Better mana checks

tonihele · Jul 21, 2024 · f407bfd · f407bfd
1 parent 6d39db2
commit f407bfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/toniarts/openkeeper/game/controller/GameWorldController.java b/src/toniarts/openkeeper/game/controller/GameWorldController.java
@@ -922,7 +922,7 @@ public void castKeeperSpell(short keeperSpellId, EntityId target, Point tile, Ve
         }
 
         // Deduct the mana
-        playerControllers.get(playerId).getManaControl().updateMana(0, keeperSpell.getManaCost());
+        playerControllers.get(playerId).getManaControl().addMana(-keeperSpell.getManaCost());
 
         // Cast the spell
         boolean spellUpgraded = researchableEntity.isUpgraded();

diff --git a/src/toniarts/openkeeper/game/controller/KeeperSpellCastValidator.java b/src/toniarts/openkeeper/game/controller/KeeperSpellCastValidator.java
@@ -65,7 +65,7 @@ && checkCastRule(mapInformation, mapTile, keeperSpell, player)
     }
 
     private static boolean checkPlayerMana(KeeperSpell keeperSpell, Keeper player) {
-        return keeperSpell.getManaCost() <= player.getMana();
+        return keeperSpell.getManaCost() <= player.getMana() - player.getManaLoose();
     }
 
     private static boolean checkTargetRule(EntityId target, EntityData entityData, KwdFile kwdFile, KeeperSpell keeperSpell, Keeper player) {