diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java index 9cc3e4e2..1a02278a 100644 --- a/src/resources/objects/SWGObject.java +++ b/src/resources/objects/SWGObject.java @@ -690,33 +690,7 @@ public abstract class SWGObject implements Serializable, Comparable { } } } - - private void debug_printSlotInfo(int tabs) { - String s = ""; - for (int i = 0; i < tabs; i++) { - s += "\t"; - } - System.out.println(s + "=== debug_printSlotInfo ===: " + this); - if (slots.size() == 0 && containedObjects.size() == 0) { - System.out.println(s + "NO CHILDREN"); - return; - } - - if (slots.size() > 0) System.out.println(s + "= Slots ="); - for (Map.Entry entry : slots.entrySet()) { - System.out.println(s + "Slot: " + entry.getKey() + " Value: " + entry.getValue() + (entry.getValue() != null ? " arrangement: " + entry.getValue().slotArrangement : "")); - if (entry.getValue() != null) entry.getValue().debug_printSlotInfo(tabs + 1); - } - - if (containedObjects.size() > 0) System.out.println(s + "= ContainerObjects ="); - for (SWGObject object : containedObjects.values()) { - System.out.println(s + "ContainedObject: " + object + " arrangementId: " + object.slotArrangement); - object.debug_printSlotInfo(tabs + 1); - } - - - } - + @Override public String toString() { return "SWGObject[ID=" + objectId + " NAME=" + objectName + " TEMPLATE=" + template + "]"; diff --git a/src/resources/objects/cell/CellObject.java b/src/resources/objects/cell/CellObject.java index 6e47d66b..cd01811c 100644 --- a/src/resources/objects/cell/CellObject.java +++ b/src/resources/objects/cell/CellObject.java @@ -82,7 +82,7 @@ public class CellObject extends SWGObject { public void createBaseline3(Player target, BaselineBuilder bb) { super.createBaseline3(target, bb); - bb.addByte(1); + bb.addByte(1); // isPublic bb.addInt(number); bb.incrementOperandCount(2); } diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index ad425d33..3e67347f 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -697,7 +697,7 @@ public class CreatureObject extends TangibleObject { super.createBaseline4(target, bb); // 0 variables bb.addFloat((float) accelScale); // 0 bb.addFloat((float) accelPercent); // 1 - bb.addObject(hamEncumbList); // 2 + bb.addObject(hamEncumbList); // Rename to bonusAttributes? 2 bb.addObject(skillMods); // 3 bb.addFloat((float) movementScale); // 4 bb.addFloat((float) movementPercent); // 5 @@ -708,7 +708,7 @@ public class CreatureObject extends TangibleObject { bb.addFloat((float) turnScale); // 10 bb.addFloat((float) walkSpeed); // 11 bb.addFloat((float) waterModPercent); // 12 - bb.addObject(missionCriticalObjs); // 13 + bb.addObject(missionCriticalObjs); // Group Missions? 13 bb.addObject(abilities); // 14 bb.addInt(totalLevelXp); // 15 @@ -743,9 +743,9 @@ public class CreatureObject extends TangibleObject { bb.addInt((hologramColour == null) ? -1 : hologramColour.getValue()); // Hologram Color -- 29 bb.addBoolean(shownOnRadar); // 30 bb.addBoolean(beast); // 31 - bb.addByte(0); // Unknown -- 32 + bb.addByte(0); // forceShowHam? -- 32 bb.addObject(appearanceList); // 33 - bb.addLong(0); // unknown -- 34 + bb.addLong(0); // decoy? -- 34 bb.incrementOperandCount(27); } diff --git a/src/resources/objects/player/PlayerObject.java b/src/resources/objects/player/PlayerObject.java index 0137c744..a822a50f 100644 --- a/src/resources/objects/player/PlayerObject.java +++ b/src/resources/objects/player/PlayerObject.java @@ -471,11 +471,11 @@ public class PlayerObject extends IntangibleObject { bb.addObject(waypoints); // 1 bb.addInt(100); // Current Force Power -- 2 bb.addInt(100); // Max Force Power -- 3 - bb.addInt(0); // Current FS Quest List (List) -- 4 + bb.addInt(0); // Completed Quests (List) -- 4 bb.addInt(0); - bb.addInt(0); // Completed FS Quest List (List) -- 5 + bb.addInt(0); // Active Quests (List) -- 5 bb.addInt(0); - bb.addInt(activeQuest); // 6 + bb.addInt(activeQuest); // Current Quest -- 6 bb.addObject(quests); // 7 bb.addAscii(profWheelPosition); // 8 @@ -501,7 +501,7 @@ public class PlayerObject extends IntangibleObject { bb.addInt(100); // Max Drink -- 13 bb.addInt(0); // Current Consumable -- 14 bb.addInt(100); // Max Consumable -- 15 - bb.addInt(0); // Waypoints - Is there a difference between this one and baseline 8? -- 16 + bb.addInt(0); // Group Waypoints -- 16 bb.addInt(0); bb.addObject(defenders); // 17 bb.addInt(killMeter); // 18 diff --git a/src/resources/objects/resource/ResourceContainerObject.java b/src/resources/objects/resource/ResourceContainerObject.java index 4f84fd0b..545dc3de 100644 --- a/src/resources/objects/resource/ResourceContainerObject.java +++ b/src/resources/objects/resource/ResourceContainerObject.java @@ -98,37 +98,19 @@ public class ResourceContainerObject extends TangibleObject { @Override public void createBaseline3(Player target, BaselineBuilder bb) { super.createBaseline3(target, bb); - // lol I understand none of these variables bb.addInt(quantity); - bb.addInt(0); - bb.addInt(0); - bb.addInt(0); - bb.addInt(0); - bb.addShort(0); - bb.addInt(0); - bb.addInt(0); - bb.addInt(100); // Max Condition - bb.addByte(1); - bb.addInt(0); bb.addLong(resourceType); - - bb.incrementOperandCount(12); + bb.incrementOperandCount(2); } @Override public void createBaseline6(Player target, BaselineBuilder bb) { super.createBaseline6(target, bb); - // lol I understand none of these variables - bb.addLong(0); - bb.addLong(0); - bb.addLong(0); - bb.addLong(0); - bb.addInt(0); - bb.addByte(0); bb.addInt(maxQuantity); - bb.addAscii(getTemplate()); - bb.addUnicode("inorganic_minerals_small"); // container name - bb.addLong(0); + bb.addAscii(parentName); + bb.addUnicode(resourceName); + bb.addLong(0); // Resource Id + bb.incrementOperandCount(4); } } diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java index 5aa06d6d..319ac78a 100644 --- a/src/resources/objects/tangible/TangibleObject.java +++ b/src/resources/objects/tangible/TangibleObject.java @@ -161,10 +161,10 @@ public class TangibleObject extends SWGObject { bb.addArray(appearanceData); bb.addInt(0); // Component customization (Set, Integer) bb.addInt(0); //updates - bb.addInt(128); // Options Bitmask (128 = Attackable) - bb.addInt(0); // Incap Timer for players, Use count for objects + bb.addInt(128); // Options Bitmask (128 = Attackable) // TODO: Fix this for buildings + bb.addInt(0); // Generic Counter -- use count and incap timer bb.addInt(condition); - bb.addInt(100); // Random number that should be high enough - maxCondition + bb.addInt(100); // maxHitPoints bb.addBoolean(false); // isStatic bb.incrementOperandCount(9); @@ -175,15 +175,14 @@ public class TangibleObject extends SWGObject { bb.addBoolean(false); // Combat flag bb.addInt(0); // Defenders List (Set, Long) bb.addInt(0); - bb.addInt(0); // Unknown List (List, Long) + bb.addInt(0); // Map color + bb.addInt(0); // Access List bb.addInt(0); - bb.addInt(0); // Unknown List (List, Integer) + bb.addInt(0); // Guild Access Set bb.addInt(0); - bb.addInt(0); // Unknown, possibly a list/map or something + bb.addInt(0); // Effects Map bb.addInt(0); - bb.addInt(0); - bb.incrementOperandCount(6); } diff --git a/src/resources/objects/weapon/WeaponObject.java b/src/resources/objects/weapon/WeaponObject.java index 573601e4..88f6c78a 100644 --- a/src/resources/objects/weapon/WeaponObject.java +++ b/src/resources/objects/weapon/WeaponObject.java @@ -101,11 +101,11 @@ public class WeaponObject extends TangibleObject implements Encodable{ bb.addFloat(attackSpeed); bb.addInt(0); // accuracy (pre-nge) - bb.addInt(0); // unknown + bb.addInt(0); // minRange bb.addFloat(maxRange); - bb.addInt(1); // unknown (set to 1 for default weapon) - bb.addInt(0); // weapon particle effect? - bb.addInt(0); // weapon particle effect color? + bb.addInt(1); // damageType + bb.addInt(0); // elementalType + bb.addInt(0); // elementalValue bb.incrementOperandCount(7); }