From bec623832dd9879a8dc07619740eb7a9d1cfe32c Mon Sep 17 00:00:00 2001 From: Logan Date: Wed, 22 Jul 2020 23:57:55 -0500 Subject: [PATCH] Intro done --- Music and Fonts(Misc.)/m5x7.tres | 4 ++ art/door.png | Bin 764 -> 804 bytes art/torch.png | Bin 0 -> 151 bytes art/torch.png.import | 34 +++++++++++++ levels/Campaign/Level0.tscn | 38 ++++++++++++++ levels/World.tscn | 28 ----------- levels/{ => other}/AnimationPlayer.gd | 0 levels/{ => other}/AnimationPlayer2.gd | 0 levels/{ => other}/Leap Of Faith.gd | 0 levels/{ => other}/Level 1.tscn | 9 ++-- levels/{ => other}/Level 1a.gd | 0 levels/{ => other}/Level 1a.tscn | 3 +- levels/{ => other}/Node2D.tscn | 0 levels/{ => other}/Tilte.tscn | 0 levels/{ => other}/Timer.gd | 0 levels/other/World.tscn | 38 ++++++++++++++ levels/{ => other}/test.tscn | 0 npc/Wizard.gd | 7 +++ npc/Wizard.tscn | 66 ++++++++++++++++++++++--- objects/Door.gd | 19 +++++-- objects/Door.tscn | 22 +++++++-- objects/torch.tscn | 51 +++++++++++++++++++ project.godot | 2 +- 23 files changed, 272 insertions(+), 49 deletions(-) create mode 100644 Music and Fonts(Misc.)/m5x7.tres create mode 100644 art/torch.png create mode 100644 art/torch.png.import create mode 100644 levels/Campaign/Level0.tscn delete mode 100644 levels/World.tscn rename levels/{ => other}/AnimationPlayer.gd (100%) rename levels/{ => other}/AnimationPlayer2.gd (100%) rename levels/{ => other}/Leap Of Faith.gd (100%) rename levels/{ => other}/Level 1.tscn (96%) rename levels/{ => other}/Level 1a.gd (100%) rename levels/{ => other}/Level 1a.tscn (99%) rename levels/{ => other}/Node2D.tscn (100%) rename levels/{ => other}/Tilte.tscn (100%) rename levels/{ => other}/Timer.gd (100%) create mode 100644 levels/other/World.tscn rename levels/{ => other}/test.tscn (100%) create mode 100644 objects/torch.tscn diff --git a/Music and Fonts(Misc.)/m5x7.tres b/Music and Fonts(Misc.)/m5x7.tres new file mode 100644 index 0000000..649cc4f --- /dev/null +++ b/Music and Fonts(Misc.)/m5x7.tres @@ -0,0 +1,4 @@ +[gd_resource type="DynamicFontData" format=2] + +[resource] +font_path = "res://Music and Fonts(Misc.)/m5x7.ttf" diff --git a/art/door.png b/art/door.png index 2af09a59a3aa0eebf879db7bea32d3c84c7f20ed..d7c04e6ddbf44e149d019b241cb84f26397b7592 100644 GIT binary patch delta 767 zcmV2!9y-k( zzgOG)UKPXXN*X&V5M(f842-cvjuT?wC>W~#!5$zwKj=0jr{XeOp7CoM!zPQqmfl!v zMq$b#?ItKXEq^*=B2FJ7&YGsI$^uottTx)r6d4+3uo#@Ev2FEj(PhCw21KR2Znni| zVc9@qhh;&MC1;DMUlt#lqAxmSlb*U@nAW$bZ?mLqQL{kGfH={&HLla#@xPfZ&q4#3 z$Ly<=0ifpA0RW@L_Mn69hLmIj3)9aUo&lG)H{6KPVt)(AaWGnJLucHyA5ah`!3Lwn z7L#BDK+XmgQ9n6hs)a={u|KGsOp5+r_SvksJIx)wr+Wp64G+Nh;u?VFtoEWeCedKgK^hZ~1ENFH zkD+-i%6|axXZ@Rt54sIpxgG%fU0KY8Z|5JSHuYXa)z1@Y3B(Z>H!{VBESucMa%|HC^yTecd=&!v8Z=bL+VsSB~Rwr-_UZsI@?#=lrmsIFKl8hkoSRLG*D&jX}Lq`XF6 zfr9o*UL#T{@&N8rA(Sc-g=wg63o6t23TM}|%dWj^uyd#IlcHdInQvxx_Kz3f!i5VL zE_`3ETpC4Dls7TH*=(Hbx1sIogY_X5=A1VYXN);JV$=5hu79r`qv0ruavJn(GQfPb z!)!8;_vWh|9{M5T;Xz*O&&BtEG8uKj2&Xyc;GCaaLAqUCKQJ{E!OtcGB`8M+p8bmnswL`f0O_KO3*YI8!l}GE@N6$RU7E~f&S2^r-Y+b4%6h++4j}<#Z(1H z6;N05rrxIas(-3M*siLACPU5_svppsw(QfOe9F_54BPmo`aVO-m&!@dCHub4#lwUA z&U$-OnZPc3Unc;{l31kKQ3KxzsmTOZrQbHP0`6a*A)HvG85m<&q*-N;+vWq2ge2c% zk!DEpJpi>Dbf|upC_~`m{SEi8&+hIp-LSr^=Wf zji*KL_J8gB{4ZMu1$DE!E8^v6G@i;o&bh2C8+5n#iYa({ugclaSK7ws30-gv zlpB#G-y=p(Y0#ts1p4`ajVk@NF>ZvCd@t8+Uz#TCpWO(ZoBw(vbjomWLFji${YJ>J zY_%~<3;n0ChxPXC=B+3jp{KB?oCCV<3rwE@^H8#8N*>iW*=ZAbIMDWS6ooN%bTAP` zQC{?ZG0f(x-C0kCbuFQ<%mMTq|0^g~fDB1m_`(=F=|>S4{sNJSiebRnZsh;~002ov JPDHLkV1k>*X7T_4 diff --git a/art/torch.png b/art/torch.png new file mode 100644 index 0000000000000000000000000000000000000000..c61e8617c12c7cee409bdf181413bc8ce5afdd3d GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|0zF+ELnNlo zJ-3mw!GMAF;`9W?j6`LN30s*hmhGK;n8Qp=>*XUh!9Cv&|KvaKmd) y$+msWzYEzqPVW-s6}+|V-+h7SnSb_ad}KO2mGA$JY;QxL;S8RxelF{r5}E)T12t6u literal 0 HcmV?d00001 diff --git a/art/torch.png.import b/art/torch.png.import new file mode 100644 index 0000000..b133230 --- /dev/null +++ b/art/torch.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/torch.png-9e86e614ec888a767a72b2b0ff11ec81.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/torch.png" +dest_files=[ "res://.import/torch.png-9e86e614ec888a767a72b2b0ff11ec81.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 diff --git a/levels/Campaign/Level0.tscn b/levels/Campaign/Level0.tscn new file mode 100644 index 0000000..8ae7452 --- /dev/null +++ b/levels/Campaign/Level0.tscn @@ -0,0 +1,38 @@ +[gd_scene load_steps=7 format=2] + +[ext_resource path="res://Music and Fonts(Misc.)/Hawaii Partii - Stranded Lullaby(8-Bit).wav" type="AudioStream" id=1] +[ext_resource path="res://npc/Wizard.tscn" type="PackedScene" id=2] +[ext_resource path="res://objects/Door.tscn" type="PackedScene" id=3] +[ext_resource path="res://objects/torch.tscn" type="PackedScene" id=4] +[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=5] +[ext_resource path="res://meta/DungeonTilemap.tscn" type="PackedScene" id=6] + +[node name="World" type="Node2D"] + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 1 ) +volume_db = -21.204 +autoplay = true + +[node name="Door" parent="." instance=ExtResource( 3 )] +position = Vector2( 180, 128 ) +unlocked = false + +[node name="CanvasModulate" type="CanvasModulate" parent="."] +color = Color( 0.564706, 0.564706, 0.564706, 1 ) + +[node name="Wizard" parent="." instance=ExtResource( 2 )] +position = Vector2( 128, 160 ) + +[node name="Player" parent="." instance=ExtResource( 5 )] +position = Vector2( 74, 158 ) + +[node name="torch" parent="." instance=ExtResource( 4 )] +position = Vector2( 85, 91 ) + +[node name="torch2" parent="." instance=ExtResource( 4 )] +position = Vector2( 171, 91 ) + +[node name="TileMap" parent="." instance=ExtResource( 6 )] +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 ) +[connection signal="dialogue_finished" from="Wizard" to="Door" method="unlock"] diff --git a/levels/World.tscn b/levels/World.tscn deleted file mode 100644 index 31c6fb9..0000000 --- a/levels/World.tscn +++ /dev/null @@ -1,28 +0,0 @@ -[gd_scene load_steps=6 format=2] - -[ext_resource path="res://meta/DungeonTilemap.tscn" type="PackedScene" id=1] -[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://objects/Door.tscn" type="PackedScene" id=3] -[ext_resource path="res://Music and Fonts(Misc.)/Hawaii Partii - Stranded Lullaby(8-Bit).wav" type="AudioStream" id=4] -[ext_resource path="res://npc/Wizard.tscn" type="PackedScene" id=10] - -[node name="World" type="Node2D"] - -[node name="TileMap" parent="." instance=ExtResource( 1 )] -tile_data = PoolIntArray( 0, 0, 8, 1, 0, 10, 2, 0, 10, 3, 0, 10, 4, 0, 10, 5, 0, 10, 6, 0, 10, 7, 0, 10, 8, 0, 10, 9, 0, 10, 10, 0, 10, 11, 0, 10, 12, 0, 10, 13, 0, 10, 14, 0, 10, 15, 0, 10, 16, 0, 10, 17, 0, 10, 18, 0, 10, 19, 0, 10, 20, 0, 11, 65536, 0, 65544, 65537, 0, 131078, 65538, 0, 196617, 65539, 0, 196617, 65540, 0, 196617, 65541, 0, 196617, 65542, 0, 196617, 65543, 0, 196617, 65544, 0, 196617, 65545, 0, 196617, 65546, 0, 196617, 65547, 0, 196617, 65548, 0, 196617, 65549, 0, 196617, 65550, 0, 196617, 65551, 0, 196617, 65552, 0, 196617, 65553, 0, 196617, 65554, 0, 196617, 65555, 0, 131077, 65556, 0, 131083, 131072, 0, 65544, 131073, 0, 131083, 131091, 0, 65544, 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, 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, 10, 655375, 0, 10, 655376, 0, 10, 655377, 0, 10, 655378, 0, 10, 655379, 0, 65541, 655380, 0, 131083, 720896, 0, 196616, 720897, 0, 196617, 720898, 0, 196617, 720899, 0, 196617, 720900, 0, 196617, 720901, 0, 196617, 720902, 0, 196617, 720903, 0, 196617, 720904, 0, 196617, 720905, 0, 196617, 720906, 0, 196617, 720907, 0, 196617, 720908, 0, 196617, 720909, 0, 196617, 720910, 0, 196617, 720911, 0, 196617, 720912, 0, 196617, 720913, 0, 196617, 720914, 0, 196617, 720915, 0, 196617, 720916, 0, 196619 ) - -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 4 ) -volume_db = -21.204 -autoplay = true - -[node name="Door" parent="." instance=ExtResource( 3 )] -position = Vector2( 255, 126 ) - -[node name="Player" parent="." instance=ExtResource( 2 )] -position = Vector2( 63, 158 ) - -[node name="Wizard" parent="." instance=ExtResource( 10 )] -position = Vector2( 141, 160 ) - -[node name="CanvasLayer" type="CanvasLayer" parent="."] diff --git a/levels/AnimationPlayer.gd b/levels/other/AnimationPlayer.gd similarity index 100% rename from levels/AnimationPlayer.gd rename to levels/other/AnimationPlayer.gd diff --git a/levels/AnimationPlayer2.gd b/levels/other/AnimationPlayer2.gd similarity index 100% rename from levels/AnimationPlayer2.gd rename to levels/other/AnimationPlayer2.gd diff --git a/levels/Leap Of Faith.gd b/levels/other/Leap Of Faith.gd similarity index 100% rename from levels/Leap Of Faith.gd rename to levels/other/Leap Of Faith.gd diff --git a/levels/Level 1.tscn b/levels/other/Level 1.tscn similarity index 96% rename from levels/Level 1.tscn rename to levels/other/Level 1.tscn index 423a187..3f1371e 100644 --- a/levels/Level 1.tscn +++ b/levels/other/Level 1.tscn @@ -6,13 +6,14 @@ [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://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://levels/other/Leap Of Faith.gd" type="Script" id=7] +[ext_resource path="res://levels/other/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] +[ext_resource path="res://levels/other/AnimationPlayer2.gd" type="Script" id=12] +[ext_resource path="res://levels/other/Timer.gd" type="Script" id=13] + [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 85, 8 ) diff --git a/levels/Level 1a.gd b/levels/other/Level 1a.gd similarity index 100% rename from levels/Level 1a.gd rename to levels/other/Level 1a.gd diff --git a/levels/Level 1a.tscn b/levels/other/Level 1a.tscn similarity index 99% rename from levels/Level 1a.tscn rename to levels/other/Level 1a.tscn index 4224e4c..bc65969 100644 --- a/levels/Level 1a.tscn +++ b/levels/other/Level 1a.tscn @@ -6,7 +6,8 @@ [ext_resource path="res://ai/Scenes/ogre.tscn" type="PackedScene" id=4] [ext_resource path="res://ai/Scenes/Skeleton Enemy.tscn" type="PackedScene" id=5] [ext_resource path="res://ai/Scenes/Demon.tscn" type="PackedScene" id=6] -[ext_resource path="res://levels/Level 1a.gd" type="Script" id=7] +[ext_resource path="res://levels/other/Level 1a.gd" type="Script" id=7] + [node name="Level 1a" type="Node"] script = ExtResource( 7 ) diff --git a/levels/Node2D.tscn b/levels/other/Node2D.tscn similarity index 100% rename from levels/Node2D.tscn rename to levels/other/Node2D.tscn diff --git a/levels/Tilte.tscn b/levels/other/Tilte.tscn similarity index 100% rename from levels/Tilte.tscn rename to levels/other/Tilte.tscn diff --git a/levels/Timer.gd b/levels/other/Timer.gd similarity index 100% rename from levels/Timer.gd rename to levels/other/Timer.gd diff --git a/levels/other/World.tscn b/levels/other/World.tscn new file mode 100644 index 0000000..6babdde --- /dev/null +++ b/levels/other/World.tscn @@ -0,0 +1,38 @@ +[gd_scene load_steps=7 format=2] + +[ext_resource path="res://meta/DungeonTilemap.tscn" type="PackedScene" id=1] +[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://objects/Door.tscn" type="PackedScene" id=3] +[ext_resource path="res://Music and Fonts(Misc.)/Hawaii Partii - Stranded Lullaby(8-Bit).wav" type="AudioStream" id=4] +[ext_resource path="res://objects/torch.tscn" type="PackedScene" id=5] +[ext_resource path="res://npc/Wizard.tscn" type="PackedScene" id=10] + +[node name="World" type="Node2D"] + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 4 ) +volume_db = -21.204 +autoplay = true + +[node name="Door" parent="." instance=ExtResource( 3 )] +position = Vector2( 180, 128 ) +unlocked = false + +[node name="CanvasModulate" type="CanvasModulate" parent="."] +color = Color( 0.564706, 0.564706, 0.564706, 1 ) + +[node name="Wizard" parent="." instance=ExtResource( 10 )] +position = Vector2( 128, 160 ) + +[node name="Player" parent="." instance=ExtResource( 2 )] +position = Vector2( 74, 158 ) + +[node name="torch" parent="." instance=ExtResource( 5 )] +position = Vector2( 85, 91 ) + +[node name="torch2" parent="." instance=ExtResource( 5 )] +position = Vector2( 171, 91 ) + +[node name="TileMap" parent="." instance=ExtResource( 1 )] +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 ) +[connection signal="dialogue_finished" from="Wizard" to="Door" method="unlock"] diff --git a/levels/test.tscn b/levels/other/test.tscn similarity index 100% rename from levels/test.tscn rename to levels/other/test.tscn diff --git a/npc/Wizard.gd b/npc/Wizard.gd index 7ccf1ae..9fe3eac 100644 --- a/npc/Wizard.gd +++ b/npc/Wizard.gd @@ -12,6 +12,8 @@ var lines = [line0, line1, line2, line3, line4, line5] var line_number = 0 var current_line +signal dialogue_finished + func _process(delta): var p = Player.position if p.x > position.x: @@ -31,6 +33,8 @@ func next_line(): line_number = clamp(line_number + 1, 0, 5) else: $Timer.stop() + emit_signal("dialogue_finished") + do_exit() pass func _on_Timer_timeout(): @@ -39,3 +43,6 @@ func _on_Timer_timeout(): func _on_Delay_timeout(): next_line() $Timer.start() + +func do_exit(): + $Typewriter.play("Exit") diff --git a/npc/Wizard.tscn b/npc/Wizard.tscn index b4bd8a7..c06a5d6 100644 --- a/npc/Wizard.tscn +++ b/npc/Wizard.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://art/WizardM.png" type="Texture" id=1] [ext_resource path="res://npc/Wizard.gd" type="Script" id=2] -[ext_resource path="res://Music and Fonts(Misc.)/m5x7.tres" type="DynamicFont" id=3] [sub_resource type="Animation" id=1] resource_name = "Idle" @@ -22,7 +21,48 @@ tracks/0/keys = { "values": [ 0, 1, 2, 3 ] } -[sub_resource type="Animation" id=3] +[sub_resource type="Animation" id=6] +resource_name = "Exit" +tracks/0/type = "value" +tracks/0/path = NodePath("Label:modulate") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.5 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Sprite:modulate") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0.5, 1 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] +} +tracks/2/type = "method" +tracks/2/path = NodePath(".") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 1 ), +"transitions": PoolRealArray( 1 ), +"values": [ { +"args": [ ], +"method": "queue_free" +} ] +} + +[sub_resource type="Animation" id=2] resource_name = "Typewriter" length = 1.5 tracks/0/type = "value" @@ -38,11 +78,20 @@ tracks/0/keys = { "values": [ 0.0, 1.0 ] } -[sub_resource type="RectangleShape2D" id=2] +[sub_resource type="RectangleShape2D" id=3] extents = Vector2( 7, 7 ) +[sub_resource type="DynamicFontData" id=4] +font_path = "res://Music and Fonts(Misc.)/m5x7.ttf" + +[sub_resource type="DynamicFont" id=5] +extra_spacing_top = -3 +extra_spacing_bottom = -3 +font_data = SubResource( 4 ) + [node name="Wizard" type="KinematicBody2D"] -collision_mask = 3 +collision_layer = 0 +collision_mask = 2 script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] @@ -57,18 +106,19 @@ autoplay = "Idle" anims/Idle = SubResource( 1 ) [node name="Typewriter" type="AnimationPlayer" parent="."] -anims/Typewriter = SubResource( 3 ) +anims/Exit = SubResource( 6 ) +anims/Typewriter = SubResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0, -7 ) -shape = SubResource( 2 ) +shape = SubResource( 3 ) [node name="Label" type="Label" parent="."] margin_left = -55.0 margin_top = -63.0 margin_right = 55.0 margin_bottom = -26.0 -custom_fonts/font = ExtResource( 3 ) +custom_fonts/font = SubResource( 5 ) align = 1 valign = 1 autowrap = true diff --git a/objects/Door.gd b/objects/Door.gd index 1cdc403..e6b501d 100644 --- a/objects/Door.gd +++ b/objects/Door.gd @@ -7,7 +7,20 @@ onready var door = get_node("AnimationPlayer") func _process(delta): if $Area2D.get_overlapping_bodies().size() != 0: - if Input.is_action_pressed("open") and unlocked: - Player.current_scene = next_scene - get_tree().change_scene(next_scene) + if unlocked: + $Label.text = "F to Open" + if Input.is_action_pressed("open"): + Player.current_scene = next_scene + get_tree().change_scene(next_scene) + else: + $Label.text = "Locked" + $Label.visible = true + else: + $Label.visible = false + +func lock(): + unlocked = false + +func unlock(): + unlocked = true diff --git a/objects/Door.tscn b/objects/Door.tscn index d0064e8..58ac8b3 100644 --- a/objects/Door.tscn +++ b/objects/Door.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] -[ext_resource path="res://objects/Area2D.gd" type="Script" id=1] +[ext_resource path="res://Music and Fonts(Misc.)/m5x7.tres" type="DynamicFontData" id=1] [ext_resource path="res://art/door.png" type="Texture" id=2] [ext_resource path="res://objects/Door.gd" type="Script" id=3] @@ -23,20 +23,34 @@ tracks/0/keys = { [sub_resource type="RectangleShape2D" id=2] extents = Vector2( 14, 13 ) +[sub_resource type="DynamicFont" id=3] +font_data = ExtResource( 1 ) + [node name="Door" type="Sprite"] texture = ExtResource( 2 ) centered = false hframes = 2 -frame = 1 script = ExtResource( 3 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] "anims/Door Opening" = SubResource( 1 ) [node name="Area2D" type="Area2D" parent="."] -script = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] position = Vector2( 16, 19 ) shape = SubResource( 2 ) + +[node name="Label" type="Label" parent="."] +margin_left = -9.0 +margin_top = -15.0 +margin_right = 42.0 +margin_bottom = -1.0 +custom_fonts/font = SubResource( 3 ) +text = "F to Open" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [connection signal="body_entered" from="Area2D" to="Area2D" method="_on_Area2D_body_entered"] diff --git a/objects/torch.tscn b/objects/torch.tscn new file mode 100644 index 0000000..fbc5e2f --- /dev/null +++ b/objects/torch.tscn @@ -0,0 +1,51 @@ +[gd_scene load_steps=8 format=2] + +[ext_resource path="res://art/light.png" type="Texture" id=1] +[ext_resource path="res://art/torch.png" type="Texture" id=2] + +[sub_resource type="Gradient" id=1] +offsets = PoolRealArray( 0, 0.24498, 0.638554, 1 ) +colors = PoolColorArray( 1, 1, 1, 1, 1, 0.433594, 0, 1, 1, 0.164063, 0.164063, 1, 0, 0, 0, 1 ) + +[sub_resource type="GradientTexture" id=2] +gradient = SubResource( 1 ) + +[sub_resource type="Curve" id=3] +_data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0.509091 ), -0.824243, 0.0, 0, 0 ] + +[sub_resource type="CurveTexture" id=4] +curve = SubResource( 3 ) + +[sub_resource type="ParticlesMaterial" id=5] +emission_shape = 1 +emission_sphere_radius = 2.0 +flag_disable_z = true +spread = 30.0 +gravity = Vector3( 0, 0, 0 ) +initial_velocity = 60.0 +angular_velocity = 15.0 +orbit_velocity = 0.0 +orbit_velocity_random = 0.0 +scale = 2.0 +scale_curve = SubResource( 4 ) +color_ramp = SubResource( 2 ) + +[node name="torch" type="Sprite"] +position = Vector2( 0, 4 ) +texture = ExtResource( 2 ) + +[node name="Particles2D" type="Particles2D" parent="."] +show_behind_parent = true +position = Vector2( 0, -5 ) +rotation = -1.57079 +amount = 60 +lifetime = 0.3 +speed_scale = 0.25 +process_material = SubResource( 5 ) + +[node name="Light2D" type="Light2D" parent="."] +position = Vector2( 0, -5 ) +texture = ExtResource( 1 ) +color = Color( 1, 0.4, 0, 1 ) +range_layer_min = -5 +range_layer_max = 5 diff --git a/project.godot b/project.godot index feb7637..f6c322a 100644 --- a/project.godot +++ b/project.godot @@ -57,7 +57,7 @@ _global_script_class_icons={ [application] config/name="Gamejam" -run/main_scene="res://levels/World.tscn" +run/main_scene="res://levels/other/World.tscn" config/icon="res://icon.png" [autoload]