diff --git a/.gitignore b/.gitignore index f80b1387..b4314ba3 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,7 @@ odb/swgobjects/je.info.* ======= odb/auction/je.info.* odb/bounties/je.info.* +odb/cities/je.info.* >>>>>>> 12ca3ae66170fcfe09d848a7eea529041b9af5ad # External tool builders diff --git a/ngengine_public.jar b/ngengine_public.jar index 2dbdc9f0..91d5298a 100644 Binary files a/ngengine_public.jar and b/ngengine_public.jar differ diff --git a/odb/cities/je.info.0.8 b/odb/cities/je.info.0.8 new file mode 100644 index 00000000..c6a20587 --- /dev/null +++ b/odb/cities/je.info.0.8 @@ -0,0 +1 @@ +140613 19:57:33:302 INFO [.\odb\cities]Chose lowest utilized file for cleaning. totalUtilization: 14 bestFileUtilization: 101 lnSizeCorrectionFactor: NaN isProbe: false diff --git a/odb/cities/placeholder.txt b/odb/cities/placeholder.txt new file mode 100644 index 00000000..e69de29b diff --git a/scripts/buffs/of_deb_def_1.py b/scripts/buffs/of_deb_def_1.py index 13cdab58..793bdf94 100644 --- a/scripts/buffs/of_deb_def_1.py +++ b/scripts/buffs/of_deb_def_1.py @@ -1,9 +1,6 @@ import sys def setup(core, actor, buff): - if actor.getSkillMod('expertise_aura_maintain'): - if actor.getSkillModBase('expertise_aura_maintain') > 0: - buff.setDuration(-1) return def add(core, actor, buff): diff --git a/scripts/buffs/of_deb_def_2.py b/scripts/buffs/of_deb_def_2.py index 097ffe2b..b8489de2 100644 --- a/scripts/buffs/of_deb_def_2.py +++ b/scripts/buffs/of_deb_def_2.py @@ -1,9 +1,6 @@ import sys def setup(core, actor, buff): - if actor.getSkillMod('expertise_aura_maintain'): - if actor.getSkillModBase('expertise_aura_maintain') > 0: - buff.setDuration(-1) return def add(core, actor, buff): diff --git a/scripts/buffs/of_deb_def_3.py b/scripts/buffs/of_deb_def_3.py index c3b28b0b..9ca704a3 100644 --- a/scripts/buffs/of_deb_def_3.py +++ b/scripts/buffs/of_deb_def_3.py @@ -1,9 +1,6 @@ import sys def setup(core, actor, buff): - if actor.getSkillMod('expertise_aura_maintain'): - if actor.getSkillModBase('expertise_aura_maintain') > 0: - buff.setDuration(-1) return def add(core, actor, buff): diff --git a/scripts/buffs/of_deb_def_4.py b/scripts/buffs/of_deb_def_4.py index e93dde70..62a832dd 100644 --- a/scripts/buffs/of_deb_def_4.py +++ b/scripts/buffs/of_deb_def_4.py @@ -1,9 +1,6 @@ import sys def setup(core, actor, buff): - if actor.getSkillMod('expertise_aura_maintain'): - if actor.getSkillModBase('expertise_aura_maintain') > 0: - buff.setDuration(-1) return def add(core, actor, buff): diff --git a/scripts/buffs/of_deb_def_5.py b/scripts/buffs/of_deb_def_5.py index 233ec4dd..4c8e28fa 100644 --- a/scripts/buffs/of_deb_def_5.py +++ b/scripts/buffs/of_deb_def_5.py @@ -1,9 +1,6 @@ import sys def setup(core, actor, buff): - if actor.getSkillMod('expertise_aura_maintain'): - if actor.getSkillModBase('expertise_aura_maintain') > 0: - buff.setDuration(-1) return def add(core, actor, buff): diff --git a/scripts/buffs/of_deb_def_6.py b/scripts/buffs/of_deb_def_6.py index cdb29995..eb41e77b 100644 --- a/scripts/buffs/of_deb_def_6.py +++ b/scripts/buffs/of_deb_def_6.py @@ -1,9 +1,6 @@ import sys def setup(core, actor, buff): - if actor.getSkillMod('expertise_aura_maintain'): - if actor.getSkillModBase('expertise_aura_maintain') > 0: - buff.setDuration(-1) return def add(core, actor, buff): diff --git a/scripts/buffs/of_deb_def_7.py b/scripts/buffs/of_deb_def_7.py index 9e9fedf5..c1e5dd6e 100644 --- a/scripts/buffs/of_deb_def_7.py +++ b/scripts/buffs/of_deb_def_7.py @@ -1,9 +1,6 @@ import sys def setup(core, actor, buff): - if actor.getSkillMod('expertise_aura_maintain'): - if actor.getSkillModBase('expertise_aura_maintain') > 0: - buff.setDuration(-1) return def add(core, actor, buff): diff --git a/scripts/buffs/of_deb_def_8.py b/scripts/buffs/of_deb_def_8.py index 6016ba0d..1ad5b201 100644 --- a/scripts/buffs/of_deb_def_8.py +++ b/scripts/buffs/of_deb_def_8.py @@ -1,9 +1,6 @@ import sys def setup(core, actor, buff): - if actor.getSkillMod('expertise_aura_maintain'): - if actor.getSkillModBase('expertise_aura_maintain') > 0: - buff.setDuration(-1) return def add(core, actor, buff): diff --git a/scripts/buffs/powerup_weapon.py b/scripts/buffs/powerup_weapon.py new file mode 100644 index 00000000..740fa4e3 --- /dev/null +++ b/scripts/buffs/powerup_weapon.py @@ -0,0 +1,27 @@ +import sys +from java.lang import Float + +def setup(core, actor, buff): + + #powerup = actor.getUseTarget() + powerupID = actor.getAttachment('LastUsedPUP') + powerup = core.objectService.getObject(long(powerupID)) + effectName = powerup.getAttachment("effectName"); + powerValue = powerup.getAttachment("powerValue"); + effectName = effectName.replace('@stat_n:', '') + actor.sendSystemMessage('en %s' % effectName, 0) + actor.sendSystemMessage('pv %s' % powerValue, 0) + buff.setDuration(Float(1800.0)) + if effectName: + buff.setEffect1Name(effectName) + if powerValue: + buff.setEffect1Value(Float(powerValue)) + return + +def add(core, actor, buff): + + return + +def remove(core, actor, buff): + + return \ No newline at end of file diff --git a/scripts/cityRankCaps.py b/scripts/cityRankCaps.py new file mode 100644 index 00000000..02ce24fd --- /dev/null +++ b/scripts/cityRankCaps.py @@ -0,0 +1,13 @@ +import sys +from jarray import array + +def addCityRankCaps(core): + + cityService = core.playerCityService + cityService.addCityRankCap('corellia', array([20, 20, 15, 10, 10], 'i')) + cityService.addCityRankCap('dantooine', array([50, 50, 30, 20, 20], 'i')) + cityService.addCityRankCap('lok', array([50, 50, 30, 20, 20], 'i')) + cityService.addCityRankCap('naboo', array([20, 20, 15, 10, 10], 'i')) + cityService.addCityRankCap('rori', array([50, 50, 30, 20, 20], 'i')) + cityService.addCityRankCap('talus', array([50, 50, 30, 20, 20], 'i')) + cityService.addCityRankCap('tatooine', array([20, 20, 15, 10, 10], 'i')) \ No newline at end of file diff --git a/scripts/gcw/gcwrank_imperial.py b/scripts/collections/gcwrank_imperial.py similarity index 100% rename from scripts/gcw/gcwrank_imperial.py rename to scripts/collections/gcwrank_imperial.py diff --git a/scripts/gcw/gcwrank_rebel.py b/scripts/collections/gcwrank_rebel.py similarity index 100% rename from scripts/gcw/gcwrank_rebel.py rename to scripts/collections/gcwrank_rebel.py diff --git a/scripts/commands/applypowerup.py b/scripts/commands/applypowerup.py new file mode 100644 index 00000000..a490c050 --- /dev/null +++ b/scripts/commands/applypowerup.py @@ -0,0 +1,11 @@ +import sys +from java.lang import Long + +def setup(): + return + +def run(core, actor, target, objectid): + object = core.objectService.getObject(long(objectid)) + target.setAttachment('UsedObjectID',Long(objectid)) + core.objectService.useObject(actor, target) + return \ No newline at end of file diff --git a/scripts/commands/factorycratesplit.py b/scripts/commands/factorycratesplit.py new file mode 100644 index 00000000..1c2b6a51 --- /dev/null +++ b/scripts/commands/factorycratesplit.py @@ -0,0 +1,8 @@ +import sys + +def setup(): + return + +def run(core, actor, target, commandString): + target.splitFactoryCrate(actor,target,commandString) + return \ No newline at end of file diff --git a/scripts/commands/permissionlistmodify.py b/scripts/commands/permissionlistmodify.py index 5d75a1e2..05f567ea 100644 --- a/scripts/commands/permissionlistmodify.py +++ b/scripts/commands/permissionlistmodify.py @@ -6,12 +6,13 @@ def setup(): def run(core, actor, target, commandString): permissionType = 'Undetermined' commandArgs = commandString.split(' ') - if len(commandArgs) > 3: - permissionType = commandArgs[2] - if permissionType=='ENTRY' | permissionType=='BAN': + target = core.housingService.getClosestStructureWithAdminRights(actor) + if not target: + return + if target.getTemplate().startswith('object/building'): core.housingService.handlePermissionListModify(actor, target, commandString) - if permissionType=='ADMIN' | permissionType=='HOPPER': + elif target.getTemplate().startswith('object/installation'): core.harvesterService.handlePermissionListModify(actor, target, commandString) - return + return \ No newline at end of file diff --git a/scripts/commands/placestructure.py b/scripts/commands/placestructure.py index fa7bc65a..35e85d03 100644 --- a/scripts/commands/placestructure.py +++ b/scripts/commands/placestructure.py @@ -19,7 +19,11 @@ def run(core, actor, target, commandString): positionX = float(cmdArgs[1]) positionZ = float(cmdArgs[2]) rotation = float(cmdArgs[3]) - + + if 'cityhall' in deed.getTemplate(): + core.playerCityService.handlePlaceCity(actor, deed, positionX, positionZ, rotation) + return + core.housingService.placeStructure(actor, deed, positionX, positionZ, rotation) return diff --git a/scripts/commands/rotatefurniture.py b/scripts/commands/rotatefurniture.py index 66b1dc27..804f5fcb 100644 --- a/scripts/commands/rotatefurniture.py +++ b/scripts/commands/rotatefurniture.py @@ -6,7 +6,7 @@ def setup(): def run(core, actor, target, commandString): tarObj = core.objectService.getObject(actor.getTargetId()) - + container = actor.getContainer() parsedMsg = commandString.split(' ', 2) @@ -14,14 +14,14 @@ def run(core, actor, target, commandString): return if core.housingService.getPermissions(actor, container): # i should probably relook into my permissions system... it kinda sucks - if parsedMsg[0] == "pitch": - core.simulationService.transform(tarObj, float(parsedMsg[1]), Point3D(1, 0, 0)) # this is messed up ??? + if parsedMsg[0] == "pitch" and core.collectionService.isComplete(actor, 'force_shui_01'): + core.simulationService.transform(tarObj, float(parsedMsg[1]), Point3D(0, 0, 1)) # this is messed up ??? return elif parsedMsg[0] == "yaw": core.simulationService.transform(tarObj, float(parsedMsg[1]), Point3D(0, 1, 0)) # this is correct return - elif parsedMsg[0] == "roll": - core.simulationService.transform(tarObj, float(parsedMsg[1]), Point3D(0, 0, 1)) # this is messed up ??? + elif parsedMsg[0] == "roll" and core.collectionService.isComplete(actor, 'force_shui_02'): + core.simulationService.transform(tarObj, float(parsedMsg[1]), Point3D(1, 0, 0)) # this is messed up ??? return elif container.getTemplate() == "object/cell/shared_cell.iff": actor.sendSystemMessage("You do not have permission to access that container!", 0) diff --git a/scripts/conversation/missions/deliver.py b/scripts/conversation/missions/deliver.py index 774e3e01..126665a7 100644 --- a/scripts/conversation/missions/deliver.py +++ b/scripts/conversation/missions/deliver.py @@ -43,7 +43,7 @@ def handlePickupStage(core, actor, npc, objective, mission): endConversation(core, actor, npc) return - core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'p') + core.conversationService.sendStopConversation(actor, npc, mission.getMissionStf(), 'm' + str(mission.getMissionId()) + 'p') objective.createDeliveryItem(core, actor) objective.update(core, actor) return @@ -54,7 +54,7 @@ def handleDeliveryStage(core, actor, npc, objective, mission): endConversation(core, actor, npc) return - core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'r') + core.conversationService.sendStopConversation(actor, npc, mission.getMissionStf(), 'm' + str(mission.getMissionId()) + 'r') core.objectService.destroyObject(objective.getDeliveryObject()) objective.update(core, actor) return @@ -65,6 +65,6 @@ def handleCompletionStage(core, actor, npc, objective, mission): endConversation(core, actor, npc) return - core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 's') + core.conversationService.sendStopConversation(actor, npc, mission.getMissionStf(), 'm' + str(mission.getMissionId()) + 's') core.missionService.handleMissionComplete(actor, mission) return \ No newline at end of file diff --git a/scripts/expertise/expertise_bh_absorbtion_1.py b/scripts/expertise/expertise_bh_absorbtion_1.py deleted file mode 100644 index 81963132..00000000 --- a/scripts/expertise/expertise_bh_absorbtion_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_absorption_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_absorption_1") - return diff --git a/scripts/expertise/expertise_bh_absorbtion_2.py b/scripts/expertise/expertise_bh_absorbtion_2.py deleted file mode 100644 index 732e9847..00000000 --- a/scripts/expertise/expertise_bh_absorbtion_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_absorption_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_absorption_2") - return diff --git a/scripts/expertise/expertise_bh_absorbtion_3.py b/scripts/expertise/expertise_bh_absorbtion_3.py deleted file mode 100644 index b8d44ab2..00000000 --- a/scripts/expertise/expertise_bh_absorbtion_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_absorption_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_absorption_3") - return diff --git a/scripts/expertise/expertise_bh_absorbtion_4.py b/scripts/expertise/expertise_bh_absorbtion_4.py deleted file mode 100644 index 3210a0b0..00000000 --- a/scripts/expertise/expertise_bh_absorbtion_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_absorption_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_absorption_4") - return diff --git a/scripts/expertise/expertise_bh_agility_1.py b/scripts/expertise/expertise_bh_agility_1.py deleted file mode 100644 index 007b7232..00000000 --- a/scripts/expertise/expertise_bh_agility_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_agility_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_agility_1") - return diff --git a/scripts/expertise/expertise_bh_agility_2.py b/scripts/expertise/expertise_bh_agility_2.py deleted file mode 100644 index 2d896352..00000000 --- a/scripts/expertise/expertise_bh_agility_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_agility_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_agility_1") - return \ No newline at end of file diff --git a/scripts/expertise/expertise_bh_agility_3.py b/scripts/expertise/expertise_bh_agility_3.py deleted file mode 100644 index d55eaa3a..00000000 --- a/scripts/expertise/expertise_bh_agility_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_agility_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_agility_3") - return diff --git a/scripts/expertise/expertise_bh_agility_4.py b/scripts/expertise/expertise_bh_agility_4.py deleted file mode 100644 index 84d67d3f..00000000 --- a/scripts/expertise/expertise_bh_agility_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_agility_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_agility_4") - return diff --git a/scripts/expertise/expertise_bh_amb_act_1.py b/scripts/expertise/expertise_bh_amb_act_1.py deleted file mode 100644 index 55a6b1d7..00000000 --- a/scripts/expertise/expertise_bh_amb_act_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_amb_act_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_amb_act_1") - return diff --git a/scripts/expertise/expertise_bh_amb_act_2.py b/scripts/expertise/expertise_bh_amb_act_2.py deleted file mode 100644 index e1d3bd74..00000000 --- a/scripts/expertise/expertise_bh_amb_act_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_amb_act_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_amb_act_2") - return diff --git a/scripts/expertise/expertise_bh_amb_act_3.py b/scripts/expertise/expertise_bh_amb_act_3.py deleted file mode 100644 index da81f8ad..00000000 --- a/scripts/expertise/expertise_bh_amb_act_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_amb_act_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_amb_act_3") - return diff --git a/scripts/expertise/expertise_bh_amb_cool_1.py b/scripts/expertise/expertise_bh_amb_cool_1.py deleted file mode 100644 index 6e07401d..00000000 --- a/scripts/expertise/expertise_bh_amb_cool_1.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_amb_cool_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_amb_cool_1") - return - \ No newline at end of file diff --git a/scripts/expertise/expertise_bh_amb_cool_2.py b/scripts/expertise/expertise_bh_amb_cool_2.py deleted file mode 100644 index b1e0427e..00000000 --- a/scripts/expertise/expertise_bh_amb_cool_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("bh_amb_cool_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("bh_amb_cool_2") - return diff --git a/scripts/expertise/expertise_bh_amb_dam_1.py b/scripts/expertise/expertise_bh_amb_dam_1.py deleted file mode 100644 index 932bf6e5..00000000 --- a/scripts/expertise/expertise_bh_amb_dam_1.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_amb_dam_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_amb_dam_1") - return - \ No newline at end of file diff --git a/scripts/expertise/expertise_bh_amb_dam_2.py b/scripts/expertise/expertise_bh_amb_dam_2.py deleted file mode 100644 index 53bdcb8a..00000000 --- a/scripts/expertise/expertise_bh_amb_dam_2.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_amb_dam_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_amb_dam_2") - return - \ No newline at end of file diff --git a/scripts/expertise/expertise_bh_amb_dam_3.py b/scripts/expertise/expertise_bh_amb_dam_3.py deleted file mode 100644 index 02832491..00000000 --- a/scripts/expertise/expertise_bh_amb_dam_3.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_amb_dam_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_amb_dam_3") - return - \ No newline at end of file diff --git a/scripts/expertise/expertise_bh_amb_dam_cool.py b/scripts/expertise/expertise_bh_amb_dam_cool.py deleted file mode 100644 index 633d3846..00000000 --- a/scripts/expertise/expertise_bh_amb_dam_cool.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_dam_cool") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_amb_dam_cool") - return - \ No newline at end of file diff --git a/scripts/expertise/expertise_bh_armor_eng_1.py b/scripts/expertise/expertise_bh_armor_eng_1.py deleted file mode 100644 index a67e6dee..00000000 --- a/scripts/expertise/expertise_bh_armor_eng_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_eng_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_eng_1") - return diff --git a/scripts/expertise/expertise_bh_armor_eng_2.py b/scripts/expertise/expertise_bh_armor_eng_2.py deleted file mode 100644 index 86521742..00000000 --- a/scripts/expertise/expertise_bh_armor_eng_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_eng_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_eng_2") - return diff --git a/scripts/expertise/expertise_bh_armor_eng_3.py b/scripts/expertise/expertise_bh_armor_eng_3.py deleted file mode 100644 index 9674d322..00000000 --- a/scripts/expertise/expertise_bh_armor_eng_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_eng_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_eng_3") - return diff --git a/scripts/expertise/expertise_bh_armor_eng_4.py b/scripts/expertise/expertise_bh_armor_eng_4.py deleted file mode 100644 index 2282200c..00000000 --- a/scripts/expertise/expertise_bh_armor_eng_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_eng_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_eng_4") - return diff --git a/scripts/expertise/expertise_bh_armor_kin_1.py b/scripts/expertise/expertise_bh_armor_kin_1.py deleted file mode 100644 index 91acd05a..00000000 --- a/scripts/expertise/expertise_bh_armor_kin_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_kin_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_kin_1") - return diff --git a/scripts/expertise/expertise_bh_armor_kin_2.py b/scripts/expertise/expertise_bh_armor_kin_2.py deleted file mode 100644 index 8e603d50..00000000 --- a/scripts/expertise/expertise_bh_armor_kin_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_kin_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_kin_2") - return diff --git a/scripts/expertise/expertise_bh_armor_kin_3.py b/scripts/expertise/expertise_bh_armor_kin_3.py deleted file mode 100644 index d54efcba..00000000 --- a/scripts/expertise/expertise_bh_armor_kin_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_kin_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_kin_3") - return diff --git a/scripts/expertise/expertise_bh_armor_kin_4.py b/scripts/expertise/expertise_bh_armor_kin_4.py deleted file mode 100644 index 7351a899..00000000 --- a/scripts/expertise/expertise_bh_armor_kin_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_kin_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_kin_4") - return diff --git a/scripts/expertise/expertise_bh_armor_mgb_1.py b/scripts/expertise/expertise_bh_armor_mgb_1.py deleted file mode 100644 index f6a10221..00000000 --- a/scripts/expertise/expertise_bh_armor_mgb_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_mgb_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_mgb_1") - return diff --git a/scripts/expertise/expertise_bh_armor_mgb_2.py b/scripts/expertise/expertise_bh_armor_mgb_2.py deleted file mode 100644 index b71a226c..00000000 --- a/scripts/expertise/expertise_bh_armor_mgb_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_mgb_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_mgb_2") - return diff --git a/scripts/expertise/expertise_bh_armor_mgb_3.py b/scripts/expertise/expertise_bh_armor_mgb_3.py deleted file mode 100644 index 957b4b88..00000000 --- a/scripts/expertise/expertise_bh_armor_mgb_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_mgb_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_mgb_3") - return diff --git a/scripts/expertise/expertise_bh_armor_rgb_1.py b/scripts/expertise/expertise_bh_armor_rgb_1.py deleted file mode 100644 index c1d48b96..00000000 --- a/scripts/expertise/expertise_bh_armor_rgb_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_rgb_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_rgb_1") - return diff --git a/scripts/expertise/expertise_bh_armor_rgb_2.py b/scripts/expertise/expertise_bh_armor_rgb_2.py deleted file mode 100644 index d0757ff7..00000000 --- a/scripts/expertise/expertise_bh_armor_rgb_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_rgb_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_rgb_2") - return diff --git a/scripts/expertise/expertise_bh_armor_rgb_3.py b/scripts/expertise/expertise_bh_armor_rgb_3.py deleted file mode 100644 index 7f8e5879..00000000 --- a/scripts/expertise/expertise_bh_armor_rgb_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_armor_rgb_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_armor_rgb_3") - return diff --git a/scripts/expertise/expertise_bh_ass_act_1.py b/scripts/expertise/expertise_bh_ass_act_1.py deleted file mode 100644 index 35100c39..00000000 --- a/scripts/expertise/expertise_bh_ass_act_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_ass_act_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_ass_act_1") - return diff --git a/scripts/expertise/expertise_bh_ass_act_2.py b/scripts/expertise/expertise_bh_ass_act_2.py deleted file mode 100644 index e647dfd4..00000000 --- a/scripts/expertise/expertise_bh_ass_act_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_ass_act_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_ass_act_2") - return diff --git a/scripts/expertise/expertise_bh_ass_act_3.py b/scripts/expertise/expertise_bh_ass_act_3.py deleted file mode 100644 index 7011247d..00000000 --- a/scripts/expertise/expertise_bh_ass_act_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_ass_act_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_ass_act_3") - return diff --git a/scripts/expertise/expertise_bh_ass_cool_1.py b/scripts/expertise/expertise_bh_ass_cool_1.py deleted file mode 100644 index c9d4f6bf..00000000 --- a/scripts/expertise/expertise_bh_ass_cool_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_ass_cool_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_ass_cool_1") - return diff --git a/scripts/expertise/expertise_bh_ass_cool_2.py b/scripts/expertise/expertise_bh_ass_cool_2.py deleted file mode 100644 index 4532702b..00000000 --- a/scripts/expertise/expertise_bh_ass_cool_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_ass_cool_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_ass_cool_2") - return diff --git a/scripts/expertise/expertise_bh_ass_dam_1.py b/scripts/expertise/expertise_bh_ass_dam_1.py deleted file mode 100644 index 7d52ed2f..00000000 --- a/scripts/expertise/expertise_bh_ass_dam_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_ass_dam_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_ass_dam_1") - return diff --git a/scripts/expertise/expertise_bh_ass_dam_2.py b/scripts/expertise/expertise_bh_ass_dam_2.py deleted file mode 100644 index a6587bd4..00000000 --- a/scripts/expertise/expertise_bh_ass_dam_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_ass_dam_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_ass_dam_2") - return diff --git a/scripts/expertise/expertise_bh_ass_dam_3.py b/scripts/expertise/expertise_bh_ass_dam_3.py deleted file mode 100644 index 57e2d7c4..00000000 --- a/scripts/expertise/expertise_bh_ass_dam_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_ass_dam_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_ass_dam_3") - return diff --git a/scripts/expertise/expertise_bh_carbine_act_1.py b/scripts/expertise/expertise_bh_carbine_act_1.py deleted file mode 100644 index bb7e39f3..00000000 --- a/scripts/expertise/expertise_bh_carbine_act_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_carbine_act_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_carbine_act_1") - return diff --git a/scripts/expertise/expertise_bh_carbine_act_2.py b/scripts/expertise/expertise_bh_carbine_act_2.py deleted file mode 100644 index c2024eab..00000000 --- a/scripts/expertise/expertise_bh_carbine_act_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_carbine_act_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_carbine_act_2") - return diff --git a/scripts/expertise/expertise_bh_carbine_act_3.py b/scripts/expertise/expertise_bh_carbine_act_3.py deleted file mode 100644 index ddb0ac36..00000000 --- a/scripts/expertise/expertise_bh_carbine_act_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_carbine_act_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_carbine_act_3") - return diff --git a/scripts/expertise/expertise_bh_carbine_act_4.py b/scripts/expertise/expertise_bh_carbine_act_4.py deleted file mode 100644 index 30d33f95..00000000 --- a/scripts/expertise/expertise_bh_carbine_act_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_carbine_act_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_carbine_act_4") - return diff --git a/scripts/expertise/expertise_bh_carbine_crit_1.py b/scripts/expertise/expertise_bh_carbine_crit_1.py deleted file mode 100644 index 76d07aa9..00000000 --- a/scripts/expertise/expertise_bh_carbine_crit_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_carbine_crit_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_carbine_crit_1") - return diff --git a/scripts/expertise/expertise_bh_carbine_dam_1.py b/scripts/expertise/expertise_bh_carbine_dam_1.py deleted file mode 100644 index 101aaaa0..00000000 --- a/scripts/expertise/expertise_bh_carbine_dam_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_carbine_dam_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_carbine_dam_1") - return diff --git a/scripts/expertise/expertise_bh_carbine_dam_2.py b/scripts/expertise/expertise_bh_carbine_dam_2.py deleted file mode 100644 index 311fdf16..00000000 --- a/scripts/expertise/expertise_bh_carbine_dam_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_carbine_dam_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_carbine_dam_2") - return diff --git a/scripts/expertise/expertise_bh_constitution_1.py b/scripts/expertise/expertise_bh_constitution_1.py deleted file mode 100644 index 4311146c..00000000 --- a/scripts/expertise/expertise_bh_constitution_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_constitution_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_constitution_1") - return diff --git a/scripts/expertise/expertise_bh_constitution_2.py b/scripts/expertise/expertise_bh_constitution_2.py deleted file mode 100644 index b08059f1..00000000 --- a/scripts/expertise/expertise_bh_constitution_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_constitution_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_constitution_2") - return diff --git a/scripts/expertise/expertise_bh_constitution_3.py b/scripts/expertise/expertise_bh_constitution_3.py deleted file mode 100644 index 3cd7edf6..00000000 --- a/scripts/expertise/expertise_bh_constitution_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_constitution_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_constitution_3") - return diff --git a/scripts/expertise/expertise_bh_constitution_4.py b/scripts/expertise/expertise_bh_constitution_4.py deleted file mode 100644 index 662706cb..00000000 --- a/scripts/expertise/expertise_bh_constitution_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_constitution_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_constitution_4") - return diff --git a/scripts/expertise/expertise_bh_deflection_1.py b/scripts/expertise/expertise_bh_deflection_1.py deleted file mode 100644 index 8ac3bf4c..00000000 --- a/scripts/expertise/expertise_bh_deflection_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_deflection_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_deflection_1") - return diff --git a/scripts/expertise/expertise_bh_deflection_2.py b/scripts/expertise/expertise_bh_deflection_2.py deleted file mode 100644 index 35b2c47e..00000000 --- a/scripts/expertise/expertise_bh_deflection_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_deflection_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_deflection_2") - return diff --git a/scripts/expertise/expertise_bh_deflection_3.py b/scripts/expertise/expertise_bh_deflection_3.py deleted file mode 100644 index d1cd6d2d..00000000 --- a/scripts/expertise/expertise_bh_deflection_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_deflection_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_deflection_3") - return diff --git a/scripts/expertise/expertise_bh_deflection_4.py b/scripts/expertise/expertise_bh_deflection_4.py deleted file mode 100644 index fa5ae83f..00000000 --- a/scripts/expertise/expertise_bh_deflection_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_deflection_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_deflection_4") - return diff --git a/scripts/expertise/expertise_bh_innate_1.py b/scripts/expertise/expertise_bh_innate_1.py deleted file mode 100644 index be7b9b38..00000000 --- a/scripts/expertise/expertise_bh_innate_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_innate_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_innate_1") - return diff --git a/scripts/expertise/expertise_bh_man_crit_1.py b/scripts/expertise/expertise_bh_man_crit_1.py deleted file mode 100644 index 39c35cea..00000000 --- a/scripts/expertise/expertise_bh_man_crit_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_man_crit_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_man_crit_1") - return diff --git a/scripts/expertise/expertise_bh_man_crit_2.py b/scripts/expertise/expertise_bh_man_crit_2.py deleted file mode 100644 index f59f750a..00000000 --- a/scripts/expertise/expertise_bh_man_crit_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_man_crit_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_man_crit_2") - return diff --git a/scripts/expertise/expertise_bh_man_crit_3.py b/scripts/expertise/expertise_bh_man_crit_3.py deleted file mode 100644 index cb9d8b76..00000000 --- a/scripts/expertise/expertise_bh_man_crit_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_man_crit_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_man_crit_3") - return diff --git a/scripts/expertise/expertise_bh_precision_1.py b/scripts/expertise/expertise_bh_precision_1.py deleted file mode 100644 index f3813dc5..00000000 --- a/scripts/expertise/expertise_bh_precision_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_precision_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_precision_1") - return diff --git a/scripts/expertise/expertise_bh_precision_2.py b/scripts/expertise/expertise_bh_precision_2.py deleted file mode 100644 index 6207ca53..00000000 --- a/scripts/expertise/expertise_bh_precision_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_precision_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_precision_2") - return diff --git a/scripts/expertise/expertise_bh_precision_3.py b/scripts/expertise/expertise_bh_precision_3.py deleted file mode 100644 index d872a9f0..00000000 --- a/scripts/expertise/expertise_bh_precision_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_precision_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_precision_3") - return diff --git a/scripts/expertise/expertise_bh_precision_4.py b/scripts/expertise/expertise_bh_precision_4.py deleted file mode 100644 index c23f6372..00000000 --- a/scripts/expertise/expertise_bh_precision_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_precision_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_precision_4") - return diff --git a/scripts/expertise/expertise_bh_rifle_act_1.py b/scripts/expertise/expertise_bh_rifle_act_1.py deleted file mode 100644 index 5ab3b5b8..00000000 --- a/scripts/expertise/expertise_bh_rifle_act_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_rifle_act_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_rifle_act_1") - return diff --git a/scripts/expertise/expertise_bh_rifle_act_2.py b/scripts/expertise/expertise_bh_rifle_act_2.py deleted file mode 100644 index 1f94991c..00000000 --- a/scripts/expertise/expertise_bh_rifle_act_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_rifle_act_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_rifle_act_2") - return diff --git a/scripts/expertise/expertise_bh_rifle_act_3.py b/scripts/expertise/expertise_bh_rifle_act_3.py deleted file mode 100644 index 21f5a7b6..00000000 --- a/scripts/expertise/expertise_bh_rifle_act_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_rifle_act_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_rifle_act_3") - return diff --git a/scripts/expertise/expertise_bh_rifle_act_4.py b/scripts/expertise/expertise_bh_rifle_act_4.py deleted file mode 100644 index cb32b474..00000000 --- a/scripts/expertise/expertise_bh_rifle_act_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_rifle_act_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_rifle_act_4") - return diff --git a/scripts/expertise/expertise_bh_rifle_dam_1.py b/scripts/expertise/expertise_bh_rifle_dam_1.py deleted file mode 100644 index debb9b31..00000000 --- a/scripts/expertise/expertise_bh_rifle_dam_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_rifle_dam_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_rifle_dam_1") - return diff --git a/scripts/expertise/expertise_bh_rifle_dam_2.py b/scripts/expertise/expertise_bh_rifle_dam_2.py deleted file mode 100644 index 29f37539..00000000 --- a/scripts/expertise/expertise_bh_rifle_dam_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_rifle_dam_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_rifle_dam_2") - return diff --git a/scripts/expertise/expertise_bh_stamina_1.py b/scripts/expertise/expertise_bh_stamina_1.py deleted file mode 100644 index 77903769..00000000 --- a/scripts/expertise/expertise_bh_stamina_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_stamina_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_stamina_1") - return diff --git a/scripts/expertise/expertise_bh_stamina_2.py b/scripts/expertise/expertise_bh_stamina_2.py deleted file mode 100644 index 0deb8459..00000000 --- a/scripts/expertise/expertise_bh_stamina_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_stamina_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_stamina_2") - return diff --git a/scripts/expertise/expertise_bh_stamina_3.py b/scripts/expertise/expertise_bh_stamina_3.py deleted file mode 100644 index 3ec0af04..00000000 --- a/scripts/expertise/expertise_bh_stamina_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_stamina_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_stamina_3") - return diff --git a/scripts/expertise/expertise_bh_stamina_4.py b/scripts/expertise/expertise_bh_stamina_4.py deleted file mode 100644 index fd17d13e..00000000 --- a/scripts/expertise/expertise_bh_stamina_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_stamina_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_stamina_4") - return diff --git a/scripts/expertise/expertise_bh_survival_instinct_1.py b/scripts/expertise/expertise_bh_survival_instinct_1.py deleted file mode 100644 index c361bf9b..00000000 --- a/scripts/expertise/expertise_bh_survival_instinct_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_survival_instinct_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_survival_instinct_1") - return diff --git a/scripts/expertise/expertise_bh_survival_instinct_2.py b/scripts/expertise/expertise_bh_survival_instinct_2.py deleted file mode 100644 index 6302e5c0..00000000 --- a/scripts/expertise/expertise_bh_survival_instinct_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_survival_instinct_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_survival_instinct_2") - return diff --git a/scripts/expertise/expertise_bh_trap_dam_1.py b/scripts/expertise/expertise_bh_trap_dam_1.py deleted file mode 100644 index c3ec4563..00000000 --- a/scripts/expertise/expertise_bh_trap_dam_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_trap_dam_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_trap_dam_1") - return diff --git a/scripts/expertise/expertise_bh_trap_dam_2.py b/scripts/expertise/expertise_bh_trap_dam_2.py deleted file mode 100644 index 7e4066c6..00000000 --- a/scripts/expertise/expertise_bh_trap_dam_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_trap_dam_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_trap_dam_2") - return diff --git a/scripts/expertise/expertise_bh_trap_dam_3.py b/scripts/expertise/expertise_bh_trap_dam_3.py deleted file mode 100644 index 27207b90..00000000 --- a/scripts/expertise/expertise_bh_trap_dam_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_trap_dam_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_trap_dam_3") - return diff --git a/scripts/expertise/expertise_bh_trap_dam_4.py b/scripts/expertise/expertise_bh_trap_dam_4.py deleted file mode 100644 index 7caad822..00000000 --- a/scripts/expertise/expertise_bh_trap_dam_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_trap_dam_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_trap_dam_4") - return diff --git a/scripts/expertise/expertise_bh_trap_duration_1.py b/scripts/expertise/expertise_bh_trap_duration_1.py deleted file mode 100644 index 77c4e203..00000000 --- a/scripts/expertise/expertise_bh_trap_duration_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_trap_duration_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_trap_duration_1") - return diff --git a/scripts/expertise/expertise_bh_trap_duration_2.py b/scripts/expertise/expertise_bh_trap_duration_2.py deleted file mode 100644 index 682f7452..00000000 --- a/scripts/expertise/expertise_bh_trap_duration_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_trap_duration_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_trap_duration_2") - return diff --git a/scripts/expertise/expertise_bh_trap_duration_3.py b/scripts/expertise/expertise_bh_trap_duration_3.py deleted file mode 100644 index d08b714c..00000000 --- a/scripts/expertise/expertise_bh_trap_duration_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_trap_duration_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_trap_duration_3") - return diff --git a/scripts/expertise/expertise_bh_trap_rng_1.py b/scripts/expertise/expertise_bh_trap_rng_1.py deleted file mode 100644 index 74ce4e28..00000000 --- a/scripts/expertise/expertise_bh_trap_rng_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_trap_rng_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_trap_rng_1") - return diff --git a/scripts/expertise/expertise_bh_trap_rng_2.py b/scripts/expertise/expertise_bh_trap_rng_2.py deleted file mode 100644 index c3508e35..00000000 --- a/scripts/expertise/expertise_bh_trap_rng_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bh_trap_rng_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bh_trap_rng_2") - return diff --git a/scripts/expertise/expertise_bm_abilility_aquisition_mod_1.py b/scripts/expertise/expertise_bm_abilility_aquisition_mod_1.py deleted file mode 100644 index ad3b81a0..00000000 --- a/scripts/expertise/expertise_bm_abilility_aquisition_mod_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_abilility_aquisition_mod_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_abilility_aquisition_mod_1") - return diff --git a/scripts/expertise/expertise_bm_add_first_pet_bar_1.py b/scripts/expertise/expertise_bm_add_first_pet_bar_1.py deleted file mode 100644 index e0653096..00000000 --- a/scripts/expertise/expertise_bm_add_first_pet_bar_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_add_first_pet_bar_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_add_first_pet_bar_1") - return diff --git a/scripts/expertise/expertise_bm_add_second_pet_bar_1.py b/scripts/expertise/expertise_bm_add_second_pet_bar_1.py deleted file mode 100644 index 374dae76..00000000 --- a/scripts/expertise/expertise_bm_add_second_pet_bar_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_add_second_pet_bar_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_add_second_pet_bar_1") - return diff --git a/scripts/expertise/expertise_bm_add_third_pet_bar_1.py b/scripts/expertise/expertise_bm_add_third_pet_bar_1.py deleted file mode 100644 index 600df6ad..00000000 --- a/scripts/expertise/expertise_bm_add_third_pet_bar_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_add_third_pet_bar_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_add_third_pet_bar_1") - return diff --git a/scripts/expertise/expertise_bm_beast_mastery_1.py b/scripts/expertise/expertise_bm_beast_mastery_1.py deleted file mode 100644 index b4720a91..00000000 --- a/scripts/expertise/expertise_bm_beast_mastery_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_beast_mastery_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_beast_mastery_1") - return diff --git a/scripts/expertise/expertise_bm_dexterity_training_1.py b/scripts/expertise/expertise_bm_dexterity_training_1.py deleted file mode 100644 index 50a560d4..00000000 --- a/scripts/expertise/expertise_bm_dexterity_training_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_dexterity_training_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_dexterity_training_1") - return diff --git a/scripts/expertise/expertise_bm_dexterity_training_2.py b/scripts/expertise/expertise_bm_dexterity_training_2.py deleted file mode 100644 index ab2527c4..00000000 --- a/scripts/expertise/expertise_bm_dexterity_training_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_dexterity_training_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_dexterity_training_2") - return diff --git a/scripts/expertise/expertise_bm_dna_harvesting_1.py b/scripts/expertise/expertise_bm_dna_harvesting_1.py deleted file mode 100644 index 3f9e6c4c..00000000 --- a/scripts/expertise/expertise_bm_dna_harvesting_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_dna_harvesting_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_dna_harvesting_1") - return diff --git a/scripts/expertise/expertise_bm_dna_harvesting_2.py b/scripts/expertise/expertise_bm_dna_harvesting_2.py deleted file mode 100644 index 0b5cc4fa..00000000 --- a/scripts/expertise/expertise_bm_dna_harvesting_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_dna_harvesting_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_dna_harvesting_2") - return diff --git a/scripts/expertise/expertise_bm_dna_harvesting_3.py b/scripts/expertise/expertise_bm_dna_harvesting_3.py deleted file mode 100644 index 2f6fcdfa..00000000 --- a/scripts/expertise/expertise_bm_dna_harvesting_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_dna_harvesting_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_dna_harvesting_3") - return diff --git a/scripts/expertise/expertise_bm_erratic_genius_1.py b/scripts/expertise/expertise_bm_erratic_genius_1.py deleted file mode 100644 index d7ed15a7..00000000 --- a/scripts/expertise/expertise_bm_erratic_genius_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_erratic_genius_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_erratic_genius_1") - return diff --git a/scripts/expertise/expertise_bm_erratic_genius_2.py b/scripts/expertise/expertise_bm_erratic_genius_2.py deleted file mode 100644 index 6e387fb5..00000000 --- a/scripts/expertise/expertise_bm_erratic_genius_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_erratic_genius_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_erratic_genius_2") - return diff --git a/scripts/expertise/expertise_bm_erratic_genius_3.py b/scripts/expertise/expertise_bm_erratic_genius_3.py deleted file mode 100644 index 0ee3e98e..00000000 --- a/scripts/expertise/expertise_bm_erratic_genius_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_erratic_genius_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_erratic_genius_3") - return diff --git a/scripts/expertise/expertise_bm_evasion_1.py b/scripts/expertise/expertise_bm_evasion_1.py deleted file mode 100644 index aa280e26..00000000 --- a/scripts/expertise/expertise_bm_evasion_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_evasion_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_evasion_1") - return diff --git a/scripts/expertise/expertise_bm_evasion_2.py b/scripts/expertise/expertise_bm_evasion_2.py deleted file mode 100644 index 2b7ceac3..00000000 --- a/scripts/expertise/expertise_bm_evasion_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_evasion_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_evasion_2") - return diff --git a/scripts/expertise/expertise_bm_evasion_3.py b/scripts/expertise/expertise_bm_evasion_3.py deleted file mode 100644 index 6aab14d4..00000000 --- a/scripts/expertise/expertise_bm_evasion_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_evasion_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_evasion_3") - return diff --git a/scripts/expertise/expertise_bm_exceptional_nutrition_1.py b/scripts/expertise/expertise_bm_exceptional_nutrition_1.py deleted file mode 100644 index e65b9f1b..00000000 --- a/scripts/expertise/expertise_bm_exceptional_nutrition_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_exceptional_nutrition_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_exceptional_nutrition_1") - return diff --git a/scripts/expertise/expertise_bm_exceptional_nutrition_2.py b/scripts/expertise/expertise_bm_exceptional_nutrition_2.py deleted file mode 100644 index 68aa2189..00000000 --- a/scripts/expertise/expertise_bm_exceptional_nutrition_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_exceptional_nutrition_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_exceptional_nutrition_2") - return diff --git a/scripts/expertise/expertise_bm_fortitude_1.py b/scripts/expertise/expertise_bm_fortitude_1.py deleted file mode 100644 index d1f38de7..00000000 --- a/scripts/expertise/expertise_bm_fortitude_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_fortitude_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_fortitude_1") - return diff --git a/scripts/expertise/expertise_bm_fortitude_2.py b/scripts/expertise/expertise_bm_fortitude_2.py deleted file mode 100644 index a2a6f76e..00000000 --- a/scripts/expertise/expertise_bm_fortitude_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_fortitude_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_fortitude_2") - return diff --git a/scripts/expertise/expertise_bm_fortitude_3.py b/scripts/expertise/expertise_bm_fortitude_3.py deleted file mode 100644 index 899a6288..00000000 --- a/scripts/expertise/expertise_bm_fortitude_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_fortitude_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_fortitude_3") - return diff --git a/scripts/expertise/expertise_bm_genetic_engineering_1.py b/scripts/expertise/expertise_bm_genetic_engineering_1.py deleted file mode 100644 index e4efece4..00000000 --- a/scripts/expertise/expertise_bm_genetic_engineering_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_genetic_engineering_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_genetic_engineering_1") - return diff --git a/scripts/expertise/expertise_bm_genetic_engineering_2.py b/scripts/expertise/expertise_bm_genetic_engineering_2.py deleted file mode 100644 index 92cded50..00000000 --- a/scripts/expertise/expertise_bm_genetic_engineering_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_genetic_engineering_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_genetic_engineering_2") - return diff --git a/scripts/expertise/expertise_bm_genetic_engineering_3.py b/scripts/expertise/expertise_bm_genetic_engineering_3.py deleted file mode 100644 index a9521b48..00000000 --- a/scripts/expertise/expertise_bm_genetic_engineering_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_genetic_engineering_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_genetic_engineering_3") - return diff --git a/scripts/expertise/expertise_bm_genetic_engineering_4.py b/scripts/expertise/expertise_bm_genetic_engineering_4.py deleted file mode 100644 index 22c76382..00000000 --- a/scripts/expertise/expertise_bm_genetic_engineering_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_genetic_engineering_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_genetic_engineering_4") - return diff --git a/scripts/expertise/expertise_bm_improved_healing_1.py b/scripts/expertise/expertise_bm_improved_healing_1.py deleted file mode 100644 index 9ccb8bbf..00000000 --- a/scripts/expertise/expertise_bm_improved_healing_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_improved_healing_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_improved_healing_1") - return diff --git a/scripts/expertise/expertise_bm_improved_healing_2.py b/scripts/expertise/expertise_bm_improved_healing_2.py deleted file mode 100644 index 3168a225..00000000 --- a/scripts/expertise/expertise_bm_improved_healing_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_improved_healing_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_improved_healing_2") - return diff --git a/scripts/expertise/expertise_bm_improved_healing_3.py b/scripts/expertise/expertise_bm_improved_healing_3.py deleted file mode 100644 index c8cd2102..00000000 --- a/scripts/expertise/expertise_bm_improved_healing_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_improved_healing_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_improved_healing_3") - return diff --git a/scripts/expertise/expertise_bm_incubation_mod_1.py b/scripts/expertise/expertise_bm_incubation_mod_1.py deleted file mode 100644 index b99b1518..00000000 --- a/scripts/expertise/expertise_bm_incubation_mod_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_incubation_mod_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_incubation_mod_1") - return diff --git a/scripts/expertise/expertise_bm_incubation_mod_2.py b/scripts/expertise/expertise_bm_incubation_mod_2.py deleted file mode 100644 index 167f2676..00000000 --- a/scripts/expertise/expertise_bm_incubation_mod_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_incubation_mod_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_incubation_mod_2") - return diff --git a/scripts/expertise/expertise_bm_incubation_mod_3.py b/scripts/expertise/expertise_bm_incubation_mod_3.py deleted file mode 100644 index e90a66ee..00000000 --- a/scripts/expertise/expertise_bm_incubation_mod_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_incubation_mod_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_incubation_mod_3") - return diff --git a/scripts/expertise/expertise_bm_loyalty_mod_1.py b/scripts/expertise/expertise_bm_loyalty_mod_1.py deleted file mode 100644 index e697ccab..00000000 --- a/scripts/expertise/expertise_bm_loyalty_mod_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_loyalty_mod_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_loyalty_mod_1") - return diff --git a/scripts/expertise/expertise_bm_loyalty_mod_2.py b/scripts/expertise/expertise_bm_loyalty_mod_2.py deleted file mode 100644 index 94e893a7..00000000 --- a/scripts/expertise/expertise_bm_loyalty_mod_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_loyalty_mod_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_loyalty_mod_2") - return diff --git a/scripts/expertise/expertise_bm_loyalty_mod_3.py b/scripts/expertise/expertise_bm_loyalty_mod_3.py deleted file mode 100644 index a70c5c6b..00000000 --- a/scripts/expertise/expertise_bm_loyalty_mod_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_loyalty_mod_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_loyalty_mod_3") - return diff --git a/scripts/expertise/expertise_bm_metagame_mod_1.py b/scripts/expertise/expertise_bm_metagame_mod_1.py deleted file mode 100644 index 310506d4..00000000 --- a/scripts/expertise/expertise_bm_metagame_mod_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_metagame_mod_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_metagame_mod_1") - return diff --git a/scripts/expertise/expertise_bm_metagame_mod_2.py b/scripts/expertise/expertise_bm_metagame_mod_2.py deleted file mode 100644 index e1138649..00000000 --- a/scripts/expertise/expertise_bm_metagame_mod_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_metagame_mod_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_metagame_mod_2") - return diff --git a/scripts/expertise/expertise_bm_metagame_mod_3.py b/scripts/expertise/expertise_bm_metagame_mod_3.py deleted file mode 100644 index 7b6e0112..00000000 --- a/scripts/expertise/expertise_bm_metagame_mod_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_metagame_mod_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_metagame_mod_3") - return diff --git a/scripts/expertise/expertise_bm_metagame_mod_4.py b/scripts/expertise/expertise_bm_metagame_mod_4.py deleted file mode 100644 index ffb8090a..00000000 --- a/scripts/expertise/expertise_bm_metagame_mod_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_metagame_mod_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_metagame_mod_4") - return diff --git a/scripts/expertise/expertise_bm_pet_dodge_1.py b/scripts/expertise/expertise_bm_pet_dodge_1.py deleted file mode 100644 index fc36117c..00000000 --- a/scripts/expertise/expertise_bm_pet_dodge_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_pet_dodge_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_pet_dodge_1") - return diff --git a/scripts/expertise/expertise_bm_pet_dodge_2.py b/scripts/expertise/expertise_bm_pet_dodge_2.py deleted file mode 100644 index 2341888c..00000000 --- a/scripts/expertise/expertise_bm_pet_dodge_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_pet_dodge_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_pet_dodge_2") - return diff --git a/scripts/expertise/expertise_bm_pet_dodge_3.py b/scripts/expertise/expertise_bm_pet_dodge_3.py deleted file mode 100644 index c9a97d17..00000000 --- a/scripts/expertise/expertise_bm_pet_dodge_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_pet_dodge_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_pet_dodge_3") - return diff --git a/scripts/expertise/expertise_bm_pet_recovery_1.py b/scripts/expertise/expertise_bm_pet_recovery_1.py deleted file mode 100644 index 1a956cf2..00000000 --- a/scripts/expertise/expertise_bm_pet_recovery_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_pet_recovery_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_pet_recovery_1") - return diff --git a/scripts/expertise/expertise_bm_pet_recovery_2.py b/scripts/expertise/expertise_bm_pet_recovery_2.py deleted file mode 100644 index 41c09b07..00000000 --- a/scripts/expertise/expertise_bm_pet_recovery_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_pet_recovery_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_pet_recovery_2") - return diff --git a/scripts/expertise/expertise_bm_pet_recovery_3.py b/scripts/expertise/expertise_bm_pet_recovery_3.py deleted file mode 100644 index 36413c3c..00000000 --- a/scripts/expertise/expertise_bm_pet_recovery_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_pet_recovery_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_pet_recovery_3") - return diff --git a/scripts/expertise/expertise_bm_savagery_1.py b/scripts/expertise/expertise_bm_savagery_1.py deleted file mode 100644 index 27f21562..00000000 --- a/scripts/expertise/expertise_bm_savagery_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_savagery_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_savagery_1") - return diff --git a/scripts/expertise/expertise_bm_savagery_2.py b/scripts/expertise/expertise_bm_savagery_2.py deleted file mode 100644 index 09c606de..00000000 --- a/scripts/expertise/expertise_bm_savagery_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_savagery_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_savagery_2") - return diff --git a/scripts/expertise/expertise_bm_savagery_3.py b/scripts/expertise/expertise_bm_savagery_3.py deleted file mode 100644 index 775c9484..00000000 --- a/scripts/expertise/expertise_bm_savagery_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_savagery_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_savagery_3") - return diff --git a/scripts/expertise/expertise_bm_specialized_supplements_1.py b/scripts/expertise/expertise_bm_specialized_supplements_1.py deleted file mode 100644 index 0ea96000..00000000 --- a/scripts/expertise/expertise_bm_specialized_supplements_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_bm_specialized_supplements_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_bm_specialized_supplements_1") - return diff --git a/scripts/expertise/expertise_bm_train_mount_1.py b/scripts/expertise/expertise_bm_train_mount_1.py deleted file mode 100644 index 0199dd5c..00000000 --- a/scripts/expertise/expertise_bm_train_mount_1.py +++ /dev/null @@ -1,48 +0,0 @@ -import sys - -def addExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.addSkill('expertise_bm_train_mount_1') - - actor.addSkillMod('expertise_bm_train_mount', 100) - - addAbilities(core, actor, player) - - return - -def removeExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.removeSkill('expertise_bm_train_mount_1') - - actor.removeSkillMod('expertise_bm_train_mount', 100) - - removeAbilities(core, actor, player) - - return - -# this checks what abilities the player gets by level, need to also call this on level-up -def addAbilities(core, actor, player): - - - return - -def removeAbilities(core, actor, player): - - - return diff --git a/scripts/expertise/expertise_co_angled_shrapnel_1.py b/scripts/expertise/expertise_co_angled_shrapnel_1.py deleted file mode 100644 index c2e3f8ce..00000000 --- a/scripts/expertise/expertise_co_angled_shrapnel_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_angled_shrapnel_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_angled_shrapnel_1") - return diff --git a/scripts/expertise/expertise_co_angled_shrapnel_2.py b/scripts/expertise/expertise_co_angled_shrapnel_2.py deleted file mode 100644 index 48f5c250..00000000 --- a/scripts/expertise/expertise_co_angled_shrapnel_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_angled_shrapnel_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_angled_shrapnel_2") - return diff --git a/scripts/expertise/expertise_co_blast_radius_1.py b/scripts/expertise/expertise_co_blast_radius_1.py deleted file mode 100644 index 1dab9e96..00000000 --- a/scripts/expertise/expertise_co_blast_radius_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_blast_radius_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_blast_radius_1") - return diff --git a/scripts/expertise/expertise_co_blast_radius_2.py b/scripts/expertise/expertise_co_blast_radius_2.py deleted file mode 100644 index 3cc739c8..00000000 --- a/scripts/expertise/expertise_co_blast_radius_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_blast_radius_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_blast_radius_2") - return diff --git a/scripts/expertise/expertise_co_blast_radius_3.py b/scripts/expertise/expertise_co_blast_radius_3.py deleted file mode 100644 index d87f0a4b..00000000 --- a/scripts/expertise/expertise_co_blast_radius_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_blast_radius_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_blast_radius_3") - return diff --git a/scripts/expertise/expertise_co_blast_radius_4.py b/scripts/expertise/expertise_co_blast_radius_4.py deleted file mode 100644 index 99d44c0c..00000000 --- a/scripts/expertise/expertise_co_blast_radius_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_blast_radius_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_blast_radius_4") - return diff --git a/scripts/expertise/expertise_co_blast_resistance_1.py b/scripts/expertise/expertise_co_blast_resistance_1.py deleted file mode 100644 index d4b76bda..00000000 --- a/scripts/expertise/expertise_co_blast_resistance_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_blast_resistance_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_blast_resistance_1") - return diff --git a/scripts/expertise/expertise_co_blast_resistance_2.py b/scripts/expertise/expertise_co_blast_resistance_2.py deleted file mode 100644 index 6596c815..00000000 --- a/scripts/expertise/expertise_co_blast_resistance_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_blast_resistance_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_blast_resistance_2") - return diff --git a/scripts/expertise/expertise_co_blast_resistance_3.py b/scripts/expertise/expertise_co_blast_resistance_3.py deleted file mode 100644 index 8a5b7bc9..00000000 --- a/scripts/expertise/expertise_co_blast_resistance_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_blast_resistance_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_blast_resistance_3") - return diff --git a/scripts/expertise/expertise_co_blast_resistance_4.py b/scripts/expertise/expertise_co_blast_resistance_4.py deleted file mode 100644 index c046b643..00000000 --- a/scripts/expertise/expertise_co_blast_resistance_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_blast_resistance_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_blast_resistance_4") - return diff --git a/scripts/expertise/expertise_co_blow_em_away_1.py b/scripts/expertise/expertise_co_blow_em_away_1.py deleted file mode 100644 index 3880d17d..00000000 --- a/scripts/expertise/expertise_co_blow_em_away_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_blow_em_away_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_blow_em_away_1") - return diff --git a/scripts/expertise/expertise_co_blow_em_away_2.py b/scripts/expertise/expertise_co_blow_em_away_2.py deleted file mode 100644 index 11ca839c..00000000 --- a/scripts/expertise/expertise_co_blow_em_away_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_blow_em_away_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_blow_em_away_2") - return diff --git a/scripts/expertise/expertise_co_burst_fire_1.py b/scripts/expertise/expertise_co_burst_fire_1.py deleted file mode 100644 index 0522e875..00000000 --- a/scripts/expertise/expertise_co_burst_fire_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_burst_fire_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_burst_fire_1") - return diff --git a/scripts/expertise/expertise_co_burst_fire_2.py b/scripts/expertise/expertise_co_burst_fire_2.py deleted file mode 100644 index 952ff386..00000000 --- a/scripts/expertise/expertise_co_burst_fire_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_burst_fire_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_burst_fire_2") - return diff --git a/scripts/expertise/expertise_co_deflective_armor_1.py b/scripts/expertise/expertise_co_deflective_armor_1.py deleted file mode 100644 index 52b523c5..00000000 --- a/scripts/expertise/expertise_co_deflective_armor_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_deflective_armor_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_deflective_armor_1") - return diff --git a/scripts/expertise/expertise_co_deflective_armor_2.py b/scripts/expertise/expertise_co_deflective_armor_2.py deleted file mode 100644 index 2ece0722..00000000 --- a/scripts/expertise/expertise_co_deflective_armor_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_deflective_armor_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_deflective_armor_2") - return diff --git a/scripts/expertise/expertise_co_deflective_armor_3.py b/scripts/expertise/expertise_co_deflective_armor_3.py deleted file mode 100644 index 245175f4..00000000 --- a/scripts/expertise/expertise_co_deflective_armor_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_deflective_armor_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_deflective_armor_3") - return diff --git a/scripts/expertise/expertise_co_deflective_armor_4.py b/scripts/expertise/expertise_co_deflective_armor_4.py deleted file mode 100644 index e3e5d15f..00000000 --- a/scripts/expertise/expertise_co_deflective_armor_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_deflective_armor_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_deflective_armor_4") - return diff --git a/scripts/expertise/expertise_co_diagnostic_armor_1.py b/scripts/expertise/expertise_co_diagnostic_armor_1.py deleted file mode 100644 index 974a3234..00000000 --- a/scripts/expertise/expertise_co_diagnostic_armor_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_diagnostic_armor_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_diagnostic_armor_1") - return diff --git a/scripts/expertise/expertise_co_enhanced_constitution_1.py b/scripts/expertise/expertise_co_enhanced_constitution_1.py deleted file mode 100644 index f2320188..00000000 --- a/scripts/expertise/expertise_co_enhanced_constitution_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_enhanced_constitution_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_enhanced_constitution_1") - return diff --git a/scripts/expertise/expertise_co_enhanced_constitution_2.py b/scripts/expertise/expertise_co_enhanced_constitution_2.py deleted file mode 100644 index 4afc434d..00000000 --- a/scripts/expertise/expertise_co_enhanced_constitution_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_enhanced_constitution_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_enhanced_constitution_2") - return diff --git a/scripts/expertise/expertise_co_enhanced_fuel_cans_1.py b/scripts/expertise/expertise_co_enhanced_fuel_cans_1.py deleted file mode 100644 index 58cfa70c..00000000 --- a/scripts/expertise/expertise_co_enhanced_fuel_cans_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_enhanced_fuel_cans_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_enhanced_fuel_cans_1") - return diff --git a/scripts/expertise/expertise_co_enhanced_fuel_cans_2.py b/scripts/expertise/expertise_co_enhanced_fuel_cans_2.py deleted file mode 100644 index f4449372..00000000 --- a/scripts/expertise/expertise_co_enhanced_fuel_cans_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_enhanced_fuel_cans_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_enhanced_fuel_cans_2") - return diff --git a/scripts/expertise/expertise_co_enhanced_fuel_cans_3.py b/scripts/expertise/expertise_co_enhanced_fuel_cans_3.py deleted file mode 100644 index 9b4f7cd1..00000000 --- a/scripts/expertise/expertise_co_enhanced_fuel_cans_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_enhanced_fuel_cans_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_enhanced_fuel_cans_3") - return diff --git a/scripts/expertise/expertise_co_enhanced_fuel_cans_4.py b/scripts/expertise/expertise_co_enhanced_fuel_cans_4.py deleted file mode 100644 index ab78cd77..00000000 --- a/scripts/expertise/expertise_co_enhanced_fuel_cans_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_enhanced_fuel_cans_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_enhanced_fuel_cans_4") - return diff --git a/scripts/expertise/expertise_co_enhanced_precision_1.py b/scripts/expertise/expertise_co_enhanced_precision_1.py deleted file mode 100644 index 250e6d10..00000000 --- a/scripts/expertise/expertise_co_enhanced_precision_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_enhanced_precision_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_enhanced_precision_1") - return diff --git a/scripts/expertise/expertise_co_enhanced_precision_2.py b/scripts/expertise/expertise_co_enhanced_precision_2.py deleted file mode 100644 index 7d965d8c..00000000 --- a/scripts/expertise/expertise_co_enhanced_precision_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_enhanced_precision_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_enhanced_precision_2") - return diff --git a/scripts/expertise/expertise_co_enhanced_stamina_1.py b/scripts/expertise/expertise_co_enhanced_stamina_1.py deleted file mode 100644 index cbdb7744..00000000 --- a/scripts/expertise/expertise_co_enhanced_stamina_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_enhanced_stamina_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_enhanced_stamina_1") - return diff --git a/scripts/expertise/expertise_co_enhanced_stamina_2.py b/scripts/expertise/expertise_co_enhanced_stamina_2.py deleted file mode 100644 index 5afc8f93..00000000 --- a/scripts/expertise/expertise_co_enhanced_stamina_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_enhanced_stamina_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_enhanced_stamina_2") - return diff --git a/scripts/expertise/expertise_co_flashbang_1.py b/scripts/expertise/expertise_co_flashbang_1.py deleted file mode 100644 index 74b642c1..00000000 --- a/scripts/expertise/expertise_co_flashbang_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_flashbang_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_flashbang_1") - return diff --git a/scripts/expertise/expertise_co_flashbang_2.py b/scripts/expertise/expertise_co_flashbang_2.py deleted file mode 100644 index bad49ff3..00000000 --- a/scripts/expertise/expertise_co_flashbang_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_flashbang_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_flashbang_2") - return diff --git a/scripts/expertise/expertise_co_general_enhanced_luck_1.py b/scripts/expertise/expertise_co_general_enhanced_luck_1.py deleted file mode 100644 index 8f303625..00000000 --- a/scripts/expertise/expertise_co_general_enhanced_luck_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_general_enhanced_luck_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_general_enhanced_luck_1") - return diff --git a/scripts/expertise/expertise_co_general_enhanced_luck_2.py b/scripts/expertise/expertise_co_general_enhanced_luck_2.py deleted file mode 100644 index 598a9a1d..00000000 --- a/scripts/expertise/expertise_co_general_enhanced_luck_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_general_enhanced_luck_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_general_enhanced_luck_2") - return diff --git a/scripts/expertise/expertise_co_heavy_ammunition_1.py b/scripts/expertise/expertise_co_heavy_ammunition_1.py deleted file mode 100644 index 90f370b1..00000000 --- a/scripts/expertise/expertise_co_heavy_ammunition_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_heavy_ammunition_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_heavy_ammunition_1") - return diff --git a/scripts/expertise/expertise_co_heavy_ammunition_2.py b/scripts/expertise/expertise_co_heavy_ammunition_2.py deleted file mode 100644 index cd20a2e4..00000000 --- a/scripts/expertise/expertise_co_heavy_ammunition_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_heavy_ammunition_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_heavy_ammunition_2") - return diff --git a/scripts/expertise/expertise_co_heavy_ammunition_3.py b/scripts/expertise/expertise_co_heavy_ammunition_3.py deleted file mode 100644 index 07492f2a..00000000 --- a/scripts/expertise/expertise_co_heavy_ammunition_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_heavy_ammunition_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_heavy_ammunition_3") - return diff --git a/scripts/expertise/expertise_co_heavy_ammunition_4.py b/scripts/expertise/expertise_co_heavy_ammunition_4.py deleted file mode 100644 index 5bbd826a..00000000 --- a/scripts/expertise/expertise_co_heavy_ammunition_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_heavy_ammunition_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_heavy_ammunition_4") - return diff --git a/scripts/expertise/expertise_co_hose_down_1.py b/scripts/expertise/expertise_co_hose_down_1.py deleted file mode 100644 index 466d938a..00000000 --- a/scripts/expertise/expertise_co_hose_down_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_hose_down_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_hose_down_1") - return diff --git a/scripts/expertise/expertise_co_hose_down_2.py b/scripts/expertise/expertise_co_hose_down_2.py deleted file mode 100644 index 5b631478..00000000 --- a/scripts/expertise/expertise_co_hose_down_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_hose_down_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_hose_down_2") - return diff --git a/scripts/expertise/expertise_co_imp_position_secured_1.py b/scripts/expertise/expertise_co_imp_position_secured_1.py deleted file mode 100644 index 26286412..00000000 --- a/scripts/expertise/expertise_co_imp_position_secured_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_imp_position_secured_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_imp_position_secured_1") - return diff --git a/scripts/expertise/expertise_co_imp_position_secured_2.py b/scripts/expertise/expertise_co_imp_position_secured_2.py deleted file mode 100644 index 2a134cd0..00000000 --- a/scripts/expertise/expertise_co_imp_position_secured_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_imp_position_secured_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_imp_position_secured_2") - return diff --git a/scripts/expertise/expertise_co_imp_position_secured_3.py b/scripts/expertise/expertise_co_imp_position_secured_3.py deleted file mode 100644 index f18a8164..00000000 --- a/scripts/expertise/expertise_co_imp_position_secured_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_imp_position_secured_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_imp_position_secured_3") - return diff --git a/scripts/expertise/expertise_co_imp_riddle_armor_1.py b/scripts/expertise/expertise_co_imp_riddle_armor_1.py deleted file mode 100644 index 2c83b9e3..00000000 --- a/scripts/expertise/expertise_co_imp_riddle_armor_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_imp_riddle_armor_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_imp_riddle_armor_1") - return diff --git a/scripts/expertise/expertise_co_imp_riddle_armor_2.py b/scripts/expertise/expertise_co_imp_riddle_armor_2.py deleted file mode 100644 index be67095b..00000000 --- a/scripts/expertise/expertise_co_imp_riddle_armor_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_imp_riddle_armor_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_imp_riddle_armor_2") - return diff --git a/scripts/expertise/expertise_co_imp_stand_fast_1.py b/scripts/expertise/expertise_co_imp_stand_fast_1.py deleted file mode 100644 index e1c77d58..00000000 --- a/scripts/expertise/expertise_co_imp_stand_fast_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_imp_stand_fast_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_imp_stand_fast_1") - return diff --git a/scripts/expertise/expertise_co_imp_stand_fast_2.py b/scripts/expertise/expertise_co_imp_stand_fast_2.py deleted file mode 100644 index b4daa5e8..00000000 --- a/scripts/expertise/expertise_co_imp_stand_fast_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_imp_stand_fast_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_imp_stand_fast_2") - return diff --git a/scripts/expertise/expertise_co_imp_stand_fast_3.py b/scripts/expertise/expertise_co_imp_stand_fast_3.py deleted file mode 100644 index 9e3ddf52..00000000 --- a/scripts/expertise/expertise_co_imp_stand_fast_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_imp_stand_fast_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_imp_stand_fast_3") - return diff --git a/scripts/expertise/expertise_co_improved_explosives_1.py b/scripts/expertise/expertise_co_improved_explosives_1.py deleted file mode 100644 index 7479e8d1..00000000 --- a/scripts/expertise/expertise_co_improved_explosives_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_improved_explosives_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_improved_explosives_1") - return diff --git a/scripts/expertise/expertise_co_improved_explosives_2.py b/scripts/expertise/expertise_co_improved_explosives_2.py deleted file mode 100644 index 485df881..00000000 --- a/scripts/expertise/expertise_co_improved_explosives_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_improved_explosives_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_improved_explosives_2") - return diff --git a/scripts/expertise/expertise_co_improved_explosives_3.py b/scripts/expertise/expertise_co_improved_explosives_3.py deleted file mode 100644 index 3abcab9b..00000000 --- a/scripts/expertise/expertise_co_improved_explosives_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_improved_explosives_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_improved_explosives_3") - return diff --git a/scripts/expertise/expertise_co_improved_explosives_4.py b/scripts/expertise/expertise_co_improved_explosives_4.py deleted file mode 100644 index 99b4e564..00000000 --- a/scripts/expertise/expertise_co_improved_explosives_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_improved_explosives_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_improved_explosives_4") - return diff --git a/scripts/expertise/expertise_co_keen_eye_1.py b/scripts/expertise/expertise_co_keen_eye_1.py deleted file mode 100644 index b03ebc46..00000000 --- a/scripts/expertise/expertise_co_keen_eye_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_keen_eye_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_keen_eye_1") - return diff --git a/scripts/expertise/expertise_co_keen_eye_2.py b/scripts/expertise/expertise_co_keen_eye_2.py deleted file mode 100644 index aff4527a..00000000 --- a/scripts/expertise/expertise_co_keen_eye_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_keen_eye_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_keen_eye_2") - return diff --git a/scripts/expertise/expertise_co_killing_grimace_1.py b/scripts/expertise/expertise_co_killing_grimace_1.py deleted file mode 100644 index 091846d5..00000000 --- a/scripts/expertise/expertise_co_killing_grimace_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_killing_grimace_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_killing_grimace_1") - return diff --git a/scripts/expertise/expertise_co_killing_grimace_2.py b/scripts/expertise/expertise_co_killing_grimace_2.py deleted file mode 100644 index ad8ee400..00000000 --- a/scripts/expertise/expertise_co_killing_grimace_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_killing_grimace_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_killing_grimace_2") - return diff --git a/scripts/expertise/expertise_co_marksman_1.py b/scripts/expertise/expertise_co_marksman_1.py deleted file mode 100644 index c57aa617..00000000 --- a/scripts/expertise/expertise_co_marksman_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_marksman_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_marksman_1") - return diff --git a/scripts/expertise/expertise_co_marksman_2.py b/scripts/expertise/expertise_co_marksman_2.py deleted file mode 100644 index 7f74b950..00000000 --- a/scripts/expertise/expertise_co_marksman_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_marksman_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_marksman_2") - return diff --git a/scripts/expertise/expertise_co_marksman_3.py b/scripts/expertise/expertise_co_marksman_3.py deleted file mode 100644 index 27c8b759..00000000 --- a/scripts/expertise/expertise_co_marksman_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_marksman_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_marksman_3") - return diff --git a/scripts/expertise/expertise_co_on_target_1.py b/scripts/expertise/expertise_co_on_target_1.py deleted file mode 100644 index f652cbd2..00000000 --- a/scripts/expertise/expertise_co_on_target_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_on_target_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_on_target_1") - return diff --git a/scripts/expertise/expertise_co_on_target_2.py b/scripts/expertise/expertise_co_on_target_2.py deleted file mode 100644 index b51e92a9..00000000 --- a/scripts/expertise/expertise_co_on_target_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_on_target_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_on_target_2") - return diff --git a/scripts/expertise/expertise_co_on_target_3.py b/scripts/expertise/expertise_co_on_target_3.py deleted file mode 100644 index 5456ca93..00000000 --- a/scripts/expertise/expertise_co_on_target_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_on_target_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_on_target_3") - return diff --git a/scripts/expertise/expertise_co_on_target_4.py b/scripts/expertise/expertise_co_on_target_4.py deleted file mode 100644 index b750b412..00000000 --- a/scripts/expertise/expertise_co_on_target_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_on_target_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_on_target_4") - return diff --git a/scripts/expertise/expertise_co_packed_explosives_1.py b/scripts/expertise/expertise_co_packed_explosives_1.py deleted file mode 100644 index fa57097c..00000000 --- a/scripts/expertise/expertise_co_packed_explosives_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_packed_explosives_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_packed_explosives_1") - return diff --git a/scripts/expertise/expertise_co_packed_explosives_2.py b/scripts/expertise/expertise_co_packed_explosives_2.py deleted file mode 100644 index 288e1944..00000000 --- a/scripts/expertise/expertise_co_packed_explosives_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_packed_explosives_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_packed_explosives_2") - return diff --git a/scripts/expertise/expertise_co_packed_explosives_3.py b/scripts/expertise/expertise_co_packed_explosives_3.py deleted file mode 100644 index 8f61f39d..00000000 --- a/scripts/expertise/expertise_co_packed_explosives_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_packed_explosives_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_packed_explosives_3") - return diff --git a/scripts/expertise/expertise_co_packed_explosives_4.py b/scripts/expertise/expertise_co_packed_explosives_4.py deleted file mode 100644 index efd1b2a9..00000000 --- a/scripts/expertise/expertise_co_packed_explosives_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_packed_explosives_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_packed_explosives_4") - return diff --git a/scripts/expertise/expertise_co_pinpoint_shielding_1.py b/scripts/expertise/expertise_co_pinpoint_shielding_1.py deleted file mode 100644 index 1937db02..00000000 --- a/scripts/expertise/expertise_co_pinpoint_shielding_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_pinpoint_shielding_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_pinpoint_shielding_1") - return diff --git a/scripts/expertise/expertise_co_pinpoint_shielding_2.py b/scripts/expertise/expertise_co_pinpoint_shielding_2.py deleted file mode 100644 index c3ad2200..00000000 --- a/scripts/expertise/expertise_co_pinpoint_shielding_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_pinpoint_shielding_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_pinpoint_shielding_2") - return diff --git a/scripts/expertise/expertise_co_pinpoint_shielding_3.py b/scripts/expertise/expertise_co_pinpoint_shielding_3.py deleted file mode 100644 index 02c5884e..00000000 --- a/scripts/expertise/expertise_co_pinpoint_shielding_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_pinpoint_shielding_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_pinpoint_shielding_3") - return diff --git a/scripts/expertise/expertise_co_pinpoint_shielding_4.py b/scripts/expertise/expertise_co_pinpoint_shielding_4.py deleted file mode 100644 index f85df1de..00000000 --- a/scripts/expertise/expertise_co_pinpoint_shielding_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_pinpoint_shielding_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_pinpoint_shielding_4") - return diff --git a/scripts/expertise/expertise_co_powered_armor_1.py b/scripts/expertise/expertise_co_powered_armor_1.py deleted file mode 100644 index 58530d57..00000000 --- a/scripts/expertise/expertise_co_powered_armor_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_powered_armor_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_powered_armor_1") - return diff --git a/scripts/expertise/expertise_co_powered_armor_2.py b/scripts/expertise/expertise_co_powered_armor_2.py deleted file mode 100644 index e9ea79e9..00000000 --- a/scripts/expertise/expertise_co_powered_armor_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_powered_armor_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_powered_armor_2") - return diff --git a/scripts/expertise/expertise_co_powered_armor_3.py b/scripts/expertise/expertise_co_powered_armor_3.py deleted file mode 100644 index 5cba60e6..00000000 --- a/scripts/expertise/expertise_co_powered_armor_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_powered_armor_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_powered_armor_3") - return diff --git a/scripts/expertise/expertise_co_powered_armor_4.py b/scripts/expertise/expertise_co_powered_armor_4.py deleted file mode 100644 index b10f5264..00000000 --- a/scripts/expertise/expertise_co_powered_armor_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_powered_armor_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_powered_armor_4") - return diff --git a/scripts/expertise/expertise_co_short_fuse_1.py b/scripts/expertise/expertise_co_short_fuse_1.py deleted file mode 100644 index a5cbad44..00000000 --- a/scripts/expertise/expertise_co_short_fuse_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_short_fuse_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_short_fuse_1") - return diff --git a/scripts/expertise/expertise_co_strong_arm_1.py b/scripts/expertise/expertise_co_strong_arm_1.py deleted file mode 100644 index b4e5ab18..00000000 --- a/scripts/expertise/expertise_co_strong_arm_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_strong_arm_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_strong_arm_1") - return diff --git a/scripts/expertise/expertise_co_strong_arm_2.py b/scripts/expertise/expertise_co_strong_arm_2.py deleted file mode 100644 index b0672495..00000000 --- a/scripts/expertise/expertise_co_strong_arm_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_strong_arm_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_strong_arm_2") - return diff --git a/scripts/expertise/expertise_co_strong_arm_3.py b/scripts/expertise/expertise_co_strong_arm_3.py deleted file mode 100644 index d69525d7..00000000 --- a/scripts/expertise/expertise_co_strong_arm_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_strong_arm_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_strong_arm_3") - return diff --git a/scripts/expertise/expertise_co_strong_arm_4.py b/scripts/expertise/expertise_co_strong_arm_4.py deleted file mode 100644 index dd42b534..00000000 --- a/scripts/expertise/expertise_co_strong_arm_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_strong_arm_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_strong_arm_4") - return diff --git a/scripts/expertise/expertise_co_suppression_efficiency_1.py b/scripts/expertise/expertise_co_suppression_efficiency_1.py deleted file mode 100644 index 60950dc4..00000000 --- a/scripts/expertise/expertise_co_suppression_efficiency_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_suppression_efficiency_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_suppression_efficiency_1") - return diff --git a/scripts/expertise/expertise_co_suppression_efficiency_2.py b/scripts/expertise/expertise_co_suppression_efficiency_2.py deleted file mode 100644 index 3ce19870..00000000 --- a/scripts/expertise/expertise_co_suppression_efficiency_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_suppression_efficiency_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_suppression_efficiency_2") - return diff --git a/scripts/expertise/expertise_co_suppression_efficiency_3.py b/scripts/expertise/expertise_co_suppression_efficiency_3.py deleted file mode 100644 index 00e43a22..00000000 --- a/scripts/expertise/expertise_co_suppression_efficiency_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_suppression_efficiency_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_suppression_efficiency_3") - return diff --git a/scripts/expertise/expertise_co_suppression_efficiency_4.py b/scripts/expertise/expertise_co_suppression_efficiency_4.py deleted file mode 100644 index f9c1c3e5..00000000 --- a/scripts/expertise/expertise_co_suppression_efficiency_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_suppression_efficiency_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_suppression_efficiency_4") - return diff --git a/scripts/expertise/expertise_co_tibanna_gas_1.py b/scripts/expertise/expertise_co_tibanna_gas_1.py deleted file mode 100644 index 1c8d5371..00000000 --- a/scripts/expertise/expertise_co_tibanna_gas_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_tibanna_gas_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_tibanna_gas_1") - return diff --git a/scripts/expertise/expertise_co_tibanna_gas_2.py b/scripts/expertise/expertise_co_tibanna_gas_2.py deleted file mode 100644 index f907947a..00000000 --- a/scripts/expertise/expertise_co_tibanna_gas_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_tibanna_gas_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_tibanna_gas_2") - return diff --git a/scripts/expertise/expertise_co_tibanna_gas_3.py b/scripts/expertise/expertise_co_tibanna_gas_3.py deleted file mode 100644 index 4b1ac247..00000000 --- a/scripts/expertise/expertise_co_tibanna_gas_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_tibanna_gas_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_tibanna_gas_3") - return diff --git a/scripts/expertise/expertise_co_tibanna_gas_4.py b/scripts/expertise/expertise_co_tibanna_gas_4.py deleted file mode 100644 index 67b238f2..00000000 --- a/scripts/expertise/expertise_co_tibanna_gas_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_tibanna_gas_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_tibanna_gas_4") - return diff --git a/scripts/expertise/expertise_co_timer_reset_1.py b/scripts/expertise/expertise_co_timer_reset_1.py deleted file mode 100644 index 1b2e232d..00000000 --- a/scripts/expertise/expertise_co_timer_reset_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_timer_reset_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_timer_reset_1") - return diff --git a/scripts/expertise/expertise_co_timer_reset_2.py b/scripts/expertise/expertise_co_timer_reset_2.py deleted file mode 100644 index 9c29a8c9..00000000 --- a/scripts/expertise/expertise_co_timer_reset_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_timer_reset_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_timer_reset_2") - return diff --git a/scripts/expertise/expertise_co_youll_regret_that_1.py b/scripts/expertise/expertise_co_youll_regret_that_1.py deleted file mode 100644 index a0895f86..00000000 --- a/scripts/expertise/expertise_co_youll_regret_that_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_youll_regret_that_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_youll_regret_that_1") - return diff --git a/scripts/expertise/expertise_co_youll_regret_that_2.py b/scripts/expertise/expertise_co_youll_regret_that_2.py deleted file mode 100644 index d96de9f4..00000000 --- a/scripts/expertise/expertise_co_youll_regret_that_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_youll_regret_that_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_youll_regret_that_2") - return diff --git a/scripts/expertise/expertise_co_youll_regret_that_3.py b/scripts/expertise/expertise_co_youll_regret_that_3.py deleted file mode 100644 index 0ab9bab3..00000000 --- a/scripts/expertise/expertise_co_youll_regret_that_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_youll_regret_that_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_youll_regret_that_3") - return diff --git a/scripts/expertise/expertise_co_youll_regret_that_4.py b/scripts/expertise/expertise_co_youll_regret_that_4.py deleted file mode 100644 index 95a86d07..00000000 --- a/scripts/expertise/expertise_co_youll_regret_that_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_co_youll_regret_that_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_co_youll_regret_that_4") - return diff --git a/scripts/expertise/expertise_cybernetic_dexterity_1.py b/scripts/expertise/expertise_cybernetic_dexterity_1.py deleted file mode 100644 index db71010f..00000000 --- a/scripts/expertise/expertise_cybernetic_dexterity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_cybernetic_dexterity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_cybernetic_dexterity_1") - return diff --git a/scripts/expertise/expertise_cybernetic_dexterity_2.py b/scripts/expertise/expertise_cybernetic_dexterity_2.py deleted file mode 100644 index 40cfd8c9..00000000 --- a/scripts/expertise/expertise_cybernetic_dexterity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_cybernetic_dexterity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_cybernetic_dexterity_2") - return diff --git a/scripts/expertise/expertise_cybernetic_dexterity_3.py b/scripts/expertise/expertise_cybernetic_dexterity_3.py deleted file mode 100644 index de7ea37b..00000000 --- a/scripts/expertise/expertise_cybernetic_dexterity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_cybernetic_dexterity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_cybernetic_dexterity_3") - return diff --git a/scripts/expertise/expertise_cybernetic_dexterity_4.py b/scripts/expertise/expertise_cybernetic_dexterity_4.py deleted file mode 100644 index 303f05f7..00000000 --- a/scripts/expertise/expertise_cybernetic_dexterity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_cybernetic_dexterity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_cybernetic_dexterity_4") - return diff --git a/scripts/expertise/expertise_domestic_artisan_advanced_theory_1.py b/scripts/expertise/expertise_domestic_artisan_advanced_theory_1.py deleted file mode 100644 index 7768503c..00000000 --- a/scripts/expertise/expertise_domestic_artisan_advanced_theory_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_artisan_advanced_theory_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_artisan_advanced_theory_1") - return diff --git a/scripts/expertise/expertise_domestic_artisan_dexterity_1.py b/scripts/expertise/expertise_domestic_artisan_dexterity_1.py deleted file mode 100644 index 558c2105..00000000 --- a/scripts/expertise/expertise_domestic_artisan_dexterity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_artisan_dexterity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_artisan_dexterity_1") - return diff --git a/scripts/expertise/expertise_domestic_artisan_dexterity_2.py b/scripts/expertise/expertise_domestic_artisan_dexterity_2.py deleted file mode 100644 index 8c7ab6cf..00000000 --- a/scripts/expertise/expertise_domestic_artisan_dexterity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_artisan_dexterity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_artisan_dexterity_2") - return diff --git a/scripts/expertise/expertise_domestic_artisan_dexterity_3.py b/scripts/expertise/expertise_domestic_artisan_dexterity_3.py deleted file mode 100644 index 3759a96d..00000000 --- a/scripts/expertise/expertise_domestic_artisan_dexterity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_artisan_dexterity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_artisan_dexterity_3") - return diff --git a/scripts/expertise/expertise_domestic_artisan_dexterity_4.py b/scripts/expertise/expertise_domestic_artisan_dexterity_4.py deleted file mode 100644 index 4be842ea..00000000 --- a/scripts/expertise/expertise_domestic_artisan_dexterity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_artisan_dexterity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_artisan_dexterity_4") - return diff --git a/scripts/expertise/expertise_domestic_artisan_hypothesis_1.py b/scripts/expertise/expertise_domestic_artisan_hypothesis_1.py deleted file mode 100644 index d8af5dc4..00000000 --- a/scripts/expertise/expertise_domestic_artisan_hypothesis_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_artisan_artisan_hypthesis_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_artisan_artisan_hypthesis_1") - return diff --git a/scripts/expertise/expertise_domestic_artisan_hypothesis_2.py b/scripts/expertise/expertise_domestic_artisan_hypothesis_2.py deleted file mode 100644 index d9a13f59..00000000 --- a/scripts/expertise/expertise_domestic_artisan_hypothesis_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_artisan_hypthesis_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_artisan_hypthesis_2") - return diff --git a/scripts/expertise/expertise_domestic_artisan_hypothesis_3.py b/scripts/expertise/expertise_domestic_artisan_hypothesis_3.py deleted file mode 100644 index 1ebf788d..00000000 --- a/scripts/expertise/expertise_domestic_artisan_hypothesis_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_artisan_hypthesis_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_artisan_hypthesis_3") - return diff --git a/scripts/expertise/expertise_domestic_artisan_hypothesis_4.py b/scripts/expertise/expertise_domestic_artisan_hypothesis_4.py deleted file mode 100644 index e0797ccd..00000000 --- a/scripts/expertise/expertise_domestic_artisan_hypothesis_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_artisan_hypthesis_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_artisan_hypthesis_4") - return diff --git a/scripts/expertise/expertise_domestic_chef_advanced_theory_1.py b/scripts/expertise/expertise_domestic_chef_advanced_theory_1.py deleted file mode 100644 index 2ee6b7d6..00000000 --- a/scripts/expertise/expertise_domestic_chef_advanced_theory_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_advanced_theory_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_advanced_theory_1") - return diff --git a/scripts/expertise/expertise_domestic_chef_dexterity_1.py b/scripts/expertise/expertise_domestic_chef_dexterity_1.py deleted file mode 100644 index f3edfc97..00000000 --- a/scripts/expertise/expertise_domestic_chef_dexterity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_dexterity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_dexterity_1") - return diff --git a/scripts/expertise/expertise_domestic_chef_dexterity_2.py b/scripts/expertise/expertise_domestic_chef_dexterity_2.py deleted file mode 100644 index 006997ac..00000000 --- a/scripts/expertise/expertise_domestic_chef_dexterity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_dexterity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_dexterity_2") - return diff --git a/scripts/expertise/expertise_domestic_chef_dexterity_3.py b/scripts/expertise/expertise_domestic_chef_dexterity_3.py deleted file mode 100644 index f35f9cad..00000000 --- a/scripts/expertise/expertise_domestic_chef_dexterity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_dexterity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_dexterity_3") - return diff --git a/scripts/expertise/expertise_domestic_chef_dexterity_4.py b/scripts/expertise/expertise_domestic_chef_dexterity_4.py deleted file mode 100644 index 257e22e5..00000000 --- a/scripts/expertise/expertise_domestic_chef_dexterity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_dexterity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_dexterity_4") - return diff --git a/scripts/expertise/expertise_domestic_chef_hypothesis_1.py b/scripts/expertise/expertise_domestic_chef_hypothesis_1.py deleted file mode 100644 index ce68731f..00000000 --- a/scripts/expertise/expertise_domestic_chef_hypothesis_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_hypothesis_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_hypothesis_1") - return diff --git a/scripts/expertise/expertise_domestic_chef_hypothesis_2.py b/scripts/expertise/expertise_domestic_chef_hypothesis_2.py deleted file mode 100644 index e27b783b..00000000 --- a/scripts/expertise/expertise_domestic_chef_hypothesis_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_hypothesis_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_hypothesis_2") - return diff --git a/scripts/expertise/expertise_domestic_chef_hypothesis_3.py b/scripts/expertise/expertise_domestic_chef_hypothesis_3.py deleted file mode 100644 index 578de3e8..00000000 --- a/scripts/expertise/expertise_domestic_chef_hypothesis_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_hypothesis_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_hypothesis_3") - return diff --git a/scripts/expertise/expertise_domestic_chef_hypothesis_4.py b/scripts/expertise/expertise_domestic_chef_hypothesis_4.py deleted file mode 100644 index 65d4a9d4..00000000 --- a/scripts/expertise/expertise_domestic_chef_hypothesis_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_hypothesis_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_hypothesis_4") - return diff --git a/scripts/expertise/expertise_domestic_chef_insight_1.py b/scripts/expertise/expertise_domestic_chef_insight_1.py deleted file mode 100644 index 620ede83..00000000 --- a/scripts/expertise/expertise_domestic_chef_insight_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_insight_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_insight_1") - return diff --git a/scripts/expertise/expertise_domestic_chef_insight_2.py b/scripts/expertise/expertise_domestic_chef_insight_2.py deleted file mode 100644 index 1b3cfd75..00000000 --- a/scripts/expertise/expertise_domestic_chef_insight_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_insight_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_insight_2") - return diff --git a/scripts/expertise/expertise_domestic_chef_keen_understanding_1.py b/scripts/expertise/expertise_domestic_chef_keen_understanding_1.py deleted file mode 100644 index 2d6a9548..00000000 --- a/scripts/expertise/expertise_domestic_chef_keen_understanding_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_keen_understanding_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_keen_understanding_1") - return diff --git a/scripts/expertise/expertise_domestic_chef_keen_understanding_2.py b/scripts/expertise/expertise_domestic_chef_keen_understanding_2.py deleted file mode 100644 index 1a8fef1f..00000000 --- a/scripts/expertise/expertise_domestic_chef_keen_understanding_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_keen_understanding_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_keen_understanding_2") - return diff --git a/scripts/expertise/expertise_domestic_chef_schematic_1_1.py b/scripts/expertise/expertise_domestic_chef_schematic_1_1.py deleted file mode 100644 index 8da9070b..00000000 --- a/scripts/expertise/expertise_domestic_chef_schematic_1_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_schematic_1_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_schematic_1_1") - return diff --git a/scripts/expertise/expertise_domestic_chef_schematic_2_1.py b/scripts/expertise/expertise_domestic_chef_schematic_2_1.py deleted file mode 100644 index ec21ccbf..00000000 --- a/scripts/expertise/expertise_domestic_chef_schematic_2_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_chef_schematic_2_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_chef_schematic_2_1") - return diff --git a/scripts/expertise/expertise_domestic_resource_processing_1.py b/scripts/expertise/expertise_domestic_resource_processing_1.py deleted file mode 100644 index 7fa9d660..00000000 --- a/scripts/expertise/expertise_domestic_resource_processing_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_resource_processing_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_resource_processing_1") - return diff --git a/scripts/expertise/expertise_domestic_resource_processing_2.py b/scripts/expertise/expertise_domestic_resource_processing_2.py deleted file mode 100644 index 8e6e3a11..00000000 --- a/scripts/expertise/expertise_domestic_resource_processing_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_resource_processing_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_resource_processing_2") - return diff --git a/scripts/expertise/expertise_domestic_resource_refinement_1.py b/scripts/expertise/expertise_domestic_resource_refinement_1.py deleted file mode 100644 index b0352b8e..00000000 --- a/scripts/expertise/expertise_domestic_resource_refinement_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_resource_refinement_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_resource_refinement_1") - return diff --git a/scripts/expertise/expertise_domestic_resource_refinement_2.py b/scripts/expertise/expertise_domestic_resource_refinement_2.py deleted file mode 100644 index 74913100..00000000 --- a/scripts/expertise/expertise_domestic_resource_refinement_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_resource_refinement_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_resource_refinement_2") - return diff --git a/scripts/expertise/expertise_domestic_tailor_advanced_theory_1.py b/scripts/expertise/expertise_domestic_tailor_advanced_theory_1.py deleted file mode 100644 index 46aa159d..00000000 --- a/scripts/expertise/expertise_domestic_tailor_advanced_theory_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_advanced_theory_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_advanced_theory_1") - return diff --git a/scripts/expertise/expertise_domestic_tailor_attachment_upgrade_1.py b/scripts/expertise/expertise_domestic_tailor_attachment_upgrade_1.py deleted file mode 100644 index d10933fb..00000000 --- a/scripts/expertise/expertise_domestic_tailor_attachment_upgrade_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_attachment_upgrade_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_attachment_upgrade_1") - return diff --git a/scripts/expertise/expertise_domestic_tailor_dexterity_1.py b/scripts/expertise/expertise_domestic_tailor_dexterity_1.py deleted file mode 100644 index 7b05bf09..00000000 --- a/scripts/expertise/expertise_domestic_tailor_dexterity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_dexterity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_dexterity_1") - return diff --git a/scripts/expertise/expertise_domestic_tailor_dexterity_2.py b/scripts/expertise/expertise_domestic_tailor_dexterity_2.py deleted file mode 100644 index 16c9b28e..00000000 --- a/scripts/expertise/expertise_domestic_tailor_dexterity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_dexterity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_dexterity_2") - return diff --git a/scripts/expertise/expertise_domestic_tailor_dexterity_3.py b/scripts/expertise/expertise_domestic_tailor_dexterity_3.py deleted file mode 100644 index 0f4697c9..00000000 --- a/scripts/expertise/expertise_domestic_tailor_dexterity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_dexterity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_dexterity_3") - return diff --git a/scripts/expertise/expertise_domestic_tailor_dexterity_4.py b/scripts/expertise/expertise_domestic_tailor_dexterity_4.py deleted file mode 100644 index 8ef125c7..00000000 --- a/scripts/expertise/expertise_domestic_tailor_dexterity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_dexterity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_dexterity_4") - return diff --git a/scripts/expertise/expertise_domestic_tailor_hypothesis_1.py b/scripts/expertise/expertise_domestic_tailor_hypothesis_1.py deleted file mode 100644 index e9e14164..00000000 --- a/scripts/expertise/expertise_domestic_tailor_hypothesis_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_hypothesis_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_hypothesis_1") - return diff --git a/scripts/expertise/expertise_domestic_tailor_hypothesis_2.py b/scripts/expertise/expertise_domestic_tailor_hypothesis_2.py deleted file mode 100644 index 0dad6f4d..00000000 --- a/scripts/expertise/expertise_domestic_tailor_hypothesis_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_hypothesis_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_hypothesis_2") - return diff --git a/scripts/expertise/expertise_domestic_tailor_hypothesis_3.py b/scripts/expertise/expertise_domestic_tailor_hypothesis_3.py deleted file mode 100644 index 70d55b5c..00000000 --- a/scripts/expertise/expertise_domestic_tailor_hypothesis_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_hypothesis_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_hypothesis_3") - return diff --git a/scripts/expertise/expertise_domestic_tailor_hypothesis_4.py b/scripts/expertise/expertise_domestic_tailor_hypothesis_4.py deleted file mode 100644 index c9a25d1c..00000000 --- a/scripts/expertise/expertise_domestic_tailor_hypothesis_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_hypothesis_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_hypothesis_4") - return diff --git a/scripts/expertise/expertise_domestic_tailor_insight_1.py b/scripts/expertise/expertise_domestic_tailor_insight_1.py deleted file mode 100644 index dcafb9f2..00000000 --- a/scripts/expertise/expertise_domestic_tailor_insight_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_insight_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_insight_1") - return diff --git a/scripts/expertise/expertise_domestic_tailor_insight_2.py b/scripts/expertise/expertise_domestic_tailor_insight_2.py deleted file mode 100644 index cd307c4c..00000000 --- a/scripts/expertise/expertise_domestic_tailor_insight_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_insight_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_insight_2") - return diff --git a/scripts/expertise/expertise_domestic_tailor_keen_understanding_1.py b/scripts/expertise/expertise_domestic_tailor_keen_understanding_1.py deleted file mode 100644 index e4c2ab72..00000000 --- a/scripts/expertise/expertise_domestic_tailor_keen_understanding_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_keen_understanding_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_keen_understanding_1") - return diff --git a/scripts/expertise/expertise_domestic_tailor_keen_understanding_2.py b/scripts/expertise/expertise_domestic_tailor_keen_understanding_2.py deleted file mode 100644 index b866a83f..00000000 --- a/scripts/expertise/expertise_domestic_tailor_keen_understanding_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_keen_understanding_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_keen_understanding_2") - return diff --git a/scripts/expertise/expertise_domestic_tailor_socket_bonus_1.py b/scripts/expertise/expertise_domestic_tailor_socket_bonus_1.py deleted file mode 100644 index 4cac0dfc..00000000 --- a/scripts/expertise/expertise_domestic_tailor_socket_bonus_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_domestic_tailor_socket_bonus_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_domestic_tailor_socket_bonus_1") - return diff --git a/scripts/expertise/expertise_en_affability_1.py b/scripts/expertise/expertise_en_affability_1.py deleted file mode 100644 index 35dfd326..00000000 --- a/scripts/expertise/expertise_en_affability_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_affability_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_affability_1") - return diff --git a/scripts/expertise/expertise_en_affability_2.py b/scripts/expertise/expertise_en_affability_2.py deleted file mode 100644 index 38b336df..00000000 --- a/scripts/expertise/expertise_en_affability_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_affability_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_affability_2") - return diff --git a/scripts/expertise/expertise_en_affability_3.py b/scripts/expertise/expertise_en_affability_3.py deleted file mode 100644 index 0a2cf7fc..00000000 --- a/scripts/expertise/expertise_en_affability_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_affability_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_affability_3") - return diff --git a/scripts/expertise/expertise_en_affability_4.py b/scripts/expertise/expertise_en_affability_4.py deleted file mode 100644 index 3949d215..00000000 --- a/scripts/expertise/expertise_en_affability_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_affability_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_affability_4") - return diff --git a/scripts/expertise/expertise_en_allure_1.py b/scripts/expertise/expertise_en_allure_1.py deleted file mode 100644 index 9448b911..00000000 --- a/scripts/expertise/expertise_en_allure_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_allure_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_allure_1") - return diff --git a/scripts/expertise/expertise_en_allure_2.py b/scripts/expertise/expertise_en_allure_2.py deleted file mode 100644 index 831a7c36..00000000 --- a/scripts/expertise/expertise_en_allure_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_allure_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_allure_2") - return diff --git a/scripts/expertise/expertise_en_allure_3.py b/scripts/expertise/expertise_en_allure_3.py deleted file mode 100644 index f896a1d2..00000000 --- a/scripts/expertise/expertise_en_allure_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_allure_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_allure_3") - return diff --git a/scripts/expertise/expertise_en_annulling_1.py b/scripts/expertise/expertise_en_annulling_1.py deleted file mode 100644 index 6055557a..00000000 --- a/scripts/expertise/expertise_en_annulling_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_annulling_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_annulling_1") - return diff --git a/scripts/expertise/expertise_en_annulling_2.py b/scripts/expertise/expertise_en_annulling_2.py deleted file mode 100644 index e06fc2ef..00000000 --- a/scripts/expertise/expertise_en_annulling_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_annulling_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_annulling_2") - return diff --git a/scripts/expertise/expertise_en_annulling_3.py b/scripts/expertise/expertise_en_annulling_3.py deleted file mode 100644 index b26f4814..00000000 --- a/scripts/expertise/expertise_en_annulling_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_annulling_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_annulling_3") - return diff --git a/scripts/expertise/expertise_en_conditioned_vessel_1.py b/scripts/expertise/expertise_en_conditioned_vessel_1.py deleted file mode 100644 index 896a8752..00000000 --- a/scripts/expertise/expertise_en_conditioned_vessel_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_conditioned_vessel_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_conditioned_vessel_1") - return diff --git a/scripts/expertise/expertise_en_conditioned_vessel_2.py b/scripts/expertise/expertise_en_conditioned_vessel_2.py deleted file mode 100644 index e7123ab7..00000000 --- a/scripts/expertise/expertise_en_conditioned_vessel_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_conditioned_vessel_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_conditioned_vessel_2") - return diff --git a/scripts/expertise/expertise_en_conditioned_vessel_3.py b/scripts/expertise/expertise_en_conditioned_vessel_3.py deleted file mode 100644 index e0292169..00000000 --- a/scripts/expertise/expertise_en_conditioned_vessel_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_conditioned_vessel_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_conditioned_vessel_3") - return diff --git a/scripts/expertise/expertise_en_conditioned_vessel_4.py b/scripts/expertise/expertise_en_conditioned_vessel_4.py deleted file mode 100644 index f0d7b6e7..00000000 --- a/scripts/expertise/expertise_en_conditioned_vessel_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_conditioned_vessel_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_conditioned_vessel_4") - return diff --git a/scripts/expertise/expertise_en_controlled_spin_1.py b/scripts/expertise/expertise_en_controlled_spin_1.py deleted file mode 100644 index dc088a17..00000000 --- a/scripts/expertise/expertise_en_controlled_spin_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_controlled_spin_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_controlled_spin_1") - return diff --git a/scripts/expertise/expertise_en_controlled_spin_2.py b/scripts/expertise/expertise_en_controlled_spin_2.py deleted file mode 100644 index 018aae71..00000000 --- a/scripts/expertise/expertise_en_controlled_spin_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_controlled_spin_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_controlled_spin_2") - return diff --git a/scripts/expertise/expertise_en_controlled_spin_3.py b/scripts/expertise/expertise_en_controlled_spin_3.py deleted file mode 100644 index 4850d8cc..00000000 --- a/scripts/expertise/expertise_en_controlled_spin_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_controlled_spin_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_controlled_spin_3") - return diff --git a/scripts/expertise/expertise_en_creativity_1.py b/scripts/expertise/expertise_en_creativity_1.py deleted file mode 100644 index ec5120d4..00000000 --- a/scripts/expertise/expertise_en_creativity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_creativity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_creativity_1") - return diff --git a/scripts/expertise/expertise_en_creativity_2.py b/scripts/expertise/expertise_en_creativity_2.py deleted file mode 100644 index 9e919439..00000000 --- a/scripts/expertise/expertise_en_creativity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_creativity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_creativity_2") - return diff --git a/scripts/expertise/expertise_en_creativity_3.py b/scripts/expertise/expertise_en_creativity_3.py deleted file mode 100644 index a4e8153f..00000000 --- a/scripts/expertise/expertise_en_creativity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_creativity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_creativity_3") - return diff --git a/scripts/expertise/expertise_en_creativity_4.py b/scripts/expertise/expertise_en_creativity_4.py deleted file mode 100644 index f743578d..00000000 --- a/scripts/expertise/expertise_en_creativity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_creativity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_creativity_4") - return diff --git a/scripts/expertise/expertise_en_dramatic_flair_1.py b/scripts/expertise/expertise_en_dramatic_flair_1.py deleted file mode 100644 index bd280ed0..00000000 --- a/scripts/expertise/expertise_en_dramatic_flair_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_dramatic_flair_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_dramatic_flair_1") - return diff --git a/scripts/expertise/expertise_en_dramatic_flair_2.py b/scripts/expertise/expertise_en_dramatic_flair_2.py deleted file mode 100644 index 7d32d156..00000000 --- a/scripts/expertise/expertise_en_dramatic_flair_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_dramatic_flair_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_dramatic_flair_2") - return diff --git a/scripts/expertise/expertise_en_dramatic_flair_3.py b/scripts/expertise/expertise_en_dramatic_flair_3.py deleted file mode 100644 index 16533340..00000000 --- a/scripts/expertise/expertise_en_dramatic_flair_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_dramatic_flair_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_dramatic_flair_3") - return diff --git a/scripts/expertise/expertise_en_dramatic_flair_4.py b/scripts/expertise/expertise_en_dramatic_flair_4.py deleted file mode 100644 index ccb52574..00000000 --- a/scripts/expertise/expertise_en_dramatic_flair_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_dramatic_flair_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_dramatic_flair_4") - return diff --git a/scripts/expertise/expertise_en_emotional_prescience_1.py b/scripts/expertise/expertise_en_emotional_prescience_1.py deleted file mode 100644 index f9177d7c..00000000 --- a/scripts/expertise/expertise_en_emotional_prescience_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_emotional_prescience_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_emotional_prescience_1") - return diff --git a/scripts/expertise/expertise_en_emotional_prescience_2.py b/scripts/expertise/expertise_en_emotional_prescience_2.py deleted file mode 100644 index 5afb81a1..00000000 --- a/scripts/expertise/expertise_en_emotional_prescience_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_emotional_prescience_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_emotional_prescience_2") - return diff --git a/scripts/expertise/expertise_en_emotional_prescience_3.py b/scripts/expertise/expertise_en_emotional_prescience_3.py deleted file mode 100644 index 8f5b2500..00000000 --- a/scripts/expertise/expertise_en_emotional_prescience_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_emotional_prescience_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_emotional_prescience_3") - return diff --git a/scripts/expertise/expertise_en_emotional_prescience_4.py b/scripts/expertise/expertise_en_emotional_prescience_4.py deleted file mode 100644 index 1a2ce7e1..00000000 --- a/scripts/expertise/expertise_en_emotional_prescience_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_emotional_prescience_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_emotional_prescience_4") - return diff --git a/scripts/expertise/expertise_en_encore_heal_1.py b/scripts/expertise/expertise_en_encore_heal_1.py deleted file mode 100644 index 14d899a0..00000000 --- a/scripts/expertise/expertise_en_encore_heal_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_encore_heal_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_encore_heal_1") - return diff --git a/scripts/expertise/expertise_en_encore_heal_2.py b/scripts/expertise/expertise_en_encore_heal_2.py deleted file mode 100644 index 1ac0eb53..00000000 --- a/scripts/expertise/expertise_en_encore_heal_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_encore_heal_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_encore_heal_2") - return diff --git a/scripts/expertise/expertise_en_encore_heal_3.py b/scripts/expertise/expertise_en_encore_heal_3.py deleted file mode 100644 index 348742d1..00000000 --- a/scripts/expertise/expertise_en_encore_heal_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_encore_heal_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_encore_heal_3") - return diff --git a/scripts/expertise/expertise_en_focused_control_1.py b/scripts/expertise/expertise_en_focused_control_1.py deleted file mode 100644 index 99d0436a..00000000 --- a/scripts/expertise/expertise_en_focused_control_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_focused_control_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_focused_control_1") - return diff --git a/scripts/expertise/expertise_en_focused_control_2.py b/scripts/expertise/expertise_en_focused_control_2.py deleted file mode 100644 index 2b81f293..00000000 --- a/scripts/expertise/expertise_en_focused_control_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_focused_control_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_focused_control_2") - return diff --git a/scripts/expertise/expertise_en_focused_control_3.py b/scripts/expertise/expertise_en_focused_control_3.py deleted file mode 100644 index b256a48d..00000000 --- a/scripts/expertise/expertise_en_focused_control_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_focused_control_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_focused_control_3") - return diff --git a/scripts/expertise/expertise_en_focused_control_4.py b/scripts/expertise/expertise_en_focused_control_4.py deleted file mode 100644 index f3ec007f..00000000 --- a/scripts/expertise/expertise_en_focused_control_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_focused_control_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_focused_control_4") - return diff --git a/scripts/expertise/expertise_en_folded_inward_1.py b/scripts/expertise/expertise_en_folded_inward_1.py deleted file mode 100644 index 142d632c..00000000 --- a/scripts/expertise/expertise_en_folded_inward_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_folded_inward_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_folded_inward_1") - return diff --git a/scripts/expertise/expertise_en_folded_inward_2.py b/scripts/expertise/expertise_en_folded_inward_2.py deleted file mode 100644 index 3c56cd2c..00000000 --- a/scripts/expertise/expertise_en_folded_inward_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_folded_inward_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_folded_inward_2") - return diff --git a/scripts/expertise/expertise_en_folded_inward_3.py b/scripts/expertise/expertise_en_folded_inward_3.py deleted file mode 100644 index 40b26c21..00000000 --- a/scripts/expertise/expertise_en_folded_inward_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_folded_inward_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_folded_inward_3") - return diff --git a/scripts/expertise/expertise_en_folded_inward_4.py b/scripts/expertise/expertise_en_folded_inward_4.py deleted file mode 100644 index 94c18354..00000000 --- a/scripts/expertise/expertise_en_folded_inward_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_folded_inward_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_folded_inward_4") - return diff --git a/scripts/expertise/expertise_en_holographic_duration_1.py b/scripts/expertise/expertise_en_holographic_duration_1.py deleted file mode 100644 index 04ec0485..00000000 --- a/scripts/expertise/expertise_en_holographic_duration_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_holographic_duration_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_holographic_duration_1") - return diff --git a/scripts/expertise/expertise_en_holographic_mastery_1.py b/scripts/expertise/expertise_en_holographic_mastery_1.py deleted file mode 100644 index cb7f5424..00000000 --- a/scripts/expertise/expertise_en_holographic_mastery_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_holographic_mastery_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_holographic_mastery_1") - return diff --git a/scripts/expertise/expertise_en_holographic_mastery_2.py b/scripts/expertise/expertise_en_holographic_mastery_2.py deleted file mode 100644 index 6fc49ee0..00000000 --- a/scripts/expertise/expertise_en_holographic_mastery_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_holographic_mastery_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_holographic_mastery_2") - return diff --git a/scripts/expertise/expertise_en_improv_1.py b/scripts/expertise/expertise_en_improv_1.py deleted file mode 100644 index b2b0352b..00000000 --- a/scripts/expertise/expertise_en_improv_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_improv_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_improv_1") - return diff --git a/scripts/expertise/expertise_en_inspired_fitness_1.py b/scripts/expertise/expertise_en_inspired_fitness_1.py deleted file mode 100644 index 1c557c8d..00000000 --- a/scripts/expertise/expertise_en_inspired_fitness_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_fitness_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_fitness_1") - return diff --git a/scripts/expertise/expertise_en_inspired_fitness_2.py b/scripts/expertise/expertise_en_inspired_fitness_2.py deleted file mode 100644 index 92101da2..00000000 --- a/scripts/expertise/expertise_en_inspired_fitness_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_fitness_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_fitness_2") - return diff --git a/scripts/expertise/expertise_en_inspired_fitness_3.py b/scripts/expertise/expertise_en_inspired_fitness_3.py deleted file mode 100644 index 91839161..00000000 --- a/scripts/expertise/expertise_en_inspired_fitness_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_fitness_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_fitness_3") - return diff --git a/scripts/expertise/expertise_en_inspired_fitness_4.py b/scripts/expertise/expertise_en_inspired_fitness_4.py deleted file mode 100644 index 649ae342..00000000 --- a/scripts/expertise/expertise_en_inspired_fitness_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_fitness_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_fitness_4") - return diff --git a/scripts/expertise/expertise_en_inspired_industry_1.py b/scripts/expertise/expertise_en_inspired_industry_1.py deleted file mode 100644 index f544cc87..00000000 --- a/scripts/expertise/expertise_en_inspired_industry_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_industry_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_industry_1") - return diff --git a/scripts/expertise/expertise_en_inspired_industry_2.py b/scripts/expertise/expertise_en_inspired_industry_2.py deleted file mode 100644 index 4c0f93d3..00000000 --- a/scripts/expertise/expertise_en_inspired_industry_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_industry_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_industry_2") - return diff --git a/scripts/expertise/expertise_en_inspired_industry_3.py b/scripts/expertise/expertise_en_inspired_industry_3.py deleted file mode 100644 index 619e0efa..00000000 --- a/scripts/expertise/expertise_en_inspired_industry_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_industry_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_industry_3") - return diff --git a/scripts/expertise/expertise_en_inspired_industry_4.py b/scripts/expertise/expertise_en_inspired_industry_4.py deleted file mode 100644 index 8a99a16c..00000000 --- a/scripts/expertise/expertise_en_inspired_industry_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_industry_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_industry_4") - return diff --git a/scripts/expertise/expertise_en_inspired_reactions_1.py b/scripts/expertise/expertise_en_inspired_reactions_1.py deleted file mode 100644 index 90e56a58..00000000 --- a/scripts/expertise/expertise_en_inspired_reactions_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_reactions_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_reactions_1") - return diff --git a/scripts/expertise/expertise_en_inspired_reactions_2.py b/scripts/expertise/expertise_en_inspired_reactions_2.py deleted file mode 100644 index 9fb0f596..00000000 --- a/scripts/expertise/expertise_en_inspired_reactions_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_reactions_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_reactions_2") - return diff --git a/scripts/expertise/expertise_en_inspired_reactions_3.py b/scripts/expertise/expertise_en_inspired_reactions_3.py deleted file mode 100644 index 0ae224f0..00000000 --- a/scripts/expertise/expertise_en_inspired_reactions_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_reactions_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_reactions_3") - return diff --git a/scripts/expertise/expertise_en_inspired_reactions_4.py b/scripts/expertise/expertise_en_inspired_reactions_4.py deleted file mode 100644 index c3818211..00000000 --- a/scripts/expertise/expertise_en_inspired_reactions_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_reactions_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_reactions_4") - return diff --git a/scripts/expertise/expertise_en_inspired_resilience_1.py b/scripts/expertise/expertise_en_inspired_resilience_1.py deleted file mode 100644 index c62a7767..00000000 --- a/scripts/expertise/expertise_en_inspired_resilience_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_resilience_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_resilience_1") - return diff --git a/scripts/expertise/expertise_en_inspired_resilience_2.py b/scripts/expertise/expertise_en_inspired_resilience_2.py deleted file mode 100644 index fe23ae90..00000000 --- a/scripts/expertise/expertise_en_inspired_resilience_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_resilience_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_resilience_2") - return diff --git a/scripts/expertise/expertise_en_inspired_resilience_3.py b/scripts/expertise/expertise_en_inspired_resilience_3.py deleted file mode 100644 index 1506e79b..00000000 --- a/scripts/expertise/expertise_en_inspired_resilience_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_resilience_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_resilience_3") - return diff --git a/scripts/expertise/expertise_en_inspired_resilience_4.py b/scripts/expertise/expertise_en_inspired_resilience_4.py deleted file mode 100644 index f6db50ad..00000000 --- a/scripts/expertise/expertise_en_inspired_resilience_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_resilience_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_resilience_4") - return diff --git a/scripts/expertise/expertise_en_inspired_warfare_1.py b/scripts/expertise/expertise_en_inspired_warfare_1.py deleted file mode 100644 index f1f8049e..00000000 --- a/scripts/expertise/expertise_en_inspired_warfare_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_warfare_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_warfare_1") - return diff --git a/scripts/expertise/expertise_en_inspired_warfare_2.py b/scripts/expertise/expertise_en_inspired_warfare_2.py deleted file mode 100644 index 541c27f1..00000000 --- a/scripts/expertise/expertise_en_inspired_warfare_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_warfare_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_warfare_2") - return diff --git a/scripts/expertise/expertise_en_inspired_warfare_3.py b/scripts/expertise/expertise_en_inspired_warfare_3.py deleted file mode 100644 index 00781c96..00000000 --- a/scripts/expertise/expertise_en_inspired_warfare_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_warfare_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_warfare_3") - return diff --git a/scripts/expertise/expertise_en_inspired_warfare_4.py b/scripts/expertise/expertise_en_inspired_warfare_4.py deleted file mode 100644 index 159615a1..00000000 --- a/scripts/expertise/expertise_en_inspired_warfare_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_inspired_warfare_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_inspired_warfare_4") - return diff --git a/scripts/expertise/expertise_en_intense_performer_1.py b/scripts/expertise/expertise_en_intense_performer_1.py deleted file mode 100644 index 4a064e58..00000000 --- a/scripts/expertise/expertise_en_intense_performer_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_intense_performer_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_intense_performer_1") - return diff --git a/scripts/expertise/expertise_en_intense_performer_2.py b/scripts/expertise/expertise_en_intense_performer_2.py deleted file mode 100644 index 6650519c..00000000 --- a/scripts/expertise/expertise_en_intense_performer_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_intense_performer_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_intense_performer_2") - return diff --git a/scripts/expertise/expertise_en_intense_performer_3.py b/scripts/expertise/expertise_en_intense_performer_3.py deleted file mode 100644 index 0c213a0d..00000000 --- a/scripts/expertise/expertise_en_intense_performer_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_intense_performer_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_intense_performer_3") - return diff --git a/scripts/expertise/expertise_en_intense_performer_4.py b/scripts/expertise/expertise_en_intense_performer_4.py deleted file mode 100644 index 82cf75e6..00000000 --- a/scripts/expertise/expertise_en_intense_performer_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_intense_performer_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_intense_performer_4") - return diff --git a/scripts/expertise/expertise_en_lasting_impression_1.py b/scripts/expertise/expertise_en_lasting_impression_1.py deleted file mode 100644 index cd2f80fe..00000000 --- a/scripts/expertise/expertise_en_lasting_impression_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_lasting_impression_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_lasting_impression_1") - return diff --git a/scripts/expertise/expertise_en_lasting_impression_2.py b/scripts/expertise/expertise_en_lasting_impression_2.py deleted file mode 100644 index 2c17365a..00000000 --- a/scripts/expertise/expertise_en_lasting_impression_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_lasting_impression_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_lasting_impression_2") - return diff --git a/scripts/expertise/expertise_en_lasting_impression_3.py b/scripts/expertise/expertise_en_lasting_impression_3.py deleted file mode 100644 index 2012d616..00000000 --- a/scripts/expertise/expertise_en_lasting_impression_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_lasting_impression_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_lasting_impression_3") - return diff --git a/scripts/expertise/expertise_en_lasting_impression_4.py b/scripts/expertise/expertise_en_lasting_impression_4.py deleted file mode 100644 index c90caf25..00000000 --- a/scripts/expertise/expertise_en_lasting_impression_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_lasting_impression_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_lasting_impression_4") - return diff --git a/scripts/expertise/expertise_en_rising_spirit_1.py b/scripts/expertise/expertise_en_rising_spirit_1.py deleted file mode 100644 index a2fda212..00000000 --- a/scripts/expertise/expertise_en_rising_spirit_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_rising_spirit_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_rising_spirit_1") - return diff --git a/scripts/expertise/expertise_en_rising_spirit_2.py b/scripts/expertise/expertise_en_rising_spirit_2.py deleted file mode 100644 index c7bafd45..00000000 --- a/scripts/expertise/expertise_en_rising_spirit_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_rising_spirit_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_rising_spirit_2") - return diff --git a/scripts/expertise/expertise_en_rising_spirit_3.py b/scripts/expertise/expertise_en_rising_spirit_3.py deleted file mode 100644 index 05f1324e..00000000 --- a/scripts/expertise/expertise_en_rising_spirit_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_rising_spirit_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_rising_spirit_3") - return diff --git a/scripts/expertise/expertise_en_rising_spirit_4.py b/scripts/expertise/expertise_en_rising_spirit_4.py deleted file mode 100644 index 3deb8a46..00000000 --- a/scripts/expertise/expertise_en_rising_spirit_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_rising_spirit_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_rising_spirit_4") - return diff --git a/scripts/expertise/expertise_en_show_stopper_1.py b/scripts/expertise/expertise_en_show_stopper_1.py deleted file mode 100644 index bb347a8e..00000000 --- a/scripts/expertise/expertise_en_show_stopper_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_show_stopper_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_show_stopper_1") - return diff --git a/scripts/expertise/expertise_en_show_stopper_2.py b/scripts/expertise/expertise_en_show_stopper_2.py deleted file mode 100644 index 99493ec7..00000000 --- a/scripts/expertise/expertise_en_show_stopper_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_show_stopper_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_show_stopper_2") - return diff --git a/scripts/expertise/expertise_en_show_stopper_3.py b/scripts/expertise/expertise_en_show_stopper_3.py deleted file mode 100644 index 4f70ff63..00000000 --- a/scripts/expertise/expertise_en_show_stopper_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_show_stopper_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_show_stopper_3") - return diff --git a/scripts/expertise/expertise_en_stage_presence_1.py b/scripts/expertise/expertise_en_stage_presence_1.py deleted file mode 100644 index 073086aa..00000000 --- a/scripts/expertise/expertise_en_stage_presence_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_stage_presence_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_stage_presence_1") - return diff --git a/scripts/expertise/expertise_en_stage_presence_2.py b/scripts/expertise/expertise_en_stage_presence_2.py deleted file mode 100644 index 95a28985..00000000 --- a/scripts/expertise/expertise_en_stage_presence_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_stage_presence_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_stage_presence_2") - return diff --git a/scripts/expertise/expertise_en_stage_presence_3.py b/scripts/expertise/expertise_en_stage_presence_3.py deleted file mode 100644 index 827f44ea..00000000 --- a/scripts/expertise/expertise_en_stage_presence_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_stage_presence_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_stage_presence_3") - return diff --git a/scripts/expertise/expertise_en_thought_as_action_1.py b/scripts/expertise/expertise_en_thought_as_action_1.py deleted file mode 100644 index 8d109903..00000000 --- a/scripts/expertise/expertise_en_thought_as_action_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_thought_as_action_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_thought_as_action_1") - return diff --git a/scripts/expertise/expertise_en_thought_as_action_2.py b/scripts/expertise/expertise_en_thought_as_action_2.py deleted file mode 100644 index bd397576..00000000 --- a/scripts/expertise/expertise_en_thought_as_action_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_thought_as_action_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_thought_as_action_2") - return diff --git a/scripts/expertise/expertise_en_thought_as_action_3.py b/scripts/expertise/expertise_en_thought_as_action_3.py deleted file mode 100644 index abbee833..00000000 --- a/scripts/expertise/expertise_en_thought_as_action_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_thought_as_action_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_thought_as_action_3") - return diff --git a/scripts/expertise/expertise_en_thought_as_action_4.py b/scripts/expertise/expertise_en_thought_as_action_4.py deleted file mode 100644 index 76958de5..00000000 --- a/scripts/expertise/expertise_en_thought_as_action_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_thought_as_action_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_thought_as_action_4") - return diff --git a/scripts/expertise/expertise_en_to_the_hilt_1.py b/scripts/expertise/expertise_en_to_the_hilt_1.py deleted file mode 100644 index 18db5e7d..00000000 --- a/scripts/expertise/expertise_en_to_the_hilt_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_to_the_hilt_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_to_the_hilt_1") - return diff --git a/scripts/expertise/expertise_en_to_the_hilt_2.py b/scripts/expertise/expertise_en_to_the_hilt_2.py deleted file mode 100644 index 5546a211..00000000 --- a/scripts/expertise/expertise_en_to_the_hilt_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_to_the_hilt_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_to_the_hilt_2") - return diff --git a/scripts/expertise/expertise_en_uprising_1.py b/scripts/expertise/expertise_en_uprising_1.py deleted file mode 100644 index dc55de01..00000000 --- a/scripts/expertise/expertise_en_uprising_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_uprising_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_uprising_1") - return diff --git a/scripts/expertise/expertise_en_uprising_2.py b/scripts/expertise/expertise_en_uprising_2.py deleted file mode 100644 index 5540f85b..00000000 --- a/scripts/expertise/expertise_en_uprising_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_en_uprising_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_en_uprising_2") - return diff --git a/scripts/expertise/expertise_engineering_artisan_advanced_theory_1.py b/scripts/expertise/expertise_engineering_artisan_advanced_theory_1.py deleted file mode 100644 index bd6b7454..00000000 --- a/scripts/expertise/expertise_engineering_artisan_advanced_theory_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_artisan_advanced_theory_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_artisan_advanced_theory_1") - return diff --git a/scripts/expertise/expertise_engineering_artisan_dexterity_1.py b/scripts/expertise/expertise_engineering_artisan_dexterity_1.py deleted file mode 100644 index 3e103c16..00000000 --- a/scripts/expertise/expertise_engineering_artisan_dexterity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_artisan_dexterity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_artisan_dexterity_1") - return diff --git a/scripts/expertise/expertise_engineering_artisan_dexterity_2.py b/scripts/expertise/expertise_engineering_artisan_dexterity_2.py deleted file mode 100644 index 50edc60b..00000000 --- a/scripts/expertise/expertise_engineering_artisan_dexterity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_artisan_dexterity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_artisan_dexterity_2") - return diff --git a/scripts/expertise/expertise_engineering_artisan_dexterity_3.py b/scripts/expertise/expertise_engineering_artisan_dexterity_3.py deleted file mode 100644 index 0cd8c37e..00000000 --- a/scripts/expertise/expertise_engineering_artisan_dexterity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_artisan_dexterity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_artisan_dexterity_3") - return diff --git a/scripts/expertise/expertise_engineering_artisan_dexterity_4.py b/scripts/expertise/expertise_engineering_artisan_dexterity_4.py deleted file mode 100644 index 34c64977..00000000 --- a/scripts/expertise/expertise_engineering_artisan_dexterity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_artisan_dexterity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_artisan_dexterity_4") - return diff --git a/scripts/expertise/expertise_engineering_artisan_hypothesis_1.py b/scripts/expertise/expertise_engineering_artisan_hypothesis_1.py deleted file mode 100644 index c2daa093..00000000 --- a/scripts/expertise/expertise_engineering_artisan_hypothesis_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_artisan_hypothesis_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_artisan_hypothesis_1") - return diff --git a/scripts/expertise/expertise_engineering_artisan_hypothesis_2.py b/scripts/expertise/expertise_engineering_artisan_hypothesis_2.py deleted file mode 100644 index 96592a1b..00000000 --- a/scripts/expertise/expertise_engineering_artisan_hypothesis_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_artisan_hypothesis_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_artisan_hypothesis_2") - return diff --git a/scripts/expertise/expertise_engineering_artisan_hypothesis_3.py b/scripts/expertise/expertise_engineering_artisan_hypothesis_3.py deleted file mode 100644 index e4f6a8b1..00000000 --- a/scripts/expertise/expertise_engineering_artisan_hypothesis_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_artisan_hypothesis_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_artisan_hypothesis_3") - return diff --git a/scripts/expertise/expertise_engineering_artisan_hypothesis_4.py b/scripts/expertise/expertise_engineering_artisan_hypothesis_4.py deleted file mode 100644 index 95f93fbd..00000000 --- a/scripts/expertise/expertise_engineering_artisan_hypothesis_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_artisan_hypothesis_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_artisan_hypothesis_4") - return diff --git a/scripts/expertise/expertise_engineering_cybernetic_advanced_theory_1.py b/scripts/expertise/expertise_engineering_cybernetic_advanced_theory_1.py deleted file mode 100644 index e7cf240d..00000000 --- a/scripts/expertise/expertise_engineering_cybernetic_advanced_theory_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_cybernetic_advanced_theory_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_cybernetic_advanced_theory_1") - return diff --git a/scripts/expertise/expertise_engineering_cybernetic_hypothesis_1.py b/scripts/expertise/expertise_engineering_cybernetic_hypothesis_1.py deleted file mode 100644 index bbf9682e..00000000 --- a/scripts/expertise/expertise_engineering_cybernetic_hypothesis_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_cybernetic_hypothesis_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_cybernetic_hypothesis_1") - return diff --git a/scripts/expertise/expertise_engineering_cybernetic_hypothesis_2.py b/scripts/expertise/expertise_engineering_cybernetic_hypothesis_2.py deleted file mode 100644 index 6c7d6b20..00000000 --- a/scripts/expertise/expertise_engineering_cybernetic_hypothesis_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_cybernetic_hypothesis_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_cybernetic_hypothesis_2") - return diff --git a/scripts/expertise/expertise_engineering_cybernetic_hypothesis_3.py b/scripts/expertise/expertise_engineering_cybernetic_hypothesis_3.py deleted file mode 100644 index fc963038..00000000 --- a/scripts/expertise/expertise_engineering_cybernetic_hypothesis_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_cybernetic_hypothesis_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_cybernetic_hypothesis_3") - return diff --git a/scripts/expertise/expertise_engineering_cybernetic_hypothesis_4.py b/scripts/expertise/expertise_engineering_cybernetic_hypothesis_4.py deleted file mode 100644 index 4f15a6d8..00000000 --- a/scripts/expertise/expertise_engineering_cybernetic_hypothesis_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_cybernetic_hypothesis_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_cybernetic_hypothesis_4") - return diff --git a/scripts/expertise/expertise_engineering_cybernetic_negative_effects_reduction_1.py b/scripts/expertise/expertise_engineering_cybernetic_negative_effects_reduction_1.py deleted file mode 100644 index 658dd7df..00000000 --- a/scripts/expertise/expertise_engineering_cybernetic_negative_effects_reduction_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_cybernetic_negative_effects_reduction_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_cybernetic_negative_effects_reduction_1") - return diff --git a/scripts/expertise/expertise_engineering_cybernetic_negative_effects_reduction_2.py b/scripts/expertise/expertise_engineering_cybernetic_negative_effects_reduction_2.py deleted file mode 100644 index d04160b0..00000000 --- a/scripts/expertise/expertise_engineering_cybernetic_negative_effects_reduction_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_cybernetic_negative_effects_reduction_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_cybernetic_negative_effects_reduction_2") - return diff --git a/scripts/expertise/expertise_engineering_cybernetic_negative_effects_reduction_3.py b/scripts/expertise/expertise_engineering_cybernetic_negative_effects_reduction_3.py deleted file mode 100644 index 9c98e65b..00000000 --- a/scripts/expertise/expertise_engineering_cybernetic_negative_effects_reduction_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_cybernetic_negative_effects_reduction_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_cybernetic_negative_effects_reduction_3") - return diff --git a/scripts/expertise/expertise_engineering_cybernetic_negative_effects_reduction_4.py b/scripts/expertise/expertise_engineering_cybernetic_negative_effects_reduction_4.py deleted file mode 100644 index 93bd0c81..00000000 --- a/scripts/expertise/expertise_engineering_cybernetic_negative_effects_reduction_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_cybernetic_negative_effects_reduction_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_cybernetic_negative_effects_reduction_4") - return diff --git a/scripts/expertise/expertise_engineering_cybernetic_s03_schematics_1.py b/scripts/expertise/expertise_engineering_cybernetic_s03_schematics_1.py deleted file mode 100644 index 59dacda7..00000000 --- a/scripts/expertise/expertise_engineering_cybernetic_s03_schematics_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_cybernetic_s03_schematics_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_cybernetic_s03_schematics_1") - return diff --git a/scripts/expertise/expertise_engineering_droid_advanced_theory_1.py b/scripts/expertise/expertise_engineering_droid_advanced_theory_1.py deleted file mode 100644 index 8435fcae..00000000 --- a/scripts/expertise/expertise_engineering_droid_advanced_theory_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_advanced_theory_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_advanced_theory_1") - return diff --git a/scripts/expertise/expertise_engineering_droid_dexterity_1.py b/scripts/expertise/expertise_engineering_droid_dexterity_1.py deleted file mode 100644 index 58da3ce9..00000000 --- a/scripts/expertise/expertise_engineering_droid_dexterity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_dexterity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_dexterity_1") - return diff --git a/scripts/expertise/expertise_engineering_droid_dexterity_2.py b/scripts/expertise/expertise_engineering_droid_dexterity_2.py deleted file mode 100644 index 5608862f..00000000 --- a/scripts/expertise/expertise_engineering_droid_dexterity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_dexterity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_dexterity_2") - return diff --git a/scripts/expertise/expertise_engineering_droid_dexterity_3.py b/scripts/expertise/expertise_engineering_droid_dexterity_3.py deleted file mode 100644 index a5f8e6df..00000000 --- a/scripts/expertise/expertise_engineering_droid_dexterity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_dexterity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_dexterity_3") - return diff --git a/scripts/expertise/expertise_engineering_droid_dexterity_4.py b/scripts/expertise/expertise_engineering_droid_dexterity_4.py deleted file mode 100644 index ce65339b..00000000 --- a/scripts/expertise/expertise_engineering_droid_dexterity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_dexterity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_dexterity_4") - return diff --git a/scripts/expertise/expertise_engineering_droid_hypothesis_1.py b/scripts/expertise/expertise_engineering_droid_hypothesis_1.py deleted file mode 100644 index 71ad763c..00000000 --- a/scripts/expertise/expertise_engineering_droid_hypothesis_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_hypothesis_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_hypothesis_1") - return diff --git a/scripts/expertise/expertise_engineering_droid_hypothesis_2.py b/scripts/expertise/expertise_engineering_droid_hypothesis_2.py deleted file mode 100644 index 56645f9b..00000000 --- a/scripts/expertise/expertise_engineering_droid_hypothesis_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_hypothesis_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_hypothesis_2") - return diff --git a/scripts/expertise/expertise_engineering_droid_hypothesis_3.py b/scripts/expertise/expertise_engineering_droid_hypothesis_3.py deleted file mode 100644 index dc413239..00000000 --- a/scripts/expertise/expertise_engineering_droid_hypothesis_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_hypothesis_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_hypothesis_3") - return diff --git a/scripts/expertise/expertise_engineering_droid_hypothesis_4.py b/scripts/expertise/expertise_engineering_droid_hypothesis_4.py deleted file mode 100644 index 7b5af620..00000000 --- a/scripts/expertise/expertise_engineering_droid_hypothesis_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_hypothesis_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_hypothesis_4") - return diff --git a/scripts/expertise/expertise_engineering_droid_insight_1.py b/scripts/expertise/expertise_engineering_droid_insight_1.py deleted file mode 100644 index 6209cf4e..00000000 --- a/scripts/expertise/expertise_engineering_droid_insight_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_insight_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_insight_1") - return diff --git a/scripts/expertise/expertise_engineering_droid_insight_2.py b/scripts/expertise/expertise_engineering_droid_insight_2.py deleted file mode 100644 index cfd7d326..00000000 --- a/scripts/expertise/expertise_engineering_droid_insight_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_insight_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_insight_2") - return diff --git a/scripts/expertise/expertise_engineering_droid_keen_understanding_1.py b/scripts/expertise/expertise_engineering_droid_keen_understanding_1.py deleted file mode 100644 index 471b9cf0..00000000 --- a/scripts/expertise/expertise_engineering_droid_keen_understanding_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_keen_understanding_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_keen_understanding_1") - return diff --git a/scripts/expertise/expertise_engineering_droid_keen_understanding_2.py b/scripts/expertise/expertise_engineering_droid_keen_understanding_2.py deleted file mode 100644 index c7bd1ede..00000000 --- a/scripts/expertise/expertise_engineering_droid_keen_understanding_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_keen_understanding_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_keen_understanding_2") - return diff --git a/scripts/expertise/expertise_engineering_droid_schematic_1_1.py b/scripts/expertise/expertise_engineering_droid_schematic_1_1.py deleted file mode 100644 index c9a0234c..00000000 --- a/scripts/expertise/expertise_engineering_droid_schematic_1_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_schematic_1_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_schematic_1_1") - return diff --git a/scripts/expertise/expertise_engineering_droid_schematic_2_1.py b/scripts/expertise/expertise_engineering_droid_schematic_2_1.py deleted file mode 100644 index c7e1a68f..00000000 --- a/scripts/expertise/expertise_engineering_droid_schematic_2_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_droid_schematic_2_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_droid_schematic_2_1") - return diff --git a/scripts/expertise/expertise_engineering_resource_processing_1.py b/scripts/expertise/expertise_engineering_resource_processing_1.py deleted file mode 100644 index 38aa0595..00000000 --- a/scripts/expertise/expertise_engineering_resource_processing_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_resource_processing_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_resource_processing_1") - return diff --git a/scripts/expertise/expertise_engineering_resource_processing_2.py b/scripts/expertise/expertise_engineering_resource_processing_2.py deleted file mode 100644 index 0e561add..00000000 --- a/scripts/expertise/expertise_engineering_resource_processing_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_resource_processing_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_resource_processing_2") - return diff --git a/scripts/expertise/expertise_engineering_resource_refinement_1.py b/scripts/expertise/expertise_engineering_resource_refinement_1.py deleted file mode 100644 index 476a968e..00000000 --- a/scripts/expertise/expertise_engineering_resource_refinement_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_resource_refinement_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_resource_refinement_1") - return diff --git a/scripts/expertise/expertise_engineering_resource_refinement_2.py b/scripts/expertise/expertise_engineering_resource_refinement_2.py deleted file mode 100644 index 80b22ec3..00000000 --- a/scripts/expertise/expertise_engineering_resource_refinement_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_resource_refinement_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_resource_refinement_2") - return diff --git a/scripts/expertise/expertise_engineering_weaponsmith_attachment_upgrade_1.py b/scripts/expertise/expertise_engineering_weaponsmith_attachment_upgrade_1.py deleted file mode 100644 index 8045a598..00000000 --- a/scripts/expertise/expertise_engineering_weaponsmith_attachment_upgrade_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_weaponsmith_attachment_upgrade_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_weaponsmith_attachment_upgrade_1") - return diff --git a/scripts/expertise/expertise_engineering_weaponsmith_socket_bonus_1.py b/scripts/expertise/expertise_engineering_weaponsmith_socket_bonus_1.py deleted file mode 100644 index 7fbbb3d1..00000000 --- a/scripts/expertise/expertise_engineering_weaponsmith_socket_bonus_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_engineering_weaponsmith_socket_bonus_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_engineering_weaponsmith_socket_bonus_1") - return diff --git a/scripts/expertise/expertise_fs_general_alacrity_1.py b/scripts/expertise/expertise_fs_general_alacrity_1.py deleted file mode 100644 index b69a7bc6..00000000 --- a/scripts/expertise/expertise_fs_general_alacrity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_alacrity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_alacrity_1") - return diff --git a/scripts/expertise/expertise_fs_general_alacrity_2.py b/scripts/expertise/expertise_fs_general_alacrity_2.py deleted file mode 100644 index 3c5d3f66..00000000 --- a/scripts/expertise/expertise_fs_general_alacrity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_alacrity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_alacrity_2") - return diff --git a/scripts/expertise/expertise_fs_general_alacrity_3.py b/scripts/expertise/expertise_fs_general_alacrity_3.py deleted file mode 100644 index 58282db9..00000000 --- a/scripts/expertise/expertise_fs_general_alacrity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_alacrity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_alacrity_3") - return diff --git a/scripts/expertise/expertise_fs_general_alacrity_4.py b/scripts/expertise/expertise_fs_general_alacrity_4.py deleted file mode 100644 index 641990c1..00000000 --- a/scripts/expertise/expertise_fs_general_alacrity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_alacrity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_alacrity_4") - return diff --git a/scripts/expertise/expertise_fs_general_enhanced_agility_1.py b/scripts/expertise/expertise_fs_general_enhanced_agility_1.py deleted file mode 100644 index b4133b1b..00000000 --- a/scripts/expertise/expertise_fs_general_enhanced_agility_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_enhanced_agility_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_enhanced_agility_1") - return diff --git a/scripts/expertise/expertise_fs_general_enhanced_agility_2.py b/scripts/expertise/expertise_fs_general_enhanced_agility_2.py deleted file mode 100644 index 48301d52..00000000 --- a/scripts/expertise/expertise_fs_general_enhanced_agility_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_enhanced_agility_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_enhanced_agility_2") - return diff --git a/scripts/expertise/expertise_fs_general_enhanced_constitution_1.py b/scripts/expertise/expertise_fs_general_enhanced_constitution_1.py deleted file mode 100644 index 5521929c..00000000 --- a/scripts/expertise/expertise_fs_general_enhanced_constitution_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_enhanced_constitution_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_enhanced_constitution_1") - return diff --git a/scripts/expertise/expertise_fs_general_enhanced_constitution_2.py b/scripts/expertise/expertise_fs_general_enhanced_constitution_2.py deleted file mode 100644 index f800a526..00000000 --- a/scripts/expertise/expertise_fs_general_enhanced_constitution_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_enhanced_constitution_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_enhanced_constitution_2") - return diff --git a/scripts/expertise/expertise_fs_general_enhanced_stamina_1.py b/scripts/expertise/expertise_fs_general_enhanced_stamina_1.py deleted file mode 100644 index 28be7fc3..00000000 --- a/scripts/expertise/expertise_fs_general_enhanced_stamina_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_enhanced_stamina_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_enhanced_stamina_1") - return diff --git a/scripts/expertise/expertise_fs_general_enhanced_stamina_2.py b/scripts/expertise/expertise_fs_general_enhanced_stamina_2.py deleted file mode 100644 index 57ad1cd6..00000000 --- a/scripts/expertise/expertise_fs_general_enhanced_stamina_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_enhanced_stamina_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_enhanced_stamina_2") - return diff --git a/scripts/expertise/expertise_fs_general_enhanced_strength_1.py b/scripts/expertise/expertise_fs_general_enhanced_strength_1.py deleted file mode 100644 index 881f9819..00000000 --- a/scripts/expertise/expertise_fs_general_enhanced_strength_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_enhanced_strength_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_enhanced_strength_1") - return diff --git a/scripts/expertise/expertise_fs_general_enhanced_strength_2.py b/scripts/expertise/expertise_fs_general_enhanced_strength_2.py deleted file mode 100644 index fed1b59a..00000000 --- a/scripts/expertise/expertise_fs_general_enhanced_strength_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_enhanced_strength_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_enhanced_strength_2") - return diff --git a/scripts/expertise/expertise_fs_general_exacting_strikes_1.py b/scripts/expertise/expertise_fs_general_exacting_strikes_1.py deleted file mode 100644 index 91ea8275..00000000 --- a/scripts/expertise/expertise_fs_general_exacting_strikes_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_exacting_strike_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_exacting_strike_1") - return diff --git a/scripts/expertise/expertise_fs_general_exacting_strikes_2.py b/scripts/expertise/expertise_fs_general_exacting_strikes_2.py deleted file mode 100644 index c28e666c..00000000 --- a/scripts/expertise/expertise_fs_general_exacting_strikes_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_exacting_strike_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_exacting_strike_2") - return diff --git a/scripts/expertise/expertise_fs_general_exacting_strikes_3.py b/scripts/expertise/expertise_fs_general_exacting_strikes_3.py deleted file mode 100644 index 5e711192..00000000 --- a/scripts/expertise/expertise_fs_general_exacting_strikes_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_exacting_strike_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_exacting_strike_3") - return diff --git a/scripts/expertise/expertise_fs_general_exacting_strikes_4.py b/scripts/expertise/expertise_fs_general_exacting_strikes_4.py deleted file mode 100644 index 86f573c0..00000000 --- a/scripts/expertise/expertise_fs_general_exacting_strikes_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_exacting_strike_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_exacting_strike_4") - return diff --git a/scripts/expertise/expertise_fs_general_fidelity_1.py b/scripts/expertise/expertise_fs_general_fidelity_1.py deleted file mode 100644 index 9817071f..00000000 --- a/scripts/expertise/expertise_fs_general_fidelity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_fidelity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_fidelity_1") - return diff --git a/scripts/expertise/expertise_fs_general_fidelity_2.py b/scripts/expertise/expertise_fs_general_fidelity_2.py deleted file mode 100644 index 19abb94c..00000000 --- a/scripts/expertise/expertise_fs_general_fidelity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_fidelity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_fidelity_2") - return diff --git a/scripts/expertise/expertise_fs_general_grace_in_motion_1.py b/scripts/expertise/expertise_fs_general_grace_in_motion_1.py deleted file mode 100644 index 1bc3e355..00000000 --- a/scripts/expertise/expertise_fs_general_grace_in_motion_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_grace_in_motion_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_grace_in_motion_1") - return diff --git a/scripts/expertise/expertise_fs_general_grace_in_motion_2.py b/scripts/expertise/expertise_fs_general_grace_in_motion_2.py deleted file mode 100644 index fa2a708a..00000000 --- a/scripts/expertise/expertise_fs_general_grace_in_motion_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_grace_in_motion_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_grace_in_motion_2") - return diff --git a/scripts/expertise/expertise_fs_general_grace_in_motion_3.py b/scripts/expertise/expertise_fs_general_grace_in_motion_3.py deleted file mode 100644 index ea60fbe1..00000000 --- a/scripts/expertise/expertise_fs_general_grace_in_motion_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_grace_in_motion_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_grace_in_motion_3") - return diff --git a/scripts/expertise/expertise_fs_general_heightened_speed_1.py b/scripts/expertise/expertise_fs_general_heightened_speed_1.py deleted file mode 100644 index aa3be1b3..00000000 --- a/scripts/expertise/expertise_fs_general_heightened_speed_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_heightened_speed_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_heightened_speed_1") - return diff --git a/scripts/expertise/expertise_fs_general_heightened_speed_2.py b/scripts/expertise/expertise_fs_general_heightened_speed_2.py deleted file mode 100644 index 245c3478..00000000 --- a/scripts/expertise/expertise_fs_general_heightened_speed_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_heightened_speed_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_heightened_speed_2") - return diff --git a/scripts/expertise/expertise_fs_general_heightened_speed_3.py b/scripts/expertise/expertise_fs_general_heightened_speed_3.py deleted file mode 100644 index e5517964..00000000 --- a/scripts/expertise/expertise_fs_general_heightened_speed_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_heightened_speed_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_heightened_speed_3") - return diff --git a/scripts/expertise/expertise_fs_general_heightened_speed_4.py b/scripts/expertise/expertise_fs_general_heightened_speed_4.py deleted file mode 100644 index e49ae9b4..00000000 --- a/scripts/expertise/expertise_fs_general_heightened_speed_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_heightened_speed_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_heightened_speed_4") - return diff --git a/scripts/expertise/expertise_fs_general_improved_crippling_accuracy_1.py b/scripts/expertise/expertise_fs_general_improved_crippling_accuracy_1.py deleted file mode 100644 index 16c4a122..00000000 --- a/scripts/expertise/expertise_fs_general_improved_crippling_accuracy_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_improved_crippling_accuracy_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_improved_crippling_accuracy_1") - return diff --git a/scripts/expertise/expertise_fs_general_improved_crippling_accuracy_2.py b/scripts/expertise/expertise_fs_general_improved_crippling_accuracy_2.py deleted file mode 100644 index 1ca0b65b..00000000 --- a/scripts/expertise/expertise_fs_general_improved_crippling_accuracy_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_improved_crippling_accuracy_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_improved_crippling_accuracy_2") - return diff --git a/scripts/expertise/expertise_fs_general_improved_crippling_accuracy_3.py b/scripts/expertise/expertise_fs_general_improved_crippling_accuracy_3.py deleted file mode 100644 index 51018497..00000000 --- a/scripts/expertise/expertise_fs_general_improved_crippling_accuracy_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_improved_crippling_accuracy_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_improved_crippling_accuracy_3") - return diff --git a/scripts/expertise/expertise_fs_general_improved_force_cloak_1.py b/scripts/expertise/expertise_fs_general_improved_force_cloak_1.py deleted file mode 100644 index bd140591..00000000 --- a/scripts/expertise/expertise_fs_general_improved_force_cloak_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_improved_force_cloak_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_improved_force_cloak_1") - return diff --git a/scripts/expertise/expertise_fs_general_improved_force_shockwave_1.py b/scripts/expertise/expertise_fs_general_improved_force_shockwave_1.py deleted file mode 100644 index 0c675358..00000000 --- a/scripts/expertise/expertise_fs_general_improved_force_shockwave_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_improved_force_shockwave_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_improved_force_shockwave_1") - return diff --git a/scripts/expertise/expertise_fs_general_improved_force_shockwave_2.py b/scripts/expertise/expertise_fs_general_improved_force_shockwave_2.py deleted file mode 100644 index e47b87b3..00000000 --- a/scripts/expertise/expertise_fs_general_improved_force_shockwave_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_improved_force_shockwave_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_improved_force_shockwave_2") - return diff --git a/scripts/expertise/expertise_fs_general_improved_force_shockwave_3.py b/scripts/expertise/expertise_fs_general_improved_force_shockwave_3.py deleted file mode 100644 index c7293502..00000000 --- a/scripts/expertise/expertise_fs_general_improved_force_shockwave_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_improved_force_shockwave_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_improved_force_shockwave_3") - return diff --git a/scripts/expertise/expertise_fs_general_improved_force_throw_1.py b/scripts/expertise/expertise_fs_general_improved_force_throw_1.py deleted file mode 100644 index 07264c82..00000000 --- a/scripts/expertise/expertise_fs_general_improved_force_throw_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_improved_force_throw_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_improved_force_throw_1") - return diff --git a/scripts/expertise/expertise_fs_general_improved_force_throw_2.py b/scripts/expertise/expertise_fs_general_improved_force_throw_2.py deleted file mode 100644 index 1d5d428b..00000000 --- a/scripts/expertise/expertise_fs_general_improved_force_throw_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_improved_force_throw_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_improved_force_throw_2") - return diff --git a/scripts/expertise/expertise_fs_general_improved_saber_block_1.py b/scripts/expertise/expertise_fs_general_improved_saber_block_1.py deleted file mode 100644 index 41596ad9..00000000 --- a/scripts/expertise/expertise_fs_general_improved_saber_block_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_improved_saber_block_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_improved_saber_block_1") - return diff --git a/scripts/expertise/expertise_fs_general_improved_saber_block_2.py b/scripts/expertise/expertise_fs_general_improved_saber_block_2.py deleted file mode 100644 index abc2f012..00000000 --- a/scripts/expertise/expertise_fs_general_improved_saber_block_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_improved_saber_block_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_improved_saber_block_2") - return diff --git a/scripts/expertise/expertise_fs_general_improved_saber_block_3.py b/scripts/expertise/expertise_fs_general_improved_saber_block_3.py deleted file mode 100644 index 37892890..00000000 --- a/scripts/expertise/expertise_fs_general_improved_saber_block_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_improved_saber_block_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_improved_saber_block_3") - return diff --git a/scripts/expertise/expertise_fs_general_incisiveness_1.py b/scripts/expertise/expertise_fs_general_incisiveness_1.py deleted file mode 100644 index b872f06e..00000000 --- a/scripts/expertise/expertise_fs_general_incisiveness_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_incisiveness_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_incisiveness_1") - return diff --git a/scripts/expertise/expertise_fs_general_incisiveness_2.py b/scripts/expertise/expertise_fs_general_incisiveness_2.py deleted file mode 100644 index 7d397ae3..00000000 --- a/scripts/expertise/expertise_fs_general_incisiveness_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_incisiveness_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_incisiveness_2") - return diff --git a/scripts/expertise/expertise_fs_general_incisiveness_3.py b/scripts/expertise/expertise_fs_general_incisiveness_3.py deleted file mode 100644 index 58ea449d..00000000 --- a/scripts/expertise/expertise_fs_general_incisiveness_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_incisiveness_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_incisiveness_3") - return diff --git a/scripts/expertise/expertise_fs_general_premonition_1.py b/scripts/expertise/expertise_fs_general_premonition_1.py deleted file mode 100644 index c5510629..00000000 --- a/scripts/expertise/expertise_fs_general_premonition_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_premonition_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_premonition_1") - return diff --git a/scripts/expertise/expertise_fs_general_premonition_2.py b/scripts/expertise/expertise_fs_general_premonition_2.py deleted file mode 100644 index ac6cbe24..00000000 --- a/scripts/expertise/expertise_fs_general_premonition_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_premonition_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_premonition_2") - return diff --git a/scripts/expertise/expertise_fs_general_premonition_3.py b/scripts/expertise/expertise_fs_general_premonition_3.py deleted file mode 100644 index 4bfaf6eb..00000000 --- a/scripts/expertise/expertise_fs_general_premonition_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_premonition_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_premonition_3") - return diff --git a/scripts/expertise/expertise_fs_general_premonition_4.py b/scripts/expertise/expertise_fs_general_premonition_4.py deleted file mode 100644 index 751255e1..00000000 --- a/scripts/expertise/expertise_fs_general_premonition_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_premonition_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_premonition_4") - return diff --git a/scripts/expertise/expertise_fs_general_second_wind_1.py b/scripts/expertise/expertise_fs_general_second_wind_1.py deleted file mode 100644 index 90120855..00000000 --- a/scripts/expertise/expertise_fs_general_second_wind_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_second_wind_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_second_wind_1") - return diff --git a/scripts/expertise/expertise_fs_general_second_wind_2.py b/scripts/expertise/expertise_fs_general_second_wind_2.py deleted file mode 100644 index 5dc1cf7a..00000000 --- a/scripts/expertise/expertise_fs_general_second_wind_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_general_second_wind_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_general_second_wind_2") - return diff --git a/scripts/expertise/expertise_fs_general_stance_saber_block_1.py b/scripts/expertise/expertise_fs_general_stance_saber_block_1.py deleted file mode 100644 index 01313e59..00000000 --- a/scripts/expertise/expertise_fs_general_stance_saber_block_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("saberBlock") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("saberBlock") - return diff --git a/scripts/expertise/expertise_fs_path_anticipate_aggression_1.py b/scripts/expertise/expertise_fs_path_anticipate_aggression_1.py deleted file mode 100644 index ac447738..00000000 --- a/scripts/expertise/expertise_fs_path_anticipate_aggression_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_anticipate_aggression_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_anticipate_aggression_1") - return diff --git a/scripts/expertise/expertise_fs_path_anticipate_aggression_2.py b/scripts/expertise/expertise_fs_path_anticipate_aggression_2.py deleted file mode 100644 index da421e8b..00000000 --- a/scripts/expertise/expertise_fs_path_anticipate_aggression_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_anticipate_aggression_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_anticipate_aggression_2") - return diff --git a/scripts/expertise/expertise_fs_path_brutality_1.py b/scripts/expertise/expertise_fs_path_brutality_1.py deleted file mode 100644 index b583d402..00000000 --- a/scripts/expertise/expertise_fs_path_brutality_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_brutality_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_brutality_1") - return diff --git a/scripts/expertise/expertise_fs_path_brutality_2.py b/scripts/expertise/expertise_fs_path_brutality_2.py deleted file mode 100644 index 06c05ccd..00000000 --- a/scripts/expertise/expertise_fs_path_brutality_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_brutality_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_brutality_2") - return diff --git a/scripts/expertise/expertise_fs_path_brutality_3.py b/scripts/expertise/expertise_fs_path_brutality_3.py deleted file mode 100644 index 63954836..00000000 --- a/scripts/expertise/expertise_fs_path_brutality_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_brutality_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_brutality_3") - return diff --git a/scripts/expertise/expertise_fs_path_brutality_4.py b/scripts/expertise/expertise_fs_path_brutality_4.py deleted file mode 100644 index c922074e..00000000 --- a/scripts/expertise/expertise_fs_path_brutality_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_brutality_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_brutality_4") - return diff --git a/scripts/expertise/expertise_fs_path_cautious_nature_1.py b/scripts/expertise/expertise_fs_path_cautious_nature_1.py deleted file mode 100644 index d4d90133..00000000 --- a/scripts/expertise/expertise_fs_path_cautious_nature_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_cautious_nature_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_cautious_nature_1") - return diff --git a/scripts/expertise/expertise_fs_path_cautious_nature_2.py b/scripts/expertise/expertise_fs_path_cautious_nature_2.py deleted file mode 100644 index 112514fd..00000000 --- a/scripts/expertise/expertise_fs_path_cautious_nature_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_cautious_nature_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_cautious_nature_2") - return diff --git a/scripts/expertise/expertise_fs_path_cautious_nature_3.py b/scripts/expertise/expertise_fs_path_cautious_nature_3.py deleted file mode 100644 index 05183a16..00000000 --- a/scripts/expertise/expertise_fs_path_cautious_nature_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_cautious_nature_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_cautious_nature_3") - return diff --git a/scripts/expertise/expertise_fs_path_cautious_nature_4.py b/scripts/expertise/expertise_fs_path_cautious_nature_4.py deleted file mode 100644 index d5f122dd..00000000 --- a/scripts/expertise/expertise_fs_path_cautious_nature_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_cautious_nature_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_cautious_nature_4") - return diff --git a/scripts/expertise/expertise_fs_path_expansive_trickery_1.py b/scripts/expertise/expertise_fs_path_expansive_trickery_1.py deleted file mode 100644 index f58232ed..00000000 --- a/scripts/expertise/expertise_fs_path_expansive_trickery_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_expensive_trickery_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_expensive_trickery_2") - return diff --git a/scripts/expertise/expertise_fs_path_force_clarity_1.py b/scripts/expertise/expertise_fs_path_force_clarity_1.py deleted file mode 100644 index f511c020..00000000 --- a/scripts/expertise/expertise_fs_path_force_clarity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_force_clarity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_force_clarity_1") - return diff --git a/scripts/expertise/expertise_fs_path_improved_force_choke_1.py b/scripts/expertise/expertise_fs_path_improved_force_choke_1.py deleted file mode 100644 index 6aef5ed0..00000000 --- a/scripts/expertise/expertise_fs_path_improved_force_choke_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_improved_force_choke_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_improved_force_choke_1") - return diff --git a/scripts/expertise/expertise_fs_path_improved_force_choke_2.py b/scripts/expertise/expertise_fs_path_improved_force_choke_2.py deleted file mode 100644 index dc0cb249..00000000 --- a/scripts/expertise/expertise_fs_path_improved_force_choke_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_improved_force_choke_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_improved_force_choke_2") - return diff --git a/scripts/expertise/expertise_fs_path_improved_force_drain_1.py b/scripts/expertise/expertise_fs_path_improved_force_drain_1.py deleted file mode 100644 index 425f98c3..00000000 --- a/scripts/expertise/expertise_fs_path_improved_force_drain_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_improved_force_drain_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_improved_force_drain_1") - return diff --git a/scripts/expertise/expertise_fs_path_improved_force_drain_2.py b/scripts/expertise/expertise_fs_path_improved_force_drain_2.py deleted file mode 100644 index a155578f..00000000 --- a/scripts/expertise/expertise_fs_path_improved_force_drain_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_improved_force_drain_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_improved_force_drain_2") - return diff --git a/scripts/expertise/expertise_fs_path_improved_force_drain_3.py b/scripts/expertise/expertise_fs_path_improved_force_drain_3.py deleted file mode 100644 index 9fc7a049..00000000 --- a/scripts/expertise/expertise_fs_path_improved_force_drain_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_improved_force_drain_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_improved_force_drain_3") - return diff --git a/scripts/expertise/expertise_fs_path_improved_saber_reflect_1.py b/scripts/expertise/expertise_fs_path_improved_saber_reflect_1.py deleted file mode 100644 index fcd8dab3..00000000 --- a/scripts/expertise/expertise_fs_path_improved_saber_reflect_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_improved_saber_reflect_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_improved_saber_reflect_1") - return diff --git a/scripts/expertise/expertise_fs_path_improved_saber_reflect_2.py b/scripts/expertise/expertise_fs_path_improved_saber_reflect_2.py deleted file mode 100644 index dc7a3f46..00000000 --- a/scripts/expertise/expertise_fs_path_improved_saber_reflect_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_improved_saber_reflect_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_improved_saber_reflect_2") - return diff --git a/scripts/expertise/expertise_fs_path_lethargy_1.py b/scripts/expertise/expertise_fs_path_lethargy_1.py deleted file mode 100644 index a214883f..00000000 --- a/scripts/expertise/expertise_fs_path_lethargy_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_lethargy_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_lethargy_1") - return diff --git a/scripts/expertise/expertise_fs_path_lethargy_2.py b/scripts/expertise/expertise_fs_path_lethargy_2.py deleted file mode 100644 index b3191ac1..00000000 --- a/scripts/expertise/expertise_fs_path_lethargy_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_lethargy_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_lethargy_2") - return diff --git a/scripts/expertise/expertise_fs_path_lethargy_3.py b/scripts/expertise/expertise_fs_path_lethargy_3.py deleted file mode 100644 index 833037e2..00000000 --- a/scripts/expertise/expertise_fs_path_lethargy_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_lethargy_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_lethargy_3") - return diff --git a/scripts/expertise/expertise_fs_path_lethargy_4.py b/scripts/expertise/expertise_fs_path_lethargy_4.py deleted file mode 100644 index 6fb09b25..00000000 --- a/scripts/expertise/expertise_fs_path_lethargy_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_lethargy_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_lethargy_4") - return diff --git a/scripts/expertise/expertise_fs_path_perceptive_sentinel_1.py b/scripts/expertise/expertise_fs_path_perceptive_sentinel_1.py deleted file mode 100644 index c2bb199d..00000000 --- a/scripts/expertise/expertise_fs_path_perceptive_sentinel_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_perceptive_sentinel_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_perceptive_sentinel_1") - return diff --git a/scripts/expertise/expertise_fs_path_perceptive_sentinel_2.py b/scripts/expertise/expertise_fs_path_perceptive_sentinel_2.py deleted file mode 100644 index 04c69b17..00000000 --- a/scripts/expertise/expertise_fs_path_perceptive_sentinel_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_perceptive_sentinel_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_perceptive_sentinel_2") - return diff --git a/scripts/expertise/expertise_fs_path_perceptive_sentinel_3.py b/scripts/expertise/expertise_fs_path_perceptive_sentinel_3.py deleted file mode 100644 index 83c4131f..00000000 --- a/scripts/expertise/expertise_fs_path_perceptive_sentinel_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_perceptive_sentinel_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_perceptive_sentinel_3") - return diff --git a/scripts/expertise/expertise_fs_path_perceptive_sentinel_4.py b/scripts/expertise/expertise_fs_path_perceptive_sentinel_4.py deleted file mode 100644 index 0f6276dc..00000000 --- a/scripts/expertise/expertise_fs_path_perceptive_sentinel_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_perceptive_sentinel_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_perceptive_sentinel_4") - return diff --git a/scripts/expertise/expertise_fs_path_reactive_response_1.py b/scripts/expertise/expertise_fs_path_reactive_response_1.py deleted file mode 100644 index 816c657d..00000000 --- a/scripts/expertise/expertise_fs_path_reactive_response_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_reactive_response_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_reactive_response_1") - return diff --git a/scripts/expertise/expertise_fs_path_reactive_response_2.py b/scripts/expertise/expertise_fs_path_reactive_response_2.py deleted file mode 100644 index 3a79b265..00000000 --- a/scripts/expertise/expertise_fs_path_reactive_response_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_reactive_response_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_reactive_response_2") - return diff --git a/scripts/expertise/expertise_fs_path_remorseless_nature_1.py b/scripts/expertise/expertise_fs_path_remorseless_nature_1.py deleted file mode 100644 index 1c4bee8a..00000000 --- a/scripts/expertise/expertise_fs_path_remorseless_nature_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_remorseless_nature_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_remorseless_nature_1") - return diff --git a/scripts/expertise/expertise_fs_path_remorseless_nature_2.py b/scripts/expertise/expertise_fs_path_remorseless_nature_2.py deleted file mode 100644 index 85d986d8..00000000 --- a/scripts/expertise/expertise_fs_path_remorseless_nature_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_remorseless_nature_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_remorseless_nature_2") - return diff --git a/scripts/expertise/expertise_fs_path_remorseless_nature_3.py b/scripts/expertise/expertise_fs_path_remorseless_nature_3.py deleted file mode 100644 index 19dfa6fd..00000000 --- a/scripts/expertise/expertise_fs_path_remorseless_nature_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_remorseless_nature_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_remorseless_nature_3") - return diff --git a/scripts/expertise/expertise_fs_path_remorseless_nature_4.py b/scripts/expertise/expertise_fs_path_remorseless_nature_4.py deleted file mode 100644 index 8d505b2f..00000000 --- a/scripts/expertise/expertise_fs_path_remorseless_nature_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_remorseless_nature_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_remorseless_nature_4") - return diff --git a/scripts/expertise/expertise_fs_path_riposte_1.py b/scripts/expertise/expertise_fs_path_riposte_1.py deleted file mode 100644 index 5ffa3594..00000000 --- a/scripts/expertise/expertise_fs_path_riposte_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_riposte_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_riposte_1") - return diff --git a/scripts/expertise/expertise_fs_path_riposte_2.py b/scripts/expertise/expertise_fs_path_riposte_2.py deleted file mode 100644 index 7704424c..00000000 --- a/scripts/expertise/expertise_fs_path_riposte_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_riposte_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_riposte_2") - return diff --git a/scripts/expertise/expertise_fs_path_ruthless_precision_1.py b/scripts/expertise/expertise_fs_path_ruthless_precision_1.py deleted file mode 100644 index ad47cf20..00000000 --- a/scripts/expertise/expertise_fs_path_ruthless_precision_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_ruthless_precision_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_ruthless_precision_1") - return diff --git a/scripts/expertise/expertise_fs_path_ruthless_precision_2.py b/scripts/expertise/expertise_fs_path_ruthless_precision_2.py deleted file mode 100644 index c4ccc5ae..00000000 --- a/scripts/expertise/expertise_fs_path_ruthless_precision_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_ruthless_precision_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_ruthless_precision_2") - return diff --git a/scripts/expertise/expertise_fs_path_ruthless_precision_3.py b/scripts/expertise/expertise_fs_path_ruthless_precision_3.py deleted file mode 100644 index 01546884..00000000 --- a/scripts/expertise/expertise_fs_path_ruthless_precision_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_ruthless_precision_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_ruthless_precision_3") - return diff --git a/scripts/expertise/expertise_fs_path_ruthless_precision_4.py b/scripts/expertise/expertise_fs_path_ruthless_precision_4.py deleted file mode 100644 index 6292bfe5..00000000 --- a/scripts/expertise/expertise_fs_path_ruthless_precision_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_ruthless_precision_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_ruthless_precision_4") - return diff --git a/scripts/expertise/expertise_fs_path_saber_shackle_1.py b/scripts/expertise/expertise_fs_path_saber_shackle_1.py deleted file mode 100644 index e7115fa0..00000000 --- a/scripts/expertise/expertise_fs_path_saber_shackle_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_saber_shackle_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_saber_shackle_1") - return diff --git a/scripts/expertise/expertise_fs_path_saber_shackle_2.py b/scripts/expertise/expertise_fs_path_saber_shackle_2.py deleted file mode 100644 index cc2cdab9..00000000 --- a/scripts/expertise/expertise_fs_path_saber_shackle_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_saber_shackle_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_saber_shackle_2") - return diff --git a/scripts/expertise/expertise_fs_path_saber_shackle_3.py b/scripts/expertise/expertise_fs_path_saber_shackle_3.py deleted file mode 100644 index 426199d1..00000000 --- a/scripts/expertise/expertise_fs_path_saber_shackle_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_saber_shackle_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_saber_shackle_3") - return diff --git a/scripts/expertise/expertise_fs_path_saber_shackle_4.py b/scripts/expertise/expertise_fs_path_saber_shackle_4.py deleted file mode 100644 index a20668d8..00000000 --- a/scripts/expertise/expertise_fs_path_saber_shackle_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_saber_shackle_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_saber_shackle_4") - return diff --git a/scripts/expertise/expertise_fs_path_soothing_aura_1.py b/scripts/expertise/expertise_fs_path_soothing_aura_1.py deleted file mode 100644 index ab8c5c6b..00000000 --- a/scripts/expertise/expertise_fs_path_soothing_aura_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_soothing_aura_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_soothing_aura_1") - return diff --git a/scripts/expertise/expertise_fs_path_soothing_aura_2.py b/scripts/expertise/expertise_fs_path_soothing_aura_2.py deleted file mode 100644 index e04ed993..00000000 --- a/scripts/expertise/expertise_fs_path_soothing_aura_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_soothing_aura_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_soothing_aura_2") - return diff --git a/scripts/expertise/expertise_fs_path_soothing_aura_3.py b/scripts/expertise/expertise_fs_path_soothing_aura_3.py deleted file mode 100644 index c7ec3e0b..00000000 --- a/scripts/expertise/expertise_fs_path_soothing_aura_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_soothing_aura_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_soothing_aura_3") - return diff --git a/scripts/expertise/expertise_fs_path_soothing_aura_4.py b/scripts/expertise/expertise_fs_path_soothing_aura_4.py deleted file mode 100644 index 0e3bc9a1..00000000 --- a/scripts/expertise/expertise_fs_path_soothing_aura_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_soothing_aura_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_soothing_aura_4") - return diff --git a/scripts/expertise/expertise_fs_path_strangulation_1.py b/scripts/expertise/expertise_fs_path_strangulation_1.py deleted file mode 100644 index b1db621b..00000000 --- a/scripts/expertise/expertise_fs_path_strangulation_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_strangulation_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_strangulation_1") - return diff --git a/scripts/expertise/expertise_fs_path_strangulation_2.py b/scripts/expertise/expertise_fs_path_strangulation_2.py deleted file mode 100644 index 43c05ab8..00000000 --- a/scripts/expertise/expertise_fs_path_strangulation_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_strangulation_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_strangulation_2") - return diff --git a/scripts/expertise/expertise_fs_path_tempt_hatred_1.py b/scripts/expertise/expertise_fs_path_tempt_hatred_1.py deleted file mode 100644 index c8260021..00000000 --- a/scripts/expertise/expertise_fs_path_tempt_hatred_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_tempt_hatred_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_tempt_hatred_1") - return diff --git a/scripts/expertise/expertise_fs_path_tempt_hatred_2.py b/scripts/expertise/expertise_fs_path_tempt_hatred_2.py deleted file mode 100644 index cced0afd..00000000 --- a/scripts/expertise/expertise_fs_path_tempt_hatred_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_tempt_hatred_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_tempt_hatred_2") - return diff --git a/scripts/expertise/expertise_fs_path_wracking_energy_1.py b/scripts/expertise/expertise_fs_path_wracking_energy_1.py deleted file mode 100644 index 25e70e11..00000000 --- a/scripts/expertise/expertise_fs_path_wracking_energy_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_wracking_energy_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_wracking_energy_1") - return diff --git a/scripts/expertise/expertise_fs_path_wracking_energy_2.py b/scripts/expertise/expertise_fs_path_wracking_energy_2.py deleted file mode 100644 index cd1ed137..00000000 --- a/scripts/expertise/expertise_fs_path_wracking_energy_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_wracking_energy_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_wracking_energy_2") - return diff --git a/scripts/expertise/expertise_fs_path_wracking_energy_3.py b/scripts/expertise/expertise_fs_path_wracking_energy_3.py deleted file mode 100644 index 00b73ffc..00000000 --- a/scripts/expertise/expertise_fs_path_wracking_energy_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_wracking_energy_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_wracking_energy_3") - return diff --git a/scripts/expertise/expertise_fs_path_wracking_energy_4.py b/scripts/expertise/expertise_fs_path_wracking_energy_4.py deleted file mode 100644 index 86641a26..00000000 --- a/scripts/expertise/expertise_fs_path_wracking_energy_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_fs_path_wracking_energy_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_fs_path_wracking_energy_4") - return diff --git a/scripts/expertise/expertise_me_agility_1.py b/scripts/expertise/expertise_me_agility_1.py deleted file mode 100644 index 62abf270..00000000 --- a/scripts/expertise/expertise_me_agility_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_agility_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_agility_1") - return diff --git a/scripts/expertise/expertise_me_agility_2.py b/scripts/expertise/expertise_me_agility_2.py deleted file mode 100644 index d9f1bc7b..00000000 --- a/scripts/expertise/expertise_me_agility_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_agility_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_agility_2") - return diff --git a/scripts/expertise/expertise_me_agility_3.py b/scripts/expertise/expertise_me_agility_3.py deleted file mode 100644 index 1d58506f..00000000 --- a/scripts/expertise/expertise_me_agility_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_agility_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_agility_3") - return diff --git a/scripts/expertise/expertise_me_agility_4.py b/scripts/expertise/expertise_me_agility_4.py deleted file mode 100644 index ab6d2201..00000000 --- a/scripts/expertise/expertise_me_agility_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_agility_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_agility_4") - return diff --git a/scripts/expertise/expertise_me_agro_healing_1.py b/scripts/expertise/expertise_me_agro_healing_1.py deleted file mode 100644 index 35bcdccc..00000000 --- a/scripts/expertise/expertise_me_agro_healing_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_agro_healing_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_agro_healing_1") - return diff --git a/scripts/expertise/expertise_me_agro_healing_2.py b/scripts/expertise/expertise_me_agro_healing_2.py deleted file mode 100644 index 40fbc169..00000000 --- a/scripts/expertise/expertise_me_agro_healing_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_agro_healing_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_agro_healing_2") - return diff --git a/scripts/expertise/expertise_me_agro_healing_3.py b/scripts/expertise/expertise_me_agro_healing_3.py deleted file mode 100644 index 4deaea9a..00000000 --- a/scripts/expertise/expertise_me_agro_healing_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_agro_healing_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_agro_healing_3") - return diff --git a/scripts/expertise/expertise_me_carbine_damage_1.py b/scripts/expertise/expertise_me_carbine_damage_1.py deleted file mode 100644 index 4cdfd0d0..00000000 --- a/scripts/expertise/expertise_me_carbine_damage_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_carbine_damage_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_carbine_damage_1") - return diff --git a/scripts/expertise/expertise_me_carbine_damage_2.py b/scripts/expertise/expertise_me_carbine_damage_2.py deleted file mode 100644 index 2ca975d7..00000000 --- a/scripts/expertise/expertise_me_carbine_damage_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_carbine_damage_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_carbine_damage_2") - return diff --git a/scripts/expertise/expertise_me_carbine_damage_3.py b/scripts/expertise/expertise_me_carbine_damage_3.py deleted file mode 100644 index 0fec9aac..00000000 --- a/scripts/expertise/expertise_me_carbine_damage_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_carbine_damage_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_carbine_damage_3") - return diff --git a/scripts/expertise/expertise_me_carbine_damage_4.py b/scripts/expertise/expertise_me_carbine_damage_4.py deleted file mode 100644 index 23dd0479..00000000 --- a/scripts/expertise/expertise_me_carbine_damage_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_carbine_damage_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_carbine_damage_4") - return diff --git a/scripts/expertise/expertise_me_dot_damage_1.py b/scripts/expertise/expertise_me_dot_damage_1.py deleted file mode 100644 index 163a8d86..00000000 --- a/scripts/expertise/expertise_me_dot_damage_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_dot_damage_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_dot_damage_1") - return diff --git a/scripts/expertise/expertise_me_dot_damage_2.py b/scripts/expertise/expertise_me_dot_damage_2.py deleted file mode 100644 index 0deae54e..00000000 --- a/scripts/expertise/expertise_me_dot_damage_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_dot_damage_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_dot_damage_2") - return diff --git a/scripts/expertise/expertise_me_dot_damage_3.py b/scripts/expertise/expertise_me_dot_damage_3.py deleted file mode 100644 index 11ff1f05..00000000 --- a/scripts/expertise/expertise_me_dot_damage_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_dot_damage_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_dot_damage_3") - return diff --git a/scripts/expertise/expertise_me_dot_duration_1.py b/scripts/expertise/expertise_me_dot_duration_1.py deleted file mode 100644 index c3a9b6a5..00000000 --- a/scripts/expertise/expertise_me_dot_duration_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_dot_duration_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_dot_duration_1") - return diff --git a/scripts/expertise/expertise_me_dot_duration_2.py b/scripts/expertise/expertise_me_dot_duration_2.py deleted file mode 100644 index 61309ba1..00000000 --- a/scripts/expertise/expertise_me_dot_duration_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_dot_duration_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_dot_duration_2") - return diff --git a/scripts/expertise/expertise_me_dot_duration_3.py b/scripts/expertise/expertise_me_dot_duration_3.py deleted file mode 100644 index 6f7b45eb..00000000 --- a/scripts/expertise/expertise_me_dot_duration_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_dot_duration_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_dot_duration_3") - return diff --git a/scripts/expertise/expertise_me_dueterium_rounds_1.py b/scripts/expertise/expertise_me_dueterium_rounds_1.py deleted file mode 100644 index ed57795c..00000000 --- a/scripts/expertise/expertise_me_dueterium_rounds_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_dueterium_rounds_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_dueterium_rounds_1") - return diff --git a/scripts/expertise/expertise_me_energy_armor_1.py b/scripts/expertise/expertise_me_energy_armor_1.py deleted file mode 100644 index fd7c40f9..00000000 --- a/scripts/expertise/expertise_me_energy_armor_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_energy_armor_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_energy_armor_1") - return diff --git a/scripts/expertise/expertise_me_energy_armor_2.py b/scripts/expertise/expertise_me_energy_armor_2.py deleted file mode 100644 index ace09ed5..00000000 --- a/scripts/expertise/expertise_me_energy_armor_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_energy_armor_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_energy_armor_2") - return diff --git a/scripts/expertise/expertise_me_energy_armor_3.py b/scripts/expertise/expertise_me_energy_armor_3.py deleted file mode 100644 index 1d161f38..00000000 --- a/scripts/expertise/expertise_me_energy_armor_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_energy_armor_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_energy_armor_3") - return diff --git a/scripts/expertise/expertise_me_energy_armor_4.py b/scripts/expertise/expertise_me_energy_armor_4.py deleted file mode 100644 index 84fad199..00000000 --- a/scripts/expertise/expertise_me_energy_armor_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_energy_armor_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_energy_armor_4") - return diff --git a/scripts/expertise/expertise_me_enhance_duration_1.py b/scripts/expertise/expertise_me_enhance_duration_1.py deleted file mode 100644 index 85c5c455..00000000 --- a/scripts/expertise/expertise_me_enhance_duration_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_enhance_duration_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_enhance_duration_1") - return diff --git a/scripts/expertise/expertise_me_enhance_duration_2.py b/scripts/expertise/expertise_me_enhance_duration_2.py deleted file mode 100644 index ffb8e438..00000000 --- a/scripts/expertise/expertise_me_enhance_duration_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_enhance_duration_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_enhance_duration_2") - return diff --git a/scripts/expertise/expertise_me_enhance_duration_3.py b/scripts/expertise/expertise_me_enhance_duration_3.py deleted file mode 100644 index 53442947..00000000 --- a/scripts/expertise/expertise_me_enhance_duration_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_enhance_duration_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_enhance_duration_3") - return diff --git a/scripts/expertise/expertise_me_heal_action_1.py b/scripts/expertise/expertise_me_heal_action_1.py deleted file mode 100644 index 33f3254f..00000000 --- a/scripts/expertise/expertise_me_heal_action_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_heal_action_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_heal_action_1") - return diff --git a/scripts/expertise/expertise_me_heal_action_2.py b/scripts/expertise/expertise_me_heal_action_2.py deleted file mode 100644 index b10d3548..00000000 --- a/scripts/expertise/expertise_me_heal_action_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_heal_action_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_heal_action_2") - return diff --git a/scripts/expertise/expertise_me_heal_action_3.py b/scripts/expertise/expertise_me_heal_action_3.py deleted file mode 100644 index c009d1ae..00000000 --- a/scripts/expertise/expertise_me_heal_action_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_heal_action_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_heal_action_3") - return diff --git a/scripts/expertise/expertise_me_heal_damage_1.py b/scripts/expertise/expertise_me_heal_damage_1.py deleted file mode 100644 index ba2a72a5..00000000 --- a/scripts/expertise/expertise_me_heal_damage_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_heal_damage_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_heal_damage_1") - return diff --git a/scripts/expertise/expertise_me_heal_damage_2.py b/scripts/expertise/expertise_me_heal_damage_2.py deleted file mode 100644 index 050ba76f..00000000 --- a/scripts/expertise/expertise_me_heal_damage_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_heal_damage_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_heal_damage_2") - return diff --git a/scripts/expertise/expertise_me_heal_damage_3.py b/scripts/expertise/expertise_me_heal_damage_3.py deleted file mode 100644 index 3b85bde4..00000000 --- a/scripts/expertise/expertise_me_heal_damage_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_heal_damage_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_heal_damage_3") - return diff --git a/scripts/expertise/expertise_me_heal_damage_4.py b/scripts/expertise/expertise_me_heal_damage_4.py deleted file mode 100644 index e58ddb1a..00000000 --- a/scripts/expertise/expertise_me_heal_damage_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_heal_damage_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_heal_damage_4") - return diff --git a/scripts/expertise/expertise_me_hot_duration_1.py b/scripts/expertise/expertise_me_hot_duration_1.py deleted file mode 100644 index c18a4e36..00000000 --- a/scripts/expertise/expertise_me_hot_duration_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_hot_duration_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_hot_duration_1") - return diff --git a/scripts/expertise/expertise_me_hot_duration_2.py b/scripts/expertise/expertise_me_hot_duration_2.py deleted file mode 100644 index e89e515c..00000000 --- a/scripts/expertise/expertise_me_hot_duration_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_hot_duration_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_hot_duration_2") - return diff --git a/scripts/expertise/expertise_me_hot_duration_3.py b/scripts/expertise/expertise_me_hot_duration_3.py deleted file mode 100644 index ef238d8d..00000000 --- a/scripts/expertise/expertise_me_hot_duration_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_hot_duration_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_hot_duration_3") - return diff --git a/scripts/expertise/expertise_me_hot_duration_4.py b/scripts/expertise/expertise_me_hot_duration_4.py deleted file mode 100644 index 16368742..00000000 --- a/scripts/expertise/expertise_me_hot_duration_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_hot_duration_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_hot_duration_4") - return diff --git a/scripts/expertise/expertise_me_humanoid_crits_1.py b/scripts/expertise/expertise_me_humanoid_crits_1.py deleted file mode 100644 index 482342f3..00000000 --- a/scripts/expertise/expertise_me_humanoid_crits_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_humanoid_crits_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_humanoid_crits_1") - return diff --git a/scripts/expertise/expertise_me_humanoid_crits_2.py b/scripts/expertise/expertise_me_humanoid_crits_2.py deleted file mode 100644 index 085396cc..00000000 --- a/scripts/expertise/expertise_me_humanoid_crits_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_humanoid_crits_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_humanoid_crits_2") - return diff --git a/scripts/expertise/expertise_me_humanoid_crits_3.py b/scripts/expertise/expertise_me_humanoid_crits_3.py deleted file mode 100644 index 7392d917..00000000 --- a/scripts/expertise/expertise_me_humanoid_crits_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_humanoid_crits_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_humanoid_crits_3") - return diff --git a/scripts/expertise/expertise_me_kinetic_armor_1.py b/scripts/expertise/expertise_me_kinetic_armor_1.py deleted file mode 100644 index 8d78e253..00000000 --- a/scripts/expertise/expertise_me_kinetic_armor_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_kinetic_armor_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_kinetic_armor_1") - return diff --git a/scripts/expertise/expertise_me_kinetic_armor_2.py b/scripts/expertise/expertise_me_kinetic_armor_2.py deleted file mode 100644 index ab5c5e71..00000000 --- a/scripts/expertise/expertise_me_kinetic_armor_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_kinetic_armor_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_kinetic_armor_2") - return diff --git a/scripts/expertise/expertise_me_kinetic_armor_3.py b/scripts/expertise/expertise_me_kinetic_armor_3.py deleted file mode 100644 index dcdb9751..00000000 --- a/scripts/expertise/expertise_me_kinetic_armor_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_kinetic_armor_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_kinetic_armor_3") - return diff --git a/scripts/expertise/expertise_me_kinetic_armor_4.py b/scripts/expertise/expertise_me_kinetic_armor_4.py deleted file mode 100644 index 1982a785..00000000 --- a/scripts/expertise/expertise_me_kinetic_armor_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_kinetic_armor_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_kinetic_armor_4") - return diff --git a/scripts/expertise/expertise_me_poison_knuckle_1.py b/scripts/expertise/expertise_me_poison_knuckle_1.py deleted file mode 100644 index 7b436d7b..00000000 --- a/scripts/expertise/expertise_me_poison_knuckle_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_poison_knuckle_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_poison_knuckle_1") - return diff --git a/scripts/expertise/expertise_me_precision_1.py b/scripts/expertise/expertise_me_precision_1.py deleted file mode 100644 index 0d344061..00000000 --- a/scripts/expertise/expertise_me_precision_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_precision_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_precision_1") - return diff --git a/scripts/expertise/expertise_me_precision_2.py b/scripts/expertise/expertise_me_precision_2.py deleted file mode 100644 index 6857d3a2..00000000 --- a/scripts/expertise/expertise_me_precision_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_precision_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_precision_2") - return diff --git a/scripts/expertise/expertise_me_precision_3.py b/scripts/expertise/expertise_me_precision_3.py deleted file mode 100644 index bb36eea4..00000000 --- a/scripts/expertise/expertise_me_precision_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_precision_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_precision_3") - return diff --git a/scripts/expertise/expertise_me_precision_4.py b/scripts/expertise/expertise_me_precision_4.py deleted file mode 100644 index c32b63ff..00000000 --- a/scripts/expertise/expertise_me_precision_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_precision_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_precision_4") - return diff --git a/scripts/expertise/expertise_me_revive_duration_1.py b/scripts/expertise/expertise_me_revive_duration_1.py deleted file mode 100644 index d2bcc4ba..00000000 --- a/scripts/expertise/expertise_me_revive_duration_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_revive_duration_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_revive_duration_1") - return diff --git a/scripts/expertise/expertise_me_revive_duration_2.py b/scripts/expertise/expertise_me_revive_duration_2.py deleted file mode 100644 index 5c8a9035..00000000 --- a/scripts/expertise/expertise_me_revive_duration_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_revive_duration_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_revive_duration_2") - return diff --git a/scripts/expertise/expertise_me_revive_duration_3.py b/scripts/expertise/expertise_me_revive_duration_3.py deleted file mode 100644 index 0ed33a9b..00000000 --- a/scripts/expertise/expertise_me_revive_duration_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_revive_duration_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_revive_duration_3") - return diff --git a/scripts/expertise/expertise_me_strength_1.py b/scripts/expertise/expertise_me_strength_1.py deleted file mode 100644 index 9c3faac3..00000000 --- a/scripts/expertise/expertise_me_strength_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_strength_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_strength_1") - return diff --git a/scripts/expertise/expertise_me_strength_2.py b/scripts/expertise/expertise_me_strength_2.py deleted file mode 100644 index fa2bc7b7..00000000 --- a/scripts/expertise/expertise_me_strength_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_strength_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_strength_2") - return diff --git a/scripts/expertise/expertise_me_strength_3.py b/scripts/expertise/expertise_me_strength_3.py deleted file mode 100644 index 89f7a7a1..00000000 --- a/scripts/expertise/expertise_me_strength_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_strength_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_strength_3") - return diff --git a/scripts/expertise/expertise_me_strength_4.py b/scripts/expertise/expertise_me_strength_4.py deleted file mode 100644 index d3e48b21..00000000 --- a/scripts/expertise/expertise_me_strength_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_strength_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_strength_4") - return diff --git a/scripts/expertise/expertise_me_unarmed_crit_1.py b/scripts/expertise/expertise_me_unarmed_crit_1.py deleted file mode 100644 index 529ff739..00000000 --- a/scripts/expertise/expertise_me_unarmed_crit_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_unarmed_crit_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_unarmed_crit_1") - return diff --git a/scripts/expertise/expertise_me_unarmed_crit_2.py b/scripts/expertise/expertise_me_unarmed_crit_2.py deleted file mode 100644 index 4b18402e..00000000 --- a/scripts/expertise/expertise_me_unarmed_crit_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_unarmed_crit_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_unarmed_crit_2") - return diff --git a/scripts/expertise/expertise_me_unarmed_crit_3.py b/scripts/expertise/expertise_me_unarmed_crit_3.py deleted file mode 100644 index 8ba3de99..00000000 --- a/scripts/expertise/expertise_me_unarmed_crit_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_unarmed_crit_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_unarmed_crit_3") - return diff --git a/scripts/expertise/expertise_me_unarmed_damage_1.py b/scripts/expertise/expertise_me_unarmed_damage_1.py deleted file mode 100644 index 6b81c0bb..00000000 --- a/scripts/expertise/expertise_me_unarmed_damage_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_unarmed_damage_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_unarmed_damage_1") - return diff --git a/scripts/expertise/expertise_me_unarmed_damage_2.py b/scripts/expertise/expertise_me_unarmed_damage_2.py deleted file mode 100644 index 9bb4a83d..00000000 --- a/scripts/expertise/expertise_me_unarmed_damage_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_unarmed_damage_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_unarmed_damage_2") - return diff --git a/scripts/expertise/expertise_me_unarmed_damage_3.py b/scripts/expertise/expertise_me_unarmed_damage_3.py deleted file mode 100644 index cd4660fa..00000000 --- a/scripts/expertise/expertise_me_unarmed_damage_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_unarmed_damage_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_unarmed_damage_3") - return diff --git a/scripts/expertise/expertise_me_unarmed_damage_4.py b/scripts/expertise/expertise_me_unarmed_damage_4.py deleted file mode 100644 index 8df37d4d..00000000 --- a/scripts/expertise/expertise_me_unarmed_damage_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_unarmed_damage_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_unarmed_damage_4") - return diff --git a/scripts/expertise/expertise_me_vital_action_1.py b/scripts/expertise/expertise_me_vital_action_1.py deleted file mode 100644 index 60a8e9e4..00000000 --- a/scripts/expertise/expertise_me_vital_action_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_vital_action_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_vital_action_1") - return diff --git a/scripts/expertise/expertise_me_vital_action_2.py b/scripts/expertise/expertise_me_vital_action_2.py deleted file mode 100644 index a8d0ea03..00000000 --- a/scripts/expertise/expertise_me_vital_action_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_vital_action_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_vital_action_2") - return diff --git a/scripts/expertise/expertise_me_vital_action_3.py b/scripts/expertise/expertise_me_vital_action_3.py deleted file mode 100644 index bd0965c7..00000000 --- a/scripts/expertise/expertise_me_vital_action_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_vital_action_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_vital_action_3") - return diff --git a/scripts/expertise/expertise_me_vital_action_4.py b/scripts/expertise/expertise_me_vital_action_4.py deleted file mode 100644 index ffcab6ff..00000000 --- a/scripts/expertise/expertise_me_vital_action_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_vital_action_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_vital_action_4") - return diff --git a/scripts/expertise/expertise_me_vital_damage_1.py b/scripts/expertise/expertise_me_vital_damage_1.py deleted file mode 100644 index 8783041a..00000000 --- a/scripts/expertise/expertise_me_vital_damage_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_vital_damage_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_vital_damage_1") - return diff --git a/scripts/expertise/expertise_me_vital_damage_2.py b/scripts/expertise/expertise_me_vital_damage_2.py deleted file mode 100644 index 727ee2fd..00000000 --- a/scripts/expertise/expertise_me_vital_damage_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_vital_damage_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_vital_damage_2") - return diff --git a/scripts/expertise/expertise_me_vital_damage_3.py b/scripts/expertise/expertise_me_vital_damage_3.py deleted file mode 100644 index 0e35314c..00000000 --- a/scripts/expertise/expertise_me_vital_damage_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_vital_damage_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_vital_damage_3") - return diff --git a/scripts/expertise/expertise_me_vital_damage_4.py b/scripts/expertise/expertise_me_vital_damage_4.py deleted file mode 100644 index bb634713..00000000 --- a/scripts/expertise/expertise_me_vital_damage_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_me_vital_damage_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_me_vital_damage_4") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_advanced_theory_1.py b/scripts/expertise/expertise_munition_armorsmith_advanced_theory_1.py deleted file mode 100644 index dd347899..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_advanced_theory_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_advanced_theory_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_advanced_theory_1") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_attachment_upgrade_1.py b/scripts/expertise/expertise_munition_armorsmith_attachment_upgrade_1.py deleted file mode 100644 index 4f4ae755..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_attachment_upgrade_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_attachment_upgrade_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_attachment_upgrade_1") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_dexterity_1.py b/scripts/expertise/expertise_munition_armorsmith_dexterity_1.py deleted file mode 100644 index 60cea356..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_dexterity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_dexterity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_dexterity_1") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_dexterity_2.py b/scripts/expertise/expertise_munition_armorsmith_dexterity_2.py deleted file mode 100644 index 1cfed98e..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_dexterity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_dexterity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_dexterity_2") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_dexterity_3.py b/scripts/expertise/expertise_munition_armorsmith_dexterity_3.py deleted file mode 100644 index 550545ec..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_dexterity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_dexterity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_dexterity_3") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_dexterity_4.py b/scripts/expertise/expertise_munition_armorsmith_dexterity_4.py deleted file mode 100644 index 0467db0c..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_dexterity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_dexterity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_dexterity_4") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_hypothesis_1.py b/scripts/expertise/expertise_munition_armorsmith_hypothesis_1.py deleted file mode 100644 index a813988d..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_hypothesis_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_hypothesis_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_hypothesis_1") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_hypothesis_2.py b/scripts/expertise/expertise_munition_armorsmith_hypothesis_2.py deleted file mode 100644 index 3e1df126..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_hypothesis_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_hypothesis_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_hypothesis_2") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_hypothesis_3.py b/scripts/expertise/expertise_munition_armorsmith_hypothesis_3.py deleted file mode 100644 index 641c52c8..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_hypothesis_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_hypothesis_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_hypothesis_3") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_hypothesis_4.py b/scripts/expertise/expertise_munition_armorsmith_hypothesis_4.py deleted file mode 100644 index 94bf9c1e..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_hypothesis_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_hypothesis_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_hypothesis_4") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_insight_1.py b/scripts/expertise/expertise_munition_armorsmith_insight_1.py deleted file mode 100644 index 682413ee..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_insight_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_insight_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_insight_1") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_insight_2.py b/scripts/expertise/expertise_munition_armorsmith_insight_2.py deleted file mode 100644 index a1ddebae..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_insight_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_insight_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_insight_2") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_keen_understanding_1.py b/scripts/expertise/expertise_munition_armorsmith_keen_understanding_1.py deleted file mode 100644 index 4b919776..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_keen_understanding_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_keen_understanding_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_keen_understanding_1") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_keen_understanding_2.py b/scripts/expertise/expertise_munition_armorsmith_keen_understanding_2.py deleted file mode 100644 index 68063fba..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_keen_understanding_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_keen_understand_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_keen_understand_2") - return diff --git a/scripts/expertise/expertise_munition_armorsmith_socket_bonus_1.py b/scripts/expertise/expertise_munition_armorsmith_socket_bonus_1.py deleted file mode 100644 index 87f97e77..00000000 --- a/scripts/expertise/expertise_munition_armorsmith_socket_bonus_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_armorsmith_socket_bonus_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_armorsmith_socket_bonus_1") - return diff --git a/scripts/expertise/expertise_munition_artisan_advanced_theory_1.py b/scripts/expertise/expertise_munition_artisan_advanced_theory_1.py deleted file mode 100644 index 52843271..00000000 --- a/scripts/expertise/expertise_munition_artisan_advanced_theory_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_artisan_advanced_theory_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_artisan_advanced_theory_1") - return diff --git a/scripts/expertise/expertise_munition_artisan_dexterity_1.py b/scripts/expertise/expertise_munition_artisan_dexterity_1.py deleted file mode 100644 index 3c7654c3..00000000 --- a/scripts/expertise/expertise_munition_artisan_dexterity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_artisan_dexterity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_artisan_dexterity_1") - return diff --git a/scripts/expertise/expertise_munition_artisan_dexterity_2.py b/scripts/expertise/expertise_munition_artisan_dexterity_2.py deleted file mode 100644 index 100dd414..00000000 --- a/scripts/expertise/expertise_munition_artisan_dexterity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_artisan_dexterity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_artisan_dexterity_2") - return diff --git a/scripts/expertise/expertise_munition_artisan_dexterity_3.py b/scripts/expertise/expertise_munition_artisan_dexterity_3.py deleted file mode 100644 index aa5cdd64..00000000 --- a/scripts/expertise/expertise_munition_artisan_dexterity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_artisan_dexterity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_artisan_dexterity_3") - return diff --git a/scripts/expertise/expertise_munition_artisan_dexterity_4.py b/scripts/expertise/expertise_munition_artisan_dexterity_4.py deleted file mode 100644 index 4dd8ecbb..00000000 --- a/scripts/expertise/expertise_munition_artisan_dexterity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_artisan_dexterity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_artisan_dexterity_4") - return diff --git a/scripts/expertise/expertise_munition_artisan_hypothesis_1.py b/scripts/expertise/expertise_munition_artisan_hypothesis_1.py deleted file mode 100644 index 24cb3aae..00000000 --- a/scripts/expertise/expertise_munition_artisan_hypothesis_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_artisan_hypothesis_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_artisan_hypothesis_1") - return diff --git a/scripts/expertise/expertise_munition_artisan_hypothesis_2.py b/scripts/expertise/expertise_munition_artisan_hypothesis_2.py deleted file mode 100644 index 99447075..00000000 --- a/scripts/expertise/expertise_munition_artisan_hypothesis_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_artisan_hypothesis_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_artisan_hypothesis_2") - return diff --git a/scripts/expertise/expertise_munition_artisan_hypothesis_3.py b/scripts/expertise/expertise_munition_artisan_hypothesis_3.py deleted file mode 100644 index a18d8365..00000000 --- a/scripts/expertise/expertise_munition_artisan_hypothesis_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_artisan_hypothesis_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_artisan_hypothesis_3") - return diff --git a/scripts/expertise/expertise_munition_artisan_hypothesis_4.py b/scripts/expertise/expertise_munition_artisan_hypothesis_4.py deleted file mode 100644 index 35ee3e44..00000000 --- a/scripts/expertise/expertise_munition_artisan_hypothesis_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_artisan_hypothesis_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_artisan_hypothesis_4") - return diff --git a/scripts/expertise/expertise_munition_resource_processing_1.py b/scripts/expertise/expertise_munition_resource_processing_1.py deleted file mode 100644 index 46b265dc..00000000 --- a/scripts/expertise/expertise_munition_resource_processing_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_resource_processing_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_resource_processing_1") - return diff --git a/scripts/expertise/expertise_munition_resource_processing_2.py b/scripts/expertise/expertise_munition_resource_processing_2.py deleted file mode 100644 index f188f336..00000000 --- a/scripts/expertise/expertise_munition_resource_processing_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_resource_processing_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_resource_processing_2") - return diff --git a/scripts/expertise/expertise_munition_resource_refinement_1.py b/scripts/expertise/expertise_munition_resource_refinement_1.py deleted file mode 100644 index 855d585b..00000000 --- a/scripts/expertise/expertise_munition_resource_refinement_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_resource_refinement_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_resource_refinement_1") - return diff --git a/scripts/expertise/expertise_munition_resource_refinement_2.py b/scripts/expertise/expertise_munition_resource_refinement_2.py deleted file mode 100644 index e4536a48..00000000 --- a/scripts/expertise/expertise_munition_resource_refinement_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_resource_refinement_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_resource_refinement_2") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_advanced_theory_1.py b/scripts/expertise/expertise_munition_weaponsmith_advanced_theory_1.py deleted file mode 100644 index 6b248343..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_advanced_theory_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_advanced_theory_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_advanced_theory_1") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_dexterity_1.py b/scripts/expertise/expertise_munition_weaponsmith_dexterity_1.py deleted file mode 100644 index 78a141b6..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_dexterity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_dexterity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_dexterity_1") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_dexterity_2.py b/scripts/expertise/expertise_munition_weaponsmith_dexterity_2.py deleted file mode 100644 index 978ba95f..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_dexterity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_dexterity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_dexterity_2") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_dexterity_3.py b/scripts/expertise/expertise_munition_weaponsmith_dexterity_3.py deleted file mode 100644 index c386a1ac..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_dexterity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_dexterity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_dexterity_3") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_dexterity_4.py b/scripts/expertise/expertise_munition_weaponsmith_dexterity_4.py deleted file mode 100644 index 22d08692..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_dexterity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_dexterity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_dexterity_4") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_hypothesis_1.py b/scripts/expertise/expertise_munition_weaponsmith_hypothesis_1.py deleted file mode 100644 index 33a64c97..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_hypothesis_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_hypothesis_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_hypothesis_1") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_hypothesis_2.py b/scripts/expertise/expertise_munition_weaponsmith_hypothesis_2.py deleted file mode 100644 index a38da0d9..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_hypothesis_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_hypothesis_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_hypothesis_2") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_hypothesis_3.py b/scripts/expertise/expertise_munition_weaponsmith_hypothesis_3.py deleted file mode 100644 index a6ecbf5a..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_hypothesis_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_hypothesis_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_hypothesis_3") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_hypothesis_4.py b/scripts/expertise/expertise_munition_weaponsmith_hypothesis_4.py deleted file mode 100644 index 08e1855e..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_hypothesis_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_hypothesis_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_hypothesis_4") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_insight_1.py b/scripts/expertise/expertise_munition_weaponsmith_insight_1.py deleted file mode 100644 index 02ae306a..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_insight_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_insight_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_insight_1") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_insight_2.py b/scripts/expertise/expertise_munition_weaponsmith_insight_2.py deleted file mode 100644 index fd8846c4..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_insight_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_insight_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_insight_2") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_keen_understanding_1.py b/scripts/expertise/expertise_munition_weaponsmith_keen_understanding_1.py deleted file mode 100644 index 3a4b9071..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_keen_understanding_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_keen_understanding_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_keen_understanding_1") - return diff --git a/scripts/expertise/expertise_munition_weaponsmith_keen_understanding_2.py b/scripts/expertise/expertise_munition_weaponsmith_keen_understanding_2.py deleted file mode 100644 index 14a0134d..00000000 --- a/scripts/expertise/expertise_munition_weaponsmith_keen_understanding_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_munition_weaponsmith_keen_understanding_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_munition_weaponsmith_keen_understanding_2") - return diff --git a/scripts/expertise/expertise_of_1h_crit_1.py b/scripts/expertise/expertise_of_1h_crit_1.py deleted file mode 100644 index 5b1de38a..00000000 --- a/scripts/expertise/expertise_of_1h_crit_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_1h_crit_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_1h_crit_1") - return diff --git a/scripts/expertise/expertise_of_1h_crit_2.py b/scripts/expertise/expertise_of_1h_crit_2.py deleted file mode 100644 index 6f5fa016..00000000 --- a/scripts/expertise/expertise_of_1h_crit_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_1h_crit_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_1h_crit_2") - return diff --git a/scripts/expertise/expertise_of_1h_dam_1.py b/scripts/expertise/expertise_of_1h_dam_1.py deleted file mode 100644 index f143981d..00000000 --- a/scripts/expertise/expertise_of_1h_dam_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_1h_dam_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_1h_dam_1") - return diff --git a/scripts/expertise/expertise_of_1h_dam_2.py b/scripts/expertise/expertise_of_1h_dam_2.py deleted file mode 100644 index 65802383..00000000 --- a/scripts/expertise/expertise_of_1h_dam_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_1h_dam_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_1h_dam_2") - return diff --git a/scripts/expertise/expertise_of_1h_dam_3.py b/scripts/expertise/expertise_of_1h_dam_3.py deleted file mode 100644 index e1a3c0ad..00000000 --- a/scripts/expertise/expertise_of_1h_dam_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_1h_dam_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_1h_dam_3") - return diff --git a/scripts/expertise/expertise_of_1h_dam_4.py b/scripts/expertise/expertise_of_1h_dam_4.py deleted file mode 100644 index 10539dc5..00000000 --- a/scripts/expertise/expertise_of_1h_dam_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_1h_dam_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_1h_dam_4") - return diff --git a/scripts/expertise/expertise_of_aggro_channel_2.py b/scripts/expertise/expertise_of_aggro_channel_2.py deleted file mode 100644 index 69b37a58..00000000 --- a/scripts/expertise/expertise_of_aggro_channel_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_aggro_channel_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_aggro_channel_2") - return diff --git a/scripts/expertise/expertise_of_aggro_channel_3.py b/scripts/expertise/expertise_of_aggro_channel_3.py deleted file mode 100644 index 59bb6863..00000000 --- a/scripts/expertise/expertise_of_aggro_channel_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_aggro_channel_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_aggro_channel_3") - return diff --git a/scripts/expertise/expertise_of_aoe_act_1.py b/scripts/expertise/expertise_of_aoe_act_1.py deleted file mode 100644 index 674c7d3a..00000000 --- a/scripts/expertise/expertise_of_aoe_act_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_aoe_act_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_aoe_act_1") - return diff --git a/scripts/expertise/expertise_of_aoe_act_2.py b/scripts/expertise/expertise_of_aoe_act_2.py deleted file mode 100644 index 97120f62..00000000 --- a/scripts/expertise/expertise_of_aoe_act_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_aoe_act_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_aoe_act_2") - return diff --git a/scripts/expertise/expertise_of_aoe_act_3.py b/scripts/expertise/expertise_of_aoe_act_3.py deleted file mode 100644 index 509996aa..00000000 --- a/scripts/expertise/expertise_of_aoe_act_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_aoe_act_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_aoe_act_3") - return diff --git a/scripts/expertise/expertise_of_aoe_act_4.py b/scripts/expertise/expertise_of_aoe_act_4.py deleted file mode 100644 index d6d15040..00000000 --- a/scripts/expertise/expertise_of_aoe_act_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_aoe_act_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_aoe_act_4") - return diff --git a/scripts/expertise/expertise_of_aoe_crit_1.py b/scripts/expertise/expertise_of_aoe_crit_1.py deleted file mode 100644 index f87e35f3..00000000 --- a/scripts/expertise/expertise_of_aoe_crit_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_aoe_crit_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_aoe_crit_1") - return diff --git a/scripts/expertise/expertise_of_aoe_crit_2.py b/scripts/expertise/expertise_of_aoe_crit_2.py deleted file mode 100644 index 66c7da61..00000000 --- a/scripts/expertise/expertise_of_aoe_crit_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_aoe_crit_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_aoe_crit_2") - return diff --git a/scripts/expertise/expertise_of_aoe_crit_3.py b/scripts/expertise/expertise_of_aoe_crit_3.py deleted file mode 100644 index 500ec01d..00000000 --- a/scripts/expertise/expertise_of_aoe_crit_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_aoe_crit_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_aoe_crit_3") - return diff --git a/scripts/expertise/expertise_of_aoe_dam_1.py b/scripts/expertise/expertise_of_aoe_dam_1.py deleted file mode 100644 index 89e60747..00000000 --- a/scripts/expertise/expertise_of_aoe_dam_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_aoe_dam_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_aoe_dam_1") - return diff --git a/scripts/expertise/expertise_of_aoe_dam_2.py b/scripts/expertise/expertise_of_aoe_dam_2.py deleted file mode 100644 index 67ec6994..00000000 --- a/scripts/expertise/expertise_of_aoe_dam_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_aoe_dam_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_aoe_dam_2") - return diff --git a/scripts/expertise/expertise_of_armor_eng_1.py b/scripts/expertise/expertise_of_armor_eng_1.py deleted file mode 100644 index c5d4960e..00000000 --- a/scripts/expertise/expertise_of_armor_eng_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_armor_eng_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_armor_eng_1") - return diff --git a/scripts/expertise/expertise_of_armor_eng_2.py b/scripts/expertise/expertise_of_armor_eng_2.py deleted file mode 100644 index ae551145..00000000 --- a/scripts/expertise/expertise_of_armor_eng_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_armor_eng_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_armor_eng_2") - return diff --git a/scripts/expertise/expertise_of_armor_kin_1.py b/scripts/expertise/expertise_of_armor_kin_1.py deleted file mode 100644 index 98f1e9e7..00000000 --- a/scripts/expertise/expertise_of_armor_kin_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_armor_kin_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_armor_kin_1") - return diff --git a/scripts/expertise/expertise_of_armor_kin_2.py b/scripts/expertise/expertise_of_armor_kin_2.py deleted file mode 100644 index a67cdba1..00000000 --- a/scripts/expertise/expertise_of_armor_kin_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_armor_kin_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_armor_kin_2") - return diff --git a/scripts/expertise/expertise_of_constitution_1.py b/scripts/expertise/expertise_of_constitution_1.py deleted file mode 100644 index 33d66895..00000000 --- a/scripts/expertise/expertise_of_constitution_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_constution_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_constution_1") - return diff --git a/scripts/expertise/expertise_of_constitution_2.py b/scripts/expertise/expertise_of_constitution_2.py deleted file mode 100644 index 5afec279..00000000 --- a/scripts/expertise/expertise_of_constitution_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_constution_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_constution_2") - return diff --git a/scripts/expertise/expertise_of_constitution_3.py b/scripts/expertise/expertise_of_constitution_3.py deleted file mode 100644 index eb215ec3..00000000 --- a/scripts/expertise/expertise_of_constitution_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_constution_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_constution_3") - return diff --git a/scripts/expertise/expertise_of_constitution_4.py b/scripts/expertise/expertise_of_constitution_4.py deleted file mode 100644 index 75679a92..00000000 --- a/scripts/expertise/expertise_of_constitution_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_constution_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_constution_4") - return diff --git a/scripts/expertise/expertise_of_firepower_cool_1.py b/scripts/expertise/expertise_of_firepower_cool_1.py deleted file mode 100644 index 028ad25c..00000000 --- a/scripts/expertise/expertise_of_firepower_cool_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_firepower_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_firepower_1") - return diff --git a/scripts/expertise/expertise_of_firepower_cool_2.py b/scripts/expertise/expertise_of_firepower_cool_2.py deleted file mode 100644 index fdfcbaba..00000000 --- a/scripts/expertise/expertise_of_firepower_cool_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_firepower_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_firepower_2") - return diff --git a/scripts/expertise/expertise_of_firepower_cool_3.py b/scripts/expertise/expertise_of_firepower_cool_3.py deleted file mode 100644 index 28c63b2a..00000000 --- a/scripts/expertise/expertise_of_firepower_cool_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_firepower_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_firepower_3") - return diff --git a/scripts/expertise/expertise_of_group_buff_duration_1.py b/scripts/expertise/expertise_of_group_buff_duration_1.py deleted file mode 100644 index dd53fe02..00000000 --- a/scripts/expertise/expertise_of_group_buff_duration_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_group_buff_duration_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_group_buff_duration_1") - return diff --git a/scripts/expertise/expertise_of_group_buff_duration_2.py b/scripts/expertise/expertise_of_group_buff_duration_2.py deleted file mode 100644 index 3414a208..00000000 --- a/scripts/expertise/expertise_of_group_buff_duration_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_group_buff_duration_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_group_buff_duration_2") - return diff --git a/scripts/expertise/expertise_of_heal_cool_1.py b/scripts/expertise/expertise_of_heal_cool_1.py deleted file mode 100644 index 9f3a849f..00000000 --- a/scripts/expertise/expertise_of_heal_cool_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_heal_cool_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_heal_cool_1") - return diff --git a/scripts/expertise/expertise_of_heal_cool_2.py b/scripts/expertise/expertise_of_heal_cool_2.py deleted file mode 100644 index 2f5a04ad..00000000 --- a/scripts/expertise/expertise_of_heal_cool_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_heal_cool_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_heal_cool_2") - return diff --git a/scripts/expertise/expertise_of_heal_dam_1.py b/scripts/expertise/expertise_of_heal_dam_1.py deleted file mode 100644 index b9263761..00000000 --- a/scripts/expertise/expertise_of_heal_dam_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_heal_dam_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_heal_dam_1") - return diff --git a/scripts/expertise/expertise_of_heal_dam_2.py b/scripts/expertise/expertise_of_heal_dam_2.py deleted file mode 100644 index 2975d55f..00000000 --- a/scripts/expertise/expertise_of_heal_dam_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_heal_dam_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_heal_dam_2") - return diff --git a/scripts/expertise/expertise_of_last_words_1.py b/scripts/expertise/expertise_of_last_words_1.py deleted file mode 100644 index 688c8727..00000000 --- a/scripts/expertise/expertise_of_last_words_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - - return - -def removeAbilities(core, actor, player): - - return diff --git a/scripts/expertise/expertise_of_paint_dam_1.py b/scripts/expertise/expertise_of_paint_dam_1.py deleted file mode 100644 index 9ba31a9b..00000000 --- a/scripts/expertise/expertise_of_paint_dam_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_paint_dam_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_paint_dam_1") - return diff --git a/scripts/expertise/expertise_of_paint_dam_2.py b/scripts/expertise/expertise_of_paint_dam_2.py deleted file mode 100644 index 7733a8d2..00000000 --- a/scripts/expertise/expertise_of_paint_dam_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_paint_dam_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_paint_dam_2") - return diff --git a/scripts/expertise/expertise_of_paint_debuff_1.py b/scripts/expertise/expertise_of_paint_debuff_1.py deleted file mode 100644 index f3529a45..00000000 --- a/scripts/expertise/expertise_of_paint_debuff_1.py +++ /dev/null @@ -1,31 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - if actor.getLevel() >= 4: - actor.addAbility("of_adv_paint_debuff_1") - if actor.getLevel() >= 12: - actor.addAbility("of_adv_paint_debuff_2") - if actor.getLevel() >= 20: - actor.addAbility("of_adv_paint_debuff_3") - if actor.getLevel() >= 30: - actor.addAbility("of_adv_paint_debuff_4") - if actor.getLevel() >= 38: - actor.addAbility("of_adv_paint_debuff_5") - if actor.getLevel() >= 52: - actor.addAbility("of_adv_paint_debuff_6") - if actor.getLevel() >= 62: - actor.addAbility("of_adv_paint_debuff_7") - if actor.getLevel() >= 72: - actor.addAbility("of_adv_paint_debuff_8") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("of_adv_paint_debuff_1") - actor.removeAbility("of_adv_paint_debuff_2") - actor.removeAbility("of_adv_paint_debuff_3") - actor.removeAbility("of_adv_paint_debuff_4") - actor.removeAbility("of_adv_paint_debuff_5") - actor.removeAbility("of_adv_paint_debuff_6") - actor.removeAbility("of_adv_paint_debuff_7") - actor.removeAbility("of_adv_paint_debuff_8") - return diff --git a/scripts/expertise/expertise_of_paint_expose_1.py b/scripts/expertise/expertise_of_paint_expose_1.py deleted file mode 100644 index 561882fd..00000000 --- a/scripts/expertise/expertise_of_paint_expose_1.py +++ /dev/null @@ -1,31 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - if actor.getLevel() >= 4: - actor.addAbility("of_adv_paint_expose_1") - if actor.getLevel() >= 12: - actor.addAbility("of_adv_paint_expose_2") - if actor.getLevel() >= 20: - actor.addAbility("of_adv_paint_expose_3") - if actor.getLevel() >= 30: - actor.addAbility("of_adv_paint_expose_4") - if actor.getLevel() >= 38: - actor.addAbility("of_adv_paint_expose_5") - if actor.getLevel() >= 52: - actor.addAbility("of_adv_paint_expose_6") - if actor.getLevel() >= 62: - actor.addAbility("of_adv_paint_expose_7") - if actor.getLevel() >= 72: - actor.addAbility("of_adv_paint_expose_8") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("of_adv_paint_expose_1") - actor.removeAbility("of_adv_paint_expose_2") - actor.removeAbility("of_adv_paint_expose_3") - actor.removeAbility("of_adv_paint_expose_4") - actor.removeAbility("of_adv_paint_expose_5") - actor.removeAbility("of_adv_paint_expose_6") - actor.removeAbility("of_adv_paint_expose_7") - actor.removeAbility("of_adv_paint_expose_8") - return diff --git a/scripts/expertise/expertise_of_pistol_crit_1.py b/scripts/expertise/expertise_of_pistol_crit_1.py deleted file mode 100644 index 7e944647..00000000 --- a/scripts/expertise/expertise_of_pistol_crit_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_pistol_crit_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_pistol_crit_1") - return diff --git a/scripts/expertise/expertise_of_pistol_crit_2.py b/scripts/expertise/expertise_of_pistol_crit_2.py deleted file mode 100644 index d36a18b3..00000000 --- a/scripts/expertise/expertise_of_pistol_crit_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_pistol_crit_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_pistol_crit_2") - return diff --git a/scripts/expertise/expertise_of_pistol_dam_1.py b/scripts/expertise/expertise_of_pistol_dam_1.py deleted file mode 100644 index 877ac063..00000000 --- a/scripts/expertise/expertise_of_pistol_dam_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_pistol_dam_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_pistol_dam_1") - return diff --git a/scripts/expertise/expertise_of_pistol_dam_2.py b/scripts/expertise/expertise_of_pistol_dam_2.py deleted file mode 100644 index e01f6b55..00000000 --- a/scripts/expertise/expertise_of_pistol_dam_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_pistol_dam_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_pistol_dam_2") - return diff --git a/scripts/expertise/expertise_of_pistol_dam_3.py b/scripts/expertise/expertise_of_pistol_dam_3.py deleted file mode 100644 index 8762ecfa..00000000 --- a/scripts/expertise/expertise_of_pistol_dam_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_pistol_dam_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_pistol_dam_3") - return diff --git a/scripts/expertise/expertise_of_pistol_dam_4.py b/scripts/expertise/expertise_of_pistol_dam_4.py deleted file mode 100644 index 478313ef..00000000 --- a/scripts/expertise/expertise_of_pistol_dam_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_pistol_dam_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_pistol_dam_4") - return diff --git a/scripts/expertise/expertise_of_precision_1.py b/scripts/expertise/expertise_of_precision_1.py deleted file mode 100644 index fb5f45a2..00000000 --- a/scripts/expertise/expertise_of_precision_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_precision_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_precision_1") - return diff --git a/scripts/expertise/expertise_of_precision_2.py b/scripts/expertise/expertise_of_precision_2.py deleted file mode 100644 index 95ba3853..00000000 --- a/scripts/expertise/expertise_of_precision_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_precision_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_precision_2") - return diff --git a/scripts/expertise/expertise_of_precision_3.py b/scripts/expertise/expertise_of_precision_3.py deleted file mode 100644 index cfb27438..00000000 --- a/scripts/expertise/expertise_of_precision_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_precision_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_precision_3") - return diff --git a/scripts/expertise/expertise_of_precision_4.py b/scripts/expertise/expertise_of_precision_4.py deleted file mode 100644 index 9ca52db1..00000000 --- a/scripts/expertise/expertise_of_precision_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_precision_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_precision_4") - return diff --git a/scripts/expertise/expertise_of_stamina_1.py b/scripts/expertise/expertise_of_stamina_1.py deleted file mode 100644 index 73155458..00000000 --- a/scripts/expertise/expertise_of_stamina_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_stamina_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_stamina_1") - return diff --git a/scripts/expertise/expertise_of_stamina_2.py b/scripts/expertise/expertise_of_stamina_2.py deleted file mode 100644 index 1cc498d9..00000000 --- a/scripts/expertise/expertise_of_stamina_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_stamina_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_stamina_2") - return diff --git a/scripts/expertise/expertise_of_stamina_3.py b/scripts/expertise/expertise_of_stamina_3.py deleted file mode 100644 index 63826671..00000000 --- a/scripts/expertise/expertise_of_stamina_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_stamina_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_stamina_3") - return diff --git a/scripts/expertise/expertise_of_stamina_4.py b/scripts/expertise/expertise_of_stamina_4.py deleted file mode 100644 index 22e5cea3..00000000 --- a/scripts/expertise/expertise_of_stamina_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_stamina_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_stamina_4") - return diff --git a/scripts/expertise/expertise_of_strength_1.py b/scripts/expertise/expertise_of_strength_1.py deleted file mode 100644 index 3decd9c7..00000000 --- a/scripts/expertise/expertise_of_strength_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_strength_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_strength_1") - return diff --git a/scripts/expertise/expertise_of_strength_2.py b/scripts/expertise/expertise_of_strength_2.py deleted file mode 100644 index 676d8d92..00000000 --- a/scripts/expertise/expertise_of_strength_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_strength_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_strength_2") - return diff --git a/scripts/expertise/expertise_of_strength_3.py b/scripts/expertise/expertise_of_strength_3.py deleted file mode 100644 index d6780308..00000000 --- a/scripts/expertise/expertise_of_strength_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_strength_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_strength_3") - return diff --git a/scripts/expertise/expertise_of_strength_4.py b/scripts/expertise/expertise_of_strength_4.py deleted file mode 100644 index 4a59b20d..00000000 --- a/scripts/expertise/expertise_of_strength_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_strength_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_strength_4") - return diff --git a/scripts/expertise/expertise_of_sup_cool_1.py b/scripts/expertise/expertise_of_sup_cool_1.py deleted file mode 100644 index 2e982ac3..00000000 --- a/scripts/expertise/expertise_of_sup_cool_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_sup_cool_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_sup_cool_1") - return diff --git a/scripts/expertise/expertise_of_sup_cool_2.py b/scripts/expertise/expertise_of_sup_cool_2.py deleted file mode 100644 index 1d469433..00000000 --- a/scripts/expertise/expertise_of_sup_cool_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_sup_cool_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_sup_cool_2") - return diff --git a/scripts/expertise/expertise_of_sup_cool_3.py b/scripts/expertise/expertise_of_sup_cool_3.py deleted file mode 100644 index 32064d76..00000000 --- a/scripts/expertise/expertise_of_sup_cool_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_sup_cool_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_sup_cool_3") - return diff --git a/scripts/expertise/expertise_of_sup_cool_4.py b/scripts/expertise/expertise_of_sup_cool_4.py deleted file mode 100644 index 3a2418dc..00000000 --- a/scripts/expertise/expertise_of_sup_cool_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_sup_cool_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_sup_cool_4") - return diff --git a/scripts/expertise/expertise_of_sure_act_1.py b/scripts/expertise/expertise_of_sure_act_1.py deleted file mode 100644 index 5d4f27cd..00000000 --- a/scripts/expertise/expertise_of_sure_act_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_sure_act_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_sure_act_1") - return diff --git a/scripts/expertise/expertise_of_sure_act_2.py b/scripts/expertise/expertise_of_sure_act_2.py deleted file mode 100644 index 208d6135..00000000 --- a/scripts/expertise/expertise_of_sure_act_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_sure_act_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_sure_act_2") - return diff --git a/scripts/expertise/expertise_of_sure_act_3.py b/scripts/expertise/expertise_of_sure_act_3.py deleted file mode 100644 index d66005c7..00000000 --- a/scripts/expertise/expertise_of_sure_act_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_sure_act_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_sure_act_3") - return diff --git a/scripts/expertise/expertise_of_sure_act_4.py b/scripts/expertise/expertise_of_sure_act_4.py deleted file mode 100644 index 75485c39..00000000 --- a/scripts/expertise/expertise_of_sure_act_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_sure_act_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_sure_act_4") - return diff --git a/scripts/expertise/expertise_of_sure_dam_1.py b/scripts/expertise/expertise_of_sure_dam_1.py deleted file mode 100644 index 8acfba2d..00000000 --- a/scripts/expertise/expertise_of_sure_dam_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_sure_dam_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_sure_dam_1") - return diff --git a/scripts/expertise/expertise_of_sure_dam_2.py b/scripts/expertise/expertise_of_sure_dam_2.py deleted file mode 100644 index 740150f1..00000000 --- a/scripts/expertise/expertise_of_sure_dam_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_sure_dam_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_sure_dam_2") - return diff --git a/scripts/expertise/expertise_of_sure_dam_3.py b/scripts/expertise/expertise_of_sure_dam_3.py deleted file mode 100644 index 05c3d330..00000000 --- a/scripts/expertise/expertise_of_sure_dam_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_of_sure_dam_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_of_sure_dam_3") - return diff --git a/scripts/expertise/expertise_of_tactical_sup_1.py b/scripts/expertise/expertise_of_tactical_sup_1.py deleted file mode 100644 index a3434b0e..00000000 --- a/scripts/expertise/expertise_of_tactical_sup_1.py +++ /dev/null @@ -1,25 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - if actor.getLevel() >= 10: - actor.addAbility("of_tactical_sup_1") - if actor.getLevel() >= 34: - actor.addAbility("of_tactical_sup_2") - if actor.getLevel() >= 48: - actor.addAbility("of_tactical_sup_3") - if actor.getLevel() >= 62: - actor.addAbility("of_tactical_sup_4") - if actor.getLevel() >= 76: - actor.addAbility("of_tactical_sup_5") - if actor.getLevel() >= 90: - actor.addAbility("of_tactical_sup_6") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("of_tactical_sup_1") - actor.removeAbility("of_tactical_sup_2") - actor.removeAbility("of_tactical_sup_3") - actor.removeAbility("of_tactical_sup_4") - actor.removeAbility("of_tactical_sup_5") - actor.removeAbility("of_tactical_sup_6") - return diff --git a/scripts/expertise/expertise_sm_general_double_deal_1.py b/scripts/expertise/expertise_sm_general_double_deal_1.py deleted file mode 100644 index 8dbe17db..00000000 --- a/scripts/expertise/expertise_sm_general_double_deal_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_double_deal_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_double_deal_1") - return diff --git a/scripts/expertise/expertise_sm_general_double_deal_2.py b/scripts/expertise/expertise_sm_general_double_deal_2.py deleted file mode 100644 index 5215636e..00000000 --- a/scripts/expertise/expertise_sm_general_double_deal_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_double_deal_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_double_deal_2") - return diff --git a/scripts/expertise/expertise_sm_general_elbow_grease_1.py b/scripts/expertise/expertise_sm_general_elbow_grease_1.py deleted file mode 100644 index b0ff55ad..00000000 --- a/scripts/expertise/expertise_sm_general_elbow_grease_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_elbow_grease_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_elbow_grease_1") - return diff --git a/scripts/expertise/expertise_sm_general_enhanced_luck_1.py b/scripts/expertise/expertise_sm_general_enhanced_luck_1.py deleted file mode 100644 index 347e28e3..00000000 --- a/scripts/expertise/expertise_sm_general_enhanced_luck_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_enhanced_luck_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_enhanced_luck_1") - return diff --git a/scripts/expertise/expertise_sm_general_enhanced_luck_2.py b/scripts/expertise/expertise_sm_general_enhanced_luck_2.py deleted file mode 100644 index 2f9d1747..00000000 --- a/scripts/expertise/expertise_sm_general_enhanced_luck_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_enhanced_luck_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_enhanced_luck_2") - return diff --git a/scripts/expertise/expertise_sm_general_enhanced_luck_3.py b/scripts/expertise/expertise_sm_general_enhanced_luck_3.py deleted file mode 100644 index ad637ef1..00000000 --- a/scripts/expertise/expertise_sm_general_enhanced_luck_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_enhanced_luck_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_enhanced_luck_3") - return diff --git a/scripts/expertise/expertise_sm_general_enhanced_luck_4.py b/scripts/expertise/expertise_sm_general_enhanced_luck_4.py deleted file mode 100644 index acbe531d..00000000 --- a/scripts/expertise/expertise_sm_general_enhanced_luck_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_enhanced_luck_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_enhanced_luck_4") - return diff --git a/scripts/expertise/expertise_sm_general_enhanced_precision_1.py b/scripts/expertise/expertise_sm_general_enhanced_precision_1.py deleted file mode 100644 index 959579d6..00000000 --- a/scripts/expertise/expertise_sm_general_enhanced_precision_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_enhanced_precision_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_enhanced_precision_1") - return diff --git a/scripts/expertise/expertise_sm_general_enhanced_precision_2.py b/scripts/expertise/expertise_sm_general_enhanced_precision_2.py deleted file mode 100644 index a50e08ba..00000000 --- a/scripts/expertise/expertise_sm_general_enhanced_precision_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_enhanced_precision_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_enhanced_precision_2") - return diff --git a/scripts/expertise/expertise_sm_general_enhanced_precision_3.py b/scripts/expertise/expertise_sm_general_enhanced_precision_3.py deleted file mode 100644 index 58c40a83..00000000 --- a/scripts/expertise/expertise_sm_general_enhanced_precision_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_enhanced_precision_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_enhanced_precision_3") - return diff --git a/scripts/expertise/expertise_sm_general_enhanced_precision_4.py b/scripts/expertise/expertise_sm_general_enhanced_precision_4.py deleted file mode 100644 index 938574a4..00000000 --- a/scripts/expertise/expertise_sm_general_enhanced_precision_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_enhanced_precision_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_enhanced_precision_4") - return diff --git a/scripts/expertise/expertise_sm_general_gun_oil_1.py b/scripts/expertise/expertise_sm_general_gun_oil_1.py deleted file mode 100644 index 618b2f14..00000000 --- a/scripts/expertise/expertise_sm_general_gun_oil_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_gun_oil_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_gun_oil_1") - return diff --git a/scripts/expertise/expertise_sm_general_hair_trigger_1.py b/scripts/expertise/expertise_sm_general_hair_trigger_1.py deleted file mode 100644 index 981958f2..00000000 --- a/scripts/expertise/expertise_sm_general_hair_trigger_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_hair_trigger_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_hair_trigger_1") - return diff --git a/scripts/expertise/expertise_sm_general_hair_trigger_2.py b/scripts/expertise/expertise_sm_general_hair_trigger_2.py deleted file mode 100644 index 0e8537b5..00000000 --- a/scripts/expertise/expertise_sm_general_hair_trigger_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_hair_trigger_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_hair_trigger_2") - return diff --git a/scripts/expertise/expertise_sm_general_hair_trigger_3.py b/scripts/expertise/expertise_sm_general_hair_trigger_3.py deleted file mode 100644 index 9e3f61fc..00000000 --- a/scripts/expertise/expertise_sm_general_hair_trigger_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_hair_trigger_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_hair_trigger_3") - return diff --git a/scripts/expertise/expertise_sm_general_hair_trigger_4.py b/scripts/expertise/expertise_sm_general_hair_trigger_4.py deleted file mode 100644 index 78108d29..00000000 --- a/scripts/expertise/expertise_sm_general_hair_trigger_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_hair_trigger_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_hair_trigger_4") - return diff --git a/scripts/expertise/expertise_sm_general_hammer_fanning_1.py b/scripts/expertise/expertise_sm_general_hammer_fanning_1.py deleted file mode 100644 index d0a970f5..00000000 --- a/scripts/expertise/expertise_sm_general_hammer_fanning_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_hammer_fanning_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_hammer_fanning_1") - return diff --git a/scripts/expertise/expertise_sm_general_hammer_fanning_2.py b/scripts/expertise/expertise_sm_general_hammer_fanning_2.py deleted file mode 100644 index 9d157ddb..00000000 --- a/scripts/expertise/expertise_sm_general_hammer_fanning_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_hammer_fanning_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_hammer_fanning_2") - return diff --git a/scripts/expertise/expertise_sm_general_hammer_fanning_3.py b/scripts/expertise/expertise_sm_general_hammer_fanning_3.py deleted file mode 100644 index 24b7a3fb..00000000 --- a/scripts/expertise/expertise_sm_general_hammer_fanning_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_hammer_fanning_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_hammer_fanning_3") - return diff --git a/scripts/expertise/expertise_sm_general_hammer_fanning_4.py b/scripts/expertise/expertise_sm_general_hammer_fanning_4.py deleted file mode 100644 index 5db77165..00000000 --- a/scripts/expertise/expertise_sm_general_hammer_fanning_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_hammer_fanning_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_hammer_fanning_4") - return diff --git a/scripts/expertise/expertise_sm_general_head_crack_1.py b/scripts/expertise/expertise_sm_general_head_crack_1.py deleted file mode 100644 index 7f20d29f..00000000 --- a/scripts/expertise/expertise_sm_general_head_crack_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_head_crack_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_head_crack_1") - return diff --git a/scripts/expertise/expertise_sm_general_head_crack_2.py b/scripts/expertise/expertise_sm_general_head_crack_2.py deleted file mode 100644 index abe7628c..00000000 --- a/scripts/expertise/expertise_sm_general_head_crack_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_head_crack_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_head_crack_2") - return diff --git a/scripts/expertise/expertise_sm_general_hidden_padding_1.py b/scripts/expertise/expertise_sm_general_hidden_padding_1.py deleted file mode 100644 index 07cceb20..00000000 --- a/scripts/expertise/expertise_sm_general_hidden_padding_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_hidden_padding_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_hidden_padding_1") - return diff --git a/scripts/expertise/expertise_sm_general_hidden_padding_2.py b/scripts/expertise/expertise_sm_general_hidden_padding_2.py deleted file mode 100644 index 3c2cc318..00000000 --- a/scripts/expertise/expertise_sm_general_hidden_padding_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_hidden_padding_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_hidden_padding_2") - return diff --git a/scripts/expertise/expertise_sm_general_idiot_proof_plan_1.py b/scripts/expertise/expertise_sm_general_idiot_proof_plan_1.py deleted file mode 100644 index 05db4ebf..00000000 --- a/scripts/expertise/expertise_sm_general_idiot_proof_plan_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_idiot_proof_plan_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_idiot_proof_plan_1") - return diff --git a/scripts/expertise/expertise_sm_general_idiot_proof_plan_2.py b/scripts/expertise/expertise_sm_general_idiot_proof_plan_2.py deleted file mode 100644 index 3baa2e23..00000000 --- a/scripts/expertise/expertise_sm_general_idiot_proof_plan_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_idiot_proof_plan_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_idiot_proof_plan_2") - return diff --git a/scripts/expertise/expertise_sm_general_lined_pockets_1.py b/scripts/expertise/expertise_sm_general_lined_pockets_1.py deleted file mode 100644 index e22e98ad..00000000 --- a/scripts/expertise/expertise_sm_general_lined_pockets_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_lined_pockets_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_lined_pockets_1") - return diff --git a/scripts/expertise/expertise_sm_general_lined_pockets_2.py b/scripts/expertise/expertise_sm_general_lined_pockets_2.py deleted file mode 100644 index 08bf5f8d..00000000 --- a/scripts/expertise/expertise_sm_general_lined_pockets_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_lined_pockets_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_lined_pockets_2") - return diff --git a/scripts/expertise/expertise_sm_general_meager_fortune_1.py b/scripts/expertise/expertise_sm_general_meager_fortune_1.py deleted file mode 100644 index 40018dbd..00000000 --- a/scripts/expertise/expertise_sm_general_meager_fortune_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_meager_fortune_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_meager_fortune_1") - return diff --git a/scripts/expertise/expertise_sm_general_one_two_pummel_1.py b/scripts/expertise/expertise_sm_general_one_two_pummel_1.py deleted file mode 100644 index 0fbb25e1..00000000 --- a/scripts/expertise/expertise_sm_general_one_two_pummel_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_one_two_pummel_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_one_two_pummel_1") - return diff --git a/scripts/expertise/expertise_sm_general_one_two_pummel_2.py b/scripts/expertise/expertise_sm_general_one_two_pummel_2.py deleted file mode 100644 index f33d6cca..00000000 --- a/scripts/expertise/expertise_sm_general_one_two_pummel_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_one_two_pummel_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_one_two_pummel_2") - return diff --git a/scripts/expertise/expertise_sm_general_one_two_pummel_3.py b/scripts/expertise/expertise_sm_general_one_two_pummel_3.py deleted file mode 100644 index 31f91153..00000000 --- a/scripts/expertise/expertise_sm_general_one_two_pummel_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_one_two_pummel_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_one_two_pummel_3") - return diff --git a/scripts/expertise/expertise_sm_general_one_two_pummel_4.py b/scripts/expertise/expertise_sm_general_one_two_pummel_4.py deleted file mode 100644 index 7832734e..00000000 --- a/scripts/expertise/expertise_sm_general_one_two_pummel_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_one_two_pummel_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_one_two_pummel_4") - return diff --git a/scripts/expertise/expertise_sm_general_poor_prospect_1.py b/scripts/expertise/expertise_sm_general_poor_prospect_1.py deleted file mode 100644 index 6cbf1c51..00000000 --- a/scripts/expertise/expertise_sm_general_poor_prospect_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_poor_prospect_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_poor_prospect_1") - return diff --git a/scripts/expertise/expertise_sm_general_poor_prospect_2.py b/scripts/expertise/expertise_sm_general_poor_prospect_2.py deleted file mode 100644 index 18d810f7..00000000 --- a/scripts/expertise/expertise_sm_general_poor_prospect_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_poor_prospect_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_poor_prospect_2") - return diff --git a/scripts/expertise/expertise_sm_general_precise_bead_1.py b/scripts/expertise/expertise_sm_general_precise_bead_1.py deleted file mode 100644 index 427e2f61..00000000 --- a/scripts/expertise/expertise_sm_general_precise_bead_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_precise_bead_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_precise_bead_1") - return diff --git a/scripts/expertise/expertise_sm_general_precise_bead_2.py b/scripts/expertise/expertise_sm_general_precise_bead_2.py deleted file mode 100644 index 941d326d..00000000 --- a/scripts/expertise/expertise_sm_general_precise_bead_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_precise_bead_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_precise_bead_2") - return diff --git a/scripts/expertise/expertise_sm_general_switcheroo_1.py b/scripts/expertise/expertise_sm_general_switcheroo_1.py deleted file mode 100644 index 50d08045..00000000 --- a/scripts/expertise/expertise_sm_general_switcheroo_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_switcheroo_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_switcheroo_1") - return diff --git a/scripts/expertise/expertise_sm_general_switcheroo_2.py b/scripts/expertise/expertise_sm_general_switcheroo_2.py deleted file mode 100644 index e66bad5a..00000000 --- a/scripts/expertise/expertise_sm_general_switcheroo_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_switcheroo_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_switcheroo_2") - return diff --git a/scripts/expertise/expertise_sm_general_switcheroo_3.py b/scripts/expertise/expertise_sm_general_switcheroo_3.py deleted file mode 100644 index e7e1dcf9..00000000 --- a/scripts/expertise/expertise_sm_general_switcheroo_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_switcheroo_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_switcheroo_3") - return diff --git a/scripts/expertise/expertise_sm_general_switcheroo_4.py b/scripts/expertise/expertise_sm_general_switcheroo_4.py deleted file mode 100644 index c52c8ddf..00000000 --- a/scripts/expertise/expertise_sm_general_switcheroo_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_switcheroo_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_switcheroo_4") - return diff --git a/scripts/expertise/expertise_sm_general_wretched_fate_1.py b/scripts/expertise/expertise_sm_general_wretched_fate_1.py deleted file mode 100644 index e1c1ba8d..00000000 --- a/scripts/expertise/expertise_sm_general_wretched_fate_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_general_wretched_fate_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_general_wretched_fate_1") - return diff --git a/scripts/expertise/expertise_sm_path_beat_down_1.py b/scripts/expertise/expertise_sm_path_beat_down_1.py deleted file mode 100644 index ac0f35cb..00000000 --- a/scripts/expertise/expertise_sm_path_beat_down_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_beat_down_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_beat_down_1") - return diff --git a/scripts/expertise/expertise_sm_path_beat_down_2.py b/scripts/expertise/expertise_sm_path_beat_down_2.py deleted file mode 100644 index 49463363..00000000 --- a/scripts/expertise/expertise_sm_path_beat_down_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_beat_down_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_beat_down_2") - return diff --git a/scripts/expertise/expertise_sm_path_best_deal_ever_1.py b/scripts/expertise/expertise_sm_path_best_deal_ever_1.py deleted file mode 100644 index 5ff94eb3..00000000 --- a/scripts/expertise/expertise_sm_path_best_deal_ever_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_best_deal_ever_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_best_deal_ever_1") - return diff --git a/scripts/expertise/expertise_sm_path_best_deal_ever_2.py b/scripts/expertise/expertise_sm_path_best_deal_ever_2.py deleted file mode 100644 index 60cf82ff..00000000 --- a/scripts/expertise/expertise_sm_path_best_deal_ever_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_best_deal_ever_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_best_deal_ever_2") - return diff --git a/scripts/expertise/expertise_sm_path_blaster_at_your_side_1.py b/scripts/expertise/expertise_sm_path_blaster_at_your_side_1.py deleted file mode 100644 index 93b9fb75..00000000 --- a/scripts/expertise/expertise_sm_path_blaster_at_your_side_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_blaster_at_your_side_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_blaster_at_your_side_1") - return diff --git a/scripts/expertise/expertise_sm_path_blaster_at_your_side_2.py b/scripts/expertise/expertise_sm_path_blaster_at_your_side_2.py deleted file mode 100644 index 71b64cd7..00000000 --- a/scripts/expertise/expertise_sm_path_blaster_at_your_side_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_blaster_at_your_side_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_blaster_at_your_side_2") - return diff --git a/scripts/expertise/expertise_sm_path_blindside_1.py b/scripts/expertise/expertise_sm_path_blindside_1.py deleted file mode 100644 index 8914b449..00000000 --- a/scripts/expertise/expertise_sm_path_blindside_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_blindside_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_blindside_1") - return diff --git a/scripts/expertise/expertise_sm_path_blindside_2.py b/scripts/expertise/expertise_sm_path_blindside_2.py deleted file mode 100644 index 85ff65e6..00000000 --- a/scripts/expertise/expertise_sm_path_blindside_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_blindside_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_blindside_2") - return diff --git a/scripts/expertise/expertise_sm_path_card_up_your_sleeve_1.py b/scripts/expertise/expertise_sm_path_card_up_your_sleeve_1.py deleted file mode 100644 index c8664074..00000000 --- a/scripts/expertise/expertise_sm_path_card_up_your_sleeve_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_card_up_your_sleeve_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_card_up_your_sleeve_1") - return diff --git a/scripts/expertise/expertise_sm_path_card_up_your_sleeve_2.py b/scripts/expertise/expertise_sm_path_card_up_your_sleeve_2.py deleted file mode 100644 index 350c78a6..00000000 --- a/scripts/expertise/expertise_sm_path_card_up_your_sleeve_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_card_up_your_sleeve_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_card_up_your_sleeve_2") - return diff --git a/scripts/expertise/expertise_sm_path_card_up_your_sleeve_3.py b/scripts/expertise/expertise_sm_path_card_up_your_sleeve_3.py deleted file mode 100644 index 36a56da8..00000000 --- a/scripts/expertise/expertise_sm_path_card_up_your_sleeve_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_card_up_your_sleeve_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_card_up_your_sleeve_3") - return diff --git a/scripts/expertise/expertise_sm_path_card_up_your_sleeve_4.py b/scripts/expertise/expertise_sm_path_card_up_your_sleeve_4.py deleted file mode 100644 index 2c273743..00000000 --- a/scripts/expertise/expertise_sm_path_card_up_your_sleeve_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_card_up_your_sleeve_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_card_up_your_sleeve_4") - return diff --git a/scripts/expertise/expertise_sm_path_easy_money_1.py b/scripts/expertise/expertise_sm_path_easy_money_1.py deleted file mode 100644 index 9891035b..00000000 --- a/scripts/expertise/expertise_sm_path_easy_money_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_easy_money_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_easy_money_1") - return diff --git a/scripts/expertise/expertise_sm_path_easy_money_2.py b/scripts/expertise/expertise_sm_path_easy_money_2.py deleted file mode 100644 index a02f24f8..00000000 --- a/scripts/expertise/expertise_sm_path_easy_money_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_easy_money_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_easy_money_2") - return diff --git a/scripts/expertise/expertise_sm_path_easy_money_3.py b/scripts/expertise/expertise_sm_path_easy_money_3.py deleted file mode 100644 index 18684c32..00000000 --- a/scripts/expertise/expertise_sm_path_easy_money_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_easy_money_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_easy_money_3") - return diff --git a/scripts/expertise/expertise_sm_path_easy_money_4.py b/scripts/expertise/expertise_sm_path_easy_money_4.py deleted file mode 100644 index 3241291b..00000000 --- a/scripts/expertise/expertise_sm_path_easy_money_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_easy_money_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_easy_money_4") - return diff --git a/scripts/expertise/expertise_sm_path_eat_dirt_1.py b/scripts/expertise/expertise_sm_path_eat_dirt_1.py deleted file mode 100644 index 54211af3..00000000 --- a/scripts/expertise/expertise_sm_path_eat_dirt_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_eat_dirt_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_eat_dirt_1") - return diff --git a/scripts/expertise/expertise_sm_path_eat_dirt_2.py b/scripts/expertise/expertise_sm_path_eat_dirt_2.py deleted file mode 100644 index da074616..00000000 --- a/scripts/expertise/expertise_sm_path_eat_dirt_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_eat_dirt_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_eat_dirt_2") - return diff --git a/scripts/expertise/expertise_sm_path_fake_goods_1.py b/scripts/expertise/expertise_sm_path_fake_goods_1.py deleted file mode 100644 index bd727012..00000000 --- a/scripts/expertise/expertise_sm_path_fake_goods_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_fake_goods_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_fake_goods_1") - return diff --git a/scripts/expertise/expertise_sm_path_fake_goods_2.py b/scripts/expertise/expertise_sm_path_fake_goods_2.py deleted file mode 100644 index 3419faae..00000000 --- a/scripts/expertise/expertise_sm_path_fake_goods_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_fake_goods_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_fake_goods_2") - return diff --git a/scripts/expertise/expertise_sm_path_feeling_lucky_1.py b/scripts/expertise/expertise_sm_path_feeling_lucky_1.py deleted file mode 100644 index 1f38b885..00000000 --- a/scripts/expertise/expertise_sm_path_feeling_lucky_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_feeling_lucky_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_feeling_lucky_1") - return diff --git a/scripts/expertise/expertise_sm_path_feeling_lucky_2.py b/scripts/expertise/expertise_sm_path_feeling_lucky_2.py deleted file mode 100644 index 6c5af161..00000000 --- a/scripts/expertise/expertise_sm_path_feeling_lucky_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_feeling_lucky_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_feeling_lucky_2") - return diff --git a/scripts/expertise/expertise_sm_path_feeling_lucky_3.py b/scripts/expertise/expertise_sm_path_feeling_lucky_3.py deleted file mode 100644 index 7965558c..00000000 --- a/scripts/expertise/expertise_sm_path_feeling_lucky_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_feeling_lucky_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_feeling_lucky_3") - return diff --git a/scripts/expertise/expertise_sm_path_feeling_lucky_4.py b/scripts/expertise/expertise_sm_path_feeling_lucky_4.py deleted file mode 100644 index b9299149..00000000 --- a/scripts/expertise/expertise_sm_path_feeling_lucky_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_feeling_lucky_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_feeling_lucky_4") - return diff --git a/scripts/expertise/expertise_sm_path_flying_tackle_1.py b/scripts/expertise/expertise_sm_path_flying_tackle_1.py deleted file mode 100644 index 5fbcd2eb..00000000 --- a/scripts/expertise/expertise_sm_path_flying_tackle_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_flying_tackle_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_flying_tackle_1") - return diff --git a/scripts/expertise/expertise_sm_path_flying_tackle_2.py b/scripts/expertise/expertise_sm_path_flying_tackle_2.py deleted file mode 100644 index 249e61b5..00000000 --- a/scripts/expertise/expertise_sm_path_flying_tackle_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_flying_tackle_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_flying_tackle_2") - return diff --git a/scripts/expertise/expertise_sm_path_loaded_chance_dice_1.py b/scripts/expertise/expertise_sm_path_loaded_chance_dice_1.py deleted file mode 100644 index a73977ba..00000000 --- a/scripts/expertise/expertise_sm_path_loaded_chance_dice_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_loaded_chance_dice_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_loaded_chance_dice_1") - return diff --git a/scripts/expertise/expertise_sm_path_loaded_chance_dice_2.py b/scripts/expertise/expertise_sm_path_loaded_chance_dice_2.py deleted file mode 100644 index ec00a3d4..00000000 --- a/scripts/expertise/expertise_sm_path_loaded_chance_dice_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_loaded_chance_dice_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_loaded_chance_dice_2") - return diff --git a/scripts/expertise/expertise_sm_path_lucky_break_1.py b/scripts/expertise/expertise_sm_path_lucky_break_1.py deleted file mode 100644 index 2beff304..00000000 --- a/scripts/expertise/expertise_sm_path_lucky_break_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_lucky_break_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_lucky_break_1") - return diff --git a/scripts/expertise/expertise_sm_path_lucky_break_2.py b/scripts/expertise/expertise_sm_path_lucky_break_2.py deleted file mode 100644 index 5a40d6c0..00000000 --- a/scripts/expertise/expertise_sm_path_lucky_break_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_lucky_break_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_lucky_break_2") - return diff --git a/scripts/expertise/expertise_sm_path_lucky_break_3.py b/scripts/expertise/expertise_sm_path_lucky_break_3.py deleted file mode 100644 index b1507e0b..00000000 --- a/scripts/expertise/expertise_sm_path_lucky_break_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_lucky_break_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_lucky_break_3") - return diff --git a/scripts/expertise/expertise_sm_path_lucky_break_4.py b/scripts/expertise/expertise_sm_path_lucky_break_4.py deleted file mode 100644 index b30641cc..00000000 --- a/scripts/expertise/expertise_sm_path_lucky_break_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_lucky_break_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_lucky_break_4") - return diff --git a/scripts/expertise/expertise_sm_path_ploy_1.py b/scripts/expertise/expertise_sm_path_ploy_1.py deleted file mode 100644 index 956c9d43..00000000 --- a/scripts/expertise/expertise_sm_path_ploy_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_ploy_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_ploy_1") - return diff --git a/scripts/expertise/expertise_sm_path_ploy_2.py b/scripts/expertise/expertise_sm_path_ploy_2.py deleted file mode 100644 index fe707dc0..00000000 --- a/scripts/expertise/expertise_sm_path_ploy_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_ploy_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_ploy_2") - return diff --git a/scripts/expertise/expertise_sm_path_ploy_3.py b/scripts/expertise/expertise_sm_path_ploy_3.py deleted file mode 100644 index cecca14e..00000000 --- a/scripts/expertise/expertise_sm_path_ploy_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_ploy_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_ploy_3") - return diff --git a/scripts/expertise/expertise_sm_path_ploy_4.py b/scripts/expertise/expertise_sm_path_ploy_4.py deleted file mode 100644 index de968f40..00000000 --- a/scripts/expertise/expertise_sm_path_ploy_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_ploy_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_ploy_4") - return diff --git a/scripts/expertise/expertise_sm_path_quick_fix_1.py b/scripts/expertise/expertise_sm_path_quick_fix_1.py deleted file mode 100644 index 68fa7682..00000000 --- a/scripts/expertise/expertise_sm_path_quick_fix_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_quick_fix_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_quick_fix_1") - return diff --git a/scripts/expertise/expertise_sm_path_quick_fix_2.py b/scripts/expertise/expertise_sm_path_quick_fix_2.py deleted file mode 100644 index 7426e059..00000000 --- a/scripts/expertise/expertise_sm_path_quick_fix_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_quick_fix_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_quick_fix_2") - return diff --git a/scripts/expertise/expertise_sm_path_quick_fix_3.py b/scripts/expertise/expertise_sm_path_quick_fix_3.py deleted file mode 100644 index c469d4ed..00000000 --- a/scripts/expertise/expertise_sm_path_quick_fix_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_quick_fix_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_quick_fix_3") - return diff --git a/scripts/expertise/expertise_sm_path_quick_fix_4.py b/scripts/expertise/expertise_sm_path_quick_fix_4.py deleted file mode 100644 index cebeae68..00000000 --- a/scripts/expertise/expertise_sm_path_quick_fix_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_quick_fix_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_quick_fix_4") - return diff --git a/scripts/expertise/expertise_sm_path_scandal_1.py b/scripts/expertise/expertise_sm_path_scandal_1.py deleted file mode 100644 index e4f9b9b0..00000000 --- a/scripts/expertise/expertise_sm_path_scandal_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_scandal_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_scandal_1") - return diff --git a/scripts/expertise/expertise_sm_path_scandal_2.py b/scripts/expertise/expertise_sm_path_scandal_2.py deleted file mode 100644 index 39dc1d2b..00000000 --- a/scripts/expertise/expertise_sm_path_scandal_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_scandal_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_scandal_2) - return diff --git a/scripts/expertise/expertise_sm_path_scandal_3.py b/scripts/expertise/expertise_sm_path_scandal_3.py deleted file mode 100644 index 4094a791..00000000 --- a/scripts/expertise/expertise_sm_path_scandal_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_scandal_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_scandal_3") - return diff --git a/scripts/expertise/expertise_sm_path_scandal_4.py b/scripts/expertise/expertise_sm_path_scandal_4.py deleted file mode 100644 index 6352b2e1..00000000 --- a/scripts/expertise/expertise_sm_path_scandal_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_scandal_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_scandal_4") - return diff --git a/scripts/expertise/expertise_sm_path_sleight_of_hand_1.py b/scripts/expertise/expertise_sm_path_sleight_of_hand_1.py deleted file mode 100644 index 98907737..00000000 --- a/scripts/expertise/expertise_sm_path_sleight_of_hand_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_sleight_of_hand_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_sleight_of_hand_1") - return diff --git a/scripts/expertise/expertise_sm_path_sleight_of_hand_2.py b/scripts/expertise/expertise_sm_path_sleight_of_hand_2.py deleted file mode 100644 index 88bdf88d..00000000 --- a/scripts/expertise/expertise_sm_path_sleight_of_hand_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_sleight_of_hand_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_sleight_of_hand_2") - return diff --git a/scripts/expertise/expertise_sm_path_smooth_move_1.py b/scripts/expertise/expertise_sm_path_smooth_move_1.py deleted file mode 100644 index 0f766064..00000000 --- a/scripts/expertise/expertise_sm_path_smooth_move_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_smooth_move_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_smooth_move_1") - return diff --git a/scripts/expertise/expertise_sm_path_smooth_move_2.py b/scripts/expertise/expertise_sm_path_smooth_move_2.py deleted file mode 100644 index d27d5c81..00000000 --- a/scripts/expertise/expertise_sm_path_smooth_move_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_smooth_move_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_smooth_move_2") - return diff --git a/scripts/expertise/expertise_sm_path_smooth_move_3.py b/scripts/expertise/expertise_sm_path_smooth_move_3.py deleted file mode 100644 index 888bd5d2..00000000 --- a/scripts/expertise/expertise_sm_path_smooth_move_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_smooth_move_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_smooth_move_3") - return diff --git a/scripts/expertise/expertise_sm_path_smooth_move_4.py b/scripts/expertise/expertise_sm_path_smooth_move_4.py deleted file mode 100644 index 52572e2a..00000000 --- a/scripts/expertise/expertise_sm_path_smooth_move_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sm_path_smooth_move_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sm_path_smooth_move_4") - return diff --git a/scripts/expertise/expertise_sm_path_under_the_counter_1.py b/scripts/expertise/expertise_sm_path_under_the_counter_1.py deleted file mode 100644 index 4ca94bdb..00000000 --- a/scripts/expertise/expertise_sm_path_under_the_counter_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_path_under_the_counter_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_path_under_the_counter_1") - return diff --git a/scripts/expertise/expertise_sm_path_under_the_counter_2.py b/scripts/expertise/expertise_sm_path_under_the_counter_2.py deleted file mode 100644 index 5769c9d6..00000000 --- a/scripts/expertise/expertise_sm_path_under_the_counter_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_path_under_the_counter_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_path_under_the_counter_2") - return diff --git a/scripts/expertise/expertise_sp_assassins_blade_1.py b/scripts/expertise/expertise_sp_assassins_blade_1.py deleted file mode 100644 index e022fcf7..00000000 --- a/scripts/expertise/expertise_sp_assassins_blade_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_assassins_blade_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_assassins_blade_1") - return diff --git a/scripts/expertise/expertise_sp_assassins_blade_2.py b/scripts/expertise/expertise_sp_assassins_blade_2.py deleted file mode 100644 index 19d3ca7d..00000000 --- a/scripts/expertise/expertise_sp_assassins_blade_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_assassins_blade_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_assassins_blade_2") - return diff --git a/scripts/expertise/expertise_sp_assassins_blade_4.py b/scripts/expertise/expertise_sp_assassins_blade_4.py deleted file mode 100644 index 810a2d9c..00000000 --- a/scripts/expertise/expertise_sp_assassins_blade_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_assassins_blade_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_assassins_blade_3") - return diff --git a/scripts/expertise/expertise_sp_careful_observation_1.py b/scripts/expertise/expertise_sp_careful_observation_1.py deleted file mode 100644 index 158e2de9..00000000 --- a/scripts/expertise/expertise_sp_careful_observation_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_careful_observation_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_careful_observation_1") - return diff --git a/scripts/expertise/expertise_sp_careful_observation_2.py b/scripts/expertise/expertise_sp_careful_observation_2.py deleted file mode 100644 index 64ab18fe..00000000 --- a/scripts/expertise/expertise_sp_careful_observation_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_careful_observation_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_careful_observation_2") - return diff --git a/scripts/expertise/expertise_sp_cheap_shots_1.py b/scripts/expertise/expertise_sp_cheap_shots_1.py deleted file mode 100644 index 4c45be85..00000000 --- a/scripts/expertise/expertise_sp_cheap_shots_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cheap_shots_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cheap_shots_1") - return diff --git a/scripts/expertise/expertise_sp_cheap_shots_2.py b/scripts/expertise/expertise_sp_cheap_shots_2.py deleted file mode 100644 index 6f1510ff..00000000 --- a/scripts/expertise/expertise_sp_cheap_shots_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cheap_shots_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cheap_shots_2") - return diff --git a/scripts/expertise/expertise_sp_cheap_shots_3.py b/scripts/expertise/expertise_sp_cheap_shots_3.py deleted file mode 100644 index a44a75a0..00000000 --- a/scripts/expertise/expertise_sp_cheap_shots_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cheap_shots_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cheap_shots_3") - return diff --git a/scripts/expertise/expertise_sp_cheap_shots_4.py b/scripts/expertise/expertise_sp_cheap_shots_4.py deleted file mode 100644 index be49ce20..00000000 --- a/scripts/expertise/expertise_sp_cheap_shots_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cheap_shots_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cheap_shots_4") - return diff --git a/scripts/expertise/expertise_sp_cheap_strikes_1.py b/scripts/expertise/expertise_sp_cheap_strikes_1.py deleted file mode 100644 index bf64aff5..00000000 --- a/scripts/expertise/expertise_sp_cheap_strikes_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cheap_strikes_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cheap_strikes_1") - return diff --git a/scripts/expertise/expertise_sp_cheap_strikes_2.py b/scripts/expertise/expertise_sp_cheap_strikes_2.py deleted file mode 100644 index 2264e3cc..00000000 --- a/scripts/expertise/expertise_sp_cheap_strikes_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cheap_strikes_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cheap_strikes_2") - return diff --git a/scripts/expertise/expertise_sp_cheap_strikes_3.py b/scripts/expertise/expertise_sp_cheap_strikes_3.py deleted file mode 100644 index 110acea8..00000000 --- a/scripts/expertise/expertise_sp_cheap_strikes_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cheap_strikes_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cheap_strikes_3") - return diff --git a/scripts/expertise/expertise_sp_cheap_strikes_4.py b/scripts/expertise/expertise_sp_cheap_strikes_4.py deleted file mode 100644 index 97a2d0f6..00000000 --- a/scripts/expertise/expertise_sp_cheap_strikes_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cheap_strikes_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cheap_strikes_4") - return diff --git a/scripts/expertise/expertise_sp_cloak_and_dagger_1.py b/scripts/expertise/expertise_sp_cloak_and_dagger_1.py deleted file mode 100644 index 55d9c884..00000000 --- a/scripts/expertise/expertise_sp_cloak_and_dagger_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cloak_and_dagger_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cloak_and_dagger_1") - return diff --git a/scripts/expertise/expertise_sp_cloak_and_dagger_2.py b/scripts/expertise/expertise_sp_cloak_and_dagger_2.py deleted file mode 100644 index 1ee3ca02..00000000 --- a/scripts/expertise/expertise_sp_cloak_and_dagger_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cloak_and_dagger_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cloak_and_dagger_2") - return diff --git a/scripts/expertise/expertise_sp_cloak_and_dagger_3.py b/scripts/expertise/expertise_sp_cloak_and_dagger_3.py deleted file mode 100644 index c46d0390..00000000 --- a/scripts/expertise/expertise_sp_cloak_and_dagger_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cloak_and_dagger_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cloak_and_dagger_3") - return diff --git a/scripts/expertise/expertise_sp_cloak_and_dagger_4.py b/scripts/expertise/expertise_sp_cloak_and_dagger_4.py deleted file mode 100644 index 7e78d832..00000000 --- a/scripts/expertise/expertise_sp_cloak_and_dagger_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cloak_and_dagger_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cloak_and_dagger_4") - return diff --git a/scripts/expertise/expertise_sp_cloaking_armor_1.py b/scripts/expertise/expertise_sp_cloaking_armor_1.py deleted file mode 100644 index 4d29b500..00000000 --- a/scripts/expertise/expertise_sp_cloaking_armor_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cloaking_armor_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cloaking_armor_1") - return diff --git a/scripts/expertise/expertise_sp_cloaking_armor_2.py b/scripts/expertise/expertise_sp_cloaking_armor_2.py deleted file mode 100644 index 7aef08d8..00000000 --- a/scripts/expertise/expertise_sp_cloaking_armor_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_cloaking_armor_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_cloaking_armor_2") - return diff --git a/scripts/expertise/expertise_sp_close_quarters_1.py b/scripts/expertise/expertise_sp_close_quarters_1.py deleted file mode 100644 index e98a053f..00000000 --- a/scripts/expertise/expertise_sp_close_quarters_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_close_quarters_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_close_quarters_1") - return diff --git a/scripts/expertise/expertise_sp_close_quarters_2.py b/scripts/expertise/expertise_sp_close_quarters_2.py deleted file mode 100644 index 6a94d3e4..00000000 --- a/scripts/expertise/expertise_sp_close_quarters_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_close_quarters_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_close_quarters_2") - return diff --git a/scripts/expertise/expertise_sp_close_quarters_3.py b/scripts/expertise/expertise_sp_close_quarters_3.py deleted file mode 100644 index 3b9e0088..00000000 --- a/scripts/expertise/expertise_sp_close_quarters_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_close_quarters_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_close_quarters_3") - return diff --git a/scripts/expertise/expertise_sp_covert_mastery_1.py b/scripts/expertise/expertise_sp_covert_mastery_1.py deleted file mode 100644 index 56e5d7df..00000000 --- a/scripts/expertise/expertise_sp_covert_mastery_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_covert_mastery_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_covert_mastery_1") - return diff --git a/scripts/expertise/expertise_sp_crippling_traps_1.py b/scripts/expertise/expertise_sp_crippling_traps_1.py deleted file mode 100644 index f414594b..00000000 --- a/scripts/expertise/expertise_sp_crippling_traps_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_crippling_traps_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_crippling_traps_1") - return diff --git a/scripts/expertise/expertise_sp_crippling_traps_2.py b/scripts/expertise/expertise_sp_crippling_traps_2.py deleted file mode 100644 index f5899f9c..00000000 --- a/scripts/expertise/expertise_sp_crippling_traps_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_crippling_traps_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_crippling_traps_2") - return diff --git a/scripts/expertise/expertise_sp_deadly_pistols_1.py b/scripts/expertise/expertise_sp_deadly_pistols_1.py deleted file mode 100644 index 16e02540..00000000 --- a/scripts/expertise/expertise_sp_deadly_pistols_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_deadly_pistols_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_deadly_pistols_1") - return diff --git a/scripts/expertise/expertise_sp_deadly_pistols_2.py b/scripts/expertise/expertise_sp_deadly_pistols_2.py deleted file mode 100644 index dc23941c..00000000 --- a/scripts/expertise/expertise_sp_deadly_pistols_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_deadly_pistols_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_deadly_pistols_2") - return diff --git a/scripts/expertise/expertise_sp_deadly_pistols_3.py b/scripts/expertise/expertise_sp_deadly_pistols_3.py deleted file mode 100644 index 42077da1..00000000 --- a/scripts/expertise/expertise_sp_deadly_pistols_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_deadly_pistols_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_deadly_pistols_3") - return diff --git a/scripts/expertise/expertise_sp_deadly_toxins_1.py b/scripts/expertise/expertise_sp_deadly_toxins_1.py deleted file mode 100644 index cc5432e9..00000000 --- a/scripts/expertise/expertise_sp_deadly_toxins_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_deadly_toxins_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_deadly_toxins_1") - return diff --git a/scripts/expertise/expertise_sp_deadly_toxins_2.py b/scripts/expertise/expertise_sp_deadly_toxins_2.py deleted file mode 100644 index f5f3be36..00000000 --- a/scripts/expertise/expertise_sp_deadly_toxins_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_deadly_toxins_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_deadly_toxins_2") - return diff --git a/scripts/expertise/expertise_sp_diversion_1.py b/scripts/expertise/expertise_sp_diversion_1.py deleted file mode 100644 index fdd847e9..00000000 --- a/scripts/expertise/expertise_sp_diversion_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_diversion_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_diversion_1") - return diff --git a/scripts/expertise/expertise_sp_diversion_2.py b/scripts/expertise/expertise_sp_diversion_2.py deleted file mode 100644 index 7dddf6ba..00000000 --- a/scripts/expertise/expertise_sp_diversion_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_diversion_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_diversion_2") - return diff --git a/scripts/expertise/expertise_sp_equilibrium.py b/scripts/expertise/expertise_sp_equilibrium.py deleted file mode 100644 index 1ebdcbd1..00000000 --- a/scripts/expertise/expertise_sp_equilibrium.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_equilibrium") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_equilibrium") - return diff --git a/scripts/expertise/expertise_sp_expose_shadows_1.py b/scripts/expertise/expertise_sp_expose_shadows_1.py deleted file mode 100644 index 22769831..00000000 --- a/scripts/expertise/expertise_sp_expose_shadows_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_expose_shadows_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_expose_shadows_1") - return diff --git a/scripts/expertise/expertise_sp_expose_shadows_2.py b/scripts/expertise/expertise_sp_expose_shadows_2.py deleted file mode 100644 index ff7f014f..00000000 --- a/scripts/expertise/expertise_sp_expose_shadows_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_expose_shadows_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_expose_shadows_2") - return diff --git a/scripts/expertise/expertise_sp_expose_shadows_3.py b/scripts/expertise/expertise_sp_expose_shadows_3.py deleted file mode 100644 index 209eb428..00000000 --- a/scripts/expertise/expertise_sp_expose_shadows_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_expose_shadows_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_expose_shadows_3") - return diff --git a/scripts/expertise/expertise_sp_expose_shadows_4.py b/scripts/expertise/expertise_sp_expose_shadows_4.py deleted file mode 100644 index 2afdddf2..00000000 --- a/scripts/expertise/expertise_sp_expose_shadows_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_expose_shadows_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_expose_shadows_4") - return diff --git a/scripts/expertise/expertise_sp_glancing_armor_1.py b/scripts/expertise/expertise_sp_glancing_armor_1.py deleted file mode 100644 index f1e04872..00000000 --- a/scripts/expertise/expertise_sp_glancing_armor_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_glancing_armor_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_glancing_armor_1") - return diff --git a/scripts/expertise/expertise_sp_glancing_armor_2.py b/scripts/expertise/expertise_sp_glancing_armor_2.py deleted file mode 100644 index 42c8c808..00000000 --- a/scripts/expertise/expertise_sp_glancing_armor_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_glancing_armor_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_glancing_armor_2") - return diff --git a/scripts/expertise/expertise_sp_improved_first_aid_1.py b/scripts/expertise/expertise_sp_improved_first_aid_1.py deleted file mode 100644 index 7e866996..00000000 --- a/scripts/expertise/expertise_sp_improved_first_aid_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_improved_first_aid_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_improved_first_aid_1") - return diff --git a/scripts/expertise/expertise_sp_improved_first_aid_2.py b/scripts/expertise/expertise_sp_improved_first_aid_2.py deleted file mode 100644 index cec8de8b..00000000 --- a/scripts/expertise/expertise_sp_improved_first_aid_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_improved_first_aid_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_improved_first_aid_2") - return diff --git a/scripts/expertise/expertise_sp_increased_agility_1.py b/scripts/expertise/expertise_sp_increased_agility_1.py deleted file mode 100644 index 3b62fbf5..00000000 --- a/scripts/expertise/expertise_sp_increased_agility_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_increased_agility_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_increased_agility_1") - return diff --git a/scripts/expertise/expertise_sp_increased_agility_2.py b/scripts/expertise/expertise_sp_increased_agility_2.py deleted file mode 100644 index dea0db05..00000000 --- a/scripts/expertise/expertise_sp_increased_agility_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_increased_agility_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_increased_agility_2") - return diff --git a/scripts/expertise/expertise_sp_increased_strength_1.py b/scripts/expertise/expertise_sp_increased_strength_1.py deleted file mode 100644 index b1bec56f..00000000 --- a/scripts/expertise/expertise_sp_increased_strength_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_increased_strength_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_increased_strength_1") - return diff --git a/scripts/expertise/expertise_sp_increased_strength_2.py b/scripts/expertise/expertise_sp_increased_strength_2.py deleted file mode 100644 index ae61711d..00000000 --- a/scripts/expertise/expertise_sp_increased_strength_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_increased_strength_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_increased_strength_2") - return diff --git a/scripts/expertise/expertise_sp_initiative_1.py b/scripts/expertise/expertise_sp_initiative_1.py deleted file mode 100644 index 9032c21a..00000000 --- a/scripts/expertise/expertise_sp_initiative_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_initiative_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_initiative_1") - return diff --git a/scripts/expertise/expertise_sp_initiative_2.py b/scripts/expertise/expertise_sp_initiative_2.py deleted file mode 100644 index ea719348..00000000 --- a/scripts/expertise/expertise_sp_initiative_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_initiative_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_initiative_2") - return diff --git a/scripts/expertise/expertise_sp_initiative_3.py b/scripts/expertise/expertise_sp_initiative_3.py deleted file mode 100644 index 15748ad9..00000000 --- a/scripts/expertise/expertise_sp_initiative_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_initiative_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_initiative_3") - return diff --git a/scripts/expertise/expertise_sp_initiative_4.py b/scripts/expertise/expertise_sp_initiative_4.py deleted file mode 100644 index d013c718..00000000 --- a/scripts/expertise/expertise_sp_initiative_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_initiative_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_initiative_4") - return diff --git a/scripts/expertise/expertise_sp_jagged_edge_1.py b/scripts/expertise/expertise_sp_jagged_edge_1.py deleted file mode 100644 index 2043cb12..00000000 --- a/scripts/expertise/expertise_sp_jagged_edge_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_jagged_edge_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_jagged_edge_1") - return diff --git a/scripts/expertise/expertise_sp_jagged_edge_2.py b/scripts/expertise/expertise_sp_jagged_edge_2.py deleted file mode 100644 index 4360a1af..00000000 --- a/scripts/expertise/expertise_sp_jagged_edge_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_jagged_edge_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_jagged_edge_2") - return diff --git a/scripts/expertise/expertise_sp_jagged_edge_3.py b/scripts/expertise/expertise_sp_jagged_edge_3.py deleted file mode 100644 index e2d8f310..00000000 --- a/scripts/expertise/expertise_sp_jagged_edge_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_jagged_edge_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_jagged_edge_3") - return diff --git a/scripts/expertise/expertise_sp_noxious_traps_1.py b/scripts/expertise/expertise_sp_noxious_traps_1.py deleted file mode 100644 index 8bf68635..00000000 --- a/scripts/expertise/expertise_sp_noxious_traps_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_noxious_traps_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_noxious_traps_1") - return diff --git a/scripts/expertise/expertise_sp_noxious_traps_2.py b/scripts/expertise/expertise_sp_noxious_traps_2.py deleted file mode 100644 index 3d684ce2..00000000 --- a/scripts/expertise/expertise_sp_noxious_traps_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_noxious_traps_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_noxious_traps_2") - return diff --git a/scripts/expertise/expertise_sp_opportunity_1.py b/scripts/expertise/expertise_sp_opportunity_1.py deleted file mode 100644 index ce63f8f1..00000000 --- a/scripts/expertise/expertise_sp_opportunity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_opportunity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_opportunity_1") - return diff --git a/scripts/expertise/expertise_sp_opportunity_2.py b/scripts/expertise/expertise_sp_opportunity_2.py deleted file mode 100644 index 92941b78..00000000 --- a/scripts/expertise/expertise_sp_opportunity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_opportunity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_opportunity_2") - return diff --git a/scripts/expertise/expertise_sp_opportunity_3.py b/scripts/expertise/expertise_sp_opportunity_3.py deleted file mode 100644 index f69db076..00000000 --- a/scripts/expertise/expertise_sp_opportunity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_opportunity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_opportunity_3") - return diff --git a/scripts/expertise/expertise_sp_opportunity_4.py b/scripts/expertise/expertise_sp_opportunity_4.py deleted file mode 100644 index 5c11573c..00000000 --- a/scripts/expertise/expertise_sp_opportunity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_opportunity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_opportunity_4") - return diff --git a/scripts/expertise/expertise_sp_precision_1.py b/scripts/expertise/expertise_sp_precision_1.py deleted file mode 100644 index fc82b38c..00000000 --- a/scripts/expertise/expertise_sp_precision_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_precision_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_precision_1") - return diff --git a/scripts/expertise/expertise_sp_precision_2.py b/scripts/expertise/expertise_sp_precision_2.py deleted file mode 100644 index 7dbf6345..00000000 --- a/scripts/expertise/expertise_sp_precision_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_precision_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_precision_2") - return diff --git a/scripts/expertise/expertise_sp_protective_armor_1.py b/scripts/expertise/expertise_sp_protective_armor_1.py deleted file mode 100644 index e4b17d21..00000000 --- a/scripts/expertise/expertise_sp_protective_armor_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_protective_armor_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_protective_armor_1") - return diff --git a/scripts/expertise/expertise_sp_protective_armor_2.py b/scripts/expertise/expertise_sp_protective_armor_2.py deleted file mode 100644 index 1e9e1495..00000000 --- a/scripts/expertise/expertise_sp_protective_armor_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_protective_armor_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_protective_armor_2") - return diff --git a/scripts/expertise/expertise_sp_protective_armor_3.py b/scripts/expertise/expertise_sp_protective_armor_3.py deleted file mode 100644 index daaaae35..00000000 --- a/scripts/expertise/expertise_sp_protective_armor_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_protective_armor_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_protective_armor_3") - return diff --git a/scripts/expertise/expertise_sp_protective_armor_4.py b/scripts/expertise/expertise_sp_protective_armor_4.py deleted file mode 100644 index 14b113f9..00000000 --- a/scripts/expertise/expertise_sp_protective_armor_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_protective_armor_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_protective_armor_4") - return diff --git a/scripts/expertise/expertise_sp_puncturing_strikes_1.py b/scripts/expertise/expertise_sp_puncturing_strikes_1.py deleted file mode 100644 index 07849a4d..00000000 --- a/scripts/expertise/expertise_sp_puncturing_strikes_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_puncturing_strikes_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_puncturing_strikes_1") - return diff --git a/scripts/expertise/expertise_sp_puncturing_strikes_2.py b/scripts/expertise/expertise_sp_puncturing_strikes_2.py deleted file mode 100644 index d1526657..00000000 --- a/scripts/expertise/expertise_sp_puncturing_strikes_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_puncturing_strikes_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_puncturing_strikes_2") - return diff --git a/scripts/expertise/expertise_sp_puncturing_strikes_3.py b/scripts/expertise/expertise_sp_puncturing_strikes_3.py deleted file mode 100644 index 20173336..00000000 --- a/scripts/expertise/expertise_sp_puncturing_strikes_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_puncturing_strikes_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_puncturing_strikes_3") - return diff --git a/scripts/expertise/expertise_sp_puncturing_strikes_4.py b/scripts/expertise/expertise_sp_puncturing_strikes_4.py deleted file mode 100644 index 858d86c0..00000000 --- a/scripts/expertise/expertise_sp_puncturing_strikes_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_puncturing_strikes_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_puncturing_strikes_4") - return diff --git a/scripts/expertise/expertise_sp_quiet_steps_1.py b/scripts/expertise/expertise_sp_quiet_steps_1.py deleted file mode 100644 index a9ffb99e..00000000 --- a/scripts/expertise/expertise_sp_quiet_steps_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_quiet_steps_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_quiet_steps_1") - return diff --git a/scripts/expertise/expertise_sp_quiet_steps_2.py b/scripts/expertise/expertise_sp_quiet_steps_2.py deleted file mode 100644 index 9dc38491..00000000 --- a/scripts/expertise/expertise_sp_quiet_steps_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_quiet_steps_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_quiet_steps_2") - return diff --git a/scripts/expertise/expertise_sp_rapid_concealment_1.py b/scripts/expertise/expertise_sp_rapid_concealment_1.py deleted file mode 100644 index a9c2efb4..00000000 --- a/scripts/expertise/expertise_sp_rapid_concealment_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_rapid_concealment_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_rapid_concealment_1") - return diff --git a/scripts/expertise/expertise_sp_rapid_concealment_2.py b/scripts/expertise/expertise_sp_rapid_concealment_2.py deleted file mode 100644 index 5397db2e..00000000 --- a/scripts/expertise/expertise_sp_rapid_concealment_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_rapid_concealment_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_rapid_concealment_2") - return diff --git a/scripts/expertise/expertise_sp_rapid_concealment_3.py b/scripts/expertise/expertise_sp_rapid_concealment_3.py deleted file mode 100644 index ce36df91..00000000 --- a/scripts/expertise/expertise_sp_rapid_concealment_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_rapid_concealment_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_rapid_concealment_3") - return diff --git a/scripts/expertise/expertise_sp_rapid_concealment_4.py b/scripts/expertise/expertise_sp_rapid_concealment_4.py deleted file mode 100644 index 1b0d16bc..00000000 --- a/scripts/expertise/expertise_sp_rapid_concealment_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_rapid_concealment_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_rapid_concealment_4") - return diff --git a/scripts/expertise/expertise_sp_resonance.py b/scripts/expertise/expertise_sp_resonance.py deleted file mode 100644 index 815f559a..00000000 --- a/scripts/expertise/expertise_sp_resonance.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_resonance") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_resonance") - return diff --git a/scripts/expertise/expertise_sp_savagery.py b/scripts/expertise/expertise_sp_savagery.py deleted file mode 100644 index b8522cc2..00000000 --- a/scripts/expertise/expertise_sp_savagery.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_savagery") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_savagery") - return diff --git a/scripts/expertise/expertise_sp_shadows_embrace_1.py b/scripts/expertise/expertise_sp_shadows_embrace_1.py deleted file mode 100644 index b0e83dee..00000000 --- a/scripts/expertise/expertise_sp_shadows_embrace_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_shadows_embrace_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_shadows_embrace_1") - return diff --git a/scripts/expertise/expertise_sp_shadows_embrace_2.py b/scripts/expertise/expertise_sp_shadows_embrace_2.py deleted file mode 100644 index ccd8c71e..00000000 --- a/scripts/expertise/expertise_sp_shadows_embrace_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_shadows_embrace_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_shadows_embrace_2") - return diff --git a/scripts/expertise/expertise_sp_shadows_embrace_3.py b/scripts/expertise/expertise_sp_shadows_embrace_3.py deleted file mode 100644 index ac459d05..00000000 --- a/scripts/expertise/expertise_sp_shadows_embrace_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_shadows_embrace_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_shadows_embrace_3") - return diff --git a/scripts/expertise/expertise_sp_shadows_embrace_4.py b/scripts/expertise/expertise_sp_shadows_embrace_4.py deleted file mode 100644 index ef6195ea..00000000 --- a/scripts/expertise/expertise_sp_shadows_embrace_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_shadows_embrace_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_shadows_embrace_4") - return diff --git a/scripts/expertise/expertise_sp_smoke_screen_1.py b/scripts/expertise/expertise_sp_smoke_screen_1.py deleted file mode 100644 index b3e851b3..00000000 --- a/scripts/expertise/expertise_sp_smoke_screen_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_smoke_screen_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_smoke_screen_1") - return diff --git a/scripts/expertise/expertise_sp_smoke_screen_2.py b/scripts/expertise/expertise_sp_smoke_screen_2.py deleted file mode 100644 index 2873cd10..00000000 --- a/scripts/expertise/expertise_sp_smoke_screen_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_smoke_screen_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_smoke_screen_2") - return diff --git a/scripts/expertise/expertise_sp_smoke_screen_3.py b/scripts/expertise/expertise_sp_smoke_screen_3.py deleted file mode 100644 index 57be23e9..00000000 --- a/scripts/expertise/expertise_sp_smoke_screen_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_smoke_screen_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_smoke_screen_3") - return diff --git a/scripts/expertise/expertise_sp_smoke_screen_4.py b/scripts/expertise/expertise_sp_smoke_screen_4.py deleted file mode 100644 index 0ec9ab54..00000000 --- a/scripts/expertise/expertise_sp_smoke_screen_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_smoke_screen_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_smoke_screen_4") - return diff --git a/scripts/expertise/expertise_sp_steup_1.py b/scripts/expertise/expertise_sp_steup_1.py deleted file mode 100644 index 80eed675..00000000 --- a/scripts/expertise/expertise_sp_steup_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_steup_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_steup_1") - return diff --git a/scripts/expertise/expertise_sp_steup_2.py b/scripts/expertise/expertise_sp_steup_2.py deleted file mode 100644 index 3a6b451b..00000000 --- a/scripts/expertise/expertise_sp_steup_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_steup_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_steup_2") - return diff --git a/scripts/expertise/expertise_sp_steup_3.py b/scripts/expertise/expertise_sp_steup_3.py deleted file mode 100644 index 3ab4f758..00000000 --- a/scripts/expertise/expertise_sp_steup_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_steup_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_steup_3") - return diff --git a/scripts/expertise/expertise_sp_steup_4.py b/scripts/expertise/expertise_sp_steup_4.py deleted file mode 100644 index b2eb1e65..00000000 --- a/scripts/expertise/expertise_sp_steup_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_steup_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_steup_4") - return diff --git a/scripts/expertise/expertise_sp_undercover_1.py b/scripts/expertise/expertise_sp_undercover_1.py deleted file mode 100644 index 3c67e708..00000000 --- a/scripts/expertise/expertise_sp_undercover_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_undercover_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_undercover_1") - return diff --git a/scripts/expertise/expertise_sp_undercover_2.py b/scripts/expertise/expertise_sp_undercover_2.py deleted file mode 100644 index b6660db2..00000000 --- a/scripts/expertise/expertise_sp_undercover_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_undercover_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_undercover_2") - return diff --git a/scripts/expertise/expertise_sp_undercover_3.py b/scripts/expertise/expertise_sp_undercover_3.py deleted file mode 100644 index 39c4394d..00000000 --- a/scripts/expertise/expertise_sp_undercover_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_undercover_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_undercover_3") - return diff --git a/scripts/expertise/expertise_sp_vibrogenerator_1.py b/scripts/expertise/expertise_sp_vibrogenerator_1.py deleted file mode 100644 index ed2f90ea..00000000 --- a/scripts/expertise/expertise_sp_vibrogenerator_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_vibrogenerator_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_vibrogenerator_1") - return diff --git a/scripts/expertise/expertise_sp_vibrogenerator_2.py b/scripts/expertise/expertise_sp_vibrogenerator_2.py deleted file mode 100644 index 84e4e570..00000000 --- a/scripts/expertise/expertise_sp_vibrogenerator_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_vibrogenerator_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_vibrogenerator_2") - return diff --git a/scripts/expertise/expertise_sp_vibrogenerator_3.py b/scripts/expertise/expertise_sp_vibrogenerator_3.py deleted file mode 100644 index 592cb4d4..00000000 --- a/scripts/expertise/expertise_sp_vibrogenerator_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_sp_vibrogenerator_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_sp_vibrogenerator_3") - return diff --git a/scripts/expertise/expertise_sp_without_a_trace_1.py b/scripts/expertise/expertise_sp_without_a_trace_1.py deleted file mode 100644 index ebe2f8f3..00000000 --- a/scripts/expertise/expertise_sp_without_a_trace_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("sp_without_a_trace") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("sp_without_a_trace") - return diff --git a/scripts/expertise/expertise_structure_architect_advanced_theory_1.py b/scripts/expertise/expertise_structure_architect_advanced_theory_1.py deleted file mode 100644 index 42e72115..00000000 --- a/scripts/expertise/expertise_structure_architect_advanced_theory_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_theory_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_theory_1") - return diff --git a/scripts/expertise/expertise_structure_architect_dexterity_1.py b/scripts/expertise/expertise_structure_architect_dexterity_1.py deleted file mode 100644 index b3644dbd..00000000 --- a/scripts/expertise/expertise_structure_architect_dexterity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_dexterity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_dexterity_1") - return diff --git a/scripts/expertise/expertise_structure_architect_dexterity_2.py b/scripts/expertise/expertise_structure_architect_dexterity_2.py deleted file mode 100644 index d87f7a01..00000000 --- a/scripts/expertise/expertise_structure_architect_dexterity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_dexterity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_dexterity_2") - return diff --git a/scripts/expertise/expertise_structure_architect_dexterity_3.py b/scripts/expertise/expertise_structure_architect_dexterity_3.py deleted file mode 100644 index f07fb9ae..00000000 --- a/scripts/expertise/expertise_structure_architect_dexterity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_dexterity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_dexterity_3") - return diff --git a/scripts/expertise/expertise_structure_architect_dexterity_4.py b/scripts/expertise/expertise_structure_architect_dexterity_4.py deleted file mode 100644 index 339e3773..00000000 --- a/scripts/expertise/expertise_structure_architect_dexterity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_dexterity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_dexterity_4") - return diff --git a/scripts/expertise/expertise_structure_architect_hypothesis_1.py b/scripts/expertise/expertise_structure_architect_hypothesis_1.py deleted file mode 100644 index 7c1de09a..00000000 --- a/scripts/expertise/expertise_structure_architect_hypothesis_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_hypothesis_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_hypothesis_1") - return diff --git a/scripts/expertise/expertise_structure_architect_hypothesis_2.py b/scripts/expertise/expertise_structure_architect_hypothesis_2.py deleted file mode 100644 index e9acaf9b..00000000 --- a/scripts/expertise/expertise_structure_architect_hypothesis_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_hypothesis_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_hypothesis_2") - return diff --git a/scripts/expertise/expertise_structure_architect_hypothesis_3.py b/scripts/expertise/expertise_structure_architect_hypothesis_3.py deleted file mode 100644 index b43dc039..00000000 --- a/scripts/expertise/expertise_structure_architect_hypothesis_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_hypothesis_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_hypothesis_3") - return diff --git a/scripts/expertise/expertise_structure_architect_hypothesis_4.py b/scripts/expertise/expertise_structure_architect_hypothesis_4.py deleted file mode 100644 index 7a184294..00000000 --- a/scripts/expertise/expertise_structure_architect_hypothesis_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_hypothesis_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_hypothesis_4") - return diff --git a/scripts/expertise/expertise_structure_architect_insight_1.py b/scripts/expertise/expertise_structure_architect_insight_1.py deleted file mode 100644 index 9ff69aa3..00000000 --- a/scripts/expertise/expertise_structure_architect_insight_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_insight_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_insight_1") - return diff --git a/scripts/expertise/expertise_structure_architect_insight_2.py b/scripts/expertise/expertise_structure_architect_insight_2.py deleted file mode 100644 index b5acc5e0..00000000 --- a/scripts/expertise/expertise_structure_architect_insight_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_insight_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_insight_2") - return diff --git a/scripts/expertise/expertise_structure_architect_keen_understanding_1.py b/scripts/expertise/expertise_structure_architect_keen_understanding_1.py deleted file mode 100644 index 5e63c078..00000000 --- a/scripts/expertise/expertise_structure_architect_keen_understanding_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_keen_understanding_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_keen_understanding_1") - return diff --git a/scripts/expertise/expertise_structure_architect_keen_understanding_2.py b/scripts/expertise/expertise_structure_architect_keen_understanding_2.py deleted file mode 100644 index a35ab95e..00000000 --- a/scripts/expertise/expertise_structure_architect_keen_understanding_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_keen_understanding_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_keen_understanding_2") - return diff --git a/scripts/expertise/expertise_structure_architect_schematic_1_1.py b/scripts/expertise/expertise_structure_architect_schematic_1_1.py deleted file mode 100644 index 77d60042..00000000 --- a/scripts/expertise/expertise_structure_architect_schematic_1_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_schematic_1_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_schematic_1_1") - return diff --git a/scripts/expertise/expertise_structure_architect_schematic_2_1.py b/scripts/expertise/expertise_structure_architect_schematic_2_1.py deleted file mode 100644 index 9db9ab48..00000000 --- a/scripts/expertise/expertise_structure_architect_schematic_2_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_architect_schematic_2_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_architect_schematic_2_1") - return diff --git a/scripts/expertise/expertise_structure_artisan_advanced_theory_1.py b/scripts/expertise/expertise_structure_artisan_advanced_theory_1.py deleted file mode 100644 index 59364e96..00000000 --- a/scripts/expertise/expertise_structure_artisan_advanced_theory_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_artisan_advanced_theory_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_artisan_advanced_theory_1") - return diff --git a/scripts/expertise/expertise_structure_artisan_dexterity_1.py b/scripts/expertise/expertise_structure_artisan_dexterity_1.py deleted file mode 100644 index 6b4364cf..00000000 --- a/scripts/expertise/expertise_structure_artisan_dexterity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_artisan_dexterity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_artisan_dexterity_1") - return diff --git a/scripts/expertise/expertise_structure_artisan_dexterity_2.py b/scripts/expertise/expertise_structure_artisan_dexterity_2.py deleted file mode 100644 index e5bee87f..00000000 --- a/scripts/expertise/expertise_structure_artisan_dexterity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_artisan_dexterity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_artisan_dexterity_2") - return diff --git a/scripts/expertise/expertise_structure_artisan_dexterity_3.py b/scripts/expertise/expertise_structure_artisan_dexterity_3.py deleted file mode 100644 index fb2b5c62..00000000 --- a/scripts/expertise/expertise_structure_artisan_dexterity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_artisan_dexterity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_artisan_dexterity_3") - return diff --git a/scripts/expertise/expertise_structure_artisan_dexterity_4.py b/scripts/expertise/expertise_structure_artisan_dexterity_4.py deleted file mode 100644 index c4fea7ab..00000000 --- a/scripts/expertise/expertise_structure_artisan_dexterity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_artisan_dexterity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_artisan_dexterity_4") - return diff --git a/scripts/expertise/expertise_structure_artisan_hypothesis_1.py b/scripts/expertise/expertise_structure_artisan_hypothesis_1.py deleted file mode 100644 index c5ec040c..00000000 --- a/scripts/expertise/expertise_structure_artisan_hypothesis_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_artisan_hypothesis_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_artisan_hypothesis_1") - return diff --git a/scripts/expertise/expertise_structure_artisan_hypothesis_2.py b/scripts/expertise/expertise_structure_artisan_hypothesis_2.py deleted file mode 100644 index c8803e0c..00000000 --- a/scripts/expertise/expertise_structure_artisan_hypothesis_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_artisan_hypothesis_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_artisan_hypothesis_2") - return diff --git a/scripts/expertise/expertise_structure_artisan_hypothesis_3.py b/scripts/expertise/expertise_structure_artisan_hypothesis_3.py deleted file mode 100644 index 0995112b..00000000 --- a/scripts/expertise/expertise_structure_artisan_hypothesis_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_artisan_hypothesis_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_artisan_hypothesis_3") - return diff --git a/scripts/expertise/expertise_structure_artisan_hypothesis_4.py b/scripts/expertise/expertise_structure_artisan_hypothesis_4.py deleted file mode 100644 index d5a30bc6..00000000 --- a/scripts/expertise/expertise_structure_artisan_hypothesis_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_artisan_hypothesis_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_artisan_hypothesis_4") - return diff --git a/scripts/expertise/expertise_structure_resource_processing_1.py b/scripts/expertise/expertise_structure_resource_processing_1.py deleted file mode 100644 index 38475c6d..00000000 --- a/scripts/expertise/expertise_structure_resource_processing_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_resource_processing_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_resource_processing_1") - return diff --git a/scripts/expertise/expertise_structure_resource_processing_2.py b/scripts/expertise/expertise_structure_resource_processing_2.py deleted file mode 100644 index 79d11128..00000000 --- a/scripts/expertise/expertise_structure_resource_processing_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_resource_processing_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_resource_processing_2") - return diff --git a/scripts/expertise/expertise_structure_resource_refinement_1.py b/scripts/expertise/expertise_structure_resource_refinement_1.py deleted file mode 100644 index 5b55ffb2..00000000 --- a/scripts/expertise/expertise_structure_resource_refinement_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_resource_refinement_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_resource_refinement_1") - return diff --git a/scripts/expertise/expertise_structure_resource_refinement_2.py b/scripts/expertise/expertise_structure_resource_refinement_2.py deleted file mode 100644 index d9347d52..00000000 --- a/scripts/expertise/expertise_structure_resource_refinement_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_resource_refinement_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_resource_refinement_2") - return diff --git a/scripts/expertise/expertise_structure_shipwright_advanced_theory_1.py b/scripts/expertise/expertise_structure_shipwright_advanced_theory_1.py deleted file mode 100644 index 7077e0e4..00000000 --- a/scripts/expertise/expertise_structure_shipwright_advanced_theory_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_advanced_theory_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_advanced_theory_1") - return diff --git a/scripts/expertise/expertise_structure_shipwright_dexterity_1.py b/scripts/expertise/expertise_structure_shipwright_dexterity_1.py deleted file mode 100644 index f3bd8da5..00000000 --- a/scripts/expertise/expertise_structure_shipwright_dexterity_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_dexterity_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_dexterity_1") - return diff --git a/scripts/expertise/expertise_structure_shipwright_dexterity_2.py b/scripts/expertise/expertise_structure_shipwright_dexterity_2.py deleted file mode 100644 index c242e7f8..00000000 --- a/scripts/expertise/expertise_structure_shipwright_dexterity_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_dexterity_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_dexterity_2") - return diff --git a/scripts/expertise/expertise_structure_shipwright_dexterity_3.py b/scripts/expertise/expertise_structure_shipwright_dexterity_3.py deleted file mode 100644 index 7690812b..00000000 --- a/scripts/expertise/expertise_structure_shipwright_dexterity_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_dexterity_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_dexterity_3") - return diff --git a/scripts/expertise/expertise_structure_shipwright_dexterity_4.py b/scripts/expertise/expertise_structure_shipwright_dexterity_4.py deleted file mode 100644 index a63652c5..00000000 --- a/scripts/expertise/expertise_structure_shipwright_dexterity_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_dexterity_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_dexterity_4") - return diff --git a/scripts/expertise/expertise_structure_shipwright_hypothesis_1.py b/scripts/expertise/expertise_structure_shipwright_hypothesis_1.py deleted file mode 100644 index 65ef4ba2..00000000 --- a/scripts/expertise/expertise_structure_shipwright_hypothesis_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_hypothesis_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_hypothesis_1") - return diff --git a/scripts/expertise/expertise_structure_shipwright_hypothesis_2.py b/scripts/expertise/expertise_structure_shipwright_hypothesis_2.py deleted file mode 100644 index 4ab8f864..00000000 --- a/scripts/expertise/expertise_structure_shipwright_hypothesis_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_hypothesis_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_hypothesis_2") - return diff --git a/scripts/expertise/expertise_structure_shipwright_hypothesis_3.py b/scripts/expertise/expertise_structure_shipwright_hypothesis_3.py deleted file mode 100644 index af933c60..00000000 --- a/scripts/expertise/expertise_structure_shipwright_hypothesis_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_hypothesis_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_hypothesis_3") - return diff --git a/scripts/expertise/expertise_structure_shipwright_hypothesis_4.py b/scripts/expertise/expertise_structure_shipwright_hypothesis_4.py deleted file mode 100644 index 4b120a10..00000000 --- a/scripts/expertise/expertise_structure_shipwright_hypothesis_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_hypothesis_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_hypothesis_4") - return diff --git a/scripts/expertise/expertise_structure_shipwright_insight_1.py b/scripts/expertise/expertise_structure_shipwright_insight_1.py deleted file mode 100644 index 43dd055e..00000000 --- a/scripts/expertise/expertise_structure_shipwright_insight_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_insight_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_insight_1") - return diff --git a/scripts/expertise/expertise_structure_shipwright_insight_2.py b/scripts/expertise/expertise_structure_shipwright_insight_2.py deleted file mode 100644 index 0fe7dd52..00000000 --- a/scripts/expertise/expertise_structure_shipwright_insight_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_insight_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_insight_2") - return diff --git a/scripts/expertise/expertise_structure_shipwright_keen_understanding_1.py b/scripts/expertise/expertise_structure_shipwright_keen_understanding_1.py deleted file mode 100644 index 211217c1..00000000 --- a/scripts/expertise/expertise_structure_shipwright_keen_understanding_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_keen_understanding_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_keen_understanding_1") - return diff --git a/scripts/expertise/expertise_structure_shipwright_keen_understanding_2.py b/scripts/expertise/expertise_structure_shipwright_keen_understanding_2.py deleted file mode 100644 index c11a18a0..00000000 --- a/scripts/expertise/expertise_structure_shipwright_keen_understanding_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_keen_understanding_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_keen_understanding_2") - return diff --git a/scripts/expertise/expertise_structure_shipwright_schematic_1_1.py b/scripts/expertise/expertise_structure_shipwright_schematic_1_1.py deleted file mode 100644 index 2cce7bef..00000000 --- a/scripts/expertise/expertise_structure_shipwright_schematic_1_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_schmematic_1_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_schmematic_1_1") - return diff --git a/scripts/expertise/expertise_structure_shipwright_schematic_2_1.py b/scripts/expertise/expertise_structure_shipwright_schematic_2_1.py deleted file mode 100644 index b23f6f2c..00000000 --- a/scripts/expertise/expertise_structure_shipwright_schematic_2_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_structure_shipwright_schmematic_2_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_structure_shipwright_schmematic_2_1") - return diff --git a/scripts/expertise/expertise_test_add_proc.py b/scripts/expertise/expertise_test_add_proc.py deleted file mode 100644 index 777edb05..00000000 --- a/scripts/expertise/expertise_test_add_proc.py +++ /dev/null @@ -1,46 +0,0 @@ -import sys - -def addExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.addSkill('expertise_test_add_proc') - - - addAbilities(core, actor, player) - - return - -def removeExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.removeSkill('expertise_test_add_proc') - - - removeAbilities(core, actor, player) - - return - -# this checks what abilities the player gets by level, need to also call this on level-up -def addAbilities(core, actor, player): - - - return - -def removeAbilities(core, actor, player): - - - return diff --git a/scripts/expertise/expertise_test_add_reac.py b/scripts/expertise/expertise_test_add_reac.py deleted file mode 100644 index 201f236d..00000000 --- a/scripts/expertise/expertise_test_add_reac.py +++ /dev/null @@ -1,46 +0,0 @@ -import sys - -def addExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.addSkill('expertise_test_add_reac') - - - addAbilities(core, actor, player) - - return - -def removeExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.removeSkill('expertise_test_add_reac') - - - removeAbilities(core, actor, player) - - return - -# this checks what abilities the player gets by level, need to also call this on level-up -def addAbilities(core, actor, player): - - - return - -def removeAbilities(core, actor, player): - - - return diff --git a/scripts/expertise/expertise_test_postreq_1.py b/scripts/expertise/expertise_test_postreq_1.py deleted file mode 100644 index c166d925..00000000 --- a/scripts/expertise/expertise_test_postreq_1.py +++ /dev/null @@ -1,46 +0,0 @@ -import sys - -def addExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.addSkill('expertise_test_postreq_1') - - - addAbilities(core, actor, player) - - return - -def removeExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.removeSkill('expertise_test_postreq_1') - - - removeAbilities(core, actor, player) - - return - -# this checks what abilities the player gets by level, need to also call this on level-up -def addAbilities(core, actor, player): - - - return - -def removeAbilities(core, actor, player): - - - return diff --git a/scripts/expertise/expertise_test_prereq1_1.py b/scripts/expertise/expertise_test_prereq1_1.py deleted file mode 100644 index 375a8d70..00000000 --- a/scripts/expertise/expertise_test_prereq1_1.py +++ /dev/null @@ -1,46 +0,0 @@ -import sys - -def addExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.addSkill('expertise_test_prereq1_1') - - - addAbilities(core, actor, player) - - return - -def removeExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.removeSkill('expertise_test_prereq1_1') - - - removeAbilities(core, actor, player) - - return - -# this checks what abilities the player gets by level, need to also call this on level-up -def addAbilities(core, actor, player): - - - return - -def removeAbilities(core, actor, player): - - - return diff --git a/scripts/expertise/expertise_test_prereq2_1.py b/scripts/expertise/expertise_test_prereq2_1.py deleted file mode 100644 index 064511dd..00000000 --- a/scripts/expertise/expertise_test_prereq2_1.py +++ /dev/null @@ -1,46 +0,0 @@ -import sys - -def addExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.addSkill('expertise_test_prereq2_1') - - - addAbilities(core, actor, player) - - return - -def removeExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.removeSkill('expertise_test_prereq2_1') - - - removeAbilities(core, actor, player) - - return - -# this checks what abilities the player gets by level, need to also call this on level-up -def addAbilities(core, actor, player): - - - return - -def removeAbilities(core, actor, player): - - - return diff --git a/scripts/expertise/expertise_test_prereq3_1.py b/scripts/expertise/expertise_test_prereq3_1.py deleted file mode 100644 index 109827f9..00000000 --- a/scripts/expertise/expertise_test_prereq3_1.py +++ /dev/null @@ -1,46 +0,0 @@ -import sys - -def addExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.addSkill('expertise_test_prereq3_1') - - - addAbilities(core, actor, player) - - return - -def removeExpertisePoint(core, actor): - - player = actor.getSlottedObject('ghost') - - if not player: - return - - if not player.getProfession() == 'all_1a': - return - - actor.removeSkill('expertise_test_prereq3_1') - - - removeAbilities(core, actor, player) - - return - -# this checks what abilities the player gets by level, need to also call this on level-up -def addAbilities(core, actor, player): - - - return - -def removeAbilities(core, actor, player): - - - return diff --git a/scripts/expertise/expertise_trader_business_accounting_1.py b/scripts/expertise/expertise_trader_business_accounting_1.py deleted file mode 100644 index 115fc5cd..00000000 --- a/scripts/expertise/expertise_trader_business_accounting_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_business_accounting_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_business_accounting_1") - return diff --git a/scripts/expertise/expertise_trader_business_accounting_2.py b/scripts/expertise/expertise_trader_business_accounting_2.py deleted file mode 100644 index 24e5d569..00000000 --- a/scripts/expertise/expertise_trader_business_accounting_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_business_accounting_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_business_accounting_2") - return diff --git a/scripts/expertise/expertise_trader_business_accounting_3.py b/scripts/expertise/expertise_trader_business_accounting_3.py deleted file mode 100644 index d0d619c7..00000000 --- a/scripts/expertise/expertise_trader_business_accounting_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_business_accounting_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_business_accounting_3") - return diff --git a/scripts/expertise/expertise_trader_business_accounting_4.py b/scripts/expertise/expertise_trader_business_accounting_4.py deleted file mode 100644 index 62d4ef7a..00000000 --- a/scripts/expertise/expertise_trader_business_accounting_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_business_accounting_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_business_accounting_4") - return diff --git a/scripts/expertise/expertise_trader_factory_energy_1.py b/scripts/expertise/expertise_trader_factory_energy_1.py deleted file mode 100644 index 0c42837e..00000000 --- a/scripts/expertise/expertise_trader_factory_energy_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_factory_energy_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_factory_energy_1") - return diff --git a/scripts/expertise/expertise_trader_factory_energy_2.py b/scripts/expertise/expertise_trader_factory_energy_2.py deleted file mode 100644 index 5a89f344..00000000 --- a/scripts/expertise/expertise_trader_factory_energy_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_factory_energy_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_factory_energy_2") - return diff --git a/scripts/expertise/expertise_trader_factory_energy_3.py b/scripts/expertise/expertise_trader_factory_energy_3.py deleted file mode 100644 index 998dd932..00000000 --- a/scripts/expertise/expertise_trader_factory_energy_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_factory_energy_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_factory_energy_3") - return diff --git a/scripts/expertise/expertise_trader_factory_energy_4.py b/scripts/expertise/expertise_trader_factory_energy_4.py deleted file mode 100644 index dbed8294..00000000 --- a/scripts/expertise/expertise_trader_factory_energy_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_factory_energy_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_factory_energy_4") - return diff --git a/scripts/expertise/expertise_trader_factory_maintenance_1.py b/scripts/expertise/expertise_trader_factory_maintenance_1.py deleted file mode 100644 index cc4ea7c8..00000000 --- a/scripts/expertise/expertise_trader_factory_maintenance_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_factory_maintenance_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_factory_maintenance_1") - return diff --git a/scripts/expertise/expertise_trader_factory_maintenance_2.py b/scripts/expertise/expertise_trader_factory_maintenance_2.py deleted file mode 100644 index 701595a4..00000000 --- a/scripts/expertise/expertise_trader_factory_maintenance_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_factory_maintenance_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_factory_maintenance_2") - return diff --git a/scripts/expertise/expertise_trader_factory_maintenance_3.py b/scripts/expertise/expertise_trader_factory_maintenance_3.py deleted file mode 100644 index f192b2e5..00000000 --- a/scripts/expertise/expertise_trader_factory_maintenance_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_factory_maintenance_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_factory_maintenance_3") - return diff --git a/scripts/expertise/expertise_trader_factory_maintenance_4.py b/scripts/expertise/expertise_trader_factory_maintenance_4.py deleted file mode 100644 index 2af47dac..00000000 --- a/scripts/expertise/expertise_trader_factory_maintenance_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_factory_maintenance_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_factory_maintenance_4") - return diff --git a/scripts/expertise/expertise_trader_factory_production_1.py b/scripts/expertise/expertise_trader_factory_production_1.py deleted file mode 100644 index 1d1f755b..00000000 --- a/scripts/expertise/expertise_trader_factory_production_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_factory_production_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_factory_production_1") - return diff --git a/scripts/expertise/expertise_trader_factory_production_2.py b/scripts/expertise/expertise_trader_factory_production_2.py deleted file mode 100644 index 8feb2585..00000000 --- a/scripts/expertise/expertise_trader_factory_production_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_factory_production_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_factory_production_2") - return diff --git a/scripts/expertise/expertise_trader_harvester_collection_1.py b/scripts/expertise/expertise_trader_harvester_collection_1.py deleted file mode 100644 index 3b7b2f6e..00000000 --- a/scripts/expertise/expertise_trader_harvester_collection_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_collection_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_collection_1") - return diff --git a/scripts/expertise/expertise_trader_harvester_collection_2.py b/scripts/expertise/expertise_trader_harvester_collection_2.py deleted file mode 100644 index 1959a0fb..00000000 --- a/scripts/expertise/expertise_trader_harvester_collection_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_collection_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_collection_2") - return diff --git a/scripts/expertise/expertise_trader_harvester_energy_1.py b/scripts/expertise/expertise_trader_harvester_energy_1.py deleted file mode 100644 index ef79a694..00000000 --- a/scripts/expertise/expertise_trader_harvester_energy_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_energy_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_energy_1") - return diff --git a/scripts/expertise/expertise_trader_harvester_energy_2.py b/scripts/expertise/expertise_trader_harvester_energy_2.py deleted file mode 100644 index 6ae294a9..00000000 --- a/scripts/expertise/expertise_trader_harvester_energy_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_energy_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_energy_2") - return diff --git a/scripts/expertise/expertise_trader_harvester_energy_3.py b/scripts/expertise/expertise_trader_harvester_energy_3.py deleted file mode 100644 index 247b53c3..00000000 --- a/scripts/expertise/expertise_trader_harvester_energy_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_energy_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_energy_3") - return diff --git a/scripts/expertise/expertise_trader_harvester_energy_4.py b/scripts/expertise/expertise_trader_harvester_energy_4.py deleted file mode 100644 index 8d6225be..00000000 --- a/scripts/expertise/expertise_trader_harvester_energy_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_energy_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_energy_4") - return diff --git a/scripts/expertise/expertise_trader_harvester_maintenance_1.py b/scripts/expertise/expertise_trader_harvester_maintenance_1.py deleted file mode 100644 index da891720..00000000 --- a/scripts/expertise/expertise_trader_harvester_maintenance_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_maintenance_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_maintenance_1") - return diff --git a/scripts/expertise/expertise_trader_harvester_maintenance_2.py b/scripts/expertise/expertise_trader_harvester_maintenance_2.py deleted file mode 100644 index fd1f96cd..00000000 --- a/scripts/expertise/expertise_trader_harvester_maintenance_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_maintenance_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_maintenance_2") - return diff --git a/scripts/expertise/expertise_trader_harvester_maintenance_3.py b/scripts/expertise/expertise_trader_harvester_maintenance_3.py deleted file mode 100644 index d1d62f39..00000000 --- a/scripts/expertise/expertise_trader_harvester_maintenance_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_maintenance_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_maintenance_3") - return diff --git a/scripts/expertise/expertise_trader_harvester_maintenance_4.py b/scripts/expertise/expertise_trader_harvester_maintenance_4.py deleted file mode 100644 index 54e4b04e..00000000 --- a/scripts/expertise/expertise_trader_harvester_maintenance_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_maintenance_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_maintenance_4") - return diff --git a/scripts/expertise/expertise_trader_harvester_storage_1.py b/scripts/expertise/expertise_trader_harvester_storage_1.py deleted file mode 100644 index a1a9c7c8..00000000 --- a/scripts/expertise/expertise_trader_harvester_storage_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_storage_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_storage_1") - return diff --git a/scripts/expertise/expertise_trader_harvester_storage_2.py b/scripts/expertise/expertise_trader_harvester_storage_2.py deleted file mode 100644 index 4f4dc914..00000000 --- a/scripts/expertise/expertise_trader_harvester_storage_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_storage_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_storage_2") - return diff --git a/scripts/expertise/expertise_trader_harvester_storage_3.py b/scripts/expertise/expertise_trader_harvester_storage_3.py deleted file mode 100644 index d0c04a3d..00000000 --- a/scripts/expertise/expertise_trader_harvester_storage_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_storage_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_storage_3") - return diff --git a/scripts/expertise/expertise_trader_harvester_storage_4.py b/scripts/expertise/expertise_trader_harvester_storage_4.py deleted file mode 100644 index 6e2b769b..00000000 --- a/scripts/expertise/expertise_trader_harvester_storage_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_harvester_storage_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_harvester_storage_4") - return diff --git a/scripts/expertise/expertise_trader_personnel_management_1.py b/scripts/expertise/expertise_trader_personnel_management_1.py deleted file mode 100644 index e44aba53..00000000 --- a/scripts/expertise/expertise_trader_personnel_management_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_personnel_management_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_personnel_management_1") - return diff --git a/scripts/expertise/expertise_trader_personnel_management_2.py b/scripts/expertise/expertise_trader_personnel_management_2.py deleted file mode 100644 index 064d6415..00000000 --- a/scripts/expertise/expertise_trader_personnel_management_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_personnel_management_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_personnel_management_2") - return diff --git a/scripts/expertise/expertise_trader_reverse_engineering_1.py b/scripts/expertise/expertise_trader_reverse_engineering_1.py deleted file mode 100644 index 26f209bc..00000000 --- a/scripts/expertise/expertise_trader_reverse_engineering_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_reverse_engineering_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_reverse_engineering_1") - return diff --git a/scripts/expertise/expertise_trader_reverse_engineering_2.py b/scripts/expertise/expertise_trader_reverse_engineering_2.py deleted file mode 100644 index 2192e020..00000000 --- a/scripts/expertise/expertise_trader_reverse_engineering_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_reverse_engineering_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_reverse_engineering_2") - return diff --git a/scripts/expertise/expertise_trader_sampling_collection_1.py b/scripts/expertise/expertise_trader_sampling_collection_1.py deleted file mode 100644 index 4935bf9d..00000000 --- a/scripts/expertise/expertise_trader_sampling_collection_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_sampling_collection_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_sampling_collection_1") - return diff --git a/scripts/expertise/expertise_trader_sampling_collection_2.py b/scripts/expertise/expertise_trader_sampling_collection_2.py deleted file mode 100644 index 1fa225fc..00000000 --- a/scripts/expertise/expertise_trader_sampling_collection_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_sampling_collection_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_sampling_collection_2") - return diff --git a/scripts/expertise/expertise_trader_sampling_collection_3.py b/scripts/expertise/expertise_trader_sampling_collection_3.py deleted file mode 100644 index 9a7a1174..00000000 --- a/scripts/expertise/expertise_trader_sampling_collection_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_sampling_collection_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_sampling_collection_3") - return diff --git a/scripts/expertise/expertise_trader_sampling_collection_4.py b/scripts/expertise/expertise_trader_sampling_collection_4.py deleted file mode 100644 index 158ca5da..00000000 --- a/scripts/expertise/expertise_trader_sampling_collection_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_sampling_collection_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_sampling_collection_4") - return diff --git a/scripts/expertise/expertise_trader_sampling_efficiency_1.py b/scripts/expertise/expertise_trader_sampling_efficiency_1.py deleted file mode 100644 index 2f4c90f2..00000000 --- a/scripts/expertise/expertise_trader_sampling_efficiency_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_sampling_efficiency_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_sampling_efficiency_1") - return diff --git a/scripts/expertise/expertise_trader_sampling_efficiency_2.py b/scripts/expertise/expertise_trader_sampling_efficiency_2.py deleted file mode 100644 index f197eff0..00000000 --- a/scripts/expertise/expertise_trader_sampling_efficiency_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_sampling_efficiency_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_sampling_efficiency_2") - return diff --git a/scripts/expertise/expertise_trader_sampling_efficiency_3.py b/scripts/expertise/expertise_trader_sampling_efficiency_3.py deleted file mode 100644 index cf2e5c0c..00000000 --- a/scripts/expertise/expertise_trader_sampling_efficiency_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_sampling_efficiency_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_sampling_efficiency_3") - return diff --git a/scripts/expertise/expertise_trader_warehousing_1.py b/scripts/expertise/expertise_trader_warehousing_1.py deleted file mode 100644 index 9ca8b894..00000000 --- a/scripts/expertise/expertise_trader_warehousing_1.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_trader_warehousing_1") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_trader_warehousing_1") - return diff --git a/scripts/expertise/expertise_trader_warehousing_2.py b/scripts/expertise/expertise_trader_warehousing_2.py deleted file mode 100644 index 5541c71e..00000000 --- a/scripts/expertise/expertise_trader_warehousing_2.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_trader_warehousing_2") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_trader_warehousing_2") - return diff --git a/scripts/expertise/expertise_trader_warehousing_3.py b/scripts/expertise/expertise_trader_warehousing_3.py deleted file mode 100644 index eb1dc350..00000000 --- a/scripts/expertise/expertise_trader_warehousing_3.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_trader_warehousing_3") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_trader_warehousing_3") - return diff --git a/scripts/expertise/expertise_trader_warehousing_4.py b/scripts/expertise/expertise_trader_warehousing_4.py deleted file mode 100644 index 96495edd..00000000 --- a/scripts/expertise/expertise_trader_warehousing_4.py +++ /dev/null @@ -1,9 +0,0 @@ -import sys - -def addAbilities(core, actor, player): - actor.addAbility("expertise_trader_trader_warehousing_4") - return - -def removeAbilities(core, actor, player): - actor.removeAbility("expertise_trader_trader_warehousing_4") - return diff --git a/scripts/houses/player_cityhall_corellia_style_01.py b/scripts/houses/player_cityhall_corellia_style_01.py index ff396cb0..98ce272b 100644 --- a/scripts/houses/player_cityhall_corellia_style_01.py +++ b/scripts/houses/player_cityhall_corellia_style_01.py @@ -9,8 +9,8 @@ def setup(housingTemplates): houseTemplate.addPlaceablePlanet("corellia") houseTemplate.addPlaceablePlanet("talus") houseTemplate.setDefaultItemLimit(400) - houseTemplate.setBaseMaintenanceRate(308) - + houseTemplate.setBaseMaintenanceRate(1000) + houseTemplate.setCivicStructure(True) housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_cityhall_naboo_style_01.py b/scripts/houses/player_cityhall_naboo_style_01.py index 8bb52c69..5a0be0e3 100644 --- a/scripts/houses/player_cityhall_naboo_style_01.py +++ b/scripts/houses/player_cityhall_naboo_style_01.py @@ -10,7 +10,8 @@ def setup(housingTemplates): houseTemplate.addPlaceablePlanet("rori") houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.setDefaultItemLimit(400) - houseTemplate.setBaseMaintenanceRate(308) - + houseTemplate.setBaseMaintenanceRate(1000) + + houseTemplate.setCivicStructure(True) housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_cityhall_tatooine_style_01.py b/scripts/houses/player_cityhall_tatooine_style_01.py index 766ed7cf..6f32c157 100644 --- a/scripts/houses/player_cityhall_tatooine_style_01.py +++ b/scripts/houses/player_cityhall_tatooine_style_01.py @@ -10,7 +10,8 @@ def setup(housingTemplates): houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.addPlaceablePlanet("lok") houseTemplate.setDefaultItemLimit(400) - houseTemplate.setBaseMaintenanceRate(308) - + houseTemplate.setBaseMaintenanceRate(1000) + + houseTemplate.setCivicStructure(True) housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_garden_tatooine_sml_01.py b/scripts/houses/player_garden_tatooine_sml_01.py index ed3b2981..cbbe549d 100644 --- a/scripts/houses/player_garden_tatooine_sml_01.py +++ b/scripts/houses/player_garden_tatooine_sml_01.py @@ -10,6 +10,8 @@ def setup(housingTemplates): houseTemplate.addPlaceablePlanet("dantooine") houseTemplate.addPlaceablePlanet("lok") houseTemplate.setDefaultItemLimit(0) - + + houseTemplate.setCivicStructure(True) + houseTemplate.setBaseMaintenanceRate(2000) housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/houses/player_shuttleport_tatooine.py b/scripts/houses/player_shuttleport_tatooine.py index 4d7e480f..7b970481 100644 --- a/scripts/houses/player_shuttleport_tatooine.py +++ b/scripts/houses/player_shuttleport_tatooine.py @@ -8,5 +8,8 @@ def setup(housingTemplates): houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3.5),float(-0.3),float(3.5))) houseTemplate.addPlaceablePlanet("tatooine") houseTemplate.setDefaultItemLimit(0) + houseTemplate.setBaseMaintenanceRate(2000) + + houseTemplate.setCivicStructure(True) housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate) return \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/aurek.py b/scripts/loot/lootItems/collections/aurebesh_tiles/aurek.py new file mode 100644 index 00000000..768d1ca1 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/aurek.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_aurek.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/besh.py b/scripts/loot/lootItems/collections/aurebesh_tiles/besh.py new file mode 100644 index 00000000..9ae6cce1 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/besh.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_besh.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/cherek.py b/scripts/loot/lootItems/collections/aurebesh_tiles/cherek.py new file mode 100644 index 00000000..c567b490 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/cherek.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_cherek.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/cresh.py b/scripts/loot/lootItems/collections/aurebesh_tiles/cresh.py new file mode 100644 index 00000000..8a0df2db --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/cresh.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_cresh.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/dorn.py b/scripts/loot/lootItems/collections/aurebesh_tiles/dorn.py new file mode 100644 index 00000000..652d1177 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/dorn.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_dorn.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/enth.py b/scripts/loot/lootItems/collections/aurebesh_tiles/enth.py new file mode 100644 index 00000000..3c50da6f --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/enth.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_enth.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/esk.py b/scripts/loot/lootItems/collections/aurebesh_tiles/esk.py new file mode 100644 index 00000000..6393bc11 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/esk.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_esk.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/forn.py b/scripts/loot/lootItems/collections/aurebesh_tiles/forn.py new file mode 100644 index 00000000..cf99a309 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/forn.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_forn.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/grek.py b/scripts/loot/lootItems/collections/aurebesh_tiles/grek.py new file mode 100644 index 00000000..8266d5e0 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/grek.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_grek.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/herf.py b/scripts/loot/lootItems/collections/aurebesh_tiles/herf.py new file mode 100644 index 00000000..46a7a667 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/herf.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_herf.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/isk.py b/scripts/loot/lootItems/collections/aurebesh_tiles/isk.py new file mode 100644 index 00000000..9e12fe8c --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/isk.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_isk.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/jenth.py b/scripts/loot/lootItems/collections/aurebesh_tiles/jenth.py new file mode 100644 index 00000000..f2ab09c2 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/jenth.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_jenth.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/kerenth.py b/scripts/loot/lootItems/collections/aurebesh_tiles/kerenth.py new file mode 100644 index 00000000..d9e94800 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/kerenth.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_kerenth.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/krill.py b/scripts/loot/lootItems/collections/aurebesh_tiles/krill.py new file mode 100644 index 00000000..d1178074 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/krill.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_krill.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/leth.py b/scripts/loot/lootItems/collections/aurebesh_tiles/leth.py new file mode 100644 index 00000000..17fa0f2e --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/leth.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_leth.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/mern.py b/scripts/loot/lootItems/collections/aurebesh_tiles/mern.py new file mode 100644 index 00000000..be52ad3c --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/mern.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_mern.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/nen.py b/scripts/loot/lootItems/collections/aurebesh_tiles/nen.py new file mode 100644 index 00000000..3fbc77ea --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/nen.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_nen.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/nern.py b/scripts/loot/lootItems/collections/aurebesh_tiles/nern.py new file mode 100644 index 00000000..41928ec2 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/nern.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_nern.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/onith.py b/scripts/loot/lootItems/collections/aurebesh_tiles/onith.py new file mode 100644 index 00000000..88718d51 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/onith.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_onith.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/orenth.py b/scripts/loot/lootItems/collections/aurebesh_tiles/orenth.py new file mode 100644 index 00000000..c4ee972f --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/orenth.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_orenth.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/osk.py b/scripts/loot/lootItems/collections/aurebesh_tiles/osk.py new file mode 100644 index 00000000..1378d83e --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/osk.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_osk.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/peth.py b/scripts/loot/lootItems/collections/aurebesh_tiles/peth.py new file mode 100644 index 00000000..aed372ed --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/peth.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_peth.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/qek.py b/scripts/loot/lootItems/collections/aurebesh_tiles/qek.py new file mode 100644 index 00000000..cad1f3e8 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/qek.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_qek.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/resh.py b/scripts/loot/lootItems/collections/aurebesh_tiles/resh.py new file mode 100644 index 00000000..26daa4c5 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/resh.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_resh.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/senth.py b/scripts/loot/lootItems/collections/aurebesh_tiles/senth.py new file mode 100644 index 00000000..4145d440 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/senth.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_senth.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/shen.py b/scripts/loot/lootItems/collections/aurebesh_tiles/shen.py new file mode 100644 index 00000000..bf8fdcb1 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/shen.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_shen.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/thesh.py b/scripts/loot/lootItems/collections/aurebesh_tiles/thesh.py new file mode 100644 index 00000000..354786fd --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/thesh.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_thesh.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/trill.py b/scripts/loot/lootItems/collections/aurebesh_tiles/trill.py new file mode 100644 index 00000000..37d65aec --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/trill.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_trill.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/usk.py b/scripts/loot/lootItems/collections/aurebesh_tiles/usk.py new file mode 100644 index 00000000..6a8da398 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/usk.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_usk.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/vev.py b/scripts/loot/lootItems/collections/aurebesh_tiles/vev.py new file mode 100644 index 00000000..537f954b --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/vev.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_vev.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/wesk.py b/scripts/loot/lootItems/collections/aurebesh_tiles/wesk.py new file mode 100644 index 00000000..1a06fcc7 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/wesk.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_wesk.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/xesh.py b/scripts/loot/lootItems/collections/aurebesh_tiles/xesh.py new file mode 100644 index 00000000..d0ed4aab --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/xesh.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_xesh.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/yirt.py b/scripts/loot/lootItems/collections/aurebesh_tiles/yirt.py new file mode 100644 index 00000000..15b09e88 --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/yirt.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_yirt.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/aurebesh_tiles/zerek.py b/scripts/loot/lootItems/collections/aurebesh_tiles/zerek.py new file mode 100644 index 00000000..878086bc --- /dev/null +++ b/scripts/loot/lootItems/collections/aurebesh_tiles/zerek.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_aurebesh_tile_zerek.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_1.py b/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_1.py new file mode 100644 index 00000000..c76af186 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_1.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_01.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_01_01','static_item_d','item_smuggler_contraband_01_01'] + +def AddToCollection(): + + return 'col_contraband_01' + +def CollectionItemName(): + + return 'col_contraband_01_item_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_2.py b/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_2.py new file mode 100644 index 00000000..01af0592 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_2.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_01.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_01_02','static_item_d','item_smuggler_contraband_01_02'] + +def AddToCollection(): + + return 'col_contraband_01' + +def CollectionItemName(): + + return 'col_contraband_01_item_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_3.py b/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_3.py new file mode 100644 index 00000000..0639cc9f --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_3.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_01.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_01_03','static_item_d','item_smuggler_contraband_01_03'] + +def AddToCollection(): + + return 'col_contraband_01' + +def CollectionItemName(): + + return 'col_contraband_01_item_03' + +def stackable(): + + return 1 diff --git a/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_4.py b/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_4.py new file mode 100644 index 00000000..983d7a0b --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_4.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_01.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_01_04','static_item_d','item_smuggler_contraband_01_04'] + +def AddToCollection(): + + return 'col_contraband_01' + +def CollectionItemName(): + + return 'col_contraband_01_item_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_5.py b/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_5.py new file mode 100644 index 00000000..00e072d2 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/chemical_warheads/chemical_warhead_5.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_01.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_01_05','static_item_d','item_smuggler_contraband_01_05'] + +def AddToCollection(): + + return 'col_contraband_01' + +def CollectionItemName(): + + return 'col_contraband_01_item_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_1.py b/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_1.py new file mode 100644 index 00000000..d2de5734 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_1.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_04.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_05_01','static_item_d','item_smuggler_contraband_05_01'] + +def AddToCollection(): + + return 'col_contraband_05' + +def CollectionItemName(): + + return 'col_contraband_05_item_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_2.py b/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_2.py new file mode 100644 index 00000000..8a5a2283 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_2.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_04.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_05_02','static_item_d','item_smuggler_contraband_05_02'] + +def AddToCollection(): + + return 'col_contraband_05' + +def CollectionItemName(): + + return 'col_contraband_05_item_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_3.py b/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_3.py new file mode 100644 index 00000000..2d9bea4c --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_3.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_04.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_05_03','static_item_d','item_smuggler_contraband_05_03'] + +def AddToCollection(): + + return 'col_contraband_05' + +def CollectionItemName(): + + return 'col_contraband_05_item_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_4.py b/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_4.py new file mode 100644 index 00000000..068f558d --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_4.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_04.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_05_04','static_item_d','item_smuggler_contraband_05_04'] + +def AddToCollection(): + + return 'col_contraband_05' + +def CollectionItemName(): + + return 'col_contraband_05_item_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_5.py b/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_5.py new file mode 100644 index 00000000..1fa5b61f --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/counterfeit_credits/counterfeit_credits_5.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_04.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_05_05','static_item_d','item_smuggler_contraband_05_05'] + +def AddToCollection(): + + return 'col_contraband_05' + +def CollectionItemName(): + + return 'col_contraband_05_item_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/false_information/false_information_1.py b/scripts/loot/lootItems/collections/contraband/false_information/false_information_1.py new file mode 100644 index 00000000..63255cfd --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/false_information/false_information_1.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_05.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_05_01','static_item_d','item_smuggler_contraband_05_01'] + +def AddToCollection(): + + return 'col_contraband_04' + +def CollectionItemName(): + + return 'col_contraband_05_item_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/false_information/false_information_2.py b/scripts/loot/lootItems/collections/contraband/false_information/false_information_2.py new file mode 100644 index 00000000..031a7ac4 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/false_information/false_information_2.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_05.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_04_02','static_item_d','item_smuggler_contraband_04_02'] + +def AddToCollection(): + + return 'col_contraband_04' + +def CollectionItemName(): + + return 'col_contraband_04_item_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/false_information/false_information_3.py b/scripts/loot/lootItems/collections/contraband/false_information/false_information_3.py new file mode 100644 index 00000000..7432930d --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/false_information/false_information_3.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_05.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_04_03','static_item_d','item_smuggler_contraband_04_03'] + +def AddToCollection(): + + return 'col_contraband_04' + +def CollectionItemName(): + + return 'col_contraband_04_item_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/false_information/false_information_4.py b/scripts/loot/lootItems/collections/contraband/false_information/false_information_4.py new file mode 100644 index 00000000..764a962a --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/false_information/false_information_4.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_05.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_04_04','static_item_d','item_smuggler_contraband_04_04'] + +def AddToCollection(): + + return 'col_contraband_04' + +def CollectionItemName(): + + return 'col_contraband_04_item_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/false_information/false_information_5.py b/scripts/loot/lootItems/collections/contraband/false_information/false_information_5.py new file mode 100644 index 00000000..8ce72916 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/false_information/false_information_5.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_05.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_04_05','static_item_d','item_smuggler_contraband_04_05'] + +def AddToCollection(): + + return 'col_contraband_04' + +def CollectionItemName(): + + return 'col_contraband_04_item_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_1.py b/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_1.py new file mode 100644 index 00000000..af072a29 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_1.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_03.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_03_01','static_item_d','item_smuggler_contraband_03_01'] + +def AddToCollection(): + + return 'col_contraband_03' + +def CollectionItemName(): + + return 'col_contraband_03_item_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_2.py b/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_2.py new file mode 100644 index 00000000..9ecdbe27 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_2.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_03.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_03_02','static_item_d','item_smuggler_contraband_03_02'] + +def AddToCollection(): + + return 'col_contraband_03' + +def CollectionItemName(): + + return 'col_contraband_03_item_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_3.py b/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_3.py new file mode 100644 index 00000000..01107b32 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_3.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_03.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_03_03','static_item_d','item_smuggler_contraband_03_03'] + +def AddToCollection(): + + return 'col_contraband_03' + +def CollectionItemName(): + + return 'col_contraband_03_item_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_4.py b/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_4.py new file mode 100644 index 00000000..a74913f3 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_4.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_03.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_03_04','static_item_d','item_smuggler_contraband_03_04'] + +def AddToCollection(): + + return 'col_contraband_03' + +def CollectionItemName(): + + return 'col_contraband_03_item_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_5.py b/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_5.py new file mode 100644 index 00000000..ba46f3a0 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/forbidden_fruit/forbidden_fruit_5.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_03.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_03_05','static_item_d','item_smuggler_contraband_03_05'] + +def AddToCollection(): + + return 'col_contraband_03' + +def CollectionItemName(): + + return 'col_contraband_03_item_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_1.py b/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_1.py new file mode 100644 index 00000000..9ddaece3 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_1.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_02.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_02_01','static_item_d','item_smuggler_contraband_02_01'] + +def AddToCollection(): + + return 'col_contraband_02' + +def CollectionItemName(): + + return 'col_contraband_02_item_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_2.py b/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_2.py new file mode 100644 index 00000000..08d3437f --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_2.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_02.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_02_02','static_item_d','item_smuggler_contraband_02_02'] + +def AddToCollection(): + + return 'col_contraband_02' + +def CollectionItemName(): + + return 'col_contraband_02_item_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_3.py b/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_3.py new file mode 100644 index 00000000..26b9e84e --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_3.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_02.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_02_03','static_item_d','item_smuggler_contraband_02_03'] + +def AddToCollection(): + + return 'col_contraband_02' + +def CollectionItemName(): + + return 'col_contraband_02_item_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_4.py b/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_4.py new file mode 100644 index 00000000..a6d9dca1 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_4.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_02.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_02_04','static_item_d','item_smuggler_contraband_02_04'] + +def AddToCollection(): + + return 'col_contraband_02' + +def CollectionItemName(): + + return 'col_contraband_02_item_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_5.py b/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_5.py new file mode 100644 index 00000000..a55c8142 --- /dev/null +++ b/scripts/loot/lootItems/collections/contraband/unauthorized_access/unauthorized_access_5.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_contraband_style1_02.iff'] + +def STFparams(): + + return ['static_item_n','item_smuggler_contraband_02_05','static_item_d','item_smuggler_contraband_02_05'] + +def AddToCollection(): + + return 'col_contraband_02' + +def CollectionItemName(): + + return 'col_contraband_02_item_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/jedi_holocron_1_5_wp.py b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_1_5.py similarity index 87% rename from scripts/loot/lootItems/holocrons/jedi_holocron_1_5_wp.py rename to scripts/loot/lootItems/collections/holocrons/jedi_holocron_1_5.py index 1fefed1a..f1034759 100644 --- a/scripts/loot/lootItems/holocrons/jedi_holocron_1_5_wp.py +++ b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_1_5.py @@ -1,3 +1,4 @@ + def itemTemplate(): return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff'] @@ -15,3 +16,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_jedi_holocron_02_01','static_item_d','item_collection_jedi_holocron_02_01'] + +def AddToCollection(): + + return 'inv_holocron_collection_02' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/jedi_holocron_1_5.py b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_1_5_wp.py similarity index 78% rename from scripts/loot/lootItems/holocrons/jedi_holocron_1_5.py rename to scripts/loot/lootItems/collections/holocrons/jedi_holocron_1_5_wp.py index 0aa5767e..4b22dfa9 100644 --- a/scripts/loot/lootItems/holocrons/jedi_holocron_1_5.py +++ b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_1_5_wp.py @@ -1,4 +1,3 @@ - def itemTemplate(): return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff'] @@ -16,3 +15,11 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_jedi_holocron_01_01','static_item_d','item_collection_jedi_holocron_01_01'] + +def AddToCollection(): + + return 'inv_holocron_collection_01' + +def CollectionItemName(): + + return 'jedi_holocron_01_01' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/jedi_holocron_2_5_wp.py b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_2_5.py similarity index 87% rename from scripts/loot/lootItems/holocrons/jedi_holocron_2_5_wp.py rename to scripts/loot/lootItems/collections/holocrons/jedi_holocron_2_5.py index 2e21085f..6a56d0f7 100644 --- a/scripts/loot/lootItems/holocrons/jedi_holocron_2_5_wp.py +++ b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_2_5.py @@ -15,3 +15,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_jedi_holocron_02_02','static_item_d','item_collection_jedi_holocron_02_02'] + +def AddToCollection(): + + return 'inv_holocron_collection_02' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/jedi_holocron_2_5.py b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_2_5_wp.py similarity index 87% rename from scripts/loot/lootItems/holocrons/jedi_holocron_2_5.py rename to scripts/loot/lootItems/collections/holocrons/jedi_holocron_2_5_wp.py index a81d216e..02ffb791 100644 --- a/scripts/loot/lootItems/holocrons/jedi_holocron_2_5.py +++ b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_2_5_wp.py @@ -15,3 +15,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_jedi_holocron_01_02','static_item_d','item_collection_jedi_holocron_01_02'] + +def AddToCollection(): + + return 'inv_holocron_collection_01' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/jedi_holocron_3_5_wp.py b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_3_5.py similarity index 87% rename from scripts/loot/lootItems/holocrons/jedi_holocron_3_5_wp.py rename to scripts/loot/lootItems/collections/holocrons/jedi_holocron_3_5.py index 099bc7d2..0a959a78 100644 --- a/scripts/loot/lootItems/holocrons/jedi_holocron_3_5_wp.py +++ b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_3_5.py @@ -1,4 +1,3 @@ - def itemTemplate(): return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff'] @@ -16,3 +15,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_jedi_holocron_02_03','static_item_d','item_collection_jedi_holocron_02_03'] + +def AddToCollection(): + + return 'inv_holocron_collection_02' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/jedi_holocron_3_5.py b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_3_5_wp.py similarity index 87% rename from scripts/loot/lootItems/holocrons/jedi_holocron_3_5.py rename to scripts/loot/lootItems/collections/holocrons/jedi_holocron_3_5_wp.py index 49cd2ba9..9ad52606 100644 --- a/scripts/loot/lootItems/holocrons/jedi_holocron_3_5.py +++ b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_3_5_wp.py @@ -1,3 +1,4 @@ + def itemTemplate(): return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff'] @@ -15,3 +16,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_jedi_holocron_01_03','static_item_d','item_collection_jedi_holocron_01_03'] + +def AddToCollection(): + + return 'inv_holocron_collection_01' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/jedi_holocron_4_5_wp.py b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_4_5.py similarity index 87% rename from scripts/loot/lootItems/holocrons/jedi_holocron_4_5_wp.py rename to scripts/loot/lootItems/collections/holocrons/jedi_holocron_4_5.py index 4fbf4ec2..6aaadc82 100644 --- a/scripts/loot/lootItems/holocrons/jedi_holocron_4_5_wp.py +++ b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_4_5.py @@ -15,3 +15,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_jedi_holocron_02_04','static_item_d','item_collection_jedi_holocron_02_04'] + +def AddToCollection(): + + return 'inv_holocron_collection_02' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/jedi_holocron_4_5.py b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_4_5_wp.py similarity index 87% rename from scripts/loot/lootItems/holocrons/jedi_holocron_4_5.py rename to scripts/loot/lootItems/collections/holocrons/jedi_holocron_4_5_wp.py index 3af7480c..3971e813 100644 --- a/scripts/loot/lootItems/holocrons/jedi_holocron_4_5.py +++ b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_4_5_wp.py @@ -15,3 +15,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_jedi_holocron_01_04','static_item_d','item_collection_jedi_holocron_01_04'] + +def AddToCollection(): + + return 'inv_holocron_collection_01' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/jedi_holocron_5_5_wp.py b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_5_5.py similarity index 87% rename from scripts/loot/lootItems/holocrons/jedi_holocron_5_5_wp.py rename to scripts/loot/lootItems/collections/holocrons/jedi_holocron_5_5.py index a12df6d3..a88b2eb8 100644 --- a/scripts/loot/lootItems/holocrons/jedi_holocron_5_5_wp.py +++ b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_5_5.py @@ -1,3 +1,4 @@ + def itemTemplate(): return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff'] @@ -15,3 +16,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_jedi_holocron_02_05','static_item_d','item_collection_jedi_holocron_02_05'] + +def AddToCollection(): + + return 'inv_holocron_collection_02' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/jedi_holocron_5_5.py b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_5_5_wp.py similarity index 87% rename from scripts/loot/lootItems/holocrons/jedi_holocron_5_5.py rename to scripts/loot/lootItems/collections/holocrons/jedi_holocron_5_5_wp.py index a328fe36..e3f3de89 100644 --- a/scripts/loot/lootItems/holocrons/jedi_holocron_5_5.py +++ b/scripts/loot/lootItems/collections/holocrons/jedi_holocron_5_5_wp.py @@ -1,4 +1,3 @@ - def itemTemplate(): return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff'] @@ -16,3 +15,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_jedi_holocron_01_05','static_item_d','item_collection_jedi_holocron_01_05'] + +def AddToCollection(): + + return 'inv_holocron_collection_01' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/sith_holocron_1_5_wp.py b/scripts/loot/lootItems/collections/holocrons/sith_holocron_1_5.py similarity index 87% rename from scripts/loot/lootItems/holocrons/sith_holocron_1_5_wp.py rename to scripts/loot/lootItems/collections/holocrons/sith_holocron_1_5.py index a482605e..f01b4cac 100644 --- a/scripts/loot/lootItems/holocrons/sith_holocron_1_5_wp.py +++ b/scripts/loot/lootItems/collections/holocrons/sith_holocron_1_5.py @@ -15,3 +15,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_sith_holocron_02_01','static_item_d','item_collection_sith_holocron_02_01'] + +def AddToCollection(): + + return 'inv_holocron_collection_02' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/sith_holocron_1_5.py b/scripts/loot/lootItems/collections/holocrons/sith_holocron_1_5_wp.py similarity index 87% rename from scripts/loot/lootItems/holocrons/sith_holocron_1_5.py rename to scripts/loot/lootItems/collections/holocrons/sith_holocron_1_5_wp.py index 09dda7e7..5839c16f 100644 --- a/scripts/loot/lootItems/holocrons/sith_holocron_1_5.py +++ b/scripts/loot/lootItems/collections/holocrons/sith_holocron_1_5_wp.py @@ -15,3 +15,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_sith_holocron_01_01','static_item_d','item_collection_sith_holocron_01_01'] + +def AddToCollection(): + + return 'inv_holocron_collection_01' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/sith_holocron_2_5_wp.py b/scripts/loot/lootItems/collections/holocrons/sith_holocron_2_5.py similarity index 76% rename from scripts/loot/lootItems/holocrons/sith_holocron_2_5_wp.py rename to scripts/loot/lootItems/collections/holocrons/sith_holocron_2_5.py index 01a2e29c..aea412fa 100644 --- a/scripts/loot/lootItems/holocrons/sith_holocron_2_5_wp.py +++ b/scripts/loot/lootItems/collections/holocrons/sith_holocron_2_5.py @@ -14,4 +14,8 @@ def customizationValues(): def STFparams(): - return ['static_item_n','item_collection_sith_holocron_02_02','static_item_d','item_collection_sith_holocron_02_02'] \ No newline at end of file + return ['static_item_n','item_collection_sith_holocron_02_02','static_item_d','item_collection_sith_holocron_02_02'] + +def AddToCollection(): + + return 'inv_holocron_collection_02' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/sith_holocron_2_5.py b/scripts/loot/lootItems/collections/holocrons/sith_holocron_2_5_wp.py similarity index 87% rename from scripts/loot/lootItems/holocrons/sith_holocron_2_5.py rename to scripts/loot/lootItems/collections/holocrons/sith_holocron_2_5_wp.py index 7c286a4f..1d5b561d 100644 --- a/scripts/loot/lootItems/holocrons/sith_holocron_2_5.py +++ b/scripts/loot/lootItems/collections/holocrons/sith_holocron_2_5_wp.py @@ -15,3 +15,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_sith_holocron_01_02','static_item_d','item_collection_sith_holocron_01_02'] + +def AddToCollection(): + + return 'inv_holocron_collection_01' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/sith_holocron_3_5_wp.py b/scripts/loot/lootItems/collections/holocrons/sith_holocron_3_5.py similarity index 76% rename from scripts/loot/lootItems/holocrons/sith_holocron_3_5_wp.py rename to scripts/loot/lootItems/collections/holocrons/sith_holocron_3_5.py index 79c1e4f1..ede2ccf7 100644 --- a/scripts/loot/lootItems/holocrons/sith_holocron_3_5_wp.py +++ b/scripts/loot/lootItems/collections/holocrons/sith_holocron_3_5.py @@ -14,4 +14,8 @@ def customizationValues(): def STFparams(): - return ['static_item_n','item_collection_sith_holocron_02_03','static_item_d','item_collection_sith_holocron_02_03'] \ No newline at end of file + return ['static_item_n','item_collection_sith_holocron_02_03','static_item_d','item_collection_sith_holocron_02_03'] + +def AddToCollection(): + + return 'inv_holocron_collection_02' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/sith_holocron_3_5.py b/scripts/loot/lootItems/collections/holocrons/sith_holocron_3_5_wp.py similarity index 87% rename from scripts/loot/lootItems/holocrons/sith_holocron_3_5.py rename to scripts/loot/lootItems/collections/holocrons/sith_holocron_3_5_wp.py index ad41e22c..93d34fdb 100644 --- a/scripts/loot/lootItems/holocrons/sith_holocron_3_5.py +++ b/scripts/loot/lootItems/collections/holocrons/sith_holocron_3_5_wp.py @@ -15,3 +15,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_sith_holocron_01_03','static_item_d','item_collection_sith_holocron_01_03'] + +def AddToCollection(): + + return 'inv_holocron_collection_01' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/sith_holocron_4_5_wp.py b/scripts/loot/lootItems/collections/holocrons/sith_holocron_4_5.py similarity index 76% rename from scripts/loot/lootItems/holocrons/sith_holocron_4_5_wp.py rename to scripts/loot/lootItems/collections/holocrons/sith_holocron_4_5.py index 1c288246..5439593a 100644 --- a/scripts/loot/lootItems/holocrons/sith_holocron_4_5_wp.py +++ b/scripts/loot/lootItems/collections/holocrons/sith_holocron_4_5.py @@ -14,4 +14,8 @@ def customizationValues(): def STFparams(): - return ['static_item_n','item_collection_sith_holocron_02_04','static_item_d','item_collection_sith_holocron_02_04'] \ No newline at end of file + return ['static_item_n','item_collection_sith_holocron_02_04','static_item_d','item_collection_sith_holocron_02_04'] + +def AddToCollection(): + + return 'inv_holocron_collection_02' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/sith_holocron_4_5.py b/scripts/loot/lootItems/collections/holocrons/sith_holocron_4_5_wp.py similarity index 87% rename from scripts/loot/lootItems/holocrons/sith_holocron_4_5.py rename to scripts/loot/lootItems/collections/holocrons/sith_holocron_4_5_wp.py index 8c47ca7d..d7b851e0 100644 --- a/scripts/loot/lootItems/holocrons/sith_holocron_4_5.py +++ b/scripts/loot/lootItems/collections/holocrons/sith_holocron_4_5_wp.py @@ -15,3 +15,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_sith_holocron_01_04','static_item_d','item_collection_sith_holocron_01_04'] + +def AddToCollection(): + + return 'inv_holocron_collection_01' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/sith_holocron_5_5_wp.py b/scripts/loot/lootItems/collections/holocrons/sith_holocron_5_5.py similarity index 76% rename from scripts/loot/lootItems/holocrons/sith_holocron_5_5_wp.py rename to scripts/loot/lootItems/collections/holocrons/sith_holocron_5_5.py index 88478546..25514103 100644 --- a/scripts/loot/lootItems/holocrons/sith_holocron_5_5_wp.py +++ b/scripts/loot/lootItems/collections/holocrons/sith_holocron_5_5.py @@ -14,4 +14,8 @@ def customizationValues(): def STFparams(): - return ['static_item_n','item_collection_sith_holocron_02_05','static_item_d','item_collection_sith_holocron_02_05'] \ No newline at end of file + return ['static_item_n','item_collection_sith_holocron_02_05','static_item_d','item_collection_sith_holocron_02_05'] + +def AddToCollection(): + + return 'inv_holocron_collection_02' \ No newline at end of file diff --git a/scripts/loot/lootItems/holocrons/sith_holocron_5_5.py b/scripts/loot/lootItems/collections/holocrons/sith_holocron_5_5_wp.py similarity index 87% rename from scripts/loot/lootItems/holocrons/sith_holocron_5_5.py rename to scripts/loot/lootItems/collections/holocrons/sith_holocron_5_5_wp.py index a1923334..bcb21477 100644 --- a/scripts/loot/lootItems/holocrons/sith_holocron_5_5.py +++ b/scripts/loot/lootItems/collections/holocrons/sith_holocron_5_5_wp.py @@ -15,3 +15,7 @@ def customizationValues(): def STFparams(): return ['static_item_n','item_collection_sith_holocron_01_05','static_item_d','item_collection_sith_holocron_01_05'] + +def AddToCollection(): + + return 'inv_holocron_collection_01' \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_1.py b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_1.py new file mode 100644 index 00000000..2486b7c2 --- /dev/null +++ b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_1.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_10.py b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_10.py new file mode 100644 index 00000000..2486b7c2 --- /dev/null +++ b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_10.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_2.py b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_2.py new file mode 100644 index 00000000..2486b7c2 --- /dev/null +++ b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_2.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_3.py b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_3.py new file mode 100644 index 00000000..2486b7c2 --- /dev/null +++ b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_3.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_4.py b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_4.py new file mode 100644 index 00000000..2486b7c2 --- /dev/null +++ b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_4.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_5.py b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_5.py new file mode 100644 index 00000000..2486b7c2 --- /dev/null +++ b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_5.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_6.py b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_6.py new file mode 100644 index 00000000..2486b7c2 --- /dev/null +++ b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_6.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_7.py b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_7.py new file mode 100644 index 00000000..2486b7c2 --- /dev/null +++ b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_7.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_8.py b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_8.py new file mode 100644 index 00000000..2486b7c2 --- /dev/null +++ b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_8.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_9.py b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_9.py new file mode 100644 index 00000000..2486b7c2 --- /dev/null +++ b/scripts/loot/lootItems/collections/shattered_crystal_shard/unknown_shard_9.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_unknown_shattered_shard_fragment.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_1.py b/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_1.py new file mode 100644 index 00000000..4956377c --- /dev/null +++ b/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_1.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_dooku_datadisk_01.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_2.py b/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_2.py new file mode 100644 index 00000000..0469bfa1 --- /dev/null +++ b/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_2.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_dooku_datadisk_02.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_3.py b/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_3.py new file mode 100644 index 00000000..0cb1da81 --- /dev/null +++ b/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_3.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_dooku_datadisk_03.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_4.py b/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_4.py new file mode 100644 index 00000000..fcf0dc92 --- /dev/null +++ b/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_4.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_dooku_datadisk_04.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_5.py b/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_5.py new file mode 100644 index 00000000..5a2edf0a --- /dev/null +++ b/scripts/loot/lootItems/collections/story_of_count_dooku/dooku_datadisk_5.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_dooku_datadisk_05.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_1.py b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_1.py new file mode 100644 index 00000000..2b2c4542 --- /dev/null +++ b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_1.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_01.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_2.py b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_2.py new file mode 100644 index 00000000..21297a8c --- /dev/null +++ b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_2.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_02.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_3.py b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_3.py new file mode 100644 index 00000000..fe754904 --- /dev/null +++ b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_3.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_03.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_4.py b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_4.py new file mode 100644 index 00000000..5aa4f65d --- /dev/null +++ b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_4.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_04.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_5.py b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_5.py new file mode 100644 index 00000000..b73d999b --- /dev/null +++ b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_5.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_05.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_6.py b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_6.py new file mode 100644 index 00000000..50422db0 --- /dev/null +++ b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_6.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_06.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_7.py b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_7.py new file mode 100644 index 00000000..f61db335 --- /dev/null +++ b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_7.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_07.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_8.py b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_8.py new file mode 100644 index 00000000..cedb52f9 --- /dev/null +++ b/scripts/loot/lootItems/collections/walter_emanus_lost_journal/lost_journal_page_8.py @@ -0,0 +1,13 @@ + +def itemTemplate(): + + return ['/object/tangible/loot/creature_loot/collections/shared_exar_kun_lost_journal_page_08.iff'] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 100 + diff --git a/scripts/loot/lootItems/exceptionallootchest/legendary_e5_carbine.py b/scripts/loot/lootItems/exceptionallootchest/legendary_e5_carbine.py index 7550577b..b268fcbc 100644 --- a/scripts/loot/lootItems/exceptionallootchest/legendary_e5_carbine.py +++ b/scripts/loot/lootItems/exceptionallootchest/legendary_e5_carbine.py @@ -25,12 +25,12 @@ def requiredCL(): def itemStats(): - stats = ['mindamage','400','450'] - stats += ['maxdamage','850','900'] + stats = ['mindamage','400','400'] + stats += ['maxdamage','850','850'] stats += ['attackspeed','0.6','0.6'] stats += ['maxrange','0','50'] stats += ['damagetype','energy','energy'] - stats += ['elemtype','@obj_attr_n:elemental_electricity','@obj_attr_n:elemental_electricity'] + stats += ['elemtype','electricity','electricity'] stats += ['elemdamage','23','23'] stats += ['weapontype','1','1'] diff --git a/scripts/loot/lootItems/exceptionallootchest/legendary_fwg5_pistol.py b/scripts/loot/lootItems/exceptionallootchest/legendary_fwg5_pistol.py index 81e1e8b5..c441cd26 100644 --- a/scripts/loot/lootItems/exceptionallootchest/legendary_fwg5_pistol.py +++ b/scripts/loot/lootItems/exceptionallootchest/legendary_fwg5_pistol.py @@ -25,12 +25,12 @@ def requiredCL(): def itemStats(): - stats = ['mindamage','250','270'] - stats += ['maxdamage','500','530'] + stats = ['mindamage','250','250'] + stats += ['maxdamage','500','500'] stats += ['attackspeed','0.4','0.4'] stats += ['maxrange','0','35'] stats += ['damagetype','energy','energy'] - stats += ['elemtype','@obj_attr_n:elemental_heat','@obj_attr_n:elemental_heat'] + stats += ['elemtype','heat','heat'] stats += ['elemdamage','35','35'] stats += ['weapontype','2','2'] diff --git a/scripts/loot/lootItems/exceptionallootchest/legendary_nightsister_energy_lance.py b/scripts/loot/lootItems/exceptionallootchest/legendary_nightsister_energy_lance.py index 58756024..24e6aa4c 100644 --- a/scripts/loot/lootItems/exceptionallootchest/legendary_nightsister_energy_lance.py +++ b/scripts/loot/lootItems/exceptionallootchest/legendary_nightsister_energy_lance.py @@ -25,12 +25,12 @@ def requiredCL(): def itemStats(): - stats = ['mindamage','750','800'] - stats += ['maxdamage','1100','1200'] + stats = ['mindamage','800','800'] + stats += ['maxdamage','1200','1200'] stats += ['attackspeed','1.0','1.0'] stats += ['maxrange','0','5'] stats += ['damagetype','energy','energy'] - stats += ['elemtype','@obj_attr_n:elemental_electricity','@obj_attr_n:elemental_electricity'] + stats += ['elemtype','electricity','electricity'] stats += ['elemdamage','50','50'] stats += ['weapontype','7','7'] diff --git a/scripts/loot/lootItems/exceptionallootchest/legendary_power_hammer.py b/scripts/loot/lootItems/exceptionallootchest/legendary_power_hammer.py index 3224b384..a05de2b3 100644 --- a/scripts/loot/lootItems/exceptionallootchest/legendary_power_hammer.py +++ b/scripts/loot/lootItems/exceptionallootchest/legendary_power_hammer.py @@ -25,12 +25,12 @@ def requiredCL(): def itemStats(): - stats = ['mindamage','850','900'] - stats += ['maxdamage','1250','1350'] + stats = ['mindamage','900','900'] + stats += ['maxdamage','1350','1350'] stats += ['attackspeed','1.0','1.0'] stats += ['maxrange','0','5'] stats += ['damagetype','energy','energy'] - stats += ['elemtype','@obj_attr_n:elemental_acid','@obj_attr_n:elemental_acid'] + stats += ['elemtype','acid','acid'] stats += ['elemdamage','20','20'] stats += ['weapontype','5','5'] diff --git a/scripts/loot/lootItems/exceptionallootchest/legendary_stun_baton.py b/scripts/loot/lootItems/exceptionallootchest/legendary_stun_baton.py index cbc9cb70..5e9556aa 100644 --- a/scripts/loot/lootItems/exceptionallootchest/legendary_stun_baton.py +++ b/scripts/loot/lootItems/exceptionallootchest/legendary_stun_baton.py @@ -25,12 +25,12 @@ def requiredCL(): def itemStats(): - stats = ['mindamage','550','600'] - stats += ['maxdamage','1250','1300'] + stats = ['mindamage','600','600'] + stats += ['maxdamage','1300','1300'] stats += ['attackspeed','1.0','1.0'] stats += ['maxrange','0','5'] stats += ['damagetype','energy','energy'] - stats += ['elemtype','@obj_attr_n:elemental_electricity','@obj_attr_n:elemental_electricity'] + stats += ['elemtype','electricity','electricity'] stats += ['elemdamage','75','75'] stats += ['weapontype','5','5'] diff --git a/scripts/loot/lootItems/exceptionallootchest/legendary_t21_rifle.py b/scripts/loot/lootItems/exceptionallootchest/legendary_t21_rifle.py index 66a8dd30..e84cf910 100644 --- a/scripts/loot/lootItems/exceptionallootchest/legendary_t21_rifle.py +++ b/scripts/loot/lootItems/exceptionallootchest/legendary_t21_rifle.py @@ -25,12 +25,12 @@ def requiredCL(): def itemStats(): - stats = ['mindamage','500','550'] - stats += ['maxdamage','1050','1100'] + stats = ['mindamage','550','550'] + stats += ['maxdamage','1100','1100'] stats += ['attackspeed','0.8','0.8'] stats += ['maxrange','0','64'] stats += ['damagetype','energy','energy'] - stats += ['elemtype','@obj_attr_n:elemental_acid','@obj_attr_n:elemental_acid'] + stats += ['elemtype','acid','acid'] stats += ['elemdamage','30','30'] stats += ['weapontype','0','0'] diff --git a/scripts/loot/lootItems/npc_loot/metal_case_generic.py b/scripts/loot/lootItems/junk_generic/dented_metal_case.py similarity index 78% rename from scripts/loot/lootItems/npc_loot/metal_case_generic.py rename to scripts/loot/lootItems/junk_generic/dented_metal_case.py index 688d988d..c4126290 100644 --- a/scripts/loot/lootItems/npc_loot/metal_case_generic.py +++ b/scripts/loot/lootItems/junk_generic/dented_metal_case.py @@ -2,6 +2,10 @@ def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_metal_case_generic.iff'] +def customItemName(): + + return 'Dented Metal Case' + def stackable(): return 1 diff --git a/scripts/loot/lootItems/npc_loot/answering_machine_generic.py b/scripts/loot/lootItems/npc_loot/answering_machine_generic.py deleted file mode 100644 index 89740650..00000000 --- a/scripts/loot/lootItems/npc_loot/answering_machine_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_answering_machine_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/atat_life_support_generic.py b/scripts/loot/lootItems/npc_loot/atat_life_support_generic.py deleted file mode 100644 index 02682d0f..00000000 --- a/scripts/loot/lootItems/npc_loot/atat_life_support_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_atat_life_support_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bacta_ampules_generic.py b/scripts/loot/lootItems/npc_loot/bacta_ampules_generic.py deleted file mode 100644 index c1951d7c..00000000 --- a/scripts/loot/lootItems/npc_loot/bacta_ampules_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bacta_ampules_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/basket_generic.py b/scripts/loot/lootItems/npc_loot/basket_generic.py deleted file mode 100644 index df8acc43..00000000 --- a/scripts/loot/lootItems/npc_loot/basket_generic.py +++ /dev/null @@ -1,14 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_basket_generic.iff'] -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bottle_s01_generic.py b/scripts/loot/lootItems/npc_loot/bottle_s01_generic.py deleted file mode 100644 index 9d3745d7..00000000 --- a/scripts/loot/lootItems/npc_loot/bottle_s01_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bottle_s01_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bottle_s02_generic.py b/scripts/loot/lootItems/npc_loot/bottle_s02_generic.py deleted file mode 100644 index 541e29fc..00000000 --- a/scripts/loot/lootItems/npc_loot/bottle_s02_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bottle_s02_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bottle_s03_generic.py b/scripts/loot/lootItems/npc_loot/bottle_s03_generic.py deleted file mode 100644 index be88312d..00000000 --- a/scripts/loot/lootItems/npc_loot/bottle_s03_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bottle_s03_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bottle_s04_generic.py b/scripts/loot/lootItems/npc_loot/bottle_s04_generic.py deleted file mode 100644 index 1c94fece..00000000 --- a/scripts/loot/lootItems/npc_loot/bottle_s04_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bottle_s04_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bowl_generic.py b/scripts/loot/lootItems/npc_loot/bowl_generic.py deleted file mode 100644 index 6afc929d..00000000 --- a/scripts/loot/lootItems/npc_loot/bowl_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bowl_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/briefcase_generic.py b/scripts/loot/lootItems/npc_loot/briefcase_generic.py deleted file mode 100644 index eca5bbca..00000000 --- a/scripts/loot/lootItems/npc_loot/briefcase_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_briefcase_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/broad_spectrum_med_device_generic.py b/scripts/loot/lootItems/npc_loot/broad_spectrum_med_device_generic.py deleted file mode 100644 index 9f5ba3cd..00000000 --- a/scripts/loot/lootItems/npc_loot/broad_spectrum_med_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_broad_spectrum_med_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/bug_jar_generic.py b/scripts/loot/lootItems/npc_loot/bug_jar_generic.py deleted file mode 100644 index 28cf4703..00000000 --- a/scripts/loot/lootItems/npc_loot/bug_jar_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_bug_jar_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/cage_generic.py b/scripts/loot/lootItems/npc_loot/cage_generic.py deleted file mode 100644 index f91bfbf6..00000000 --- a/scripts/loot/lootItems/npc_loot/cage_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_cage_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/camera_generic.py b/scripts/loot/lootItems/npc_loot/camera_generic.py deleted file mode 100644 index 2e6f6432..00000000 --- a/scripts/loot/lootItems/npc_loot/camera_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_camera_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/canister_small_device_generic.py b/scripts/loot/lootItems/npc_loot/canister_small_device_generic.py deleted file mode 100644 index a008f436..00000000 --- a/scripts/loot/lootItems/npc_loot/canister_small_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_canister_small_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/chance_cube_8_generic.py b/scripts/loot/lootItems/npc_loot/chance_cube_8_generic.py deleted file mode 100644 index 0abb6985..00000000 --- a/scripts/loot/lootItems/npc_loot/chance_cube_8_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_chance_cube_8_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/clamp_generic.py b/scripts/loot/lootItems/npc_loot/clamp_generic.py deleted file mode 100644 index 0a673f2b..00000000 --- a/scripts/loot/lootItems/npc_loot/clamp_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_clamp_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/clipon_id_badge_generic.py b/scripts/loot/lootItems/npc_loot/clipon_id_badge_generic.py deleted file mode 100644 index bdc491df..00000000 --- a/scripts/loot/lootItems/npc_loot/clipon_id_badge_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_clipon_id_badge_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/cloth_box_generic.py b/scripts/loot/lootItems/npc_loot/cloth_box_generic.py deleted file mode 100644 index 817b40b9..00000000 --- a/scripts/loot/lootItems/npc_loot/cloth_box_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_cloth_box_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/cloth_kit_generic.py b/scripts/loot/lootItems/npc_loot/cloth_kit_generic.py deleted file mode 100644 index fc557163..00000000 --- a/scripts/loot/lootItems/npc_loot/cloth_kit_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_cloth_kit_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/comlink_civilian_generic.py b/scripts/loot/lootItems/npc_loot/comlink_civilian_generic.py deleted file mode 100644 index 4eca0138..00000000 --- a/scripts/loot/lootItems/npc_loot/comlink_civilian_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_comlink_civilian_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/datapad_generic.py b/scripts/loot/lootItems/npc_loot/datapad_generic.py deleted file mode 100644 index 699d4187..00000000 --- a/scripts/loot/lootItems/npc_loot/datapad_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_datapad_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/datapad_trakball_generic.py b/scripts/loot/lootItems/npc_loot/datapad_trakball_generic.py deleted file mode 100644 index 57dedb7d..00000000 --- a/scripts/loot/lootItems/npc_loot/datapad_trakball_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_datapad_trakball_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/deed_datapad_generic.py b/scripts/loot/lootItems/npc_loot/deed_datapad_generic.py deleted file mode 100644 index b4727ee5..00000000 --- a/scripts/loot/lootItems/npc_loot/deed_datapad_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_deed_datapad_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/dermal_analyzer_generic.py b/scripts/loot/lootItems/npc_loot/dermal_analyzer_generic.py deleted file mode 100644 index f4be3df0..00000000 --- a/scripts/loot/lootItems/npc_loot/dermal_analyzer_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_dermal_analyzer_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/disguise_makeup_kit_generic.py b/scripts/loot/lootItems/npc_loot/disguise_makeup_kit_generic.py deleted file mode 100644 index fb704084..00000000 --- a/scripts/loot/lootItems/npc_loot/disguise_makeup_kit_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_disguise_makeup_kit_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/dye_set_generic.py b/scripts/loot/lootItems/npc_loot/dye_set_generic.py deleted file mode 100644 index 45a0a16e..00000000 --- a/scripts/loot/lootItems/npc_loot/dye_set_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_dye_set_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/electro_polearm_generic.py b/scripts/loot/lootItems/npc_loot/electro_polearm_generic.py deleted file mode 100644 index b542f217..00000000 --- a/scripts/loot/lootItems/npc_loot/electro_polearm_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_electro_polearm_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/firework_generic.py b/scripts/loot/lootItems/npc_loot/firework_generic.py deleted file mode 100644 index eb99aac1..00000000 --- a/scripts/loot/lootItems/npc_loot/firework_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_firework_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/flask_sample_device_generic.py b/scripts/loot/lootItems/npc_loot/flask_sample_device_generic.py deleted file mode 100644 index 1ca01637..00000000 --- a/scripts/loot/lootItems/npc_loot/flask_sample_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_flask_sample_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/fliptop_calibrator_generic.py b/scripts/loot/lootItems/npc_loot/fliptop_calibrator_generic.py deleted file mode 100644 index c0e1ddf6..00000000 --- a/scripts/loot/lootItems/npc_loot/fliptop_calibrator_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_fliptop_calibrator_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/frequency_jammer_wire_generic.py b/scripts/loot/lootItems/npc_loot/frequency_jammer_wire_generic.py deleted file mode 100644 index dd99ef94..00000000 --- a/scripts/loot/lootItems/npc_loot/frequency_jammer_wire_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_frequency_jammer_wire_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/furniture_repair_device_generic.py b/scripts/loot/lootItems/npc_loot/furniture_repair_device_generic.py deleted file mode 100644 index bb171ed2..00000000 --- a/scripts/loot/lootItems/npc_loot/furniture_repair_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_furniture_repair_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/generic_crystal.py b/scripts/loot/lootItems/npc_loot/generic_crystal.py deleted file mode 100644 index e90d50de..00000000 --- a/scripts/loot/lootItems/npc_loot/generic_crystal.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_generic_crystal.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/generic_tool_kit_generic.py b/scripts/loot/lootItems/npc_loot/generic_tool_kit_generic.py deleted file mode 100644 index 3af36b03..00000000 --- a/scripts/loot/lootItems/npc_loot/generic_tool_kit_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_generic_tool_kit_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/green_stone_necklace_generic.py b/scripts/loot/lootItems/npc_loot/green_stone_necklace_generic.py deleted file mode 100644 index 6bebbcd0..00000000 --- a/scripts/loot/lootItems/npc_loot/green_stone_necklace_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_green_stone_necklace_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/handheld_viewscreen_1_generic.py b/scripts/loot/lootItems/npc_loot/handheld_viewscreen_1_generic.py deleted file mode 100644 index a1132938..00000000 --- a/scripts/loot/lootItems/npc_loot/handheld_viewscreen_1_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_handheld_viewscreen_1_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/healing_chemical_generic.py b/scripts/loot/lootItems/npc_loot/healing_chemical_generic.py deleted file mode 100644 index 78323bd5..00000000 --- a/scripts/loot/lootItems/npc_loot/healing_chemical_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_healing_chemical_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw.py b/scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw_light.py b/scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw_light.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_claw_light.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s01.py b/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s01.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s01.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s02.py b/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s02.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s02.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s03.py b/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s03.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_axkva_min_crystal_s03.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_destroyer_cooling_coil.py b/scripts/loot/lootItems/npc_loot/heroic_destroyer_cooling_coil.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_destroyer_cooling_coil.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_destroyer_power_transformer.py b/scripts/loot/lootItems/npc_loot/heroic_destroyer_power_transformer.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_destroyer_power_transformer.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_destroyer_reactor_console.py b/scripts/loot/lootItems/npc_loot/heroic_destroyer_reactor_console.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_destroyer_reactor_console.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_destroyer_space_beacon.py b/scripts/loot/lootItems/npc_loot/heroic_destroyer_space_beacon.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_destroyer_space_beacon.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_brazier.py b/scripts/loot/lootItems/npc_loot/heroic_exar_brazier.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_brazier.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_claw_s01.py b/scripts/loot/lootItems/npc_loot/heroic_exar_claw_s01.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_claw_s01.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_claw_s02.py b/scripts/loot/lootItems/npc_loot/heroic_exar_claw_s02.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_claw_s02.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s01.py b/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s01.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s01.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s02.py b/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s02.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s02.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s03.py b/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s03.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s03.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s04.py b/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s04.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_roots_s04.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_exar_torch.py b/scripts/loot/lootItems/npc_loot/heroic_exar_torch.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_exar_torch.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_sm_generator.py b/scripts/loot/lootItems/npc_loot/heroic_sm_generator.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_sm_generator.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_solar_panel.py b/scripts/loot/lootItems/npc_loot/heroic_solar_panel.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_solar_panel.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_tusken_meat_rack.py b/scripts/loot/lootItems/npc_loot/heroic_tusken_meat_rack.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_tusken_meat_rack.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_tusken_shelves.py b/scripts/loot/lootItems/npc_loot/heroic_tusken_shelves.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_tusken_shelves.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_tusken_stairs.py b/scripts/loot/lootItems/npc_loot/heroic_tusken_stairs.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_tusken_stairs.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_tusken_vent_pillar.py b/scripts/loot/lootItems/npc_loot/heroic_tusken_vent_pillar.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_tusken_vent_pillar.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/heroic_wall_lamp.py b/scripts/loot/lootItems/npc_loot/heroic_wall_lamp.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/heroic_wall_lamp.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/holocube_splinters_generic.py b/scripts/loot/lootItems/npc_loot/holocube_splinters_generic.py deleted file mode 100644 index dd9d24f0..00000000 --- a/scripts/loot/lootItems/npc_loot/holocube_splinters_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_holocube_splinters_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/hovercrate_transport_generic.py b/scripts/loot/lootItems/npc_loot/hovercrate_transport_generic.py deleted file mode 100644 index 1706a92b..00000000 --- a/scripts/loot/lootItems/npc_loot/hovercrate_transport_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_hovercrate_transport_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/imp_life_support_pack_generic.py b/scripts/loot/lootItems/npc_loot/imp_life_support_pack_generic.py deleted file mode 100644 index aba6ec0d..00000000 --- a/scripts/loot/lootItems/npc_loot/imp_life_support_pack_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_imp_life_support_pack_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/impulse_detector_01_generic.py b/scripts/loot/lootItems/npc_loot/impulse_detector_01_generic.py deleted file mode 100644 index 67c498fe..00000000 --- a/scripts/loot/lootItems/npc_loot/impulse_detector_01_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_impulse_detector_01_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/impulse_detector_02_generic.py b/scripts/loot/lootItems/npc_loot/impulse_detector_02_generic.py deleted file mode 100644 index d26e4009..00000000 --- a/scripts/loot/lootItems/npc_loot/impulse_detector_02_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_impulse_detector_02_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jellyfish_generic.py b/scripts/loot/lootItems/npc_loot/jellyfish_generic.py deleted file mode 100644 index 34d2a67e..00000000 --- a/scripts/loot/lootItems/npc_loot/jellyfish_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_jellyfish_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s02.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s02.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s02.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s03.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s03.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s03.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s04.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s04.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s04.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s06.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s06.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s06.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s07.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s07.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s07.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s08.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s08.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s08.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s09.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s09.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s09.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s10.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s10.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s10.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s11.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s11.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s11.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s12.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s12.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s12.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s13.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s13.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s13.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s14.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s14.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s14.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_ear_s15.py b/scripts/loot/lootItems/npc_loot/jewelry_ear_s15.py deleted file mode 100644 index ccad8904..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_ear_s15.py +++ /dev/null @@ -1,4 +0,0 @@ -import sys - -def setup(core, object): - return \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/jewelry_setting_generic.py b/scripts/loot/lootItems/npc_loot/jewelry_setting_generic.py deleted file mode 100644 index 957b63ed..00000000 --- a/scripts/loot/lootItems/npc_loot/jewelry_setting_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_jewelry_setting_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/large_dispersal_unit_generic.py b/scripts/loot/lootItems/npc_loot/large_dispersal_unit_generic.py deleted file mode 100644 index fcd26a3f..00000000 --- a/scripts/loot/lootItems/npc_loot/large_dispersal_unit_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_large_dispersal_unit_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/laser_trap_generic.py b/scripts/loot/lootItems/npc_loot/laser_trap_generic.py deleted file mode 100644 index 1abe062d..00000000 --- a/scripts/loot/lootItems/npc_loot/laser_trap_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_laser_trap_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/launcher_tube_generic.py b/scripts/loot/lootItems/npc_loot/launcher_tube_generic.py deleted file mode 100644 index 101ea1f7..00000000 --- a/scripts/loot/lootItems/npc_loot/launcher_tube_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_launcher_tube_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/ledger_generic.py b/scripts/loot/lootItems/npc_loot/ledger_generic.py deleted file mode 100644 index 42d4a063..00000000 --- a/scripts/loot/lootItems/npc_loot/ledger_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_ledger_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/magseal_detector_generic.py b/scripts/loot/lootItems/npc_loot/magseal_detector_generic.py deleted file mode 100644 index 4a5dedde..00000000 --- a/scripts/loot/lootItems/npc_loot/magseal_detector_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_magseal_detector_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/medical_device_generic.py b/scripts/loot/lootItems/npc_loot/medical_device_generic.py deleted file mode 100644 index 2aa256ff..00000000 --- a/scripts/loot/lootItems/npc_loot/medical_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_medical_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/medical_enhance_device_generic.py b/scripts/loot/lootItems/npc_loot/medical_enhance_device_generic.py deleted file mode 100644 index 56e301ff..00000000 --- a/scripts/loot/lootItems/npc_loot/medical_enhance_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_medical_enhance_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/metal_ball_generic.py b/scripts/loot/lootItems/npc_loot/metal_ball_generic.py deleted file mode 100644 index fac99e44..00000000 --- a/scripts/loot/lootItems/npc_loot/metal_ball_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_metal_ball_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/metal_barrel_generic.py b/scripts/loot/lootItems/npc_loot/metal_barrel_generic.py deleted file mode 100644 index a00254b6..00000000 --- a/scripts/loot/lootItems/npc_loot/metal_barrel_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_metal_barrel_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/notebook_generic.py b/scripts/loot/lootItems/npc_loot/notebook_generic.py deleted file mode 100644 index a0fab1c9..00000000 --- a/scripts/loot/lootItems/npc_loot/notebook_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_notebook_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/organichem_stores_generic.py b/scripts/loot/lootItems/npc_loot/organichem_stores_generic.py deleted file mode 100644 index 386bfc3a..00000000 --- a/scripts/loot/lootItems/npc_loot/organichem_stores_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_organichem_stores_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/pearl_generic.py b/scripts/loot/lootItems/npc_loot/pearl_generic.py deleted file mode 100644 index 670e8960..00000000 --- a/scripts/loot/lootItems/npc_loot/pearl_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_pearl_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/place_setting_generic.py b/scripts/loot/lootItems/npc_loot/place_setting_generic.py deleted file mode 100644 index 81892f53..00000000 --- a/scripts/loot/lootItems/npc_loot/place_setting_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_place_setting_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/preserved_bugs_generic.py b/scripts/loot/lootItems/npc_loot/preserved_bugs_generic.py deleted file mode 100644 index 214c24a6..00000000 --- a/scripts/loot/lootItems/npc_loot/preserved_bugs_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_preserved_bugs_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/prop_jacket_generic.py b/scripts/loot/lootItems/npc_loot/prop_jacket_generic.py deleted file mode 100644 index 5eb4524f..00000000 --- a/scripts/loot/lootItems/npc_loot/prop_jacket_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_prop_jacket_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/radio_generic.py b/scripts/loot/lootItems/npc_loot/radio_generic.py deleted file mode 100644 index 88590013..00000000 --- a/scripts/loot/lootItems/npc_loot/radio_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_radio_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/rebreather_generic.py b/scripts/loot/lootItems/npc_loot/rebreather_generic.py deleted file mode 100644 index b42c7d4c..00000000 --- a/scripts/loot/lootItems/npc_loot/rebreather_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_rebreather_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/red_wiring_generic.py b/scripts/loot/lootItems/npc_loot/red_wiring_generic.py deleted file mode 100644 index 24cb70ad..00000000 --- a/scripts/loot/lootItems/npc_loot/red_wiring_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_red_wiring_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/rng_weapon_repair_device_generic.py b/scripts/loot/lootItems/npc_loot/rng_weapon_repair_device_generic.py deleted file mode 100644 index 01b9b15d..00000000 --- a/scripts/loot/lootItems/npc_loot/rng_weapon_repair_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_rng_weapon_repair_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/rock_generic.py b/scripts/loot/lootItems/npc_loot/rock_generic.py deleted file mode 100644 index 718c633a..00000000 --- a/scripts/loot/lootItems/npc_loot/rock_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_rock_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/rocket_generic.py b/scripts/loot/lootItems/npc_loot/rocket_generic.py deleted file mode 100644 index 7ae615cb..00000000 --- a/scripts/loot/lootItems/npc_loot/rocket_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_rocket_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/rusty_toolkit_generic.py b/scripts/loot/lootItems/npc_loot/rusty_toolkit_generic.py deleted file mode 100644 index e724632a..00000000 --- a/scripts/loot/lootItems/npc_loot/rusty_toolkit_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_rusty_toolkit_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/scope_weapon_generic.py b/scripts/loot/lootItems/npc_loot/scope_weapon_generic.py deleted file mode 100644 index 918a51d3..00000000 --- a/scripts/loot/lootItems/npc_loot/scope_weapon_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_scope_weapon_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/scroll_generic.py b/scripts/loot/lootItems/npc_loot/scroll_generic.py deleted file mode 100644 index 983c80fb..00000000 --- a/scripts/loot/lootItems/npc_loot/scroll_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_scroll_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/serum_vial_generic.py b/scripts/loot/lootItems/npc_loot/serum_vial_generic.py deleted file mode 100644 index 88de796e..00000000 --- a/scripts/loot/lootItems/npc_loot/serum_vial_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_serum_vial_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/shield_repair_device_generic.py b/scripts/loot/lootItems/npc_loot/shield_repair_device_generic.py deleted file mode 100644 index cac3b1ed..00000000 --- a/scripts/loot/lootItems/npc_loot/shield_repair_device_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_shield_repair_device_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/shisa_generic.py b/scripts/loot/lootItems/npc_loot/shisa_generic.py deleted file mode 100644 index 6e009638..00000000 --- a/scripts/loot/lootItems/npc_loot/shisa_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_shisa_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/shoe_soul_generic.py b/scripts/loot/lootItems/npc_loot/shoe_soul_generic.py deleted file mode 100644 index 549780d1..00000000 --- a/scripts/loot/lootItems/npc_loot/shoe_soul_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_shoe_soul_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/slave_collar_generic.py b/scripts/loot/lootItems/npc_loot/slave_collar_generic.py deleted file mode 100644 index d708ad10..00000000 --- a/scripts/loot/lootItems/npc_loot/slave_collar_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_slave_collar_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/software_module_orange_generic.py b/scripts/loot/lootItems/npc_loot/software_module_orange_generic.py deleted file mode 100644 index 3392dfe1..00000000 --- a/scripts/loot/lootItems/npc_loot/software_module_orange_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_software_module_orange_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/software_module_red_generic.py b/scripts/loot/lootItems/npc_loot/software_module_red_generic.py deleted file mode 100644 index 55a69b0c..00000000 --- a/scripts/loot/lootItems/npc_loot/software_module_red_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_software_module_red_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/solar_panel.py b/scripts/loot/lootItems/npc_loot/solar_panel.py deleted file mode 100644 index 145b5f97..00000000 --- a/scripts/loot/lootItems/npc_loot/solar_panel.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_solar_panel_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/speaker_generic.py b/scripts/loot/lootItems/npc_loot/speaker_generic.py deleted file mode 100644 index 51a1be5b..00000000 --- a/scripts/loot/lootItems/npc_loot/speaker_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_speaker_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_booster_blue_generic.py b/scripts/loot/lootItems/npc_loot/spice_booster_blue_generic.py deleted file mode 100644 index 27e14a53..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_booster_blue_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_booster_blue_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_crash_n_burn_generic.py b/scripts/loot/lootItems/npc_loot/spice_crash_n_burn_generic.py deleted file mode 100644 index f29b059a..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_crash_n_burn_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_crash_n_burn_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_droid_lube_generic.py b/scripts/loot/lootItems/npc_loot/spice_droid_lube_generic.py deleted file mode 100644 index c4fc473c..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_droid_lube_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_droid_lube_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_giggledust_generic.py b/scripts/loot/lootItems/npc_loot/spice_giggledust_generic.py deleted file mode 100644 index e9bc4c5c..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_giggledust_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_giggledust_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_grey_gabaki_generic.py b/scripts/loot/lootItems/npc_loot/spice_grey_gabaki_generic.py deleted file mode 100644 index 8db66847..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_grey_gabaki_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_grey_gabaki_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_gunjack_generic.py b/scripts/loot/lootItems/npc_loot/spice_gunjack_generic.py deleted file mode 100644 index 7ddee3a0..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_gunjack_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_gunjack_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_kliknik_boost_generic.py b/scripts/loot/lootItems/npc_loot/spice_kliknik_boost_generic.py deleted file mode 100644 index 0050a0e3..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_kliknik_boost_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_kliknik_boost_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_kwi_boost_generic.py b/scripts/loot/lootItems/npc_loot/spice_kwi_boost_generic.py deleted file mode 100644 index 409905d7..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_kwi_boost_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_kwi_boost_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_muon_gold_generic.py b/scripts/loot/lootItems/npc_loot/spice_muon_gold_generic.py deleted file mode 100644 index 8166790d..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_muon_gold_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_muon_gold_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_neutron_pixey_generic.py b/scripts/loot/lootItems/npc_loot/spice_neutron_pixey_generic.py deleted file mode 100644 index ec4b0502..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_neutron_pixey_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_neutron_pixie_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_pyrepenol_generic.py b/scripts/loot/lootItems/npc_loot/spice_pyrepenol_generic.py deleted file mode 100644 index 6ee5a60e..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_pyrepenol_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_pyrepenol_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_scramjet_generic.py b/scripts/loot/lootItems/npc_loot/spice_scramjet_generic.py deleted file mode 100644 index a6fde893..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_scramjet_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_scramjet_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_sedative_h4b_generic.py b/scripts/loot/lootItems/npc_loot/spice_sedative_h4b_generic.py deleted file mode 100644 index 113d6074..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_sedative_h4b_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_sedative_h4b_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_shadowpaw_generic.py b/scripts/loot/lootItems/npc_loot/spice_shadowpaw_generic.py deleted file mode 100644 index e84ed917..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_shadowpaw_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_shadowpaw_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_sweetblossom_generic.py b/scripts/loot/lootItems/npc_loot/spice_sweetblossom_generic.py deleted file mode 100644 index 1c1b485b..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_sweetblossom_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_sweetblossom_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_thruster_head_generic.py b/scripts/loot/lootItems/npc_loot/spice_thruster_head_generic.py deleted file mode 100644 index ff27c155..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_thruster_head_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_thrusterhead_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spice_yarrock_generic.py b/scripts/loot/lootItems/npc_loot/spice_yarrock_generic.py deleted file mode 100644 index 08a3bc5b..00000000 --- a/scripts/loot/lootItems/npc_loot/spice_yarrock_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spice_yarrock_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spray_bottle_generic.py b/scripts/loot/lootItems/npc_loot/spray_bottle_generic.py deleted file mode 100644 index 07938537..00000000 --- a/scripts/loot/lootItems/npc_loot/spray_bottle_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spray_bottle_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spray_unit_small_01_generic.py b/scripts/loot/lootItems/npc_loot/spray_unit_small_01_generic.py deleted file mode 100644 index 53bcebf3..00000000 --- a/scripts/loot/lootItems/npc_loot/spray_unit_small_01_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spray_unit_small_01_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spray_unit_small_02_generic.py b/scripts/loot/lootItems/npc_loot/spray_unit_small_02_generic.py deleted file mode 100644 index 38cc5f98..00000000 --- a/scripts/loot/lootItems/npc_loot/spray_unit_small_02_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spray_unit_small_02_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spray_unit_small_03_generic.py b/scripts/loot/lootItems/npc_loot/spray_unit_small_03_generic.py deleted file mode 100644 index 31a6703a..00000000 --- a/scripts/loot/lootItems/npc_loot/spray_unit_small_03_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spray_unit_small_03_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/spray_unit_small_generic.py b/scripts/loot/lootItems/npc_loot/spray_unit_small_generic.py deleted file mode 100644 index 9d291638..00000000 --- a/scripts/loot/lootItems/npc_loot/spray_unit_small_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_spray_unit_small_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/stasis_field_generic.py b/scripts/loot/lootItems/npc_loot/stasis_field_generic.py deleted file mode 100644 index 170a5f89..00000000 --- a/scripts/loot/lootItems/npc_loot/stasis_field_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_stasis_field_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/stim_a_generic.py b/scripts/loot/lootItems/npc_loot/stim_a_generic.py deleted file mode 100644 index df58334a..00000000 --- a/scripts/loot/lootItems/npc_loot/stim_a_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_stim_a_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/substance_analyzer_generic.py b/scripts/loot/lootItems/npc_loot/substance_analyzer_generic.py deleted file mode 100644 index 242fa26e..00000000 --- a/scripts/loot/lootItems/npc_loot/substance_analyzer_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_substance_analyzer_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/supplement_liquid.py b/scripts/loot/lootItems/npc_loot/supplement_liquid.py deleted file mode 100644 index 75ba8b93..00000000 --- a/scripts/loot/lootItems/npc_loot/supplement_liquid.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_supplement_liquid_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/supplement_solid.py b/scripts/loot/lootItems/npc_loot/supplement_solid.py deleted file mode 100644 index 9c62747d..00000000 --- a/scripts/loot/lootItems/npc_loot/supplement_solid.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_supplement_solid.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/supplement_solid_pills.py b/scripts/loot/lootItems/npc_loot/supplement_solid_pills.py deleted file mode 100644 index d7b2d57a..00000000 --- a/scripts/loot/lootItems/npc_loot/supplement_solid_pills.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_supplement_solid_pills.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/survival_equipment_generic.py b/scripts/loot/lootItems/npc_loot/survival_equipment_generic.py deleted file mode 100644 index d34e96b1..00000000 --- a/scripts/loot/lootItems/npc_loot/survival_equipment_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_survival_equipment_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/syringe_generic.py b/scripts/loot/lootItems/npc_loot/syringe_generic.py deleted file mode 100644 index da7d11db..00000000 --- a/scripts/loot/lootItems/npc_loot/syringe_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_syringe_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/tech_food_basket_generic.py b/scripts/loot/lootItems/npc_loot/tech_food_basket_generic.py deleted file mode 100644 index a8fc68d9..00000000 --- a/scripts/loot/lootItems/npc_loot/tech_food_basket_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_tech_food_basket_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/tool_bundle_generic.py b/scripts/loot/lootItems/npc_loot/tool_bundle_generic.py deleted file mode 100644 index d7a0286c..00000000 --- a/scripts/loot/lootItems/npc_loot/tool_bundle_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_tool_bundle_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/tube_paste_generic.py b/scripts/loot/lootItems/npc_loot/tube_paste_generic.py deleted file mode 100644 index 5b1809a9..00000000 --- a/scripts/loot/lootItems/npc_loot/tube_paste_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_tube_paste_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/wiring_generic.py b/scripts/loot/lootItems/npc_loot/wiring_generic.py deleted file mode 100644 index 535a4455..00000000 --- a/scripts/loot/lootItems/npc_loot/wiring_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/worklight_generic.py b/scripts/loot/lootItems/npc_loot/worklight_generic.py deleted file mode 100644 index cb1df243..00000000 --- a/scripts/loot/lootItems/npc_loot/worklight_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_worklight_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/writing_utensils_generic.py b/scripts/loot/lootItems/npc_loot/writing_utensils_generic.py deleted file mode 100644 index 05478bd9..00000000 --- a/scripts/loot/lootItems/npc_loot/writing_utensils_generic.py +++ /dev/null @@ -1,15 +0,0 @@ -def itemTemplate(): - - return ['object/tangible/loot/npc_loot/shared_writing_utensils_generic.iff'] - -def stackable(): - - return 1 - -def junkDealerPrice(): - - return 28 - -def junkType(): - - return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/rarelootchest/kowakian_cage.py b/scripts/loot/lootItems/rarelootchest/kowakian_cage.py index 810362f8..8a5c9ff6 100644 --- a/scripts/loot/lootItems/rarelootchest/kowakian_cage.py +++ b/scripts/loot/lootItems/rarelootchest/kowakian_cage.py @@ -2,3 +2,7 @@ def itemTemplate(): return ['object/tangible/event_perk/shared_lifeday_monkey_cage.iff'] # needs correct iff still + +def STFparams(): + + return ['static_item_n','item_event_lifeday_monkey_cage','static_item_d','item_event_lifeday_monkey_cage'] \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/aero_magnifier_generic.py b/scripts/loot/lootItems/re_junk/aeromagnifier.py similarity index 79% rename from scripts/loot/lootItems/npc_loot/aero_magnifier_generic.py rename to scripts/loot/lootItems/re_junk/aeromagnifier.py index 80c9c816..f71b77c3 100644 --- a/scripts/loot/lootItems/npc_loot/aero_magnifier_generic.py +++ b/scripts/loot/lootItems/re_junk/aeromagnifier.py @@ -1,7 +1,11 @@ def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_aero_magnifier_generic.iff'] - + +def customItemName(): + + return 'Aeromagnifier' + def stackable(): return 1 diff --git a/scripts/loot/lootItems/junk/armor_repair_device.py b/scripts/loot/lootItems/re_junk/armor_repair_device.py similarity index 100% rename from scripts/loot/lootItems/junk/armor_repair_device.py rename to scripts/loot/lootItems/re_junk/armor_repair_device.py diff --git a/scripts/loot/lootItems/npc_loot/copper_battery_generic.py b/scripts/loot/lootItems/re_junk/battery.py similarity index 77% rename from scripts/loot/lootItems/npc_loot/copper_battery_generic.py rename to scripts/loot/lootItems/re_junk/battery.py index 61a9b0eb..6d54a956 100644 --- a/scripts/loot/lootItems/npc_loot/copper_battery_generic.py +++ b/scripts/loot/lootItems/re_junk/battery.py @@ -2,6 +2,10 @@ def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_copper_battery_generic.iff'] +def customItemName(): + + return 'Battery' + def stackable(): return 1 @@ -12,4 +16,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/motivator_device_generic.py b/scripts/loot/lootItems/re_junk/burnt_out_droid_motivator.py similarity index 72% rename from scripts/loot/lootItems/npc_loot/motivator_device_generic.py rename to scripts/loot/lootItems/re_junk/burnt_out_droid_motivator.py index a4dc7ed1..e8d7b7b3 100644 --- a/scripts/loot/lootItems/npc_loot/motivator_device_generic.py +++ b/scripts/loot/lootItems/re_junk/burnt_out_droid_motivator.py @@ -2,6 +2,10 @@ def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_motivator_device_generic.iff'] +def customItemName(): + + return 'Burnt Out Droid Motivator' + def stackable(): return 1 @@ -12,4 +16,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/re_junk/canceled_travel_ticket.py b/scripts/loot/lootItems/re_junk/canceled_travel_ticket.py new file mode 100644 index 00000000..42eb375f --- /dev/null +++ b/scripts/loot/lootItems/re_junk/canceled_travel_ticket.py @@ -0,0 +1,21 @@ + +def itemTemplate(): + + return ['object/tangible/loot/misc/shared_ticket_expired.iff'] + +def customItemName(): + + return 'Canceled Travel Ticket' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/junk/chassis_blueprint.py b/scripts/loot/lootItems/re_junk/chassis_blueprints.py similarity index 54% rename from scripts/loot/lootItems/junk/chassis_blueprint.py rename to scripts/loot/lootItems/re_junk/chassis_blueprints.py index 2848f501..834cacdf 100644 --- a/scripts/loot/lootItems/junk/chassis_blueprint.py +++ b/scripts/loot/lootItems/re_junk/chassis_blueprints.py @@ -1,11 +1,11 @@ def itemTemplate(): - return ['object/tangible/loot/generic_usable/shared_chassis_blueprint_usuable.iff'] + return ['object/tangible/loot/npc_loot/shared_chassis_blueprint_device_generic.iff'] def customItemName(): - return 'Chassis Blueprint' + return 'Chassis Blueprints' def stackable(): diff --git a/scripts/loot/lootItems/npc_loot/chem_dispersion_device_generic.py b/scripts/loot/lootItems/re_junk/chemical_dispersion_unit.py similarity index 72% rename from scripts/loot/lootItems/npc_loot/chem_dispersion_device_generic.py rename to scripts/loot/lootItems/re_junk/chemical_dispersion_unit.py index 71f933c7..0f5c50d1 100644 --- a/scripts/loot/lootItems/npc_loot/chem_dispersion_device_generic.py +++ b/scripts/loot/lootItems/re_junk/chemical_dispersion_unit.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_chem_dispersion_device_generic.iff'] +def customItemName(): + + return 'Chemical Dispersion Unit' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/elect_module_simple_generic.py b/scripts/loot/lootItems/re_junk/circuit.py similarity index 77% rename from scripts/loot/lootItems/npc_loot/elect_module_simple_generic.py rename to scripts/loot/lootItems/re_junk/circuit.py index 44256af6..3abdc52c 100644 --- a/scripts/loot/lootItems/npc_loot/elect_module_simple_generic.py +++ b/scripts/loot/lootItems/re_junk/circuit.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_elect_module_simple_generic.iff'] +def customItemName(): + + return 'Circuit' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/circuit_board_generic.py b/scripts/loot/lootItems/re_junk/circuit_board.py similarity index 79% rename from scripts/loot/lootItems/npc_loot/circuit_board_generic.py rename to scripts/loot/lootItems/re_junk/circuit_board.py index 86d8c842..3a26f5f8 100644 --- a/scripts/loot/lootItems/npc_loot/circuit_board_generic.py +++ b/scripts/loot/lootItems/re_junk/circuit_board.py @@ -2,6 +2,10 @@ def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_circuit_board_generic.iff'] +def customItemName(): + + return 'Circuit Board' + def stackable(): return 1 diff --git a/scripts/loot/lootItems/npc_loot/elect_module_wires.py b/scripts/loot/lootItems/re_junk/circuitry.py similarity index 76% rename from scripts/loot/lootItems/npc_loot/elect_module_wires.py rename to scripts/loot/lootItems/re_junk/circuitry.py index 3aada50d..31b3a7ed 100644 --- a/scripts/loot/lootItems/npc_loot/elect_module_wires.py +++ b/scripts/loot/lootItems/re_junk/circuitry.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_elect_module_wires.iff'] +def customItemName(): + + return 'Circuitry' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/clothing_repair_device_generic.py b/scripts/loot/lootItems/re_junk/clothing_repair_device.py similarity index 73% rename from scripts/loot/lootItems/npc_loot/clothing_repair_device_generic.py rename to scripts/loot/lootItems/re_junk/clothing_repair_device.py index b15e233d..b9ef6317 100644 --- a/scripts/loot/lootItems/npc_loot/clothing_repair_device_generic.py +++ b/scripts/loot/lootItems/re_junk/clothing_repair_device.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_clothing_repair_device_generic.iff'] +def customItemName(): + + return 'Clothing Repair Device' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/artifact_generic.py b/scripts/loot/lootItems/re_junk/collapsed_artifact.py similarity index 73% rename from scripts/loot/lootItems/npc_loot/artifact_generic.py rename to scripts/loot/lootItems/re_junk/collapsed_artifact.py index db5670a1..d9028fed 100644 --- a/scripts/loot/lootItems/npc_loot/artifact_generic.py +++ b/scripts/loot/lootItems/re_junk/collapsed_artifact.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_artifact_generic.iff'] +def customItemName(): + + return 'Collapsed Artifact' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/junk/comlink.py b/scripts/loot/lootItems/re_junk/comlink.py similarity index 100% rename from scripts/loot/lootItems/junk/comlink.py rename to scripts/loot/lootItems/re_junk/comlink.py diff --git a/scripts/loot/lootItems/npc_loot/elect_module_misc_01.py b/scripts/loot/lootItems/re_junk/control_box.py similarity index 75% rename from scripts/loot/lootItems/npc_loot/elect_module_misc_01.py rename to scripts/loot/lootItems/re_junk/control_box.py index 2acda9e5..51754acb 100644 --- a/scripts/loot/lootItems/npc_loot/elect_module_misc_01.py +++ b/scripts/loot/lootItems/re_junk/control_box.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_elect_module_misc_01.iff'] +def customItemName(): + + return 'Control Box' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/junk/damaged_datapad.py b/scripts/loot/lootItems/re_junk/damaged_datapad.py similarity index 100% rename from scripts/loot/lootItems/junk/damaged_datapad.py rename to scripts/loot/lootItems/re_junk/damaged_datapad.py diff --git a/scripts/loot/lootItems/npc_loot/software_module_generic.py b/scripts/loot/lootItems/re_junk/damaged_droid_memory_unit.py similarity index 71% rename from scripts/loot/lootItems/npc_loot/software_module_generic.py rename to scripts/loot/lootItems/re_junk/damaged_droid_memory_unit.py index 75d68601..bdf8752a 100644 --- a/scripts/loot/lootItems/npc_loot/software_module_generic.py +++ b/scripts/loot/lootItems/re_junk/damaged_droid_memory_unit.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_software_module_generic.iff'] +def customItemName(): + + return 'a Damaged Droid Memory Unit' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/small_motor_generic.py b/scripts/loot/lootItems/re_junk/damaged_droid_motivator.py similarity index 71% rename from scripts/loot/lootItems/npc_loot/small_motor_generic.py rename to scripts/loot/lootItems/re_junk/damaged_droid_motivator.py index 89bf3902..73b366c6 100644 --- a/scripts/loot/lootItems/npc_loot/small_motor_generic.py +++ b/scripts/loot/lootItems/re_junk/damaged_droid_motivator.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_small_motor_generic.iff'] +def customItemName(): + + return 'a Damaged Droid Motivator' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/elect_power_unit_generic.py b/scripts/loot/lootItems/re_junk/damaged_droid_power_cell.py similarity index 71% rename from scripts/loot/lootItems/npc_loot/elect_power_unit_generic.py rename to scripts/loot/lootItems/re_junk/damaged_droid_power_cell.py index 0060d932..5313f367 100644 --- a/scripts/loot/lootItems/npc_loot/elect_power_unit_generic.py +++ b/scripts/loot/lootItems/re_junk/damaged_droid_power_cell.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_elect_power_unit_generic.iff'] +def customItemName(): + + return 'a Damaged Droid Power Cell' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/shield_module_generic.py b/scripts/loot/lootItems/re_junk/damaged_droid_swivel_joint.py similarity index 70% rename from scripts/loot/lootItems/npc_loot/shield_module_generic.py rename to scripts/loot/lootItems/re_junk/damaged_droid_swivel_joint.py index 31b0fb17..3f5354f8 100644 --- a/scripts/loot/lootItems/npc_loot/shield_module_generic.py +++ b/scripts/loot/lootItems/re_junk/damaged_droid_swivel_joint.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_shield_module_generic.iff'] +def customItemName(): + + return 'a Damaged Droid Swivel Joint' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/disk_drive_generic.py b/scripts/loot/lootItems/re_junk/data_housing.py similarity index 75% rename from scripts/loot/lootItems/npc_loot/disk_drive_generic.py rename to scripts/loot/lootItems/re_junk/data_housing.py index f93bdb82..a9550dd0 100644 --- a/scripts/loot/lootItems/npc_loot/disk_drive_generic.py +++ b/scripts/loot/lootItems/re_junk/data_housing.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_disk_drive_generic.iff'] +def customItemName(): + + return 'Data Housing' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/datapad_flashy_generic.py b/scripts/loot/lootItems/re_junk/datapad.py similarity index 77% rename from scripts/loot/lootItems/npc_loot/datapad_flashy_generic.py rename to scripts/loot/lootItems/re_junk/datapad.py index 2879d622..1846a0c6 100644 --- a/scripts/loot/lootItems/npc_loot/datapad_flashy_generic.py +++ b/scripts/loot/lootItems/re_junk/datapad.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_datapad_flashy_generic.iff'] +def customItemName(): + + return 'Datapad' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/datadisk_generic.py b/scripts/loot/lootItems/re_junk/demagnetized_datadisk.py similarity index 72% rename from scripts/loot/lootItems/npc_loot/datadisk_generic.py rename to scripts/loot/lootItems/re_junk/demagnetized_datadisk.py index ee3b9ddf..94c19eea 100644 --- a/scripts/loot/lootItems/npc_loot/datadisk_generic.py +++ b/scripts/loot/lootItems/re_junk/demagnetized_datadisk.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_datadisk_generic.iff'] +def customItemName(): + + return 'Demagnetized Datadisk' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/elect_module_complex_generic.py b/scripts/loot/lootItems/re_junk/differential_regulator.py similarity index 73% rename from scripts/loot/lootItems/npc_loot/elect_module_complex_generic.py rename to scripts/loot/lootItems/re_junk/differential_regulator.py index 54ce9d22..8b77d537 100644 --- a/scripts/loot/lootItems/npc_loot/elect_module_complex_generic.py +++ b/scripts/loot/lootItems/re_junk/differential_regulator.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_elect_module_complex_generic.iff'] +def customItemName(): + + return 'Differential Regulator' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/re_junk/droid_battery_black_green.py b/scripts/loot/lootItems/re_junk/droid_battery_black_green.py new file mode 100644 index 00000000..4d896c3c --- /dev/null +++ b/scripts/loot/lootItems/re_junk/droid_battery_black_green.py @@ -0,0 +1,24 @@ +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_copper_battery_generic.iff'] + +def customItemName(): + + return 'Droid Battery' + +def stackable(): + + return 1 + +def reverse_engineering_name(): + + return 'Black/Green' + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/re_junk/droid_battery_purple_green.py b/scripts/loot/lootItems/re_junk/droid_battery_purple_green.py new file mode 100644 index 00000000..50d9b3d0 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/droid_battery_purple_green.py @@ -0,0 +1,36 @@ +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_copper_battery_generic.iff'] + +def customItemName(): + + return 'Droid Battery' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [28] + +def stackable(): + + return 1 + +def reverse_engineering_name(): + + return 'Purple/Green' + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/re_junk/droid_battery_teal.py b/scripts/loot/lootItems/re_junk/droid_battery_teal.py new file mode 100644 index 00000000..3d379020 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/droid_battery_teal.py @@ -0,0 +1,36 @@ +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_copper_battery_generic.iff'] + +def customItemName(): + + return 'Droid Battery' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [26] + +def stackable(): + + return 1 + +def reverse_engineering_name(): + + return 'Teal' + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/re_junk/droid_memory_module.py b/scripts/loot/lootItems/re_junk/droid_memory_module.py new file mode 100644 index 00000000..12c9020a --- /dev/null +++ b/scripts/loot/lootItems/re_junk/droid_memory_module.py @@ -0,0 +1,21 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_elect_module_simple_generic.iff'] + +def customItemName(): + + return 'Droid Memory Module' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/re_junk/droid_motor_red.py b/scripts/loot/lootItems/re_junk/droid_motor_red.py new file mode 100644 index 00000000..f68735fe --- /dev/null +++ b/scripts/loot/lootItems/re_junk/droid_motor_red.py @@ -0,0 +1,35 @@ +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_small_motor_generic.iff'] + +def customItemName(): + + return 'Droid Motor' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [6] + +def stackable(): + + return 1 + +def reverse_engineering_name(): + + return 'Red' + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/re_junk/droid_motor_yellow.py b/scripts/loot/lootItems/re_junk/droid_motor_yellow.py new file mode 100644 index 00000000..d23d505d --- /dev/null +++ b/scripts/loot/lootItems/re_junk/droid_motor_yellow.py @@ -0,0 +1,35 @@ +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_small_motor_generic.iff'] + +def customItemName(): + + return 'Droid Motor' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [11] + +def stackable(): + + return 1 + +def reverse_engineering_name(): + + return 'Yellow' + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/junk/ear_jewel.py b/scripts/loot/lootItems/re_junk/ear_jewel.py similarity index 100% rename from scripts/loot/lootItems/junk/ear_jewel.py rename to scripts/loot/lootItems/re_junk/ear_jewel.py diff --git a/scripts/loot/lootItems/re_junk/electronics_module.py b/scripts/loot/lootItems/re_junk/electronics_module.py new file mode 100644 index 00000000..5ed9edcb --- /dev/null +++ b/scripts/loot/lootItems/re_junk/electronics_module.py @@ -0,0 +1,21 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_elect_module_simple_generic.iff'] + +def customItemName(): + + return 'Electronics Module' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/re_junk/emergency_reactivator.py b/scripts/loot/lootItems/re_junk/emergency_reactivator.py new file mode 100644 index 00000000..8f95eb49 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/emergency_reactivator.py @@ -0,0 +1,21 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_elect_module_wires.iff'] + +def customItemName(): + + return 'Emergency Reactivator' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/rocket_ammo_generic.py b/scripts/loot/lootItems/re_junk/explosive_dud.py similarity index 70% rename from scripts/loot/lootItems/npc_loot/rocket_ammo_generic.py rename to scripts/loot/lootItems/re_junk/explosive_dud.py index ea5b521f..e871fd97 100644 --- a/scripts/loot/lootItems/npc_loot/rocket_ammo_generic.py +++ b/scripts/loot/lootItems/re_junk/explosive_dud.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_rocket_ammo_generic.iff'] + +def customItemName(): + return 'Explosive Dud' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 10 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/re_junk/frequency_jamming_wired.py b/scripts/loot/lootItems/re_junk/frequency_jamming_wired.py new file mode 100644 index 00000000..af2594c0 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/frequency_jamming_wired.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_frequency_jammed_wire_generic.iff'] + +def customItemName(): + + return 'Frequency Jamming Wired' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 10 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/npc_loot/recording_rod_generic.py b/scripts/loot/lootItems/re_junk/holorecorder.py similarity index 70% rename from scripts/loot/lootItems/npc_loot/recording_rod_generic.py rename to scripts/loot/lootItems/re_junk/holorecorder.py index f6d25839..e6c121e1 100644 --- a/scripts/loot/lootItems/npc_loot/recording_rod_generic.py +++ b/scripts/loot/lootItems/re_junk/holorecorder.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_recording_rod_generic.iff'] + +def customItemName(): + return 'Holorecorder' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 10 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/junk/hyperdrive_unit.py b/scripts/loot/lootItems/re_junk/hyperdrive_unit.py similarity index 68% rename from scripts/loot/lootItems/junk/hyperdrive_unit.py rename to scripts/loot/lootItems/re_junk/hyperdrive_unit.py index 8ce2372d..919bba54 100644 --- a/scripts/loot/lootItems/junk/hyperdrive_unit.py +++ b/scripts/loot/lootItems/re_junk/hyperdrive_unit.py @@ -1,7 +1,7 @@ def itemTemplate(): - return ['object/tangible/loot/misc/shared_hyperdrive_part_s01.iff'] + return ['object/tangible/loot/npc_loot/shared_hyperdrive_part_generic.iff'] def customItemName(): diff --git a/scripts/loot/lootItems/junk/id_chip.py b/scripts/loot/lootItems/re_junk/id_chip.py similarity index 100% rename from scripts/loot/lootItems/junk/id_chip.py rename to scripts/loot/lootItems/re_junk/id_chip.py diff --git a/scripts/loot/lootItems/junk/impulse_detector.py b/scripts/loot/lootItems/re_junk/impulse_detector.py similarity index 100% rename from scripts/loot/lootItems/junk/impulse_detector.py rename to scripts/loot/lootItems/re_junk/impulse_detector.py diff --git a/scripts/loot/lootItems/junk/laser_trap.py b/scripts/loot/lootItems/re_junk/laser_trap.py similarity index 100% rename from scripts/loot/lootItems/junk/laser_trap.py rename to scripts/loot/lootItems/re_junk/laser_trap.py diff --git a/scripts/loot/lootItems/junk/launcher_tube.py b/scripts/loot/lootItems/re_junk/launcher_tube.py similarity index 100% rename from scripts/loot/lootItems/junk/launcher_tube.py rename to scripts/loot/lootItems/re_junk/launcher_tube.py diff --git a/scripts/loot/lootItems/junk/ledger.py b/scripts/loot/lootItems/re_junk/ledger.py similarity index 100% rename from scripts/loot/lootItems/junk/ledger.py rename to scripts/loot/lootItems/re_junk/ledger.py diff --git a/scripts/loot/lootItems/re_junk/locomotor.py b/scripts/loot/lootItems/re_junk/locomotor.py new file mode 100644 index 00000000..9f886792 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/locomotor.py @@ -0,0 +1,32 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_small_motor_generic.iff'] + +def customItemName(): + + return 'Locomotor' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [26] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 34 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/junk/magseal_detector.py b/scripts/loot/lootItems/re_junk/magseal_detector.py similarity index 100% rename from scripts/loot/lootItems/junk/magseal_detector.py rename to scripts/loot/lootItems/re_junk/magseal_detector.py diff --git a/scripts/loot/lootItems/re_junk/mark_i_circuit_board.py b/scripts/loot/lootItems/re_junk/mark_i_circuit_board.py new file mode 100644 index 00000000..96662feb --- /dev/null +++ b/scripts/loot/lootItems/re_junk/mark_i_circuit_board.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_circuit_board_generic.iff'] + +def customItemName(): + + return 'Mark I Circuit Board' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 15 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/re_junk/mark_v_circuit_board.py b/scripts/loot/lootItems/re_junk/mark_v_circuit_board.py new file mode 100644 index 00000000..c113eff2 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/mark_v_circuit_board.py @@ -0,0 +1,32 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_circuit_board_generic.iff'] + +def customItemName(): + + return 'Mark I Circuit Board' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [6] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 15 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/re_junk/mark_v_vocab_module.py b/scripts/loot/lootItems/re_junk/mark_v_vocab_module.py new file mode 100644 index 00000000..f04794d6 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/mark_v_vocab_module.py @@ -0,0 +1,33 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_software_module_orange_generic.iff'] + +def customItemName(): + + return 'Mark V Vocab Module' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [0] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/re_junk/mark_vii_vocabulation_module.py b/scripts/loot/lootItems/re_junk/mark_vii_vocabulation_module.py new file mode 100644 index 00000000..97d157a4 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/mark_vii_vocabulation_module.py @@ -0,0 +1,33 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_software_module_generic.iff'] + +def customItemName(): + + return 'Mark VII Vocabulation Module' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [0] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/re_junk/mark_x_vocab_module.py b/scripts/loot/lootItems/re_junk/mark_x_vocab_module.py new file mode 100644 index 00000000..6d83c144 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/mark_x_vocab_module.py @@ -0,0 +1,33 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_software_module_red_generic.iff'] + +def customItemName(): + + return 'Mark X Vocab Module' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [0] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/junk/medical_console.py b/scripts/loot/lootItems/re_junk/medical_console.py similarity index 100% rename from scripts/loot/lootItems/junk/medical_console.py rename to scripts/loot/lootItems/re_junk/medical_console.py diff --git a/scripts/loot/lootItems/junk/medical_device.py b/scripts/loot/lootItems/re_junk/medical_device.py similarity index 100% rename from scripts/loot/lootItems/junk/medical_device.py rename to scripts/loot/lootItems/re_junk/medical_device.py diff --git a/scripts/loot/lootItems/junk/motor.py b/scripts/loot/lootItems/re_junk/motor.py similarity index 100% rename from scripts/loot/lootItems/junk/motor.py rename to scripts/loot/lootItems/re_junk/motor.py diff --git a/scripts/loot/lootItems/npc_loot/chassis_blueprint_device_generic.py b/scripts/loot/lootItems/re_junk/newsfilter_module.py similarity index 74% rename from scripts/loot/lootItems/npc_loot/chassis_blueprint_device_generic.py rename to scripts/loot/lootItems/re_junk/newsfilter_module.py index 00bc89b2..33b142cb 100644 --- a/scripts/loot/lootItems/npc_loot/chassis_blueprint_device_generic.py +++ b/scripts/loot/lootItems/re_junk/newsfilter_module.py @@ -1,14 +1,19 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_chassis_blueprint_device_generic.iff'] +def customItemName(): + + return 'Newsfilter Module' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 21 def junkType(): diff --git a/scripts/loot/lootItems/re_junk/outdated_aeromagnifier.py b/scripts/loot/lootItems/re_junk/outdated_aeromagnifier.py new file mode 100644 index 00000000..425f9eff --- /dev/null +++ b/scripts/loot/lootItems/re_junk/outdated_aeromagnifier.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_aero_magnifier_generic.iff'] + +def customItemName(): + + return 'Outdated Aeromagnifier' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/armor_repair_device_generic.py b/scripts/loot/lootItems/re_junk/palm_diary.py similarity index 52% rename from scripts/loot/lootItems/npc_loot/armor_repair_device_generic.py rename to scripts/loot/lootItems/re_junk/palm_diary.py index 0ace743b..6860f705 100644 --- a/scripts/loot/lootItems/npc_loot/armor_repair_device_generic.py +++ b/scripts/loot/lootItems/re_junk/palm_diary.py @@ -1,6 +1,10 @@ def itemTemplate(): - return ['object/tangible/loot/npc_loot/shared_armor_repair_device_generic.iff'] + return ['object/tangible/loot/misc/shared_ledger_s01.iff'] + +def customItemName(): + + return 'Palm Diary' def stackable(): diff --git a/scripts/loot/lootItems/npc_loot/tubed_device_generic.py b/scripts/loot/lootItems/re_junk/plugged_hydraulics_system.py similarity index 75% rename from scripts/loot/lootItems/npc_loot/tubed_device_generic.py rename to scripts/loot/lootItems/re_junk/plugged_hydraulics_system.py index 86a8ba00..655528f4 100644 --- a/scripts/loot/lootItems/npc_loot/tubed_device_generic.py +++ b/scripts/loot/lootItems/re_junk/plugged_hydraulics_system.py @@ -2,6 +2,10 @@ def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_tubed_device_generic.iff'] +def customItemName(): + + return 'Plugged Hydraulics System' + def stackable(): return 1 diff --git a/scripts/loot/lootItems/junk/power_output_analyzer.py b/scripts/loot/lootItems/re_junk/power_output_analyzer.py similarity index 100% rename from scripts/loot/lootItems/junk/power_output_analyzer.py rename to scripts/loot/lootItems/re_junk/power_output_analyzer.py diff --git a/scripts/loot/lootItems/npc_loot/power_output_analyzer_generic.py b/scripts/loot/lootItems/re_junk/power_output_device.py similarity index 69% rename from scripts/loot/lootItems/npc_loot/power_output_analyzer_generic.py rename to scripts/loot/lootItems/re_junk/power_output_device.py index 0371ec7c..fdca8bea 100644 --- a/scripts/loot/lootItems/npc_loot/power_output_analyzer_generic.py +++ b/scripts/loot/lootItems/re_junk/power_output_device.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_power_output_analyzer_generic.iff'] + +def customItemName(): + return 'Power Output Device' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 21 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/npc_loot/generator_device_generic.py b/scripts/loot/lootItems/re_junk/power_supply.py similarity index 70% rename from scripts/loot/lootItems/npc_loot/generator_device_generic.py rename to scripts/loot/lootItems/re_junk/power_supply.py index de8b4255..18d89a7d 100644 --- a/scripts/loot/lootItems/npc_loot/generator_device_generic.py +++ b/scripts/loot/lootItems/re_junk/power_supply.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_generator_device_generic.iff'] + +def customItemName(): + return 'Power Supply' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 21 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/re_junk/rapid_program_module.py b/scripts/loot/lootItems/re_junk/rapid_program_module.py new file mode 100644 index 00000000..8821da77 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/rapid_program_module.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_chassis_blueprint_device_generic.iff'] + +def customItemName(): + + return 'Rapid Program Module' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 21 + +def junkType(): + + return 0 \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/ration_kit_device_generic.py b/scripts/loot/lootItems/re_junk/rations_kit.py similarity index 80% rename from scripts/loot/lootItems/npc_loot/ration_kit_device_generic.py rename to scripts/loot/lootItems/re_junk/rations_kit.py index 8f253eee..31cb551a 100644 --- a/scripts/loot/lootItems/npc_loot/ration_kit_device_generic.py +++ b/scripts/loot/lootItems/re_junk/rations_kit.py @@ -2,6 +2,10 @@ def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_ration_kit_device_generic.iff'] +def customItemName(): + + return 'Rations Kit' + def stackable(): return 1 diff --git a/scripts/loot/lootItems/junk/red_wiring.py b/scripts/loot/lootItems/re_junk/red_wiring.py similarity index 100% rename from scripts/loot/lootItems/junk/red_wiring.py rename to scripts/loot/lootItems/re_junk/red_wiring.py diff --git a/scripts/loot/lootItems/npc_loot/electronic_key_generic.py b/scripts/loot/lootItems/re_junk/remote_transmitter.py similarity index 68% rename from scripts/loot/lootItems/npc_loot/electronic_key_generic.py rename to scripts/loot/lootItems/re_junk/remote_transmitter.py index 4cb3cbe3..e010fa14 100644 --- a/scripts/loot/lootItems/npc_loot/electronic_key_generic.py +++ b/scripts/loot/lootItems/re_junk/remote_transmitter.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_electronic_key_generic.iff'] + +def customItemName(): + return 'Remote Transmitter' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 12 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/npc_loot/engineer_analysis_board_generic.py b/scripts/loot/lootItems/re_junk/restraining_device.py similarity index 70% rename from scripts/loot/lootItems/npc_loot/engineer_analysis_board_generic.py rename to scripts/loot/lootItems/re_junk/restraining_device.py index 271749a8..31866d68 100644 --- a/scripts/loot/lootItems/npc_loot/engineer_analysis_board_generic.py +++ b/scripts/loot/lootItems/re_junk/restraining_device.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_engineer_analysis_board_generic.iff'] + +def customItemName(): + return 'Restraining Device' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 12 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/re_junk/self_analysis_circuit.py b/scripts/loot/lootItems/re_junk/self_analysis_circuit.py new file mode 100644 index 00000000..81645d5b --- /dev/null +++ b/scripts/loot/lootItems/re_junk/self_analysis_circuit.py @@ -0,0 +1,21 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_elect_module_wires.iff'] + +def customItemName(): + + return 'Self Analysis Circuit' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/npc_loot/medical_console_generic.py b/scripts/loot/lootItems/re_junk/servo_joint.py similarity index 71% rename from scripts/loot/lootItems/npc_loot/medical_console_generic.py rename to scripts/loot/lootItems/re_junk/servo_joint.py index 69ee6034..2b399503 100644 --- a/scripts/loot/lootItems/npc_loot/medical_console_generic.py +++ b/scripts/loot/lootItems/re_junk/servo_joint.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_medical_console_generic.iff'] + +def customItemName(): + return 'Servo Joint' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 24 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/junk/shield_module.py b/scripts/loot/lootItems/re_junk/shield_module.py similarity index 100% rename from scripts/loot/lootItems/junk/shield_module.py rename to scripts/loot/lootItems/re_junk/shield_module.py diff --git a/scripts/loot/lootItems/npc_loot/building_repair_device_generic.py b/scripts/loot/lootItems/re_junk/small_mining_tool.py similarity index 74% rename from scripts/loot/lootItems/npc_loot/building_repair_device_generic.py rename to scripts/loot/lootItems/re_junk/small_mining_tool.py index 89af1925..32cb47e5 100644 --- a/scripts/loot/lootItems/npc_loot/building_repair_device_generic.py +++ b/scripts/loot/lootItems/re_junk/small_mining_tool.py @@ -1,7 +1,12 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_building_repair_device_generic.iff'] +def customItemName(): + + return 'a Small Mining Tool' + def stackable(): return 1 @@ -12,4 +17,5 @@ def junkDealerPrice(): def junkType(): - return 0 \ No newline at end of file + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/junk/software_module.py b/scripts/loot/lootItems/re_junk/software_module.py similarity index 100% rename from scripts/loot/lootItems/junk/software_module.py rename to scripts/loot/lootItems/re_junk/software_module.py diff --git a/scripts/loot/lootItems/npc_loot/hyperdrive_part_generic.py b/scripts/loot/lootItems/re_junk/speederdrive.py similarity index 70% rename from scripts/loot/lootItems/npc_loot/hyperdrive_part_generic.py rename to scripts/loot/lootItems/re_junk/speederdrive.py index 46b965c8..91b7909a 100644 --- a/scripts/loot/lootItems/npc_loot/hyperdrive_part_generic.py +++ b/scripts/loot/lootItems/re_junk/speederdrive.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_hyperdrive_part_generic.iff'] + +def customItemName(): + return 'Speederdrive' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 34 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/junk/survival_gear.py b/scripts/loot/lootItems/re_junk/survival_gear.py similarity index 100% rename from scripts/loot/lootItems/junk/survival_gear.py rename to scripts/loot/lootItems/re_junk/survival_gear.py diff --git a/scripts/loot/lootItems/re_junk/tranceiver.py b/scripts/loot/lootItems/re_junk/tranceiver.py new file mode 100644 index 00000000..fabc708c --- /dev/null +++ b/scripts/loot/lootItems/re_junk/tranceiver.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_elect_module_complex_generic.iff'] + +def customItemName(): + + return 'Tranceiver' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 34 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/junk/explosive_dud.py b/scripts/loot/lootItems/re_junk/tubing.py similarity index 55% rename from scripts/loot/lootItems/junk/explosive_dud.py rename to scripts/loot/lootItems/re_junk/tubing.py index 1fdcf7c3..0f27b301 100644 --- a/scripts/loot/lootItems/junk/explosive_dud.py +++ b/scripts/loot/lootItems/re_junk/tubing.py @@ -1,11 +1,11 @@ def itemTemplate(): - return ['object/tangible/loot/npc_loot/shared_firework_generic.iff'] + return ['object/tangible/loot/npc_loot/shared_tubing_device_generic.iff'] def customItemName(): - return 'Explosive Dud' + return 'Tubing' def stackable(): @@ -13,7 +13,7 @@ def stackable(): def junkDealerPrice(): - return 10 + return 34 def junkType(): diff --git a/scripts/loot/lootItems/junk/underpowered_survey_pad.py b/scripts/loot/lootItems/re_junk/underpowered_survey_pad.py similarity index 100% rename from scripts/loot/lootItems/junk/underpowered_survey_pad.py rename to scripts/loot/lootItems/re_junk/underpowered_survey_pad.py diff --git a/scripts/loot/lootItems/junk/unidentified_serum_vial.py b/scripts/loot/lootItems/re_junk/unidentified_serum_vial.py similarity index 100% rename from scripts/loot/lootItems/junk/unidentified_serum_vial.py rename to scripts/loot/lootItems/re_junk/unidentified_serum_vial.py diff --git a/scripts/loot/lootItems/npc_loot/installation_repair_device_generic.py b/scripts/loot/lootItems/re_junk/unpowered_installation_repair_device.py similarity index 65% rename from scripts/loot/lootItems/npc_loot/installation_repair_device_generic.py rename to scripts/loot/lootItems/re_junk/unpowered_installation_repair_device.py index 1d701f23..75cee131 100644 --- a/scripts/loot/lootItems/npc_loot/installation_repair_device_generic.py +++ b/scripts/loot/lootItems/re_junk/unpowered_installation_repair_device.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_installation_repair_device_generic.iff'] + +def customItemName(): + return 'Unpowered Installation Repair Device' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 34 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/npc_loot/decryptor_generic.py b/scripts/loot/lootItems/re_junk/unpowered_memory_encryptor.py similarity index 66% rename from scripts/loot/lootItems/npc_loot/decryptor_generic.py rename to scripts/loot/lootItems/re_junk/unpowered_memory_encryptor.py index 218fe01d..be33e61b 100644 --- a/scripts/loot/lootItems/npc_loot/decryptor_generic.py +++ b/scripts/loot/lootItems/re_junk/unpowered_memory_encryptor.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_decryptor_generic.iff'] + +def customItemName(): + return 'Unpowered Memory Encryptor' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 34 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/npc_loot/survey_pad_adv_generic.py b/scripts/loot/lootItems/re_junk/unpowered_survey_pad.py similarity index 68% rename from scripts/loot/lootItems/npc_loot/survey_pad_adv_generic.py rename to scripts/loot/lootItems/re_junk/unpowered_survey_pad.py index f5e9e3cd..a75a8091 100644 --- a/scripts/loot/lootItems/npc_loot/survey_pad_adv_generic.py +++ b/scripts/loot/lootItems/re_junk/unpowered_survey_pad.py @@ -1,15 +1,20 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_survey_pad_adv_generic.iff'] + +def customItemName(): + return 'Unpowered Survey Pad' + def stackable(): return 1 def junkDealerPrice(): - return 28 + return 34 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/npc_loot/id_chip_generic.py b/scripts/loot/lootItems/re_junk/used_id_chip.py similarity index 74% rename from scripts/loot/lootItems/npc_loot/id_chip_generic.py rename to scripts/loot/lootItems/re_junk/used_id_chip.py index a35ff878..34ac1e3c 100644 --- a/scripts/loot/lootItems/npc_loot/id_chip_generic.py +++ b/scripts/loot/lootItems/re_junk/used_id_chip.py @@ -1,6 +1,11 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_id_chip_generic.iff'] + +def customItemName(): + + return 'Used ID Chip' def stackable(): @@ -8,7 +13,7 @@ def stackable(): def junkDealerPrice(): - return 28 + return 14 def junkType(): diff --git a/scripts/loot/lootItems/junk/used_notebook.py b/scripts/loot/lootItems/re_junk/used_notebook.py similarity index 100% rename from scripts/loot/lootItems/junk/used_notebook.py rename to scripts/loot/lootItems/re_junk/used_notebook.py diff --git a/scripts/loot/lootItems/npc_loot/handheld_viewscreen_2_generic.py b/scripts/loot/lootItems/re_junk/used_vidscreen.py similarity index 75% rename from scripts/loot/lootItems/npc_loot/handheld_viewscreen_2_generic.py rename to scripts/loot/lootItems/re_junk/used_vidscreen.py index 7734f2fa..df5b2a48 100644 --- a/scripts/loot/lootItems/npc_loot/handheld_viewscreen_2_generic.py +++ b/scripts/loot/lootItems/re_junk/used_vidscreen.py @@ -1,6 +1,11 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_handheld_viewscreen_2_generic.iff'] + +def customItemName(): + + return 'Used Vidscreen' def stackable(): @@ -8,7 +13,7 @@ def stackable(): def junkDealerPrice(): - return 28 + return 14 def junkType(): diff --git a/scripts/loot/lootItems/re_junk/vocabulator.py b/scripts/loot/lootItems/re_junk/vocabulator.py new file mode 100644 index 00000000..d8b93a49 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/vocabulator.py @@ -0,0 +1,33 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_software_module_generic.iff'] + +def customItemName(): + + return 'Vocabulator' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [0] + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/junk/weak_droid_battery.py b/scripts/loot/lootItems/re_junk/weak_droid_battery.py similarity index 100% rename from scripts/loot/lootItems/junk/weak_droid_battery.py rename to scripts/loot/lootItems/re_junk/weak_droid_battery.py diff --git a/scripts/loot/lootItems/re_junk/wire_element.py b/scripts/loot/lootItems/re_junk/wire_element.py new file mode 100644 index 00000000..4f0e8eeb --- /dev/null +++ b/scripts/loot/lootItems/re_junk/wire_element.py @@ -0,0 +1,21 @@ + +def itemTemplate(): + + return ['object/tangible/loot/simple_kit/shared_heating_element.iff'] + +def customItemName(): + + return 'Wire Element' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 28 + +def junkType(): + + return 0 + \ No newline at end of file diff --git a/scripts/loot/lootItems/re_junk/wiring_black.py b/scripts/loot/lootItems/re_junk/wiring_black.py new file mode 100644 index 00000000..5c69cb3b --- /dev/null +++ b/scripts/loot/lootItems/re_junk/wiring_black.py @@ -0,0 +1,36 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [2] + +def reverse_engineering_name(): + + return 'Black' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/npc_loot/blue_wiring_generic.py b/scripts/loot/lootItems/re_junk/wiring_blue.py similarity index 59% rename from scripts/loot/lootItems/npc_loot/blue_wiring_generic.py rename to scripts/loot/lootItems/re_junk/wiring_blue.py index d7096aba..0190a3b8 100644 --- a/scripts/loot/lootItems/npc_loot/blue_wiring_generic.py +++ b/scripts/loot/lootItems/re_junk/wiring_blue.py @@ -1,15 +1,24 @@ + def itemTemplate(): return ['object/tangible/loot/npc_loot/shared_blue_wiring_generic.iff'] + +def customItemName(): + return 'Wiring' + def stackable(): return 1 +def reverse_engineering_name(): + + return 'Blue' + def junkDealerPrice(): - return 28 + return 12 def junkType(): - return 0 \ No newline at end of file + return 0 diff --git a/scripts/loot/lootItems/re_junk/wiring_green.py b/scripts/loot/lootItems/re_junk/wiring_green.py new file mode 100644 index 00000000..6646dd97 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/wiring_green.py @@ -0,0 +1,35 @@ +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [14] + +def reverse_engineering_name(): + + return 'Green' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/re_junk/wiring_orange.py b/scripts/loot/lootItems/re_junk/wiring_orange.py new file mode 100644 index 00000000..678b5e77 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/wiring_orange.py @@ -0,0 +1,35 @@ +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [6] + +def reverse_engineering_name(): + + return 'Orange' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/re_junk/wiring_purple.py b/scripts/loot/lootItems/re_junk/wiring_purple.py new file mode 100644 index 00000000..b53c4e6a --- /dev/null +++ b/scripts/loot/lootItems/re_junk/wiring_purple.py @@ -0,0 +1,36 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [29] + +def reverse_engineering_name(): + + return 'Purple' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/re_junk/wiring_red_yellow.py b/scripts/loot/lootItems/re_junk/wiring_red_yellow.py new file mode 100644 index 00000000..88fd2f59 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/wiring_red_yellow.py @@ -0,0 +1,36 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [13] #not correct + +def reverse_engineering_name(): + + return 'Red/Yellow' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/re_junk/wiring_teal.py b/scripts/loot/lootItems/re_junk/wiring_teal.py new file mode 100644 index 00000000..10809917 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/wiring_teal.py @@ -0,0 +1,36 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [25] + +def reverse_engineering_name(): + + return 'Teal' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/re_junk/wiring_white.py b/scripts/loot/lootItems/re_junk/wiring_white.py new file mode 100644 index 00000000..64b57002 --- /dev/null +++ b/scripts/loot/lootItems/re_junk/wiring_white.py @@ -0,0 +1,36 @@ + +def itemTemplate(): + + return ['object/tangible/loot/npc_loot/shared_wiring_generic.iff'] + +def customItemName(): + + return 'Wiring' + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + + return ['/private/index_color_1'] + +def customizationValues(): + + return [1] + +def reverse_engineering_name(): + + return 'White' + +def stackable(): + + return 1 + +def junkDealerPrice(): + + return 12 + +def junkType(): + + return 0 diff --git a/scripts/loot/lootItems/junk/worklight_generic.py b/scripts/loot/lootItems/re_junk/worklight_generic.py similarity index 100% rename from scripts/loot/lootItems/junk/worklight_generic.py rename to scripts/loot/lootItems/re_junk/worklight_generic.py diff --git a/scripts/loot/lootPools/corellia/re_junk_chirq_council_cavalier.py b/scripts/loot/lootPools/corellia/re_junk_chirq_council_cavalier.py new file mode 100644 index 00000000..4946215a --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_chirq_council_cavalier.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_chirq_council_chemist.py b/scripts/loot/lootPools/corellia/re_junk_chirq_council_chemist.py new file mode 100644 index 00000000..4946215a --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_chirq_council_chemist.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_chirq_council_mechanized_guardian.py b/scripts/loot/lootPools/corellia/re_junk_chirq_council_mechanized_guardian.py new file mode 100644 index 00000000..d7800214 --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_chirq_council_mechanized_guardian.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['explosive_dud','hyperdrive_unit','unidentified_serum_vial'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_chirq_council_sentinel.py b/scripts/loot/lootPools/corellia/re_junk_chirq_council_sentinel.py new file mode 100644 index 00000000..4946215a --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_chirq_council_sentinel.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_chirq_council_vanquisher.py b/scripts/loot/lootPools/corellia/re_junk_chirq_council_vanquisher.py new file mode 100644 index 00000000..4946215a --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_chirq_council_vanquisher.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_chirq_council_watcher.py b/scripts/loot/lootPools/corellia/re_junk_chirq_council_watcher.py new file mode 100644 index 00000000..4946215a --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_chirq_council_watcher.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_crale_forte.py b/scripts/loot/lootPools/corellia/re_junk_crale_forte.py new file mode 100644 index 00000000..4946215a --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_crale_forte.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_dain_pax.py b/scripts/loot/lootPools/corellia/re_junk_dain_pax.py new file mode 100644 index 00000000..4946215a --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_dain_pax.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_koran_lassk.py b/scripts/loot/lootPools/corellia/re_junk_koran_lassk.py new file mode 100644 index 00000000..4946215a --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_koran_lassk.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_markus_gilder.py b/scripts/loot/lootPools/corellia/re_junk_markus_gilder.py new file mode 100644 index 00000000..4946215a --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_markus_gilder.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_mathazar_zayet.py b/scripts/loot/lootPools/corellia/re_junk_mathazar_zayet.py new file mode 100644 index 00000000..4946215a --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_mathazar_zayet.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_meatlump_fool.py b/scripts/loot/lootPools/corellia/re_junk_meatlump_fool.py new file mode 100644 index 00000000..9dd97d3f --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_meatlump_fool.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['explosive_dud','hyperdrive_unit'] + +def itemChances(): + + return [50,50] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_ragtag_kook.py b/scripts/loot/lootPools/corellia/re_junk_ragtag_kook.py new file mode 100644 index 00000000..4a9e0477 --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_ragtag_kook.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['impulse_detector','launcher_tube','ledger','magseal_detector'] + +def itemChances(): + + return [25,25,25,25] \ No newline at end of file diff --git a/scripts/loot/lootPools/corellia/re_junk_rallynn_secura.py b/scripts/loot/lootPools/corellia/re_junk_rallynn_secura.py new file mode 100644 index 00000000..4946215a --- /dev/null +++ b/scripts/loot/lootPools/corellia/re_junk_rallynn_secura.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/dantooine/re_junk_dantari_battlelord.py b/scripts/loot/lootPools/dantooine/re_junk_dantari_battlelord.py new file mode 100644 index 00000000..a4167509 --- /dev/null +++ b/scripts/loot/lootPools/dantooine/re_junk_dantari_battlelord.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['circuit','differential_regulator','droid_motor_yellow','mark_v_vocab_module','wiring_purple'] + +def itemChances(): + + return [20,20,20,20,20] \ No newline at end of file diff --git a/scripts/loot/lootPools/dantooine/re_junk_dantari_chief.py b/scripts/loot/lootPools/dantooine/re_junk_dantari_chief.py new file mode 100644 index 00000000..f0a52641 --- /dev/null +++ b/scripts/loot/lootPools/dantooine/re_junk_dantari_chief.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor'] + +def itemChances(): + + return [60,40] \ No newline at end of file diff --git a/scripts/loot/lootPools/dantooine/re_junk_dantari_raider.py b/scripts/loot/lootPools/dantooine/re_junk_dantari_raider.py new file mode 100644 index 00000000..ca4042dd --- /dev/null +++ b/scripts/loot/lootPools/dantooine/re_junk_dantari_raider.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','motor','software_module','unpowered_survey_pad'] + +def itemChances(): + + return [25,25,25,25] \ No newline at end of file diff --git a/scripts/loot/lootPools/dantooine/re_junk_dantari_stragetist.py b/scripts/loot/lootPools/dantooine/re_junk_dantari_stragetist.py new file mode 100644 index 00000000..078c9a54 --- /dev/null +++ b/scripts/loot/lootPools/dantooine/re_junk_dantari_stragetist.py @@ -0,0 +1,7 @@ +def itemNames(): + + return ['unpowered_survey_pad'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/dantooine/re_junk_kunga_scout.py b/scripts/loot/lootPools/dantooine/re_junk_kunga_scout.py new file mode 100644 index 00000000..078c9a54 --- /dev/null +++ b/scripts/loot/lootPools/dantooine/re_junk_kunga_scout.py @@ -0,0 +1,7 @@ +def itemNames(): + + return ['unpowered_survey_pad'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/dantooine/re_junk_mokk_clan_primalist.py b/scripts/loot/lootPools/dantooine/re_junk_mokk_clan_primalist.py new file mode 100644 index 00000000..ebb5cdc2 --- /dev/null +++ b/scripts/loot/lootPools/dantooine/re_junk_mokk_clan_primalist.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['rations_kit'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/dantooine/re_junk_mokk_rockshaper.py b/scripts/loot/lootPools/dantooine/re_junk_mokk_rockshaper.py new file mode 100644 index 00000000..bdd6680f --- /dev/null +++ b/scripts/loot/lootPools/dantooine/re_junk_mokk_rockshaper.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/dantooine/re_junk_mokk_scout.py b/scripts/loot/lootPools/dantooine/re_junk_mokk_scout.py new file mode 100644 index 00000000..2a4d7c6c --- /dev/null +++ b/scripts/loot/lootPools/dantooine/re_junk_mokk_scout.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['motor','used_id_chip'] + +def itemChances(): + + return [50,50] \ No newline at end of file diff --git a/scripts/loot/lootPools/dantooine/re_junk_mokk_warrior.py b/scripts/loot/lootPools/dantooine/re_junk_mokk_warrior.py new file mode 100644 index 00000000..a1342593 --- /dev/null +++ b/scripts/loot/lootPools/dantooine/re_junk_mokk_warrior.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','motor'] + +def itemChances(): + + return [50,50] \ No newline at end of file diff --git a/scripts/loot/lootPools/dantooine/re_junk_rogue_droid.py b/scripts/loot/lootPools/dantooine/re_junk_rogue_droid.py new file mode 100644 index 00000000..803baf78 --- /dev/null +++ b/scripts/loot/lootPools/dantooine/re_junk_rogue_droid.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['aeromagnifier','comlink',control_box','droid_motor_red'] + +def itemChances(): + + return [28,16,28,28] \ No newline at end of file diff --git a/scripts/loot/lootPools/dantooine/re_junk_scientist_warren.py b/scripts/loot/lootPools/dantooine/re_junk_scientist_warren.py new file mode 100644 index 00000000..5926cec5 --- /dev/null +++ b/scripts/loot/lootPools/dantooine/re_junk_scientist_warren.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','control_box','medical_device','motor','power_output_analyzer','survival_gear','used_notebook'] + +def itemChances(): + + return [20,10,20,20,10,10,10] \ No newline at end of file diff --git a/scripts/loot/lootPools/dathomir/re_junk_nightsister_initiate.py b/scripts/loot/lootPools/dathomir/re_junk_nightsister_initiate.py new file mode 100644 index 00000000..5589880a --- /dev/null +++ b/scripts/loot/lootPools/dathomir/re_junk_nightsister_initiate.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['armor_repair_device','chassis_blueprints','dented_metal_case','medical_console','medical_device','motor','software_module','worklight'] + +def itemChances(): + + return [10,15,15,10,15,10,15,10] \ No newline at end of file diff --git a/scripts/loot/lootPools/dathomir/re_junk_nightsister_protector.py b/scripts/loot/lootPools/dathomir/re_junk_nightsister_protector.py new file mode 100644 index 00000000..d1fc69da --- /dev/null +++ b/scripts/loot/lootPools/dathomir/re_junk_nightsister_protector.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['armor_repair_device','chassis_blueprints','medical_console','medical_device','motor','software_module','worklight'] + +def itemChances(): + + return [10,20,10,20,10,20,10] \ No newline at end of file diff --git a/scripts/loot/lootPools/dathomir/re_junk_nightsister_rancor_tamer.py b/scripts/loot/lootPools/dathomir/re_junk_nightsister_rancor_tamer.py new file mode 100644 index 00000000..5589880a --- /dev/null +++ b/scripts/loot/lootPools/dathomir/re_junk_nightsister_rancor_tamer.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['armor_repair_device','chassis_blueprints','dented_metal_case','medical_console','medical_device','motor','software_module','worklight'] + +def itemChances(): + + return [10,15,15,10,15,10,15,10] \ No newline at end of file diff --git a/scripts/loot/lootPools/dathomir/re_junk_nightsister_ranger.py b/scripts/loot/lootPools/dathomir/re_junk_nightsister_ranger.py new file mode 100644 index 00000000..def27446 --- /dev/null +++ b/scripts/loot/lootPools/dathomir/re_junk_nightsister_ranger.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['armor_repair_device','chassis_blueprints','dented_metal_case','medical_device','worklight'] + +def itemChances(): + + return [12,22,22,22,22] \ No newline at end of file diff --git a/scripts/loot/lootPools/dathomir/re_junk_nightsister_sentinel.py b/scripts/loot/lootPools/dathomir/re_junk_nightsister_sentinel.py new file mode 100644 index 00000000..51f0f739 --- /dev/null +++ b/scripts/loot/lootPools/dathomir/re_junk_nightsister_sentinel.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','medical_device','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/dathomir/re_junk_nightsister_sentry.py b/scripts/loot/lootPools/dathomir/re_junk_nightsister_sentry.py new file mode 100644 index 00000000..768fbccc --- /dev/null +++ b/scripts/loot/lootPools/dathomir/re_junk_nightsister_sentry.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['armor_repair_device','chassis_blueprints','dented_metal_case','medical_console',medical_device','motor','software_module','speederdrive'] + +def itemChances(): + + return [5,15,15,5,15,15,15,15] \ No newline at end of file diff --git a/scripts/loot/lootPools/dathomir/re_junk_nightsister_slave.py b/scripts/loot/lootPools/dathomir/re_junk_nightsister_slave.py new file mode 100644 index 00000000..c780235a --- /dev/null +++ b/scripts/loot/lootPools/dathomir/re_junk_nightsister_slave.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','medical_console','medical_device','software_module','speederdrive'] + +def itemChances(): + + return [20,20,20,20,20] \ No newline at end of file diff --git a/scripts/loot/lootPools/dathomir/re_junk_nightsister_stalker.py b/scripts/loot/lootPools/dathomir/re_junk_nightsister_stalker.py new file mode 100644 index 00000000..5589880a --- /dev/null +++ b/scripts/loot/lootPools/dathomir/re_junk_nightsister_stalker.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['armor_repair_device','chassis_blueprints','dented_metal_case','medical_console','medical_device','motor','software_module','worklight'] + +def itemChances(): + + return [10,15,15,10,15,10,15,10] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_archaic_jinda_ritualist.py b/scripts/loot/lootPools/endor/re_junk_archaic_jinda_ritualist.py new file mode 100644 index 00000000..dd4db679 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_archaic_jinda_ritualist.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['clothing_repair_device'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_battle_droid.py b/scripts/loot/lootPools/endor/re_junk_battle_droid.py new file mode 100644 index 00000000..ca2ced7f --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_battle_droid.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['datapad','locomotor','mark_v_circuit_board','mark_x_vocab_module','wiring_red_yellow'] + +def itemChances(): + + return [20,20,20,20,20] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_blacksun_assassin.py b/scripts/loot/lootPools/endor/re_junk_blacksun_assassin.py new file mode 100644 index 00000000..72b1f9c2 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_blacksun_assassin.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','used_vidscreen'] + +def itemChances(): + + return [50,50] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_blacksun_guard.py b/scripts/loot/lootPools/endor/re_junk_blacksun_guard.py new file mode 100644 index 00000000..052d5fd9 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_blacksun_guard.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','medical_device','motor'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_blacksun_henchman.py b/scripts/loot/lootPools/endor/re_junk_blacksun_henchman.py new file mode 100644 index 00000000..79cba640 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_blacksun_henchman.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','medical_device','motor','power_output_device','used_viscreen'] + +def itemChances(): + + return [20,20,20,20,20] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_blacksun_thug.py b/scripts/loot/lootPools/endor/re_junk_blacksun_thug.py new file mode 100644 index 00000000..a1342593 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_blacksun_thug.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','motor'] + +def itemChances(): + + return [50,50] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_death_watch_bloodguard.py b/scripts/loot/lootPools/endor/re_junk_death_watch_bloodguard.py new file mode 100644 index 00000000..a45b3486 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_death_watch_bloodguard.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','circuit_board','collapsed_artifact','power_output_device','software_module'] + +def itemChances(): + + return [20,20,20,20,20] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_death_watch_ghost.py b/scripts/loot/lootPools/endor/re_junk_death_watch_ghost.py new file mode 100644 index 00000000..005c98fc --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_death_watch_ghost.py @@ -0,0 +1,7 @@ +def itemNames(): + + return ['software_module'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_death_watch_wraith.py b/scripts/loot/lootPools/endor/re_junk_death_watch_wraith.py new file mode 100644 index 00000000..72b1f9c2 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_death_watch_wraith.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','used_vidscreen'] + +def itemChances(): + + return [50,50] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_hardened_jinda_worker.py b/scripts/loot/lootPools/endor/re_junk_hardened_jinda_worker.py new file mode 100644 index 00000000..fa7b7839 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_hardened_jinda_worker.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','medical_device','motor','used_id_chip'] + +def itemChances(): + + return [25,25,25,25] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_jinda_cub.py b/scripts/loot/lootPools/endor/re_junk_jinda_cub.py new file mode 100644 index 00000000..12b34f36 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_jinda_cub.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','medical_device','motor','unpowered_survey_pad','used_id_chip'] + +def itemChances(): + + return [20,20,20,20,20] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_jinda_elder.py b/scripts/loot/lootPools/endor/re_junk_jinda_elder.py new file mode 100644 index 00000000..052d5fd9 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_jinda_elder.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','medical_device','motor'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_jinda_elder_worker.py b/scripts/loot/lootPools/endor/re_junk_jinda_elder_worker.py new file mode 100644 index 00000000..1e3da706 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_jinda_elder_worker.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','software_module','used_id_chip'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_jinda_matriarch.py b/scripts/loot/lootPools/endor/re_junk_jinda_matriarch.py new file mode 100644 index 00000000..005c98fc --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_jinda_matriarch.py @@ -0,0 +1,7 @@ +def itemNames(): + + return ['software_module'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_jinda_rigualist.py b/scripts/loot/lootPools/endor/re_junk_jinda_rigualist.py new file mode 100644 index 00000000..bdd6680f --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_jinda_rigualist.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_jinda_shaman.py b/scripts/loot/lootPools/endor/re_junk_jinda_shaman.py new file mode 100644 index 00000000..bdd6680f --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_jinda_shaman.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_jinda_tribesman.py b/scripts/loot/lootPools/endor/re_junk_jinda_tribesman.py new file mode 100644 index 00000000..773b30c7 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_jinda_tribesman.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','rations_kit','software_module'] + +def itemChances(): + + return [25,25,25,25] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_jinda_veteran.py b/scripts/loot/lootPools/endor/re_junk_jinda_veteran.py new file mode 100644 index 00000000..ca4042dd --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_jinda_veteran.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','motor','software_module','unpowered_survey_pad'] + +def itemChances(): + + return [25,25,25,25] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_jinda_warrior.py b/scripts/loot/lootPools/endor/re_junk_jinda_warrior.py new file mode 100644 index 00000000..8617e7d9 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_jinda_warrior.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['clothing_repair_device','motor'] + +def itemChances(): + + return [40,60] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_jinda_worker.py b/scripts/loot/lootPools/endor/re_junk_jinda_worker.py new file mode 100644 index 00000000..fa7b7839 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_jinda_worker.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','medical_device','motor','used_id_chip'] + +def itemChances(): + + return [25,25,25,25] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_masterfull_jinda_warrior.py b/scripts/loot/lootPools/endor/re_junk_masterfull_jinda_warrior.py new file mode 100644 index 00000000..c8ae8122 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_masterfull_jinda_warrior.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','clothing_repair_device','medical_device','motor','software_module','unpowered_survey_pad'] + +def itemChances(): + + return [21,8,21,21,21,8] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_miner.py b/scripts/loot/lootPools/endor/re_junk_miner.py new file mode 100644 index 00000000..0c1f49a0 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_miner.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['motor'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_r3_h1.py b/scripts/loot/lootPools/endor/re_junk_r3_h1.py new file mode 100644 index 00000000..2adfc7fb --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_r3_h1.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['comlink','outdated_aeromagnifier','wiring_black'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_seasond_jinda_warrior.py b/scripts/loot/lootPools/endor/re_junk_seasond_jinda_warrior.py new file mode 100644 index 00000000..6a149503 --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_seasond_jinda_warrior.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['laser_trap','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_skilled_jinda_worker.py b/scripts/loot/lootPools/endor/re_junk_skilled_jinda_worker.py new file mode 100644 index 00000000..4946215a --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_skilled_jinda_worker.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','motor','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_super_battle_droid.py b/scripts/loot/lootPools/endor/re_junk_super_battle_droid.py new file mode 100644 index 00000000..ca2ced7f --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_super_battle_droid.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['datapad','locomotor','mark_v_circuit_board','mark_x_vocab_module','wiring_red_yellow'] + +def itemChances(): + + return [20,20,20,20,20] \ No newline at end of file diff --git a/scripts/loot/lootPools/endor/re_junk_technician.py b/scripts/loot/lootPools/endor/re_junk_technician.py new file mode 100644 index 00000000..bdd6680f --- /dev/null +++ b/scripts/loot/lootPools/endor/re_junk_technician.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/kashyyyk/re_junk_feral_wookiee.py b/scripts/loot/lootPools/kashyyyk/re_junk_feral_wookiee.py new file mode 100644 index 00000000..8b06ac40 --- /dev/null +++ b/scripts/loot/lootPools/kashyyyk/re_junk_feral_wookiee.py @@ -0,0 +1,7 @@ +def itemNames(): + + return ['tubing','used_wiring','worklight'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/lok/re_junk_droid_cave_droideka.py b/scripts/loot/lootPools/lok/re_junk_droid_cave_droideka.py new file mode 100644 index 00000000..2956ba88 --- /dev/null +++ b/scripts/loot/lootPools/lok/re_junk_droid_cave_droideka.py @@ -0,0 +1,7 @@ +def itemNames(): + + return ['restraining_device','self_analysis_circuit','weak_droid_battery','wire_element','wiring_green'] + +def itemChances(): + + return [20,20,20,20,20] \ No newline at end of file diff --git a/scripts/loot/lootPools/lok/re_junk_droideka.py b/scripts/loot/lootPools/lok/re_junk_droideka.py new file mode 100644 index 00000000..4b69dfee --- /dev/null +++ b/scripts/loot/lootPools/lok/re_junk_droideka.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['droid_battery_teal','rapid_program_module','servo_joint','vocabulator','wiring_blue'] + +def itemChances(): + + return [20,20,20,20,20] \ No newline at end of file diff --git a/scripts/loot/lootPools/lok/re_junk_ig_assassin_droid.py b/scripts/loot/lootPools/lok/re_junk_ig_assassin_droid.py new file mode 100644 index 00000000..f362fc1c --- /dev/null +++ b/scripts/loot/lootPools/lok/re_junk_ig_assassin_droid.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['droid_battery_black_green','emergency_reactivator','remote_transmitter','tranceiver','wiring_white'] + +def itemChances(): + + return [20,20,20,20,20] \ No newline at end of file diff --git a/scripts/loot/lootPools/mustafar/re_junk_ancient_patrol_droid.py b/scripts/loot/lootPools/mustafar/re_junk_ancient_patrol_droid.py new file mode 100644 index 00000000..10d9fbeb --- /dev/null +++ b/scripts/loot/lootPools/mustafar/re_junk_ancient_patrol_droid.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['damaged_droid_memory_unit','damaged_droid_motivator''damaged_droid_power_cell','damaged_droid_swivel_joint'] + +def itemChances(): + return [25,25,25,25] + \ No newline at end of file diff --git a/scripts/loot/lootPools/naboo/re_junk_borvo_brigand.py b/scripts/loot/lootPools/naboo/re_junk_borvo_brigand.py new file mode 100644 index 00000000..add836e7 --- /dev/null +++ b/scripts/loot/lootPools/naboo/re_junk_borvo_brigand.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['explosive_dud','hyperdrive_unit','shield_module','unidentified_serum_vial'] + +def itemChances(): + + return [25,25,25,25] \ No newline at end of file diff --git a/scripts/loot/lootPools/naboo/re_junk_borvo_thug.py b/scripts/loot/lootPools/naboo/re_junk_borvo_thug.py new file mode 100644 index 00000000..add836e7 --- /dev/null +++ b/scripts/loot/lootPools/naboo/re_junk_borvo_thug.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['explosive_dud','hyperdrive_unit','shield_module','unidentified_serum_vial'] + +def itemChances(): + + return [25,25,25,25] \ No newline at end of file diff --git a/scripts/loot/lootPools/naboo/re_junk_mechtorian.py b/scripts/loot/lootPools/naboo/re_junk_mechtorian.py new file mode 100644 index 00000000..eb5cde22 --- /dev/null +++ b/scripts/loot/lootPools/naboo/re_junk_mechtorian.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['hyperdrive_unit','shield_module','unidentified_serum_vial'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/naboo/re_junk_naboo_droids.py b/scripts/loot/lootPools/naboo/re_junk_naboo_droids.py new file mode 100644 index 00000000..5ba42d70 --- /dev/null +++ b/scripts/loot/lootPools/naboo/re_junk_naboo_droids.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['burnt_out_droid_motor','data_housing',',demagnetized_datadisk','unpowered_memory_encryptor','wiring_orange'] + +def itemChances(): + + return [20,20,20,20,20] \ No newline at end of file diff --git a/scripts/loot/lootPools/naboo/re_junk_old_republic_droideka.py b/scripts/loot/lootPools/naboo/re_junk_old_republic_droideka.py new file mode 100644 index 00000000..87498646 --- /dev/null +++ b/scripts/loot/lootPools/naboo/re_junk_old_republic_droideka.py @@ -0,0 +1,7 @@ +def itemNames(): + + return ['unpowered_memory_encryptor'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/naboo/re_junk_stonewall_lc_92_antagonist.py b/scripts/loot/lootPools/naboo/re_junk_stonewall_lc_92_antagonist.py new file mode 100644 index 00000000..eb5cde22 --- /dev/null +++ b/scripts/loot/lootPools/naboo/re_junk_stonewall_lc_92_antagonist.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['hyperdrive_unit','shield_module','unidentified_serum_vial'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/naboo/re_junk_stonewall_swl_5_overseer.py b/scripts/loot/lootPools/naboo/re_junk_stonewall_swl_5_overseer.py new file mode 100644 index 00000000..de2545e2 --- /dev/null +++ b/scripts/loot/lootPools/naboo/re_junk_stonewall_swl_5_overseer.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['shield_module','unidentified_serum_vial'] + +def itemChances(): + + return [50,50] \ No newline at end of file diff --git a/scripts/loot/lootPools/naboo/re_junk_stonewall_zh_28_guard.py b/scripts/loot/lootPools/naboo/re_junk_stonewall_zh_28_guard.py new file mode 100644 index 00000000..eb5cde22 --- /dev/null +++ b/scripts/loot/lootPools/naboo/re_junk_stonewall_zh_28_guard.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['hyperdrive_unit','shield_module','unidentified_serum_vial'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/naboo/re_junk_terrorist.py b/scripts/loot/lootPools/naboo/re_junk_terrorist.py new file mode 100644 index 00000000..add836e7 --- /dev/null +++ b/scripts/loot/lootPools/naboo/re_junk_terrorist.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['explosive_dud','hyperdrive_unit','shield_module','unidentified_serum_vial'] + +def itemChances(): + + return [25,25,25,25] \ No newline at end of file diff --git a/scripts/loot/lootPools/ord_mantell/re_junk_droid.py b/scripts/loot/lootPools/ord_mantell/re_junk_droid.py new file mode 100644 index 00000000..a128befe --- /dev/null +++ b/scripts/loot/lootPools/ord_mantell/re_junk_droid.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['droid_memory_module'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/ord_mantell/re_junk_hutt.py b/scripts/loot/lootPools/ord_mantell/re_junk_hutt.py new file mode 100644 index 00000000..9ea5fecb --- /dev/null +++ b/scripts/loot/lootPools/ord_mantell/re_junk_hutt.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['canceled_travel_ticket'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/ord_mantell/re_junk_ord_blacksun_slicer.py b/scripts/loot/lootPools/ord_mantell/re_junk_ord_blacksun_slicer.py new file mode 100644 index 00000000..433d2bec --- /dev/null +++ b/scripts/loot/lootPools/ord_mantell/re_junk_ord_blacksun_slicer.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['holorecorder','newsfilter_module'] + +def itemChances(): + + return [50,50] \ No newline at end of file diff --git a/scripts/loot/lootPools/ord_mantell/re_junk_ord_genesis_red.py b/scripts/loot/lootPools/ord_mantell/re_junk_ord_genesis_red.py new file mode 100644 index 00000000..b37d7753 --- /dev/null +++ b/scripts/loot/lootPools/ord_mantell/re_junk_ord_genesis_red.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['palm_diary'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/ord_mantell/re_junk_ord_master_level_slicer.py b/scripts/loot/lootPools/ord_mantell/re_junk_ord_master_level_slicer.py new file mode 100644 index 00000000..433d2bec --- /dev/null +++ b/scripts/loot/lootPools/ord_mantell/re_junk_ord_master_level_slicer.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['holorecorder','newsfilter_module'] + +def itemChances(): + + return [50,50] \ No newline at end of file diff --git a/scripts/loot/lootPools/powercrystals_hiq.py b/scripts/loot/lootPools/powercrystals_hiq.py index 63d33a9b..52dadfb8 100644 --- a/scripts/loot/lootPools/powercrystals_hiq.py +++ b/scripts/loot/lootPools/powercrystals_hiq.py @@ -1,6 +1,6 @@ def itemNames(): - return ['powercrystal_premium','powercrystal_flawless','powercrystal_perfect'] + return ['powercrystal_select', 'powercrystal_premium', 'powercrystal_flawless'] def itemChances(): - return [94,5,1] #= 100% \ No newline at end of file + return [75, 20, 5] #= 100% \ No newline at end of file diff --git a/scripts/loot/lootPools/re_junk.py b/scripts/loot/lootPools/re_junk.py new file mode 100644 index 00000000..ef757825 --- /dev/null +++ b/scripts/loot/lootPools/re_junk.py @@ -0,0 +1,15 @@ + +def itemNames(): + + templates=['damaged_datapad','red_wiring','worklight_generic','antenna','brain','eye','gland','heart','stomach','armor_repair_device'] #10 + templates=templates+['brain','chassis_blueprint','comlink','explosive_dud','hyperdrive_unit','id_chip','impulse_detector','laser_trap'] #8 + templates=templates+['launcher_tube','ledger','magseal_detector','medical_console','medical_device','motor','power_output_analyzer','shield_module'] #8 + templates=templates+['software_module','survival_gear','underpowered_survey_pad','unidentified_serum_vial','used_notebook','weak_droid_battery'] #6 + return templates + +def itemChances(): + chances=[3.125,3.125,3.125,3.125,3.125,3.125,3.125,3.125] + chances=chances+[3.125,3.125,3.125,3.125,3.125,3.125,3.125,3.125] + chances=chances+[3.125,3.125,3.125,3.125,3.125,3.125,3.125,3.125] + chances=chances+[3.125,3.125,3.125,3.125,3.125,3.125,3.125,3.125] + return chances #32 \ No newline at end of file diff --git a/scripts/loot/lootPools/re_junk_generic.py b/scripts/loot/lootPools/re_junk_generic.py new file mode 100644 index 00000000..881802bc --- /dev/null +++ b/scripts/loot/lootPools/re_junk_generic.py @@ -0,0 +1,9 @@ + +def itemNames(): + + return ['small_mining_tool','circuitry','electronics_module','frequency_jamming_wire','unpowered_installation_repair_device', + 'wiring_teal'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_aakuan_follower.py b/scripts/loot/lootPools/talus/re_junk_aakuan_follower.py new file mode 100644 index 00000000..601b04d2 --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_aakuan_follower.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['motor','software_module'] + +def itemChances(): + + return [50,50] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_aakuan_guardian.py b/scripts/loot/lootPools/talus/re_junk_aakuan_guardian.py new file mode 100644 index 00000000..e6e5b6be --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_aakuan_guardian.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chemical_dispersion_unit','power_output_analyzer','software_module'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_aakuan_steward.py b/scripts/loot/lootPools/talus/re_junk_aakuan_steward.py new file mode 100644 index 00000000..bdd6680f --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_aakuan_steward.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_aakuan_warder.py b/scripts/loot/lootPools/talus/re_junk_aakuan_warder.py new file mode 100644 index 00000000..f5072afa --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_aakuan_warder.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['medical_device','software_module'] + +def itemChances(): + + return [50,50] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_confident_rebel_guard.py b/scripts/loot/lootPools/talus/re_junk_confident_rebel_guard.py new file mode 100644 index 00000000..a31ccd7c --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_confident_rebel_guard.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chemical_dispersion_unit'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_crack_rebel_riflemen.py b/scripts/loot/lootPools/talus/re_junk_crack_rebel_riflemen.py new file mode 100644 index 00000000..a31ccd7c --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_crack_rebel_riflemen.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chemical_dispersion_unit'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_elite_rebel_commando.py b/scripts/loot/lootPools/talus/re_junk_elite_rebel_commando.py new file mode 100644 index 00000000..933bd31b --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_elite_rebel_commando.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chemical_dispersion_unit','motor'] + +def itemChances(): + + return [40,60] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_grizzled_rebel_colonel.py b/scripts/loot/lootPools/talus/re_junk_grizzled_rebel_colonel.py new file mode 100644 index 00000000..a31ccd7c --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_grizzled_rebel_colonel.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chemical_dispersion_unit'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_grizzled_rebel_liberator.py b/scripts/loot/lootPools/talus/re_junk_grizzled_rebel_liberator.py new file mode 100644 index 00000000..a31ccd7c --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_grizzled_rebel_liberator.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chemical_dispersion_unit'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_rebel_elite_heavy_trooper.py b/scripts/loot/lootPools/talus/re_junk_rebel_elite_heavy_trooper.py new file mode 100644 index 00000000..1acc8030 --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_rebel_elite_heavy_trooper.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chemical_dispersion_unit','mark_x_vocab_module'] + +def itemChances(): + + return [40,60] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_rebel_weapons_master.py b/scripts/loot/lootPools/talus/re_junk_rebel_weapons_master.py new file mode 100644 index 00000000..a31ccd7c --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_rebel_weapons_master.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chemical_dispersion_unit'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_skilled_rebel_officer.py b/scripts/loot/lootPools/talus/re_junk_skilled_rebel_officer.py new file mode 100644 index 00000000..ce51f98f --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_skilled_rebel_officer.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chemical_dispersion_unit','medical_device'] + +def itemChances(): + + return [40,60] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_strictful_rebel_sergeant.py b/scripts/loot/lootPools/talus/re_junk_strictful_rebel_sergeant.py new file mode 100644 index 00000000..4ff1691f --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_strictful_rebel_sergeant.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','chemical_dispersion_unit'] + +def itemChances(): + + return [60,40] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_talus_battle_droid.py b/scripts/loot/lootPools/talus/re_junk_talus_battle_droid.py new file mode 100644 index 00000000..9db0ede8 --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_talus_battle_droid.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['mark_v_circuit_board'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_watchful_rebel_guard.py b/scripts/loot/lootPools/talus/re_junk_watchful_rebel_guard.py new file mode 100644 index 00000000..40903384 --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_watchful_rebel_guard.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chemical_dispersion_unit','software_module'] + +def itemChances(): + + return [40,60] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_well_trained_elite_rebel_sand_rat.py b/scripts/loot/lootPools/talus/re_junk_well_trained_elite_rebel_sand_rat.py new file mode 100644 index 00000000..e278ad95 --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_well_trained_elite_rebel_sand_rat.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chemical_dispersion_unit','power_output_devoce'] + +def itemChances(): + + return [40,60] \ No newline at end of file diff --git a/scripts/loot/lootPools/talus/re_junk_well_trained_rebel_captain.py b/scripts/loot/lootPools/talus/re_junk_well_trained_rebel_captain.py new file mode 100644 index 00000000..4ff1691f --- /dev/null +++ b/scripts/loot/lootPools/talus/re_junk_well_trained_rebel_captain.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','chemical_dispersion_unit'] + +def itemChances(): + + return [60,40] \ No newline at end of file diff --git a/scripts/loot/lootPools/tatooine/re_junk_desert_swooper.py b/scripts/loot/lootPools/tatooine/re_junk_desert_swooper.py new file mode 100644 index 00000000..6d0e0122 --- /dev/null +++ b/scripts/loot/lootPools/tatooine/re_junk_desert_swooper.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['id_chip','impulse_detector','ledger','magseal_detector'] + +def itemChances(): + + return [25,25,25,25] \ No newline at end of file diff --git a/scripts/loot/lootPools/tatooine/re_junk_error_prone_battle_droid.py b/scripts/loot/lootPools/tatooine/re_junk_error_prone_battle_droid.py new file mode 100644 index 00000000..36ce03c0 --- /dev/null +++ b/scripts/loot/lootPools/tatooine/re_junk_error_prone_battle_droid.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['comlink','control_box','mark_i_circuit_board','outdated_aeromagnifier','wiring_black'] + +def itemChances(): + + return [22,22,16,22,16] \ No newline at end of file diff --git a/scripts/loot/lootPools/tatooine/re_junk_escaped_criminal.py b/scripts/loot/lootPools/tatooine/re_junk_escaped_criminal.py new file mode 100644 index 00000000..57fdc59d --- /dev/null +++ b/scripts/loot/lootPools/tatooine/re_junk_escaped_criminal.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['id_chip','ledger','magseal_detector'] + +def itemChances(): + + return [33,33,34] \ No newline at end of file diff --git a/scripts/loot/lootPools/tatooine/re_junk_exogen_class_dark_trooper.py b/scripts/loot/lootPools/tatooine/re_junk_exogen_class_dark_trooper.py new file mode 100644 index 00000000..3eeebfd2 --- /dev/null +++ b/scripts/loot/lootPools/tatooine/re_junk_exogen_class_dark_trooper.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['circuit','differential_regulator'] + +def itemChances(): + + return [50,50] \ No newline at end of file diff --git a/scripts/loot/lootPools/tatooine/re_junk_imperial_darktrooper.py b/scripts/loot/lootPools/tatooine/re_junk_imperial_darktrooper.py new file mode 100644 index 00000000..c22dc720 --- /dev/null +++ b/scripts/loot/lootPools/tatooine/re_junk_imperial_darktrooper.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['differential_regulator'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/tatooine/re_junk_shinn_guard.py b/scripts/loot/lootPools/tatooine/re_junk_shinn_guard.py new file mode 100644 index 00000000..5154a65f --- /dev/null +++ b/scripts/loot/lootPools/tatooine/re_junk_shinn_guard.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['id_chip'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/tatooine/re_junk_shinn_mugger.py b/scripts/loot/lootPools/tatooine/re_junk_shinn_mugger.py new file mode 100644 index 00000000..5154a65f --- /dev/null +++ b/scripts/loot/lootPools/tatooine/re_junk_shinn_mugger.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['id_chip'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/tatooine/re_junk_tusken_raider_soldier.py b/scripts/loot/lootPools/tatooine/re_junk_tusken_raider_soldier.py new file mode 100644 index 00000000..65021cd7 --- /dev/null +++ b/scripts/loot/lootPools/tatooine/re_junk_tusken_raider_soldier.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['ledger'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/tatooine/re_junk_tusken_raider_warrior.py b/scripts/loot/lootPools/tatooine/re_junk_tusken_raider_warrior.py new file mode 100644 index 00000000..65021cd7 --- /dev/null +++ b/scripts/loot/lootPools/tatooine/re_junk_tusken_raider_warrior.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['ledger'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/tatooine/re_junk_vaigon_shinn.py b/scripts/loot/lootPools/tatooine/re_junk_vaigon_shinn.py new file mode 100644 index 00000000..5154a65f --- /dev/null +++ b/scripts/loot/lootPools/tatooine/re_junk_vaigon_shinn.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['id_chip'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/tatooine/re_junk_valarian_depot_guard.py b/scripts/loot/lootPools/tatooine/re_junk_valarian_depot_guard.py new file mode 100644 index 00000000..4a9e0477 --- /dev/null +++ b/scripts/loot/lootPools/tatooine/re_junk_valarian_depot_guard.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['impulse_detector','launcher_tube','ledger','magseal_detector'] + +def itemChances(): + + return [25,25,25,25] \ No newline at end of file diff --git a/scripts/loot/lootPools/yavin_iv/re_junk_alert_droideka.py b/scripts/loot/lootPools/yavin_iv/re_junk_alert_droideka.py new file mode 100644 index 00000000..bc8c200b --- /dev/null +++ b/scripts/loot/lootPools/yavin_iv/re_junk_alert_droideka.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['droid_battery_purple_green','mark_vii_vocabulation_module','plugged_hydrolics_system','power_supply','wiring_white'] + +def itemChances(): + + return [20,20,20,20,20] \ No newline at end of file diff --git a/scripts/loot/lootPools/yavin_iv/re_junk_crazed_geonosian.py b/scripts/loot/lootPools/yavin_iv/re_junk_crazed_geonosian.py new file mode 100644 index 00000000..8f5de199 --- /dev/null +++ b/scripts/loot/lootPools/yavin_iv/re_junk_crazed_geonosian.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['armor_repair_device','dented_metal_case',medical_console','worklight'] + +def itemChances(): + + return [14,33,20,33] \ No newline at end of file diff --git a/scripts/loot/lootPools/yavin_iv/re_junk_imperial_observer.py b/scripts/loot/lootPools/yavin_iv/re_junk_imperial_observer.py new file mode 100644 index 00000000..87792303 --- /dev/null +++ b/scripts/loot/lootPools/yavin_iv/re_junk_imperial_observer.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['armor_repair_device'] + +def itemChances(): + + return [100] \ No newline at end of file diff --git a/scripts/loot/lootPools/yavin_iv/re_junk_yavin_blacksun_assassin.py b/scripts/loot/lootPools/yavin_iv/re_junk_yavin_blacksun_assassin.py new file mode 100644 index 00000000..68561623 --- /dev/null +++ b/scripts/loot/lootPools/yavin_iv/re_junk_yavin_blacksun_assassin.py @@ -0,0 +1,8 @@ + +def itemNames(): + + return ['chassis_blueprints','circuit_board','medical_console','motor','software_module','used_vidscreen'] + +def itemChances(): + + return [15,10,5,30,30,10] \ No newline at end of file diff --git a/scripts/loot/rarelootchestcontents/exceptionaltable.py b/scripts/loot/rarelootchestcontents/exceptionaltable.py index f652f0a4..9fece86c 100644 --- a/scripts/loot/rarelootchestcontents/exceptionaltable.py +++ b/scripts/loot/rarelootchestcontents/exceptionaltable.py @@ -28,21 +28,21 @@ def itemNames(): templates +=['ugnaught_costume_instructions','victory','wampa_costume_instructions','war_terminal'] templates +=['warriors honor','wookie_home_banner_kit','wookie_life_day_orb','xeno_couch'] templates +=['xeno_desk','xeno_desk_lamp','xeno_rug','xeno_table'] - + templates += ['powercrystal_perfect'] return templates def itemChances(): chances = [1.908,1.908,1.908,1.908,1.908,1.908,1.908,1.908,1.908,1.908] #27 Exceptionals chances += [1.908,1.908,1.908,1.908,1.908,1.908,1.908,1.908,1.908,1.908] chances += [1.908,1.908,1.908,1.908,1.908,1.908,1.908] - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] #76 Rares - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] - chances += [0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636,0.636] - chances += [0.636,0.636,0.636,0.636,0.636,0.784] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] #77 Rares + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629,0.629] + chances += [0.629,0.629,0.629,0.629,0.629,0.629,0.629] return chances \ No newline at end of file diff --git a/scripts/loot/rarelootchestcontents/legendarytable.py b/scripts/loot/rarelootchestcontents/legendarytable.py index c46a7855..6a082256 100644 --- a/scripts/loot/rarelootchestcontents/legendarytable.py +++ b/scripts/loot/rarelootchestcontents/legendarytable.py @@ -32,6 +32,7 @@ def itemNames(): templates +=['ugnaught_costume_instructions','victory','wampa_costume_instructions','war_terminal'] templates +=['warriors honor','wookie_home_banner_kit','wookie_life_day_orb','xeno_couch'] templates +=['xeno_desk','xeno_desk_lamp','xeno_rug','xeno_table'] + templates += ['powercrystal_perfect'] return templates def itemChances(): @@ -39,13 +40,13 @@ def itemChances(): chances += [1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25] #27 Exceptionals chances += [1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25,1.25] chances += [1.25,1.25,1.25,1.25,1.25,1.25,1.25] - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] #76 Rares - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] - chances += [0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625,0.625] - chances += [0.625,0.625,0.625,0.625,0.625,0.625] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] #77 Rares + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616,0.616] + chances += [0.616,0.616,0.616,0.616,0.616,0.616,0.616] return chances \ No newline at end of file diff --git a/scripts/loot/rarelootchestcontents/raretable.py b/scripts/loot/rarelootchestcontents/raretable.py index 8e049299..49014635 100644 --- a/scripts/loot/rarelootchestcontents/raretable.py +++ b/scripts/loot/rarelootchestcontents/raretable.py @@ -20,17 +20,18 @@ def itemNames(): items +=['ugnaught_costume_instructions','victory','wampa_costume_instructions','war_terminal'] items +=['warriors honor','wookie_home_banner_kit','wookie_life_day_orb','xeno_couch'] items +=['xeno_desk','xeno_desk_lamp','xeno_rug','xeno_table'] + items += ['powercrystal_perfect'] return items def itemChances(): - chances=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315,1.315] - chances+=[1.315,1.315,1.315,1.315,1.315,1.375] - return chances ##Sum must be exactly 100 76 items -> 1.315 + chances=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298,1.298] + chances+=[1.298,1.298,1.298,1.298,1.298,1.298,1.298] + return chances ##Sum must be exactly 100 77 items -> 1.298 \ No newline at end of file diff --git a/scripts/mobiles/corellia/acicular_defender.py b/scripts/mobiles/corellia/acicular_defender.py index 7968c64d..d09c4a29 100644 --- a/scripts/mobiles/corellia/acicular_defender.py +++ b/scripts/mobiles/corellia/acicular_defender.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("paralope") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/corellia/bageraset.py b/scripts/mobiles/corellia/bageraset.py index 314a5f27..34dd5ad8 100644 --- a/scripts/mobiles/corellia/bageraset.py +++ b/scripts/mobiles/corellia/bageraset.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(230) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(130) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(80) mobileTemplate.setSocialGroup("bageraset") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/bageraset_bruiser.py b/scripts/mobiles/corellia/bageraset_bruiser.py index aa6b32b8..da004eee 100644 --- a/scripts/mobiles/corellia/bageraset_bruiser.py +++ b/scripts/mobiles/corellia/bageraset_bruiser.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(230) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(130) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(80) mobileTemplate.setSocialGroup("bageraset") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/bloated_gubbur.py b/scripts/mobiles/corellia/bloated_gubbur.py index ffacfbe0..bb0b4c2d 100644 --- a/scripts/mobiles/corellia/bloated_gubbur.py +++ b/scripts/mobiles/corellia/bloated_gubbur.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(4) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(3) mobileTemplate.setSocialGroup("gubbur") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/blood_stained_prowler.py b/scripts/mobiles/corellia/blood_stained_prowler.py index 18dae272..8d5b037d 100644 --- a/scripts/mobiles/corellia/blood_stained_prowler.py +++ b/scripts/mobiles/corellia/blood_stained_prowler.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(70) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(40) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(35) mobileTemplate.setSocialGroup("wrix") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/canoid.py b/scripts/mobiles/corellia/canoid.py index 3eac5fc6..0c529a70 100644 --- a/scripts/mobiles/corellia/canoid.py +++ b/scripts/mobiles/corellia/canoid.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("canoid") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/canoid_hunter.py b/scripts/mobiles/corellia/canoid_hunter.py index d7f4addb..acc6a34b 100644 --- a/scripts/mobiles/corellia/canoid_hunter.py +++ b/scripts/mobiles/corellia/canoid_hunter.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("canoid") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/canoid_pack_leader.py b/scripts/mobiles/corellia/canoid_pack_leader.py index 6c0cbd80..05c90c58 100644 --- a/scripts/mobiles/corellia/canoid_pack_leader.py +++ b/scripts/mobiles/corellia/canoid_pack_leader.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("canoid") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/crazed_durni.py b/scripts/mobiles/corellia/crazed_durni.py index 016b30f7..b7d06ade 100644 --- a/scripts/mobiles/corellia/crazed_durni.py +++ b/scripts/mobiles/corellia/crazed_durni.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("durni") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/corellia/crimson_razor_cat.py b/scripts/mobiles/corellia/crimson_razor_cat.py index 5a302f46..78895d6b 100644 --- a/scripts/mobiles/corellia/crimson_razor_cat.py +++ b/scripts/mobiles/corellia/crimson_razor_cat.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("razor cat") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/deranged_wrix.py b/scripts/mobiles/corellia/deranged_wrix.py index 412ec288..b28a89e3 100644 --- a/scripts/mobiles/corellia/deranged_wrix.py +++ b/scripts/mobiles/corellia/deranged_wrix.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(55) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(25) mobileTemplate.setSocialGroup("wrix") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/dire_cat.py b/scripts/mobiles/corellia/dire_cat.py index 9f06ca34..fef2c811 100644 --- a/scripts/mobiles/corellia/dire_cat.py +++ b/scripts/mobiles/corellia/dire_cat.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("dire cat") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/corellia/diseased_vrelt.py b/scripts/mobiles/corellia/diseased_vrelt.py index f48f39b2..7ede71c1 100644 --- a/scripts/mobiles/corellia/diseased_vrelt.py +++ b/scripts/mobiles/corellia/diseased_vrelt.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(4) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("vrelt") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/diseased_vrelt_matriarch.py b/scripts/mobiles/corellia/diseased_vrelt_matriarch.py index 76b34b21..b5b10276 100644 --- a/scripts/mobiles/corellia/diseased_vrelt_matriarch.py +++ b/scripts/mobiles/corellia/diseased_vrelt_matriarch.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(10) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(10) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(10) mobileTemplate.setSocialGroup("vrelt") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/domestic_bageraset.py b/scripts/mobiles/corellia/domestic_bageraset.py index 6a32a763..ba128b91 100644 --- a/scripts/mobiles/corellia/domestic_bageraset.py +++ b/scripts/mobiles/corellia/domestic_bageraset.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(240) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(145) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(104) mobileTemplate.setSocialGroup("bageraset") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/domestic_humbaba.py b/scripts/mobiles/corellia/domestic_humbaba.py index 48271bc1..bfd126ee 100644 --- a/scripts/mobiles/corellia/domestic_humbaba.py +++ b/scripts/mobiles/corellia/domestic_humbaba.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(215) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(115) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(65) mobileTemplate.setSocialGroup("humbaba") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/domestic_krahbu.py b/scripts/mobiles/corellia/domestic_krahbu.py index 65f48a97..9b190673 100644 --- a/scripts/mobiles/corellia/domestic_krahbu.py +++ b/scripts/mobiles/corellia/domestic_krahbu.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(230) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(160) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(145) mobileTemplate.setSocialGroup("krahbu") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/durni.py b/scripts/mobiles/corellia/durni.py index 5a4e9200..b244ca8c 100644 --- a/scripts/mobiles/corellia/durni.py +++ b/scripts/mobiles/corellia/durni.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("durni") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/dwarf_gronda.py b/scripts/mobiles/corellia/dwarf_gronda.py index 79e74602..2da84193 100644 --- a/scripts/mobiles/corellia/dwarf_gronda.py +++ b/scripts/mobiles/corellia/dwarf_gronda.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(280) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(170) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(90) mobileTemplate.setSocialGroup("gronda") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/elder_gronda.py b/scripts/mobiles/corellia/elder_gronda.py index 4fed9dd4..c3fe8a86 100644 --- a/scripts/mobiles/corellia/elder_gronda.py +++ b/scripts/mobiles/corellia/elder_gronda.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(360) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(270) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("gronda") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/enraged_tabage_mother.py b/scripts/mobiles/corellia/enraged_tabage_mother.py index 15f2f795..6abbfa7c 100644 --- a/scripts/mobiles/corellia/enraged_tabage_mother.py +++ b/scripts/mobiles/corellia/enraged_tabage_mother.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(16) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(16) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(16) mobileTemplate.setSocialGroup("tagage") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/female_dire_cat.py b/scripts/mobiles/corellia/female_dire_cat.py index ed9323a7..b60dc0a3 100644 --- a/scripts/mobiles/corellia/female_dire_cat.py +++ b/scripts/mobiles/corellia/female_dire_cat.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("dire cat") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/corellia/female_forest_slice_hound.py b/scripts/mobiles/corellia/female_forest_slice_hound.py index 502d693c..5d7488a8 100644 --- a/scripts/mobiles/corellia/female_forest_slice_hound.py +++ b/scripts/mobiles/corellia/female_forest_slice_hound.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("slice hound forest") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/corellia/female_grassland_slice_hound.py b/scripts/mobiles/corellia/female_grassland_slice_hound.py index 03ab833b..b965eea1 100644 --- a/scripts/mobiles/corellia/female_grassland_slice_hound.py +++ b/scripts/mobiles/corellia/female_grassland_slice_hound.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("slice hound grassland") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/corellia/female_razor_cat.py b/scripts/mobiles/corellia/female_razor_cat.py index 20a4ddbf..a1bd337a 100644 --- a/scripts/mobiles/corellia/female_razor_cat.py +++ b/scripts/mobiles/corellia/female_razor_cat.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("razor cat") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/female_slice_hound.py b/scripts/mobiles/corellia/female_slice_hound.py index 4c80d0ba..021d9431 100644 --- a/scripts/mobiles/corellia/female_slice_hound.py +++ b/scripts/mobiles/corellia/female_slice_hound.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("slice hound") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/corellia/feral_orphan.py b/scripts/mobiles/corellia/feral_orphan.py index 5f7ade20..1229694c 100644 --- a/scripts/mobiles/corellia/feral_orphan.py +++ b/scripts/mobiles/corellia/feral_orphan.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("dire cat") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/corellia/forest_murra.py b/scripts/mobiles/corellia/forest_murra.py index 9711f09d..5717b1a1 100644 --- a/scripts/mobiles/corellia/forest_murra.py +++ b/scripts/mobiles/corellia/forest_murra.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(75) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("murra") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/forest_slice_hound.py b/scripts/mobiles/corellia/forest_slice_hound.py index b7237528..2b72350e 100644 --- a/scripts/mobiles/corellia/forest_slice_hound.py +++ b/scripts/mobiles/corellia/forest_slice_hound.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("slice hound forest") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/corellia/giant_gubbur.py b/scripts/mobiles/corellia/giant_gubbur.py index 92c7a230..43c8f350 100644 --- a/scripts/mobiles/corellia/giant_gubbur.py +++ b/scripts/mobiles/corellia/giant_gubbur.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(10) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(15) - mobileTemplate.setBoneType("Mammal Hide") + mobileTemplate.setBoneType("Animal Hide") mobileTemplate.setBoneAmount(15) mobileTemplate.setSocialGroup("gubbur") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/grand_wrix.py b/scripts/mobiles/corellia/grand_wrix.py index 7dcdc025..a7e728a9 100644 --- a/scripts/mobiles/corellia/grand_wrix.py +++ b/scripts/mobiles/corellia/grand_wrix.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(70) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(40) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(35) mobileTemplate.setSocialGroup("wrix") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/grassland_slice_hound.py b/scripts/mobiles/corellia/grassland_slice_hound.py index 65b17d4a..72562fb9 100644 --- a/scripts/mobiles/corellia/grassland_slice_hound.py +++ b/scripts/mobiles/corellia/grassland_slice_hound.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("slice hound grass") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/great_plains_stalker.py b/scripts/mobiles/corellia/great_plains_stalker.py index 8d208a34..7326bbec 100644 --- a/scripts/mobiles/corellia/great_plains_stalker.py +++ b/scripts/mobiles/corellia/great_plains_stalker.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("razor cat") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/gronda.py b/scripts/mobiles/corellia/gronda.py index 4c35178d..1a442557 100644 --- a/scripts/mobiles/corellia/gronda.py +++ b/scripts/mobiles/corellia/gronda.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(360) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(270) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("gronda") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/gronda_juggernaut.py b/scripts/mobiles/corellia/gronda_juggernaut.py index 114dd63a..c648ed63 100644 --- a/scripts/mobiles/corellia/gronda_juggernaut.py +++ b/scripts/mobiles/corellia/gronda_juggernaut.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(500) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(400) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(375) mobileTemplate.setSocialGroup("gronda") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/gronda_patriarch.py b/scripts/mobiles/corellia/gronda_patriarch.py index 40aaf426..5dc54bcf 100644 --- a/scripts/mobiles/corellia/gronda_patriarch.py +++ b/scripts/mobiles/corellia/gronda_patriarch.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(360) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(270) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("gronda") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/gubbur.py b/scripts/mobiles/corellia/gubbur.py index e886f324..b210b500 100644 --- a/scripts/mobiles/corellia/gubbur.py +++ b/scripts/mobiles/corellia/gubbur.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(4) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Hide") + mobileTemplate.setBoneType("Animal Hide") mobileTemplate.setBoneAmount(3) mobileTemplate.setSocialGroup("gubbur") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/gurrcat.py b/scripts/mobiles/corellia/gurrcat.py index 167c7d9e..0eb68db4 100644 --- a/scripts/mobiles/corellia/gurrcat.py +++ b/scripts/mobiles/corellia/gurrcat.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("dire cat") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/humbaba.py b/scripts/mobiles/corellia/humbaba.py index b6a42e66..f0a42a5c 100644 --- a/scripts/mobiles/corellia/humbaba.py +++ b/scripts/mobiles/corellia/humbaba.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(230) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(130) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(80) mobileTemplate.setSocialGroup("humbaba") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/krahbu.py b/scripts/mobiles/corellia/krahbu.py index fd616421..cf17577d 100644 --- a/scripts/mobiles/corellia/krahbu.py +++ b/scripts/mobiles/corellia/krahbu.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(210) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(135) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(120) mobileTemplate.setSocialGroup("krahbu") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/minor_gubbur.py b/scripts/mobiles/corellia/minor_gubbur.py index 702f354a..f5e27d4c 100644 --- a/scripts/mobiles/corellia/minor_gubbur.py +++ b/scripts/mobiles/corellia/minor_gubbur.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(3) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(2) - mobileTemplate.setBoneType("Mammal Hide") + mobileTemplate.setBoneType("Animal Hide") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("gubbur") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/mottled_wrix.py b/scripts/mobiles/corellia/mottled_wrix.py index b36060fe..63a2861d 100644 --- a/scripts/mobiles/corellia/mottled_wrix.py +++ b/scripts/mobiles/corellia/mottled_wrix.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("wrix") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/mountain_murra.py b/scripts/mobiles/corellia/mountain_murra.py index a1ea3eed..b42a79a1 100644 --- a/scripts/mobiles/corellia/mountain_murra.py +++ b/scripts/mobiles/corellia/mountain_murra.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(75) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(45) mobileTemplate.setSocialGroup("murra") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/murra.py b/scripts/mobiles/corellia/murra.py index 52ac0f9e..53605afa 100644 --- a/scripts/mobiles/corellia/murra.py +++ b/scripts/mobiles/corellia/murra.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(55) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(32) mobileTemplate.setSocialGroup("murra") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/noxious_vrelt_scavenger.py b/scripts/mobiles/corellia/noxious_vrelt_scavenger.py index d98888c0..43571077 100644 --- a/scripts/mobiles/corellia/noxious_vrelt_scavenger.py +++ b/scripts/mobiles/corellia/noxious_vrelt_scavenger.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(10) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(10) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(10) mobileTemplate.setSocialGroup("vrelt") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/paralope.py b/scripts/mobiles/corellia/paralope.py index 06854799..85169cc0 100644 --- a/scripts/mobiles/corellia/paralope.py +++ b/scripts/mobiles/corellia/paralope.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("paralope") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/corellia/razor_cat.py b/scripts/mobiles/corellia/razor_cat.py index 5048f07f..4c27ac06 100644 --- a/scripts/mobiles/corellia/razor_cat.py +++ b/scripts/mobiles/corellia/razor_cat.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("razor cat") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/razor_cat_cub.py b/scripts/mobiles/corellia/razor_cat_cub.py index c1e6367c..8200ead7 100644 --- a/scripts/mobiles/corellia/razor_cat_cub.py +++ b/scripts/mobiles/corellia/razor_cat_cub.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(25) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(14) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("razor cat") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/razor_cat_eviscerator.py b/scripts/mobiles/corellia/razor_cat_eviscerator.py index 684b6c44..91f28753 100644 --- a/scripts/mobiles/corellia/razor_cat_eviscerator.py +++ b/scripts/mobiles/corellia/razor_cat_eviscerator.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("razor cat") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/rogue_bageraset.py b/scripts/mobiles/corellia/rogue_bageraset.py index 2210bc0a..8c7e7bbc 100644 --- a/scripts/mobiles/corellia/rogue_bageraset.py +++ b/scripts/mobiles/corellia/rogue_bageraset.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(230) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(130) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(80) mobileTemplate.setSocialGroup("bageraset") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/savage_humbaba.py b/scripts/mobiles/corellia/savage_humbaba.py index 88b94ebb..00be364d 100644 --- a/scripts/mobiles/corellia/savage_humbaba.py +++ b/scripts/mobiles/corellia/savage_humbaba.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(265) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(168) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(118) mobileTemplate.setSocialGroup("humbaba") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/scavenger_rat.py b/scripts/mobiles/corellia/scavenger_rat.py index a0c9821e..0cfe0653 100644 --- a/scripts/mobiles/corellia/scavenger_rat.py +++ b/scripts/mobiles/corellia/scavenger_rat.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(4) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Hide") + mobileTemplate.setBoneType("Animal Hide") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("scavenger rat") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/sharnaff.py b/scripts/mobiles/corellia/sharnaff.py index c035f9c8..775853c8 100644 --- a/scripts/mobiles/corellia/sharnaff.py +++ b/scripts/mobiles/corellia/sharnaff.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(450) mobileTemplate.setHideType("Scaley Hide") mobileTemplate.setHideAmount(300) - mobileTemplate.setBoneType("Mammal Hide") + mobileTemplate.setBoneType("Animal Hide") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("sharnaff") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/sharnaff_bull.py b/scripts/mobiles/corellia/sharnaff_bull.py index f4612b9d..3b054976 100644 --- a/scripts/mobiles/corellia/sharnaff_bull.py +++ b/scripts/mobiles/corellia/sharnaff_bull.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(482) mobileTemplate.setHideType("Scaley Hide") mobileTemplate.setHideAmount(335) - mobileTemplate.setBoneType("Mammal Hide") + mobileTemplate.setBoneType("Animal Hide") mobileTemplate.setBoneAmount(200) mobileTemplate.setSocialGroup("sharnaff") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/sharnaff_reckless_ravager.py b/scripts/mobiles/corellia/sharnaff_reckless_ravager.py index 54a20b2c..351781ca 100644 --- a/scripts/mobiles/corellia/sharnaff_reckless_ravager.py +++ b/scripts/mobiles/corellia/sharnaff_reckless_ravager.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(450) mobileTemplate.setHideType("Scaley Hide") mobileTemplate.setHideAmount(300) - mobileTemplate.setBoneType("Mammal Hide") + mobileTemplate.setBoneType("Animal Hide") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("sharnaff") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/slice_hound.py b/scripts/mobiles/corellia/slice_hound.py index 40d3d8df..964b5615 100644 --- a/scripts/mobiles/corellia/slice_hound.py +++ b/scripts/mobiles/corellia/slice_hound.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("slice hound") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/corellia/swamp_gurrcat.py b/scripts/mobiles/corellia/swamp_gurrcat.py index b910d50a..b09a7922 100644 --- a/scripts/mobiles/corellia/swamp_gurrcat.py +++ b/scripts/mobiles/corellia/swamp_gurrcat.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("swamp gurrcat") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/swamp_humbaba.py b/scripts/mobiles/corellia/swamp_humbaba.py index bb5f710d..d9eccf56 100644 --- a/scripts/mobiles/corellia/swamp_humbaba.py +++ b/scripts/mobiles/corellia/swamp_humbaba.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(250) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(150) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(105) mobileTemplate.setSocialGroup("humbaba") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/tabage.py b/scripts/mobiles/corellia/tabage.py index 05c9c1cc..d04a0022 100644 --- a/scripts/mobiles/corellia/tabage.py +++ b/scripts/mobiles/corellia/tabage.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(18) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(24) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(7) mobileTemplate.setSocialGroup("tabage") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/tabage_protector.py b/scripts/mobiles/corellia/tabage_protector.py index d4bda0ed..f7225f7a 100644 --- a/scripts/mobiles/corellia/tabage_protector.py +++ b/scripts/mobiles/corellia/tabage_protector.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(14) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(14) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(14) mobileTemplate.setSocialGroup("tabage") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/tabage_scavenger.py b/scripts/mobiles/corellia/tabage_scavenger.py index fc75c23b..5e6b8361 100644 --- a/scripts/mobiles/corellia/tabage_scavenger.py +++ b/scripts/mobiles/corellia/tabage_scavenger.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(13) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(13) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(13) mobileTemplate.setSocialGroup("tabage") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/vehement_durni.py b/scripts/mobiles/corellia/vehement_durni.py index cc0d1323..9cd3082d 100644 --- a/scripts/mobiles/corellia/vehement_durni.py +++ b/scripts/mobiles/corellia/vehement_durni.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("durni") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/vicious_slice_hound.py b/scripts/mobiles/corellia/vicious_slice_hound.py index f205b29b..427a50ac 100644 --- a/scripts/mobiles/corellia/vicious_slice_hound.py +++ b/scripts/mobiles/corellia/vicious_slice_hound.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("slice hound") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/violent_krahbu.py b/scripts/mobiles/corellia/violent_krahbu.py index 03bd0b36..396fef07 100644 --- a/scripts/mobiles/corellia/violent_krahbu.py +++ b/scripts/mobiles/corellia/violent_krahbu.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(225) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(135) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(135) mobileTemplate.setSocialGroup("violent krahbu") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/vrelt.py b/scripts/mobiles/corellia/vrelt.py index 9a4d6356..3d2edc62 100644 --- a/scripts/mobiles/corellia/vrelt.py +++ b/scripts/mobiles/corellia/vrelt.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(4) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("vrelt") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/vrelt_mother.py b/scripts/mobiles/corellia/vrelt_mother.py index 26e375ad..0b4d7306 100644 --- a/scripts/mobiles/corellia/vrelt_mother.py +++ b/scripts/mobiles/corellia/vrelt_mother.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(13) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(13) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(13) mobileTemplate.setSocialGroup("vrelt") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/vynock.py b/scripts/mobiles/corellia/vynock.py index eb02fee2..2aae58e8 100644 --- a/scripts/mobiles/corellia/vynock.py +++ b/scripts/mobiles/corellia/vynock.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(50) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(70) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(20) mobileTemplate.setSocialGroup("vynock") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/corellia/war_gronda.py b/scripts/mobiles/corellia/war_gronda.py index db47f7e8..ac9358de 100644 --- a/scripts/mobiles/corellia/war_gronda.py +++ b/scripts/mobiles/corellia/war_gronda.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(390) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(300) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(240) mobileTemplate.setSocialGroup("gronda") mobileTemplate.setAssistRange(10) diff --git a/scripts/mobiles/corellia/wooded_paralope.py b/scripts/mobiles/corellia/wooded_paralope.py index c68d6ed0..439250c6 100644 --- a/scripts/mobiles/corellia/wooded_paralope.py +++ b/scripts/mobiles/corellia/wooded_paralope.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("paralope") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/corellia/wrix.py b/scripts/mobiles/corellia/wrix.py index 171e9e7e..e0c6e596 100644 --- a/scripts/mobiles/corellia/wrix.py +++ b/scripts/mobiles/corellia/wrix.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(60) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(30) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(25) mobileTemplate.setSocialGroup("wrix") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/dantooine/ancient_graul.py b/scripts/mobiles/dantooine/ancient_graul.py index 97558bcc..03f7e1f6 100644 --- a/scripts/mobiles/dantooine/ancient_graul.py +++ b/scripts/mobiles/dantooine/ancient_graul.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(950) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(875) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(775) mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/bile_drenched_quenker.py b/scripts/mobiles/dantooine/bile_drenched_quenker.py index 07ac1a52..9ab334a0 100644 --- a/scripts/mobiles/dantooine/bile_drenched_quenker.py +++ b/scripts/mobiles/dantooine/bile_drenched_quenker.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(0) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setBoneAmount(0) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(0) mobileTemplate.setSocialGroup("quenker") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/bol.py b/scripts/mobiles/dantooine/bol.py index 8ab9b488..06fec651 100644 --- a/scripts/mobiles/dantooine/bol.py +++ b/scripts/mobiles/dantooine/bol.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(0) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(300) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(180) mobileTemplate.setSocialGroup("bol") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/bol_pack_runner.py b/scripts/mobiles/dantooine/bol_pack_runner.py index 9a2b996e..2d4a1eea 100644 --- a/scripts/mobiles/dantooine/bol_pack_runner.py +++ b/scripts/mobiles/dantooine/bol_pack_runner.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(0) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(300) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(180) mobileTemplate.setSocialGroup("bol") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/frenzied_graul.py b/scripts/mobiles/dantooine/frenzied_graul.py index be562790..6bc6a47d 100644 --- a/scripts/mobiles/dantooine/frenzied_graul.py +++ b/scripts/mobiles/dantooine/frenzied_graul.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(1025) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(950) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(855) mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/graul.py b/scripts/mobiles/dantooine/graul.py index 2b99aa00..ef0bc70b 100644 --- a/scripts/mobiles/dantooine/graul.py +++ b/scripts/mobiles/dantooine/graul.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(950) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(875) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(775) mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/graul_mangler.py b/scripts/mobiles/dantooine/graul_mangler.py index 122ddb10..69b5af9d 100644 --- a/scripts/mobiles/dantooine/graul_mangler.py +++ b/scripts/mobiles/dantooine/graul_mangler.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(950) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(875) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(775) mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/graul_marauder.py b/scripts/mobiles/dantooine/graul_marauder.py index c88b6961..252fd91e 100644 --- a/scripts/mobiles/dantooine/graul_marauder.py +++ b/scripts/mobiles/dantooine/graul_marauder.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(950) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(875) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(775) mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/graul_mauler.py b/scripts/mobiles/dantooine/graul_mauler.py index 71d54ed3..944a188d 100644 --- a/scripts/mobiles/dantooine/graul_mauler.py +++ b/scripts/mobiles/dantooine/graul_mauler.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(950) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(875) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(775) mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/hostile_thune_mother.py b/scripts/mobiles/dantooine/hostile_thune_mother.py index 8900f990..8cbd4939 100644 --- a/scripts/mobiles/dantooine/hostile_thune_mother.py +++ b/scripts/mobiles/dantooine/hostile_thune_mother.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(135) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setBoneAmount(150) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(0) mobileTemplate.setSocialGroup("thune") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/huurton.py b/scripts/mobiles/dantooine/huurton.py index 77578d1d..a2a99c57 100644 --- a/scripts/mobiles/dantooine/huurton.py +++ b/scripts/mobiles/dantooine/huurton.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(15) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(10) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/huurton_bloodhunter.py b/scripts/mobiles/dantooine/huurton_bloodhunter.py index 8ff08d17..f2580c17 100644 --- a/scripts/mobiles/dantooine/huurton_bloodhunter.py +++ b/scripts/mobiles/dantooine/huurton_bloodhunter.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(15) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(10) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/huurton_howler.py b/scripts/mobiles/dantooine/huurton_howler.py index 51f0438b..1a27dc07 100644 --- a/scripts/mobiles/dantooine/huurton_howler.py +++ b/scripts/mobiles/dantooine/huurton_howler.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(15) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(10) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/huurton_huntress.py b/scripts/mobiles/dantooine/huurton_huntress.py index ed36b08b..b99180dd 100644 --- a/scripts/mobiles/dantooine/huurton_huntress.py +++ b/scripts/mobiles/dantooine/huurton_huntress.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(15) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(10) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/huurton_matron.py b/scripts/mobiles/dantooine/huurton_matron.py index 6c80036e..e466a2a4 100644 --- a/scripts/mobiles/dantooine/huurton_matron.py +++ b/scripts/mobiles/dantooine/huurton_matron.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(15) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(10) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/huurton_pub.py b/scripts/mobiles/dantooine/huurton_pub.py index ed6870b2..dfd78e9e 100644 --- a/scripts/mobiles/dantooine/huurton_pub.py +++ b/scripts/mobiles/dantooine/huurton_pub.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(10) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(5) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(5) mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/huurton_reaper.py b/scripts/mobiles/dantooine/huurton_reaper.py index c617f9d9..16c79940 100644 --- a/scripts/mobiles/dantooine/huurton_reaper.py +++ b/scripts/mobiles/dantooine/huurton_reaper.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(25) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(10) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(25) mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/huurton_stalker.py b/scripts/mobiles/dantooine/huurton_stalker.py index ebfc9b9f..a500dee8 100644 --- a/scripts/mobiles/dantooine/huurton_stalker.py +++ b/scripts/mobiles/dantooine/huurton_stalker.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(15) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(10) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("huurton") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/infant_graul.py b/scripts/mobiles/dantooine/infant_graul.py index 8b25b40e..bf35d1e1 100644 --- a/scripts/mobiles/dantooine/infant_graul.py +++ b/scripts/mobiles/dantooine/infant_graul.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(700) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(750) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(650) mobileTemplate.setSocialGroup("graul") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/lesser_plains_bol.py b/scripts/mobiles/dantooine/lesser_plains_bol.py index 77b0d7c1..42d830e7 100644 --- a/scripts/mobiles/dantooine/lesser_plains_bol.py +++ b/scripts/mobiles/dantooine/lesser_plains_bol.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(0) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(300) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(180) mobileTemplate.setSocialGroup("bol") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/mammoth_thune.py b/scripts/mobiles/dantooine/mammoth_thune.py index c6a75374..e2857e26 100644 --- a/scripts/mobiles/dantooine/mammoth_thune.py +++ b/scripts/mobiles/dantooine/mammoth_thune.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(225) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setBoneAmount(190) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(0) mobileTemplate.setSocialGroup("thune") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/quenker.py b/scripts/mobiles/dantooine/quenker.py index a66ecc94..9173cc06 100644 --- a/scripts/mobiles/dantooine/quenker.py +++ b/scripts/mobiles/dantooine/quenker.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(15) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setBoneAmount(10) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("quenker") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/quenker_ravager.py b/scripts/mobiles/dantooine/quenker_ravager.py index 05a03d5d..63936e71 100644 --- a/scripts/mobiles/dantooine/quenker_ravager.py +++ b/scripts/mobiles/dantooine/quenker_ravager.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(15) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setBoneAmount(10) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("quenker") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/quenker_relic_reaper.py b/scripts/mobiles/dantooine/quenker_relic_reaper.py index 8ee0f8dd..446d75dc 100644 --- a/scripts/mobiles/dantooine/quenker_relic_reaper.py +++ b/scripts/mobiles/dantooine/quenker_relic_reaper.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(15) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setBoneAmount(10) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(15) mobileTemplate.setSocialGroup("quenker") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/savage_quenker.py b/scripts/mobiles/dantooine/savage_quenker.py index 2236c389..31cb177d 100644 --- a/scripts/mobiles/dantooine/savage_quenker.py +++ b/scripts/mobiles/dantooine/savage_quenker.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(0) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setBoneAmount(0) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(0) mobileTemplate.setSocialGroup("quenker") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/seething_bol_crusher.py b/scripts/mobiles/dantooine/seething_bol_crusher.py index f29f1f73..b6450919 100644 --- a/scripts/mobiles/dantooine/seething_bol_crusher.py +++ b/scripts/mobiles/dantooine/seething_bol_crusher.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(0) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(300) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(180) mobileTemplate.setSocialGroup("bol") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/slice_hound.py b/scripts/mobiles/dantooine/slice_hound.py index 7889cce5..67b29a52 100644 --- a/scripts/mobiles/dantooine/slice_hound.py +++ b/scripts/mobiles/dantooine/slice_hound.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setBoneAmount(35) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(30) mobileTemplate.setSocialGroup("slice_hound") mobileTemplate.setAssistRange(1) diff --git a/scripts/mobiles/dantooine/swift_charging_bol.py b/scripts/mobiles/dantooine/swift_charging_bol.py index bc42d2bf..1810993f 100644 --- a/scripts/mobiles/dantooine/swift_charging_bol.py +++ b/scripts/mobiles/dantooine/swift_charging_bol.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(0) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(300) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(180) mobileTemplate.setSocialGroup("bol") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/terrible_quenker.py b/scripts/mobiles/dantooine/terrible_quenker.py index 712aeb98..39638845 100644 --- a/scripts/mobiles/dantooine/terrible_quenker.py +++ b/scripts/mobiles/dantooine/terrible_quenker.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(0) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setBoneAmount(0) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(0) mobileTemplate.setSocialGroup("quenker") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/thune.py b/scripts/mobiles/dantooine/thune.py index b21dbbb6..d19dfba1 100644 --- a/scripts/mobiles/dantooine/thune.py +++ b/scripts/mobiles/dantooine/thune.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(115) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setBoneAmount(125) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(0) mobileTemplate.setSocialGroup("thune") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/thune_grassland_guardian.py b/scripts/mobiles/dantooine/thune_grassland_guardian.py index 4bffe805..f6cac1fe 100644 --- a/scripts/mobiles/dantooine/thune_grassland_guardian.py +++ b/scripts/mobiles/dantooine/thune_grassland_guardian.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(135) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setBoneAmount(150) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(0) mobileTemplate.setSocialGroup("thune") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dantooine/thune_herd_leader.py b/scripts/mobiles/dantooine/thune_herd_leader.py index 566531b7..5cddbb89 100644 --- a/scripts/mobiles/dantooine/thune_herd_leader.py +++ b/scripts/mobiles/dantooine/thune_herd_leader.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(135) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setBoneAmount(150) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(0) mobileTemplate.setSocialGroup("thune") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dathomir/alpha_bolma.py b/scripts/mobiles/dathomir/alpha_bolma.py index 2a608f43..96fcdc0b 100644 --- a/scripts/mobiles/dathomir/alpha_bolma.py +++ b/scripts/mobiles/dathomir/alpha_bolma.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(500) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(550) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(500) mobileTemplate.setSocialGroup("bolma") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dathomir/ancient_bull_rancor.py b/scripts/mobiles/dathomir/ancient_bull_rancor.py index 8463ec53..1d22bd4e 100644 --- a/scripts/mobiles/dathomir/ancient_bull_rancor.py +++ b/scripts/mobiles/dathomir/ancient_bull_rancor.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(1100) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(1000) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(950) mobileTemplate.setSocialGroup("rancor") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dathomir/angry_baz_nitch_avenger.py b/scripts/mobiles/dathomir/angry_baz_nitch_avenger.py index 526099b1..8ad77433 100644 --- a/scripts/mobiles/dathomir/angry_baz_nitch_avenger.py +++ b/scripts/mobiles/dathomir/angry_baz_nitch_avenger.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(2) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("baz nitch") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dathomir/baz_nitch.py b/scripts/mobiles/dathomir/baz_nitch.py index 7eb93ec3..6006f555 100644 --- a/scripts/mobiles/dathomir/baz_nitch.py +++ b/scripts/mobiles/dathomir/baz_nitch.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(2) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("baz nitch") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dathomir/bolma.py b/scripts/mobiles/dathomir/bolma.py index 85976909..2ae33f5e 100644 --- a/scripts/mobiles/dathomir/bolma.py +++ b/scripts/mobiles/dathomir/bolma.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(160) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(150) mobileTemplate.setSocialGroup("bolma") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/dathomir/bolma_calf.py b/scripts/mobiles/dathomir/bolma_calf.py index 32ad0f88..24581d71 100644 --- a/scripts/mobiles/dathomir/bolma_calf.py +++ b/scripts/mobiles/dathomir/bolma_calf.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(175) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(160) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(150) mobileTemplate.setSocialGroup("bolma") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/dathomir/bolma_female.py b/scripts/mobiles/dathomir/bolma_female.py index 2db2cf60..17ec44e8 100644 --- a/scripts/mobiles/dathomir/bolma_female.py +++ b/scripts/mobiles/dathomir/bolma_female.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(300) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(320) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(300) mobileTemplate.setSocialGroup("bolma") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/dathomir/bolma_male.py b/scripts/mobiles/dathomir/bolma_male.py index 5ffa89c5..d2268f1b 100644 --- a/scripts/mobiles/dathomir/bolma_male.py +++ b/scripts/mobiles/dathomir/bolma_male.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(320) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(340) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(320) mobileTemplate.setSocialGroup("bolma") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/dathomir/bolma_pack_master.py b/scripts/mobiles/dathomir/bolma_pack_master.py index 6c340817..49eb3d0b 100644 --- a/scripts/mobiles/dathomir/bolma_pack_master.py +++ b/scripts/mobiles/dathomir/bolma_pack_master.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1.2) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(160) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(150) mobileTemplate.setSocialGroup("bolma") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/dathomir/bolma_prime.py b/scripts/mobiles/dathomir/bolma_prime.py index 2f643a21..8cf7bcf2 100644 --- a/scripts/mobiles/dathomir/bolma_prime.py +++ b/scripts/mobiles/dathomir/bolma_prime.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(175) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(160) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(150) mobileTemplate.setSocialGroup("bolma") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dathomir/bolma_youth.py b/scripts/mobiles/dathomir/bolma_youth.py index 415933cc..9ec14aa8 100644 --- a/scripts/mobiles/dathomir/bolma_youth.py +++ b/scripts/mobiles/dathomir/bolma_youth.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(160) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(150) mobileTemplate.setSocialGroup("bolma") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/dathomir/brackaset.py b/scripts/mobiles/dathomir/brackaset.py index 0067af75..5f90b4c2 100644 --- a/scripts/mobiles/dathomir/brackaset.py +++ b/scripts/mobiles/dathomir/brackaset.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('brackaset') mobileTemplate.setLevel(66) - mobileTemplate.setMinLevel(66) - mobileTemplate.setMaxLevel(6) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) @@ -24,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(100) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(91) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(81) mobileTemplate.setSocialGroup("brackaset") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/dathomir/brackaset_female.py b/scripts/mobiles/dathomir/brackaset_female.py index 804590d0..bc0a7489 100644 --- a/scripts/mobiles/dathomir/brackaset_female.py +++ b/scripts/mobiles/dathomir/brackaset_female.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(100) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(90) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(80) mobileTemplate.setSocialGroup("brackaset") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/dathomir/brackaset_male.py b/scripts/mobiles/dathomir/brackaset_male.py index 82e40057..8b6f7a34 100644 --- a/scripts/mobiles/dathomir/brackaset_male.py +++ b/scripts/mobiles/dathomir/brackaset_male.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(100) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(91) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(81) mobileTemplate.setSocialGroup("brackaset") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/dathomir/bull_rancor.py b/scripts/mobiles/dathomir/bull_rancor.py index 22d247f5..2b84546c 100644 --- a/scripts/mobiles/dathomir/bull_rancor.py +++ b/scripts/mobiles/dathomir/bull_rancor.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(1020) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(900) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(850) mobileTemplate.setSocialGroup("rancor") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dathomir/caver_spider_broodling.py b/scripts/mobiles/dathomir/cavern_spider_broodling.py similarity index 100% rename from scripts/mobiles/dathomir/caver_spider_broodling.py rename to scripts/mobiles/dathomir/cavern_spider_broodling.py diff --git a/scripts/mobiles/dathomir/craggy_bolma.py b/scripts/mobiles/dathomir/craggy_bolma.py index 24123805..f047912f 100644 --- a/scripts/mobiles/dathomir/craggy_bolma.py +++ b/scripts/mobiles/dathomir/craggy_bolma.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(500) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(550) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(500) mobileTemplate.setSocialGroup("bolma") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dathomir/disturbed_bolma.py b/scripts/mobiles/dathomir/disturbed_bolma.py index c12df5e2..99f35b99 100644 --- a/scripts/mobiles/dathomir/disturbed_bolma.py +++ b/scripts/mobiles/dathomir/disturbed_bolma.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(160) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(150) mobileTemplate.setSocialGroup("bolma") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dathomir/domesticated_brackaset.py b/scripts/mobiles/dathomir/domesticated_brackaset.py index f9cb3d15..bc05824b 100644 --- a/scripts/mobiles/dathomir/domesticated_brackaset.py +++ b/scripts/mobiles/dathomir/domesticated_brackaset.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(100) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(90) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(80) mobileTemplate.setSocialGroup("brackaset") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/dathomir/enraged_bull_rancor.py b/scripts/mobiles/dathomir/enraged_bull_rancor.py index ded2e78b..9cedb235 100644 --- a/scripts/mobiles/dathomir/enraged_bull_rancor.py +++ b/scripts/mobiles/dathomir/enraged_bull_rancor.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(880) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(750) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(670) mobileTemplate.setSocialGroup("rancor") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dathomir/enraged_rancor.py b/scripts/mobiles/dathomir/enraged_rancor.py index e7e14e99..1d004154 100644 --- a/scripts/mobiles/dathomir/enraged_rancor.py +++ b/scripts/mobiles/dathomir/enraged_rancor.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(950) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(878) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(778) mobileTemplate.setSocialGroup("rancor") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/dathomir/female_kwi.py b/scripts/mobiles/dathomir/female_kwi.py new file mode 100644 index 00000000..145100ef --- /dev/null +++ b/scripts/mobiles/dathomir/female_kwi.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('female_kwi') + mobileTemplate.setLevel(63) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Herbivore Meat") + mobileTemplate.setMeatAmount(100) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(86) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(76) + mobileTemplate.setSocialGroup("kwi") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_kwi.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('female_kwi', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/female_malkloc_plainswalker.py b/scripts/mobiles/dathomir/female_malkloc_plainswalker.py new file mode 100644 index 00000000..c905dd7a --- /dev/null +++ b/scripts/mobiles/dathomir/female_malkloc_plainswalker.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('malkloc_plainswalker_female') + mobileTemplate.setLevel(79) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Herbivore Meat") + mobileTemplate.setMeatAmount(2000) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(1800) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(1350) + mobileTemplate.setSocialGroup("malkloc plainswalker") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_malkloc.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('female_malkloc_plainswalker', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/foul_desecrator.py b/scripts/mobiles/dathomir/foul_desecrator.py new file mode 100644 index 00000000..76650bca --- /dev/null +++ b/scripts/mobiles/dathomir/foul_desecrator.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('kamurith_foul_desecrator') + mobileTemplate.setLevel(79) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(90) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(65) + mobileTemplate.setBoneType("Avian Bones") + mobileTemplate.setBoneAmount(50) + mobileTemplate.setSocialGroup("kamurith") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_vexed_voritor_lizard.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('foul_desecrator', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/gaping_spider.py b/scripts/mobiles/dathomir/gaping_spider.py new file mode 100644 index 00000000..c57ec913 --- /dev/null +++ b/scripts/mobiles/dathomir/gaping_spider.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('gaping_spider') + mobileTemplate.setLevel(63) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(8) + mobileTemplate.setSocialGroup("gaping") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_gaping_spider.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('gaping_spider', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/gaping_spider_broodling.py b/scripts/mobiles/dathomir/gaping_spider_broodling.py new file mode 100644 index 00000000..a4c6cf72 --- /dev/null +++ b/scripts/mobiles/dathomir/gaping_spider_broodling.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('gaping_spider_broodling') + mobileTemplate.setLevel(62) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(5) + mobileTemplate.setSocialGroup("gaping") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_gaping_spider_broodling.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('gaping_spider_broodling', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/gaping_spider_hunter.py b/scripts/mobiles/dathomir/gaping_spider_hunter.py new file mode 100644 index 00000000..8a6e1053 --- /dev/null +++ b/scripts/mobiles/dathomir/gaping_spider_hunter.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('gaping_spider_hunter') + mobileTemplate.setLevel(68) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(9) + mobileTemplate.setSocialGroup("gaping") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_gaping_spider.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureRangedAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('gaping_spider_hunter', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/gaping_spider_queen.py b/scripts/mobiles/dathomir/gaping_spider_queen.py new file mode 100644 index 00000000..be522ebe --- /dev/null +++ b/scripts/mobiles/dathomir/gaping_spider_queen.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('gaping_spider_queen') + mobileTemplate.setLevel(65) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(9) + mobileTemplate.setSocialGroup("gaping") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_gaping_spider_queen.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureRangedAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('gaping_spider_queen', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/gaping_spider_recluse.py b/scripts/mobiles/dathomir/gaping_spider_recluse.py new file mode 100644 index 00000000..a85a47c9 --- /dev/null +++ b/scripts/mobiles/dathomir/gaping_spider_recluse.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('gaping_spider_recluse') + mobileTemplate.setLevel(75) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(11) + mobileTemplate.setSocialGroup("gaping") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_gaping_spider_recluse.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureRangedAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('gaping_spider_recluse', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/gaping_spider_recluse_queen.py b/scripts/mobiles/dathomir/gaping_spider_recluse_queen.py new file mode 100644 index 00000000..3f18b926 --- /dev/null +++ b/scripts/mobiles/dathomir/gaping_spider_recluse_queen.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('gaping_spider_recluse_giant') + mobileTemplate.setLevel(75) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(11) + mobileTemplate.setSocialGroup("gaping recluse") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_gaping_spider_recluse.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureRangedAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('gaping_spider_recluse_giant', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/giant_baz_nitch.py b/scripts/mobiles/dathomir/giant_baz_nitch.py new file mode 100644 index 00000000..2cd97fa8 --- /dev/null +++ b/scripts/mobiles/dathomir/giant_baz_nitch.py @@ -0,0 +1,45 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('giant_baz_nitch') + mobileTemplate.setLevel(64) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Wild Meat") + mobileTemplate.setMeatAmount(9) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(5) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(5) + mobileTemplate.setSocialGroup("baz nitch") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_giant_baz_nitch.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('baz_nitch', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/giant_cavern_spider_recluse.py b/scripts/mobiles/dathomir/giant_cavern_spider_recluse.py new file mode 100644 index 00000000..a4671c4c --- /dev/null +++ b/scripts/mobiles/dathomir/giant_cavern_spider_recluse.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('cave_gaping_spider_recluse_giant') + mobileTemplate.setLevel(81) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(35) + mobileTemplate.setSocialGroup("spider nightsister") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_gaping_spider_recluse.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('giant_cavern_spider_recluse', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/giant_gaping_spider_recluse.py b/scripts/mobiles/dathomir/giant_gaping_spider_recluse.py new file mode 100644 index 00000000..00497d9f --- /dev/null +++ b/scripts/mobiles/dathomir/giant_gaping_spider_recluse.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('gaping_spider_recluse_giant') + mobileTemplate.setLevel(78) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(11) + mobileTemplate.setSocialGroup("gaping") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_gaping_spider_recluse.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('giant_gaping_spider_recluse', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/gnarled_rancor.py b/scripts/mobiles/dathomir/gnarled_rancor.py new file mode 100644 index 00000000..ef9f2acc --- /dev/null +++ b/scripts/mobiles/dathomir/gnarled_rancor.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('gnarled_rancor') + mobileTemplate.setLevel(78) + mobileTemplate.setDifficulty(Difficulty.ELITE) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(950) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(876) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(776) + mobileTemplate.setSocialGroup("rancor") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_rancor.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('gnarled_rancor', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/grovo.py b/scripts/mobiles/dathomir/grovo.py new file mode 100644 index 00000000..b3d1f5ec --- /dev/null +++ b/scripts/mobiles/dathomir/grovo.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rancor') #temp until gorvo name is found + mobileTemplate.setLevel(83) + mobileTemplate.setDifficulty(Difficulty.BOSS) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(1100) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(1000) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(950) + mobileTemplate.setSocialGroup("nightsister") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_nsister_rancor_grovo.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('grovo', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/infant_brackaset.py b/scripts/mobiles/dathomir/infant_brackaset.py new file mode 100644 index 00000000..700e5679 --- /dev/null +++ b/scripts/mobiles/dathomir/infant_brackaset.py @@ -0,0 +1,45 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('infant_brackaset') + mobileTemplate.setLevel(63) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Wild Meat") + mobileTemplate.setMeatAmount(75) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(65) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(60) + mobileTemplate.setSocialGroup("brackaset") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_infant_brackaset.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('infant_brackaset', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/injured_kwi.py b/scripts/mobiles/dathomir/injured_kwi.py new file mode 100644 index 00000000..90cbb1a6 --- /dev/null +++ b/scripts/mobiles/dathomir/injured_kwi.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('injured_kwi') + mobileTemplate.setLevel(60) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Herbivore Meat") + mobileTemplate.setMeatAmount(100) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(85) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(75) + mobileTemplate.setSocialGroup("kwi") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_kwi.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('injured_kwi', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/injured_purbole.py b/scripts/mobiles/dathomir/injured_purbole.py new file mode 100644 index 00000000..006abc24 --- /dev/null +++ b/scripts/mobiles/dathomir/injured_purbole.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('injured_purbole') + mobileTemplate.setLevel(61) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(15) + mobileTemplate.setHideType("Bristly Hide") + mobileTemplate.setHideAmount(10) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(10) + mobileTemplate.setSocialGroup("purbole") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_purbole.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('injured_purbole', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/injured_verne.py b/scripts/mobiles/dathomir/injured_verne.py new file mode 100644 index 00000000..9182d79e --- /dev/null +++ b/scripts/mobiles/dathomir/injured_verne.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('injured_verne') + mobileTemplate.setLevel(61) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Wild Meat") + mobileTemplate.setMeatAmount(30) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(25) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(22) + mobileTemplate.setSocialGroup("verne") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_verne.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('injured_verne', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/kamurith_defiler.py b/scripts/mobiles/dathomir/kamurith_defiler.py new file mode 100644 index 00000000..7690b865 --- /dev/null +++ b/scripts/mobiles/dathomir/kamurith_defiler.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('kamurith_defiler') + mobileTemplate.setLevel(68) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(90) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(65) + mobileTemplate.setBoneType("Avian Bones") + mobileTemplate.setBoneAmount(50) + mobileTemplate.setSocialGroup("kamurith") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_vexed_voritor_lizard.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('kamurith_defiler', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/kamurith_snapper.py b/scripts/mobiles/dathomir/kamurith_snapper.py new file mode 100644 index 00000000..cb7fc86c --- /dev/null +++ b/scripts/mobiles/dathomir/kamurith_snapper.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('kamurith_snapper') + mobileTemplate.setLevel(65) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(90) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(65) + mobileTemplate.setBoneType("Avian Bones") + mobileTemplate.setBoneAmount(50) + mobileTemplate.setSocialGroup("kamurith") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_vexed_voritor_lizard.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('kamurith_snapper', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/kiin_dray.py b/scripts/mobiles/dathomir/kiin_dray.py new file mode 100644 index 00000000..e6879b07 --- /dev/null +++ b/scripts/mobiles/dathomir/kiin_dray.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('gaping_spider_recluse_giant_kiin_dray') + mobileTemplate.setLevel(83) + mobileTemplate.setDifficulty(Difficulty.BOSS) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(11) + mobileTemplate.setSocialGroup("spider nightsister") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_gaping_spider_recluse_giant_kiin_dray.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('kiin_dray', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/kinad_baz_nitch.py b/scripts/mobiles/dathomir/kinad_baz_nitch.py new file mode 100644 index 00000000..abfdac89 --- /dev/null +++ b/scripts/mobiles/dathomir/kinad_baz_nitch.py @@ -0,0 +1,45 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('kinad_baz_nitch') + mobileTemplate.setLevel(70) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Wild Meat") + mobileTemplate.setMeatAmount(15) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(10) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(5) + mobileTemplate.setSocialGroup("baz nitch") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_baz_nitch.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('kinad_baz_nitch', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/kwi.py b/scripts/mobiles/dathomir/kwi.py new file mode 100644 index 00000000..c59a206d --- /dev/null +++ b/scripts/mobiles/dathomir/kwi.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('kwi') + mobileTemplate.setLevel(65) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Herbivore Meat") + mobileTemplate.setMeatAmount(100) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(85) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(75) + mobileTemplate.setSocialGroup("kwi") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_kwi.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('kwi', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/lowland_brackaset.py b/scripts/mobiles/dathomir/lowland_brackaset.py new file mode 100644 index 00000000..9c6cdd0e --- /dev/null +++ b/scripts/mobiles/dathomir/lowland_brackaset.py @@ -0,0 +1,45 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('brackaset_lowlands') + mobileTemplate.setLevel(60) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Wild Meat") + mobileTemplate.setMeatAmount(75) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(65) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(60) + mobileTemplate.setSocialGroup("brackaset") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_brackaset_hue.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('lowland_brackaset', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/lumbering_bolma.py b/scripts/mobiles/dathomir/lumbering_bolma.py new file mode 100644 index 00000000..b5afd17c --- /dev/null +++ b/scripts/mobiles/dathomir/lumbering_bolma.py @@ -0,0 +1,43 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('lumbering_bolma') + mobileTemplate.setLevel(65) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(160) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(150) + mobileTemplate.setSocialGroup("bolma") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_bolma.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('lumbering_bolma', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/lurking_shear_mite.py b/scripts/mobiles/dathomir/lurking_shear_mite.py new file mode 100644 index 00000000..b02e6122 --- /dev/null +++ b/scripts/mobiles/dathomir/lurking_shear_mite.py @@ -0,0 +1,43 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('lurking_shear_mite') + mobileTemplate.setLevel(69) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(15) + mobileTemplate.setHideType("Scaley Hide") + mobileTemplate.setHideAmount(12) + mobileTemplate.setSocialGroup("shearmite") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_shear_mite.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('lurking_shear_mite', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/malkloc.py b/scripts/mobiles/dathomir/malkloc.py new file mode 100644 index 00000000..77a3306a --- /dev/null +++ b/scripts/mobiles/dathomir/malkloc.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('malkloc') + mobileTemplate.setLevel(74) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Herbivore Meat") + mobileTemplate.setMeatAmount(1100) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(1200) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(1100) + mobileTemplate.setSocialGroup("malkloc") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_malkloc.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('malkloc', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/malkloc_bull.py b/scripts/mobiles/dathomir/malkloc_bull.py new file mode 100644 index 00000000..86cba5b0 --- /dev/null +++ b/scripts/mobiles/dathomir/malkloc_bull.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('malkloc_bull') + mobileTemplate.setLevel(75) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Herbivore Meat") + mobileTemplate.setMeatAmount(1400) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(1500) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(1200) + mobileTemplate.setSocialGroup("malkloc") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_malkloc_bull.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('malkloc_bull', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/malkloc_plainswalker.py b/scripts/mobiles/dathomir/malkloc_plainswalker.py new file mode 100644 index 00000000..74c08ffd --- /dev/null +++ b/scripts/mobiles/dathomir/malkloc_plainswalker.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('malkloc_plainswalker') + mobileTemplate.setLevel(81) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Herbivore Meat") + mobileTemplate.setMeatAmount(2400) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(2100) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(1700) + mobileTemplate.setSocialGroup("malkloc plainswalker") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_malkloc.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('malkloc_plainswalker', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/mature_reptilian_flier.py b/scripts/mobiles/dathomir/mature_reptilian_flier.py new file mode 100644 index 00000000..fa930513 --- /dev/null +++ b/scripts/mobiles/dathomir/mature_reptilian_flier.py @@ -0,0 +1,45 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mature_reptilian_flier') + mobileTemplate.setLevel(68) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Avian Meat") + mobileTemplate.setMeatAmount(130) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(85) + mobileTemplate.setBoneType("Avian Bones") + mobileTemplate.setBoneAmount(80) + mobileTemplate.setSocialGroup("reptilian flier") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_reptilian_flier.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('mature_reptilian_flier', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/monstrous_brute.py b/scripts/mobiles/dathomir/monstrous_brute.py new file mode 100644 index 00000000..7a6dab31 --- /dev/null +++ b/scripts/mobiles/dathomir/monstrous_brute.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rancor_monstrous_brute') + mobileTemplate.setLevel(82) + mobileTemplate.setDifficulty(Difficulty.ELITE) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(950) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(878) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(778) + mobileTemplate.setSocialGroup("rancor") + mobileTemplate.setAssistRange(24) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_rancor.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('monstrous_brute', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/mutant_ baz_nitch.py b/scripts/mobiles/dathomir/mutant_ baz_nitch.py new file mode 100644 index 00000000..5e578e2f --- /dev/null +++ b/scripts/mobiles/dathomir/mutant_ baz_nitch.py @@ -0,0 +1,45 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mutant_baz_nitch') + mobileTemplate.setLevel(63) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Wild Meat") + mobileTemplate.setMeatAmount(5) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(2) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(2) + mobileTemplate.setSocialGroup("baz nitch") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_baz_nitch_hue.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('mutant_baz_nitch', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/mutant_rancor.py b/scripts/mobiles/dathomir/mutant_rancor.py new file mode 100644 index 00000000..d5e1ab66 --- /dev/null +++ b/scripts/mobiles/dathomir/mutant_rancor.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mutant_rancor') + mobileTemplate.setLevel(81) + mobileTemplate.setDifficulty(Difficulty.ELITE) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(1020) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(901) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(851) + mobileTemplate.setSocialGroup("rancor") + mobileTemplate.setAssistRange(24) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_mutant_rancor.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('mutant_rancor', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/nightsister_bull_ rancor.py b/scripts/mobiles/dathomir/nightsister_bull_ rancor.py new file mode 100644 index 00000000..6ab48e01 --- /dev/null +++ b/scripts/mobiles/dathomir/nightsister_bull_ rancor.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('nightsister_bull_rancor') + mobileTemplate.setLevel(80) + mobileTemplate.setDifficulty(Difficulty.ELITE) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(1020) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(900) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(850) + mobileTemplate.setSocialGroup("nightsister") + mobileTemplate.setAssistRange(24) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_bull_rancor.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('nightsister_bull_rancor', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/nightsister_enraged_ rancor.py b/scripts/mobiles/dathomir/nightsister_enraged_ rancor.py new file mode 100644 index 00000000..69c24317 --- /dev/null +++ b/scripts/mobiles/dathomir/nightsister_enraged_ rancor.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('nightsister_enraged_rancor') + mobileTemplate.setLevel(80) + mobileTemplate.setDifficulty(Difficulty.ELITE) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(950) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(878) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(778) + mobileTemplate.setSocialGroup("nightsister") + mobileTemplate.setAssistRange(24) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_rancor.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('nightsister_enraged_bull_rancor', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/nightsister_enraged_bull_ rancor.py b/scripts/mobiles/dathomir/nightsister_enraged_bull_ rancor.py new file mode 100644 index 00000000..53a4ff47 --- /dev/null +++ b/scripts/mobiles/dathomir/nightsister_enraged_bull_ rancor.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('nightsister_enraged_bull_rancor') + mobileTemplate.setLevel(81) + mobileTemplate.setDifficulty(Difficulty.ELITE) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(880) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(750) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(670) + mobileTemplate.setSocialGroup("nightsister") + mobileTemplate.setAssistRange(24) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_bull_rancor.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('nightsister_enraged_bull_rancor', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/nightsister_rancor.py b/scripts/mobiles/dathomir/nightsister_rancor.py index 0227f75b..db1c0ba0 100644 --- a/scripts/mobiles/dathomir/nightsister_rancor.py +++ b/scripts/mobiles/dathomir/nightsister_rancor.py @@ -17,10 +17,18 @@ def addTemplate(core): mobileTemplate.setMinSpawnDistance(4) mobileTemplate.setMaxSpawnDistance(6) mobileTemplate.setDeathblow(True) - mobileTemplate.setSocialGroup('nightsister') - mobileTemplate.setAssistRange(12) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(950) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(878) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(778) + mobileTemplate.setSocialGroup("nightsister") + mobileTemplate.setAssistRange(24) mobileTemplate.setRespawnTime(300) mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + mobileTemplate.setStalker(True) templates = Vector() templates.add('object/mobile/shared_rancor.iff') diff --git a/scripts/mobiles/dathomir/nocuous_kamurith.py b/scripts/mobiles/dathomir/nocuous_kamurith.py new file mode 100644 index 00000000..53039d5e --- /dev/null +++ b/scripts/mobiles/dathomir/nocuous_kamurith.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('kamurith_nocuous') + mobileTemplate.setLevel(68) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(90) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(65) + mobileTemplate.setBoneType("Avian Bones") + mobileTemplate.setBoneAmount(50) + mobileTemplate.setSocialGroup("kamurith") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_vexed_voritor_lizard.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('nocuous_kamurith', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/purbole.py b/scripts/mobiles/dathomir/purbole.py new file mode 100644 index 00000000..277d16f7 --- /dev/null +++ b/scripts/mobiles/dathomir/purbole.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('purbole') + mobileTemplate.setLevel(62) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(12) + mobileTemplate.setHideType("Bristly Hide") + mobileTemplate.setHideAmount(8) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(8) + mobileTemplate.setSocialGroup("purbole") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_purbole.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('purbole', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/purbole_elder.py b/scripts/mobiles/dathomir/purbole_elder.py new file mode 100644 index 00000000..9db17110 --- /dev/null +++ b/scripts/mobiles/dathomir/purbole_elder.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('purbole_elder') + mobileTemplate.setLevel(63) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(15) + mobileTemplate.setHideType("Bristly Hide") + mobileTemplate.setHideAmount(11) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(11) + mobileTemplate.setSocialGroup("purbole") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_purbole_elder.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('purbole_elder', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/purbole_hunter.py b/scripts/mobiles/dathomir/purbole_hunter.py new file mode 100644 index 00000000..e4ab532e --- /dev/null +++ b/scripts/mobiles/dathomir/purbole_hunter.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('purbole_hunter') + mobileTemplate.setLevel(64) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(15) + mobileTemplate.setHideType("Bristly Hide") + mobileTemplate.setHideAmount(10) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(10) + mobileTemplate.setSocialGroup("purbole") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_purbole.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('purbole_hunter', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/purbole_scout.py b/scripts/mobiles/dathomir/purbole_scout.py new file mode 100644 index 00000000..04778554 --- /dev/null +++ b/scripts/mobiles/dathomir/purbole_scout.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('purbole_scout') + mobileTemplate.setLevel(64) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(15) + mobileTemplate.setHideType("Bristly Hide") + mobileTemplate.setHideAmount(10) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(10) + mobileTemplate.setSocialGroup("purbole") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_purbole.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('purbole_scout', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/purbole_stalker.py b/scripts/mobiles/dathomir/purbole_stalker.py new file mode 100644 index 00000000..b59495ce --- /dev/null +++ b/scripts/mobiles/dathomir/purbole_stalker.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('purbole_stalker') + mobileTemplate.setLevel(64) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(15) + mobileTemplate.setHideType("Bristly Hide") + mobileTemplate.setHideAmount(11) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(11) + mobileTemplate.setSocialGroup("purbole") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_purbole.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('purbole_stalker', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/purbole_youth.py b/scripts/mobiles/dathomir/purbole_youth.py new file mode 100644 index 00000000..c853dc24 --- /dev/null +++ b/scripts/mobiles/dathomir/purbole_youth.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('purbole_youth') + mobileTemplate.setLevel(64) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(12) + mobileTemplate.setHideType("Bristly Hide") + mobileTemplate.setHideAmount(8) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(8) + mobileTemplate.setSocialGroup("purbole") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_purbole_youth.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('purbole_youth', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/rancor.py b/scripts/mobiles/dathomir/rancor.py index 44fcda70..5aabc841 100644 --- a/scripts/mobiles/dathomir/rancor.py +++ b/scripts/mobiles/dathomir/rancor.py @@ -10,8 +10,8 @@ def addTemplate(core): mobileTemplate = MobileTemplate() mobileTemplate.setCreatureName('rancor') - mobileTemplate.setLevel(50) - mobileTemplate.setDifficulty(Difficulty.ELITE) + mobileTemplate.setLevel(61) + mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) mobileTemplate.setMaxSpawnDistance(8) mobileTemplate.setDeathblow(True) @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(950) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(877) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(777) mobileTemplate.setSocialGroup("rancor") mobileTemplate.setAssistRange(24) diff --git a/scripts/mobiles/dathomir/rancor_pygmy.py b/scripts/mobiles/dathomir/rancor_pygmy.py new file mode 100644 index 00000000..7dabfc3f --- /dev/null +++ b/scripts/mobiles/dathomir/rancor_pygmy.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rancor_pygmy') + mobileTemplate.setLevel(50) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(950) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(877) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(777) + mobileTemplate.setSocialGroup("rancor") + mobileTemplate.setAssistRange(24) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_rancor.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rancor_pygmy', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/rancor_youth.py b/scripts/mobiles/dathomir/rancor_youth.py new file mode 100644 index 00000000..2da26303 --- /dev/null +++ b/scripts/mobiles/dathomir/rancor_youth.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rancor_youth') + mobileTemplate.setLevel(60) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(950) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(877) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(777) + mobileTemplate.setSocialGroup("rancor") + mobileTemplate.setAssistRange(24) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_rancor_youth.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rancor_youth', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/reclusive_cavern_spider.py b/scripts/mobiles/dathomir/reclusive_cavern_spider.py new file mode 100644 index 00000000..a76a62f7 --- /dev/null +++ b/scripts/mobiles/dathomir/reclusive_cavern_spider.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('cave_gaping_spider_recluse') + mobileTemplate.setLevel(80) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(41) + mobileTemplate.setSocialGroup("spider nightsister") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_gaping_spider_broodling.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('reclusive_cavern_spider', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/reclusive_cavern_spider_queen.py b/scripts/mobiles/dathomir/reclusive_cavern_spider_queen.py new file mode 100644 index 00000000..67d765f4 --- /dev/null +++ b/scripts/mobiles/dathomir/reclusive_cavern_spider_queen.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('cave_gaping_spider_recluse_queen') + mobileTemplate.setLevel(82) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(45) + mobileTemplate.setSocialGroup("spider nightsister") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_gaping_spider_broodling.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('reclusive_cavern_spider_queen', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/reptilian_flier.py b/scripts/mobiles/dathomir/reptilian_flier.py new file mode 100644 index 00000000..1a00632b --- /dev/null +++ b/scripts/mobiles/dathomir/reptilian_flier.py @@ -0,0 +1,45 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('reptilian_flier') + mobileTemplate.setLevel(65) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Avian Meat") + mobileTemplate.setMeatAmount(125) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(80) + mobileTemplate.setBoneType("Avian Bones") + mobileTemplate.setBoneAmount(75) + mobileTemplate.setSocialGroup("reptilian flier") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_reptilian_flier.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('reptilian_flier', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/reptilian_life_stealer.py b/scripts/mobiles/dathomir/reptilian_life_stealer.py new file mode 100644 index 00000000..82e6a6ab --- /dev/null +++ b/scripts/mobiles/dathomir/reptilian_life_stealer.py @@ -0,0 +1,45 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('reptilian_life_stealer') + mobileTemplate.setLevel(70) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Avian Meat") + mobileTemplate.setMeatAmount(135) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(90) + mobileTemplate.setBoneType("Avian Bones") + mobileTemplate.setBoneAmount(85) + mobileTemplate.setSocialGroup("reptilian flier") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_reptilian_flier.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('reptilian_life_stealer', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/rhoa_kwi.py b/scripts/mobiles/dathomir/rhoa_kwi.py new file mode 100644 index 00000000..6cb4de96 --- /dev/null +++ b/scripts/mobiles/dathomir/rhoa_kwi.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rhoa_kwi') + mobileTemplate.setLevel(64) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(120) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(86) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(76) + mobileTemplate.setSocialGroup("kwi rhoa") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_kwi.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rhoa_kwi', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/rhoa_kwi_guardian.py b/scripts/mobiles/dathomir/rhoa_kwi_guardian.py new file mode 100644 index 00000000..86234978 --- /dev/null +++ b/scripts/mobiles/dathomir/rhoa_kwi_guardian.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rhoa_kwi_hunter') + mobileTemplate.setLevel(64) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(120) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(86) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(76) + mobileTemplate.setSocialGroup("kwi rhoa") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_kwi.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rhoa_kwi_hunter', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/rhoa_kwi_hunter.py b/scripts/mobiles/dathomir/rhoa_kwi_hunter.py new file mode 100644 index 00000000..86234978 --- /dev/null +++ b/scripts/mobiles/dathomir/rhoa_kwi_hunter.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rhoa_kwi_hunter') + mobileTemplate.setLevel(64) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(120) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(86) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(76) + mobileTemplate.setSocialGroup("kwi rhoa") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_kwi.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rhoa_kwi_hunter', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/rhoa_kwi_pack_leader.py b/scripts/mobiles/dathomir/rhoa_kwi_pack_leader.py new file mode 100644 index 00000000..d830c88b --- /dev/null +++ b/scripts/mobiles/dathomir/rhoa_kwi_pack_leader.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rhoa_kwi_pack_leader') + mobileTemplate.setLevel(65) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(120) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(86) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(76) + mobileTemplate.setSocialGroup("kwi rhoa") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_kwi.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rhoa_kwi_pack_leader', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/shear_mite.py b/scripts/mobiles/dathomir/shear_mite.py new file mode 100644 index 00000000..de0340ff --- /dev/null +++ b/scripts/mobiles/dathomir/shear_mite.py @@ -0,0 +1,43 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('shear_mite') + mobileTemplate.setLevel(70) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(15) + mobileTemplate.setHideType("Scaley Hide") + mobileTemplate.setHideAmount(12) + mobileTemplate.setSocialGroup("shearmite") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + + templates = Vector() + templates.add('object/mobile/shared_shear_mite.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('shear_mite', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/shear_mite_broodling.py b/scripts/mobiles/dathomir/shear_mite_broodling.py new file mode 100644 index 00000000..ac224e59 --- /dev/null +++ b/scripts/mobiles/dathomir/shear_mite_broodling.py @@ -0,0 +1,43 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('shear_mite_broodling') + mobileTemplate.setLevel(69) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(15) + mobileTemplate.setHideType("Scaley Hide") + mobileTemplate.setHideAmount(3) + mobileTemplate.setSocialGroup("shearmite") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + + templates = Vector() + templates.add('object/mobile/shared_shear_mite_broodling.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('shear_mite_broodling', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/shear_mite_hunter.py b/scripts/mobiles/dathomir/shear_mite_hunter.py new file mode 100644 index 00000000..fcf8af4f --- /dev/null +++ b/scripts/mobiles/dathomir/shear_mite_hunter.py @@ -0,0 +1,43 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('shear_mite_hunter') + mobileTemplate.setLevel(71) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(15) + mobileTemplate.setHideType("Scaley Hide") + mobileTemplate.setHideAmount(12) + mobileTemplate.setSocialGroup("shearmite") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + + templates = Vector() + templates.add('object/mobile/shared_shear_mite_hunter.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('shear_mite_hunter', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/shear_mite_queen.py b/scripts/mobiles/dathomir/shear_mite_queen.py new file mode 100644 index 00000000..61c6c467 --- /dev/null +++ b/scripts/mobiles/dathomir/shear_mite_queen.py @@ -0,0 +1,43 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('shear_mite_queen') + mobileTemplate.setLevel(72) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(15) + mobileTemplate.setHideType("Scaley Hide") + mobileTemplate.setHideAmount(12) + mobileTemplate.setSocialGroup("shearmite") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + + templates = Vector() + templates.add('object/mobile/shared_shear_mite_queen.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('shear_mite_queen', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/shear_mite_soldier.py b/scripts/mobiles/dathomir/shear_mite_soldier.py new file mode 100644 index 00000000..7f602b5e --- /dev/null +++ b/scripts/mobiles/dathomir/shear_mite_soldier.py @@ -0,0 +1,43 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('shear_mite_soldier') + mobileTemplate.setLevel(70) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Insect Meat") + mobileTemplate.setMeatAmount(15) + mobileTemplate.setHideType("Scaley Hide") + mobileTemplate.setHideAmount(12) + mobileTemplate.setSocialGroup("shearmite") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(True) + + templates = Vector() + templates.add('object/mobile/shared_shear_mite_queen.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('shear_mite_soldier', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/surefoot_brackaset.py b/scripts/mobiles/dathomir/surefoot_brackaset.py new file mode 100644 index 00000000..82eb7ee2 --- /dev/null +++ b/scripts/mobiles/dathomir/surefoot_brackaset.py @@ -0,0 +1,45 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('surefoot_brackaset') + mobileTemplate.setLevel(65) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Wild Meat") + mobileTemplate.setMeatAmount(100) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(91) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(81) + mobileTemplate.setSocialGroup("brackaset") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_brackaset_hue.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('surefoot_brackaset', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/verne.py b/scripts/mobiles/dathomir/verne.py new file mode 100644 index 00000000..e5aaa798 --- /dev/null +++ b/scripts/mobiles/dathomir/verne.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('verne') + mobileTemplate.setLevel(60) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Herbivore Meat") + mobileTemplate.setMeatAmount(125) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(90) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(80) + mobileTemplate.setSocialGroup("verne") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_verne.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('verne', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/verne_bull.py b/scripts/mobiles/dathomir/verne_bull.py new file mode 100644 index 00000000..5beb933f --- /dev/null +++ b/scripts/mobiles/dathomir/verne_bull.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('verne_bull') + mobileTemplate.setLevel(61) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Wild Meat") + mobileTemplate.setMeatAmount(110) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(95) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(85) + mobileTemplate.setSocialGroup("verne") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_verne_bull.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('verne_bull', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/verne_calf.py b/scripts/mobiles/dathomir/verne_calf.py new file mode 100644 index 00000000..795753b6 --- /dev/null +++ b/scripts/mobiles/dathomir/verne_calf.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('verne_calf') + mobileTemplate.setLevel(60) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Wild Meat") + mobileTemplate.setMeatAmount(18) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(15) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(12) + mobileTemplate.setSocialGroup("verne") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_verne_calf.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('verne_calf', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/young_baz_nitch.py b/scripts/mobiles/dathomir/young_baz_nitch.py new file mode 100644 index 00000000..2a121206 --- /dev/null +++ b/scripts/mobiles/dathomir/young_baz_nitch.py @@ -0,0 +1,45 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('young_baz_nitch') + mobileTemplate.setLevel(62) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Wild Meat") + mobileTemplate.setMeatAmount(5) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(2) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(2) + mobileTemplate.setSocialGroup("baz nitch") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + + templates = Vector() + templates.add('object/mobile/shared_baz_nitch_hue.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('young_baz_nitch', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/dathomir/young_malkloc.py b/scripts/mobiles/dathomir/young_malkloc.py new file mode 100644 index 00000000..602ecb7b --- /dev/null +++ b/scripts/mobiles/dathomir/young_malkloc.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('young_malkloc') + mobileTemplate.setLevel(72) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Herbivore Meat") + mobileTemplate.setMeatAmount(850) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(900) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(850) + mobileTemplate.setSocialGroup("malkloc") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_young_malkloc.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('young_malkloc', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/dathomir/young_malkloc_plainswalker.py b/scripts/mobiles/dathomir/young_malkloc_plainswalker.py new file mode 100644 index 00000000..2f14552e --- /dev/null +++ b/scripts/mobiles/dathomir/young_malkloc_plainswalker.py @@ -0,0 +1,39 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('malkloc_plainswalker_youth') + mobileTemplate.setLevel(78) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Herbivore Meat") + mobileTemplate.setMeatAmount(1500) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setHideAmount(1350) + mobileTemplate.setBoneType("Animal Bones") + mobileTemplate.setBoneAmount(1100) + mobileTemplate.setSocialGroup("malkloc plainswalker") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_young_malkloc.iff') + mobileTemplate.setTemplates(templates) + + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('young_malkloc_plainswalker', mobileTemplate) \ No newline at end of file diff --git a/scripts/mobiles/endor/blooming_jax.py b/scripts/mobiles/endor/blooming_jax.py index 45ef4af9..6b873bd8 100644 --- a/scripts/mobiles/endor/blooming_jax.py +++ b/scripts/mobiles/endor/blooming_jax.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(25) mobileTemplate.setSocialGroup("jax") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/blushing_jax.py b/scripts/mobiles/endor/blushing_jax.py index 7a2a34b9..d89e7675 100644 --- a/scripts/mobiles/endor/blushing_jax.py +++ b/scripts/mobiles/endor/blushing_jax.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(25) mobileTemplate.setSocialGroup("jax") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/bolle_bol_bark_biter.py b/scripts/mobiles/endor/bolle_bol_bark_biter.py index 627237d6..5f8cd211 100644 --- a/scripts/mobiles/endor/bolle_bol_bark_biter.py +++ b/scripts/mobiles/endor/bolle_bol_bark_biter.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(300) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("bolle bol") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/bolle_bol_calf.py b/scripts/mobiles/endor/bolle_bol_calf.py index e475fb5b..1aceda6a 100644 --- a/scripts/mobiles/endor/bolle_bol_calf.py +++ b/scripts/mobiles/endor/bolle_bol_calf.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(.5) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(300) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("bolle bol") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/bolle_bol_colt.py b/scripts/mobiles/endor/bolle_bol_colt.py index 22711e8b..7c1166e8 100644 --- a/scripts/mobiles/endor/bolle_bol_colt.py +++ b/scripts/mobiles/endor/bolle_bol_colt.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(.5) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(300) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("bolle bol") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/bolle_bol_female.py b/scripts/mobiles/endor/bolle_bol_female.py index d1ee5499..1454b84c 100644 --- a/scripts/mobiles/endor/bolle_bol_female.py +++ b/scripts/mobiles/endor/bolle_bol_female.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(300) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("bolle bol") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/bolle_bol_herd_leader.py b/scripts/mobiles/endor/bolle_bol_herd_leader.py index 8a59c62a..797fd923 100644 --- a/scripts/mobiles/endor/bolle_bol_herd_leader.py +++ b/scripts/mobiles/endor/bolle_bol_herd_leader.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1.2) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(300) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("bolle bol") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/bolle_bol_male.py b/scripts/mobiles/endor/bolle_bol_male.py index b554b24b..5078c0be 100644 --- a/scripts/mobiles/endor/bolle_bol_male.py +++ b/scripts/mobiles/endor/bolle_bol_male.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(300) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("bolle bol") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/bolle_bol_stomper.py b/scripts/mobiles/endor/bolle_bol_stomper.py index 6a93eaba..6eee987b 100644 --- a/scripts/mobiles/endor/bolle_bol_stomper.py +++ b/scripts/mobiles/endor/bolle_bol_stomper.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(300) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("bolle bol") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/bounding_jax.py b/scripts/mobiles/endor/bounding_jax.py index b1b7d530..852d8863 100644 --- a/scripts/mobiles/endor/bounding_jax.py +++ b/scripts/mobiles/endor/bounding_jax.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(25) mobileTemplate.setSocialGroup("jax") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/diminutive_bounding_jax.py b/scripts/mobiles/endor/diminutive_bounding_jax.py index 27bdaf0e..c4330b60 100644 --- a/scripts/mobiles/endor/diminutive_bounding_jax.py +++ b/scripts/mobiles/endor/diminutive_bounding_jax.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(25) mobileTemplate.setSocialGroup("jax") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/elder_hanadak_matriarch.py b/scripts/mobiles/endor/elder_hanadak_matriarch.py index 62e92f84..13678dd2 100644 --- a/scripts/mobiles/endor/elder_hanadak_matriarch.py +++ b/scripts/mobiles/endor/elder_hanadak_matriarch.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(35) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(35) mobileTemplate.setSocialGroup("hanadak") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/endor/elder_squall.py b/scripts/mobiles/endor/elder_squall.py index 5cb1709a..11816f22 100644 --- a/scripts/mobiles/endor/elder_squall.py +++ b/scripts/mobiles/endor/elder_squall.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(12) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(8) mobileTemplate.setSocialGroup("squall") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/hanadak_ancient.py b/scripts/mobiles/endor/hanadak_ancient.py index 2c203d92..ba2f4875 100644 --- a/scripts/mobiles/endor/hanadak_ancient.py +++ b/scripts/mobiles/endor/hanadak_ancient.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(40) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(40) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(40) mobileTemplate.setSocialGroup("hanadak") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/endor/hanadak_drifter.py b/scripts/mobiles/endor/hanadak_drifter.py index 2bcf9479..8654485a 100644 --- a/scripts/mobiles/endor/hanadak_drifter.py +++ b/scripts/mobiles/endor/hanadak_drifter.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(35) mobileTemplate.setSocialGroup("bageraset") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/endor/mature_hanadak.py b/scripts/mobiles/endor/mature_hanadak.py index c41a0d1e..366de3ef 100644 --- a/scripts/mobiles/endor/mature_hanadak.py +++ b/scripts/mobiles/endor/mature_hanadak.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(20) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(20) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(20) mobileTemplate.setSocialGroup("hanadak") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/endor/mature_hanadak_rock_smasher.py b/scripts/mobiles/endor/mature_hanadak_rock_smasher.py index 7d073d9c..246c5f1b 100644 --- a/scripts/mobiles/endor/mature_hanadak_rock_smasher.py +++ b/scripts/mobiles/endor/mature_hanadak_rock_smasher.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(35) mobileTemplate.setSocialGroup("hanadak") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/endor/rabid_squall.py b/scripts/mobiles/endor/rabid_squall.py index 5d3b69df..af9a0dae 100644 --- a/scripts/mobiles/endor/rabid_squall.py +++ b/scripts/mobiles/endor/rabid_squall.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(12) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(8) mobileTemplate.setSocialGroup("squall") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/endor/squall.py b/scripts/mobiles/endor/squall.py index ffbb2748..af10c574 100644 --- a/scripts/mobiles/endor/squall.py +++ b/scripts/mobiles/endor/squall.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(12) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(8) mobileTemplate.setSocialGroup("squall") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/endor/stoneskin_hanadak.py b/scripts/mobiles/endor/stoneskin_hanadak.py index ace8cfca..5be9e97b 100644 --- a/scripts/mobiles/endor/stoneskin_hanadak.py +++ b/scripts/mobiles/endor/stoneskin_hanadak.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(40) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(40) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(40) mobileTemplate.setSocialGroup("hanadak") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/generic/faction/imperial/ace_imp_bombardier_50.py b/scripts/mobiles/generic/faction/imperial/ace_imp_bombardier_50.py index f524b521..bbaa0ddb 100644 --- a/scripts/mobiles/generic/faction/imperial/ace_imp_bombardier_50.py +++ b/scripts/mobiles/generic/faction/imperial/ace_imp_bombardier_50.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_bombardier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/ace_imp_bombardier_74.py b/scripts/mobiles/generic/faction/imperial/ace_imp_bombardier_74.py index 61c1332e..e8f9b553 100644 --- a/scripts/mobiles/generic/faction/imperial/ace_imp_bombardier_74.py +++ b/scripts/mobiles/generic/faction/imperial/ace_imp_bombardier_74.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_bombardier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/ace_imp_bombardier_89.py b/scripts/mobiles/generic/faction/imperial/ace_imp_bombardier_89.py index a03ac73b..3189292e 100644 --- a/scripts/mobiles/generic/faction/imperial/ace_imp_bombardier_89.py +++ b/scripts/mobiles/generic/faction/imperial/ace_imp_bombardier_89.py @@ -23,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_bombardier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/ace_imp_storm_com_70.py b/scripts/mobiles/generic/faction/imperial/ace_imp_storm_com_70.py index d8261543..e9730567 100644 --- a/scripts/mobiles/generic/faction/imperial/ace_imp_storm_com_70.py +++ b/scripts/mobiles/generic/faction/imperial/ace_imp_storm_com_70.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_bombardier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/ace_imp_storm_com_87.py b/scripts/mobiles/generic/faction/imperial/ace_imp_storm_com_87.py index 84278383..a42bac60 100644 --- a/scripts/mobiles/generic/faction/imperial/ace_imp_storm_com_87.py +++ b/scripts/mobiles/generic/faction/imperial/ace_imp_storm_com_87.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_bombardier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/ace_imp_storm_com_89.py b/scripts/mobiles/generic/faction/imperial/ace_imp_storm_com_89.py index e3d4ee57..5eae6706 100644 --- a/scripts/mobiles/generic/faction/imperial/ace_imp_storm_com_89.py +++ b/scripts/mobiles/generic/faction/imperial/ace_imp_storm_com_89.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_bombardier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/battle_droid_imp.py b/scripts/mobiles/generic/faction/imperial/battle_droid_imperial.py similarity index 95% rename from scripts/mobiles/generic/faction/imperial/battle_droid_imp.py rename to scripts/mobiles/generic/faction/imperial/battle_droid_imperial.py index a3bbbbac..6f69f2ce 100644 --- a/scripts/mobiles/generic/faction/imperial/battle_droid_imp.py +++ b/scripts/mobiles/generic/faction/imperial/battle_droid_imperial.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_battle_droid.iff') diff --git a/scripts/mobiles/generic/faction/imperial/battle_shocked_imp_noncom_32.py b/scripts/mobiles/generic/faction/imperial/battle_shocked_imp_noncom_32.py index c5f73e5c..acf0d43b 100644 --- a/scripts/mobiles/generic/faction/imperial/battle_shocked_imp_noncom_32.py +++ b/scripts/mobiles/generic/faction/imperial/battle_shocked_imp_noncom_32.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_black_blue.iff') diff --git a/scripts/mobiles/generic/faction/imperial/battle_shocked_imp_noncom_77.py b/scripts/mobiles/generic/faction/imperial/battle_shocked_imp_noncom_77.py index bbde9d73..cd61e794 100644 --- a/scripts/mobiles/generic/faction/imperial/battle_shocked_imp_noncom_77.py +++ b/scripts/mobiles/generic/faction/imperial/battle_shocked_imp_noncom_77.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_white_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/bombardier.py b/scripts/mobiles/generic/faction/imperial/bombardier.py index 9d9bb317..4811b150 100644 --- a/scripts/mobiles/generic/faction/imperial/bombardier.py +++ b/scripts/mobiles/generic/faction/imperial/bombardier.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_bombardier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/civil_patrol_captain.py b/scripts/mobiles/generic/faction/imperial/civil_patrol_captain.py index 5b998237..98203d98 100644 --- a/scripts/mobiles/generic/faction/imperial/civil_patrol_captain.py +++ b/scripts/mobiles/generic/faction/imperial/civil_patrol_captain.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_patrol_member_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/civil_patrol_commander.py b/scripts/mobiles/generic/faction/imperial/civil_patrol_commander.py index 52b7b6c0..71e7c63d 100644 --- a/scripts/mobiles/generic/faction/imperial/civil_patrol_commander.py +++ b/scripts/mobiles/generic/faction/imperial/civil_patrol_commander.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_patrol_member_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/civil_patrol_corporal.py b/scripts/mobiles/generic/faction/imperial/civil_patrol_corporal.py index 1648ecfd..ff23fade 100644 --- a/scripts/mobiles/generic/faction/imperial/civil_patrol_corporal.py +++ b/scripts/mobiles/generic/faction/imperial/civil_patrol_corporal.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_patrol_member_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/civil_patrol_sergeant.py b/scripts/mobiles/generic/faction/imperial/civil_patrol_sergeant.py index fb98cfcc..80b7d6e7 100644 --- a/scripts/mobiles/generic/faction/imperial/civil_patrol_sergeant.py +++ b/scripts/mobiles/generic/faction/imperial/civil_patrol_sergeant.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_patrol_member_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/civillian_patrolman.py b/scripts/mobiles/generic/faction/imperial/civillian_patrolman.py index 7ff429b2..98dcb016 100644 --- a/scripts/mobiles/generic/faction/imperial/civillian_patrolman.py +++ b/scripts/mobiles/generic/faction/imperial/civillian_patrolman.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_patrol_member_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/comm_operator.py b/scripts/mobiles/generic/faction/imperial/comm_operator.py index 30a234a5..1f9c8933 100644 --- a/scripts/mobiles/generic/faction/imperial/comm_operator.py +++ b/scripts/mobiles/generic/faction/imperial/comm_operator.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_lieutenant_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/command_security_guard.py b/scripts/mobiles/generic/faction/imperial/command_security_guard.py index 47170f32..fc75f059 100644 --- a/scripts/mobiles/generic/faction/imperial/command_security_guard.py +++ b/scripts/mobiles/generic/faction/imperial/command_security_guard.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_imp_security_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/commander_byrne.py b/scripts/mobiles/generic/faction/imperial/commander_byrne.py index 9562b027..ed65953c 100644 --- a/scripts/mobiles/generic/faction/imperial/commander_byrne.py +++ b/scripts/mobiles/generic/faction/imperial/commander_byrne.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_lian_byrne.iff') diff --git a/scripts/mobiles/generic/faction/imperial/crackdown_stormtrooper_captain.py b/scripts/mobiles/generic/faction/imperial/crackdown_stormtrooper_captain.py index 81ba83e7..dde053fb 100644 --- a/scripts/mobiles/generic/faction/imperial/crackdown_stormtrooper_captain.py +++ b/scripts/mobiles/generic/faction/imperial/crackdown_stormtrooper_captain.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_captain_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/dark_nova_trooper.py b/scripts/mobiles/generic/faction/imperial/dark_nova_trooper.py index 8c910e09..6330297c 100644 --- a/scripts/mobiles/generic/faction/imperial/dark_nova_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/dark_nova_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_dark_trooper_black_hole.iff') diff --git a/scripts/mobiles/generic/faction/imperial/dark_trooper.py b/scripts/mobiles/generic/faction/imperial/dark_trooper.py index 5757dea0..0b8f874c 100644 --- a/scripts/mobiles/generic/faction/imperial/dark_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/dark_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dark_trooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/decorated_imperial_colonel_50.py b/scripts/mobiles/generic/faction/imperial/decorated_imperial_colonel_50.py index 38bd8da0..e17f8b02 100644 --- a/scripts/mobiles/generic/faction/imperial/decorated_imperial_colonel_50.py +++ b/scripts/mobiles/generic/faction/imperial/decorated_imperial_colonel_50.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_colonel_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/decorated_imperial_colonel_87.py b/scripts/mobiles/generic/faction/imperial/decorated_imperial_colonel_87.py index 291fabda..8ec1a148 100644 --- a/scripts/mobiles/generic/faction/imperial/decorated_imperial_colonel_87.py +++ b/scripts/mobiles/generic/faction/imperial/decorated_imperial_colonel_87.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_colonel_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/detention_security_guard.py b/scripts/mobiles/generic/faction/imperial/detention_security_guard.py index 88984a92..63eebd24 100644 --- a/scripts/mobiles/generic/faction/imperial/detention_security_guard.py +++ b/scripts/mobiles/generic/faction/imperial/detention_security_guard.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/droid_corps_junior_technican.py b/scripts/mobiles/generic/faction/imperial/droid_corps_junior_technican.py index 0fb5ed0e..4d766ae9 100644 --- a/scripts/mobiles/generic/faction/imperial/droid_corps_junior_technican.py +++ b/scripts/mobiles/generic/faction/imperial/droid_corps_junior_technican.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_mechanic_nils_cridmeen.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_dark_trooper.py b/scripts/mobiles/generic/faction/imperial/elite_dark_trooper.py index a9a86eb8..3fa1a334 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_dark_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/elite_dark_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dark_trooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_exogen_class_dark_trooper.py b/scripts/mobiles/generic/faction/imperial/elite_exogen_class_dark_trooper.py index cb43ebbd..a07a4d1d 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_exogen_class_dark_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/elite_exogen_class_dark_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_assault_trooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_master_sergant_34.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_master_sergant_34.py index a7c8b88a..48e484ad 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_master_sergant_34.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_master_sergant_34.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_white_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_master_sergant_79.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_master_sergant_79.py index b49d3cc2..8045cf7c 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_master_sergant_79.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_master_sergant_79.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_white_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_sand_trooper_50.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_sand_trooper_50.py index 5042cef6..92b03a96 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_sand_trooper_50.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_sand_trooper_50.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sand_trooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_sand_trooper_85.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_sand_trooper_85.py index a6bcb944..4a77feb3 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_sand_trooper_85.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_sand_trooper_85.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sand_trooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_scout_trooper_45.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_scout_trooper_45.py index deb7265f..77e0d571 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_scout_trooper_45.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_scout_trooper_45.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_scout_trooper_white_white.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_scout_trooper_84.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_scout_trooper_84.py index 7e39efac..8dc6d4b4 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_scout_trooper_84.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_scout_trooper_84.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_scout_trooper_white_white.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_security_guard_25.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_security_guard_25.py index 04abe994..39b20d61 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_security_guard_25.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_security_guard_25.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_white_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_security_guard_76.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_security_guard_76.py index 71c8daa0..f73913e6 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_security_guard_76.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_security_guard_76.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_white_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormcaptain.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormcaptain.py index c193e1bf..55a8a97d 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormcaptain.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormcaptain.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_captain_black_gold.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormrifle_50.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormrifle_50.py index 0cc109e7..57102cca 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormrifle_50.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormrifle_50.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_rifleman_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormrifle_85.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormrifle_85.py index 3de873c7..df9fc0bc 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormrifle_85.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormrifle_85.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_rifleman_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormrifle_88.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormrifle_88.py index bbad706d..05a2048f 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormrifle_88.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormrifle_88.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -21,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_rifleman_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormsniper_50.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormsniper_50.py index 2518a56a..35cca83f 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormsniper_50.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormsniper_50.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sniper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormsniper_85.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormsniper_85.py index df8bceef..d78678cf 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormsniper_85.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormsniper_85.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -21,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sniper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormsniper_89.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormsniper_89.py index 794ebe50..db941089 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormsniper_89.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormsniper_89.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -21,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sniper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormtrooper_50.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormtrooper_50.py index a63129e5..9d79dd29 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormtrooper_50.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormtrooper_50.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormtrooper_84.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormtrooper_84.py index 0d5a8844..9f4a17d9 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormtrooper_84.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormtrooper_84.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormtrooper_89.py b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormtrooper_89.py index d13d8b97..46cafded 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_imperial_stormtrooper_89.py +++ b/scripts/mobiles/generic/faction/imperial/elite_imperial_stormtrooper_89.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_novatrooper.py b/scripts/mobiles/generic/faction/imperial/elite_novatrooper.py index 14bb46de..2b436b60 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_novatrooper.py +++ b/scripts/mobiles/generic/faction/imperial/elite_novatrooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_restuss_dark_trooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_novatrooper_commander.py b/scripts/mobiles/generic/faction/imperial/elite_novatrooper_commander.py index 63878ead..a9b0057d 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_novatrooper_commander.py +++ b/scripts/mobiles/generic/faction/imperial/elite_novatrooper_commander.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_restuss_dark_trooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_45_1.py b/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_45_1.py index f71b7544..466fe3ce 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_45_1.py +++ b/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_45_1.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sandtrooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_45_2.py b/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_45_2.py index 728f5522..996bbaaa 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_45_2.py +++ b/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_45_2.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sandtrooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_81.py b/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_81.py index 2d20094b..cd5ddcf6 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_81.py +++ b/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_81.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sandtrooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_commando_75.py b/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_commando_75.py index 4c616f2e..8ab83df4 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_commando_75.py +++ b/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_commando_75.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sandtrooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_commando_87.py b/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_commando_87.py index f636fa83..a5b655e1 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_commando_87.py +++ b/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_commando_87.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sandtrooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_commando_vet.py b/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_commando_vet.py index 564b2665..a5f4e5c2 100644 --- a/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_commando_vet.py +++ b/scripts/mobiles/generic/faction/imperial/elite_sand_trooper_commando_vet.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sandtrooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/emperors_hand.py b/scripts/mobiles/generic/faction/imperial/emperors_hand.py index 160d345c..2be6c52e 100644 --- a/scripts/mobiles/generic/faction/imperial/emperors_hand.py +++ b/scripts/mobiles/generic/faction/imperial/emperors_hand.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_emperors_hand_human_female_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/eow_fbase_imperial_corporal.py b/scripts/mobiles/generic/faction/imperial/eow_fbase_imperial_corporal.py index 368db75b..6d1b57cd 100644 --- a/scripts/mobiles/generic/faction/imperial/eow_fbase_imperial_corporal.py +++ b/scripts/mobiles/generic/faction/imperial/eow_fbase_imperial_corporal.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -21,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_captain_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/eow_fbase_stormtrooper.py b/scripts/mobiles/generic/faction/imperial/eow_fbase_stormtrooper.py index 34648d59..d06f08a5 100644 --- a/scripts/mobiles/generic/faction/imperial/eow_fbase_stormtrooper.py +++ b/scripts/mobiles/generic/faction/imperial/eow_fbase_stormtrooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -21,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/exogen_class_dark_trooper.py b/scripts/mobiles/generic/faction/imperial/exogen_class_dark_trooper.py index 201bc81a..823656c2 100644 --- a/scripts/mobiles/generic/faction/imperial/exogen_class_dark_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/exogen_class_dark_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dark_trooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/experienced_imp_captain_45.py b/scripts/mobiles/generic/faction/imperial/experienced_imp_captain_45.py index 13a3da9e..fc02fc24 100644 --- a/scripts/mobiles/generic/faction/imperial/experienced_imp_captain_45.py +++ b/scripts/mobiles/generic/faction/imperial/experienced_imp_captain_45.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_captain_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/experienced_imp_captain_85.py b/scripts/mobiles/generic/faction/imperial/experienced_imp_captain_85.py index 00add62d..7a6fae57 100644 --- a/scripts/mobiles/generic/faction/imperial/experienced_imp_captain_85.py +++ b/scripts/mobiles/generic/faction/imperial/experienced_imp_captain_85.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_captain_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/experienced_imp_corporal_40.py b/scripts/mobiles/generic/faction/imperial/experienced_imp_corporal_40.py index 6fc13ba8..6f359f27 100644 --- a/scripts/mobiles/generic/faction/imperial/experienced_imp_corporal_40.py +++ b/scripts/mobiles/generic/faction/imperial/experienced_imp_corporal_40.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_captain_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/experienced_imp_corporal_78.py b/scripts/mobiles/generic/faction/imperial/experienced_imp_corporal_78.py index 4fe09799..1b8288cc 100644 --- a/scripts/mobiles/generic/faction/imperial/experienced_imp_corporal_78.py +++ b/scripts/mobiles/generic/faction/imperial/experienced_imp_corporal_78.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_captain_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/general_otto.py b/scripts/mobiles/generic/faction/imperial/general_otto.py index 09582750..7fe9aed9 100644 --- a/scripts/mobiles/generic/faction/imperial/general_otto.py +++ b/scripts/mobiles/generic/faction/imperial/general_otto.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_general_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/glory_class_dark_trooper.py b/scripts/mobiles/generic/faction/imperial/glory_class_dark_trooper.py index 46577570..fb6042de 100644 --- a/scripts/mobiles/generic/faction/imperial/glory_class_dark_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/glory_class_dark_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sand_trooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/glory_class_dark_trooper_2.py b/scripts/mobiles/generic/faction/imperial/glory_class_dark_trooper_2.py index 2af4c2bb..e46518ff 100644 --- a/scripts/mobiles/generic/faction/imperial/glory_class_dark_trooper_2.py +++ b/scripts/mobiles/generic/faction/imperial/glory_class_dark_trooper_2.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sand_trooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/grizzled_elite_sand_trooper.py b/scripts/mobiles/generic/faction/imperial/grizzled_elite_sand_trooper.py index dc1f879d..42f5dcdf 100644 --- a/scripts/mobiles/generic/faction/imperial/grizzled_elite_sand_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/grizzled_elite_sand_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_scout_trooper_white_white.iff') diff --git a/scripts/mobiles/generic/faction/imperial/grizzled_elite_scout_trooper.py b/scripts/mobiles/generic/faction/imperial/grizzled_elite_scout_trooper.py index 30f4dd5b..4bc8851c 100644 --- a/scripts/mobiles/generic/faction/imperial/grizzled_elite_scout_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/grizzled_elite_scout_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sandtrooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/grizzled_imp_colonel.py b/scripts/mobiles/generic/faction/imperial/grizzled_imp_colonel.py index 66b3a4a2..f9ce6dc0 100644 --- a/scripts/mobiles/generic/faction/imperial/grizzled_imp_colonel.py +++ b/scripts/mobiles/generic/faction/imperial/grizzled_imp_colonel.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_colonel_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/grizzled_imp_exterminator.py b/scripts/mobiles/generic/faction/imperial/grizzled_imp_exterminator.py index 5984e311..792f8765 100644 --- a/scripts/mobiles/generic/faction/imperial/grizzled_imp_exterminator.py +++ b/scripts/mobiles/generic/faction/imperial/grizzled_imp_exterminator.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_exterminator.iff') diff --git a/scripts/mobiles/generic/faction/imperial/gunner.py b/scripts/mobiles/generic/faction/imperial/gunner.py index 9c83452a..e0e033c6 100644 --- a/scripts/mobiles/generic/faction/imperial/gunner.py +++ b/scripts/mobiles/generic/faction/imperial/gunner.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_gunner_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/hardened_swamp_trooper_25.py b/scripts/mobiles/generic/faction/imperial/hardened_swamp_trooper_25.py index dcb96a61..7b7b1cf7 100644 --- a/scripts/mobiles/generic/faction/imperial/hardened_swamp_trooper_25.py +++ b/scripts/mobiles/generic/faction/imperial/hardened_swamp_trooper_25.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_swamp_trooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/high_colonel.py b/scripts/mobiles/generic/faction/imperial/high_colonel.py index 04ddc12c..91d51597 100644 --- a/scripts/mobiles/generic/faction/imperial/high_colonel.py +++ b/scripts/mobiles/generic/faction/imperial/high_colonel.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_colonel_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_1st_lieutenant_20.py b/scripts/mobiles/generic/faction/imperial/imp_1st_lieutenant_20.py index f2135189..33f31955 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_1st_lieutenant_20.py +++ b/scripts/mobiles/generic/faction/imperial/imp_1st_lieutenant_20.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_lieutenant_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_1st_lieutenant_20_2.py b/scripts/mobiles/generic/faction/imperial/imp_1st_lieutenant_20_2.py index e627b5d5..14603c88 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_1st_lieutenant_20_2.py +++ b/scripts/mobiles/generic/faction/imperial/imp_1st_lieutenant_20_2.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_lieutenant_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_1st_lieutenant_68.py b/scripts/mobiles/generic/faction/imperial/imp_1st_lieutenant_68.py index 3d874e5e..64e0ab86 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_1st_lieutenant_68.py +++ b/scripts/mobiles/generic/faction/imperial/imp_1st_lieutenant_68.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_lieutenant_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_army_captain.py b/scripts/mobiles/generic/faction/imperial/imp_army_captain.py index 267b3ac2..c976e9c9 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_army_captain.py +++ b/scripts/mobiles/generic/faction/imperial/imp_army_captain.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_captain_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_assault_trooper.py b/scripts/mobiles/generic/faction/imperial/imp_assault_trooper.py index ff5aacdc..d7350cc3 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_assault_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/imp_assault_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_assault_trooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_assault_trooper_squad_leader.py b/scripts/mobiles/generic/faction/imperial/imp_assault_trooper_squad_leader.py index bae65fa7..e8761978 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_assault_trooper_squad_leader.py +++ b/scripts/mobiles/generic/faction/imperial/imp_assault_trooper_squad_leader.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -21,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_assault_trooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_bombardier_25.py b/scripts/mobiles/generic/faction/imperial/imp_bombardier_25.py index 384f52fe..836173b6 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_bombardier_25.py +++ b/scripts/mobiles/generic/faction/imperial/imp_bombardier_25.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_bombardier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_bombardier_75.py b/scripts/mobiles/generic/faction/imperial/imp_bombardier_75.py index d6de1014..3c35a244 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_bombardier_75.py +++ b/scripts/mobiles/generic/faction/imperial/imp_bombardier_75.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_bombardier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_brigadier_general.py b/scripts/mobiles/generic/faction/imperial/imp_brigadier_general.py index ee9e21c4..581175b0 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_brigadier_general.py +++ b/scripts/mobiles/generic/faction/imperial/imp_brigadier_general.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_general_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_cadet.py b/scripts/mobiles/generic/faction/imperial/imp_cadet.py index 2ccf986c..342ea465 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_cadet.py +++ b/scripts/mobiles/generic/faction/imperial/imp_cadet.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_soldier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_cadet_squad.py b/scripts/mobiles/generic/faction/imperial/imp_cadet_squad.py index 12b9daad..250e7d08 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_cadet_squad.py +++ b/scripts/mobiles/generic/faction/imperial/imp_cadet_squad.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_soldier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_captain_21.py b/scripts/mobiles/generic/faction/imperial/imp_captain_21.py index 90a9eb39..94ff52f4 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_captain_21.py +++ b/scripts/mobiles/generic/faction/imperial/imp_captain_21.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_captain_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_captain_69.py b/scripts/mobiles/generic/faction/imperial/imp_captain_69.py index 2f7f3ece..0f802547 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_captain_69.py +++ b/scripts/mobiles/generic/faction/imperial/imp_captain_69.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_captain_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_colonel.py b/scripts/mobiles/generic/faction/imperial/imp_colonel.py index 66b3a4a2..f9ce6dc0 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_colonel.py +++ b/scripts/mobiles/generic/faction/imperial/imp_colonel.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_colonel_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_colonel_23.py b/scripts/mobiles/generic/faction/imperial/imp_colonel_23.py index 7ed69e21..d156a9fb 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_colonel_23.py +++ b/scripts/mobiles/generic/faction/imperial/imp_colonel_23.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_colonel_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_colonel_77.py b/scripts/mobiles/generic/faction/imperial/imp_colonel_77.py index 0718a1f1..b1b9498e 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_colonel_77.py +++ b/scripts/mobiles/generic/faction/imperial/imp_colonel_77.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_colonel_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_comm_security_guard_15.py b/scripts/mobiles/generic/faction/imperial/imp_comm_security_guard_15.py index dc761785..336e0bec 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_comm_security_guard_15.py +++ b/scripts/mobiles/generic/faction/imperial/imp_comm_security_guard_15.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_comm_security_guard_67.py b/scripts/mobiles/generic/faction/imperial/imp_comm_security_guard_67.py index 6061543e..6828921a 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_comm_security_guard_67.py +++ b/scripts/mobiles/generic/faction/imperial/imp_comm_security_guard_67.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_comm_specialist_35.py b/scripts/mobiles/generic/faction/imperial/imp_comm_specialist_35.py index bd44ed7f..5a281ec8 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_comm_specialist_35.py +++ b/scripts/mobiles/generic/faction/imperial/imp_comm_specialist_35.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_comm_specialist_77.py b/scripts/mobiles/generic/faction/imperial/imp_comm_specialist_77.py index fef5003c..4f671426 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_comm_specialist_77.py +++ b/scripts/mobiles/generic/faction/imperial/imp_comm_specialist_77.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_commop_14.py b/scripts/mobiles/generic/faction/imperial/imp_commop_14.py index f6a3799e..b7288994 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_commop_14.py +++ b/scripts/mobiles/generic/faction/imperial/imp_commop_14.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_commop_64.py b/scripts/mobiles/generic/faction/imperial/imp_commop_64.py index 4203cc03..d576cb70 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_commop_64.py +++ b/scripts/mobiles/generic/faction/imperial/imp_commop_64.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_corporal_16.py b/scripts/mobiles/generic/faction/imperial/imp_corporal_16.py index e05776f4..45fb5e67 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_corporal_16.py +++ b/scripts/mobiles/generic/faction/imperial/imp_corporal_16.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_corporal_66.py b/scripts/mobiles/generic/faction/imperial/imp_corporal_66.py index 694e802c..80f2ba17 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_corporal_66.py +++ b/scripts/mobiles/generic/faction/imperial/imp_corporal_66.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_dead-eye_36.py b/scripts/mobiles/generic/faction/imperial/imp_dead-eye_36.py index d5cacaba..00edb8bd 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_dead-eye_36.py +++ b/scripts/mobiles/generic/faction/imperial/imp_dead-eye_36.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_dead-eye_78.py b/scripts/mobiles/generic/faction/imperial/imp_dead-eye_78.py index 1837ff3d..dc00636d 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_dead-eye_78.py +++ b/scripts/mobiles/generic/faction/imperial/imp_dead-eye_78.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_exterminator.py b/scripts/mobiles/generic/faction/imperial/imp_exterminator.py index c036873a..90ec5245 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_exterminator.py +++ b/scripts/mobiles/generic/faction/imperial/imp_exterminator.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_exterminator.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_general.py b/scripts/mobiles/generic/faction/imperial/imp_general.py index 4fe93d1f..54a0cae8 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_general.py +++ b/scripts/mobiles/generic/faction/imperial/imp_general.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_general_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_high_general.py b/scripts/mobiles/generic/faction/imperial/imp_high_general.py index b05084b0..bd946f7a 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_high_general.py +++ b/scripts/mobiles/generic/faction/imperial/imp_high_general.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_general_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_inquisitor_80.py b/scripts/mobiles/generic/faction/imperial/imp_inquisitor_80.py index 55c97564..aa806c7a 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_inquisitor_80.py +++ b/scripts/mobiles/generic/faction/imperial/imp_inquisitor_80.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_inquisitor_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_inquisitor_83.py b/scripts/mobiles/generic/faction/imperial/imp_inquisitor_83.py index 404f9e62..e75155b7 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_inquisitor_83.py +++ b/scripts/mobiles/generic/faction/imperial/imp_inquisitor_83.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_inquisitor_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_lance_corporal.py b/scripts/mobiles/generic/faction/imperial/imp_lance_corporal.py index 933c7e92..e6802350 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_lance_corporal.py +++ b/scripts/mobiles/generic/faction/imperial/imp_lance_corporal.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_lieutenant_colonel.py b/scripts/mobiles/generic/faction/imperial/imp_lieutenant_colonel.py index d580c84e..dee88982 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_lieutenant_colonel.py +++ b/scripts/mobiles/generic/faction/imperial/imp_lieutenant_colonel.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_colonel_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_lieutenant_general.py b/scripts/mobiles/generic/faction/imperial/imp_lieutenant_general.py index 18064f2e..892c688d 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_lieutenant_general.py +++ b/scripts/mobiles/generic/faction/imperial/imp_lieutenant_general.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_general_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_major.py b/scripts/mobiles/generic/faction/imperial/imp_major.py index e7349fbe..63567bfe 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_major.py +++ b/scripts/mobiles/generic/faction/imperial/imp_major.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_major_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_major_general.py b/scripts/mobiles/generic/faction/imperial/imp_major_general.py index e8a2b256..a959f665 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_major_general.py +++ b/scripts/mobiles/generic/faction/imperial/imp_major_general.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_general_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_master_sergant_18.py b/scripts/mobiles/generic/faction/imperial/imp_master_sergant_18.py index ac288869..c902cc22 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_master_sergant_18.py +++ b/scripts/mobiles/generic/faction/imperial/imp_master_sergant_18.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_master_sergant_67.py b/scripts/mobiles/generic/faction/imperial/imp_master_sergant_67.py index 5a705f8c..de2d2035 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_master_sergant_67.py +++ b/scripts/mobiles/generic/faction/imperial/imp_master_sergant_67.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_medic_16.py b/scripts/mobiles/generic/faction/imperial/imp_medic_16.py index 3ddf1444..f52ffd24 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_medic_16.py +++ b/scripts/mobiles/generic/faction/imperial/imp_medic_16.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_medic1_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_medic_65.py b/scripts/mobiles/generic/faction/imperial/imp_medic_65.py index 2e361332..f2744637 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_medic_65.py +++ b/scripts/mobiles/generic/faction/imperial/imp_medic_65.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_medic1_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_noncom_14.py b/scripts/mobiles/generic/faction/imperial/imp_noncom_14.py index b271b1e3..770d08c9 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_noncom_14.py +++ b/scripts/mobiles/generic/faction/imperial/imp_noncom_14.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_noncom_64.py b/scripts/mobiles/generic/faction/imperial/imp_noncom_64.py index cc3ed0e8..aefa1e2d 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_noncom_64.py +++ b/scripts/mobiles/generic/faction/imperial/imp_noncom_64.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_pilot.py b/scripts/mobiles/generic/faction/imperial/imp_pilot.py index 5181bd7f..7f37e0c6 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_pilot.py +++ b/scripts/mobiles/generic/faction/imperial/imp_pilot.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_tie_pilot_f.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_private.py b/scripts/mobiles/generic/faction/imperial/imp_private.py index 2612e5ec..9e18c496 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_private.py +++ b/scripts/mobiles/generic/faction/imperial/imp_private.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_sandtrooper_25.py b/scripts/mobiles/generic/faction/imperial/imp_sandtrooper_25.py index d5791db5..01dd5465 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_sandtrooper_25.py +++ b/scripts/mobiles/generic/faction/imperial/imp_sandtrooper_25.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sand_trooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_sandtrooper_75.py b/scripts/mobiles/generic/faction/imperial/imp_sandtrooper_75.py index 9d95ff1b..809b22ed 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_sandtrooper_75.py +++ b/scripts/mobiles/generic/faction/imperial/imp_sandtrooper_75.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sand_trooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_scouttrooper_23.py b/scripts/mobiles/generic/faction/imperial/imp_scouttrooper_23.py index d7a6b542..71d057db 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_scouttrooper_23.py +++ b/scripts/mobiles/generic/faction/imperial/imp_scouttrooper_23.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_scout_trooper_white_white.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_scouttrooper_67.py b/scripts/mobiles/generic/faction/imperial/imp_scouttrooper_67.py index 1fa59581..9d0fef30 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_scouttrooper_67.py +++ b/scripts/mobiles/generic/faction/imperial/imp_scouttrooper_67.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_scout_trooper_white_white.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_second_lieutenant.py b/scripts/mobiles/generic/faction/imperial/imp_second_lieutenant.py index a0f90179..4c454b2a 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_second_lieutenant.py +++ b/scripts/mobiles/generic/faction/imperial/imp_second_lieutenant.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_lieutenant_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_senior_cadet.py b/scripts/mobiles/generic/faction/imperial/imp_senior_cadet.py index 55350eeb..e96d674b 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_senior_cadet.py +++ b/scripts/mobiles/generic/faction/imperial/imp_senior_cadet.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_soldier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_sergeant_16.py b/scripts/mobiles/generic/faction/imperial/imp_sergeant_16.py index 95d665d6..e0ee4c7c 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_sergeant_16.py +++ b/scripts/mobiles/generic/faction/imperial/imp_sergeant_16.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_sergeant_65.py b/scripts/mobiles/generic/faction/imperial/imp_sergeant_65.py index 91d6d759..fe8ddf53 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_sergeant_65.py +++ b/scripts/mobiles/generic/faction/imperial/imp_sergeant_65.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_sergeant_major.py b/scripts/mobiles/generic/faction/imperial/imp_sergeant_major.py index 64aedd40..d84bbb70 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_sergeant_major.py +++ b/scripts/mobiles/generic/faction/imperial/imp_sergeant_major.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_sharpshooter_17.py b/scripts/mobiles/generic/faction/imperial/imp_sharpshooter_17.py index 1ba1734a..dd0a960a 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_sharpshooter_17.py +++ b/scripts/mobiles/generic/faction/imperial/imp_sharpshooter_17.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_sharpshooter_66.py b/scripts/mobiles/generic/faction/imperial/imp_sharpshooter_66.py index a3a389c7..04e8e74c 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_sharpshooter_66.py +++ b/scripts/mobiles/generic/faction/imperial/imp_sharpshooter_66.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_specialist_13.py b/scripts/mobiles/generic/faction/imperial/imp_specialist_13.py index e0aaa3b6..2e6469c8 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_specialist_13.py +++ b/scripts/mobiles/generic/faction/imperial/imp_specialist_13.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_specialist_65.py b/scripts/mobiles/generic/faction/imperial/imp_specialist_65.py index e1b641e6..b58bf643 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_specialist_65.py +++ b/scripts/mobiles/generic/faction/imperial/imp_specialist_65.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_staff_corporal.py b/scripts/mobiles/generic/faction/imperial/imp_staff_corporal.py index 91948bf6..ec7372aa 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_staff_corporal.py +++ b/scripts/mobiles/generic/faction/imperial/imp_staff_corporal.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_staff_sergeant.py b/scripts/mobiles/generic/faction/imperial/imp_staff_sergeant.py index bc3712bf..13a646ef 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_staff_sergeant.py +++ b/scripts/mobiles/generic/faction/imperial/imp_staff_sergeant.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stealth_operative.py b/scripts/mobiles/generic/faction/imperial/imp_stealth_operative.py index 6b95a3f4..2dde6145 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stealth_operative.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stealth_operative.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_storm_captain_29.py b/scripts/mobiles/generic/faction/imperial/imp_storm_captain_29.py index 2f59003b..216072bf 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_storm_captain_29.py +++ b/scripts/mobiles/generic/faction/imperial/imp_storm_captain_29.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_captain_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_storm_captain_81.py b/scripts/mobiles/generic/faction/imperial/imp_storm_captain_81.py index 9fa447a3..1ed0414f 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_storm_captain_81.py +++ b/scripts/mobiles/generic/faction/imperial/imp_storm_captain_81.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_captain_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_storm_commando_29.py b/scripts/mobiles/generic/faction/imperial/imp_storm_commando_29.py index a8e326b9..3f273582 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_storm_commando_29.py +++ b/scripts/mobiles/generic/faction/imperial/imp_storm_commando_29.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_commando_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_storm_commando_80.py b/scripts/mobiles/generic/faction/imperial/imp_storm_commando_80.py index 33506b78..084313b1 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_storm_commando_80.py +++ b/scripts/mobiles/generic/faction/imperial/imp_storm_commando_80.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_commando_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormmedic_25.py b/scripts/mobiles/generic/faction/imperial/imp_stormmedic_25.py index c4282379..48b04b28 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormmedic_25.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormmedic_25.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_medic1_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormmedic_74.py b/scripts/mobiles/generic/faction/imperial/imp_stormmedic_74.py index 2ea46a91..b60ef94b 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormmedic_74.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormmedic_74.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_medic1_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormrifle_25.py b/scripts/mobiles/generic/faction/imperial/imp_stormrifle_25.py index 643668f2..6d6fa747 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormrifle_25.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormrifle_25.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_rifleman_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormrifle_79.py b/scripts/mobiles/generic/faction/imperial/imp_stormrifle_79.py index bfe1e321..359ccadf 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormrifle_79.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormrifle_79.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_rifleman_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormsniper_25.py b/scripts/mobiles/generic/faction/imperial/imp_stormsniper_25.py index c69c24c3..ab790f8a 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormsniper_25.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormsniper_25.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sniper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormsniper_79.py b/scripts/mobiles/generic/faction/imperial/imp_stormsniper_79.py index b3ea31c6..1c0c3a8f 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormsniper_79.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormsniper_79.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -21,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sniper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormsurgeon_50.py b/scripts/mobiles/generic/faction/imperial/imp_stormsurgeon_50.py index de833c05..4efede18 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormsurgeon_50.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormsurgeon_50.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_medic1_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormsurgeon_85.py b/scripts/mobiles/generic/faction/imperial/imp_stormsurgeon_85.py index 88a9ff69..822ea80b 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormsurgeon_85.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormsurgeon_85.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_medic1_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormsurgeon_89.py b/scripts/mobiles/generic/faction/imperial/imp_stormsurgeon_89.py index e53c95cc..8a914426 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormsurgeon_89.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormsurgeon_89.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_medic1_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_25.py b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_25.py index cc1373b5..f6394663 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_25.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_25.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_80.py b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_80.py index a3568c56..be14ef7f 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_80.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_80.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_colonel_55.py b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_colonel_55.py index 2f25022d..851bb545 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_colonel_55.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_colonel_55.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_colonel_86.py b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_colonel_86.py index 480f8d6a..afef75c2 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_colonel_86.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_colonel_86.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_colonel_89.py b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_colonel_89.py index 5b42c3b7..f3352985 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_colonel_89.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_colonel_89.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_squad_leader_27.py b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_squad_leader_27.py index 13a84c01..e75fa43b 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_squad_leader_27.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_squad_leader_27.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_squad_leader_76.py b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_squad_leader_76.py index dfe20573..a35fa416 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_squad_leader_76.py +++ b/scripts/mobiles/generic/faction/imperial/imp_stormtrooper_squad_leader_76.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_surface_marshall.py b/scripts/mobiles/generic/faction/imperial/imp_surface_marshall.py index 2638d0de..b986a4f7 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_surface_marshall.py +++ b/scripts/mobiles/generic/faction/imperial/imp_surface_marshall.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_surgeon_33.py b/scripts/mobiles/generic/faction/imperial/imp_surgeon_33.py index 251d22c2..3c0f326f 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_surgeon_33.py +++ b/scripts/mobiles/generic/faction/imperial/imp_surgeon_33.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_medic1_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_surgeon_77.py b/scripts/mobiles/generic/faction/imperial/imp_surgeon_77.py index f27bf764..39fe728f 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_surgeon_77.py +++ b/scripts/mobiles/generic/faction/imperial/imp_surgeon_77.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_medic1_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_swamp_trooper.py b/scripts/mobiles/generic/faction/imperial/imp_swamp_trooper.py index 24660206..19c3e7f9 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_swamp_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/imp_swamp_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_swamp_trooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_trooper.py b/scripts/mobiles/generic/faction/imperial/imp_trooper.py index 2ac59d44..b62c4f79 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/imp_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_warant_officer_i.py b/scripts/mobiles/generic/faction/imperial/imp_warant_officer_i.py index 5664c994..aa83b335 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_warant_officer_i.py +++ b/scripts/mobiles/generic/faction/imperial/imp_warant_officer_i.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii.py b/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii.py index c399678d..c8cd84db 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii.py +++ b/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_1st_class_33.py b/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_1st_class_33.py index 962edafc..9078e243 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_1st_class_33.py +++ b/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_1st_class_33.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_1st_class_79.py b/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_1st_class_79.py index ff3c7afd..e4e3c1ad 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_1st_class_79.py +++ b/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_1st_class_79.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_2nd_class_18.py b/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_2nd_class_18.py index a618507e..0f9055d6 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_2nd_class_18.py +++ b/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_2nd_class_18.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_2nd_class_67.py b/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_2nd_class_67.py index 0f9faf81..5e0f9e38 100644 --- a/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_2nd_class_67.py +++ b/scripts/mobiles/generic/faction/imperial/imp_warant_officer_ii_2nd_class_67.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/imprisoned_imp_offi.py b/scripts/mobiles/generic/faction/imperial/imprisoned_imp_offi.py index 86f8df29..6cfd0605 100644 --- a/scripts/mobiles/generic/faction/imperial/imprisoned_imp_offi.py +++ b/scripts/mobiles/generic/faction/imperial/imprisoned_imp_offi.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/lance_bombardier.py b/scripts/mobiles/generic/faction/imperial/lance_bombardier.py index 55f55b47..5b490359 100644 --- a/scripts/mobiles/generic/faction/imperial/lance_bombardier.py +++ b/scripts/mobiles/generic/faction/imperial/lance_bombardier.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_bombardier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/lesser_prophet_dark.py b/scripts/mobiles/generic/faction/imperial/lesser_prophet_dark.py index e7aa3e3e..cdce5d27 100644 --- a/scripts/mobiles/generic/faction/imperial/lesser_prophet_dark.py +++ b/scripts/mobiles/generic/faction/imperial/lesser_prophet_dark.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_dark_jedi_human_female_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/master_prophet_dark.py b/scripts/mobiles/generic/faction/imperial/master_prophet_dark.py index 93218e78..381bfc7f 100644 --- a/scripts/mobiles/generic/faction/imperial/master_prophet_dark.py +++ b/scripts/mobiles/generic/faction/imperial/master_prophet_dark.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_dark_jedi_elder_female_human_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/nova_trooper.py b/scripts/mobiles/generic/faction/imperial/nova_trooper.py index 47e6f6af..8ac93f98 100644 --- a/scripts/mobiles/generic/faction/imperial/nova_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/nova_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/nova_trooper_cadet.py b/scripts/mobiles/generic/faction/imperial/nova_trooper_cadet.py index 986b3711..7e559fb2 100644 --- a/scripts/mobiles/generic/faction/imperial/nova_trooper_cadet.py +++ b/scripts/mobiles/generic/faction/imperial/nova_trooper_cadet.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(8) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/nova_trooper_captain.py b/scripts/mobiles/generic/faction/imperial/nova_trooper_captain.py index 10d09373..8b4731ad 100644 --- a/scripts/mobiles/generic/faction/imperial/nova_trooper_captain.py +++ b/scripts/mobiles/generic/faction/imperial/nova_trooper_captain.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/nova_trooper_commander.py b/scripts/mobiles/generic/faction/imperial/nova_trooper_commander.py index 3541896f..2db9674d 100644 --- a/scripts/mobiles/generic/faction/imperial/nova_trooper_commander.py +++ b/scripts/mobiles/generic/faction/imperial/nova_trooper_commander.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/nova_trooper_ensign.py b/scripts/mobiles/generic/faction/imperial/nova_trooper_ensign.py index 83456ffb..c4cadb93 100644 --- a/scripts/mobiles/generic/faction/imperial/nova_trooper_ensign.py +++ b/scripts/mobiles/generic/faction/imperial/nova_trooper_ensign.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/nova_trooper_medic.py b/scripts/mobiles/generic/faction/imperial/nova_trooper_medic.py index 69fdf6bb..4b66d96e 100644 --- a/scripts/mobiles/generic/faction/imperial/nova_trooper_medic.py +++ b/scripts/mobiles/generic/faction/imperial/nova_trooper_medic.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/nova_trooper_squad_leader.py b/scripts/mobiles/generic/faction/imperial/nova_trooper_squad_leader.py index f732db09..957ed380 100644 --- a/scripts/mobiles/generic/faction/imperial/nova_trooper_squad_leader.py +++ b/scripts/mobiles/generic/faction/imperial/nova_trooper_squad_leader.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/opressor_7_dark_trooper_80.py b/scripts/mobiles/generic/faction/imperial/opressor_7_dark_trooper_80.py index e5f7bc4a..289bfafd 100644 --- a/scripts/mobiles/generic/faction/imperial/opressor_7_dark_trooper_80.py +++ b/scripts/mobiles/generic/faction/imperial/opressor_7_dark_trooper_80.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dark_trooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/opressor_7_dark_trooper_88.py b/scripts/mobiles/generic/faction/imperial/opressor_7_dark_trooper_88.py index 3d41bf8e..1d8990b9 100644 --- a/scripts/mobiles/generic/faction/imperial/opressor_7_dark_trooper_88.py +++ b/scripts/mobiles/generic/faction/imperial/opressor_7_dark_trooper_88.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_dark_trooper_black_hole.iff') diff --git a/scripts/mobiles/generic/faction/imperial/opressor_9_dark_trooper.py b/scripts/mobiles/generic/faction/imperial/opressor_9_dark_trooper.py index c9e851ac..ec0ecfa2 100644 --- a/scripts/mobiles/generic/faction/imperial/opressor_9_dark_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/opressor_9_dark_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dark_trooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/probot_drone.py b/scripts/mobiles/generic/faction/imperial/probot_drone.py index 1128b4b7..0b03b8f3 100644 --- a/scripts/mobiles/generic/faction/imperial/probot_drone.py +++ b/scripts/mobiles/generic/faction/imperial/probot_drone.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_probot.iff') diff --git a/scripts/mobiles/generic/faction/imperial/probot_seeker.py b/scripts/mobiles/generic/faction/imperial/probot_seeker.py index 6fffb60a..8644d138 100644 --- a/scripts/mobiles/generic/faction/imperial/probot_seeker.py +++ b/scripts/mobiles/generic/faction/imperial/probot_seeker.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_probot.iff') diff --git a/scripts/mobiles/generic/faction/imperial/prophet_dark.py b/scripts/mobiles/generic/faction/imperial/prophet_dark.py index fd9174ed..b8c4ba75 100644 --- a/scripts/mobiles/generic/faction/imperial/prophet_dark.py +++ b/scripts/mobiles/generic/faction/imperial/prophet_dark.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_dark_jedi_elder_female_human_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/sand_trooper.py b/scripts/mobiles/generic/faction/imperial/sand_trooper.py index 49df184b..22ef32a6 100644 --- a/scripts/mobiles/generic/faction/imperial/sand_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/sand_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sand_trooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/scouttrooper.py b/scripts/mobiles/generic/faction/imperial/scouttrooper.py index 5bb2e76d..3b5ca986 100644 --- a/scripts/mobiles/generic/faction/imperial/scouttrooper.py +++ b/scripts/mobiles/generic/faction/imperial/scouttrooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -21,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_scout_trooper_white_white.iff') diff --git a/scripts/mobiles/generic/faction/imperial/senior_prophet_dark.py b/scripts/mobiles/generic/faction/imperial/senior_prophet_dark.py index c6aceee4..e4509893 100644 --- a/scripts/mobiles/generic/faction/imperial/senior_prophet_dark.py +++ b/scripts/mobiles/generic/faction/imperial/senior_prophet_dark.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_dark_jedi_elder_female_human_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/signalman.py b/scripts/mobiles/generic/faction/imperial/signalman.py index ddc429e4..fcb41574 100644 --- a/scripts/mobiles/generic/faction/imperial/signalman.py +++ b/scripts/mobiles/generic/faction/imperial/signalman.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/skilled_1st_lieutenant_35.py b/scripts/mobiles/generic/faction/imperial/skilled_1st_lieutenant_35.py index 3d277f69..edaaf35c 100644 --- a/scripts/mobiles/generic/faction/imperial/skilled_1st_lieutenant_35.py +++ b/scripts/mobiles/generic/faction/imperial/skilled_1st_lieutenant_35.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_lieutenant_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/skilled_1st_lieutenant_80.py b/scripts/mobiles/generic/faction/imperial/skilled_1st_lieutenant_80.py index a514c9cd..eb850e22 100644 --- a/scripts/mobiles/generic/faction/imperial/skilled_1st_lieutenant_80.py +++ b/scripts/mobiles/generic/faction/imperial/skilled_1st_lieutenant_80.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_lieutenant_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/special_missions_engineer.py b/scripts/mobiles/generic/faction/imperial/special_missions_engineer.py index 8f01444c..811b8d6b 100644 --- a/scripts/mobiles/generic/faction/imperial/special_missions_engineer.py +++ b/scripts/mobiles/generic/faction/imperial/special_missions_engineer.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/specialis_noncom.py b/scripts/mobiles/generic/faction/imperial/specialis_noncom.py index 2c9e74d6..eb23d815 100644 --- a/scripts/mobiles/generic/faction/imperial/specialis_noncom.py +++ b/scripts/mobiles/generic/faction/imperial/specialis_noncom.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/storm_commando.py b/scripts/mobiles/generic/faction/imperial/storm_commando.py index aa5b18bb..7edec4c5 100644 --- a/scripts/mobiles/generic/faction/imperial/storm_commando.py +++ b/scripts/mobiles/generic/faction/imperial/storm_commando.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_commando_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/stormtrooper.py b/scripts/mobiles/generic/faction/imperial/stormtrooper.py index a6be48c2..3c8c1a11 100644 --- a/scripts/mobiles/generic/faction/imperial/stormtrooper.py +++ b/scripts/mobiles/generic/faction/imperial/stormtrooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(5) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/stormtrooper_2.py b/scripts/mobiles/generic/faction/imperial/stormtrooper_2.py index 20a20c0c..e29d776a 100644 --- a/scripts/mobiles/generic/faction/imperial/stormtrooper_2.py +++ b/scripts/mobiles/generic/faction/imperial/stormtrooper_2.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(5) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/stormtrooper_25.py b/scripts/mobiles/generic/faction/imperial/stormtrooper_25.py index 78b83c28..d136ef99 100644 --- a/scripts/mobiles/generic/faction/imperial/stormtrooper_25.py +++ b/scripts/mobiles/generic/faction/imperial/stormtrooper_25.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_dark_trooper_black_hole.iff') diff --git a/scripts/mobiles/generic/faction/imperial/super_battle_droid_imp.py b/scripts/mobiles/generic/faction/imperial/super_battle_droid_imp.py index 477cf43f..9a42bd95 100644 --- a/scripts/mobiles/generic/faction/imperial/super_battle_droid_imp.py +++ b/scripts/mobiles/generic/faction/imperial/super_battle_droid_imp.py @@ -4,13 +4,14 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector def addTemplate(core): mobileTemplate = MobileTemplate() - mobileTemplate.setCreatureName('imperial_battle_droid') + mobileTemplate.setCreatureName('imperial_super_battle_droid') mobileTemplate.setLevel(86) mobileTemplate.setDifficulty(Difficulty.ELITE) @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_super_battle_droid.iff') @@ -37,5 +38,5 @@ def addTemplate(core): mobileTemplate.setDefaultAttack('rangedShot') mobileTemplate.setAttacks(attacks) - core.spawnService.addMobileTemplate('sbd_imperials', mobileTemplate) + core.spawnService.addMobileTemplate('sbd_imperial', mobileTemplate) return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/imperial/triumphant_class_dark_trooper.py b/scripts/mobiles/generic/faction/imperial/triumphant_class_dark_trooper.py index 7851b8f9..689547c6 100644 --- a/scripts/mobiles/generic/faction/imperial/triumphant_class_dark_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/triumphant_class_dark_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dark_trooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_ imperial_storm_captain.py b/scripts/mobiles/generic/faction/imperial/veteran_ imperial_storm_captain.py index 6eb7a16e..dd285598 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_ imperial_storm_captain.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_ imperial_storm_captain.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_captain_black_black.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_ imperial_storm_commando.py b/scripts/mobiles/generic/faction/imperial/veteran_ imperial_storm_commando.py index b17f6bc0..6e2c0ba3 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_ imperial_storm_commando.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_ imperial_storm_commando.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_commando_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormmedic.py b/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormmedic.py index abd237f7..0892d5b6 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormmedic.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormmedic.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_medic1_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormrifle.py b/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormrifle.py index d6458643..a67f59a0 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormrifle.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormrifle.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_rifleman_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormsniper.py b/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormsniper.py index 1bc80c73..b487eda2 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormsniper.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormsniper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -21,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sniper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormtrooper_squad_leader.py b/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormtrooper_squad_leader.py index 314a51a4..13100330 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormtrooper_squad_leader.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_ imperial_stormtrooper_squad_leader.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_assault_trooper.py b/scripts/mobiles/generic/faction/imperial/veteran_assault_trooper.py index 4415be86..15b6913d 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_assault_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_assault_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(5) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_assault_trooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_assault_trooper_squad.py b/scripts/mobiles/generic/faction/imperial/veteran_assault_trooper_squad.py index ce108b6d..20f03d4e 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_assault_trooper_squad.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_assault_trooper_squad.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -21,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(5) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_assault_trooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_brigadier_general.py b/scripts/mobiles/generic/faction/imperial/veteran_brigadier_general.py index 6b044629..dc21133f 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_brigadier_general.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_brigadier_general.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_general_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_com_security_guard.py b/scripts/mobiles/generic/faction/imperial/veteran_com_security_guard.py index 76a3cd22..03352f48 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_com_security_guard.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_com_security_guard.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_compforce_trooper.py b/scripts/mobiles/generic/faction/imperial/veteran_compforce_trooper.py index 336a9ab6..d2e215af 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_compforce_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_compforce_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_stormtrooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_dark_trooper.py b/scripts/mobiles/generic/faction/imperial/veteran_dark_trooper.py index 1de1188b..fb5bcfd1 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_dark_trooper.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_dark_trooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dark_trooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_first_lieutenant.py b/scripts/mobiles/generic/faction/imperial/veteran_first_lieutenant.py index bd78098a..e2dab519 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_first_lieutenant.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_first_lieutenant.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_lieutenant_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imp_army_captain.py b/scripts/mobiles/generic/faction/imperial/veteran_imp_army_captain.py index e3ddb147..9d36253d 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imp_army_captain.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imp_army_captain.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_captain_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imp_captain.py b/scripts/mobiles/generic/faction/imperial/veteran_imp_captain.py index 23391729..c97069c0 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imp_captain.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imp_captain.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_captain_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imp_colonel.py b/scripts/mobiles/generic/faction/imperial/veteran_imp_colonel.py index 9c2f4144..6dbe3e4f 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imp_colonel.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imp_colonel.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_colonel_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imp_corporal.py b/scripts/mobiles/generic/faction/imperial/veteran_imp_corporal.py index b9778a3d..7b1d7784 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imp_corporal.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imp_corporal.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_officer_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imp_lance_corporal.py b/scripts/mobiles/generic/faction/imperial/veteran_imp_lance_corporal.py index 0416c679..e93a7620 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imp_lance_corporal.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imp_lance_corporal.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_officer_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imp_lieutenant_colonel.py b/scripts/mobiles/generic/faction/imperial/veteran_imp_lieutenant_colonel.py index 4f950382..9697a3eb 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imp_lieutenant_colonel.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imp_lieutenant_colonel.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_lieutenant_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imp_lieutenant_general.py b/scripts/mobiles/generic/faction/imperial/veteran_imp_lieutenant_general.py index 1c9f9697..51f2f86c 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imp_lieutenant_general.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imp_lieutenant_general.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_general_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_2nd_lieutenant.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_2nd_lieutenant.py index e656b74c..dc7d12cc 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_2nd_lieutenant.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_2nd_lieutenant.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_lieutenant_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_army_captain.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_army_captain.py index 07f45707..0e2909ba 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_army_captain.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_army_captain.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_captain_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_bombardier.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_bombardier.py index 67af1f4e..bac644c2 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_bombardier.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_bombardier.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_bombardier_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_general.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_general.py index ee521b5a..1bace7e9 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_general.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_general.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_general_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_high_general.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_high_general.py index 6b822069..d10ae315 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_high_general.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_high_general.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_general_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_major.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_major.py index c5da9af5..a1cef454 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_major.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_major.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_major_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_major_general.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_major_general.py index d703714e..05aaa995 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_major_general.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_major_general.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_general_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_master_sergeant.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_master_sergeant.py index 401a2916..f76f295a 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_master_sergeant.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_master_sergeant.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_medic.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_medic.py index 7c22266e..33608bf8 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_medic.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_medic.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_medic1_human_male_01.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_sandtrooper.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_sandtrooper.py index ec6ece88..7b531ab4 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_sandtrooper.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_sandtrooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_stormtrooper_sandtrooper_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_scouttrooper.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_scouttrooper.py index 5ab8d8e4..a1717778 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_scouttrooper.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_scouttrooper.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -21,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_scout_trooper_white_white.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_sergeant.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_sergeant.py index e75485e8..d437bb79 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_sergeant.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_sergeant.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_sergeant_major.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_sergeant_major.py index bca25c02..d3d347f7 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_sergeant_major.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_sergeant_major.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_major_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_sharpshooter.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_sharpshooter.py index 032e63ee..4aaede0d 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_sharpshooter.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_sharpshooter.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_staff_corporal.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_staff_corporal.py index 0aa81767..fd345608 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_staff_corporal.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_staff_corporal.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_imperial_officer_m.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_staff_sergeant.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_staff_sergeant.py index 31aa514b..c1db2091 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_staff_sergeant.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_staff_sergeant.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_surface_marshall.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_surface_marshall.py index ec110e62..7e47644c 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_surface_marshall.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_surface_marshall.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_warant_officer_i.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_warant_officer_i.py index 77cee302..6701d536 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_warant_officer_i.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_warant_officer_i.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/veteran_imperial_warant_officer_ii.py b/scripts/mobiles/generic/faction/imperial/veteran_imperial_warant_officer_ii.py index c9a7272b..9296c364 100644 --- a/scripts/mobiles/generic/faction/imperial/veteran_imperial_warant_officer_ii.py +++ b/scripts/mobiles/generic/faction/imperial/veteran_imperial_warant_officer_ii.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_npe_imperial_officer.iff') diff --git a/scripts/mobiles/generic/faction/imperial/victory_class_dark_trooper_32.py b/scripts/mobiles/generic/faction/imperial/victory_class_dark_trooper_32.py index 3e45c984..e1f5e3c4 100644 --- a/scripts/mobiles/generic/faction/imperial/victory_class_dark_trooper_32.py +++ b/scripts/mobiles/generic/faction/imperial/victory_class_dark_trooper_32.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dark_trooper.iff') diff --git a/scripts/mobiles/generic/faction/imperial/victory_class_dark_trooper_80.py b/scripts/mobiles/generic/faction/imperial/victory_class_dark_trooper_80.py index d09284bf..ec945ac8 100644 --- a/scripts/mobiles/generic/faction/imperial/victory_class_dark_trooper_80.py +++ b/scripts/mobiles/generic/faction/imperial/victory_class_dark_trooper_80.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) mobileTemplate.setFaction("imperial") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dark_trooper.iff') diff --git a/scripts/mobiles/generic/faction/rebel/alliance_intelligence_case.py b/scripts/mobiles/generic/faction/rebel/alliance_intelligence_case.py new file mode 100644 index 00000000..4b20dcc5 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/alliance_intelligence_case.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mission_alliance_intelligence_case_officer') + mobileTemplate.setLevel(22) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('alliance_intelligence_case', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/alliance_intelligence_case_officer.py b/scripts/mobiles/generic/faction/rebel/alliance_intelligence_case_officer.py new file mode 100644 index 00000000..118ec0d5 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/alliance_intelligence_case_officer.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('alliance_intelligence_case_officer') + mobileTemplate.setLevel(22) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_dlt20a.iff', WeaponType.RIFLE, 1.0, 24, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShotrifle') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('alliance_intelligence_case_officer', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/apprentice_creature_handler.py b/scripts/mobiles/generic/faction/rebel/apprentice_creature_handler.py new file mode 100644 index 00000000..c3c266e8 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/apprentice_creature_handler.py @@ -0,0 +1,43 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('alliance_intelligence_case_officer') + mobileTemplate.setLevel(11) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_creaturehandler_trainer_human_male_01.iff') + templates.add('object/mobile/shared_dressed_creaturehandler_trainer_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_creaturehandler_trainer_zabrak_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShotrifle') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('apprentice_creature_handler', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/area_coordinator.py b/scripts/mobiles/generic/faction/rebel/area_coordinator.py new file mode 100644 index 00000000..ffe1aa3b --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/area_coordinator.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('area_coordinator') + mobileTemplate.setLevel(13) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('area_coordinator', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/battle_droid_reb.py b/scripts/mobiles/generic/faction/rebel/battle_droid_rebel.py similarity index 95% rename from scripts/mobiles/generic/faction/rebel/battle_droid_reb.py rename to scripts/mobiles/generic/faction/rebel/battle_droid_rebel.py index c8b5076b..61e54700 100644 --- a/scripts/mobiles/generic/faction/rebel/battle_droid_reb.py +++ b/scripts/mobiles/generic/faction/rebel/battle_droid_rebel.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(24) mobileTemplate.setStalker(False) mobileTemplate.setFaction("rebel") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_battle_droid.iff') diff --git a/scripts/mobiles/generic/faction/rebel/battle_ready_rebel_recruit_32.py b/scripts/mobiles/generic/faction/rebel/battle_ready_rebel_recruit_32.py new file mode 100644 index 00000000..a0acb322 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/battle_ready_rebel_recruit_32.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_recruit_hard') + mobileTemplate.setLevel(32) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('battle_ready_rebel_recruit_32', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/battle_ready_rebel_recruit_77.py b/scripts/mobiles/generic/faction/rebel/battle_ready_rebel_recruit_77.py new file mode 100644 index 00000000..e01ba4c5 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/battle_ready_rebel_recruit_77.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_recruit_hard') + mobileTemplate.setLevel(77) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('battle_ready_rebel_recruit_77', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/battle_ready_rebel_soldier_50.py b/scripts/mobiles/generic/faction/rebel/battle_ready_rebel_soldier_50.py new file mode 100644 index 00000000..90de55a2 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/battle_ready_rebel_soldier_50.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_soldier_hard') + mobileTemplate.setLevel(50) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('battle_ready_rebel_soldier_50', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/battle_ready_rebel_soldier_85.py b/scripts/mobiles/generic/faction/rebel/battle_ready_rebel_soldier_85.py new file mode 100644 index 00000000..211ef3d7 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/battle_ready_rebel_soldier_85.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_soldier_hard') + mobileTemplate.setLevel(85) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('battle_ready_rebel_soldier_85', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/battle_worn_rebel_officer_18.py b/scripts/mobiles/generic/faction/rebel/battle_worn_rebel_officer_18.py new file mode 100644 index 00000000..30543c3b --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/battle_worn_rebel_officer_18.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_master_sergeant') + mobileTemplate.setLevel(18) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('battle_worn_rebel_officer_18', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/battle_worn_rebel_officer_66.py b/scripts/mobiles/generic/faction/rebel/battle_worn_rebel_officer_66.py new file mode 100644 index 00000000..66e9875f --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/battle_worn_rebel_officer_66.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_master_sergeant') + mobileTemplate.setLevel(66) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('battle_worn_rebel_officer_66', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/confidant_rebel_cadet.py b/scripts/mobiles/generic/faction/rebel/confidant_rebel_cadet.py new file mode 100644 index 00000000..8ac70470 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/confidant_rebel_cadet.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_cadet_extreme') + mobileTemplate.setLevel(88) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('confidant_rebel_cadet', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/confidant_rebel_guardian.py b/scripts/mobiles/generic/faction/rebel/confidant_rebel_guardian.py new file mode 100644 index 00000000..d1989636 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/confidant_rebel_guardian.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_guardsman_extreme') + mobileTemplate.setLevel(89) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('confidant_rebel_guardian', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/corvette_rebel_commando.py b/scripts/mobiles/generic/faction/rebel/corvette_rebel_commando.py new file mode 100644 index 00000000..71bf66ff --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/corvette_rebel_commando.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvette_rebel_commando') + mobileTemplate.setLevel(89) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_corvette_commando_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corvette_commando_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corvette_commando_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corvette_commando_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corvette_commando_twilek_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corvette_commando_zabrak_female_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('corvette_rebel_commando', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/corvette_rebel_midshipman.py b/scripts/mobiles/generic/faction/rebel/corvette_rebel_midshipman.py new file mode 100644 index 00000000..e5121051 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/corvette_rebel_midshipman.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvet_rebel_midshipman') + mobileTemplate.setLevel(81) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_corvette_commando_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corvette_commando_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corvette_commando_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corvette_commando_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corvette_commando_twilek_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corvette_commando_zabrak_female_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('corvette_rebel_midshipman', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/crack_rebel_rifleman_50.py b/scripts/mobiles/generic/faction/rebel/crack_rebel_rifleman_50.py new file mode 100644 index 00000000..fb4dc670 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/crack_rebel_rifleman_50.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_rifleman_hard') + mobileTemplate.setLevel(50) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('crack_rebel_rifleman_50', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/crack_rebel_rifleman_85.py b/scripts/mobiles/generic/faction/rebel/crack_rebel_rifleman_85.py new file mode 100644 index 00000000..ead1be24 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/crack_rebel_rifleman_85.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_rifleman_hard') + mobileTemplate.setLevel(85) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_dlt20a.iff', WeaponType.RIFLE, 1.0, 24, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('crack_rebel_rifleman_85', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/crack_rebel_rifleman_88.py b/scripts/mobiles/generic/faction/rebel/crack_rebel_rifleman_88.py new file mode 100644 index 00000000..103c9a6a --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/crack_rebel_rifleman_88.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_rifleman_hard') + mobileTemplate.setLevel(88) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('crack_rebel_rifleman_88', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/decorated_rebel_colonel_50.py b/scripts/mobiles/generic/faction/rebel/decorated_rebel_colonel_50.py new file mode 100644 index 00000000..92e9212a --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/decorated_rebel_colonel_50.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_imperial_colonel_hard') + mobileTemplate.setLevel(50) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_moncal_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_zabrak_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('decorated_rebel_colonel_50', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/decorated_rebel_colonel_88.py b/scripts/mobiles/generic/faction/rebel/decorated_rebel_colonel_88.py new file mode 100644 index 00000000..4fb763b1 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/decorated_rebel_colonel_88.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_imperial_colonel_hard') + mobileTemplate.setLevel(88) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_moncal_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_zabrak_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('decorated_rebel_colonel_88', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/decorated_sith_hunter.py b/scripts/mobiles/generic/faction/rebel/decorated_sith_hunter.py index df7a6986..4f53b8c4 100644 --- a/scripts/mobiles/generic/faction/rebel/decorated_sith_hunter.py +++ b/scripts/mobiles/generic/faction/rebel/decorated_sith_hunter.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(24) mobileTemplate.setStalker(False) mobileTemplate.setFaction("rebel") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_dressed_rebel_ris_01.iff') diff --git a/scripts/mobiles/generic/faction/rebel/elite_rebel_commando_70.py b/scripts/mobiles/generic/faction/rebel/elite_rebel_commando_70.py new file mode 100644 index 00000000..824ceb8e --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/elite_rebel_commando_70.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('cheerleader_rebel_commando_hard') + mobileTemplate.setLevel(70) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_commando_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_twilek_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_zabrak_female_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('elite_rebel_commando_70', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/elite_rebel_commando_89.py b/scripts/mobiles/generic/faction/rebel/elite_rebel_commando_89.py new file mode 100644 index 00000000..6a91fe19 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/elite_rebel_commando_89.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('cheerleader_rebel_commando_hard') + mobileTemplate.setLevel(89) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_commando_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_twilek_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_zabrak_female_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('elite_rebel_commando_89', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/elite_rebel_sand_rat_45.py b/scripts/mobiles/generic/faction/rebel/elite_rebel_sand_rat_45.py new file mode 100644 index 00000000..21b3b70f --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/elite_rebel_sand_rat_45.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_elite_sand_rat') + mobileTemplate.setLevel(45) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('elite_rebel_sand_rat_45', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/elite_rebel_sand_rat_81.py b/scripts/mobiles/generic/faction/rebel/elite_rebel_sand_rat_81.py new file mode 100644 index 00000000..c138b3d5 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/elite_rebel_sand_rat_81.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_elite_sand_rat') + mobileTemplate.setLevel(81) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('elite_rebel_sand_rat_81', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/expierienced_rebel_cadet_60.py b/scripts/mobiles/generic/faction/rebel/expierienced_rebel_cadet_60.py new file mode 100644 index 00000000..bb48285f --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/expierienced_rebel_cadet_60.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_cadet_hard') + mobileTemplate.setLevel(60) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('experienced_rebel_cadet_60', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/expierienced_rebel_cadet_85.py b/scripts/mobiles/generic/faction/rebel/expierienced_rebel_cadet_85.py new file mode 100644 index 00000000..db377fcf --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/expierienced_rebel_cadet_85.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_cadet_hard') + mobileTemplate.setLevel(85) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('experienced_rebel_cadet_85', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/expierienced_rebel_liberator_45.py b/scripts/mobiles/generic/faction/rebel/expierienced_rebel_liberator_45.py new file mode 100644 index 00000000..38972904 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/expierienced_rebel_liberator_45.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_liberator_hard') + mobileTemplate.setLevel(45) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('experienced_rebel_liberator_45', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/expierienced_rebel_liberator_84.py b/scripts/mobiles/generic/faction/rebel/expierienced_rebel_liberator_84.py new file mode 100644 index 00000000..eee4ea0b --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/expierienced_rebel_liberator_84.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_liberator_hard') + mobileTemplate.setLevel(84) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('experienced_rebel_liberator_84', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/fatigued_rebel_officer_20.py b/scripts/mobiles/generic/faction/rebel/fatigued_rebel_officer_20.py new file mode 100644 index 00000000..1d6e6ff8 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/fatigued_rebel_officer_20.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_first_lieutenant') + mobileTemplate.setLevel(20) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_bothan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_moncal_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_moncal_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_sullustan_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('fatigued_rebel_officer_20', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/fatigued_rebel_officer_67.py b/scripts/mobiles/generic/faction/rebel/fatigued_rebel_officer_67.py new file mode 100644 index 00000000..c20c6a66 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/fatigued_rebel_officer_67.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_first_lieutenant') + mobileTemplate.setLevel(67) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_bothan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_moncal_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_moncal_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_sullustan_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('fatigued_rebel_officer_67', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/fresh_rebel_rifleman_25.py b/scripts/mobiles/generic/faction/rebel/fresh_rebel_rifleman_25.py new file mode 100644 index 00000000..56e49af2 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/fresh_rebel_rifleman_25.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_rifleman') + mobileTemplate.setLevel(25) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('fresh_rebel_rifleman_25', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/fresh_rebel_rifleman_75.py b/scripts/mobiles/generic/faction/rebel/fresh_rebel_rifleman_75.py new file mode 100644 index 00000000..ec5253d9 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/fresh_rebel_rifleman_75.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_rifleman') + mobileTemplate.setLevel(75) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_dlt20a.iff', WeaponType.RIFLE, 1.0, 24, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('fresh_rebel_rifleman_75', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/frightened_rebel_recruit_14.py b/scripts/mobiles/generic/faction/rebel/frightened_rebel_recruit_14.py new file mode 100644 index 00000000..295f3931 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/frightened_rebel_recruit_14.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_recruit') + mobileTemplate.setLevel(14) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('frightened_Rebel_recruit_14', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/frightened_rebel_recruit_64.py b/scripts/mobiles/generic/faction/rebel/frightened_rebel_recruit_64.py new file mode 100644 index 00000000..3a5f6788 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/frightened_rebel_recruit_64.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_recruit') + mobileTemplate.setLevel(64) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('frightened_Rebel_recruit_64', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/general_garax_hadriin.py b/scripts/mobiles/generic/faction/rebel/general_garax_hadriin.py new file mode 100644 index 00000000..3327f28d --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/general_garax_hadriin.py @@ -0,0 +1,41 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('c_syren_4_reb_boss') + mobileTemplate.setLevel(82) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_general_fat_human_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('general_garax_hadriin', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/grizzled_elite_rebel_commando.py b/scripts/mobiles/generic/faction/rebel/grizzled_elite_rebel_commando.py new file mode 100644 index 00000000..e42dedb0 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/grizzled_elite_rebel_commando.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_commando_extreme') + mobileTemplate.setLevel(89) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_commando_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_twilek_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_zabrak_female_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('grizzled_elite_rebel_commando', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/grizzled_elite_rebel_sand_rat.py b/scripts/mobiles/generic/faction/rebel/grizzled_elite_rebel_sand_rat.py new file mode 100644 index 00000000..0936bae7 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/grizzled_elite_rebel_sand_rat.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_elite_sand_rat_extreme') + mobileTemplate.setLevel(89) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('grizzled_elite_rebel_sand_rat', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/grizzled_rebel_colonel.py b/scripts/mobiles/generic/faction/rebel/grizzled_rebel_colonel.py new file mode 100644 index 00000000..b8944397 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/grizzled_rebel_colonel.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_colonel_extreme') + mobileTemplate.setLevel(89) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_moncal_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_zabrak_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('grizzled_rebel_colonel', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/grizzled_rebel_liberator.py b/scripts/mobiles/generic/faction/rebel/grizzled_rebel_liberator.py new file mode 100644 index 00000000..38aa9c6e --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/grizzled_rebel_liberator.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_liberator_extreme') + mobileTemplate.setLevel(89) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_moncal_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_zabrak_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('grizzled_rebel_liberator', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/grizzled_rebel_munitions_expert.py b/scripts/mobiles/generic/faction/rebel/grizzled_rebel_munitions_expert.py new file mode 100644 index 00000000..9de945fe --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/grizzled_rebel_munitions_expert.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_grenadier_extreme') + mobileTemplate.setLevel(88) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_moncal_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_zabrak_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('grizzled_rebel_munitions_expert', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/grizzled_rebel_section_commander.py b/scripts/mobiles/generic/faction/rebel/grizzled_rebel_section_commander.py new file mode 100644 index 00000000..3f306114 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/grizzled_rebel_section_commander.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_squad_leader_extreme') + mobileTemplate.setLevel(89) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_bothan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_moncal_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_moncal_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_sullustan_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('grizzled_rebel_section_commander', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/grizzled_rebel_soldier.py b/scripts/mobiles/generic/faction/rebel/grizzled_rebel_soldier.py new file mode 100644 index 00000000..f38564d6 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/grizzled_rebel_soldier.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_soldier_extreme') + mobileTemplate.setLevel(88) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('grizzled_rebel_soldier', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/imprisoned_rebel_soldier.py b/scripts/mobiles/generic/faction/rebel/imprisoned_rebel_soldier.py new file mode 100644 index 00000000..c6051451 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/imprisoned_rebel_soldier.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('imprisoned_rebel') + mobileTemplate.setLevel(11) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('imprisoned_rebel_soldier', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/inexpierienced_rebel_cadet_29.py b/scripts/mobiles/generic/faction/rebel/inexpierienced_rebel_cadet_29.py new file mode 100644 index 00000000..6ea953f3 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/inexpierienced_rebel_cadet_29.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_cadet') + mobileTemplate.setLevel(29) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('inexperienced_rebel_cadet_29', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/inexpierienced_rebel_cadet_78.py b/scripts/mobiles/generic/faction/rebel/inexpierienced_rebel_cadet_78.py new file mode 100644 index 00000000..c20b11b1 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/inexpierienced_rebel_cadet_78.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_cadet') + mobileTemplate.setLevel(78) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('inexperienced_rebel_cadet_78', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_admiral.py b/scripts/mobiles/generic/faction/rebel/rebel_admiral.py new file mode 100644 index 00000000..13003db0 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_admiral.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvette_rebel_admiral') + mobileTemplate.setLevel(83) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(6) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_bith_male.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_moncal_female.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_sullustan_male.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_trandoshan_female.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_alliance_disruptor.iff', WeaponType.PISTOL, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_admiral', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_army_captain.py b/scripts/mobiles/generic/faction/rebel/rebel_army_captain.py new file mode 100644 index 00000000..c67afa8e --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_army_captain.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mission_rebel_army_captain') + mobileTemplate.setLevel(21) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_army_captain_bothan_male.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_trandoshan_female.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_twk_male.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_zabrak_female.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_army_captain', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_brigadier_general.py b/scripts/mobiles/generic/faction/rebel/rebel_brigadier_general.py new file mode 100644 index 00000000..3c37b988 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_brigadier_general.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mission_rebel_brigadier_general') + mobileTemplate.setLevel(25) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_bith_male.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_moncal_female.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_sullustan_male.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_trandoshan_female.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_brigadier_general', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_captain_21.py b/scripts/mobiles/generic/faction/rebel/rebel_captain_21.py new file mode 100644 index 00000000..802f5964 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_captain_21.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('itp_rebel_captain') + mobileTemplate.setLevel(21) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_army_captain_bothan_male.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_trandoshan_female.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_twk_male.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_zabrak_female.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_captain_21', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_captain_68.py b/scripts/mobiles/generic/faction/rebel/rebel_captain_68.py new file mode 100644 index 00000000..2f08ea43 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_captain_68.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('itp_rebel_captain') + mobileTemplate.setLevel(68) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_army_captain_bothan_male.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_trandoshan_female.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_twk_male.iff') + templates.add('object/mobile/shared_dressed_rebel_army_captain_zabrak_female.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_captain_68', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_colonel_24.py b/scripts/mobiles/generic/faction/rebel/rebel_colonel_24.py new file mode 100644 index 00000000..785e5ac7 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_colonel_24.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_colonel') + mobileTemplate.setLevel(24) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_moncal_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_zabrak_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_colonel_24', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_colonel_69.py b/scripts/mobiles/generic/faction/rebel/rebel_colonel_69.py new file mode 100644 index 00000000..3406fbc4 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_colonel_69.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_colonel') + mobileTemplate.setLevel(69) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_moncal_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_zabrak_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_colonel_69', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_comm_officer_35.py b/scripts/mobiles/generic/faction/rebel/rebel_comm_officer_35.py new file mode 100644 index 00000000..b05f157c --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_comm_officer_35.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_comm_operator_hard') + mobileTemplate.setLevel(35) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_communication_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_communication_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_comm_officer_35', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_comm_officer_77.py b/scripts/mobiles/generic/faction/rebel/rebel_comm_officer_77.py new file mode 100644 index 00000000..b481ae73 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_comm_officer_77.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_comm_operator_hard') + mobileTemplate.setLevel(77) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_communication_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_communication_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_comm_officer_77', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_comm_op_14.py b/scripts/mobiles/generic/faction/rebel/rebel_comm_op_14.py new file mode 100644 index 00000000..283716a8 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_comm_op_14.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_comm_operator') + mobileTemplate.setLevel(14) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_communication_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_communication_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_comm_op_14', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_comm_op_64.py b/scripts/mobiles/generic/faction/rebel/rebel_comm_op_64.py new file mode 100644 index 00000000..f130edd7 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_comm_op_64.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_comm_operator') + mobileTemplate.setLevel(64) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_communication_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_communication_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_comm_op_64', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_commandant.py b/scripts/mobiles/generic/faction/rebel/rebel_commandant.py new file mode 100644 index 00000000..cc28530a --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_commandant.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvette_rebel_commandant') + mobileTemplate.setLevel(82) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(6) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_bith_male.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_moncal_female.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_sullustan_male.iff') + templates.add('object/mobile/shared_dressed_rebel_brigadier_general_trandoshan_female.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_alliance_disruptor.iff', WeaponType.PISTOL, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_commandant', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_commando_25.py b/scripts/mobiles/generic/faction/rebel/rebel_commando_25.py new file mode 100644 index 00000000..a6224a88 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_commando_25.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvette_rebel_commando') + mobileTemplate.setLevel(29) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_commando_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_twilek_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_zabrak_female_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_commando_29', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_commando_29.py b/scripts/mobiles/generic/faction/rebel/rebel_commando_29.py new file mode 100644 index 00000000..7af2c0a3 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_commando_29.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvette_rebel_commando') + mobileTemplate.setLevel(25) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_commando_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_twilek_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_zabrak_female_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_commando_25', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_commando_77.py b/scripts/mobiles/generic/faction/rebel/rebel_commando_77.py new file mode 100644 index 00000000..6aa497fa --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_commando_77.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvette_rebel_commando') + mobileTemplate.setLevel(77) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_commando_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_twilek_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_zabrak_female_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_commando_77', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_commodore.py b/scripts/mobiles/generic/faction/rebel/rebel_commodore.py new file mode 100644 index 00000000..36097f3b --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_commodore.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvette_rebel_commodore') + mobileTemplate.setLevel(82) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_moncal_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_lieutenant_colonel_zabrak_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_commodore', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_corporal_16.py b/scripts/mobiles/generic/faction/rebel/rebel_corporal_16.py new file mode 100644 index 00000000..6b21edfe --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_corporal_16.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvette_rebel_admiral') + mobileTemplate.setLevel(16) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(6) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_corporal_bith_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_bothan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_sullustan_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_alliance_disruptor.iff', WeaponType.PISTOL, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_corporal_16', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_corporal_65.py b/scripts/mobiles/generic/faction/rebel/rebel_corporal_65.py new file mode 100644 index 00000000..9406ce34 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_corporal_65.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvette_rebel_admiral') + mobileTemplate.setLevel(65) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(6) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_corporal_bith_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_bothan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_sullustan_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_alliance_disruptor.iff', WeaponType.PISTOL, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_corporal_65', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_crewman.py b/scripts/mobiles/generic/faction/rebel/rebel_crewman.py new file mode 100644 index 00000000..53658487 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_crewman.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rebel_crewman') + mobileTemplate.setLevel(22) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_crewman', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_dark_trooper_hunter_32.py b/scripts/mobiles/generic/faction/rebel/rebel_dark_trooper_hunter_32.py new file mode 100644 index 00000000..853ca75e --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_dark_trooper_hunter_32.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_heavy_trooper') + mobileTemplate.setLevel(32) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_dark_trooper_hunter_32', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_dark_trooper_hunter_80.py b/scripts/mobiles/generic/faction/rebel/rebel_dark_trooper_hunter_80.py new file mode 100644 index 00000000..01c68c69 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_dark_trooper_hunter_80.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_heavy_trooper') + mobileTemplate.setLevel(80) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_dark_trooper_hunter_80', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_dead-eye_36.py b/scripts/mobiles/generic/faction/rebel/rebel_dead-eye_36.py new file mode 100644 index 00000000..27b2bc55 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_dead-eye_36.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_sharpshooter_hard') + mobileTemplate.setLevel(36) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_dead-eye_36', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_dead-eye_78.py b/scripts/mobiles/generic/faction/rebel/rebel_dead-eye_78.py new file mode 100644 index 00000000..699b87eb --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_dead-eye_78.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_sharpshooter_hard') + mobileTemplate.setLevel(78) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_dead-eye_78', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_elite_commando.py b/scripts/mobiles/generic/faction/rebel/rebel_elite_commando.py new file mode 100644 index 00000000..9097b8fe --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_elite_commando.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('restuss_elite_rebel_commando') + mobileTemplate.setLevel(81) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_commando_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_twilek_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_commando_zabrak_female_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_elite_commando', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_elite_heavy_trooper_64.py b/scripts/mobiles/generic/faction/rebel/rebel_elite_heavy_trooper_64.py new file mode 100644 index 00000000..f6735fc8 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_elite_heavy_trooper_64.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_elite_heavy_trooper') + mobileTemplate.setLevel(64) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_elite_heavy_trooper_64', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_elite_heavy_trooper_88.py b/scripts/mobiles/generic/faction/rebel/rebel_elite_heavy_trooper_88.py new file mode 100644 index 00000000..055705d8 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_elite_heavy_trooper_88.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_elite_heavy_trooper') + mobileTemplate.setLevel(88) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_elite_heavy_trooper_88', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_engineer.py b/scripts/mobiles/generic/faction/rebel/rebel_engineer.py new file mode 100644 index 00000000..9a7c49f9 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_engineer.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvette_rebel_engineer') + mobileTemplate.setLevel(80) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(6) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/rifle/shared_rifle_dlt20a.iff', WeaponType.RIFLE, 1.0, 24, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_engineer', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_ensign.py b/scripts/mobiles/generic/faction/rebel/rebel_ensign.py new file mode 100644 index 00000000..ade4019a --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_ensign.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvette_rebel_ensign') + mobileTemplate.setLevel(81) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(6) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_ensign', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_field_corporal_40.py b/scripts/mobiles/generic/faction/rebel/rebel_field_corporal_40.py new file mode 100644 index 00000000..dba5b5dd --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_field_corporal_40.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('cheerleader_rebel_corporal_hard') + mobileTemplate.setLevel(40) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(6) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_corporal_bith_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_bothan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_sullustan_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_field_corporal_40', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_field_corporal_78.py b/scripts/mobiles/generic/faction/rebel/rebel_field_corporal_78.py new file mode 100644 index 00000000..33f0379a --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_field_corporal_78.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('cheerleader_rebel_corporal_hard') + mobileTemplate.setLevel(78) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(6) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_corporal_bith_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_bothan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_sullustan_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_field_corporal_78', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_first_lieutemant.py b/scripts/mobiles/generic/faction/rebel/rebel_first_lieutemant.py new file mode 100644 index 00000000..3f306114 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_first_lieutemant.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_squad_leader_extreme') + mobileTemplate.setLevel(89) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_bothan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_moncal_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_moncal_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_first_lieutenant_sullustan_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('grizzled_rebel_section_commander', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_first_mate.py b/scripts/mobiles/generic/faction/rebel/rebel_first_mate.py new file mode 100644 index 00000000..ed636ea3 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_first_mate.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('corvette_rebel_mate') + mobileTemplate.setLevel(80) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_first_mate', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_general.py b/scripts/mobiles/generic/faction/rebel/rebel_general.py new file mode 100644 index 00000000..8b921c07 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_general.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mission_rebel_general') + mobileTemplate.setLevel(28) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_general_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_general_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_general_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_general_old_twilek_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_general_rieekan_01.iff') + templates.add('object/mobile/shared_dressed_rebel_general_rodian_female_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_brigadier_general', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_grenadier_25.py b/scripts/mobiles/generic/faction/rebel/rebel_grenadier_25.py new file mode 100644 index 00000000..607d3640 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_grenadier_25.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_grenadier') + mobileTemplate.setLevel(25) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_grenadier_25', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_grenadier_75.py b/scripts/mobiles/generic/faction/rebel/rebel_grenadier_75.py new file mode 100644 index 00000000..4d21badb --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_grenadier_75.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_grenadier') + mobileTemplate.setLevel(75) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_grenadier_75', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_guard_25.py b/scripts/mobiles/generic/faction/rebel/rebel_guard_25.py new file mode 100644 index 00000000..a61d4b6c --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_guard_25.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_guardsman') + mobileTemplate.setLevel(25) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_guard_25', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_guard_74.py b/scripts/mobiles/generic/faction/rebel/rebel_guard_74.py new file mode 100644 index 00000000..3aba7b07 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_guard_74.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_guardsman') + mobileTemplate.setLevel(74) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_guard_74', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_guard_captain_25.py b/scripts/mobiles/generic/faction/rebel/rebel_guard_captain_25.py new file mode 100644 index 00000000..38ebd9aa --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_guard_captain_25.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_guard_captain') + mobileTemplate.setLevel(25) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_guard_captain_25', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_guard_captain_76.py b/scripts/mobiles/generic/faction/rebel/rebel_guard_captain_76.py new file mode 100644 index 00000000..c0197c93 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_guard_captain_76.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_guard_captain') + mobileTemplate.setLevel(76) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_guard_captain_76', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_high_general.py b/scripts/mobiles/generic/faction/rebel/rebel_high_general.py new file mode 100644 index 00000000..de17aac5 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_high_general.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mission_rebel_high_general') + mobileTemplate.setLevel(29) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_high_general_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_high_general_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_high_general_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_high_general_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_high_general_old_twilek_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_high_general_sullustan_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_high_general', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_lance_corporal.py b/scripts/mobiles/generic/faction/rebel/rebel_lance_corporal.py new file mode 100644 index 00000000..9efaa71d --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_lance_corporal.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('mission_rebel_lance_corporal') + mobileTemplate.setLevel(15) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(6) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_corporal_bith_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_bothan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_moncal_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_corporal_sullustan_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_lance_corporal', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_liberator.py b/scripts/mobiles/generic/faction/rebel/rebel_liberator.py new file mode 100644 index 00000000..0a5782e4 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_liberator.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('crackdown_rebel_liberator') + mobileTemplate.setLevel(28) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_female_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_02.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_03.iff') + templates.add('object/mobile/shared_dressed_rebel_crewman_human_male_04.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_liberator', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_weapons_leader.py b/scripts/mobiles/generic/faction/rebel/rebel_weapons_leader.py new file mode 100644 index 00000000..eccef4e9 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_weapons_leader.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_heavy_trooper_extreme') + mobileTemplate.setLevel(89) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_weapons_leader', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_weapons_master_50.py b/scripts/mobiles/generic/faction/rebel/rebel_weapons_master_50.py new file mode 100644 index 00000000..33c09a73 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_weapons_master_50.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_heavy_trooper_hard') + mobileTemplate.setLevel(50) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_weapons_master_50', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/rebel_weapons_master_86.py b/scripts/mobiles/generic/faction/rebel/rebel_weapons_master_86.py new file mode 100644 index 00000000..736a2aa2 --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/rebel_weapons_master_86.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('fbase_rebel_heavy_trooper_hard') + mobileTemplate.setLevel(86) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_dressed_rebel_trooper_bith_m_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_human_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_sullustan_male_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_rebel_trooper_twk_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('rebel_weapons_master_86', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/super_battle_droid_reb.py b/scripts/mobiles/generic/faction/rebel/super_battle_droid_reb.py new file mode 100644 index 00000000..b6d1014d --- /dev/null +++ b/scripts/mobiles/generic/faction/rebel/super_battle_droid_reb.py @@ -0,0 +1,42 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from resources.datatables import FactionStatus +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('rebel_super_battle_droid') + mobileTemplate.setLevel(86) + mobileTemplate.setDifficulty(Difficulty.ELITE) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(True) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("rebel") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + mobileTemplate.setFaction("rebel") + mobileTemplate.setFactionStatus(FactionStatus.Combatant) + + templates = Vector() + templates.add('object/mobile/shared_super_battle_droid.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('sbd_rebel', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/generic/faction/rebel/tamed_gurrcat.py b/scripts/mobiles/generic/faction/rebel/tamed_gurrcat.py index 90fea542..3cd10957 100644 --- a/scripts/mobiles/generic/faction/rebel/tamed_gurrcat.py +++ b/scripts/mobiles/generic/faction/rebel/tamed_gurrcat.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,13 +23,13 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("dire cat") mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("rebel") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_gurrcat.iff') diff --git a/scripts/mobiles/generic/faction/rebel/tamed_huurton.py b/scripts/mobiles/generic/faction/rebel/tamed_huurton.py index 2487c0d9..eef92a69 100644 --- a/scripts/mobiles/generic/faction/rebel/tamed_huurton.py +++ b/scripts/mobiles/generic/faction/rebel/tamed_huurton.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,7 +23,7 @@ def addTemplate(core): mobileTemplate.setAssistRange(12) mobileTemplate.setStalker(False) mobileTemplate.setFaction("rebel") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_huurton.iff') diff --git a/scripts/mobiles/generic/faction/rebel/tamed_razor_cat.py b/scripts/mobiles/generic/faction/rebel/tamed_razor_cat.py index 12f7e319..afe12ea8 100644 --- a/scripts/mobiles/generic/faction/rebel/tamed_razor_cat.py +++ b/scripts/mobiles/generic/faction/rebel/tamed_razor_cat.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,13 +23,13 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("razor cat") mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(True) mobileTemplate.setFaction("rebel") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_corellian_sand_panther.iff') diff --git a/scripts/mobiles/generic/faction/rebel/tamed_slice_hound.py b/scripts/mobiles/generic/faction/rebel/tamed_slice_hound.py index 49918fd1..5976d595 100644 --- a/scripts/mobiles/generic/faction/rebel/tamed_slice_hound.py +++ b/scripts/mobiles/generic/faction/rebel/tamed_slice_hound.py @@ -4,6 +4,7 @@ from services.spawn import WeaponTemplate from resources.datatables import WeaponType from resources.datatables import Difficulty from resources.datatables import Options +from resources.datatables import FactionStatus from java.util import Vector @@ -22,13 +23,13 @@ def addTemplate(core): mobileTemplate.setMeatAmount(65) mobileTemplate.setHideType("Bristly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(30) mobileTemplate.setSocialGroup("slice hound") mobileTemplate.setAssistRange(6) mobileTemplate.setStalker(False) mobileTemplate.setFaction("rebel") - mobileTemplate.setFactionStatus(1) + mobileTemplate.setFactionStatus(FactionStatus.Combatant) templates = Vector() templates.add('object/mobile/shared_corellian_slice_hound.iff') diff --git a/scripts/mobiles/naboo/alpha_veermok.py b/scripts/mobiles/naboo/alpha_veermok.py index 541095e0..f80c1fb3 100644 --- a/scripts/mobiles/naboo/alpha_veermok.py +++ b/scripts/mobiles/naboo/alpha_veermok.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(150) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(150) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(40) mobileTemplate.setSocialGroup("veermok") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/naboo/bachelor_gualama.py b/scripts/mobiles/naboo/bachelor_gualama.py index c9795ec9..2c788785 100644 --- a/scripts/mobiles/naboo/bachelor_gualama.py +++ b/scripts/mobiles/naboo/bachelor_gualama.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(150) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(150) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(90) mobileTemplate.setSocialGroup("gualama") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/naboo/bolle_bol.py b/scripts/mobiles/naboo/bolle_bol.py index f91097eb..2d28b666 100644 --- a/scripts/mobiles/naboo/bolle_bol.py +++ b/scripts/mobiles/naboo/bolle_bol.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(450) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(300) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(180) mobileTemplate.setSocialGroup("bolle bol") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/naboo/fambaa.py b/scripts/mobiles/naboo/fambaa.py index be77cf48..8e934269 100644 --- a/scripts/mobiles/naboo/fambaa.py +++ b/scripts/mobiles/naboo/fambaa.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(1250) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(325) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(675) mobileTemplate.setSocialGroup("fambaa") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/naboo/gualama.py b/scripts/mobiles/naboo/gualama.py index 34b739c0..4d583c84 100644 --- a/scripts/mobiles/naboo/gualama.py +++ b/scripts/mobiles/naboo/gualama.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(200) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(150) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(90) mobileTemplate.setSocialGroup("gualama") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/naboo/narglatch.py b/scripts/mobiles/naboo/narglatch.py index 7c03d086..b61b1d2d 100644 --- a/scripts/mobiles/naboo/narglatch.py +++ b/scripts/mobiles/naboo/narglatch.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(60) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(45) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(40) mobileTemplate.setSocialGroup("narglatch") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/naboo/veermok.py b/scripts/mobiles/naboo/veermok.py index 29328650..67a28675 100644 --- a/scripts/mobiles/naboo/veermok.py +++ b/scripts/mobiles/naboo/veermok.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(150) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(150) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(60) mobileTemplate.setSocialGroup("veermok") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/rori/adult_pygmy_torton.py b/scripts/mobiles/rori/adult_pygmy_torton.py index 90cdcb97..24fd87a1 100644 --- a/scripts/mobiles/rori/adult_pygmy_torton.py +++ b/scripts/mobiles/rori/adult_pygmy_torton.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(600) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(400) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(600) mobileTemplate.setSocialGroup("torton") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/rori/bark_mite.py b/scripts/mobiles/rori/bark_mite.py index ddc5fbf4..206f4bb2 100644 --- a/scripts/mobiles/rori/bark_mite.py +++ b/scripts/mobiles/rori/bark_mite.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Scaley Hide") mobileTemplate.setHideAmount(4) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(3) mobileTemplate.setSocialGroup("bark mite") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/rori/bearded_jax.py b/scripts/mobiles/rori/bearded_jax.py index f7b7ef23..0af6982a 100644 --- a/scripts/mobiles/rori/bearded_jax.py +++ b/scripts/mobiles/rori/bearded_jax.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(15) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(15) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(10) mobileTemplate.setSocialGroup("jax") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/rori/pugoriss.py b/scripts/mobiles/rori/pugoriss.py index 7f7ab12e..f7a986c0 100644 --- a/scripts/mobiles/rori/pugoriss.py +++ b/scripts/mobiles/rori/pugoriss.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(375) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(425) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(375) mobileTemplate.setSocialGroup("pugoriss") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/rori/torton.py b/scripts/mobiles/rori/torton.py index 1f53052b..04d114c8 100644 --- a/scripts/mobiles/rori/torton.py +++ b/scripts/mobiles/rori/torton.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(1300) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(1150) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(1300) mobileTemplate.setSocialGroup("torton") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/rori/vir_vur.py b/scripts/mobiles/rori/vir_vur.py index 1e8929ff..387272ce 100644 --- a/scripts/mobiles/rori/vir_vur.py +++ b/scripts/mobiles/rori/vir_vur.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setMeatType("Avian Meat") mobileTemplate.setMeatAmount(10) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(4) mobileTemplate.setSocialGroup("vir vur") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/spawnareas/naboo_lair_center_1.py b/scripts/mobiles/spawnareas/naboo_lair_center_1.py new file mode 100644 index 00000000..1764e88c --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_center_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', -3600, 500, 1500, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/naboo_lair_center_2.py b/scripts/mobiles/spawnareas/naboo_lair_center_2.py new file mode 100644 index 00000000..1b2f2fc4 --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_center_2.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', -400, 700, 2000, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/naboo_lair_center_3.py b/scripts/mobiles/spawnareas/naboo_lair_center_3.py new file mode 100644 index 00000000..62512e9c --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_center_3.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', -2400, 2300, 1200, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/naboo_lair_e_1.py b/scripts/mobiles/spawnareas/naboo_lair_e_1.py new file mode 100644 index 00000000..3eae367a --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_e_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', 4900, -1200, 3700, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/naboo_lair_n_1.py b/scripts/mobiles/spawnareas/naboo_lair_n_1.py new file mode 100644 index 00000000..2e89cafa --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_n_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', -500, 5200, 2700, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/naboo_lair_ne_1.py b/scripts/mobiles/spawnareas/naboo_lair_ne_1.py new file mode 100644 index 00000000..2ea5493c --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_ne_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', 5300, 5000, 3300, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/naboo_lair_nw_1.py b/scripts/mobiles/spawnareas/naboo_lair_nw_1.py new file mode 100644 index 00000000..3e4739fd --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_nw_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', -5700, 4700, 3200, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/naboo_lair_s2.py b/scripts/mobiles/spawnareas/naboo_lair_s2.py new file mode 100644 index 00000000..5bfe2ff8 --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_s2.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', -900, -2500, 2700, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/naboo_lair_s_1.py b/scripts/mobiles/spawnareas/naboo_lair_s_1.py new file mode 100644 index 00000000..791f408a --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_s_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', -1400, -5700, 2000, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/naboo_lair_s_3.py b/scripts/mobiles/spawnareas/naboo_lair_s_3.py new file mode 100644 index 00000000..74f26880 --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_s_3.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', 2400, -5800, 2200, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/naboo_lair_se_1.py b/scripts/mobiles/spawnareas/naboo_lair_se_1.py new file mode 100644 index 00000000..609bfae4 --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_se_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', 6500, -6200, 2300, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/naboo_lair_sw_1.py b/scripts/mobiles/spawnareas/naboo_lair_sw_1.py new file mode 100644 index 00000000..a75786a0 --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_sw_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', -6000, -4000, 3500, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/naboo_lair_w_1.py b/scripts/mobiles/spawnareas/naboo_lair_w_1.py new file mode 100644 index 00000000..def46008 --- /dev/null +++ b/scripts/mobiles/spawnareas/naboo_lair_w_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('naboo_starter', -6500, 500, 1700, 'naboo') + return diff --git a/scripts/mobiles/spawnareas/tatooine_lair_center_1.py b/scripts/mobiles/spawnareas/tatooine_lair_center_1.py new file mode 100644 index 00000000..74fa09c8 --- /dev/null +++ b/scripts/mobiles/spawnareas/tatooine_lair_center_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('tatooine_starter', -2400, 3600, 1800, 'tatooine') + return diff --git a/scripts/mobiles/spawnareas/tatooine_lair_center_2.py b/scripts/mobiles/spawnareas/tatooine_lair_center_2.py new file mode 100644 index 00000000..e941ed59 --- /dev/null +++ b/scripts/mobiles/spawnareas/tatooine_lair_center_2.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('tatooine_starter', -1300, 500, 2000, 'tatooine') + return diff --git a/scripts/mobiles/spawnareas/tatooine_lair_center_3.py b/scripts/mobiles/spawnareas/tatooine_lair_center_3.py new file mode 100644 index 00000000..8f57813a --- /dev/null +++ b/scripts/mobiles/spawnareas/tatooine_lair_center_3.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('tatooine_starter', 1700, -2200, 2400, 'tatooine') + return diff --git a/scripts/mobiles/spawnareas/tatooine_lair_e_1.py b/scripts/mobiles/spawnareas/tatooine_lair_e_1.py new file mode 100644 index 00000000..59dd2198 --- /dev/null +++ b/scripts/mobiles/spawnareas/tatooine_lair_e_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('tatooine_starter', 6300, -2200, 2600, 'tatooine') + return diff --git a/scripts/mobiles/spawnareas/tatooine_lair_n_1.py b/scripts/mobiles/spawnareas/tatooine_lair_n_1.py new file mode 100644 index 00000000..b6e3b6b9 --- /dev/null +++ b/scripts/mobiles/spawnareas/tatooine_lair_n_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('tatooine_starter', -1800, 6500, 1900, 'tatooine') + return diff --git a/scripts/mobiles/spawnareas/tatooine_lair_ne_1.py b/scripts/mobiles/spawnareas/tatooine_lair_ne_1.py new file mode 100644 index 00000000..22eb88af --- /dev/null +++ b/scripts/mobiles/spawnareas/tatooine_lair_ne_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('tatooine_starter', 4000, 4200, 4800, 'tatooine') + return diff --git a/scripts/mobiles/spawnareas/tatooine_lair_nw_1.py b/scripts/mobiles/spawnareas/tatooine_lair_nw_1.py new file mode 100644 index 00000000..f51a55fb --- /dev/null +++ b/scripts/mobiles/spawnareas/tatooine_lair_nw_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('tatooine_starter', -5900, 6100, 2500, 'tatooine') + return diff --git a/scripts/mobiles/spawnareas/tatooine_lair_s_1.py b/scripts/mobiles/spawnareas/tatooine_lair_s_1.py new file mode 100644 index 00000000..3dae081b --- /dev/null +++ b/scripts/mobiles/spawnareas/tatooine_lair_s_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('tatooine_starter', 1200, -6500, 2200, 'tatooine') + return diff --git a/scripts/mobiles/spawnareas/tatooine_lair_s_2.py b/scripts/mobiles/spawnareas/tatooine_lair_s_2.py new file mode 100644 index 00000000..e132c56c --- /dev/null +++ b/scripts/mobiles/spawnareas/tatooine_lair_s_2.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('tatooine_starter', 3700, -7000, 1500, 'tatooine') + return diff --git a/scripts/mobiles/spawnareas/tatooine_lair_se_1.py b/scripts/mobiles/spawnareas/tatooine_lair_se_1.py new file mode 100644 index 00000000..ccfc75e9 --- /dev/null +++ b/scripts/mobiles/spawnareas/tatooine_lair_se_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('tatooine_starter', 6300, -6400, 2200, 'tatooine') + return diff --git a/scripts/mobiles/spawnareas/tatooine_lair_w_1.py b/scripts/mobiles/spawnareas/tatooine_lair_w_1.py new file mode 100644 index 00000000..754b1ba0 --- /dev/null +++ b/scripts/mobiles/spawnareas/tatooine_lair_w_1.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('tatooine_starter', -5900, 1800, 2900, 'tatooine') + return diff --git a/scripts/mobiles/spawnareas/tatooine_lair_w_2.py b/scripts/mobiles/spawnareas/tatooine_lair_w_2.py new file mode 100644 index 00000000..7af63ee7 --- /dev/null +++ b/scripts/mobiles/spawnareas/tatooine_lair_w_2.py @@ -0,0 +1,6 @@ +# Spawn Area file created with PSWG Planetary Spawn Tool +import sys + +def addSpawnArea(core): + core.spawnService.addLairSpawnArea('tatooine_starter', -4500, -4300, 4300, 'tatooine') + return diff --git a/scripts/mobiles/talus/berserk_kahmurra.py b/scripts/mobiles/talus/berserk_kahmurra.py index 73a95a86..26b8d3f8 100644 --- a/scripts/mobiles/talus/berserk_kahmurra.py +++ b/scripts/mobiles/talus/berserk_kahmurra.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(50) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(50) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(35) mobileTemplate.setSocialGroup("kahmurra") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/borvos_mutant_kahmurra.py b/scripts/mobiles/talus/borvos_mutant_kahmurra.py index f7861a50..d03d8796 100644 --- a/scripts/mobiles/talus/borvos_mutant_kahmurra.py +++ b/scripts/mobiles/talus/borvos_mutant_kahmurra.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(50) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setBoneAmount(30) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(35) mobileTemplate.setSocialGroup("kahmurra") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/crazed_roba.py b/scripts/mobiles/talus/crazed_roba.py index 63bf2050..38b7b7a8 100644 --- a/scripts/mobiles/talus/crazed_roba.py +++ b/scripts/mobiles/talus/crazed_roba.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(12) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(18) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(12) mobileTemplate.setSocialGroup("self") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/docile_kahmurra.py b/scripts/mobiles/talus/docile_kahmurra.py index b71d1e0d..ac8dda29 100644 --- a/scripts/mobiles/talus/docile_kahmurra.py +++ b/scripts/mobiles/talus/docile_kahmurra.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(45) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setBoneAmount(27) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(32) mobileTemplate.setSocialGroup("self") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/famished_sludge_panther.py b/scripts/mobiles/talus/famished_sludge_panther.py index 0be48cfa..cfaeec32 100644 --- a/scripts/mobiles/talus/famished_sludge_panther.py +++ b/scripts/mobiles/talus/famished_sludge_panther.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(40) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(35) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(35) mobileTemplate.setSocialGroup("sludge panther") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/feeble_kima.py b/scripts/mobiles/talus/feeble_kima.py index 1237d6eb..c6d1ea61 100644 --- a/scripts/mobiles/talus/feeble_kima.py +++ b/scripts/mobiles/talus/feeble_kima.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setBoneAmount(7) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(5) mobileTemplate.setSocialGroup("kima") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/female_roba.py b/scripts/mobiles/talus/female_roba.py index dba25828..d42057a4 100644 --- a/scripts/mobiles/talus/female_roba.py +++ b/scripts/mobiles/talus/female_roba.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(10) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(15) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(10) mobileTemplate.setSocialGroup("roba") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/ferine_razorfang.py b/scripts/mobiles/talus/ferine_razorfang.py index a905b98b..b273475a 100644 --- a/scripts/mobiles/talus/ferine_razorfang.py +++ b/scripts/mobiles/talus/ferine_razorfang.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(7) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setBoneAmount(8) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(7) mobileTemplate.setSocialGroup("kima") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/foaming_vynock.py b/scripts/mobiles/talus/foaming_vynock.py index 1bbe01b7..e1a50098 100644 --- a/scripts/mobiles/talus/foaming_vynock.py +++ b/scripts/mobiles/talus/foaming_vynock.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(50) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(70) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(20) mobileTemplate.setSocialGroup("self") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/genetically_enhanced_kahmurra.py b/scripts/mobiles/talus/genetically_enhanced_kahmurra.py index db4e2790..daa5679f 100644 --- a/scripts/mobiles/talus/genetically_enhanced_kahmurra.py +++ b/scripts/mobiles/talus/genetically_enhanced_kahmurra.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(50) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(30) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(35) mobileTemplate.setSocialGroup("kahmurra") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/greater_sludge_panther.py b/scripts/mobiles/talus/greater_sludge_panther.py index 3abcac91..2377e035 100644 --- a/scripts/mobiles/talus/greater_sludge_panther.py +++ b/scripts/mobiles/talus/greater_sludge_panther.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(80) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(70) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(70) mobileTemplate.setSocialGroup("sludge panther") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/guf_drolg.py b/scripts/mobiles/talus/guf_drolg.py index bdbfed73..201de206 100644 --- a/scripts/mobiles/talus/guf_drolg.py +++ b/scripts/mobiles/talus/guf_drolg.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(350) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(275) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(200) mobileTemplate.setSocialGroup("guf drolg") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/guf_drolg_female.py b/scripts/mobiles/talus/guf_drolg_female.py index 77bceca5..30f0300b 100644 --- a/scripts/mobiles/talus/guf_drolg_female.py +++ b/scripts/mobiles/talus/guf_drolg_female.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(325) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(265) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(190) mobileTemplate.setSocialGroup("guf drolg") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/hilltop_kima.py b/scripts/mobiles/talus/hilltop_kima.py index 1cf62a1d..8c1ee553 100644 --- a/scripts/mobiles/talus/hilltop_kima.py +++ b/scripts/mobiles/talus/hilltop_kima.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(87) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(10) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(8) mobileTemplate.setSocialGroup("kima") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/huf_dun.py b/scripts/mobiles/talus/huf_dun.py index c66e6fac..2fac768a 100644 --- a/scripts/mobiles/talus/huf_dun.py +++ b/scripts/mobiles/talus/huf_dun.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(1350) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(1600) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(1350) mobileTemplate.setSocialGroup("huf dun") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/huf_dun_bull.py b/scripts/mobiles/talus/huf_dun_bull.py index b5f03fe3..f91c9e1f 100644 --- a/scripts/mobiles/talus/huf_dun_bull.py +++ b/scripts/mobiles/talus/huf_dun_bull.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(1350) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(1600) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(1350) mobileTemplate.setSocialGroup("huf dun") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/kima.py b/scripts/mobiles/talus/kima.py index b4aad377..6586aa34 100644 --- a/scripts/mobiles/talus/kima.py +++ b/scripts/mobiles/talus/kima.py @@ -24,7 +24,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(7) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(8) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(7) mobileTemplate.setSocialGroup("kima") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/male_roba.py b/scripts/mobiles/talus/male_roba.py index 31d02e7f..d23f00c5 100644 --- a/scripts/mobiles/talus/male_roba.py +++ b/scripts/mobiles/talus/male_roba.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(11) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(17) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(12) mobileTemplate.setSocialGroup("roba") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/meager_tortur.py b/scripts/mobiles/talus/meager_tortur.py index 8e354fa0..d8f9d1ac 100644 --- a/scripts/mobiles/talus/meager_tortur.py +++ b/scripts/mobiles/talus/meager_tortur.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(650) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(575) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(650) mobileTemplate.setSocialGroup("tortur") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/minor_guf_drolg.py b/scripts/mobiles/talus/minor_guf_drolg.py index 26302f02..6fb1f7c0 100644 --- a/scripts/mobiles/talus/minor_guf_drolg.py +++ b/scripts/mobiles/talus/minor_guf_drolg.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(300) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(240) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(170) mobileTemplate.setSocialGroup("guf drolg") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/minor_sludge_panther.py b/scripts/mobiles/talus/minor_sludge_panther.py index 719372b3..c890b117 100644 --- a/scripts/mobiles/talus/minor_sludge_panther.py +++ b/scripts/mobiles/talus/minor_sludge_panther.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(20) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(27) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(27) mobileTemplate.setSocialGroup("sludge panther") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/mire_marauder.py b/scripts/mobiles/talus/mire_marauder.py index a6780a50..e304c40a 100644 --- a/scripts/mobiles/talus/mire_marauder.py +++ b/scripts/mobiles/talus/mire_marauder.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(150) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(140) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(140) mobileTemplate.setSocialGroup("sludge panther") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/mutated_kahmurra.py b/scripts/mobiles/talus/mutated_kahmurra.py index d3101c46..c29d8531 100644 --- a/scripts/mobiles/talus/mutated_kahmurra.py +++ b/scripts/mobiles/talus/mutated_kahmurra.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(50) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(33) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setBoneAmount(37) mobileTemplate.setSocialGroup("kahmurra") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/rabid_mutant_kahmurra.py b/scripts/mobiles/talus/rabid_mutant_kahmurra.py index 00f82c55..f52b1256 100644 --- a/scripts/mobiles/talus/rabid_mutant_kahmurra.py +++ b/scripts/mobiles/talus/rabid_mutant_kahmurra.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(50) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(30) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setBoneAmount(35) mobileTemplate.setSocialGroup("kahmurra") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/savage_guf_drolg.py b/scripts/mobiles/talus/savage_guf_drolg.py index 4b25eeb4..96e1a060 100644 --- a/scripts/mobiles/talus/savage_guf_drolg.py +++ b/scripts/mobiles/talus/savage_guf_drolg.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(550) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(460) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(320) mobileTemplate.setSocialGroup("guf drolg") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/sludge_panther.py b/scripts/mobiles/talus/sludge_panther.py index 568ba4e2..b846deab 100644 --- a/scripts/mobiles/talus/sludge_panther.py +++ b/scripts/mobiles/talus/sludge_panther.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(24) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setBoneAmount(30) - mobileTemplate.setBoneType("Mammal Bone") + mobileTemplate.setBoneType("Animal Bone") mobileTemplate.setHideAmount(31) mobileTemplate.setSocialGroup("sludge panther") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/stunted_huf_dun.py b/scripts/mobiles/talus/stunted_huf_dun.py index 5edfd8d8..cffb0eee 100644 --- a/scripts/mobiles/talus/stunted_huf_dun.py +++ b/scripts/mobiles/talus/stunted_huf_dun.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(775) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(800) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(775) mobileTemplate.setSocialGroup("huf dun") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/tortur_bull.py b/scripts/mobiles/talus/tortur_bull.py index 4375ab35..c650aef3 100644 --- a/scripts/mobiles/talus/tortur_bull.py +++ b/scripts/mobiles/talus/tortur_bull.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(1300) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(1151) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(1301) mobileTemplate.setSocialGroup("tortur") mobileTemplate.setAssistRange(0) diff --git a/scripts/mobiles/talus/vicious_huf_dun.py b/scripts/mobiles/talus/vicious_huf_dun.py index 5d9da0f4..6e8ac39b 100644 --- a/scripts/mobiles/talus/vicious_huf_dun.py +++ b/scripts/mobiles/talus/vicious_huf_dun.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(850) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(900) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(850) mobileTemplate.setSocialGroup("huf dun") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/talus/wolf_kima.py b/scripts/mobiles/talus/wolf_kima.py index df81f6ba..d436c84f 100644 --- a/scripts/mobiles/talus/wolf_kima.py +++ b/scripts/mobiles/talus/wolf_kima.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(10) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(11) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(10) mobileTemplate.setSocialGroup("kima") mobileTemplate.setAssistRange(6) diff --git a/scripts/mobiles/tatooine/brok_ziamzun.py b/scripts/mobiles/tatooine/brok_ziamzun.py new file mode 100644 index 00000000..99b6b6fb --- /dev/null +++ b/scripts/mobiles/tatooine/brok_ziamzun.py @@ -0,0 +1,41 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('tatooine_opening_brok') + mobileTemplate.setLevel(14) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("whitethranta") + mobileTemplate.setAssistRange(3) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + + templates = Vector() + templates.add('object/mobile/shared_dressed_tatooine_opening_brok.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShotpistol') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('brok_ziamzun', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/desert_demon.py b/scripts/mobiles/tatooine/desert_demon.py index d64649bc..578b7dbb 100644 --- a/scripts/mobiles/tatooine/desert_demon.py +++ b/scripts/mobiles/tatooine/desert_demon.py @@ -11,7 +11,8 @@ def addTemplate(core): mobileTemplate = MobileTemplate() mobileTemplate.setCreatureName('desert_demon') - mobileTemplate.setLevel(13) + mobileTemplate.setMinLevel(13) + mobileTemplate.setMaxLevel(14) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) @@ -21,7 +22,8 @@ def addTemplate(core): mobileTemplate.setSocialGroup("desert demon") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) - + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_desert_demon.iff') diff --git a/scripts/mobiles/tatooine/desert_demon_bodyguard.py b/scripts/mobiles/tatooine/desert_demon_bodyguard.py index 9a72a31c..e572b55f 100644 --- a/scripts/mobiles/tatooine/desert_demon_bodyguard.py +++ b/scripts/mobiles/tatooine/desert_demon_bodyguard.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("desert demon") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/desert_demon_brawler.py b/scripts/mobiles/tatooine/desert_demon_brawler.py index a405ae70..f19a5dce 100644 --- a/scripts/mobiles/tatooine/desert_demon_brawler.py +++ b/scripts/mobiles/tatooine/desert_demon_brawler.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("desert demon") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/desert_demon_leader.py b/scripts/mobiles/tatooine/desert_demon_leader.py index 28b8bb67..85b7711c 100644 --- a/scripts/mobiles/tatooine/desert_demon_leader.py +++ b/scripts/mobiles/tatooine/desert_demon_leader.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("desert demon") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/desert_demon_marksman.py b/scripts/mobiles/tatooine/desert_demon_marksman.py index 57dd8f55..a02ab449 100644 --- a/scripts/mobiles/tatooine/desert_demon_marksman.py +++ b/scripts/mobiles/tatooine/desert_demon_marksman.py @@ -21,7 +21,8 @@ def addTemplate(core): mobileTemplate.setSocialGroup("desert demon") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(True) - + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_desert_demon_marksman.iff') diff --git a/scripts/mobiles/tatooine/dune_stalker_brawler.py b/scripts/mobiles/tatooine/dune_stalker_brawler.py index cb8f9ff1..e5b0ed58 100644 --- a/scripts/mobiles/tatooine/dune_stalker_brawler.py +++ b/scripts/mobiles/tatooine/dune_stalker_brawler.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("dune stalker") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_dune_stalker_brawler.iff') diff --git a/scripts/mobiles/tatooine/dune_stalker_enforcer.py b/scripts/mobiles/tatooine/dune_stalker_enforcer.py index 8c308769..fd686b36 100644 --- a/scripts/mobiles/tatooine/dune_stalker_enforcer.py +++ b/scripts/mobiles/tatooine/dune_stalker_enforcer.py @@ -21,6 +21,8 @@ def addTemplate(core): mobileTemplate.setSocialGroup("dune stalker") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_dune_stalker.iff') diff --git a/scripts/mobiles/tatooine/dune_stalker_leader.py b/scripts/mobiles/tatooine/dune_stalker_leader.py index a0be485f..6a6cfacb 100644 --- a/scripts/mobiles/tatooine/dune_stalker_leader.py +++ b/scripts/mobiles/tatooine/dune_stalker_leader.py @@ -21,7 +21,9 @@ def addTemplate(core): mobileTemplate.setSocialGroup("dune stalker") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(True) - + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_dune_stalker_leader.iff') mobileTemplate.setTemplates(templates) diff --git a/scripts/mobiles/tatooine/dune_stalker_marksman.py b/scripts/mobiles/tatooine/dune_stalker_marksman.py index 35717078..6ac3f1c6 100644 --- a/scripts/mobiles/tatooine/dune_stalker_marksman.py +++ b/scripts/mobiles/tatooine/dune_stalker_marksman.py @@ -21,6 +21,8 @@ def addTemplate(core): mobileTemplate.setSocialGroup("dune stalker") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_dune_stalker_marksman.iff') diff --git a/scripts/mobiles/tatooine/dune_stalker_scavenger.py b/scripts/mobiles/tatooine/dune_stalker_scavenger.py index cd248bab..be2e4bea 100644 --- a/scripts/mobiles/tatooine/dune_stalker_scavenger.py +++ b/scripts/mobiles/tatooine/dune_stalker_scavenger.py @@ -21,6 +21,8 @@ def addTemplate(core): mobileTemplate.setSocialGroup("dune stalker") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_dune_stalker.iff') diff --git a/scripts/mobiles/tatooine/durr_rodak.py b/scripts/mobiles/tatooine/durr_rodak.py new file mode 100644 index 00000000..74bc24df --- /dev/null +++ b/scripts/mobiles/tatooine/durr_rodak.py @@ -0,0 +1,41 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('tatooine_opening_dren') + mobileTemplate.setLevel(13) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("whitethranta") + mobileTemplate.setAssistRange(3) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + + templates = Vector() + templates.add('object/mobile/shared_dressed_tatooine_opening_dren.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShotpistol') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('durr_rodak', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/gunrunner1.py b/scripts/mobiles/tatooine/gunrunner1.py index c306089f..94ec84fb 100644 --- a/scripts/mobiles/tatooine/gunrunner1.py +++ b/scripts/mobiles/tatooine/gunrunner1.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("mercenary") mobileTemplate.setAssistRange(0) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() templates.add('object/mobile/shared_dressed_tatooine_gunrunner.iff') diff --git a/scripts/mobiles/tatooine/modified_battle_droid.py b/scripts/mobiles/tatooine/modified_battle_droid.py new file mode 100644 index 00000000..1ae1b6a3 --- /dev/null +++ b/scripts/mobiles/tatooine/modified_battle_droid.py @@ -0,0 +1,40 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('tatooine_lin_demolitionmech') + mobileTemplate.setLevel(16) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("modified battle droid") + mobileTemplate.setAssistRange(4) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_battle_droid.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('modified_battle_droid', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/rock_beetle.py b/scripts/mobiles/tatooine/rock_beetle.py index 382b139a..80b5362d 100644 --- a/scripts/mobiles/tatooine/rock_beetle.py +++ b/scripts/mobiles/tatooine/rock_beetle.py @@ -12,14 +12,12 @@ def addTemplate(core): mobileTemplate.setCreatureName('rock_beetle') mobileTemplate.setLevel(18) - mobileTemplate.setMinLevel(17) - mobileTemplate.setMaxLevel(18) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) mobileTemplate.setMaxSpawnDistance(8) mobileTemplate.setDeathblow(False) - mobileTemplate.setScale(1) + mobileTemplate.setScale(2) mobileTemplate.setMeatType("Insect Meat") mobileTemplate.setMeatAmount(8) mobileTemplate.setHideType("Scaley Hide") @@ -27,6 +25,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("rock beetle") mobileTemplate.setAssistRange(6) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() templates.add('object/mobile/shared_rock_beetle.iff') diff --git a/scripts/mobiles/tatooine/rock_beetle1.py b/scripts/mobiles/tatooine/rock_beetle1.py index 90002552..97d33dda 100644 --- a/scripts/mobiles/tatooine/rock_beetle1.py +++ b/scripts/mobiles/tatooine/rock_beetle1.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('rock_beetle') mobileTemplate.setLevel(19) - mobileTemplate.setMinLevel(18) - mobileTemplate.setMaxLevel(19) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/rock_beetle_cave.py b/scripts/mobiles/tatooine/rock_beetle_cave.py index 8730ffd7..30cbabad 100644 --- a/scripts/mobiles/tatooine/rock_beetle_cave.py +++ b/scripts/mobiles/tatooine/rock_beetle_cave.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('rock_beetle_cave') mobileTemplate.setLevel(19) - mobileTemplate.setMinLevel(18) - mobileTemplate.setMaxLevel(19) mobileTemplate.setDifficulty(Difficulty.ELITE) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/tusken_outrider.py b/scripts/mobiles/tatooine/tusken_outrider.py index 7cf08008..e01ce81b 100644 --- a/scripts/mobiles/tatooine/tusken_outrider.py +++ b/scripts/mobiles/tatooine/tusken_outrider.py @@ -21,7 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("tusken raider") mobileTemplate.setAssistRange(6) mobileTemplate.setStalker(False) - + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() templates.add('object/mobile/shared_tusken_raider.iff') diff --git a/scripts/mobiles/tatooine/valarian_depot_boss.py b/scripts/mobiles/tatooine/valarian_depot_boss.py index af7fdcc8..0745dd3c 100644 --- a/scripts/mobiles/tatooine/valarian_depot_boss.py +++ b/scripts/mobiles/tatooine/valarian_depot_boss.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_depot_foreman.py b/scripts/mobiles/tatooine/valarian_depot_foreman.py index d976881e..49857e62 100644 --- a/scripts/mobiles/tatooine/valarian_depot_foreman.py +++ b/scripts/mobiles/tatooine/valarian_depot_foreman.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_depot_guard.py b/scripts/mobiles/tatooine/valarian_depot_guard.py index 0cac75ce..abcb1db4 100644 --- a/scripts/mobiles/tatooine/valarian_depot_guard.py +++ b/scripts/mobiles/tatooine/valarian_depot_guard.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_depot_scout.py b/scripts/mobiles/tatooine/valarian_depot_scout.py index b2a5081e..d0ec9222 100644 --- a/scripts/mobiles/tatooine/valarian_depot_scout.py +++ b/scripts/mobiles/tatooine/valarian_depot_scout.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_depot_swooper.py b/scripts/mobiles/tatooine/valarian_depot_swooper.py index ee2b41dd..4f7ef586 100644 --- a/scripts/mobiles/tatooine/valarian_depot_swooper.py +++ b/scripts/mobiles/tatooine/valarian_depot_swooper.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_depot_worker.py b/scripts/mobiles/tatooine/valarian_depot_worker.py index 903715ef..b910f1fd 100644 --- a/scripts/mobiles/tatooine/valarian_depot_worker.py +++ b/scripts/mobiles/tatooine/valarian_depot_worker.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_enforcer.py b/scripts/mobiles/tatooine/valarian_enforcer.py index 96b7dc2d..48e6bc23 100644 --- a/scripts/mobiles/tatooine/valarian_enforcer.py +++ b/scripts/mobiles/tatooine/valarian_enforcer.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_henchman.py b/scripts/mobiles/tatooine/valarian_henchman.py index 8d0d9c4d..9c7bda15 100644 --- a/scripts/mobiles/tatooine/valarian_henchman.py +++ b/scripts/mobiles/tatooine/valarian_henchman.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_mechanic.py b/scripts/mobiles/tatooine/valarian_mechanic.py index d69542ff..0647a189 100644 --- a/scripts/mobiles/tatooine/valarian_mechanic.py +++ b/scripts/mobiles/tatooine/valarian_mechanic.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_scout.py b/scripts/mobiles/tatooine/valarian_scout.py index 05106f69..0e7dcc0d 100644 --- a/scripts/mobiles/tatooine/valarian_scout.py +++ b/scripts/mobiles/tatooine/valarian_scout.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_shuttle_guard.py b/scripts/mobiles/tatooine/valarian_shuttle_guard.py index cc71c614..07af7c3c 100644 --- a/scripts/mobiles/tatooine/valarian_shuttle_guard.py +++ b/scripts/mobiles/tatooine/valarian_shuttle_guard.py @@ -23,6 +23,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_swooper.py b/scripts/mobiles/tatooine/valarian_swooper.py index d4ef89c1..e98762a9 100644 --- a/scripts/mobiles/tatooine/valarian_swooper.py +++ b/scripts/mobiles/tatooine/valarian_swooper.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_thief.py b/scripts/mobiles/tatooine/valarian_thief.py index 9473f552..32da20f0 100644 --- a/scripts/mobiles/tatooine/valarian_thief.py +++ b/scripts/mobiles/tatooine/valarian_thief.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/tatooine/valarian_thug.py b/scripts/mobiles/tatooine/valarian_thug.py index 55dcf27b..83011c5e 100644 --- a/scripts/mobiles/tatooine/valarian_thug.py +++ b/scripts/mobiles/tatooine/valarian_thug.py @@ -21,6 +21,7 @@ def addTemplate(core): mobileTemplate.setSocialGroup("valarian") mobileTemplate.setAssistRange(4) mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE) templates = Vector() diff --git a/scripts/mobiles/yavin4/ancient_mamien.py b/scripts/mobiles/yavin4/ancient_mamien.py index 72e1c73e..57132e76 100644 --- a/scripts/mobiles/yavin4/ancient_mamien.py +++ b/scripts/mobiles/yavin4/ancient_mamien.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(20) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(20) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(20) mobileTemplate.setSocialGroup("mamien") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/elder_mamien.py b/scripts/mobiles/yavin4/elder_mamien.py index e6a63191..3f6d25cb 100644 --- a/scripts/mobiles/yavin4/elder_mamien.py +++ b/scripts/mobiles/yavin4/elder_mamien.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(35) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(40) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(45) mobileTemplate.setSocialGroup("mamien") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/enraged_tybis.py b/scripts/mobiles/yavin4/enraged_tybis.py index 7d1d0c25..ca5b37dd 100644 --- a/scripts/mobiles/yavin4/enraged_tybis.py +++ b/scripts/mobiles/yavin4/enraged_tybis.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(220) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(160) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(105) mobileTemplate.setSocialGroup("tybis") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/female_mamien.py b/scripts/mobiles/yavin4/female_mamien.py index 9c7e0488..d810d87a 100644 --- a/scripts/mobiles/yavin4/female_mamien.py +++ b/scripts/mobiles/yavin4/female_mamien.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(45) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(20) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(20) mobileTemplate.setSocialGroup("mamien") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/female_tybis.py b/scripts/mobiles/yavin4/female_tybis.py index 29ac58bf..4d6d7edd 100644 --- a/scripts/mobiles/yavin4/female_tybis.py +++ b/scripts/mobiles/yavin4/female_tybis.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(220) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(160) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(105) mobileTemplate.setSocialGroup("tybis") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/gackle_bat.py b/scripts/mobiles/yavin4/gackle_bat.py index 957e5aee..d32e7b97 100644 --- a/scripts/mobiles/yavin4/gackle_bat.py +++ b/scripts/mobiles/yavin4/gackle_bat.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(4) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(2) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(3) mobileTemplate.setSocialGroup("gacklebat") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/gackle_bat_hunter.py b/scripts/mobiles/yavin4/gackle_bat_hunter.py index 6f0d8648..a658a998 100644 --- a/scripts/mobiles/yavin4/gackle_bat_hunter.py +++ b/scripts/mobiles/yavin4/gackle_bat_hunter.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(4) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(2) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(3) mobileTemplate.setSocialGroup("gacklebat") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/geonosian_bunker/enhanced_kwi.py b/scripts/mobiles/yavin4/geonosian_bunker/enhanced_kwi.py index 4fd13a9a..a8dcafb7 100644 --- a/scripts/mobiles/yavin4/geonosian_bunker/enhanced_kwi.py +++ b/scripts/mobiles/yavin4/geonosian_bunker/enhanced_kwi.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(100) mobileTemplate.setHideType("Leathery Hide") mobileTemplate.setHideAmount(85) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(75) mobileTemplate.setSocialGroup("geonosian bunker") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/giant_gackle_bat.py b/scripts/mobiles/yavin4/giant_gackle_bat.py index 9d21cf31..bab98658 100644 --- a/scripts/mobiles/yavin4/giant_gackle_bat.py +++ b/scripts/mobiles/yavin4/giant_gackle_bat.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(7) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(5) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(6) mobileTemplate.setSocialGroup("gacklebat") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/giant_stintaril.py b/scripts/mobiles/yavin4/giant_stintaril.py index a6412c00..f3349c77 100644 --- a/scripts/mobiles/yavin4/giant_stintaril.py +++ b/scripts/mobiles/yavin4/giant_stintaril.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(9) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(7) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(6) mobileTemplate.setSocialGroup("stintaril") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/male_mamien.py b/scripts/mobiles/yavin4/male_mamien.py index ffebceaa..d5797c41 100644 --- a/scripts/mobiles/yavin4/male_mamien.py +++ b/scripts/mobiles/yavin4/male_mamien.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(45) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(20) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(20) mobileTemplate.setSocialGroup("mamien") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/male_tybis.py b/scripts/mobiles/yavin4/male_tybis.py index eda71959..92a194c9 100644 --- a/scripts/mobiles/yavin4/male_tybis.py +++ b/scripts/mobiles/yavin4/male_tybis.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(275) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(200) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(125) mobileTemplate.setSocialGroup("tybis") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/mamien_junglelord.py b/scripts/mobiles/yavin4/mamien_junglelord.py index f397f445..086edb9c 100644 --- a/scripts/mobiles/yavin4/mamien_junglelord.py +++ b/scripts/mobiles/yavin4/mamien_junglelord.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(18) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(18) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(18) mobileTemplate.setSocialGroup("mamien") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/mamien_matriarch.py b/scripts/mobiles/yavin4/mamien_matriarch.py index 670a9d16..73a8fdf7 100644 --- a/scripts/mobiles/yavin4/mamien_matriarch.py +++ b/scripts/mobiles/yavin4/mamien_matriarch.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(17) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(20) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(20) mobileTemplate.setSocialGroup("mamien") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/mamien_youth.py b/scripts/mobiles/yavin4/mamien_youth.py index 01c12951..2bd49a10 100644 --- a/scripts/mobiles/yavin4/mamien_youth.py +++ b/scripts/mobiles/yavin4/mamien_youth.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(35) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(20) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(20) mobileTemplate.setSocialGroup("mamien") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/ominous_skreeg.py b/scripts/mobiles/yavin4/ominous_skreeg.py index 41e14a10..03c961f8 100644 --- a/scripts/mobiles/yavin4/ominous_skreeg.py +++ b/scripts/mobiles/yavin4/ominous_skreeg.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(9) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(7) mobileTemplate.setSocialGroup("skreeg") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/puny_gackle_bat.py b/scripts/mobiles/yavin4/puny_gackle_bat.py index f61d823a..6bfd7529 100644 --- a/scripts/mobiles/yavin4/puny_gackle_bat.py +++ b/scripts/mobiles/yavin4/puny_gackle_bat.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(2) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(1) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(1) mobileTemplate.setSocialGroup("gacklebat") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/puny_stintaril.py b/scripts/mobiles/yavin4/puny_stintaril.py index 0c2c843e..5ce5dcc9 100644 --- a/scripts/mobiles/yavin4/puny_stintaril.py +++ b/scripts/mobiles/yavin4/puny_stintaril.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(2) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(1) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(1) mobileTemplate.setSocialGroup("stintaril") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/ravaging_gackle_bat.py b/scripts/mobiles/yavin4/ravaging_gackle_bat.py index 284d6f12..b4282450 100644 --- a/scripts/mobiles/yavin4/ravaging_gackle_bat.py +++ b/scripts/mobiles/yavin4/ravaging_gackle_bat.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(4) mobileTemplate.setSocialGroup("gacklebat") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/skreeg_adolescent.py b/scripts/mobiles/yavin4/skreeg_adolescent.py index aa93920f..a268aefa 100644 --- a/scripts/mobiles/yavin4/skreeg_adolescent.py +++ b/scripts/mobiles/yavin4/skreeg_adolescent.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(12) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(9) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(7) mobileTemplate.setSocialGroup("skreeg") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/skreeg_female.py b/scripts/mobiles/yavin4/skreeg_female.py index 447023f7..36b2767a 100644 --- a/scripts/mobiles/yavin4/skreeg_female.py +++ b/scripts/mobiles/yavin4/skreeg_female.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(9) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(7) mobileTemplate.setSocialGroup("skreeg") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/skreeg_gatherer.py b/scripts/mobiles/yavin4/skreeg_gatherer.py index 65166caa..9a9464c7 100644 --- a/scripts/mobiles/yavin4/skreeg_gatherer.py +++ b/scripts/mobiles/yavin4/skreeg_gatherer.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(18) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(9) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(7) mobileTemplate.setSocialGroup("skreeg") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/skreeg_hunter.py b/scripts/mobiles/yavin4/skreeg_hunter.py index 6855d166..75e89b9c 100644 --- a/scripts/mobiles/yavin4/skreeg_hunter.py +++ b/scripts/mobiles/yavin4/skreeg_hunter.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(9) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(7) mobileTemplate.setSocialGroup("skreeg") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/skreeg_infant.py b/scripts/mobiles/yavin4/skreeg_infant.py index dc969c5f..b4092804 100644 --- a/scripts/mobiles/yavin4/skreeg_infant.py +++ b/scripts/mobiles/yavin4/skreeg_infant.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(15) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(9) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(7) mobileTemplate.setSocialGroup("skreeg") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/skreeg_male.py b/scripts/mobiles/yavin4/skreeg_male.py index 1508a36e..ad37c48c 100644 --- a/scripts/mobiles/yavin4/skreeg_male.py +++ b/scripts/mobiles/yavin4/skreeg_male.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(9) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(7) mobileTemplate.setSocialGroup("skreeg") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/skreeg_scout.py b/scripts/mobiles/yavin4/skreeg_scout.py index a0e2e196..4862dc43 100644 --- a/scripts/mobiles/yavin4/skreeg_scout.py +++ b/scripts/mobiles/yavin4/skreeg_scout.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(9) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(7) mobileTemplate.setSocialGroup("skreeg") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/skreeg_warrior.py b/scripts/mobiles/yavin4/skreeg_warrior.py index 8b4a25fa..19dd183c 100644 --- a/scripts/mobiles/yavin4/skreeg_warrior.py +++ b/scripts/mobiles/yavin4/skreeg_warrior.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(9) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(7) mobileTemplate.setSocialGroup("skreeg") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/skreeg_warrior_elite.py b/scripts/mobiles/yavin4/skreeg_warrior_elite.py index 0cfd16c4..3bf0e929 100644 --- a/scripts/mobiles/yavin4/skreeg_warrior_elite.py +++ b/scripts/mobiles/yavin4/skreeg_warrior_elite.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(9) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(7) mobileTemplate.setSocialGroup("skreeg") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/stintaril.py b/scripts/mobiles/yavin4/stintaril.py index 1340650d..fbc96b73 100644 --- a/scripts/mobiles/yavin4/stintaril.py +++ b/scripts/mobiles/yavin4/stintaril.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("stintaril") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/stintaril_fleshripper.py b/scripts/mobiles/yavin4/stintaril_fleshripper.py index 5de1a956..ee2c6aa3 100644 --- a/scripts/mobiles/yavin4/stintaril_fleshripper.py +++ b/scripts/mobiles/yavin4/stintaril_fleshripper.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("stintaril") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/stintaril_prowler.py b/scripts/mobiles/yavin4/stintaril_prowler.py index 6807891f..c35f422e 100644 --- a/scripts/mobiles/yavin4/stintaril_prowler.py +++ b/scripts/mobiles/yavin4/stintaril_prowler.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("stintaril") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/stintaril_ravager.py b/scripts/mobiles/yavin4/stintaril_ravager.py index f3e3652e..a65834e2 100644 --- a/scripts/mobiles/yavin4/stintaril_ravager.py +++ b/scripts/mobiles/yavin4/stintaril_ravager.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("stintaril") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/stintaril_scavenger.py b/scripts/mobiles/yavin4/stintaril_scavenger.py index 57a614ed..4430a6d8 100644 --- a/scripts/mobiles/yavin4/stintaril_scavenger.py +++ b/scripts/mobiles/yavin4/stintaril_scavenger.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(5) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(3) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(2) mobileTemplate.setSocialGroup("stintaril") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/stunted_woolamander.py b/scripts/mobiles/yavin4/stunted_woolamander.py index 1d15920a..cb04115f 100644 --- a/scripts/mobiles/yavin4/stunted_woolamander.py +++ b/scripts/mobiles/yavin4/stunted_woolamander.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(20) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(20) mobileTemplate.setSocialGroup("woolamander") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/tybis.py b/scripts/mobiles/yavin4/tybis.py index 1ac228bc..cbb58387 100644 --- a/scripts/mobiles/yavin4/tybis.py +++ b/scripts/mobiles/yavin4/tybis.py @@ -22,7 +22,7 @@ def addTemplate(core): mobileTemplate.setMeatAmount(275) mobileTemplate.setHideType("Bristley Hide") mobileTemplate.setHideAmount(200) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(125) mobileTemplate.setSocialGroup("tybis") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/woolamander.py b/scripts/mobiles/yavin4/woolamander.py index dc2c53d5..8b8640ef 100644 --- a/scripts/mobiles/yavin4/woolamander.py +++ b/scripts/mobiles/yavin4/woolamander.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(20) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(20) mobileTemplate.setSocialGroup("woolamander") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/woolamander_gatherer.py b/scripts/mobiles/yavin4/woolamander_gatherer.py index c7dff97c..25afc320 100644 --- a/scripts/mobiles/yavin4/woolamander_gatherer.py +++ b/scripts/mobiles/yavin4/woolamander_gatherer.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(20) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(20) mobileTemplate.setSocialGroup("woolamander") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/woolamander_harrower.py b/scripts/mobiles/yavin4/woolamander_harrower.py index beea14ab..6b5c773d 100644 --- a/scripts/mobiles/yavin4/woolamander_harrower.py +++ b/scripts/mobiles/yavin4/woolamander_harrower.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(40) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(40) mobileTemplate.setSocialGroup("woolamander") mobileTemplate.setAssistRange(40) diff --git a/scripts/mobiles/yavin4/woolamander_harvester.py b/scripts/mobiles/yavin4/woolamander_harvester.py index 6f9b15a1..a9e34915 100644 --- a/scripts/mobiles/yavin4/woolamander_harvester.py +++ b/scripts/mobiles/yavin4/woolamander_harvester.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(20) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(20) mobileTemplate.setSocialGroup("woolamander") mobileTemplate.setAssistRange(12) diff --git a/scripts/mobiles/yavin4/woolamander_reaper.py b/scripts/mobiles/yavin4/woolamander_reaper.py index 612d929f..07ae4d59 100644 --- a/scripts/mobiles/yavin4/woolamander_reaper.py +++ b/scripts/mobiles/yavin4/woolamander_reaper.py @@ -20,7 +20,7 @@ def addTemplate(core): mobileTemplate.setScale(1) mobileTemplate.setHideType("Wooly Hide") mobileTemplate.setHideAmount(35) - mobileTemplate.setBoneType("Mammal Bones") + mobileTemplate.setBoneType("Animal Bones") mobileTemplate.setBoneAmount(20) mobileTemplate.setSocialGroup("woolamander") mobileTemplate.setAssistRange(12) diff --git a/scripts/object/building/corellia/bank_corellia.py b/scripts/object/building/corellia/bank_corellia.py index 8a96a6ad..f12ba66a 100644 --- a/scripts/object/building/corellia/bank_corellia.py +++ b/scripts/object/building/corellia/bank_corellia.py @@ -8,5 +8,6 @@ def setup(core, object): objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_bank.iff', 0, 0.5, -4.2, 1, 0) objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_bank.iff', 4.2, 0.5, 0.707107, 0.707107, 1) objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_bank.iff', -4.2, 0.5, 0, -0.707107, 0.707107) - + + core.mapService.addLocation(object.getPlanet(), 'Bank Terminal', object.getPosition().x, object.getPosition().z, 2, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/corellia/cantina_corellia.py b/scripts/object/building/corellia/cantina_corellia.py index ccad8904..ebffb61a 100644 --- a/scripts/object/building/corellia/cantina_corellia.py +++ b/scripts/object/building/corellia/cantina_corellia.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Cantina', object.getPosition().x, object.getPosition().z, 3, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/corellia/cloning_corellia.py b/scripts/object/building/corellia/cloning_corellia.py index 76288df2..4c77f4ab 100644 --- a/scripts/object/building/corellia/cloning_corellia.py +++ b/scripts/object/building/corellia/cloning_corellia.py @@ -17,6 +17,7 @@ def setup(core, object): spawnPoints.add(SpawnPoint(-2.84125, -4.79167, 0.657588, -0.0356012, 0.999366, 4)) object.setAttachment('spawnPoints', spawnPoints) - + + core.mapService.addLocation(object.getPlanet(), 'Cloning Facility', object.getPosition().x, object.getPosition().z, 5, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/corellia/garage_corellia.py b/scripts/object/building/corellia/garage_corellia.py index ccad8904..5ba07218 100644 --- a/scripts/object/building/corellia/garage_corellia.py +++ b/scripts/object/building/corellia/garage_corellia.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Parking Garage', object.getPosition().x, object.getPosition().z, 55, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/corellia/hospital_corellia.py b/scripts/object/building/corellia/hospital_corellia.py index ccad8904..46a0b2dc 100644 --- a/scripts/object/building/corellia/hospital_corellia.py +++ b/scripts/object/building/corellia/hospital_corellia.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Hospital', object.getPosition().x, object.getPosition().z, 13, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/corellia/hospital_corellia_s02.py b/scripts/object/building/corellia/hospital_corellia_s02.py index ccad8904..46a0b2dc 100644 --- a/scripts/object/building/corellia/hospital_corellia_s02.py +++ b/scripts/object/building/corellia/hospital_corellia_s02.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Hospital', object.getPosition().x, object.getPosition().z, 13, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/corellia/hotel_corellia.py b/scripts/object/building/corellia/hotel_corellia.py index ccad8904..089091e6 100644 --- a/scripts/object/building/corellia/hotel_corellia.py +++ b/scripts/object/building/corellia/hotel_corellia.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Hotel', object.getPosition().x, object.getPosition().z, 12, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/corellia/salon_corellia.py b/scripts/object/building/corellia/salon_corellia.py index ccad8904..036d0a44 100644 --- a/scripts/object/building/corellia/salon_corellia.py +++ b/scripts/object/building/corellia/salon_corellia.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Salon', object.getPosition().x, object.getPosition().z, 57, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/corellia/shuttleport_corellia.py b/scripts/object/building/corellia/shuttleport_corellia.py index 5cdd5f87..1b72f816 100644 --- a/scripts/object/building/corellia/shuttleport_corellia.py +++ b/scripts/object/building/corellia/shuttleport_corellia.py @@ -6,5 +6,8 @@ def setup(core, object): objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_travel.iff', -13, 0.6, -10, -0.707107, 0.707107) objSvc.createChildObject(object, 'object/creature/npc/theme_park/shared_player_shuttle.iff', 0, 0.6, 0, 1, 0) objSvc.createChildObject(object, 'object/tangible/travel/ticket_collector/shared_ticket_collector.iff', -13, 0.6, 10, -0.707107, 0.707107) - + + + core.mapService.addLocation(object.getPlanet(), 'Shuttleport', object.getPosition().x, object.getPosition().z, 14, 0, 0) + return \ No newline at end of file diff --git a/scripts/object/building/military/small_imperial_cloning_facility_s02.py b/scripts/object/building/military/small_imperial_cloning_facility_s02.py index ccad8904..7f92643a 100644 --- a/scripts/object/building/military/small_imperial_cloning_facility_s02.py +++ b/scripts/object/building/military/small_imperial_cloning_facility_s02.py @@ -1,4 +1,16 @@ import sys +from java.util import Vector +from resources.common import SpawnPoint def setup(core, object): + objSvc = core.objectService + objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_cloning.iff', float(-5.5), float(0.13), float(-3.44), float(0.70), float(0.71), 6) + + spawnPoints = Vector() + spawnPoints.add(SpawnPoint(4.45, 0.13, -3.80, -0.71, 0.71, 5)) + spawnPoints.add(SpawnPoint(4.65, 0.13, 1.50, 0.71, -0.70, 4)) + spawnPoints.add(SpawnPoint(-3.99, 0.13, -3.52, 0.70, 0.71, 6)) + + object.setAttachment('spawnPoints', spawnPoints) + return \ No newline at end of file diff --git a/scripts/object/building/naboo/bank_naboo.py b/scripts/object/building/naboo/bank_naboo.py index 8a96a6ad..0781428e 100644 --- a/scripts/object/building/naboo/bank_naboo.py +++ b/scripts/object/building/naboo/bank_naboo.py @@ -9,4 +9,6 @@ def setup(core, object): objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_bank.iff', 4.2, 0.5, 0.707107, 0.707107, 1) objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_bank.iff', -4.2, 0.5, 0, -0.707107, 0.707107) + core.mapService.addLocation(object.getPlanet(), 'Bank Terminal', object.getPosition().x, object.getPosition().z, 2, 0, 0) + return \ No newline at end of file diff --git a/scripts/object/building/naboo/cantina_naboo.py b/scripts/object/building/naboo/cantina_naboo.py index ccad8904..ebffb61a 100644 --- a/scripts/object/building/naboo/cantina_naboo.py +++ b/scripts/object/building/naboo/cantina_naboo.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Cantina', object.getPosition().x, object.getPosition().z, 3, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/naboo/cloning_facility_naboo.py b/scripts/object/building/naboo/cloning_facility_naboo.py index 91cb87d3..b9aa25eb 100644 --- a/scripts/object/building/naboo/cloning_facility_naboo.py +++ b/scripts/object/building/naboo/cloning_facility_naboo.py @@ -17,6 +17,7 @@ def setup(core, object): spawnPoints.add(SpawnPoint(-2.84, -4.79, 0.66, -0.04, 0.99, 4)) object.setAttachment('spawnPoints', spawnPoints) - + + core.mapService.addLocation(object.getPlanet(), 'Cloning Facility', object.getPosition().x, object.getPosition().z, 5, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/naboo/hospital_naboo.py b/scripts/object/building/naboo/hospital_naboo.py index ccad8904..46a0b2dc 100644 --- a/scripts/object/building/naboo/hospital_naboo.py +++ b/scripts/object/building/naboo/hospital_naboo.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Hospital', object.getPosition().x, object.getPosition().z, 13, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/naboo/hospital_naboo_s02.py b/scripts/object/building/naboo/hospital_naboo_s02.py index ccad8904..46a0b2dc 100644 --- a/scripts/object/building/naboo/hospital_naboo_s02.py +++ b/scripts/object/building/naboo/hospital_naboo_s02.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Hospital', object.getPosition().x, object.getPosition().z, 13, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/naboo/hotel_naboo_theed.py b/scripts/object/building/naboo/hotel_naboo_theed.py index ccad8904..089091e6 100644 --- a/scripts/object/building/naboo/hotel_naboo_theed.py +++ b/scripts/object/building/naboo/hotel_naboo_theed.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Hotel', object.getPosition().x, object.getPosition().z, 12, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/naboo/parking_garage_naboo_style_1.py b/scripts/object/building/naboo/parking_garage_naboo_style_1.py index ccad8904..5ba07218 100644 --- a/scripts/object/building/naboo/parking_garage_naboo_style_1.py +++ b/scripts/object/building/naboo/parking_garage_naboo_style_1.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Parking Garage', object.getPosition().x, object.getPosition().z, 55, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/naboo/rori_restuss_shuttleport.py b/scripts/object/building/naboo/rori_restuss_shuttleport.py index 9d1219e5..89a7e444 100644 --- a/scripts/object/building/naboo/rori_restuss_shuttleport.py +++ b/scripts/object/building/naboo/rori_restuss_shuttleport.py @@ -5,4 +5,7 @@ def setup(core, object): objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_travel.iff', -13, 0.6, -10, -0.707107, 0.707107) objSvc.createChildObject(object, 'object/creature/npc/theme_park/shared_player_shuttle.iff', 0, 0.6, 0, 1, 0) objSvc.createChildObject(object, 'object/tangible/travel/ticket_collector/shared_ticket_collector.iff', -13, 0.6, 10, -0.707107, 0.707107) + + core.mapService.addLocation(object.getPlanet(), 'Shuttleport', object.getPosition().x, object.getPosition().z, 14, 0, 0) + return \ No newline at end of file diff --git a/scripts/object/building/naboo/rori_restuss_starport.py b/scripts/object/building/naboo/rori_restuss_starport.py index 1130afc6..63e4e89f 100644 --- a/scripts/object/building/naboo/rori_restuss_starport.py +++ b/scripts/object/building/naboo/rori_restuss_starport.py @@ -4,5 +4,6 @@ def setup(core, object): objSvc = core.objectService objSvc.createChildObject(object, 'object/creature/npc/theme_park/shared_player_transport.iff', 0, 7, 0, 0.707107, 0.707107) objSvc.createChildObject(object, 'object/tangible/travel/ticket_collector/shared_ticket_collector.iff', 1, 0, -10, 0, 1) - objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_travel.iff', float(-3.12), float(0.14659503), float(-17.57), float(0.707107), float(-0.707107), 1) + objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_travel.iff', float(-3.12), float(0.14659503), float(-17.57), float(0.707107), float(-0.707107), 1) + core.mapService.addLocation(object.getPlanet(), 'Starport', object.getPosition().x, object.getPosition().z, 15, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/naboo/salon_corellia.py b/scripts/object/building/naboo/salon_corellia.py index ccad8904..036d0a44 100644 --- a/scripts/object/building/naboo/salon_corellia.py +++ b/scripts/object/building/naboo/salon_corellia.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Salon', object.getPosition().x, object.getPosition().z, 57, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/naboo/salon_naboo.py b/scripts/object/building/naboo/salon_naboo.py index ccad8904..036d0a44 100644 --- a/scripts/object/building/naboo/salon_naboo.py +++ b/scripts/object/building/naboo/salon_naboo.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Salon', object.getPosition().x, object.getPosition().z, 57, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/player/city/cityhall_tatooine.py b/scripts/object/building/player/city/cityhall_tatooine.py index 6b2cbced..2390d6f0 100644 --- a/scripts/object/building/player/city/cityhall_tatooine.py +++ b/scripts/object/building/player/city/cityhall_tatooine.py @@ -9,7 +9,7 @@ def setup(core, object): structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -17.2, 1.5 , 8, 1, 0 ,4) #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') - structureterminal.setAttachment('housing_parentstruct', object) + cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(16), float(2), float(-9)), Quaternion(float(1), float(1), float(1), float(0)),5) #cityterminal.setAttachment('housing_parentstruct', object) diff --git a/scripts/object/building/tatooine/bank_tatooine.py b/scripts/object/building/tatooine/bank_tatooine.py index 8a96a6ad..06147e58 100644 --- a/scripts/object/building/tatooine/bank_tatooine.py +++ b/scripts/object/building/tatooine/bank_tatooine.py @@ -9,4 +9,5 @@ def setup(core, object): objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_bank.iff', 4.2, 0.5, 0.707107, 0.707107, 1) objSvc.createChildObject(object, 'object/tangible/terminal/shared_terminal_bank.iff', -4.2, 0.5, 0, -0.707107, 0.707107) + core.mapService.addLocation(object.getPlanet(), 'Bank Terminal', object.getPosition().x, object.getPosition().z, 2, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/tatooine/cloning_facility_tatooine_small.py b/scripts/object/building/tatooine/cloning_facility_tatooine_small.py index 73dc07de..cc21eca6 100644 --- a/scripts/object/building/tatooine/cloning_facility_tatooine_small.py +++ b/scripts/object/building/tatooine/cloning_facility_tatooine_small.py @@ -10,6 +10,8 @@ def setup(core, object): spawnPoints.add(SpawnPoint(0.445015, 0.271775, 1.39199, 0.707038, 0.707176, 9)) object.setAttachment('spawnPoints', spawnPoints) + + core.mapService.addLocation(object.getPlanet(), 'Cloning Facility', object.getPosition().x, object.getPosition().z, 5, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/tatooine/hotel_tatooine_general.py b/scripts/object/building/tatooine/hotel_tatooine_general.py index ccad8904..089091e6 100644 --- a/scripts/object/building/tatooine/hotel_tatooine_general.py +++ b/scripts/object/building/tatooine/hotel_tatooine_general.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Hotel', object.getPosition().x, object.getPosition().z, 12, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/tatooine/hotel_tatooine_style_01.py b/scripts/object/building/tatooine/hotel_tatooine_style_01.py index ccad8904..089091e6 100644 --- a/scripts/object/building/tatooine/hotel_tatooine_style_01.py +++ b/scripts/object/building/tatooine/hotel_tatooine_style_01.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Hotel', object.getPosition().x, object.getPosition().z, 12, 0, 0) return \ No newline at end of file diff --git a/scripts/object/building/tatooine/salon_tatooine.py b/scripts/object/building/tatooine/salon_tatooine.py index ccad8904..036d0a44 100644 --- a/scripts/object/building/tatooine/salon_tatooine.py +++ b/scripts/object/building/tatooine/salon_tatooine.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + core.mapService.addLocation(object.getPlanet(), 'Salon', object.getPosition().x, object.getPosition().z, 57, 0, 0) return \ No newline at end of file diff --git a/scripts/object/factory/factory_crate_armor.py b/scripts/object/factory/factory_crate_armor.py index ccad8904..a4cabbc7 100644 --- a/scripts/object/factory/factory_crate_armor.py +++ b/scripts/object/factory/factory_crate_armor.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'item/factory_crate') return \ No newline at end of file diff --git a/scripts/object/factory/factory_crate_chemicals.py b/scripts/object/factory/factory_crate_chemicals.py index ccad8904..a4cabbc7 100644 --- a/scripts/object/factory/factory_crate_chemicals.py +++ b/scripts/object/factory/factory_crate_chemicals.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'item/factory_crate') return \ No newline at end of file diff --git a/scripts/object/factory/factory_crate_clothing.py b/scripts/object/factory/factory_crate_clothing.py index ccad8904..a4cabbc7 100644 --- a/scripts/object/factory/factory_crate_clothing.py +++ b/scripts/object/factory/factory_crate_clothing.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'item/factory_crate') return \ No newline at end of file diff --git a/scripts/object/factory/factory_crate_electronics.py b/scripts/object/factory/factory_crate_electronics.py index ccad8904..a4cabbc7 100644 --- a/scripts/object/factory/factory_crate_electronics.py +++ b/scripts/object/factory/factory_crate_electronics.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'item/factory_crate') return \ No newline at end of file diff --git a/scripts/object/factory/factory_crate_food.py b/scripts/object/factory/factory_crate_food.py index ccad8904..a4cabbc7 100644 --- a/scripts/object/factory/factory_crate_food.py +++ b/scripts/object/factory/factory_crate_food.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'item/factory_crate') return \ No newline at end of file diff --git a/scripts/object/factory/factory_crate_furniture.py b/scripts/object/factory/factory_crate_furniture.py index ccad8904..a4cabbc7 100644 --- a/scripts/object/factory/factory_crate_furniture.py +++ b/scripts/object/factory/factory_crate_furniture.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'item/factory_crate') return \ No newline at end of file diff --git a/scripts/object/factory/factory_crate_generic_items.py b/scripts/object/factory/factory_crate_generic_items.py index ccad8904..a4cabbc7 100644 --- a/scripts/object/factory/factory_crate_generic_items.py +++ b/scripts/object/factory/factory_crate_generic_items.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'item/factory_crate') return \ No newline at end of file diff --git a/scripts/object/factory/factory_crate_installation.py b/scripts/object/factory/factory_crate_installation.py index ccad8904..a4cabbc7 100644 --- a/scripts/object/factory/factory_crate_installation.py +++ b/scripts/object/factory/factory_crate_installation.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'item/factory_crate') return \ No newline at end of file diff --git a/scripts/object/factory/factory_crate_weapon.py b/scripts/object/factory/factory_crate_weapon.py index ccad8904..a4cabbc7 100644 --- a/scripts/object/factory/factory_crate_weapon.py +++ b/scripts/object/factory/factory_crate_weapon.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'item/factory_crate') return \ No newline at end of file diff --git a/scripts/object/tangible/container/loot/reverse_engineer_tool.py b/scripts/object/tangible/container/loot/reverse_engineer_tool.py index ccad8904..6c7c69bf 100644 --- a/scripts/object/tangible/container/loot/reverse_engineer_tool.py +++ b/scripts/object/tangible/container/loot/reverse_engineer_tool.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'item/reverse_engineering_tool') return \ No newline at end of file diff --git a/scripts/object/tangible/terminal/terminal_city_vote.py b/scripts/object/tangible/terminal/terminal_city_vote.py index ccad8904..4e988a1e 100644 --- a/scripts/object/tangible/terminal/terminal_city_vote.py +++ b/scripts/object/tangible/terminal/terminal_city_vote.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'terminal/city_voting_terminal') return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/robe/robe_s32.py b/scripts/object/tangible/wearables/robe/robe_s32.py index ccad8904..68484d13 100644 --- a/scripts/object/tangible/wearables/robe/robe_s32.py +++ b/scripts/object/tangible/wearables/robe/robe_s32.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + object.setStfFilename('static_item_n') + object.setStfName('item_jedi_robe_06_04') + object.setDetailFilename('static_item_d') + object.setDetailName('item_jedi_robe_06_04') + + object.setStringAttribute('protection_level', 'Radiant') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 90) + + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 135) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 135) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 135) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 135) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_damage_line_fs_ae_dm_cc', 4) + + object.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_jedi_robe_1') + + object.setAttachment('type', 'jedi_cloak') + object.setAttachment('setBonus', 'set_bonus_jedi_robe') + + return + + \ No newline at end of file diff --git a/scripts/object/tangible/wearables/robe/robe_s32_h1.py b/scripts/object/tangible/wearables/robe/robe_s32_h1.py index ccad8904..fdbb2840 100644 --- a/scripts/object/tangible/wearables/robe/robe_s32_h1.py +++ b/scripts/object/tangible/wearables/robe/robe_s32_h1.py @@ -1,4 +1,26 @@ import sys def setup(core, object): - return \ No newline at end of file + object.setStfFilename('static_item_n') + object.setStfName('item_jedi_robe_06_06') + object.setDetailFilename('static_item_d') + object.setDetailName('item_jedi_robe_06_06') + + object.setStringAttribute('protection_level', 'Radiant') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 90) + + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 135) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 170) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 170) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 170) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_damage_line_fs_ae_dm_cc', 4) + + object.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_jedi_robe_1') + + object.setAttachment('type', 'jedi_cloak') + object.setAttachment('setBonus', 'set_bonus_jedi_robe') + + return + + \ No newline at end of file diff --git a/scripts/object/tangible/wearables/robe/robe_s33.py b/scripts/object/tangible/wearables/robe/robe_s33.py index ccad8904..e5bded55 100644 --- a/scripts/object/tangible/wearables/robe/robe_s33.py +++ b/scripts/object/tangible/wearables/robe/robe_s33.py @@ -1,4 +1,28 @@ import sys def setup(core, object): - return \ No newline at end of file + object.setStfFilename('static_item_n') + object.setStfName('item_jedi_robe_06_03') + object.setDetailFilename('static_item_d') + object.setDetailName('item_jedi_robe_06_03') + + object.setStringAttribute('protection_level', 'Radiant') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 90) + + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 135) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 135) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 135) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 135) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_damage_weapon_9', 4) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_damage_weapon_10', 4) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_damage_weapon_11', 4) + + object.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_jedi_robe_1') + + object.setAttachment('type', 'jedi_cloak') + object.setAttachment('setBonus', 'set_bonus_jedi_robe') + + return + + \ No newline at end of file diff --git a/scripts/object/tangible/wearables/robe/robe_s33_h1.py b/scripts/object/tangible/wearables/robe/robe_s33_h1.py index ccad8904..3d700373 100644 --- a/scripts/object/tangible/wearables/robe/robe_s33_h1.py +++ b/scripts/object/tangible/wearables/robe/robe_s33_h1.py @@ -1,4 +1,28 @@ import sys def setup(core, object): - return \ No newline at end of file + object.setStfFilename('static_item_n') + object.setStfName('item_jedi_robe_06_05') + object.setDetailFilename('static_item_d') + object.setDetailName('item_jedi_robe_06_05') + + object.setStringAttribute('protection_level', 'Radiant') + object.setStringAttribute('class_required', 'Jedi') + object.setIntAttribute('required_combat_level', 90) + + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 135) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 170) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 170) + object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 170) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_damage_weapon_9', 4) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_damage_weapon_10', 4) + object.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_damage_weapon_11', 4) + + object.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_jedi_robe_1') + + object.setAttachment('type', 'jedi_cloak') + object.setAttachment('setBonus', 'set_bonus_jedi_robe') + + return + + \ No newline at end of file diff --git a/scripts/radial/item/collection/loot_collection.py b/scripts/radial/item/collection/loot_collection.py new file mode 100644 index 00000000..c88a04e2 --- /dev/null +++ b/scripts/radial/item/collection/loot_collection.py @@ -0,0 +1,17 @@ +from resources.common import RadialOptions +import sys + +def createRadial(core, owner, target, radials): + radials.add(RadialOptions(0, 21, 1, '')) + radials.add(RadialOptions(0, 7, 1, '')) + radials.add(RadialOptions(0, 21, 3, '@collection:consume_item')) + return + +def handleSelection(core, actor, target, option): + if option == 21 and target: + print (target.getAttachment('CollectionItemName')) + core.collectionService.addCollection(actor, target.getAttachment('CollectionItemName')) + core.objectService.useObject(actor, target) + #core.objectService.destroyObject(target) + return + \ No newline at end of file diff --git a/scripts/radial/item/factory_crate.py b/scripts/radial/item/factory_crate.py new file mode 100644 index 00000000..a2af6122 --- /dev/null +++ b/scripts/radial/item/factory_crate.py @@ -0,0 +1,19 @@ +from resources.common import RadialOptions +import sys + +def createRadial(core, owner, target, radials): + radials.clear() + radials.add(RadialOptions(0, 44, 0, 'Get Item From Crate')) + radials.add(RadialOptions(0, 49, 0, 'Split')) + radials.add(RadialOptions(0, 7, 0, 'Examine')) + radials.add(RadialOptions(0, 15, 0, 'Destroy')) + return + +def handleSelection(core, owner, target, option): + if option == 44 and target: + target.getObjectOutOfCrate(owner) + if option == 15 and target: + core.objectService.destroyObject(target) + #if option == 49 and target: + #target.splitFactoryCrate(owner, target, option) + return \ No newline at end of file diff --git a/scripts/radial/item/reverse_engineering_tool.py b/scripts/radial/item/reverse_engineering_tool.py new file mode 100644 index 00000000..b82ced03 --- /dev/null +++ b/scripts/radial/item/reverse_engineering_tool.py @@ -0,0 +1,44 @@ +from resources.common import RadialOptions +from protocol.swg import ResourceListForSurveyMessage +from services.sui.SUIService import MessageBoxType +from services.SurveyService import createSurveyRangeSUIWindow +from services.sui.SUIWindow import Trigger +from java.util import Vector +import sys + +def createRadial(core, owner, target, radials): + radials.clear() + radials.add(RadialOptions(0, 17, 1, 'Open')) + radials.add(RadialOptions(0, 7, 2, 'Examine')) + radials.add(RadialOptions(0, 15, 3, 'Destroy')) + radials.add(RadialOptions(0, 14, 4, 'Drop')) + radials.add(RadialOptions(0, 132, 5, 'Reverse Engineer')) + radials.add(RadialOptions(0, 133, 6, 'Create Skill Enhancing Attachment')) + radials.add(RadialOptions(0, 134, 7, 'Create Powerup')) + return + +def handleSelection(core, owner, target, option): + if owner.getPlayerObject().getProfession()!='trader_0a' and owner.getPlayerObject().getProfession()!='trader_0b' and owner.getPlayerObject().getProfession()!='trader_0c' and owner.getPlayerObject().getProfession()!='trader_0d': + owner.sendSystemMessage('@base_player:not_correct_skill', 0) + return + + if option == 21 and target: + if owner is not None: + + return + if option == 132: + if owner is not None: + core.reverseEngineeringService.reverseEngineer(owner, target) + return + + if option == 133: + if owner is not None: + core.reverseEngineeringService.createSEA(owner, target) + return + + if option == 134: + if owner is not None: + core.reverseEngineeringService.createPowerup(owner, target) + return + + return diff --git a/scripts/radial/structure/moveable.py b/scripts/radial/structure/moveable.py index 4bbb4120..1419fae6 100644 --- a/scripts/radial/structure/moveable.py +++ b/scripts/radial/structure/moveable.py @@ -2,7 +2,7 @@ from resources.common import RadialOptions import sys def createRadial(core, owner, target, radials): - radials.clear() + radials.add(RadialOptions(0, 7, 1, '')) radials.add(RadialOptions(0, 11, 1, '')) radials.add(RadialOptions(0, 55, 0, '')) diff --git a/scripts/radial/structure/structure_management_terminal.py b/scripts/radial/structure/structure_management_terminal.py index 8bdc5878..d6756fec 100644 --- a/scripts/radial/structure/structure_management_terminal.py +++ b/scripts/radial/structure/structure_management_terminal.py @@ -7,25 +7,28 @@ import sys def createRadial(core, owner, target, radials): #(byte parentId, short optionId, byte optionType, String description) - radials.clear() - radials.add(RadialOptions(0, 7, 0, 'Examine')) - radials.add(RadialOptions(0, 78, 0, '@player_structure:management')) - radials.add(RadialOptions(0, 117, 0, '@player_structure:permissions')) - radials.add(RadialOptions(2, 128, 0, '@player_structure:permission_destroy')) - radials.add(RadialOptions(2, 124, 0, '@player_structure:management_status')) - radials.add(RadialOptions(2, 129, 0, '@player_structure:management_pay')) - radials.add(RadialOptions(2, 50, 0, '@base_player:set_name')) - radials.add(RadialOptions(2, 127, 0, '@player_structure:management_residence')) - radials.add(RadialOptions(2, 125, 0, '@player_structure:management_privacy : ' + core.housingService.fetchPrivacyString(target))) - radials.add(RadialOptions(2, 171, 0, '@player_structure:find_items_find_all_house_items')) - radials.add(RadialOptions(2, 173, 0, '@player_structure:move_first_item')) - radials.add(RadialOptions(2, 174, 0, '@player_structure:find_items_search_for_house_items')) - radials.add(RadialOptions(2, 175, 0, '@player_structure:delete_all_items_title')) - radials.add(RadialOptions(2, 172, 0, 'Pack Up This Building')) - radials.add(RadialOptions(3, 121, 0, '@player_structure:permission_enter')) - radials.add(RadialOptions(3, 123, 0, '@player_structure:permission_banned')) - if owner.getSkillModBase('manage_vendor') >= 1: - radials.add(RadialOptions(2, 130, 0, '@player_structure:create_vendor')) + + if core.housingService.getPermissions(owner, target.getContainer()): + radials.clear() + radials.add(RadialOptions(0, 7, 0, 'Examine')) + radials.add(RadialOptions(0, 78, 0, '@player_structure:management')) + radials.add(RadialOptions(0, 117, 0, '@player_structure:permissions')) + radials.add(RadialOptions(2, 128, 0, '@player_structure:permission_destroy')) + radials.add(RadialOptions(2, 124, 0, '@player_structure:management_status')) + radials.add(RadialOptions(2, 129, 0, '@player_structure:management_pay')) + radials.add(RadialOptions(2, 50, 0, '@base_player:set_name')) + radials.add(RadialOptions(2, 127, 0, '@player_structure:management_residence')) + radials.add(RadialOptions(2, 125, 0, '@player_structure:management_privacy : ' + core.housingService.fetchPrivacyString(target))) + radials.add(RadialOptions(2, 171, 0, '@player_structure:find_items_find_all_house_items')) + radials.add(RadialOptions(2, 173, 0, '@player_structure:move_first_item')) + radials.add(RadialOptions(2, 174, 0, '@player_structure:find_items_search_for_house_items')) + radials.add(RadialOptions(2, 175, 0, '@player_structure:delete_all_items_title')) + radials.add(RadialOptions(2, 172, 0, 'Pack Up This Building')) + radials.add(RadialOptions(3, 121, 0, '@player_structure:permission_enter')) + radials.add(RadialOptions(3, 122, 0, '@player_structure:permission_admin')) + radials.add(RadialOptions(3, 123, 0, '@player_structure:permission_banned')) + if owner.getSkillModBase('manage_vendor') >= 1: + radials.add(RadialOptions(2, 130, 0, '@player_structure:create_vendor')) return @@ -39,17 +42,25 @@ def handleSelection(core, owner, target, option): if owner is not None: core.housingService.createStatusSUIPage(owner,target) return + if option == 125: + if owner is not None and owner.getGrandparent(): + building = owner.getGrandparent() + if building.getPrivacy() == 0: + building.setPrivacy(1) + elif building.getPrivacy() == 1: + building.setPrivacy(0) + return if option == 129: if owner is not None: core.housingService.createPayMaintenanceSUIPage(owner,target) return if option == 50: if owner is not None: - core.housingService.createRenameSUIPage(owner,target) + core.housingService.createRenameSUIPage(owner, owner.getGrandparent()) return if option == 127: if owner is not None: - core.housingService.declareResidency(owner,target) + core.housingService.declareResidency(owner,target.getGrandparent()) return if option == 171: if owner is not None: @@ -71,6 +82,10 @@ def handleSelection(core, owner, target, option): if owner is not None: core.housingService.handlePermissionEntry(owner,target) return + if option == 122: + if owner is not None: + core.housingService.handlePermissionAdmin(owner,target) + return if option == 123: if owner is not None: core.housingService.handlePermissionBan(owner,target) diff --git a/scripts/radial/terminal/city_maintenance_terminal.py b/scripts/radial/terminal/city_maintenance_terminal.py index e5bab716..6aee6a2b 100644 --- a/scripts/radial/terminal/city_maintenance_terminal.py +++ b/scripts/radial/terminal/city_maintenance_terminal.py @@ -1,64 +1,81 @@ from resources.common import RadialOptions +from resources.common import OutOfBand from protocol.swg import ResourceListForSurveyMessage from services.sui.SUIService import MessageBoxType from services.sui.SUIWindow import Trigger from java.util import Vector +from java.lang import System +from java.lang import Long +from java.util import Map +from java.util import TreeMap import main.NGECore import sys def createRadial(core, owner, target, radials): #(byte parentId, short optionId, byte optionType, String description) radials.clear() + city = core.playerCityService.getCityObjectIsIn(owner) + if not city: + return radials.add(RadialOptions(0, 7, 0, 'Examine')) - radials.add(RadialOptions(0, 216, 0, '@city/city:city_management')) - radials.add(RadialOptions(0, 226, 0, '@city/city:city_info')) - radials.add(RadialOptions(0, 227, 0, '@city/city:remove_trainers')) - radials.add(RadialOptions(2, 217, 0, '@city/city:city_name_new_t')) - radials.add(RadialOptions(2, 222, 0, '@city/city:city_register')) - radials.add(RadialOptions(2, 224, 0, '@city/city:unzone')) - radials.add(RadialOptions(2, 218, 0, '@city/city:city_militia')) - radials.add(RadialOptions(2, 219, 0, '@city/city:treasury_taxes')) - radials.add(RadialOptions(2, 221, 0, '@city/city:treasury_withdraw')) - radials.add(RadialOptions(2, 225, 0, '@city/city:city_specializations')) - radials.add(RadialOptions(2, 228, 0, '@city/city:align')) - radials.add(RadialOptions(3, 121, 0, '@city/city:non_citizen_city_status')) - radials.add(RadialOptions(3, 122, 0, '@city/city:rank_info_t')) - radials.add(RadialOptions(3, 123, 0, '@city/city:citizen_list_t')) - radials.add(RadialOptions(3, 230, 0, '@city/city:revoke_citizenship')) + radials.add(RadialOptions(0, 211, 0, '@city/city:city_info')) + if city.getMayorID() == owner.getObjectID(): + radials.add(RadialOptions(0, 216, 0, '@city/city:city_management')) - radials.add(RadialOptions(3, 231, 0, 'Add 10 citizens')) - radials.add(RadialOptions(3, 232, 0, 'Deduct 10 citizens')) + radials.add(RadialOptions(2, 212, 0, '@city/city:city_status')) + radials.add(RadialOptions(2, 213, 0, '@city/city:citizen_list_t')) + radials.add(RadialOptions(2, 214, 0, '@city/city:city_structures')) + radials.add(RadialOptions(2, 223, 0, '@city/city:rank_info_t')) + radials.add(RadialOptions(2, 224, 0, '@city/city:city_maint')) + radials.add(RadialOptions(2, 215, 0, '@city/city:treasury_status')) + radials.add(RadialOptions(2, 220, 0, '@city/city:treasury_deposit')) + + if owner.getPlayerObject().getCitizenship() != 3 and core.playerCityService.getPlayerCity(owner) == city: + radials.add(RadialOptions(2, 230, 0, '@city/city:revoke_citizenship')) + + if owner.getClient().isGM(): + radials.add(RadialOptions(2, 231, 0, 'Add 10 citizens')) + radials.add(RadialOptions(2, 232, 0, 'Deduct 10 citizens')) + + if city.getMayorID() != owner.getObjectID(): + return + + #radials.add(RadialOptions(0, 227, 0, '@city/city:remove_trainers')) not needed for pswg + radials.add(RadialOptions(3, 217, 0, '@city/city:city_name_new_t')) + if city.isRegistered(): + radials.add(RadialOptions(3, 222, 0, '@city/city:city_unregister')) + else: + radials.add(RadialOptions(3, 222, 0, '@city/city:city_register')) + if city.isZoningEnabled(): + radials.add(RadialOptions(3, 226, 0, '@city/city:unzone')) + else: + radials.add(RadialOptions(3, 226, 0, '@city/city:zone')) + + radials.add(RadialOptions(3, 218, 0, '@city/city:city_militia')) + radials.add(RadialOptions(3, 219, 0, '@city/city:treasury_taxes')) + radials.add(RadialOptions(3, 221, 0, '@city/city:treasury_withdraw')) + radials.add(RadialOptions(3, 225, 0, '@city/city:city_specializations')) + radials.add(RadialOptions(3, 228, 0, '@city/city:align')) return + def handleSelection(core, owner, target, option): - playerCity = core.playerCityService.getPlayerCity(owner) - if playerCity==None: + playerCity = core.playerCityService.getCityObjectIsIn(owner) + if playerCity == None: return if option == 217: if owner is not None: handleSetCityName(core, owner, target, option) return - if option == 124: - if owner is not None: - core.housingService.createStatusSUIPage(owner,target) - return - if option == 129: - if owner is not None: - core.housingService.createPayMaintenanceSUIPage(owner,target) - return - if option == 50: - if owner is not None: - core.housingService.createRenameSUIPage(owner,target) - return if option == 222: if owner is not None: - handleRegisterMap(core, owner, target, option) - return - if option == 171: - if owner is not None: - core.housingService.handleListAllItems(owner,target) + if playerCity.getMayorID() == owner.getObjectID(): + if playerCity.isRegistered(): + handleUnregisterMap(core, owner, target, option) + else: + handleRegisterMap(core, owner, target, option) return if option == 219: if owner is not None: @@ -72,45 +89,277 @@ def handleSelection(core, owner, target, option): if owner is not None: handleWithdrawal(core, owner, target, option) return - if option == 121: + if option == 212: + if owner is not None: + handleCityInfo(core, owner, target, option) + return + if option == 223: if owner is not None: handleCityRankInfo(core, owner, target, option) return - if option == 122: - if owner is not None: - handleCityRankInfo(core, owner, target, option) - return - if option == 123: + if option == 213: if owner is not None: handleCitizenList(core, owner, target, option) return - if option == 231: if owner is not None: handle10Add(core, owner, target, option) return - if option == 232: if owner is not None: handle10Deduct(core, owner, target, option) return + if option == 220: + if owner is not None: + handleDeposit(core, owner, target, option) + return + if option == 226: + if owner is not None: + handleToggleZoning(core, owner, target, option) + return + if option == 214: + if owner is not None: + handleStructureReport(core, owner, target, option) + return + if option == 215: + if owner is not None: + handleTreasuryReport(core, owner, target, option) + return + if option == 218: + if owner is not None: + handleManageMilitia(core, owner, target, option) + return + if option == 230: + if owner is not None: + handleRevokeCitizenship(core, owner, target, option) + return + +def handleRevokeCitizenship(core, owner, target, option): + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity or not playerCity.isCitizen(owner.getObjectID()) or playerCity.getMayorID() == owner.getObjectID(): + return + window = core.suiService.createMessageBox(2, 'revoke_cit_t', 'revoke_cit_d', owner, None, 0) + returnList = Vector() + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, revokeCitizenship) + core.suiService.openSUIWindow(suiWindow) + return + +def revokeCitizenship(owner, window, eventType, returnList): + core = main.NGECore.getInstance() + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity or not playerCity.isCitizen(owner.getObjectID()) or playerCity.getMayorID() == owner.getObjectID(): + return + playerCity.removeCitizen(owner.getObjectID()) + owner.getPlayerObject().setHome('') + owner.getPlayerObject().setCitizenship(0) + owner.setAttachment('residentCity', None) + owner.sendSystemMessage('You have successfully revoked your citizenship.', 0) + owner.sendSystemMessage('@city/city:revoke_citizenship_warning', 0) + return + +def handleManageMilitia(core, owner, target, option): + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity: + return + menuItems = TreeMap() + menuItems.put(Long(0), '@city/city:militia_new_t') + for militiaId in playerCity.getMilitiaList(): + militia = core.objectService.getObject(militiaId) + if not militia: + militia = core.objectService.getCreatureFromDB(militiaId) + if militia: + menuItems.put(Long(militiaId), militia.getCustomName()) + + returnList = Vector() + returnList.add('List.lstList:SelectedRow') + window = core.suiService.createListBox(1, '@city/city:militia_t', '@city/city:militia_d', menuItems, owner, None, 0) + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, handleMilitiaListBox) + core.suiService.openSUIWindow(window) + + return + +def handleMilitiaListBox(owner, window, eventType, returnList): + core = main.NGECore.getInstance() + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity: + return + index = int(returnList.get(0)) + id = window.getObjectIdByIndex(index) + if id == 0: + handleAddMiltiaPrompt(core, owner) + else: + core.playerCityService.handleRemoveMilitia(owner, id) + return + +def handleAddMiltiaPrompt(core, owner): + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity: + return + window = core.suiService.createInputBox(2, '@city/city:militia_new_t', '@city/city:militia_new_d', owner, None, 0) + returnList = Vector() + returnList.add('txtInput:LocalText') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, handleAddMiltia) + core.suiService.openSUIWindow(window) + return + +def handleAddMiltia(owner, window, eventType, returnList): + core = main.NGECore.getInstance() + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity: + return + name = returnList.get(0) + militiaId = core.characterService.getPlayerOID(name) + if militiaId == 0: + owner.sendSystemMessage('@city/city:cannot_find_citizen', 0) + return + if not playerCity.isCitizen(militiaId): + owner.sendSystemMessage('@city/city:not_citizen', 0) + return + if playerCity.isMilitiaMember(militiaId) or militiaId == playerCity.getMayorID(): + owner.sendSystemMessage('That player is already a member of the city militia.', 0) + return + militia = core.objectService.getObject(militiaId) + persist = False + if not militia: + militia = core.objectService.getCreatureFromDB(militiaId) + persist = True + if not militia: + owner.sendSystemMessage('@city/city:cannot_find_citizen', 0) + return + playerCity.addMilitia(militiaId) + if militia.getClient(): + militia.sendSystemMessage('@city/city:added_militia_target', 0) + owner.sendSystemMessage('@city/city:added_militia', 0) + militia.getPlayerObject().setCitizenship(2) + if persist: + core.objectService.persistObject(militiaId, militia, core.getSWGObjectODB()) + return + +def handleTreasuryReport(core, owner, target, option): + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity: + return + menuItems = TreeMap() + menuItems.put(Long(1), '@city/city:treasury ' + str(playerCity.getCityTreasury())) + window = core.suiService.createListBox(1, '@city/city:treasury_balance_t', '@city/city:treasury_balance_d', menuItems, owner, None, 0) + core.suiService.openSUIWindow(window) + return + +def handleStructureReport(core, owner, target, option): + playerCity = core.playerCityService.getPlayerCity(owner) + if not playerCity: + return + menuItems = TreeMap() + i = 0 + for structureId in playerCity.getPlacedStructures(): + structure = core.objectService.getObject(structureId) + if structure and structure.getAttachment('isCivicStructure') is not None and structure.getAttachment('isCivicStructure') == True: + i += 1 + menuItems.put(Long(i), structure.getLookAtText() + ' - Condition : ' + str((structure.getMaximumCondition() - structure.getConditionDamage()) / structure.getMaximumCondition() * 100) + '%') + window = core.suiService.createListBox(1, '@city/city:structure_list_t', '@city/city:structure_list_d', menuItems, owner, None, 0) + core.suiService.openSUIWindow(window) + return + +def handleDeposit(core, owner, target, option): + playerCity = core.playerCityService.getPlayerCity(owner) + suiSvc = core.suiService + suiWindow = suiSvc.createSUIWindow('Script.transfer', owner, target, 10) + suiWindow.setProperty('transaction.txtInputFrom:Text', '@city/city:total_funds') + suiWindow.setProperty('bg.caption.lblTitle:Text', '@city/city:treasury_deposit') + suiWindow.setProperty('Prompt.lblPrompt:Text', '@city/city:treasury_deposit_d') + suiWindow.setProperty('transaction.lblFrom:Text', '@city/city:total_funds') + suiWindow.setProperty('transaction.lblTo:Text', '@city/city:treasury') + suiWindow.setProperty('transaction.lblStartingFrom:Text', str(owner.getCashCredits())) + suiWindow.setProperty('transaction.lblStartingTo:Text', '') + suiWindow.setProperty('transaction.txtInputFrom:Text', str(owner.getCashCredits())) + suiWindow.setProperty('transaction.txtInputTo:Text', '') + suiWindow.setProperty('transaction:ConversionRatioFrom', '1') + suiWindow.setProperty('transaction:ConversionRatioTo', '1') + returnParams = Vector() + returnParams.add('transaction.txtInputFrom:Text') + returnParams.add('transaction.txtInputTo:Text') + suiWindow.addHandler(0, '', Trigger.TRIGGER_OK, returnParams, handleDepositSUI) + + suiSvc.openSUIWindow(suiWindow) + + return + +def handleDepositSUI(owner, window, eventType, returnList): + playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) + if not playerCity: + return + amount = int(returnList.get(0)) + cash = owner.getCashCredits() + deposit = cash - amount + if amount > cash or deposit < 1: + owner.sendSystemMessage('@city/city:positive_deposit', 0) + return + if playerCity.getCityTreasury() + deposit > 100000000: + owner.sendSystemMessage('@city/city:positive_deposit', 0) + return + playerCity.addToTreasury(deposit) + owner.deductCashCredits(deposit) + owner.sendSystemMessage(OutOfBand.ProsePackage('@city/city:deposit_treasury', deposit), 0) + playerCity.sendTreasuryDepositMail(owner, deposit) + return + +def handleToggleZoning(core, owner, target, option): + playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) + if not playerCity or playerCity.getMayorID() != owner.getObjectID(): + return + + playerCity.setZoningEnabled(not playerCity.isZoningEnabled()) + + if playerCity.isZoningEnabled(): + owner.sendSystemMessage('@city/city:zoning_enabled', 0) + else: + owner.sendSystemMessage('@city/city:zoning_disabled', 0) + + return + + def handle10Add(core, owner, target, option): playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) playerCity.Add10MoreCitizens() return - def handle10Deduct(core, owner, target, option): playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) playerCity.Deduct10Citizens() return -def setnameCallBack(owner, window, eventType, returnList): +def handleSetCityName(core, owner, target, option): + playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) + if not playerCity: + return + if playerCity.getCityNameChangeCooldown() > System.currentTimeMillis(): + owner.sendSystemMessage('You may only change the city name once in 4 weeks.', 0) + return + window = core.suiService.createInputBox(2, '@city/city:city_name_new_t','@city/city:city_name_new_d', owner, None, 0) + window.setProperty('txtInput:MaxLength', '40') + returnList = Vector() + returnList.add('txtInput:LocalText') + window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setNameCallBack) + + return + + +def setNameCallBack(owner, window, eventType, returnList): if returnList.size()==0: return + name = returnList.get(0) + if not core.characterService.checkName(name, owner.getClient(), True): + owner.sendSystemMessage('@player_structure:not_valid_name', 0) + return + if not core.playerCityService.doesCityNameExist(name): + owner.sendSystemMessage('@player_structure:cityname_not_unique', 0) + return + playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - playerCity.setCityName(returnList.get(0)) + playerCity.setCityName(name) + playerCity.setCityNameChangeCooldown(System.currentTimeMillis() + str(604800 * 4 * 1000)) + # TODO send mail owner.sendSystemMessage('@city/city:name_changed', 0) return @@ -118,7 +367,7 @@ def setnameCallBack(owner, window, eventType, returnList): def handleAdjustTaxes(core, owner, target, option): playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - if playerCity.getRank()<2: + if playerCity.getRank() < 2: owner.sendSystemMessage('@city/city:no_rank_taxes', 0) return @@ -179,14 +428,15 @@ def handleSetIncomeTax(owner): return def handleSetIncomeTaxCallBack(owner, window, eventType, returnList): - if int(returnList.get(0))>2000 or int(returnList.get(0))<0: + tax = int(returnList.get(0)) + if tax > 2000 or tax < 0: owner.sendSystemMessage('Income tax value is out of range of accepteable values.', 0) handleSetIncomeTax(owner) return playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - playerCity.setIncomeTax(int(returnList.get(0))) - owner.sendSystemMessage('@city/city:set_income_tax', 0) + playerCity.setIncomeTax(tax) + owner.sendSystemMessage(OutOfBand.ProsePackage('@city/city:set_income_tax', tax), 0) return def handleSetSalesTax(owner): @@ -201,14 +451,15 @@ def handleSetSalesTax(owner): return def handleSetSalesTaxCallBack(owner, window, eventType, returnList): - if int(returnList.get(0))>20 or int(returnList.get(0))<0: + tax = int(returnList.get(0)) + if tax > 20 or tax < 0: owner.sendSystemMessage('Sales tax value is out of range of accepteable values.', 0) handleSetSalesTax(owner) return playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - playerCity.setIncomeTax(int(returnList.get(0))) - owner.sendSystemMessage('@city/city:set_sales_tax', 0) + playerCity.setIncomeTax(tax) + owner.sendSystemMessage(OutOfBand.ProsePackage('@city/city:set_sales_tax', tax), 0) return def handleSetPropertyTax(owner): @@ -223,14 +474,15 @@ def handleSetPropertyTax(owner): return def handleSetPropertyTaxCallBack(owner, window, eventType, returnList): - if int(returnList.get(0))>50 or int(returnList.get(0))<0: + tax = int(returnList.get(0)) + if tax > 50 or tax < 0: owner.sendSystemMessage('Property tax value is out of range of accepteable values.', 0) handleSetPropertyTax(owner) return playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - playerCity.setIncomeTax(int(returnList.get(0))) - owner.sendSystemMessage('@city/city:set_property_tax', 0) + playerCity.setIncomeTax(tax) + owner.sendSystemMessage(OutOfBand.ProsePackage('@city/city:set_property_tax', tax), 0) return def handleSetTravelTax(owner): @@ -249,14 +501,15 @@ def handleSetTravelTax(owner): return def handleSetTravelTaxCallBack(owner, window, eventType, returnList): - if int(returnList.get(0))>500 or int(returnList.get(0))<1: + tax = int(returnList.get(0)) + if tax > 500 or tax < 1: owner.sendSystemMessage('Travel tax value is out of range of accepteable values.', 0) handleSetIncomeTax(owner) return playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - playerCity.setTravelTax(int(returnList.get(0))) - owner.sendSystemMessage('@city/city:set_travel_fee', 0) + playerCity.setTravelTax(tax) + owner.sendSystemMessage(OutOfBand.ProsePackage('@city/city:set_travel_fee', tax), 0) return def handleSetGarageTax(owner): @@ -271,67 +524,30 @@ def handleSetGarageTax(owner): return def handleSetGarageTaxCallBack(owner, window, eventType, returnList): - if int(returnList.get(0))>500 or int(returnList.get(0))<1: + tax = int(returnList.get(0)) + if tax > 500 or tax < 1: owner.sendSystemMessage('Garage tax value is out of range of accepteable values.', 0) handleSetIncomeTax(owner) return - + playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - playerCity.setGarageTax(int(returnList.get(0))) - owner.sendSystemMessage('@city/city:set_garage_tax', 0) + playerCity.setGarageTax(tax) + owner.sendSystemMessage(OutOfBand.ProsePackage('@city/city:set_garage_tax', tax), 0) return def handleWithdrawal(core, owner, target, option): playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - window = core.suiService.createSUIWindow("Script.transfer", owner, target, 10) - - window.setProperty("bg.caption.lblTitle:Text", "@city/city:treasury_withdraw_subject") - window.setProperty("Prompt.lblPrompt:Text", "@city/city:treasury_withdraw_prompt" + "\n \n @city/city:treasury_status : %s" % playerCity.getCityTreasury()) - - window.setProperty("msgPayMaintenance", "transaction.txtInputFrom"); - - window.setProperty("transaction.lblFrom:Text", "@city/city:treasury_balance_t"); - window.setProperty("transaction.lblTo:Text", "@city/city:treasury_withdraw"); - window.setProperty("transaction.lblFrom", "@city/city:treasury_balance_t"); - window.setProperty("transaction.lblTo", "@city/city:treasury_withdraw"); - - window.setProperty("transaction.lblStartingFrom:Text", '%s' % playerCity.getCityTreasury()); - window.setProperty("transaction.lblStartingTo:Text", '0'); - - window.setProperty("transaction:InputFrom", "555555"); - window.setProperty("transaction:InputTo", "666666"); - - window.setProperty("transaction:txtInputFrom", '%s' % playerCity.getCityTreasury()); - window.setProperty("transaction:txtInputTo", "1"); - window.setProperty("transaction.txtInputFrom:Text", '%s' % playerCity.getCityTreasury()); - window.setProperty("transaction.txtInputTo:Text", "" + "0"); - - window.setProperty("transaction.ConversionRatioFrom", "1"); - window.setProperty("transaction.ConversionRatioTo", "0"); - - window.setProperty("btnOk:visible", "True"); - window.setProperty("btnCancel:visible", "True"); - window.setProperty("btnOk:Text", "@ok"); - window.setProperty("btnCancel:Text", "@cancel"); - - returnList = Vector() - returnList.add('transaction.txtInputFrom:Text') - returnList.add('ransaction.txtInputTo:Text') - window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setWithdrawalCallBack) - window.addHandler(1, '', Trigger.TRIGGER_CANCEL, returnList, setWithdrawalCallBack) - core.suiService.openSUIWindow(window); - return - -def setWithdrawalCallBack(owner, window, eventType, returnList): - if returnList.size()==0: + if not playerCity: return - playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - playerCity.setCityName(returnList.get(0)) - owner.sendSystemMessage('@city/city:name_changed', 0) - return + if playerCity.getCityTreasuryWithdrawalCooldown() > System.currentTimeMillis(): + owner.sendSystemMessage('@city/city:withdraw_daily', 0) + return + core.playerCityService.handleCityTreasuryWithdrawal(owner) + -def handleCitizenList(core, owner, target, option): +def handleCitizenList(core, owner, target, option): + # wasnt there a new list layout in NGE ? window = core.suiService.createSUIWindow('Script.listBox', owner, target, 0); window.setProperty('bg.caption.lblTitle:Text', '@city/city:citizen_list_t') window.setProperty('Prompt.lblPrompt:Text', '@city/city:citizen_list_prompt') @@ -340,7 +556,12 @@ def handleCitizenList(core, owner, target, option): index = 1; for citizen in playerCity.getCitizens(): citizenObject = core.objectService.getObject(citizen) - window.addListBoxMenuItem(citizenObject.getCustomName(),index) + if not citizenObject: + continue + name = citizenObject.getCustomName() + if citizenObject.getPlayerObject().getCitizenship() == 2: + name += ' (Militia)' + window.addListBoxMenuItem(name,index) index += 1 window.setProperty('btnOk:visible', 'True') @@ -351,35 +572,42 @@ def handleCitizenList(core, owner, target, option): returnList = Vector() returnList.add('txtInput:LocalText') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setCitizenListCallBack) - window.addHandler(1, '', Trigger.TRIGGER_CANCEL, returnList, setCitizenListCallBack) core.suiService.openSUIWindow(window); return def setCitizenListCallBack(owner, window, eventType, returnList): - #handle waypoint creation to citizen's house + # todo add waypoint return -def handleCityRankInfo(core, owner, target, option): - window = core.suiService.createSUIWindow('Script.listBox', owner, target, 0); - window.setProperty('bg.caption.lblTitle:Text', '@city/city:rank_info_t') - window.setProperty('Prompt.lblPrompt:Text', '@city/city:rank_info_d') +def handleCityInfo(core, owner, target, option): + window = core.suiService.createSUIWindow('Script.listBox', owner, None, 0); + window.setProperty('bg.caption.lblTitle:Text', '@city/city:city_info_t') + window.setProperty('Prompt.lblPrompt:Text', '@city/city:city_info_d') playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - - window.addListBoxMenuItem('City : ' + playerCity.getCityName(),0) - window.addListBoxMenuItem('@city/city:radius_prompt : %s' % playerCity.getCityRadius(),1) - window.addListBoxMenuItem('@city/city:city_rank_prompt : @city/city:rank' + str(playerCity.getRank()),2) - window.addListBoxMenuItem('@city/city:reg_citizen_prompt : %s' % len(playerCity.getCitizens()),3) - if playerCity.getRank()>=3 and playerCity.getSpecialization()>-1: + mayor = core.objectService.getObject(playerCity.getMayorID()) + if not mayor: + mayor = core.objectService.getCreatureFromDB(playerCity.getMayorID()) + window.addListBoxMenuItem('@city/city:name_prompt : ' + playerCity.getCityName(),0) + if mayor: + window.addListBoxMenuItem('@city/city:mayor_prompt : ' + mayor.getCustomName(),5) + window.addListBoxMenuItem('@city/city:location_prompt : ' + str(playerCity.getCityCenterPosition().x) + ' ' + str(playerCity.getCityCenterPosition().z),6) + window.addListBoxMenuItem('@city/city:radius_prompt : %s' % playerCity.getCityRadius(),1) + window.addListBoxMenuItem('@city/city:reg_citizen_prompt : %s' % len(playerCity.getCitizens()),7) + window.addListBoxMenuItem('@kb/kb_player_cities_n:civic_structures_n : %s' % playerCity.getCivicStructuresCount(),8) + window.addListBoxMenuItem('@city/city:decorations : %s' % 0,9) # todo when decorations are implemented + if playerCity.getRank() >= 3 and playerCity.getSpecialization() > -1: window.addListBoxMenuItem('@city/city:specialization_prompt : @city/city:' + playerCity.getSpecializationSTFNamesAsList().get(playerCity.getSpecialization()),4) + + window.addListBoxMenuItem('@city/city:city_rank_prompt : @city/city:rank' + str(playerCity.getRank()),2) + # TODO add tax info window.setProperty('btnOk:visible', 'True') window.setProperty('btnCancel:visible', 'True') window.setProperty('btnOk:Text', '@ok') window.setProperty('btnCancel:Text', '@cancel') window.setProperty('btnCancel:Text', '@cancel') - playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) returnList = Vector() returnList.add('txtInput:LocalText') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setCityInfoCallBack) @@ -391,6 +619,29 @@ def setCityInfoCallBack(owner, window, eventType, returnList): #handle waypoint creation to citizen's house return +def handleCityRankInfo(core, owner, target, option): + window = core.suiService.createSUIWindow('Script.listBox', owner, None, 0); + window.setProperty('bg.caption.lblTitle:Text', '@city/city:rank_info_t') + window.setProperty('Prompt.lblPrompt:Text', '@city/city:rank_info_d') + + playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) + rank = playerCity.getRank() + nextRank = rank + 1 + if nextRank > 5: + nextRank = 5 + window.addListBoxMenuItem('@city/city:city_rank_prompt : @city/city:rank' + str(playerCity.getRank()),1) + window.addListBoxMenuItem('@city/city:reg_citizen_prompt : %s' % len(playerCity.getCitizens()),2) + window.addListBoxMenuItem('@city/city:pop_req_current_rank : ' + str(playerCity.getReqCitizenCountForRank(rank)),3) + window.addListBoxMenuItem('@city/city:pop_req_next_rank : ' + str(playerCity.getReqCitizenCountForRank(nextRank)),4) + window.setProperty('btnOk:visible', 'True') + window.setProperty('btnCancel:visible', 'True') + window.setProperty('btnOk:Text', '@ok') + window.setProperty('btnCancel:Text', '@cancel') + window.setProperty('btnCancel:Text', '@cancel') + core.suiService.openSUIWindow(window); + + return + def handleRegisterMap(core, owner, target, option): playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) @@ -401,23 +652,35 @@ def handleRegisterMap(core, owner, target, option): if owner.getObjectId()!=playerCity.getMayorID(): owner.sendSystemMessage('@city/city:cant_register', 0) return - - # now register it somehow - - return - -def setRegisterMapCallBack(owner, window, eventType, returnList): - if returnList.size()==0: + + if playerCity.isRegistered(): return - playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - playerCity.setCityName(returnList.get(0)) - owner.sendSystemMessage('@city/city:name_changed', 0) + playerCity.setRegistered(True) + core.mapService.addLocation(owner.getPlanet(), playerCity.getCityName(), playerCity.getCityCenterPosition().x, playerCity.getCityCenterPosition().z, 17, 0, 0) return +def handleUnregisterMap(core, owner, target, option): + + playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) + if playerCity.getRank()<3: + owner.sendSystemMessage('@city/city:cant_register_rank', 0) + return + + if owner.getObjectId()!=playerCity.getMayorID(): + owner.sendSystemMessage('@city/city:cant_register', 0) + return + + if not playerCity.isRegistered(): + return + playerCity.setRegistered(False) + core.mapService.removeLocation(owner.getPlanet(), playerCity.getCityCenterPosition().x, playerCity.getCityCenterPosition().z, 17) + return + + def handleSpecialization(core, owner, target, option): playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) - if playerCity.getRank()<3: + if playerCity.getRank() < 3: owner.sendSystemMessage('@city/city:no_rank_spec', 0) return @@ -434,9 +697,6 @@ def handleSpecialization(core, owner, target, option): window.addListBoxMenuItem('@city/city:city_spec_doctor',6) window.addListBoxMenuItem('@city/city:city_spec_research',7) window.addListBoxMenuItem('@city/city:city_spec_sample_rich',8) - window.addListBoxMenuItem('@city/city:city_spec_master_manufacturing',9) - window.addListBoxMenuItem('@city/city:city_spec_master_healing',10) - window.addListBoxMenuItem('@city/city:city_spec_stronghold',11) window.setProperty('btnOk:visible', 'True') window.setProperty('btnCancel:visible', 'True') @@ -697,5 +957,5 @@ def showSpecConfirmWindow(owner): def handleSpecConfirmCallback(owner, window, eventType, returnList): playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner) chosenSpec = owner.getAttachment('ChosenCitySpec') - playerCity.setSpecialisation(chosenSpec) + playerCity.setSpecialization(chosenSpec) return \ No newline at end of file diff --git a/scripts/radial/terminal/city_voting_terminal.py b/scripts/radial/terminal/city_voting_terminal.py new file mode 100644 index 00000000..be3f5772 --- /dev/null +++ b/scripts/radial/terminal/city_voting_terminal.py @@ -0,0 +1,78 @@ +from resources.common import RadialOptions +from services.sui.SUIService import MessageBoxType +from services.sui.SUIWindow import Trigger +from java.util import Vector +from java.util import TreeMap +from java.util import Map +from java.lang import System +from java.lang import Long +import sys + +def createRadial(core, owner, target, radials): + radials.clear() + city = core.playerCityService.getCityObjectIsIn(owner) + if not city: + return + radials.add(RadialOptions(0, 7, 0, 'Examine')) + radials.add(RadialOptions(0, 224, 0, '@city/city:mayoral_race')) + radials.add(RadialOptions(2, 225, 0, '@city/city:mayoral_standings')) + radials.add(RadialOptions(2, 226, 0, '@city/city:mayoral_vote')) + if city.isCandidate(owner.getObjectID()): + radials.add(RadialOptions(2, 227, 0, '@city/city:mayoral_unregister')) + else: + radials.add(RadialOptions(2, 227, 0, '@city/city:mayoral_register')) + + + return + +def handleSelection(core, owner, target, option): + + city = core.playerCityService.getCityObjectIsIn(owner) + if not city: + return + if option == 224 or option == 225: + core.playerCityService.handleViewStandings(owner, city) + if option == 226: + core.playerCityService.handlePromptVote(owner, city) + if option == 227 and city.isCandidate(owner.getObjectID()): + handleUnregister(core, owner) + if option == 227 and not city.isCandidate(owner.getObjectID()): + handleRegister(core, owner) + + return + +def handlePromptVote(core, owner): + return + +def handleUnregister(core, owner): + city = core.playerCityService.getCityObjectIsIn(owner) + if not city or not city.isCitizen(owner.getObjectID()): + return + if city.isElectionLocked(): + owner.sendSystemMessage('@city/city:registration_locked', 0) + return + if city.isCandidate(owner.getObjectID()): + city.getElectionList().remove(Long(owner.getObjectID())) + owner.sendSystemMessage('@city/city:unregistered_race', 0) + city.sendCandidateUnregisteredMail(owner) + return + +def handleRegister(core, owner): + city = core.playerCityService.getCityObjectIsIn(owner) + if not city: + return + if not city.isCitizen(owner.getObjectID()): + owner.sendSystemMessage('@city/city:register_noncitizen', 0) + return + if city.isElectionLocked(): + owner.sendSystemMessage('@city/city:registration_locked', 0) + return + if owner.getAttachment('registerElectionCooldown') and owner.getAttachment('registerElectionCooldown') > System.currentTimeMillis(): + owner.sendSystemMessage('@city/city:register_timestamp', 0) + return + city.getElectionList().put(Long(owner.getObjectID()), 0) + owner.sendSystemMessage('@city/city:register_congrats', 0) + owner.setAttachment('registerElectionCooldown', System.currentTimeMillis() + 86400000) + city.sendCandidateRegisteredMail(owner) + return + \ No newline at end of file diff --git a/scripts/static_spawns/corellia/coronet.py b/scripts/static_spawns/corellia/coronet.py index e7974869..7bd491dd 100644 --- a/scripts/static_spawns/corellia/coronet.py +++ b/scripts/static_spawns/corellia/coronet.py @@ -121,7 +121,14 @@ def addPlanetSpawns(core, planet): mackJasper.setCustomName2('Lieutenant Mack Jasper') mackJasper.setOptionsBitmask(256) - #Junkdealer will be added as soon as i can find coords +#-Coronet Misc NPCS + #Profession Counselor + stcSvc.spawnObject('object/mobile/shared_respec_seller_f_1.iff', 'corellia', long(0), float(-129), float(28), float(-4758), float(-0.3327), float(0.9288)) + #Junk Dealer + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-118), float(28), float(-4792), float(0.71), float(0.71)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(22), float(28), float(-4773), float(0.71), float(-0.71)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-42), float(28), float(-4612), float(0), float(0)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-68), float(28), float(-4585), float(0), float(1)) return \ No newline at end of file diff --git a/scripts/static_spawns/corellia/doaba_guerfel.py b/scripts/static_spawns/corellia/doaba_guerfel.py index bb48cb72..f25520a5 100644 --- a/scripts/static_spawns/corellia/doaba_guerfel.py +++ b/scripts/static_spawns/corellia/doaba_guerfel.py @@ -6,7 +6,11 @@ from resources.datatables import StateStatus def addPlanetSpawns(core, planet): + stcSvc = core.staticService + - #junkdealer will be added as soon as i find coords + #doaba guerfel + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(3190), float(300.2), float(5387), float(0.71), float(0.71)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(3227), float(300.2), float(5387), float(0.71), float(-0.71)) return diff --git a/scripts/static_spawns/corellia/kor_vella.py b/scripts/static_spawns/corellia/kor_vella.py index bb48cb72..a256b03a 100644 --- a/scripts/static_spawns/corellia/kor_vella.py +++ b/scripts/static_spawns/corellia/kor_vella.py @@ -7,6 +7,12 @@ from resources.datatables import StateStatus def addPlanetSpawns(core, planet): - #junkdealer will be added as soon as i find coords + stcSvc = core.staticService + + #korvella + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-3151), float(31), float(2790), float(0.71), float(0.71)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-3567), float(86), float(3143), float(0.71), float(-0.71)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-3788), float(86), float(-3190), float(0), float(0)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-3390), float(86), float(-3288), float(0), float(1)) return diff --git a/scripts/static_spawns/corellia/tyrena.py b/scripts/static_spawns/corellia/tyrena.py index bb48cb72..e0759c24 100644 --- a/scripts/static_spawns/corellia/tyrena.py +++ b/scripts/static_spawns/corellia/tyrena.py @@ -6,7 +6,12 @@ from resources.datatables import StateStatus def addPlanetSpawns(core, planet): + stcSvc = core.staticService #junkdealer will be added as soon as i find coords - + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5088), float(21.3), float(-2384), float(0.71), float(0.71)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5125.2), float(21.3), float(-2384), float(0.71), float(-0.71)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5278), float(21), float(-2510), float(0), float(0)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5469), float(21), float(-2657), float(0), float(1)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5502), float(21), float(-2709), float(0), float(1)) return diff --git a/scripts/static_spawns/corellia/vreni_island.py b/scripts/static_spawns/corellia/vreni_island.py new file mode 100644 index 00000000..cbc2f84a --- /dev/null +++ b/scripts/static_spawns/corellia/vreni_island.py @@ -0,0 +1,16 @@ + +import sys +from resources.datatables import Options +from resources.datatables import StateStatus + + +def addPlanetSpawns(core, planet): + + stcSvc = core.staticService + + #vreni + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5542), float(23.4), float(-6228.7), float(0.71), float(0.71)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5552), float(16.1), float(-6071), float(0.71), float(-0.71)) + + + return diff --git a/scripts/static_spawns/tatooine/darklighter_cave.py b/scripts/static_spawns/tatooine/darklighter_cave.py new file mode 100644 index 00000000..c8c82261 --- /dev/null +++ b/scripts/static_spawns/tatooine/darklighter_cave.py @@ -0,0 +1,72 @@ +import sys +# Project SWG: darklighter cave +# (C)2014 ProjectSWG + + + +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + + stcSvc = core.staticService + objSvc = core.objectService + + # TODO Check all NPCs for personalized scripting, change format. + + cave = core.objectService.getObject(long(-466404036409557011)) + + lifter = stcSvc.spawnObject('object/mobile/shared_cll8_binary_load_lifter.iff', 'tatooine', cave.getCellByCellNumber(2), float(8.8), float(-21.8), float(-38.1), float(0.71), float(0), float(0.70), float(0)) + lifter.setCustomName('a Binary Load Lifter') + lifter.setOptionsBitmask(256) + + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(4), float(-34.7), float(-49.1), float(-109.5), float(0.71), float(0), float(0.70), float(0)) + + stcSvc.spawnObject('desert_demon_marksman', 'tatooine', cave.getCellByCellNumber(5), float(-12.8), float(-48.4), float(-161.9), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_bodyguard', 'tatooine', cave.getCellByCellNumber(5), float(-9), float(-48.6), float(-167.8), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(5), float(-6.3), float(-48.6), float(-164.2), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_bodyguard', 'tatooine', cave.getCellByCellNumber(7), float(41), float(-71), float(-187.3), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(11), float(35.5), float(-80.8), float(-232.9), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(11), float(40), float(-80.8), float(-234.5), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(11), float(39.6), float(-80.7), float(-244.7), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_bodyguard', 'tatooine', cave.getCellByCellNumber(13), float(24.8), float(-79.7), float(-265.8), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(13), float(28.2), float(-79.7), float(-275.7), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(13), float(10.2), float(-79.7), float(-277.7), float(0.71), float(0), float(0.70), float(0)) + + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(14), float(-25.4), float(-85.4), float(-263.9), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_bodyguard', 'tatooine', cave.getCellByCellNumber(15), float(-78.4), float(-96.6), float(-233), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(17), float(-109.5), float(-107.9), float(-338.8), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(17), float(-126.7), float(-107.8), float(-313.9), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(17), float(-150.3), float(-116.7), float(-335.7), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_bodyguard', 'tatooine', cave.getCellByCellNumber(17), float(-158.7), float(-111.9), float(-324.7), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_bodyguard', 'tatooine', cave.getCellByCellNumber(17), float(-170.9), float(-109.1), float(-317.3), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(9), float(-57.5), float(-65.2), float(-197.8), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(10), float(-138), float(-86), float(-257.5), float(0.71), float(0), float(0.70), float(0)) + + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(9), float(-91.3), float(-74.4), float(-199.2), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('desert_demon_brawler', 'tatooine', cave.getCellByCellNumber(10), float(-124.2), float(-84.5), float(-253.9), float(0.71), float(0), float(0.70), float(0)) + + #dunestalker + + stcSvc.spawnObject('dune_stalker_brawler', 'tatooine', cave.getCellByCellNumber(12), float(-163.8), float(-88.5), float(-221.7), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('dune_stalker_enforcer', 'tatooine', cave.getCellByCellNumber(12), float(-162.6), float(-87.5), float(-214.3), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('dune_stalker_brawler', 'tatooine', cave.getCellByCellNumber(12), float(-174.7), float(-87.8), float(-217.7), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('dune_stalker_leader', 'tatooine', cave.getCellByCellNumber(12), float(-198.4), float(-89), float(-166.5), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('dune_stalker_marksman', 'tatooine', cave.getCellByCellNumber(12), float(-210.5), float(-88), float(-174.9), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('dune_stalker_scavenger', 'tatooine', cave.getCellByCellNumber(12), float(-233.4), float(-87.4), float(-221.2), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('dune_stalker_enforcer', 'tatooine', cave.getCellByCellNumber(12), float(-249.5), float(-87.6), float(-229.4), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('dune_stalker_brawler', 'tatooine', cave.getCellByCellNumber(12), float(-254.4), float(-88.1), float(-219.7), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('dune_stalker_enforcer', 'tatooine', cave.getCellByCellNumber(12), float(-256.3), float(-84.8), float(-198.2), float(0.71), float(0), float(0.70), float(0)) + + stcSvc.spawnObject('rock_beetle', 'tatooine', cave.getCellByCellNumber(12), float(-275.4), float(-81.7), float(-192.8), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('rock_beetle', 'tatooine', cave.getCellByCellNumber(12), float(-276), float(-81.1), float(-182), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('rock_beetle', 'tatooine', cave.getCellByCellNumber(12), float(-286), float(-81), float(-199.6), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('rock_beetle', 'tatooine', cave.getCellByCellNumber(12), float(-269.9), float(-86.1), float(-248.1), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('rock_beetle', 'tatooine', cave.getCellByCellNumber(12), float(-270.7), float(-86.1), float(-263), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('rock_beetle', 'tatooine', cave.getCellByCellNumber(12), float(-264.9), float(-84.8), float(-251.6), float(0.71), float(0), float(0.70), float(0)) + + + return + + diff --git a/scripts/static_spawns/tatooine/jawa_sandcrawler_legacy.py b/scripts/static_spawns/tatooine/jawa_sandcrawler_legacy.py index 4a4d0c61..0a748d49 100644 --- a/scripts/static_spawns/tatooine/jawa_sandcrawler_legacy.py +++ b/scripts/static_spawns/tatooine/jawa_sandcrawler_legacy.py @@ -21,5 +21,22 @@ def addPlanetSpawns(core, planet): fa2po.setOptionsBitmask(256) + #tusken point 1 + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3691), float(4.5), float(-4781), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3675), float(2), float(-4790), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3669), float(2.1), float(-4780), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3687), float(3), float(-4794), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3674), float(0.5), float(-4804), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3696), float(3.6), float(-4803), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3681), float(3.8), float(-4777), float(0), float(0), float(0), float(0), 45) + + #tusken point 2 + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3529), float(0), float(-4638), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3523), float(0), float(-4646), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3510), float(0), float(-4641), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3511), float(0), float(-4629), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3522), float(0), float(-4623), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3532), float(0), float(-4623), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('tusken_outrider', 'tatooine', long(0), float(-3523), float(0), float(-4632), float(0), float(0), float(0), float(0), 45) return diff --git a/scripts/static_spawns/tatooine/jem_lavar_place.py b/scripts/static_spawns/tatooine/jem_lavar_place.py new file mode 100644 index 00000000..4af6f2f3 --- /dev/null +++ b/scripts/static_spawns/tatooine/jem_lavar_place.py @@ -0,0 +1,36 @@ +import sys +# Project SWG: Jem Levar Place Spawn +# (C)2014 ProjectSWG + + + +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + + stcSvc = core.staticService + objSvc = core.objectService + + # TODO Check all NPCs for personalized scripting, change format. + + jem = stcSvc.spawnObject('object/mobile/shared_dressed_legacy_lavar.iff', 'tatooine', long(0), float(-487.6), float(43.7), float(-7119.5), float(0), float(0)) + jem.setCustomName('Jem Lavar') + jem.setOptionsBitmask(256) + + #gunrunners + + stcSvc.spawnObject('gunrunner_1', 'tatooine', long(0), float(-483), float(42.7), float(-7107), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('gunrunner_1', 'tatooine', long(0), float(-475), float(42), float(-7106), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('gunrunner_1', 'tatooine', long(0), float(-466), float(41.4), float(-7101), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('gunrunner_1', 'tatooine', long(0), float(-476), float(42.9), float(-7119), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('gunrunner_1', 'tatooine', long(0), float(-477), float(43.7), float(-7129), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('gunrunner_1', 'tatooine', long(0), float(-490), float(45.7), float(-7134), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('gunrunner_1', 'tatooine', long(0), float(-495), float(44.3), float(-7124), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('gunrunner_1', 'tatooine', long(0), float(-505), float(47.1), float(-7119), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('gunrunner_1', 'tatooine', long(0), float(-507), float(44.7), float(-7100), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('gunrunner_1', 'tatooine', long(0), float(-494), float(43.9), float(-7108), float(0), float(0), float(0), float(0), 45) + + return + diff --git a/scripts/static_spawns/tatooine/lars_homestead.py b/scripts/static_spawns/tatooine/lars_homestead.py index 90877ca9..3bc982e3 100644 --- a/scripts/static_spawns/tatooine/lars_homestead.py +++ b/scripts/static_spawns/tatooine/lars_homestead.py @@ -20,6 +20,15 @@ def addPlanetSpawns(core, planet): zefAndo.setCustomName2('Zef Ando') zefAndo.setOptionsBitmask(256) + #droids + stcSvc.spawnObject('modified_battle_droid', 'tatooine', long(0), float(-2578), float(0), float(-5638), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('modified_battle_droid', 'tatooine', long(0), float(-2588), float(0), float(-5621), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('modified_battle_droid', 'tatooine', long(0), float(-2604), float(0), float(-5648), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('modified_battle_droid', 'tatooine', long(0), float(-2570), float(0), float(-5668), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('modified_battle_droid', 'tatooine', long(0), float(-2545), float(0), float(-5648), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('modified_battle_droid', 'tatooine', long(0), float(-2563), float(0), float(-5630), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('modified_battle_droid', 'tatooine', long(0), float(-2590), float(0), float(-5627), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('modified_battle_droid', 'tatooine', long(0), float(-2594), float(0), float(-5649), float(0), float(0), float(0), float(0), 45) return diff --git a/scripts/static_spawns/tatooine/mos_eisley_toggi_bok.py b/scripts/static_spawns/tatooine/mos_eisley_toggi_bok.py index 6c172aa7..eeeb94b0 100644 --- a/scripts/static_spawns/tatooine/mos_eisley_toggi_bok.py +++ b/scripts/static_spawns/tatooine/mos_eisley_toggi_bok.py @@ -13,7 +13,9 @@ def addPlanetSpawns(core, planet): stcSvc = core.staticService objSvc = core.objectService + #toggi bock + stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_opening_toggi.iff', 'tatooine', long(0), float(2756), float(7), float(-4567), float(0), float(0), float(0), float(0)) # Thiefs thiefs = stcSvc.spawnObject('thief', 'tatooine', long(0), float(2780), float(6), float(-4579), float(0), float(0), float(0), float(0), 30) diff --git a/scripts/static_spawns/tatooine/mos_eisley_wt_bunker.py b/scripts/static_spawns/tatooine/mos_eisley_wt_bunker.py index cc115e3c..4bbd6e7c 100644 --- a/scripts/static_spawns/tatooine/mos_eisley_wt_bunker.py +++ b/scripts/static_spawns/tatooine/mos_eisley_wt_bunker.py @@ -104,5 +104,9 @@ def addPlanetSpawns(core, planet): prisoner4 = stcSvc.spawnObject('object/mobile/shared_dressed_noble_twilek_female_01.iff', 'tatooine', wt_bunker.getCellByCellNumber(21), float(-36), float(-12), float(129.9), float(0.994), float(0), float(0.105), float(0)) prisoner4.setCustomName('Ogavi Stibi') prisoner4.setOptionsBitmask(256) + + durr = stcSvc.spawnObject('durr_rodak', 'tatooine', wt_bunker.getCellByCellNumber(29), float(-153.7), float(-44), float(97.8), float(0), float(0), float(0), float(0), 45) + + brok = stcSvc.spawnObject('brok_ziamzun', 'tatooine', wt_bunker.getCellByCellNumber(32), float(-58.1), float(-44), float(-7.3), float(0), float(0), float(0), float(0), 45) return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/mos_espa.py b/scripts/static_spawns/tatooine/mos_espa.py index 666d8b1b..1cae7735 100644 --- a/scripts/static_spawns/tatooine/mos_espa.py +++ b/scripts/static_spawns/tatooine/mos_espa.py @@ -70,7 +70,10 @@ def addPlanetSpawns(core, planet): #Junkdealer will be added as soon as i can find coords stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-3060.50), float(5), float(2181.71), float(0), float(1)) stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-2924.53), float(5), float(2173.97), float(0), float(1)) - - + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-2977), float(5.5), float(2327), float(0), float(1)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-3008), float(5.5), float(2347), float(0), float(1)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-2903), float(5), float(2446), float(0), float(1)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-2085), float(5), float(2195), float(0), float(1)) + stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-2085), float(5), float(2230), float(0), float(1)) return diff --git a/scripts/static_spawns/tatooine/tosche_station.py b/scripts/static_spawns/tatooine/tosche_station.py new file mode 100644 index 00000000..0e5ddec8 --- /dev/null +++ b/scripts/static_spawns/tatooine/tosche_station.py @@ -0,0 +1,14 @@ +import sys +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + stcSvc = core.staticService + + stcSvc.spawnObject('desert_demon', 'tatooine', long(0), float(-260), float(3.5), float(-6205.3), float(0.70), float(0.71), float(0), float(0), 45) + stcSvc.spawnObject('desert_demon', 'tatooine', long(0), float(-243), float(12.3), float(-6202), float(0.70), float(0.71), float(0), float(0), 45) + stcSvc.spawnObject('desert_demon', 'tatooine', long(0), float(-250), float(6.3), float(-6199), float(0.70), float(0.71), float(0), float(0), 45) + stcSvc.spawnObject('desert_demon', 'tatooine', long(0), float(-255), float(4.1), float(-6207), float(0.70), float(0.71), float(0), float(0), 45) + return + diff --git a/scripts/static_spawns/tatooine/valarian_haul.py b/scripts/static_spawns/tatooine/valarian_haul.py new file mode 100644 index 00000000..e7086e13 --- /dev/null +++ b/scripts/static_spawns/tatooine/valarian_haul.py @@ -0,0 +1,86 @@ +import sys +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + stcSvc = core.staticService + + #inside depot + #Gate + stcSvc.spawnObject('valarian_depot_guard', 'tatooine', long(0), float(-1640), float(9.9), float(-3272), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_guard', 'tatooine', long(0), float(-1655), float(9.9), float(-3279), float(0), float(0), float(0), float(0), 45) + #inner Place + stcSvc.spawnObject('valarian_depot_worker', 'tatooine', long(0), float(-1666), float(9.9), float(-3287), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_swooper', 'tatooine', long(0), float(-1634), float(9.9), float(-3300), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_scout', 'tatooine', long(0), float(-1640), float(9.9), float(-3298), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_boss', 'tatooine', long(0), float(-1618), float(9.2), float(-3327), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_swooper', 'tatooine', long(0), float(-1627), float(8.3), float(-3335), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_foreman', 'tatooine', long(0), float(-1661), float(7.8), float(-3331), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_worker', 'tatooine', long(0), float(-1703.5), float(12.3), float(-3330), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_swooper', 'tatooine', long(0), float(-1706), float(12.8), float(-3333), float(0), float(0), float(0), float(0), 45) + + #down the hill + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1728), float(18.9), float(-3347), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1730), float(19.9), float(-3347), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_enforcer', 'tatooine', long(0), float(-1730), float(19), float(-3351), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1733), float(20.4), float(-3328), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1734), float(24.8), float(-3249), float(0), float(0), float(0), float(0), 45) + + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1728), float(18.9), float(-3347), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1730), float(19.9), float(-3347), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_enforcer', 'tatooine', long(0), float(-1730), float(19), float(-3351), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1733), float(20.4), float(-3328), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thug', 'tatooine', long(0), float(-1734), float(24.8), float(-3249), float(0), float(0), float(0), float(0), 45) + + #around camp + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1676), float(11.2), float(-3260), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1684), float(12.8), float(-3260), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thug', 'tatooine', long(0), float(-1695), float(14.7), float(-3274), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1699), float(16.4), float(-3271), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1708), float(20.7), float(-3256), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1710), float(21.9), float(-3249), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_enforcer', 'tatooine', long(0), float(-1621), float(11.3), float(-3248), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thug', 'tatooine', long(0), float(-1619), float(11.4), float(-3247.5), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_enforcer', 'tatooine', long(0), float(-1588), float(7.8), float(-3306), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1575), float(7.9), float(-3312), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1571), float(8.1), float(-3309), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1585), float(7.6), float(-3318), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1590), float(7.8), float(-3325), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thug', 'tatooine', long(0), float(-1673), float(8.7), float(-3379), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_enforcer', 'tatooine', long(0), float(-1686), float(9.7), float(-3376), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1681), float(8.7), float(-3367), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1650), float(8.7), float(-3360), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1642), float(8.7), float(-3367), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1638), float(8.7), float(-3369), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1640), float(8.7), float(-3372), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_enforcer', 'tatooine', long(0), float(-1647), float(8.7), float(-3377), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thug', 'tatooine', long(0), float(-1592), float(7.4), float(-3362), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1603), float(7.4), float(-3363), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1608), float(7.4), float(-3367), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_enforcer', 'tatooine', long(0), float(-1610), float(7.4), float(-3366), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thug', 'tatooine', long(0), float(-1608), float(7.4), float(-3370), float(0), float(0), float(0), float(0), 45) + #up the hill + stcSvc.spawnObject('valarian_shuttle_guard', 'tatooine', long(0), float(-1754), float(31.5), float(-3325), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_shuttle_guard', 'tatooine', long(0), float(-1754), float(31.5), float(-3328), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_shuttle_guard', 'tatooine', long(0), float(-1759), float(31.5), float(-3320), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_shuttle_guard', 'tatooine', long(0), float(-1762), float(31.5), float(-3327), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1730), float(23.9), float(-3324), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1731), float(24.2), float(-3315), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_enforcer', 'tatooine', long(0), float(-1733), float(25.9), float(-3312), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_foreman', 'tatooine', long(0), float(-1739), float(28.6), float(-3307), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1726), float(22.1), float(-3297), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1744), float(28.2), float(-3290), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_henchman', 'tatooine', long(0), float(-1812), float(31.5), float(-3293), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_enforcer', 'tatooine', long(0), float(-1814), float(31.5), float(-3289), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thug', 'tatooine', long(0), float(-1845), float(29.9), float(-3326), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1840), float(31.5), float(-3332), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1825), float(31.5), float(-3334), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1819), float(31.5), float(-3374), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1814), float(31.4), float(-3374), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_henchman', 'tatooine', long(0), float(-1810), float(31.5), float(-3365), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_henchman', 'tatooine', long(0), float(-1786), float(30.3), float(-3389), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_scout', 'tatooine', long(0), float(-1775), float(30.1), float(-3386), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_thief', 'tatooine', long(0), float(-1770), float(31.4), float(-3377), float(0), float(0), float(0), float(0), 45) + return + diff --git a/src/main/NGECore.java b/src/main/NGECore.java index 92dde2db..757f4d39 100644 --- a/src/main/NGECore.java +++ b/src/main/NGECore.java @@ -99,10 +99,12 @@ import services.object.ObjectId; import services.object.ObjectService; import services.object.UpdateService; import services.pet.MountService; +import services.playercities.PlayerCity; import services.playercities.PlayerCityService; import services.resources.HarvesterService; import services.resources.ResourceService; import services.retro.RetroService; +import services.reverseengineering.ReverseEngineeringService; import services.spawn.SpawnService; import services.sui.SUIService; import services.trade.TradeService; @@ -199,7 +201,7 @@ public class NGECore { public HarvesterService harvesterService; public MountService mountService; public PlayerCityService playerCityService; - + public ReverseEngineeringService reverseEngineeringService; // Login Server public NetworkDispatch loginDispatch; @@ -227,6 +229,7 @@ public class NGECore { private ObjectDatabase resourceHistoryODB; private ObjectDatabase swgObjectODB; private ObjectDatabase bountiesODB; + private ObjectDatabase cityODB; public static boolean PACKET_DEBUG = false; @@ -305,6 +308,7 @@ public class NGECore { resourceHistoryODB = new ObjectDatabase("resourcehistory", true, true, true, GalacticResource.class); auctionODB = new ObjectDatabase("auction", true, true, true, AuctionItem.class); bountiesODB = new ObjectDatabase("bounties", true, true, true, BountyListItem.class); + cityODB = new ObjectDatabase("cities", true, true, true, PlayerCity.class); // Services loginService = new LoginService(this); @@ -340,6 +344,7 @@ public class NGECore { mountService = new MountService(this); playerCityService = new PlayerCityService(this); staticService = new StaticService(this); + reverseEngineeringService = new ReverseEngineeringService(this); if (config.keyExists("JYTHONCONSOLE.PORT")) { int jythonPort = config.getInt("JYTHONCONSOLE.PORT"); @@ -398,6 +403,7 @@ public class NGECore { zoneDispatch.addService(housingService); zoneDispatch.addService(playerCityService); zoneDispatch.addService(staticService); + zoneDispatch.addService(reverseEngineeringService); if (optionsConfigLoaded && options.getInt("LOAD.RESOURCE.SYSTEM") == 1) { zoneDispatch.addService(surveyService); @@ -517,7 +523,8 @@ public class NGECore { staticService.spawnStatics(); equipmentService.loadBonusSets(); - + playerCityService.loadCityRankCaps(); + playerCityService.loadCities(); retroService.run(); didServerCrash = false; @@ -673,7 +680,11 @@ public class NGECore { public ObjectDatabase getAuctionODB() { return auctionODB; } - + + public ObjectDatabase getCityODB() { + return cityODB; + } + public int getActiveClients() { int connections = 0; for (Map.Entry c : clients.entrySet()) { @@ -781,6 +792,7 @@ public class NGECore { objectIdODB.close(); duplicateIdODB.close(); auctionODB.close(); + cityODB.close(); } public String getMotd() { diff --git a/src/protocol/swg/CharacterSheetResponseMessage.java b/src/protocol/swg/CharacterSheetResponseMessage.java index bdb6531d..e2cedb97 100644 --- a/src/protocol/swg/CharacterSheetResponseMessage.java +++ b/src/protocol/swg/CharacterSheetResponseMessage.java @@ -27,6 +27,7 @@ import main.NGECore; import org.apache.mina.core.buffer.IoBuffer; +import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; import resources.objects.player.PlayerObject; import engine.resources.common.CRC; @@ -90,16 +91,24 @@ public class CharacterSheetResponseMessage extends SWGMessage { buffer.putFloat(0); // bank y buffer.put(getAsciiString("tatooine")); - buffer.putFloat(0); // home x - buffer.putFloat(0); // home z - buffer.putFloat(0); // home y - buffer.put(getAsciiString("")); // home planet + if(creature.getAttachment("residentBuilding") == null) { + buffer.putFloat(0); // home x + buffer.putFloat(0); // home z + buffer.putFloat(0); // home y + buffer.put(getAsciiString("")); // home planet + } else { + BuildingObject building = (BuildingObject) NGECore.getInstance().objectService.getObject((long) creature.getAttachment("residentBuilding")); + buffer.putFloat(building.getPosition().x); // home x + buffer.putFloat(building.getPosition().y); // home z + buffer.putFloat(building.getPosition().z); // home y + buffer.put(getAsciiString(building.getPlanet().getName())); // home planet + } - buffer.put(getAsciiString("")); // Name of city player resides in + buffer.put(getAsciiString(player.getHome())); // Name of city player resides in buffer.put(getUnicodeString(spouse)); - buffer.putInt(creature.getPlayerObject().getLotsRemaining()); // lots remaining + buffer.putInt(player.getLotsRemaining()); // lots remaining return buffer.flip(); } diff --git a/src/resources/common/AnimationType.java b/src/resources/common/AnimationType.java index b0bd9a17..d426e009 100644 --- a/src/resources/common/AnimationType.java +++ b/src/resources/common/AnimationType.java @@ -1,3 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ package resources.common; public class AnimationType { diff --git a/src/resources/common/MathUtilities.java b/src/resources/common/MathUtilities.java index b6159ac0..cdfd672e 100644 --- a/src/resources/common/MathUtilities.java +++ b/src/resources/common/MathUtilities.java @@ -70,6 +70,15 @@ public class MathUtilities { return dec.remainder(new BigDecimal(3600)).divide(new BigDecimal(60), BigDecimal.ROUND_FLOOR).intValue(); } + public float fastInverseSqrt(float x) { + float xHalf = 0.5F * x; + int temp = Float.floatToRawIntBits(x); + temp = 0x5F3759DF - (temp >> 1); // magic + float newX = Float.intBitsToFloat(temp); + newX = newX * (1.5F - xHalf * newX * newX); + return newX; + } + public static boolean tryChance(int chance) { if (chance <= 0) { return false; diff --git a/src/resources/common/ProsePackage.java b/src/resources/common/ProsePackage.java index bdb10e5f..0d7b9dcc 100644 --- a/src/resources/common/ProsePackage.java +++ b/src/resources/common/ProsePackage.java @@ -221,4 +221,11 @@ public class ProsePackage implements Serializable { this.dfFloat = dfFloat; } + public void init() { + stf.init(null); + tuStf.init(null); + ttStf.init(null); + toStf.init(null); + } + } diff --git a/src/resources/common/collidables/CollidableCircle.java b/src/resources/common/collidables/CollidableCircle.java index fef3eacc..2f6cf76c 100644 --- a/src/resources/common/collidables/CollidableCircle.java +++ b/src/resources/common/collidables/CollidableCircle.java @@ -31,6 +31,7 @@ public class CollidableCircle extends AbstractCollidable { private Point3D center; private float radius; + private float radiusSquared; // for bh traps private boolean useYAxis = false; @@ -54,6 +55,7 @@ public class CollidableCircle extends AbstractCollidable { public void setRadius(float radius) { this.radius = radius; + this.radiusSquared = radius * radius; } public boolean isUseYAxis() { @@ -68,18 +70,18 @@ public class CollidableCircle extends AbstractCollidable { public boolean doesCollide(SWGObject obj) { Point3D objectPos = obj.getWorldPosition(); if(useYAxis) { - return center.getDistance(objectPos) <= radius && objectPos.y == center.y; + return (objectPos.x - center.x) * (objectPos.x - center.x) + (objectPos.z - center.z) * (objectPos.z - center.z) <= radiusSquared && objectPos.y <= center.y + 1 && objectPos.y >= center.y - 1; } else { - return center.getDistance(objectPos) <= radius; + return (objectPos.x - center.x) * (objectPos.x - center.x) + (objectPos.z - center.z) * (objectPos.z - center.z) <= radiusSquared; } } @Override public boolean doesCollide(Point3D position) { if(useYAxis) { - return center.getDistance(position) <= radius && position.y == center.y; + return (position.x - center.x) * (position.x - center.x) + (position.z - center.z) * (position.z - center.z) <= radiusSquared && position.y <= center.y + 1 && position.y >= center.y - 1; } else { - return center.getDistance(position) <= radius; + return (position.x - center.x) * (position.x - center.x) + (position.z - center.z) * (position.z - center.z) <= radiusSquared; } } diff --git a/src/resources/datatables/CivicStructures.java b/src/resources/datatables/CivicStructures.java new file mode 100644 index 00000000..8de2f8c9 --- /dev/null +++ b/src/resources/datatables/CivicStructures.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ +package resources.datatables; + +public class CivicStructures { + + public static final int BANK = 1; + public static final int CLONING_FACILITY = 2; + public static final int MEDICAL_CENTER = 3; + public static final int GARAGE = 4; + public static final int CANTINA = 5; + public static final int THEATER = 6; + public static final int SHUTTLEPORT = 7; + public static final int SMALL_GARDEN = 8; + public static final int MEDIUM_GARDEN = 9; + public static final int LARGE_GARDEN = 10; + + // [CiviCode - 1] for rank + public static final int[] rankRequired = new int[] { 2, 3, 3, 2, 2, 4, 4, 1, 2, 3}; + +} diff --git a/src/resources/objectives/BountyMissionObjective.java b/src/resources/objectives/BountyMissionObjective.java index a2d81812..bd5d7a87 100644 --- a/src/resources/objectives/BountyMissionObjective.java +++ b/src/resources/objectives/BountyMissionObjective.java @@ -298,20 +298,20 @@ public class BountyMissionObjective extends MissionObjective { return; } - WaypointObject missionWp = mission.getAttachedWaypoint(); + WaypointObject missionWp = mission.getWaypoint(); - if (missionWp == null) { - WaypointObject waypoint = (WaypointObject) NGECore.getInstance().objectService.createObject("object/waypoint/shared_waypoint.iff", target.getPlanet(), - target.getWorldPosition().x, target.getWorldPosition().z, target.getWorldPosition().y); + if (missionWp.getPlanetCRC() != CRC.StringtoCRC(target.getPlanet().name)) { + WaypointObject waypoint = (WaypointObject) getMissionObject().getWaypoint(); waypoint.setActive(true); waypoint.setColor(WaypointObject.ORANGE); - waypoint.setName(getMissionObject().getMissionTargetName()); + waypoint.setName(getMissionObject().getTargetName()); waypoint.setPlanetCRC(CRC.StringtoCRC(target.getPlanet().getName())); waypoint.setStringAttribute("", ""); - getMissionObject().setAttachedWaypoint(waypoint); + getMissionObject().setWaypoint(waypoint); } else { missionWp.setPosition(target.getWorldPosition()); - mission.setAttachedWaypoint(missionWp); + mission.setWaypoint(missionWp); + getMissionObject().setWaypoint(missionWp); } actor.sendSystemMessage("@mission/mission_generic:target_location_updated_ground", DisplayType.Broadcast); actor.sendSystemMessage("@mission/mission_generic:target_continue_tracking", DisplayType.Broadcast); @@ -327,7 +327,7 @@ public class BountyMissionObjective extends MissionObjective { public void beginArakydUpdate(final CreatureObject actor) { arakydActive = true; Executors.newScheduledThreadPool(1).schedule(() -> { - + int number = new Random().nextInt(100); // Effectively a 16% chance of failing. The failure type is calculated by subtracting 10 from the number received. @@ -340,14 +340,15 @@ public class BountyMissionObjective extends MissionObjective { target.getWorldPosition().x, target.getWorldPosition().z, target.getWorldPosition().y); waypoint.setActive(true); waypoint.setColor(WaypointObject.ORANGE); - waypoint.setName(getMissionObject().getMissionTargetName()); + waypoint.setName(getMissionObject().getTargetName()); waypoint.setPlanetCRC(CRC.StringtoCRC(target.getPlanet().getName())); waypoint.setStringAttribute("", ""); - getMissionObject().setAttachedWaypoint(waypoint); + + actor.getClient().getSession().write(getMissionObject().getBaseline3().set("waypoint", waypoint)); actor.sendSystemMessage("@mission/mission_generic:target_location_updated_ground", DisplayType.Broadcast); actor.sendSystemMessage("@mission/mission_generic:target_located_" + target.getPlanet().getName(), DisplayType.Broadcast); - + }, 180, TimeUnit.SECONDS); } diff --git a/src/resources/objectives/DeliveryMissionObjective.java b/src/resources/objectives/DeliveryMissionObjective.java index 96f9b583..b2ae62a6 100644 --- a/src/resources/objectives/DeliveryMissionObjective.java +++ b/src/resources/objectives/DeliveryMissionObjective.java @@ -21,6 +21,7 @@ ******************************************************************************/ package resources.objectives; +import engine.resources.common.CRC; import engine.resources.scene.Point3D; import main.NGECore; import resources.common.OutOfBand; @@ -51,8 +52,8 @@ public class DeliveryMissionObjective extends MissionObjective { String template = "object/mobile/shared_dressed_commoner_tatooine_sullustan_male_06.iff"; - Point3D startLoc = parent.getStartLocation(); - Point3D destination = parent.getDestination(); + Point3D startLoc = parent.getStartLocation().getLocation(); + Point3D destination = parent.getDestinationLocation().getLocation(); // TODO: Randomize this process. CreatureObject missionGiver = (CreatureObject) core.staticService.spawnObject(template, parent.getPlanet().name, 0, startLoc.x, startLoc.y, startLoc.z, 0, 1); @@ -78,19 +79,22 @@ public class DeliveryMissionObjective extends MissionObjective { setDropOffNpc(dropOffNpc); if (getObjectivePhase() == 0) { - WaypointObject waypoint = (WaypointObject) core.objectService.createObject("object/waypoint/shared_waypoint.iff", parent.getPlanet()); + WaypointObject waypoint = getMissionObject().getWaypoint(); + //waypoint.setPlanet(missionGiver.getPlanet()); + waypoint.setPlanetCRC(CRC.StringtoCRC(missionGiver.getPlanet().name)); waypoint.setPosition(startLoc); - waypoint.setName("@mission/" + parent.getMissionTitle() + ":" + "m" + parent.getMissionId() + "t"); + waypoint.setName("@" + parent.getTitle().getStfFilename() + ":" + "m" + parent.getMissionId() + "t"); waypoint.setColor(WaypointObject.ORANGE); waypoint.setActive(true); - getMissionObject().setAttachedWaypoint(waypoint); + getMissionObject().setWaypoint(waypoint); } else if (getObjectivePhase() == 1) { - WaypointObject waypoint = (WaypointObject) core.objectService.createObject("object/waypoint/shared_waypoint.iff", parent.getPlanet()); - waypoint.setPosition(parent.getDestination()); - waypoint.setName("@mission/" + parent.getMissionTitle() + ":" + "m" + parent.getMissionId() + "t"); + WaypointObject waypoint = getMissionObject().getWaypoint(); + waypoint.setPlanetCRC(CRC.StringtoCRC(dropOffNpc.getPlanet().name)); + waypoint.setPosition(destination); + waypoint.setName("@" + parent.getTitle().getStfFilename() + ":" + "m" + parent.getMissionId() + "t"); waypoint.setColor(WaypointObject.ORANGE); waypoint.setActive(true); - getMissionObject().setAttachedWaypoint(waypoint); + getMissionObject().setWaypoint(waypoint); } setActive(true); @@ -130,22 +134,21 @@ public class DeliveryMissionObjective extends MissionObjective { switch(getObjectivePhase()) { case 1: WaypointObject waypoint = (WaypointObject) core.objectService.createObject("object/waypoint/shared_waypoint.iff", parent.getPlanet()); - waypoint.setPosition(parent.getDestination()); - waypoint.setName("@mission/" + parent.getMissionTitle() + ":" + "m" + parent.getMissionId() + "t"); + waypoint.setPosition(parent.getDestinationLocation().getLocation()); + waypoint.setName("@" + parent.getTitle().getStfFilename() + ":" + "m" + parent.getMissionId() + "t"); waypoint.setColor(WaypointObject.ORANGE); waypoint.setActive(true); - getMissionObject().setMissionTargetName("Dropoff Location"); - getMissionObject().setAttachedWaypoint(waypoint); - System.out.println("Waypoint set to " + parent.getDestination().x + " and " + parent.getDestination().z); + getMissionObject().setTargetName("Dropoff Location"); + getMissionObject().setWaypoint(waypoint); break; case 2: WaypointObject returnWp = (WaypointObject) core.objectService.createObject("object/waypoint/shared_waypoint.iff", parent.getPlanet()); - returnWp.setPosition(parent.getStartLocation()); - returnWp.setName("@mission/" + parent.getMissionTitle() + ":" + "m" + parent.getMissionId() + "t"); + returnWp.setPosition(parent.getStartLocation().getLocation()); + returnWp.setName("@" + parent.getTitle().getStfFilename() + ":" + "m" + parent.getMissionId() + "t"); returnWp.setColor(WaypointObject.ORANGE); returnWp.setActive(true); - getMissionObject().setMissionTargetName("Return"); - getMissionObject().setAttachedWaypoint(returnWp); + getMissionObject().setTargetName("Return"); + getMissionObject().setWaypoint(returnWp); break; } } @@ -160,7 +163,7 @@ public class DeliveryMissionObjective extends MissionObjective { if (inventory == null) return false; - TangibleObject deliveryObject = (TangibleObject) core.objectService.createObject("object/tangible/mission/shared_mission_datadisk.iff", getMissionObject().getGrandparent().getPlanet()); + TangibleObject deliveryObject = (TangibleObject) core.objectService.createObject("object/tangible/mission/shared_mission_datadisk.iff", player.getPlanet()); if (deliveryObject != null && inventory.add(deliveryObject)) { setDeliveryObject(deliveryObject); diff --git a/src/resources/objectives/SurveyMissionObjective.java b/src/resources/objectives/SurveyMissionObjective.java index 025b15bf..67c0c3fe 100644 --- a/src/resources/objectives/SurveyMissionObjective.java +++ b/src/resources/objectives/SurveyMissionObjective.java @@ -47,7 +47,7 @@ public class SurveyMissionObjective extends MissionObjective{ public void activate(NGECore core, CreatureObject player) { pickupPlanet = player.getPlanet().getName(); pickupLocation = player.getPosition(); - resourceFamily = getMissionObject().getMissionTargetName(); + resourceFamily = getMissionObject().getTargetName(); // This way will allow 2 survey missions at a time. AtomicInteger number = new AtomicInteger(); diff --git a/src/resources/objects/building/BuildingObject.java b/src/resources/objects/building/BuildingObject.java index 152b4846..9ee735d1 100644 --- a/src/resources/objects/building/BuildingObject.java +++ b/src/resources/objects/building/BuildingObject.java @@ -35,6 +35,7 @@ import resources.datatables.Options; import resources.objects.ObjectMessageBuilder; import resources.objects.cell.CellObject; import resources.objects.creature.CreatureObject; +import resources.objects.player.PlayerObject; import resources.objects.tangible.TangibleObject; import engine.clientdata.ClientFileManager; import engine.clientdata.visitors.PortalVisitor; @@ -54,6 +55,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria private Vector entryList = new Vector(); private Vector banList = new Vector(); + private Vector adminList = new Vector(); public static final byte PRIVATE = (byte) 0; public static final byte PUBLIC = (byte) 1; @@ -62,7 +64,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria super(objectID, planet, position, orientation, Template); getBaseline(3).set("volume", 255); setOptionsBitmask(Options.INVULNERABLE); - setConditionDamage(100); + setConditionDamage(0); setMaximumCondition(4320); setStaticObject(true); } @@ -71,7 +73,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria super(); getBaseline(3).set("volume", 255); setOptionsBitmask(Options.INVULNERABLE); - setConditionDamage(100); + setConditionDamage(0); setMaximumCondition(4320); setStaticObject(true); } @@ -82,7 +84,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria defendersList = new Vector(); getBaseline(3).set("volume", 255); setOptionsBitmask(Options.INVULNERABLE); - setConditionDamage(100); + setConditionDamage(0); setMaximumCondition(4320); } @@ -90,6 +92,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria public Baseline getOtherVariables() { Baseline baseline = super.getOtherVariables(); baseline.put("maintenanceAmount", (float) 0); + baseline.put("outstandingMaintenance", 0); baseline.put("baseMaintenanceRate", 0); baseline.put("deedTemplate", ""); baseline.put("residency", false); @@ -158,6 +161,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria PortalVisitor portal = ClientFileManager.loadFile(portalLayoutFilename, PortalVisitor.class); for (int i = 0; i <= portal.cellCount; i++) { + System.out.println("Cellname: " + portal.cells.get(i).name); if (cellName.equals(portal.cells.get(i).name)) { return getCellByCellNumber(i + 1); } @@ -190,12 +194,21 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria otherVariables.set("maintenanceAmount", maintenanceAmount); } + public int getOutstandingMaintenance() { + return (int) otherVariables.get("outstandingMaintenance"); + } + + public void setOutstandingMaintenance(int maintenanceAmount) { + otherVariables.set("outstandingMaintenance", maintenanceAmount); + } + public int getBMR() { return (int) otherVariables.get("baseMaintenanceRate"); } public void setBMR(int BMR) { otherVariables.set("baseMaintenanceRate", BMR); + setMaximumCondition(BMR); } public String getDeedTemplate(){ @@ -221,9 +234,8 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria return (boolean) otherVariables.get("residency"); } - public void setResidency(CreatureObject owner){ - owner.sendSystemMessage("@player_structure:declared_residency", (byte) 1); - otherVariables.set("residency", true); + public void setResidency(boolean flag) { + otherVariables.set("residency", flag); } public byte getPrivacy() { @@ -242,7 +254,8 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria } public void setPrivacy(byte privacy) { - otherVariables.set("residency", privacy); + otherVariables.set("privacy", privacy); + getObservers().stream().map(Client::getParent).forEach(this::updateCellPermissions); } public Vector getItemsList() { @@ -260,7 +273,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria } public short getMaximumStorageCapacity() { - return (byte) otherVariables.get("maximumStorageCapacity"); + return (short) otherVariables.get("maximumStorageCapacity"); } public void setMaximumStorageCapacity(short maximumStorageCapacity) { @@ -289,6 +302,18 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria owner.getClient().getSession().write(messageBuilder.buildPermissionListCreate(banListFirstNames, name)); } + public void setPermissionAdmin(String name, CreatureObject owner){ + Vector adminListFirstNames = new Vector(); + + for (long oid : adminList) { + String firstName = NGECore.getInstance().characterService.getPlayerFirstName(oid); + adminListFirstNames.add(firstName); + } + + owner.getClient().getSession().write(messageBuilder.buildPermissionListCreate(adminListFirstNames, name)); + } + + public void addPlayerToEntryList(CreatureObject owner, long oid, String firstName){ if (!entryList.contains(oid)){ SWGObject obj = NGECore.getInstance().objectService.getObject(oid); @@ -329,6 +354,22 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria } } + public void addPlayerToAdminList(CreatureObject owner, long oid, String firstName){ + if (!adminList.contains(oid)){ + adminList.add(oid); + if(owner != null) + owner.sendSystemMessage(OutOfBand.ProsePackage("@player_structure:player_added", "TO", NGECore.getInstance().objectService.getObject(oid).getCustomName()), DisplayType.Screen); + } + } + + public void removePlayerFromAdminList(CreatureObject owner, long oid, String firstName){ + if (adminList.contains(oid)){ + adminList.remove(oid); + if(owner != null) + owner.sendSystemMessage(OutOfBand.ProsePackage("@player_structure:player_removed", "TO", NGECore.getInstance().objectService.getObject(oid).getCustomName()), DisplayType.Screen); + } + } + @Override public void notifyClients(IoBuffer buffer, boolean notifySelf) { notifyObservers(buffer, false); @@ -365,7 +406,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria } public boolean canEnter(SWGObject object) { - return (getPrivacy() == PRIVATE && entryList.contains(object.getObjectID())) || !banList.contains(object.getObjectID()); + return (getPrivacy() == PRIVATE && (entryList.contains(object.getObjectID()) || adminList.contains(object.getObjectID()))) || !banList.contains(object.getObjectID()) || object.getClient().isGM(); } public void updateCellPermissions(SWGObject obj) { @@ -374,4 +415,17 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria viewChildren(this, true, false, (cell) -> ((CellObject) cell).sendPermissionMessage(obj.getClient())); } + public boolean isOnEntryList(CreatureObject creature) { + return entryList.contains(creature.getObjectID()); + } + + public boolean isOnBanList(CreatureObject creature) { + return banList.contains(creature.getObjectID()); + } + + public boolean isOnAdminList(CreatureObject creature) { + return adminList.contains(creature.getObjectID()); + } + + } diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index baa0e465..907526ab 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -1853,4 +1853,14 @@ public class CreatureObject extends TangibleObject implements Serializable { } } } + + public String getFirstName() + { + return getCustomName().split(" ")[0]; + } + + public String getLastName() + { + return getCustomName().split(" ")[1]; + } } diff --git a/src/resources/objects/factorycrate/FactoryCrateMessageBuilder.java b/src/resources/objects/factorycrate/FactoryCrateMessageBuilder.java index bcde4afc..4085f8e7 100644 --- a/src/resources/objects/factorycrate/FactoryCrateMessageBuilder.java +++ b/src/resources/objects/factorycrate/FactoryCrateMessageBuilder.java @@ -48,7 +48,7 @@ public class FactoryCrateMessageBuilder extends TangibleMessageBuilder{ buffer.putFloat(1.0f); //op0 buffer.put(getAsciiString("factory_n")); buffer.putInt(0); - buffer.put(getAsciiString("food_crate")); + buffer.put(getAsciiString(factoryCrateObject.getFactoryCrateType())); if (factoryCrateObject.getCustomName().length()>0) buffer.put(getUnicodeString(factoryCrateObject.getCustomName())); diff --git a/src/resources/objects/factorycrate/FactoryCrateObject.java b/src/resources/objects/factorycrate/FactoryCrateObject.java index b735ece8..54f0a715 100644 --- a/src/resources/objects/factorycrate/FactoryCrateObject.java +++ b/src/resources/objects/factorycrate/FactoryCrateObject.java @@ -42,6 +42,7 @@ import engine.resources.scene.Point3D; import engine.resources.scene.Quaternion; import resources.objects.ObjectMessageBuilder; import resources.objects.creature.CreatureObject; +import resources.objects.resource.ResourceContainerObject; import resources.objects.tangible.TangibleObject; @Persistent(version=0) @@ -53,7 +54,13 @@ public class FactoryCrateObject extends TangibleObject implements Serializable { private byte capacity; private byte contentObjectQuantity; private int contentCRC; - private TangibleObject contentObjectType; + //private TangibleObject contentObjectType; + private String contentObjectTypeTemplate; + private String contentObjectType; + private String factoryCrateType; + private Map contentAttributes; + private String contentFilename; + private String crateSerialNumber; @NotPersistent private transient FactoryCrateMessageBuilder messageBuilder; @@ -72,29 +79,22 @@ public class FactoryCrateObject extends TangibleObject implements Serializable { public FactoryCrateObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String template) { super(objectID, planet, position, orientation, template); this.messageBuilder = new FactoryCrateMessageBuilder(this); - this.contents = new Vector(); this.contentObjectQuantity = 0; this.capacity = 25; - this.getAttributes().put("@obj_attr_n:condition", "100/100"); - this.getAttributes().put("@obj_attr_n:volume", "1"); - this.getAttributes().put("@obj_attr_n:quantity", "1"); - this.getAttributes().put("@obj_attr_n:factory_count", "1"); - this.getAttributes().put("@obj_attr_n:factory_attribs", "------------"); - this.getAttributes().put("@obj_attr_n:type", "@got_n:component"); - this.getAttributes().put("@obj_attr_n:serial_number", "123"); - - + this.factoryCrateType = "factory_crate"; + this.contentObjectType = ""; + //this.setStackable(true); } public boolean setContentType(TangibleObject contentObject) { synchronized(objectMutex) { - this.contentObjectType = contentObject; + this.contentObjectTypeTemplate = contentObject.getTemplate(); if (contentObject.getTemplate().length()>0) this.contentCRC = CRC.StringtoCRC(contentObject.getTemplate()); else this.contentCRC = 0; - - Map contentAttributes = contentObject.getAttributes(); + + contentAttributes = contentObject.getAttributes(); for (Map.Entry entry : contentAttributes.entrySet()) { //if (!entry.getKey().equals(@obj_attr_n:condition)) @@ -105,13 +105,13 @@ public class FactoryCrateObject extends TangibleObject implements Serializable { } } - public TangibleObject getContentType() { + public String getContentType() { return this.contentObjectType; } public boolean setContentTypeAndQuantity(TangibleObject contentObject, int quantity) { synchronized(objectMutex) { - this.contentObjectType = contentObject; + this.contentObjectTypeTemplate = contentObject.getTemplate(); if (contentObject.getTemplate().length()>0) this.contentCRC = CRC.StringtoCRC(contentObject.getTemplate()); else{ @@ -119,33 +119,101 @@ public class FactoryCrateObject extends TangibleObject implements Serializable { return false; // Does it make sense to continue anyway? } - Map contentAttributes = contentObject.getAttributes(); + this.setCustomName(contentObject.getCustomName()); + + contentAttributes = contentObject.getAttributes(); for (Map.Entry entry : contentAttributes.entrySet()) { //if (!entry.getKey().equals(@obj_attr_n:condition)) this.getAttributes().put(entry.getKey(), entry.getValue()); System.out.println(entry.getKey() + " " + entry.getValue()); } - if (quantity0) + this.factoryCrateType = crateType; + if (contentType!=null) + if (contentType.length()>0) + this.contentObjectType = contentType; + + this.contentObjectTypeTemplate = contentObject.getTemplate(); + contentFilename = contentObject.getStfFilename(); + if (contentObject.getTemplate().length()>0) + this.contentCRC = CRC.StringtoCRC(contentObject.getTemplate()); + else{ + this.contentCRC = 0; + return false; // Does it make sense to continue anyway? + } + + if (contentObject.getSerialNumber()==null){ + crateSerialNumber = main.NGECore.getInstance().reverseEngineeringService.createSerialNumber(); + } else { + crateSerialNumber = contentObject.getSerialNumber(); + } + + this.setCustomName(contentObject.getCustomName()); + this.getAttributes().put("@obj_attr_n:condition", "100/100"); + this.getAttributes().put("@obj_attr_n:volume", "1"); + this.getAttributes().put("@obj_attr_n:quantity", "1"); + this.getAttributes().put("@obj_attr_n:factory_count", "1"); + this.getAttributes().put("@obj_attr_n:factory_attribs", "------------"); + this.getAttributes().put("@obj_attr_n:type", "@got_n:"+contentType); + if (contentObject.getStringAttribute("@obj_attr_n:original_name")!=null) + this.getAttributes().put("@obj_attr_n:original_name", contentObject.getStringAttribute("@obj_attr_n:original_name")); + if (contentObject.getStringAttribute("@obj_attr_n:crafter")!=null) + this.getAttributes().put("@obj_attr_n:crafter", contentObject.getStringAttribute("@obj_attr_n:crafter")); + this.getAttributes().put("@obj_attr_n:serial_number", crateSerialNumber); + + contentAttributes = contentObject.getAttributes(); + for (Map.Entry entry : contentAttributes.entrySet()) + { + //if (!entry.getKey().equals(@obj_attr_n:condition)) + if (entry.getKey()!=null && entry.getValue()!=null) + this.getAttributes().put(entry.getKey(), entry.getValue()); + } + if (quantity<=capacity) { + //this.setSerialNumber(contentObject.getSerialNumber()); +// for (int i=0;i0){ - TangibleObject contentType = this.getContentType(); - if (contentType==null) - return; // Bad, crate had no content type set - TangibleObject contentItem = (TangibleObject) core.objectService.createObject(contentType.getTemplate(), player.getPlanet()); + NGECore core = main.NGECore.getInstance(); + if (this.getQuantity()>0){ + TangibleObject contentItem = (TangibleObject) core.objectService.createObject(contentObjectTypeTemplate, player.getPlanet()); contentItem.setOptions(resources.datatables.Options.SERIAL, true); - int crc = this.getContentCRC();//CRC.StringtoCRC("object/tangible/food/crafted/shared_drink_alcohol.iff"); - SceneCreateObjectByCrc createObjectMsg = new SceneCreateObjectByCrc(contentItem.getObjectID(), player.getOrientation().x, player.getOrientation().y, player.getOrientation().z, player.getOrientation().w, player.getPosition().x, player.getPosition().y, player.getPosition().z, crc, (byte) 0); - player.getClient().getSession().write(createObjectMsg.serialize()); - contentItem.sendBaselines(player.getClient()); // TANO 3,6,8,9 Baselines - SceneEndBaselines sceneEndBaselinesMsg = new SceneEndBaselines(contentItem.getObjectID()); - player.getClient().getSession().write(sceneEndBaselinesMsg.serialize()); + contentItem.setSerialNumber(this.getSerialNumber()); +// int crc = this.getContentCRC();//CRC.StringtoCRC("object/tangible/food/crafted/shared_drink_alcohol.iff"); +// SceneCreateObjectByCrc createObjectMsg = new SceneCreateObjectByCrc(contentItem.getObjectID(), player.getOrientation().x, player.getOrientation().y, player.getOrientation().z, player.getOrientation().w, player.getPosition().x, player.getPosition().y, player.getPosition().z, crc, (byte) 0); +// player.getClient().getSession().write(createObjectMsg.serialize()); +// contentItem.sendBaselines(player.getClient()); // TANO 3,6,8,9 Baselines +// SceneEndBaselines sceneEndBaselinesMsg = new SceneEndBaselines(contentItem.getObjectID()); +// player.getClient().getSession().write(sceneEndBaselinesMsg.serialize()); + + for (Map.Entry entry : contentAttributes.entrySet()){ + //contentItem.getAttributes().put(entry.getKey(),entry.getValue()); + System.out.println("entry.getKey()"+entry.getKey()); + System.out.println("entry.getValue()"+entry.getValue()); + if (entry.getKey()!=null && entry.getValue()!=null) + contentItem.setStringAttribute(entry.getKey(),entry.getValue()); + } + + contentItem.setCustomName(this.getCustomName()); long parentId = this.getParentId(); SWGObject parentContainer = core.objectService.getObject(parentId); if (parentContainer==null) return; // crate has no parent, error - UpdateContainmentMessage updateContainmentMessage= new UpdateContainmentMessage(contentItem.getObjectID(), parentContainer.getObjectID(), -1); - player.getClient().getSession().write(updateContainmentMessage.serialize()); +// UpdateContainmentMessage updateContainmentMessage= new UpdateContainmentMessage(contentItem.getObjectID(), parentContainer.getObjectID(), -1); +// player.getClient().getSession().write(updateContainmentMessage.serialize()); + + parentContainer.add(contentItem); this.sendSetQuantity(player.getClient(),this.getQuantity()-1); if (this.getQuantity()==0){ // Crate is empty now, delete it @@ -210,10 +290,11 @@ public class FactoryCrateObject extends TangibleObject implements Serializable { } public String getSerialNumber() { - if (!contents.isEmpty()) { - return contents.firstElement().getSerialNumber(); - } - return ""; +// if (!contents.isEmpty()) { +// return contents.firstElement().getSerialNumber(); +// } + return crateSerialNumber; + //return ""; } public int getContentCRC() { @@ -226,11 +307,49 @@ public class FactoryCrateObject extends TangibleObject implements Serializable { } } - public void handleSplit(){ - - } + + public void splitFactoryCrate(CreatureObject owner, FactoryCrateObject originalObject, String commandString){ + String[] splitArray = commandString.split(" "); + if (splitArray.length<3) + return; + int cloneStackQuantity= Integer.parseInt(splitArray[0]); + int parentcontainerID= Integer.parseInt(splitArray[1]); + SWGObject objectParentContainer = (SWGObject) NGECore.getInstance().objectService.getObject(parentcontainerID); + if (objectParentContainer==null || originalObject==null) + return; + + FactoryCrateObject newCrateObject = (FactoryCrateObject) NGECore.getInstance().objectService.createObject(originalObject.getTemplate(), owner.getPlanet()); + //newCrateObject.cloneStats(originalObject); + + TangibleObject contentItem = (TangibleObject) NGECore.getInstance().objectService.createObject(contentObjectTypeTemplate, owner.getPlanet()); + contentItem.setOptions(resources.datatables.Options.SERIAL, true); + //contentItem.setSerialNumber(this.getSerialNumber()); + + for (Map.Entry entry : contentAttributes.entrySet()){ + //contentItem.getAttributes().put(entry.getKey(),entry.getValue()); + System.out.println("entry.getKey()"+entry.getKey()); + System.out.println("entry.getValue()"+entry.getValue()); + if (entry.getKey()!=null && entry.getValue()!=null) + contentItem.setStringAttribute(entry.getKey(),entry.getValue()); + } + + + contentItem.setCustomName(this.getCustomName()); + newCrateObject.setContentTypeAndQuantity(contentItem,cloneStackQuantity, originalObject.getFactoryCrateType(), originalObject.getContentType(), owner.getClient(),true); + + newCrateObject.getAttributes().put("@obj_attr_n:factory_count", ""+cloneStackQuantity); + newCrateObject.getAttributes().put("@obj_attr_n:quantity", ""+cloneStackQuantity); + + + //newCrateObject.sendSetQuantity(owner.getClient(), cloneStackQuantity); + originalObject.sendSetQuantity(owner.getClient(), originalObject.getQuantity()-cloneStackQuantity); + objectParentContainer.add(newCrateObject); + } + public void sendAddItem(Client destination) { + if (destination==null) + return; destination.getSession().write(messageBuilder.buildDelta3()); this.getAttributes().put("@obj_attr_n:factory_count", ""+this.getQuantity()); this.getAttributes().put("@obj_attr_n:quantity", ""+this.getQuantity()); @@ -238,6 +357,8 @@ public class FactoryCrateObject extends TangibleObject implements Serializable { } public void sendSetQuantity(Client destination,int quantity) { + if (destination==null) + return; contentObjectQuantity = (byte) quantity; destination.getSession().write(messageBuilder.buildDelta3()); this.getAttributes().put("@obj_attr_n:factory_count", ""+quantity); @@ -276,4 +397,8 @@ public class FactoryCrateObject extends TangibleObject implements Serializable { return messageBuilder; } + public String getFactoryCrateType(){ + return factoryCrateType; + } + } \ No newline at end of file diff --git a/src/resources/objects/harvester/HarvesterObject.java b/src/resources/objects/harvester/HarvesterObject.java index 50f87e23..c4dce6dc 100644 --- a/src/resources/objects/harvester/HarvesterObject.java +++ b/src/resources/objects/harvester/HarvesterObject.java @@ -424,4 +424,13 @@ public class HarvesterObject extends InstallationObject implements Serializable return messageBuilder; } + public boolean isOnHopperList(CreatureObject creature) { + return hopperList.contains(creature.getCustomName().split(" ")[0]); + } + + public boolean isOnAdminList(CreatureObject creature) { + return adminList.contains(creature.getCustomName().split(" ")[0]); + } + + } diff --git a/src/resources/objects/mission/MissionMessageBuilder.java b/src/resources/objects/mission/MissionMessageBuilder.java index 22431c85..4166aeca 100644 --- a/src/resources/objects/mission/MissionMessageBuilder.java +++ b/src/resources/objects/mission/MissionMessageBuilder.java @@ -21,16 +21,9 @@ ******************************************************************************/ package resources.objects.mission; -import java.nio.ByteOrder; import java.util.Map; - -import org.apache.mina.core.buffer.IoBuffer; - -import engine.resources.common.CRC; import engine.resources.objects.Builder; -import engine.resources.scene.Point3D; import resources.objects.intangible.IntangibleMessageBuilder; -import resources.objects.waypoint.WaypointObject; public class MissionMessageBuilder extends IntangibleMessageBuilder { @@ -42,363 +35,6 @@ public class MissionMessageBuilder extends IntangibleMessageBuilder { super(); } - public IoBuffer buildBaseline3() { - MissionObject mission = (MissionObject) object; - IoBuffer buffer = IoBuffer.allocate(100, false).order(ByteOrder.LITTLE_ENDIAN); - buffer.setAutoExpand(true); - - buffer.putShort((short) 16); - - buffer.putFloat(object.getComplexity()); // mission complexity ?? - - buffer.put(getAsciiString(object.getStfFilename())); - buffer.putInt(0); - buffer.put(getAsciiString(object.getStfName())); - - if (mission.getCustomName() == null) { buffer.putInt(0); } - else { buffer.put(getUnicodeString(mission.getCustomName())); } - - buffer.putInt(object.getVolume()); // volume - - buffer.putInt(0); // unused - - buffer.putInt(mission.getMissionLevel()); - - if (mission.getStartLocation() != null) { - buffer.putFloat(mission.getStartLocation().x); - buffer.putFloat(0); - buffer.putFloat(mission.getStartLocation().z); - } else { - buffer.putFloat(0); - buffer.putFloat(0); - buffer.putFloat(0); - } - buffer.putLong(0); // Start Object ID - if (mission.getMissionStartPlanet() == null) - buffer.putInt(0); - else - buffer.putInt(CRC.StringtoCRC(mission.getMissionStartPlanet())); - - if (mission.getCreator() != null) - buffer.put(getUnicodeString(mission.getCreator())); - else - buffer.putInt(0); - - buffer.putInt(mission.getCreditReward()); - - if (mission.getDestination() != null) { - buffer.putFloat(mission.getDestination().x); - buffer.putFloat(0); - buffer.putFloat(mission.getDestination().z); - } else { - buffer.putFloat(0); - buffer.putFloat(0); - buffer.putFloat(0); - } - buffer.putLong(0); // Destination Object ID - if (mission.getMissionDestinationPlanet() == null) - buffer.putInt(0); - else - buffer.putInt(CRC.StringtoCRC(mission.getMissionDestinationPlanet())); - - buffer.putInt(mission.getMissionTemplateObject()); - - buffer.put(getAsciiString(mission.getMissionStf())); - buffer.putInt(0); - buffer.put(getAsciiString(mission.getMissionDescription())); - - buffer.put(getAsciiString(mission.getMissionStf())); - buffer.putInt(0); - buffer.put(getAsciiString(mission.getMissionTitle())); - - buffer.putInt(0); // refresh counter - - if(mission.getMissionType() == null) - buffer.putInt(0); - else - buffer.putInt(CRC.StringtoCRC(mission.getMissionType())); - - buffer.put(getAsciiString(mission.getMissionTargetName())); - - WaypointObject wp = mission.getAttachedWaypoint(); - - if (wp == null) { - buffer.putInt(0); // cell - buffer.putFloat(0); // x - buffer.putFloat(0); // z - buffer.putFloat(0); // y - buffer.putLong(0); // target id - buffer.putInt(0); // planet crc - buffer.putInt(0); // name - buffer.putLong(0); // waypoint id - buffer.put((byte) 0); // color - buffer.put((byte) 0x01); //active - } else { - buffer.putInt(wp.getCellId()); - buffer.putFloat(wp.getPosition().x); - buffer.putFloat(wp.getPosition().y); - buffer.putFloat(wp.getPosition().z); - buffer.putLong(0); - buffer.putInt(CRC.StringtoCRC(wp.getPlanet().name)); - buffer.put(getUnicodeString(wp.getName())); - buffer.putLong(wp.getObjectId()); - buffer.put(wp.getColor()); - buffer.put((byte) (wp.isActive() ? 1 : 0)); - } - - int size = buffer.position(); - buffer = bufferPool.allocate(size, false).put(buffer.array(), 0, size); - - buffer.flip(); - buffer = createBaseline("MISO", (byte) 3, buffer, size); - - //Console.println("MISO3 Bytes: " + StringUtilities.bytesToHex(buffer.array())); - return buffer; - } - - public IoBuffer buildBaseline6() { - - IoBuffer buffer = IoBuffer.allocate(18, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putShort((short) 3); - buffer.putInt(76); // server id - buffer.putLong(0); // detail stf - buffer.putInt(0xFFFFFFFF); // unknown - - int size = buffer.position(); - buffer.flip(); - buffer = createBaseline("MISO", (byte) 6, buffer, size); - - return buffer; - } - - public IoBuffer buildBaseline8() { - IoBuffer buffer = IoBuffer.allocate(2, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putShort((short) 0); // unknown - - int size = buffer.position(); - buffer.flip(); - buffer = createBaseline("MISO", (byte) 8, buffer, size); - - return buffer; - } - - public IoBuffer buildBaseline9() { - IoBuffer buffer = IoBuffer.allocate(2, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putShort((short) 0); // unknown - - int size = buffer.position(); - buffer.flip(); - buffer = createBaseline("MISO", (byte) 9, buffer, size); - - return buffer; - } - - public IoBuffer buildStfDelta(String stfFile, String stfName) { - - IoBuffer buffer = IoBuffer.allocate(4 + stfFile.length() + stfName.length(), false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.put(getAsciiString(stfFile)); - buffer.putInt(0); - buffer.put(getAsciiString(stfName)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x01, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildDifficultyLevelDelta(int difficulty) { - - IoBuffer buffer = IoBuffer.allocate(4, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putInt(difficulty); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x05, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildStartLocationDelta(Point3D startLocation, String planet) { - - IoBuffer buffer = IoBuffer.allocate(24, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putFloat(startLocation.x); - buffer.putFloat(0); - buffer.putFloat(startLocation.z); - - buffer.putLong(0); - - if (planet == null) { - buffer.putInt(CRC.StringtoCRC(object.getPlanet().name)); - } else { - buffer.putInt(CRC.StringtoCRC(planet)); - } - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x06, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildCreatorNameDelta(String creator) { - - IoBuffer buffer = IoBuffer.allocate(4 + (creator.length() * 2), false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.put(getUnicodeString(creator)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x07, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildCreditsRewardDelta(int creds) { - - IoBuffer buffer = IoBuffer.allocate(4, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putInt(creds); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x08, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildDestinationDelta(Point3D destination, String planet) { - - IoBuffer buffer = IoBuffer.allocate(24, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putFloat(destination.x); - buffer.putFloat(0); - buffer.putFloat(destination.z); - - buffer.putLong(0); // Destination Object ID - - if (planet == null) { - buffer.putInt(CRC.StringtoCRC(object.getPlanet().name)); - } else { - buffer.putInt(CRC.StringtoCRC(planet)); - } - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x09, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildTargetObjectIffDelta(int template) { - - IoBuffer buffer = IoBuffer.allocate(4, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putInt(template); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x0A, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildMissionDescriptionDelta(String stfFile, String descId) { - - IoBuffer buffer = IoBuffer.allocate(13 + stfFile.length() + descId.length(), false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.put(getAsciiString(stfFile)); - buffer.putInt(0); - buffer.put(getAsciiString(descId)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x0B, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildMissionTitleDelta(String stfFile, String titleId) { - - IoBuffer buffer = IoBuffer.allocate(12 + stfFile.length() + titleId.length(), false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.put(getAsciiString(stfFile)); - buffer.putInt(0); - buffer.put(getAsciiString(titleId)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x0C, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildRepeatCounterDelta(int counter) { - - IoBuffer buffer = IoBuffer.allocate(4, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putInt(counter); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x0D, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildMissionTypeDelta(String type) { - - IoBuffer buffer = IoBuffer.allocate(4, false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putInt(CRC.StringtoCRC(type)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x0E, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildTargetNameDelta(String targetName) { - - IoBuffer buffer = IoBuffer.allocate(4 + targetName.length(), false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.put(getAsciiString(targetName)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x0F, buffer, size + 4); - - return buffer; - } - - public IoBuffer buildWaypointDelta(WaypointObject wp) { - - IoBuffer buffer = IoBuffer.allocate(44 + (2 * wp.getName().length()), false).order(ByteOrder.LITTLE_ENDIAN); - - buffer.putInt(wp.getCellId()); - buffer.putFloat(wp.getPosition().x); - buffer.putFloat(wp.getPosition().y); - buffer.putFloat(wp.getPosition().z); - buffer.putLong(0); - buffer.putInt(CRC.StringtoCRC(wp.getPlanet().name)); - buffer.put(getUnicodeString(wp.getName())); - buffer.putLong(wp.getObjectId()); - buffer.put(wp.getColor()); - buffer.put((byte) (wp.isActive() ? 1 : 0)); - - int size = buffer.position(); - buffer.flip(); - buffer = createDelta("MISO", (byte) 3, (short) 1, (short) 0x10, buffer, size + 4); - - return buffer; - } - @Override public void buildBaseline3(Map baselineBuilders, Map deltaBuilders) { super.buildBaseline3(baselineBuilders, deltaBuilders); diff --git a/src/resources/objects/mission/MissionObject.java b/src/resources/objects/mission/MissionObject.java index e6640a05..f4990bbc 100644 --- a/src/resources/objects/mission/MissionObject.java +++ b/src/resources/objects/mission/MissionObject.java @@ -22,45 +22,38 @@ package resources.objects.mission; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; -import com.sleepycat.persist.model.NotPersistent; -import com.sleepycat.persist.model.Persistent; +import org.apache.mina.core.buffer.IoBuffer; -import resources.objects.ObjectMessageBuilder; +import main.NGECore; import resources.objects.intangible.IntangibleObject; import resources.objects.waypoint.WaypointObject; +import services.mission.MissionLocation; import services.mission.MissionObjective; import engine.clients.Client; +import engine.resources.common.CRC; +import engine.resources.common.Stf; +import engine.resources.common.StringUtilities; +import engine.resources.common.UString; +import engine.resources.objects.Baseline; import engine.resources.scene.Planet; import engine.resources.scene.Point3D; import engine.resources.scene.Quaternion; -@Persistent(version=1) public class MissionObject extends IntangibleObject implements Serializable { private static final long serialVersionUID = 1L; - private Point3D destination; - private Point3D startLocation; - private String startPlanet = ""; - private int difficultyLevel = 0; // Difficulty level displayed in details - private String destinationPlanet = ""; - private int repeatCount = 0; // increases for each player using the mission; used for redisplaying on mission term too - private int reward = 0; - private String creator = ""; - private String description = ""; - private String title = ""; - private String missionTargetName = ""; // Target object I guess? - private int missionId = 0; - private String missionStf = ""; - private String type = ""; - private int missionTemplateObject = 0; - private WaypointObject attachedWaypoint; - + // Server variables private MissionObjective objective; private long bountyObjId; + private String missionType = ""; + private int missionId; + private int repeatCount; - @NotPersistent private transient MissionMessageBuilder messageBuilder = new MissionMessageBuilder(this); public MissionObject() { @@ -71,221 +64,191 @@ public class MissionObject extends IntangibleObject implements Serializable { super(objectID, planet, new Point3D(0, 0, 0), new Quaternion(1, 0, 0, 0), template); } - public String getMissionDestinationPlanet() { - synchronized(objectMutex) { - return destinationPlanet; - } + public Baseline getBaseline3() { + Baseline baseline = super.getBaseline3(); + baseline.put("difficultyLevel", 0); + baseline.put("startLocation", new MissionLocation(new Point3D(0,0,0), 0, "tatooine")); + baseline.put("creator", new UString("")); + baseline.put("creditReward", 0); + baseline.put("destinationLocation", new MissionLocation(new Point3D(0,0,0), 0, "tatooine")); + baseline.put("templateObject", 0); + baseline.put("description", new Stf("", 0, "")); + baseline.put("title", new Stf("", 0, "")); + baseline.put("repeatCounter", 0); + baseline.put("missionType", 0); + baseline.put("targetName", ""); + + WaypointObject wp = (WaypointObject) NGECore.getInstance().objectService.createObject("object/waypoint/base/shared_base_waypoint.iff", getPlanet()); + wp.setActive(true); + baseline.put("waypoint", wp); + return baseline; + } + + public Baseline getBaseline6() { + Baseline baseline = super.getBaseline6(); + baseline.put("unk", -1); + return baseline; + } + + public Baseline getBaseline8() { + Baseline baseline = super.getBaseline8(); + return baseline; + } + + public Baseline getBaseline9() { + Baseline baseline = super.getBaseline9(); + return baseline; } @Override public void initAfterDBLoad() { super.init(); messageBuilder = new MissionMessageBuilder(this); - if(attachedWaypoint != null) - attachedWaypoint.initAfterDBLoad(); } - - public int getMissionLevel() { - synchronized(objectMutex) { - return difficultyLevel; + + public int getDifficultyLevel() { + return (int) getBaseline3().get("difficultyLevel"); + } + + public void setDifficultyLevel(int level) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline(3).set("difficultyLevel", level)); } } - - public void setMissionLevel(int missionLevel) { - synchronized(objectMutex) { - this.difficultyLevel = missionLevel; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildDifficultyLevelDelta(missionLevel)); + + public MissionLocation getStartLocation() { + return (MissionLocation) getBaseline3().get("startLocation"); + } + + public void setStartLocation(Point3D location, long objId, String planet) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + MissionLocation startLocation = new MissionLocation(location.clone(), objId, planet); + getGrandparent().getClient().getSession().write(getBaseline(3).set("startLocation", startLocation)); } } - - public String getMissionStartPlanet() { - synchronized(objectMutex) { - return startPlanet; - } - } - - public int getMissionRepeatCounter() { - synchronized(objectMutex) { - return repeatCount; - } - } - - public void setRepeatCount(int missionRepeatCounter) { - synchronized(objectMutex) { - this.repeatCount = missionRepeatCounter; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildRepeatCounterDelta(missionRepeatCounter)); - } - } - - public int getCreditReward() { - synchronized(objectMutex) { - return reward; - } - } - - public void setCreditReward(int missionCredits) { - synchronized(objectMutex) { - this.reward = missionCredits; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildCreditsRewardDelta(missionCredits)); - } - } - + public String getCreator() { - synchronized(objectMutex) { - return creator; + return ((UString)getBaseline3().get("creator")).get(); + } + + public void setCreator(String creator) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("creator", new UString(creator))); } } - - public void setCreator(String missionCreator) { - synchronized(objectMutex) { - this.creator = missionCreator; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildCreatorNameDelta(missionCreator)); + + public int getCreditReward() { + return (int) getBaseline3().get("creditReward"); + } + + public void setCreditReward(int credits) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("creditReward", credits)); } } - - public String getMissionDescription() { - synchronized(objectMutex) { - return description; + + public MissionLocation getDestinationLocation() { + return (MissionLocation) getBaseline3().get("destinationLocation"); + } + + public void setDestinationLocation(Point3D location, long objId, String planet) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + MissionLocation destinationLocation = new MissionLocation(location.clone(), objId, planet); + getGrandparent().getClient().getSession().write(getBaseline3().set("destinationLocation", destinationLocation)); } } - - public void setMissionDescription(String missionDescription) { - synchronized(objectMutex) { - this.description = missionDescription; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildMissionDescriptionDelta(missionStf, missionDescription)); + + public int getTemplateObject() { + return (int) getBaseline3().get("templateObject"); + } + + public void setTemplateObject(int objCRC) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("templateObject", objCRC)); } } - - public String getMissionTitle() { - synchronized(objectMutex) { - return title; + + public Stf getDescription() { + return (Stf) getBaseline3().get("description"); + } + + public void setDescription(String description) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("description", new Stf(description))); } } - - public void setMissionTitle(String missionTitle) { - synchronized(objectMutex) { - this.title = missionTitle; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildMissionTitleDelta(missionStf, missionTitle)); + + public Stf getTitle() { + return (Stf) getBaseline3().get("title"); + } + + public void setTitle(String title) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("title", new Stf(title))); } } - - public String getMissionTargetName() { - synchronized(objectMutex) { - return missionTargetName; + + public int getRepeatCounter() { + return (int) getBaseline3().get("repeatCounter"); + } + + public void setRepeatCounter(int count) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + this.repeatCount = count; + getGrandparent().getClient().getSession().write(getBaseline3().set("repeatCounter", count)); } } - - public void setMissionTargetName(String missionTargetName) { - synchronized(objectMutex) { - this.missionTargetName = missionTargetName; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildTargetNameDelta(missionTargetName)); + + public void incrementRepeatCounter() { + setRepeatCounter(this.repeatCount + 1); // temporary fix for getBaseline(3).get("repeatCounter") always being 0. + } + + public void decrementRepeatCounter() { + int repeatCounter = getRepeatCounter() + 1; + setRepeatCounter((repeatCounter < 0) ? 0 : repeatCounter); + } + + public int getMissionTypeCRC() { + return (int) getBaseline3().get("missionType"); + } + + public void setMissionType(String type) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("missionType", CRC.StringtoCRC(type))); + this.missionType = type; } } - - public WaypointObject getAttachedWaypoint() { - synchronized(objectMutex) { - return attachedWaypoint; - } - } - - public void setAttachedWaypoint(WaypointObject waypoint) { - synchronized(objectMutex) { - this.attachedWaypoint = waypoint; - } - - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildWaypointDelta(waypoint)); - } - } - - public int getMissionTemplateObject() { - synchronized(objectMutex) { - return missionTemplateObject; - } - } - - public void setMissionTemplateObject(int missionTemplateObject) { - synchronized(objectMutex) { - this.missionTemplateObject = missionTemplateObject; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildTargetObjectIffDelta(missionTemplateObject)); - } - } - + public String getMissionType() { - synchronized(objectMutex) { - return type; - } + return missionType; } - - public void setMissionType(String missionType) { - synchronized(objectMutex) { - this.type = missionType; - } - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildMissionTypeDelta(missionType)); - } + + public String getTargetName() { + return (String) getBaseline3().get("targetName"); } - - public MissionObjective getObjective() { - synchronized(objectMutex) { - return objective; - } - } - - public void setObjective(MissionObjective objective) { - synchronized(objectMutex) { - this.objective = objective; - } - } - - public Point3D getStartLocation() { - synchronized(objectMutex) { - return startLocation; + + public void setTargetName(String targetName) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("targetName", targetName)); } } - public Point3D getDestination() { - synchronized(objectMutex) { - return destination; - } + public WaypointObject getWaypoint() { + return (WaypointObject) getBaseline3().get("waypoint"); } - - public void setStartLocation(Point3D startLocation, String planet) { - synchronized(objectMutex) { - this.startLocation = startLocation; - this.startPlanet = planet; - } - - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildStartLocationDelta(startLocation, planet)); + + public void setWaypoint(WaypointObject waypoint) { + if (getGrandparent() != null && getGrandparent().getClient() != null) { + getGrandparent().getClient().getSession().write(getBaseline3().set("waypoint", waypoint)); } } - public void setDestination(Point3D destination, String planet) { - synchronized(objectMutex) { - this.destination = destination; - this.destinationPlanet = planet; - } - - if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) { - getGrandparent().getClient().getSession().write(messageBuilder.buildDestinationDelta(destination, planet)); - } + public long getBountyMarkId() { + return bountyObjId; + } + + public void setBountyMarkId(long bountyObjId) { + this.bountyObjId = bountyObjId; } public int getMissionId() { @@ -296,38 +259,49 @@ public class MissionObject extends IntangibleObject implements Serializable { this.missionId = missionId; } - public long getBountyMarkId() { - return bountyObjId; + public MissionObjective getObjective() { + return objective; } - public void setBountyMarkId(long bountyObjId) { - this.bountyObjId = bountyObjId; - } - - public String getMissionStf() { - return missionStf; - } - - public void setMissionStf(String missionStf) { - this.missionStf = missionStf; + public void setObjective(MissionObjective objective) { + this.objective = objective; } @Override public void sendBaselines(Client destination) { - - if(destination == null || destination.getSession() == null) { - System.out.println("NULL session"); - return; + if (destination != null && destination.getSession() != null) { + destination.getSession().write(getBaseline(3).getBaseline()); + destination.getSession().write(getBaseline(6).getBaseline()); + destination.getSession().write(getBaseline(8).getBaseline()); + destination.getSession().write(getBaseline(9).getBaseline()); } - - destination.getSession().write(messageBuilder.buildBaseline3()); - destination.getSession().write(messageBuilder.buildBaseline6()); - destination.getSession().write(messageBuilder.buildBaseline8()); - destination.getSession().write(messageBuilder.buildBaseline9()); } - public ObjectMessageBuilder getMessageBuilder() { - return messageBuilder; + @Override + public void sendListDelta(byte viewType, short updateType, IoBuffer buffer) { + switch (viewType) { + case 1: + case 4: + case 3: + case 6: + case 7: + case 8: + case 9: + if (getGrandparent().getClient() != null) { + buffer = getBaseline(viewType).createDelta(updateType, buffer.array()); + getGrandparent().getClient().getSession().write(buffer); + } + default: + return; + } + } + + public MissionMessageBuilder getMessageBuilder() { + synchronized(objectMutex) { + if (messageBuilder == null) + messageBuilder = new MissionMessageBuilder(this); + + return messageBuilder; + } } - } diff --git a/src/resources/objects/waypoint/WaypointObject.java b/src/resources/objects/waypoint/WaypointObject.java index 563ae32f..189a310e 100644 --- a/src/resources/objects/waypoint/WaypointObject.java +++ b/src/resources/objects/waypoint/WaypointObject.java @@ -43,7 +43,7 @@ public class WaypointObject extends IntangibleObject implements Serializable, ID private int cellId; // ??? private long locationNetworkId; private int planetCRC; - private String name; + private String name = ""; private byte color; private boolean isActive; private transient static SimpleBufferAllocator bufferPool = new SimpleBufferAllocator(); diff --git a/src/services/BuffService.java b/src/services/BuffService.java index 8d2d4038..d8c95147 100644 --- a/src/services/BuffService.java +++ b/src/services/BuffService.java @@ -274,7 +274,7 @@ public class BuffService implements INetworkDispatch { for(final Buff buff : creature.getBuffList().get().toArray(new Buff[] { })) { - if (buff.getGroup1().startsWith("setBonus")) { continue; } + if (buff.getGroup1().startsWith("setBonus") || buff.getRemovalTask() != null) { continue; } if(buff.isGroupBuff() && buff.getGroupBufferId() != creature.getObjectID()) { removeBuffFromCreature(creature, buff); diff --git a/src/services/CharacterService.java b/src/services/CharacterService.java index 8c2c1810..948a49b8 100644 --- a/src/services/CharacterService.java +++ b/src/services/CharacterService.java @@ -75,6 +75,7 @@ public class CharacterService implements INetworkDispatch { private DatabaseConnection databaseConnection2; private engine.resources.common.NameGen nameGenerator; private static final String allowedCharsRegex = "['-]?[A-Za-z]('[a-zA-Z]|-[a-zA-Z]|[a-zA-Z])*['-]?$"; + private static final String allowedCharsRegexWithSpace = "['-]?[A-Za-z]('[a-zA-Z]|-[a-zA-Z]|[a-zA-Z]| )*['-]?$"; public CharacterService(NGECore core) { @@ -89,9 +90,13 @@ public class CharacterService implements INetworkDispatch { } public boolean checkName(String name, Client client) { + return checkName(name, client, false); + } + + public boolean checkName(String name, Client client, boolean allowSpaces) { // TODO: check for dev names, profane names, iconic names etc try { - if(checkForDuplicateName(name, client.getAccountId()) || !name.matches(allowedCharsRegex)) + if(checkForDuplicateName(name, client.getAccountId()) || (!allowSpaces && !name.matches(allowedCharsRegex)) || (allowSpaces && !name.matches(allowedCharsRegexWithSpace))) return false; } catch (SQLException e) { e.printStackTrace(); @@ -552,9 +557,13 @@ public class CharacterService implements INetworkDispatch { */ public long getPlayerOID(String name) { if (!name.equals("")) { + if (name.contains(" ")) { + name = name.split(" ")[0]; + } + name = name.toLowerCase(); long oid = 0L; try { - PreparedStatement ps = databaseConnection.preparedStatement("SELECT * FROM characters WHERE \"firstName\"=?"); + PreparedStatement ps = databaseConnection.preparedStatement("SELECT * FROM characters WHERE LOWER(\"firstName\")=?"); ps.setString(1, name); ResultSet resultSet = ps.executeQuery(); while (resultSet.next()) { diff --git a/src/services/DevService.java b/src/services/DevService.java index 9af51490..d3f37e10 100644 --- a/src/services/DevService.java +++ b/src/services/DevService.java @@ -95,6 +95,8 @@ public class DevService implements INetworkDispatch { suiOptions.put((long) 130, "Vehicle Deeds"); if (creature.getClient().isGM()) { suiOptions.put((long) 121, "Sandbox City"); + if(creature.getPlayerObject().getProfession().equals("trader_0a") || creature.getPlayerObject().getProfession().equals("trader_0b") || creature.getPlayerObject().getProfession().equals("trader_0c") || creature.getPlayerObject().getProfession().equals("trader_0d")) + suiOptions.put((long) 177, "REing"); } break; @@ -1309,6 +1311,14 @@ public class DevService implements INetworkDispatch { case 153: Point3D position = new Point3D(-6222,1,7380); core.simulationService.transferToPlanet(player, core.terrainService.getPlanetByName("dantooine"), position, player.getOrientation(), null); + + case 177: + // "object/draft_schematic/item/shared_item_reverse_engineering_tool.iff" + TangibleObject REingTool = (TangibleObject) core.objectService.createObject("object/tangible/container/loot/shared_reverse_engineer_tool.iff", planet); + REingTool.setCustomName("Reverse Engineering Tool"); + inventory.add(REingTool); + core.lootService.prepInv2(player); + return; } } }); diff --git a/src/services/GroupService.java b/src/services/GroupService.java index bcdc2d02..e7b06a1b 100644 --- a/src/services/GroupService.java +++ b/src/services/GroupService.java @@ -45,6 +45,7 @@ public class GroupService implements INetworkDispatch { core.commandService.registerCommand("invite"); core.commandService.registerCommand("join"); core.commandService.registerCommand("disband"); + core.commandService.registerAlias("leavegroup", "disband"); core.commandService.registerCommand("decline"); core.commandService.registerCommand("dismissgroupmember"); } diff --git a/src/services/LootService.java b/src/services/LootService.java index 7bf4b72c..8e36f35e 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -44,9 +44,12 @@ import protocol.swg.PlayClientEffectObjectTransformMessage; import protocol.swg.StopClientEffectObjectByLabel; import resources.common.OutOfBand; import resources.datatables.DisplayType; +import resources.datatables.Options; +import resources.datatables.WeaponType; import resources.loot.LootGroup; import resources.loot.LootRollSession; import resources.objects.creature.CreatureObject; +import resources.objects.factorycrate.FactoryCrateObject; import resources.objects.group.GroupObject; import resources.objects.intangible.IntangibleObject; import resources.objects.tangible.TangibleObject; @@ -75,6 +78,8 @@ public class LootService implements INetworkDispatch { private NGECore core; private static int prepInvCnt = 0; + String testDropTemplate = null; + //String testDropTemplate = "kowakian_cage"; public LootService(NGECore core) { this.core = core; @@ -170,6 +175,8 @@ public class LootService implements INetworkDispatch { int randomRareLoot = new Random().nextInt(100); int chanceRequirement = 1; chanceRequirement = 10; // This is for a test period to lift chest drop chance a bit + if (testDropTemplate!=null) + chanceRequirement = 100; if (lootRollSession.getLootedObjectDifficulty()==1) chanceRequirement+=2; if (lootRollSession.getLootedObjectDifficulty()==2) @@ -540,7 +547,8 @@ public class LootService implements INetworkDispatch { if (randomItemFromPool<=remainder){ // this element has been chosen e.g. kraytpearl_flawless //System.err.println("CHOSEN ITEM " + itemNames.get(i)); - handleLootPoolItems(itemNames.get(i), lootRollSession); + handleLootPoolItems(itemNames.get(i), lootRollSession); + //handleLootPoolItems(testDropTemplate, lootRollSession); //break; return; } @@ -560,6 +568,7 @@ public class LootService implements INetworkDispatch { rollSession.setSessionPlanet(requester.getPlanet()); handleLootPoolItems(template, rollSession); + if(rollSession.getDroppedItems().get(0) != null) return rollSession.getDroppedItems().get(0); return null; @@ -610,10 +619,15 @@ public class LootService implements INetworkDispatch { String requiredFaction = ""; Vector customizationAttributes = null; Vector customizationValues = null; + Vector reverse_engineering_name = null; + int customColor1 = 0; + String lootDescriptor = ""; Vector itemStats = null; Vector itemSkillMods = null; Vector STFparams = null; - + String addToCollection = null; + String collectionItemName = null; + if(core.scriptService.getMethod(itemPath,"","itemTemplate")==null){ String errorMessage = "Loot item '" + itemName + "' has no template function assigned in its script. Please contact Charon about this issue."; lootRollSession.addErrorMessage(errorMessage); @@ -640,6 +654,15 @@ public class LootService implements INetworkDispatch { if(core.scriptService.getMethod(itemPath,"","customizationValues")!=null) customizationValues = (Vector)core.scriptService.fetchIntegerVector(itemPath,"customizationValues"); + if(core.scriptService.getMethod(itemPath,"","reverse_engineering_name")!=null) + reverse_engineering_name = (Vector)core.scriptService.fetchStringVector(itemPath,"reverse_engineering_name"); + + if(core.scriptService.getMethod(itemPath,"","customColor1")!=null) + customColor1 = (Integer)core.scriptService.fetchInteger(itemPath,"customColor1"); + + if(core.scriptService.getMethod(itemPath,"","lootDescriptor")!=null) + lootDescriptor = (String)core.scriptService.fetchString(itemPath,"lootDescriptor"); + if(core.scriptService.getMethod(itemPath,"","itemStats")!=null) itemStats = (Vector)core.scriptService.fetchStringVector(itemPath,"itemStats"); @@ -670,6 +693,12 @@ public class LootService implements INetworkDispatch { if(core.scriptService.getMethod(itemPath,"","STFparams")!=null) STFparams = (Vector)core.scriptService.fetchStringVector(itemPath,"STFparams"); + if(core.scriptService.getMethod(itemPath,"","AddToCollection")!=null) + addToCollection = (String)core.scriptService.fetchString(itemPath,"AddToCollection"); + + if(core.scriptService.getMethod(itemPath,"","CollectionItemName")!=null) + collectionItemName = (String)core.scriptService.fetchString(itemPath,"CollectionItemName"); + System.out.println("itemTemplate " + itemTemplate); @@ -678,6 +707,11 @@ public class LootService implements INetworkDispatch { droppedItem.setLootItem(true); droppedItem.setAttachment("LootItemName", itemName); + droppedItem.setAttachment("customColor1", customColor1); + droppedItem.setAttachment("lootDescriptor", lootDescriptor); + droppedItem.setAttachment("reverse_engineering_name", reverse_engineering_name); + droppedItem.setAttachment("customName", customName); + droppedItem.setAttachment("CollectionItemName", collectionItemName); if(core.scriptService.getMethod(itemPath,"","randomStatJewelry")!=null){ customName = setRandomStatsJewelry(droppedItem, lootRollSession); @@ -711,7 +745,7 @@ public class LootService implements INetworkDispatch { lootRollSession.addErrorMessage(errorMessage); return; } - handleStats(droppedItem, itemStats); + handleStats(droppedItem, itemStats, lootRollSession); } if (itemSkillMods!=null){ @@ -722,7 +756,18 @@ public class LootService implements INetworkDispatch { setSTFParams(droppedItem, STFparams); } + if (addToCollection!=null){ + droppedItem.getAttributes().put("@obj_attr_n:collection_name", "@collection_n:"+addToCollection); + //droppedItem.getAttributes().put("@obj_attr_n:collection_name", "\\#FFFF00 @collection_n:"+addToCollection + " \\#FFFFFF "); + //core.collectionService.addCollection(actor, "new_prof_officer_master") + droppedItem.setAttachment("radial_filename", "item/collection/loot_collection"); + System.out.println("collection"); + } + if (collectionItemName!=null){ + droppedItem.setAttachment("CollectionItemName", collectionItemName); + + } // if (customizationValues!=null) // setCustomization(droppedItem, itemName); @@ -989,7 +1034,15 @@ public class LootService implements INetworkDispatch { else remainder += span; if (randomItemFromPool<=remainder){ - fillChest4(itemNames.get(i), owner, chest); + //fillChest4(itemNames.get(i), owner, chest); + + if (testDropTemplate!=null) + fillChest4(testDropTemplate, owner, chest); + else + fillChest4(itemNames.get(i), owner, chest); + + + //fillChest4("colorcrystal", owner, chest); //break; return; @@ -1049,7 +1102,7 @@ public class LootService implements INetworkDispatch { Vector itemStats = null; Vector itemSkillMods = null; Vector STFparams = null; - Vector addToCollections = null; + String addToCollection = null; if(core.scriptService.getMethod(itemPath,"","itemTemplate")==null){ String errorMessage = "Loot item '" + itemName + "' has no template function assigned in its script. Please contact Charon about this issue."; @@ -1115,8 +1168,8 @@ public class LootService implements INetworkDispatch { if(core.scriptService.getMethod(itemPath,"","STFparams")!=null) STFparams = (Vector)core.scriptService.fetchStringVector(itemPath,"STFparams"); - if(core.scriptService.getMethod(itemPath,"","AddToCollections")!=null) - addToCollections = (Vector)core.scriptService.fetchStringVector(itemPath,"AddToCollections"); + if(core.scriptService.getMethod(itemPath,"","AddToCollection")!=null) + addToCollection = (String)core.scriptService.fetchString(itemPath,"AddToCollection"); System.out.println("itemTemplate " + itemTemplate); @@ -1158,7 +1211,7 @@ public class LootService implements INetworkDispatch { String errorMessage = "Loot item '" + itemName + "' has a wrong number of itemstats. Please contact Charon about this issue."; return; } - handleStats(droppedItem, itemStats); + handleStats(droppedItem, itemStats,null); } if (itemSkillMods!=null){ @@ -1168,6 +1221,15 @@ public class LootService implements INetworkDispatch { if (STFparams!=null){ setSTFParams(droppedItem, STFparams); } + + if (addToCollection!=null){ + droppedItem.getAttributes().put("@obj_attr_n:collection_name", "@collection_n:"+addToCollection); + //droppedItem.getAttributes().put("@obj_attr_n:collection_name", "\\#FFFF00 @collection_n:"+addToCollection + " \\#FFFFFF "); + //core.collectionService.addCollection(actor, "new_prof_officer_master") + droppedItem.setAttachment("radial_filename", "item/loot_collection"); + } + + setCustomization(droppedItem, itemName, customizationAttributes, customizationValues); // for now @@ -1233,6 +1295,10 @@ public class LootService implements INetworkDispatch { droppedItem.getAttributes().put("@obj_attr_n:color", resources.datatables.LightsaberColors.get(crystalColor)); droppedItem.setAttachment("radial_filename", "item/tunable"); //droppedItem.getAttributes().put("@obj_attr_n:color", "@jedi_spam:saber_color_" + crystalColor); // Commented out for now + + String[] crystalColorElementalMapping = new String[]{"heat","heat","acid","acid","cold","cold","cold","acid","electricity","electricity","heat","heat"}; + setCrystalStat(droppedItem, "elemtype", crystalColorElementalMapping[crystalColor],crystalColorElementalMapping[crystalColor]); + setCrystalStat(droppedItem, "elemdamage", "2", "2"); } else { for (int i=0; i itemStats) { + private void handleStats(TangibleObject droppedItem, Vector itemStats, LootRollSession lootRollSession) { if (droppedItem.getTemplate().contains("object/weapon")){ WeaponObject weaponObject = (WeaponObject) droppedItem; @@ -1302,8 +1368,10 @@ public class LootService implements INetworkDispatch { String statName = itemStats.get(3*i); String minValue = itemStats.get(3*i+1); String maxValue = itemStats.get(3*i+2); - setArmorStat(droppedItem, statName, minValue, maxValue); + setArmorStat(droppedItem, statName, minValue, maxValue); } + if (lootRollSession != null) + setRandomAttributes(droppedItem,lootRollSession); } String lootDescriptor = (String)droppedItem.getAttachment("lootDescriptor"); @@ -1315,6 +1383,7 @@ public class LootService implements INetworkDispatch { String minValue = itemStats.get(3*i+1); String maxValue = itemStats.get(3*i+2); setCrystalStat(droppedItem, statName, minValue, maxValue); + return; } } @@ -1324,11 +1393,89 @@ public class LootService implements INetworkDispatch { String minValue = itemStats.get(3*i+1); String maxValue = itemStats.get(3*i+2); setBuffItemStat(droppedItem, statName, minValue, maxValue); + return; } - } - + } } + private void setRandomAttributes(TangibleObject droppedItem, LootRollSession lootRollSession){ + + //determine number of stats #20 yt + int statNumber = 1; + int levelOfDrop = lootRollSession.getLootedObjectLevel(); + int difficultyLevel = lootRollSession.getLootedObjectDifficulty(); // better for calculation + + int statRoll = new Random().nextInt(100); + int difficultyBonus = 0; + +// // stage 1 +// if (difficultyLevel==1) +// difficultyBonus = 60; +// if (difficultyLevel>=2) +// difficultyBonus = 75; +// +// if (statRoll<20+difficultyBonus) // diff 3 95% diff 2 70 diff1 20 +// statNumber++; +// +// // stage 2 +// difficultyBonus = 0; +// if (difficultyLevel==1) +// difficultyBonus = 20; +// if (difficultyLevel>=2) +// difficultyBonus = 60; +// +// if (statRoll<10+difficultyBonus) // diff 3 70% diff 2 30 diff1 10 +// statNumber++; +// +// // stage 3 +// difficultyBonus = 0; +// if (difficultyLevel==1) +// difficultyBonus = 3; +// if (difficultyLevel>=2) +// difficultyBonus = 5; +// +// if (statRoll<1+difficultyBonus) +// statNumber++; + + if (levelOfDrop>60 && levelOfDrop<=90 && difficultyLevel<1){ + statNumber=2; + } + + if (levelOfDrop>84 && difficultyLevel>=1){ + statNumber=3; + } + + + int primaryAttribute = new Random().nextInt(7); // 0-6 + int maxValue = (int) (levelOfDrop*25/90); + int minValue = (int) (0.75*maxValue); + minValue = Math.max(1, minValue); + maxValue = Math.max(2, maxValue); + droppedItem.setIntAttribute(getAttributeSTF(primaryAttribute), getStatValue(minValue,maxValue)); + //maxValue -= 2; //secondary attributes must have less maxValue + minValue = (int) (0.75*maxValue); + minValue = Math.max(1, minValue); + maxValue = Math.max(2, maxValue); + String prefix = getJewelryPrefix(droppedItem); + String suffix = getJewelrySuffix(primaryAttribute, statNumber); + String itemName = prefix + suffix; + Vector alreadyUsedStats = new Vector(); + alreadyUsedStats.add(primaryAttribute); + int attribute = primaryAttribute; + + List statList = new ArrayList(); + for (int i=0;i<7;i++) + statList.add(i); + statList.remove(primaryAttribute); + + for (int i=0;i skillMods) { for (int i=0;iminimalValue) + extra = new Random().nextInt(maximalValue-minimalValue); + int randomValue = minimalValue + extra; weapon.setMinDamage(randomValue); } if (statName.equals("maxdamage")){ int minimalValue = (int) Integer.parseInt(minValue); int maximalValue = (int) Integer.parseInt(maxValue); - int randomValue = minimalValue + new Random().nextInt(maximalValue-minimalValue); + int extra = 0; + if (maximalValue>minimalValue) + extra = new Random().nextInt(maximalValue-minimalValue); + int randomValue = minimalValue + extra; weapon.setMaxDamage(randomValue); } @@ -1806,6 +1962,7 @@ public class LootService implements INetworkDispatch { } } + private void setArmorStat(SWGObject armor, String statName, String minValue, String maxValue){ // Armor is not represented with its own class, // so we gotta create the attributes here @@ -2373,7 +2530,7 @@ public class LootService implements INetworkDispatch { System.err.println(errorMessage); return; } - handleStats(droppedItem, itemStats); + handleStats(droppedItem, itemStats, lootRollSession); } if (itemSkillMods!=null){ @@ -2555,6 +2712,196 @@ public class LootService implements INetworkDispatch { } + public void prepInv2(CreatureObject player){ + SWGObject playerInventory = player.getSlottedObject("inventory"); + TangibleObject item11 = (TangibleObject)core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_bicep_r.iff", player.getPlanet()); + item11.setCustomName("Composite Armor Right Bicep"); + + item11.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 6000); + item11.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 4000); + item11.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 5000); + item11.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 5000); + item11.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 5000); + item11.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 5000); + + item11.setIntAttribute("cat_stat_mod_bonus.@stat_n:agility_modified", 25); + item11.setIntAttribute("cat_stat_mod_bonus.@stat_n:constitution_modified", 25); + item11.setIntAttribute("cat_stat_mod_bonus.@stat_n:precision_modified", 25); + + playerInventory.add(item11); + + TangibleObject item11a = (TangibleObject)core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_bicep_r.iff", player.getPlanet()); + item11.setCustomName("Composite Armor Right Bicep"); + + item11a.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 6000); + item11a.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 4000); + item11a.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 5000); + item11a.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 5000); + item11a.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 5000); + item11a.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 5000); + + item11a.setIntAttribute("cat_stat_mod_bonus.@stat_n:agility_modified", 25); + item11a.setIntAttribute("cat_stat_mod_bonus.@stat_n:constitution_modified", 25); + playerInventory.add(item11a); + + + TangibleObject item12aa = (TangibleObject)core.objectService.createObject("object/tangible/wearables/shirt/shared_shirt_s07.iff", player.getPlanet()); + item12aa.setCustomName("Socketed Shirt"); + item12aa.setIntAttribute("@obj_attr_n:sockets", 1); + playerInventory.add(item12aa); + + TangibleObject item12 = (TangibleObject)core.objectService.createObject("object/tangible/wearables/shirt/shared_shirt_s07.iff", player.getPlanet()); + + item12.setStfFilename("wearables_name"); + item12.setStfName("shirt_s01"); + item12.setDetailFilename("wearables_detail"); + item12.setDetailName("shirt_s01"); + item12.setCustomName("Socketed Shirt"); + item12.getAttributes().put("@obj_attr_n:crafter", "Charon"); + + item12.setIntAttribute("@obj_attr_n:sockets", 1); + + String crateTemplate = "object/factory/shared_factory_crate_clothing.iff"; + FactoryCrateObject crate1 = (FactoryCrateObject) core.objectService.createObject(crateTemplate, player.getPlanet()); + crate1.setContentTypeAndQuantity(item12,25, "clothing_factory_crate", "clothing", player.getClient(),true); + playerInventory.add(crate1); + + + + TangibleObject item12a = (TangibleObject)core.objectService.createObject("object/tangible/wearables/shirt/shared_shirt_s07.iff", player.getPlanet()); + item12a.setCustomName("Socketed Shirt"); + item12a.setIntAttribute("cat_stat_mod_bonus.@stat_n:agility_modified", 18); + playerInventory.add(item12a); + + String powerBitTemplate = "object/tangible/component/reverse_engineering/shared_power_bit.iff"; + TangibleObject powerBit = (TangibleObject) core.objectService.createObject(powerBitTemplate, player.getPlanet()); + powerBit.setCustomName("+25 2nd Order Power Bit"); + powerBit.setAttachment("PowerBitValue", 25); + powerBit.setAttachment("PowerBitOrder", 2); + playerInventory.add(powerBit); + + + TangibleObject powerBit2 = (TangibleObject) core.objectService.createObject(powerBitTemplate, player.getPlanet()); + powerBit2.setCustomName("+25 3nd Order Power Bit"); + powerBit2.setAttachment("PowerBitValue", 25); + powerBit2.setAttachment("PowerBitOrder", 3); + playerInventory.add(powerBit2); + + TangibleObject powerBit3 = (TangibleObject) core.objectService.createObject(powerBitTemplate, player.getPlanet()); + powerBit3.setCustomName("+25 1st Order Power Bit"); + powerBit3.setAttachment("PowerBitValue", 25); + powerBit3.setAttachment("PowerBitOrder", 1); + playerInventory.add(powerBit3); + + TangibleObject item24a = (TangibleObject)core.objectService.createObject("object/tangible/loot/npc_loot/shared_medical_console_generic.iff", player.getPlanet()); + item24a.setCustomName("Medical Console"); + item24a.setStackable(true); + item24a.setUses(299); + core.objectService.addStackableItem(item24a,playerInventory); + + TangibleObject item24b = (TangibleObject)core.objectService.createObject("object/tangible/loot/npc_loot/shared_medical_device_generic.iff", player.getPlanet()); + item24b.setCustomName("Medical Device"); + item24b.setStackable(true); + item24b.setUses(399); + core.objectService.addStackableItem(item24b,playerInventory); + + + + String modifierBitTemplate = "object/tangible/component/reverse_engineering/shared_modifier_bit.iff"; + TangibleObject modifierBit = (TangibleObject) core.objectService.createObject(modifierBitTemplate, player.getPlanet()); + modifierBit.setCustomName("Droid Experimentation"); + modifierBit.setStringAttribute("serial_number", core.reverseEngineeringService.createSerialNumber()); + modifierBit.setStringAttribute("@crafting:mod_bit_type", "@stat_n:droid_experimentation"); + modifierBit.setIntAttribute("@crafting:mod_bit_ratio", 4); + playerInventory.add(modifierBit); + + modifierBit = (TangibleObject) core.objectService.createObject(modifierBitTemplate, player.getPlanet()); + modifierBit.setCustomName("Droid Experimentation"); + modifierBit.setStringAttribute("serial_number", core.reverseEngineeringService.createSerialNumber()); + modifierBit.setStringAttribute("@crafting:mod_bit_type", "@stat_n:droid_experimentation"); + modifierBit.setIntAttribute("@crafting:mod_bit_ratio", 4); + playerInventory.add(modifierBit); + + modifierBit = (TangibleObject) core.objectService.createObject(modifierBitTemplate, player.getPlanet()); + modifierBit.setCustomName("Droid Experimentation"); + modifierBit.setStringAttribute("serial_number", core.reverseEngineeringService.createSerialNumber()); + modifierBit.setStringAttribute("@crafting:mod_bit_type", "@stat_n:droid_experimentation"); + modifierBit.setIntAttribute("@crafting:mod_bit_ratio", 4); + playerInventory.add(modifierBit); + + String SEALabel = "socket_gem_armor"; + String SEADescription = "socket_gem"; + String SEATemplate = "object/tangible/gem/shared_clothing.iff"; + TangibleObject skillEnhancingAttachment = (TangibleObject)core.objectService.createObject(SEATemplate, player.getPlanet()); + skillEnhancingAttachment.setStfFilename("item_n"); + skillEnhancingAttachment.setStfName(SEALabel); + skillEnhancingAttachment.setDetailFilename("item_n"); + skillEnhancingAttachment.setDetailName(SEADescription); + String effectName = "@stat_n:expertise_glancing_blow_ranged"; + int modifierValue = 5; + skillEnhancingAttachment.setIntAttribute(effectName, modifierValue); + Vector effectNameList = new Vector(); + effectNameList.add(effectName); + Vector effectValueList = new Vector(); + effectValueList.add(modifierValue); + skillEnhancingAttachment.setAttachment("SEAeffectNameList", effectNameList); + skillEnhancingAttachment.setAttachment("SEAmodifierValueList", effectValueList); + playerInventory.add(skillEnhancingAttachment); + + TangibleObject skillEnhancingAttachment2 = (TangibleObject)core.objectService.createObject(SEATemplate, player.getPlanet()); + skillEnhancingAttachment2.setStfFilename("item_n"); + skillEnhancingAttachment2.setStfName(SEALabel); + skillEnhancingAttachment2.setDetailFilename("item_n"); + skillEnhancingAttachment2.setDetailName(SEADescription); + effectName = "@stat_n:expertise_action_weapon_5"; + String effectName2 = "@stat_n:expertise_critical_line_sp_dm"; + modifierValue = 5; + skillEnhancingAttachment2.setIntAttribute(effectName, modifierValue); + skillEnhancingAttachment2.setIntAttribute(effectName2, 6); + effectNameList = new Vector(); + effectNameList.add(effectName); + effectNameList.add(effectName2); + effectValueList = new Vector(); + effectValueList.add(modifierValue); + effectValueList.add(6); + skillEnhancingAttachment2.setAttachment("SEAeffectNameList", effectNameList); + skillEnhancingAttachment2.setAttachment("SEAmodifierValueList", effectValueList); + playerInventory.add(skillEnhancingAttachment2); + + WeaponObject sword1 = (WeaponObject) core.objectService.createObject("object/weapon/melee/sword/shared_sword_01.iff", player.getPlanet()); + sword1.setIntAttribute("required_combat_level", 90); + sword1.setAttackSpeed(1); + sword1.setMaxRange(5); + sword1.setDamageType("kinetic"); + sword1.setMinDamage(1100); + sword1.setMaxDamage(1200); + sword1.setOptions(Options.SOCKETED, true); + sword1.setOptions(Options.USABLE, true); + sword1.setWeaponType(WeaponType.ONEHANDEDMELEE); + playerInventory.add(sword1); + System.err.println("MIX " + sword1.getObjectID()); + + + String powerUpLabel = "item_reverse_engineering_powerup_weapon_02_01"; + String powerUpDescription = "item_reverse_engineering_powerup_weapon_02_01"; + String powerUpTemplate = "object/tangible/powerup/base/shared_weapon_base.iff"; + + int powerValue = 12; + TangibleObject powerUp = (TangibleObject) core.objectService.createObject(powerUpTemplate, player.getPlanet()); + + powerUp.setStfFilename("static_item_n"); + powerUp.setStfName(powerUpLabel); + powerUp.setDetailFilename("static_item_d"); + powerUp.setDetailName(powerUpDescription); + powerUp.setIntAttribute("@stat_n:droid_experimentation", powerValue); + powerUp.setAttachment("effectName","droid_experimentation"); + powerUp.setAttachment("powerValue",powerValue); + powerUp.setIntAttribute("num_in_stack", 250); + powerUp.setAttachment("radial_filename", "item/item"); + playerInventory.add(powerUp); + + } + /* 1377 wpn_category_0 Rifle diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java index 03d2a5a4..0f8ac7ba 100644 --- a/src/services/SimulationService.java +++ b/src/services/SimulationService.java @@ -230,7 +230,6 @@ public class SimulationService implements INetworkDispatch { @SuppressWarnings("unchecked") Vector childObjects = (Vector) object.getAttachment("childObjects"); if(childObjects != null) { addChildObjects(object, childObjects); - object.setAttachment("childObjects", null); } if(notifyObservers) { @@ -515,6 +514,7 @@ public class SimulationService implements INetworkDispatch { } Point3D newPos = new Point3D(dataTransform.getXPosition(), dataTransform.getYPosition(), dataTransform.getZPosition()); + newPos.setCell((CellObject) parent); if(Float.isNaN(newPos.x) || Float.isNaN(newPos.y) || Float.isNaN(newPos.z)) return; Point3D oldPos = object.getPosition(); diff --git a/src/services/TerrainService.java b/src/services/TerrainService.java index 7905763e..9cc2924a 100644 --- a/src/services/TerrainService.java +++ b/src/services/TerrainService.java @@ -30,14 +30,13 @@ import java.util.concurrent.ConcurrentHashMap; import resources.common.FileUtilities; import resources.common.collidables.CollidableCircle; - +import services.playercities.ClientRegion; import engine.clientdata.ClientFileManager; import engine.clientdata.visitors.DatatableVisitor; import engine.resources.config.Config; import engine.resources.objects.SWGObject; import engine.resources.scene.Planet; import engine.resources.scene.Point3D; - import main.NGECore; public class TerrainService { @@ -45,6 +44,7 @@ public class TerrainService { private NGECore core; private List planets = Collections.synchronizedList(new ArrayList()); private Map> noBuildAreas = new ConcurrentHashMap>(); + private Map> clientRegions = new ConcurrentHashMap>(); public TerrainService(NGECore core) { this.core = core; @@ -88,13 +88,15 @@ public class TerrainService { for (int i = 0; i < regionTable.getRowCount(); i++) { + String name = (String) regionTable.getObject(i, 0); float x = (Float) regionTable.getObject(i, 1); float z = (Float) regionTable.getObject(i, 2); float radius = (Float) regionTable.getObject(i, 3); CollidableCircle region = new CollidableCircle(new Point3D(x, 0, z), radius, planet); noBuildAreas.get(planet).add(region); - + ClientRegion clientRegion = new ClientRegion(name, new Point3D(x, 0, z), radius, planet); + clientRegions.get(planet).add(clientRegion); } } catch (InstantiationException | IllegalAccessException e) { @@ -174,6 +176,7 @@ public class TerrainService { planets.add(planet); core.mapService.addPlanet(planet); noBuildAreas.put(planet, new ArrayList()); + clientRegions.put(planet, new ArrayList()); loadClientRegions(planet); } @@ -299,6 +302,14 @@ public class TerrainService { return planet.getTerrainVisitor().isWater(worldPosition.x, worldPosition.z); } - + public List getClientRegionsForPlanet(Planet planet) { + return clientRegions.get(planet); + } + + public List getClientRegions() { + List regions = new ArrayList(); + clientRegions.values().forEach(regions::addAll); + return regions; + } } diff --git a/src/services/ai/AIService.java b/src/services/ai/AIService.java index 1e684fbc..2b76826f 100644 --- a/src/services/ai/AIService.java +++ b/src/services/ai/AIService.java @@ -54,6 +54,8 @@ public class AIService { float z = pointB.z - 1 + new Random().nextFloat(); Point3D endPoint = new Point3D(x, core.terrainService.getHeight(planetId, x, z), z); endPoint.setCell(pointB.getCell()); + if(endPoint.getCell() != null) + endPoint.y = pointB.y; path.add(endPoint); return path; } diff --git a/src/services/ai/states/AttackState.java b/src/services/ai/states/AttackState.java index 3b16a857..e487a9f9 100644 --- a/src/services/ai/states/AttackState.java +++ b/src/services/ai/states/AttackState.java @@ -133,7 +133,7 @@ public class AttackState extends AIState { actor.scheduleRecovery(); return StateResult.UNFINISHED; } - if(target.getPosture() == 13 || target.getPosture() == 14) { + if(target.getPosture() == 13 || target.getPosture() == 14 || target.isInStealth()) { actor.removeDefender(target); actor.setFollowObject(actor.getHighestDamageDealer()); target = actor.getFollowObject(); diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java index 84835f18..95747297 100644 --- a/src/services/chat/ChatService.java +++ b/src/services/chat/ChatService.java @@ -350,7 +350,7 @@ public class ChatService implements INetworkDispatch { return; mail.setStatus(Mail.READ); - + mail.init(); sendPersistentMessage(client, mail); storePersistentMessage(mail); diff --git a/src/services/chat/Mail.java b/src/services/chat/Mail.java index c5f829b4..2cad7452 100644 --- a/src/services/chat/Mail.java +++ b/src/services/chat/Mail.java @@ -27,7 +27,7 @@ import java.util.List; import resources.common.OutOfBand; import resources.common.ProsePackage; - +import engine.resources.common.Stf; import com.sleepycat.persist.model.Entity; import com.sleepycat.persist.model.PrimaryKey; @@ -41,7 +41,7 @@ public class Mail implements Serializable { private String senderName; private long recieverId; private String subject; - private String message; + private String message = ""; private byte status; private int timeStamp; private List attachments = new ArrayList(); @@ -149,5 +149,9 @@ public class Mail implements Serializable { public void addProseAttachment(ProsePackage prose) { proseAttachments.add(prose); } + + public void init() { + proseAttachments.forEach(ProsePackage::init); + } } diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java index b7359d8f..9c511792 100644 --- a/src/services/command/CommandService.java +++ b/src/services/command/CommandService.java @@ -69,6 +69,7 @@ public class CommandService implements INetworkDispatch { } public boolean callCommand(CreatureObject actor, SWGObject target, BaseSWGCommand command, int actionCounter, String commandArgs) { + if (actor == null) { return false; } @@ -115,10 +116,10 @@ public class CommandService implements INetworkDispatch { case 0: // Target Not Used For This Command break; case 1: // Other Only (objectId/targetName) - if (target == null) { + if (target == null || target == actor) { if (commandArgs != null && !commandArgs.equals("")) { String name = commandArgs.split(" ")[0]; - + target = core.objectService.getObjectByFirstName(name); if (target == actor) { @@ -128,7 +129,7 @@ public class CommandService implements INetworkDispatch { break; } - + if (target == actor) { return false; } diff --git a/src/services/equipment/EquipmentService.java b/src/services/equipment/EquipmentService.java index b519f773..2c2afb04 100644 --- a/src/services/equipment/EquipmentService.java +++ b/src/services/equipment/EquipmentService.java @@ -48,6 +48,7 @@ import engine.resources.service.INetworkRemoteEvent; import resources.objects.player.PlayerObject; import resources.objects.tangible.TangibleObject; import resources.objects.weapon.WeaponObject; +import resources.skills.SkillMod; public class EquipmentService implements INetworkDispatch { @@ -196,7 +197,49 @@ public class EquipmentService implements INetworkDispatch { if(equipping) { - if(item.getStringAttribute("cat_wpn_damage.wpn_category") != null) core.skillModService.addSkillMod(creature, "display_only_critical", getWeaponCriticalChance(creature, item)); + if(item.getStringAttribute("cat_wpn_damage.wpn_category") != null) { + core.skillModService.addSkillMod(creature, "display_only_critical", getWeaponCriticalChance(creature, item)); + + creature.setAttachment("EquippedWeapon", item.getObjectID()); + // Check if weapon has power up active + if (item.getAttachment("PUPEndTime")!=null){ + long pupEndTime = (long)item.getAttachment("PUPEndTime"); + if (pupEndTime>System.currentTimeMillis()){ + // do nothing let the rest add the mods + } else { + // Make sure pup buff icons are cleared + } + } + } + + if(item.getTemplate().contains("shirt")) { + + creature.setAttachment("EquippedShirt", item.getObjectID()); + // Check if shirt has power up active + if (item.getAttachment("PUPEndTime")!=null){ + long pupEndTime = (long)item.getAttachment("PUPEndTime"); + if (pupEndTime>System.currentTimeMillis()){ + // do nothing let the rest add the mods + } else { + // Make sure pup buff icons are cleared + } + } + } + + if(item.getTemplate().contains("chest")) { + + creature.setAttachment("EquippedChest", item.getObjectID()); + // Check if chest has power up active + if (item.getAttachment("PUPEndTime")!=null){ + long pupEndTime = (long)item.getAttachment("PUPEndTime"); + if (pupEndTime>System.currentTimeMillis()){ + // do nothing let the rest add the mods + } else { + // Make sure pup buff icons are cleared + } + } + } + if(item.getStringAttribute("proc_name") != null) core.buffService.addBuffToCreature(creature, item.getStringAttribute("proc_name").replace("@ui_buff:", ""), creature); for(Entry e : attributes.entrySet()) @@ -224,7 +267,19 @@ public class EquipmentService implements INetworkDispatch { } else { - if(item.getStringAttribute("cat_wpn_damage.wpn_category") != null) core.skillModService.deductSkillMod(creature, "display_only_critical", getWeaponCriticalChance(creature, item)); + if(item.getStringAttribute("cat_wpn_damage.wpn_category") != null){ + core.skillModService.deductSkillMod(creature, "display_only_critical", getWeaponCriticalChance(creature, item)); + creature.setAttachment("EquippedWeapon", null); + } + + if(item.getTemplate().contains("shirt")) { + creature.setAttachment("EquippedShirt", null); + } + + if(item.getTemplate().contains("chest")) { + creature.setAttachment("EquippedChest", null); + } + if(item.getStringAttribute("proc_name") != null) core.buffService.removeBuffFromCreatureByName(creature, item.getStringAttribute("proc_name").replace("@ui_buff:", "")); for(Entry e : attributes.entrySet()) diff --git a/src/services/gcw/GCWService.java b/src/services/gcw/GCWService.java index 0ac88608..f1c775f6 100644 --- a/src/services/gcw/GCWService.java +++ b/src/services/gcw/GCWService.java @@ -562,9 +562,9 @@ public class GCWService implements INetworkDispatch { player.setRankProgress((float) Math.floor(newprogress)); if (newrank > oldrank) { - core.scriptService.callScript("scripts/gcw/", "gcwrank_" + actor.getFaction(), "handleRankUp", core, actor, newrank); + core.scriptService.callScript("scripts/collections/", "gcwrank_" + actor.getFaction(), "handleRankUp", core, actor, newrank); } else { - core.scriptService.callScript("scripts/gcw/", "gcwrank_" + actor.getFaction(), "handleRankDown", actor, newrank); + core.scriptService.callScript("scripts/collections/", "gcwrank_" + actor.getFaction(), "handleRankDown", actor, newrank); } } diff --git a/src/services/housing/HouseTemplate.java b/src/services/housing/HouseTemplate.java index 78f7715f..b13b5a93 100644 --- a/src/services/housing/HouseTemplate.java +++ b/src/services/housing/HouseTemplate.java @@ -15,6 +15,8 @@ public class HouseTemplate { private int baseMaintenanceRate; private Vector placeablePlanets; private Map buildingSigns; + private boolean isCivicStructure; + private int civicStructureType; public HouseTemplate(String deedTemplate, String buildingTemplate, int lotCost) { this.deedTemplate = deedTemplate; @@ -77,5 +79,21 @@ public class HouseTemplate { public void setBaseMaintenanceRate(int baseMaintenanceRate) { this.baseMaintenanceRate = baseMaintenanceRate; } + + public boolean isCivicStructure() { + return isCivicStructure; + } + + public void setCivicStructure(boolean isCivicStructure) { + this.isCivicStructure = isCivicStructure; + } + + public int getCivicStructureType() { + return civicStructureType; + } + + public void setCivicStructureType(int civicStructureType) { + this.civicStructureType = civicStructureType; + } } diff --git a/src/services/housing/HousingService.java b/src/services/housing/HousingService.java index 6ef59c27..4dd3e58b 100644 --- a/src/services/housing/HousingService.java +++ b/src/services/housing/HousingService.java @@ -42,9 +42,13 @@ import java.util.concurrent.atomic.AtomicReference; import main.NGECore; import protocol.swg.EnterStructurePlacementModeMessage; +import resources.common.OutOfBand; +import resources.datatables.Citizenship; import resources.datatables.DisplayType; import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; +import resources.objects.harvester.HarvesterObject; +import resources.objects.installation.InstallationObject; import resources.objects.player.PlayerObject; import resources.objects.tangible.TangibleObject; import services.playercities.PlayerCity; @@ -99,25 +103,25 @@ public class HousingService implements INetworkDispatch { } } - public void placeStructure(final CreatureObject actor, TangibleObject deed, float positionX, float positionZ, float rotation) { + public BuildingObject placeStructure(final CreatureObject actor, TangibleObject deed, float positionX, float positionZ, float rotation) { HouseTemplate houseTemplate = housingTemplates.get(deed.getTemplate()); int structureLotCost = houseTemplate.getLotCost(); String structureTemplate = houseTemplate.getBuildingTemplate(); if (!houseTemplate.canBePlacedOn(actor.getPlanet().getName())) { actor.sendSystemMessage("You may not place this structure on this planet.", (byte) 0); // should probably load this from an stf - return; + return null; } if(!actor.getClient().isGM() && !core.terrainService.canBuildAtPosition(actor, positionX, positionZ)) { actor.sendSystemMessage("You may not place a structure here.", (byte) 0); // should probably load this from an stf - return; + return null; } // Lot stuff if (!actor.getPlayerObject().deductLots(structureLotCost)) { actor.sendSystemMessage("You do not have enough available lots to place this structure.", (byte) 0); // should probably load this from an stf - return; + return null; } // Calculate our orientation and height @@ -142,30 +146,23 @@ public class HousingService implements INetworkDispatch { core.objectService.destroyObject(deed); - // Structure management - Vector admins = new Vector<>(); - admins.add(actor.getObjectID()); - building.setAttachment("sign", sign); // meh workaround building.setAttachment("nextMaintenance", System.currentTimeMillis() + 3600000); building.setAttachment("structureOwner", actor.getObjectID()); - building.setAttachment("structureAdmins", admins); building.setAttachment("isCondemned", false); + building.setAttachment("isCivicStructure", houseTemplate.isCivicStructure()); + building.setAttachment("civicStructureType", houseTemplate.getCivicStructureType()); building.setAttachment("outstandingMaint", 0); + building.addPlayerToAdminList(null, actor.getObjectID(), playerFirstName); building.setDeedTemplate(deed.getTemplate()); building.setMaintenanceAmount(houseTemplate.getBaseMaintenanceRate()); building.setConditionDamage(100); // Ouch - if (structureTemplate.contains("cityhall")){ - PlayerCity newCity = core.playerCityService.addNewPlayerCity(actor); - building.setAttachment("structureCity", newCity.getCityID()); - actor.setAttachment("residentCity", newCity.getCityID()); - } - + /* // Check for city founders joining a new city PlayerCity cityActorIsIn = core.playerCityService.getCityObjectIsIn(actor); - if (cityActorIsIn!=null) { + if (cityActorIsIn != null) { actor.setAttachment("Has24HZoningFor",cityActorIsIn.getCityID()); // for testing int cityActorHasZoning = (int)actor.getAttachment("Has24HZoningFor"); @@ -177,14 +174,17 @@ public class HousingService implements INetworkDispatch { cityActorIsIn.addNewStructure(building.getObjectID()); } } - } + }*/ core.objectService.persistObject(building.getObjectID(), building, core.getSWGObjectODB()); - + return building; } public void startMaintenanceTask(BuildingObject building) { + if(building.getAttachment("isCivicStructure") != null && (boolean) building.getAttachment("isCivicStructure")) + return; + AtomicReference> ref = new AtomicReference>(); ref.set(scheduler.scheduleAtFixedRate(() -> { @@ -212,7 +212,7 @@ public class HousingService implements INetworkDispatch { building.setAttachment("isCondemned", true); building.setBuildingName(building.getBuildingName() + " \\#FF0000(CONDEMNED)\\#FFFFFF"); } - building.setAttachment("outstandingMaint", (int) building.getAttachment("outstandingMaint") + amount); + building.setOutstandingMaintenance(building.getOutstandingMaintenance() + amount); // TODO: lock down building, add option to pay outstanding maintenance and uncondemn building } } @@ -227,19 +227,17 @@ public class HousingService implements INetworkDispatch { core.objectService.getObjectList() .values().stream() .filter(obj -> obj instanceof BuildingObject && obj.getAttachment("structureOwner") != null) - .forEach(building -> core.objectService.persistObject(building.getObjectID(), building, core.getSWGObjectODB())); + .forEach(building -> { + if(building.getAttachment("childObjects") != null) + ((Vector) building.getAttachment("childObjects")).clear(); + core.objectService.persistObject(building.getObjectID(), building, core.getSWGObjectODB()); + }); } @SuppressWarnings("unchecked") public boolean getPermissions(SWGObject player, SWGObject container) { SWGObject structure = container.getContainer(); - Vector structureAdmins = (Vector) structure.getAttachment("structureAdmins"); - - if (structureAdmins != null && structureAdmins.contains(player.getObjectID())) { - return true; - } - - return false; + return ((BuildingObject) structure).isOnAdminList((CreatureObject) player); } public void createDestroySUIPage(final SWGObject owner, final TangibleObject target) { @@ -254,6 +252,7 @@ public class HousingService implements INetworkDispatch { } String displayname = "@installation_n:"+building.getStfName(); + final Vector noRedeed = new Vector(); if (building.getCustomName()!=null) displayname = building.getCustomName(); final SUIWindow window = core.suiService.createSUIWindow("Script.listBox", owner, target, 0); @@ -265,16 +264,19 @@ public class HousingService implements INetworkDispatch { "@player_structure:confirm_destruction_d4 "); if (building.getConditionDamage()<20 && building.getMaintenanceAmount()<3000){ window.addListBoxMenuItem("@player_structure:redeed_confirmation \\#BB0000 @player_structure:can_redeed_no_suffix \\#FFFFFF ",1 ); + noRedeed.add(-1); } else { window.addListBoxMenuItem("@player_structure:redeed_confirmation \\#32CD32 @player_structure:can_redeed_yes_suffix \\#FFFFFF ",1 ); } if (building.getConditionDamage()<20){ window.addListBoxMenuItem("@player_structure:redeed_condition \\#BB0000 " + building.getConditionDamage() + " \\#FFFFFF ",1 ); + noRedeed.add(-1); } else { window.addListBoxMenuItem("@player_structure:redeed_condition \\#32CD32 " + building.getConditionDamage() + " \\#FFFFFF ",1 ); } - if (building.getMaintenanceAmount()<0){ + if (building.getMaintenanceAmount()<0 || building.getMaintenanceAmount()<800){ window.addListBoxMenuItem("@player_structure:redeed_maintenance \\#BB0000 " + (int)building.getMaintenanceAmount() + " \\#FFFFFF ",2 ); + noRedeed.add(-1); } else { window.addListBoxMenuItem("@player_structure:redeed_maintenance \\#32CD32 " + (int)building.getMaintenanceAmount() + " \\#FFFFFF ",2 ); } @@ -288,7 +290,8 @@ public class HousingService implements INetworkDispatch { @Override public void process(SWGObject owner, int eventType, Vector returnList) { core.suiService.closeSUIWindow(owner, 0); - createCodeWindow(owner, target); + if (noRedeed.size()==0 && ((CreatureObject)owner).getBankCredits()>800) + createCodeWindow(owner, target); } }); window.addHandler(1, "", Trigger.TRIGGER_CANCEL, returnList, new SUICallback() { @@ -309,11 +312,12 @@ public class HousingService implements INetworkDispatch { final int confirmCode = 100000 + rnd.nextInt(900000); final SUIWindow window = core.suiService.createInputBox(2,"@player_structure:structure_status","@player_structure:structure_name_prompt", owner, target, 0); window.setProperty("bg.caption.lblTitle:Text", "@player_structure:confirm_destruction_t"); + window.setProperty("Prompt.lblPrompt:Text", "@player_structure:your_structure_prefix " + - "\\#32CD32 @player_structure:will_redeed_confirm \\#FFFFFF "+ - "@player_structure:will_redeed_suffix " + - "\n \n Code: " + confirmCode); - + "\\#32CD32 @player_structure:will_redeed_confirm \\#FFFFFF "+ + "@player_structure:will_redeed_suffix " + + "\n \n Code: " + confirmCode); + window.setProperty("btnOk:visible", "True"); window.setProperty("btnCancel:visible", "True"); window.setProperty("btnOk:Text", "@yes"); @@ -324,27 +328,31 @@ public class HousingService implements INetworkDispatch { window.addHandler(0, "", Trigger.TRIGGER_OK, returnList, new SUICallback() { @Override public void process(SWGObject owner, int eventType, Vector returnList) { - CreatureObject crafter = (CreatureObject)owner; + CreatureObject houseOwner = (CreatureObject)owner; core.suiService.closeSUIWindow(owner, 0); - if (returnList.get(0).equals(""+confirmCode)){ + if (returnList.get(0).equals(""+confirmCode)) { // handle creation of correct deed in player inventory - PlayerObject player = (PlayerObject) crafter.getSlottedObject("ghost"); + PlayerObject player = (PlayerObject) houseOwner.getSlottedObject("ghost"); HouseTemplate houseTemplate = housingTemplates.get(houseToDeed.get(building.getTemplate())); TangibleObject deed = (TangibleObject) core.objectService.createObject(houseTemplate.getDeedTemplate(), owner.getPlanet()); if (player.getLotsRemaining() + houseTemplate.getLotCost() > 10){ // Something went wrong or hacking attempt - crafter.sendSystemMessage("Structure can't be redeeded. Maximum lot count exceeded.",(byte)1); + houseOwner.sendSystemMessage("Structure can't be redeeded. Maximum lot count exceeded.",(byte)1); return; } deed.setIntAttribute("@obj_attr_n:examine_maintenance_rate", houseTemplate.getBaseMaintenanceRate()); deed.setIntAttribute("@obj_attr_n:examine_maintenance", (int) building.getMaintenanceAmount()); - core.objectService.destroyObject(building.getObjectID()); - if(building.getAttachment("sign") != null) - core.objectService.destroyObject((SWGObject) building.getAttachment("sign")); + owner.getContainer().remove(owner); + + int costs = 800; + houseOwner.setBankCredits(houseOwner.getBankCredits()-costs); + + destroyStructure(building); + SWGObject ownerInventory = owner.getSlottedObject("inventory"); ownerInventory.add(deed); @@ -352,12 +360,13 @@ public class HousingService implements INetworkDispatch { if (player.getLotsRemaining() + houseTemplate.getLotCost() <= 10) { player.setLotsRemaining(player.getLotsRemaining() + houseTemplate.getLotCost()); } + + houseOwner.sendSystemMessage("@player_structure:processing_destruction",(byte)1); + houseOwner.sendSystemMessage("@player_structure:deed_reclaimed",(byte)1); - crafter.sendSystemMessage("@player_structure:processing_destruction",(byte)1); - crafter.sendSystemMessage("@player_structure:deed_reclaimed",(byte)1); } else { - crafter.sendSystemMessage("@player_structure:incorrect_destroy_code",(byte)1); + houseOwner.sendSystemMessage("@player_structure:incorrect_destroy_code",(byte)1); } } @@ -371,6 +380,39 @@ public class HousingService implements INetworkDispatch { core.suiService.openSUIWindow(window); } + public void destroyStructure(BuildingObject building) { + + PlayerCity city = core.playerCityService.getCityObjectIsIn(building); + CreatureObject owner = null; + if(building.getAttachment("structureOwner") != null) + owner = (CreatureObject) core.objectService.getObject((long) building.getAttachment("structureOwner")); + + if(building.getAttachment("sign") != null) + core.objectService.destroyObject((SWGObject) building.getAttachment("sign")); + + core.objectService.destroyObject(building.getObjectID()); + core.objectService.deletePersistentObject(building.getObjectID(), core.getSWGObjectODB()); + + if(building.getResidency()) + owner.setAttachment("residentBuilding", null); + + + if(city != null) { + city.removeStructure(building.getObjectID()); + if(building.getResidency()) { + city.removeCitizen(owner.getObjectID()); + owner.getPlayerObject().setHome(""); + owner.getPlayerObject().setCitizenship(Citizenship.Homeless); + owner.setAttachment("residentCity", null); + } + if(building.getTemplate().contains("cityhall")) { + // destroy city + core.playerCityService.destroyCity(city); + } + } + + } + public void createPayMaintenanceSUIPage(SWGObject owner, TangibleObject target) { CreatureObject creature = (CreatureObject) owner; final BuildingObject building = (BuildingObject) target.getGrandparent(); @@ -415,10 +457,7 @@ public class HousingService implements INetworkDispatch { CreatureObject crafter = (CreatureObject)owner; crafter.setCashCredits(crafter.getCashCredits() - Integer.parseInt(returnList.get(1))); building.setMaintenanceAmount(building.getMaintenanceAmount()+Float.parseFloat(returnList.get(1))); - String displayname = "the structure"; - if (building.getCustomName()!=null) - displayname = building.getCustomName(); - crafter.sendSystemMessage("You successfully make a payment of " + Integer.parseInt(returnList.get(1)) + " credits to " + displayname + ".", (byte) 0); + crafter.sendSystemMessage("You successfully make a payment of " + Integer.parseInt(returnList.get(1)) + " credits to the maintenance pool.", (byte) 0); core.suiService.closeSUIWindow(owner, 0); } }); @@ -451,22 +490,20 @@ public class HousingService implements INetworkDispatch { owner.sendSystemMessage("Structure renamed.", DisplayType.Broadcast); } - public void createStatusSUIPage(SWGObject owner, TangibleObject target) { + public void createStatusSUIPage(CreatureObject owner, TangibleObject target) + { final BuildingObject building = (BuildingObject) target.getGrandparent(); - //final BuildingObject building = (BuildingObject) target.getAttachment("housing_parentstruct"); + String displayname = "@installation_n:"+building.getStfName(); - if (building.getCustomName()!=null) - displayname = building.getCustomName(); + if (building.getCustomName()!=null) displayname = building.getCustomName(); + final SUIWindow window = core.suiService.createSUIWindow("Script.listBox", owner, target, 0); window.setProperty("bg.caption.lblTitle:Text", "@player_structure:structure_status_t"); window.setProperty("Prompt.lblPrompt:Text", "@player_structure:structure_name_prompt" + " " + displayname); - String ownerName = owner.getCustomName(); - if (ownerName.length()>0){ - String[] helper = ownerName.split(" "); - ownerName = helper[0]; - } - + + String ownerName = core.objectService.getObject((long) building.getAttachment("structureOwner")).getFirstName(); String maintenancePool_string = ""+(int)building.getMaintenanceAmount(); + int hourlyMaintenance = building.getBMR(); float totalNumberOfHours = (float)building.getMaintenanceAmount()/hourlyMaintenance; float minuteFraction = ((totalNumberOfHours * 100) % 100) / 100; @@ -477,10 +514,10 @@ public class HousingService implements INetworkDispatch { maintenancePool_string += " (" + nDays + " days, " + nHours + " hours, " + nMinutes + " minutes)"; window.addListBoxMenuItem("@player_structure:owner_prompt" + " " + ownerName, 0); - if (building.getPrivacy()==BuildingObject.PRIVATE) - window.addListBoxMenuItem("@player_structure:structure_private", 1); - else - window.addListBoxMenuItem("@player_structure:structure_public", 1); + + if (building.getPrivacy()==BuildingObject.PRIVATE) window.addListBoxMenuItem("@player_structure:structure_private", 1); + else window.addListBoxMenuItem("@player_structure:structure_public", 1); + window.addListBoxMenuItem("@player_structure:condition_prompt" + " " + target.getConditionDamage()+"%", 2); window.addListBoxMenuItem("@player_structure:maintenance_pool_prompt " + maintenancePool_string, 3); window.addListBoxMenuItem("@player_structure:maintenance_rate_prompt " + building.getBMR() + " cr/h", 4); // @player_structure:credits_per_hour @@ -504,13 +541,54 @@ public class HousingService implements INetworkDispatch { core.suiService.openSUIWindow(window); } - public void declareResidency(SWGObject owner, TangibleObject target) { - final BuildingObject building = (BuildingObject) target.getGrandparent(); - //final BuildingObject building = (BuildingObject) target.getAttachment("housing_parentstruct"); - building.setResidency((CreatureObject)owner); - PlayerCity cityActorIsIn = core.playerCityService.getCityObjectIsIn(owner); - owner.setAttachment("residentCity", cityActorIsIn.getCityID()); - //owner.setResidence(); + public void declareResidency(SWGObject owner, BuildingObject building) { + PlayerCity cityActorIsIn = core.playerCityService.getCityObjectIsIn(building); + if(owner.getObjectID() != (long) building.getAttachment("structureOwner")) { + ((CreatureObject) owner).sendSystemMessage("@player_structure:declare_must_be_owner", (byte) 0); + return; + } else if(building.getResidency()) { + ((CreatureObject) owner).sendSystemMessage("@player_structure:already_residence", (byte) 0); + return; + } + if(((CreatureObject) owner).getPlayerObject().getCitizenship() == Citizenship.Mayor && !building.getTemplate().contains("cityhall")) { // mayors always have the city hall as their residence and cant change it + if(cityActorIsIn == null || cityActorIsIn.getMayorID() != owner.getObjectID()) { + ((CreatureObject) owner).sendSystemMessage("@city/city:mayor_residence_change", (byte) 0); + return; + } + } + if((owner.getAttachment("residencyCooldown") == null || System.currentTimeMillis() < (long) owner.getAttachment("residencyCooldown")) && cityActorIsIn.getMayorID() != owner.getObjectID()) { + ((CreatureObject) owner).sendSystemMessage(OutOfBand.ProsePackage("@player_structure:change_residence_time", "DI", (int) ((long) owner.getAttachment("residencyCooldown") - System.currentTimeMillis()) / 3600000), (byte) 0); + return; + } + BuildingObject oldResidency = null; + if(owner.getAttachment("residentBuilding") != null && core.objectService.getObject((long) owner.getAttachment("residentBuilding")) != null) { + oldResidency = (BuildingObject) core.objectService.getObject((long) owner.getAttachment("residentBuilding")); + oldResidency.setResidency(false); + ((CreatureObject) owner).sendSystemMessage("@player_structure:change_residence", (byte) 0); + PlayerCity oldCity = core.playerCityService.getCityObjectIsIn(oldResidency); + if(oldCity != null) { + oldCity.removeStructure(oldResidency.getObjectID()); + oldCity.removeCitizen(owner.getObjectID()); + ((CreatureObject) owner).getPlayerObject().setHome(""); + ((CreatureObject) owner).getPlayerObject().setCitizenship(Citizenship.Homeless); + owner.setAttachment("residentCity", null); + } + ((CreatureObject) owner).sendSystemMessage("@player_structure:change_residence", (byte) 0); + } else { + ((CreatureObject) owner).sendSystemMessage("@player_structure:declared_residency", (byte) 0); + } + building.setResidency(true); + owner.setAttachment("residencyCooldown", System.currentTimeMillis() + 86400000); // 24 hours + owner.setAttachment("residentBuilding", building.getObjectID()); + if(cityActorIsIn != null) { + cityActorIsIn.addCitizen(owner.getObjectID()); + owner.setAttachment("residentCity", cityActorIsIn.getCityID()); + ((CreatureObject) owner).getPlayerObject().setHome(cityActorIsIn.getCityName()); + if(cityActorIsIn.getMayorID() == owner.getObjectID()) + ((CreatureObject) owner).getPlayerObject().setCitizenship(Citizenship.Mayor); + else + ((CreatureObject) owner).getPlayerObject().setCitizenship(Citizenship.Citizen); + } } public void handleListAllItems(SWGObject owner, TangibleObject target) { @@ -542,16 +620,11 @@ public class HousingService implements INetworkDispatch { core.suiService.closeSUIWindow(owner, 0); } }); - core.suiService.openSUIWindow(window); - - + core.suiService.openSUIWindow(window); } - public void handleDeleteAllItems(SWGObject owner, TangibleObject target) { - final BuildingObject building = (BuildingObject) target.getGrandparent(); - //final BuildingObject building = (BuildingObject) target.getAttachment("housing_parentstruct"); - //building.getItemsList().clear(); - // confirmation needed + public void handleDeleteAllItems(SWGObject owner, TangibleObject target) + { confirmDeleteAllItems(owner, target); } @@ -597,8 +670,8 @@ public class HousingService implements INetworkDispatch { core.suiService.openSUIWindow(window); } - public void confirmDeleteAllItems2ndStage(final CreatureObject ownerC, BuildingObject building) { - + public void confirmDeleteAllItems2ndStage(final CreatureObject ownerC, BuildingObject building) + { final SUIWindow window = core.suiService.createMessageBox(2,"@player_structure:structure_status","@player_structure:structure_name_prompt", ownerC, building, 0); window.setProperty("bg.caption.lblTitle:Text", "@player_structure:confirm_destruction_t"); window.setProperty("Prompt.lblPrompt:Text", "@player_structure:delete_all_items_second_d"); @@ -768,25 +841,46 @@ public class HousingService implements INetworkDispatch { public void handlePermissionEntry(CreatureObject owner, TangibleObject target) { final BuildingObject building = (BuildingObject) target.getGrandparent(); //final BuildingObject building = (BuildingObject) target.getAttachment("housing_parentstruct"); - String listName = "ENTRY"; + String listName = "entry"; building.setPermissionEntry(listName,owner); } public void handlePermissionBan(CreatureObject owner, TangibleObject target) { final BuildingObject building = (BuildingObject) target.getGrandparent(); //final BuildingObject building = (BuildingObject) target.getAttachment("housing_parentstruct"); - String listName = "BAN"; + String listName = "ban"; building.setPermissionBan(listName,owner); } + public void handlePermissionAdmin(CreatureObject owner, TangibleObject target) { + final BuildingObject building = (BuildingObject) target.getGrandparent(); + //final BuildingObject building = (BuildingObject) target.getAttachment("housing_parentstruct"); + String listName = "admin"; + building.setPermissionAdmin(listName,owner); + } + + + public SWGObject getClosestStructureWithAdminRights(CreatureObject actor) { + return core.simulationService.get(actor.getPlanet(), actor.getWorldPosition().x, actor.getWorldPosition().z, 20) + .stream().filter(o -> o instanceof BuildingObject || o instanceof InstallationObject) + .filter(o -> { + if(o instanceof BuildingObject) + return ((BuildingObject) o).isOnAdminList(actor); + else if(o instanceof HarvesterObject) { + System.out.println("test"); + return ((HarvesterObject) o).isOnAdminList(actor); + } + return false; + }).min((o1, o2) -> (int) (o1.getWorldPosition().getDistance(actor.getWorldPosition()) - o2.getWorldPosition().getDistance(actor.getWorldPosition()))).orElse(null); + } + public void handlePermissionListModify(CreatureObject owner, SWGObject target, String commandArgs){ String[] commandSplit = commandArgs.split(" "); - if (commandSplit.length==3){ - if (core.characterService.playerExists(commandSplit[2]) && - core.characterService.getPlayerOID(commandSplit[2])>0){ + if (commandSplit.length >= 3) { + if (core.characterService.playerExists(commandSplit[2]) && core.characterService.getPlayerOID(commandSplit[2]) > 0) { long playerOID = core.characterService.getPlayerOID(commandSplit[2]); - if (commandSplit[2].equals("ENTRY")){ + if (commandSplit[1].equals("entry")) { if (commandSplit[0].equals("add")){ ((BuildingObject)target).addPlayerToEntryList(owner, playerOID, commandSplit[2]); @@ -795,13 +889,35 @@ public class HousingService implements INetworkDispatch { ((BuildingObject)target).removePlayerFromEntryList(owner, playerOID, commandSplit[2]); } } - if (commandSplit[2].equals("BAN")){ + if (commandSplit[1].equals("ban")) { + + if (commandSplit[0].equals("add")) { + if(((BuildingObject)target).isOnAdminList((CreatureObject) core.objectService.getObject(playerOID))) { + owner.sendSystemMessage("@player_structure:cannot_ban_admin", (byte) 0); + return; + } + ((BuildingObject)target).addPlayerToBanList(owner, playerOID, commandSplit[2]); + ((BuildingObject)target).removePlayerFromEntryList(owner, playerOID, commandSplit[2]); + } + if (commandSplit[0].equals("remove")) { + ((BuildingObject)target).removePlayerFromBanList(owner, playerOID, commandSplit[2]); + } + } + if (commandSplit[1].equals("admin")) { if (commandSplit[0].equals("add")){ - ((BuildingObject)target).addPlayerToBanList(owner, playerOID, commandSplit[2]); + ((BuildingObject)target).addPlayerToAdminList(owner, playerOID, commandSplit[2]); } - if (commandSplit[0].equals("remove")){ - ((BuildingObject)target).removePlayerFromBanList(owner, playerOID, commandSplit[2]); + if (commandSplit[0].equals("remove")) { + if(playerOID == (long) target.getAttachment("structureOwner")) { + owner.sendSystemMessage("@player_structure:cannot_remove_owner", (byte) 0); + return; + } + else if(playerOID == owner.getObjectID()) { + owner.sendSystemMessage("@player_structure:cannot_remove_self", (byte) 0); + return; + } + ((BuildingObject)target).removePlayerFromAdminList(owner, playerOID, commandSplit[2]); } } } else { diff --git a/src/services/map/MapService.java b/src/services/map/MapService.java index 007f4281..edbbc908 100644 --- a/src/services/map/MapService.java +++ b/src/services/map/MapService.java @@ -115,6 +115,15 @@ public class MapService implements INetworkDispatch { } + public void removeLocation(Planet planet, float x, float y, byte category) { + if(locationMap.get(planet) == null) + return; + MapLocation location = locationMap.get(planet).stream().filter(l -> l.getX() == x && l.getY() == y && l.getCategory() == category).findFirst().orElse(null); + if(location == null) + return; + locationMap.get(planet).remove(location); + } + public String getClosestCityName(SWGObject object) { if(object.getPlanet() == null) diff --git a/src/services/mission/MissionLocation.java b/src/services/mission/MissionLocation.java new file mode 100644 index 00000000..85141267 --- /dev/null +++ b/src/services/mission/MissionLocation.java @@ -0,0 +1,88 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ +package services.mission; + +import org.apache.mina.core.buffer.IoBuffer; + +import engine.resources.common.CRC; +import engine.resources.objects.Delta; +import engine.resources.scene.Point3D; + +public class MissionLocation extends Delta { + + private static final long serialVersionUID = 1L; + + private Point3D location; + private long objId; + private String planet; + + public MissionLocation() { } + + public MissionLocation(Point3D location, long objId, String planet) { + this.location = location; + this.objId = objId; + this.planet = planet; + } + + public Point3D getLocation() { + return location; + } + + public void setLocation(Point3D location) { + this.location = location; + } + + public long getObjectId() { + return objId; + } + + public void setObjectId(long objId) { + this.objId = objId; + } + + public String getPlanet() { + return planet; + } + + public void setPlanet(String planet) { + this.planet = planet; + } + + public int getPlanetCRC() { + if (planet != null) + return CRC.StringtoCRC(planet); + else + return 0; + } + + @Override + public byte[] getBytes() { + IoBuffer buffer = createBuffer(24); + + buffer.putFloat(location.x); + buffer.putFloat(location.y); + buffer.putFloat(location.z); + buffer.putLong(objId); + buffer.putInt(getPlanetCRC()); + return buffer.flip().array(); + } +} diff --git a/src/services/mission/MissionService.java b/src/services/mission/MissionService.java index 60af71ec..2d97a7ae 100644 --- a/src/services/mission/MissionService.java +++ b/src/services/mission/MissionService.java @@ -312,7 +312,7 @@ public class MissionService implements INetworkDispatch { else return; - mission.setRepeatCount(requestCounter); + mission.incrementRepeatCounter(); typeOneCount.incrementAndGet(); } else if (typeTwoCount.get() < 5) { @@ -329,7 +329,7 @@ public class MissionService implements INetworkDispatch { else return; - mission.setRepeatCount(requestCounter); + mission.incrementRepeatCounter(); typeTwoCount.incrementAndGet(); } } @@ -383,6 +383,11 @@ public class MissionService implements INetworkDispatch { return false; } + if (mission.getPlanetId() != creature.getPlanetId()) { + mission.setPlanet(creature.getPlanet()); + mission.setPlanetId(creature.getPlanetId()); + } + missionBag.transferTo(creature, datapad, mission); createMissionObjective(creature, mission); return true; @@ -475,21 +480,21 @@ public class MissionService implements INetworkDispatch { mission.setMissionType("survey"); String missionStf = "mission/mission_npc_survey_neutral_easy"; - mission.setMissionStf(missionStf); + mission.setMissionId(getRandomStringEntry(missionStf)); - mission.setMissionDescription("m" + mission.getMissionId() + "d"); - mission.setMissionTitle("m" + mission.getMissionId() + "t"); + mission.setDescription("@" + missionStf + ":" + "m" + mission.getMissionId() + "d"); + mission.setTitle("@" + missionStf + ":" + "m" + mission.getMissionId() + "t"); mission.setCreator(nameGenerator.compose(2) + " " + nameGenerator.compose(3)); - mission.setMissionLevel(randLevel); + mission.setDifficultyLevel(randLevel); - mission.setStartLocation(player.getPosition(), player.getPlanet().name); + mission.setStartLocation(player.getPosition(), 0, player.getPlanet().name); mission.setCreditReward(400 + (randLevel - minLevel) * 20 + ran.nextInt(100)); - mission.setMissionTemplateObject(CRC.StringtoCRC(ResourceRoot.CONTAINER_TYPE_IFF_SIGNIFIER[family.getContainerType()])); // This should be the resource container obj - mission.setMissionTargetName(family.getResourceType() + family.getResourceClass()); + mission.setTemplateObject(CRC.StringtoCRC(ResourceRoot.CONTAINER_TYPE_IFF_SIGNIFIER[family.getContainerType()])); // This should be the resource container obj + mission.setTargetName(family.getResourceType() + family.getResourceClass()); } @@ -499,26 +504,27 @@ public class MissionService implements INetworkDispatch { String[] difficulties = { "easy", "medium", "hard" }; String missionStf = "mission/mission_deliver_neutral_" + difficulties[ran.nextInt(difficulties.length)]; - mission.setMissionStf(missionStf); + mission.setMissionId(getRandomStringEntry(missionStf)); - mission.setMissionDescription("m" + mission.getMissionId() + "d"); - mission.setMissionTitle("m" + mission.getMissionId() + "t"); + mission.setDescription("@" + missionStf + ":" + "m" + mission.getMissionId() + "d"); + mission.setTitle("@" + missionStf + ":" + "m" + mission.getMissionId() + "t"); mission.setCreator(nameGenerator.compose(2) + " " + nameGenerator.compose(3)); - mission.setMissionLevel(5); + mission.setDifficultyLevel(5); // TODO: Use pre-defined commoner locations Point3D startLocation = SpawnPoint.getRandomPosition(player.getPosition(), (float) 50, (float) 300, player.getPlanetId()); Point3D destination = SpawnPoint.getRandomPosition(startLocation, (float) 50, (float) 500, player.getPlanetId()); - mission.setStartLocation(startLocation, player.getPlanet().name); - mission.setDestination(destination, player.getPlanet().name); + mission.setStartLocation(startLocation, 0, player.getPlanet().name); + mission.setDestinationLocation(destination, 0, player.getPlanet().name); mission.setCreditReward((int) (200 + ((startLocation.getDistance2D(destination) / 10)))); - mission.setMissionTemplateObject(CRC.StringtoCRC("object/tangible/mission/shared_mission_datadisk.iff")); - mission.setMissionTargetName("Datadisk"); + mission.setTemplateObject(CRC.StringtoCRC("object/tangible/mission/shared_mission_datadisk.iff")); + mission.setTargetName("Datadisk"); + } private void randomBountyMission(SWGObject player, MissionObject mission) { @@ -547,19 +553,18 @@ public class MissionService implements INetworkDispatch { String missionStf = "mission/mission_bounty_jedi"; - mission.setMissionStf(missionStf); if (!bountyTarget.getProfession().equals("")) { // TODO: Smuggler mission checks. if (bountyTarget.getFaction().equals("rebel")) { - mission.setMissionTargetName("Rebel Bounty"); + mission.setTargetName("Rebel Bounty"); mission.setMissionId(2); mission.setCreator("The Galactic Empire"); } else if (bountyTarget.getFaction().equals("imperial")) { - mission.setMissionTargetName("Imperial Bounty"); + mission.setTargetName("Imperial Bounty"); mission.setMissionId(1); mission.setCreator("The Alliance"); } - mission.setMissionTitle("m" + mission.getMissionId() + "t"); - mission.setMissionDescription("m" + mission.getMissionId() + "d"); + mission.setTitle("@" + missionStf + ":" + "m" + mission.getMissionId() + "t"); + mission.setDescription("@" + missionStf + ":" + "m" + mission.getMissionId() + "d"); } else { // TODO: Dead code, but place-holder for implementation of smuggler missions. if (bountyTarget.getFaction().equals("neutral")) { @@ -571,17 +576,18 @@ public class MissionService implements INetworkDispatch { else if (bountyTarget.getFaction().equals("imperial")) { mission.setMissionId(1); } - mission.setMissionTitle("m" + mission.getMissionId() + "ts"); - mission.setMissionDescription("m" + mission.getMissionId() + "ds"); + mission.setTitle("@" + missionStf + ":" + "m" + mission.getMissionId() + "ts"); + mission.setDescription("@" + missionStf + ":" + "m" + mission.getMissionId() + "ds"); } - mission.setMissionLevel(95 + bountyTarget.getFailedAttempts()); + mission.setDifficultyLevel(95 + bountyTarget.getFailedAttempts()); mission.setCreditReward(bountyTarget.getCreditReward()); - mission.setMissionTemplateObject(CRC.StringtoCRC("object/tangible/mission/shared_mission_bounty_jedi_target.iff")); + mission.setTemplateObject(CRC.StringtoCRC("object/tangible/mission/shared_mission_bounty_jedi_target.iff")); mission.setBountyMarkId(bountyTarget.getObjectID()); + } public enum TerminalType {; diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index cfb98a1c..96070041 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -165,6 +165,7 @@ public class ObjectService implements INetworkDispatch { core.bazaarService.saveAllItems(); core.housingService.saveBuildings(); core.harvesterService.saveHarvesters(); + core.playerCityService.saveAllCities(); core.closeODBs(); } }); @@ -527,7 +528,14 @@ public class ObjectService implements INetworkDispatch { } else { core.simulationService.remove(object, object.getWorldPosition().x, object.getWorldPosition().z, true); } - + @SuppressWarnings("unchecked") Vector childObjects = (Vector) object.getAttachment("childObjects"); + if(childObjects != null) + { + for(SWGObject child : childObjects) { + if(child != null && child.getParentId() != 0) + destroyObject(child); + } + } } public void destroyObject(long objectID) { @@ -675,6 +683,8 @@ public class ObjectService implements INetworkDispatch { } public void useObject(CreatureObject creature, final SWGObject object) { + System.out.println("creature " + creature); + System.out.println("object " + object); if (creature == null || object == null) { return; } @@ -726,6 +736,71 @@ public class ObjectService implements INetworkDispatch { } } + // Check if used item was a PUP + String powerUpTemplate1 = "object/tangible/powerup/base/shared_armor_base.iff"; + String powerUpTemplate2 = "object/tangible/powerup/base/shared_base.iff"; + String powerUpTemplate3 = "object/tangible/powerup/base/shared_weapon_base.iff"; + if (object.getTemplate().equals(powerUpTemplate1)){ + // chestplate + + String effectName = (String) object.getAttachment("effectName"); + int powerValue = (int) object.getAttachment("powerValue"); + + Long chestID = (Long) creature.getAttachment("EquippedChest"); + if (chestID==null) + return; + + TangibleObject chest = (TangibleObject) core.objectService.getObject(chestID); + //chest.setIntAttribute(effectName, powerValue); + chest.setAttachment("PUPEffectName", effectName); + chest.setAttachment("PUPEffectValue", powerValue); + + } + if (object.getTemplate().equals(powerUpTemplate2)){ + // Shirt + + String effectName = (String) object.getAttachment("effectName"); + int powerValue = (int) object.getAttachment("powerValue"); + + Long shirtID = (Long) creature.getAttachment("EquippedShirt"); + if (shirtID==null) + return; + + TangibleObject shirt = (TangibleObject) core.objectService.getObject(shirtID); + //shirt.setIntAttribute(effectName, powerValue); + shirt.setAttachment("PUPEffectName", effectName); + shirt.setAttachment("PUPEffectValue", powerValue); + + } + if (object.getTemplate().equals(powerUpTemplate3)){ + // weapon + SWGObject usedObject = null; + if (object.getAttachment("UsedObjectID")!=null){ + long usedObjectid = (long)object.getAttachment("UsedObjectID"); + usedObject = core.objectService.getObject(usedObjectid); + } + + creature.setAttachment("LastUsedPUP",object.getObjectID()); + + if (usedObject==null){ + Long weaponID = (Long) creature.getAttachment("EquippedWeapon"); + System.out.println("weaponID " + weaponID); + if (weaponID==null) + return; + + WeaponObject weapon = (WeaponObject) core.objectService.getObject(weaponID); + usedObject = (SWGObject) weapon; + } + + core.buffService.addBuffToCreature(creature, "powerup_weapon", creature); + + int amount = object.getIntAttribute("num_in_stack"); + if (amount==1) + destroyObject(object.getObjectID()); + else + object.setIntAttribute("num_in_stack",amount-1); + } + creature.setUseTarget(object); int reuse_time; @@ -1307,4 +1382,34 @@ public class ObjectService implements INetworkDispatch { odb.remove(key); } + public void addStackableItem(TangibleObject item, SWGObject container) { + // Maybe even better placed inside SWGObject.add(), so whenever an item is added to a container + // it will bechecked if it is stackable and if there is already a stack to add it to + if (! item.isStackable()) + container.add(item); + final Vector alikeItemsInContainer = new Vector(); + container.viewChildren(container, false, false, new Traverser() { + @Override + public void process(SWGObject obj) { + if (obj.getTemplate().equals(item.getTemplate())){ + alikeItemsInContainer.add(obj); + System.out.println(obj.getTemplate()); + } + } + }); + + if (alikeItemsInContainer.size()==0){ + container.add(item); + return; + } + TangibleObject alikeItem = (TangibleObject)alikeItemsInContainer.get(0); + int alikeUses = alikeItem.getUses(); + int itemUses = item.getUses(); + if (itemUses==0) + itemUses=1; + int newUses = alikeUses+itemUses; + + alikeItem.setUses(newUses); + core.objectService.destroyObject(item.getObjectID()); + } } diff --git a/src/services/playercities/ClientRegion.java b/src/services/playercities/ClientRegion.java new file mode 100644 index 00000000..d2243d59 --- /dev/null +++ b/src/services/playercities/ClientRegion.java @@ -0,0 +1,53 @@ +package services.playercities; + +import engine.resources.scene.Planet; +import engine.resources.scene.Point3D; + +public class ClientRegion { + + private String name; + private Point3D center; + private float radius; + private Planet planet; + + public ClientRegion(String name, Point3D center, float radius, Planet planet) { + this.name = name; + this.center = center; + this.radius = radius; + this.planet = planet; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public float getRadius() { + return radius; + } + + public void setRadius(float radius) { + this.radius = radius; + } + + public Point3D getCenter() { + return center; + } + + public void setCenter(Point3D center) { + this.center = center; + } + + public Planet getPlanet() { + return planet; + } + + public void setPlanet(Planet planet) { + this.planet = planet; + } + + +} diff --git a/src/services/playercities/PlayerCity.java b/src/services/playercities/PlayerCity.java index 6caaf000..8d3f9f9e 100644 --- a/src/services/playercities/PlayerCity.java +++ b/src/services/playercities/PlayerCity.java @@ -26,14 +26,30 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Vector; +import java.util.concurrent.ConcurrentHashMap; +import net.engio.mbassy.listener.Handler; +import resources.common.OutOfBand; +import resources.common.ProsePackage; +import resources.common.collidables.AbstractCollidable; +import resources.common.collidables.CollidableCircle; +import resources.common.collidables.AbstractCollidable.EnterEvent; +import resources.common.collidables.AbstractCollidable.ExitEvent; +import resources.datatables.CivicStructures; +import resources.datatables.Options; import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; +import resources.objects.tangible.TangibleObject; import resources.objects.waypoint.WaypointObject; import services.chat.Mail; import services.chat.WaypointAttachment; import main.NGECore; +import engine.clientdata.ClientFileManager; +import engine.clientdata.StfTable; +import engine.clientdata.visitors.DatatableVisitor; +import engine.resources.common.CRC; import engine.resources.objects.SWGObject; import engine.resources.scene.Point3D; @@ -45,8 +61,6 @@ public class PlayerCity implements Serializable { private static final long serialVersionUID = 1L; - public static final int DESERTED = 0; - public static final int NEWCITY = 0; public static final int OUTPOST = 1; public static final int VILLAGE = 2; public static final int TOWNSHIP = 3; @@ -62,9 +76,6 @@ public class PlayerCity implements Serializable { public static final int MEDICAL_CENTER = 7; public static final int RESEARCH_CENTER = 8; public static final int SAMPLE_RICH = 9; - public static final int INDUSTRIAL_SOCIETY = 10; - public static final int SCIENTIFIC_SOCIETY = 11; - public static final int STRONGHOLD = 12; public static final String[] specialisationSTFNames = new String[]{"city_spec_cloning", "city_spec_bm_incubator", @@ -74,25 +85,19 @@ public class PlayerCity implements Serializable { "city_spec_industry", "city_spec_doctor", "city_spec_research", - "city_spec_sample_rich", - "city_spec_master_manufacturing", - "city_spec_master_healing", - "city_spec_stronghold"}; - - public static final int BANK = 1; - public static final int CLONING_FACILITY = 2; - public static final int GARAGE = 3; - public static final int MEDIUM_GARDEN = 4; - public static final int LARGE_GARDEN = 5; - public static final int SHUTTLEPORT = 6; + "city_spec_sample_rich"}; + + public static final int[] citizensPerRank = new int[] { 5, 10, 15, 30, 40 }; private String cityName = ""; - private int cityID = -1; + private int planetId; + private long cityHallId = 0; + private long cityID = -1; private Point3D cityCenterPosition = new Point3D(0,0,0); - private int cityRadius = 0; - private int cityRank = 0; - private int specialization = -1; + private int cityRadius = 150; + private int cityRank = 1; + private int specialization = 0; private long mayorID = 0L; private int cityTreasury = 0; private int maintenanceFee = 0; @@ -109,36 +114,50 @@ public class PlayerCity implements Serializable { private boolean shuttlePort = false; private boolean registered = false; private boolean zoningEnabled = false; - - //private final long cityUpdateSpan = 7*86400*1000; - private final long cityUpdateSpan = 100*1000; - - //private final long legislationPeriod = 21*86400*1000; - private final long legislationPeriod = 100*1000; + private boolean electionLocked = false; // election is locked in third and final week + private transient CollidableCircle area; + private long cityNameChangeCooldown; + private long cityTreasuryWithdrawalCooldown; + + //public static final long cityUpdateSpan = 7*86400*1000; + public static final long cityUpdateSpan = 100*1000; + //public static final long cityUpdateSpan = 86400*1000; + public static final long newCityGraceSpan = 100*1000; + + //public static final long legislationPeriod = 21*86400*1000; + public static final long legislationPeriod = 100*1000; private Vector placedStructures = new Vector(); private Vector citizens = new Vector(); - private Vector electionCandidates = new Vector(); - private Vector electionVotes = new Vector(); + private Map electionList = new ConcurrentHashMap(); + private Map mayoralVotes = new ConcurrentHashMap(); // Key = voter id Value = candidate id private Vector cityBanList = new Vector(); private Vector militiaList = new Vector(); private Vector foundersList = new Vector(); - public PlayerCity(){} + public PlayerCity() {} - public PlayerCity(CreatureObject founder, int cityID){ - - setCityCenterPosition(founder.getPosition()); - setCityRadius(150); + public PlayerCity(CreatureObject founder, long cityId, BuildingObject cityHall) { + setCityCenterPosition(cityHall.getPosition()); + setCityHallId(cityHall.getObjectID()); setFoundationTime(System.currentTimeMillis()); setMaintenanceFee(1); setNextCityUpdate(foundationTime+cityUpdateSpan); setNextElectionDate(foundationTime+legislationPeriod); - citizens.add(founder.getObjectID()); - this.cityID = cityID; + this.cityID = cityId; setMayorID(founder.getObjectID()); + setPlanetId(cityHall.getPlanetId()); + init(); } + public void init() { + area = new CollidableCircle(getCityCenterPosition(), cityRadius, NGECore.getInstance().terrainService.getPlanetByID(planetId)); + area.getEventBus().subscribe(this); + NGECore.getInstance().simulationService.addCollidable(area, area.getCenter().x, area.getCenter().z); + if(isRegistered()) + NGECore.getInstance().mapService.addLocation(NGECore.getInstance().terrainService.getPlanetByID(planetId), getCityName(), area.getCenter().x, area.getCenter().z, (byte) 17, (byte) 0, (byte) 0); + } + public void handleGrantZoning() { } @@ -151,86 +170,45 @@ public class PlayerCity implements Serializable { } + public int getCivicStructuresCount() { + return (int) placedStructures.stream(). + map(NGECore.getInstance().objectService::getObject). + filter(o -> o.getAttachment("civicStructureType") != null && (int) o.getAttachment("civicStructureType") > 0). + count(); + } + public void processElection() { // ToDo: handle everything long winnerID = mayorID; mayorID = winnerID; - electionVotes.clear(); - electionCandidates.clear(); - electionCandidates.add(mayorID); setNextElectionDate(System.currentTimeMillis()+legislationPeriod); } public void processCityUpdate() { // has something changed? - System.out.println("processCityUpdate"); + System.out.println("processCityUpdate for " + cityName); + + fixupCitizens(); int censusResult = citizens.size(); int currentRank = getRank(); - switch (currentRank) { - case NEWCITY : if (censusResult>=5){ - setRank(++currentRank); // Expand to Outpost - sendCityExpandMailAll(); - } - - if (censusResult<5){ - // kill city - } - break; - - case OUTPOST : if (censusResult>=10){ - setRank(++currentRank); // Expand to Village - sendCityExpandMailAll(); - } - if (censusResult<5){ - setRank(--currentRank); // Contract to Deserted - sendCityContractMailAll(); - } - break; - - case VILLAGE : if (censusResult>=15){ - setRank(++currentRank); // Expand to Township - sendCityExpandMailAll(); - } - if (censusResult<10){ - setRank(--currentRank); // Contract to Outpost - sendCityContractMailAll(); - } - break; - - case TOWNSHIP : if (censusResult>=30){ - setRank(++currentRank); // Expand to City - sendCityExpandMailAll(); - } - if (censusResult<15){ - setRank(--currentRank); // Contract to Village - sendCityContractMailAll(); - } - break; - - case CITY : if (censusResult>=40){ - setRank(++currentRank); // Expand to Metropolis - sendCityExpandMailAll(); - } - if (censusResult<15){ - setRank(--currentRank); // Contract to Township - sendCityContractMailAll(); - } - break; - - case METROPOLIS : if (censusResult<40){ - setRank(--currentRank); // Contract to City - sendCityContractMailAll(); - } - break; - - + int minCitizen = citizensPerRank[currentRank - 1]; + + if(censusResult < minCitizen) { + contractCity(); + } else { + if(getRank() != METROPOLIS && citizensPerRank[currentRank] <= censusResult) + expandCity(); } + NGECore core = NGECore.getInstance(); // collect taxes - for (long citizen : citizens){ - CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); - + if(core.objectService.getObject(cityHallId) == null) + return; + for (long citizen : citizens) { + CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen); + if(citizenObject == null) + continue; // ToDo: Handle tax evaders etc. int incomeTax = getIncomeTax(); citizenObject.setBankCredits(citizenObject.getBankCredits()-incomeTax); @@ -244,15 +222,159 @@ public class PlayerCity implements Serializable { } citizenObject.setBankCredits(citizenObject.getBankCredits()-cumulatedPropertyTax); + if(core.objectService.getObject(citizen) == null) + core.objectService.persistObject(citizen, citizenObject, core.getSWGObjectODB()); cityTreasury += cumulatedPropertyTax; } - demolishHighRankStructures(); + calculateAndPayMaintenance(); + core.playerCityService.schedulePlayerCityUpdate(this, cityUpdateSpan); setNextCityUpdate(System.currentTimeMillis()+cityUpdateSpan); } - public void cityFixUp(){ + public void contractCity() { + NGECore core = NGECore.getInstance(); + int newRank = getRank() - 1; + CreatureObject mayor = core.objectService.getObject(getMayorID()) == null ? core.objectService.getCreatureFromDB(getMayorID()) : (CreatureObject) core.objectService.getObject(getMayorID()); + if(mayor == null) + return; + + if(newRank < 1) { + core.housingService.destroyStructure((BuildingObject) core.objectService.getObject(cityHallId)); + return; + } + if(newRank < 3 && isRegistered()) { + setRegistered(false); + core.mapService.removeLocation(core.terrainService.getPlanetByID(planetId), getCityCenterPosition().x, getCityCenterPosition().z, (byte) 17); + } + setRank(newRank); + demolishCivicStructuresOutsideRadius(); + demolishHighRankStructures(); + sendCityContractMail(); + fixupCitizens(); + } + + private void demolishCivicStructuresOutsideRadius() { + NGECore core = NGECore.getInstance(); + List remove = new ArrayList(); + placedStructures.stream().map(core.objectService::getObject) + .filter(o -> o.getAttachment("isCivicStructure") != null && (boolean) o.getAttachment("isCivicStructure")) + .filter(o -> !area.doesCollide(o)).forEach(remove::add); + remove.forEach(b -> core.housingService.destroyStructure((BuildingObject) b)); + } + + public void expandCity() { + + NGECore core = NGECore.getInstance(); + CreatureObject mayor = core.objectService.getObject(getMayorID()) == null ? core.objectService.getCreatureFromDB(getMayorID()) : (CreatureObject) core.objectService.getObject(getMayorID()); + if(mayor == null) + return; + + if(getRank() == METROPOLIS) + return; + + int newRank = getRank() + 1; + boolean rankCapped = core.playerCityService.isRankCapped(core.terrainService.getPlanetByID(planetId), newRank); + sendCityExpandMail(rankCapped); + + if(!rankCapped) { + setRank(newRank); + addNewStructures(); + fixupCitizens(); + } + + } + + private void addNewStructures() { + NGECore core = NGECore.getInstance(); + List objects = core.simulationService.get(core.terrainService.getPlanetByID(planetId), area.getCenter().x, area.getCenter().z, 500); + objects.stream().filter(o -> o instanceof BuildingObject && o.getAttachment("structureOwner") != null && area.doesCollide(o)).map(SWGObject::getObjectID).forEach(this::addNewStructure); + } + + // cleanup in case something went wrong + public void fixupCitizens() { + List residents = new ArrayList(); + List added = new ArrayList(); + List removed = new ArrayList(); + // TODO: add extra mail for deleted characters + + NGECore core = NGECore.getInstance(); + CreatureObject mayor = core.objectService.getObject(getMayorID()) == null ? core.objectService.getCreatureFromDB(getMayorID()) : (CreatureObject) core.objectService.getObject(getMayorID()); + if(mayor == null) + return; + + for (long structureID : new Vector(placedStructures)) { + BuildingObject structure = (BuildingObject) NGECore.getInstance().objectService.getObject(structureID); + if(structure == null) + return; + if(structure.getResidency()) + residents.add((Long) structure.getAttachment("structureOwner")); + } + for(long citizenId : new Vector(citizens)) { + if(!residents.contains(citizenId)) { + removeCitizen(citizenId, false); + CreatureObject citizenObject = core.objectService.getObject(citizenId) == null ? core.objectService.getCreatureFromDB(citizenId) : (CreatureObject) core.objectService.getObject(citizenId); + if(citizenObject != null) + removed.add(citizenObject); + } + } + for(long residentId : residents) { + if(!citizens.contains(residentId)) { + addCitizen(residentId, false); + CreatureObject citizenObject = core.objectService.getObject(residentId) == null ? core.objectService.getCreatureFromDB(residentId) : (CreatureObject) core.objectService.getObject(residentId); + if(citizenObject != null) + added.add(citizenObject); + } + } + + String addTT = ""; + for(CreatureObject addedCitizen : added) { + if(added.indexOf(addedCitizen) == added.size() - 1) + addTT += addedCitizen.getCustomName(); + else + addTT += (addedCitizen.getCustomName() + ", "); + } + + String removedTT = ""; + for(CreatureObject removedCitizen : removed) { + if(removed.indexOf(removedCitizen) == removed.size() - 1) + removedTT += removedCitizen.getCustomName(); + else + removedTT += (removedCitizen.getCustomName() + ", "); + } + + if(added.size() > 0) { + Mail mail = new Mail(); + mail.setMailId(core.chatService.generateMailId()); + mail.setRecieverId(getMayorID()); + mail.setStatus(Mail.NEW); + mail.setTimeStamp((int) (new Date().getTime() / 1000)); + mail.setSubject("@city/city:city_fixup_add_citizens_subject"); + mail.setSenderName("@city/city:new_city_from"); + mail.addProseAttachment(new ProsePackage("@city/city:city_fixup_add_citizens_body", "TT", addTT)); + + core.chatService.storePersistentMessage(mail); + if(mayor.getClient() != null) + core.chatService.sendPersistentMessageHeader(mayor.getClient(), mail); + } + + if(removed.size() > 0) { + Mail mail = new Mail(); + mail.setMailId(core.chatService.generateMailId()); + mail.setRecieverId(getMayorID()); + mail.setStatus(Mail.NEW); + mail.setTimeStamp((int) (new Date().getTime() / 1000)); + mail.setSubject("@city/city:city_fixup_remove_citizens_subject"); + mail.setSenderName("@city/city:new_city_from"); + mail.addProseAttachment(new ProsePackage("@city/city:city_fixup_remove_citizens_body", "TT", removedTT)); + + core.chatService.storePersistentMessage(mail); + if(mayor.getClient() != null) + core.chatService.sendPersistentMessageHeader(mayor.getClient(), mail); + } + + } public void demolishHighRankStructures() { @@ -260,38 +382,18 @@ public class PlayerCity implements Serializable { // that require a higher rank than the current one synchronized(placedStructures){ Vector wreckingBall = new Vector(); - for (long structureID : placedStructures){ + for (long structureID : placedStructures) { SWGObject structure = NGECore.getInstance().objectService.getObject(structureID); - int structureCode = (int) structure.getAttachment("CityStructureCode"); - - if (structureCode==BANK && cityRank<2){ + if(structure.getAttachment("civicStructureType") == null || (int) structure.getAttachment("civicStructureType") == 0) + return; + int structureCode = (int) structure.getAttachment("civicStructureType"); + if(getRank() < CivicStructures.rankRequired[structureCode - 1]) wreckingBall.add(structure); - } - - if (structureCode==CLONING_FACILITY && cityRank<3){ - wreckingBall.add(structure); - } - - if (structureCode==GARAGE && cityRank<2){ - wreckingBall.add(structure); - } - - if (structureCode==MEDIUM_GARDEN && cityRank<2){ - wreckingBall.add(structure); - } - - if (structureCode==LARGE_GARDEN && cityRank<3){ - wreckingBall.add(structure); - } - - if (structureCode==SHUTTLEPORT && cityRank<4){ - wreckingBall.add(structure); - } } for (SWGObject wreck : wreckingBall){ placedStructures.remove(wreck.getObjectID()); - NGECore.getInstance().objectService.destroyObject(wreck.getObjectID()); + NGECore.getInstance().housingService.destroyStructure((BuildingObject) wreck); } } } @@ -301,21 +403,108 @@ public class PlayerCity implements Serializable { Vector founders = getFoundersList(); Vector citizenList = getCitizens(); int founderCitizenCount = 0; + NGECore core = NGECore.getInstance(); for (long founderId : founders){ - CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(founderId); + CreatureObject citizenObject = core.objectService.getObject(founderId) == null ? core.objectService.getCreatureFromDB(founderId) : (CreatureObject) core.objectService.getObject(founderId); + if(citizenObject == null) + continue; if (citizenList.contains(founderId) && (long)citizenObject.getAttachment("residentCity")==this.getCityID()) founderCitizenCount++; } if (founderCitizenCount==founders.size()){ return true; // All founders are citizens now - } return false; } - public void calculateMaintenance() { + public void calculateAndPayMaintenance() { + NGECore core = NGECore.getInstance(); + // 1. Pay City Hall Maintenance + int maintAmount = 0; + BuildingObject cityHall = (BuildingObject) core.objectService.getObject(cityHallId); + int cityHallMaintenance = 1000 + getRank() * 2500; + if(registered) + cityHallMaintenance += 5000; + cityHallMaintenance += getSpecializationMaintenance(); + maintAmount += deductCivicStructureMaintenance(cityHall, cityHallMaintenance); + for(long placedStructures : new Vector(placedStructures)) { + BuildingObject building = (BuildingObject) core.objectService.getObject(placedStructures); + if(building != null) + maintAmount += deductCivicStructureMaintenance(building, building.getBMR()); + } + + sendMaintenanceMail(maintAmount); + } + + private int getSpecializationMaintenance() { + + switch(specialization) { + + case CLONE_LAB: + return 80000; + case DNA_LABORATORY: + return 200000; + case ENCORE_PERFORMANCE: + return 200000; + case ENTERTAINMENT_DISTRICT: + return 80000; + case IMPROVED_JOB_MARKET: + return 80000; + case MANUFACTURING_CENTER: + return 50000; + case MEDICAL_CENTER: + return 80000; + case RESEARCH_CENTER: + return 125000; + case SAMPLE_RICH: + return 70000; + default: + return 0; + } + + } + + private int deductCivicStructureMaintenance(BuildingObject civicStructure, int amount) { + int maintOwed = civicStructure.getOutstandingMaintenance(); + int amountPaid = 0; + if(amount > cityTreasury) { + int decay = civicStructure.getConditionDamage(); + int amountToPay = amount - cityTreasury; + int nextDecay = (int) (amountToPay / amount * civicStructure.getMaximumCondition() * 0.25f); + civicStructure.setOutstandingMaintenance(maintOwed - amountToPay); + civicStructure.setConditionDamage(decay + nextDecay); + amountPaid = cityTreasury; + cityTreasury = 0; + sendStructureDecayMail(civicStructure, amount); + } else { + cityTreasury -= amount; + amountPaid = amount; + if(maintOwed > 0) { + if(maintOwed > cityTreasury) { + amountPaid = cityTreasury; + int decay = civicStructure.getConditionDamage(); + if(decay > 0) { + civicStructure.setConditionDamage(cityTreasury / (maintOwed / decay)); + civicStructure.setOutstandingMaintenance(maintOwed - cityTreasury); + cityTreasury = 0; + } + } else { + amountPaid += maintOwed; + civicStructure.setOutstandingMaintenance(0); + cityTreasury -= maintOwed; + civicStructure.setConditionDamage(0); + } + sendStructureDecayRepairMail(civicStructure); + } + } + if(civicStructure.getConditionDamage() >= civicStructure.getMaximumCondition()) { + placedStructures.remove(civicStructure); + NGECore.getInstance().housingService.destroyStructure(civicStructure); + sendStructureDecayDestroyMail(civicStructure); + } + return amountPaid; } public void handleBanRequest() { @@ -332,6 +521,21 @@ public class PlayerCity implements Serializable { public void setRank(int cityRank) { this.cityRank = cityRank; + switch(cityRank) { + + case OUTPOST: + setCityRadius(150); + case VILLAGE: + setCityRadius(200); + case TOWNSHIP: + setCityRadius(300); + case CITY: + setCityRadius(400); + case METROPOLIS: + setCityRadius(450); + default: + setCityRadius(150); + } } public int getSpecialization() { @@ -351,11 +555,11 @@ public class PlayerCity implements Serializable { this.mayorID = mayorID; } - public int getCityTreasury() { + public synchronized int getCityTreasury() { return cityTreasury; } - public void setCityTreasury(int cityTreasury) { + public synchronized void setCityTreasury(int cityTreasury) { this.cityTreasury = cityTreasury; } @@ -406,19 +610,44 @@ public class PlayerCity implements Serializable { } public void addCitizen(long citizen) { - synchronized(citizens){ - this.citizens.add(citizen); - } - CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); - sendNewCitizenMailAll(citizenObject); - sendNewCitizenMail(citizenObject); + addCitizen(citizen, true); } public void removeCitizen(long citizen) { - synchronized(citizens){ - this.citizens.remove(citizen); + removeCitizen(citizen, true); + } + + public void addCitizen(long citizen, boolean sendMail) { + citizens.add(citizen); + NGECore core = NGECore.getInstance(); + CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen); + if(citizenObject == null) + return; + if(sendMail) { + sendNewCitizenMailAll(citizenObject); + sendNewCitizenMail(citizenObject); } } + + public void removeCitizen(long citizen, boolean sendMail) { + citizens.remove(citizen); + removeMilitia(citizen); + NGECore core = NGECore.getInstance(); + CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen); + if(citizenObject == null) + return; + if(sendMail) { + sendCitizenLeftMailAll(citizenObject); + } + } + + public void addMilitia(long militiaId) { + militiaList.add(militiaId); + } + + public void removeMilitia(long militiaId) { + militiaList.remove(militiaId); + } public long getNextElectionDate() { return nextElectionDate; @@ -428,14 +657,6 @@ public class PlayerCity implements Serializable { this.nextElectionDate = nextElectionDate; } - public Vector getElectionCandidates() { - return electionCandidates; - } - - public void setElectionCandidates(Vector electionCandidates) { - this.electionCandidates = electionCandidates; - } - public long getNextCityUpdate() { return nextCityUpdate; } @@ -452,27 +673,14 @@ public class PlayerCity implements Serializable { this.cityBanList = cityBanList; } - public Vector getElectionVotes() { - return electionVotes; - } - - public void addToElectionVotes(byte vote) { - electionVotes.add(vote); - } - - public void addToTreasury(int amountToAdd) { + public synchronized void addToTreasury(int amountToAdd) { cityTreasury += amountToAdd; } - public void removeFromTreasury(int amountToDeduct) { + public synchronized void removeFromTreasury(int amountToDeduct) { cityTreasury -= amountToDeduct; } - // Stalinesque method :D - public void setElectionVotes(Vector electionVotes) { - this.electionVotes = electionVotes; - } - public Point3D getCityCenterPosition() { return cityCenterPosition; } @@ -487,6 +695,7 @@ public class PlayerCity implements Serializable { public void setCityRadius(int cityRadius) { this.cityRadius = cityRadius; + area.setRadius(cityRadius); } public Vector getMilitiaList() { @@ -531,11 +740,11 @@ public class PlayerCity implements Serializable { return; } - public int getCityID() { + public long getCityID() { return cityID; } - public void setCityID(int cityID) { + public void setCityID(long cityID) { this.cityID = cityID; } @@ -610,13 +819,6 @@ public class PlayerCity implements Serializable { return false; } - public boolean hasCitizen(long actor){ - if (getCitizens().contains(actor)) - return true; - - return false; - } - public static String[] getSpecialisationSTFNames() { return specialisationSTFNames; } @@ -629,8 +831,11 @@ public class PlayerCity implements Serializable { // city_version_update_subject_4 // city_version_update_body_4 Vector citizenList = getCitizens(); + NGECore core = NGECore.getInstance(); for (long citizen : citizenList){ -// CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); + CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen); + if(citizenObject == null) + continue; Mail actorMail = new Mail(); actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); actorMail.setRecieverId(citizen); @@ -638,24 +843,24 @@ public class PlayerCity implements Serializable { actorMail.setTimeStamp((int) (new Date().getTime() / 1000)); actorMail.setMessage("@city/city:city_version_update_body_4"); actorMail.setSubject("@city/city:city_version_update_subject_4"); - actorMail.setSenderName("City " + this.cityName); - -// List attachments = new ArrayList(); -// WaypointAttachment attachment = new WaypointAttachment(); -// attachment.active = false; -// attachments.add(attachment); -// attachment.cellID = constructionWaypoint.getCellId(); -// attachment.color = (byte)1; -// attachment.name = "City"; -// attachment.planetCRC = engine.resources.common.CRC.StringtoCRC(citizenObject.getPlanet().getName()); -// attachment.positionX = object.getPosition().x; -// attachment.positionY = 0; -// attachment.positionZ = object.getPosition().z; -// actorMail.setAttachments(attachments); + actorMail.setSenderName("City: " + this.cityName); + /* + List attachments = new ArrayList(); + WaypointAttachment attachment = new WaypointAttachment(); + attachment.active = false; + attachments.add(attachment); + attachment.cellID = 0; + attachment.color = (byte)1; + attachment.name = "City"; + attachment.planetCRC = engine.resources.common.CRC.StringtoCRC(citizenObject.getPlanet().getName()); + attachment.positionX = object.getPosition().x; + attachment.positionY = 0; + attachment.positionZ = object.getPosition().z; + actorMail.setWaypointAttachments(attachments);*/ NGECore.getInstance().chatService.storePersistentMessage(actorMail); -// if (newCitizen.getClient()!=null) -// NGECore.getInstance().chatService.sendPersistentMessageHeader(newCitizen.getClient(), actorMail); + if (citizenObject.getClient()!=null) + NGECore.getInstance().chatService.sendPersistentMessageHeader(citizenObject.getClient(), actorMail); } } @@ -667,30 +872,19 @@ public class PlayerCity implements Serializable { public void sendNewCitizenMailAll(CreatureObject newCitizen) { Vector citizenList = getCitizens(); + NGECore core = NGECore.getInstance(); for (long citizen : citizenList){ - CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); + CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen); + if(citizenObject == null) + continue; Mail actorMail = new Mail(); actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); actorMail.setRecieverId(citizen); actorMail.setStatus(Mail.NEW); actorMail.setTimeStamp((int) (new Date().getTime() / 1000)); - actorMail.setMessage("@city/city:new_city_citizen_body"); actorMail.setSubject("@city/city:new_city_citizen_subject"); actorMail.setSenderName("City " + this.cityName); - - List attachments = new ArrayList(); - WaypointObject constructionWaypoint = (WaypointObject)NGECore.getInstance().objectService.createObject("object/waypoint/shared_world_waypoint_blue.iff", citizenObject.getPlanet(), citizenObject.getPosition().x, 0 ,citizenObject.getPosition().z); - WaypointAttachment attachment = new WaypointAttachment(); - attachment.active = false; - attachment.cellID = constructionWaypoint.getCellId(); - attachment.color = (byte)1; - attachment.name = "City"; - attachment.planetCRC = engine.resources.common.CRC.StringtoCRC(citizenObject.getPlanet().getName()); - attachment.positionX = citizenObject.getPosition().x; - attachment.positionY = 0; - attachment.positionZ = citizenObject.getPosition().z; - attachments.add(attachment); - actorMail.setWaypointAttachments(attachments); + actorMail.addProseAttachment(new ProsePackage("@city/city:new_city_citizen_body", "TO", newCitizen.getCustomName())); NGECore.getInstance().chatService.storePersistentMessage(actorMail); if (newCitizen.getClient()!=null) @@ -699,134 +893,94 @@ public class PlayerCity implements Serializable { } } - public void sendNewCitizenMail(CreatureObject citizen) { + public void sendNewCitizenMail(CreatureObject citizen) { + + NGECore core = NGECore.getInstance(); + CreatureObject mayor = core.objectService.getObject(getMayorID()) == null ? core.objectService.getCreatureFromDB(getMayorID()) : (CreatureObject) core.objectService.getObject(getMayorID()); + if(mayor == null) + return; Mail actorMail = new Mail(); - actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); + actorMail.setMailId(core.chatService.generateMailId()); actorMail.setRecieverId(citizen.getObjectID()); actorMail.setStatus(Mail.NEW); actorMail.setTimeStamp((int) (new Date().getTime() / 1000)); - actorMail.setMessage("@city/city:new_city_citizen_other_body"); actorMail.setSubject("@city/city:new_city_citizen_other_subject"); actorMail.setSenderName("City " + this.cityName); - - List attachments = new ArrayList(); - WaypointObject constructionWaypoint = (WaypointObject)NGECore.getInstance().objectService.createObject("object/waypoint/shared_world_waypoint_blue.iff", citizen.getPlanet(), citizen.getPosition().x, 0 ,citizen.getPosition().z); - WaypointAttachment attachment = new WaypointAttachment(); - attachment.active = false; - attachment.cellID = constructionWaypoint.getCellId(); - attachment.color = (byte)1; - attachment.name = "City"; - attachment.planetCRC = engine.resources.common.CRC.StringtoCRC(citizen.getPlanet().getName()); - attachment.positionX = citizen.getPosition().x; - attachment.positionY = 0; - attachment.positionZ = citizen.getPosition().z; - attachments.add(attachment); - actorMail.setWaypointAttachments(attachments); - - - NGECore.getInstance().chatService.storePersistentMessage(actorMail); - NGECore.getInstance().chatService.sendPersistentMessageHeader(citizen.getClient(), actorMail); + actorMail.addProseAttachment(new ProsePackage("@city/city:new_city_citizen_other_body", "TT", mayor.getCustomName(), "TU", cityName)); + + core.chatService.storePersistentMessage(actorMail); + if (citizen.getClient()!=null) + core.chatService.sendPersistentMessageHeader(citizen.getClient(), actorMail); } public void sendCitizenLeftMailAll(CreatureObject newCitizen) { Vector citizenList = getCitizens(); + NGECore core = NGECore.getInstance(); for (long citizen : citizenList){ - CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); + CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen); + if(citizenObject == null) + continue; Mail actorMail = new Mail(); actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); actorMail.setRecieverId(citizen); actorMail.setStatus(Mail.NEW); actorMail.setTimeStamp((int) (new Date().getTime() / 1000)); - actorMail.setMessage("@city/city:lost_citizen_body"); actorMail.setSubject("@city/city:lost_citizen_subject"); actorMail.setSenderName("City " + this.cityName); - - List attachments = new ArrayList(); - WaypointObject constructionWaypoint = (WaypointObject)NGECore.getInstance().objectService.createObject("object/waypoint/shared_world_waypoint_blue.iff", citizenObject.getPlanet(), citizenObject.getPosition().x, 0 ,citizenObject.getPosition().z); - WaypointAttachment attachment = new WaypointAttachment(); - attachment.active = false; - attachment.cellID = constructionWaypoint.getCellId(); - attachment.color = (byte)1; - attachment.name = "City"; - attachment.planetCRC = engine.resources.common.CRC.StringtoCRC(citizenObject.getPlanet().getName()); - attachment.positionX = citizenObject.getPosition().x; - attachment.positionY = 0; - attachment.positionZ = citizenObject.getPosition().z; - attachments.add(attachment); - actorMail.setWaypointAttachments(attachments); - + actorMail.addProseAttachment(new ProsePackage("@city/city:lost_citizen_body", "TO", newCitizen.getCustomName())); + NGECore.getInstance().chatService.storePersistentMessage(actorMail); - if (newCitizen.getClient()!=null) - NGECore.getInstance().chatService.sendPersistentMessageHeader(newCitizen.getClient(), actorMail); + if (citizenObject.getClient()!=null) + NGECore.getInstance().chatService.sendPersistentMessageHeader(citizenObject.getClient(), actorMail); } } - public void sendCityExpandMailAll() { + public void sendCityExpandMail(boolean rankCapped) { - Vector citizenList = getCitizens(); - for (long citizen : citizenList){ - CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); - Mail actorMail = new Mail(); - actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); - actorMail.setRecieverId(citizen); - actorMail.setStatus(Mail.NEW); - actorMail.setTimeStamp((int) (new Date().getTime() / 1000)); - actorMail.setMessage("@city/city:city_expand_body"); - actorMail.setSubject("@city/city:city_expand_subject"); - actorMail.setSenderName("City " + this.cityName); - - List attachments = new ArrayList(); - WaypointObject constructionWaypoint = (WaypointObject)NGECore.getInstance().objectService.createObject("object/waypoint/shared_world_waypoint_blue.iff", citizenObject.getPlanet(), citizenObject.getPosition().x, 0 ,citizenObject.getPosition().z); - WaypointAttachment attachment = new WaypointAttachment(); - attachment.active = false; - attachment.cellID = constructionWaypoint.getCellId(); - attachment.color = (byte)1; - attachment.name = "City"; - attachment.planetCRC = engine.resources.common.CRC.StringtoCRC(citizenObject.getPlanet().getName()); - attachment.positionX = citizenObject.getPosition().x; - attachment.positionY = 0; - attachment.positionZ = citizenObject.getPosition().z; - attachments.add(attachment); - actorMail.setWaypointAttachments(attachments); - - NGECore.getInstance().chatService.storePersistentMessage(actorMail); - - } + NGECore core = NGECore.getInstance(); + CreatureObject mayor = core.objectService.getObject(getMayorID()) == null ? core.objectService.getCreatureFromDB(getMayorID()) : (CreatureObject) core.objectService.getObject(getMayorID()); + if(mayor == null) + return; + Mail mail = new Mail(); + mail.setMailId(NGECore.getInstance().chatService.generateMailId()); + mail.setRecieverId(getMayorID()); + mail.setStatus(Mail.NEW); + mail.setTimeStamp((int) (new Date().getTime() / 1000)); + mail.setSenderName("@city/city:new_city_from"); + if(rankCapped) { + mail.setSubject("@city/city:city_expand_cap_subject"); + mail.addProseAttachment(new ProsePackage("@city/city:city_expand_cap_body", "TO", cityName, cityRank + 1)); + } else { + mail.setSubject("@city/city:city_expand_subject"); + mail.addProseAttachment(new ProsePackage("@city/city:city_expand_body", "TO", cityName, cityRank)); + } + core.chatService.storePersistentMessage(mail); + if(mayor.getClient() != null) + core.chatService.sendPersistentMessageHeader(mayor.getClient(), mail); } - public void sendCityContractMailAll() { + public void sendCityContractMail() { + + NGECore core = NGECore.getInstance(); + CreatureObject mayor = core.objectService.getObject(getMayorID()) == null ? core.objectService.getCreatureFromDB(getMayorID()) : (CreatureObject) core.objectService.getObject(getMayorID()); + if(mayor == null) + return; + Mail mail = new Mail(); + mail.setMailId(NGECore.getInstance().chatService.generateMailId()); + mail.setRecieverId(getMayorID()); + mail.setStatus(Mail.NEW); + mail.setTimeStamp((int) (new Date().getTime() / 1000)); + mail.setSubject("@city/city:city_contract_subject"); + mail.setSenderName("@city/city:new_city_from"); + mail.addProseAttachment(new ProsePackage("@city/city:city_contract_body", "TO", cityName, cityRank)); + + core.chatService.storePersistentMessage(mail); + if(mayor.getClient() != null) + core.chatService.sendPersistentMessageHeader(mayor.getClient(), mail); - Vector citizenList = getCitizens(); - for (long citizen : citizenList){ - CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); - Mail actorMail = new Mail(); - actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); - actorMail.setRecieverId(citizen); - actorMail.setStatus(Mail.NEW); - actorMail.setTimeStamp((int) (new Date().getTime() / 1000)); - actorMail.setMessage("@city/city:city_contract_body"); - actorMail.setSubject("@city/city:city_contract_subject"); - actorMail.setSenderName("City " + this.cityName); - - List attachments = new ArrayList(); - WaypointObject constructionWaypoint = (WaypointObject)NGECore.getInstance().objectService.createObject("object/waypoint/shared_world_waypoint_blue.iff", citizenObject.getPlanet(), citizenObject.getPosition().x, 0 ,citizenObject.getPosition().z); - WaypointAttachment attachment = new WaypointAttachment(); - attachment.active = false; - attachment.cellID = constructionWaypoint.getCellId(); - attachment.color = (byte)1; - attachment.name = "City"; - attachment.planetCRC = engine.resources.common.CRC.StringtoCRC(citizenObject.getPlanet().getName()); - attachment.positionX = citizenObject.getPosition().x; - attachment.positionY = 0; - attachment.positionZ = citizenObject.getPosition().z; - attachments.add(attachment); - actorMail.setWaypointAttachments(attachments); - - NGECore.getInstance().chatService.storePersistentMessage(actorMail); - } } @@ -854,4 +1008,332 @@ public class PlayerCity implements Serializable { } } } + + public void removeStructure(long objectID) { + placedStructures.remove(objectID); + } + + public CollidableCircle getArea() { + return area; + } + + public void setArea(CollidableCircle area) { + this.area = area; + } + + public long getCityHallId() { + return cityHallId; + } + + public void setCityHallId(long cityHallId) { + this.cityHallId = cityHallId; + } + + public String getSpecialisationStfValue() { + if(specialization == 0) + return ""; + try { + StfTable stf = new StfTable("clientdata/string/en/city/city.stf"); + + for (int s = 1; s < stf.getRowCount(); s++) { + String stfKey = stf.getStringById(s).getKey(); + + if (stfKey != null && stfKey != "" && stfKey.equals(specialisationSTFNames[specialization - 1])) { + return stf.getStringById(s).getValue(); + } + } + + } catch (Exception e) { + e.printStackTrace(); + } + return ""; + } + + public String getCityRankStfValue() { + try { + StfTable stf = new StfTable("clientdata/string/en/city/city.stf"); + + for (int s = 1; s < stf.getRowCount(); s++) { + String stfKey = stf.getStringById(s).getKey(); + + if (stfKey != null && stfKey != "" && stfKey.equals("rank" + String.valueOf(cityRank))) { + return stf.getStringById(s).getValue(); + } + } + + } catch (Exception e) { + e.printStackTrace(); + } + return ""; + } + + + @Handler + public void onEnter(EnterEvent event) { + SWGObject object = event.object; + + if(object == null || !(object instanceof CreatureObject)) + return; + + String rank = getCityRankStfValue(); + String specialisation = getSpecialisationStfValue(); + if(specialisation.length() == 0) + ((CreatureObject) object).sendSystemMessage(OutOfBand.ProsePackage("@city/city:city_enter_city", "TT", getCityName(), "TO", rank), (byte) 0); + else + ((CreatureObject) object).sendSystemMessage(OutOfBand.ProsePackage("@city/city:city_enter_city", "TT", getCityName(), "TO", rank + ", " + specialisation), (byte) 0); + + // TODO: apply specialisation skill mods + } + + @Handler + public void onExit(ExitEvent event) { + SWGObject object = event.object; + + if(object == null || !(object instanceof CreatureObject)) + return; + + ((CreatureObject) object).sendSystemMessage(OutOfBand.ProsePackage("@city/city:city_leave_city", "TO", getCityName()), (byte) 0); + + // TODO: remove specialisation skill mods + + } + private void sendMaintenanceMail(int amount) { + NGECore core = NGECore.getInstance(); + CreatureObject mayor = core.objectService.getObject(getMayorID()) == null ? core.objectService.getCreatureFromDB(getMayorID()) : (CreatureObject) core.objectService.getObject(getMayorID()); + if(mayor == null) + return; + Mail mail = new Mail(); + mail.setMailId(NGECore.getInstance().chatService.generateMailId()); + mail.setRecieverId(getMayorID()); + mail.setStatus(Mail.NEW); + mail.setTimeStamp((int) (new Date().getTime() / 1000)); + mail.setSubject("@city/city:city_maint_subject"); + mail.setSenderName("@city/city:treasury_withdraw_from"); + mail.addProseAttachment(new ProsePackage("@city/city:city_maint_body", "TO", mayor.getObjectID(), amount)); + + core.chatService.storePersistentMessage(mail); + if(mayor.getClient() != null) + core.chatService.sendPersistentMessageHeader(mayor.getClient(), mail); + + } + + + private void sendStructureDecayRepairMail(BuildingObject building) { + NGECore core = NGECore.getInstance(); + CreatureObject mayor = core.objectService.getObject(getMayorID()) == null ? core.objectService.getCreatureFromDB(getMayorID()) : (CreatureObject) core.objectService.getObject(getMayorID()); + if(mayor == null) + return; + Mail mail = new Mail(); + mail.setMailId(NGECore.getInstance().chatService.generateMailId()); + mail.setRecieverId(getMayorID()); + mail.setStatus(Mail.NEW); + mail.setTimeStamp((int) (new Date().getTime() / 1000)); + mail.setSubject("@city/city:structure_repaired_subject"); + mail.setSenderName("@city/city:treasury_withdraw_from"); + mail.addProseAttachment(new ProsePackage("@city/city:structure_repaired_body", "TO", mayor.getObjectID(), "TT", building.getLookAtText())); + + core.chatService.storePersistentMessage(mail); + if(mayor.getClient() != null) + core.chatService.sendPersistentMessageHeader(mayor.getClient(), mail); + + } + + private void sendStructureDecayMail(BuildingObject building, int amount) { + NGECore core = NGECore.getInstance(); + CreatureObject mayor = core.objectService.getObject(getMayorID()) == null ? core.objectService.getCreatureFromDB(getMayorID()) : (CreatureObject) core.objectService.getObject(getMayorID()); + if(mayor == null) + return; + Mail mail = new Mail(); + mail.setMailId(NGECore.getInstance().chatService.generateMailId()); + mail.setRecieverId(getMayorID()); + mail.setStatus(Mail.NEW); + mail.setTimeStamp((int) (new Date().getTime() / 1000)); + mail.setSubject("@city/city:structure_damaged_subject"); + mail.setSenderName("@city/city:treasury_withdraw_from"); + mail.addProseAttachment(new ProsePackage("@city/city:structure_damaged_body", "TO", mayor.getObjectID(), "TT", building.getObjectName().getString(), amount)); + + core.chatService.storePersistentMessage(mail); + if(mayor.getClient() != null) + core.chatService.sendPersistentMessageHeader(mayor.getClient(), mail); + + } + + + private void sendStructureDecayDestroyMail(BuildingObject building) { + NGECore core = NGECore.getInstance(); + CreatureObject mayor = core.objectService.getObject(getMayorID()) == null ? core.objectService.getCreatureFromDB(getMayorID()) : (CreatureObject) core.objectService.getObject(getMayorID()); + if(mayor == null) + return; + Mail mail = new Mail(); + mail.setMailId(NGECore.getInstance().chatService.generateMailId()); + mail.setRecieverId(getMayorID()); + mail.setStatus(Mail.NEW); + mail.setTimeStamp((int) (new Date().getTime() / 1000)); + mail.setSubject("@city/city:structure_destroyed_maint_subject"); + mail.setSenderName("@city/city:treasury_withdraw_from"); + mail.addProseAttachment(new ProsePackage("@city/city:structure_destroyed_maint_body", "TO", mayor.getObjectID(), "TT", building.getObjectName().getString())); + + core.chatService.storePersistentMessage(mail); + if(mayor.getClient() != null) + core.chatService.sendPersistentMessageHeader(mayor.getClient(), mail); + + } + + public int getPlanetId() { + return planetId; + } + + public void setPlanetId(int planetId) { + this.planetId = planetId; + } + + public Map getElectionList() { + return electionList; + } + + public void setElectionList(Map electionList) { + this.electionList = electionList; + } + + public int getReqCitizenCountForRank(int rank) { + return citizensPerRank[rank - 1]; + } + + public long getCityNameChangeCooldown() { + return cityNameChangeCooldown; + } + + public void setCityNameChangeCooldown(long cityNameChangeCooldown) { + this.cityNameChangeCooldown = cityNameChangeCooldown; + } + + public long getCityTreasuryWithdrawalCooldown() { + return cityTreasuryWithdrawalCooldown; + } + + public void setCityTreasuryWithdrawalCooldown(long cityTreasuryWithdrawalCooldown) { + this.cityTreasuryWithdrawalCooldown = cityTreasuryWithdrawalCooldown; + } + + public void sendTreasuryWithdrawalMail(CreatureObject mayor, int amount, String reason) { + Vector citizenList = getCitizens(); + NGECore core = NGECore.getInstance(); + for (long citizen : citizenList){ + CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen); + if(citizenObject == null) + continue; + Mail actorMail = new Mail(); + actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); + actorMail.setRecieverId(citizen); + actorMail.setStatus(Mail.NEW); + actorMail.setTimeStamp((int) (new Date().getTime() / 1000)); + actorMail.setSubject("@city/city:treasury_withdraw_subject"); + actorMail.setSenderName("@city/city:treasury_withdraw_from"); + actorMail.addProseAttachment(new ProsePackage("@city/city:treasury_withdraw_body", "TO", mayor.getCustomName(), "TT", reason, amount)); + + NGECore.getInstance().chatService.storePersistentMessage(actorMail); + if (citizenObject.getClient() != null) + NGECore.getInstance().chatService.sendPersistentMessageHeader(citizenObject.getClient(), actorMail); + + } + + } + + public void sendTreasuryDepositMail(CreatureObject actor, int amount) { + NGECore core = NGECore.getInstance(); + CreatureObject mayor = core.objectService.getObject(getMayorID()) == null ? core.objectService.getCreatureFromDB(getMayorID()) : (CreatureObject) core.objectService.getObject(getMayorID()); + if(mayor == null) + return; + Mail mail = new Mail(); + mail.setMailId(NGECore.getInstance().chatService.generateMailId()); + mail.setRecieverId(getMayorID()); + mail.setStatus(Mail.NEW); + mail.setTimeStamp((int) (new Date().getTime() / 1000)); + mail.setSubject("@city/city:treasury_deposit_subject"); + mail.setSenderName("@city/city:treasury_deposit_from"); + mail.addProseAttachment(new ProsePackage("@city/city:treasury_deposit_body", "TO", actor.getCustomName(), amount)); + + core.chatService.storePersistentMessage(mail); + if(mayor.getClient() != null) + core.chatService.sendPersistentMessageHeader(mayor.getClient(), mail); + } + + public boolean isCitizen(long citizenId) { + return getCitizens().contains(citizenId); + } + + public boolean isCandidate(long candidateId) { + return electionList.containsKey(candidateId); + } + + public void castVote(CreatureObject actor, CreatureObject candidate) { + if(mayoralVotes.get(actor.getObjectID()) == candidate.getObjectID()) + return; + if(mayoralVotes.containsKey(actor.getObjectID()) && electionList.containsKey(mayoralVotes.get(actor.getObjectID()))) + electionList.put(mayoralVotes.get(actor.getObjectID()), electionList.get(mayoralVotes.get(actor.getObjectID())) - 1); + mayoralVotes.put(actor.getObjectID(), candidate.getObjectID()); + electionList.put(candidate.getObjectID(), electionList.get(candidate.getObjectID()) + 1); + } + + public boolean isElectionLocked() { + return electionLocked; + } + + public void setElectionLocked(boolean electionLocked) { + this.electionLocked = electionLocked; + } + + public void sendCandidateRegisteredMail(CreatureObject candidate) { + Vector citizenList = getCitizens(); + NGECore core = NGECore.getInstance(); + for (long citizen : citizenList) { + if(citizen == candidate.getObjectID()) + continue; + CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen); + if(citizenObject == null) + continue; + Mail actorMail = new Mail(); + actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); + actorMail.setRecieverId(citizen); + actorMail.setStatus(Mail.NEW); + actorMail.setTimeStamp((int) (new Date().getTime() / 1000)); + actorMail.setSubject("@city/city:registered_citizen_email_subject"); + actorMail.setSenderName("@city/city:new_city_from"); + actorMail.addProseAttachment(new ProsePackage("@city/city:rceb", "TO", candidate.getCustomName())); + + NGECore.getInstance().chatService.storePersistentMessage(actorMail); + if (citizenObject.getClient() != null) + NGECore.getInstance().chatService.sendPersistentMessageHeader(citizenObject.getClient(), actorMail); + + } + + } + + public void sendCandidateUnregisteredMail(CreatureObject candidate) { + Vector citizenList = getCitizens(); + NGECore core = NGECore.getInstance(); + for (long citizen : citizenList) { + if(citizen == candidate.getObjectID()) + continue; + CreatureObject citizenObject = core.objectService.getObject(citizen) == null ? core.objectService.getCreatureFromDB(citizen) : (CreatureObject) core.objectService.getObject(citizen); + if(citizenObject == null) + continue; + Mail actorMail = new Mail(); + actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); + actorMail.setRecieverId(citizen); + actorMail.setStatus(Mail.NEW); + actorMail.setTimeStamp((int) (new Date().getTime() / 1000)); + actorMail.setSubject("@city/city:unregistered_citizen_email_subject"); + actorMail.setSenderName("@city/city:new_city_from"); + actorMail.addProseAttachment(new ProsePackage("@city/city:unregistered_citizen_email_body", "TO", candidate.getCustomName())); + + NGECore.getInstance().chatService.storePersistentMessage(actorMail); + if (citizenObject.getClient() != null) + NGECore.getInstance().chatService.sendPersistentMessageHeader(citizenObject.getClient(), actorMail); + + } + + } + + } diff --git a/src/services/playercities/PlayerCityService.java b/src/services/playercities/PlayerCityService.java index c3ea7fc2..b89faa24 100644 --- a/src/services/playercities/PlayerCityService.java +++ b/src/services/playercities/PlayerCityService.java @@ -22,19 +22,32 @@ package services.playercities; import java.util.Collections; +import java.util.Date; import java.util.Map; +import java.util.Random; +import java.util.TreeMap; import java.util.Vector; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import resources.common.OutOfBand; +import resources.common.ProsePackage; +import resources.datatables.Citizenship; import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; import resources.objects.tangible.TangibleObject; +import services.chat.Mail; +import services.sui.SUIService.InputBoxType; +import services.sui.SUIService.ListBoxType; +import services.sui.SUIService.MessageBoxType; import services.sui.SUIWindow; import services.sui.SUIWindow.SUICallback; import services.sui.SUIWindow.Trigger; +import engine.resources.database.ODBCursor; import engine.resources.objects.SWGObject; +import engine.resources.scene.Planet; import engine.resources.scene.Point3D; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; @@ -48,52 +61,132 @@ public class PlayerCityService implements INetworkDispatch { private NGECore core; private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); - + private Random random = new Random(); private Vector playerCities = new Vector(); private int cityID = 0; // This must be persisted or handled via objectservice somehow - + private Map cityRankCaps = new ConcurrentHashMap(); // static helper variable to be deleted later public static boolean sandboxCityBuilt = false; public PlayerCityService(NGECore core) { this.core = core; - - scheduler.scheduleAtFixedRate(() -> { - administratePlayerCities(); - }, 0, 1, TimeUnit.MINUTES); - } - - public void administratePlayerCities() { - synchronized(playerCities){ - Vector unfoundedCities = new Vector(); - for (PlayerCity city : playerCities){ - - if (city.getNextCityUpdate()<=System.currentTimeMillis()) - city.processCityUpdate(); - - if (city.getNextElectionDate()<=System.currentTimeMillis()) - city.processElection(); - - if (! city.isFounded() && city.getFoundationTime()<=System.currentTimeMillis()-(60*60*24*1000)){ - if (! city.checkFoundationSuccess()) - unfoundedCities.add(city); - } - } - - if (unfoundedCities.size()>0){ - playerCities.removeAll(unfoundedCities); - } - playerCities.removeAll(Collections.singleton(null)); - } } - public PlayerCity addNewPlayerCity(CreatureObject founder) { + public void loadCityRankCaps() { + core.scriptService.callScript("scripts/", "cityRankCaps", "addCityRankCaps", core); + } + + public void addCityRankCap(String planetName, int[] caps) { + cityRankCaps.put(planetName, caps); + } + + public void saveAllCities() { + playerCities.forEach(c -> core.objectService.persistObject(c.getCityID(), c, core.getCityODB())); + } + + public void loadCities() { + ODBCursor cursor = core.getCityODB().getCursor(); + while(cursor.hasNext()) { + PlayerCity city = (PlayerCity) cursor.next(); + if(city == null) + continue; + city.init(); + playerCities.add(city); + if(System.currentTimeMillis() < city.getNextCityUpdate()) + city.processCityUpdate(); + else + schedulePlayerCityUpdate(city, city.getNextCityUpdate() - System.currentTimeMillis()); + } + cursor.close(); + } + + public boolean isRankCapped(Planet planet, int rank) { + if(cityRankCaps.get(planet.getName()) == null) + return true; + int cap = cityRankCaps.get(planet.getName())[rank - 1]; + return playerCities.stream().filter(c -> c.getPlanetId() == planet.getID()).count() >= cap; + } + + private long generateCityId() { + boolean found = false; + long id = 0; + while(!found) { + id = random.nextLong(); + final long cityId = id; + if(!playerCities.stream().filter(c -> c.getCityID() == cityId).findFirst().isPresent()) + found = true; + } + return id; + } + + private boolean doesCityNameExist(String name) { + return playerCities.stream().map(PlayerCity::getCityName).filter(n -> n.equalsIgnoreCase(name)).findFirst().isPresent() || + core.terrainService.getClientRegions().stream().map(ClientRegion::getName).filter(n -> n.equalsIgnoreCase(name)).findFirst().isPresent(); + } + + public void handlePlaceCity(final CreatureObject actor, TangibleObject deed, float positionX, float positionZ, float rotation) { + + if(!canPlacePlayerCityAtPosition(actor, actor.getPlanet(), new Point3D(positionX, 0, positionZ))) + return; + + if(isRankCapped(actor.getPlanet(), PlayerCity.OUTPOST)) { + actor.sendSystemMessage("This Planet can not support any more cities.", (byte) 0); + return; + } + + if(actor.getPlayerObject().getCitizenship() == Citizenship.Mayor) { + actor.sendSystemMessage("@city/city:already_mayor", (byte) 0); + return; + } + + final SUIWindow window = core.suiService.createInputBox(2, "@city/city:city_name_t","@city/city:city_name_d", actor, null, 0); + window.setProperty("txtInput:MaxLength", "40"); + Vector returnList = new Vector(); + returnList.add("txtInput:LocalText"); + window.addHandler(0, "", Trigger.TRIGGER_OK, returnList, new SUICallback() { + @Override + public void process(SWGObject owner, int eventType, Vector returnList) { + if (returnList.size() == 0 || returnList.get(0).length() == 0) + return; + String name = returnList.get(0); + if(!core.characterService.checkName(name, owner.getClient(), true)) { + actor.sendSystemMessage("@player_structure:not_valid_name", (byte) 0); + return; + } + if(doesCityNameExist(name)) { + actor.sendSystemMessage("@player_structure:cityname_not_unique", (byte) 0); + return; + } + + BuildingObject cityHall = core.housingService.placeStructure(actor, deed, positionX, positionZ, rotation); + + if(cityHall == null) { + actor.sendSystemMessage("Error: NULL city hall", (byte) 0); + return; + } + + PlayerCity playerCity = addNewPlayerCity(actor, cityHall); + playerCity.setCityName(name); + playerCity.addNewStructure(cityHall.getObjectID()); + PlayerCityService.this.schedulePlayerCityUpdate(playerCity, PlayerCity.newCityGraceSpan); + cityHall.setAttachment("structureCity", playerCity.getCityID()); + actor.setAttachment("residentCity", playerCity.getCityID()); + core.housingService.declareResidency(actor, cityHall); + core.objectService.persistObject(playerCity.getCityID(), playerCity, core.getCityODB()); + newCitySUI2((CreatureObject) owner, playerCity); + + } + }); + core.suiService.openSUIWindow(window); + + } + + public PlayerCity addNewPlayerCity(CreatureObject founder, BuildingObject cityHall) { PlayerCity newCity = null; synchronized(playerCities){ - newCity = new PlayerCity(founder,cityID++); + newCity = new PlayerCity(founder, generateCityId(), cityHall); playerCities.add(newCity); } - newCitySUI1(founder,newCity); return newCity; } @@ -115,7 +208,7 @@ public class PlayerCityService implements INetworkDispatch { PlayerCity foundCity = null; synchronized(playerCities){ for (PlayerCity city : playerCities){ - int id = (int)citizen.getAttachment("residentCity"); + long id = (long)citizen.getAttachment("residentCity"); if (city.getCityID()==id){ foundCity = city; } @@ -124,7 +217,20 @@ public class PlayerCityService implements INetworkDispatch { return foundCity; } - + public boolean canPlacePlayerCityAtPosition(CreatureObject actor, Planet planet, Point3D position) { + + PlayerCity closest = playerCities.stream().min((c1, c2) -> (int) (c1.getCityCenterPosition().getDistance2D(position) - c2.getCityCenterPosition().getDistance2D(position))).orElse(null); + if(closest != null && closest.getCityCenterPosition().getDistance2D(position) < 1024) { + actor.sendSystemMessage(OutOfBand.ProsePackage("@player_structure:city_too_close", "TO", closest.getCityName()), (byte) 0); + return false; + } + ClientRegion closest2 = core.terrainService.getClientRegionsForPlanet(planet).stream().min((c1, c2) -> (int) (c1.getCenter().getDistance2D(position) - c2.getCenter().getDistance2D(position))).orElse(null); + if(closest2 != null && closest2.getCenter().getDistance2D(position) < 1024) { + actor.sendSystemMessage(OutOfBand.ProsePackage("@player_structure:city_too_close", "TO", closest2.getName()), (byte) 0); + return false; + } + return true; + } public void newCitySUI1(CreatureObject citizen, final PlayerCity newCity) { final SUIWindow window = core.suiService.createInputBox(2,"@city/city:city_name_t","@city/city:city_name_d", citizen, citizen, 0); @@ -185,7 +291,7 @@ public class PlayerCityService implements INetworkDispatch { PlayerCity sandboxCity = null; synchronized(playerCities){ - sandboxCity = new PlayerCity(founder,cityID++); + sandboxCity = new PlayerCity(founder,cityID++, cityHall); sandboxCity.setCityName("Sandbox City"); playerCities.add(sandboxCity); } @@ -268,5 +374,207 @@ public class PlayerCityService implements INetworkDispatch { public void shutdown() { // TODO Auto-generated method stub - } + } + + public void destroyCity(PlayerCity city) { + + CreatureObject mayor = core.objectService.getObject(city.getMayorID()) == null ? core.objectService.getCreatureFromDB(city.getMayorID()) : (CreatureObject) core.objectService.getObject(city.getMayorID()); + if(mayor == null) + return; + + Mail mail = new Mail(); + mail.setMailId(NGECore.getInstance().chatService.generateMailId()); + mail.setRecieverId(city.getMayorID()); + mail.setStatus(Mail.NEW); + mail.setTimeStamp((int) (new Date().getTime() / 1000)); + mail.setSubject("@city/city:new_city_fail_subject"); + mail.setSenderName("@city/city:new_city_from"); + mail.setMessage("@city/city:new_city_fail_body"); + + if(mayor.getClient() != null) + core.chatService.sendPersistentMessageHeader(mayor.getClient(), mail); + core.chatService.storePersistentMessage(mail); + for(long civicStructureId : new Vector(city.getPlacedStructures())) { + BuildingObject civicStructure = (BuildingObject) core.objectService.getObject(civicStructureId); + if(civicStructure == null) + continue; + core.housingService.destroyStructure(civicStructure); + } + core.simulationService.removeCollidable(city.getArea(), city.getArea().getCenter().x, city.getArea().getCenter().z); + playerCities.remove(city); + if(city.isRegistered()) + core.mapService.removeLocation(core.terrainService.getPlanetByID(city.getPlanetId()), city.getCityCenterPosition().x, city.getCityCenterPosition().z, (byte) 17); + core.objectService.deletePersistentObject(city.getCityID(), core.getCityODB()); + + } + + public void schedulePlayerCityUpdate(PlayerCity playerCity, long time) { + scheduler.schedule(() -> { + try { + playerCity.processCityUpdate(); + } catch(Exception e) { + e.printStackTrace(); + } + }, time, TimeUnit.MILLISECONDS); + } + + public void handleCityTreasuryWithdrawal(CreatureObject owner) { + SUIWindow window = core.suiService.createInputBox(InputBoxType.INPUT_BOX_OK_CANCEL, "@city/city:withdraw_reason_t", "@city/city:withdraw_reason_d", owner, null, 0, (actor, eventType, returnList) -> { + String reason = returnList.get(0); + if(reason.length() <= 0) + return; + promptCityTreasuryWithdrawal(owner, reason); + }); + window.setProperty("txtInput:MaxLength", "255"); + core.suiService.openSUIWindow(window); + } + + public void promptCityTreasuryWithdrawal(CreatureObject owner, String reason) { + PlayerCity playerCity = core.playerCityService.getPlayerCity(owner); + SUIWindow window = core.suiService.createSUIWindow("Script.transfer", owner, null, 0); + + window.setProperty("bg.caption.lblTitle:Text", "@city/city:treasury_withdraw_subject"); + window.setProperty("Prompt.lblPrompt:Text", "@city/city:treasury_withdraw_prompt"); + + window.setProperty("msgPayMaintenance", "transaction.txtInputFrom"); + + window.setProperty("transaction.lblFrom:Text", "@city/city:treasury_balance_t"); + window.setProperty("transaction.lblTo:Text", "@city/city:treasury_withdraw"); + window.setProperty("transaction.lblFrom", "@city/city:treasury_balance_t"); + window.setProperty("transaction.lblTo", "@city/city:treasury_withdraw"); + + window.setProperty("transaction.lblStartingFrom:Text", String.valueOf(playerCity.getCityTreasury())); + window.setProperty("transaction.lblStartingTo:Text", "0"); + + window.setProperty("transaction:InputFrom", "555555"); + window.setProperty("transaction:InputTo", "666666"); + + window.setProperty("transaction:txtInputFrom", String.valueOf(playerCity.getCityTreasury())); + window.setProperty("transaction:txtInputTo", "1"); + window.setProperty("transaction.txtInputFrom:Text", String.valueOf(playerCity.getCityTreasury())); + window.setProperty("transaction.txtInputTo:Text", "0"); + + window.setProperty("transaction.ConversionRatioFrom", "1"); + window.setProperty("transaction.ConversionRatioTo", "0"); + + window.setProperty("btnOk:visible", "True"); + window.setProperty("btnCancel:visible", "True"); + window.setProperty("btnOk:Text", "@ok"); + window.setProperty("btnCancel:Text", "@cancel"); + + Vector returnList = new Vector(); + returnList.add("transaction.txtInputFrom:Text"); + returnList.add("transaction.txtInputTo:Text"); + window.addHandler(0, "", Trigger.TRIGGER_OK, returnList, (actor, eventType, inputList) -> { + + if(inputList.size() < 2) + return; + + if(playerCity.getCityTreasury() <= 0) { + owner.sendSystemMessage("@city/city:no_money", (byte) 0); + return; + } + + if(playerCity.getCityTreasuryWithdrawalCooldown() > System.currentTimeMillis()) { + owner.sendSystemMessage("@city/city:withdraw_daily", (byte) 0); + return; + } + + int amount = Integer.parseInt(inputList.get(1)); + + if(amount < 5000 || amount > 150000) { + owner.sendSystemMessage("@city/city:withdraw_limits", (byte) 0); + return; + } + + if(amount > playerCity.getCityTreasury()) { + owner.sendSystemMessage("@city/city:withdraw_treasury_error", (byte) 0); + return; + } + + owner.addBankCredits(amount); + playerCity.removeFromTreasury(amount); + playerCity.setCityTreasuryWithdrawalCooldown(System.currentTimeMillis() + 86400000); // 24 hours + owner.sendSystemMessage(OutOfBand.ProsePackage("@city/city:you_withdraw_from_treasury", amount), (byte) 0); + playerCity.sendTreasuryWithdrawalMail(owner, amount, reason); + + }); + core.suiService.openSUIWindow(window); + + } + + public void handleRemoveMilitia(CreatureObject mayor, long militiaId) { + PlayerCity playerCity = core.playerCityService.getPlayerCity(mayor); + CreatureObject militia = core.objectService.getObject(militiaId) == null ? core.objectService.getCreatureFromDB(militiaId) : (CreatureObject) core.objectService.getObject(militiaId); + if(militia == null) + return; + + SUIWindow window = core.suiService.createMessageBox(MessageBoxType.MESSAGE_BOX_OK_CANCEL, "@city/city:remove_militia_confirm", "@city/city:remove_militia_prefix " + militia.getCustomName() + " @city/city:remove_militia_suffix", mayor, null, 0); + window.addHandler(0, "", Trigger.TRIGGER_OK, new Vector(), (actor, eventType, returnList) -> { + playerCity.removeMilitia(militiaId); + if(militia.getClient() != null) + militia.sendSystemMessage("@city/city:removed_militia_target", (byte) 0); + mayor.sendSystemMessage("@city/city:removed_militia", (byte) 0); + militia.getPlayerObject().setCitizenship(Citizenship.Citizen); + if(core.objectService.getObject(militiaId) == null) + core.objectService.persistObject(militiaId, militia, core.getSWGObjectODB()); + }); + core.suiService.openSUIWindow(window); + } + + public void handleViewStandings(CreatureObject actor, PlayerCity city) { + SUIWindow window = core.suiService.createListBox(ListBoxType.LIST_BOX_OK_CANCEL, "@city/city:mayoral_standings_t", "@city/city:mayoral_standings_d", new TreeMap(), actor, null, 0); + long mayorId = city.getMayorID(); + for(long candidateId : city.getElectionList().keySet()) { + CreatureObject candidate = core.objectService.getObject(candidateId) == null ? core.objectService.getCreatureFromDB(candidateId) : (CreatureObject) core.objectService.getObject(candidateId); + if(candidate == null) + continue; + if(candidateId == mayorId) + window.addListBoxMenuItem("Incumbent: " + candidate.getCustomName() + " -- Votes: " + String.valueOf(city.getElectionList().get(candidateId)), candidateId); + else + window.addListBoxMenuItem("Challenger: " + candidate.getCustomName() + " -- Votes: " + String.valueOf(city.getElectionList().get(candidateId)), candidateId); + } + core.suiService.openSUIWindow(window); + } + + public void handlePromptVote(CreatureObject actor, PlayerCity city) { + + if(!city.isCitizen(actor.getObjectID())) { + actor.sendSystemMessage("@city/city:vote_noncitizen", (byte) 0); + return; + } + + if(city.getElectionList().size() < 1) { + actor.sendSystemMessage("@city/city:no_candidates", (byte) 0); + return; + } + + SUIWindow window = core.suiService.createListBox(ListBoxType.LIST_BOX_OK_CANCEL, "@city/city:mayoral_vote_t", "@city/city:mayoral_vote_d", new TreeMap(), actor, null, 0); + long mayorId = city.getMayorID(); + for(long candidateId : city.getElectionList().keySet()) { + CreatureObject candidate = core.objectService.getObject(candidateId) == null ? core.objectService.getCreatureFromDB(candidateId) : (CreatureObject) core.objectService.getObject(candidateId); + if(candidate == null) + continue; + if(candidateId == mayorId) + window.addListBoxMenuItem(candidate.getCustomName() + " (Incumbent)", candidateId); + else + window.addListBoxMenuItem(candidate.getCustomName() + " (Challenger)", candidateId); + } + Vector returnList = new Vector(); + returnList.add("List.lstList:SelectedRow"); + window.addHandler(0, "", Trigger.TRIGGER_OK, returnList, (owner, eventType, inputList) -> { + + int index = Integer.parseInt(inputList.get(0)); + long candidateId = window.getObjectIdByIndex(index); + CreatureObject candidate = core.objectService.getObject(candidateId) == null ? core.objectService.getCreatureFromDB(candidateId) : (CreatureObject) core.objectService.getObject(candidateId); + if(candidate == null || !city.isCandidate(candidateId)) + return; + city.castVote(actor, candidate); + actor.sendSystemMessage(OutOfBand.ProsePackage("@city/city:vote_placed", "TO", candidate.getCustomName()), (byte) 0); + + }); + + } + + } diff --git a/src/services/resources/HarvesterService.java b/src/services/resources/HarvesterService.java index d9d79383..cd0a1306 100644 --- a/src/services/resources/HarvesterService.java +++ b/src/services/resources/HarvesterService.java @@ -692,45 +692,62 @@ public class HarvesterService implements INetworkDispatch { public void handlePermissionAdmin(CreatureObject owner, TangibleObject target) { - String listName = "ADMIN"; + String listName = "admin"; ((HarvesterObject) target).setPermissionAdmin(listName,owner); } public void handlePermissionHopper(CreatureObject owner, TangibleObject target) { - String listName = "HOPPER"; + String listName = "hopper"; ((HarvesterObject) target).setPermissionHopper(listName,owner); } public void handlePermissionListModify(CreatureObject crafter, SWGObject target, String commandArgs){ String[] commandSplit = commandArgs.split(" "); - if (commandSplit.length==3){ - if (core.characterService.playerExists(commandSplit[2])){ - if (commandSplit[2].equals("ADMIN")){ + if (commandSplit.length >= 3) { + if (core.characterService.playerExists(commandSplit[2])) { + SWGObject obj = core.objectService.getObject(core.characterService.getPlayerOID(commandSplit[2])); + if (commandSplit[2].equals("admin")){ Vector adminList = ((HarvesterObject)target).getAdminList(); if (commandSplit[0].equals("add") && (!adminList.contains(commandSplit[2]))){ crafter.sendSystemMessage(commandSplit[2] + " added as administrator", (byte) 0); adminList.add(commandSplit[2]); ((HarvesterObject)target).setAdminList(adminList); } - if (commandSplit[0].equals("remove") && (adminList.contains(commandSplit[2]))){ + if (commandSplit[0].equals("remove") && (adminList.contains(commandSplit[2]))){ + if(((HarvesterObject)target).getOwner() == obj.getObjectID()) { + crafter.sendSystemMessage("@player_structure:cannot_remove_owner", (byte) 0); + return; + } + if(crafter == obj) { + crafter.sendSystemMessage("@player_structure:cannot_remove_self", (byte) 0); + return; + } crafter.sendSystemMessage(commandSplit[2] + " removed as administrator", (byte) 0); adminList.remove(commandSplit[2]); ((HarvesterObject)target).setAdminList(adminList); } - } - if (commandSplit[2].equals("HOPPER")){ - Vector hopperList = ((HarvesterObject)target).getHopperList(); - if (commandSplit[0].equals("add") && (!hopperList.contains(commandSplit[2]))){ - crafter.sendSystemMessage(commandSplit[2] + " added as administrator", (byte) 0); - hopperList.add(commandSplit[2]); - ((HarvesterObject)target).setHopperList(hopperList); - } - if (commandSplit[0].equals("remove") && (hopperList.contains(commandSplit[2]))){ - crafter.sendSystemMessage(commandSplit[2] + " removed as administrator", (byte) 0); - hopperList.remove(commandSplit[2]); - ((HarvesterObject)target).setHopperList(hopperList); + if (commandSplit[2].equals("hopper")){ + Vector hopperList = ((HarvesterObject)target).getHopperList(); + if (commandSplit[0].equals("add") && (!hopperList.contains(commandSplit[2]))){ + crafter.sendSystemMessage(commandSplit[2] + " added as administrator", (byte) 0); + hopperList.add(commandSplit[2]); + ((HarvesterObject)target).setHopperList(hopperList); + } + if (commandSplit[0].equals("remove") && (hopperList.contains(commandSplit[2]))) { + if(((HarvesterObject)target).getOwner() == obj.getObjectID()) { + crafter.sendSystemMessage("@player_structure:cannot_remove_owner", (byte) 0); + return; + } + if(crafter == obj) { + crafter.sendSystemMessage("@player_structure:cannot_remove_self", (byte) 0); + return; + } + crafter.sendSystemMessage(commandSplit[2] + " removed as administrator", (byte) 0); + hopperList.remove(commandSplit[2]); + ((HarvesterObject)target).setHopperList(hopperList); + } } } } else { @@ -1015,8 +1032,8 @@ public class HarvesterService implements INetworkDispatch { String structureTemplate = (String) object.getAttachment("StructureTemplate"); HarvesterObject harvester = (HarvesterObject) NGECore.getInstance().objectService.createObject(structureTemplate, actor.getPlanet()); Vector adminList = harvester.getAdminList(); - //String[] fullName = ((CreatureObject)actor).getCustomName().split(" "); - adminList.add(actor.getCustomName()); + String[] fullName = ((CreatureObject)actor).getCustomName().split(" "); + adminList.add(fullName[0]); // Set BER and outputhopper capacity here, take it from deed harvester.setBER((int)object.getAttachment("Deed_BER")); harvester.setSpecRate((int)(1.5F*(int)object.getAttachment("Deed_BER"))); diff --git a/src/services/reverseengineering/ReverseEngineeringService.java b/src/services/reverseengineering/ReverseEngineeringService.java new file mode 100644 index 00000000..a3a400e6 --- /dev/null +++ b/src/services/reverseengineering/ReverseEngineeringService.java @@ -0,0 +1,3532 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ +package services.reverseengineering; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Vector; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; + +import resources.datatables.Options; +import resources.objects.creature.CreatureObject; +import resources.objects.player.PlayerObject; +import resources.objects.tangible.TangibleObject; +import services.travel.TravelPoint; +import engine.resources.container.Traverser; +import engine.resources.objects.SWGObject; +import engine.resources.service.INetworkDispatch; +import engine.resources.service.INetworkRemoteEvent; +import main.NGECore; + +/** + * @author Charon + */ + +public class ReverseEngineeringService implements INetworkDispatch { + + private NGECore core; + private ArrayList statNameList = new ArrayList(Arrays.asList("cat_stat_mod_bonus.@stat_n:agility_modified", + "cat_stat_mod_bonus.@stat_n:constitution_modified", + "cat_stat_mod_bonus.@stat_n:precision_modified", + "cat_stat_mod_bonus.@stat_n:stamina_modified", + "cat_stat_mod_bonus.@stat_n:strength_modified", + "cat_stat_mod_bonus.@stat_n:luck_modified" + )); + + private Vector re_Combinations = new Vector(); + private Map skillModMapping = new HashMap(); + + public class RE_Combination{ + private String ingredient1 = ""; + private String ingredient2 = ""; + private String result = ""; + public RE_Combination(String ingredient1, String ingredient2, String result){ + this.ingredient1 = ingredient1; + this.ingredient2 = ingredient2; + this.result = result; + } + public String getIngredient1(){ + return this.ingredient1; + } + public String getIngredient2(){ + return this.ingredient2; + } + public String getResult(){ + return this.result; + } + } + + public ReverseEngineeringService(NGECore core) { + this.core = core; + createReCombinations(); + createMappings(); + } + + public void createReCombinations(){ + re_Combinations.add(new RE_Combination("Launcher Tube","Used Wiring","1-H Light Saber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Unpowered Survey Pad","1-H Light Saber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Wiring (White)","1-H Light Saber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Servo Joint","Mark V Vocab Module","1-H Light Saber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Wiring (Red/Yellow)","1-H Light Saber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Servo Joint","1-H Light Saber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Medical Device","1-H Light Saber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Wiring (Blue)","1-H Light Saber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Wiring (Green)","1-H Light Saber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Wiring (Black)","1-H Light Saber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Unpowered Installation Repair Device","1-H Light Saber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Wiring (Orange)","1-H Light Saber Action Cost (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Medical Console","1-H Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Tranceiver","Used Vidscreen","1-H Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Mark V Vocab Module","1-H Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Shield Module","Tubing","1-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Tubing","1-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("Used Notebook","Servo Joint","1-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Remote Transmitter","1-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Shield Module","1-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Impulse Detector","1-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Shield Module","1-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Used Notebook","1-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("Ledger","Plugged Hydraulics System","1-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Ledger","Tubing","1-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Comlink","Laser Trap","1-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Newsfilter Module","1-H Melee Damage (10)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Used Wiring","2-H Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Wiring (White)","2-H Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Medical Console","Wire Element","2-H Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Wiring (Red/Yellow)","2-H Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Demagnetized Datadisk","2-H Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Software Module","Tranceiver","2-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Power Output Analyzer","2-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("Power Output Device","Servo Joint","2-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Power Output Device","2-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Tranceiver","2-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Servo Joint","2-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Tranceiver","2-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("Medical Console","Vocabulator","2-H Melee Action Cost (10)")); + re_Combinations.add(new RE_Combination("Used Notebook","Droid Motor (Yellow)","2-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Used Notebook","2-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Locomotor","Used Notebook","2-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Motor","Used Notebook","2-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Ledger","Wiring (Black)","2-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Ledger","Wiring (Orange)","2-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Ledger","Used Wiring","2-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Ledger","Wiring (White)","2-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Used Notebook","2-H Melee Critical Chance (14)")); + re_Combinations.add(new RE_Combination("Used Notebook","Droid Motor (Red)","2-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Ledger","Wiring (Red/Yellow)","2-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Ledger","Wiring (Blue)","2-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Ledger","Wiring (Green)","2-H Melee Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Wiring (Orange)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Wiring (Blue)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Wiring (Teal)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Wiring (Green)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Wiring (Red/Yellow)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Control Box","Speederdrive","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Wiring (White)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Wiring (Blue)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Wiring (Green)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Wiring (Purple)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Wiring (Red/Yellow)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Datapad","Launcher Tube","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Wiring (Teal)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Wiring (Black)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Used Wiring","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Wiring (Orange)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Used Wiring","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Wiring (White)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Wiring (Blue)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Wiring (Green)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Control Box","Hyperdrive Unit","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Wiring (Black)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Wiring (Orange)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Wiring (Purple)","2-H Melee Damage (14)")); + re_Combinations.add(new RE_Combination("Shield Module","Frequency Jamming Wired","Advanced Component Experimentation (4)")); + re_Combinations.add(new RE_Combination("Shield Module","Wire Element","Advanced Component Experimentation (4)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Wire Element","Advanced Component Experimentation (4)")); + re_Combinations.add(new RE_Combination("Software Module","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Survival Gear","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Mark VII Vocabulation Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Datapad","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Ledger","Canceled Travel Ticket","Agility (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Droid Battery (Black/Green)","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Used ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Power Output Analyzer","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Power Output Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Rapid Program Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Software Module","Mark V Vocab Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Rations Kit","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Weak Droid Battery","Agility (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Weak Droid Battery","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Wire Element","Agility (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Control Box","Launcher Tube","Agility (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Launcher Tube","Agility (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Software Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Used Wiring","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Software Module","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Tubing","Canceled Travel Ticket","Agility (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Medical Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Droid Battery (Black/Green)","Agility (1)")); + re_Combinations.add(new RE_Combination("Canceled Travel Ticket","Frequency Jamming Wired","Agility (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Used ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Outdated Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Used Notebook","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Power Output Analyzer","Agility (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Used Vidscreen","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Rapid Program Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Control Box","Rations Kit","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","A Damaged Droid Power Cell","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","A Damaged Droid Power Cell","Agility (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Rations Kit","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Weak Droid Battery","Agility (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Tubing","Agility (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Shield Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Shield Module","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Launcher Tube","Agility (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","A Small Mining Tool","Agility (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Software Module","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Canceled Travel Ticket","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Medical Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Used ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Datapad","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Used Notebook","Agility (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Canceled Travel Ticket","Agility (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Medical Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Droid Battery (Black/Green)","Agility (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Outdated Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Droid Battery (Black/Green)","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Outdated Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Outdated Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Used ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Power Output Analyzer","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Power Output Analyzer","Agility (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Differential Regulator","Agility (1)")); + re_Combinations.add(new RE_Combination("Aeromagnifier","Differential Regulator","Agility (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Used Notebook","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Power Output Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Power Output Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Used Vidscreen","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Chassis Blueprints","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Control Box","Agility (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Rations Kit","Agility (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Weak Droid Battery","Agility (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Weak Droid Battery","Agility (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("Software Module","Tubing","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","A Small Mining Tool","Agility (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Launcher Tube","Agility (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","A Small Mining Tool","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Ledger","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Servo Joint","Used Wiring","Agility (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Medical Device","Agility (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Medical Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Droid Battery (Black/Green)","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Outdated Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Droid Battery (Black/Green)","Agility (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Outdated Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Droid Battery (Black/Green)","Agility (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Outdated Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Used ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Power Output Analyzer","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Power Output Analyzer","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Used Vidscreen","Agility (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Used Vidscreen","Agility (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Mark V Vocab Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Differential Regulator","Mark V Vocab Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","A Damaged Droid Swivel Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Remote Transmitter","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Weak Droid Battery","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Shield Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Impulse Detector","Agility (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Launcher Tube","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Ledger","Agility (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Ledger","Agility (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Software Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Software Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Software Module","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Survival Gear","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Mark VII Vocabulation Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Datapad","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Ledger","Canceled Travel Ticket","Agility (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Droid Battery (Black/Green)","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Used ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Power Output Analyzer","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Power Output Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Rapid Program Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Software Module","Mark V Vocab Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Rations Kit","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Weak Droid Battery","Agility (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Weak Droid Battery","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Wire Element","Agility (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Control Box","Launcher Tube","Agility (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Launcher Tube","Agility (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Software Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Used Wiring","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Software Module","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Tubing","Canceled Travel Ticket","Agility (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Medical Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Droid Battery (Black/Green)","Agility (1)")); + re_Combinations.add(new RE_Combination("Canceled Travel Ticket","Frequency Jamming Wired","Agility (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Used ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Outdated Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Used Notebook","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Power Output Analyzer","Agility (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Used Vidscreen","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Rapid Program Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Control Box","Rations Kit","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","A Damaged Droid Power Cell","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","A Damaged Droid Power Cell","Agility (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Rations Kit","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Weak Droid Battery","Agility (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Tubing","Agility (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Shield Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Shield Module","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Launcher Tube","Agility (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","A Small Mining Tool","Agility (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Software Module","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Canceled Travel Ticket","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Medical Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Unpowered Memory Encryptor","Agility (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Used ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Datapad","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Used Notebook","Agility (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("Ledger","Differential Regulator","Agility (1)")); + re_Combinations.add(new RE_Combination("Servo Joint","Differential Regulator","Agility (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Used Notebook","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Power Output Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Rapid Program Module","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Mark V Vocab Module","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Collapsed Artifact","Agility (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Comlink","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Weak Droid Battery","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Droid Battery (Teal)","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Wire Element","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Tubing","Agility (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Tubing","Agility (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Impulse Detector","Agility (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","A Small Mining Tool","Agility (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","A Small Mining Tool","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Used Wiring","Agility (1)")); + re_Combinations.add(new RE_Combination("Datapad","Servo Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Newsfilter Module","Canceled Travel Ticket","Agility (1)")); + re_Combinations.add(new RE_Combination("Datapad","Medical Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Control Box","Used ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Datapad","Outdated Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Used ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Ledger","Used ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Used ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Plugged Hydraulics System","Agility (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Power Output Analyzer","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Power Output Analyzer","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Power Output Device","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Power Output Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Power Output Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Used Vidscreen","Agility (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Used Vidscreen","Agility (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Rations Kit","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","A Damaged Droid Swivel Joint","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Remote Transmitter","Agility (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Remote Transmitter","Agility (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Droid Battery (Purple/Green)","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Wire Element","Agility (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Wire Element","Agility (1)")); + re_Combinations.add(new RE_Combination("Datapad","Explosive Dud","Agility (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Wire Element","Agility (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("Ledger","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Self Analysis Circuit","Agility (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Tubing","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","ID Chip","Agility (1)")); + re_Combinations.add(new RE_Combination("Comlink","Impulse Detector","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Launcher Tube","Agility (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","A Small Mining Tool","Agility (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Unpowered Installation Repair Device","Agility (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Aeromagnifier","Agility (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Shield Module","Armor Assembly (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Mark V Circuit Board","Armor Assembly (3)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Shield Module","Armor Assembly (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Mark I Circuit Board","Armor Assembly (3)")); + re_Combinations.add(new RE_Combination("Shield Module","Mark V Vocab Module","Armor Assembly (3)")); + re_Combinations.add(new RE_Combination("Circuit Board","A Damaged Droid Swivel Joint","Armor Assembly (3)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Wire Element","Armor Experimentation (4)")); + re_Combinations.add(new RE_Combination("Restraining Device","Power Supply","Armor Experimentation (4)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Self Analysis Circuit","Artisan Assembly (3)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Demagnetized Datadisk","Artisan Assembly (3)")); + re_Combinations.add(new RE_Combination("Circuit Board","Explosive Dud","Artisan Assembly (3)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Used Notebook","Artisan Assembly (3)")); + re_Combinations.add(new RE_Combination("Circuit Board","Demagnetized Datadisk","Artisan Assembly (3)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Mark V Circuit Board","Artisan Assembly (3)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Unpowered Survey Pad","Artisan Assembly (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Worklight","Artisan Assembly (3)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Demagnetized Datadisk","Artisan Assembly (3)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Mark I Circuit Board","Artisan Assembly (3)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Unpowered Survey Pad","Artisan Assembly (3)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Outdated Aeromagnifier","Artisan Experimentation (4)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Aeromagnifier","Artisan Experimentation (4)")); + re_Combinations.add(new RE_Combination("Locomotor","Unpowered Survey Pad","Assassinate Action Cost (9)")); + re_Combinations.add(new RE_Combination("Motor","Unpowered Survey Pad","Assassinate Action Cost (9)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Survival Gear","Assassinate Action Cost (10)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Unpowered Survey Pad","Assassinate Action Cost (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Unpowered Survey Pad","Assassinate Action Cost (8)")); + re_Combinations.add(new RE_Combination("Unpowered Survey Pad","Droid Motor (Yellow)","Assassinate Action Cost (8)")); + re_Combinations.add(new RE_Combination("Shield Module","Survival Gear","Assassinate Action Cost (10)")); + re_Combinations.add(new RE_Combination("Medical Console","Droid Motor (Yellow)","Assassinate Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Laser Trap","Droid Motor (Red)","Assassinate Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Laser Trap","Assassinate Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Ledger","Mark X Vocab Module","Assassinate Critical Chance (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Medical Console","Assassinate Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Medical Console","Droid Motor (Red)","Assassinate Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Laser Trap","Unpowered Survey Pad","Assassinate Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Laser Trap","Motor","Assassinate Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Laser Trap","Locomotor","Assassinate Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Motor","Rations Kit","Assassinate Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Survival Gear","Assassinate Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Motor","Assassinate Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Locomotor","Rations Kit","Assassinate Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Explosive Dud","Assassinate Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Explosive Dud","Assassinate Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Locomotor","Assassinate Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Power Output Device","Survival Gear","Assassinate Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Rations Kit","Assassinate Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Droid Motor (Red)","Assassinate Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Unpowered Survey Pad","Assault Action Cost (8)")); + re_Combinations.add(new RE_Combination("Laser Trap","Droid Motor (Yellow)","Assault Critical Chance (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Laser Trap","Assault Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Power Output Analyzer","Assault Damage (8)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Power Output Device","Assault Damage (8)")); + re_Combinations.add(new RE_Combination("Rations Kit","Droid Motor (Red)","Assault Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Vocabulator","Assault Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Rations Kit","Assault Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Vocabulator","Assault Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Software Module","Vocabulator","Assault Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Rations Kit","Droid Motor (Yellow)","Assault Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Shield Module","Used ID Chip","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Power Output Analyzer","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Power Output Device","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("Wire Element","Wiring (Black)","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("Wire Element","Wiring (Orange)","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","ID Chip","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("Wire Element","Used Wiring","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Used ID Chip","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("Wire Element","Wiring (White)","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("Wire Element","Wiring (Purple)","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("ID Chip","Shield Module","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("Frequency Jamming Wired","Wiring (Teal)","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("Wire Element","Wiring (Red/Yellow)","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("Wire Element","Wiring (Blue)","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("Wire Element","Wiring (Green)","Bleed Resistance (4)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Power Supply","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Droid Motor (Yellow)","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("ID Chip","Motor","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("ID Chip","Locomotor","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("ID Chip","Droid Motor (Yellow)","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("Locomotor","Used ID Chip","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("Motor","Used ID Chip","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Vocabulator","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","ID Chip","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","ID Chip","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("ID Chip","Droid Motor (Red)","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Used ID Chip","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Used ID Chip","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Droid Motor (Red)","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("Unpowered Survey Pad","Used Vidscreen","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("Power Supply","Tubing","Bleeding Absorption (4)")); + re_Combinations.add(new RE_Combination("Data Housing","Droid Motor (Red)","Booster Assembly (3)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Data Housing","Booster Assembly (3)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Tranceiver","Booster Assembly (3)")); + re_Combinations.add(new RE_Combination("Data Housing","Motor","Booster Assembly (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Data Housing","Booster Assembly (3)")); + re_Combinations.add(new RE_Combination("Data Housing","Locomotor","Booster Assembly (3)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Power Supply","Booster Assembly (3)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Tranceiver","Booster Assembly (3)")); + re_Combinations.add(new RE_Combination("Data Housing","Droid Motor (Yellow)","Booster Assembly (3)")); + re_Combinations.add(new RE_Combination("Control Box","Wiring (Orange)","Booster Experimentation (4)")); + re_Combinations.add(new RE_Combination("Medical Console","Unpowered Installation Repair Device","Booster Experimentation (4)")); + re_Combinations.add(new RE_Combination("Control Box","Wiring (Purple)","Booster Experimentation (4)")); + re_Combinations.add(new RE_Combination("Control Box","Wiring (Green)","Booster Experimentation (4)")); + re_Combinations.add(new RE_Combination("Restraining Device","Shield Module","Booster Experimentation (4)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Restraining Device","Booster Experimentation (4)")); + re_Combinations.add(new RE_Combination("Control Box","Wiring (Red/Yellow)","Booster Experimentation (4)")); + re_Combinations.add(new RE_Combination("Control Box","Wiring (Blue)","Booster Experimentation (4)")); + re_Combinations.add(new RE_Combination("Medical Console","A Small Mining Tool","Booster Experimentation (4)")); + re_Combinations.add(new RE_Combination("Control Box","Used Wiring","Booster Experimentation (4)")); + re_Combinations.add(new RE_Combination("Control Box","Wiring (White)","Booster Experimentation (4)")); + re_Combinations.add(new RE_Combination("Control Box","Wiring (Black)","Booster Experimentation (4)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Servo Joint","Camouflage (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Medical Device","Camouflage (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Droid Memory Module","Carbine Action Cost (10)")); + re_Combinations.add(new RE_Combination("Survival Gear","Circuit","Carbine Action Cost (14)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Rapid Program Module","Carbine Damage (14)")); + re_Combinations.add(new RE_Combination("Circuit Board","Electronics Module","Carbine Damage (14)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","A Damaged Droid Power Cell","Carbine Damage (14)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Datapad","Carbine Damage (14)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Unpowered Memory Encryptor","Chassis Assembly (3)")); + re_Combinations.add(new RE_Combination("Shield Module","Unpowered Memory Encryptor","Chassis Assembly (3)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Remote Transmitter","Chassis Experimentation (4)")); + re_Combinations.add(new RE_Combination("Software Module","Circuit","Chassis Experimentation (4)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Circuit","Chassis Experimentation (4)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Magseal Detector","Chassis Experimentation (4)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Circuit","Chassis Experimentation (4)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Tubing","Chassis Experimentation (4)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Frequency Jamming Wired","Clothing Assembly (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Vocabulator","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Droid Motor (Red)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Locomotor","Weak Droid Battery","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Motor","Weak Droid Battery","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Droid Battery (Teal)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Wire Element","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Power Supply","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Droid Motor (Red)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Motor","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Frequency Jamming Wired","Clothing Assembly (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Plugged Hydraulics System","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Droid Battery (Purple/Green)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Wire Element","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Locomotor","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Droid Battery (Black/Green)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("ID Chip","Power Supply","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Droid Motor (Yellow)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Weak Droid Battery","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Droid Battery (Black/Green)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Motor","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Droid Battery (Black/Green)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Locomotor","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Droid Motor (Red)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Tubing","Frequency Jamming Wired","Clothing Assembly (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Droid Battery (Teal)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Wire Element","Tubing","Clothing Assembly (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Droid Battery (Black/Green)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Motor","Droid Battery (Black/Green)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Weak Droid Battery","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Droid Battery (Purple/Green)","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Tubing","Clothing Assembly (3)")); + re_Combinations.add(new RE_Combination("Medical Device","Droid Memory Module","Clothing Experimentation (4)")); + re_Combinations.add(new RE_Combination("Servo Joint","Circuit","Clothing Experimentation (4)")); + re_Combinations.add(new RE_Combination("Comlink","Unpowered Survey Pad","Clothing Experimentation (4)")); + re_Combinations.add(new RE_Combination("Medical Device","Circuit","Clothing Experimentation (4)")); + re_Combinations.add(new RE_Combination("Servo Joint","Droid Memory Module","Clothing Experimentation (4)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Medical Console","Constitution (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Droid Battery (Black/Green)","Constitution (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("Servo Joint","Droid Battery (Black/Green)","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Plugged Hydraulics System","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Power Output Analyzer","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Differential Regulator","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Power Output Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Power Output Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Circuit Board","Constitution (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Comlink","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Remote Transmitter","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Emergency Reactivator","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Wire Element","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Wire Element","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Self Analysis Circuit","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Shield Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Black/Green)","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Shield Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","A Small Mining Tool","Constitution (1)")); + re_Combinations.add(new RE_Combination("Comlink","Launcher Tube","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Software Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Ledger","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Control Box","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Ledger","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Medical Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Outdated Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Plugged Hydraulics System","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Used Notebook","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Power Output Analyzer","Constitution (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Differential Regulator","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Power Output Analyzer","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Mark V Vocab Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Rapid Program Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Aeromagnifier","Mark V Vocab Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","A Damaged Droid Memory Unit","Constitution (1)")); + re_Combinations.add(new RE_Combination("Comlink","Rations Kit","Constitution (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Rations Kit","Constitution (1)")); + re_Combinations.add(new RE_Combination("Control Box","A Damaged Droid Power Cell","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Remote Transmitter","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Droid Battery (Teal)","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Explosive Dud","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Wire Element","Constitution (1)")); + re_Combinations.add(new RE_Combination("Datapad","Self Analysis Circuit","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Software Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Software Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Mark V Circuit Board","Constitution (1)")); + re_Combinations.add(new RE_Combination("Comlink","Survival Gear","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Mark V Circuit Board","Constitution (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Survival Gear","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Mark VII Vocabulation Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Wire Element","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Medical Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Droid Battery (Black/Green)","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Outdated Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Power Output Analyzer","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Differential Regulator","Constitution (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Power Output Analyzer","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Power Output Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Power Output Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Used Vidscreen","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Rations Kit","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Rations Kit","Constitution (1)")); + re_Combinations.add(new RE_Combination("Comlink","Datapad","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Remote Transmitter","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Droid Battery (Purple/Green)","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Wire Element","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Self Analysis Circuit","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Explosive Dud","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Mark I Circuit Board","Constitution (1)")); + re_Combinations.add(new RE_Combination("Wire Element","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Comlink","Mark V Circuit Board","Constitution (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Mark V Circuit Board","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Medical Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Plugged Hydraulics System","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Used Notebook","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Used Vidscreen","Constitution (1)")); + re_Combinations.add(new RE_Combination("Control Box","Power Output Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Ledger","Power Output Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Mark V Vocab Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Used Notebook","Mark V Vocab Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Rapid Program Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Rations Kit","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Weak Droid Battery","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Weak Droid Battery","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Remote Transmitter","Constitution (1)")); + re_Combinations.add(new RE_Combination("Comlink","Self Analysis Circuit","Constitution (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Self Analysis Circuit","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Self Analysis Circuit","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","A Small Mining Tool","Constitution (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Mark I Circuit Board","Constitution (1)")); + re_Combinations.add(new RE_Combination("Servo Joint","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Medical Console","Constitution (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Medical Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Droid Battery (Black/Green)","Constitution (1)")); + re_Combinations.add(new RE_Combination("Comlink","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Differential Regulator","Constitution (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Power Output Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Used Vidscreen","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Datapad","Constitution (1)")); + re_Combinations.add(new RE_Combination("Control Box","Explosive Dud","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Explosive Dud","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Wire Element","Constitution (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Shield Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Shield Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Comlink","A Small Mining Tool","Constitution (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","A Small Mining Tool","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","A Small Mining Tool","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Unpowered Installation Repair Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Comlink","Mark I Circuit Board","Constitution (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Mark I Circuit Board","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Survival Gear","Constitution (1)")); + re_Combinations.add(new RE_Combination("Control Box","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Ledger","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Medical Console","Constitution (1)")); + re_Combinations.add(new RE_Combination("Control Box","Medical Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Ledger","Medical Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Frequency Jamming Wired","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Droid Battery (Black/Green)","Constitution (1)")); + re_Combinations.add(new RE_Combination("Control Box","Outdated Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Droid Battery (Black/Green)","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Outdated Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("Ledger","Outdated Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Outdated Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Software Module","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Plugged Hydraulics System","Constitution (1)")); + re_Combinations.add(new RE_Combination("Comlink","Differential Regulator","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Used Notebook","Constitution (1)")); + re_Combinations.add(new RE_Combination("Control Box","Power Output Analyzer","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Used Notebook","Constitution (1)")); + re_Combinations.add(new RE_Combination("Unpowered Installation Repair Device","Differential Regulator","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Power Output Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Comlink","Used Vidscreen","Constitution (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Used Vidscreen","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Used Vidscreen","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Rapid Program Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Rapid Program Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Rations Kit","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Weak Droid Battery","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Remote Transmitter","Constitution (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Explosive Dud","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Explosive Dud","Constitution (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Wire Element","Constitution (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Self Analysis Circuit","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Shield Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Launcher Tube","Constitution (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Launcher Tube","Constitution (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","A Small Mining Tool","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Ledger","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Mark VII Vocabulation Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Medical Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Outdated Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Outdated Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Used ID Chip","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Plugged Hydraulics System","Constitution (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Plugged Hydraulics System","Constitution (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Power Output Analyzer","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Differential Regulator","Constitution (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Differential Regulator","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Used Notebook","Constitution (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Used Vidscreen","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Comlink","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Rapid Program Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Rations Kit","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Rations Kit","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Weak Droid Battery","Constitution (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Weak Droid Battery","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Explosive Dud","Constitution (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Shield Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Launcher Tube","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Launcher Tube","Constitution (1)")); + re_Combinations.add(new RE_Combination("Control Box","Demagnetized Datadisk","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Mark VII Vocabulation Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Medical Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Outdated Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Plugged Hydraulics System","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Power Output Analyzer","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Differential Regulator","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Power Output Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Power Output Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Differential Regulator","Constitution (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Differential Regulator","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Used Notebook","Constitution (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Used Vidscreen","Constitution (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Comlink","Constitution (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Rapid Program Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Rations Kit","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Rations Kit","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Weak Droid Battery","Constitution (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Weak Droid Battery","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Explosive Dud","Constitution (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Tubing","Constitution (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Shield Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Launcher Tube","Constitution (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Launcher Tube","Constitution (1)")); + re_Combinations.add(new RE_Combination("Control Box","Demagnetized Datadisk","Constitution (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Mark VII Vocabulation Module","Constitution (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Servo Joint","Constitution (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Medical Device","Constitution (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Unpowered Memory Encryptor","Constitution (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Outdated Aeromagnifier","Constitution (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Shield Module","Creature Critical Chance (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Rations Kit","Creature Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Data Housing","Wire Element","Dance Prop Assembly (3)")); + re_Combinations.add(new RE_Combination("Survival Gear","Worklight","Dance Prop Assembly (3)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","A Damaged Droid Swivel Joint","Dancing Enhancement (3)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Shield Module","Dancing Enhancement (3)")); + re_Combinations.add(new RE_Combination("Datapad","ID Chip","Dancing Enhancement (3)")); + re_Combinations.add(new RE_Combination("Datapad","Used ID Chip","Dancing Enhancement (3)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Shield Module","Dancing Enhancement (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Rapid Program Module","Dancing Enhancement (3)")); + re_Combinations.add(new RE_Combination("Tranceiver","Demagnetized Datadisk","Dancing Enhancement (3)")); + re_Combinations.add(new RE_Combination("Control Box","Self Analysis Circuit","Dancing Enhancement (3)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Medical Console","Dancing Enhancement (3)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Remote Transmitter","Dancing Knowledge (3)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Impulse Detector","Dancing Knowledge (3)")); + re_Combinations.add(new RE_Combination("Data Housing","Emergency Reactivator","Dancing Knowledge (3)")); + re_Combinations.add(new RE_Combination("Wire Element","Demagnetized Datadisk","Dancing Knowledge (3)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Remote Transmitter","Disease Absorption (4)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Impulse Detector","Disease Absorption (4)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Tubing","Disease Absorption (4)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Wire Element","Droid Assembly (3)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Wire Element","Droid Assembly (3)")); + re_Combinations.add(new RE_Combination("Comlink","Unpowered Memory Encryptor","Droid Assembly (3)")); + re_Combinations.add(new RE_Combination("Medical Device","Plugged Hydraulics System","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Tubing","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Power Output Device","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Power Output Device","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Servo Joint","Tubing","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Power Output Analyzer","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Power Output Analyzer","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Locomotor","Power Output Analyzer","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Motor","Power Output Analyzer","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Servo Joint","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Power Output Device","Droid Motor (Yellow)","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Locomotor","Power Output Device","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Motor","Power Output Device","Droid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Data Housing","Droid Battery (Purple/Green)","Droid Experimentation (4)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Worklight","Droid Experimentation (4)")); + re_Combinations.add(new RE_Combination("Data Housing","Weak Droid Battery","Droid Experimentation (4)")); + re_Combinations.add(new RE_Combination("Data Housing","Droid Battery (Black/Green)","Droid Experimentation (4)")); + re_Combinations.add(new RE_Combination("Data Housing","Droid Battery (Teal)","Droid Experimentation (4)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Demagnetized Datadisk","Droid Experimentation (4)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Worklight","Droid Speed (3)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Worklight","Droid Speed (3)")); + re_Combinations.add(new RE_Combination("Battery","Holorecorder","Droid Speed (10)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Worklight","Droid Speed (3)")); + re_Combinations.add(new RE_Combination("Worklight","Droid Battery (Black/Green)","Droid Speed (3)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Wire Element","Engine Assembly (3)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Unpowered Memory Encryptor","Engine Assembly (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Unpowered Memory Encryptor","Engine Assembly (3)")); + re_Combinations.add(new RE_Combination("Software Module","Unpowered Memory Encryptor","Engine Assembly (3)")); + re_Combinations.add(new RE_Combination("Power Output Device","Used Vidscreen","Engine Experimentation (4)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Used Notebook","Engine Experimentation (4)")); + re_Combinations.add(new RE_Combination("Speederdrive","Used Notebook","Engine Experimentation (4)")); + re_Combinations.add(new RE_Combination("Medical Console","Tranceiver","Engine Experimentation (4)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Used Vidscreen","Engine Experimentation (4)")); + re_Combinations.add(new RE_Combination("Shield Module","Unpowered Survey Pad","Fast Draw Action Cost (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Unpowered Survey Pad","Fast Draw Action Cost (8)")); + re_Combinations.add(new RE_Combination("Medical Console","Shield Module","Fast Draw Critical Chance (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Medical Console","Fast Draw Critical Chance (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Software Module","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Locomotor","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Motor","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Locomotor","Motor","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Locomotor","Droid Motor (Yellow)","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Shield Module","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Droid Motor (Yellow)","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Locomotor","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Motor","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Droid Motor (Yellow)","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","A Damaged Droid Motivator","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Droid Motor (Red)","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Locomotor","Droid Motor (Red)","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Motor","Droid Motor (Red)","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","A Damaged Droid Swivel Joint","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Shield Module","Software Module","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Motor","Droid Motor (Yellow)","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Shield Module","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Mark VII Vocabulation Module","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Droid Motor (Red)","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Droid Motor (Red)","Fast Draw Damage (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Tranceiver","Fire Absorption (4)")); + re_Combinations.add(new RE_Combination("Shield Module","Tranceiver","Fire Absorption (4)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Rations Kit","Fire Resistance (4)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Speederdrive","Fire Resistance (4)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Mark X Vocab Module","Fire Resistance (4)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Mark V Vocab Module","Focused Fire Action Cost (8)")); + re_Combinations.add(new RE_Combination("Motor","Mark V Vocab Module","Focused Fire Action Cost (8)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Software Module","Focused Fire Action Cost (8)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Survival Gear","Focused Fire Action Cost (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Mark VII Vocabulation Module","Focused Fire Action Cost (8)")); + re_Combinations.add(new RE_Combination("Droid Motor (Yellow)","Mark V Vocab Module","Focused Fire Action Cost (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Software Module","Focused Fire Action Cost (8)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Wiring (Black)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Device","Wiring (Red/Yellow)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Wiring (Orange)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Device","Wiring (Blue)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Device","Wiring (Green)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Wiring (White)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Used Wiring","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Device","Wiring (Black)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Device","Wiring (Orange)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Device","Wiring (White)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Wiring (Red/Yellow)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Device","Used Wiring","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Wiring (Blue)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Wiring (Green)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Power Output Device","Wiring (Purple)","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Rations Kit","Unpowered Survey Pad","Focused Fire Damage (8)")); + re_Combinations.add(new RE_Combination("Survival Gear","Used Notebook","Focused Fire Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Power Output Device","Focused Fire Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Tranceiver","Food Assembly (3)")); + re_Combinations.add(new RE_Combination("Rations Kit","Demagnetized Datadisk","Food Assembly (3)")); + re_Combinations.add(new RE_Combination("Comlink","Software Module","Food Experimentation (4)")); + re_Combinations.add(new RE_Combination("Comlink","A Damaged Droid Memory Unit","Food Experimentation (4)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Laser Trap","Food Experimentation (4)")); + re_Combinations.add(new RE_Combination("Comlink","Mark VII Vocabulation Module","Food Experimentation (4)")); + re_Combinations.add(new RE_Combination("Restraining Device","Tranceiver","Food Experimentation (4)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Tubing","Glancing Blow Increase (18)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Remote Transmitter","Glancing Blow Increase (18)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Mark X Vocab Module","Glancing Blow Increase (18)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Mark V Vocab Module","Glancing Blow Increase (Melee) (14)")); + re_Combinations.add(new RE_Combination("Rations Kit","Servo Joint","Glancing Blow Increase (Melee) (14)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Ledger","Glancing Blow Increase (Melee) (14)")); + re_Combinations.add(new RE_Combination("Medical Device","Rations Kit","Glancing Blow Increase (Melee) (14)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Unpowered Installation Repair Device","Glancing Blow Increase (Melee) (14)")); + re_Combinations.add(new RE_Combination("Unpowered Installation Repair Device","Mark V Vocab Module","Glancing Blow Increase (Melee) (14)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Plugged Hydraulics System","Glancing Blow Increase (Ranged) (14)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Tubing","Glancing Blow Increase (Ranged) (14)")); + re_Combinations.add(new RE_Combination("Speederdrive","Tubing","Glancing Blow Increase (Ranged) (14)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Speederdrive","Glancing Blow Increase (Ranged) (14)")); + re_Combinations.add(new RE_Combination("Vocabulator","Servo Joint","Glancing Blow Increase (Ranged) (14)")); + re_Combinations.add(new RE_Combination("ID Chip","Unpowered Survey Pad","Glancing Blow Increase (Ranged) (14)")); + re_Combinations.add(new RE_Combination("Unpowered Survey Pad","Used ID Chip","Glancing Blow Increase (Ranged) (14)")); + re_Combinations.add(new RE_Combination("Medical Device","Vocabulator","Glancing Blow Increase (Ranged) (14)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Power Supply","Healing Potency (8)")); + re_Combinations.add(new RE_Combination("Power Supply","Droid Battery (Black/Green)","Healing Potency (8)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","ID Chip","Healing Potency (8)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Power Supply","Healing Potency (8)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Used ID Chip","Healing Potency (8)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Power Supply","Healing Potency (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Speederdrive","Heavy Weapon Action Cost (10)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Droid Motor (Red)","Heavy Weapon Action Cost (10)")); + re_Combinations.add(new RE_Combination("Speederdrive","Droid Motor (Red)","Heavy Weapon Action Cost (10)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Hyperdrive Unit","Heavy Weapon Action Cost (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Hyperdrive Unit","Heavy Weapon Action Cost (10)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Locomotor","Heavy Weapon Action Cost (10)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Speederdrive","Heavy Weapon Action Cost (10)")); + re_Combinations.add(new RE_Combination("Locomotor","Speederdrive","Heavy Weapon Action Cost (10)")); + re_Combinations.add(new RE_Combination("Motor","Speederdrive","Heavy Weapon Action Cost (10)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Motor","Heavy Weapon Action Cost (10)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Droid Motor (Yellow)","Heavy Weapon Action Cost (10)")); + re_Combinations.add(new RE_Combination("Speederdrive","Droid Motor (Yellow)","Heavy Weapon Action Cost (10)")); + re_Combinations.add(new RE_Combination("Ledger","Survival Gear","Heavy Weapon Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Servo Joint","Wiring (Orange)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Wiring (Red/Yellow)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Servo Joint","Wiring (White)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Wiring (Blue)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Wiring (Green)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Wiring (Purple)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Servo Joint","Wiring (Purple)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Wiring (Black)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Wiring (Orange)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Servo Joint","Wiring (Red/Yellow)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Servo Joint","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Wiring (White)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Servo Joint","Wiring (Blue)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Servo Joint","Wiring (Green)","Humanoid Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Used Notebook","Instrument Assembly (3)")); + re_Combinations.add(new RE_Combination("Datapad","Power Supply","Instrument Assembly (3)")); + re_Combinations.add(new RE_Combination("Data Housing","Restraining Device","Instrument Assembly (3)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Worklight","Instrument Assembly (3)")); + re_Combinations.add(new RE_Combination("Locomotor","Mark X Vocab Module","Jedi Strike Action Cost (8)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Droid Motor (Red)","Jedi Strike Action Cost (8)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Mark X Vocab Module","Jedi Strike Action Cost (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Mark X Vocab Module","Jedi Strike Action Cost (8)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Droid Motor (Yellow)","Jedi Strike Action Cost (8)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Motor","Jedi Strike Action Cost (8)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Wiring (Purple)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Wiring (Purple)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Wiring (Green)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Wiring (Red/Yellow)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Survival Gear","Tranceiver","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Wiring (Blue)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Wiring (Green)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Tubing","Wiring (Red/Yellow)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Wiring (Red/Yellow)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Laser Trap","Mark V Vocab Module","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Wiring (Blue)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Wiring (Black)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Wiring (White)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Wiring (Orange)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Used Wiring","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Wiring (White)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Wiring (Black)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Used Wiring","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Medical Console","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Wiring (Orange)","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Tubing","Used Wiring","Jedi Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Rations Kit","Survival Gear","Jedi Strike Damage (8)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Shield Module","Jedi Strike Damage (8)")); + re_Combinations.add(new RE_Combination("Used Notebook","Tubing","Jedi Strike Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Used Notebook","Jedi Strike Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Wiring (Teal)","Lightsaber Assembly (3)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Control Box","Lightsaber Assembly (3)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Wiring (Black)","Lightsaber Assembly (3)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Wiring (Orange)","Lightsaber Assembly (3)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Rapid Program Module","Lightsaber Assembly (3)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Wiring (Blue)","Lightsaber Assembly (3)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Wiring (Green)","Lightsaber Assembly (3)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Wiring (White)","Lightsaber Assembly (3)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Emergency Reactivator","Lightsaber Assembly (3)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Wiring (Purple)","Lightsaber Assembly (3)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Wiring (Red/Yellow)","Lightsaber Assembly (3)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Aeromagnifier","Lightsaber Experimentation (5)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Self Analysis Circuit","Lightsaber Experimentation (5)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Outdated Aeromagnifier","Lightsaber Experimentation (5)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Droid Battery (Black/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Droid Battery (Black/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Used Vidscreen","Luck (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","A Damaged Droid Memory Unit","Luck (1)")); + re_Combinations.add(new RE_Combination("Datapad","Weak Droid Battery","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Droid Battery (Purple/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","A Small Mining Tool","Luck (1)")); + re_Combinations.add(new RE_Combination("Ledger","A Small Mining Tool","Luck (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","A Small Mining Tool","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Ledger","Luck (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Ledger","Luck (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Unpowered Installation Repair Device","Luck (1)")); + re_Combinations.add(new RE_Combination("Control Box","Mark I Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Mark I Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Ledger","Mark I Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Mark V Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Mark VII Vocabulation Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Control Box","Medical Console","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Medical Console","Luck (1)")); + re_Combinations.add(new RE_Combination("Ledger","Medical Console","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Droid Battery (Black/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Used Notebook","Luck (1)")); + re_Combinations.add(new RE_Combination("Control Box","Used Vidscreen","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Used Vidscreen","Luck (1)")); + re_Combinations.add(new RE_Combination("Ledger","Used Vidscreen","Luck (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Used Vidscreen","Luck (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Mark V Vocab Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Collapsed Artifact","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Rapid Program Module","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Weak Droid Battery","Luck (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Weak Droid Battery","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Remote Transmitter","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Datapad","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Emergency Reactivator","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Wire Element","Luck (1)")); + re_Combinations.add(new RE_Combination("Software Module","Wire Element","Luck (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Wire Element","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Tubing","Luck (1)")); + re_Combinations.add(new RE_Combination("Datapad","Shield Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Ledger","Luck (1)")); + re_Combinations.add(new RE_Combination("Shield Module","A Small Mining Tool","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Software Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Unpowered Installation Repair Device","Luck (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Mark I Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Mark VII Vocabulation Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Medical Device","Luck (1)")); + re_Combinations.add(new RE_Combination("Datapad","Droid Battery (Black/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Droid Battery (Black/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Used Vidscreen","Luck (1)")); + re_Combinations.add(new RE_Combination("Control Box","Mark V Vocab Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Used Vidscreen","Luck (1)")); + re_Combinations.add(new RE_Combination("Datapad","Rapid Program Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Weak Droid Battery","Luck (1)")); + re_Combinations.add(new RE_Combination("Software Module","Weak Droid Battery","Luck (1)")); + re_Combinations.add(new RE_Combination("Datapad","Droid Battery (Teal)","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Emergency Reactivator","Luck (1)")); + re_Combinations.add(new RE_Combination("Datapad","Tubing","Luck (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Shield Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","A Small Mining Tool","Luck (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","A Small Mining Tool","Luck (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Software Module","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Unpowered Installation Repair Device","Luck (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Mark I Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Control Box","Mark VII Vocabulation Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Mark VII Vocabulation Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Ledger","Mark VII Vocabulation Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Medical Console","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Droid Battery (Black/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Droid Battery (Black/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Software Module","Droid Battery (Black/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Used Notebook","Luck (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Used Vidscreen","Luck (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Used Vidscreen","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Rapid Program Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Tubing","Mark V Vocab Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Datapad","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Remote Transmitter","Luck (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Weak Droid Battery","Luck (1)")); + re_Combinations.add(new RE_Combination("Datapad","Droid Battery (Purple/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Droid Battery (Teal)","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Wire Element","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Tubing","Luck (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Tubing","Luck (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Unpowered Installation Repair Device","Luck (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Software Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Survival Gear","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Mark V Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Palm Diary","Luck (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Newsfilter Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Droid Battery (Black/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Used Notebook","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Used Notebook","Luck (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Used Notebook","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Rapid Program Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Rapid Program Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Datapad","Remote Transmitter","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Droid Battery (Purple/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Datapad","Wire Element","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Tubing","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Tubing","Luck (1)")); + re_Combinations.add(new RE_Combination("Datapad","Impulse Detector","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","A Small Mining Tool","Luck (1)")); + re_Combinations.add(new RE_Combination("Control Box","Software Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Unpowered Installation Repair Device","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Software Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Ledger","Software Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Unpowered Installation Repair Device","Luck (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Software Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Survival Gear","Luck (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Mark VII Vocabulation Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Frequency Jamming Wired","Luck (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Used Notebook","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Used Vidscreen","Luck (1)")); + re_Combinations.add(new RE_Combination("Used Notebook","Used Vidscreen","Luck (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Rapid Program Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Control Box","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Weak Droid Battery","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Remote Transmitter","Luck (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Remote Transmitter","Luck (1)")); + re_Combinations.add(new RE_Combination("Control Box","Datapad","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Wire Element","Luck (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Wire Element","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Emergency Reactivator","Luck (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Tubing","Luck (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Impulse Detector","Luck (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Impulse Detector","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","A Small Mining Tool","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Mark I Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Aeromagnifier","Luck (1)")); + re_Combinations.add(new RE_Combination("Control Box","Survival Gear","Luck (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Mark V Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Survival Gear","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Medical Console","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Droid Battery (Black/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Used Vidscreen","Luck (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Mark V Vocab Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Control Box","A Damaged Droid Memory Unit","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Remote Transmitter","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Remote Transmitter","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Wire Element","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Wire Element","Luck (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Wire Element","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Impulse Detector","Luck (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","A Small Mining Tool","Luck (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Software Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Software Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Control Box","Mark V Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Mark V Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Ledger","Mark V Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Droid Battery (Black/Green)","Luck (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Mark V Vocab Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Rapid Program Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","A Damaged Droid Memory Unit","Luck (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Datapad","Luck (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Weak Droid Battery","Luck (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Remote Transmitter","Luck (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Weak Droid Battery","Luck (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Droid Battery (Teal)","Luck (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Weak Droid Battery","Luck (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Emergency Reactivator","Luck (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Wire Element","Luck (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","A Small Mining Tool","Luck (1)")); + re_Combinations.add(new RE_Combination("Datapad","Ledger","Luck (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Unpowered Installation Repair Device","Luck (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Mark I Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Mark V Circuit Board","Luck (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Survival Gear","Luck (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Survival Gear","Luck (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Mark VII Vocabulation Module","Luck (1)")); + re_Combinations.add(new RE_Combination("Used Notebook","Used Wiring","Luck (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Medical Console","Luck (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Rapid Program Module","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","A Small Mining Tool","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Circuit Board","Unpowered Installation Repair Device","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Servo Joint","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Medical Device","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Electronics Module","Differential Regulator","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Circuit Board","A Small Mining Tool","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Launcher Tube","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","A Small Mining Tool","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Unpowered Installation Repair Device","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Comlink","Power Supply","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Control Box","Data Housing","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Medical Console","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Unpowered Installation Repair Device","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Servo Joint","Music Knowledge (3)")); + re_Combinations.add(new RE_Combination("Comlink","Medical Console","Musical Enhancement (3)")); + re_Combinations.add(new RE_Combination("Control Box","Power Supply","Musical Enhancement (3)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Rations Kit","Pistol Action Cost (10)")); + re_Combinations.add(new RE_Combination("Rations Kit","Tubing","Pistol Action Cost (10)")); + re_Combinations.add(new RE_Combination("Rations Kit","Remote Transmitter","Pistol Action Cost (10)")); + re_Combinations.add(new RE_Combination("Medical Console","Software Module","Pistol Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Survival Gear","Power Supply","Pistol Critical Chance (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Medical Console","Pistol Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Laser Trap","Survival Gear","Pistol Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Medical Console","Pistol Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Mark I Circuit Board","Pistol Damage (14)")); + re_Combinations.add(new RE_Combination("Laser Trap","Rapid Program Module","Pistol Damage (14)")); + re_Combinations.add(new RE_Combination("Circuit Board","Hyperdrive Unit","Pistol Damage (14)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Speederdrive","Pistol Damage (14)")); + re_Combinations.add(new RE_Combination("Software Module","Used Wiring","Pistol Damage (14)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Laser Trap","Pistol Damage (14)")); + re_Combinations.add(new RE_Combination("Circuit Board","Speederdrive","Pistol Damage (14)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Speederdrive","Pistol Damage (14)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Mark V Circuit Board","Pistol Damage (14)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Survival Gear","Poison Absorption (4)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Used Notebook","Poison Absorption (4)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Restraining Device","Poison Resistance (4)")); + re_Combinations.add(new RE_Combination("Laser Trap","Used Notebook","Poison Resistance (4)")); + re_Combinations.add(new RE_Combination("Tranceiver","Vocabulator","Poison Resistance (4)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Rations Kit","Polearm Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Unpowered Survey Pad","Polearm Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Tranceiver","Wire Element","Polearm Damage (14)")); + re_Combinations.add(new RE_Combination("Circuit Board","A Damaged Droid Power Cell","Polearm Lightsaber Action Cost (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Mark I Circuit Board","Polearm Lightsaber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Tubing","Polearm Lightsaber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Weak Droid Battery","Polearm Lightsaber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Droid Battery (Black/Green)","Polearm Lightsaber Action Cost (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Mark V Circuit Board","Polearm Lightsaber Action Cost (10)")); + re_Combinations.add(new RE_Combination("Datapad","Wiring (White)","Polearm Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Datapad","Used Wiring","Polearm Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Datapad","Wiring (Black)","Polearm Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Datapad","Wiring (Orange)","Polearm Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Datapad","Wiring (Green)","Polearm Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Used Notebook","Polearm Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Datapad","Wiring (Red/Yellow)","Polearm Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Datapad","Wiring (Blue)","Polearm Lightsaber Damage (14)")); + re_Combinations.add(new RE_Combination("Data Housing","Mark V Vocab Module","Power Systems Assembly (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Power Output Device","Power Systems Assembly (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Power Output Analyzer","Power Systems Assembly (3)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Used Vidscreen","Power Systems Assembly (3)")); + re_Combinations.add(new RE_Combination("Medical Device","A Small Mining Tool","Power Systems Experimentation (4)")); + re_Combinations.add(new RE_Combination("Servo Joint","Unpowered Installation Repair Device","Power Systems Experimentation (4)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Servo Joint","Power Systems Experimentation (4)")); + re_Combinations.add(new RE_Combination("Medical Device","Unpowered Installation Repair Device","Power Systems Experimentation (4)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Circuit","Power Systems Experimentation (4)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Used ID Chip","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Outdated Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Outdated Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Servo Joint","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Installation Repair Device","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Differential Regulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Used Notebook","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Collapsed Artifact","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Mark V Vocab Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Rations Kit","Precision (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","A Damaged Droid Motivator","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","A Damaged Droid Swivel Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Remote Transmitter","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Wire Element","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Wire Element","Precision (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Self Analysis Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Survey Pad","Wire Element","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Impulse Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Unpowered Installation Repair Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Used Notebook","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Survival Gear","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Blue)","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Survival Gear","Precision (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Survival Gear","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Mark VII Vocabulation Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Mark VII Vocabulation Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Aeromagnifier","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Droid Memory Module","Precision (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Droid Memory Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Worklight","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Unpowered Memory Encryptor","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Newsfilter Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Unpowered Memory Encryptor","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Medical Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Unpowered Memory Encryptor","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Medical Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Electronics Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Used ID Chip","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Used ID Chip","Precision (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Plugged Hydraulics System","Precision (1)")); + re_Combinations.add(new RE_Combination("Vocabulator","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Used ID Chip","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Orange)","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Newsfilter Module","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Power Output Analyzer","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Clothing Repair Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Survey Pad","Mark V Vocab Module","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","A Damaged Droid Motivator","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","A Damaged Droid Motivator","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Self Analysis Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Hyperdrive Unit","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Self Analysis Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Blue)","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Laser Trap","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","A Small Mining Tool","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Launcher Tube","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("Datapad","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("Worklight","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Mark V Circuit Board","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Wire Element","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Mark X Vocab Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Datapad","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Medical Console","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Control Box","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Control Box","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Ledger","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Unpowered Memory Encryptor","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Aeromagnifier","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Electronics Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Supply","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Memory Module","Frequency Jamming Wired","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Droid Battery (Black/Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Used ID Chip","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Plugged Hydraulics System","Precision (1)")); + re_Combinations.add(new RE_Combination("Worklight","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Plugged Hydraulics System","Precision (1)")); + re_Combinations.add(new RE_Combination("Tubing","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Plugged Hydraulics System","Precision (1)")); + re_Combinations.add(new RE_Combination("Holorecorder","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Differential Regulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Differential Regulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Power Output Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Chemical Dispersion Unit","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Comlink","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","A Damaged Droid Memory Unit","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","A Damaged Droid Motivator","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Self Analysis Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Self Analysis Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Survey Pad","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Shield Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Shield Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Laser Trap","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Launcher Tube","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Launcher Tube","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Supply","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Software Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Software Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Survey Pad","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Worklight","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Mark X Vocab Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Black/Green)","Droid Memory Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Memory Module","Newsfilter Module","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Unpowered Memory Encryptor","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Wire Element","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Software Module","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Holorecorder","Precision (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Electronics Module","Holorecorder","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Droid Battery (Black/Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Outdated Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Plugged Hydraulics System","Precision (1)")); + re_Combinations.add(new RE_Combination("Aeromagnifier","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Plugged Hydraulics System","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Differential Regulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Power Output Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Power Output Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Circuit Board","Precision (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Rapid Program Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Comlink","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Rapid Program Module","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Rations Kit","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","A Damaged Droid Motivator","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","A Damaged Droid Swivel Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Remote Transmitter","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Data Housing","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Supply","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Weak Droid Battery","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Supply","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Hyperdrive Unit","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Shield Module","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Impulse Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","A Small Mining Tool","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","A Small Mining Tool","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","A Small Mining Tool","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Ledger","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Ledger","Precision (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Mark I Circuit Board","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Green)","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Survival Gear","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Software Module","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Survival Gear","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Mark VII Vocabulation Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Vocabulator","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Mark X Vocab Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Mark X Vocab Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Medical Console","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Droid Memory Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Droid Memory Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Medical Console","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Unpowered Memory Encryptor","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Medical Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Medical Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Worklight","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Droid Battery (Black/Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Outdated Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Outdated Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Outdated Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Droid Battery (Black/Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Plugged Hydraulics System","Precision (1)")); + re_Combinations.add(new RE_Combination("Software Module","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Wire Element","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Blue)","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Differential Regulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Power Output Analyzer","Precision (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Used Vidscreen","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Used Vidscreen","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Chassis Blueprints","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Clothing Repair Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Control Box","Precision (1)")); + re_Combinations.add(new RE_Combination("Holorecorder","Mark V Vocab Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","A Damaged Droid Memory Unit","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Rations Kit","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Weak Droid Battery","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Explosive Dud","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Explosive Dud","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Green)","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Launcher Tube","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Software Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Unpowered Installation Repair Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Ledger","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Survey Pad","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Mark V Circuit Board","Precision (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Mark V Circuit Board","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Mark V Circuit Board","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Mark X Vocab Module","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Droid Memory Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Wire Element","Droid Memory Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Newsfilter Module","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Unpowered Memory Encryptor","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Medical Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Unpowered Memory Encryptor","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Medical Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Used Notebook","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Memory Module","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Memory Module","Electronics Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Servo Joint","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Memory Module","Holorecorder","Precision (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Outdated Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Used ID Chip","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Supply","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Red/Yellow)","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Power Output Analyzer","Precision (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Differential Regulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Power Output Analyzer","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Power Output Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Chemical Dispersion Unit","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Purple)","Mark V Vocab Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","A Damaged Droid Motivator","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Rations Kit","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","A Damaged Droid Power Cell","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","A Damaged Droid Swivel Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Remote Transmitter","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Remote Transmitter","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Remote Transmitter","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Control Box","Emergency Reactivator","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Wire Element","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Self Analysis Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Wire Element","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Self Analysis Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Hyperdrive Unit","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Self Analysis Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Shield Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","ID Chip","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Shield Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Impulse Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Shield Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Laser Trap","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Launcher Tube","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Software Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Control Box","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Ledger","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("Control Box","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Ledger","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Orange)","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Mark VII Vocabulation Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Used Notebook","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Mark VII Vocabulation Module","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Droid Memory Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Newsfilter Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Worklight","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Electronics Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Wire Element","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Datapad","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Control Box","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Ledger","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Ledger","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Control Box","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Used ID Chip","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Outdated Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Ledger","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Plugged Hydraulics System","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Plugged Hydraulics System","Precision (1)")); + re_Combinations.add(new RE_Combination("Used Wiring","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Used Notebook","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Survey Pad","Differential Regulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Survey Pad","Used Notebook","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Power Output Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Rapid Program Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Tubing","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Burnt Out Droid Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Rapid Program Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Collapsed Artifact","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Supply","Wiring (Orange)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Rapid Program Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Rations Kit","Precision (1)")); + re_Combinations.add(new RE_Combination("Control Box","A Damaged Droid Motivator","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Vocabulator","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Data Housing","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Datapad","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Device","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Self Analysis Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Self Analysis Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Hyperdrive Unit","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Orange)","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","A Small Mining Tool","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Launcher Tube","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","A Small Mining Tool","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Unpowered Installation Repair Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Unpowered Installation Repair Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Unpowered Installation Repair Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Supply","Unpowered Installation Repair Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Mark I Circuit Board","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Vocabulator","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Mark I Circuit Board","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Mark I Circuit Board","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Survival Gear","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Red/Yellow)","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Droid Memory Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Droid Memory Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Supply","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Newsfilter Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Medical Console","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Medical Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Medical Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Unpowered Memory Encryptor","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Control Box","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Worklight","Electronics Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Demagnetized Datadisk","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Software Module","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Outdated Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Outdated Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Tranceiver","Used ID Chip","Precision (1)")); + re_Combinations.add(new RE_Combination("Wiring (Green)","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Electronics Module","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Supply","Wiring (White)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Used Vidscreen","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Used Vidscreen","Precision (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Yellow)","Wiring (Purple)","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Chemical Dispersion Unit","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Mark V Vocab Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Worklight","Mark V Vocab Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Circuitry","Precision (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","A Damaged Droid Motivator","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","A Damaged Droid Power Cell","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","A Damaged Droid Power Cell","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Wiring (Blue)","Precision (1)")); + re_Combinations.add(new RE_Combination("Chemical Dispersion Unit","Data Housing","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Data Housing","Precision (1)")); + re_Combinations.add(new RE_Combination("Comlink","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Rations Kit","Wiring (Green)","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Restraining Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Tubing","Precision (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Self Analysis Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","ID Chip","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Wiring (Black)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Laser Trap","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Self Analysis Circuit","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Wiring (Red/Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Software Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Worklight","Precision (1)")); + re_Combinations.add(new RE_Combination("Armor Repair Device","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Locomotor","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Software Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Software Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Locomotor","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Datapad","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Demagnetized Datadisk","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Magseal Detector","Precision (1)")); + re_Combinations.add(new RE_Combination("ID Chip","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Speederdrive","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Motor (Red)","Aeromagnifier","Precision (1)")); + re_Combinations.add(new RE_Combination("Ledger","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Worklight","Power Supply","Precision (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Control Box","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Mark X Vocab Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Power Supply","Used Wiring","Precision (1)")); + re_Combinations.add(new RE_Combination("Ledger","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Medical Device","Tranceiver","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Palm Diary","Precision (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Servo Joint","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Unpowered Memory Encryptor","Precision (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Unpowered Memory Encryptor","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Unpowered Memory Encryptor","Precision (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Motor","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("Outdated Aeromagnifier","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Medical Device","Precision (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Circuit","Precision (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Electronics Module","Precision (1)")); + re_Combinations.add(new RE_Combination("Vocabulator","Droid Motor (Red)","Precision (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Motor","Precision (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Circuit","Holorecorder","Precision (1)")); + re_Combinations.add(new RE_Combination("Unpowered Memory Encryptor","Unpowered Survey Pad","Precision (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Droid Motor (Yellow)","Precision (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Servo Joint","PVP Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Survival Gear","PVP Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Medical Console","Circuit","Reverse Engineering Chance (10)")); + re_Combinations.add(new RE_Combination("Used Notebook","Electronics Module","Reverse Engineering Chance (10)")); + re_Combinations.add(new RE_Combination("Used Notebook","Differential Regulator","Reverse Engineering Chance (10)")); + re_Combinations.add(new RE_Combination("Medical Console","Droid Memory Module","Reverse Engineering Chance (10)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Locomotor","Rifle Action Cost (10)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Motor","Rifle Action Cost (10)")); + re_Combinations.add(new RE_Combination("ID Chip","Servo Joint","Rifle Action Cost (10)")); + re_Combinations.add(new RE_Combination("ID Chip","Medical Device","Rifle Action Cost (10)")); + re_Combinations.add(new RE_Combination("Tubing","Differential Regulator","Rifle Action Cost (10)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Emergency Reactivator","Rifle Action Cost (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Emergency Reactivator","Rifle Action Cost (10)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Power Supply","Rifle Action Cost (10)")); + re_Combinations.add(new RE_Combination("Used ID Chip","Servo Joint","Rifle Action Cost (10)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Droid Motor (Red)","Rifle Action Cost (10)")); + re_Combinations.add(new RE_Combination("Power Output Device","Power Supply","Rifle Action Cost (10)")); + re_Combinations.add(new RE_Combination("Medical Device","Used ID Chip","Rifle Action Cost (10)")); + re_Combinations.add(new RE_Combination("Medical Console","Mark V Vocab Module","Rifle Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","ID Chip","Rifle Damage (14)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Used ID Chip","Rifle Damage (14)")); + re_Combinations.add(new RE_Combination("Datapad","Worklight","Rifle Damage (14)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Speederdrive","Shield Assembly (3)")); + re_Combinations.add(new RE_Combination("Data Housing","Unpowered Survey Pad","Shield Assembly (3)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Magseal Detector","Shield Assembly (3)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Survival Gear","Shield Experimentation (4)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Black/Green)","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Used Vidscreen","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Used Vidscreen","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Blue)","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Worklight","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Control Box","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Data Housing","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Weak Droid Battery","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Weak Droid Battery","Stamina (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Hyperdrive Unit","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Shield Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Laser Trap","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Laser Trap","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Laser Trap","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Software Module","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Green)","Unpowered Installation Repair Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Mark V Circuit Board","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Survival Gear","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Datapad","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Black/Green)","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Holorecorder","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Droid Battery (Black/Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Worklight","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Software Module","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Worklight","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Red/Yellow)","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Rapid Program Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Wiring (Teal)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","A Damaged Droid Swivel Joint","Stamina (1)")); + re_Combinations.add(new RE_Combination("Software Module","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Remote Transmitter","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Data Housing","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Datapad","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Wire Element","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Software Module","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Hyperdrive Unit","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Shield Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Impulse Detector","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Shield Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Control Box","Laser Trap","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Laser Trap","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","A Small Mining Tool","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Orange)","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wire Element","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Mark VII Vocabulation Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Worklight","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Blue)","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Medical Console","Stamina (1)")); + re_Combinations.add(new RE_Combination("Tubing","Holorecorder","Stamina (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Unpowered Survey Pad","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Used Notebook","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Used Vidscreen","Stamina (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Mark V Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Rapid Program Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Data Housing","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Data Housing","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Orange)","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Vocabulator","Weak Droid Battery","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Orange)","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Hyperdrive Unit","Stamina (1)")); + re_Combinations.add(new RE_Combination("Datapad","Hyperdrive Unit","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Tubing","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Laser Trap","Stamina (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Laser Trap","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","A Small Mining Tool","Stamina (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","A Small Mining Tool","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Orange)","Unpowered Installation Repair Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Mark I Circuit Board","Stamina (1)")); + re_Combinations.add(new RE_Combination("Software Module","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Red/Yellow)","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Medical Console","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Medical Console","Stamina (1)")); + re_Combinations.add(new RE_Combination("Vocabulator","Droid Battery (Black/Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Used Notebook","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Used Vidscreen","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Used Vidscreen","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Green)","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Used Vidscreen","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Remote Transmitter","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Wire Element","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Hyperdrive Unit","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Hyperdrive Unit","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Impulse Detector","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Software Module","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Datapad","Laser Trap","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","A Small Mining Tool","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Black/Green)","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Software Module","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Vocabulator","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Software Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Unpowered Installation Repair Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Red/Yellow)","Unpowered Installation Repair Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Ledger","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Mark VII Vocabulation Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Unpowered Memory Encryptor","Stamina (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Holorecorder","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Droid Battery (Black/Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Wiring","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Software Module","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Used Vidscreen","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Collapsed Artifact","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Data Housing","Stamina (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Black/Green)","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Remote Transmitter","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Emergency Reactivator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Wire Element","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Black/Green)","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Wire Element","Stamina (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Wire Element","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Hyperdrive Unit","Stamina (1)")); + re_Combinations.add(new RE_Combination("Vocabulator","Wire Element","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Worklight","Tubing","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Laser Trap","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Control Box","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Ledger","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Ledger","Stamina (1)")); + re_Combinations.add(new RE_Combination("Worklight","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Ledger","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Blue)","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Survival Gear","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Survival Gear","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Mark VII Vocabulation Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Green)","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Power Output Analyzer","Stamina (1)")); + re_Combinations.add(new RE_Combination("Software Module","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Power Output Analyzer","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Orange)","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Control Box","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Ledger","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Data Housing","Stamina (1)")); + re_Combinations.add(new RE_Combination("Worklight","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Weak Droid Battery","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Worklight","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Blue)","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Wire Element","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Hyperdrive Unit","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Laser Trap","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Laser Trap","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Notebook","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Software Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Blue)","Unpowered Installation Repair Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Datapad","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Mark V Circuit Board","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Medical Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Holorecorder","Stamina (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Droid Battery (Black/Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Wiring (Purple)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Notebook","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Weak Droid Battery","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Used Vidscreen","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Shield Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Shield Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Laser Trap","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Ledger","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Software Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Survival Gear","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Control Box","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Black)","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Orange)","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Holorecorder","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Droid Battery (Black/Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Droid Battery (Black/Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Used Notebook","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Used Notebook","Stamina (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Wiring (White)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Rapid Program Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Rapid Program Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Clothing Repair Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Black/Green)","Wiring (Orange)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Datapad","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Vocabulator","Stamina (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Wiring (Blue)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Weak Droid Battery","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Control Box","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Ledger","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Restraining Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Wiring (Green)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Hyperdrive Unit","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Hyperdrive Unit","Stamina (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Wiring (Black)","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","A Small Mining Tool","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","A Small Mining Tool","Stamina (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Worklight","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (Green)","Wiring (Red/Yellow)","Stamina (1)")); + re_Combinations.add(new RE_Combination("Laser Trap","Ledger","Stamina (1)")); + re_Combinations.add(new RE_Combination("Wiring (White)","Unpowered Installation Repair Device","Stamina (1)")); + re_Combinations.add(new RE_Combination("Restraining Device","Software Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Mark I Circuit Board","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Speederdrive","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Survival Gear","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Speederdrive","Survival Gear","Stamina (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Used Wiring","Stamina (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Mark X Vocab Module","Stamina (1)")); + re_Combinations.add(new RE_Combination("Data Housing","Medical Console","Stamina (1)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Frequency Jamming Wired","Stamina (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Wiring (Black)","Stealth (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Wiring (Orange)","Stealth (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Wiring (Purple)","Stealth (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Wiring (Green)","Stealth (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Wiring (Red/Yellow)","Stealth (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Wiring (Blue)","Stealth (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Power Cell","Wiring (White)","Stealth (1)")); + re_Combinations.add(new RE_Combination("Control Box","Used Notebook","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Used Notebook","Strength (1)")); + re_Combinations.add(new RE_Combination("Ledger","Used Notebook","Strength (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Used Notebook","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Used Vidscreen","Strength (1)")); + re_Combinations.add(new RE_Combination("Control Box","Rapid Program Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Software Module","Used Vidscreen","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Rapid Program Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Ledger","Rapid Program Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Remote Transmitter","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Weak Droid Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Datapad","Strength (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Weak Droid Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Control Box","Droid Battery (Teal)","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Emergency Reactivator","Strength (1)")); + re_Combinations.add(new RE_Combination("Control Box","Tubing","Strength (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Impulse Detector","Strength (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Software Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Software Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Unpowered Installation Repair Device","Strength (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Software Module","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Survival Gear","Strength (1)")); + re_Combinations.add(new RE_Combination("Datapad","Mark V Circuit Board","Strength (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Wire Element","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Used Notebook","Strength (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Rapid Program Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Remote Transmitter","Strength (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Datapad","Strength (1)")); + re_Combinations.add(new RE_Combination("Control Box","Droid Battery (Purple/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Emergency Reactivator","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Shield Module","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Ledger","Strength (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Survival Gear","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Mark V Circuit Board","Strength (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Mark V Circuit Board","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Survival Gear","Strength (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Survival Gear","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Palm Diary","Strength (1)")); + re_Combinations.add(new RE_Combination("Used Notebook","Newsfilter Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Medical Console","Strength (1)")); + re_Combinations.add(new RE_Combination("Palm Diary","Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Used Notebook","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Used Vidscreen","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Rapid Program Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Control Box","A Damaged Droid Swivel Joint","Strength (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Weak Droid Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Control Box","Remote Transmitter","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Weak Droid Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Remote Transmitter","Strength (1)")); + re_Combinations.add(new RE_Combination("Ledger","Remote Transmitter","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Droid Battery (Teal)","Strength (1)")); + re_Combinations.add(new RE_Combination("Control Box","Wire Element","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Wire Element","Strength (1)")); + re_Combinations.add(new RE_Combination("Ledger","Wire Element","Strength (1)")); + re_Combinations.add(new RE_Combination("Control Box","Impulse Detector","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Impulse Detector","Strength (1)")); + re_Combinations.add(new RE_Combination("Datapad","A Small Mining Tool","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Ledger","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Unpowered Installation Repair Device","Strength (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Unpowered Installation Repair Device","Strength (1)")); + re_Combinations.add(new RE_Combination("Datapad","Mark I Circuit Board","Strength (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Mark V Circuit Board","Strength (1)")); + re_Combinations.add(new RE_Combination("Medical Console","Survival Gear","Strength (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Palm Diary","Strength (1)")); + re_Combinations.add(new RE_Combination("Datapad","Medical Console","Strength (1)")); + re_Combinations.add(new RE_Combination("Ledger","Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Datapad","Used Vidscreen","Strength (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Collapsed Artifact","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Control Box","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Weak Droid Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Droid Battery (Purple/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Weak Droid Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","A Small Mining Tool","Strength (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","A Small Mining Tool","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Mark I Circuit Board","Strength (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Mark I Circuit Board","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Mark VII Vocabulation Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Medical Console","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Remote Transmitter","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Used Notebook","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Used Vidscreen","Strength (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Used Vidscreen","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","A Damaged Droid Swivel Joint","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Remote Transmitter","Strength (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Weak Droid Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Droid Battery (Teal)","Strength (1)")); + re_Combinations.add(new RE_Combination("Used Notebook","Weak Droid Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Droid Battery (Teal)","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Wire Element","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Shield Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Impulse Detector","Strength (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Ledger","Strength (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Mark I Circuit Board","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Survival Gear","Strength (1)")); + re_Combinations.add(new RE_Combination("Datapad","Mark VII Vocabulation Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Software Module","Survival Gear","Strength (1)")); + re_Combinations.add(new RE_Combination("Ledger","Palm Diary","Strength (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Medical Console","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Medical Console","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Ledger","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Shield Module","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Used Notebook","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Plugged Hydraulics System","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Used Notebook","Strength (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Used Vidscreen","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Used Vidscreen","Strength (1)")); + re_Combinations.add(new RE_Combination("A Small Mining Tool","Used Vidscreen","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Rapid Program Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","A Damaged Droid Memory Unit","Strength (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Weak Droid Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Droid Battery (Purple/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Swivel Joint","Droid Battery (Purple/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Droid Battery (Teal)","Strength (1)")); + re_Combinations.add(new RE_Combination("Control Box","Ledger","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Ledger","Strength (1)")); + re_Combinations.add(new RE_Combination("Datapad","Unpowered Installation Repair Device","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Software Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Software Module","Unpowered Installation Repair Device","Strength (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Mark VII Vocabulation Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Unpowered Installation Repair Device","Used Wiring","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Black/Green)","Palm Diary","Strength (1)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Rapid Program Module","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Used Notebook","Strength (1)")); + re_Combinations.add(new RE_Combination("Survival Gear","Used Vidscreen","Strength (1)")); + re_Combinations.add(new RE_Combination("Control Box","Weak Droid Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Weak Droid Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Ledger","Weak Droid Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Used Notebook","Wire Element","Strength (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Ledger","Strength (1)")); + re_Combinations.add(new RE_Combination("Datapad","Software Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Survival Gear","Strength (1)")); + re_Combinations.add(new RE_Combination("Circuit Board","Mark VII Vocabulation Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark V Circuit Board","Mark VII Vocabulation Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Palm Diary","Strength (1)")); + re_Combinations.add(new RE_Combination("Tubing","Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Used Notebook","Strength (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Rapid Program Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Control Box","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Remote Transmitter","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Wire Element","Strength (1)")); + re_Combinations.add(new RE_Combination("Datapad","Emergency Reactivator","Strength (1)")); + re_Combinations.add(new RE_Combination("Weak Droid Battery","Wire Element","Strength (1)")); + re_Combinations.add(new RE_Combination("Control Box","Shield Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Shield Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Ledger","Shield Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Impulse Detector","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","A Small Mining Tool","Strength (1)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Ledger","Strength (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Software Module","Strength (1)")); + re_Combinations.add(new RE_Combination("Datapad","Survival Gear","Strength (1)")); + re_Combinations.add(new RE_Combination("Mark I Circuit Board","Mark V Circuit Board","Strength (1)")); + re_Combinations.add(new RE_Combination("Impulse Detector","Battery","Strength (1)")); + re_Combinations.add(new RE_Combination("Control Box","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Battery","Frequency Jamming Wired","Strength (1)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Droid Battery (Black/Green)","Strength (1)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Servo Joint","Structure Assembly (3)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Medical Device","Structure Assembly (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Demagnetized Datadisk","Structure Assembly (3)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Demagnetized Datadisk","Structure Assembly (3)")); + re_Combinations.add(new RE_Combination("Software Module","Demagnetized Datadisk","Structure Assembly (3)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Differential Regulator","Structure Assembly (3)")); + re_Combinations.add(new RE_Combination("Power Output Device","Differential Regulator","Structure Assembly (3)")); + re_Combinations.add(new RE_Combination("Burnt Out Droid Motor","Datapad","Structure Experimentation (4)")); + re_Combinations.add(new RE_Combination("Survival Gear","Weak Droid Battery","Structure Experimentation (4)")); + re_Combinations.add(new RE_Combination("Datapad","Droid Motor (Yellow)","Structure Experimentation (4)")); + re_Combinations.add(new RE_Combination("Survival Gear","Droid Battery (Black/Green)","Structure Experimentation (4)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Survival Gear","Structure Experimentation (4)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Motivator","Datapad","Structure Experimentation (4)")); + re_Combinations.add(new RE_Combination("Datapad","Droid Motor (Red)","Structure Experimentation (4)")); + re_Combinations.add(new RE_Combination("Survival Gear","Battery","Structure Experimentation (4)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Survival Gear","Structure Experimentation (4)")); + re_Combinations.add(new RE_Combination("Datapad","Locomotor","Structure Experimentation (4)")); + re_Combinations.add(new RE_Combination("Datapad","Motor","Structure Experimentation (4)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Mark X Vocab Module","Sure Shot Action Cost (8)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Mark X Vocab Module","Sure Shot Action Cost (8)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Software Module","Sure Shot Action Cost (8)")); + re_Combinations.add(new RE_Combination("Mark X Vocab Module","Rations Kit","Sure Shot Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Circuit Board","Clothing Repair Device","Tracking Droids (4)")); + re_Combinations.add(new RE_Combination("Collapsed Artifact","Laser Trap","Tracking Droids (4)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Mark V Circuit Board","Tracking Droids (4)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Mark I Circuit Board","Tracking Droids (4)")); + re_Combinations.add(new RE_Combination("Speederdrive","Wiring (White)","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Wiring (Black)","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Speederdrive","Used Wiring","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Wiring (Orange)","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("ID Chip","Survival Gear","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Wiring (Green)","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Speederdrive","Wiring (Red/Yellow)","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Survival Gear","Used ID Chip","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Speederdrive","Wiring (Blue)","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Speederdrive","Wiring (Green)","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Wiring (Red/Yellow)","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Wiring (Blue)","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Speederdrive","Wiring (Black)","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Wiring (White)","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Speederdrive","Wiring (Orange)","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Used Wiring","Unarmed Action Cost (10)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Used Notebook","Unarmed Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Used Notebook","Unarmed Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Software Module","Used Notebook","Unarmed Critical Chance (10)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Mark VII Vocabulation Module","Unarmed Damage (14)")); + re_Combinations.add(new RE_Combination("Clothing Repair Device","Software Module","Unarmed Damage (14)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Plugged Hydraulics System","Vital Strike Action Cost (8)")); + re_Combinations.add(new RE_Combination("Plugged Hydraulics System","Tranceiver","Vital Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Tranceiver","Tubing","Vital Strike Critical Chance (8)")); + re_Combinations.add(new RE_Combination("Vocabulator","Wiring (Purple)","Vital Strike Damage (8)")); + re_Combinations.add(new RE_Combination("Vocabulator","Wiring (Red/Yellow)","Vital Strike Damage (8)")); + re_Combinations.add(new RE_Combination("Vocabulator","Wiring (Blue)","Vital Strike Damage (8)")); + re_Combinations.add(new RE_Combination("Vocabulator","Wiring (Green)","Vital Strike Damage (8)")); + re_Combinations.add(new RE_Combination("Vocabulator","Wiring (Black)","Vital Strike Damage (8)")); + re_Combinations.add(new RE_Combination("Vocabulator","Wiring (Orange)","Vital Strike Damage (8)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Mark X Vocab Module","Vital Strike Damage (8)")); + re_Combinations.add(new RE_Combination("Vocabulator","Wiring (White)","Vital Strike Damage (8)")); + re_Combinations.add(new RE_Combination("Vocabulator","Used Wiring","Vital Strike Damage (8)")); + re_Combinations.add(new RE_Combination("Used Notebook","Wiring (Purple)","Vital Strike Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Used Notebook","Wiring (Red/Yellow)","Vital Strike Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Used Notebook","Wiring (Blue)","Vital Strike Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Used Notebook","Wiring (Green)","Vital Strike Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Used Notebook","Wiring (Black)","Vital Strike Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Used Notebook","Wiring (Orange)","Vital Strike Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Used Notebook","Wiring (White)","Vital Strike Freeshot Chance (8)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Droid Battery (Black/Green)","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Control Box","A Small Mining Tool","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Power Output Device","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","ID Chip","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Emergency Reactivator","Used ID Chip","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Power Output Analyzer","Weak Droid Battery","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Comlink","Emergency Reactivator","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Power Output Device","Droid Battery (Black/Green)","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Droid Battery (Purple/Green)","Power Output Analyzer","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Power Output Device","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Data Housing","Datapad","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Power Output Device","Weak Droid Battery","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Droid Battery (Teal)","Power Output Analyzer","Weapon Assembly (3)")); + re_Combinations.add(new RE_Combination("Hyperdrive Unit","Restraining Device","Weapon Experimentation (4)")); + re_Combinations.add(new RE_Combination("Chassis Blueprints","Launcher Tube","Weapon Experimentation (4)")); + re_Combinations.add(new RE_Combination("Datapad","Used Notebook","Weapon Experimentation (4)")); + re_Combinations.add(new RE_Combination("Comlink","Explosive Dud","Weapon Experimentation (4)")); + re_Combinations.add(new RE_Combination("Launcher Tube","Rapid Program Module","Weapon Experimentation (4)")); + re_Combinations.add(new RE_Combination("Restraining Device","Speederdrive","Weapon Experimentation (4)")); + re_Combinations.add(new RE_Combination("Mark VII Vocabulation Module","Differential Regulator","Weapon Systems Assembly (3)")); + re_Combinations.add(new RE_Combination("A Damaged Droid Memory Unit","Differential Regulator","Weapon Systems Assembly (3)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Droid Memory Module","Weapon Systems Assembly (3)")); + re_Combinations.add(new RE_Combination("Explosive Dud","Restraining Device","Weapon Systems Experimentation (4)")); + re_Combinations.add(new RE_Combination("Magseal Detector","Tranceiver","Weapon Systems Experimentation (4)")); + } + + public void createMappings(){ + + skillModMapping.put("1-H Light Saber Action Cost","expertise_action_weapon_9"); + skillModMapping.put("1-H Lightsaber Damage","expertise_damage_weapon_9"); + skillModMapping.put("1-H Melee Action Cost","expertise_action_weapon_4"); + skillModMapping.put("1-H Melee Critical Chance","expertise_critical_1h"); + skillModMapping.put("1-H Melee Damage","onehandmelee_damage"); + skillModMapping.put("2-H Lightsaber Damage","expertise_damage_weapon_10"); + skillModMapping.put("2-H Melee Action Cost","expertise_action_weapon_5"); + skillModMapping.put("2-H Melee Critical Chance","expertise_critical_2h"); + skillModMapping.put("2-H Melee Damage","expertise_damage_weapon_5"); + skillModMapping.put("Advanced Component Experimentation","advanced_ship_experimentation"); + skillModMapping.put("Agility","agility_modified"); + skillModMapping.put("Armor Assembly","armor_assembly"); + skillModMapping.put("Armor Experimentation","armor_experimentation"); + skillModMapping.put("Artisan Assembly","general_assembly"); + skillModMapping.put("Artisan Experimentation","general_experimentation"); + skillModMapping.put("Assassinate Action Cost","expertise_action_line_sp_dm"); + skillModMapping.put("Assassinate Critical Chance","expertise_critical_line_sp_dm"); + skillModMapping.put("Assassinate Freeshot Chance","expertise_freeshot_sp_dm"); + skillModMapping.put("Assault Action Cost","expertise_action_line_dm"); + skillModMapping.put("Assault Critical Chance","expertise_critical_line_dm"); + skillModMapping.put("Assault Damage","expertise_damage_line_dm"); + skillModMapping.put("Assault Freeshot Chance","expertise_freeshot_dm"); + skillModMapping.put("Bleed Resistance","resistance_bleeding"); + skillModMapping.put("Bleeding Absorption","absorption_bleeding"); + skillModMapping.put("Booster Assembly","booster_assembly"); + skillModMapping.put("Booster Experimentation","booster_experimentation"); + skillModMapping.put("Camouflage","camouflage"); + skillModMapping.put("Carbine Action Cost","expertise_action_weapon_1"); + skillModMapping.put("Carbine Damage","expertise_damage_weapon_1"); + skillModMapping.put("Chassis Assembly","chassis_assembly"); + skillModMapping.put("Chassis Experimentation","chassis_experimentation"); + skillModMapping.put("Clothing Assembly","clothing_assembly"); + skillModMapping.put("Clothing Experimentation","clothing_experimentation"); + skillModMapping.put("Constitution","constitution_modified"); + skillModMapping.put("Creature Critical Chance","expertise_critical_niche_creature"); + skillModMapping.put("Dance Prop Assembly","prop_assembly"); + skillModMapping.put("Dancing Enhancement","healing_dance_mind"); + skillModMapping.put("Dancing Knowledge","healing_dance_ability"); + skillModMapping.put("Disease Absorption","absorption_disease"); + skillModMapping.put("Droid Assembly","droid_assembly"); + skillModMapping.put("Droid Critical Chance","expertise_critical_niche_droid"); + skillModMapping.put("Droid Experimentation","droid_experimentation"); + skillModMapping.put("Droid Speed","droid_find_speed"); + skillModMapping.put("Engine Assembly","engine_assembly"); + skillModMapping.put("Engine Experimentation","engine_experimentation"); + skillModMapping.put("Fast Draw Action Cost","expertise_action_line_sm_dm"); + skillModMapping.put("Fast Draw Critical Chance","expertise_critical_line_sm_dm"); + skillModMapping.put("Fast Draw Damage","expertise_damage_line_sm_dm"); + skillModMapping.put("Fire Absorption","absorption_fire"); + skillModMapping.put("Fire Resistance","resistance_fire"); + skillModMapping.put("Focused Fire Action Cost","expertise_action_line_co_dm"); + skillModMapping.put("Focused Fire Damage","expertise_damage_line_co_dm"); + skillModMapping.put("Focused Fire Freeshot Chance","expertise_freeshot_co_dm"); + skillModMapping.put("Food Assembly","food_assembly"); + skillModMapping.put("Food Experimentation","food_experimentation"); + skillModMapping.put("Glancing Blow Increase","glancing_blow_vulnerable"); + skillModMapping.put("Glancing Blow Increase (Melee)","expertise_glancing_blow_melee"); + skillModMapping.put("Glancing Blow Increase (Ranged)","expertise_glancing_blow_ranged"); + skillModMapping.put("Healing Potency","expertise_healing_all"); + skillModMapping.put("Heavy Weapon Action Cost","expertise_action_weapon_12"); + skillModMapping.put("Heavy Weapon Critical Chance","expertise_critical_heavy"); + skillModMapping.put("Humanoid Critical Chance","expertise_critical_niche_npc"); + skillModMapping.put("Instrument Assembly","instrument_assembly"); + skillModMapping.put("Jedi Strike Action Cost","expertise_action_line_fs_dm"); + skillModMapping.put("Jedi Strike Critical Chance","expertise_critical_line_fs_dm"); + skillModMapping.put("Jedi Strike Damage","expertise_damage_line_fs_dm"); + skillModMapping.put("Jedi Strike Freeshot Chance","expertise_freeshot_fs_dm"); + skillModMapping.put("Lightsaber Assembly","jedi_saber_assembly"); + skillModMapping.put("Lightsaber Experimentation","jedi_saber_experimentation"); + skillModMapping.put("Luck","luck_modified"); + skillModMapping.put("Music Knowledge","healing_music_ability"); + skillModMapping.put("Musical Enhancement","healing_music_mind"); + skillModMapping.put("Pistol Action Cost","expertise_action_weapon_2"); + skillModMapping.put("Pistol Critical Chance","expertise_critical_pistol"); + skillModMapping.put("Pistol Damage","expertise_damage_weapon_2"); + skillModMapping.put("Poison Absorption","absorption_poison"); + skillModMapping.put("Poison Resistance","resistance_poison"); + skillModMapping.put("Polearm Critical Chance","expertise_critical_polearm"); + skillModMapping.put("Polearm Damage","expertise_damage_weapon_7"); + skillModMapping.put("Polearm Lightsaber Action Cost","expertise_action_weapon_11"); + skillModMapping.put("Polearm Lightsaber Damage","expertise_damage_weapon_11"); + skillModMapping.put("Power Systems Assembly","power_systems"); + skillModMapping.put("Power Systems Experimentation","power_systems_experimentation"); + skillModMapping.put("Precision","precision_modified"); + skillModMapping.put("PVP Critical Chance","expertise_critical_niche_pvp"); + skillModMapping.put("Reverse Engineering Chance","expertise_reverse_engineering_bonus"); + skillModMapping.put("Rifle Action Cost","expertise_action_weapon_0"); + skillModMapping.put("Rifle Critical Chance","expertise_critical_rifle"); + skillModMapping.put("Rifle Damage","expertise_damage_weapon_0"); + skillModMapping.put("Shield Assembly","shields_assembly"); + skillModMapping.put("Shield Experimentation","shields_experimentation"); + skillModMapping.put("Stamina","stamina_modified"); + skillModMapping.put("Stealth","stealth"); + skillModMapping.put("Strength","strength_modified"); + skillModMapping.put("Structure Assembly","structure_assembly"); + skillModMapping.put("Structure Experimentation","structure_experimentation"); + skillModMapping.put("Sure Shot Action Cost","expertise_action_line_of_sure"); + skillModMapping.put("Sure Shot Freeshot Chance","expertise_freeshot_of_sure"); + skillModMapping.put("Tracking Droids","droid_tracks"); + skillModMapping.put("Unarmed Action Cost","expertise_action_weapon_6"); + skillModMapping.put("Unarmed Critical Chance","expertise_critical_unarmed"); + skillModMapping.put("Unarmed Damage","expertise_damage_weapon_6"); + skillModMapping.put("Vital Strike Action Cost","expertise_action_line_me_dm"); + skillModMapping.put("Vital Strike Critical Chance","expertise_critical_line_me_dm"); + skillModMapping.put("Vital Strike Damage","expertise_damage_line_me_dm"); + skillModMapping.put("Vital Strike Freeshot Chance","expertise_freeshot_me_dm"); + skillModMapping.put("Weapon Assembly","weapon_assembly"); + skillModMapping.put("Weapon Experimentation","weapon_experimentation"); + skillModMapping.put("Weapon Systems Assembly","weapon_systems"); + skillModMapping.put("Weapon Systems Experimentation","weapon_systems_experimentation"); + } + + + public void reverseEngineer(CreatureObject engineer, TangibleObject retool){ + // First determine what's inside the RE Tool + final Vector reToolContentList = new Vector(); + SWGObject engineerInventory = engineer.getSlottedObject("inventory"); + retool.viewChildren(engineer, false, false, new Traverser() { + @Override + public void process(SWGObject obj) { + reToolContentList.add(obj); + //System.out.println(obj.getTemplate()); + } + }); + + if (reToolContentList.size()==0) + return; + + // Power-Bit Creation + if (reToolContentList.size()==1){ + TangibleObject piece = (TangibleObject) reToolContentList.get(0); + if (piece.getStringAttribute("bio_link")!=null) + return; + + if (! piece.getTemplate().contains("object/tangible/wearables/")) + return; + + if (piece.getTemplate().contains("object/tangible/wearables/")){ + // Determine how powerful the bit will be + + int highestStat = getHighestStat(piece); + int numberOfStats = getNumberOfStats(piece); + //System.out.println("highestStat " + highestStat); + //System.out.println("numberOfStats " + numberOfStats); + + int powerBitOrder = 1; + String powerBitOrderString = "1st"; + int powerBitValue = 1; + + // Determine the quality factor based on total buffs (RE Chance, Luck etc.) + float qualityfactor = 1.0F; // For now it's 1 + int luck = engineer.getLuck(); + qualityfactor += luck/1000; // around 1200 luck was top + qualityfactor = Math.max(1.0F, qualityfactor); + int itemCL = 1; + if (piece.getAttributes().get("required_combat_level")!=null) + itemCL = piece.getIntAttribute("required_combat_level"); + float CLFactor = itemCL/85.71F; // item Combat Level adds a small amount too + if (CLFactor>1.0F) + qualityfactor += (CLFactor-1.0F); + int re_Chance = engineer.getSkillModBase("expertise_reverse_engineering_bonus"); + float re_factor = re_Chance/140 * qualityfactor; // 159 RE-Chance was top + qualityfactor = Math.max(re_factor, qualityfactor); + + powerBitValue = Math.round(highestStat * qualityfactor); + + if (numberOfStats==1){ + int roll = new Random().nextInt()*100; + if (roll<20){ + powerBitOrder=2; + powerBitOrderString="2nd"; + } + } + if (numberOfStats==2){ + powerBitOrder=2; + powerBitOrderString="2nd"; + } + if (numberOfStats==3 || numberOfStats==4){ + powerBitOrder=3; + powerBitOrderString="3rd"; + } + + core.objectService.destroyObject(piece.getObjectID()); + String powerBitTemplate = "object/tangible/component/reverse_engineering/shared_power_bit.iff"; + TangibleObject powerBit = (TangibleObject) core.objectService.createObject(powerBitTemplate, engineer.getPlanet()); + powerBit.setCustomName("+" + powerBitValue + " " + powerBitOrderString + " Order Power Bit"); + powerBit.setAttachment("PowerBitValue", powerBitValue); + powerBit.setAttachment("PowerBitOrder", powerBitOrder); + engineerInventory.add(powerBit); + } + } + + // Modifier-Bit Creation + String pcr = ""; + String modifierBitNameResult = null; + if (reToolContentList.size()==2){ + + TangibleObject piece1 = (TangibleObject) reToolContentList.get(0); + TangibleObject piece2 = (TangibleObject) reToolContentList.get(1); + //if (! piece1.getTemplate().contains("lootItems/npc_loot/") || piece2.getTemplate().contains("lootItems/npc_loot/")) + //return; // No junk loot +// if (piece1.getTemplate().contains("modifier_bit") && piece2.getTemplate().contains("power_bit") +// || piece1.getTemplate().contains("power_bit") && piece2.getTemplate().contains("modifier_bit")){ +// return; // Fail-safe if someone wants to RE bits +// } + + String modifierBitName = null; + String piece1Name = getCorrectJunkName(piece1); + String piece2Name = getCorrectJunkName(piece2); + for (RE_Combination comb : re_Combinations){ + if (comb.getIngredient1().contains(piece1Name) && comb.getIngredient2().contains(piece2Name) + || comb.getIngredient1().contains(piece2Name) && comb.getIngredient2().contains(piece1Name)){ + modifierBitNameResult = comb.getResult(); // "Rifle Critical Chance (10)" + String[] modNameArr = modifierBitNameResult.split("\\("); + modifierBitName = modNameArr[0].replace("\\(", "").trim(); + String[] modArr2 = modNameArr[1].split("\\)"); + pcr = modArr2[0].replace("\\)","").trim(); + } + } + System.out.println("modifierBitNameResult " + modifierBitNameResult); + System.out.println("modifierBitName " + modifierBitName); + if (modifierBitNameResult==null){ + return; + } + + String skillModName = skillModMapping.get(modifierBitName); + System.out.println("skillModName " + skillModName); + if (skillModName==null){ + engineer.sendSystemMessage("Junkloot combination wrong/not registered yet or Junkloot names don't conform to http://www.nova-inside.com naming convention",(byte) 0); + return; + } +// core.objectService.destroyObject(piece1.getObjectID()); +// core.objectService.destroyObject(piece2.getObjectID()); + int piece1Uses = piece1.getUses()-1; + int piece2Uses = piece2.getUses()-1; + piece1.setUses(piece1Uses); + piece2.setUses(piece2Uses); + if (piece1Uses==0) + core.objectService.destroyObject(piece1.getObjectID()); + if (piece2Uses==0) + core.objectService.destroyObject(piece2.getObjectID()); + + int pcrIntValue = Integer.parseInt(pcr); + String modifierBitTemplate = "object/tangible/component/reverse_engineering/shared_modifier_bit.iff"; + TangibleObject modifierBit = (TangibleObject) core.objectService.createObject(modifierBitTemplate, engineer.getPlanet()); + modifierBit.setCustomName(modifierBitName); + modifierBit.setStringAttribute("serial_number", createSerialNumber()); + modifierBit.setStringAttribute("@crafting:mod_bit_type", "@stat_n:"+skillModName); + modifierBit.setIntAttribute("@crafting:mod_bit_ratio", pcrIntValue); + engineerInventory.add(modifierBit); + } + } + + public String createSerialNumber(){ + String serialNumber = "("; + char ascii; + int numberOfSerialDigits=8; + int numbersStart=48; + int lettersStart=97; + for (int k=0;k reToolContentList = new Vector(); + SWGObject engineerInventory = engineer.getSlottedObject("inventory"); + retool.viewChildren(engineer, false, false, new Traverser() { + @Override + public void process(SWGObject obj) { + reToolContentList.add(obj); + //System.out.println(obj.getTemplate()); + } + }); + + if (reToolContentList.size()==0) + return; + + // Power Up Creation + if (reToolContentList.size()==2){ + TangibleObject bit1 = (TangibleObject) reToolContentList.get(0); + TangibleObject bit2 = (TangibleObject) reToolContentList.get(1); + if (bit1.getTemplate().contains("modifier_bit") && bit2.getTemplate().contains("power_bit") + || bit1.getTemplate().contains("power_bit") && bit2.getTemplate().contains("modifier_bit")){ + + int amount = 200 + new Random().nextInt(50); // Needs to be randomized and skillmod-related + int luck = engineer.getLuck(); + float factor = luck/700; + float multiplier = Math.max(1.0F, factor); + amount = (int) (multiplier * amount); // around 1200 luck was top + + int powerValue = 1; + + String effectName = null; + int ratio = 1; + int powerBitValue = 1; + + if (bit1.getTemplate().contains("modifier_bit")){ + effectName = bit1.getStringAttribute("@crafting:mod_bit_type"); + ratio = bit1.getIntAttribute("@crafting:mod_bit_ratio"); + } + if (bit2.getTemplate().contains("modifier_bit")){ + effectName = bit2.getStringAttribute("@crafting:mod_bit_type"); + ratio = bit2.getIntAttribute("@crafting:mod_bit_ratio"); + } + if (bit1.getTemplate().contains("power_bit")){ + powerBitValue = (int) bit1.getAttachment("PowerBitValue"); + } + if (bit2.getTemplate().contains("power_bit")){ + powerBitValue = (int) bit2.getAttachment("PowerBitValue"); + } + + int re_Chance = engineer.getSkillModBase("expertise_reverse_engineering_bonus"); + + float X = (float) (new Random().nextFloat() * (1.1 - 0.85) + 0.85); // Magic number + + //powerValue = 3*powerBitValue/ratio; // rough + powerValue = (int) Math.floor( 2 * powerBitValue / ratio * re_Chance / 100 * X ); + + // Assuming munition + String powerUpLabel = "item_reverse_engineering_powerup_armor_02_01"; + String powerUpDescription = "item_reverse_engineering_powerup_armor_02_01"; + String powerUpTemplate = "object/tangible/loot/generic_usable/shared_copper_battery_usuable.iff"; + + if (profession.equals("trader_0a")){ // Domestic + powerUpLabel = "item_reverse_engineering_powerup_clothing_02_01"; + powerUpDescription = "item_reverse_engineering_powerup_clothing_02_01"; + powerUpTemplate = "object/tangible/loot/generic_usable/shared_chassis_blueprint_usuable.iff"; + + } + if (profession.equals("trader_0d")){ // Engineer + powerUpLabel = "item_reverse_engineering_powerup_weapon_02_01"; + powerUpDescription = "item_reverse_engineering_powerup_weapon_02_01"; + powerUpTemplate = "object/tangible/powerup/base/shared_weapon_base.iff"; + } + + core.objectService.destroyObject(bit1.getObjectID()); + core.objectService.destroyObject(bit2.getObjectID()); + + TangibleObject powerUp = (TangibleObject) core.objectService.createObject(powerUpTemplate, engineer.getPlanet()); + + powerUp.setStfFilename("static_item_n"); + powerUp.setStfName(powerUpLabel); + powerUp.setDetailFilename("static_item_d"); + powerUp.setDetailName(powerUpDescription); + powerUp.setIntAttribute(effectName, powerValue); + powerUp.setAttachment("effectName",effectName); + powerUp.setAttachment("powerValue",powerValue); + powerUp.setIntAttribute("num_in_stack", amount); + powerUp.setAttachment("radial_filename", "item/item"); + engineerInventory.add(powerUp); + } + } + } + + @SuppressWarnings("unchecked") + public void createSEA(CreatureObject engineer, TangibleObject retool){ + PlayerObject player = (PlayerObject) engineer.getSlottedObject("ghost"); + String profession = player.getProfession(); + if (profession.equals("trader_0b")) // Structures can't make SEAs + return; + + final Vector reToolContentList = new Vector(); + SWGObject engineerInventory = engineer.getSlottedObject("inventory"); + retool.viewChildren(engineer, false, false, new Traverser() { + @Override + public void process(SWGObject obj) { + reToolContentList.add(obj); + //System.out.println(obj.getTemplate()); + } + }); + + if (reToolContentList.size()==0) + return; + + // SEA Creation + if (reToolContentList.size()==2){ + TangibleObject bit1 = (TangibleObject) reToolContentList.get(0); + TangibleObject bit2 = (TangibleObject) reToolContentList.get(1); + if (bit1.getTemplate().contains("modifier_bit") && bit2.getTemplate().contains("power_bit") + || bit1.getTemplate().contains("power_bit") && bit2.getTemplate().contains("modifier_bit")){ + + + String customName = ""; + String effectName = ""; + int ratio = 1; + int modifierValue = 1; + if (bit1.getTemplate().contains("modifier_bit")){ + customName = bit1.getCustomName(); + effectName = bit1.getStringAttribute("@crafting:mod_bit_type"); + ratio = bit1.getIntAttribute("@crafting:mod_bit_ratio"); + } + if (bit2.getTemplate().contains("modifier_bit")){ + customName = bit2.getCustomName(); + effectName = bit2.getStringAttribute("@crafting:mod_bit_type"); + ratio = bit2.getIntAttribute("@crafting:mod_bit_ratio"); + } + if (bit1.getTemplate().contains("power_bit")){ + modifierValue = (int) bit1.getAttachment("PowerBitValue"); + } + if (bit2.getTemplate().contains("power_bit")){ + modifierValue = (int) bit2.getAttachment("PowerBitValue"); + } + + modifierValue = modifierValue/ratio; // int cast truncates + + // Assuming munition + String SEALabel = "socket_gem_armor"; + String SEADescription = "socket_gem"; + String SEATemplate = "object/tangible/gem/shared_armor.iff"; + + if (profession.equals("trader_0a")){ + SEALabel = "socket_gem_clothing"; + SEADescription = "socket_gem"; + SEATemplate = "object/tangible/gem/shared_clothing.iff"; + } + if (profession.equals("trader_0d")){ + SEALabel = "socket_gem_weapon"; + SEADescription = "socket_gem"; + SEATemplate = "object/tangible/gem/shared_weapon.iff"; + } + + core.objectService.destroyObject(bit1.getObjectID()); + core.objectService.destroyObject(bit2.getObjectID()); + + TangibleObject skillEnhancingAttachment = (TangibleObject) core.objectService.createObject(SEATemplate, engineer.getPlanet()); + + skillEnhancingAttachment.setStfFilename("item_n"); + skillEnhancingAttachment.setStfName(SEALabel); + skillEnhancingAttachment.setDetailFilename("item_n"); + skillEnhancingAttachment.setDetailName(SEADescription); + skillEnhancingAttachment.setIntAttribute(effectName, modifierValue); + Vector effectNameList = new Vector(); + effectNameList.add(effectName); + Vector effectValueList = new Vector(); + effectValueList.add(modifierValue); + skillEnhancingAttachment.setAttachment("SEAeffectNameList", effectNameList); + skillEnhancingAttachment.setAttachment("SEAmodifierValueList", effectValueList); + skillEnhancingAttachment.setAttachment("radial_filename", "item/item"); + //skillEnhancingAttachment.setOptions(Options.SOCKETED, true); + skillEnhancingAttachment.setOptions(Options.USABLE, true); + engineerInventory.add(skillEnhancingAttachment); + } + } + + // Multi-stat SEA + if (reToolContentList.size()==3){ + TangibleObject bit1 = (TangibleObject) reToolContentList.get(0); + TangibleObject bit2 = (TangibleObject) reToolContentList.get(1); + TangibleObject bit3 = (TangibleObject) reToolContentList.get(2); + + String effectName = ""; + int ratio = 1; + int powermodifierValue = 1; + int modifierValue = 1; + int powerBitOrder = 1; + Vector effectNameList = new Vector(); + Vector effectValueList = new Vector(); + String SEASTFName = ""; + + //verify RE tool content requirement + List contentVerification = new ArrayList(); + contentVerification.add("modifier_bit"); + contentVerification.add("power_bit"); + contentVerification.add("sea"); + + if (bit1.getTemplate().contains("modifier_bit")){ + effectName = bit1.getStringAttribute("@crafting:mod_bit_type"); + ratio = bit1.getIntAttribute("@crafting:mod_bit_ratio"); + contentVerification.remove("modifier_bit"); + } + if (bit1.getTemplate().contains("power_bit")){ + powermodifierValue = (int) bit1.getAttachment("PowerBitValue"); + powerBitOrder = (int) bit1.getAttachment("PowerBitOrder"); + contentVerification.remove("power_bit"); + } + if (bit1.getTemplate().contains("object/tangible/gem/shared_clothing.iff")){ + effectNameList = (Vector) bit1.getAttachment("SEAeffectNameList"); + effectValueList = (Vector) bit1.getAttachment("SEAmodifierValueList"); + SEASTFName = bit1.getStfName(); + if (effectNameList.size()==3) + return; + contentVerification.remove("sea"); + } + + if (bit2.getTemplate().contains("modifier_bit")){ + effectName = bit2.getStringAttribute("@crafting:mod_bit_type"); + ratio = bit2.getIntAttribute("@crafting:mod_bit_ratio"); + contentVerification.remove("modifier_bit"); + } + if (bit2.getTemplate().contains("power_bit")){ + powermodifierValue = (int) bit2.getAttachment("PowerBitValue"); + powerBitOrder = (int) bit2.getAttachment("PowerBitOrder"); + contentVerification.remove("power_bit"); + } + if (bit2.getTemplate().contains("object/tangible/gem/shared_clothing.iff")){ + effectNameList = (Vector) bit2.getAttachment("SEAeffectNameList"); + effectValueList = (Vector) bit2.getAttachment("SEAmodifierValueList"); + SEASTFName = bit2.getStfName(); + if (effectNameList.size()==3) + return; + contentVerification.remove("sea"); + } + + if (bit3.getTemplate().contains("modifier_bit")){ + effectName = bit3.getStringAttribute("@crafting:mod_bit_type"); + ratio = bit3.getIntAttribute("@crafting:mod_bit_ratio"); + contentVerification.remove("modifier_bit"); + } + if (bit3.getTemplate().contains("power_bit")){ + powermodifierValue = (int) bit3.getAttachment("PowerBitValue"); + powerBitOrder = (int) bit3.getAttachment("PowerBitOrder"); + contentVerification.remove("power_bit"); + } + if (bit3.getTemplate().contains("object/tangible/gem/shared_clothing.iff")){ + effectNameList = (Vector) bit3.getAttachment("SEAeffectNameList"); + effectValueList = (Vector) bit3.getAttachment("SEAmodifierValueList"); + SEASTFName = bit3.getStfName(); + if (effectNameList.size()==3) + return; + contentVerification.remove("sea"); + } + + if (contentVerification.size()==0){ + modifierValue = powermodifierValue; + modifierValue = modifierValue/ratio; // int cast truncates + + // Assuming munition + String SEALabel = "socket_gem_armor"; + String SEADescription = "socket_gem"; + String SEATemplate = "object/tangible/gem/shared_armor.iff"; + + if (profession.equals("trader_0c")){ // QA + if (! SEASTFName.equals("socket_gem_armor")) + return; // Wrong SEA type inserted + } + + if (profession.equals("trader_0a")){ + if (! SEASTFName.equals("socket_gem_clothing")) + return; // Wrong SEA type inserted + SEALabel = "socket_gem_clothing"; + SEADescription = "socket_gem"; + SEATemplate = "object/tangible/gem/shared_clothing.iff"; + } + if (profession.equals("trader_0d")){ + if (! SEASTFName.equals("socket_gem_weapon")) + return; // Wrong SEA type inserted + SEALabel = "socket_gem_weapon"; + SEADescription = "socket_gem"; + SEATemplate = "object/tangible/gem/shared_weapon.iff"; + } + + // SEA --- this item can have max 3 modifiers; it is not possible to stack the same kind of modifier in one SEA. + if (effectNameList.contains(effectName)) + return; + + core.objectService.destroyObject(bit1.getObjectID()); + core.objectService.destroyObject(bit2.getObjectID()); + core.objectService.destroyObject(bit3.getObjectID()); + + int attachmentUpgrade = engineer.getSkillModBase("expertise_attachment_upgrade"); + System.out.println("attachmentUpgrade " + attachmentUpgrade); + System.out.println("player.getProfession() " + player.getProfession()); + if (powerBitOrder>effectNameList.size() && attachmentUpgrade>=1){ // Only add a stat if the power bit is higher + effectNameList.add(effectName); + effectValueList.add(modifierValue); + } + + TangibleObject skillEnhancingAttachment = (TangibleObject) core.objectService.createObject(SEATemplate, engineer.getPlanet()); + + skillEnhancingAttachment.setStfFilename("item_n"); + skillEnhancingAttachment.setStfName(SEALabel); + skillEnhancingAttachment.setDetailFilename("item_n"); + skillEnhancingAttachment.setDetailName(SEADescription); + + for (int i=0;i attributesMap = piece.getAttributes(); + for (Map.Entry entry : attributesMap.entrySet()) + { + if (statNameList.contains(entry.getKey())){ + int currentStat = Integer.parseInt(entry.getValue()); + if (currentStat>highestStat) + highestStat=currentStat; + } + } + return highestStat; + } + + public int getNumberOfStats(TangibleObject piece){ + int numberOfStats = 0; + Map attributesMap = piece.getAttributes(); + for (Map.Entry entry : attributesMap.entrySet()) + { + if (statNameList.contains(entry.getKey())){ + numberOfStats++; + } + } + return numberOfStats; + } + + private String getCorrectJunkName(TangibleObject piece){ + String junkName = piece.getCustomName(); + if (piece.getTemplate().contains("shared_wiring_generic.iff")){ + String colorCombo = (String)piece.getAttachment("reverse_engineering_name"); + if (colorCombo!=null) + junkName = "Wiring (" + colorCombo + ")"; + } + if (piece.getTemplate().contains("Droid Motor Template")){ + String colorCombo = (String)piece.getAttachment("reverse_engineering_name"); + if (colorCombo!=null) + junkName = "Droid Motor (" + colorCombo + ")"; + } + if (piece.getTemplate().contains("Droid Battery Template")){ + String colorCombo = (String)piece.getAttachment("reverse_engineering_name"); + if (colorCombo!=null) + junkName = "Droid Battery (" + colorCombo + ")"; + } + return junkName; + } + + @Override + public void insertOpcodes(Map arg0, + Map arg1) { + // TODO Auto-generated method stub + + } + + + @Override + public void shutdown() { + // TODO Auto-generated method stub + + } +}