zenayi/GameJamDungeon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inventory behavior from previous commit

Browse Source
This commit is contained in:
Zenny
2025-03-27 00:08:18 -07:00
parent 8a9a2313fe
commit 096786f97e
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Zennysoft.Game.Ma/src/game/Game.cs
View File

@@ -403,31 +403,31 @@ public partial class Game : Node3D, IGame
{ {
case UsableItemTag.TeleportAllEnemiesToRoom: case UsableItemTag.TeleportAllEnemiesToRoom:
_effectService.TeleportEnemiesToCurrentRoom(); _effectService.TeleportEnemiesToCurrentRoom();
InGameUI.CloseInventory(); GameRepo.CloseInventory();
break; break;
case UsableItemTag.KillHalfEnemiesInRoom: case UsableItemTag.KillHalfEnemiesInRoom:
_effectService.KillHalfEnemiesInRoom(); _effectService.KillHalfEnemiesInRoom();
InGameUI.CloseInventory(); GameRepo.CloseInventory();
break; break;
case UsableItemTag.TurnAllEnemiesIntoHealingItem: case UsableItemTag.TurnAllEnemiesIntoHealingItem:
_effectService.TurnAllEnemiesInRoomIntoHealingItem(); _effectService.TurnAllEnemiesInRoomIntoHealingItem();
InGameUI.CloseInventory(); GameRepo.CloseInventory();
break; break;
case UsableItemTag.HealsAllInRoomToMaxHP: case UsableItemTag.HealsAllInRoomToMaxHP:
_effectService.HealAllEnemiesAndPlayerInRoomToFull(); _effectService.HealAllEnemiesAndPlayerInRoomToFull();
InGameUI.CloseInventory(); GameRepo.CloseInventory();
break; break;
case UsableItemTag.AbsorbHPFromAllEnemiesInRoom: case UsableItemTag.AbsorbHPFromAllEnemiesInRoom:
_effectService.AbsorbHPFromAllEnemiesInRoom(); _effectService.AbsorbHPFromAllEnemiesInRoom();
InGameUI.CloseInventory(); GameRepo.CloseInventory();
break; break;
case UsableItemTag.DealElementalDamageToAllEnemiesInRoom: case UsableItemTag.DealElementalDamageToAllEnemiesInRoom:
_effectService.DealElementalDamageToAllEnemiesInRoom(effectItem.Stats.ElementalDamageType); _effectService.DealElementalDamageToAllEnemiesInRoom(effectItem.Stats.ElementalDamageType);
InGameUI.CloseInventory(); GameRepo.CloseInventory();
break; break;
case UsableItemTag.SwapHPAndVT: case UsableItemTag.SwapHPAndVT:
_effectService.SwapHPandVT(); _effectService.SwapHPandVT();
InGameUI.CloseInventory(); GameRepo.CloseInventory();
break; break;
case UsableItemTag.RaiseCurrentWeaponAttack: case UsableItemTag.RaiseCurrentWeaponAttack:
_effectService.RaiseCurrentWeaponAttack(); _effectService.RaiseCurrentWeaponAttack();
@@ -450,18 +450,18 @@ public partial class Game : Node3D, IGame
{ {
case ThrowableItemTag.DoubleExp: case ThrowableItemTag.DoubleExp:
GameRepo.StartDoubleEXP(TimeSpan.FromSeconds(30)); GameRepo.StartDoubleEXP(TimeSpan.FromSeconds(30));
InGameUI.CloseInventory(); GameRepo.CloseInventory();
break; break;
case ThrowableItemTag.TeleportToRandomLocation: case ThrowableItemTag.TeleportToRandomLocation:
_effectService.TeleportToRandomRoom(Player); _effectService.TeleportToRandomRoom(Player);
InGameUI.CloseInventory(); GameRepo.CloseInventory();
break; break;
case ThrowableItemTag.CanChangeAffinity: case ThrowableItemTag.CanChangeAffinity:
_effectService.ChangeAffinity(throwableItem); _effectService.ChangeAffinity(throwableItem);
break; break;
case ThrowableItemTag.WarpToExitIfFound: case ThrowableItemTag.WarpToExitIfFound:
_effectService.WarpToExit(Player); _effectService.WarpToExit(Player);
InGameUI.CloseInventory(); GameRepo.CloseInventory();
break; break;
} }

2
Zennysoft.Game.Ma/src/map/dungeon/floors/Floor00.tscn
View File

@@ -26,7 +26,7 @@
[ext_resource type="PackedScene" uid="uid://c6w7dpk0hurj0" path="res://src/items/consumable/ConsumableItem.tscn" id="22_he1ou"] [ext_resource type="PackedScene" uid="uid://c6w7dpk0hurj0" path="res://src/items/consumable/ConsumableItem.tscn" id="22_he1ou"]
[ext_resource type="Resource" uid="uid://bjwbx3ymt8o7" path="res://src/items/consumable/resources/MysteryConsumable.tres" id="23_rufnk"] [ext_resource type="Resource" uid="uid://bjwbx3ymt8o7" path="res://src/items/consumable/resources/MysteryConsumable.tres" id="23_rufnk"]
[ext_resource type="PackedScene" uid="uid://d0pl1n1jf77jm" path="res://src/items/effect/EffectItem.tscn" id="24_t3xa0"] [ext_resource type="PackedScene" uid="uid://d0pl1n1jf77jm" path="res://src/items/effect/EffectItem.tscn" id="24_t3xa0"]
[ext_resource type="Resource" uid="uid://bg2fsie2g3j6q" path="res://src/items/effect/resources/Cosmos.tres" id="25_qqc7i"] [ext_resource type="Resource" uid="uid://bptg6eybj5dxk" path="res://src/items/effect/resources/DevicRecall.tres" id="25_qqc7i"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3ubi4"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3ubi4"]
shading_mode = 0 shading_mode = 0