From 0175a013d67e7915b7167ef8c9cb1147cc09e01f Mon Sep 17 00:00:00 2001 From: Harmony Honey Date: Wed, 1 Mar 2023 19:34:43 -0500 Subject: [PATCH] mergey --- default_env.tres | 6 +- icon.png.import | 2 +- media/audio/music/6-29-2018.mp3.import | 4 +- media/audio/sfx/Randomize103.wav.import | 2 +- media/audio/sfx/Randomize104.wav.import | 2 +- media/audio/sfx/Randomize105.wav.import | 2 +- media/audio/sfx/Randomize7.wav.import | 2 +- media/audio/sfx/bell0.wav.import | 2 +- media/audio/sfx/bell1.wav.import | 2 +- media/audio/sfx/box_drop.wav.import | 2 +- media/audio/sfx/box_pickup.wav.import | 2 +- media/audio/sfx/box_throw.wav.import | 2 +- media/audio/sfx/box_throw_long.wav.import | 2 +- media/audio/sfx/btn0.wav.import | 2 +- media/audio/sfx/btn2.wav.import | 2 +- media/audio/sfx/btn3.wav.import | 2 +- media/audio/sfx/btn4.wav.import | 2 +- media/audio/sfx/button.wav.import | 2 +- media/audio/sfx/hit0.wav.import | 2 +- media/audio/sfx/hit1.wav.import | 2 +- media/audio/sfx/hit10.wav.import | 2 +- media/audio/sfx/hit14.wav.import | 2 +- media/audio/sfx/hit6.wav.import | 2 +- media/audio/sfx/hit9.wav.import | 2 +- media/audio/sfx/jump1.wav.import | 2 +- media/audio/sfx/player_die.wav.import | 2 +- media/audio/sfx/player_jump.wav.import | 2 +- media/audio/sfx/portal0.wav.import | 2 +- media/audio/sfx/portal2.wav.import | 2 +- media/audio/sfx/portal4.wav.import | 2 +- media/audio/sfx/portal7.wav.import | 2 +- media/audio/sfx/portal8.wav.import | 2 +- media/audio/sfx/portal9.wav.import | 2 +- media/audio/sfx/push.wav.import | 2 +- media/audio/sfx/sfx10.wav.import | 2 +- media/audio/sfx/sfx11.wav.import | 2 +- media/audio/sfx/sfx13.wav.import | 2 +- media/audio/sfx/sfx14.wav.import | 2 +- media/audio/sfx/sfx18.wav.import | 2 +- media/audio/sfx/sfx20.wav.import | 2 +- media/audio/sfx/sfx3.wav.import | 2 +- media/audio/sfx/sfx4.wav.import | 2 +- media/audio/sfx/sfx5.wav.import | 2 +- media/audio/sfx/wipe.wav.import | 2 +- media/font/m3x6.tres | 9 +- media/font/m3x6.ttf.import | 9 +- media/font/m5x7.tres | 8 +- media/font/m5x7.ttf.import | 2 +- media/font/m6x11.tres | 7 +- media/font/m6x11.ttf.import | 2 +- media/image/1pixel.png.import | 2 +- media/image/8pixel.png.import | 2 +- media/image/9slice.png.import | 2 +- media/image/HarmonyHoneyLogo.png.import | 2 +- media/image/android_icon.png.import | 2 +- media/image/bricks.png.import | 2 +- media/image/btn.png.import | 2 +- media/image/corner.png.import | 2 +- media/image/crate.png.import | 2 +- media/image/crate_tiles.png.import | 2 +- media/image/dither1.png.import | 34 +++ media/image/door.png.import | 35 +++ media/image/explode.png.import | 2 +- media/image/explode2.png.import | 2 +- media/image/glove.png.import | 34 +++ media/image/icon.png.import | 2 +- media/image/lift.png.import | 34 +++ media/image/note.png.import | 2 +- media/image/pixel.png.import | 2 +- media/image/player.png.import | 2 +- media/image/portal.png.import | 2 +- media/image/slam.png.import | 2 +- media/image/solid_bricks.png.import | 2 +- media/image/splash.png.import | 2 +- media/image/star.png.import | 2 +- media/image/tinyArrow.png.import | 2 +- media/image/wipe.png.import | 2 +- project.godot | 52 ++--- src/actor/Actor.gd | 18 +- src/actor/Box.gd | 4 +- src/actor/Exit.gd | 4 +- src/actor/Note.gd | 4 +- src/actor/Passthrough.gd | 4 +- src/actor/Player.gd | 6 +- src/actor/Player.tscn | 207 ++++++++--------- src/actor/Switch.gd | 4 +- src/actor/SwitchBlock.gd | 4 +- src/autoload/Pause.tscn | 92 +++----- src/autoload/Shared.gd | 20 +- src/autoload/UI.tscn | 80 +++---- src/autoload/Wipe.gd | 17 +- src/autoload/Wipe.tscn | 42 ++-- src/autoload/touch_screen.gd | 2 +- src/autoload/touch_screen.tscn | 102 +++++---- src/autoload/touch_screen_button.gd | 4 +- src/class/EaseMover.gd | 2 +- src/map/1-1.tscn | 75 +++---- src/map/1-2.tscn | 75 +++---- src/map/1-3.tscn | 88 ++++---- src/map/1-4.tscn | 87 ++++---- src/menu/StartMenu.tscn | 198 +++++++--------- src/menu/WinScreen.tscn | 111 ++++----- src/menu/credits.tscn | 260 ++++++++++++++++++---- src/menu/options/OptionsMenu.tscn | 255 +++++++++------------ src/menu/options/Volume.tscn | 84 +++---- src/menu/select.tscn | 190 ++++++++-------- src/menu/splash.gd | 2 +- src/menu/splash.tscn | 11 +- src/shader/wipe.gdshader | 4 +- src/stage/DetailTileMap.tscn | 18 +- src/stage/GameCamera.gd | 8 +- src/stage/ObscureMap.gd | 7 +- src/stage/SolidTileMap.tscn | 16 +- src/stage/SpikeTileMap.gd | 4 +- src/stage/SpikeTileMap.tscn | 32 ++- 115 files changed, 1332 insertions(+), 1175 deletions(-) create mode 100644 media/image/dither1.png.import create mode 100644 media/image/door.png.import create mode 100644 media/image/glove.png.import create mode 100644 media/image/lift.png.import diff --git a/default_env.tres b/default_env.tres index 3cc584f..1a5570b 100644 --- a/default_env.tres +++ b/default_env.tres @@ -1,7 +1,7 @@ -[gd_resource type="Environment" load_steps=2 format=3 uid="uid://k0qc36xeidr3"] +[gd_resource type="Environment" load_steps=2 format=2] -[sub_resource type="Sky" id="1"] +[sub_resource type="Sky" id=1] [resource] background_mode = 2 -sky = SubResource("1") +background_sky = SubResource( 1 ) diff --git a/icon.png.import b/icon.png.import index a5dd676..55743f6 100644 --- a/icon.png.import +++ b/icon.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bk12w2lupngjw" +uid="uid://d12a8lepkscvb" path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex" metadata={ "vram_texture": false diff --git a/media/audio/music/6-29-2018.mp3.import b/media/audio/music/6-29-2018.mp3.import index 5370142..99fd74f 100644 --- a/media/audio/music/6-29-2018.mp3.import +++ b/media/audio/music/6-29-2018.mp3.import @@ -2,7 +2,7 @@ importer="mp3" type="AudioStreamMP3" -uid="uid://54qabptvj083" +uid="uid://cibjya4necndq" path="res://.godot/imported/6-29-2018.mp3-3666ab9a926edae929fa93527a80d386.mp3str" [deps] @@ -12,7 +12,7 @@ dest_files=["res://.godot/imported/6-29-2018.mp3-3666ab9a926edae929fa93527a80d38 [params] -loop=false +loop=true loop_offset=0 bpm=0 beat_count=0 diff --git a/media/audio/sfx/Randomize103.wav.import b/media/audio/sfx/Randomize103.wav.import index dbadb19..41c7d32 100644 --- a/media/audio/sfx/Randomize103.wav.import +++ b/media/audio/sfx/Randomize103.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://55ii5eq78ub3" +uid="uid://lmsmr8cqqx8i" path="res://.godot/imported/Randomize103.wav-ee5a52e9d598d5905a164fce9ecebb83.sample" [deps] diff --git a/media/audio/sfx/Randomize104.wav.import b/media/audio/sfx/Randomize104.wav.import index 7a90498..bc17769 100644 --- a/media/audio/sfx/Randomize104.wav.import +++ b/media/audio/sfx/Randomize104.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://b8w3161ew8ebr" +uid="uid://cdbbh0vkaxmh3" path="res://.godot/imported/Randomize104.wav-b5b016037977d9b4c1497f5b651ce912.sample" [deps] diff --git a/media/audio/sfx/Randomize105.wav.import b/media/audio/sfx/Randomize105.wav.import index 7b3a63b..1fcb6a8 100644 --- a/media/audio/sfx/Randomize105.wav.import +++ b/media/audio/sfx/Randomize105.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://c6j7whkrtbc8o" +uid="uid://daloj1lhr4ev3" path="res://.godot/imported/Randomize105.wav-e2f3f63dc859076b0c289219f11a24c0.sample" [deps] diff --git a/media/audio/sfx/Randomize7.wav.import b/media/audio/sfx/Randomize7.wav.import index 652af34..bf31433 100644 --- a/media/audio/sfx/Randomize7.wav.import +++ b/media/audio/sfx/Randomize7.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://ivgq70cvaq7d" +uid="uid://754jav7333ds" path="res://.godot/imported/Randomize7.wav-4f55b44a9bcb5ae7293a41fae7f4a758.sample" [deps] diff --git a/media/audio/sfx/bell0.wav.import b/media/audio/sfx/bell0.wav.import index e5fd58c..54fcb36 100644 --- a/media/audio/sfx/bell0.wav.import +++ b/media/audio/sfx/bell0.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://boitdhw4uf64m" +uid="uid://cpf7sue0y5d4t" path="res://.godot/imported/bell0.wav-b0be517fbd423bfe90526736b43bf268.sample" [deps] diff --git a/media/audio/sfx/bell1.wav.import b/media/audio/sfx/bell1.wav.import index d9eb897..6efcdcc 100644 --- a/media/audio/sfx/bell1.wav.import +++ b/media/audio/sfx/bell1.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://b0w5cue6n55pg" +uid="uid://p6e1cf5igeb4" path="res://.godot/imported/bell1.wav-f26864f7fa4298f6cd67fb6188ba7fee.sample" [deps] diff --git a/media/audio/sfx/box_drop.wav.import b/media/audio/sfx/box_drop.wav.import index 2786bd5..cb27f38 100644 --- a/media/audio/sfx/box_drop.wav.import +++ b/media/audio/sfx/box_drop.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://b0kxya23o88pp" +uid="uid://c0ocrcymlhdtu" path="res://.godot/imported/box_drop.wav-99f7f5001596ab31b55579d0589f2040.sample" [deps] diff --git a/media/audio/sfx/box_pickup.wav.import b/media/audio/sfx/box_pickup.wav.import index 6b32dfe..36a6581 100644 --- a/media/audio/sfx/box_pickup.wav.import +++ b/media/audio/sfx/box_pickup.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://t68blun2ylg6" +uid="uid://ebi5nrg6cudn" path="res://.godot/imported/box_pickup.wav-82ffd7a594a6edaaa48e886bd462a5ac.sample" [deps] diff --git a/media/audio/sfx/box_throw.wav.import b/media/audio/sfx/box_throw.wav.import index 354f4ff..2095987 100644 --- a/media/audio/sfx/box_throw.wav.import +++ b/media/audio/sfx/box_throw.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://dgdtvvbiuqgmk" +uid="uid://bmh8dwdsjp6ut" path="res://.godot/imported/box_throw.wav-116a127c6417d94b036e236d1415bdac.sample" [deps] diff --git a/media/audio/sfx/box_throw_long.wav.import b/media/audio/sfx/box_throw_long.wav.import index e4696d7..e75a8c4 100644 --- a/media/audio/sfx/box_throw_long.wav.import +++ b/media/audio/sfx/box_throw_long.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://dung1fd0i7sxo" +uid="uid://dnymipyqkxyw0" path="res://.godot/imported/box_throw_long.wav-cb0c804ae84d597f03fb4ff3cbb08295.sample" [deps] diff --git a/media/audio/sfx/btn0.wav.import b/media/audio/sfx/btn0.wav.import index 60533d1..f74c1b9 100644 --- a/media/audio/sfx/btn0.wav.import +++ b/media/audio/sfx/btn0.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://b3wm2hbfgvt5h" +uid="uid://dlnstudklha3c" path="res://.godot/imported/btn0.wav-cc43b0baff08c93f0425b3a99180aac5.sample" [deps] diff --git a/media/audio/sfx/btn2.wav.import b/media/audio/sfx/btn2.wav.import index 954dae5..e337a00 100644 --- a/media/audio/sfx/btn2.wav.import +++ b/media/audio/sfx/btn2.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://pk7wpcj3tgrt" +uid="uid://c0b8tln3bxvet" path="res://.godot/imported/btn2.wav-87de156e3b039e165f414100ac9ac18b.sample" [deps] diff --git a/media/audio/sfx/btn3.wav.import b/media/audio/sfx/btn3.wav.import index 7424bf6..0a22727 100644 --- a/media/audio/sfx/btn3.wav.import +++ b/media/audio/sfx/btn3.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://wtb7sskkiedi" +uid="uid://ckn802p7r0h4s" path="res://.godot/imported/btn3.wav-7655611b6058068c8226c5729b790750.sample" [deps] diff --git a/media/audio/sfx/btn4.wav.import b/media/audio/sfx/btn4.wav.import index 644a46b..8dcaa97 100644 --- a/media/audio/sfx/btn4.wav.import +++ b/media/audio/sfx/btn4.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://e6q51g27r0es" +uid="uid://bv2f5k5gfr40o" path="res://.godot/imported/btn4.wav-15a1b6870971a988082193338009b8eb.sample" [deps] diff --git a/media/audio/sfx/button.wav.import b/media/audio/sfx/button.wav.import index d03cde1..f087908 100644 --- a/media/audio/sfx/button.wav.import +++ b/media/audio/sfx/button.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://bigew0qvf24tt" +uid="uid://b6gfyuvh0kqkv" path="res://.godot/imported/button.wav-099ce697be40efbd6d20c01572155b73.sample" [deps] diff --git a/media/audio/sfx/hit0.wav.import b/media/audio/sfx/hit0.wav.import index 5b6dacf..cea0387 100644 --- a/media/audio/sfx/hit0.wav.import +++ b/media/audio/sfx/hit0.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://ly7x512dl8bv" +uid="uid://chytadlfmqvp7" path="res://.godot/imported/hit0.wav-7e49fc62dec62173fc430be7ac5dc708.sample" [deps] diff --git a/media/audio/sfx/hit1.wav.import b/media/audio/sfx/hit1.wav.import index 35e491d..eb1c9e6 100644 --- a/media/audio/sfx/hit1.wav.import +++ b/media/audio/sfx/hit1.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://2qoigxu2m5f6" +uid="uid://c0sja8q4h5lm4" path="res://.godot/imported/hit1.wav-b85f8eaaafccef07e7ae895374a06b43.sample" [deps] diff --git a/media/audio/sfx/hit10.wav.import b/media/audio/sfx/hit10.wav.import index 8e1c112..a7e066e 100644 --- a/media/audio/sfx/hit10.wav.import +++ b/media/audio/sfx/hit10.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://dkmisuey1xi3v" +uid="uid://bp4gtkevt8yvd" path="res://.godot/imported/hit10.wav-53465991b2407b587922ceb88fc4f8ad.sample" [deps] diff --git a/media/audio/sfx/hit14.wav.import b/media/audio/sfx/hit14.wav.import index dc1f004..4978760 100644 --- a/media/audio/sfx/hit14.wav.import +++ b/media/audio/sfx/hit14.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://c7uw4cm52g1rk" +uid="uid://br4l3h67uwy16" path="res://.godot/imported/hit14.wav-9cf7e7328bfbde7b81b841f553e695ae.sample" [deps] diff --git a/media/audio/sfx/hit6.wav.import b/media/audio/sfx/hit6.wav.import index 9a3a05c..0bf979c 100644 --- a/media/audio/sfx/hit6.wav.import +++ b/media/audio/sfx/hit6.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://t0j8nelpxxcq" +uid="uid://ddctfkil5fhxt" path="res://.godot/imported/hit6.wav-bfadebd54c79e38e6d143ba4bb6fa4a5.sample" [deps] diff --git a/media/audio/sfx/hit9.wav.import b/media/audio/sfx/hit9.wav.import index 07a04a9..7a2aba7 100644 --- a/media/audio/sfx/hit9.wav.import +++ b/media/audio/sfx/hit9.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://td53so8m4a28" +uid="uid://cadjrwyp0vbec" path="res://.godot/imported/hit9.wav-e8c70b46a992bb18534c74a7eee9fd69.sample" [deps] diff --git a/media/audio/sfx/jump1.wav.import b/media/audio/sfx/jump1.wav.import index 8bed71e..01dc5c0 100644 --- a/media/audio/sfx/jump1.wav.import +++ b/media/audio/sfx/jump1.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://bcolys2tr4jyl" +uid="uid://c8vrdf3cmdbic" path="res://.godot/imported/jump1.wav-fc1d903c523488a64270dedc45da8504.sample" [deps] diff --git a/media/audio/sfx/player_die.wav.import b/media/audio/sfx/player_die.wav.import index f6bee05..0337f09 100644 --- a/media/audio/sfx/player_die.wav.import +++ b/media/audio/sfx/player_die.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://bah21ev5naroc" +uid="uid://d1i873uucppw2" path="res://.godot/imported/player_die.wav-95cce916470d28af7460fb053fdb8f08.sample" [deps] diff --git a/media/audio/sfx/player_jump.wav.import b/media/audio/sfx/player_jump.wav.import index f343b33..6e43555 100644 --- a/media/audio/sfx/player_jump.wav.import +++ b/media/audio/sfx/player_jump.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://c1qijx4hfumhw" +uid="uid://dv5dxf1jhm2hq" path="res://.godot/imported/player_jump.wav-7f53ea4805fd4c1a6853a0564da9ac1f.sample" [deps] diff --git a/media/audio/sfx/portal0.wav.import b/media/audio/sfx/portal0.wav.import index f4c09a1..1890ed0 100644 --- a/media/audio/sfx/portal0.wav.import +++ b/media/audio/sfx/portal0.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://bs5esc5putj1g" +uid="uid://deynniptk8o2q" path="res://.godot/imported/portal0.wav-6938cb4953aef29a3321c670b70bf343.sample" [deps] diff --git a/media/audio/sfx/portal2.wav.import b/media/audio/sfx/portal2.wav.import index 0c70bf3..2936b5d 100644 --- a/media/audio/sfx/portal2.wav.import +++ b/media/audio/sfx/portal2.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://6526kbj7gx65" +uid="uid://csr7kdpjl41yx" path="res://.godot/imported/portal2.wav-57bc484ca362251e13182e66083a536a.sample" [deps] diff --git a/media/audio/sfx/portal4.wav.import b/media/audio/sfx/portal4.wav.import index d88366f..e6786c6 100644 --- a/media/audio/sfx/portal4.wav.import +++ b/media/audio/sfx/portal4.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://bhfbbpaov30hr" +uid="uid://6vltkbg7juq4" path="res://.godot/imported/portal4.wav-0ba7943d39fd1fd36e43fb1074560529.sample" [deps] diff --git a/media/audio/sfx/portal7.wav.import b/media/audio/sfx/portal7.wav.import index 92517c3..e76a658 100644 --- a/media/audio/sfx/portal7.wav.import +++ b/media/audio/sfx/portal7.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://dd8u0k8x2xtvl" +uid="uid://bd5iht8uibqik" path="res://.godot/imported/portal7.wav-bfa99c3d2f17995092245b0cd7b9c1d5.sample" [deps] diff --git a/media/audio/sfx/portal8.wav.import b/media/audio/sfx/portal8.wav.import index c996f22..c82a961 100644 --- a/media/audio/sfx/portal8.wav.import +++ b/media/audio/sfx/portal8.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://b8hnnccqiyd7u" +uid="uid://w5uqh4gx8ull" path="res://.godot/imported/portal8.wav-79e9ce8e7e51772c19c844ace1e205c9.sample" [deps] diff --git a/media/audio/sfx/portal9.wav.import b/media/audio/sfx/portal9.wav.import index 3141ae7..c82396e 100644 --- a/media/audio/sfx/portal9.wav.import +++ b/media/audio/sfx/portal9.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://bxugc67lsdulw" +uid="uid://gqspthpv6a4l" path="res://.godot/imported/portal9.wav-c3bd56ed9ae18235b339c1f937aef10d.sample" [deps] diff --git a/media/audio/sfx/push.wav.import b/media/audio/sfx/push.wav.import index 5a2b0d0..b1ea78a 100644 --- a/media/audio/sfx/push.wav.import +++ b/media/audio/sfx/push.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://d1wxo8n8ky3q3" +uid="uid://dlybl1756ddur" path="res://.godot/imported/push.wav-bc8a1d59fc5f296aa2c31bacd1c07c2d.sample" [deps] diff --git a/media/audio/sfx/sfx10.wav.import b/media/audio/sfx/sfx10.wav.import index 9d2bbd6..8949173 100644 --- a/media/audio/sfx/sfx10.wav.import +++ b/media/audio/sfx/sfx10.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://c0dk8demtu5yr" +uid="uid://dr27v7uymtocf" path="res://.godot/imported/sfx10.wav-c0d9a504c23b2c38e9fd6f06e5544fcd.sample" [deps] diff --git a/media/audio/sfx/sfx11.wav.import b/media/audio/sfx/sfx11.wav.import index 4461fda..6b06fc5 100644 --- a/media/audio/sfx/sfx11.wav.import +++ b/media/audio/sfx/sfx11.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://fvcihtmy5mim" +uid="uid://duhy1tf3t0rwi" path="res://.godot/imported/sfx11.wav-2e7e7ee30e6b070bb7106a85f4c7ff5b.sample" [deps] diff --git a/media/audio/sfx/sfx13.wav.import b/media/audio/sfx/sfx13.wav.import index 0a72863..c95affa 100644 --- a/media/audio/sfx/sfx13.wav.import +++ b/media/audio/sfx/sfx13.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://ct1jopjawqt85" +uid="uid://djqicpqqb3c3t" path="res://.godot/imported/sfx13.wav-d12665fae055485500b574e74f29ac2b.sample" [deps] diff --git a/media/audio/sfx/sfx14.wav.import b/media/audio/sfx/sfx14.wav.import index 08b2567..319b16e 100644 --- a/media/audio/sfx/sfx14.wav.import +++ b/media/audio/sfx/sfx14.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://byje8v15typdr" +uid="uid://dsy6k8b3us1m5" path="res://.godot/imported/sfx14.wav-b93c59d02a7ba2b5fcf66f0144c18a64.sample" [deps] diff --git a/media/audio/sfx/sfx18.wav.import b/media/audio/sfx/sfx18.wav.import index 680729b..7fc8d1a 100644 --- a/media/audio/sfx/sfx18.wav.import +++ b/media/audio/sfx/sfx18.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://cnoey5bqmh2ea" +uid="uid://dv7i1pd4dhxoi" path="res://.godot/imported/sfx18.wav-c24c986597c7cbc9890aa5166640003d.sample" [deps] diff --git a/media/audio/sfx/sfx20.wav.import b/media/audio/sfx/sfx20.wav.import index bbda9c0..c37d881 100644 --- a/media/audio/sfx/sfx20.wav.import +++ b/media/audio/sfx/sfx20.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://c1pr3ljmfmju7" +uid="uid://b5t6wp1mmqlo6" path="res://.godot/imported/sfx20.wav-343daaeb114959a07bd540e29707eb08.sample" [deps] diff --git a/media/audio/sfx/sfx3.wav.import b/media/audio/sfx/sfx3.wav.import index 0340893..6f41eb4 100644 --- a/media/audio/sfx/sfx3.wav.import +++ b/media/audio/sfx/sfx3.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://81555pekl1oy" +uid="uid://3d7jvhtcwlpd" path="res://.godot/imported/sfx3.wav-c3290f254b53e2ed2f6eb20aa2cb8395.sample" [deps] diff --git a/media/audio/sfx/sfx4.wav.import b/media/audio/sfx/sfx4.wav.import index 26547c9..d287448 100644 --- a/media/audio/sfx/sfx4.wav.import +++ b/media/audio/sfx/sfx4.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://c7jir6v6yjn6r" +uid="uid://dsmbmrdijsyq1" path="res://.godot/imported/sfx4.wav-bcfa0d5ea6026a328ecfb6723f9505a6.sample" [deps] diff --git a/media/audio/sfx/sfx5.wav.import b/media/audio/sfx/sfx5.wav.import index 762ffbe..2fccd76 100644 --- a/media/audio/sfx/sfx5.wav.import +++ b/media/audio/sfx/sfx5.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://ckrl1fvww4jxk" +uid="uid://c5o213npemepk" path="res://.godot/imported/sfx5.wav-f4f5fa16dd15ce4d42607a2306389e04.sample" [deps] diff --git a/media/audio/sfx/wipe.wav.import b/media/audio/sfx/wipe.wav.import index f8c5d27..73f8823 100644 --- a/media/audio/sfx/wipe.wav.import +++ b/media/audio/sfx/wipe.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://bfbe8mrcx1l5x" +uid="uid://cfy78y5dmalny" path="res://.godot/imported/wipe.wav-08ce302c87579d3be33b0dbdd435c7bf.sample" [deps] diff --git a/media/font/m3x6.tres b/media/font/m3x6.tres index 6d17ad3..94f554d 100644 --- a/media/font/m3x6.tres +++ b/media/font/m3x6.tres @@ -1,7 +1,8 @@ -[gd_resource type="FontFile" load_steps=2 format=2] +[gd_resource type="FontVariation" load_steps=2 format=3 uid="uid://culrlsi316p0y"] -[ext_resource path="res://media/font/m3x6.ttf" type="FontFile" id=1] +[ext_resource type="FontFile" uid="uid://b6ivudxijjnpn" path="res://media/font/m3x6.ttf" id="1"] [resource] -extra_spacing_top = -5 -font_data = ExtResource( 1 ) +base_font = ExtResource("1") +spacing_top = -5 +spacing_bottom = -1 diff --git a/media/font/m3x6.ttf.import b/media/font/m3x6.ttf.import index f8181eb..397b47c 100644 --- a/media/font/m3x6.ttf.import +++ b/media/font/m3x6.ttf.import @@ -2,7 +2,7 @@ importer="font_data_dynamic" type="FontFile" -uid="uid://baxtv08wf70yt" +uid="uid://b6ivudxijjnpn" path="res://.godot/imported/m3x6.ttf-bf28ab9015d9e9d86a4ea248284c7fed.fontdata" [deps] @@ -27,7 +27,12 @@ Fallbacks=null fallbacks=[] Compress=null compress=true -preload=[] +preload=[{ +"chars": [], +"glyphs": [], +"name": "New Configuration", +"size": Vector2i(16, 0) +}] language_support={} script_support={} opentype_features={} diff --git a/media/font/m5x7.tres b/media/font/m5x7.tres index b190f63..e7e389b 100644 --- a/media/font/m5x7.tres +++ b/media/font/m5x7.tres @@ -1,8 +1,6 @@ -[gd_resource type="FontFile" load_steps=2 format=2] +[gd_resource type="FontVariation" load_steps=2 format=3 uid="uid://3vc5iho8ho52"] -[ext_resource path="res://media/font/m5x7.ttf" type="FontFile" id=1] +[ext_resource type="FontFile" uid="uid://ck1vpy11ysfyl" path="res://media/font/m5x7.ttf" id="1_lvycn"] [resource] -extra_spacing_top = -4 -extra_spacing_bottom = -1 -font_data = ExtResource( 1 ) +base_font = ExtResource("1_lvycn") diff --git a/media/font/m5x7.ttf.import b/media/font/m5x7.ttf.import index 5ca9113..4221bbf 100644 --- a/media/font/m5x7.ttf.import +++ b/media/font/m5x7.ttf.import @@ -2,7 +2,7 @@ importer="font_data_dynamic" type="FontFile" -uid="uid://cek6mkbjukm0n" +uid="uid://ck1vpy11ysfyl" path="res://.godot/imported/m5x7.ttf-427093268b7097679630737cccd15b2b.fontdata" [deps] diff --git a/media/font/m6x11.tres b/media/font/m6x11.tres index 5c77535..3286cc3 100644 --- a/media/font/m6x11.tres +++ b/media/font/m6x11.tres @@ -1,7 +1,6 @@ -[gd_resource type="FontFile" load_steps=2 format=2] +[gd_resource type="FontVariation" load_steps=2 format=3 uid="uid://cntu078xgj2oj"] -[ext_resource path="res://media/font/m6x11.ttf" type="FontFile" id=1] +[ext_resource type="FontFile" uid="uid://bipw1r1lw7y25" path="res://media/font/m6x11.ttf" id="1"] [resource] -extra_spacing_bottom = -1 -font_data = ExtResource( 1 ) +base_font = ExtResource("1") diff --git a/media/font/m6x11.ttf.import b/media/font/m6x11.ttf.import index 5b123ff..4102d87 100644 --- a/media/font/m6x11.ttf.import +++ b/media/font/m6x11.ttf.import @@ -2,7 +2,7 @@ importer="font_data_dynamic" type="FontFile" -uid="uid://dx6pnyb6s8kyk" +uid="uid://bipw1r1lw7y25" path="res://.godot/imported/m6x11.ttf-b8d890969f90adff3aa5f5dd708d3a8b.fontdata" [deps] diff --git a/media/image/1pixel.png.import b/media/image/1pixel.png.import index abf817c..8f56814 100644 --- a/media/image/1pixel.png.import +++ b/media/image/1pixel.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dkuw8uwlbvsjs" +uid="uid://cy0q0vxq8k6gx" path="res://.godot/imported/1pixel.png-281d55b8ce742c19ec6c048a51fc520e.ctex" metadata={ "vram_texture": false diff --git a/media/image/8pixel.png.import b/media/image/8pixel.png.import index 7544312..224fc63 100644 --- a/media/image/8pixel.png.import +++ b/media/image/8pixel.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dmnj3egifwv41" +uid="uid://msfqee07s5gy" path="res://.godot/imported/8pixel.png-be3eca8c49337c8484369a366edfae63.ctex" metadata={ "vram_texture": false diff --git a/media/image/9slice.png.import b/media/image/9slice.png.import index e46cbf2..af37da2 100644 --- a/media/image/9slice.png.import +++ b/media/image/9slice.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bsibe5pfs4l4o" +uid="uid://s7e12rs806hl" path="res://.godot/imported/9slice.png-5bc0df4fb55c60c3fc40ba51cb9d9f83.ctex" metadata={ "vram_texture": false diff --git a/media/image/HarmonyHoneyLogo.png.import b/media/image/HarmonyHoneyLogo.png.import index 1b5e078..06ac40c 100644 --- a/media/image/HarmonyHoneyLogo.png.import +++ b/media/image/HarmonyHoneyLogo.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dkt7moln5kuv6" +uid="uid://dfjueli3quv6r" path="res://.godot/imported/HarmonyHoneyLogo.png-6510dd6c45d50d32ed9958118065b1c7.ctex" metadata={ "vram_texture": false diff --git a/media/image/android_icon.png.import b/media/image/android_icon.png.import index 28f0d10..23e3286 100644 --- a/media/image/android_icon.png.import +++ b/media/image/android_icon.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://djy3f8dffdid0" +uid="uid://d10rcyctv3ari" path="res://.godot/imported/android_icon.png-1e2bab71b9f0135775474726f077fe7c.ctex" metadata={ "vram_texture": false diff --git a/media/image/bricks.png.import b/media/image/bricks.png.import index 14f68e1..b408f68 100644 --- a/media/image/bricks.png.import +++ b/media/image/bricks.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c4ge5csn4jbsp" +uid="uid://dvqls6evsnna5" path="res://.godot/imported/bricks.png-2cd1b8feefd25598c43adbe2d8e0b8b0.ctex" metadata={ "vram_texture": false diff --git a/media/image/btn.png.import b/media/image/btn.png.import index 120a701..a250af5 100644 --- a/media/image/btn.png.import +++ b/media/image/btn.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bvph4xvyrnhrp" +uid="uid://cmyhp4lmcy3di" path="res://.godot/imported/btn.png-83966ed2273a4217c13fd837e19c6b2f.ctex" metadata={ "vram_texture": false diff --git a/media/image/corner.png.import b/media/image/corner.png.import index 7af0d87..7f1e182 100644 --- a/media/image/corner.png.import +++ b/media/image/corner.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://14wkfc1aojx7" +uid="uid://dlsm1ct1xplth" path="res://.godot/imported/corner.png-ad2cbb5d06985852fd37c7757169d45b.ctex" metadata={ "vram_texture": false diff --git a/media/image/crate.png.import b/media/image/crate.png.import index ef27d42..bb04ab0 100644 --- a/media/image/crate.png.import +++ b/media/image/crate.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bj8yswcxrn0w" +uid="uid://dqnqofdliy6ai" path="res://.godot/imported/crate.png-2c1dc2c922f479e409e2997ae3e821b3.ctex" metadata={ "vram_texture": false diff --git a/media/image/crate_tiles.png.import b/media/image/crate_tiles.png.import index fb2a41b..c85e7dd 100644 --- a/media/image/crate_tiles.png.import +++ b/media/image/crate_tiles.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c5i8t4kb7gg22" +uid="uid://cgxirc4lig8kr" path="res://.godot/imported/crate_tiles.png-ac4cf2473a6726d866ead7347ec013ce.ctex" metadata={ "vram_texture": false diff --git a/media/image/dither1.png.import b/media/image/dither1.png.import new file mode 100644 index 0000000..6c6cfdb --- /dev/null +++ b/media/image/dither1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dither1.png-8d59b1b4d8a99300b393e526e058ba85.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://media/image/dither1.png" +dest_files=[ "res://.import/dither1.png-8d59b1b4d8a99300b393e526e058ba85.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/media/image/door.png.import b/media/image/door.png.import new file mode 100644 index 0000000..642f2df --- /dev/null +++ b/media/image/door.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/door.png-4fadbc3a28b70eb170e833098e3d514d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://media/image/door.png" +dest_files=[ "res://.import/door.png-4fadbc3a28b70eb170e833098e3d514d.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 +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/media/image/explode.png.import b/media/image/explode.png.import index b43017c..79aff04 100644 --- a/media/image/explode.png.import +++ b/media/image/explode.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bh8ioip2r62ol" +uid="uid://vycmf1smht6a" path="res://.godot/imported/explode.png-e2005cecc8ec6df306cdafe33b8a7ea9.ctex" metadata={ "vram_texture": false diff --git a/media/image/explode2.png.import b/media/image/explode2.png.import index f9b7a46..7a5fef5 100644 --- a/media/image/explode2.png.import +++ b/media/image/explode2.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://ctfj640b8rgy3" +uid="uid://ddphu4vjia0od" path="res://.godot/imported/explode2.png-47a1ac9d04429f4da9628e01ec4f16df.ctex" metadata={ "vram_texture": false diff --git a/media/image/glove.png.import b/media/image/glove.png.import new file mode 100644 index 0000000..f43d524 --- /dev/null +++ b/media/image/glove.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/glove.png-477eac63d4d085f392324e0ad0a0de15.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://media/image/glove.png" +dest_files=[ "res://.import/glove.png-477eac63d4d085f392324e0ad0a0de15.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/media/image/icon.png.import b/media/image/icon.png.import index 0dbd785..d27fc40 100644 --- a/media/image/icon.png.import +++ b/media/image/icon.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bpqrws1e4gvmp" +uid="uid://bsvhksa8bvskk" path="res://.godot/imported/icon.png-84bb0196107790770615d15e3556c3bf.ctex" metadata={ "vram_texture": false diff --git a/media/image/lift.png.import b/media/image/lift.png.import new file mode 100644 index 0000000..8eae385 --- /dev/null +++ b/media/image/lift.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/lift.png-deded018fc2f89fb21b8f559779ce926.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://media/image/lift.png" +dest_files=[ "res://.import/lift.png-deded018fc2f89fb21b8f559779ce926.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/media/image/note.png.import b/media/image/note.png.import index 6840335..305d75e 100644 --- a/media/image/note.png.import +++ b/media/image/note.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://k8x2i36rusjx" +uid="uid://cbm8q2v6s73ne" path="res://.godot/imported/note.png-2e546fcff8107f93685b47e2867bfeb2.ctex" metadata={ "vram_texture": false diff --git a/media/image/pixel.png.import b/media/image/pixel.png.import index 2322a6f..423cf18 100644 --- a/media/image/pixel.png.import +++ b/media/image/pixel.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dd280ecxlrew5" +uid="uid://b3iabo220plvt" path="res://.godot/imported/pixel.png-0203dd210494b73796f76fc7a1898ba9.ctex" metadata={ "vram_texture": false diff --git a/media/image/player.png.import b/media/image/player.png.import index 54fe544..a154715 100644 --- a/media/image/player.png.import +++ b/media/image/player.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bsv7ft2sbbjy3" +uid="uid://nljl62d6pb5b" path="res://.godot/imported/player.png-4f4d024bd25e97d38087a261e3bd2fb9.ctex" metadata={ "vram_texture": false diff --git a/media/image/portal.png.import b/media/image/portal.png.import index e021208..9140917 100644 --- a/media/image/portal.png.import +++ b/media/image/portal.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dxoukdxamovf1" +uid="uid://wnchllxti1ca" path="res://.godot/imported/portal.png-f14b1ece9eb58d22fc471c676dd7c535.ctex" metadata={ "vram_texture": false diff --git a/media/image/slam.png.import b/media/image/slam.png.import index d3e35e1..ba842ae 100644 --- a/media/image/slam.png.import +++ b/media/image/slam.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dus1fwkmuln37" +uid="uid://mibf413tvy06" path="res://.godot/imported/slam.png-032279554e829b5560614826fc4f5aa4.ctex" metadata={ "vram_texture": false diff --git a/media/image/solid_bricks.png.import b/media/image/solid_bricks.png.import index 334fbdd..d82c72c 100644 --- a/media/image/solid_bricks.png.import +++ b/media/image/solid_bricks.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://euui07kbltye" +uid="uid://c2pkx12yvks5v" path="res://.godot/imported/solid_bricks.png-bbcea4d8f169bc60e09bc97ef5c3fe0f.ctex" metadata={ "vram_texture": false diff --git a/media/image/splash.png.import b/media/image/splash.png.import index 17e474e..b8efb70 100644 --- a/media/image/splash.png.import +++ b/media/image/splash.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bltg1kx76ooyj" +uid="uid://dpp2bvluda8gm" path="res://.godot/imported/splash.png-844341cceadd2f0d179e46df86775cd8.ctex" metadata={ "vram_texture": false diff --git a/media/image/star.png.import b/media/image/star.png.import index cfaab39..9001a71 100644 --- a/media/image/star.png.import +++ b/media/image/star.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c18q85j4noc54" +uid="uid://hmhmy3558y5d" path="res://.godot/imported/star.png-8aeec8a65a06e4881e94ae048984f08f.ctex" metadata={ "vram_texture": false diff --git a/media/image/tinyArrow.png.import b/media/image/tinyArrow.png.import index a075db3..61e718d 100644 --- a/media/image/tinyArrow.png.import +++ b/media/image/tinyArrow.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cvl6vt5icbgny" +uid="uid://cog8ofb176cgq" path="res://.godot/imported/tinyArrow.png-40c3ef37f6103506b39dffbade15ad8f.ctex" metadata={ "vram_texture": false diff --git a/media/image/wipe.png.import b/media/image/wipe.png.import index 46ffb25..0406cac 100644 --- a/media/image/wipe.png.import +++ b/media/image/wipe.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b45dgiu3vbexu" +uid="uid://pmq8s2o1oxny" path.s3tc="res://.godot/imported/wipe.png-40af1f8b1069a827e7e2527620d67ba5.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/project.godot b/project.godot index 37f813a..9f103f7 100644 --- a/project.godot +++ b/project.godot @@ -80,88 +80,88 @@ texture={ up={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":87,"physical_keycode":0,"key_label":0,"unicode":119,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null) ] } down={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194322,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":83,"physical_keycode":0,"key_label":0,"unicode":115,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null) ] } left={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194319,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":65,"physical_keycode":0,"key_label":0,"unicode":97,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null) ] } right={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194321,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":68,"physical_keycode":0,"key_label":0,"unicode":100,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null) ] } jump={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":88,"physical_keycode":0,"key_label":0,"unicode":120,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":74,"physical_keycode":0,"key_label":0,"unicode":106,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":3,"pressure":0.0,"pressed":false,"script":null) ] } action={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":67,"physical_keycode":0,"key_label":0,"unicode":99,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":75,"physical_keycode":0,"key_label":0,"unicode":107,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null) ] } reset={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":82,"physical_keycode":0,"key_label":0,"unicode":114,"echo":false,"script":null) ] } debug_spawn_box={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194323,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) ] } window_shrink={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":45,"physical_keycode":0,"key_label":0,"unicode":45,"echo":false,"script":null) ] } window_expand={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":61,"physical_keycode":0,"key_label":0,"unicode":61,"echo":false,"script":null) ] } dev_console={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":96,"physical_keycode":0,"key_label":0,"unicode":96,"echo":false,"script":null) ] } pause={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194309,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194308,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":10,"pressure":0.0,"pressed":false,"script":null) ] } screenshot={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194343,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) ] } @@ -172,9 +172,9 @@ pointing/emulate_touch_from_mouse=true [rendering] environment/defaults/default_clear_color=Color(0, 0, 0, 1) -environment/defaults/default_environment="res://default_env.tres" textures/canvas_textures/default_texture_filter=0 -textures/canvas_textures/default_texture_repeat=1 2d/snapping/use_gpu_pixel_snap=true +environment/default_clear_color=Color(0, 0, 0, 1) +environment/default_environment="res://default_env.tres" quality/dynamic_fonts/use_oversampling=false quality/2d/use_pixel_snap=true diff --git a/src/actor/Actor.gd b/src/actor/Actor.gd index 89ed871..9b9d3bc 100644 --- a/src/actor/Actor.gd +++ b/src/actor/Actor.gd @@ -39,11 +39,11 @@ var time_since_floor := 0 var ignore_actor : Actor func _enter_tree(): - if Engine.editor_hint: return + if Engine.is_editor_hint(): return Shared.actors.append(self) func _exit_tree(): - if Engine.editor_hint: return + if Engine.is_editor_hint(): return Shared.actors.erase(self) # Called when the node enters the scene tree for the first time. @@ -51,7 +51,7 @@ func _ready(): position = position.floor() func _physics_process(delta): - if Engine.editor_hint: + if Engine.is_editor_hint(): return if is_moving: @@ -62,18 +62,18 @@ func _physics_process(delta): if not is_on_floor: time_since_floor += 1 -# update() the _draw() when hitbox values are changed (in the editor) +# #update the _draw when hitbox values are changed (in the editor) func _set_hit_x(value): hitbox_x = value - update() + #update() func _set_hit_y(value): hitbox_y = value - update() + #update() # draw hitbox in editor func _draw(): - if Engine.editor_hint: + if Engine.is_editor_hint(): draw_rect(Rect2(0, 0, hitbox_x, hitbox_y), Color(1, 0, 0.75, 0.5)) # axis aligned bounding box @@ -199,14 +199,14 @@ func wiggle_y(step): # check area for solid tiles func is_area_solid_tile(x1, y1, width, height): var w2m = Shared.node_map_solid.local_to_map(Vector2(x1, y1)) - var cell = Shared.node_map_solid.cell_size.x + var cell = Shared.node_map_solid.tile_set.tile_size.x # check more than four points if hitbox is longer than 8 pixels var points = max(2, (width / cell) + 1) for ix in points: for iy in points: var check = Vector2(w2m.x + ix, w2m.y + iy) - if Shared.node_map_solid.get_cellv(check) != -1: + if Shared.node_map_solid.get_cell_source_id(0, check) != -1: check *= cell if aabb(x1, y1, width, height, check.x, check.y, cell, cell): return true diff --git a/src/actor/Box.gd b/src/actor/Box.gd index 7dbd9c8..7a69ad3 100644 --- a/src/actor/Box.gd +++ b/src/actor/Box.gd @@ -19,7 +19,7 @@ var scene_slam = preload("res://src/fx/Slam.tscn") # Called when the node enters the scene tree for the first time. func _ready(): - if Engine.editor_hint or Shared.is_level_select: + if Engine.is_editor_hint() or Shared.is_level_select: set_physics_process(false) return @@ -45,7 +45,7 @@ func hit_floor(): # Called every frame. 'delta' is the elapsed time since the previous frame. func _physics_process(delta): - if Engine.editor_hint: + if Engine.is_editor_hint(): return is_push = false diff --git a/src/actor/Exit.gd b/src/actor/Exit.gd index 5728794..ca0886a 100644 --- a/src/actor/Exit.gd +++ b/src/actor/Exit.gd @@ -14,7 +14,7 @@ var star_rot = 0 # Called when the node enters the scene tree for the first time. func _ready(): - if Engine.editor_hint: + if Engine.is_editor_hint(): return # create dust @@ -32,7 +32,7 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. func _physics_process(delta): - if Engine.editor_hint: + if Engine.is_editor_hint(): return # move dust diff --git a/src/actor/Note.gd b/src/actor/Note.gd index 77c7419..633a706 100644 --- a/src/actor/Note.gd +++ b/src/actor/Note.gd @@ -10,13 +10,13 @@ var explosion := preload("res://src/fx/Explosion.tscn") @export var palette : PackedColorArray func _ready(): - if Engine.editor_hint: return + if Engine.is_editor_hint(): return if Shared.notes.has(Shared.current_map): modulate = palette[1] func _physics_process(delta): - if Engine.editor_hint: return + if Engine.is_editor_hint(): return bounce += delta * 2.5 sprite.offset.y = sin(bounce) * 1.5 diff --git a/src/actor/Passthrough.gd b/src/actor/Passthrough.gd index d163e2b..dd19da7 100644 --- a/src/actor/Passthrough.gd +++ b/src/actor/Passthrough.gd @@ -9,11 +9,11 @@ var is_done := false @onready var node_audio : AudioStreamPlayer2D = $Audio func _ready(): - if Engine.editor_hint: + if Engine.is_editor_hint(): return func _physics_process(delta): - if Engine.editor_hint: + if Engine.is_editor_hint(): return if is_done: diff --git a/src/actor/Player.gd b/src/actor/Player.gd index 1358174..4acabbe 100644 --- a/src/actor/Player.gd +++ b/src/actor/Player.gd @@ -52,13 +52,13 @@ var btnp_pick = false @export var is_attract_mode = false func _enter_tree(): - if Engine.editor_hint: return + if Engine.is_editor_hint(): return Shared.player = self # Called when the node enters the scene tree for the first time. func _ready(): - if Engine.editor_hint or Shared.is_level_select: + if Engine.is_editor_hint() or Shared.is_level_select: set_physics_process(false) return @@ -82,7 +82,7 @@ func just_moved(): # Called every frame. 'delta' is the elapsed time since the previous frame. func _physics_process(delta): - if Engine.editor_hint: + if Engine.is_editor_hint(): return # input diff --git a/src/actor/Player.tscn b/src/actor/Player.tscn index 17fcae9..66b5d95 100644 --- a/src/actor/Player.tscn +++ b/src/actor/Player.tscn @@ -1,224 +1,229 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=15 format=3 uid="uid://bleh1qiiufduy"] -[ext_resource path="res://src/actor/Player.gd" type="Script" id=1] -[ext_resource path="res://media/audio/sfx/player_jump.wav" type="AudioStream" id=2] -[ext_resource path="res://media/image/player.png" type="Texture2D" id=3] -[ext_resource path="res://media/audio/sfx/btn3.wav" type="AudioStream" id=4] -[ext_resource path="res://media/audio/sfx/sfx10.wav" type="AudioStream" id=5] -[ext_resource path="res://media/audio/sfx/box_drop.wav" type="AudioStream" id=6] -[ext_resource path="res://media/audio/sfx/push.wav" type="AudioStream" id=7] +[ext_resource type="Script" path="res://src/actor/Player.gd" id="1"] +[ext_resource type="AudioStream" uid="uid://dv5dxf1jhm2hq" path="res://media/audio/sfx/player_jump.wav" id="2"] +[ext_resource type="Texture2D" uid="uid://nljl62d6pb5b" path="res://media/image/player.png" id="3"] +[ext_resource type="AudioStream" uid="uid://ckn802p7r0h4s" path="res://media/audio/sfx/btn3.wav" id="4"] +[ext_resource type="AudioStream" uid="uid://dr27v7uymtocf" path="res://media/audio/sfx/sfx10.wav" id="5"] +[ext_resource type="AudioStream" uid="uid://c0ocrcymlhdtu" path="res://media/audio/sfx/box_drop.wav" id="6"] +[ext_resource type="AudioStream" uid="uid://dlybl1756ddur" path="res://media/audio/sfx/push.wav" id="7"] -[sub_resource type="Animation" id=1] +[sub_resource type="Animation" id="1"] length = 0.6 -loop = true tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true tracks/0/path = NodePath("Sprite2D:region_rect") tracks/0/interp = 0 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array( 0, 0.4 ), -"transitions": PackedFloat32Array( 1, 1 ), +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [ Rect2( 56, 0, 8, 24 ), Rect2( 64, 0, 8, 24 ) ] +"values": [Rect2(56, 0, 8, 24), Rect2(64, 0, 8, 24)] } tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true tracks/1/path = NodePath("Sprite2D:offset") tracks/1/interp = 0 tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true tracks/1/keys = { -"times": PackedFloat32Array( 0, 0.4 ), -"transitions": PackedFloat32Array( 1, 1 ), +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [ Vector2( 0, 0 ), Vector2( 0, 0 ) ] +"values": [Vector2(0, 0), Vector2(0, 0)] } -[sub_resource type="Animation" id=2] +[sub_resource type="Animation" id="2"] length = 0.1 tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true tracks/0/path = NodePath("Sprite2D:region_rect") tracks/0/interp = 0 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 0, -"values": [ Rect2( 104, 0, 8, 24 ) ] +"values": [Rect2(104, 0, 8, 24)] } tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true tracks/1/path = NodePath("Sprite2D:offset") tracks/1/interp = 0 tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true tracks/1/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 0, -"values": [ Vector2( 0, 0 ) ] +"values": [Vector2(0, 0)] } -[sub_resource type="Animation" id=3] +[sub_resource type="Animation" id="3"] length = 0.6 -loop = true tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true tracks/0/path = NodePath("Sprite2D:region_rect") tracks/0/interp = 0 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array( 0, 0.2, 0.3, 0.5 ), -"transitions": PackedFloat32Array( 1, 1, 1, 1 ), +"times": PackedFloat32Array(0, 0.2, 0.3, 0.5), +"transitions": PackedFloat32Array(1, 1, 1, 1), "update": 0, -"values": [ Rect2( 72, 0, 8, 24 ), Rect2( 80, 0, 8, 24 ), Rect2( 88, 0, 8, 24 ), Rect2( 96, 0, 8, 24 ) ] +"values": [Rect2(72, 0, 8, 24), Rect2(80, 0, 8, 24), Rect2(88, 0, 8, 24), Rect2(96, 0, 8, 24)] } tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true tracks/1/path = NodePath("Sprite2D:offset") tracks/1/interp = 0 tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true tracks/1/keys = { -"times": PackedFloat32Array( 0, 0.2, 0.3, 0.5 ), -"transitions": PackedFloat32Array( 1, 1, 1, 1 ), +"times": PackedFloat32Array(0, 0.2, 0.3, 0.5), +"transitions": PackedFloat32Array(1, 1, 1, 1), "update": 0, -"values": [ Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ) ] +"values": [Vector2(0, 0), Vector2(0, 0), Vector2(0, 0), Vector2(0, 0)] } -[sub_resource type="Animation" id=4] +[sub_resource type="Animation" id="4"] length = 0.6 -loop = true +loop_mode = 1 tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true tracks/0/path = NodePath("Sprite2D:region_rect") tracks/0/interp = 0 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array( 0, 0.4 ), -"transitions": PackedFloat32Array( 1, 1 ), +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [ Rect2( 0, 0, 8, 24 ), Rect2( 8, 0, 8, 24 ) ] +"values": [Rect2(0, 0, 8, 24), Rect2(8, 0, 8, 24)] } tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true tracks/1/path = NodePath("Sprite2D:offset") tracks/1/interp = 0 tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true tracks/1/keys = { -"times": PackedFloat32Array( 0, 0.4 ), -"transitions": PackedFloat32Array( 1, 1 ), +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [ Vector2( 0, 0 ), Vector2( 0, 0 ) ] +"values": [Vector2(0, 0), Vector2(0, 0)] } -[sub_resource type="Animation" id=5] +[sub_resource type="Animation" id="5"] length = 0.1 tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true tracks/0/path = NodePath("Sprite2D:region_rect") tracks/0/interp = 0 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 0, -"values": [ Rect2( 48, 0, 8, 24 ) ] +"values": [Rect2(48, 0, 8, 24)] } tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true tracks/1/path = NodePath("Sprite2D:offset") tracks/1/interp = 0 tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true tracks/1/keys = { -"times": PackedFloat32Array( 0 ), -"transitions": PackedFloat32Array( 1 ), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 0, -"values": [ Vector2( 0, 0 ) ] +"values": [Vector2(0, 0)] } -[sub_resource type="Animation" id=6] +[sub_resource type="Animation" id="6"] length = 0.6 -loop = true +loop_mode = 1 tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true tracks/0/path = NodePath("Sprite2D:region_rect") tracks/0/interp = 0 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array( 0, 0.2, 0.3, 0.5 ), -"transitions": PackedFloat32Array( 1, 1, 1, 1 ), +"times": PackedFloat32Array(0, 0.2, 0.3, 0.5), +"transitions": PackedFloat32Array(1, 1, 1, 1), "update": 0, -"values": [ Rect2( 16, 0, 8, 24 ), Rect2( 24, 0, 8, 24 ), Rect2( 32, 0, 8, 24 ), Rect2( 40, 0, 8, 24 ) ] +"values": [Rect2(16, 0, 8, 24), Rect2(24, 0, 8, 24), Rect2(32, 0, 8, 24), Rect2(40, 0, 8, 24)] } tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true tracks/1/path = NodePath("Sprite2D:offset") tracks/1/interp = 0 tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true tracks/1/keys = { -"times": PackedFloat32Array( 0, 0.2, 0.3, 0.5 ), -"transitions": PackedFloat32Array( 1, 1, 1, 1 ), +"times": PackedFloat32Array(0, 0.2, 0.3, 0.5), +"transitions": PackedFloat32Array(1, 1, 1, 1), "update": 0, -"values": [ Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ) ] +"values": [Vector2(0, 0), Vector2(0, 0), Vector2(0, 0), Vector2(0, 0)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_lmet5"] +_data = { +"box_idle": SubResource("1"), +"box_jump": SubResource("2"), +"box_run": SubResource("3"), +"idle": SubResource("4"), +"jump": SubResource("5"), +"run": SubResource("6") } [node name="Player" type="Node2D"] z_index = 15 z_as_relative = false -script = ExtResource( 1 ) +script = ExtResource("1") +move_speed = 0.9 +jump_speed = 1.4 +jump_frames = 16 tag = "player" is_solid = true is_moving = true is_colliding = true is_using_gravity = true -move_speed = 0.9 -jump_speed = 1.4 -jump_frames = 16 [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2( 4, -4 ) -texture = ExtResource( 3 ) +position = Vector2(4, -4) +texture = ExtResource("3") region_enabled = true -region_rect = Rect2( 0, 0, 8, 24 ) +region_rect = Rect2(0, 0, 8, 24) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "idle" -anims/box_idle = SubResource( 1 ) -anims/box_jump = SubResource( 2 ) -anims/box_run = SubResource( 3 ) -anims/idle = SubResource( 4 ) -anims/jump = SubResource( 5 ) -anims/run = SubResource( 6 ) +libraries = { +"": SubResource("AnimationLibrary_lmet5") +} [node name="AudioJump" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource( 2 ) +stream = ExtResource("2") attenuation = 0.101532 -bus = "SFX" +bus = &"SFX" [node name="AudioPickup" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource( 4 ) -bus = "SFX" +stream = ExtResource("4") +bus = &"SFX" [node name="AudioDrop" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource( 6 ) -bus = "SFX" +stream = ExtResource("6") +bus = &"SFX" [node name="AudioThrow" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource( 5 ) -bus = "SFX" +stream = ExtResource("5") +bus = &"SFX" [node name="AudioPush" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource( 7 ) -bus = "SFX" +stream = ExtResource("7") +bus = &"SFX" diff --git a/src/actor/Switch.gd b/src/actor/Switch.gd index 55956af..0b75e33 100644 --- a/src/actor/Switch.gd +++ b/src/actor/Switch.gd @@ -11,14 +11,14 @@ var is_last := false @onready var node_audio : AudioStreamPlayer2D = $AudioStreamPlayer2D func _ready(): - if Engine.editor_hint: + if Engine.is_editor_hint(): return add_to_group("switch_" + color) func _physics_process(delta): - if Engine.editor_hint: + if Engine.is_editor_hint(): return is_last = is_on diff --git a/src/actor/SwitchBlock.gd b/src/actor/SwitchBlock.gd index 5630125..82ac5af 100644 --- a/src/actor/SwitchBlock.gd +++ b/src/actor/SwitchBlock.gd @@ -11,13 +11,13 @@ class_name SwitchBlock var is_switch = false func _ready(): - if Engine.editor_hint: + if Engine.is_editor_hint(): return add_to_group("switch_block_" + color) func _physics_process(delta): - if Engine.editor_hint: + if Engine.is_editor_hint(): return if is_switch and !is_solid and !is_area_solid_actor(position.x, position.y): diff --git a/src/autoload/Pause.tscn b/src/autoload/Pause.tscn index ff2d146..f417d7d 100644 --- a/src/autoload/Pause.tscn +++ b/src/autoload/Pause.tscn @@ -1,111 +1,93 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=10 format=3 uid="uid://cmqisifc4h7nl"] -[ext_resource path="res://media/font/m3x6.tres" type="FontFile" id=1] -[ext_resource path="res://media/image/9slice.png" type="Texture2D" id=2] -[ext_resource path="res://src/autoload/Pause.gd" type="Script" id=3] -[ext_resource path="res://media/audio/sfx/sfx3.wav" type="AudioStream" id=4] -[ext_resource path="res://media/font/m6x11.ttf" type="FontFile" id=5] -[ext_resource path="res://media/audio/sfx/hit1.wav" type="AudioStream" id=7] -[ext_resource path="res://media/audio/sfx/sfx18.wav" type="AudioStream" id=9] -[ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=10] -[ext_resource path="res://media/audio/sfx/portal9.wav" type="AudioStream" id=11] - -[sub_resource type="FontFile" id=1] -spacing_bottom = -1 -font_data = ExtResource( 5 ) +[ext_resource type="FontVariation" uid="uid://culrlsi316p0y" path="res://media/font/m3x6.tres" id="1"] +[ext_resource type="Texture2D" uid="uid://s7e12rs806hl" path="res://media/image/9slice.png" id="2"] +[ext_resource type="Script" path="res://src/autoload/Pause.gd" id="3"] +[ext_resource type="AudioStream" uid="uid://3d7jvhtcwlpd" path="res://media/audio/sfx/sfx3.wav" id="4"] +[ext_resource type="FontVariation" uid="uid://cntu078xgj2oj" path="res://media/font/m6x11.tres" id="4_m13mo"] +[ext_resource type="AudioStream" uid="uid://c0sja8q4h5lm4" path="res://media/audio/sfx/hit1.wav" id="7"] +[ext_resource type="AudioStream" uid="uid://dv7i1pd4dhxoi" path="res://media/audio/sfx/sfx18.wav" id="9"] +[ext_resource type="AudioStream" uid="uid://bd5iht8uibqik" path="res://media/audio/sfx/portal7.wav" id="10"] +[ext_resource type="AudioStream" uid="uid://gqspthpv6a4l" path="res://media/audio/sfx/portal9.wav" id="11"] [node name="Pause" type="CanvasLayer"] -process_mode = 2 -script = ExtResource( 3 ) -__meta__ = { -"_edit_horizontal_guides_": [ -19.0 ] -} +process_mode = 3 +script = ExtResource("3") [node name="Menu" type="Control" parent="."] +layout_mode = 3 +anchors_preset = 0 offset_right = 72.0 offset_bottom = 72.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Paused" type="NinePatchRect" parent="Menu"] +custom_minimum_size = Vector2(24, 24) +layout_mode = 0 offset_left = 87.0 offset_top = 28.0 offset_right = 141.0 offset_bottom = 89.0 -custom_minimum_size = Vector2( 24, 24 ) -texture = ExtResource( 2 ) +texture = ExtResource("2") patch_margin_left = 8 patch_margin_top = 8 patch_margin_right = 8 patch_margin_bottom = 8 axis_stretch_horizontal = 1 axis_stretch_vertical = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Cursor" type="ColorRect" parent="Menu"] +layout_mode = 0 offset_left = 92.0 offset_top = 50.0 offset_right = 136.0 offset_bottom = 61.0 -color = Color( 0.113725, 0.168627, 0.32549, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0.113725, 0.168627, 0.32549, 1) [node name="List" type="Label" parent="Menu"] +modulate = Color(1, 0.945098, 0.909804, 1) +layout_mode = 0 offset_left = 87.0 offset_top = 52.0 offset_right = 141.0 offset_bottom = 82.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 1 ) +theme_override_fonts/font = ExtResource("1") text = "resume reset exit" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="Header" type="Label" parent="Menu"] +modulate = Color(1, 0.945098, 0.909804, 1) +layout_mode = 0 offset_left = 88.0 offset_top = 35.0 offset_right = 140.0 offset_bottom = 50.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = SubResource( 1 ) +theme_override_fonts/font = ExtResource("4_m13mo") text = "PAUSED" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="AudioPause" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 4 ) +stream = ExtResource("4") volume_db = -5.0 -bus = "SFX" +bus = &"SFX" [node name="AudioScroll" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 7 ) +stream = ExtResource("7") volume_db = -7.0 -bus = "SFX" +bus = &"SFX" [node name="AudioResume" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 10 ) +stream = ExtResource("10") volume_db = -2.0 -bus = "SFX" +bus = &"SFX" [node name="AudioReset" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 11 ) +stream = ExtResource("11") volume_db = -4.0 -bus = "SFX" +bus = &"SFX" [node name="AudioExit" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 9 ) +stream = ExtResource("9") volume_db = -1.0 -bus = "SFX" +bus = &"SFX" diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index 99af0ef..df5bbbf 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -55,9 +55,7 @@ func _ready(): # load save data var l = load_file(save_filename) if l: - var test_json_conv = JSON.new() - test_json_conv.parse(l).result - save_data = test_json_conv.get_data() + save_data = JSON.parse_string(l) print("save_data: " + JSON.stringify(save_data, "\t")) if save_data.has("map"): map_save = int(save_data["map"]) @@ -125,16 +123,12 @@ func change_map(): ### Saving and Loading func save_file(fname, arg): - var file = File.new() - file.open("user://" + str(fname), File.WRITE) + var file = FileAccess.open("user://" + str(fname), FileAccess.WRITE) file.store_string(arg) - file.close() func load_file(fname = "box.save"): - var file = File.new() - file.open("user://" + str(fname), File.READ) + var file = FileAccess.open("user://" + str(fname), FileAccess.READ) var content = file.get_as_text() - file.close() return content func create_save(): @@ -172,8 +166,10 @@ func win(): # look into a folder and return a list of filenames without file extension func dir_list(path : String): var array = [] - var dir = Directory.new() - if dir.open(path) == OK: + var dir = DirAccess.open(path) + if dir: + dir.include_hidden = false + dir.include_navigational = false dir.list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547 var file_name = dir.get_next() while file_name: @@ -192,7 +188,7 @@ func set_bus_volume(_bus := 1, _vol := 5): func set_window_scale(arg := window_scale): window_scale = max(1, arg if arg else window_scale) if OS.get_name() != "HTML5": - get_window().size = Vector2(view_size.x * window_scale, view_size.y * window_scale) + # center window get_window().set_position(DisplayServer.screen_get_size() * 0.5 - get_window().get_size() * 0.5) return "window_scale: " + str(window_scale) + " - resolution: " + str(get_window().get_size()) diff --git a/src/autoload/UI.tscn b/src/autoload/UI.tscn index 434ba3e..3d2a9e4 100644 --- a/src/autoload/UI.tscn +++ b/src/autoload/UI.tscn @@ -1,100 +1,88 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=7 format=3 uid="uid://dx6w8d0j4pa6k"] -[ext_resource path="res://media/font/m6x11.tres" type="FontFile" id=1] -[ext_resource path="res://media/image/btn.png" type="Texture2D" id=2] -[ext_resource path="res://src/autoload/UI.gd" type="Script" id=3] -[ext_resource path="res://media/image/note.png" type="Texture2D" id=4] -[ext_resource path="res://media/font/m6x11.ttf" type="FontFile" id=5] -[ext_resource path="res://src/shader/outline2D_outer.gdshader" type="Shader" id=6] +[ext_resource type="FontVariation" uid="uid://cntu078xgj2oj" path="res://media/font/m6x11.tres" id="1"] +[ext_resource type="Texture2D" uid="uid://cmyhp4lmcy3di" path="res://media/image/btn.png" id="2"] +[ext_resource type="Script" path="res://src/autoload/UI.gd" id="3"] +[ext_resource type="Texture2D" uid="uid://cbm8q2v6s73ne" path="res://media/image/note.png" id="4"] +[ext_resource type="Shader" path="res://src/shader/outline2D_outer.gdshader" id="6"] -[sub_resource type="FontFile" id=1] -spacing_bottom = -1 -font_data = ExtResource( 5 ) - -[sub_resource type="ShaderMaterial" id=2] -shader = ExtResource( 6 ) -shader_param/line_color = Color( 0, 0, 0, 1 ) -shader_param/line_thickness = 1.0 +[sub_resource type="ShaderMaterial" id="2"] +shader = ExtResource("6") +shader_parameter/line_color = Color(0, 0, 0, 1) +shader_parameter/line_thickness = 1.0 [node name="UI" type="CanvasLayer"] layer = 5 -script = ExtResource( 3 ) +script = ExtResource("3") [node name="Buttons" type="Node2D" parent="."] [node name="X" type="Sprite2D" parent="Buttons"] -position = Vector2( 12, 116 ) -texture = ExtResource( 2 ) +position = Vector2(12, 116) +texture = ExtResource("2") hframes = 6 vframes = 4 frame = 1 -region_rect = Rect2( 0, 0, 18, 18 ) +region_rect = Rect2(0, 0, 18, 18) [node name="Label" type="Label" parent="Buttons/X"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 11.0 offset_top = -7.0 offset_right = 49.0 offset_bottom = 6.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = ExtResource( 1 ) +theme_override_fonts/font = ExtResource("1") text = "select" [node name="C" type="Sprite2D" parent="Buttons"] -position = Vector2( 216, 116 ) -texture = ExtResource( 2 ) +position = Vector2(216, 116) +texture = ExtResource("2") hframes = 6 vframes = 4 -region_rect = Rect2( 0, 0, 18, 18 ) +region_rect = Rect2(0, 0, 18, 18) [node name="Label" type="Label" parent="Buttons/C"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = -38.0 offset_top = -7.0 offset_right = -10.0 offset_bottom = 6.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = ExtResource( 1 ) +theme_override_fonts/font = ExtResource("1") text = "back" +horizontal_alignment = 2 [node name="Arrows" type="Sprite2D" parent="Buttons"] visible = false -position = Vector2( 216, 116 ) -texture = ExtResource( 2 ) +position = Vector2(216, 116) +texture = ExtResource("2") hframes = 6 vframes = 4 frame = 7 -region_rect = Rect2( 0, 0, 18, 18 ) +region_rect = Rect2(0, 0, 18, 18) [node name="Label" type="Label" parent="Buttons/Arrows"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = -40.0 offset_top = -7.0 offset_right = -10.0 offset_bottom = 6.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = ExtResource( 1 ) +theme_override_fonts/font = ExtResource("1") text = "move" [node name="Notes" type="Node2D" parent="."] -position = Vector2( 218, 11 ) +position = Vector2(218, 11) [node name="Label" type="Label" parent="Notes"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = -70.0 offset_top = -6.0 offset_right = -9.0 offset_bottom = 7.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = SubResource( 1 ) +theme_override_fonts/font = ExtResource("1") text = "13" -align = 2 +horizontal_alignment = 2 [node name="Sprite2D" type="Sprite2D" parent="Notes"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -material = SubResource( 2 ) -texture = ExtResource( 4 ) +modulate = Color(1, 0.945098, 0.909804, 1) +material = SubResource("2") +texture = ExtResource("4") diff --git a/src/autoload/Wipe.gd b/src/autoload/Wipe.gd index 8a6f981..22f28d2 100644 --- a/src/autoload/Wipe.gd +++ b/src/autoload/Wipe.gd @@ -7,29 +7,30 @@ var is_wipe := false var frame = 0 # last frame -@export var last = 14 +@export var last := 14.0 -@onready var easing := EaseMover.new(0.45) +var clock := 0.0 +var time := 0.45 @onready var audio : AudioStreamPlayer2D = $AudioStreamPlayer2D @onready var image := $ColorRect @onready var mat : ShaderMaterial = $ColorRect.material func _ready(): image.visible = false - easing.clock = easing.time + #clock = time func _physics_process(delta): if is_wipe: - easing.count(delta) - var f = lerp(0.0, last, easing.frac()) + clock = clamp(clock + delta, 0, time) + var f = lerp(0.0, last, clock / time) mat.set_shader_parameter("frame", (last - f) if is_reverse else f) - if easing.is_complete: + if clock == time: stop() func start(_reverse = false): is_wipe = true - easing.reset() + clock = 0 image.visible = true is_reverse = _reverse @@ -42,7 +43,7 @@ func stop(): image.visible = false else: for i in 2: - await get_tree().idle_frame + await get_tree().physics_frame emit_signal("finish") start(true) diff --git a/src/autoload/Wipe.tscn b/src/autoload/Wipe.tscn index fe66649..fd6e277 100644 --- a/src/autoload/Wipe.tscn +++ b/src/autoload/Wipe.tscn @@ -1,29 +1,31 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=6 format=3 uid="uid://c3gxyybyv56ml"] -[ext_resource path="res://src/autoload/Wipe.gd" type="Script" id=1] -[ext_resource path="res://media/image/wipe.png" type="Texture2D" id=2] -[ext_resource path="res://src/shader/wipe.gdshader" type="Shader" id=3] -[ext_resource path="res://media/audio/sfx/portal0.wav" type="AudioStream" id=4] +[ext_resource type="Script" path="res://src/autoload/Wipe.gd" id="1"] +[ext_resource type="Texture2D" uid="uid://pmq8s2o1oxny" path="res://media/image/wipe.png" id="2"] +[ext_resource type="Shader" path="res://src/shader/wipe.gdshader" id="3"] +[ext_resource type="AudioStream" uid="uid://deynniptk8o2q" path="res://media/audio/sfx/portal0.wav" id="4"] -[sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 3 ) -shader_param/offset = Vector2( 0.125, 0 ) -shader_param/size = Vector2( 14.25, 8 ) -shader_param/frames = Vector2( 4, 4 ) -shader_param/frame = 6 -shader_param/tex = ExtResource( 2 ) +[sub_resource type="ShaderMaterial" id="1"] +shader = ExtResource("3") +shader_parameter/offset = Vector2(0.125, 0) +shader_parameter/size = Vector2(14.25, 8) +shader_parameter/frames = Vector2(4, 4) +shader_parameter/frame = 6 +shader_parameter/color = Color(1, 0.945098, 0.909804, 1) +shader_parameter/tex = ExtResource("2") [node name="Wipe" type="CanvasLayer"] -process_mode = 2 layer = 10 -script = ExtResource( 1 ) +script = ExtResource("1") [node name="ColorRect" type="ColorRect" parent="."] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -material = SubResource( 1 ) -offset_right = 228.0 -offset_bottom = 128.0 +material = SubResource("1") +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource( 4 ) -bus = "SFX" +stream = ExtResource("4") +bus = &"SFX" diff --git a/src/autoload/touch_screen.gd b/src/autoload/touch_screen.gd index 96bb309..9f903e9 100644 --- a/src/autoload/touch_screen.gd +++ b/src/autoload/touch_screen.gd @@ -5,7 +5,7 @@ extends CanvasLayer func _ready(): connect("visibility_changed",Callable(self,"vis")) - visible = (OS.has_touchscreen_ui_hint() and OS.get_name() == "HTML5") or OS.get_name() == "Android" + visible = OS.get_name() == "HTML5" or OS.get_name() == "Android" vis() func vis(): diff --git a/src/autoload/touch_screen.tscn b/src/autoload/touch_screen.tscn index 1918151..5e4fdc7 100644 --- a/src/autoload/touch_screen.tscn +++ b/src/autoload/touch_screen.tscn @@ -1,139 +1,137 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=9 format=3 uid="uid://hnd4ibyysixp"] -[ext_resource path="res://src/autoload/touch_screen.gd" type="Script" id=1] -[ext_resource path="res://media/font/m6x11.tres" type="FontFile" id=2] -[ext_resource path="res://media/font/m3x6.tres" type="FontFile" id=3] -[ext_resource path="res://src/autoload/touch_screen_button.gd" type="Script" id=4] +[ext_resource type="Script" path="res://src/autoload/touch_screen.gd" id="1"] +[ext_resource type="FontVariation" uid="uid://culrlsi316p0y" path="res://media/font/m3x6.tres" id="3"] +[ext_resource type="Script" path="res://src/autoload/touch_screen_button.gd" id="4"] -[sub_resource type="CircleShape2D" id=1] +[sub_resource type="CircleShape2D" id="1"] radius = 14.5 -[sub_resource type="CircleShape2D" id=2] +[sub_resource type="CircleShape2D" id="2"] radius = 14.5 -[sub_resource type="CircleShape2D" id=3] +[sub_resource type="CircleShape2D" id="3"] radius = 14.5 -[sub_resource type="CircleShape2D" id=4] +[sub_resource type="CircleShape2D" id="4"] radius = 14.5 -[sub_resource type="CircleShape2D" id=5] +[sub_resource type="CircleShape2D" id="5"] radius = 14.5 [node name="TouchScreen" type="CanvasLayer"] process_mode = 2 layer = 15 -script = ExtResource( 1 ) +script = ExtResource("1") [node name="Node2D" type="Node2D" parent="."] [node name="Left" type="TouchScreenButton" parent="Node2D"] -position = Vector2( 20, 108 ) -shape = SubResource( 1 ) +position = Vector2(20, 108) +shape = SubResource("1") shape_centered = false passby_press = true action = "left" visibility_mode = 1 [node name="Node2D" type="Node2D" parent="Node2D/Left"] -modulate = Color( 1, 1, 1, 0.0784314 ) -script = ExtResource( 4 ) +modulate = Color(1, 1, 1, 0.0784314) +script = ExtResource("4") circle_size = 12.0 [node name="Polygon2D" type="Polygon2D" parent="Node2D/Left"] -scale = Vector2( 0.3, 0.3 ) -offset = Vector2( -12.5, 0 ) -polygon = PackedVector2Array( 0, 0, 25, -25, 25, 25 ) +modulate = Color(1, 0.945098, 0.909804, 1) +scale = Vector2(0.3, 0.3) +offset = Vector2(-12.5, 0) +polygon = PackedVector2Array(0, 0, 25, -25, 25, 25) [node name="Right" type="TouchScreenButton" parent="Node2D"] -position = Vector2( 50, 108 ) -shape = SubResource( 2 ) +position = Vector2(50, 108) +shape = SubResource("2") shape_centered = false passby_press = true action = "right" visibility_mode = 1 [node name="Node2D" type="Node2D" parent="Node2D/Right"] -modulate = Color( 1, 1, 1, 0.0784314 ) -script = ExtResource( 4 ) +modulate = Color(1, 1, 1, 0.0784314) +script = ExtResource("4") circle_size = 12.0 [node name="Polygon2D" type="Polygon2D" parent="Node2D/Right"] -scale = Vector2( 0.3, 0.3 ) -offset = Vector2( 12.5, 0 ) -polygon = PackedVector2Array( 0, 0, -25, -25, -25, 25 ) +modulate = Color(1, 0.945098, 0.909804, 1) +scale = Vector2(0.3, 0.3) +offset = Vector2(12.5, 0) +polygon = PackedVector2Array(0, 0, -25, -25, -25, 25) [node name="C" type="TouchScreenButton" parent="Node2D"] -position = Vector2( 178, 108 ) -shape = SubResource( 3 ) +position = Vector2(178, 108) +shape = SubResource("3") shape_centered = false passby_press = true action = "action" visibility_mode = 1 [node name="Node2D" type="Node2D" parent="Node2D/C"] -modulate = Color( 1, 1, 1, 0.0784314 ) -script = ExtResource( 4 ) +modulate = Color(1, 1, 1, 0.0784314) +script = ExtResource("4") circle_size = 12.0 [node name="Label" type="Label" parent="Node2D/C"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = -12.0 offset_top = -12.0 offset_right = 12.0 offset_bottom = 12.0 -custom_fonts/font = ExtResource( 2 ) +theme_override_fonts/font = ExtResource("3") text = "c" -align = 1 -valign = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 +vertical_alignment = 1 [node name="X" type="TouchScreenButton" parent="Node2D"] -position = Vector2( 208, 108 ) -shape = SubResource( 4 ) +position = Vector2(208, 108) +shape = SubResource("4") shape_centered = false passby_press = true action = "jump" visibility_mode = 1 [node name="Node2D" type="Node2D" parent="Node2D/X"] -modulate = Color( 1, 1, 1, 0.0784314 ) -script = ExtResource( 4 ) +modulate = Color(1, 1, 1, 0.0784314) +script = ExtResource("4") circle_size = 12.0 [node name="Label" type="Label" parent="Node2D/X"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = -12.0 offset_top = -12.0 offset_right = 12.0 offset_bottom = 12.0 -custom_fonts/font = ExtResource( 2 ) +theme_override_fonts/font = ExtResource("3") text = "x" -align = 1 -valign = 1 +horizontal_alignment = 1 +vertical_alignment = 1 [node name="Pause" type="TouchScreenButton" parent="Node2D"] -position = Vector2( 208, 20 ) -shape = SubResource( 5 ) +position = Vector2(208, 20) +shape = SubResource("5") shape_centered = false passby_press = true action = "pause" visibility_mode = 1 [node name="Node2D" type="Node2D" parent="Node2D/Pause"] -modulate = Color( 1, 1, 1, 0.0784314 ) -script = ExtResource( 4 ) +modulate = Color(1, 1, 1, 0.0784314) +script = ExtResource("4") circle_size = 12.0 [node name="Label" type="Label" parent="Node2D/Pause"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = -12.0 offset_top = -12.0 offset_right = 12.0 offset_bottom = 12.0 -custom_fonts/font = ExtResource( 3 ) +theme_override_fonts/font = ExtResource("3") text = "pause" -align = 1 -valign = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 +vertical_alignment = 1 diff --git a/src/autoload/touch_screen_button.gd b/src/autoload/touch_screen_button.gd index cfc1d2a..c50133b 100644 --- a/src/autoload/touch_screen_button.gd +++ b/src/autoload/touch_screen_button.gd @@ -6,11 +6,11 @@ extends Node2D func set_is_var(arg): is_var = arg - update() + #update() func set_circle(arg): circle_size = arg - update() + #update() func _draw(): draw_circle(Vector2.ZERO, circle_size, Color.WHITE) diff --git a/src/class/EaseMover.gd b/src/class/EaseMover.gd index cdbe6c8..560636a 100644 --- a/src/class/EaseMover.gd +++ b/src/class/EaseMover.gd @@ -10,7 +10,7 @@ var node var is_complete : get = get_complete -func _init(_time := time,_from := from,_to := to,_node := node): +func _init(_time := time,_from := from,_to := to, _node = node): time = _time from = _from to = _to diff --git a/src/map/1-1.tscn b/src/map/1-1.tscn index 1915e40..0eaf304 100644 --- a/src/map/1-1.tscn +++ b/src/map/1-1.tscn @@ -1,67 +1,64 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=13 format=3 uid="uid://b48cosj2th60t"] -[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] -[ext_resource path="res://src/stage/Stage.gd" type="Script" id=7] -[ext_resource path="res://media/font/m6x11.tres" type="FontFile" id=8] -[ext_resource path="res://media/image/btn.png" type="Texture2D" id=9] -[ext_resource path="res://src/menu/hide_on_level_select.gd" type="Script" id=10] -[ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=11] -[ext_resource path="res://src/actor/Note.tscn" type="PackedScene" id=12] +[ext_resource type="PackedScene" uid="uid://ccgl186gosdcp" path="res://src/stage/SolidTileMap.tscn" id="1"] +[ext_resource type="PackedScene" path="res://src/actor/Exit.tscn" id="2"] +[ext_resource type="PackedScene" path="res://src/stage/GameCamera.tscn" id="3"] +[ext_resource type="PackedScene" uid="uid://c3tsbvbfy7tmu" path="res://src/stage/DetailTileMap.tscn" id="4"] +[ext_resource type="PackedScene" path="res://src/stage/SpikeTileMap.tscn" id="5"] +[ext_resource type="PackedScene" uid="uid://bleh1qiiufduy" path="res://src/actor/Player.tscn" id="6"] +[ext_resource type="Script" path="res://src/stage/Stage.gd" id="7"] +[ext_resource type="FontVariation" uid="uid://cntu078xgj2oj" path="res://media/font/m6x11.tres" id="8"] +[ext_resource type="Texture2D" uid="uid://cmyhp4lmcy3di" path="res://media/image/btn.png" id="9"] +[ext_resource type="Script" path="res://src/menu/hide_on_level_select.gd" id="10"] +[ext_resource type="PackedScene" path="res://src/stage/ObscureMap.tscn" id="11"] +[ext_resource type="PackedScene" path="res://src/actor/Note.tscn" id="12"] [node name="Stage" type="Node2D"] -script = ExtResource( 7 ) +script = ExtResource("7") -[node name="SolidTileMap" parent="." instance=ExtResource( 1 )] -tile_data = PackedInt32Array( -524303, 1, 0, -524302, 1, 0, -524301, 1, 0, -524300, 1, 0, -524299, 1, 0, -524298, 1, 0, -524297, 1, 0, -524296, 1, 0, -524295, 1, 0, -524294, 1, 0, -524293, 1, 0, -524292, 1, 0, -524291, 1, 0, -524290, 1, 0, -524289, 1, 0, -589824, 1, 0, -589823, 1, 0, -589822, 1, 0, -589821, 1, 0, -589820, 1, 0, -589819, 1, 0, -589818, 1, 0, -589817, 1, 0, -589816, 1, 0, -589815, 1, 0, -589814, 1, 0, -589813, 1, 0, -589812, 1, 0, -589811, 1, 0, -589810, 1, 0, -458767, 1, 0, -524274, 1, 0, -393231, 1, 0, -458738, 1, 0, -327695, 1, 0, -393202, 1, 0, -262159, 1, 0, -327666, 1, 0, -196623, 1, 0, -262130, 1, 0, -131087, 1, 0, -196594, 1, 0, -65551, 1, 0, -65542, 536870912, 0, -65541, 536870912, 1, -65540, 536870912, 1, -65539, 0, 0, -65538, 536870912, 1, -65537, 536870912, 0, -131072, 536870912, 1, -131071, 536870912, 1, -131070, 536870912, 0, -131069, 536870912, 1, -131068, 0, 0, -131067, 536870912, 1, -131066, 0, 0, -131065, 536870912, 1, -131064, 536870912, 0, -131058, 1, 0, -15, 1, 0, -14, 1, 0, -13, 1, 0, -12, 1, 0, -11, 1, 0, -10, 1, 0, -9, 1, 0, -8, 0, 1, -65528, 536870912, 0, -65522, 1, 0, 65528, 536870912, 0, 8, 536870912, 1, 14, 1, 0, 131064, 536870912, 0, 65544, 536870912, 0, 65545, 1, 0, 65546, 1, 0, 65547, 1, 0, 65548, 1, 0, 65549, 1, 0, 65550, 1, 0, 196600, 536870912, 0, 196601, 536870912, 0, 196602, 536870912, 1, 196603, 0, 0, 196604, 536870912, 1, 196605, 536870912, 0, 196606, 0, 0, 196607, 536870912, 1, 131072, 536870912, 0, 131073, 536870912, 1, 131074, 536870912, 1, 131075, 536870912, 0, 131076, 536870912, 1, 131077, 0, 0, 131078, 536870912, 1, 131079, 536870912, 0, 131080, 536870912, 0 ) +[node name="SolidTileMap" parent="." instance=ExtResource("1")] +layer_0/tile_data = PackedInt32Array(-524303, 1, 0, -524302, 1, 0, -524301, 1, 0, -524300, 1, 0, -524299, 1, 0, -524298, 1, 0, -524297, 1, 0, -524296, 1, 0, -524295, 1, 0, -524294, 1, 0, -524293, 1, 0, -524292, 1, 0, -524291, 1, 0, -524290, 1, 0, -524289, 1, 0, -589824, 1, 0, -589823, 1, 0, -589822, 1, 0, -589821, 1, 0, -589820, 1, 0, -589819, 1, 0, -589818, 1, 0, -589817, 1, 0, -589816, 1, 0, -589815, 1, 0, -589814, 1, 0, -589813, 1, 0, -589812, 1, 0, -589811, 1, 0, -589810, 1, 0, -458767, 1, 0, -524274, 1, 0, -393231, 1, 0, -458738, 1, 0, -327695, 1, 0, -393202, 1, 0, -262159, 1, 0, -327666, 1, 0, -196623, 1, 0, -262130, 1, 0, -131087, 1, 0, -196594, 1, 0, -65551, 1, 0, -65542, 536870912, 0, -65541, 536870912, 1, -65540, 536870912, 1, -65539, 0, 0, -65538, 536870912, 1, -65537, 536870912, 0, -131072, 536870912, 1, -131071, 536870912, 1, -131070, 536870912, 0, -131069, 536870912, 1, -131068, 0, 0, -131067, 536870912, 1, -131066, 0, 0, -131065, 536870912, 1, -131064, 536870912, 0, -131058, 1, 0, -15, 1, 0, -14, 1, 0, -13, 1, 0, -12, 1, 0, -11, 1, 0, -10, 1, 0, -9, 1, 0, -8, 0, 1, -65528, 536870912, 0, -65522, 1, 0, 65528, 536870912, 0, 8, 536870912, 1, 14, 1, 0, 131064, 536870912, 0, 65544, 536870912, 0, 65545, 1, 0, 65546, 1, 0, 65547, 1, 0, 65548, 1, 0, 65549, 1, 0, 65550, 1, 0, 196600, 536870912, 0, 196601, 536870912, 0, 196602, 536870912, 1, 196603, 0, 0, 196604, 536870912, 1, 196605, 536870912, 0, 196606, 0, 0, 196607, 536870912, 1, 131072, 536870912, 0, 131073, 536870912, 1, 131074, 536870912, 1, 131075, 536870912, 0, 131076, 536870912, 1, 131077, 0, 0, 131078, 536870912, 1, 131079, 536870912, 0, 131080, 536870912, 0) -[node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] +[node name="SpikeTileMap" parent="." instance=ExtResource("5")] +format = 2 -[node name="DetailTileMap" parent="." instance=ExtResource( 4 )] +[node name="DetailTileMap" parent="." instance=ExtResource("4")] z_index = -11 -tile_data = PackedInt32Array( -393212, 5, 2, -393211, 536870917, 0, -393210, -1610612731, 2, -327676, -1073741819, 2, -327675, 536870917, 0, -327674, 1610612741, 2, -262139, 536870917, 1, -262136, 536870916, 3, -262135, 536870916, 0, -262134, 4, 3, -131080, 536870916, 3, -131079, 536870916, 0, -131078, 4, 3, -196603, 536870917, 1, -196601, 536870916, 3, -196600, 536870916, 0, -196599, 4, 1, -196598, 536870916, 2, -131063, 4, 0, -131062, 536870916, 2, -10, 536870917, 0, -9, -536870907, 1, -7, 536870916, 0, -6, 4, 1, -5, 536870916, 0, -4, 4, 3, -2, 536870916, 3, -1, 536870916, 2, -65532, 4, 2, -65531, 536870916, 1, -65530, 536870916, 0, -65529, 536870916, 1, -65527, 4, 1, -65526, 536870916, 2, 65529, 4, 1, 65530, 4, 3, 65531, 4, 2, 65532, 536870916, 2, 0, 536870917, 0, 4, 536870916, 3, 5, 536870916, 2, 6, 4, 2, 7, 536870916, 0, 9, 536870916, 2, 131063, 536870916, 3, 131065, 4, 1, 131066, 536870916, 0, 131067, 4, 1, 131068, 536870916, 0, 131069, 536870916, 2, 65536, 1073741829, 1, 65537, 4, 2, 65538, 4, 3, 65540, 4, 2, 65541, 4, 3, 65542, 536870916, 3, 65543, 536870916, 0, 65545, -2147483643, 1, 65546, 536870917, 0, 196598, 536870916, 3, 196599, 536870916, 0, 262134, 536870916, 3, 262135, 4, 1, 262136, 536870916, 0, 262137, 4, 1, 262138, 536870916, 0, 262139, 536870916, 2, 196613, 4, 2, 196614, 4, 0, 196615, 536870916, 2, 327669, 536870916, 3, 327670, 536870916, 0, 327671, 536870916, 2, 327672, 536870916, 3, 327673, 4, 0, 327674, 4, 3, 393206, 4, 2, 393207, 536870916, 0, 393208, 4, 1, 393209, 536870916, 2 ) +layer_0/tile_data = PackedInt32Array(-393212, 5, 2, -393211, 536870917, 0, -393210, -1610612731, 2, -327676, -1073741819, 2, -327675, 536870917, 0, -327674, 1610612741, 2, -262139, 536870917, 1, -262136, 536870916, 3, -262135, 536870916, 0, -262134, 4, 3, -131080, 536870916, 3, -131079, 536870916, 0, -131078, 4, 3, -196603, 536870917, 1, -196601, 536870916, 3, -196600, 536870916, 0, -196599, 4, 1, -196598, 536870916, 2, -131063, 4, 0, -131062, 536870916, 2, -10, 536870917, 0, -9, -536870907, 1, -7, 536870916, 0, -6, 4, 1, -5, 536870916, 0, -4, 4, 3, -2, 536870916, 3, -1, 536870916, 2, -65532, 4, 2, -65531, 536870916, 1, -65530, 536870916, 0, -65529, 536870916, 1, -65527, 4, 1, -65526, 536870916, 2, 65529, 4, 1, 65530, 4, 3, 65531, 4, 2, 65532, 536870916, 2, 0, 536870917, 0, 4, 536870916, 3, 5, 536870916, 2, 6, 4, 2, 7, 536870916, 0, 9, 536870916, 2, 131063, 536870916, 3, 131065, 4, 1, 131066, 536870916, 0, 131067, 4, 1, 131068, 536870916, 0, 131069, 536870916, 2, 65536, 1073741829, 1, 65537, 4, 2, 65538, 4, 3, 65540, 4, 2, 65541, 4, 3, 65542, 536870916, 3, 65543, 536870916, 0, 65545, -2147483643, 1, 65546, 536870917, 0, 196598, 536870916, 3, 196599, 536870916, 0, 262134, 536870916, 3, 262135, 4, 1, 262136, 536870916, 0, 262137, 4, 1, 262138, 536870916, 0, 262139, 536870916, 2, 196613, 4, 2, 196614, 4, 0, 196615, 536870916, 2, 327669, 536870916, 3, 327670, 536870916, 0, 327671, 536870916, 2, 327672, 536870916, 3, 327673, 4, 0, 327674, 4, 3, 393206, 4, 2, 393207, 536870916, 0, 393208, 4, 1, 393209, 536870916, 2) -[node name="ObscureMap" parent="." instance=ExtResource( 11 )] -tile_data = PackedInt32Array( -458766, 1, 0, -458765, 1, 0, -458764, 1, 0, -458763, 1, 0, -458762, 1, 0, -458761, 1, 0, -458760, 1, 0, -458759, 1, 0, -458758, 1, 0, -458757, 1, 0, -458756, 1, 0, -458755, 1, 0, -458754, 1, 0, -458753, 1, 0, -524288, 1, 0, -524287, 1, 0, -524286, 1, 0, -524285, 1, 0, -524284, 1, 0, -524283, 1, 0, -524282, 1, 0, -524281, 1, 0, -524280, 1, 0, -524279, 1, 0, -524278, 1, 0, -524277, 1, 0, -524276, 1, 0, -524275, 1, 0, -393230, 1, 0, -393229, 1, 0, -393228, 1, 0, -393227, 1, 0, -393226, 1, 0, -393225, 1, 0, -393224, 1, 0, -393223, 1, 0, -393222, 1, 0, -393221, 1, 0, -393220, 1, 0, -393219, 1, 0, -393218, 1, 0, -393217, 1, 0, -458752, 1, 0, -458751, 1, 0, -458750, 1, 0, -458749, 1, 0, -458748, 1, 0, -458747, 1, 0, -458746, 1, 0, -458745, 1, 0, -458744, 1, 0, -458743, 1, 0, -458742, 1, 0, -458741, 1, 0, -458740, 1, 0, -458739, 1, 0, -327694, 1, 0, -327693, 1, 0, -327692, 1, 0, -327691, 1, 0, -327690, 1, 0, -327689, 1, 0, -327688, 1, 0, -327687, 1, 0, -327686, 1, 0, -327685, 1, 0, -327684, 1, 0, -327683, 1, 0, -327682, 1, 0, -327681, 1, 0, -393216, 1, 0, -393215, 1, 0, -393214, 1, 0, -393213, 1, 0, -393212, 1, 0, -393211, 1, 0, -393210, 1, 0, -393209, 1, 0, -393208, 1, 0, -393207, 1, 0, -393206, 1, 0, -393205, 1, 0, -393204, 1, 0, -393203, 1, 0, -262158, 1, 0, -262157, 1, 0, -262156, 1, 0, -262155, 1, 0, -262154, 1, 0, -262153, 1, 0, -262152, 1, 0, -262151, 1, 0, -262150, 1, 0, -262149, 1, 0, -262148, 1, 0, -262147, 1, 0, -262146, 1, 0, -262145, 0, 0, -327680, 0, 0, -327679, 1, 0, -327678, 1, 0, -327677, 1, 0, -327676, 1, 0, -327675, 1, 0, -327674, 1, 0, -327673, 1, 0, -327672, 1, 0, -327671, 1, 0, -327670, 1, 0, -327669, 1, 0, -327668, 1, 0, -327667, 1, 0, -196622, 1, 0, -196621, 1, 0, -196620, 1, 0, -196619, 1, 0, -196618, 1, 0, -196617, 1, 0, -196616, 1, 0, -196615, 1, 0, -196614, 1, 0, -196613, 1, 0, -196612, 1, 0, -196611, 1, 0, -196610, 1, 0, -196609, 0, 0, -262144, 0, 0, -262143, 1, 0, -262142, 1, 0, -262141, 1, 0, -262140, 1, 0, -262139, 1, 0, -262138, 1, 0, -262137, 1, 0, -262136, 1, 0, -262135, 1, 0, -262134, 1, 0, -262133, 1, 0, -262132, 1, 0, -262131, 1, 0, -131086, 1, 0, -131085, 1, 0, -131084, 1, 0, -131083, 1, 0, -131082, 1, 0, -131081, 1, 0, -131080, 1, 0, -131079, 1, 0, -131078, 1, 0, -131077, 1, 0, -131076, 1, 0, -131075, 1, 0, -131074, 1, 0, -131073, 1, 0, -196608, 1, 0, -196607, 1, 0, -196606, 1, 0, -196605, 1, 0, -196604, 1, 0, -196603, 1, 0, -196602, 1, 0, -196601, 1, 0, -196600, 1, 0, -196599, 1, 0, -196598, 1, 0, -196597, 1, 0, -196596, 1, 0, -196595, 1, 0, -65550, 1, 0, -65549, 1, 0, -65548, 1, 0, -65547, 1, 0, -65546, 1, 0, -65545, 1, 0, -65544, 2, 0, -65543, 2, 1, -131063, 1, 0, -131062, 1, 0, -131061, 1, 0, -131060, 1, 0, -131059, 1, 0, -65527, 1, 0, -65526, 1, 0, -65525, 1, 0, -65524, 1, 0, -65523, 1, 0, 9, 1, 0, 10, 1, 0, 11, 1, 0, 12, 1, 0, 13, 1, 0 ) +[node name="ObscureMap" parent="." instance=ExtResource("11")] +format = 2 +layer_0/tile_data = PackedInt32Array(-458766, 1, 0, -458765, 1, 0, -458764, 1, 0, -458763, 1, 0, -458762, 1, 0, -458761, 1, 0, -458760, 1, 0, -458759, 1, 0, -458758, 1, 0, -458757, 1, 0, -458756, 1, 0, -458755, 1, 0, -458754, 1, 0, -458753, 1, 0, -524288, 1, 0, -524287, 1, 0, -524286, 1, 0, -524285, 1, 0, -524284, 1, 0, -524283, 1, 0, -524282, 1, 0, -524281, 1, 0, -524280, 1, 0, -524279, 1, 0, -524278, 1, 0, -524277, 1, 0, -524276, 1, 0, -524275, 1, 0, -393230, 1, 0, -393229, 1, 0, -393228, 1, 0, -393227, 1, 0, -393226, 1, 0, -393225, 1, 0, -393224, 1, 0, -393223, 1, 0, -393222, 1, 0, -393221, 1, 0, -393220, 1, 0, -393219, 1, 0, -393218, 1, 0, -393217, 1, 0, -458752, 1, 0, -458751, 1, 0, -458750, 1, 0, -458749, 1, 0, -458748, 1, 0, -458747, 1, 0, -458746, 1, 0, -458745, 1, 0, -458744, 1, 0, -458743, 1, 0, -458742, 1, 0, -458741, 1, 0, -458740, 1, 0, -458739, 1, 0, -327694, 1, 0, -327693, 1, 0, -327692, 1, 0, -327691, 1, 0, -327690, 1, 0, -327689, 1, 0, -327688, 1, 0, -327687, 1, 0, -327686, 1, 0, -327685, 1, 0, -327684, 1, 0, -327683, 1, 0, -327682, 1, 0, -327681, 1, 0, -393216, 1, 0, -393215, 1, 0, -393214, 1, 0, -393213, 1, 0, -393212, 1, 0, -393211, 1, 0, -393210, 1, 0, -393209, 1, 0, -393208, 1, 0, -393207, 1, 0, -393206, 1, 0, -393205, 1, 0, -393204, 1, 0, -393203, 1, 0, -262158, 1, 0, -262157, 1, 0, -262156, 1, 0, -262155, 1, 0, -262154, 1, 0, -262153, 1, 0, -262152, 1, 0, -262151, 1, 0, -262150, 1, 0, -262149, 1, 0, -262148, 1, 0, -262147, 1, 0, -262146, 1, 0, -262145, 0, 0, -327680, 0, 0, -327679, 1, 0, -327678, 1, 0, -327677, 1, 0, -327676, 1, 0, -327675, 1, 0, -327674, 1, 0, -327673, 1, 0, -327672, 1, 0, -327671, 1, 0, -327670, 1, 0, -327669, 1, 0, -327668, 1, 0, -327667, 1, 0, -196622, 1, 0, -196621, 1, 0, -196620, 1, 0, -196619, 1, 0, -196618, 1, 0, -196617, 1, 0, -196616, 1, 0, -196615, 1, 0, -196614, 1, 0, -196613, 1, 0, -196612, 1, 0, -196611, 1, 0, -196610, 1, 0, -196609, 0, 0, -262144, 0, 0, -262143, 1, 0, -262142, 1, 0, -262141, 1, 0, -262140, 1, 0, -262139, 1, 0, -262138, 1, 0, -262137, 1, 0, -262136, 1, 0, -262135, 1, 0, -262134, 1, 0, -262133, 1, 0, -262132, 1, 0, -262131, 1, 0, -131086, 1, 0, -131085, 1, 0, -131084, 1, 0, -131083, 1, 0, -131082, 1, 0, -131081, 1, 0, -131080, 1, 0, -131079, 1, 0, -131078, 1, 0, -131077, 1, 0, -131076, 1, 0, -131075, 1, 0, -131074, 1, 0, -131073, 1, 0, -196608, 1, 0, -196607, 1, 0, -196606, 1, 0, -196605, 1, 0, -196604, 1, 0, -196603, 1, 0, -196602, 1, 0, -196601, 1, 0, -196600, 1, 0, -196599, 1, 0, -196598, 1, 0, -196597, 1, 0, -196596, 1, 0, -196595, 1, 0, -65550, 1, 0, -65549, 1, 0, -65548, 1, 0, -65547, 1, 0, -65546, 1, 0, -65545, 1, 0, -65544, 2, 0, -65543, 2, 1, -131063, 1, 0, -131062, 1, 0, -131061, 1, 0, -131060, 1, 0, -131059, 1, 0, -65527, 1, 0, -65526, 1, 0, -65525, 1, 0, -65524, 1, 0, -65523, 1, 0, 9, 1, 0, 10, 1, 0, 11, 1, 0, 12, 1, 0, 13, 1, 0) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="GameCamera" parent="." instance=ExtResource("3")] [node name="Actors" type="Node2D" parent="."] -[node name="Player" parent="Actors" instance=ExtResource( 6 )] -position = Vector2( -40, 8 ) +[node name="Player" parent="Actors" instance=ExtResource("6")] +position = Vector2(-40, 8) -[node name="Exit" parent="Actors" instance=ExtResource( 2 )] -position = Vector2( 45, 5 ) +[node name="Exit" parent="Actors" instance=ExtResource("2")] +position = Vector2(45, 5) -[node name="Note" parent="Actors" instance=ExtResource( 12 )] -position = Vector2( -5, -37 ) +[node name="Note" parent="Actors" instance=ExtResource("12")] +position = Vector2(-5, -37) [node name="arrows" type="Sprite2D" parent="."] -position = Vector2( -13, 42 ) -texture = ExtResource( 9 ) +position = Vector2(-13, 42) +texture = ExtResource("9") hframes = 6 vframes = 4 frame = 7 -region_rect = Rect2( 0, 0, 18, 18 ) -script = ExtResource( 10 ) +region_rect = Rect2(0, 0, 18, 18) +script = ExtResource("10") [node name="arrows_label" type="Label" parent="arrows"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 12.0 offset_top = -7.0 offset_right = 42.0 offset_bottom = 6.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = ExtResource( 8 ) +theme_override_fonts/font = ExtResource("8") text = "move" -__meta__ = { -"_edit_use_anchors_": false -} [editable path="GameCamera"] diff --git a/src/map/1-2.tscn b/src/map/1-2.tscn index c2f15be..3d6d346 100644 --- a/src/map/1-2.tscn +++ b/src/map/1-2.tscn @@ -1,67 +1,64 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=13 format=3 uid="uid://b8uxax82g2s1b"] -[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] -[ext_resource path="res://src/stage/Stage.gd" type="Script" id=7] -[ext_resource path="res://media/font/m6x11.tres" type="FontFile" id=8] -[ext_resource path="res://media/image/btn.png" type="Texture2D" id=9] -[ext_resource path="res://src/menu/hide_on_level_select.gd" type="Script" id=10] -[ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=11] -[ext_resource path="res://src/actor/Note.tscn" type="PackedScene" id=12] +[ext_resource type="PackedScene" uid="uid://ccgl186gosdcp" path="res://src/stage/SolidTileMap.tscn" id="1"] +[ext_resource type="PackedScene" path="res://src/actor/Exit.tscn" id="2"] +[ext_resource type="PackedScene" path="res://src/stage/GameCamera.tscn" id="3"] +[ext_resource type="PackedScene" uid="uid://c3tsbvbfy7tmu" path="res://src/stage/DetailTileMap.tscn" id="4"] +[ext_resource type="PackedScene" path="res://src/stage/SpikeTileMap.tscn" id="5"] +[ext_resource type="PackedScene" uid="uid://bleh1qiiufduy" path="res://src/actor/Player.tscn" id="6"] +[ext_resource type="Script" path="res://src/stage/Stage.gd" id="7"] +[ext_resource type="FontVariation" uid="uid://cntu078xgj2oj" path="res://media/font/m6x11.tres" id="8"] +[ext_resource type="Texture2D" uid="uid://cmyhp4lmcy3di" path="res://media/image/btn.png" id="9"] +[ext_resource type="Script" path="res://src/menu/hide_on_level_select.gd" id="10"] +[ext_resource type="PackedScene" path="res://src/stage/ObscureMap.tscn" id="11"] +[ext_resource type="PackedScene" path="res://src/actor/Note.tscn" id="12"] [node name="Stage" type="Node2D"] -script = ExtResource( 7 ) +script = ExtResource("7") -[node name="SolidTileMap" parent="." instance=ExtResource( 1 )] -tile_data = PackedInt32Array( -589839, 536870913, 0, -589838, 536870913, 0, -589837, 536870913, 0, -589836, 536870913, 0, -589835, 536870913, 0, -589834, 536870913, 0, -589833, 536870913, 0, -589832, 536870913, 0, -589831, 536870913, 0, -589830, 536870913, 0, -589829, 536870913, 0, -589828, 536870913, 0, -589827, 536870913, 0, -589826, 536870913, 0, -589825, 536870913, 0, -655360, 536870913, 0, -655359, 536870913, 0, -655358, 536870913, 0, -655357, 536870913, 0, -655356, 536870913, 0, -655355, 536870913, 0, -655354, 536870913, 0, -655353, 536870913, 0, -655352, 536870913, 0, -655351, 536870913, 0, -655350, 536870913, 0, -655349, 536870913, 0, -655348, 536870913, 0, -655347, 536870913, 0, -655346, 536870913, 0, -524303, 536870913, 0, -589810, 536870913, 0, -458767, 536870913, 0, -524274, 536870913, 0, -393231, 536870913, 0, -458738, 536870913, 0, -327695, 536870913, 0, -393202, 536870913, 0, -262159, 536870913, 0, -327666, 536870913, 0, -196623, 536870913, 0, -196613, 0, 0, -196612, 536870912, 1, -196611, 536870912, 0, -196610, 536870912, 1, -196609, 0, 0, -262142, 536870912, 1, -262141, 0, 0, -262140, 536870912, 1, -262139, 0, 0, -262138, 536870912, 1, -262137, 0, 0, -262130, 536870913, 0, -131087, 536870913, 0, -131077, 0, 0, -196601, 0, 0, -196594, 536870913, 0, -65551, 536870913, 0, -65550, 536870913, 0, -65549, 536870913, 0, -65548, 536870913, 0, -65547, 536870913, 0, -65546, 1, 0, -65545, 1, 0, -65544, 0, 0, -65543, 536870912, 1, -65542, 0, 0, -65541, 0, 1, -131065, 536870912, 1, -131058, 536870913, 0, -8, 0, 0, -65533, 0, 0, -65532, 536870912, 0, -65531, 536870912, 1, -65530, 0, 0, -65529, 0, 0, -65528, 536870913, 0, -65527, 536870913, 0, -65526, 536870913, 0, -65525, 536870913, 0, -65524, 536870913, 0, -65523, 536870913, 0, -65522, 536870913, 0, 65528, 536870912, 1, 3, 536870912, 1, 131064, 536870912, 0, 65539, 0, 0, 196600, 536870912, 1, 196607, 0, 0, 131072, 536870912, 0, 131073, 536870912, 1, 131074, 0, 0, 131075, 0, 0, 262136, 0, 0, 262143, 0, 0, 327672, 0, 0, 327673, 536870912, 1, 327674, 0, 0, 327675, 536870912, 1, 327676, 536870912, 0, 327677, 536870912, 0, 327678, 536870912, 1, 327679, 0, 0 ) +[node name="SolidTileMap" parent="." instance=ExtResource("1")] +layer_0/tile_data = PackedInt32Array(-589839, 536870913, 0, -589838, 536870913, 0, -589837, 536870913, 0, -589836, 536870913, 0, -589835, 536870913, 0, -589834, 536870913, 0, -589833, 536870913, 0, -589832, 536870913, 0, -589831, 536870913, 0, -589830, 536870913, 0, -589829, 536870913, 0, -589828, 536870913, 0, -589827, 536870913, 0, -589826, 536870913, 0, -589825, 536870913, 0, -655360, 536870913, 0, -655359, 536870913, 0, -655358, 536870913, 0, -655357, 536870913, 0, -655356, 536870913, 0, -655355, 536870913, 0, -655354, 536870913, 0, -655353, 536870913, 0, -655352, 536870913, 0, -655351, 536870913, 0, -655350, 536870913, 0, -655349, 536870913, 0, -655348, 536870913, 0, -655347, 536870913, 0, -655346, 536870913, 0, -524303, 536870913, 0, -589810, 536870913, 0, -458767, 536870913, 0, -524274, 536870913, 0, -393231, 536870913, 0, -458738, 536870913, 0, -327695, 536870913, 0, -393202, 536870913, 0, -262159, 536870913, 0, -327666, 536870913, 0, -196623, 536870913, 0, -196613, 0, 0, -196612, 536870912, 1, -196611, 536870912, 0, -196610, 536870912, 1, -196609, 0, 0, -262142, 536870912, 1, -262141, 0, 0, -262140, 536870912, 1, -262139, 0, 0, -262138, 536870912, 1, -262137, 0, 0, -262130, 536870913, 0, -131087, 536870913, 0, -131077, 0, 0, -196601, 0, 0, -196594, 536870913, 0, -65551, 536870913, 0, -65550, 536870913, 0, -65549, 536870913, 0, -65548, 536870913, 0, -65547, 536870913, 0, -65546, 1, 0, -65545, 1, 0, -65544, 0, 0, -65543, 536870912, 1, -65542, 0, 0, -65541, 0, 1, -131065, 536870912, 1, -131058, 536870913, 0, -8, 0, 0, -65533, 0, 0, -65532, 536870912, 0, -65531, 536870912, 1, -65530, 0, 0, -65529, 0, 0, -65528, 536870913, 0, -65527, 536870913, 0, -65526, 536870913, 0, -65525, 536870913, 0, -65524, 536870913, 0, -65523, 536870913, 0, -65522, 536870913, 0, 65528, 536870912, 1, 3, 536870912, 1, 131064, 536870912, 0, 65539, 0, 0, 196600, 536870912, 1, 196607, 0, 0, 131072, 536870912, 0, 131073, 536870912, 1, 131074, 0, 0, 131075, 0, 0, 262136, 0, 0, 262143, 0, 0, 327672, 0, 0, 327673, 536870912, 1, 327674, 0, 0, 327675, 536870912, 1, 327676, 536870912, 0, 327677, 536870912, 0, 327678, 536870912, 1, 327679, 0, 0) -[node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] +[node name="SpikeTileMap" parent="." instance=ExtResource("5")] +format = 2 -[node name="DetailTileMap" parent="." instance=ExtResource( 4 )] +[node name="DetailTileMap" parent="." instance=ExtResource("4")] z_index = -11 -tile_data = PackedInt32Array( -458747, 2, 0, -458746, 0, 0, -458745, -1610612734, 0, -327687, 536870916, 3, -327686, 536870916, 0, -327685, 4, 3, -393211, -1073741822, 0, -393210, 0, 0, -393209, 1610612738, 0, -262151, 4, 2, -262150, 4, 1, -262149, 4, 0, -262148, 4, 3, -327674, 1, 0, -196614, 4, 2, -131078, 536870916, 3, -131076, 4, 1, -131075, 4, 3, -131074, 1073741829, 2, -131073, 5, 0, -196608, 1610612741, 2, -196606, 4, 2, -196605, 4, 0, -196604, 4, 3, -65548, 5, 2, -65547, -1610612731, 2, -65540, 536870916, 2, -131070, 4, 2, -131069, 4, 1, -131068, 4, 3, -12, -1073741819, 0, -11, -1073741819, 0, -10, -1073741819, 1, -9, -1073741819, 1, -6, 4, 2, -5, 4, 0, -4, 536870916, 2, 65524, -1073741819, 2, 65525, 1610612741, 2, 65529, -1610612731, 2, 65531, 0, 0, 7, 5, 1, 131061, 0, 0, 131062, -1073741823, 0, 131063, -1073741823, 0, 131065, -536870907, 2, 131071, 536870916, 3, 65536, 536870916, 0, 65537, 4, 3, 65538, 5, 2, 65540, 4, 3, 65542, 2, 0, 65543, 5, 1, 65544, -1610612734, 0, 196599, 536870916, 3, 196601, 536870916, 0, 196602, 4, 3, 196604, 5, 0, 131076, 536870916, 0, 131077, 4, 3, 131078, 5, 2, 131079, 5, 0, 131080, -1610612731, 2, 262135, 536870916, 3, 262137, 4, 1, 262138, 4, 3, 262140, 5, 1, 196608, 536870916, 1, 196609, 536870916, 0, 196610, 4, 1, 196611, 4, 0, 196612, 536870916, 2, 196614, 5, 0, 196615, 5, 0, 196616, 5, 0, 327670, 4, 2, 327671, 4, 1, 262150, -1073741819, 2, 262151, 5, 0, 262152, 1610612741, 2, 393206, 536870916, 3, 393207, 4, 0, 393208, 4, 1, 393209, 4, 0, 393210, 536870916, 2, 458742, 4, 2, 458743, 4, 0, 458744, 536870916, 2 ) +layer_0/tile_data = PackedInt32Array(-458747, 2, 0, -458746, 0, 0, -458745, -1610612734, 0, -327687, 536870916, 3, -327686, 536870916, 0, -327685, 4, 3, -393211, -1073741822, 0, -393210, 0, 0, -393209, 1610612738, 0, -262151, 4, 2, -262150, 4, 1, -262149, 4, 0, -262148, 4, 3, -327674, 1, 0, -196614, 4, 2, -131078, 536870916, 3, -131076, 4, 1, -131075, 4, 3, -131074, 1073741829, 2, -131073, 5, 0, -196608, 1610612741, 2, -196606, 4, 2, -196605, 4, 0, -196604, 4, 3, -65548, 5, 2, -65547, -1610612731, 2, -65540, 536870916, 2, -131070, 4, 2, -131069, 4, 1, -131068, 4, 3, -12, -1073741819, 0, -11, -1073741819, 0, -10, -1073741819, 1, -9, -1073741819, 1, -6, 4, 2, -5, 4, 0, -4, 536870916, 2, 65524, -1073741819, 2, 65525, 1610612741, 2, 65529, -1610612731, 2, 65531, 0, 0, 7, 5, 1, 131061, 0, 0, 131062, -1073741823, 0, 131063, -1073741823, 0, 131065, -536870907, 2, 131071, 536870916, 3, 65536, 536870916, 0, 65537, 4, 3, 65538, 5, 2, 65540, 4, 3, 65542, 2, 0, 65543, 5, 1, 65544, -1610612734, 0, 196599, 536870916, 3, 196601, 536870916, 0, 196602, 4, 3, 196604, 5, 0, 131076, 536870916, 0, 131077, 4, 3, 131078, 5, 2, 131079, 5, 0, 131080, -1610612731, 2, 262135, 536870916, 3, 262137, 4, 1, 262138, 4, 3, 262140, 5, 1, 196608, 536870916, 1, 196609, 536870916, 0, 196610, 4, 1, 196611, 4, 0, 196612, 536870916, 2, 196614, 5, 0, 196615, 5, 0, 196616, 5, 0, 327670, 4, 2, 327671, 4, 1, 262150, -1073741819, 2, 262151, 5, 0, 262152, 1610612741, 2, 393206, 536870916, 3, 393207, 4, 0, 393208, 4, 1, 393209, 4, 0, 393210, 536870916, 2, 458742, 4, 2, 458743, 4, 0, 458744, 536870916, 2) -[node name="ObscureMap" parent="." instance=ExtResource( 11 )] -tile_data = PackedInt32Array( -524302, 536870913, 0, -524301, 536870913, 0, -524300, 536870913, 0, -524299, 536870913, 0, -524298, 536870913, 0, -524297, 536870913, 0, -524296, 536870913, 0, -524295, 536870913, 0, -524294, 536870913, 0, -524293, 536870913, 0, -524292, 536870913, 0, -524291, 536870913, 0, -524290, 536870913, 0, -524289, 536870913, 0, -589824, 536870913, 0, -589823, 536870913, 0, -589822, 536870913, 0, -589821, 536870913, 0, -589820, 536870913, 0, -589819, 536870913, 0, -589818, 536870913, 0, -589817, 536870913, 0, -589816, 536870913, 0, -589815, 536870913, 0, -589814, 536870913, 0, -589813, 536870913, 0, -589812, 536870913, 0, -589811, 536870913, 0, -458766, 536870913, 0, -458765, 536870913, 0, -458764, 536870913, 0, -458763, 536870913, 0, -458762, 536870913, 0, -458761, 536870913, 0, -458760, 536870913, 0, -458759, 536870913, 0, -458758, 536870913, 0, -458757, 536870913, 0, -458756, 536870913, 0, -458755, 536870913, 0, -458754, 536870913, 0, -458753, 536870913, 0, -524288, 536870913, 0, -524287, 536870913, 0, -524286, 536870913, 0, -524285, 536870913, 0, -524284, 536870913, 0, -524283, 536870913, 0, -524282, 536870913, 0, -524281, 536870913, 0, -524280, 536870913, 0, -524279, 536870913, 0, -524278, 536870913, 0, -524277, 536870913, 0, -524276, 536870913, 0, -524275, 536870913, 0, -393230, 536870913, 0, -393229, 536870913, 0, -393228, 536870913, 0, -393227, 536870913, 0, -393226, 536870913, 0, -393225, 536870913, 0, -393224, 536870913, 0, -393223, 536870913, 0, -393222, 536870913, 0, -393221, 536870913, 0, -393220, 536870913, 0, -393219, 536870913, 0, -393218, 536870913, 0, -393217, 536870913, 0, -458752, 536870913, 0, -458751, 536870913, 0, -458750, 536870913, 0, -458749, 536870913, 0, -458748, 536870913, 0, -458747, 536870913, 0, -458746, 536870913, 0, -458745, 536870913, 0, -458744, 536870913, 0, -458743, 536870913, 0, -458742, 536870913, 0, -458741, 536870913, 0, -458740, 536870913, 0, -458739, 536870913, 0, -327694, 536870913, 0, -327693, 536870913, 0, -327692, 1, 0, -327691, 536870912, 0, -327690, 0, 0, -327689, 536870913, 0, -327688, 536870913, 0, -327687, 536870913, 0, -327686, 536870913, 0, -327685, 536870913, 0, -327684, 536870913, 0, -327683, 536870913, 0, -327682, 536870913, 0, -327681, 536870913, 0, -393216, 536870913, 0, -393215, 536870913, 0, -393214, 536870913, 0, -393213, 536870913, 0, -393212, 536870913, 0, -393211, 536870913, 0, -393210, 536870913, 0, -393209, 536870913, 0, -393208, 536870913, 0, -393207, 536870913, 0, -393206, 536870913, 0, -393205, 536870913, 0, -393204, 536870913, 0, -393203, 536870913, 0, -262158, 536870913, 0, -262157, 536870913, 0, -262156, 1, 0, -262155, 536870912, 0, -262154, 0, 0, -262153, 536870913, 0, -262152, 536870913, 0, -262151, 536870913, 0, -262150, 536870913, 0, -262149, 536870913, 0, -262148, 536870913, 0, -262147, 536870913, 0, -262146, 536870913, 0, -262145, 536870913, 0, -327680, 536870913, 0, -327679, 536870913, 0, -327678, 536870913, 0, -327677, 536870913, 0, -327676, 536870913, 0, -327675, 536870913, 0, -327674, 536870913, 0, -327673, 536870913, 0, -327672, 536870913, 0, -327671, 536870913, 0, -327670, 536870913, 0, -327669, 536870913, 0, -327668, 536870913, 0, -327667, 536870913, 0, -196622, 536870913, 0, -196621, 536870913, 0, -196620, 536870913, 0, -196619, 536870913, 0, -196618, 536870913, 0, -196617, 536870913, 0, -196616, 536870913, 0, -196615, 536870913, 0, -196614, 536870913, 0, -262144, 536870914, 1, -262143, 536870914, 0, -262136, 536870913, 0, -262135, 536870913, 0, -262134, 536870913, 0, -262133, 536870913, 0, -262132, 536870913, 0, -262131, 536870913, 0, -131086, 536870913, 0, -131085, 536870913, 0, -131084, 536870913, 0, -131083, 536870913, 0, -131082, 536870913, 0, -131081, 536870913, 0, -131080, 536870913, 0, -131079, 536870913, 0, -131078, 536870913, 0, -196600, 536870913, 0, -196599, 536870913, 0, -196598, 536870913, 0, -196597, 536870913, 0, -196596, 536870913, 0, -196595, 536870913, 0, -131064, 536870913, 0, -131063, 536870913, 0, -131062, 536870913, 0, -131061, 536870913, 0, -131060, 536870913, 0, -131059, 536870913, 0 ) +[node name="ObscureMap" parent="." instance=ExtResource("11")] +format = 2 +layer_0/tile_data = PackedInt32Array(-524302, 536870913, 0, -524301, 536870913, 0, -524300, 536870913, 0, -524299, 536870913, 0, -524298, 536870913, 0, -524297, 536870913, 0, -524296, 536870913, 0, -524295, 536870913, 0, -524294, 536870913, 0, -524293, 536870913, 0, -524292, 536870913, 0, -524291, 536870913, 0, -524290, 536870913, 0, -524289, 536870913, 0, -589824, 536870913, 0, -589823, 536870913, 0, -589822, 536870913, 0, -589821, 536870913, 0, -589820, 536870913, 0, -589819, 536870913, 0, -589818, 536870913, 0, -589817, 536870913, 0, -589816, 536870913, 0, -589815, 536870913, 0, -589814, 536870913, 0, -589813, 536870913, 0, -589812, 536870913, 0, -589811, 536870913, 0, -458766, 536870913, 0, -458765, 536870913, 0, -458764, 536870913, 0, -458763, 536870913, 0, -458762, 536870913, 0, -458761, 536870913, 0, -458760, 536870913, 0, -458759, 536870913, 0, -458758, 536870913, 0, -458757, 536870913, 0, -458756, 536870913, 0, -458755, 536870913, 0, -458754, 536870913, 0, -458753, 536870913, 0, -524288, 536870913, 0, -524287, 536870913, 0, -524286, 536870913, 0, -524285, 536870913, 0, -524284, 536870913, 0, -524283, 536870913, 0, -524282, 536870913, 0, -524281, 536870913, 0, -524280, 536870913, 0, -524279, 536870913, 0, -524278, 536870913, 0, -524277, 536870913, 0, -524276, 536870913, 0, -524275, 536870913, 0, -393230, 536870913, 0, -393229, 536870913, 0, -393228, 536870913, 0, -393227, 536870913, 0, -393226, 536870913, 0, -393225, 536870913, 0, -393224, 536870913, 0, -393223, 536870913, 0, -393222, 536870913, 0, -393221, 536870913, 0, -393220, 536870913, 0, -393219, 536870913, 0, -393218, 536870913, 0, -393217, 536870913, 0, -458752, 536870913, 0, -458751, 536870913, 0, -458750, 536870913, 0, -458749, 536870913, 0, -458748, 536870913, 0, -458747, 536870913, 0, -458746, 536870913, 0, -458745, 536870913, 0, -458744, 536870913, 0, -458743, 536870913, 0, -458742, 536870913, 0, -458741, 536870913, 0, -458740, 536870913, 0, -458739, 536870913, 0, -327694, 536870913, 0, -327693, 536870913, 0, -327692, 1, 0, -327691, 536870912, 0, -327690, 0, 0, -327689, 536870913, 0, -327688, 536870913, 0, -327687, 536870913, 0, -327686, 536870913, 0, -327685, 536870913, 0, -327684, 536870913, 0, -327683, 536870913, 0, -327682, 536870913, 0, -327681, 536870913, 0, -393216, 536870913, 0, -393215, 536870913, 0, -393214, 536870913, 0, -393213, 536870913, 0, -393212, 536870913, 0, -393211, 536870913, 0, -393210, 536870913, 0, -393209, 536870913, 0, -393208, 536870913, 0, -393207, 536870913, 0, -393206, 536870913, 0, -393205, 536870913, 0, -393204, 536870913, 0, -393203, 536870913, 0, -262158, 536870913, 0, -262157, 536870913, 0, -262156, 1, 0, -262155, 536870912, 0, -262154, 0, 0, -262153, 536870913, 0, -262152, 536870913, 0, -262151, 536870913, 0, -262150, 536870913, 0, -262149, 536870913, 0, -262148, 536870913, 0, -262147, 536870913, 0, -262146, 536870913, 0, -262145, 536870913, 0, -327680, 536870913, 0, -327679, 536870913, 0, -327678, 536870913, 0, -327677, 536870913, 0, -327676, 536870913, 0, -327675, 536870913, 0, -327674, 536870913, 0, -327673, 536870913, 0, -327672, 536870913, 0, -327671, 536870913, 0, -327670, 536870913, 0, -327669, 536870913, 0, -327668, 536870913, 0, -327667, 536870913, 0, -196622, 536870913, 0, -196621, 536870913, 0, -196620, 536870913, 0, -196619, 536870913, 0, -196618, 536870913, 0, -196617, 536870913, 0, -196616, 536870913, 0, -196615, 536870913, 0, -196614, 536870913, 0, -262144, 536870914, 1, -262143, 536870914, 0, -262136, 536870913, 0, -262135, 536870913, 0, -262134, 536870913, 0, -262133, 536870913, 0, -262132, 536870913, 0, -262131, 536870913, 0, -131086, 536870913, 0, -131085, 536870913, 0, -131084, 536870913, 0, -131083, 536870913, 0, -131082, 536870913, 0, -131081, 536870913, 0, -131080, 536870913, 0, -131079, 536870913, 0, -131078, 536870913, 0, -196600, 536870913, 0, -196599, 536870913, 0, -196598, 536870913, 0, -196597, 536870913, 0, -196596, 536870913, 0, -196595, 536870913, 0, -131064, 536870913, 0, -131063, 536870913, 0, -131062, 536870913, 0, -131061, 536870913, 0, -131060, 536870913, 0, -131059, 536870913, 0) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="GameCamera" parent="." instance=ExtResource("3")] [node name="Actors" type="Node2D" parent="."] -[node name="Player" parent="Actors" instance=ExtResource( 6 )] -position = Vector2( -48, 24 ) +[node name="Player" parent="Actors" instance=ExtResource("6")] +position = Vector2(-48, 24) -[node name="Exit" parent="Actors" instance=ExtResource( 2 )] -position = Vector2( 45, -19 ) +[node name="Exit" parent="Actors" instance=ExtResource("2")] +position = Vector2(45, -19) -[node name="Note" parent="Actors" instance=ExtResource( 12 )] -position = Vector2( -85, -45 ) +[node name="Note" parent="Actors" instance=ExtResource("12")] +position = Vector2(-85, -45) [node name="x" type="Sprite2D" parent="."] -position = Vector2( 0, -47 ) -texture = ExtResource( 9 ) +position = Vector2(0, -47) +texture = ExtResource("9") hframes = 6 vframes = 4 frame = 1 -region_rect = Rect2( 0, 0, 18, 18 ) -script = ExtResource( 10 ) +region_rect = Rect2(0, 0, 18, 18) +script = ExtResource("10") [node name="x_label" type="Label" parent="x"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 12.0 offset_top = -7.0 offset_right = 50.0 offset_bottom = 6.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = ExtResource( 8 ) +theme_override_fonts/font = ExtResource("8") text = "jump" -__meta__ = { -"_edit_use_anchors_": false -} [editable path="GameCamera"] diff --git a/src/map/1-3.tscn b/src/map/1-3.tscn index 3b96b4c..8fc7953 100644 --- a/src/map/1-3.tscn +++ b/src/map/1-3.tscn @@ -1,75 +1,75 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=14 format=3 uid="uid://dpd3hnlbtetjd"] -[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] -[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] -[ext_resource path="res://src/stage/Stage.gd" type="Script" id=8] -[ext_resource path="res://media/font/m6x11.tres" type="FontFile" id=9] -[ext_resource path="res://media/image/btn.png" type="Texture2D" id=10] -[ext_resource path="res://src/menu/hide_on_level_select.gd" type="Script" id=11] -[ext_resource path="res://src/actor/Note.tscn" type="PackedScene" id=12] -[ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=13] +[ext_resource type="PackedScene" uid="uid://ccgl186gosdcp" path="res://src/stage/SolidTileMap.tscn" id="1"] +[ext_resource type="PackedScene" path="res://src/actor/Box.tscn" id="2"] +[ext_resource type="PackedScene" path="res://src/actor/Exit.tscn" id="3"] +[ext_resource type="PackedScene" path="res://src/stage/GameCamera.tscn" id="4"] +[ext_resource type="PackedScene" uid="uid://c3tsbvbfy7tmu" path="res://src/stage/DetailTileMap.tscn" id="5"] +[ext_resource type="PackedScene" path="res://src/stage/SpikeTileMap.tscn" id="6"] +[ext_resource type="PackedScene" uid="uid://bleh1qiiufduy" path="res://src/actor/Player.tscn" id="7"] +[ext_resource type="Script" path="res://src/stage/Stage.gd" id="8"] +[ext_resource type="FontVariation" uid="uid://cntu078xgj2oj" path="res://media/font/m6x11.tres" id="9"] +[ext_resource type="Texture2D" uid="uid://cmyhp4lmcy3di" path="res://media/image/btn.png" id="10"] +[ext_resource type="Script" path="res://src/menu/hide_on_level_select.gd" id="11"] +[ext_resource type="PackedScene" path="res://src/actor/Note.tscn" id="12"] +[ext_resource type="PackedScene" path="res://src/stage/ObscureMap.tscn" id="13"] [node name="Stage" type="Node2D"] -script = ExtResource( 8 ) +script = ExtResource("8") -[node name="SolidTileMap" parent="." instance=ExtResource( 1 )] -tile_data = PackedInt32Array( -589842, 536870913, 0, -589841, 536870913, 0, -589840, 536870913, 0, -589839, 536870913, 0, -589838, 536870913, 0, -589837, 536870913, 0, -589836, 536870913, 0, -589835, 536870913, 0, -589834, 536870913, 0, -524306, 536870913, 0, -524298, 536870913, 0, -458770, 536870913, 0, -458762, 536870912, 0, -458761, 0, 1, -458760, 0, 0, -458759, 0, 1, -458758, 536870912, 0, -458757, 0, 1, -458756, 0, 1, -458755, 0, 0, -458754, 0, 1, -458753, 536870912, 0, -524288, 0, 1, -524287, 0, 1, -524286, 536870912, 0, -524285, 0, 1, -524284, 0, 0, -393234, 536870913, 0, -393226, 0, 1, -458748, 0, 1, -327698, 536870913, 0, -327690, 536870912, 0, -393212, 0, 0, -393211, 0, 1, -393210, 536870912, 0, -262162, 536870913, 0, -262154, 536870912, 0, -262153, 0, 1, -262152, 0, 1, -262151, 0, 0, -262150, 0, 1, -262149, 536870912, 0, -327674, 536870912, 0, -196626, 536870913, 0, -262138, 0, 1, -131090, 536870913, 0, -196602, 536870912, 0, -65554, 536870913, 0, -65553, 536870913, 0, -65552, 536870913, 0, -65551, 536870913, 0, -65550, 536870913, 0, -65549, 536870912, 0, -65548, 0, 1, -65547, 0, 0, -65546, 0, 1, -65545, 536870912, 0, -65544, 536870912, 0, -131066, 0, 1, -13, 536870912, 0, -65530, 536870912, 0, 65523, 0, 1, 65534, 536870912, 0, 65535, 0, 1, 0, 0, 0, 1, 0, 1, 2, 536870912, 0, 3, 0, 1, 4, 0, 0, 5, 0, 1, 6, 536870912, 0, 131059, 0, 0, 131070, 0, 1, 196595, 0, 1, 196606, 0, 0, 262131, 536870912, 0, 262142, 0, 1, 327667, 536870912, 0, 327668, 0, 1, 327669, 0, 0, 327670, 0, 1, 327671, 536870912, 0, 327672, 0, 1, 327673, 0, 1, 327674, 0, 0, 327675, 0, 1, 327676, 536870912, 0, 327677, 0, 1, 327678, 536870912, 0 ) +[node name="SolidTileMap" parent="." instance=ExtResource("1")] +layer_0/tile_data = PackedInt32Array(-589842, 536870913, 0, -589841, 536870913, 0, -589840, 536870913, 0, -589839, 536870913, 0, -589838, 536870913, 0, -589837, 536870913, 0, -589836, 536870913, 0, -589835, 536870913, 0, -589834, 536870913, 0, -524306, 536870913, 0, -524298, 536870913, 0, -458770, 536870913, 0, -458762, 536870912, 0, -458761, 0, 1, -458760, 0, 0, -458759, 0, 1, -458758, 536870912, 0, -458757, 0, 1, -458756, 0, 1, -458755, 0, 0, -458754, 0, 1, -458753, 536870912, 0, -524288, 0, 1, -524287, 0, 1, -524286, 536870912, 0, -524285, 0, 1, -524284, 0, 0, -393234, 536870913, 0, -393226, 0, 1, -458748, 0, 1, -327698, 536870913, 0, -327690, 536870912, 0, -393212, 0, 0, -393211, 0, 1, -393210, 536870912, 0, -262162, 536870913, 0, -262154, 536870912, 0, -262153, 0, 1, -262152, 0, 1, -262151, 0, 0, -262150, 0, 1, -262149, 536870912, 0, -327674, 536870912, 0, -196626, 536870913, 0, -262138, 0, 1, -131090, 536870913, 0, -196602, 536870912, 0, -65554, 536870913, 0, -65553, 536870913, 0, -65552, 536870913, 0, -65551, 536870913, 0, -65550, 536870913, 0, -65549, 536870912, 0, -65548, 0, 1, -65547, 0, 0, -65546, 0, 1, -65545, 536870912, 0, -65544, 536870912, 0, -131066, 0, 1, -13, 536870912, 0, -65530, 536870912, 0, 65523, 0, 1, 65534, 536870912, 0, 65535, 0, 1, 0, 0, 0, 1, 0, 1, 2, 536870912, 0, 3, 0, 1, 4, 0, 0, 5, 0, 1, 6, 536870912, 0, 131059, 0, 0, 131070, 0, 1, 196595, 0, 1, 196606, 0, 0, 262131, 536870912, 0, 262142, 0, 1, 327667, 536870912, 0, 327668, 0, 1, 327669, 0, 0, 327670, 0, 1, 327671, 536870912, 0, 327672, 0, 1, 327673, 0, 1, 327674, 0, 0, 327675, 0, 1, 327676, 536870912, 0, 327677, 0, 1, 327678, 536870912, 0) -[node name="SpikeTileMap" parent="." instance=ExtResource( 6 )] +[node name="SpikeTileMap" parent="." instance=ExtResource("6")] +format = 2 -[node name="DetailTileMap" parent="." instance=ExtResource( 5 )] +[node name="DetailTileMap" parent="." instance=ExtResource("5")] z_index = -11 -tile_data = PackedInt32Array( -524295, 536870916, 3, -524294, 536870916, 0, -524293, 536870916, 2, -589821, 536870916, 3, -589820, 536870916, 1, -589819, 536870916, 2, -458766, 5, 2, -458765, -1610612731, 2, -524283, 536870916, 1, -524282, 4, 3, -393230, -1073741819, 0, -393229, -1073741819, 0, -393228, -1073741819, 1, -393227, -1073741819, 1, -393223, 4, 2, -393222, 4, 1, -393221, 4, 3, -393218, 5, 1, -458749, 4, 2, -458747, 4, 0, -458746, 4, 3, -327694, -1073741819, 2, -327693, 1610612741, 2, -327687, 4, 2, -327686, 4, 0, -327685, 4, 3, -327682, 1610612741, 2, -393209, 4, 3, -327678, 5, 2, -327677, 5, 0, -327676, -1610612731, 2, -327675, 4, 2, -327673, 4, 0, -327672, 4, 3, -196614, 1073741829, 2, -196613, 1610612741, 2, -262142, 5, 0, -262141, 5, 0, -262140, 5, 0, -262137, 536870916, 2, -131076, 536870916, 3, -131075, 4, 0, -131074, 536870916, 2, -196606, -1073741819, 2, -196605, 5, 0, -196604, 1610612741, 2, -65540, 536870916, 3, -65539, 4, 1, -65538, 536870916, 2, -131072, 536870916, 3, -131071, 4, 0, -131070, 4, 3, -131069, 5, 1, -11, 1073741829, 2, -10, 5, 0, -9, 1610612741, 2, -65536, 4, 2, -65535, 536870916, 1, -65534, 4, 3, -65533, 5, 1, 131057, 536870916, 3, 131058, 536870916, 0, 131060, 4, 0, 131061, 4, 1, 131062, 4, 3, 131071, -1610612731, 2, 65536, 4, 2, 65537, 4, 0, 65538, 536870916, 2, 65541, 5, 1, 196593, 536870916, 3, 196594, 536870916, 1, 196596, 4, 1, 196597, 4, 0, 196598, 4, 3, 196607, -1610612731, 0, 131077, 5, 1, 262129, 4, 2, 262130, 536870916, 0, 262132, 4, 0, 262133, 4, 1, 262134, 536870916, 2, 262138, 5, 2, 262139, 5, 0, 262140, 5, 0, 262141, 536870917, 2, 262143, -536870907, 2, 196613, 5, 0, 327666, 4, 2 ) +layer_0/tile_data = PackedInt32Array(-524295, 536870916, 3, -524294, 536870916, 0, -524293, 536870916, 2, -589821, 536870916, 3, -589820, 536870916, 1, -589819, 536870916, 2, -458766, 5, 2, -458765, -1610612731, 2, -524283, 536870916, 1, -524282, 4, 3, -393230, -1073741819, 0, -393229, -1073741819, 0, -393228, -1073741819, 1, -393227, -1073741819, 1, -393223, 4, 2, -393222, 4, 1, -393221, 4, 3, -393218, 5, 1, -458749, 4, 2, -458747, 4, 0, -458746, 4, 3, -327694, -1073741819, 2, -327693, 1610612741, 2, -327687, 4, 2, -327686, 4, 0, -327685, 4, 3, -327682, 1610612741, 2, -393209, 4, 3, -327678, 5, 2, -327677, 5, 0, -327676, -1610612731, 2, -327675, 4, 2, -327673, 4, 0, -327672, 4, 3, -196614, 1073741829, 2, -196613, 1610612741, 2, -262142, 5, 0, -262141, 5, 0, -262140, 5, 0, -262137, 536870916, 2, -131076, 536870916, 3, -131075, 4, 0, -131074, 536870916, 2, -196606, -1073741819, 2, -196605, 5, 0, -196604, 1610612741, 2, -65540, 536870916, 3, -65539, 4, 1, -65538, 536870916, 2, -131072, 536870916, 3, -131071, 4, 0, -131070, 4, 3, -131069, 5, 1, -11, 1073741829, 2, -10, 5, 0, -9, 1610612741, 2, -65536, 4, 2, -65535, 536870916, 1, -65534, 4, 3, -65533, 5, 1, 131057, 536870916, 3, 131058, 536870916, 0, 131060, 4, 0, 131061, 4, 1, 131062, 4, 3, 131071, -1610612731, 2, 65536, 4, 2, 65537, 4, 0, 65538, 536870916, 2, 65541, 5, 1, 196593, 536870916, 3, 196594, 536870916, 1, 196596, 4, 1, 196597, 4, 0, 196598, 4, 3, 196607, -1610612731, 0, 131077, 5, 1, 262129, 4, 2, 262130, 536870916, 0, 262132, 4, 0, 262133, 4, 1, 262134, 536870916, 2, 262138, 5, 2, 262139, 5, 0, 262140, 5, 0, 262141, 536870917, 2, 262143, -536870907, 2, 196613, 5, 0, 327666, 4, 2) -[node name="ObscureMap" parent="." instance=ExtResource( 13 )] -tile_data = PackedInt32Array( -524305, 536870913, 0, -524304, 536870913, 0, -524303, 536870913, 0, -524302, 536870913, 0, -524301, 536870913, 0, -524300, 536870913, 0, -524299, 536870913, 0, -458769, 536870913, 0, -458768, 536870913, 0, -458767, 536870913, 0, -458766, 536870913, 0, -458765, 536870913, 0, -458764, 536870913, 0, -458763, 536870913, 0, -393233, 536870913, 0, -393232, 536870913, 0, -393231, 536870913, 0, -393230, 536870913, 0, -393229, 536870913, 0, -393228, 536870913, 0, -393227, 536870913, 0, -327697, 536870913, 0, -327696, 536870913, 0, -327695, 536870913, 0, -327694, 536870913, 0, -327693, 536870913, 0, -327692, 536870913, 0, -327691, 536870913, 0, -262161, 536870913, 0, -262160, 0, 0, -262159, 0, 0, -262158, 536870913, 0, -262157, 1, 0, -262156, 1, 0, -262155, 536870913, 0, -196625, 536870913, 0, -196624, 0, 0, -196623, 0, 0, -196622, 536870913, 0, -196621, 1, 0, -196620, 1, 0, -196619, 536870913, 0, -196618, 536870913, 0, -196617, 536870913, 0, -196616, 2, 0, -131089, 536870913, 0, -131088, 536870913, 0, -131087, 536870913, 0, -131086, 536870913, 0, -131085, 536870913, 0, -131084, 536870913, 0, -131083, 536870913, 0, -131082, 536870913, 0, -131081, 536870913, 0, -131080, 2, 1 ) +[node name="ObscureMap" parent="." instance=ExtResource("13")] +format = 2 +layer_0/tile_data = PackedInt32Array(-524305, 536870913, 0, -524304, 536870913, 0, -524303, 536870913, 0, -524302, 536870913, 0, -524301, 536870913, 0, -524300, 536870913, 0, -524299, 536870913, 0, -458769, 536870913, 0, -458768, 536870913, 0, -458767, 536870913, 0, -458766, 536870913, 0, -458765, 536870913, 0, -458764, 536870913, 0, -458763, 536870913, 0, -393233, 536870913, 0, -393232, 536870913, 0, -393231, 536870913, 0, -393230, 536870913, 0, -393229, 536870913, 0, -393228, 536870913, 0, -393227, 536870913, 0, -327697, 536870913, 0, -327696, 536870913, 0, -327695, 536870913, 0, -327694, 536870913, 0, -327693, 536870913, 0, -327692, 536870913, 0, -327691, 536870913, 0, -262161, 536870913, 0, -262160, 0, 0, -262159, 0, 0, -262158, 536870913, 0, -262157, 1, 0, -262156, 1, 0, -262155, 536870913, 0, -196625, 536870913, 0, -196624, 0, 0, -196623, 0, 0, -196622, 536870913, 0, -196621, 1, 0, -196620, 1, 0, -196619, 536870913, 0, -196618, 536870913, 0, -196617, 536870913, 0, -196616, 2, 0, -131089, 536870913, 0, -131088, 536870913, 0, -131087, 536870913, 0, -131086, 536870913, 0, -131085, 536870913, 0, -131084, 536870913, 0, -131083, 536870913, 0, -131082, 536870913, 0, -131081, 536870913, 0, -131080, 2, 1) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] -position = Vector2( -24, -16 ) +[node name="GameCamera" parent="." instance=ExtResource("4")] +position = Vector2(-24, -16) [node name="Actors" type="Node2D" parent="."] -[node name="Player" parent="Actors" instance=ExtResource( 7 )] -position = Vector2( -92, 24 ) +[node name="Player" parent="Actors" instance=ExtResource("7")] +position = Vector2(-92, 24) -[node name="Exit" parent="Actors" instance=ExtResource( 3 )] -position = Vector2( -67, -51 ) +[node name="Exit" parent="Actors" instance=ExtResource("3")] +position = Vector2(-67, -51) -[node name="Box" parent="Actors" instance=ExtResource( 2 )] -position = Vector2( -64, 24 ) +[node name="Box" parent="Actors" instance=ExtResource("2")] +position = Vector2(-64, 24) -[node name="Box2" parent="Actors" instance=ExtResource( 2 )] -position = Vector2( 14, -8 ) +[node name="Box2" parent="Actors" instance=ExtResource("2")] +position = Vector2(14, -8) -[node name="Box3" parent="Actors" instance=ExtResource( 2 )] -position = Vector2( 11, -16 ) +[node name="Box3" parent="Actors" instance=ExtResource("2")] +position = Vector2(11, -16) -[node name="Note" parent="Actors" instance=ExtResource( 12 )] -position = Vector2( -125, -37 ) +[node name="Note" parent="Actors" instance=ExtResource("12")] +position = Vector2(-125, -37) [node name="return" type="Sprite2D" parent="."] -position = Vector2( 15, 36 ) -texture = ExtResource( 10 ) +position = Vector2(15, 36) +texture = ExtResource("10") hframes = 3 vframes = 4 frame = 10 -region_rect = Rect2( 0, 0, 18, 18 ) -script = ExtResource( 11 ) +region_rect = Rect2(0, 0, 18, 18) +script = ExtResource("11") [node name="esc_label" type="Label" parent="return"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 15.0 offset_top = -6.0 offset_right = 45.0 offset_bottom = 7.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = ExtResource( 9 ) +theme_override_fonts/font = ExtResource("9") text = "menu" [editable path="GameCamera"] diff --git a/src/map/1-4.tscn b/src/map/1-4.tscn index 6799d8c..65a17a3 100644 --- a/src/map/1-4.tscn +++ b/src/map/1-4.tscn @@ -1,74 +1,71 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=14 format=3 uid="uid://2e2waiwh22b6"] -[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] -[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] -[ext_resource path="res://src/stage/Stage.gd" type="Script" id=8] -[ext_resource path="res://media/font/m6x11.tres" type="FontFile" id=9] -[ext_resource path="res://media/image/btn.png" type="Texture2D" id=10] -[ext_resource path="res://src/menu/hide_on_level_select.gd" type="Script" id=11] -[ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=12] -[ext_resource path="res://src/actor/Note.tscn" type="PackedScene" id=13] +[ext_resource type="PackedScene" uid="uid://ccgl186gosdcp" path="res://src/stage/SolidTileMap.tscn" id="1"] +[ext_resource type="PackedScene" path="res://src/actor/Box.tscn" id="2"] +[ext_resource type="PackedScene" path="res://src/actor/Exit.tscn" id="3"] +[ext_resource type="PackedScene" path="res://src/stage/GameCamera.tscn" id="4"] +[ext_resource type="PackedScene" uid="uid://c3tsbvbfy7tmu" path="res://src/stage/DetailTileMap.tscn" id="5"] +[ext_resource type="PackedScene" path="res://src/stage/SpikeTileMap.tscn" id="6"] +[ext_resource type="PackedScene" uid="uid://bleh1qiiufduy" path="res://src/actor/Player.tscn" id="7"] +[ext_resource type="Script" path="res://src/stage/Stage.gd" id="8"] +[ext_resource type="FontVariation" uid="uid://cntu078xgj2oj" path="res://media/font/m6x11.tres" id="9"] +[ext_resource type="Texture2D" uid="uid://cmyhp4lmcy3di" path="res://media/image/btn.png" id="10"] +[ext_resource type="Script" path="res://src/menu/hide_on_level_select.gd" id="11"] +[ext_resource type="PackedScene" path="res://src/stage/ObscureMap.tscn" id="12"] +[ext_resource type="PackedScene" path="res://src/actor/Note.tscn" id="13"] [node name="Stage" type="Node2D"] -script = ExtResource( 8 ) +script = ExtResource("8") -[node name="SolidTileMap" parent="." instance=ExtResource( 1 )] -tile_data = PackedInt32Array( -720909, 1, 0, -720908, 1, 0, -720907, 1, 0, -720906, 1, 0, -720905, 1, 0, -720904, 1, 0, -720903, 1, 0, -720902, 1, 0, -720901, 1, 0, -720900, 1, 0, -720899, 1, 0, -720898, 1, 0, -720897, 1, 0, -786432, 1, 0, -786431, 1, 0, -786430, 1, 0, -786429, 1, 0, -786428, 1, 0, -786427, 1, 0, -786426, 1, 0, -786425, 1, 0, -786424, 1, 0, -786423, 1, 0, -786422, 1, 0, -786421, 1, 0, -786420, 1, 0, -786419, 1, 0, -786418, 1, 0, -786417, 1, 0, -786416, 1, 0, -655373, 1, 0, -720880, 1, 0, -589837, 1, 0, -655344, 1, 0, -524301, 1, 0, -589808, 1, 0, -458765, 1, 0, -524272, 1, 0, -393229, 1, 0, -458736, 1, 0, -327693, 1, 0, -327685, 536870912, 0, -327684, 536870912, 1, -327683, 0, 0, -327682, 536870912, 1, -327681, 536870912, 0, -393214, 0, 1, -393200, 1, 0, -262157, 1, 0, -262152, 536870912, 0, -262151, 536870912, 1, -262150, 0, 0, -262149, 536870912, 1, -327678, 536870912, 0, -327664, 1, 0, -196621, 1, 0, -196616, 536870912, 0, -262142, 536870912, 1, -262141, 0, 0, -262140, 536870912, 1, -262139, 536870912, 0, -262128, 1, 0, -131085, 1, 0, -131080, 536870912, 1, -196603, 536870912, 1, -196592, 1, 0, -65549, 1, 0, -65548, 1, 0, -65547, 1, 0, -65546, 1, 0, -65545, 1, 0, -65544, 536870912, 0, -65543, 536870912, 1, -65542, 536870912, 0, -65541, 536870912, 1, -65540, 0, 0, -65539, 536870912, 1, -65538, 536870912, 0, -131067, 536870912, 0, -131056, 1, 0, -5, 536870912, 1, -65531, 536870912, 0, -65530, 536870912, 1, -65529, 0, 0, -65528, 536870912, 1, -65527, 536870912, 0, -65526, 536870912, 1, -65525, 536870912, 0, -65524, 1, 0, -65523, 1, 0, -65522, 1, 0, -65521, 1, 0, -65520, 1, 0, 65531, 536870912, 0, 11, 536870912, 1, 131067, 536870912, 1, 65547, 536870912, 0, 196603, 536870912, 0, 131083, 536870912, 1, 262139, 536870912, 0, 262140, 536870912, 1, 262141, 0, 0, 262142, 536870912, 0, 262143, 536870912, 1, 196608, 0, 0, 196609, 536870912, 1, 196610, 536870912, 0, 196619, 536870912, 0, 262146, 536870912, 0, 262152, 536870912, 0, 262153, 536870912, 1, 262154, 0, 0, 262155, 536870912, 0, 327682, 536870912, 0, 327683, 536870912, 1, 327684, 536870912, 0, 327685, 536870912, 1, 327686, 0, 0, 327687, 536870912, 1, 327688, 536870912, 0 ) +[node name="SolidTileMap" parent="." instance=ExtResource("1")] +layer_0/tile_data = PackedInt32Array(-720909, 1, 0, -720908, 1, 0, -720907, 1, 0, -720906, 1, 0, -720905, 1, 0, -720904, 1, 0, -720903, 1, 0, -720902, 1, 0, -720901, 1, 0, -720900, 1, 0, -720899, 1, 0, -720898, 1, 0, -720897, 1, 0, -786432, 1, 0, -786431, 1, 0, -786430, 1, 0, -786429, 1, 0, -786428, 1, 0, -786427, 1, 0, -786426, 1, 0, -786425, 1, 0, -786424, 1, 0, -786423, 1, 0, -786422, 1, 0, -786421, 1, 0, -786420, 1, 0, -786419, 1, 0, -786418, 1, 0, -786417, 1, 0, -786416, 1, 0, -655373, 1, 0, -720880, 1, 0, -589837, 1, 0, -655344, 1, 0, -524301, 1, 0, -589808, 1, 0, -458765, 1, 0, -524272, 1, 0, -393229, 1, 0, -458736, 1, 0, -327693, 1, 0, -327685, 536870912, 0, -327684, 536870912, 1, -327683, 0, 0, -327682, 536870912, 1, -327681, 536870912, 0, -393214, 0, 1, -393200, 1, 0, -262157, 1, 0, -262152, 536870912, 0, -262151, 536870912, 1, -262150, 0, 0, -262149, 536870912, 1, -327678, 536870912, 0, -327664, 1, 0, -196621, 1, 0, -196616, 536870912, 0, -262142, 536870912, 1, -262141, 0, 0, -262140, 536870912, 1, -262139, 536870912, 0, -262128, 1, 0, -131085, 1, 0, -131080, 536870912, 1, -196603, 536870912, 1, -196592, 1, 0, -65549, 1, 0, -65548, 1, 0, -65547, 1, 0, -65546, 1, 0, -65545, 1, 0, -65544, 536870912, 0, -65543, 536870912, 1, -65542, 536870912, 0, -65541, 536870912, 1, -65540, 0, 0, -65539, 536870912, 1, -65538, 536870912, 0, -131067, 536870912, 0, -131056, 1, 0, -5, 536870912, 1, -65531, 536870912, 0, -65530, 536870912, 1, -65529, 0, 0, -65528, 536870912, 1, -65527, 536870912, 0, -65526, 536870912, 1, -65525, 536870912, 0, -65524, 1, 0, -65523, 1, 0, -65522, 1, 0, -65521, 1, 0, -65520, 1, 0, 65531, 536870912, 0, 11, 536870912, 1, 131067, 536870912, 1, 65547, 536870912, 0, 196603, 536870912, 0, 131083, 536870912, 1, 262139, 536870912, 0, 262140, 536870912, 1, 262141, 0, 0, 262142, 536870912, 0, 262143, 536870912, 1, 196608, 0, 0, 196609, 536870912, 1, 196610, 536870912, 0, 196619, 536870912, 0, 262146, 536870912, 0, 262152, 536870912, 0, 262153, 536870912, 1, 262154, 0, 0, 262155, 536870912, 0, 327682, 536870912, 0, 327683, 536870912, 1, 327684, 536870912, 0, 327685, 536870912, 1, 327686, 0, 0, 327687, 536870912, 1, 327688, 536870912, 0) -[node name="SpikeTileMap" parent="." instance=ExtResource( 6 )] +[node name="SpikeTileMap" parent="." instance=ExtResource("6")] +format = 2 -[node name="DetailTileMap" parent="." instance=ExtResource( 5 )] +[node name="DetailTileMap" parent="." instance=ExtResource("5")] z_index = -11 -tile_data = PackedInt32Array( -393211, 536870916, 3, -393210, 4, 0, -393209, 4, 3, -262147, 1073741829, 2, -262146, 5, 0, -262145, 5, 0, -327680, 1610612741, 2, -327676, 536870916, 3, -327675, 4, 0, -327674, 536870916, 1, -327673, 4, 3, -196612, 536870916, 3, -196611, 4, 1, -196610, 4, 3, -262138, 536870916, 0, -262137, 536870916, 1, -262136, 4, 3, -131076, 4, 2, -131075, 4, 0, -131074, 4, 3, -196604, 536870916, 0, -196602, 536870916, 1, -196601, 536870916, 0, -196600, 536870916, 2, -65545, 536870916, 3, -65540, 4, 0, -131072, 5, 2, -131071, 5, 0, -131070, -1610612731, 2, -131068, 4, 2, -131066, 4, 1, -131065, 536870916, 2, -9, 536870916, 3, -8, 4, 0, -7, 4, 1, -6, 4, 0, -4, 4, 0, -3, 4, 1, -2, 536870916, 2, -65536, 5, 0, -65535, 5, 0, -65534, 5, 0, 65527, 4, 2, 65528, 4, 1, 65529, 4, 0, 65530, 4, 1, 65532, 4, 1, 65533, 536870916, 0, 65534, 4, 3, 0, -1073741819, 2, 1, 5, 0, 2, 1610612741, 2, 6, 1073741829, 2, 7, 5, 0, 8, 5, 0, 9, 1610612741, 2, 131064, 4, 2, 131065, 4, 1, 131066, 4, 0, 65537, 5, 1, 65546, 4, 2, 65548, 4, 0, 65549, 4, 3, 196604, 5, 0, 196605, 5, 0, 196606, 536870917, 2, 131073, 5, 1, 131076, 4, 2, 131077, 4, 3, 131082, 536870916, 3, 131084, 4, 1, 131085, 4, 3, 196612, 4, 2, 196613, 4, 0, 196614, 4, 3, 196618, 4, 2, 196620, 536870916, 0, 196621, 4, 3, 327677, 5, 1, 262148, 4, 2, 262149, 4, 1, 262150, 4, 3, 262156, 4, 1, 262157, 4, 3, 393213, 1610612741, 2, 327690, 4, 2, 327691, 4, 1, 327692, 536870916, 0, 327693, 536870916, 2, 393220, 4, 2, 393221, 4, 0, 393222, 4, 3 ) +layer_0/tile_data = PackedInt32Array(-393211, 536870916, 3, -393210, 4, 0, -393209, 4, 3, -262147, 1073741829, 2, -262146, 5, 0, -262145, 5, 0, -327680, 1610612741, 2, -327676, 536870916, 3, -327675, 4, 0, -327674, 536870916, 1, -327673, 4, 3, -196612, 536870916, 3, -196611, 4, 1, -196610, 4, 3, -262138, 536870916, 0, -262137, 536870916, 1, -262136, 4, 3, -131076, 4, 2, -131075, 4, 0, -131074, 4, 3, -196604, 536870916, 0, -196602, 536870916, 1, -196601, 536870916, 0, -196600, 536870916, 2, -65545, 536870916, 3, -65540, 4, 0, -131072, 5, 2, -131071, 5, 0, -131070, -1610612731, 2, -131068, 4, 2, -131066, 4, 1, -131065, 536870916, 2, -9, 536870916, 3, -8, 4, 0, -7, 4, 1, -6, 4, 0, -4, 4, 0, -3, 4, 1, -2, 536870916, 2, -65536, 5, 0, -65535, 5, 0, -65534, 5, 0, 65527, 4, 2, 65528, 4, 1, 65529, 4, 0, 65530, 4, 1, 65532, 4, 1, 65533, 536870916, 0, 65534, 4, 3, 0, -1073741819, 2, 1, 5, 0, 2, 1610612741, 2, 6, 1073741829, 2, 7, 5, 0, 8, 5, 0, 9, 1610612741, 2, 131064, 4, 2, 131065, 4, 1, 131066, 4, 0, 65537, 5, 1, 65546, 4, 2, 65548, 4, 0, 65549, 4, 3, 196604, 5, 0, 196605, 5, 0, 196606, 536870917, 2, 131073, 5, 1, 131076, 4, 2, 131077, 4, 3, 131082, 536870916, 3, 131084, 4, 1, 131085, 4, 3, 196612, 4, 2, 196613, 4, 0, 196614, 4, 3, 196618, 4, 2, 196620, 536870916, 0, 196621, 4, 3, 327677, 5, 1, 262148, 4, 2, 262149, 4, 1, 262150, 4, 3, 262156, 4, 1, 262157, 4, 3, 393213, 1610612741, 2, 327690, 4, 2, 327691, 4, 1, 327692, 536870916, 0, 327693, 536870916, 2, 393220, 4, 2, 393221, 4, 0, 393222, 4, 3) -[node name="ObscureMap" parent="." instance=ExtResource( 12 )] -tile_data = PackedInt32Array( -655372, 1, 0, -655371, 1, 0, -655370, 1, 0, -655369, 1, 0, -655368, 1, 0, -655367, 1, 0, -655366, 1, 0, -655365, 1, 0, -655364, 1, 0, -655363, 1, 0, -655362, 1, 0, -655361, 1, 0, -720896, 1, 0, -720895, 1, 0, -720894, 1, 0, -720893, 1, 0, -720892, 1, 0, -720891, 1, 0, -720890, 1, 0, -720889, 1, 0, -720888, 1, 0, -720887, 1, 0, -720886, 1, 0, -720885, 1, 0, -720884, 1, 0, -720883, 1, 0, -720882, 1, 0, -720881, 1, 0, -589836, 1, 0, -589835, 1, 0, -589834, 1, 0, -589833, 1, 0, -589832, 1, 0, -589831, 1, 0, -589830, 1, 0, -589829, 1, 0, -589828, 1, 0, -589827, 1, 0, -589826, 1, 0, -589825, 1, 0, -655360, 1, 0, -655359, 1, 0, -655358, 1, 0, -655357, 1, 0, -655356, 1, 0, -655355, 1, 0, -655354, 1, 0, -655353, 1, 0, -655352, 1, 0, -655351, 1, 0, -655350, 1, 0, -655349, 1, 0, -655348, 1, 0, -655347, 1, 0, -655346, 1, 0, -655345, 1, 0, -524300, 1, 0, -524299, 1, 0, -524298, 1, 0, -524297, 1, 0, -524296, 1, 0, -524295, 1, 0, -524294, 1, 0, -524293, 1, 0, -524292, 1, 0, -524291, 1, 0, -524290, 1, 0, -524289, 1, 0, -589824, 1, 0, -589823, 1, 0, -589822, 1, 0, -589821, 1, 0, -589820, 1, 0, -589819, 1, 0, -589818, 1, 0, -589817, 1, 0, -589816, 1, 0, -589815, 1, 0, -589814, 1, 0, -589813, 1, 0, -589812, 1, 0, -589811, 1, 0, -589810, 1, 0, -589809, 1, 0, -458764, 1, 0, -458763, 1, 0, -458762, 1, 0, -458761, 1, 0, -458760, 1, 0, -458759, 1, 0, -458758, 1, 0, -458757, 1, 0, -458756, 1, 0, -458755, 1, 0, -458754, 1, 0, -458753, 1, 0, -524288, 1, 0, -524287, 1, 0, -524286, 1, 0, -524285, 1, 0, -524284, 1, 0, -524283, 1, 0, -524282, 1, 0, -524281, 1, 0, -524280, 1, 0, -524279, 1, 0, -524278, 1, 0, -524277, 1, 0, -524276, 1, 0, -524275, 1, 0, -524274, 1, 0, -524273, 1, 0, -393228, 1, 0, -393227, 1, 0, -393226, 1, 0, -393225, 1, 0, -393224, 1, 0, -393223, 1, 0, -393222, 1, 0, -393221, 1, 0, -393220, 1, 0, -393219, 1, 0, -393218, 1, 0, -393217, 1, 0, -458752, 1, 0, -458751, 1, 0, -458750, 1, 0, -458749, 1, 0, -458748, 1, 0, -458747, 1, 0, -458746, 1, 0, -458745, 1, 0, -458744, 1, 0, -458743, 1, 0, -458742, 1, 0, -458741, 1, 0, -458740, 1, 0, -458739, 1, 0, -458738, 1, 0, -458737, 1, 0, -327692, 1, 0, -327691, 1, 0, -327690, 1, 0, -327689, 1, 0, -327688, 1, 0, -327687, 1, 0, -327686, 1, 0, -393216, 2, 1, -393215, 2, 0, -393213, 1, 0, -393212, 1, 0, -393211, 1, 0, -393210, 1, 0, -393209, 1, 0, -393208, 1, 0, -393207, 1, 0, -393206, 1, 0, -393205, 0, 0, -393204, 0, 0, -393203, 1, 0, -393202, 1, 0, -393201, 1, 0, -262156, 1, 0, -262155, 1, 0, -262154, 1, 0, -262153, 1, 0, -327677, 1, 0, -327676, 1, 0, -327675, 1, 0, -327674, 1, 0, -327673, 1, 0, -327672, 1, 0, -327671, 1, 0, -327670, 1, 0, -327669, 0, 0, -327668, 0, 0, -327667, 1, 0, -327666, 1, 0, -327665, 1, 0, -196620, 1, 0, -196619, 1, 0, -196618, 1, 0, -196617, 1, 0, -262138, 1, 0, -262137, 1, 0, -262136, 1, 0, -262135, 1, 0, -262134, 1, 0, -262133, 1, 0, -262132, 1, 0, -262131, 1, 0, -262130, 1, 0, -262129, 1, 0, -131084, 1, 0, -131083, 1, 0, -131082, 1, 0, -131081, 1, 0, -196602, 1, 0, -196601, 1, 0, -196600, 1, 0, -196599, 1, 0, -196598, 1, 0, -196597, 1, 0, -196596, 1, 0, -196595, 1, 0, -196594, 1, 0, -196593, 1, 0, -131066, 1, 0, -131065, 1, 0, -131064, 1, 0, -131063, 1, 0, -131062, 1, 0, -131061, 1, 0, -131060, 1, 0, -131059, 1, 0, -131058, 1, 0, -131057, 1, 0 ) +[node name="ObscureMap" parent="." instance=ExtResource("12")] +format = 2 +layer_0/tile_data = PackedInt32Array(-655372, 1, 0, -655371, 1, 0, -655370, 1, 0, -655369, 1, 0, -655368, 1, 0, -655367, 1, 0, -655366, 1, 0, -655365, 1, 0, -655364, 1, 0, -655363, 1, 0, -655362, 1, 0, -655361, 1, 0, -720896, 1, 0, -720895, 1, 0, -720894, 1, 0, -720893, 1, 0, -720892, 1, 0, -720891, 1, 0, -720890, 1, 0, -720889, 1, 0, -720888, 1, 0, -720887, 1, 0, -720886, 1, 0, -720885, 1, 0, -720884, 1, 0, -720883, 1, 0, -720882, 1, 0, -720881, 1, 0, -589836, 1, 0, -589835, 1, 0, -589834, 1, 0, -589833, 1, 0, -589832, 1, 0, -589831, 1, 0, -589830, 1, 0, -589829, 1, 0, -589828, 1, 0, -589827, 1, 0, -589826, 1, 0, -589825, 1, 0, -655360, 1, 0, -655359, 1, 0, -655358, 1, 0, -655357, 1, 0, -655356, 1, 0, -655355, 1, 0, -655354, 1, 0, -655353, 1, 0, -655352, 1, 0, -655351, 1, 0, -655350, 1, 0, -655349, 1, 0, -655348, 1, 0, -655347, 1, 0, -655346, 1, 0, -655345, 1, 0, -524300, 1, 0, -524299, 1, 0, -524298, 1, 0, -524297, 1, 0, -524296, 1, 0, -524295, 1, 0, -524294, 1, 0, -524293, 1, 0, -524292, 1, 0, -524291, 1, 0, -524290, 1, 0, -524289, 1, 0, -589824, 1, 0, -589823, 1, 0, -589822, 1, 0, -589821, 1, 0, -589820, 1, 0, -589819, 1, 0, -589818, 1, 0, -589817, 1, 0, -589816, 1, 0, -589815, 1, 0, -589814, 1, 0, -589813, 1, 0, -589812, 1, 0, -589811, 1, 0, -589810, 1, 0, -589809, 1, 0, -458764, 1, 0, -458763, 1, 0, -458762, 1, 0, -458761, 1, 0, -458760, 1, 0, -458759, 1, 0, -458758, 1, 0, -458757, 1, 0, -458756, 1, 0, -458755, 1, 0, -458754, 1, 0, -458753, 1, 0, -524288, 1, 0, -524287, 1, 0, -524286, 1, 0, -524285, 1, 0, -524284, 1, 0, -524283, 1, 0, -524282, 1, 0, -524281, 1, 0, -524280, 1, 0, -524279, 1, 0, -524278, 1, 0, -524277, 1, 0, -524276, 1, 0, -524275, 1, 0, -524274, 1, 0, -524273, 1, 0, -393228, 1, 0, -393227, 1, 0, -393226, 1, 0, -393225, 1, 0, -393224, 1, 0, -393223, 1, 0, -393222, 1, 0, -393221, 1, 0, -393220, 1, 0, -393219, 1, 0, -393218, 1, 0, -393217, 1, 0, -458752, 1, 0, -458751, 1, 0, -458750, 1, 0, -458749, 1, 0, -458748, 1, 0, -458747, 1, 0, -458746, 1, 0, -458745, 1, 0, -458744, 1, 0, -458743, 1, 0, -458742, 1, 0, -458741, 1, 0, -458740, 1, 0, -458739, 1, 0, -458738, 1, 0, -458737, 1, 0, -327692, 1, 0, -327691, 1, 0, -327690, 1, 0, -327689, 1, 0, -327688, 1, 0, -327687, 1, 0, -327686, 1, 0, -393216, 2, 1, -393215, 2, 0, -393213, 1, 0, -393212, 1, 0, -393211, 1, 0, -393210, 1, 0, -393209, 1, 0, -393208, 1, 0, -393207, 1, 0, -393206, 1, 0, -393205, 0, 0, -393204, 0, 0, -393203, 1, 0, -393202, 1, 0, -393201, 1, 0, -262156, 1, 0, -262155, 1, 0, -262154, 1, 0, -262153, 1, 0, -327677, 1, 0, -327676, 1, 0, -327675, 1, 0, -327674, 1, 0, -327673, 1, 0, -327672, 1, 0, -327671, 1, 0, -327670, 1, 0, -327669, 0, 0, -327668, 0, 0, -327667, 1, 0, -327666, 1, 0, -327665, 1, 0, -196620, 1, 0, -196619, 1, 0, -196618, 1, 0, -196617, 1, 0, -262138, 1, 0, -262137, 1, 0, -262136, 1, 0, -262135, 1, 0, -262134, 1, 0, -262133, 1, 0, -262132, 1, 0, -262131, 1, 0, -262130, 1, 0, -262129, 1, 0, -131084, 1, 0, -131083, 1, 0, -131082, 1, 0, -131081, 1, 0, -196602, 1, 0, -196601, 1, 0, -196600, 1, 0, -196599, 1, 0, -196598, 1, 0, -196597, 1, 0, -196596, 1, 0, -196595, 1, 0, -196594, 1, 0, -196593, 1, 0, -131066, 1, 0, -131065, 1, 0, -131064, 1, 0, -131063, 1, 0, -131062, 1, 0, -131061, 1, 0, -131060, 1, 0, -131059, 1, 0, -131058, 1, 0, -131057, 1, 0) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] -position = Vector2( 16, 0 ) +[node name="GameCamera" parent="." instance=ExtResource("4")] +position = Vector2(16, 0) [node name="Actors" type="Node2D" parent="."] -[node name="Player" parent="Actors" instance=ExtResource( 7 )] -position = Vector2( 40, 32 ) +[node name="Player" parent="Actors" instance=ExtResource("7")] +position = Vector2(40, 32) -[node name="Exit" parent="Actors" instance=ExtResource( 3 )] -position = Vector2( -51, -27 ) +[node name="Exit" parent="Actors" instance=ExtResource("3")] +position = Vector2(-51, -27) -[node name="Box" parent="Actors" instance=ExtResource( 2 )] -position = Vector2( 72, 24 ) +[node name="Box" parent="Actors" instance=ExtResource("2")] +position = Vector2(72, 24) -[node name="Box2" parent="Actors" instance=ExtResource( 2 )] -position = Vector2( 75, 16 ) +[node name="Box2" parent="Actors" instance=ExtResource("2")] +position = Vector2(75, 16) -[node name="Note" parent="Actors" instance=ExtResource( 13 )] -position = Vector2( 91, -45 ) +[node name="Note" parent="Actors" instance=ExtResource("13")] +position = Vector2(91, -45) [node name="c" type="Sprite2D" parent="."] -position = Vector2( -76, 42 ) -texture = ExtResource( 10 ) +position = Vector2(-76, 42) +texture = ExtResource("10") hframes = 6 vframes = 4 -region_rect = Rect2( 0, 0, 18, 18 ) -script = ExtResource( 11 ) +region_rect = Rect2(0, 0, 18, 18) +script = ExtResource("11") [node name="c_label" type="Label" parent="c"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 12.0 offset_top = -6.0 offset_right = 32.0 offset_bottom = 7.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = ExtResource( 9 ) +theme_override_fonts/font = ExtResource("9") text = "lift" -__meta__ = { -"_edit_use_anchors_": false -} [editable path="GameCamera"] diff --git a/src/menu/StartMenu.tscn b/src/menu/StartMenu.tscn index 52e4c65..3059fff 100644 --- a/src/menu/StartMenu.tscn +++ b/src/menu/StartMenu.tscn @@ -1,44 +1,33 @@ -[gd_scene load_steps=24 format=2] +[gd_scene load_steps=21 format=3 uid="uid://crnn0nqwx21rh"] -[ext_resource path="res://media/font/m3x6.tres" type="FontFile" id=1] -[ext_resource path="res://media/image/9slice.png" type="Texture2D" id=2] -[ext_resource path="res://src/menu/StartMenu.gd" type="Script" id=3] -[ext_resource path="res://media/font/m3x6.ttf" type="FontFile" id=4] -[ext_resource path="res://media/font/m6x11.ttf" type="FontFile" id=5] -[ext_resource path="res://media/audio/sfx/hit1.wav" type="AudioStream" id=7] -[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=8] -[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=9] -[ext_resource path="res://src/menu/AttractMode.gd" type="Script" id=10] -[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=11] -[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=12] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=13] -[ext_resource path="res://src/actor/SwitchBlockBlue.tscn" type="PackedScene" id=14] -[ext_resource path="res://src/actor/SwitchBlue.tscn" type="PackedScene" id=15] -[ext_resource path="res://media/font/m5x7.tres" type="FontFile" id=17] -[ext_resource path="res://media/audio/sfx/sfx3.wav" type="AudioStream" id=18] -[ext_resource path="res://media/audio/sfx/sfx18.wav" type="AudioStream" id=19] -[ext_resource path="res://media/audio/sfx/sfx13.wav" type="AudioStream" id=20] -[ext_resource path="res://media/audio/sfx/portal9.wav" type="AudioStream" id=21] -[ext_resource path="res://media/audio/sfx/Randomize105.wav" type="AudioStream" id=22] -[ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=23] - -[sub_resource type="FontFile" id=1] -spacing_bottom = -1 -font_data = ExtResource( 5 ) - -[sub_resource type="FontFile" id=2] -spacing_top = -5 -spacing_bottom = -2 -font_data = ExtResource( 4 ) +[ext_resource type="FontVariation" uid="uid://culrlsi316p0y" path="res://media/font/m3x6.tres" id="1"] +[ext_resource type="Texture2D" uid="uid://s7e12rs806hl" path="res://media/image/9slice.png" id="2"] +[ext_resource type="Script" path="res://src/menu/StartMenu.gd" id="3"] +[ext_resource type="FontVariation" uid="uid://cntu078xgj2oj" path="res://media/font/m6x11.tres" id="3_k8w8k"] +[ext_resource type="AudioStream" uid="uid://c0sja8q4h5lm4" path="res://media/audio/sfx/hit1.wav" id="7"] +[ext_resource type="PackedScene" uid="uid://c3tsbvbfy7tmu" path="res://src/stage/DetailTileMap.tscn" id="8"] +[ext_resource type="PackedScene" path="res://src/actor/Box.tscn" id="9"] +[ext_resource type="Script" path="res://src/menu/AttractMode.gd" id="10"] +[ext_resource type="PackedScene" uid="uid://ccgl186gosdcp" path="res://src/stage/SolidTileMap.tscn" id="11"] +[ext_resource type="PackedScene" uid="uid://bleh1qiiufduy" path="res://src/actor/Player.tscn" id="12"] +[ext_resource type="PackedScene" path="res://src/stage/GameCamera.tscn" id="13"] +[ext_resource type="PackedScene" path="res://src/actor/SwitchBlockBlue.tscn" id="14"] +[ext_resource type="PackedScene" path="res://src/actor/SwitchBlue.tscn" id="15"] +[ext_resource type="FontVariation" uid="uid://3vc5iho8ho52" path="res://media/font/m5x7.tres" id="17"] +[ext_resource type="AudioStream" uid="uid://3d7jvhtcwlpd" path="res://media/audio/sfx/sfx3.wav" id="18"] +[ext_resource type="AudioStream" uid="uid://dv7i1pd4dhxoi" path="res://media/audio/sfx/sfx18.wav" id="19"] +[ext_resource type="AudioStream" uid="uid://djqicpqqb3c3t" path="res://media/audio/sfx/sfx13.wav" id="20"] +[ext_resource type="AudioStream" uid="uid://gqspthpv6a4l" path="res://media/audio/sfx/portal9.wav" id="21"] +[ext_resource type="AudioStream" uid="uid://daloj1lhr4ev3" path="res://media/audio/sfx/Randomize105.wav" id="22"] +[ext_resource type="AudioStream" uid="uid://bd5iht8uibqik" path="res://media/audio/sfx/portal7.wav" id="23"] [node name="StartMenu" type="Node2D"] -process_mode = 2 -script = ExtResource( 3 ) +script = ExtResource("3") [node name="Menu" type="Node2D" parent="."] -position = Vector2( -18, 8 ) z_index = 20 z_as_relative = false +position = Vector2(-18, 8) [node name="Cursor" type="ColorRect" parent="Menu"] show_behind_parent = true @@ -46,179 +35,156 @@ offset_left = 15.0 offset_top = 47.0 offset_right = 44.0 offset_bottom = 57.0 -color = Color( 0.113725, 0.168627, 0.32549, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0.113725, 0.168627, 0.32549, 1) [node name="List" type="Label" parent="Menu"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 12.0 offset_top = 48.0 offset_right = 48.0 offset_bottom = 89.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 1 ) +theme_override_fonts/font = ExtResource("1") text = "play options credits quit" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="Quit" type="Control" parent="Menu"] -visible = false +layout_mode = 3 +anchors_preset = 0 offset_left = 80.0 offset_top = 44.0 offset_right = 120.0 offset_bottom = 84.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="NinePatchRect" type="NinePatchRect" parent="Menu/Quit"] +layout_mode = 0 offset_left = -1.0 offset_top = -1.0 offset_right = 69.0 offset_bottom = 41.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource( 2 ) +texture = ExtResource("2") patch_margin_left = 8 patch_margin_top = 8 patch_margin_right = 8 patch_margin_bottom = 8 axis_stretch_horizontal = 1 axis_stretch_vertical = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="List" type="Label" parent="Menu/Quit"] +modulate = Color(1, 0.945098, 0.909804, 1) +layout_mode = 0 offset_left = 18.0 offset_top = 17.0 offset_right = 50.0 offset_bottom = 36.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 1 ) +theme_override_fonts/font = ExtResource("1") text = "yes no" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="Header" type="Label" parent="Menu/Quit"] +modulate = Color(1, 0.945098, 0.909804, 1) +layout_mode = 0 offset_left = -53.0 offset_top = 4.0 offset_right = 121.0 offset_bottom = 17.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = ExtResource( 17 ) +theme_override_fonts/font = ExtResource("17") text = "Quit Game?" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="Header" type="Label" parent="."] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = -33.0 offset_top = 24.0 offset_right = 81.0 offset_bottom = 37.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = SubResource( 1 ) +theme_override_fonts/font = ExtResource("3_k8w8k") text = "TINY CRATE" -align = 1 +horizontal_alignment = 1 [node name="Signature" type="Label" parent="Header"] +layout_mode = 0 offset_left = 26.0 offset_top = -10.0 offset_right = 87.0 offset_bottom = -4.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = SubResource( 2 ) +theme_override_fonts/font = ExtResource("1") text = "Harmony Honey's" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="AudioScroll" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 7 ) +stream = ExtResource("7") volume_db = -7.0 -bus = "SFX" +bus = &"SFX" [node name="AudioPlay" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 21 ) -bus = "SFX" +stream = ExtResource("21") +bus = &"SFX" [node name="AudioOptions" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 20 ) -bus = "SFX" +stream = ExtResource("20") +bus = &"SFX" [node name="AudioCredits" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 23 ) -bus = "SFX" +stream = ExtResource("23") +bus = &"SFX" [node name="AudioQuit" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 18 ) -bus = "SFX" +stream = ExtResource("18") +bus = &"SFX" [node name="AudioYes" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 22 ) -bus = "SFX" +stream = ExtResource("22") +bus = &"SFX" [node name="AudioNo" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 19 ) -bus = "SFX" +stream = ExtResource("19") +bus = &"SFX" [node name="Stage" type="Node2D" parent="."] -[node name="SolidTileMap" parent="Stage" instance=ExtResource( 11 )] -tile_data = PackedInt32Array( 393222, 0, 0, 393223, 0, 1, 393224, 0, 0, 393225, 0, 1, 393226, 536870912, 0, 458758, 0, 1, 524294, 0, 0, 589830, 0, 1, 655366, 536870912, 0, 720902, 0, 1, 786438, 0, 0, 786442, 0, 0, 786443, 0, 1, 786444, 536870912, 0, 786448, 0, 0, 786449, 0, 1, 786450, 536870912, 0, 786451, 0, 1, 786452, 0, 0, 786453, 0, 1, 786454, 536870912, 0 ) +[node name="SolidTileMap" parent="Stage" instance=ExtResource("11")] +layer_0/tile_data = PackedInt32Array(393222, 0, 0, 393223, 0, 1, 393224, 0, 0, 393225, 0, 1, 393226, 536870912, 0, 458758, 0, 1, 524294, 0, 0, 589830, 0, 1, 655366, 536870912, 0, 720902, 0, 1, 786438, 0, 0, 786442, 0, 0, 786443, 0, 1, 786444, 536870912, 0, 786448, 0, 0, 786449, 0, 1, 786450, 536870912, 0, 786451, 0, 1, 786452, 0, 0, 786453, 0, 1, 786454, 536870912, 0) -[node name="DetailTileMap" parent="Stage" instance=ExtResource( 8 )] +[node name="DetailTileMap" parent="Stage" instance=ExtResource("8")] z_index = -11 -tile_data = PackedInt32Array( 131093, 536870916, 3, 131094, 4, 1, 131095, 4, 0, 131096, 4, 3, 196624, 5, 2, 196625, 5, 0, 196626, -1610612731, 2, 196630, 536870916, 0, 196631, 4, 1, 196632, 4, 0, 262154, 536870916, 3, 262155, 536870916, 0, 262156, 4, 3, 262159, 5, 2, 262160, 5, 0, 262161, 5, 0, 262162, 5, 0, 262163, -1610612731, 2, 262166, 4, 1, 262167, 4, 0, 262168, 4, 1, 327685, 5, 2, 327686, 5, 0, 327687, 5, 0, 327688, 5, 0, 327689, 536870917, 2, 327690, 536870916, 0, 327691, 4, 1, 327692, 4, 0, 327695, -1610612731, 0, 327696, 5, 0, 327697, 5, 0, 327698, 5, 0, 327699, -1073741819, 0, 327701, 536870916, 3, 327702, 4, 0, 327703, 4, 1, 327704, 536870916, 2, 393221, -1073741819, 0, 393227, 4, 1, 393228, 4, 0, 393229, 4, 3, 393231, -1073741819, 2, 393232, 5, 0, 393233, 5, 0, 393234, 5, 0, 393235, -536870907, 2, 393237, 536870916, 0, 393238, 4, 1, 393239, 536870916, 0, 458757, -1073741819, 2, 458759, -1610612731, 2, 458762, 4, 1, 458763, 536870916, 0, 458764, 4, 1, 458765, 4, 0, 458768, -1073741819, 2, 458769, 5, 0, 458770, 1610612741, 2, 458773, 4, 2, 458774, 4, 0, 458775, 4, 1, 458776, 4, 3, 524295, -1610612731, 0, 524298, 4, 2, 524299, 4, 1, 524300, 536870916, 0, 524301, 4, 1, 524302, 4, 3, 524305, 5, 1, 524310, 4, 2, 524311, 536870916, 0, 524312, 536870916, 2, 589831, -1073741819, 1, 589832, -1610612731, 0, 589836, 4, 2, 589837, 4, 1, 589838, 4, 0, 589839, 4, 3, 589841, 5, 1, 589842, -536870907, 2, 655367, -1610612731, 0, 655373, 536870916, 3, 655374, 4, 1, 655375, 536870916, 0, 655377, 5, 1, 720901, -2147483643, 2, 720903, -536870907, 2, 720905, 5, 2, 720906, 5, 0, 720907, 5, 0, 720908, 536870917, 2, 720909, 536870916, 3, 720910, 536870916, 0, 720911, 536870916, 2, 720912, 5, 2, 720913, 5, 1, 720914, 5, 0, 720915, 536870917, 2, 720917, 5, 2, 720918, 5, 0, 720919, 536870917, 2, 786437, -2147483643, 0, 786441, -1073741819, 0, 786455, -1610612731, 0, 851973, -1073741819, 2, 851974, 1610612741, 2, 851977, 1073741829, 2, 851978, 5, 0, 851979, 1610612741, 2, 851981, 536870916, 3, 851982, 4, 1, 851983, 4, 0, 851987, 1073741829, 2, 851988, 5, 0, 851989, 5, 1, 851990, 5, 0, 851991, -536870907, 2, 917517, 536870916, 0, 917518, 4, 1, 917519, 536870916, 2, 917525, 1610612741, 2, 983053, 4, 2, 983054, 4, 0, 983055, 536870916, 2 ) -[node name="GameCamera" parent="Stage" instance=ExtResource( 13 )] -position = Vector2( 96, 72 ) +[node name="GameCamera" parent="Stage" instance=ExtResource("13")] +position = Vector2(96, 72) [node name="Actors" type="Node2D" parent="Stage"] -script = ExtResource( 10 ) +script = ExtResource("10") -[node name="Player" parent="Stage/Actors" instance=ExtResource( 12 )] -position = Vector2( 88, 88 ) +[node name="Player" parent="Stage/Actors" instance=ExtResource("12")] +position = Vector2(88, 88) is_attract_mode = true -[node name="Box0" parent="Stage/Actors" instance=ExtResource( 9 )] -position = Vector2( 160, 88 ) +[node name="Box0" parent="Stage/Actors" instance=ExtResource("9")] +position = Vector2(160, 88) -[node name="Box1" parent="Stage/Actors" instance=ExtResource( 9 )] -position = Vector2( 164, 80 ) +[node name="Box1" parent="Stage/Actors" instance=ExtResource("9")] +position = Vector2(164, 80) -[node name="Box2" parent="Stage/Actors" instance=ExtResource( 9 )] -position = Vector2( 160, 72 ) +[node name="Box2" parent="Stage/Actors" instance=ExtResource("9")] +position = Vector2(160, 72) -[node name="Box3" parent="Stage/Actors" instance=ExtResource( 9 )] -position = Vector2( 64, 40 ) +[node name="Box3" parent="Stage/Actors" instance=ExtResource("9")] +position = Vector2(64, 40) -[node name="SwitchBlue" parent="Stage/Actors" instance=ExtResource( 15 )] -position = Vector2( 64, 44 ) +[node name="SwitchBlue" parent="Stage/Actors" instance=ExtResource("15")] +position = Vector2(64, 44) -[node name="SwitchBlockBlue" parent="Stage/Actors" instance=ExtResource( 14 )] -position = Vector2( 104, 96 ) +[node name="SwitchBlockBlue" parent="Stage/Actors" instance=ExtResource("14")] +position = Vector2(104, 96) -[node name="SwitchBlockBlue2" parent="Stage/Actors" instance=ExtResource( 14 )] -position = Vector2( 112, 96 ) +[node name="SwitchBlockBlue2" parent="Stage/Actors" instance=ExtResource("14")] +position = Vector2(112, 96) -[node name="SwitchBlockBlue3" parent="Stage/Actors" instance=ExtResource( 14 )] -position = Vector2( 120, 96 ) +[node name="SwitchBlockBlue3" parent="Stage/Actors" instance=ExtResource("14")] +position = Vector2(120, 96) [editable path="Stage/GameCamera"] diff --git a/src/menu/WinScreen.tscn b/src/menu/WinScreen.tscn index a435895..9ce4fc9 100644 --- a/src/menu/WinScreen.tscn +++ b/src/menu/WinScreen.tscn @@ -1,116 +1,101 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=10 format=3 uid="uid://b307g6gatvpea"] -[ext_resource path="res://media/font/m5x7.tres" type="FontFile" id=1] -[ext_resource path="res://media/font/m6x11.tres" type="FontFile" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] -[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=7] -[ext_resource path="res://src/menu/WinScreen.gd" type="Script" id=8] -[ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=9] +[ext_resource type="FontVariation" uid="uid://3vc5iho8ho52" path="res://media/font/m5x7.tres" id="1"] +[ext_resource type="FontVariation" uid="uid://cntu078xgj2oj" path="res://media/font/m6x11.tres" id="2"] +[ext_resource type="PackedScene" path="res://src/stage/GameCamera.tscn" id="3"] +[ext_resource type="PackedScene" uid="uid://ccgl186gosdcp" path="res://src/stage/SolidTileMap.tscn" id="4"] +[ext_resource type="PackedScene" uid="uid://c3tsbvbfy7tmu" path="res://src/stage/DetailTileMap.tscn" id="5"] +[ext_resource type="PackedScene" uid="uid://bleh1qiiufduy" path="res://src/actor/Player.tscn" id="6"] +[ext_resource type="PackedScene" path="res://src/actor/Box.tscn" id="7"] +[ext_resource type="Script" path="res://src/menu/WinScreen.gd" id="8"] +[ext_resource type="AudioStream" uid="uid://bd5iht8uibqik" path="res://media/audio/sfx/portal7.wav" id="9"] [node name="Node2D" type="Node2D"] [node name="YouWin" type="Label" parent="."] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 2.0 offset_top = 10.0 offset_right = 230.0 offset_bottom = 23.0 -custom_fonts/font = ExtResource( 2 ) -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) +theme_override_fonts/font = ExtResource("2") text = "YOU WIN!" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="ThanksForPlaying" type="Label" parent="."] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 2.0 offset_top = 36.0 offset_right = 230.0 offset_bottom = 44.0 -custom_fonts/font = ExtResource( 1 ) -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) +theme_override_fonts/font = ExtResource("1") text = "thanks for playing" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="TinyCrate" type="Label" parent="."] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 2.0 offset_top = 58.0 offset_right = 230.0 offset_bottom = 71.0 -custom_fonts/font = ExtResource( 2 ) -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) +theme_override_fonts/font = ExtResource("2") text = "TINY CRATE" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="AGameBy" type="Label" parent="."] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 2.0 offset_top = 84.0 offset_right = 230.0 offset_bottom = 92.0 -custom_fonts/font = ExtResource( 1 ) -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) +theme_override_fonts/font = ExtResource("1") text = "a game by" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="HarmonyHoney" type="Label" parent="."] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 2.0 offset_top = 103.0 offset_right = 230.0 offset_bottom = 116.0 -custom_fonts/font = ExtResource( 2 ) -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) +theme_override_fonts/font = ExtResource("2") text = "Harmony Honey" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 -[node name="SolidTileMap" parent="." instance=ExtResource( 4 )] -tile_data = PackedInt32Array( -524286, 0, 1, -524285, 0, 1, -524284, 0, 1, -524283, 0, 1, -524282, 0, 1, -524281, 0, 1, -524280, 0, 1, -524279, 0, 1, -524278, 0, 1, -524277, 0, 1, -524276, 0, 1, -524275, 0, 1, -524274, 0, 1, -524273, 0, 1, -524272, 0, 1, -524271, 0, 1, -524270, 0, 1, -524269, 0, 1, -524268, 0, 1, -524267, 0, 1, -524266, 0, 1, -524265, 0, 1, -524264, 0, 1, -524263, 0, 1, -524262, 0, 1, -458750, 0, 1, -458726, 0, 1, -393214, 0, 1, -393190, 0, 1, -327678, 0, 1, -327654, 0, 1, -262142, 0, 1, -262118, 0, 1, -196606, 0, 1, -196582, 0, 1, -131070, 0, 1, -131046, 0, 1, -65534, 0, 1, -65510, 0, 1, 2, 0, 1, 26, 536870912, 0, 65538, 0, 0, 65539, 536870912, 1, 65540, 536870912, 1, 65541, 0, 0, 65542, 536870912, 1, 65543, 536870912, 0, 65562, 0, 1, 131079, 536870912, 1, 131095, 536870912, 1, 131096, 0, 0, 131097, 536870912, 1, 131098, 536870912, 0, 196610, 0, 1, 196611, 0, 0, 196612, 536870912, 1, 196613, 0, 0, 196614, 536870912, 1, 196615, 536870912, 0, 196623, 0, 0, 196624, 0, 1, 196625, 0, 1, 196626, 536870912, 0, 196631, 536870912, 0, 262146, 536870912, 0, 262167, 536870912, 1, 327681, 0, 0, 327682, 536870912, 1, 327703, 0, 0, 327704, 536870912, 1, 327705, 536870912, 0, 327706, 0, 1, 393217, 536870912, 1, 393226, 0, 0, 393227, 0, 1, 393228, 536870912, 0, 393229, 0, 1, 393242, 0, 0, 458753, 536870912, 0, 458778, 0, 0, 458779, 536870912, 1, 524289, 536870912, 1, 524290, 536870912, 0, 524315, 536870912, 0, 589826, 536870912, 0, 589832, 0, 1, 589833, 536870912, 0, 589838, 0, 1, 589839, 536870912, 0, 589840, 0, 1, 589841, 536870912, 0, 589850, 0, 1, 589851, 536870912, 1, 655362, 536870912, 1, 655363, 0, 0, 655364, 536870912, 1, 655365, 536870912, 0, 655386, 536870912, 0, 720901, 536870912, 1, 720918, 536870912, 1, 720919, 0, 0, 720920, 536870912, 1, 720921, 536870912, 1, 720922, 536870912, 0, 786437, 536870912, 0, 786442, 0, 0, 786443, 0, 1, 786444, 536870912, 0, 786445, 0, 1, 786446, 536870912, 0, 786449, 0, 0, 786450, 0, 1, 786454, 536870912, 0, 851970, 0, 0, 851971, 536870912, 1, 851972, 536870912, 0, 851973, 536870912, 1, 851990, 536870912, 1, 917506, 0, 0, 917526, 0, 0, 917527, 536870912, 1, 917528, 536870912, 1, 917529, 536870912, 0, 917530, 0, 1, 983042, 0, 1, 983066, 0, 0, 1048578, 0, 1, 1048602, 0, 1, 1114114, 0, 1, 1114138, 0, 1, 1179650, 0, 1, 1179674, 0, 1, 1245186, 0, 1, 1245210, 0, 1, 1310722, 0, 1, 1310746, 0, 1, 1376258, 0, 1, 1376282, 0, 1, 1441794, 0, 1, 1441818, 0, 1, 1507330, 0, 1, 1507354, 0, 1, 1572866, 0, 1, 1572890, 0, 1, 1638402, 0, 1, 1638426, 0, 1, 1703938, 0, 1, 1703939, 0, 1, 1703940, 0, 1, 1703941, 0, 1, 1703942, 0, 1, 1703943, 0, 1, 1703944, 0, 1, 1703945, 0, 1, 1703946, 0, 1, 1703947, 0, 1, 1703948, 0, 1, 1703949, 0, 1, 1703950, 0, 1, 1703951, 0, 1, 1703952, 0, 1, 1703953, 0, 1, 1703954, 0, 1, 1703955, 0, 1, 1703956, 0, 1, 1703957, 0, 1, 1703958, 0, 1, 1703959, 0, 1, 1703960, 0, 1, 1703961, 0, 1, 1703962, 0, 1 ) +[node name="SolidTileMap" parent="." instance=ExtResource("4")] +layer_0/tile_data = PackedInt32Array(-524286, 0, 1, -524285, 0, 1, -524284, 0, 1, -524283, 0, 1, -524282, 0, 1, -524281, 0, 1, -524280, 0, 1, -524279, 0, 1, -524278, 0, 1, -524277, 0, 1, -524276, 0, 1, -524275, 0, 1, -524274, 0, 1, -524273, 0, 1, -524272, 0, 1, -524271, 0, 1, -524270, 0, 1, -524269, 0, 1, -524268, 0, 1, -524267, 0, 1, -524266, 0, 1, -524265, 0, 1, -524264, 0, 1, -524263, 0, 1, -524262, 0, 1, -458750, 0, 1, -458726, 0, 1, -393214, 0, 1, -393190, 0, 1, -327678, 0, 1, -327654, 0, 1, -262142, 0, 1, -262118, 0, 1, -196606, 0, 1, -196582, 0, 1, -131070, 0, 1, -131046, 0, 1, -65534, 0, 1, -65510, 0, 1, 2, 0, 1, 26, 536870912, 0, 65538, 0, 0, 65539, 536870912, 1, 65540, 536870912, 1, 65541, 0, 0, 65542, 536870912, 1, 65543, 536870912, 0, 65562, 0, 1, 131079, 536870912, 1, 131095, 536870912, 1, 131096, 0, 0, 131097, 536870912, 1, 131098, 536870912, 0, 196610, 0, 1, 196611, 0, 0, 196612, 536870912, 1, 196613, 0, 0, 196614, 536870912, 1, 196615, 536870912, 0, 196623, 0, 0, 196624, 0, 1, 196625, 0, 1, 196626, 536870912, 0, 196631, 536870912, 0, 262146, 536870912, 0, 262167, 536870912, 1, 327681, 0, 0, 327682, 536870912, 1, 327703, 0, 0, 327704, 536870912, 1, 327705, 536870912, 0, 327706, 0, 1, 393217, 536870912, 1, 393226, 0, 0, 393227, 0, 1, 393228, 536870912, 0, 393229, 0, 1, 393242, 0, 0, 458753, 536870912, 0, 458778, 0, 0, 458779, 536870912, 1, 524289, 536870912, 1, 524290, 536870912, 0, 524315, 536870912, 0, 589826, 536870912, 0, 589832, 0, 1, 589833, 536870912, 0, 589838, 0, 1, 589839, 536870912, 0, 589840, 0, 1, 589841, 536870912, 0, 589850, 0, 1, 589851, 536870912, 1, 655362, 536870912, 1, 655363, 0, 0, 655364, 536870912, 1, 655365, 536870912, 0, 655386, 536870912, 0, 720901, 536870912, 1, 720918, 536870912, 1, 720919, 0, 0, 720920, 536870912, 1, 720921, 536870912, 1, 720922, 536870912, 0, 786437, 536870912, 0, 786442, 0, 0, 786443, 0, 1, 786444, 536870912, 0, 786445, 0, 1, 786446, 536870912, 0, 786449, 0, 0, 786450, 0, 1, 786454, 536870912, 0, 851970, 0, 0, 851971, 536870912, 1, 851972, 536870912, 0, 851973, 536870912, 1, 851990, 536870912, 1, 917506, 0, 0, 917526, 0, 0, 917527, 536870912, 1, 917528, 536870912, 1, 917529, 536870912, 0, 917530, 0, 1, 983042, 0, 1, 983066, 0, 0, 1048578, 0, 1, 1048602, 0, 1, 1114114, 0, 1, 1114138, 0, 1, 1179650, 0, 1, 1179674, 0, 1, 1245186, 0, 1, 1245210, 0, 1, 1310722, 0, 1, 1310746, 0, 1, 1376258, 0, 1, 1376282, 0, 1, 1441794, 0, 1, 1441818, 0, 1, 1507330, 0, 1, 1507354, 0, 1, 1572866, 0, 1, 1572890, 0, 1, 1638402, 0, 1, 1638426, 0, 1, 1703938, 0, 1, 1703939, 0, 1, 1703940, 0, 1, 1703941, 0, 1, 1703942, 0, 1, 1703943, 0, 1, 1703944, 0, 1, 1703945, 0, 1, 1703946, 0, 1, 1703947, 0, 1, 1703948, 0, 1, 1703949, 0, 1, 1703950, 0, 1, 1703951, 0, 1, 1703952, 0, 1, 1703953, 0, 1, 1703954, 0, 1, 1703955, 0, 1, 1703956, 0, 1, 1703957, 0, 1, 1703958, 0, 1, 1703959, 0, 1, 1703960, 0, 1, 1703961, 0, 1, 1703962, 0, 1) -[node name="DetailTileMap" parent="." instance=ExtResource( 5 )] -tile_data = PackedInt32Array( 27, -1610612731, 0, 65544, -1610612731, 2, 65558, 5, 2, 65559, 5, 0, 65560, 5, 0, 65561, 536870917, 2, 65563, -1610612731, 0, 131075, 5, 2, 131076, 5, 0, 131077, 5, 0, 131078, 5, 0, 131080, -1073741819, 1, 131081, -1610612731, 2, 131094, -1073741819, 0, 131099, -1610612731, 0, 196616, -1610612731, 0, 196628, -1073741819, 0, 196629, -1073741819, 1, 196630, -1073741819, 1, 196633, 1073741829, 2, 196634, 5, 0, 196635, 1610612741, 2, 262144, 5, 2, 262145, 5, 0, 262147, 1610612741, 2, 262150, 1073741829, 2, 262151, 1610612741, 0, 262152, 1610612741, 2, 262166, -1073741819, 0, 327680, -1073741819, 0, 327684, 5, 2, 327685, 5, 0, 327686, -1610612731, 2, 327702, -1073741819, 0, 393216, -1073741819, 0, 393220, 5, 0, 393221, 5, 0, 393222, 5, 0, 393238, -1073741819, 2, 393239, 5, 1, 393240, 1610612741, 0, 393241, 1610612741, 0, 393243, -1610612731, 2, 458752, -1073741819, 0, 458756, -1073741819, 2, 458757, 5, 0, 458758, 1610612741, 2, 458775, 5, 1, 524288, -1073741819, 0, 524293, 5, 1, 524310, 5, 2, 524311, 1610612741, 0, 524312, -1610612731, 2, 524314, -1073741819, 0, 589824, -1073741819, 2, 589825, 5, 0, 589827, 5, 0, 589828, 5, 0, 589829, 5, 1, 589830, 536870917, 2, 589846, -1073741819, 2, 589847, 1610612741, 0, 589848, 1610612741, 2, 655366, -1610612731, 0, 655387, -1610612731, 0, 720902, -1073741819, 1, 720903, -1073741819, 1, 720904, -1610612731, 0, 720917, -2147483643, 2, 720923, -1610612731, 0, 786433, 5, 2, 786434, 5, 0, 786435, 5, 0, 786436, 5, 0, 786438, -536870907, 2, 786452, -2147483643, 2, 786453, -1073741819, 1, 786455, 1610612741, 0, 786456, 1610612741, 0, 786457, 1610612741, 0, 786458, 1610612741, 0, 786459, 1610612741, 2, 851969, -1073741819, 0, 851989, -1073741819, 0, 917505, -1073741819, 0, 917525, -1073741819, 2, 983041, -1073741819, 0 ) +[node name="DetailTileMap" parent="." instance=ExtResource("5")] +layer_0/tile_data = PackedInt32Array(27, -1610612731, 0, 65544, -1610612731, 2, 65558, 5, 2, 65559, 5, 0, 65560, 5, 0, 65561, 536870917, 2, 65563, -1610612731, 0, 131075, 5, 2, 131076, 5, 0, 131077, 5, 0, 131078, 5, 0, 131080, -1073741819, 1, 131081, -1610612731, 2, 131094, -1073741819, 0, 131099, -1610612731, 0, 196616, -1610612731, 0, 196628, -1073741819, 0, 196629, -1073741819, 1, 196630, -1073741819, 1, 196633, 1073741829, 2, 196634, 5, 0, 196635, 1610612741, 2, 262144, 5, 2, 262145, 5, 0, 262147, 1610612741, 2, 262150, 1073741829, 2, 262151, 1610612741, 0, 262152, 1610612741, 2, 262166, -1073741819, 0, 327680, -1073741819, 0, 327684, 5, 2, 327685, 5, 0, 327686, -1610612731, 2, 327702, -1073741819, 0, 393216, -1073741819, 0, 393220, 5, 0, 393221, 5, 0, 393222, 5, 0, 393238, -1073741819, 2, 393239, 5, 1, 393240, 1610612741, 0, 393241, 1610612741, 0, 393243, -1610612731, 2, 458752, -1073741819, 0, 458756, -1073741819, 2, 458757, 5, 0, 458758, 1610612741, 2, 458775, 5, 1, 524288, -1073741819, 0, 524293, 5, 1, 524310, 5, 2, 524311, 1610612741, 0, 524312, -1610612731, 2, 524314, -1073741819, 0, 589824, -1073741819, 2, 589825, 5, 0, 589827, 5, 0, 589828, 5, 0, 589829, 5, 1, 589830, 536870917, 2, 589846, -1073741819, 2, 589847, 1610612741, 0, 589848, 1610612741, 2, 655366, -1610612731, 0, 655387, -1610612731, 0, 720902, -1073741819, 1, 720903, -1073741819, 1, 720904, -1610612731, 0, 720917, -2147483643, 2, 720923, -1610612731, 0, 786433, 5, 2, 786434, 5, 0, 786435, 5, 0, 786436, 5, 0, 786438, -536870907, 2, 786452, -2147483643, 2, 786453, -1073741819, 1, 786455, 1610612741, 0, 786456, 1610612741, 0, 786457, 1610612741, 0, 786458, 1610612741, 0, 786459, 1610612741, 2, 851969, -1073741819, 0, 851989, -1073741819, 0, 917505, -1073741819, 0, 917525, -1073741819, 2, 983041, -1073741819, 0) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] -position = Vector2( 116, 64 ) +[node name="GameCamera" parent="." instance=ExtResource("3")] +position = Vector2(116, 64) [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 9 ) +stream = ExtResource("9") autoplay = true -bus = "SFX" +bus = &"SFX" [node name="Actors" type="Node2D" parent="."] -script = ExtResource( 8 ) +script = ExtResource("8") -[node name="Player" parent="Actors" instance=ExtResource( 6 )] -position = Vector2( 17, 56 ) +[node name="Player" parent="Actors" instance=ExtResource("6")] +position = Vector2(17, 56) -[node name="Box" parent="Actors" instance=ExtResource( 7 )] -position = Vector2( 146, 16 ) +[node name="Box" parent="Actors" instance=ExtResource("7")] +position = Vector2(146, 16) -[node name="Box2" parent="Actors" instance=ExtResource( 7 )] -position = Vector2( 149, 8 ) +[node name="Box2" parent="Actors" instance=ExtResource("7")] +position = Vector2(149, 8) -[node name="Box3" parent="Actors" instance=ExtResource( 7 )] -position = Vector2( 197, 80 ) +[node name="Box3" parent="Actors" instance=ExtResource("7")] +position = Vector2(197, 80) -[node name="Box4" parent="Actors" instance=ExtResource( 7 )] -position = Vector2( 29, 0 ) +[node name="Box4" parent="Actors" instance=ExtResource("7")] +position = Vector2(29, 0) -[node name="Box5" parent="Actors" instance=ExtResource( 7 )] -position = Vector2( 67, 64 ) +[node name="Box5" parent="Actors" instance=ExtResource("7")] +position = Vector2(67, 64) -[node name="Box6" parent="Actors" instance=ExtResource( 7 )] -position = Vector2( 28, 72 ) +[node name="Box6" parent="Actors" instance=ExtResource("7")] +position = Vector2(28, 72) diff --git a/src/menu/credits.tscn b/src/menu/credits.tscn index 4813039..1def405 100644 --- a/src/menu/credits.tscn +++ b/src/menu/credits.tscn @@ -1,97 +1,265 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=19 format=3 uid="uid://csbr4jwfdxfd1"] -[ext_resource path="res://media/font/m3x6.tres" type="FontFile" id=1] -[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/menu/credits.gd" type="Script" id=4] -[ext_resource path="res://media/audio/sfx/Randomize103.wav" type="AudioStream" id=5] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=6] -[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=7] -[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=8] -[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=9] -[ext_resource path="res://media/font/m6x11.ttf" type="FontFile" id=10] -[ext_resource path="res://media/image/HarmonyHoneyLogo.png" type="Texture2D" id=11] +[ext_resource type="FontVariation" uid="uid://culrlsi316p0y" path="res://media/font/m3x6.tres" id="1"] +[ext_resource type="PackedScene" uid="uid://c3tsbvbfy7tmu" path="res://src/stage/DetailTileMap.tscn" id="2"] +[ext_resource type="PackedScene" uid="uid://ccgl186gosdcp" path="res://src/stage/SolidTileMap.tscn" id="3"] +[ext_resource type="FontVariation" uid="uid://cntu078xgj2oj" path="res://media/font/m6x11.tres" id="3_4x86d"] +[ext_resource type="Script" path="res://src/menu/credits.gd" id="4"] +[ext_resource type="AudioStream" uid="uid://lmsmr8cqqx8i" path="res://media/audio/sfx/Randomize103.wav" id="5"] +[ext_resource type="PackedScene" path="res://src/stage/GameCamera.tscn" id="6"] +[ext_resource type="PackedScene" path="res://src/actor/Exit.tscn" id="7"] +[ext_resource type="PackedScene" path="res://src/actor/Box.tscn" id="8"] +[ext_resource type="PackedScene" uid="uid://bleh1qiiufduy" path="res://src/actor/Player.tscn" id="9"] +[ext_resource type="Texture2D" uid="uid://dfjueli3quv6r" path="res://media/image/HarmonyHoneyLogo.png" id="11"] -[sub_resource type="FontFile" id=1] -spacing_bottom = -1 -font_data = ExtResource( 10 ) +[sub_resource type="Animation" id="1"] +length = 0.6 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:region_rect") +tracks/0/interp = 0 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Rect2(56, 0, 8, 24), Rect2(64, 0, 8, 24)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:offset") +tracks/1/interp = 0 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(0, 0), Vector2(0, 0)] +} + +[sub_resource type="Animation" id="2"] +length = 0.1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:region_rect") +tracks/0/interp = 0 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Rect2(104, 0, 8, 24)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:offset") +tracks/1/interp = 0 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, 0)] +} + +[sub_resource type="Animation" id="3"] +length = 0.6 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:region_rect") +tracks/0/interp = 0 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.2, 0.3, 0.5), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 0, +"values": [Rect2(72, 0, 8, 24), Rect2(80, 0, 8, 24), Rect2(88, 0, 8, 24), Rect2(96, 0, 8, 24)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:offset") +tracks/1/interp = 0 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.2, 0.3, 0.5), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 0, +"values": [Vector2(0, 0), Vector2(0, 0), Vector2(0, 0), Vector2(0, 0)] +} + +[sub_resource type="Animation" id="4"] +length = 0.6 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:region_rect") +tracks/0/interp = 0 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Rect2(0, 0, 8, 24), Rect2(8, 0, 8, 24)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:offset") +tracks/1/interp = 0 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(0, 0), Vector2(0, 0)] +} + +[sub_resource type="Animation" id="5"] +length = 0.1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:region_rect") +tracks/0/interp = 0 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Rect2(48, 0, 8, 24)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:offset") +tracks/1/interp = 0 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, 0)] +} + +[sub_resource type="Animation" id="6"] +length = 0.6 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:region_rect") +tracks/0/interp = 0 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.2, 0.3, 0.5), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 0, +"values": [Rect2(16, 0, 8, 24), Rect2(24, 0, 8, 24), Rect2(32, 0, 8, 24), Rect2(40, 0, 8, 24)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:offset") +tracks/1/interp = 0 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.2, 0.3, 0.5), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 0, +"values": [Vector2(0, 0), Vector2(0, 0), Vector2(0, 0), Vector2(0, 0)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_yihc7"] +_data = { +"box_idle": SubResource("1"), +"box_jump": SubResource("2"), +"box_run": SubResource("3"), +"idle": SubResource("4"), +"jump": SubResource("5"), +"run": SubResource("6") +} [node name="Credits" type="Node2D"] -script = ExtResource( 4 ) +script = ExtResource("4") [node name="AudioBack" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 5 ) -bus = "SFX" +stream = ExtResource("5") +bus = &"SFX" [node name="Header" type="Label" parent="."] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = -2.0 offset_top = 11.0 offset_right = 226.0 offset_bottom = 24.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = SubResource( 1 ) +theme_override_fonts/font = ExtResource("3_4x86d") text = "TINY CRATE" -align = 1 +horizontal_alignment = 1 [node name="By" type="Label" parent="."] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 103.0 offset_top = 25.0 offset_right = 113.0 offset_bottom = 35.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 1 ) +theme_override_fonts/font = ExtResource("1") text = "by" -align = 1 -valign = 1 +horizontal_alignment = 1 [node name="HarmonyHoneyLogo" type="Sprite2D" parent="."] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -position = Vector2( 112, 49 ) -texture = ExtResource( 11 ) +modulate = Color(1, 0.945098, 0.909804, 1) +position = Vector2(112, 49) +texture = ExtResource("11") [node name="List" type="Label" parent="."] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = -2.0 offset_top = 59.0 offset_right = 226.0 offset_bottom = 128.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 1 ) +theme_override_fonts/font = ExtResource("1") text = "hhoney.net Made with Godot Engine Fonts by Daniel Linssen" -align = 1 -valign = 1 +horizontal_alignment = 1 [node name="Stage" type="Node2D" parent="."] -[node name="SolidTileMap" parent="Stage" instance=ExtResource( 3 )] -tile_data = PackedInt32Array( -65531, 0, 1, 5, 536870912, 0, 65541, 0, 1, 131077, 0, 0, 196613, 0, 1, 262149, 536870912, 0, 327685, 0, 0, 393221, 0, 1, 524287, 0, 1, 458752, 0, 0, 458753, 0, 1, 458754, 536870912, 0, 458755, 0, 1, 458756, 0, 1, 458757, 0, 0, 458758, 0, 1, 458759, 536870912, 0, 589845, 536870912, 0, 589846, 0, 1, 589847, 0, 0, 589848, 0, 1, 589849, 0, 1, 589850, 536870912, 0, 589851, 0, 1, 589852, 0, 1, 655381, 0, 1, 720917, 536870912, 0, 786453, 0, 0, 786454, 0, 1, 786455, 536870912, 0, 851991, 0, 1, 917527, 0, 0, 983063, 536870912, 0, 1048599, 0, 1 ) +[node name="SolidTileMap" parent="Stage" instance=ExtResource("3")] +layer_0/tile_data = PackedInt32Array(-65531, 0, 1, 5, 536870912, 0, 65541, 0, 1, 131077, 0, 0, 196613, 0, 1, 262149, 536870912, 0, 327685, 0, 0, 393221, 0, 1, 524287, 0, 1, 458752, 0, 0, 458753, 0, 1, 458754, 536870912, 0, 458755, 0, 1, 458756, 0, 1, 458757, 0, 0, 458758, 0, 1, 458759, 536870912, 0, 589845, 536870912, 0, 589846, 0, 1, 589847, 0, 0, 589848, 0, 1, 589849, 0, 1, 589850, 536870912, 0, 589851, 0, 1, 589852, 0, 1, 655381, 0, 1, 720917, 536870912, 0, 786453, 0, 0, 786454, 0, 1, 786455, 536870912, 0, 851991, 0, 1, 917527, 0, 0, 983063, 536870912, 0, 1048599, 0, 1) -[node name="DetailTileMap" parent="Stage" instance=ExtResource( 2 )] +[node name="DetailTileMap" parent="Stage" instance=ExtResource("2")] z_index = -11 -tile_data = PackedInt32Array( -1, 4, 0, -65536, 536870916, 1, -65535, 4, 0, -65532, 5, 0, -65529, 536870916, 3, -65528, 536870916, 1, -65527, 536870916, 0, -65526, 4, 3, -65510, 536870916, 0, -65509, 4, 1, -65508, 4, 1, 65535, 536870916, 1, 0, 536870916, 0, 1, 536870916, 2, 4, -1073741819, 0, 7, 4, 2, 8, 4, 0, 9, 536870916, 1, 10, 536870916, 2, 17, 4, 2, 18, 536870916, 0, 19, 4, 1, 20, 4, 1, 21, 4, 0, 22, 536870916, 2, 26, 4, 2, 27, 4, 0, 28, 4, 1, 131071, 4, 0, 65536, 536870916, 2, 65540, -1073741819, 0, 65543, 536870916, 3, 65544, 536870916, 2, 65555, 4, 2, 65556, 4, 1, 65557, 536870916, 2, 65563, 4, 2, 65564, 536870916, 0, 131076, -1073741819, 0, 131095, 5, 2, 131096, 5, 0, 131097, -1610612731, 2, 196612, -1073741819, 2, 196614, 536870917, 2, 196631, 5, 0, 196632, 5, 0, 196633, 5, 0, 196634, -1610612731, 2, 262150, -1610612731, 0, 262166, -1610612731, 0, 262167, 5, 0, 262168, 5, 0, 262169, 5, 0, 262170, -1073741819, 0, 327686, -1610612731, 0, 327702, -1073741819, 2, 327703, 5, 0, 327704, 5, 0, 327705, 5, 0, 458751, 5, 0, 393216, 5, 0, 393217, 536870917, 2, 393220, 5, 2, 393222, -536870907, 2, 393239, -1073741819, 2, 393240, 5, 0, 393241, 1610612741, 2, 393242, 536870916, 3, 393243, 536870916, 1, 393244, 536870916, 1, 458776, 5, 1, 458778, 4, 2, 458779, 536870916, 0, 458780, 536870916, 1, 524289, 1073741829, 2, 524290, 5, 0, 524291, 5, 1, 524292, 1610612741, 2, 524312, 5, 1, 524313, 536870917, 2, 655359, 536870916, 1, 589824, 4, 3, 589827, 5, 1, 720895, 536870916, 1, 655360, 536870916, 2, 655362, 5, 2, 655363, 5, 1, 655364, 5, 0, 655365, -1610612731, 2, 655380, 5, 2, 655382, 5, 0, 655383, 5, 0, 655384, 5, 0, 655385, 1610612741, 2, 720897, 5, 2, 720898, 5, 0, 720899, 5, 0, 720900, -1610612731, 1, 720901, -1610612731, 1, 720902, -1610612731, 1, 720903, -1610612731, 2, 720916, -1073741819, 0, 720922, 4, 2, 720923, 4, 0, 720924, 4, 1, 786433, 5, 0, 786434, 1073741829, 1, 786435, 5, 0, 786436, 5, 0, 786452, -1073741819, 2, 786456, -1610612731, 2, 786459, 4, 2, 786460, 536870916, 1, 851969, -1073741819, 2, 851970, 5, 0, 851971, -2147483643, 1, 851972, -536870907, 1, 851973, -536870907, 2, 851992, 5, 0, 983039, 536870916, 0, 917504, 4, 3, 917506, -1073741819, 2, 917507, 5, 0, 917508, 1610612741, 2, 917528, 5, 0, 917531, 536870916, 3, 917532, 4, 0, 1048575, 4, 1, 983040, 4, 0, 983041, 4, 3, 983052, 536870916, 3, 983053, 4, 1, 983054, 4, 0, 983055, 4, 3, 983062, -2147483643, 2, 983064, 1610612741, 2, 983066, 536870916, 3, 983067, 536870916, 0, 983068, 536870916, 1, 1114111, 4, 1, 1048576, 4, 1, 1048577, 536870916, 0, 1048588, 4, 2, 1048589, 536870916, 1, 1048590, 536870916, 1, 1048591, 536870916, 2, 1048598, -2147483643, 0, 1048602, 4, 0, 1048603, 536870916, 1, 1048604, 4, 0 ) -[node name="GameCamera" parent="Stage" instance=ExtResource( 6 )] -position = Vector2( 112, 64 ) +[node name="GameCamera" parent="Stage" instance=ExtResource("6")] +position = Vector2(112, 64) [node name="Actors" type="Node2D" parent="Stage"] -[node name="Exit" parent="Stage/Actors" instance=ExtResource( 7 )] -position = Vector2( 13, 21 ) +[node name="Exit" parent="Stage/Actors" instance=ExtResource("7")] +position = Vector2(13, 21) -[node name="Box" parent="Stage/Actors" instance=ExtResource( 8 )] -position = Vector2( 19, 48 ) +[node name="Box" parent="Stage/Actors" instance=ExtResource("8")] +position = Vector2(19, 48) -[node name="Player" parent="Stage/Actors" instance=ExtResource( 9 )] -position = Vector2( 172, 64 ) +[node name="Player" parent="Stage/Actors" instance=ExtResource("9")] +position = Vector2(172, 64) is_attract_mode = true [node name="Sprite2D" parent="Stage/Actors/Player" index="0"] flip_h = true +[node name="AnimationPlayer" parent="Stage/Actors/Player" index="1"] +libraries = { +"": SubResource("AnimationLibrary_yihc7") +} + [editable path="Stage/GameCamera"] [editable path="Stage/Actors/Player"] diff --git a/src/menu/options/OptionsMenu.tscn b/src/menu/options/OptionsMenu.tscn index 17a6716..4a422d0 100644 --- a/src/menu/options/OptionsMenu.tscn +++ b/src/menu/options/OptionsMenu.tscn @@ -1,323 +1,270 @@ -[gd_scene load_steps=25 format=2] +[gd_scene load_steps=24 format=3 uid="uid://b0b7tcu578wcc"] -[ext_resource path="res://src/menu/options/OptionsMenu.gd" type="Script" id=1] -[ext_resource path="res://src/menu/options/Volume.tscn" type="PackedScene" id=2] -[ext_resource path="res://media/audio/sfx/sfx14.wav" type="AudioStream" id=3] -[ext_resource path="res://media/audio/sfx/sfx5.wav" type="AudioStream" id=4] -[ext_resource path="res://media/audio/sfx/btn0.wav" type="AudioStream" id=5] -[ext_resource path="res://media/audio/sfx/Randomize103.wav" type="AudioStream" id=7] -[ext_resource path="res://media/font/m6x11.ttf" type="FontFile" id=8] -[ext_resource path="res://media/font/m3x6.tres" type="FontFile" id=9] -[ext_resource path="res://media/audio/sfx/sfx3.wav" type="AudioStream" id=10] -[ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=11] -[ext_resource path="res://media/audio/sfx/hit1.wav" type="AudioStream" id=12] -[ext_resource path="res://media/image/9slice.png" type="Texture2D" id=13] -[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=14] -[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=15] -[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=16] -[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=17] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=18] -[ext_resource path="res://src/menu/options/Back.gd" type="Script" id=19] -[ext_resource path="res://src/menu/options/Fullscreen.gd" type="Script" id=20] -[ext_resource path="res://src/menu/options/WindowSize.gd" type="Script" id=21] -[ext_resource path="res://src/menu/options/Touch.gd" type="Script" id=22] -[ext_resource path="res://src/menu/options/Delete.gd" type="Script" id=23] -[ext_resource path="res://src/menu/options/Unlock.gd" type="Script" id=24] - -[sub_resource type="FontFile" id=1] -spacing_bottom = -1 -font_data = ExtResource( 8 ) +[ext_resource type="Script" path="res://src/menu/options/OptionsMenu.gd" id="1"] +[ext_resource type="PackedScene" uid="uid://csufsvvej8cej" path="res://src/menu/options/Volume.tscn" id="2"] +[ext_resource type="FontVariation" uid="uid://cntu078xgj2oj" path="res://media/font/m6x11.tres" id="2_y4a7q"] +[ext_resource type="AudioStream" uid="uid://dsy6k8b3us1m5" path="res://media/audio/sfx/sfx14.wav" id="3"] +[ext_resource type="AudioStream" uid="uid://c5o213npemepk" path="res://media/audio/sfx/sfx5.wav" id="4"] +[ext_resource type="AudioStream" uid="uid://dlnstudklha3c" path="res://media/audio/sfx/btn0.wav" id="5"] +[ext_resource type="AudioStream" uid="uid://lmsmr8cqqx8i" path="res://media/audio/sfx/Randomize103.wav" id="7"] +[ext_resource type="FontVariation" uid="uid://culrlsi316p0y" path="res://media/font/m3x6.tres" id="9"] +[ext_resource type="AudioStream" uid="uid://3d7jvhtcwlpd" path="res://media/audio/sfx/sfx3.wav" id="10"] +[ext_resource type="AudioStream" uid="uid://bd5iht8uibqik" path="res://media/audio/sfx/portal7.wav" id="11"] +[ext_resource type="AudioStream" uid="uid://c0sja8q4h5lm4" path="res://media/audio/sfx/hit1.wav" id="12"] +[ext_resource type="Texture2D" uid="uid://s7e12rs806hl" path="res://media/image/9slice.png" id="13"] +[ext_resource type="PackedScene" uid="uid://c3tsbvbfy7tmu" path="res://src/stage/DetailTileMap.tscn" id="14"] +[ext_resource type="PackedScene" path="res://src/actor/Exit.tscn" id="15"] +[ext_resource type="PackedScene" uid="uid://bleh1qiiufduy" path="res://src/actor/Player.tscn" id="16"] +[ext_resource type="PackedScene" uid="uid://ccgl186gosdcp" path="res://src/stage/SolidTileMap.tscn" id="17"] +[ext_resource type="PackedScene" path="res://src/stage/GameCamera.tscn" id="18"] +[ext_resource type="Script" path="res://src/menu/options/Back.gd" id="19"] +[ext_resource type="Script" path="res://src/menu/options/Fullscreen.gd" id="20"] +[ext_resource type="Script" path="res://src/menu/options/WindowSize.gd" id="21"] +[ext_resource type="Script" path="res://src/menu/options/Touch.gd" id="22"] +[ext_resource type="Script" path="res://src/menu/options/Delete.gd" id="23"] +[ext_resource type="Script" path="res://src/menu/options/Unlock.gd" id="24"] [node name="OptionsMenu" type="Node2D"] process_mode = 2 -script = ExtResource( 1 ) +script = ExtResource("1") [node name="Cursor" type="ColorRect" parent="."] offset_left = 56.0 offset_top = 23.0 offset_right = 200.0 offset_bottom = 35.0 -color = Color( 0.113725, 0.168627, 0.32549, 1 ) +color = Color(0.113725, 0.168627, 0.32549, 1) [node name="Header" type="Label" parent="."] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 14.0 offset_top = 7.0 offset_right = 242.0 offset_bottom = 20.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) -custom_constants/shadow_as_outline = 1 -custom_fonts/font = SubResource( 1 ) +theme_override_fonts/font = ExtResource("2_y4a7q") text = "OPTIONS" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="NinePatchRect" type="NinePatchRect" parent="."] visible = false show_behind_parent = true +custom_minimum_size = Vector2(24, 24) offset_left = 51.0 offset_top = 18.0 offset_right = 201.0 offset_bottom = 108.0 -custom_minimum_size = Vector2( 24, 24 ) -texture = ExtResource( 13 ) +texture = ExtResource("13") patch_margin_left = 8 patch_margin_top = 8 patch_margin_right = 8 patch_margin_bottom = 8 axis_stretch_horizontal = 1 axis_stretch_vertical = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="AudioScroll" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 12 ) +stream = ExtResource("12") volume_db = -7.0 -bus = "SFX" +bus = &"SFX" [node name="MenuItems" type="Node2D" parent="."] -position = Vector2( 14, 0 ) z_index = 20 z_as_relative = false +position = Vector2(14, 0) [node name="Back" type="Node2D" parent="MenuItems"] -position = Vector2( 50, 25 ) -script = ExtResource( 19 ) +position = Vector2(50, 25) +script = ExtResource("19") [node name="Label" type="Label" parent="MenuItems/Back"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_top = 1.0 offset_right = 128.0 offset_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 9 ) +theme_override_fonts/font = ExtResource("9") text = "Back to Menu" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="MenuItems/Back"] -stream = ExtResource( 7 ) -bus = "SFX" +stream = ExtResource("7") +bus = &"SFX" -[node name="Sounds" parent="MenuItems" instance=ExtResource( 2 )] +[node name="Sounds" parent="MenuItems" instance=ExtResource("2")] -[node name="Music" parent="MenuItems" instance=ExtResource( 2 )] -position = Vector2( 50, 49 ) +[node name="Music" parent="MenuItems" instance=ExtResource("2")] +position = Vector2(50, 49) bus = 2 [node name="Label" parent="MenuItems/Music" index="0"] text = "Music" [node name="AudioStreamPlayer" parent="MenuItems/Music" index="3"] -stream = ExtResource( 5 ) -bus = "Music" +stream = ExtResource("5") +bus = &"Music" [node name="Fullscreen" type="Node2D" parent="MenuItems"] -position = Vector2( 50, 61 ) -script = ExtResource( 20 ) +position = Vector2(50, 61) +script = ExtResource("20") [node name="Label" type="Label" parent="MenuItems/Fullscreen"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_top = 1.0 offset_right = 50.0 offset_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 9 ) +theme_override_fonts/font = ExtResource("9") text = "Fullscreen" -__meta__ = { -"_edit_use_anchors_": false -} [node name="Box" type="ColorRect" parent="MenuItems/Fullscreen"] offset_left = 99.0 offset_top = -1.0 offset_right = 109.0 offset_bottom = 9.0 -color = Color( 1, 0.945098, 0.909804, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(1, 0.945098, 0.909804, 1) [node name="Back" type="ColorRect" parent="MenuItems/Fullscreen/Box"] +layout_mode = 0 offset_left = 1.0 offset_top = 1.0 offset_right = 9.0 offset_bottom = 9.0 -color = Color( 0, 0, 0, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0, 0, 0, 1) [node name="Fill" type="ColorRect" parent="MenuItems/Fullscreen/Box"] +layout_mode = 0 offset_left = 2.0 offset_top = 2.0 offset_right = 8.0 offset_bottom = 8.0 -color = Color( 1, 0.945098, 0.909804, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(1, 0.945098, 0.909804, 1) [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="MenuItems/Fullscreen"] -stream = ExtResource( 10 ) -bus = "SFX" +stream = ExtResource("10") +bus = &"SFX" [node name="WindowSize" type="Node2D" parent="MenuItems"] -position = Vector2( 50, 73 ) -script = ExtResource( 21 ) +position = Vector2(50, 73) +script = ExtResource("21") [node name="Label" type="Label" parent="MenuItems/WindowSize"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_top = 1.0 offset_right = 50.0 offset_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 9 ) +theme_override_fonts/font = ExtResource("9") text = "Window Size" -__meta__ = { -"_edit_use_anchors_": false -} [node name="Scale" type="Label" parent="MenuItems/WindowSize"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 48.0 offset_top = 1.0 offset_right = 80.0 offset_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 9 ) +theme_override_fonts/font = ExtResource("9") text = "1x" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Resolution" type="Label" parent="MenuItems/WindowSize"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_left = 72.0 offset_top = 1.0 offset_right = 136.0 offset_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 9 ) +theme_override_fonts/font = ExtResource("9") text = "228 x 128" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="MenuItems/WindowSize"] -stream = ExtResource( 3 ) -bus = "SFX" +stream = ExtResource("3") +bus = &"SFX" [node name="TouchControls" type="Node2D" parent="MenuItems"] -position = Vector2( 50, 85 ) -script = ExtResource( 22 ) +position = Vector2(50, 85) +script = ExtResource("22") [node name="Label" type="Label" parent="MenuItems/TouchControls"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_top = 1.0 offset_right = 56.0 offset_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 9 ) +theme_override_fonts/font = ExtResource("9") text = "Touch Controls" -__meta__ = { -"_edit_use_anchors_": false -} [node name="Box" type="ColorRect" parent="MenuItems/TouchControls"] offset_left = 99.0 offset_top = -1.0 offset_right = 109.0 offset_bottom = 9.0 -color = Color( 1, 0.945098, 0.909804, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(1, 0.945098, 0.909804, 1) [node name="Back" type="ColorRect" parent="MenuItems/TouchControls/Box"] +layout_mode = 0 offset_left = 1.0 offset_top = 1.0 offset_right = 9.0 offset_bottom = 9.0 -color = Color( 0, 0, 0, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0, 0, 0, 1) [node name="Fill" type="ColorRect" parent="MenuItems/TouchControls/Box"] +layout_mode = 0 offset_left = 2.0 offset_top = 2.0 offset_right = 8.0 offset_bottom = 8.0 -color = Color( 1, 0.945098, 0.909804, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(1, 0.945098, 0.909804, 1) [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="MenuItems/TouchControls"] -stream = ExtResource( 10 ) -bus = "SFX" +stream = ExtResource("10") +bus = &"SFX" [node name="DeleteSaveData" type="Node2D" parent="MenuItems"] -position = Vector2( 50, 97 ) -script = ExtResource( 23 ) +position = Vector2(50, 97) +script = ExtResource("23") [node name="Label" type="Label" parent="MenuItems/DeleteSaveData"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_top = 1.0 offset_right = 128.0 offset_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 9 ) +theme_override_fonts/font = ExtResource("9") text = "Delete Save Data" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="MenuItems/DeleteSaveData"] -stream = ExtResource( 4 ) -bus = "SFX" +stream = ExtResource("4") +bus = &"SFX" [node name="UnlockAll" type="Node2D" parent="MenuItems"] -position = Vector2( 50, 109 ) -script = ExtResource( 24 ) +position = Vector2(50, 109) +script = ExtResource("24") [node name="Label" type="Label" parent="MenuItems/UnlockAll"] +modulate = Color(1, 0.945098, 0.909804, 1) offset_top = 1.0 offset_right = 128.0 offset_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 9 ) +theme_override_fonts/font = ExtResource("9") text = "Unlock All" -align = 1 -__meta__ = { -"_edit_use_anchors_": false -} +horizontal_alignment = 1 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="MenuItems/UnlockAll"] -stream = ExtResource( 11 ) -bus = "SFX" +stream = ExtResource("11") +bus = &"SFX" [node name="Stage" type="Node2D" parent="."] -[node name="SolidTileMap" parent="Stage" instance=ExtResource( 17 )] -tile_data = PackedInt32Array( -131061, 0, 1, -131052, 0, 0, -65525, 0, 0, -65516, 0, 1, 11, 0, 1, 20, 0, 0, 65542, 0, 0, 65543, 0, 1, 65544, 0, 1, 65545, 0, 0, 65546, 0, 1, 65547, 536870912, 0, 65556, 0, 0, 65557, 0, 1, 65558, 536870912, 1, 65559, 536870912, 0, 65560, 0, 1, 65561, 536870912, 0, 131078, 0, 1, 131097, 0, 1, 196610, 0, 0, 196611, 0, 1, 196612, 0, 0, 196613, 0, 1, 196614, 536870912, 0, 196633, 536870912, 0, 262146, 0, 1, 262169, 0, 0, 327682, 536870912, 0, 327705, 0, 1, 393218, 536870912, 0, 393241, 0, 0, 393242, 0, 1, 393243, 536870912, 0, 393244, 0, 1, 393245, 536870912, 0, 458754, 0, 1, 458781, 0, 1, 524290, 0, 0, 524317, 0, 0, 589826, 0, 1, 589853, 0, 1, 655362, 0, 0, 655363, 0, 1, 655364, 536870912, 0, 655365, 0, 1, 655366, 536870912, 0, 655389, 0, 0, 720902, 0, 0, 720925, 536870912, 0, 786438, 0, 1, 786461, 0, 1, 851974, 0, 0, 851993, 0, 0, 851994, 0, 1, 851995, 0, 0, 851996, 0, 1, 851997, 536870912, 0, 917510, 0, 0, 917529, 0, 1, 983046, 0, 1, 983065, 536870912, 0, 1048582, 0, 1, 1048601, 0, 0 ) +[node name="SolidTileMap" parent="Stage" instance=ExtResource("17")] +layer_0/tile_data = PackedInt32Array(-131052, 0, 0, -65525, 0, 0, 20, 0, 0, 65542, 0, 0, 65545, 0, 0, 65547, 0, 65536, 65556, 0, 0, 65559, 0, 65536, 65561, 0, 65536, 196610, 0, 0, 196612, 0, 0, 196614, 0, 65536, 196633, 0, 65536, 262169, 0, 0, 327682, 0, 65536, 393218, 0, 65536, 393241, 0, 0, 393243, 0, 65536, 393245, 0, 65536, 524290, 0, 0, 524317, 0, 0, 655362, 0, 0, 655364, 0, 65536, 655366, 0, 65536, 655389, 0, 0, 720902, 0, 0, 720925, 0, 65536, 851974, 0, 0, 851993, 0, 0, 851995, 0, 0, 851997, 0, 65536, 917510, 0, 0, 983065, 0, 65536, 1048601, 0, 0) -[node name="DetailTileMap" parent="Stage" instance=ExtResource( 14 )] +[node name="DetailTileMap" parent="Stage" instance=ExtResource("14")] z_index = -11 -tile_data = PackedInt32Array( -131062, 5, 0, -131051, 5, 0, -65526, 5, 0, -65515, 5, 0, -65508, 536870916, 0, -65507, 4, 1, -65506, 536870916, 0, 8, 5, 2, 9, 5, 0, 10, -1073741819, 0, 21, -1610612731, 0, 22, 5, 0, 23, 536870917, 2, 28, 4, 2, 29, 4, 0, 30, 4, 1, 65565, 4, 2, 65566, 536870916, 0, 131075, 5, 2, 131076, 5, 0, 131077, 5, 0, 131079, 5, 0, 131080, 1610612741, 2, 131095, 1073741829, 2, 131096, 5, 0, 131098, -1610612731, 2, 196615, 1610612741, 2, 196632, 1073741829, 2, 196634, 1610612741, 0, 262147, 1610612741, 2, 262170, -1610612731, 0, 327684, 5, 2, 327685, 5, 0, 327686, -1610612731, 2, 327706, 5, 0, 327707, 536870917, 2, 393220, 5, 0, 393221, 5, 0, 393222, 5, 0, 458756, -1073741819, 2, 458757, 5, 0, 458758, 1610612741, 2, 458778, 5, 1, 458779, 1610612741, 2, 524293, 1610612741, 1, 524314, 5, 1, 589828, 5, 2, 589829, 1610612741, 1, 589849, 5, 2, 589850, 5, 0, 589851, -1610612731, 2, 655385, 5, 0, 655386, 5, 0, 655387, 5, 0, 720900, 1073741829, 2, 720901, 5, 0, 720903, -1610612731, 2, 720921, -1073741819, 2, 720922, 5, 0, 720923, 1610612741, 2, 786439, 1610612741, 0, 786460, 5, 2, 851975, 1610612741, 0, 917505, 536870916, 0, 917506, 4, 3, 917511, 1610612741, 0, 917528, -2147483643, 2, 917530, 5, 0, 917531, 5, 0, 917532, 1610612741, 2, 983041, 4, 1, 983042, 4, 0, 983043, 4, 3, 983047, 1610612741, 0, 983064, -2147483643, 0, 1048577, 536870916, 0, 1048578, 4, 1, 1048579, 536870916, 0, 1048583, 1610612741, 0, 1048600, -2147483643, 0 ) -[node name="GameCamera" parent="Stage" instance=ExtResource( 18 )] -position = Vector2( 128, 64 ) +[node name="GameCamera" parent="Stage" instance=ExtResource("18")] +position = Vector2(128, 64) [node name="Actors" type="Node2D" parent="Stage"] -[node name="Exit" parent="Stage/Actors" instance=ExtResource( 15 )] -position = Vector2( 221, 21 ) +[node name="Exit" parent="Stage/Actors" instance=ExtResource("15")] +position = Vector2(221, 21) -[node name="Player" parent="Stage/Actors" instance=ExtResource( 16 )] -position = Vector2( 49, 72 ) +[node name="Player" parent="Stage/Actors" instance=ExtResource("16")] +position = Vector2(49, 72) is_attract_mode = true [editable path="MenuItems/Music"] diff --git a/src/menu/options/Volume.tscn b/src/menu/options/Volume.tscn index cdebcad..99a3403 100644 --- a/src/menu/options/Volume.tscn +++ b/src/menu/options/Volume.tscn @@ -1,127 +1,97 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://csufsvvej8cej"] -[ext_resource path="res://media/image/tinyArrow.png" type="Texture2D" id=1] -[ext_resource path="res://media/audio/sfx/sfx14.wav" type="AudioStream" id=2] -[ext_resource path="res://src/menu/options/Volume.gd" type="Script" id=3] -[ext_resource path="res://media/font/m3x6.tres" type="FontFile" id=4] +[ext_resource type="Texture2D" uid="uid://cog8ofb176cgq" path="res://media/image/tinyArrow.png" id="1"] +[ext_resource type="AudioStream" uid="uid://dsy6k8b3us1m5" path="res://media/audio/sfx/sfx14.wav" id="2"] +[ext_resource type="Script" path="res://src/menu/options/Volume.gd" id="3"] +[ext_resource type="FontVariation" uid="uid://culrlsi316p0y" path="res://media/font/m3x6.tres" id="4"] [node name="Volume" type="Node2D"] -position = Vector2( 50, 37 ) -script = ExtResource( 3 ) +position = Vector2(50, 37) +script = ExtResource("3") [node name="Label" type="Label" parent="."] +modulate = Color(1, 0.945098, 0.909804, 1) offset_top = 1.0 offset_right = 42.0 offset_bottom = 9.0 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 4 ) +theme_override_fonts/font = ExtResource("4") text = "Sounds" [node name="Meter" type="Node2D" parent="."] -position = Vector2( 89, 0 ) +position = Vector2(89, 0) [node name="1" type="ColorRect" parent="Meter"] offset_right = 3.0 offset_bottom = 8.0 -color = Color( 0, 0.894118, 0.211765, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0, 0.894118, 0.211765, 1) [node name="2" type="ColorRect" parent="Meter"] offset_left = 4.0 offset_right = 7.0 offset_bottom = 8.0 -color = Color( 0, 0.894118, 0.211765, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0, 0.894118, 0.211765, 1) [node name="3" type="ColorRect" parent="Meter"] offset_left = 8.0 offset_right = 11.0 offset_bottom = 8.0 -color = Color( 0, 0.894118, 0.211765, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0, 0.894118, 0.211765, 1) [node name="4" type="ColorRect" parent="Meter"] offset_left = 12.0 offset_right = 15.0 offset_bottom = 8.0 -color = Color( 0, 0.894118, 0.211765, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0, 0.894118, 0.211765, 1) [node name="5" type="ColorRect" parent="Meter"] offset_left = 16.0 offset_right = 19.0 offset_bottom = 8.0 -color = Color( 0, 0.894118, 0.211765, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0, 0.894118, 0.211765, 1) [node name="6" type="ColorRect" parent="Meter"] offset_left = 20.0 offset_right = 23.0 offset_bottom = 8.0 -color = Color( 0, 0.894118, 0.211765, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0, 0.894118, 0.211765, 1) [node name="7" type="ColorRect" parent="Meter"] offset_left = 24.0 offset_right = 27.0 offset_bottom = 8.0 -color = Color( 1, 0, 0.301961, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(1, 0, 0.301961, 1) [node name="8" type="ColorRect" parent="Meter"] offset_left = 28.0 offset_right = 31.0 offset_bottom = 8.0 -color = Color( 1, 0, 0.301961, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(1, 0, 0.301961, 1) [node name="9" type="ColorRect" parent="Meter"] offset_left = 32.0 offset_right = 35.0 offset_bottom = 8.0 -color = Color( 1, 0, 0.301961, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(1, 0, 0.301961, 1) [node name="10" type="ColorRect" parent="Meter"] offset_left = 36.0 offset_right = 39.0 offset_bottom = 8.0 -color = Color( 1, 0, 0.301961, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(1, 0, 0.301961, 1) [node name="Arrows" type="Node2D" parent="."] visible = false -position = Vector2( 89, 0 ) +position = Vector2(89, 0) [node name="tinyArrow" type="Sprite2D" parent="Arrows"] -position = Vector2( -2, 4 ) -texture = ExtResource( 1 ) +position = Vector2(-2, 4) +texture = ExtResource("1") [node name="tinyArrow2" type="Sprite2D" parent="Arrows"] -position = Vector2( 41, 4 ) -texture = ExtResource( 1 ) +position = Vector2(41, 4) +texture = ExtResource("1") flip_h = true [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 2 ) -bus = "SFX" +stream = ExtResource("2") +bus = &"SFX" diff --git a/src/menu/select.tscn b/src/menu/select.tscn index fc9a61a..f465bc6 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -1,207 +1,199 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=13 format=3 uid="uid://umib7fjh5g8f"] -[ext_resource path="res://media/image/corner.png" type="Texture2D" id=1] -[ext_resource path="res://media/font/m3x6.tres" type="FontFile" id=2] -[ext_resource path="res://media/image/note.png" type="Texture2D" id=3] -[ext_resource path="res://media/audio/sfx/Randomize103.wav" type="AudioStream" id=5] -[ext_resource path="res://src/shader/outline2D_outer.gdshader" type="Shader" id=6] -[ext_resource path="res://src/menu/select.gd" type="Script" id=7] -[ext_resource path="res://media/audio/sfx/Randomize104.wav" type="AudioStream" id=8] -[ext_resource path="res://media/audio/sfx/portal7.wav" type="AudioStream" id=9] +[ext_resource type="Texture2D" uid="uid://dlsm1ct1xplth" path="res://media/image/corner.png" id="1"] +[ext_resource type="FontVariation" uid="uid://culrlsi316p0y" path="res://media/font/m3x6.tres" id="2"] +[ext_resource type="Texture2D" uid="uid://cbm8q2v6s73ne" path="res://media/image/note.png" id="3"] +[ext_resource type="AudioStream" uid="uid://lmsmr8cqqx8i" path="res://media/audio/sfx/Randomize103.wav" id="5"] +[ext_resource type="Shader" path="res://src/shader/outline2D_outer.gdshader" id="6"] +[ext_resource type="Script" path="res://src/menu/select.gd" id="7"] +[ext_resource type="AudioStream" uid="uid://cdbbh0vkaxmh3" path="res://media/audio/sfx/Randomize104.wav" id="8"] +[ext_resource type="AudioStream" uid="uid://bd5iht8uibqik" path="res://media/audio/sfx/portal7.wav" id="9"] -[sub_resource type="ShaderMaterial" id=3] -shader = ExtResource( 6 ) -shader_param/line_color = Color( 0, 0, 0, 1 ) -shader_param/line_thickness = 1.0 +[sub_resource type="ShaderMaterial" id="3"] +shader = ExtResource("6") +shader_parameter/line_color = Color(0, 0, 0, 1) +shader_parameter/line_thickness = 1.0 -[sub_resource type="Animation" id=1] +[sub_resource type="Animation" id="1"] length = 1.15 -loop = true tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true tracks/0/path = NodePath("c1:position") tracks/0/interp = 2 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true tracks/0/keys = { -"times": PackedFloat32Array( 0, 0.5, 1 ), -"transitions": PackedFloat32Array( 1, 1, 1 ), +"times": PackedFloat32Array(0, 0.5, 1), +"transitions": PackedFloat32Array(1, 1, 1), "update": 0, -"values": [ Vector2( -55, -55 ), Vector2( -45, -45 ), Vector2( -55, -55 ) ] +"values": [Vector2(-55, -55), Vector2(-45, -45), Vector2(-55, -55)] } tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true tracks/1/path = NodePath("c2:position") tracks/1/interp = 2 tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true tracks/1/keys = { -"times": PackedFloat32Array( 0, 0.5, 1 ), -"transitions": PackedFloat32Array( 1, 1, 1 ), +"times": PackedFloat32Array(0, 0.5, 1), +"transitions": PackedFloat32Array(1, 1, 1), "update": 0, -"values": [ Vector2( 55, -55 ), Vector2( 45, -45 ), Vector2( 55, -55 ) ] +"values": [Vector2(55, -55), Vector2(45, -45), Vector2(55, -55)] } tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true tracks/2/path = NodePath("c3:position") tracks/2/interp = 2 tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true tracks/2/keys = { -"times": PackedFloat32Array( 0, 0.5, 1 ), -"transitions": PackedFloat32Array( 1, 1, 1 ), +"times": PackedFloat32Array(0, 0.5, 1), +"transitions": PackedFloat32Array(1, 1, 1), "update": 0, -"values": [ Vector2( -55, 55 ), Vector2( -45, 45 ), Vector2( -55, 55 ) ] +"values": [Vector2(-55, 55), Vector2(-45, 45), Vector2(-55, 55)] } tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true tracks/3/path = NodePath("c4:position") tracks/3/interp = 2 tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true tracks/3/keys = { -"times": PackedFloat32Array( 0, 0.5, 1 ), -"transitions": PackedFloat32Array( 1, 1, 1 ), +"times": PackedFloat32Array(0, 0.5, 1), +"transitions": PackedFloat32Array(1, 1, 1), "update": 0, -"values": [ Vector2( 55, 55 ), Vector2( 45, 45 ), Vector2( 55, 55 ) ] +"values": [Vector2(55, 55), Vector2(45, 45), Vector2(55, 55)] } -[sub_resource type="ShaderMaterial" id=2] -shader = ExtResource( 6 ) -shader_param/line_color = Color( 0, 0, 0, 1 ) -shader_param/line_thickness = 1.0 +[sub_resource type="AnimationLibrary" id="AnimationLibrary_tte7n"] +_data = { +"New Anim": SubResource("1") +} + +[sub_resource type="ShaderMaterial" id="2"] +shader = ExtResource("6") +shader_parameter/line_color = Color(0, 0, 0, 1) +shader_parameter/line_thickness = 1.0 [node name="Node2D" type="Node2D"] -position = Vector2( 1, 1 ) -script = ExtResource( 7 ) +position = Vector2(1, 1) +script = ExtResource("7") [node name="AudioScroll" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 8 ) +stream = ExtResource("8") volume_db = -5.0 -bus = "SFX" +bus = &"SFX" [node name="AudioSelect" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 9 ) -bus = "SFX" +stream = ExtResource("9") +bus = &"SFX" [node name="AudioBack" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 5 ) -bus = "SFX" +stream = ExtResource("5") +bus = &"SFX" [node name="Control" type="Control" parent="."] +layout_mode = 3 +anchors_preset = 0 offset_right = 320.0 offset_bottom = 180.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Screens" type="Control" parent="Control"] +anchors_preset = 0 offset_right = 40.0 offset_bottom = 40.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Screen" type="Control" parent="Control"] +anchors_preset = 0 offset_left = 110.0 offset_top = 40.0 offset_right = 150.0 offset_bottom = 80.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="ColorRect" type="ColorRect" parent="Control/Screen"] visible = false +layout_mode = 0 offset_left = -2.00002 offset_top = -2.0 offset_right = 102.0 offset_bottom = 102.0 -color = Color( 1, 0.945098, 0.909804, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(1, 0.945098, 0.909804, 1) [node name="SubViewportContainer" type="SubViewportContainer" parent="Control/Screen"] +layout_mode = 0 offset_left = -1.52588e-05 offset_right = 100.0 offset_bottom = 100.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="SubViewport" type="SubViewport" parent="Control/Screen/SubViewportContainer"] -size = Vector2( 100, 100 ) -own_world = true handle_input_locally = false -render_target_update_mode = 3 +size = Vector2i(100, 100) +render_target_update_mode = 4 [node name="Label" type="Label" parent="Control/Screen"] +self_modulate = Color(1, 0.945098, 0.909804, 1) +layout_mode = 0 offset_top = 46.0 offset_right = 100.0 offset_bottom = 54.0 grow_horizontal = 2 -custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 ) -custom_fonts/font = ExtResource( 2 ) +theme_override_fonts/font = ExtResource("2") text = "1-1" -align = 1 -valign = 1 +horizontal_alignment = 1 [node name="ColorRect" type="ColorRect" parent="Control/Screen/Label"] show_behind_parent = true +layout_mode = 0 offset_left = 43.0 offset_top = -1.0 offset_right = 56.0 offset_bottom = 7.0 -color = Color( 0, 0, 0, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} +color = Color(0, 0, 0, 1) [node name="Note" type="Sprite2D" parent="Control/Screen"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -material = SubResource( 3 ) -position = Vector2( 90, 10 ) -texture = ExtResource( 3 ) +modulate = Color(1, 0.945098, 0.909804, 1) +material = SubResource("3") +position = Vector2(90, 10) +texture = ExtResource("3") [node name="Camera2D" type="Camera2D" parent="."] -position = Vector2( 160, 90 ) -current = true -follow_smoothing_enabled = true +position = Vector2(160, 90) editor_draw_screen = false [node name="Cursor" type="Node2D" parent="Camera2D"] [node name="AnimationPlayer" type="AnimationPlayer" parent="Camera2D/Cursor"] autoplay = "New Anim" -"anims/New Anim" = SubResource( 1 ) +libraries = { +"": SubResource("AnimationLibrary_tte7n") +} [node name="c1" type="Sprite2D" parent="Camera2D/Cursor"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -material = SubResource( 2 ) -position = Vector2( -55, -55 ) -texture = ExtResource( 1 ) +modulate = Color(1, 0.945098, 0.909804, 1) +material = SubResource("2") +position = Vector2(-55, -55) +texture = ExtResource("1") [node name="c2" type="Sprite2D" parent="Camera2D/Cursor"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -material = SubResource( 2 ) -position = Vector2( 55, -55 ) +modulate = Color(1, 0.945098, 0.909804, 1) +material = SubResource("2") +position = Vector2(55, -55) rotation = 1.5708 -texture = ExtResource( 1 ) +texture = ExtResource("1") [node name="c3" type="Sprite2D" parent="Camera2D/Cursor"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -material = SubResource( 2 ) -position = Vector2( -55, 55 ) +modulate = Color(1, 0.945098, 0.909804, 1) +material = SubResource("2") +position = Vector2(-55, 55) rotation = 4.71239 -texture = ExtResource( 1 ) +texture = ExtResource("1") [node name="c4" type="Sprite2D" parent="Camera2D/Cursor"] -modulate = Color( 1, 0.945098, 0.909804, 1 ) -material = SubResource( 2 ) -position = Vector2( 55, 55 ) +modulate = Color(1, 0.945098, 0.909804, 1) +material = SubResource("2") +position = Vector2(55, 55) rotation = 3.14159 -texture = ExtResource( 1 ) +texture = ExtResource("1") [node name="BG" type="CanvasLayer" parent="."] layer = -1 @@ -213,4 +205,4 @@ z_as_relative = false [node name="ColorRect" type="ColorRect" parent="BG/Background"] offset_right = 320.0 offset_bottom = 180.0 -color = Color( 1, 0.945098, 0.909804, 1 ) +color = Color(1, 0.945098, 0.909804, 1) diff --git a/src/menu/splash.gd b/src/menu/splash.gd index 540fe1a..7945b95 100644 --- a/src/menu/splash.gd +++ b/src/menu/splash.gd @@ -1,7 +1,7 @@ extends Node2D func _ready(): - await get_tree().idle_frame + await get_tree().physics_frame Music.play() $AudioStreamPlayer.play() await get_tree().create_timer(1.5).timeout diff --git a/src/menu/splash.tscn b/src/menu/splash.tscn index 68c7bbc..1610f45 100644 --- a/src/menu/splash.tscn +++ b/src/menu/splash.tscn @@ -1,15 +1,20 @@ -[gd_scene load_steps=4 format=3 uid="uid://clv8k7ufdvb64"] +[gd_scene load_steps=4 format=3 uid="uid://sb3d7qipc01"] -[ext_resource type="Texture2D" uid="uid://dkt7moln5kuv6" path="res://media/image/HarmonyHoneyLogo.png" id="1"] +[ext_resource type="Texture2D" uid="uid://dfjueli3quv6r" path="res://media/image/HarmonyHoneyLogo.png" id="1"] [ext_resource type="Script" path="res://src/menu/splash.gd" id="3"] -[ext_resource type="AudioStream" uid="uid://b0w5cue6n55pg" path="res://media/audio/sfx/bell1.wav" id="4"] +[ext_resource type="AudioStream" uid="uid://p6e1cf5igeb4" path="res://media/audio/sfx/bell1.wav" id="4"] [node name="Splash" type="Node2D"] script = ExtResource("3") [node name="ColorRect" type="ColorRect" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 offset_right = 228.0 offset_bottom = 128.0 +grow_horizontal = 2 +grow_vertical = 2 color = Color(1, 0.945098, 0.909804, 1) [node name="Logo" type="Sprite2D" parent="."] diff --git a/src/shader/wipe.gdshader b/src/shader/wipe.gdshader index 4e3663f..fca1f64 100644 --- a/src/shader/wipe.gdshader +++ b/src/shader/wipe.gdshader @@ -6,10 +6,10 @@ uniform vec2 size = vec2(16, 9); uniform sampler2D tex; uniform vec2 frames = vec2(4, 4); uniform int frame = 0; - +uniform vec4 color : source_color = vec4(0); void fragment(){ vec2 fv = vec2(float(frame % int(frames.x)), floor(float(frame) / frames.y)); - COLOR = texture(tex, (mod(UV * size - offset, 1.0) + fv) / frames); + COLOR = texture(tex, (mod(UV * size - offset, 1.0) + fv) / frames) * color; } \ No newline at end of file diff --git a/src/stage/DetailTileMap.tscn b/src/stage/DetailTileMap.tscn index 525e84a..c174654 100644 --- a/src/stage/DetailTileMap.tscn +++ b/src/stage/DetailTileMap.tscn @@ -1,19 +1,19 @@ -[gd_scene load_steps=6 format=3 uid="uid://btk4fot4xrepn"] +[gd_scene load_steps=6 format=3 uid="uid://c3tsbvbfy7tmu"] -[ext_resource type="Texture2D" uid="uid://c5i8t4kb7gg22" path="res://media/image/crate_tiles.png" id="1"] -[ext_resource type="Texture2D" uid="uid://c4ge5csn4jbsp" path="res://media/image/bricks.png" id="2"] +[ext_resource type="Texture2D" uid="uid://cgxirc4lig8kr" path="res://media/image/crate_tiles.png" id="1"] +[ext_resource type="Texture2D" uid="uid://dvqls6evsnna5" path="res://media/image/bricks.png" id="2"] -[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_lv6wq"] +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_u50pt"] texture = ExtResource("2") -texture_region_size = Vector2i(8, 8) -[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_qa1yd"] +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_s8eh7"] texture = ExtResource("1") -texture_region_size = Vector2i(8, 8) +margins = Vector2i(0, 16) [sub_resource type="TileSet" id="1"] -sources/2 = SubResource("TileSetAtlasSource_lv6wq") -sources/3 = SubResource("TileSetAtlasSource_qa1yd") +tile_size = Vector2i(8, 8) +sources/0 = SubResource("TileSetAtlasSource_u50pt") +sources/1 = SubResource("TileSetAtlasSource_s8eh7") [node name="DetailTileMap" type="TileMap"] z_index = -10 diff --git a/src/stage/GameCamera.gd b/src/stage/GameCamera.gd index 31bdd3a..8ac5a0b 100644 --- a/src/stage/GameCamera.gd +++ b/src/stage/GameCamera.gd @@ -20,7 +20,7 @@ var bounds_lower := Vector2.ZERO @export var bounds := Rect2(0, 0, 0, 0) : set = _set_bounds func _ready(): - if Engine.editor_hint or Shared.is_level_select: + if Engine.is_editor_hint() or Shared.is_level_select: set_physics_process(false) return @@ -38,7 +38,7 @@ func _ready(): pos_target = position func _physics_process(delta): - if !is_moving or Engine.editor_hint: + if !is_moving or Engine.is_editor_hint(): return if is_instance_valid(node_target): @@ -55,10 +55,10 @@ func _set_bounds(arg): bounds.position.y = abs(arg.position.y) bounds.size.x = abs(arg.size.x) bounds.size.y = abs(arg.size.y) - update() + #update() func _draw(): - if Engine.editor_hint: + if Engine.is_editor_hint(): draw_rect(Rect2(-bounds.position.x - 228/2, -bounds.position.y - 128/2, 228 + bounds.size.x + bounds.position.x, 128 + bounds.size.y + bounds.position.y), Color.RED, false) # super simple screen shake diff --git a/src/stage/ObscureMap.gd b/src/stage/ObscureMap.gd index a69af19..dfcb3d0 100644 --- a/src/stage/ObscureMap.gd +++ b/src/stage/ObscureMap.gd @@ -1,9 +1,10 @@ extends TileMap func _ready(): - tile_set.tile_set_modulate(0, Color.BLACK) - tile_set.tile_set_modulate(1, Color.TRANSPARENT) + pass +# tile_set.tile_set_modulate(0, Color.BLACK) +# tile_set.tile_set_modulate(1, Color.TRANSPARENT) func _physics_process(delta): if is_instance_valid(Shared.player): - modulate.a = lerp(modulate.a, 0.0 if get_cellv(local_to_map(Shared.player.center())) != -1 else 1.0, delta * 10.0) + modulate.a = lerp(modulate.a, 0.0 if get_cell_source_id(0, local_to_map(Shared.player.center())) != -1 else 1.0, delta * 10.0) diff --git a/src/stage/SolidTileMap.tscn b/src/stage/SolidTileMap.tscn index 24680d3..362de47 100644 --- a/src/stage/SolidTileMap.tscn +++ b/src/stage/SolidTileMap.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=7 format=3 uid="uid://c5yiq8sj5roql"] +[gd_scene load_steps=7 format=3 uid="uid://ccgl186gosdcp"] -[ext_resource type="Texture2D" uid="uid://dmnj3egifwv41" path="res://media/image/8pixel.png" id="1"] -[ext_resource type="Texture2D" uid="uid://euui07kbltye" path="res://media/image/solid_bricks.png" id="2"] +[ext_resource type="Texture2D" uid="uid://msfqee07s5gy" path="res://media/image/8pixel.png" id="1"] +[ext_resource type="Texture2D" uid="uid://c2pkx12yvks5v" path="res://media/image/solid_bricks.png" id="2"] -[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_4hy5o"] +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_l13wt"] texture = ExtResource("2") texture_region_size = Vector2i(8, 8) 0:0/next_alternative_id = 8 @@ -49,7 +49,7 @@ texture_region_size = Vector2i(8, 8) 1:0/7/flip_v = true 1:0/7/transpose = true -[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_bde1n"] +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_u5eox"] texture = ExtResource("1") texture_region_size = Vector2i(8, 8) 0:0/next_alternative_id = 8 @@ -84,15 +84,15 @@ texture_region_size = Vector2i(8, 8) [sub_resource type="TileSet" id="1"] tile_size = Vector2i(8, 8) -sources/0 = SubResource("TileSetAtlasSource_4hy5o") -sources/1 = SubResource("TileSetAtlasSource_bde1n") +sources/0 = SubResource("TileSetAtlasSource_l13wt") +sources/1 = SubResource("TileSetAtlasSource_u5eox") [sub_resource type="GDScript" id="2"] script/source = "extends TileMap func _ready(): Shared.node_map_solid = self - tile_set.tile_set_modulate(1, Color.TRANSPARENT) + #tile_set.tile_set_modulate(1, Color.TRANSPARENT) " [node name="SolidTileMap" type="TileMap"] diff --git a/src/stage/SpikeTileMap.gd b/src/stage/SpikeTileMap.gd index 79a7129..f63714d 100644 --- a/src/stage/SpikeTileMap.gd +++ b/src/stage/SpikeTileMap.gd @@ -4,8 +4,8 @@ var scene_spike = preload("res://src/actor/Spike.tscn") func _ready(): if !Shared.is_level_select: - for pos in get_used_cells(): - var cell = cell_size.x + for pos in get_used_cells(0): + var cell = tile_set.tile_size.x var inst = scene_spike.instantiate() inst.position = Vector2(pos.x * cell, pos.y * cell + 5) add_child(inst) diff --git a/src/stage/SpikeTileMap.tscn b/src/stage/SpikeTileMap.tscn index fb289e2..c4a5806 100644 --- a/src/stage/SpikeTileMap.tscn +++ b/src/stage/SpikeTileMap.tscn @@ -1,20 +1,40 @@ -[gd_scene load_steps=5 format=3 uid="uid://crwacm1scsjcf"] +[gd_scene load_steps=5 format=3 uid="uid://bvc7mxf7gpij4"] -[ext_resource type="Texture2D" uid="uid://c5i8t4kb7gg22" path="res://media/image/crate_tiles.png" id="1"] +[ext_resource type="Texture2D" uid="uid://cgxirc4lig8kr" path="res://media/image/crate_tiles.png" id="1"] [ext_resource type="Script" path="res://src/stage/SpikeTileMap.gd" id="2"] -[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_h2cg5"] +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_vmo4d"] texture = ExtResource("1") texture_region_size = Vector2i(8, 8) +2:0/next_alternative_id = 8 2:0/0 = 0 +2:0/1 = 1 +2:0/1/flip_h = true +2:0/2 = 2 +2:0/2/flip_v = true +2:0/3 = 3 +2:0/3/flip_h = true +2:0/3/flip_v = true +2:0/4 = 4 +2:0/4/transpose = true +2:0/5 = 5 +2:0/5/flip_h = true +2:0/5/transpose = true +2:0/6 = 6 +2:0/6/flip_v = true +2:0/6/transpose = true +2:0/7 = 7 +2:0/7/flip_h = true +2:0/7/flip_v = true +2:0/7/transpose = true -[sub_resource type="TileSet" id="TileSet_47e5o"] +[sub_resource type="TileSet" id="1"] tile_size = Vector2i(8, 8) -sources/0 = SubResource("TileSetAtlasSource_h2cg5") +sources/1 = SubResource("TileSetAtlasSource_vmo4d") [node name="SpikeTileMap" type="TileMap"] z_index = 5 z_as_relative = false -tile_set = SubResource("TileSet_47e5o") +tile_set = SubResource("1") format = 2 script = ExtResource("2")