From 2fdc9beca0556130d95cd414a2d9dacdaaad5ade Mon Sep 17 00:00:00 2001 From: HumanoidSandvichDispenser Date: Sat, 3 Jun 2023 10:55:48 -0700 Subject: [PATCH] small changes and fixes --- Characters/Player.cs | 1 - Characters/Player.tscn | 2 +- Entities/Campfire.cs | 2 +- State/StateMachine.cs | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Characters/Player.cs b/Characters/Player.cs index 4623ecb..71a1906 100644 --- a/Characters/Player.cs +++ b/Characters/Player.cs @@ -1,6 +1,5 @@ using Godot; using SupaLidlGame.Utils; -using SupaLidlGame.State; namespace SupaLidlGame.Characters { diff --git a/Characters/Player.tscn b/Characters/Player.tscn index e475a08..cb23d86 100644 --- a/Characters/Player.tscn +++ b/Characters/Player.tscn @@ -204,7 +204,6 @@ horizontal_alignment = 1 y_sort_enabled = true position = Vector2(0, 4) script = ExtResource("7_xyenu") -Items = Array[Node2D]([]) InventoryMap = { "equip_1": 0, "equip_2": 1 @@ -213,6 +212,7 @@ InventoryMap = { [node name="Railgun" parent="Inventory" instance=ExtResource("10_7kb8b")] [node name="Node2D" parent="Inventory" instance=ExtResource("7_4rxuv")] +ShouldHideIdle = false [node name="Hurtbox" parent="." instance=ExtResource("9_avyu4")] Faction = 1 diff --git a/Entities/Campfire.cs b/Entities/Campfire.cs index 142f756..5fae800 100644 --- a/Entities/Campfire.cs +++ b/Entities/Campfire.cs @@ -8,7 +8,7 @@ namespace SupaLidlGame.Entities private PointLight2D _light; [Signal] - public delegate void OnCampfireUse(); + public delegate void OnCampfireUseEventHandler(); public override void _Ready() { diff --git a/State/StateMachine.cs b/State/StateMachine.cs index 0d50989..99b9349 100644 --- a/State/StateMachine.cs +++ b/State/StateMachine.cs @@ -20,7 +20,7 @@ namespace SupaLidlGame.State return false; } - if (CurrentState != null) + if (CurrentState is not null) { CurrentState.Exit(nextState); }