diff --git a/Resources/Enemies/Base_Fairy.tres b/Resources/Enemies/Base_Fairy.tres index 8469ef5d..07b1c556 100644 --- a/Resources/Enemies/Base_Fairy.tres +++ b/Resources/Enemies/Base_Fairy.tres @@ -45,7 +45,7 @@ EnemyName = &"Fairy" EnemyKey = &"FAIRY_BASE" PrefabPath = &"res://Scenes/Actors/Fairy_New.tscn" MaxHealth = 2.0 -MovementSpeed = 20.0 +MovementSpeed = 30.0 Weapon = ExtResource("7_xkg5o") LootDrops = Array[ExtResource("2_sxbtw")]([SubResource("Resource_c8nix"), SubResource("Resource_gs2l3"), SubResource("Resource_sqnvg"), SubResource("Resource_5tyar"), SubResource("Resource_48xq6")]) PlayerDetectionRange = 90.0 diff --git a/Resources/Enemies/Fairy_Guard.tres b/Resources/Enemies/Fairy_Guard.tres index 0f4bc188..068de555 100644 --- a/Resources/Enemies/Fairy_Guard.tres +++ b/Resources/Enemies/Fairy_Guard.tres @@ -45,7 +45,7 @@ EnemyName = &"Fairy Guard" EnemyKey = &"FAIRY_GUARD" PrefabPath = &"res://Scenes/Actors/FairyGuard_New.tscn" MaxHealth = 4.0 -MovementSpeed = 30.0 +MovementSpeed = 40.0 Weapon = ExtResource("7_xlxdc") LootDrops = Array[ExtResource("2_ivudp")]([SubResource("Resource_c8nix"), SubResource("Resource_gs2l3"), SubResource("Resource_sqnvg"), SubResource("Resource_5tyar"), SubResource("Resource_48xq6")]) PlayerDetectionRange = 90.0 diff --git a/Resources/Enemies/Thermathron.tres b/Resources/Enemies/Thermathron.tres index 43e3d177..6d20c332 100644 --- a/Resources/Enemies/Thermathron.tres +++ b/Resources/Enemies/Thermathron.tres @@ -10,7 +10,7 @@ EnemyName = &"Robot 1" EnemyKey = &"ROBOT_1" PrefabPath = &"res://Scenes/Actors/Thermathron.tscn" MaxHealth = 8.0 -MovementSpeed = 35.0 +MovementSpeed = 38.0 Weapon = ExtResource("7_filx8") LootDrops = Array[ExtResource("1_f3huq")]([]) PlayerDetectionRange = 90.0 diff --git a/Scenes/Actors/fsm_player.tscn b/Scenes/Actors/fsm_player.tscn index 4a681e1b..3f9d415b 100644 --- a/Scenes/Actors/fsm_player.tscn +++ b/Scenes/Actors/fsm_player.tscn @@ -329,6 +329,7 @@ _storageModule = NodePath("../../Storage") [node name="Active" type="Node2D" parent="StateMachine" node_paths=PackedStringArray("_weaponProvider", "_animationProvider", "_crosshairProvider", "_hitboxSpriteProvider", "_inputProvider", "_damageReceiver", "_activationProvider", "_interactionController", "_storageModule", "_moduleNodes")] script = ExtResource("3_3tuio") +Speed = 55 _weaponProvider = NodePath("../../WeaponProvider") _animationProvider = NodePath("../../AnimationProvider") _crosshairProvider = NodePath("../../CrosshairProvider") diff --git a/Scenes/Interactable.cs b/Scenes/Interactable.cs index 61c2c079..df71286b 100644 --- a/Scenes/Interactable.cs +++ b/Scenes/Interactable.cs @@ -12,7 +12,7 @@ public partial class Interactable : Area2D, IInteractable [Export] public Array Requirements = []; //protected InventoryManager _inventoryManager; - + public override void _Ready() { //_inventoryManager = this.GetInventoryManager(); diff --git a/Scenes/Items/PhysicsDropWrapper.tscn b/Scenes/Items/PhysicsDropWrapper.tscn index 2bb81ad0..ce3c8185 100644 --- a/Scenes/Items/PhysicsDropWrapper.tscn +++ b/Scenes/Items/PhysicsDropWrapper.tscn @@ -6,6 +6,8 @@ radius = 4.47214 [node name="PhysicsDropWrapper" type="RigidBody2D"] +collision_layer = 0 +collision_mask = 33 gravity_scale = 0.0 lock_rotation = true linear_damp = 2.5 diff --git a/Scenes/Maps/PlayerFSMTest.tscn b/Scenes/Maps/PlayerFSMTest.tscn index 2a27f056..1622c10d 100644 --- a/Scenes/Maps/PlayerFSMTest.tscn +++ b/Scenes/Maps/PlayerFSMTest.tscn @@ -636,7 +636,6 @@ position = Vector2(664, 38) [node name="PhysicsDropWrapper" parent="Tilemaps" instance=ExtResource("62_5glx6")] position = Vector2(616, 18) collision_layer = 4 -collision_mask = 33 ItemToDrop = ExtResource("23_1ajuh") [node name="CameraController" type="Camera2D" parent="."] @@ -662,7 +661,7 @@ position = Vector2(124, 338) script = ExtResource("12_8to53") [node name="PlayerStartPosition" type="Marker2D" parent="."] -position = Vector2(238, 188) +position = Vector2(635, 70) [node name="AlarmManager" type="Node2D" parent="."] process_mode = 1 diff --git a/Scripts/Interactables/IInteractable.cs b/Scripts/Interactables/IInteractable.cs index 4cacddae..e190a7b6 100644 --- a/Scripts/Interactables/IInteractable.cs +++ b/Scripts/Interactables/IInteractable.cs @@ -7,6 +7,6 @@ public interface IInteractable public bool Activate(ActivationType activationType = ActivationType.Toggle); public bool CanActivate(); - public Vector2 GetPosition(); + public Vector2 GetGlobalPosition(); //protected bool MeetsRequirements(); } \ No newline at end of file diff --git a/Scripts/Selector.cs b/Scripts/Selector.cs index 4d7714b7..7f0adb4e 100644 --- a/Scripts/Selector.cs +++ b/Scripts/Selector.cs @@ -118,7 +118,7 @@ public partial class Selector : Node2D { if (SelectedInteractable != null) { - this.Position = SelectedInteractable.GetPosition(); + this.GlobalPosition = SelectedInteractable.GetGlobalPosition(); this.Visible = true; } else