From f9bf4ed269815d9909df021df2be5b105a978b93 Mon Sep 17 00:00:00 2001 From: Obique Date: Sat, 16 Feb 2019 17:45:52 -0600 Subject: [PATCH] Fixed skillmod base modification --- .../player/experience/skills/SkillModService.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/player/experience/skills/SkillModService.java b/src/main/java/com/projectswg/holocore/services/gameplay/player/experience/skills/SkillModService.java index 642e17624..b6023ba32 100644 --- a/src/main/java/com/projectswg/holocore/services/gameplay/player/experience/skills/SkillModService.java +++ b/src/main/java/com/projectswg/holocore/services/gameplay/player/experience/skills/SkillModService.java @@ -138,11 +138,10 @@ public class SkillModService extends Service { @IntentHandler private void handleSkillModIntent(SkillModIntent smi) { for (CreatureObject creature : smi.getAffectedCreatures()) { - int adjustModifier = smi.getAdjustModifier(); String skillModName = smi.getSkillModName(); - - creature.handleLevelSkillMods(skillModName, adjustModifier); - updateSkillModHamValues(creature, skillModName,adjustModifier); + + creature.adjustSkillmod(skillModName, smi.getAdjustBase(), smi.getAdjustModifier()); + updateSkillModHamValues(creature, skillModName, smi.getAdjustBase() + smi.getAdjustModifier()); } } @@ -152,17 +151,17 @@ public class SkillModService extends Service { creature.setMaxHealth(creature.getMaxHealth() + newHealth); creature.setHealth(creature.getMaxHealth()); - creature.setBaseHealth(getLevelSkillModValue(level, profession + "_health", "")); + creature.setBaseHealth(getLevelSkillModValue(level, profession.getName() + "_health", "")); creature.setMaxAction(creature.getMaxAction() + newAction); creature.setAction(creature.getMaxAction()); - creature.setBaseAction(getLevelSkillModValue(level, profession + "_action", "")); + creature.setBaseAction(getLevelSkillModValue(level, profession.getName() + "_action", "")); sendSystemMessage(creature.getOwner(), "level_up_stat_gain_6", "DI", newHealth); sendSystemMessage(creature.getOwner(), "level_up_stat_gain_7", "DI", newAction); } - private void updateSkillModHamValues(CreatureObject creature, String skillModName, int modifer){ + private void updateSkillModHamValues(CreatureObject creature, String skillModName, int modifer) { int newHealth = 0; int newAction = 0;