From 2dd4e986ca166ab3d95963fb20f078d102a73632 Mon Sep 17 00:00:00 2001 From: Seefo Date: Thu, 27 Mar 2014 16:29:57 -0400 Subject: [PATCH 1/3] Fixed #251 --- scripts/commands/holoemote.py | 2 +- src/protocol/swg/PlayClientEffectObjectMessage.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/commands/holoemote.py b/scripts/commands/holoemote.py index 6b0554f0..e4266155 100644 --- a/scripts/commands/holoemote.py +++ b/scripts/commands/holoemote.py @@ -36,7 +36,7 @@ def run(core, actor, target, commandString): return effectObj = 'clienteffect/holoemote_' + commandString + '.cef' - actor.playEffectObject(effectObj, 'head') + actor.playEffectObject(effectObj, 'Head') player.setHoloEmoteUses(player.getHoloEmoteUses() - 1) # TODO: Cooldowns for the holo-emote's return diff --git a/src/protocol/swg/PlayClientEffectObjectMessage.java b/src/protocol/swg/PlayClientEffectObjectMessage.java index 498b8ddd..29d6aecb 100644 --- a/src/protocol/swg/PlayClientEffectObjectMessage.java +++ b/src/protocol/swg/PlayClientEffectObjectMessage.java @@ -36,7 +36,6 @@ public class PlayClientEffectObjectMessage extends SWGMessage { this.effectFile = effectFile; this.objectId = objectId; this.commandString = commandString; - } @Override @@ -47,8 +46,10 @@ public class PlayClientEffectObjectMessage extends SWGMessage { result.putShort((short) 5); result.putInt(0x8855434A); result.put(getAsciiString(effectFile)); - result.put(getAsciiString(commandString)); + result.putShort((short) 0); result.putLong(objectId); + result.put(getAsciiString(commandString)); + return result.flip(); } From 1a0b36e8f336f9716a67e93f702e94d52c10fd57 Mon Sep 17 00:00:00 2001 From: Seefo Date: Thu, 27 Mar 2014 17:07:14 -0400 Subject: [PATCH 2/3] Fixed #197, #250, and #233 --- src/resources/objects/creature/CreatureObject.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index c2803448..6206166d 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -576,6 +576,9 @@ public class CreatureObject extends TangibleObject implements IPersistent { } public void addSkillMod(String name, int base) { + + if(name == "movement") setSpeedMultiplierMod(getSpeedMultiplierMod() + ((float)base / 10)); + if(getSkillMod(name) == null) { // TODO: Send skill mods delta in sendListDelta SkillMod skillMod = new SkillMod(); @@ -601,6 +604,8 @@ public class CreatureObject extends TangibleObject implements IPersistent { if(getSkillMod(name) == null) return; + if(name == "movement") this.setSpeedMultiplierMod(getSpeedMultiplierMod() - ((float)base / 10)); + SkillMod mod = getSkillMod(name); mod.setBase(mod.getBase() - base); From 47bb841588dfcfc5859f3d2c289d636c803f5926 Mon Sep 17 00:00:00 2001 From: Seefo Date: Thu, 27 Mar 2014 17:32:03 -0400 Subject: [PATCH 3/3] Fixed #255 --- src/services/combat/CombatService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java index 78f0b7c0..6dfab5b8 100644 --- a/src/services/combat/CombatService.java +++ b/src/services/combat/CombatService.java @@ -41,6 +41,7 @@ import protocol.swg.objectControllerObjects.CombatSpam; import protocol.swg.objectControllerObjects.CommandEnqueueRemove; import protocol.swg.objectControllerObjects.StartTask; import resources.common.FileUtilities; +import resources.datatables.Posture; import resources.objects.Buff; import resources.objects.DamageOverTime; import resources.objects.creature.CreatureObject; @@ -178,8 +179,14 @@ public class CombatService implements INetworkDispatch { } - //core.buffService.addBuffToCreature(attacker, command.getBuffNameSelf()); - + if(target instanceof CreatureObject) + { + if(((CreatureObject)(target)).getPosture() == Posture.Incapacitated) + { + attacker.removeDefender(target); + target.removeDefender(attacker); + } + } } private void doAreaCombat(CreatureObject attacker, TangibleObject target, WeaponObject weapon, CombatCommand command, int actionCounter) {