mirror of
https://github.com/ProjectSWGCore/Holocore.git
synced 2026-09-11 21:45:26 -04:00
Merge pull request #551 from madsboddum/slower_ham_regen
Slower HAM regeneration to prevent getting back up from incapacitatio…
This commit is contained in:
+16
-6
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user