Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

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

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();
 
 	}

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);
 		

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) {