logan/the-crypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Logan 2020-07-22 18:18:05 -05:00
parent c0ea0f7921 c6ece4fc2a
commit 7f47cbebbc
8 changed files with 185 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ai/Script/Skeleton Enemy.gd
View file

@ -1,6 +1,6 @@
extends Enemy
var Spinning_Bone = preload("res://ai/SpinningBone.tscn")
var Spinning_Bone = preload("res://ai/Scenes/SpinningBone.tscn")
onready var ShootDelay : Timer = $ShootDelay
onready var ProjectileSpawn: Node2D = $Position2D

34
art/Ladder.png.import Normal file
View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Ladder.png-d7c8f0bbcede08ab0360215b67647373.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://art/Ladder.png"
dest_files=[ "res://.import/Ladder.png-d7c8f0bbcede08ab0360215b67647373.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

20
levels/AnimationPlayer2.gd Normal file
View file

@ -0,0 +1,20 @@
extends AnimationPlayer
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
func _on_Leap_body_entered(body):
play("Typewriter")

64
levels/Level 1.tscn
View file

@ -1,18 +1,41 @@
[gd_scene load_steps=11 format=2]
[gd_scene load_steps=17 format=2]
[ext_resource path="res://meta/DungeonTilemap.tres" type="TileSet" id=1]
[ext_resource path="res://art/Paralax Dungeon.png" type="Texture" id=2]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=3]
[ext_resource path="res://ai/Scenes/Demon.tscn" type="PackedScene" id=4]
[ext_resource path="res://art/door.png" type="Texture" id=5]
[ext_resource path="res://art/Black.png" type="Texture" id=6]
[ext_resource path="res://Music and Fonts(Misc.)/Tifax-AJ7g.ttf" type="DynamicFontData" id=6]
[ext_resource path="res://levels/Leap Of Faith.gd" type="Script" id=7]
[ext_resource path="res://levels/AnimationPlayer.gd" type="Script" id=8]
[ext_resource path="res://art/Black.tres" type="Animation" id=9]
[ext_resource path="res://ai/Scenes/Skeleton Enemy.tscn" type="PackedScene" id=10]
[ext_resource path="res://art/Black.png" type="Texture" id=11]
[ext_resource path="res://levels/AnimationPlayer2.gd" type="Script" id=12]
[ext_resource path="res://levels/Timer.gd" type="Script" id=13]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 85, 8 )
[sub_resource type="Animation" id=2]
resource_name = "Typewriter"
length = 2.0
tracks/0/type = "value"
tracks/0/path = NodePath("CanvasLayer/Label:percent_visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.6, 2 ),
"transitions": PoolRealArray( 1, 1, 1 ),
"update": 0,
"values": [ 0.0, 0.0, 1.0 ]
}
[sub_resource type="DynamicFont" id=3]
font_data = ExtResource( 6 )
[node name="Level 1" type="Node"]
[node name="door" type="Sprite" parent="."]
@ -38,7 +61,7 @@ texture = ExtResource( 2 )
centered = false
[node name="Player" parent="." instance=ExtResource( 3 )]
position = Vector2( 33, 170 )
position = Vector2( 30, 174 )
[node name="Demon" parent="." instance=ExtResource( 4 )]
position = Vector2( 301, 164 )
@ -55,12 +78,39 @@ anims/Black = ExtResource( 9 )
"anims/Black Fade in" = ExtResource( 9 )
script = ExtResource( 8 )
[node name="AnimationPlayer2" type="AnimationPlayer" parent="."]
anims/Typewriter = SubResource( 2 )
script = ExtResource( 12 )
[node name="CanvasLayer" type="CanvasLayer" parent="."]
[node name="Sprite" type="Sprite" parent="CanvasLayer"]
modulate = Color( 0, 0, 0, 0.7 )
position = Vector2( -287, -179 )
scale = Vector2( 2.025, 2.41667 )
texture = ExtResource( 6 )
modulate = Color( 0, 0, 0, 0 )
scale = Vector2( 1, 1 )
texture = ExtResource( 11 )
centered = false
[node name="Label" type="Label" parent="CanvasLayer"]
margin_left = 35.0
margin_top = 90.0
margin_right = 204.0
margin_bottom = 106.0
rect_scale = Vector2( 1.5, 1.5 )
custom_fonts/font = SubResource( 3 )
text = "Leap of Faith"
percent_visible = 0.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Skeleton Enemy" parent="." instance=ExtResource( 10 )]
position = Vector2( 357, 167 )
[node name="Timer" type="Timer" parent="."]
wait_time = 4.386
one_shot = true
script = ExtResource( 13 )
[connection signal="body_entered" from="Leap" to="AnimationPlayer2" method="_on_Leap_body_entered"]
[connection signal="body_entered" from="Leap" to="AnimationPlayer" method="_on_Leap_body_entered"]
[connection signal="body_entered" from="Leap" to="Timer" method="_on_Leap_body_entered"]
[connection signal="timeout" from="Timer" to="Timer" method="_on_Timer_timeout"]

4
levels/Level 1a.gd Normal file
View file

@ -0,0 +1,4 @@
extends Node
func _ready():
Player.current_scene = ("res://levels/Level 1a.tscn")

49
levels/Level 1a.tscn Normal file
View file

File diff suppressed because one or more lines are too long

12
levels/Timer.gd Normal file
View file

@ -0,0 +1,12 @@
extends Timer
func _on_Leap_body_entered(body):
start()
func _on_Timer_timeout():
Player.respawn()
get_tree().change_scene("res://levels/Level 1a.tscn")

13
levels/test.tscn
View file

@ -2,15 +2,18 @@
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://meta/DungeonTilemap.tscn" type="PackedScene" id=2]
[ext_resource path="res://Items/Wand Pickups/ChargeWandPickup.tscn" type="PackedScene" id=4]
[ext_resource path="res://ai/Scenes/ogre.tscn" type="PackedScene" id=3]
[node name="Node2D" type="Node2D"]
[node name="TileMap" parent="." instance=ExtResource( 2 )]
tile_data = PoolIntArray( 65536, 0, 8, 65537, 0, 10, 65538, 0, 10, 65539, 0, 10, 65540, 0, 10, 65541, 0, 10, 65542, 0, 10, 65543, 0, 10, 65544, 0, 10, 65545, 0, 10, 65546, 0, 10, 65547, 0, 10, 65548, 0, 10, 65549, 0, 10, 65550, 0, 10, 65551, 0, 10, 65552, 0, 10, 65553, 0, 10, 65554, 0, 10, 65555, 0, 10, 65556, 0, 11, 131072, 0, 65544, 131073, 0, 131078, 131074, 0, 196617, 131075, 0, 196617, 131076, 0, 196617, 131077, 0, 196617, 131078, 0, 196617, 131079, 0, 196617, 131080, 0, 196617, 131081, 0, 196617, 131082, 0, 196617, 131083, 0, 196617, 131084, 0, 196617, 131085, 0, 196617, 131086, 0, 196617, 131087, 0, 196617, 131088, 0, 196617, 131089, 0, 196617, 131090, 0, 196617, 131091, 0, 131077, 131092, 0, 131083, 196608, 0, 65544, 196609, 0, 131083, 196627, 0, 65544, 196628, 0, 131083, 262144, 0, 65544, 262145, 0, 131083, 262163, 0, 65544, 262164, 0, 131083, 327680, 0, 65544, 327681, 0, 131083, 327699, 0, 65544, 327700, 0, 131083, 393216, 0, 65544, 393217, 0, 131083, 393235, 0, 65544, 393236, 0, 131083, 458752, 0, 65544, 458753, 0, 131083, 458771, 0, 65544, 458772, 0, 131083, 524288, 0, 65544, 524289, 0, 131083, 524307, 0, 65544, 524308, 0, 131083, 589824, 0, 65544, 589825, 0, 131083, 589843, 0, 65544, 589844, 0, 131083, 655360, 0, 65544, 655361, 0, 131083, 655379, 0, 65544, 655380, 0, 131083, 720896, 0, 65544, 720897, 0, 65542, 720898, 0, 10, 720899, 0, 10, 720900, 0, 10, 720901, 0, 10, 720902, 0, 10, 720903, 0, 10, 720904, 0, 10, 720905, 0, 10, 720906, 0, 10, 720907, 0, 10, 720908, 0, 10, 720909, 0, 10, 720910, 0, 10, 720911, 0, 10, 720912, 0, 11, 720915, 0, 65544, 720916, 0, 131083, 786432, 0, 196616, 786433, 0, 196617, 786434, 0, 196617, 786435, 0, 196617, 786436, 0, 196617, 786437, 0, 196617, 786438, 0, 196617, 786439, 0, 196617, 786440, 0, 196617, 786441, 0, 196617, 786442, 0, 196617, 786443, 0, 196617, 786444, 0, 196617, 786445, 0, 196617, 786446, 0, 196617, 786447, 0, 196617, 786448, 0, 196619, 786451, 0, 196616, 786452, 0, 196619 )
tile_data = PoolIntArray( 65536, 0, 8, 65537, 0, 10, 65538, 0, 10, 65539, 0, 10, 65540, 0, 10, 65541, 0, 10, 65542, 0, 10, 65543, 0, 10, 65544, 0, 10, 65545, 0, 10, 65546, 0, 10, 65547, 0, 10, 65548, 0, 10, 65549, 0, 10, 65550, 0, 10, 65551, 0, 10, 65552, 0, 10, 65553, 0, 10, 65554, 0, 10, 65555, 0, 10, 65556, 0, 10, 65557, 0, 10, 65558, 0, 10, 65559, 0, 10, 65560, 0, 10, 65561, 0, 10, 65562, 0, 10, 65563, 0, 10, 65564, 0, 10, 65565, 0, 10, 65566, 0, 10, 65567, 0, 10, 65568, 0, 10, 65569, 0, 10, 65570, 0, 10, 65571, 0, 11, 131072, 0, 65544, 131073, 0, 131078, 131074, 0, 196617, 131075, 0, 196617, 131076, 0, 196617, 131077, 0, 196617, 131078, 0, 196617, 131079, 0, 196617, 131080, 0, 196617, 131081, 0, 196617, 131082, 0, 196617, 131083, 0, 196617, 131084, 0, 196617, 131085, 0, 196617, 131086, 0, 196617, 131087, 0, 196617, 131088, 0, 196617, 131089, 0, 196617, 131090, 0, 196617, 131091, 0, 196617, 131092, 0, 196617, 131093, 0, 196617, 131094, 0, 196617, 131095, 0, 196617, 131096, 0, 196617, 131097, 0, 196617, 131098, 0, 196617, 131099, 0, 196617, 131100, 0, 196617, 131101, 0, 196617, 131102, 0, 196617, 131103, 0, 196617, 131104, 0, 196617, 131105, 0, 196617, 131106, 0, 131077, 131107, 0, 131083, 196608, 0, 65544, 196609, 0, 131083, 196642, 0, 65544, 196643, 0, 131083, 262144, 0, 65544, 262145, 0, 131083, 262178, 0, 65544, 262179, 0, 131083, 327680, 0, 65544, 327681, 0, 131083, 327714, 0, 65544, 327715, 0, 131083, 393216, 0, 65544, 393217, 0, 131083, 393250, 0, 65544, 393251, 0, 131083, 458752, 0, 65544, 458753, 0, 131083, 458786, 0, 65544, 458787, 0, 131083, 524288, 0, 65544, 524289, 0, 131083, 524322, 0, 65544, 524323, 0, 131083, 589824, 0, 65544, 589825, 0, 131083, 589838, 0, 0, 589858, 0, 65544, 589859, 0, 131083, 655360, 0, 65544, 655361, 0, 131083, 655374, 0, 65540, 655375, 0, 11, 655394, 0, 65544, 655395, 0, 131083, 720896, 0, 65544, 720897, 0, 65542, 720898, 0, 10, 720899, 0, 10, 720900, 0, 10, 720901, 0, 10, 720902, 0, 10, 720903, 0, 10, 720904, 0, 10, 720905, 0, 10, 720906, 0, 10, 720907, 0, 10, 720908, 0, 10, 720909, 0, 10, 720910, 0, 65541, 720911, 0, 65542, 720912, 0, 10, 720913, 0, 10, 720914, 0, 10, 720915, 0, 10, 720916, 0, 10, 720917, 0, 10, 720918, 0, 10, 720919, 0, 10, 720920, 0, 10, 720921, 0, 10, 720922, 0, 10, 720923, 0, 10, 720924, 0, 11, 720930, 0, 65544, 720931, 0, 131083, 786432, 0, 196616, 786433, 0, 196617, 786434, 0, 196617, 786435, 0, 196617, 786436, 0, 196617, 786437, 0, 196617, 786438, 0, 196617, 786439, 0, 196617, 786440, 0, 196617, 786441, 0, 196617, 786442, 0, 196617, 786443, 0, 196617, 786444, 0, 196617, 786445, 0, 196617, 786446, 0, 196617, 786447, 0, 196617, 786448, 0, 196617, 786449, 0, 196617, 786450, 0, 196617, 786451, 0, 196617, 786452, 0, 196617, 786453, 0, 196617, 786454, 0, 196617, 786455, 0, 196617, 786456, 0, 196617, 786457, 0, 196617, 786458, 0, 196617, 786459, 0, 131077, 786460, 0, 131083, 786466, 0, 65544, 786467, 0, 131083, 851995, 0, 65544, 851996, 0, 131083, 852002, 0, 65544, 852003, 0, 131083, 917531, 0, 65544, 917532, 0, 131083, 917538, 0, 65544, 917539, 0, 131083, 983067, 0, 65544, 983068, 0, 131083, 983074, 0, 65544, 983075, 0, 131083, 1048603, 0, 65544, 1048604, 0, 131083, 1048610, 0, 65544, 1048611, 0, 131083, 1114139, 0, 196616, 1114140, 0, 196614, 1114141, 0, 196610, 1114142, 0, 196610, 1114143, 0, 196610, 1114144, 0, 196610, 1114145, 0, 196610, 1114146, 0, 196613, 1114147, 0, 196619 )
[node name="Player" parent="." instance=ExtResource( 1 )]
position = Vector2( 67, 169 )
position = Vector2( 60, 176 )
[node name="ChargeWandPickup" parent="." instance=ExtResource( 4 )]
position = Vector2( 59, 162 )
[node name="Ogre" parent="." instance=ExtResource( 3 )]
position = Vector2( 286, 170 )
[node name="Ogre2" parent="." instance=ExtResource( 3 )]
position = Vector2( 347, 159 )