From 2a8760a47447ed98defbc3d842a4c6697965e93d Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sat, 7 Dec 2013 16:22:42 +0100 Subject: [PATCH 1/3] Fixed heal cooldown expertise for Officer --- src/services/combat/CombatService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java index 52f0a5d3..1ee06890 100644 --- a/src/services/combat/CombatService.java +++ b/src/services/combat/CombatService.java @@ -405,11 +405,18 @@ public class CombatService implements INetworkDispatch { private void sendHealPackets(CreatureObject attacker, CreatureObject target, WeaponObject weapon, CombatCommand command, int actionCounter) { + float cooldown = 0; + CombatAction combatAction = new CombatAction(CRC.StringtoCRC(command.getDefaultAnimations()[0]), attacker.getObjectID(), weapon.getObjectID(), target.getObjectID(), command.getCommandCRC()); ObjControllerMessage objController = new ObjControllerMessage(0x1B, combatAction); attacker.notifyObserversInRange(objController, true, 125); - StartTask startTask = new StartTask(actionCounter, attacker.getObjectID(), command.getCommandCRC(), CRC.StringtoCRC(command.getCooldownGroup()), command.getCooldown()); + cooldown = command.getCooldown(); + + if(attacker.getSkillMod("expertise_cooldown_line_of_heal") != null) + cooldown -= 2*(attacker.getSkillMod("expertise_cooldown_line_of_heal").getBase()); + + StartTask startTask = new StartTask(actionCounter, attacker.getObjectID(), command.getCommandCRC(), CRC.StringtoCRC(command.getCooldownGroup()), cooldown); ObjControllerMessage objController2 = new ObjControllerMessage(0x0B, startTask); attacker.getClient().getSession().write(objController2.serialize()); From 55411e0f23f4ecf757fe81ad3ea1ce59efa6eeb6 Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sat, 7 Dec 2013 17:34:37 +0100 Subject: [PATCH 2/3] Fixed incorrect calculation for heal CD and added BH heal --- src/services/combat/CombatService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java index 1ee06890..b943779c 100644 --- a/src/services/combat/CombatService.java +++ b/src/services/combat/CombatService.java @@ -412,10 +412,13 @@ public class CombatService implements INetworkDispatch { attacker.notifyObserversInRange(objController, true, 125); cooldown = command.getCooldown(); + System.out.println(cooldown); if(attacker.getSkillMod("expertise_cooldown_line_of_heal") != null) - cooldown -= 2*(attacker.getSkillMod("expertise_cooldown_line_of_heal").getBase()); - + cooldown -= attacker.getSkillMod("expertise_cooldown_line_of_heal").getBase(); + if(attacker.getSkillMod("expertise_cooldown_line_sh") != null) + cooldown -= ((attacker.getSkillMod("expertise_cooldown_line_sh").getBase())/10); + StartTask startTask = new StartTask(actionCounter, attacker.getObjectID(), command.getCommandCRC(), CRC.StringtoCRC(command.getCooldownGroup()), cooldown); ObjControllerMessage objController2 = new ObjControllerMessage(0x0B, startTask); attacker.getClient().getSession().write(objController2.serialize()); From 4039379583951ab319212ffc10bb66bb804fcbba Mon Sep 17 00:00:00 2001 From: Ziggeh Date: Sat, 7 Dec 2013 23:12:41 +0100 Subject: [PATCH 3/3] Fixed creating waypoints through planetary map --- scripts/commands/requestwaypointatposition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/commands/requestwaypointatposition.py b/scripts/commands/requestwaypointatposition.py index 98c3fd2d..60b932ce 100644 --- a/scripts/commands/requestwaypointatposition.py +++ b/scripts/commands/requestwaypointatposition.py @@ -7,7 +7,7 @@ def run(core, actor, target, commandString): commandArgs = commandString.split("(^-,=+_)color_13548(,+-=_^)=1") - newString = commandArgs[1] + newString = commandArgs[0] print (newString) cmdService = core.commandService cmdService.callCommand(actor, 'waypoint', None, newString) # No need to re-create a script