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

Auto stash before merge of "master" and "origin/master"

Browse source
This commit is contained in:
Logan 2020-07-24 00:17:24 -05:00
parent b738fd2d9f
commit f35134b7b1
8 changed files with 147 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Cutscenes/Intro.gd
View file

@ -4,3 +4,8 @@ signal finished
func finished():
emit_signal("finished")
func _process(delta):
if Input.is_action_just_pressed("open"):
$AnimationPlayer.play("reset")
emit_signal("finished")

78
Cutscenes/NewIntro.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=10 format=2]
[gd_scene load_steps=12 format=2]
[ext_resource path="res://art/Black.png" type="Texture" id=1]
[ext_resource path="res://Music and Fonts(Misc.)/m5x7.tres" type="DynamicFontData" id=2]
@ -28,7 +28,62 @@ shader = SubResource( 3 )
size = 35
font_data = ExtResource( 2 )
[sub_resource type="Animation" id=6]
[sub_resource type="DynamicFont" id=6]
font_data = ExtResource( 2 )
[sub_resource type="Animation" id=7]
resource_name = "reset"
length = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("Black:self_modulate")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ Color( 1, 1, 1, 0 ) ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("Label:visible_characters")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ 0 ]
}
tracks/2/type = "value"
tracks/2/path = NodePath("Label2:visible_characters")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ 0 ]
}
tracks/3/type = "value"
tracks/3/path = NodePath("Label3:visible_characters")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ 0 ]
}
[sub_resource type="Animation" id=8]
length = 10.0
tracks/0/type = "value"
tracks/0/path = NodePath("Label:visible_characters")
@ -129,9 +184,9 @@ __meta__ = {
[node name="Label2" type="Label" parent="."]
material = SubResource( 4 )
margin_top = 118.0
margin_top = 112.0
margin_right = 320.0
margin_bottom = 161.0
margin_bottom = 146.0
custom_fonts/font = SubResource( 5 )
custom_colors/font_color = Color( 1, 0, 0, 1 )
text = "The Crypt"
@ -142,6 +197,19 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Label3" type="Label" parent="."]
margin_top = 152.0
margin_right = 320.0
margin_bottom = 173.0
custom_fonts/font = SubResource( 6 )
text = "Press F to skip"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
autoplay = "scroll"
anims/scroll = SubResource( 6 )
anims/reset = SubResource( 7 )
anims/scroll = SubResource( 8 )

BIN
art/Pillar.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 175 B

36
levels/Campaign/Level 1/Level 1.tscn
View file

@ -14,8 +14,9 @@
[ext_resource path="res://levels/Campaign/Level 1/AnimationPlayer2.gd" type="Script" id=12]
[ext_resource path="res://art/Black.tres" type="Animation" id=13]
[sub_resource type="DynamicFont" id=1]
font_data = ExtResource( 3 )
font_data = ExtResource( 4 )
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 85, 8 )
@ -41,21 +42,21 @@ font_data = ExtResource( 8 )
[node name="Level 1" type="Node"]
[node name="torch3" parent="." instance=ExtResource( 4 )]
[node name="torch3" parent="." instance=ExtResource( 9 )]
position = Vector2( 62, 105 )
[node name="torch7" parent="." instance=ExtResource( 4 )]
[node name="torch7" parent="." instance=ExtResource( 9 )]
position = Vector2( 446, 105 )
[node name="torch5" parent="." instance=ExtResource( 4 )]
[node name="torch5" parent="." instance=ExtResource( 9 )]
position = Vector2( 318, 105 )
[node name="torch2" parent="." instance=ExtResource( 4 )]
[node name="torch2" parent="." instance=ExtResource( 9 )]
position = Vector2( 190, 105 )
[node name="door" type="Sprite" parent="."]
position = Vector2( 31, 158 )
texture = ExtResource( 5 )
texture = ExtResource( 1 )
hframes = 2
[node name="Label" type="Label" parent="."]
@ -92,7 +93,7 @@ margin_top = 60.0
margin_right = 435.0
margin_bottom = 137.0
custom_fonts/font = SubResource( 1 )
text = "Experiment with combo's, and craft the best magic for the situation."
text = "Experiment with combos, and craft the best magic for the situation."
align = 1
valign = 1
autowrap = true
@ -103,7 +104,7 @@ __meta__ = {
[node name="TileMap" type="TileMap" parent="." groups=[
"Tilemap",
]]
tile_set = ExtResource( 1 )
tile_set = ExtResource( 2 )
cell_size = Vector2( 16, 16 )
collision_layer = 2
collision_mask = 0
@ -123,25 +124,25 @@ centered = false
position = Vector2( 30, 176 )
[node name="Leap" type="Area2D" parent="."]
script = ExtResource( 9 )
script = ExtResource( 6 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Leap"]
position = Vector2( 668, 217 )
shape = SubResource( 2 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
anims/Black = ExtResource( 13 )
"anims/Black Fade in" = ExtResource( 13 )
script = ExtResource( 11 )
anims/Black = ExtResource( 3 )
"anims/Black Fade in" = ExtResource( 3 )
script = ExtResource( 5 )
[node name="AnimationPlayer2" type="AnimationPlayer" parent="."]
anims/Typewriter = SubResource( 3 )
script = ExtResource( 12 )
script = ExtResource( 8 )
[node name="Timer" type="Timer" parent="."]
wait_time = 4.386
one_shot = true
script = ExtResource( 10 )
script = ExtResource( 7 )
[node name="CanvasModulate" type="CanvasModulate" parent="."]
color = Color( 0.564706, 0.564706, 0.564706, 1 )
@ -150,7 +151,7 @@ color = Color( 0.564706, 0.564706, 0.564706, 1 )
[node name="Sprite" type="Sprite" parent="CanvasLayer"]
modulate = Color( 0, 0, 0, 0 )
texture = ExtResource( 7 )
texture = ExtResource( 11 )
centered = false
[node name="Label" type="Label" parent="CanvasLayer"]
@ -160,14 +161,15 @@ margin_right = 90.0
margin_bottom = 76.0
rect_scale = Vector2( 3.25, 3.25 )
custom_fonts/font = SubResource( 4 )
text = "Stage 1: Leap of Faith"
text = "Stage 1:
Leap of Faith"
align = 1
valign = 1
percent_visible = 0.0
__meta__ = {
"_edit_use_anchors_": false
}
[connection signal="body_entered" from="Leap" to="AnimationPlayer" method="_on_Leap_body_entered"]
[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"]

29
levels/Campaign/Level 2/Level_2.tscn
View file

File diff suppressed because one or more lines are too long

65
levels/Campaign/Level 3/Level_3.tscn
View file

@ -1,17 +1,18 @@
[gd_scene load_steps=15 format=2]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://art/door.png" type="Texture" id=1]
[ext_resource path="res://meta/DungeonTilemap.tres" type="TileSet" id=2]
[ext_resource path="res://levels/Campaign/Level 3/Area2D.gd" type="Script" id=3]
[ext_resource path="res://meta/DungeonTilemap.tscn" type="PackedScene" id=4]
[ext_resource path="res://art/Spikes.png" type="Texture" id=3]
[ext_resource path="res://levels/Campaign/Level 3/Area2D.gd" type="Script" id=4]
[ext_resource path="res://levels/Campaign/Level 3/DisappearingTiles.gd" type="Script" id=5]
[ext_resource path="res://art/door.png" type="Texture" id=6]
[ext_resource path="res://ai/Scenes/ogre.tscn" type="PackedScene" id=7]
[ext_resource path="res://objects/Lever.tscn" type="PackedScene" id=8]
[ext_resource path="res://objects/torch.tscn" type="PackedScene" id=9]
[ext_resource path="res://art/Spikes.png" type="Texture" id=10]
[ext_resource path="res://levels/Campaign/Level 3/TileMap3.gd" type="Script" id=11]
[ext_resource path="res://objects/Door.tscn" type="PackedScene" id=13]
[ext_resource path="res://levels/Campaign/Level 3/TileMap3.gd" type="Script" id=6]
[ext_resource path="res://meta/DungeonTilemap.tscn" type="PackedScene" id=7]
[ext_resource path="res://objects/torch.tscn" type="PackedScene" id=8]
[ext_resource path="res://objects/Door.tscn" type="PackedScene" id=9]
[ext_resource path="res://objects/Lever.tscn" type="PackedScene" id=10]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=11]
[ext_resource path="res://ai/Scenes/ogre.tscn" type="PackedScene" id=12]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 152, 18 )
@ -26,48 +27,45 @@ extents = Vector2( 10, 45 )
[node name="Spikes" type="Sprite" parent="Spikes"]
position = Vector2( 753, 208 )
scale = Vector2( 2, 2 )
texture = ExtResource( 10 )
texture = ExtResource( 3 )
[node name="Spikes2" type="Sprite" parent="Spikes"]
position = Vector2( 833, 208 )
scale = Vector2( 2, 2 )
texture = ExtResource( 10 )
texture = ExtResource( 3 )
[node name="Spikes3" type="Sprite" parent="Spikes"]
position = Vector2( 913, 208 )
scale = Vector2( 2, 2 )
texture = ExtResource( 10 )
texture = ExtResource( 3 )
[node name="Spikes4" type="Sprite" parent="Spikes"]
position = Vector2( 993, 208 )
scale = Vector2( 2, 2 )
texture = ExtResource( 10 )
texture = ExtResource( 3 )
[node name="Torches" type="Node" parent="."]
[node name="torch8" parent="Torches" instance=ExtResource( 9 )]
[node name="torch8" parent="Torches" instance=ExtResource( 8 )]
position = Vector2( 480, 48 )
[node name="torch7" parent="Torches" instance=ExtResource( 9 )]
[node name="torch7" parent="Torches" instance=ExtResource( 8 )]
position = Vector2( 1136, 48 )
[node name="torch3" parent="Torches" instance=ExtResource( 9 )]
[node name="torch3" parent="Torches" instance=ExtResource( 8 )]
position = Vector2( 672, 48 )
[node name="torch4" parent="Torches" instance=ExtResource( 9 )]
position = Vector2( 504.192, 139.481 )
[node name="torch5" parent="Torches" instance=ExtResource( 9 )]
[node name="torch5" parent="Torches" instance=ExtResource( 8 )]
position = Vector2( 896, 48 )
[node name="Door" parent="." instance=ExtResource( 13 )]
[node name="Door" parent="." instance=ExtResource( 9 )]
position = Vector2( 416, 64 )
next_scene = "res://levels/Campaign/Level 4/Level_4.tscn"
text = "Stage 4: The Hoard"
[node name="door" type="Sprite" parent="."]
position = Vector2( 432, 191 )
texture = ExtResource( 6 )
texture = ExtResource( 1 )
hframes = 2
[node name="TileMapDisapearing" parent="." instance=ExtResource( 4 )]
@ -93,16 +91,16 @@ collision_layer = 0
collision_mask = 0
format = 1
tile_data = PoolIntArray( 262182, 0, 196609, 262183, 0, 196611, 262192, 0, 8, 262193, 0, 10, 262194, 0, 10, 262195, 0, 10, 262196, 0, 10, 262197, 0, 10, 262198, 0, 11, 327713, 0, 196609, 327714, 0, 196611, 327723, 0, 196609, 327724, 0, 196611, 327728, 0, 65544, 327729, 0, 131081, 327730, 0, 131078, 327731, 0, 196617, 327732, 0, 196617, 327733, 0, 131077, 327734, 0, 65542, 327735, 0, 10, 327736, 0, 10, 327737, 0, 10, 327738, 0, 10, 327739, 0, 10, 327740, 0, 10, 327741, 0, 10, 327742, 0, 11, 393264, 0, 65544, 393265, 0, 131081, 393266, 0, 131083, 393269, 0, 65544, 393270, 0, 131081, 393271, 0, 131078, 393272, 0, 196617, 393273, 0, 196617, 393274, 0, 131077, 393275, 0, 131081, 393276, 0, 131078, 393277, 0, 196617, 393278, 0, 196619, 458793, 0, 196608, 458800, 0, 65544, 458801, 0, 131081, 458802, 0, 131083, 458805, 0, 65544, 458806, 0, 131081, 458807, 0, 131083, 458810, 0, 65544, 458811, 0, 131081, 458812, 0, 131083, 524336, 0, 65544, 524337, 0, 131081, 524338, 0, 131083, 524341, 0, 65544, 524342, 0, 131081, 524343, 0, 131083, 524346, 0, 65544, 524347, 0, 131081, 524348, 0, 131083, 589872, 0, 65544, 589873, 0, 131081, 589874, 0, 131083, 589877, 0, 65544, 589878, 0, 131081, 589879, 0, 131083, 589882, 0, 65544, 589883, 0, 131081, 589884, 0, 131083, 655408, 0, 65544, 655409, 0, 131081, 655410, 0, 131083, 655413, 0, 65544, 655414, 0, 131081, 655415, 0, 131083, 655418, 0, 65544, 655419, 0, 131081, 655420, 0, 131083, 720944, 0, 65544, 720945, 0, 131081, 720946, 0, 131083, 720949, 0, 65544, 720950, 0, 131081, 720951, 0, 131083, 720954, 0, 65544, 720955, 0, 131081, 720956, 0, 131083, 786480, 0, 65544, 786481, 0, 131081, 786482, 0, 131083, 786485, 0, 65544, 786486, 0, 131081, 786487, 0, 131083, 786490, 0, 65544, 786491, 0, 131081, 786492, 0, 131083, 852016, 0, 65544, 852017, 0, 131081, 852018, 0, 131083, 852021, 0, 65544, 852022, 0, 131081, 852023, 0, 131083, 852026, 0, 65544, 852027, 0, 131081, 852028, 0, 131083, 917552, 0, 65544, 917553, 0, 131081, 917554, 0, 131083, 917557, 0, 65544, 917558, 0, 131081, 917559, 0, 131083, 917562, 0, 65544, 917563, 0, 131081, 917564, 0, 131083, 983088, 0, 196616, 983089, 0, 196617, 983090, 0, 196619, 983093, 0, 196616, 983094, 0, 196617, 983095, 0, 196619, 983098, 0, 196616, 983099, 0, 196617, 983100, 0, 196619 )
script = ExtResource( 11 )
script = ExtResource( 6 )
[node name="Lever" parent="." instance=ExtResource( 8 )]
[node name="Lever" parent="." instance=ExtResource( 10 )]
position = Vector2( 1120, 72 )
[node name="Player" parent="." instance=ExtResource( 1 )]
[node name="Player" parent="." instance=ExtResource( 11 )]
position = Vector2( 431.5, 202 )
[node name="Area2D" type="Area2D" parent="."]
script = ExtResource( 3 )
script = ExtResource( 4 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
position = Vector2( 868, 222 )
@ -137,20 +135,17 @@ shape = SubResource( 2 )
position = Vector2( -49, -9 )
shape = SubResource( 2 )
[node name="Ogre" parent="." instance=ExtResource( 7 )]
[node name="Ogre" parent="." instance=ExtResource( 12 )]
position = Vector2( 800, -52 )
[node name="Ogre2" parent="." instance=ExtResource( 7 )]
[node name="Ogre2" parent="." instance=ExtResource( 12 )]
position = Vector2( 876, -53 )
[node name="Ogre3" parent="." instance=ExtResource( 7 )]
[node name="Ogre3" parent="." instance=ExtResource( 12 )]
position = Vector2( 956, -53 )
[node name="Ogre4" parent="." instance=ExtResource( 7 )]
position = Vector2( 673.242, 139.816 )
[node name="Ogre5" parent="." instance=ExtResource( 7 )]
position = Vector2( 712.133, 122.845 )
[node name="Ogre4" parent="." instance=ExtResource( 12 )]
position = Vector2( 714, 120 )
[node name="CanvasModulate" type="CanvasModulate" parent="."]
color = Color( 0.564706, 0.564706, 0.564706, 1 )

5
levels/Campaign/Level0.tscn
View file

@ -20,7 +20,7 @@ color = Color( 0.564706, 0.564706, 0.564706, 1 )
position = Vector2( 128, 160 )
[node name="Player" parent="." instance=ExtResource( 5 )]
position = Vector2( 74, 157 )
position = Vector2( 74, 158 )
[node name="torch" parent="." instance=ExtResource( 4 )]
position = Vector2( 85, 91 )
@ -28,7 +28,8 @@ position = Vector2( 85, 91 )
[node name="torch2" parent="." instance=ExtResource( 4 )]
position = Vector2( 171, 91 )
[node name="TileMap" parent="." instance=ExtResource( 6 )]
[node name="TileMap" parent="torch2" instance=ExtResource( 6 )]
position = Vector2( -171, -91 )
tile_data = PoolIntArray( 131069, 0, 8, 131070, 0, 10, 131071, 0, 10, 65536, 0, 10, 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, 11, 196605, 0, 65544, 196606, 0, 131081, 196607, 0, 131081, 131072, 0, 131081, 131073, 0, 131081, 131074, 0, 131081, 131075, 0, 131081, 131076, 0, 131081, 131077, 0, 131081, 131078, 0, 131081, 131079, 0, 131081, 131080, 0, 131081, 131081, 0, 131081, 131082, 0, 131081, 131083, 0, 131081, 131084, 0, 131081, 131085, 0, 131081, 131086, 0, 131081, 131087, 0, 131081, 131088, 0, 131081, 131089, 0, 131081, 131090, 0, 131083, 262141, 0, 65544, 262142, 0, 131081, 262143, 0, 131081, 196608, 0, 131081, 196609, 0, 131078, 196610, 0, 196617, 196611, 0, 196617, 196612, 0, 196617, 196613, 0, 196617, 196614, 0, 196617, 196615, 0, 196617, 196616, 0, 196617, 196617, 0, 196617, 196618, 0, 196617, 196619, 0, 196617, 196620, 0, 196617, 196621, 0, 196617, 196622, 0, 131077, 196623, 0, 131081, 196624, 0, 131081, 196625, 0, 131081, 196626, 0, 131083, 327677, 0, 65544, 327678, 0, 131081, 327679, 0, 131081, 262144, 0, 131081, 262145, 0, 131083, 262158, 0, 65544, 262159, 0, 131081, 262160, 0, 131081, 262161, 0, 131081, 262162, 0, 131083, 393213, 0, 65544, 393214, 0, 131081, 393215, 0, 131081, 327680, 0, 131081, 327681, 0, 131083, 327694, 0, 65544, 327695, 0, 131081, 327696, 0, 131081, 327697, 0, 131081, 327698, 0, 131083, 458749, 0, 65544, 458750, 0, 131081, 458751, 0, 131081, 393216, 0, 131081, 393217, 0, 131083, 393230, 0, 65544, 393231, 0, 131081, 393232, 0, 131081, 393233, 0, 131081, 393234, 0, 131083, 524285, 0, 65544, 524286, 0, 131081, 524287, 0, 131081, 458752, 0, 131081, 458753, 0, 131083, 458766, 0, 65544, 458767, 0, 131081, 458768, 0, 131081, 458769, 0, 131081, 458770, 0, 131083, 589821, 0, 65544, 589822, 0, 131081, 589823, 0, 131081, 524288, 0, 131081, 524289, 0, 131083, 524302, 0, 65544, 524303, 0, 131081, 524304, 0, 131081, 524305, 0, 131081, 524306, 0, 131083, 655357, 0, 65544, 655358, 0, 131081, 655359, 0, 131081, 589824, 0, 131081, 589825, 0, 131083, 589838, 0, 65544, 589839, 0, 131081, 589840, 0, 131081, 589841, 0, 131081, 589842, 0, 131083, 720893, 0, 65544, 720894, 0, 131081, 720895, 0, 131081, 655360, 0, 131081, 655361, 0, 65542, 655362, 0, 10, 655363, 0, 10, 655364, 0, 10, 655365, 0, 10, 655366, 0, 10, 655367, 0, 10, 655368, 0, 10, 655369, 0, 10, 655370, 0, 10, 655371, 0, 10, 655372, 0, 10, 655373, 0, 10, 655374, 0, 65541, 655375, 0, 131081, 655376, 0, 131081, 655377, 0, 131081, 655378, 0, 131083, 786429, 0, 65544, 786430, 0, 131081, 786431, 0, 131081, 720896, 0, 131081, 720897, 0, 131081, 720898, 0, 131081, 720899, 0, 131081, 720900, 0, 131081, 720901, 0, 131081, 720902, 0, 131081, 720903, 0, 131081, 720904, 0, 131081, 720905, 0, 131081, 720906, 0, 131081, 720907, 0, 131081, 720908, 0, 131081, 720909, 0, 131081, 720910, 0, 131081, 720911, 0, 131081, 720912, 0, 131081, 720913, 0, 131081, 720914, 0, 131083, 851965, 0, 196616, 851966, 0, 196617, 851967, 0, 196617, 786432, 0, 196617, 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, 196619 )
[node name="CanvasLayer" parent="." instance=ExtResource( 1 )]

2
objects/Door.gd
View file

@ -27,6 +27,8 @@ func lock():
func unlock():
unlocked = true
func _on_Timer_timeout():
Player.current_scene = next_scene
get_tree().change_scene(""+next_scene+"")