From 355e0205634e3822c57170f7f885d04e1639343a Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Tue, 25 Mar 2025 19:13:00 +0100 Subject: [PATCH 1/8] Cirno new walk animation --- Sprites/Actors/Cirno.aseprite | 4 ++-- Sprites/Actors/Cirno.png | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sprites/Actors/Cirno.aseprite b/Sprites/Actors/Cirno.aseprite index b9f8a97b..0576c814 100644 --- a/Sprites/Actors/Cirno.aseprite +++ b/Sprites/Actors/Cirno.aseprite @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03d1756acb883c4b3b9a614b286992482418061b45b2770a0ef35447d6df1d6b -size 8917 +oid sha256:f0502382bcd02aa79fd0360c3af7ce4c93552c3a7411c53ae5dd281d23df9914 +size 8511 diff --git a/Sprites/Actors/Cirno.png b/Sprites/Actors/Cirno.png index f3047cac..e16dfe2e 100644 --- a/Sprites/Actors/Cirno.png +++ b/Sprites/Actors/Cirno.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2341610e5bb28b257774dfbb33b91834653f5372f42a71107f8e964d682716e1 -size 1083 +oid sha256:1ddba44c5849064e03af06ee5b7dd03443e223601efe345fed756d4f461542c5 +size 1119 From 8eb462fb27cdcd20a5c124ba328760586e2ddca4 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Tue, 25 Mar 2025 19:15:04 +0100 Subject: [PATCH 2/8] Made cirno animations faster --- Resources/Sprites/player.tres | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Sprites/player.tres b/Resources/Sprites/player.tres index a2b78496..afdfdeaa 100644 --- a/Resources/Sprites/player.tres +++ b/Resources/Sprites/player.tres @@ -178,7 +178,7 @@ animations = [{ }], "loop": true, "name": &"walk_down", -"speed": 5.0 +"speed": 8.0 }, { "frames": [{ "duration": 1.0, @@ -192,7 +192,7 @@ animations = [{ }], "loop": true, "name": &"walk_left", -"speed": 5.0 +"speed": 8.0 }, { "frames": [{ "duration": 1.0, @@ -206,7 +206,7 @@ animations = [{ }], "loop": true, "name": &"walk_right", -"speed": 5.0 +"speed": 8.0 }, { "frames": [{ "duration": 1.0, @@ -220,5 +220,5 @@ animations = [{ }], "loop": true, "name": &"walk_up", -"speed": 5.0 +"speed": 8.0 }] From ea1f50d2498410d62b3baedd94b4caf750aff830 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Tue, 25 Mar 2025 19:15:11 +0100 Subject: [PATCH 3/8] Resources update --- Resources/BossPhases/Marisa/marisa_ns1.tres | 5 ++-- Resources/BossPhases/Rumia_Lasers.tres | 4 ++-- Resources/BossPhases/Rumia_NS2.tres | 23 +++++++++---------- Resources/BossPhases/Rumia_SP1.tres | 7 +++--- Resources/Enemies/Base_Fairy.tres | 1 + Resources/Enemies/Fairy_Guard.tres | 1 + Resources/Patterns/rumia_ns_1_spiralized.tres | 5 ++-- Resources/Patterns/rumia_ns_2.tres | 9 ++++---- Scenes/Actors/fsm_player.tscn | 3 ++- Scenes/test.tscn | 2 +- 10 files changed, 29 insertions(+), 31 deletions(-) diff --git a/Resources/BossPhases/Marisa/marisa_ns1.tres b/Resources/BossPhases/Marisa/marisa_ns1.tres index 60b92618..252cf77b 100644 --- a/Resources/BossPhases/Marisa/marisa_ns1.tres +++ b/Resources/BossPhases/Marisa/marisa_ns1.tres @@ -1,7 +1,6 @@ -[gd_resource type="Resource" script_class="BossPhase" load_steps=5 format=3 uid="uid://da1vjfavqs7u2"] +[gd_resource type="Resource" script_class="BossPhase" load_steps=4 format=3 uid="uid://da1vjfavqs7u2"] [ext_resource type="Script" uid="uid://cdd6q2h0t1hhq" path="res://Scripts/Resources/BossPhase.cs" id="1_7asq8"] -[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="1_ykywc"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="1_ys2v3"] [sub_resource type="Resource" id="Resource_q4pcc"] @@ -22,7 +21,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("1_ykywc")]([]) +TimeModifiers = [] WaitForCompletion = true [resource] diff --git a/Resources/BossPhases/Rumia_Lasers.tres b/Resources/BossPhases/Rumia_Lasers.tres index 51ad4c1a..42e2b1ae 100644 --- a/Resources/BossPhases/Rumia_Lasers.tres +++ b/Resources/BossPhases/Rumia_Lasers.tres @@ -75,7 +75,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("2_rhq2s")]([]) +TimeModifiers = [] WaitForCompletion = true [sub_resource type="Resource" id="Resource_1yaaf"] @@ -117,7 +117,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("2_rhq2s")]([]) +TimeModifiers = [] WaitForCompletion = false [resource] diff --git a/Resources/BossPhases/Rumia_NS2.tres b/Resources/BossPhases/Rumia_NS2.tres index 8c68ec97..6f464be8 100644 --- a/Resources/BossPhases/Rumia_NS2.tres +++ b/Resources/BossPhases/Rumia_NS2.tres @@ -1,11 +1,10 @@ -[gd_resource type="Resource" script_class="BossPhase" load_steps=42 format=3 uid="uid://ddb5dqocmk6x7"] +[gd_resource type="Resource" script_class="BossPhase" load_steps=41 format=3 uid="uid://ddb5dqocmk6x7"] [ext_resource type="PackedScene" uid="uid://dh81snen2f6bf" path="res://Scenes/Weapons/Bullets/enemyBullet_rice_blue_small.tscn" id="1_as8n2"] [ext_resource type="Script" uid="uid://cdd6q2h0t1hhq" path="res://Scripts/Resources/BossPhase.cs" id="1_fdlxv"] [ext_resource type="Script" uid="uid://dka43xos84kbw" path="res://Scripts/Resources/Modifiers/DelayedRotationModifier.cs" id="2_onj13"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="2_wkmhk"] [ext_resource type="Script" uid="uid://dslyrfcej3g2n" path="res://Scripts/Resources/BulletResource.cs" id="3_ow5fu"] -[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="4_3qh6s"] [ext_resource type="PackedScene" uid="uid://ctrk5qrb7n3fm" path="res://Scenes/Weapons/Bullets/enemyBullet_rice_green_small.tscn" id="4_tek7n"] [ext_resource type="PackedScene" uid="uid://chowj81jsdvcx" path="res://Scenes/Weapons/Bullets/enemyBullet_rice_red_small.tscn" id="5_n4xqo"] [ext_resource type="Script" uid="uid://bhc7rbcico4kp" path="res://Scripts/Resources/SimpleMovementPattern.cs" id="6_bw7cj"] @@ -52,7 +51,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("4_3qh6s")]([]) +TimeModifiers = [] WaitForCompletion = false [sub_resource type="Resource" id="Resource_pbgtt"] @@ -94,7 +93,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("4_3qh6s")]([]) +TimeModifiers = [] WaitForCompletion = true [sub_resource type="Resource" id="Resource_w7b0n"] @@ -129,7 +128,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("4_3qh6s")]([]) +TimeModifiers = [] WaitForCompletion = false [sub_resource type="Resource" id="Resource_3iv0j"] @@ -164,7 +163,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("4_3qh6s")]([]) +TimeModifiers = [] WaitForCompletion = true [sub_resource type="Resource" id="Resource_5jr31"] @@ -199,7 +198,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("4_3qh6s")]([]) +TimeModifiers = [] WaitForCompletion = false [sub_resource type="Resource" id="Resource_mg2qy"] @@ -234,7 +233,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("4_3qh6s")]([]) +TimeModifiers = [] WaitForCompletion = true [sub_resource type="Resource" id="Resource_erexw"] @@ -291,7 +290,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("4_3qh6s")]([]) +TimeModifiers = [] WaitForCompletion = true [sub_resource type="Resource" id="Resource_l05f2"] @@ -334,7 +333,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("4_3qh6s")]([]) +TimeModifiers = [] WaitForCompletion = true [sub_resource type="Resource" id="Resource_q7cr0"] @@ -377,7 +376,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("4_3qh6s")]([]) +TimeModifiers = [] WaitForCompletion = true [sub_resource type="Resource" id="Resource_8kl6r"] @@ -420,7 +419,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("4_3qh6s")]([]) +TimeModifiers = [] WaitForCompletion = true [sub_resource type="Resource" id="Resource_ha2b6"] diff --git a/Resources/BossPhases/Rumia_SP1.tres b/Resources/BossPhases/Rumia_SP1.tres index 1003fed2..80c03222 100644 --- a/Resources/BossPhases/Rumia_SP1.tres +++ b/Resources/BossPhases/Rumia_SP1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="BossPhase" load_steps=24 format=3 uid="uid://ccj0cqbveey8c"] +[gd_resource type="Resource" script_class="BossPhase" load_steps=23 format=3 uid="uid://ccj0cqbveey8c"] [ext_resource type="Script" uid="uid://bhc7rbcico4kp" path="res://Scripts/Resources/SimpleMovementPattern.cs" id="1_lw82i"] [ext_resource type="PackedScene" uid="uid://dohakkayqj4w2" path="res://Scenes/Weapons/Bullets/enemyBullet_green.tscn" id="1_o4um1"] @@ -7,7 +7,6 @@ [ext_resource type="Script" uid="uid://cdd6q2h0t1hhq" path="res://Scripts/Resources/BossPhase.cs" id="3_o6234"] [ext_resource type="Script" uid="uid://dslyrfcej3g2n" path="res://Scripts/Resources/BulletResource.cs" id="4_juoir"] [ext_resource type="PackedScene" uid="uid://by2rk6gx67f7e" path="res://Scenes/Weapons/Bullets/enemyBullet_yellow.tscn" id="4_ruawj"] -[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="5_763gk"] [ext_resource type="Script" uid="uid://cbafxkmgns6ry" path="res://Scripts/Resources/PatternGroup.cs" id="6_6mg1u"] [sub_resource type="Resource" id="Resource_upj22"] @@ -68,7 +67,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("5_763gk")]([]) +TimeModifiers = [] WaitForCompletion = true [sub_resource type="Resource" id="Resource_e6jj0"] @@ -112,7 +111,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("5_763gk")]([]) +TimeModifiers = [] WaitForCompletion = true [sub_resource type="Resource" id="Resource_gm1rv"] diff --git a/Resources/Enemies/Base_Fairy.tres b/Resources/Enemies/Base_Fairy.tres index e6a22b60..e1569239 100644 --- a/Resources/Enemies/Base_Fairy.tres +++ b/Resources/Enemies/Base_Fairy.tres @@ -55,4 +55,5 @@ PlayerDisengageRange = 200.0 StrafeSpeed = 25.0 MaxStrafeDistance = 16.0 MinStrafeDistance = 8.0 +ResponseTime = 0.5 metadata/_custom_type_script = "uid://cd5o0ceb50jki" diff --git a/Resources/Enemies/Fairy_Guard.tres b/Resources/Enemies/Fairy_Guard.tres index 1f228430..c82dd7e9 100644 --- a/Resources/Enemies/Fairy_Guard.tres +++ b/Resources/Enemies/Fairy_Guard.tres @@ -55,4 +55,5 @@ PlayerDisengageRange = 500.0 StrafeSpeed = 25.0 MaxStrafeDistance = 32.0 MinStrafeDistance = 16.0 +ResponseTime = 0.5 metadata/_custom_type_script = "uid://cd5o0ceb50jki" diff --git a/Resources/Patterns/rumia_ns_1_spiralized.tres b/Resources/Patterns/rumia_ns_1_spiralized.tres index 2c0142de..192afb99 100644 --- a/Resources/Patterns/rumia_ns_1_spiralized.tres +++ b/Resources/Patterns/rumia_ns_1_spiralized.tres @@ -1,7 +1,6 @@ -[gd_resource type="Resource" script_class="SpiralPattern" load_steps=4 format=3 uid="uid://jjky5fqn74qk"] +[gd_resource type="Resource" script_class="SpiralPattern" load_steps=3 format=3 uid="uid://jjky5fqn74qk"] [ext_resource type="Resource" uid="uid://bifeoxb6nfykq" path="res://Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet.tres" id="1_lasr5"] -[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="2_ho5ah"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="3_ryait"] [resource] @@ -23,5 +22,5 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("2_ho5ah")]([]) +TimeModifiers = [] WaitForCompletion = true diff --git a/Resources/Patterns/rumia_ns_2.tres b/Resources/Patterns/rumia_ns_2.tres index 3e05f165..8ffded6b 100644 --- a/Resources/Patterns/rumia_ns_2.tres +++ b/Resources/Patterns/rumia_ns_2.tres @@ -1,9 +1,8 @@ -[gd_resource type="Resource" script_class="PatternGroup" load_steps=13 format=3 uid="uid://du2kuv125vbrx"] +[gd_resource type="Resource" script_class="PatternGroup" load_steps=12 format=3 uid="uid://du2kuv125vbrx"] [ext_resource type="PackedScene" uid="uid://dre2wvw4pa3hc" path="res://Scenes/Weapons/Bullets/enemyBullet_mid_blue.tscn" id="1_4xpdn"] [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="2_ee42k"] [ext_resource type="Script" uid="uid://dslyrfcej3g2n" path="res://Scripts/Resources/BulletResource.cs" id="2_gfvud"] -[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="3_fgjeq"] [ext_resource type="PackedScene" uid="uid://dohakkayqj4w2" path="res://Scenes/Weapons/Bullets/enemyBullet_green.tscn" id="3_gr7a3"] [ext_resource type="Script" uid="uid://cbafxkmgns6ry" path="res://Scripts/Resources/PatternGroup.cs" id="3_jvysx"] @@ -39,7 +38,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("3_fgjeq")]([]) +TimeModifiers = [] WaitForCompletion = true [sub_resource type="Resource" id="Resource_wtj61"] @@ -74,7 +73,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("3_fgjeq")]([]) +TimeModifiers = [] WaitForCompletion = true [sub_resource type="Resource" id="Resource_qbq0m"] @@ -109,7 +108,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = Array[ExtResource("3_fgjeq")]([]) +TimeModifiers = [] WaitForCompletion = true [resource] diff --git a/Scenes/Actors/fsm_player.tscn b/Scenes/Actors/fsm_player.tscn index 3f9d415b..e55882de 100644 --- a/Scenes/Actors/fsm_player.tscn +++ b/Scenes/Actors/fsm_player.tscn @@ -373,8 +373,9 @@ shape = SubResource("CircleShape2D_b3hxm") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] material = ExtResource("4_5qlss") sprite_frames = ExtResource("4_s0ir4") -animation = &"idle" +animation = &"walk_up" autoplay = "idle" +frame_progress = 0.405397 [node name="WeaponProvider" type="Node2D" parent="."] script = ExtResource("5_gp3hw") diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 72802326..7f18be39 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -116,7 +116,7 @@ [sub_resource type="Resource" id="Resource_6sau4"] script = ExtResource("7_l32kg") EggIndex = 0 -StartingEquipment = Array[ExtResource("6_8tdlb")]([ExtResource("6_khabp")]) +StartingEquipment = [ExtResource("6_khabp")] [sub_resource type="RectangleShape2D" id="RectangleShape2D_ksslq"] size = Vector2(184, 46.5) From 29bf869bd11c70b97236daed0d1722770170854b Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Tue, 25 Mar 2025 19:21:42 +0100 Subject: [PATCH 4/8] Player Animation based on speed --- Scripts/Components/Actors/PlayerAnimationProvider.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Scripts/Components/Actors/PlayerAnimationProvider.cs b/Scripts/Components/Actors/PlayerAnimationProvider.cs index 4dd18cf2..7c388cd9 100644 --- a/Scripts/Components/Actors/PlayerAnimationProvider.cs +++ b/Scripts/Components/Actors/PlayerAnimationProvider.cs @@ -56,13 +56,21 @@ public partial class PlayerAnimationProvider : Node2D public void SetAnimation(Vector2 velocity) { - if (velocity.X == 0 && velocity.Y == 0) + if (velocity.Length() == 0) { _animatedSprite.SpeedScale = 0; } else { - _animatedSprite.SpeedScale = 1; + if (velocity.Length() > 40) + { + _animatedSprite.SpeedScale = 1; + } + else + { + _animatedSprite.SpeedScale = 0.8f; + } + } if (velocity.X > 0) From 45055144dbc98e41d9709a0ffcd4ab55a65f89c8 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Tue, 25 Mar 2025 23:13:50 +0100 Subject: [PATCH 5/8] Shelf --- ExternalMaterial/Shelf/Shelf.png | 3 +++ ExternalMaterial/Shelf/Shelf.png.import | 34 ++++++++++++++++++++++++ ExternalMaterial/Shelf/Shelf.pxc | Bin 0 -> 5742 bytes ExternalMaterial/Shelf/Shelf.pxc1 | Bin 0 -> 5591 bytes Scenes/Maps/Level2.tscn | 6 ++++- Scenes/Props/Shelf.tscn | 8 ++++++ 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 ExternalMaterial/Shelf/Shelf.png create mode 100644 ExternalMaterial/Shelf/Shelf.png.import create mode 100644 ExternalMaterial/Shelf/Shelf.pxc create mode 100644 ExternalMaterial/Shelf/Shelf.pxc1 create mode 100644 Scenes/Props/Shelf.tscn diff --git a/ExternalMaterial/Shelf/Shelf.png b/ExternalMaterial/Shelf/Shelf.png new file mode 100644 index 00000000..cc71b791 --- /dev/null +++ b/ExternalMaterial/Shelf/Shelf.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c48536407935698931310528579cc30e79d58bc9d852b4e76f363fbd08bbfaa4 +size 382 diff --git a/ExternalMaterial/Shelf/Shelf.png.import b/ExternalMaterial/Shelf/Shelf.png.import new file mode 100644 index 00000000..bbc85823 --- /dev/null +++ b/ExternalMaterial/Shelf/Shelf.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://brgym86p3dt2k" +path="res://.godot/imported/Shelf.png-2a0dcac1f1045ae6747d0caf01fcd9af.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ExternalMaterial/Shelf/Shelf.png" +dest_files=["res://.godot/imported/Shelf.png-2a0dcac1f1045ae6747d0caf01fcd9af.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/ExternalMaterial/Shelf/Shelf.pxc b/ExternalMaterial/Shelf/Shelf.pxc new file mode 100644 index 0000000000000000000000000000000000000000..bdf14dac98e2c5bc3d55ccb0743b0b89e3669def GIT binary patch literal 5742 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 literal 0 HcmV?d00001 diff --git a/Scenes/Maps/Level2.tscn b/Scenes/Maps/Level2.tscn index 497ef76d..28b7cc0a 100644 --- a/Scenes/Maps/Level2.tscn +++ b/Scenes/Maps/Level2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=88 format=4 uid="uid://6a6tjohypmmb"] +[gd_scene load_steps=89 format=4 uid="uid://6a6tjohypmmb"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_t2k72"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_2jsgm"] @@ -45,6 +45,7 @@ [ext_resource type="PackedScene" uid="uid://ey71mxa5ocpn" path="res://Scenes/Items/Shield_Extend_Pickup.tscn" id="37_5j8ks"] [ext_resource type="PackedScene" uid="uid://dfat0erkvb513" path="res://Scenes/Actors/Fairy_New.tscn" id="37_sb7g3"] [ext_resource type="PackedScene" uid="uid://1yxieu8ekvkm" path="res://Scenes/Items/Heart_Extend_Pickup.tscn" id="38_sb7g3"] +[ext_resource type="PackedScene" uid="uid://cqi87wcxymbhx" path="res://Scenes/Props/Shelf.tscn" id="40_sb7g3"] [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_s1vkf") @@ -592,6 +593,9 @@ Target = NodePath("../Elevator3") position = Vector2(-504, 912) Targets = [NodePath("../Elevator2")] +[node name="Shelf" parent="Tilemaps/Actors" instance=ExtResource("40_sb7g3")] +position = Vector2(-227, 156) + [node name="ControlPad8" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")] position = Vector2(-500, 727) Targets = [NodePath("../Elevator2")] diff --git a/Scenes/Props/Shelf.tscn b/Scenes/Props/Shelf.tscn new file mode 100644 index 00000000..56afc32d --- /dev/null +++ b/Scenes/Props/Shelf.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=2 format=3 uid="uid://cqi87wcxymbhx"] + +[ext_resource type="Texture2D" uid="uid://brgym86p3dt2k" path="res://ExternalMaterial/Shelf/Shelf.png" id="1_nt0bt"] + +[node name="Shelf" type="Node2D"] + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("1_nt0bt") From 1455569223690cacd8d71b6728e270d99ffd03bf Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Wed, 26 Mar 2025 00:04:25 +0100 Subject: [PATCH 6/8] Computer Model --- ExternalMaterial/Computer/Computer.pxc | Bin 0 -> 3715 bytes ExternalMaterial/Computer/Computer.pxc1 | Bin 0 -> 3715 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 ExternalMaterial/Computer/Computer.pxc create mode 100644 ExternalMaterial/Computer/Computer.pxc1 diff --git a/ExternalMaterial/Computer/Computer.pxc b/ExternalMaterial/Computer/Computer.pxc new file mode 100644 index 0000000000000000000000000000000000000000..128e56db4df0b38b94cac57f1dff80bd7bb10d72 GIT binary patch literal 3715 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 literal 0 HcmV?d00001 diff --git a/ExternalMaterial/Computer/Computer.pxc1 b/ExternalMaterial/Computer/Computer.pxc1 new file mode 100644 index 0000000000000000000000000000000000000000..128e56db4df0b38b94cac57f1dff80bd7bb10d72 GIT binary patch literal 3715 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 literal 0 HcmV?d00001 From 11eac8849598f251add5b28c31c6606563b0b152 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Wed, 26 Mar 2025 00:21:57 +0100 Subject: [PATCH 7/8] Table model --- ExternalMaterial/Table/Table.pxc | Bin 0 -> 2597 bytes ExternalMaterial/Table/Table.pxc1 | Bin 0 -> 2356 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 ExternalMaterial/Table/Table.pxc create mode 100644 ExternalMaterial/Table/Table.pxc1 diff --git a/ExternalMaterial/Table/Table.pxc b/ExternalMaterial/Table/Table.pxc new file mode 100644 index 0000000000000000000000000000000000000000..25fde563a32281361e3b74d6fcebe48fc218eba3 GIT binary patch literal 2597 zcmV+=3flE}ob6ldbK1HRzkiCyUoT1h;F+2Gfk2a{&8vBw-nL{s!WN*!wp?4Jq?!Eh zXIFkZ5Fl{op4?N?DOi?vSF6?Pw=3yU9fg$sqUzp=xDlxVk_SE&Sy>R$dq#gA zhRjj-9@S{Vf9CJljJnxV9yYn+I-~YfFz&1I8_S+Xf_v(o2&eR^wv9&D zfkOm+sp`{BR@v+;nfz&q>`?>s*n(mh*;0qFEzA2zeC83s!}tl*sv(ooH#7*zPwSqz zQ;G%wh2OOr{M|fdVx04cE$Sffi!6^jY{aOOcZ3KLGNea*(2?b^C;&r532UoJ6@M31 zalr*yEW`XR)O75`eEF&}=o!xf?`LFX&01rX%lzu_^v9+>&B?-+Y^|C ztMjc=jLTDUCt#!@Bd!wAP>GncPLE3Vo)Nm@!F(E{kb4&M9SZYVd)`y^ai9u1J76vl z8l( zfhYAT5zo)v*!vDRrH)}XTF32A0W&{8TsPgTqi?e_Z>+ARk$o;u4gU{HIhcS$YBw9L z_PDcu*Y~0;clHnsj}Fd8_v`y%Y^Prn) zBq#-bf_4Kry z9!x7&5t9(25$-zMq=|OEEx^}@*Gdw!Dg2&>2-jave5YPf=yt~DGM)|!@%VI+vwOj1 zz9=QEDB}>wZZbsrJbDUog9+K%NL^5HG?lbxgBRO9H-h0ZM@eD;3n+S_89N z*#e6RH!E^^076VCfY?L^SuVivz$9o|SXhCRH4?!R&MdSm?0F{T63m3)sM%;r9Hi?; z86;hDmpN}XNtR1rcNM*b4BhtdOl9i7_X4rb za=v`IJR#A70PL0i*8_sGZuf8U&9B=v8d}!ppu_So$>k!NeMKnE6S2ZVMVB=YpsS+ut{&os4tY`#X0uZ;H^tQ^U78- z3I$n_p3HvqrY=MY;|-{4yM^4@Stura9FkzdY-L^F@PfSHfYE$#-kk8Yb`ZDZaE>{@ zBSLw_LhwRBdBI(GJCr`~kp1GmAgQ z!#*RM(AP`EE=3qaye&;D%)Fh-&7|#6+y?~eDBgOWXUX_~VIh?XnC)mWBd1(}@4fSB zw8`+)jaFOlXb^SHt7ZG~+ zrc)QiKIDmuq_kny+uC1tigHKW?U?0rf{hv!8d~M_pe$^a*KOl%Co+uou3qYoo zxLa%5-?H?G$GMnnO0>L(^d7*zO@b}OHEbi7K>KI}lM=sMWIS zq)vO>_miwLNQ>O835=kNqiBr?j+D0BYNRshwYUxe9UIB-hFWSkpQz{Dy4xXc$JFI?rq!or?Ip{n5A6)Y1! zIRR)z5@hWGh)e3p(u}U2l#Zox;-=)DGrVp#EZiY0C@tIPz-c%HiKV>`0f<{;=#oe7 zXb9cIp+n1wUvP(uLSY0=?ZRC)kWs*F9kE%p3~W5tVlB^%e7BFZeXdsmXGz8C-8lV4*@5+UM$WgkTbW4s)P2fCF z7ZBu(gN-NBq>ajaMTmjVo|!&c2_bZd@sS|l2-qM=OeEtN0|_}J2Dp(Vm;2##G?JiV zAdeJ(-5(!tqkDaO^y#Aa?e_ZPsC|CAPd=Vp)IXmehJ!(Ju9)L5a^BqkdiiD6ZD05Q zd)_=99~?dOuCMk#ce~vKPaBGX3LHiVK;Y+IQ!<=TG=W5br+LmU2{4&IUiHG@)4%=% HMgr)0JoX!4 literal 0 HcmV?d00001 diff --git a/ExternalMaterial/Table/Table.pxc1 b/ExternalMaterial/Table/Table.pxc1 new file mode 100644 index 0000000000000000000000000000000000000000..41e9875f321bb8d9de5c463ba75b000344139266 GIT binary patch literal 2356 zcmV-43Cs3)ob6g|Q`@={zCXp|uQzRNhrBU!KZK-kpu9D}>1`Xvqu7cguq{`XLny<4 zKfCg4LLh|X%$?p-+L_q0w7c3}t)5-!K_3fBe^PySO#GPEbe|K~_Q^d@WYHE0I%V|k zKrmO|ebD0xzbn778TE^|I3!W|!jSHFvsp8n*EO9-#9{JY-!*j<5AK}AM+Zkg_CAHvzDM?9#7y6PS8uj!I>_;E2Y%&!gv^kqUGLi`G@jVK zWJIAa3*(47@-U1NnR1!xyC!fY0S>w3p664I&Zv_}#zQ^*VmnDJd7$q~kSvf}%vVce~(l=16flTIpVSpfa_LTSu zMTdaK??w&&T|X9Lob#AHH$mVR+W~jkm{GT!2$51Sq(?%~k?pcL0!Ks%Yp;7CbAwpOCd`X3cnSG&=Kt?TWH49O5sv?`tJ_n~l1mGl50; zdcKPk)ApR)2{@@>#MdG!w3xZ;%xKQv3qqGXT25mucwn>8rLdljr!&3yA|w)dIqflb9Co@q~qyHwY4mPee-K zQGd+D3(GL}u>(P=W7Qk2+Ie3gZR>)-N&QD{j>3OJ*6DevHY!)Ih72UH~FoTg|$PR+utggQ^~&I;Xl+(u2Cxp z2iwh^c^KFu;grOBi4lJ>AQ&fNOdJJ_b$T?rxtbiee*V1de(6mdpK2?eN3rv!gDRgW-pt&VTgl)j%%(U)OWHI(r2^sl+ljy1Sy1S9Y;%z=2aNl|#m;%uuBOm1Q63Gomv2Bh&|q^7J8h$Z)vaQK z#e$n1`#b_6CKNzyCWC61;CSE?G;gfzz}X&&UNUpP; zuih?CNc>C!_Qv=d0KxSmZ-M*~_#?)*TGo?7@P$LeU$6+g!go`O3#nbk;B15lUVoZe ztthEKm8TjB59+3Az`E*~BPK)ht32*qHN^23_gfu(0p>((pN5{CR3}^SYo!4|dV9=f z*iFe>scWlF7R1ZOT)b2V55|13TXB>CsxVv4%pWl5E%-wZcnV@)Q2FaQMdf5b%|gp( zQJxPJvokHL-Gq-$+A<=L+~xME*Oxe0?P2c!@56+@^)LaTTuSs8KRIYt6VtOlw*s1% ziw^p#O5XEX6tU3L`X!=X+o%3#6^|50teXOzr=qU6fac;%9*ozo6RQ1xaYtFPDZCN^ znMSK&ReUlSF&awk`1#WJTVT)yfNX6miGD>^q^F7!y~GFb?rlKTcwZ@Loe4SNo*>bL zIoi6h;RSgi0Hgchx;f!%9qer>;2d*)OQiOOjo^hmZ@_(jJCy$5g8k&7B)-%Pf0-|-@8=$n+eBom_WrBwRuIfuVlZn`()Ool#a~wa} zFdH-8Ta`uFJ<|rnWl6jdMWbQN|JCO>>@l(leRGc3g%l~o+tRYag4n4#i5mv>Od46=BZZ3}tLJ1(!IrgCRRn|KXaA@|`*rpFN=m2Ct4`^($HOqozCc>!W>3I^K3dTp6SS1^zSYQOGHYoc z0y?&`=a>YMU-{;65uyd#+4~)Hu|AV`2dD)5C3J7r7WgR(Er>vTzYMKP;{2j-Wf+$K ztNKeX`ex6n+=k35SA3tsm+ZU(;(^D)!mhM7-J?s8dajA5u#xrz-kN?5I9Hd|~1A1}37 zD-lF_Bg9@f8%nDQkk;|gj&GUr&&(d*v+?yhk^-uR*=iyw8j_Ju-BQnzMoKwAL-InY z>G5@X)muP}M(N(=r7Ny9f$Kca4v{k&8xK^KkE(rLU~Ln2=j_$a2w^}>Pqcs|Y%JLZ zp4l Date: Wed, 26 Mar 2025 00:22:38 +0100 Subject: [PATCH 8/8] Mapping --- Scenes/Maps/Level2.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scenes/Maps/Level2.tscn b/Scenes/Maps/Level2.tscn index 28b7cc0a..951cbd33 100644 --- a/Scenes/Maps/Level2.tscn +++ b/Scenes/Maps/Level2.tscn @@ -594,7 +594,7 @@ position = Vector2(-504, 912) Targets = [NodePath("../Elevator2")] [node name="Shelf" parent="Tilemaps/Actors" instance=ExtResource("40_sb7g3")] -position = Vector2(-227, 156) +position = Vector2(-225, 154) [node name="ControlPad8" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")] position = Vector2(-500, 727)