diff --git a/src/game/Game.cs b/src/game/Game.cs index d3bc5f23..9b74bc19 100644 --- a/src/game/Game.cs +++ b/src/game/Game.cs @@ -2,6 +2,7 @@ namespace GameJamDungeon; using Chickensoft.AutoInject; +using Chickensoft.Collections; using Chickensoft.GodotNodeInterfaces; using Chickensoft.Introspection; using Godot; @@ -220,7 +221,7 @@ public partial class Game : Node3D, IGame { GameRepo.PlayerData.SetMaximumHP(GameRepo.PlayerData.MaximumHP.Value + amountToRaise); GameRepo.PlayerData.SetCurrentHP(GameRepo.PlayerData.MaximumHP.Value); - EmitSignal(SignalName.StatRaisedAlert, $"{amountToRaise} Maximum HP Up."); + EmitSignal(SignalName.StatRaisedAlert, $"{amountToRaise}MAXHP Up."); } } @@ -233,7 +234,8 @@ public partial class Game : Node3D, IGame private void HealHP(int amountToRaise) { GameRepo.PlayerData.SetCurrentHP(GameRepo.PlayerData.CurrentHP.Value + amountToRaise); - EmitSignal(SignalName.StatRaisedAlert, $"{amountToRaise}HP Up."); + var raiseString = amountToRaise == 1000 ? "MAX" : $"{amountToRaise}"; + EmitSignal(SignalName.StatRaisedAlert, $"{raiseString}HP Restored."); } private void RaiseVT(int amountToRaise) @@ -242,14 +244,15 @@ public partial class Game : Node3D, IGame { GameRepo.PlayerData.SetMaximumVT(GameRepo.PlayerData.MaximumVT.Value + amountToRaise); GameRepo.PlayerData.SetCurrentVT(GameRepo.PlayerData.MaximumVT.Value); - EmitSignal(SignalName.StatRaisedAlert, $"{amountToRaise} Maximum VT Up."); + EmitSignal(SignalName.StatRaisedAlert, $"{amountToRaise}MAX VT Up."); } } private void HealVT(int amountToRaise) { GameRepo.PlayerData.SetCurrentVT(GameRepo.PlayerData.CurrentVT.Value + amountToRaise); - EmitSignal(SignalName.StatRaisedAlert, $"{amountToRaise}VT Up."); + var raiseString = amountToRaise == 1000 ? "MAX" : $"{amountToRaise}"; + EmitSignal(SignalName.StatRaisedAlert, $"{raiseString}VT Restored."); } private void PlayerInventory_InventoryAtCapacity(string rejectedItem) diff --git a/src/map/dungeon/Teleport.tscn b/src/map/dungeon/Teleport.tscn index f2a2ff6d..155c270c 100644 --- a/src/map/dungeon/Teleport.tscn +++ b/src/map/dungeon/Teleport.tscn @@ -16,4 +16,5 @@ collision_mask = 256 shape = SubResource("CylinderShape3D_vtvx6") [node name="CSGCylinder3D" type="CSGCylinder3D" parent="."] +sorting_offset = 100.0 material = SubResource("StandardMaterial3D_dc1b0")