From 4f45f62d0b0dee789f09eb5f49ca273b72e22571 Mon Sep 17 00:00:00 2001 From: Treeku Date: Thu, 3 Apr 2014 16:51:20 +0100 Subject: [PATCH] Updated skillMod baseline, removed old deltas --- .../creature/CreatureMessageBuilder.java | 59 ++----------------- 1 file changed, 6 insertions(+), 53 deletions(-) diff --git a/src/resources/objects/creature/CreatureMessageBuilder.java b/src/resources/objects/creature/CreatureMessageBuilder.java index 0ac1fa79..e5ea5109 100644 --- a/src/resources/objects/creature/CreatureMessageBuilder.java +++ b/src/resources/objects/creature/CreatureMessageBuilder.java @@ -157,20 +157,13 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder { buffer.putInt(0); // HAM Encumberance List unused in NGE buffer.putInt(0); - if(creature.getSkillMods().isEmpty()) { - buffer.putInt(0); - buffer.putInt(0); - } else { - buffer.putInt(creature.getSkillMods().size()); - buffer.putInt(creature.getSkillMods().getUpdateCounter()); - - for(SkillMod skillMod : creature.getSkillMods()) { - buffer.put((byte) 0); - buffer.put(getAsciiString(skillMod.getName())); - buffer.putInt(skillMod.getBase()); - buffer.putInt((int) skillMod.getModifier()); - } + buffer.putInt(creature.getSkillMods().size()); + buffer.putInt(creature.getSkillMods().getUpdateCounter()); + for (SkillMod skillMod : creature.getSkillMods().values()) { + buffer.put((byte) 0); + buffer.put(skillMod.getBytes()); } + buffer.putFloat(creature.getSpeedMultiplierBase()); buffer.putFloat(creature.getSpeedMultiplierMod()); @@ -850,46 +843,6 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder { } - public IoBuffer buildAddSkillModDelta(String name, int base) { - - CreatureObject creature = (CreatureObject) object; - - IoBuffer buffer = bufferPool.allocate(19 + name.length(), false).order(ByteOrder.LITTLE_ENDIAN); - buffer.putInt(1); - buffer.putInt(creature.getSkillModsUpdateCounter()); - buffer.put((byte) 0); - buffer.put(getAsciiString(name)); - buffer.putInt(base); - buffer.putInt(0); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("CREO", (byte) 4, (short) 1, (short) 3, buffer, size + 4); - - return buffer; - - } - - public IoBuffer buildRemoveSkillModDelta(String name, int base) { - - CreatureObject creature = (CreatureObject) object; - - IoBuffer buffer = bufferPool.allocate(19 + name.length(), false).order(ByteOrder.LITTLE_ENDIAN); - buffer.putInt(1); - buffer.putInt(creature.getSkillModsUpdateCounter()); - buffer.put((byte) 1); - buffer.put(getAsciiString(name)); - buffer.putInt(base); - buffer.putInt(0); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("CREO", (byte) 4, (short) 1, (short) 3, buffer, size + 4); - - return buffer; - - } - public IoBuffer buildAddSkillDelta(String name) { CreatureObject creature = (CreatureObject) object;