From ed0c8ed92a60eaf4b373a30d68880485b93535b8 Mon Sep 17 00:00:00 2001 From: Ziggy Date: Tue, 28 Jun 2022 21:42:27 +0200 Subject: [PATCH] Slower HAM regeneration to prevent getting back up from incapacitation and almost immediately having full HAM bar Also added mind regeneration since it was missing --- .../combat/CombatRegenerationService.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/combat/CombatRegenerationService.java b/src/main/java/com/projectswg/holocore/services/gameplay/combat/CombatRegenerationService.java index c80458973..06cf0dc1a 100644 --- a/src/main/java/com/projectswg/holocore/services/gameplay/combat/CombatRegenerationService.java +++ b/src/main/java/com/projectswg/holocore/services/gameplay/combat/CombatRegenerationService.java @@ -61,20 +61,33 @@ public class CombatRegenerationService extends Service { private void regenerate(CreatureObject creature) { regenerationHealthTick(creature); regenerationActionTick(creature); + regenerationMindTick(creature); } private void regenerationActionTick(CreatureObject creature) { if (creature.getAction() >= creature.getMaxAction()) return; - int modification = creature.getMaxAction() / 10; + int modification = creature.getMaxAction() / 40; if (!creature.isInCombat()) - modification *= 4; + modification *= 2; creature.modifyAction(modification); } + private void regenerationMindTick(CreatureObject creature) { + if (creature.getMind() >= creature.getMaxMind()) + return; + + int modification = creature.getMaxMind() / 40; + + if (!creature.isInCombat()) + modification *= 2; + + creature.modifyMind(modification); + } + private void regenerationHealthTick(CreatureObject creature) { if (creature.getHealth() >= creature.getMaxHealth() || creature.isInCombat()) return; @@ -86,10 +99,7 @@ public class CombatRegenerationService extends Service { break; } - int modification = creature.getMaxHealth() / 10; - - if (!creature.isInCombat()) - modification *= 4; + int modification = creature.getMaxHealth() / 40; creature.modifyHealth(modification); }