small changes and fixes
parent
bf6302d859
commit
2fdc9beca0
|
@ -1,6 +1,5 @@
|
||||||
using Godot;
|
using Godot;
|
||||||
using SupaLidlGame.Utils;
|
using SupaLidlGame.Utils;
|
||||||
using SupaLidlGame.State;
|
|
||||||
|
|
||||||
namespace SupaLidlGame.Characters
|
namespace SupaLidlGame.Characters
|
||||||
{
|
{
|
||||||
|
|
|
@ -204,7 +204,6 @@ horizontal_alignment = 1
|
||||||
y_sort_enabled = true
|
y_sort_enabled = true
|
||||||
position = Vector2(0, 4)
|
position = Vector2(0, 4)
|
||||||
script = ExtResource("7_xyenu")
|
script = ExtResource("7_xyenu")
|
||||||
Items = Array[Node2D]([])
|
|
||||||
InventoryMap = {
|
InventoryMap = {
|
||||||
"equip_1": 0,
|
"equip_1": 0,
|
||||||
"equip_2": 1
|
"equip_2": 1
|
||||||
|
@ -213,6 +212,7 @@ InventoryMap = {
|
||||||
[node name="Railgun" parent="Inventory" instance=ExtResource("10_7kb8b")]
|
[node name="Railgun" parent="Inventory" instance=ExtResource("10_7kb8b")]
|
||||||
|
|
||||||
[node name="Node2D" parent="Inventory" instance=ExtResource("7_4rxuv")]
|
[node name="Node2D" parent="Inventory" instance=ExtResource("7_4rxuv")]
|
||||||
|
ShouldHideIdle = false
|
||||||
|
|
||||||
[node name="Hurtbox" parent="." instance=ExtResource("9_avyu4")]
|
[node name="Hurtbox" parent="." instance=ExtResource("9_avyu4")]
|
||||||
Faction = 1
|
Faction = 1
|
||||||
|
|
|
@ -8,7 +8,7 @@ namespace SupaLidlGame.Entities
|
||||||
private PointLight2D _light;
|
private PointLight2D _light;
|
||||||
|
|
||||||
[Signal]
|
[Signal]
|
||||||
public delegate void OnCampfireUse();
|
public delegate void OnCampfireUseEventHandler();
|
||||||
|
|
||||||
public override void _Ready()
|
public override void _Ready()
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@ namespace SupaLidlGame.State
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (CurrentState != null)
|
if (CurrentState is not null)
|
||||||
{
|
{
|
||||||
CurrentState.Exit(nextState);
|
CurrentState.Exit(nextState);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue