diff --git a/sku.0/sys.server/compiled/game/script/item/armor/new_armor.java b/sku.0/sys.server/compiled/game/script/item/armor/new_armor.java old mode 100644 new mode 100755 index 90d0e0b22..9a8b544b5 --- a/sku.0/sys.server/compiled/game/script/item/armor/new_armor.java +++ b/sku.0/sys.server/compiled/game/script/item/armor/new_armor.java @@ -58,8 +58,20 @@ public class new_armor extends script.base_script public int OnAttach(obj_id self) throws InterruptedException { int ourType = getGameObjectType(self); + System.out.println("---- Checking to see if I should remove the script. ----"); + System.out.println("--- Found type: " + ourType); + System.out.println("--- GOT_armor: " + GOT_armor); + System.out.println("--- GOT_component_armor: " + GOT_component_armor); + System.out.println("--- GOT_component_new_armor: " + GOT_component_new_armor); + System.out.println("--- GOT_cybernetic: " + GOT_cybernetic); + System.out.println("--- GOT_cybernetic_arm: " + GOT_cybernetic_arm); + System.out.println("--- GOT_cybernetic_legs: " + GOT_cybernetic_legs); + System.out.println("--- GOT_cybernetic_torso: " + GOT_cybernetic_torso); if (!isGameObjectTypeOf(ourType, GOT_armor) && !isGameObjectTypeOf(ourType, GOT_component_armor) && !isGameObjectTypeOf(ourType, GOT_component_new_armor) && !isGameObjectTypeOf(ourType, GOT_cybernetic) && !isGameObjectTypeOf(ourType, GOT_cybernetic_arm) && !isGameObjectTypeOf(ourType, GOT_cybernetic_legs) && !isGameObjectTypeOf(ourType, GOT_cybernetic_torso)) { + System.out.println("!!!!Removing armor script!!!!!"); + System.out.println("--- This is probably bad... removing because game object type of item () doesn't match one of the exceptions: "); + detachScript(self, "item.armor.new_armor"); } return SCRIPT_CONTINUE; diff --git a/sku.0/sys.server/compiled/game/script/library/craftinglib.java b/sku.0/sys.server/compiled/game/script/library/craftinglib.java old mode 100644 new mode 100755 index 5d94f4658..965e0c226 --- a/sku.0/sys.server/compiled/game/script/library/craftinglib.java +++ b/sku.0/sys.server/compiled/game/script/library/craftinglib.java @@ -1139,7 +1139,9 @@ public class craftinglib extends script.base_script } if (hasObjVar(stationId, OBJVAR_CRAFTING_STATION_BONUS) == true) { - craftingStationMod = getFloatObjVar(stationId, OBJVAR_CRAFTING_STATION_BONUS) / 10; + // Cekis: not sure why a float divided by an int is desired here (was just 10), so changing the int to a float + // as the former would have resulted in potential loss in precision. + craftingStationMod = getFloatObjVar(stationId, OBJVAR_CRAFTING_STATION_BONUS) / 10.0f; } debugServerConsoleMsg(null, "craftinglib::calcPerExperimentationCheckMod - craftingStationMod = " + craftingStationMod); float playerSkillMod = 0; @@ -1686,7 +1688,8 @@ public class craftinglib extends script.base_script public static boolean storeSecondarySkillBonuses(obj_id prototype, draft_schematic schematic) throws InterruptedException { draft_schematic.slot[] slots = schematic.getSlots(); - draft_schematic.attribute[] objectAttribs = schematic.getAttribs(); + // Cekis: never used - waste of processing. + // draft_schematic.attribute[] objectAttribs = schematic.getAttribs(); String category = getProtoTypeCategory(prototype); for (int i = 0; i < slots.length; ++i) { diff --git a/sku.0/sys.server/compiled/game/script/systems/crafting/crafting_base.java b/sku.0/sys.server/compiled/game/script/systems/crafting/crafting_base.java old mode 100644 new mode 100755 index 13a688c75..498716f9c --- a/sku.0/sys.server/compiled/game/script/systems/crafting/crafting_base.java +++ b/sku.0/sys.server/compiled/game/script/systems/crafting/crafting_base.java @@ -138,11 +138,12 @@ public class crafting_base extends script.base_script { if (component.getData() instanceof Integer) { - itemAttributes[i].currentValue = component.getIntData(); + itemAttributes[i].currentValue = (float) component.getIntData(); } else if (itemAttributes[i].minValue != itemAttributes[i].maxValue) { debugServerConsoleMsg(null, "updating attrib " + (itemAttributes[i].name).getAsciiId() + ", current value = " + itemAttributes[i].currentValue + " by component value " + component.getFloatData()); + // Cekis: This may be a bug - why incremenet if a float (in this condition), but just re-assign if an int? itemAttributes[i].currentValue += component.getFloatData(); } else @@ -209,11 +210,13 @@ public class crafting_base extends script.base_script draft_schematic.slot[] slots = schematic.getSlots(); draft_schematic.attribute[] objectAttribs = schematic.getAttribs(); draft_schematic.attribute[] experimentalAttribs = schematic.getExperimentalAttribs(); + /* Cekis: pointless loop. for (int i = 0; i < objectAttribs.length; ++i) { float modifiedValue = objectAttribs[i].currentValue; String attribName = (objectAttribs[i].name).getAsciiId(); } + */ String[] obj_attributes = new String[objectAttribs.length]; for (int i = 0; i < obj_attributes.length; ++i) { @@ -533,11 +536,13 @@ public class crafting_base extends script.base_script } draft_schematic.attribute[] objectAttribs = schematic.getAttribs(); dictionary craftingValuesDictionary = new dictionary(); + /* Cekis: this is a totally pointless loop! Commenting out for now. for (int i = 0; i < objectAttribs.length; ++i) { float modifiedValue = objectAttribs[i].currentValue; String attribName = (objectAttribs[i].name).getAsciiId(); } + */ calcAndSetPrototypeProperties(prototype, objectAttribs, craftingValuesDictionary); setSchematicAttributes(self, objectAttribs); craftinglib.storeTissueDataAsObjvars(craftingValuesDictionary, objectAttribs, prototype, true); @@ -582,6 +587,7 @@ public class crafting_base extends script.base_script } public int OnManufactureObject(obj_id self, obj_id player, obj_id newObject, draft_schematic schematic, boolean isPrototype, boolean isRealObject) throws InterruptedException { + /* Cekis: unused vars and a pointless loop. Commenting out for now. draft_schematic.attribute[] objectAttribs = schematic.getAttribs(); draft_schematic.attribute[] experimentalAttribs = schematic.getExperimentalAttribs(); for (int i = 0; i < objectAttribs.length; ++i) @@ -589,6 +595,7 @@ public class crafting_base extends script.base_script float modifiedValue = objectAttribs[i].currentValue; String attribName = (objectAttribs[i].name).getAsciiId(); } + */ if (isPrototype) { OnFinalizeSchematic(self, player, newObject, schematic); @@ -651,6 +658,7 @@ public class crafting_base extends script.base_script } public int OnMakeCraftedItem(obj_id self, obj_id prototype, draft_schematic schematic, float qualityPercent) throws InterruptedException { + /* Cekis: look kids! Pointless vars and Another pointless loop! Commenting out for now. draft_schematic.attribute[] objectAttribs = schematic.getAttribs(); draft_schematic.attribute[] experimentalAttribs = schematic.getExperimentalAttribs(); for (int i = 0; i < objectAttribs.length; ++i) @@ -658,11 +666,12 @@ public class crafting_base extends script.base_script float modifiedValue = objectAttribs[i].currentValue; String attribName = (objectAttribs[i].name).getAsciiId(); } + */ debugServerConsoleMsg(null, "OnMakeCraftedItem enter, quality = " + qualityPercent); dictionary craftingValuesDictionary = new dictionary(); for (int i = 0; i < objectAttribs.length; ++i) { - objectAttribs[i].currentValue = objectAttribs[i].minValue + (objectAttribs[i].maxValue - objectAttribs[i].minValue) * (qualityPercent / 100.0f); + objectAttribs[i].currentValue = objectAttribs[i].maxValue * (qualityPercent / 100.0f); } setSchematicAttributes(self, objectAttribs); calcAndSetPrototypeProperties(prototype, objectAttribs); diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/assault_trooper/shared_armor_assault_trooper_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/assault_trooper/shared_armor_assault_trooper_chest_plate.tpf index 9da6a7b87..2afd37700 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/assault_trooper/shared_armor_assault_trooper_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/assault_trooper/shared_armor_assault_trooper_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/assault_trooper/shared_armor_assault_trooper_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/assault_trooper/shared_armor_assault_trooper_leggings.tpf index 913494527..9a3fc1aa2 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/assault_trooper/shared_armor_assault_trooper_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/assault_trooper/shared_armor_assault_trooper_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bone/shared_armor_bone_s01_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bone/shared_armor_bone_s01_chest_plate.tpf index e87d2daed..972512e94 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bone/shared_armor_bone_s01_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bone/shared_armor_bone_s01_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bone/shared_armor_bone_s01_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bone/shared_armor_bone_s01_leggings.tpf index 609644544..2dd847b60 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bone/shared_armor_bone_s01_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bone/shared_armor_bone_s01_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 7 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_chest_plate.tpf index c59f71a61..ffc7624b5 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_crafted_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_crafted_chest_plate.tpf index 2c0b6c32a..ecacabe70 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_crafted_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_crafted_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_crafted_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_crafted_leggings.tpf index 63f567d83..752dce973 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_crafted_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_crafted_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_leggings.tpf index c503a4e47..9e695a34b 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/bounty_hunter/shared_armor_bounty_hunter_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_acklay_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_acklay_chest_plate.tpf index 3717a4eb2..96831306e 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_acklay_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_acklay_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_acklay_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_acklay_leggings.tpf index 1c470975a..29a649273 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_acklay_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_acklay_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_chest_plate.tpf index 2fc25c8f5..a274c313d 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_leggings.tpf index 424a28997..480f63cbf 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/chitin/shared_armor_chitin_s01_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 7 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_imperial_s01_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_imperial_s01_chest_plate.tpf index ab6ab94e0..a29313c0a 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_imperial_s01_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_imperial_s01_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_imperial_s01_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_imperial_s01_leggings.tpf index ca449e816..d72e5c9af 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_imperial_s01_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_imperial_s01_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_chest_plate.tpf index 3c815abf3..bb669c175 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_leggings.tpf index df5f543b5..f0f2c9a3b 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_neutral_s01_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_rebel_s01_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_rebel_s01_chest_plate.tpf index 0e3f3907d..3b8c6dc46 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_rebel_s01_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_rebel_s01_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_rebel_s01_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_rebel_s01_leggings.tpf index 046372418..431f1f1eb 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_rebel_s01_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/clone_trooper/shared_armor_clone_trooper_rebel_s01_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/composite/shared_armor_composite_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/composite/shared_armor_composite_chest_plate.tpf index 7f25d79f7..2b3f6f258 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/composite/shared_armor_composite_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/composite/shared_armor_composite_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/composite/shared_armor_composite_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/composite/shared_armor_composite_leggings.tpf index d1f77898c..d91fb3af6 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/composite/shared_armor_composite_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/composite/shared_armor_composite_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 7 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_advanced_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_advanced_chest_plate.tpf index b1bd2349e..28ac2ea56 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_advanced_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_advanced_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_advanced_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_advanced_leggings.tpf index 934fe7f81..d41980b54 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_advanced_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_advanced_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_chest_plate.tpf index 0a40ccb6b..4e67cedf6 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_leggings.tpf index 467ff4079..842658525 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_standard_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_standard_chest_plate.tpf index 9527f50a9..76f9dfe51 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_standard_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_standard_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_standard_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_standard_leggings.tpf index 078341c15..b692beb89 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_standard_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/deathtrooper/shared_armor_deathtrooper_standard_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/galactic_marine/shared_armor_galactic_marine_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/galactic_marine/shared_armor_galactic_marine_chest_plate.tpf index 8f8bfdf23..10eeec444 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/galactic_marine/shared_armor_galactic_marine_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/galactic_marine/shared_armor_galactic_marine_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/galactic_marine/shared_armor_galactic_marine_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/galactic_marine/shared_armor_galactic_marine_leggings.tpf index 12479835e..0cbef53b7 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/galactic_marine/shared_armor_galactic_marine_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/galactic_marine/shared_armor_galactic_marine_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_chest_plate.tpf index a64be7cf6..c8000289d 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_leggings.tpf index 40bd70057..995407f5f 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_defender/shared_ith_armor_s01_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_chest_plate.tpf index 34ba18782..e9be37095 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_leggings.tpf index 77a32b151..9d792e272 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_guardian/shared_ith_armor_s02_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_chest_plate.tpf index 31e638753..48fecac73 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_leggings.tpf index 2f00d7287..7ac62c2a3 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ithorian_sentinel/shared_ith_armor_s03_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian/shared_armor_mandalorian_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian/shared_armor_mandalorian_chest_plate.tpf index 3ccf51ba7..b5f025cd1 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian/shared_armor_mandalorian_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian/shared_armor_mandalorian_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian/shared_armor_mandalorian_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian/shared_armor_mandalorian_leggings.tpf index 9f8ff21e6..7d823d1fb 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian/shared_armor_mandalorian_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian/shared_armor_mandalorian_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 7 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_imperial/shared_armor_mandalorian_imperial_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_imperial/shared_armor_mandalorian_imperial_chest_plate.tpf index 2bf4c44c9..82dfbe675 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_imperial/shared_armor_mandalorian_imperial_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_imperial/shared_armor_mandalorian_imperial_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_imperial/shared_armor_mandalorian_imperial_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_imperial/shared_armor_mandalorian_imperial_leggings.tpf index 0064e2f5e..0340dffed 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_imperial/shared_armor_mandalorian_imperial_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_imperial/shared_armor_mandalorian_imperial_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_rebel/shared_armor_mandalorian_rebel_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_rebel/shared_armor_mandalorian_rebel_chest_plate.tpf index 4357e60e3..b90f4789e 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_rebel/shared_armor_mandalorian_rebel_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_rebel/shared_armor_mandalorian_rebel_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_rebel/shared_armor_mandalorian_rebel_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_rebel/shared_armor_mandalorian_rebel_leggings.tpf index add21fcde..89838c15e 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_rebel/shared_armor_mandalorian_rebel_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/mandalorian_rebel/shared_armor_mandalorian_rebel_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_chest_plate.tpf index c54d9b38b..064f7d053 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_leggings.tpf index 4f2c61d05..6ffb7532f 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s01_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 7 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_chest_plate.tpf index c7c9932af..e91c08de6 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_leggings.tpf index afa2af441..1175002a6 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s02_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 7 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_chest_plate.tpf index 4ec0887cf..9049158fa 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_leggings.tpf index 2dd0c53b5..adfd1d9e2 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marauder/shared_armor_marauder_s03_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 7 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marine/shared_armor_marine_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marine/shared_armor_marine_chest_plate.tpf index 8b739a91b..a86df674a 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marine/shared_armor_marine_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marine/shared_armor_marine_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marine/shared_armor_marine_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marine/shared_armor_marine_leggings.tpf index 95e3b1ef8..358327345 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marine/shared_armor_marine_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/marine/shared_armor_marine_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 7 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/padded/shared_armor_padded_s01_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/padded/shared_armor_padded_s01_chest_plate.tpf index eb08da2e2..c65ed4bac 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/padded/shared_armor_padded_s01_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/padded/shared_armor_padded_s01_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/padded/shared_armor_padded_s01_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/padded/shared_armor_padded_s01_leggings.tpf index dfa1cab92..8a2d2d0c9 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/padded/shared_armor_padded_s01_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/padded/shared_armor_padded_s01_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 7 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_assault_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_assault_chest_plate.tpf index 97c4ad317..773dcbdde 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_assault_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_assault_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_assault_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_assault_leggings.tpf index 870737dec..a39a914e0 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_assault_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_assault_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_spec_ops_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_spec_ops_chest_plate.tpf index 632f24a52..50a146004 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_spec_ops_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_spec_ops_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_spec_ops_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_spec_ops_leggings.tpf index 711bdad0f..bff486c24 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_spec_ops_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_assault/shared_armor_rebel_spec_ops_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_battle/shared_armor_rebel_battle_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_battle/shared_armor_rebel_battle_chest_plate.tpf index 61401211f..8ebf704d6 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_battle/shared_armor_rebel_battle_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_battle/shared_armor_rebel_battle_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_battle/shared_armor_rebel_battle_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_battle/shared_armor_rebel_battle_leggings.tpf index 42d6261b1..89c39ff96 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_battle/shared_armor_rebel_battle_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_battle/shared_armor_rebel_battle_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_snow/shared_armor_rebel_snow_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_snow/shared_armor_rebel_snow_chest_plate.tpf index 668fedc7f..814aacb6b 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_snow/shared_armor_rebel_snow_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_snow/shared_armor_rebel_snow_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_snow/shared_armor_rebel_snow_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_snow/shared_armor_rebel_snow_leggings.tpf index 6f00d3343..a92468a2f 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_snow/shared_armor_rebel_snow_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_snow/shared_armor_rebel_snow_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_spec_force/shared_armor_rebel_spec_force_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_spec_force/shared_armor_rebel_spec_force_chest_plate.tpf index b86bad2b1..af4787ec7 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_spec_force/shared_armor_rebel_spec_force_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_spec_force/shared_armor_rebel_spec_force_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_spec_force/shared_armor_rebel_spec_force_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_spec_force/shared_armor_rebel_spec_force_leggings.tpf index 8e1bed8e9..ea82790a0 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_spec_force/shared_armor_rebel_spec_force_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/rebel_spec_force/shared_armor_rebel_spec_force_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ris/shared_armor_ris_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ris/shared_armor_ris_chest_plate.tpf index 6615f31c8..cc531785b 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ris/shared_armor_ris_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ris/shared_armor_ris_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 7 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ris/shared_armor_ris_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ris/shared_armor_ris_leggings.tpf index 80422db03..5fa042c7b 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ris/shared_armor_ris_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/ris/shared_armor_ris_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 7 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/scout_trooper/shared_armor_scout_trooper_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/scout_trooper/shared_armor_scout_trooper_chest_plate.tpf index 5b63bd725..224a62419 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/scout_trooper/shared_armor_scout_trooper_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/scout_trooper/shared_armor_scout_trooper_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/scout_trooper/shared_armor_scout_trooper_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/scout_trooper/shared_armor_scout_trooper_leggings.tpf index a210100a0..1a0120902 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/scout_trooper/shared_armor_scout_trooper_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/scout_trooper/shared_armor_scout_trooper_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_chest_plate.tpf index 60f15e1a3..d436b7c9e 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_leggings.tpf index 45e2616a1..d1c8e2780 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/snowtrooper/shared_armor_snowtrooper_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_chest_plate.tpf index 5f654f759..9c7c0584c 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_leggings.tpf index 0b7a98448..3fad907e4 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 7 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_pvp_officer_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_pvp_officer_chest_plate.tpf index 4e51c2c9b..551fc2353 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_pvp_officer_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/stormtrooper/shared_armor_stormtrooper_pvp_officer_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 10 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_chest_plate.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_chest_plate.tpf index bfd85d836..c439d417f 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_chest_plate.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_chest_plate.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_vest.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9 diff --git a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_leggings.tpf b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_leggings.tpf index dc645794f..5c446ba70 100644 --- a/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_leggings.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/wearables/armor/tantel/shared_armor_tantel_skreej_leggings.tpf @@ -1,5 +1,5 @@ -@base object/tangible/wearables/base/shared_base_skirt.iff +@base object/tangible/wearables/base/shared_armor_base.iff @class tangible_object_template 9