Merge remote-tracking branch 'origin/develop' into develop

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

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]

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]

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"]

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"]

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"

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"

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

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]

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
 }]

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")

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(-225, 154)
+
 [node name="ControlPad8" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")]
 position = Vector2(-500, 727)
 Targets = [NodePath("../Elevator2")]

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")

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)

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)