diff --git a/README.md b/README.md index abccf1b8..1523c7a5 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,6 @@ Now your changes will be reviewed by other developers and once the changes are a For more information please visit the wiki: https://github.com/ProjectSWGCore/NGECore2/wiki -Documentation can be found here: http://projectswgcore.github.io/NGECore2/doc/ +Documentation can be found here: http://projectswg.com/doc/ Please prefix all commits with Added, Changed, Removed or Fixed. If you don't have enough room for multiple changes, use the extended description. Try not to bundle multiple changes into one vague line (ie. "Changed various combat things"). Try to make all commit messages understandable by non-programmers. diff --git a/scripts/buffs/buildabuff_inspiration.py b/scripts/buffs/buildabuff_inspiration.py index 35a49556..0474b1d9 100644 --- a/scripts/buffs/buildabuff_inspiration.py +++ b/scripts/buffs/buildabuff_inspiration.py @@ -5,19 +5,15 @@ def setup(core, actor, buff): return def add(core, actor, buff): - buffWorkshop = actor.getAttachment('buffWorkshop') - if buffWorkshop is None: return - attached = actor.getAttachment('inspireDuration') buff.setDuration(float(actor.getAttachment('inspireDuration') * 60)) for BuffItem in buffWorkshop: core.skillModService.addSkillMod(actor, BuffItem.getSkillName(), BuffItem.getAffectAmount()) - return def remove(core, actor, buff): diff --git a/scripts/commands/adjustLotCount.py b/scripts/commands/adjustLotCount.py new file mode 100644 index 00000000..4d20f4c7 --- /dev/null +++ b/scripts/commands/adjustLotCount.py @@ -0,0 +1,15 @@ +import sys + +def run(core, actor, target, commandString): + commandArgs = commandString.split(' ') + arg1 = commandArgs[0] + + if target is None: + target = actor + + if target: + playerObject = target.getSlottedObject('ghost') + playerObject.setLotsRemaining(playerObject.getLotsRemaining() + int(arg1)) + print(playerObject.getLotsRemaining()) + actor.sendSystemMessage('GM: Adjust Lot Count: Completed Successfully for ' + target.getFirstName(), 0) + return \ No newline at end of file diff --git a/scripts/commands/broadcastGalaxy.py b/scripts/commands/broadcastGalaxy.py new file mode 100644 index 00000000..04a1ae09 --- /dev/null +++ b/scripts/commands/broadcastGalaxy.py @@ -0,0 +1,12 @@ + +from services.sui import SUIWindow +from services.sui.SUIWindow import Trigger +from java.util import Vector +import sys + +def setup(): + return + +def run(core, actor, target, commandString): + core.chatService.broadcastGalaxy(commandString) + return \ No newline at end of file diff --git a/scripts/commands/broadcastPlanet.py b/scripts/commands/broadcastPlanet.py new file mode 100644 index 00000000..cb2956d2 --- /dev/null +++ b/scripts/commands/broadcastPlanet.py @@ -0,0 +1,11 @@ +from services.sui import SUIWindow +from services.sui.SUIWindow import Trigger +from java.util import Vector +import sys + +def setup(): + return + +def run(core, actor, target, commandString): + core.chatService.broadcastPlanet(commandString, actor.getPlanet()) + return \ No newline at end of file diff --git a/scripts/commands/credits.py b/scripts/commands/credits.py new file mode 100644 index 00000000..11d28a36 --- /dev/null +++ b/scripts/commands/credits.py @@ -0,0 +1,20 @@ +import sys + + + +def run(core, actor, target, commandString): + commandArgs = commandString.split(' ') + arg1 = commandArgs[0] + playerObject = actor.getSlottedObject('ghost') + + if actor: + actor.setCashCredits(actor.getCashCredits() + int(arg1)) + actor.sendSystemMessage(actor.getFirstName() + ' has removed ' + arg1 + ' credits from Project SWG\'s bank.', 0) + + if actor and target: + target.setCashCredits(target.getCashCredits() + int(arg1)) + target.sendSystemMessage('You have recieved ' + arg1 + ' credits from ' + actor.getFirstName(), 0) + actor.sendSystemMessage('You have transferred ' + arg1 + ' credits to ' + target.getFirstName(), 0) + + + return \ No newline at end of file diff --git a/scripts/commands/inspire.py b/scripts/commands/inspire.py index 282fe64a..15948e9e 100644 --- a/scripts/commands/inspire.py +++ b/scripts/commands/inspire.py @@ -10,13 +10,12 @@ def run(core, actor, target, commandString): if not playerObject or playerObject.getProfession() != "entertainer_1a": return - if target is None or actor.getObjectId() == target.getObjectId(): openBuffWindow = BuffBuilderStartMessage(actor.getObjectId(), actor.getObjectId(), actor.getObjectId()) objController = ObjControllerMessage(11, openBuffWindow) actor.getClient().getSession().write(objController.serialize()) return - + if target is None and commandString is not None: target = core.chatService.getObjectByFirstName(commandString) if target is None: diff --git a/scripts/commands/invulnerable.py b/scripts/commands/invulnerable.py new file mode 100644 index 00000000..90aab004 --- /dev/null +++ b/scripts/commands/invulnerable.py @@ -0,0 +1,33 @@ +import sys +from resources.datatables import Options + +def run(core, actor, target, commandString): + commandArgs = commandString.split(' ') + command = commandArgs[0] + + + if command == 'invisible': + if (actor.isInStealth()): + actor.setInStealth(False) + actor.setRadarVisible(True) + actor.sendSystemMessage('GM Command Successfull: You are no longer Invisible.', 0) + + else: + actor.setInStealth(True) + actor.setRadarVisible(False) + actor.sendSystemMessage('GM Command Successfull: You are now Invisible.', 0) + + if actor.getOptionsBitmask() == 128: + actor.setOptionsBitmask(Options.NONE) + actor.sendSystemMessage('GM Command Successfull: You are now Invulnerable.', 0) + + + elif actor.getOptionsBitmask() == 0: + actor.setOptionsBitmask(Options.ATTACKABLE) + print(actor.getOptionsBitmask()) + + actor.sendSystemMessage('GM Command Successfull: You are no longer Invulnerable.', 0) + + return + + \ No newline at end of file diff --git a/scripts/commands/setRank.py b/scripts/commands/setRank.py new file mode 100644 index 00000000..afdc5b16 --- /dev/null +++ b/scripts/commands/setRank.py @@ -0,0 +1,41 @@ +import sys +from resources.datatables import GcwRank +from services.gcw import GCWService + +def run(core, actor, target, commandString): + commandArgs = commandString.split(' ') + arg1 = commandArgs[0] + if len(commandArgs) > 1: + arg2 = commandArgs[1] + + if target is None: + target = actor + + if target.getFaction() == 'rebel' or 'imperial' and arg1 == 'up': + playerObject = target.getSlottedObject('ghost') + playerObject.setCurrentRank(int(arg2)) + newrank = playerObject.getCurrentRank() + core.scriptService.callScript("scripts/collections/", "gcwrank_" + target.getFaction(), "handleRankUp", core, target, newrank) + actor.sendSystemMessage('GM: Set Rank: Completed Successfully', 0) + if target.getFaction() == 'rebel' or 'imperial' and arg1 == 'down': + playerObject = target.getSlottedObject('ghost') + playerObject.setCurrentRank(int(arg2)) + newrank = playerObject.getCurrentRank() + core.scriptService.callScript("scripts/collections/", "gcwrank_" + target.getFaction(), "handleRankDown", target, newrank) + actor.sendSystemMessage('GM: Set Rank: Completed Successfully', 0) + +# if target.getFaction() == 'imperial' and arg1 == 'up': +# if arg1 == 'up': +# playerObject = actor.getSlottedObject('ghost') +# playerObject.setCurrentRank(int(arg2)) +# newrank = playerObject.getCurrentRank() +# core.scriptService.callScript("scripts/collections/", "gcwrank_" + target.getFaction(), "handleRankUp", core, target, newrank) +# actor.sendSystemMessage('GM: Set Rank: Completed Successfully', 0) +# if target.getFaction() == 'imperial' and arg1 == 'down': +# playerObject = actor.getSlottedObject('ghost') +# playerObject.setCurrentRank(int(arg2)) +# newrank = playerObject.getCurrentRank() +# core.scriptService.callScript("scripts/collections/", "gcwrank_" + target.getFaction(), "handleRankDown", target, newrank) +# actor.sendSystemMessage('GM: Set Rank: Completed Successfully', 0) + + return \ No newline at end of file diff --git a/scripts/commands/setgodmode.py b/scripts/commands/setgodmode.py index 753cd3f2..e00e103d 100644 --- a/scripts/commands/setgodmode.py +++ b/scripts/commands/setgodmode.py @@ -17,6 +17,8 @@ def run(core, actor, target, commandString): playerObject = actor.getSlottedObject('ghost') + global str + if not playerObject: return diff --git a/scripts/mobiles/corellia/grassland_slice_hound.py b/scripts/mobiles/corellia/grassland_slice_hound.py index 62709da1..e697cbd6 100644 --- a/scripts/mobiles/corellia/grassland_slice_hound.py +++ b/scripts/mobiles/corellia/grassland_slice_hound.py @@ -44,5 +44,5 @@ def addTemplate(core): mobileTemplate.setDefaultAttack('creatureMeleeAttack') mobileTemplate.setAttacks(attacks) - core.spawnService.addMobileTemplate('gassland_slice_hound', mobileTemplate) + core.spawnService.addMobileTemplate('grassland_slice_hound', mobileTemplate) return \ No newline at end of file diff --git a/scripts/mobiles/dantooine/baby_bol.py b/scripts/mobiles/dantooine/baby_bol.py new file mode 100644 index 00000000..e51cde50 --- /dev/null +++ b/scripts/mobiles/dantooine/baby_bol.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('baby_bol') + mobileTemplate.setLevel(58) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(5) + mobileTemplate.setMaxSpawnDistance(10) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Wild Meat") + mobileTemplate.setMeatAmount(0) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setBoneAmount(300) + mobileTemplate.setBoneType("Animal Bone") + mobileTemplate.setHideAmount(180) + mobileTemplate.setSocialGroup("bol") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_baby_bol.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('baby_bol', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_bageraset_lair_1.py b/scripts/mobiles/lairs/corellia_bageraset_lair_1.py new file mode 100644 index 00000000..190463f2 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_bageraset_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('bageraset') + + core.spawnService.addLairTemplate('corellia_bageraset_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_leaf_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_bageraset_lair_2.py b/scripts/mobiles/lairs/corellia_bageraset_lair_2.py new file mode 100644 index 00000000..7416ec37 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_bageraset_lair_2.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('bageraset') + mobileTemplates.add('bageraset_bruiser') + + core.spawnService.addLairTemplate('corellia_bageraset_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_leaf_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_canoid_lair_1.py b/scripts/mobiles/lairs/corellia_canoid_lair_1.py new file mode 100644 index 00000000..214118ba --- /dev/null +++ b/scripts/mobiles/lairs/corellia_canoid_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('canoid') + + core.spawnService.addLairTemplate('corellia_canoid_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_canoid_lair_2.py b/scripts/mobiles/lairs/corellia_canoid_lair_2.py new file mode 100644 index 00000000..3e1ec9d7 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_canoid_lair_2.py @@ -0,0 +1,11 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('canoid') + mobileTemplates.add('canoid_hunter') + mobileTemplates.add('canoid_pack_leader') + + core.spawnService.addLairTemplate('corellia_canoid_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_carrion_spat_lair_1.py b/scripts/mobiles/lairs/corellia_carrion_spat_lair_1.py new file mode 100644 index 00000000..63bf9eb6 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_carrion_spat_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('carrion_spat') + + core.spawnService.addLairTemplate('corellia_carrion_spat_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_large_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_carrion_spat_lair_2.py b/scripts/mobiles/lairs/corellia_carrion_spat_lair_2.py new file mode 100644 index 00000000..a43d423d --- /dev/null +++ b/scripts/mobiles/lairs/corellia_carrion_spat_lair_2.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('carrion_spat') + mobileTemplates.add('carrion_spat_corpsereaver') + + core.spawnService.addLairTemplate('corellia_carrion_spat_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_large_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_corellian_butterfly_lair_1.py b/scripts/mobiles/lairs/corellia_corellian_butterfly_lair_1.py new file mode 100644 index 00000000..d1203981 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_corellian_butterfly_lair_1.py @@ -0,0 +1,11 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('corellian_butterfly') + mobileTemplates.add('corellian_butterfly_monarch') + mobileTemplates.add('corellian_butterfly_worker') + + core.spawnService.addLairTemplate('corellia_corellian_butterfly_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_insecthill_small_evil_fire_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_corellian_butterfly_lair_2.py b/scripts/mobiles/lairs/corellia_corellian_butterfly_lair_2.py new file mode 100644 index 00000000..2c0b447b --- /dev/null +++ b/scripts/mobiles/lairs/corellia_corellian_butterfly_lair_2.py @@ -0,0 +1,11 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('blood_thirsty_monarch') + mobileTemplates.add('corellian_butterfly_monarch') + mobileTemplates.add('corellian_butterfly_warrior') + + core.spawnService.addLairTemplate('corellia_corellian_butterfly_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_insecthill_small_fog_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_corellian_butterfly_lair_3.py b/scripts/mobiles/lairs/corellia_corellian_butterfly_lair_3.py new file mode 100644 index 00000000..012c38db --- /dev/null +++ b/scripts/mobiles/lairs/corellia_corellian_butterfly_lair_3.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('corellian_butterfly') + mobileTemplates.add('corellian_butterfly_warrior') + + core.spawnService.addLairTemplate('corellia_corellian_butterfly_lair_3', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_insecthill_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_corellian_butterfly_lair_4.py b/scripts/mobiles/lairs/corellia_corellian_butterfly_lair_4.py new file mode 100644 index 00000000..ab0ba8c0 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_corellian_butterfly_lair_4.py @@ -0,0 +1,11 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('corellian_butterfly_worker') + mobileTemplates.add('corellian_butterfly_defender') + mobileTemplates.add('corellian_butterfly_drone') + + core.spawnService.addLairTemplate('corellia_corellian_butterfly_lair_4', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_insecthill_small_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_crazed_durni_lair_1.py b/scripts/mobiles/lairs/corellia_crazed_durni_lair_1.py new file mode 100644 index 00000000..e70abe68 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_crazed_durni_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('crazed_durni') + + core.spawnService.addLairTemplate('corellia_crazed_durni_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_warren_small_fog_gray.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_crimson_sand_panther_lair_1.py b/scripts/mobiles/lairs/corellia_crimson_sand_panther_lair_1.py new file mode 100644 index 00000000..76e1a71a --- /dev/null +++ b/scripts/mobiles/lairs/corellia_crimson_sand_panther_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('crimson_razor_cat') + + core.spawnService.addLairTemplate('corellia_crimson_sand_panther_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_large_fog_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_dalyrake_lair_1.py b/scripts/mobiles/lairs/corellia_dalyrake_lair_1.py new file mode 100644 index 00000000..871fb920 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_dalyrake_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('dalyrake') + + core.spawnService.addLairTemplate('corellia_dalyrake_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_mound_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_dalyrake_lair_2.py b/scripts/mobiles/lairs/corellia_dalyrake_lair_2.py new file mode 100644 index 00000000..5830bcba --- /dev/null +++ b/scripts/mobiles/lairs/corellia_dalyrake_lair_2.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('dalyrake_martriarch') + mobileTemplates.add('dalyrake_harvester') + + core.spawnService.addLairTemplate('corellia_dalyrake_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_deranged_wrix_lair_1.py b/scripts/mobiles/lairs/corellia_deranged_wrix_lair_1.py new file mode 100644 index 00000000..9edab76e --- /dev/null +++ b/scripts/mobiles/lairs/corellia_deranged_wrix_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('deranged_wrix') + + core.spawnService.addLairTemplate('corellia_deranged_wrix_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_evil_fire_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_devil_gulginaw_lair_1.py b/scripts/mobiles/lairs/corellia_devil_gulginaw_lair_1.py new file mode 100644 index 00000000..7cec4fad --- /dev/null +++ b/scripts/mobiles/lairs/corellia_devil_gulginaw_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('devil_gulginaw') + + core.spawnService.addLairTemplate('corellia_devil_gulginaw_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones_evil_fire_redpoi_all_lair_bones_evil_fire_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_dire_cat_lair_1.py b/scripts/mobiles/lairs/corellia_dire_cat_lair_1.py new file mode 100644 index 00000000..f362da6a --- /dev/null +++ b/scripts/mobiles/lairs/corellia_dire_cat_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('dire_cat') + + core.spawnService.addLairTemplate('corellia_dire_cat_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_dire_cat_lair_2.py b/scripts/mobiles/lairs/corellia_dire_cat_lair_2.py new file mode 100644 index 00000000..95c03604 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_dire_cat_lair_2.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('dire_cat') + mobileTemplates.add('feral_orphan') + + core.spawnService.addLairTemplate('corellia_dire_cat_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_small_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_1.py b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_1.py new file mode 100644 index 00000000..6635cfc0 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_1.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('diseased_vrelt') + mobileTemplates.add('diseased_vrelt_matriarch') + + core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_2.py b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_2.py new file mode 100644 index 00000000..613570a4 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_2.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('diseased_vrelt') + + core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_evil_fire_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_3.py b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_3.py new file mode 100644 index 00000000..649dd2fb --- /dev/null +++ b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_3.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('diseased_vrelt') + mobileTemplates.add('noxious_vrelt_scavenger') + + core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_3', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_fog_mustard.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_4.py b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_4.py new file mode 100644 index 00000000..8e645a8d --- /dev/null +++ b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_4.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('noxious_vrelt_scavenger') + + core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_4', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_fog_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_5.py b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_5.py new file mode 100644 index 00000000..e77375e6 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_5.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('diseased_vrelt') + mobileTemplates.add('diseased_vrelt_matriarch') + + core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_fog_gray.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_6.py b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_6.py new file mode 100644 index 00000000..1617ec61 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_6.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('diseased_vrelt') + mobileTemplates.add('diseased_vrelt_matriarch') + + core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_fog_mustard.iff') + return diff --git a/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_7.py b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_7.py new file mode 100644 index 00000000..bc6f56ca --- /dev/null +++ b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_7.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('diseased_vrelt') + mobileTemplates.add('diseased_vrelt_matriarch') + + core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_fog_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_8.py b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_8.py new file mode 100644 index 00000000..b6682cb2 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_diseased_vrelt_lair_8.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('diseased_vrelt') + + core.spawnService.addLairTemplate('corellia_diseased_vrelt_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_durni_warren_lair_1.py b/scripts/mobiles/lairs/corellia_durni_warren_lair_1.py new file mode 100644 index 00000000..721a5b3c --- /dev/null +++ b/scripts/mobiles/lairs/corellia_durni_warren_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('durni') + + core.spawnService.addLairTemplate('corellia_durni_warren_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_warren_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_durni_warren_lair_2.py b/scripts/mobiles/lairs/corellia_durni_warren_lair_2.py new file mode 100644 index 00000000..2fc3d415 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_durni_warren_lair_2.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('durni') + mobileTemplates.add('vehement_warrior') + + core.spawnService.addLairTemplate('corellia_durni_warren_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_warren_small_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_forest_murra_lair_1.py b/scripts/mobiles/lairs/corellia_forest_murra_lair_1.py new file mode 100644 index 00000000..ddfe6a0a --- /dev/null +++ b/scripts/mobiles/lairs/corellia_forest_murra_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('forest_murra') + + core.spawnService.addLairTemplate('corellia_forest_murra_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_dead_log_small_evil_fire_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_forest_slice_hound_lair_1.py b/scripts/mobiles/lairs/corellia_forest_slice_hound_lair_1.py new file mode 100644 index 00000000..95e39849 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_forest_slice_hound_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('forest_slice_hound') + + core.spawnService.addLairTemplate('corellia_forest_slice_hound_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones_evil_fire_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_giant_carrion_spat_lair_1.py b/scripts/mobiles/lairs/corellia_giant_carrion_spat_lair_1.py new file mode 100644 index 00000000..e5906408 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_giant_carrion_spat_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('giant_carrion_spat') + + core.spawnService.addLairTemplate('corellia_giant_carrion_spat_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_large_evil_fire_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_giant_dalyrake_lair_1.py b/scripts/mobiles/lairs/corellia_giant_dalyrake_lair_1.py new file mode 100644 index 00000000..d64384f0 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_giant_dalyrake_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('giant_dalyrake') + + core.spawnService.addLairTemplate('corellia_giant_dalyrake_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_mound_large_evil_fire_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_giant_gubbur_lair_1.py b/scripts/mobiles/lairs/corellia_giant_gubbur_lair_1.py new file mode 100644 index 00000000..44d5d5bd --- /dev/null +++ b/scripts/mobiles/lairs/corellia_giant_gubbur_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('giant_gubbur') + + core.spawnService.addLairTemplate('corellia_giant_gubbur_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_leaf_small_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_grand_wrix_lair_1.py b/scripts/mobiles/lairs/corellia_grand_wrix_lair_1.py new file mode 100644 index 00000000..8e66fb6c --- /dev/null +++ b/scripts/mobiles/lairs/corellia_grand_wrix_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('grand_wrix') + + core.spawnService.addLairTemplate('corellia_grand_wrix_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_evil_fire_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_grassland_slice_hound_lair_1.py b/scripts/mobiles/lairs/corellia_grassland_slice_hound_lair_1.py new file mode 100644 index 00000000..954062f4 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_grassland_slice_hound_lair_1.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('grassland_slice_hound') + mobileTemplates.add('female_grassland_slice_hound') + + core.spawnService.addLairTemplate('corellia_grassland_slice_hound_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones_large_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_greater_gulginaw_nest_lair_1.py b/scripts/mobiles/lairs/corellia_greater_gulginaw_nest_lair_1.py new file mode 100644 index 00000000..bd8bc324 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_greater_gulginaw_nest_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('greater_gulginaw') + + core.spawnService.addLairTemplate('corellia_greater_gulginaw_nest_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_gronda_lair_1.py b/scripts/mobiles/lairs/corellia_gronda_lair_1.py new file mode 100644 index 00000000..66a08f7d --- /dev/null +++ b/scripts/mobiles/lairs/corellia_gronda_lair_1.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('gronda') + mobileTemplates.add('dwarf_gronda') + + core.spawnService.addLairTemplate('corellia_gronda_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_gubbur_lair_1.py b/scripts/mobiles/lairs/corellia_gubbur_lair_1.py new file mode 100644 index 00000000..c494d670 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_gubbur_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('gubbur') + + core.spawnService.addLairTemplate('corellia_gubbur_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_leaf_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_gulginaw_lair_1.py b/scripts/mobiles/lairs/corellia_gulginaw_lair_1.py new file mode 100644 index 00000000..e0963caf --- /dev/null +++ b/scripts/mobiles/lairs/corellia_gulginaw_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('gulginaw') + + core.spawnService.addLairTemplate('corellia_gulginaw_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_gurrcat_lair_1.py b/scripts/mobiles/lairs/corellia_gurrcat_lair_1.py new file mode 100644 index 00000000..698cffef --- /dev/null +++ b/scripts/mobiles/lairs/corellia_gurrcat_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('gurrcat') + + core.spawnService.addLairTemplate('corellia_gurrcat_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_humbaba_lair_1.py b/scripts/mobiles/lairs/corellia_humbaba_lair_1.py new file mode 100644 index 00000000..b27337e2 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_humbaba_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('humbaba') + + core.spawnService.addLairTemplate('corellia_humbaba_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_krahbu_lair_1.py b/scripts/mobiles/lairs/corellia_krahbu_lair_1.py new file mode 100644 index 00000000..a563fe60 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_krahbu_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('krahbu') + + core.spawnService.addLairTemplate('corellia_krahbu_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_mountain_murra_lair_1.py b/scripts/mobiles/lairs/corellia_mountain_murra_lair_1.py new file mode 100644 index 00000000..74117320 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_mountain_murra_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('mountain_murra') + + core.spawnService.addLairTemplate('corellia_mountain_murra_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_dead_log_small_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_murra_lair_1.py b/scripts/mobiles/lairs/corellia_murra_lair_1.py new file mode 100644 index 00000000..29f569d0 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_murra_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('murra') + + core.spawnService.addLairTemplate('corellia_murra_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_dead_log_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_paralope_lair_1.py b/scripts/mobiles/lairs/corellia_paralope_lair_1.py new file mode 100644 index 00000000..e09caee7 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_paralope_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('paralope') + + core.spawnService.addLairTemplate('corellia_paralope_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_plumed_rasp_eyrie_lair_1.py b/scripts/mobiles/lairs/corellia_plumed_rasp_eyrie_lair_1.py new file mode 100644 index 00000000..91214c21 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_plumed_rasp_eyrie_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('majestic_plumed_rasp') + + core.spawnService.addLairTemplate('corellia_plumed_rasp_eyrie_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_small_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_plumed_rasp_lair_1.py b/scripts/mobiles/lairs/corellia_plumed_rasp_lair_1.py new file mode 100644 index 00000000..a731a40f --- /dev/null +++ b/scripts/mobiles/lairs/corellia_plumed_rasp_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('plumed_rasp') + + core.spawnService.addLairTemplate('corellia_plumed_rasp_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_razor_cat_pride_lair_1.py b/scripts/mobiles/lairs/corellia_razor_cat_pride_lair_1.py new file mode 100644 index 00000000..b89d4d16 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_razor_cat_pride_lair_1.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('razor_cat') + mobileTemplates.add('female_razor_cat') + + core.spawnService.addLairTemplate('corellia_razor_cat_pride_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_razor_cat_pride_lair_2.py b/scripts/mobiles/lairs/corellia_razor_cat_pride_lair_2.py new file mode 100644 index 00000000..fd2edaad --- /dev/null +++ b/scripts/mobiles/lairs/corellia_razor_cat_pride_lair_2.py @@ -0,0 +1,11 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('razor_cat') + mobileTemplates.add('female_razor_cat') + mobileTemplates.add('razor_cat_eviscerator') + + core.spawnService.addLairTemplate('corellia_razor_cat_pride_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_large_evil_fire_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_savage_humbaba_lair_1.py b/scripts/mobiles/lairs/corellia_savage_humbaba_lair_1.py new file mode 100644 index 00000000..70263416 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_savage_humbaba_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('savage_humbaba') + + core.spawnService.addLairTemplate('corellia_savage_humbaba_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_large_evil_fire_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_scavenger_rat_lair_1.py b/scripts/mobiles/lairs/corellia_scavenger_rat_lair_1.py new file mode 100644 index 00000000..85d0f31f --- /dev/null +++ b/scripts/mobiles/lairs/corellia_scavenger_rat_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('scavenger_rat') + + core.spawnService.addLairTemplate('corellia_scavenger_rat_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_sharnaff_lair_1.py b/scripts/mobiles/lairs/corellia_sharnaff_lair_1.py new file mode 100644 index 00000000..e0cb4bd8 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_sharnaff_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('sharnaff') + + core.spawnService.addLairTemplate('corellia_sharnaff_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_sharnaff_lair_2.py b/scripts/mobiles/lairs/corellia_sharnaff_lair_2.py new file mode 100644 index 00000000..efc1ae28 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_sharnaff_lair_2.py @@ -0,0 +1,11 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('sharnaff') + mobileTemplates.add('sharnaff_reckless_ravager') + mobileTemplates.add('sharnaff_bull') + + core.spawnService.addLairTemplate('corellia_sharnaff_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_slice_hound_lair_1.py b/scripts/mobiles/lairs/corellia_slice_hound_lair_1.py new file mode 100644 index 00000000..f13589a4 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_slice_hound_lair_1.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('female_slice_hound') + mobileTemplates.add('slice_hound') + + core.spawnService.addLairTemplate('corellia_grassland_slice_hound_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_swamp_gurrcat_lair_1.py b/scripts/mobiles/lairs/corellia_swamp_gurrcat_lair_1.py new file mode 100644 index 00000000..baa213cc --- /dev/null +++ b/scripts/mobiles/lairs/corellia_swamp_gurrcat_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('gulginaw') + + core.spawnService.addLairTemplate('corellia_gulginaw_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_bones.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_swamp_humbaba_lair_1.py b/scripts/mobiles/lairs/corellia_swamp_humbaba_lair_1.py new file mode 100644 index 00000000..5f5c5074 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_swamp_humbaba_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('swamp_humbaba') + + core.spawnService.addLairTemplate('corellia_swamp_humbaba_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_large_fog_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_tabage_lair_1.py b/scripts/mobiles/lairs/corellia_tabage_lair_1.py new file mode 100644 index 00000000..6c292c2d --- /dev/null +++ b/scripts/mobiles/lairs/corellia_tabage_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('tabage') + + core.spawnService.addLairTemplate('corellia_tabage_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_tabage_lair_2.py b/scripts/mobiles/lairs/corellia_tabage_lair_2.py new file mode 100644 index 00000000..0707c004 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_tabage_lair_2.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('tabage_scavenger') + + core.spawnService.addLairTemplate('corellia_tabage_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_small_evil_fire_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_violent_krahbu_lair_1.py b/scripts/mobiles/lairs/corellia_violent_krahbu_lair_1.py new file mode 100644 index 00000000..c9a90909 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_violent_krahbu_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('violent_krahbu') + + core.spawnService.addLairTemplate('corellia_krahbu_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small_evil_fire_red..iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_vrelt_lair_1.py b/scripts/mobiles/lairs/corellia_vrelt_lair_1.py new file mode 100644 index 00000000..04053b94 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_vrelt_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('vrelt') + + core.spawnService.addLairTemplate('corellia_vrelt_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_garbage_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_vynock_lair_1.py b/scripts/mobiles/lairs/corellia_vynock_lair_1.py new file mode 100644 index 00000000..749d161d --- /dev/null +++ b/scripts/mobiles/lairs/corellia_vynock_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('vynock') + + core.spawnService.addLairTemplate('corellia_vynock_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_nest_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_war_gronda_lair_1.py b/scripts/mobiles/lairs/corellia_war_gronda_lair_1.py new file mode 100644 index 00000000..86e0c220 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_war_gronda_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('war_gronda') + + core.spawnService.addLairTemplate('corellia_war_gronda_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_evil_fire_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_wooded_paralope_lair_1.py b/scripts/mobiles/lairs/corellia_wooded_paralope_lair_1.py new file mode 100644 index 00000000..fd1356b1 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_wooded_paralope_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('wooded_paralope') + + core.spawnService.addLairTemplate('corellia_wooded_paralope_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small_evil_fire_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/corellia_wrix_lair_1.py b/scripts/mobiles/lairs/corellia_wrix_lair_1.py new file mode 100644 index 00000000..c61b1eb8 --- /dev/null +++ b/scripts/mobiles/lairs/corellia_wrix_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('wrix') + + core.spawnService.addLairTemplate('corellia_wrix_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_ancient_graul_lair_1.py b/scripts/mobiles/lairs/dantooine_ancient_graul_lair_1.py new file mode 100644 index 00000000..cc31937a --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_ancient_graul_lair_1.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('ancient_graul') + + + core.spawnService.addLairTemplate('dantooine_ancient_graul_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/cave_small_light.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_bol_lair_1.py b/scripts/mobiles/lairs/dantooine_bol_lair_1.py index 953c80f5..0bbd1300 100644 --- a/scripts/mobiles/lairs/dantooine_bol_lair_1.py +++ b/scripts/mobiles/lairs/dantooine_bol_lair_1.py @@ -3,7 +3,9 @@ from java.util import Vector def addTemplate(core): mobileTemplates = Vector() - mobileTemplates.add('lesser_plains_bol') - mobileTemplates.add('seething_bol_crusher') - mobileTemplates.add('swift_charging_bol') - core.spawnService.addLairTemplate('dantooine_bol_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') \ No newline at end of file + mobileTemplates.add('bol') + mobileTemplates.add('bol_pack_runner') + mobileTemplates.add('baby_bol') + + core.spawnService.addLairTemplate('dantooine_bol_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_bol_lair_2.py b/scripts/mobiles/lairs/dantooine_bol_lair_2.py new file mode 100644 index 00000000..617b642e --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_bol_lair_2.py @@ -0,0 +1,11 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('bol') + mobileTemplates.add('bol_pack_runner') + mobileTemplates.add('baby_bol') + + core.spawnService.addLairTemplate('dantooine_bol_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_bol_lair_3.py b/scripts/mobiles/lairs/dantooine_bol_lair_3.py new file mode 100644 index 00000000..acdf2eac --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_bol_lair_3.py @@ -0,0 +1,11 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('bol') + mobileTemplates.add('bol_pack_runner') + mobileTemplates.add('swift_charging_bol') + + core.spawnService.addLairTemplate('dantooine_bol_lair_3', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_bol_lair_4.py b/scripts/mobiles/lairs/dantooine_bol_lair_4.py new file mode 100644 index 00000000..a219678b --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_bol_lair_4.py @@ -0,0 +1,11 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('bol') + mobileTemplates.add('bol_pack_runner') + mobileTemplates.add('swift_charging_bol') + + core.spawnService.addLairTemplate('dantooine_bol_lair_4', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_bol_lair_5.py b/scripts/mobiles/lairs/dantooine_bol_lair_5.py new file mode 100644 index 00000000..e4ba26a7 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_bol_lair_5.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('lesser_plains_bol') + + core.spawnService.addLairTemplate('dantooine_bol_lair_5', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_bol_lair_6.py b/scripts/mobiles/lairs/dantooine_bol_lair_6.py new file mode 100644 index 00000000..e5787a02 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_bol_lair_6.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('lesser_plains_bol') + + core.spawnService.addLairTemplate('dantooine_bol_lair_6', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_bol_lair_7.py b/scripts/mobiles/lairs/dantooine_bol_lair_7.py new file mode 100644 index 00000000..9e6d793c --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_bol_lair_7.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('seething_bol_crusher') + + core.spawnService.addLairTemplate('dantooine_bol_lair_6', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_bol_lair_8.py b/scripts/mobiles/lairs/dantooine_bol_lair_8.py new file mode 100644 index 00000000..bb17c668 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_bol_lair_8.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('seething_bol_crusher') + + core.spawnService.addLairTemplate('dantooine_bol_lair_6', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rock_shelter_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_frenzied_graul_lair_1.py b/scripts/mobiles/lairs/dantooine_frenzied_graul_lair_1.py new file mode 100644 index 00000000..55991920 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_frenzied_graul_lair_1.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('frenzied_graul') + + + core.spawnService.addLairTemplate('dantooine_frenzied_graul_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/cave_small_dark.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_graul_lair_1.py b/scripts/mobiles/lairs/dantooine_graul_lair_1.py index 953c80f5..f8c2d409 100644 --- a/scripts/mobiles/lairs/dantooine_graul_lair_1.py +++ b/scripts/mobiles/lairs/dantooine_graul_lair_1.py @@ -2,8 +2,5 @@ import sys from java.util import Vector def addTemplate(core): - mobileTemplates = Vector() - mobileTemplates.add('lesser_plains_bol') - mobileTemplates.add('seething_bol_crusher') - mobileTemplates.add('swift_charging_bol') - core.spawnService.addLairTemplate('dantooine_bol_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') \ No newline at end of file + core.spawnService.addLairTemplate('dantooine_graul_mauler_lair_1', 'graul', 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_graul_mauler_lair_1.py b/scripts/mobiles/lairs/dantooine_graul_mauler_lair_1.py index dfad5707..88845099 100644 --- a/scripts/mobiles/lairs/dantooine_graul_mauler_lair_1.py +++ b/scripts/mobiles/lairs/dantooine_graul_mauler_lair_1.py @@ -2,4 +2,5 @@ import sys from java.util import Vector def addTemplate(core): - core.spawnService.addLairTemplate('dantooine_graul_mauler_lair_1', 'graul_mauler', 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') \ No newline at end of file + core.spawnService.addLairTemplate('dantooine_graul_mauler_lair_1', 'graul_mauler', 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_evil_fire_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_graul_mauler_lair_2.py b/scripts/mobiles/lairs/dantooine_graul_mauler_lair_2.py new file mode 100644 index 00000000..ca0b46d3 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_graul_mauler_lair_2.py @@ -0,0 +1,11 @@ +import sys +from java.util import Vector + +def addTemplate(core): + + mobileTemplates = Vector() + mobileTemplates.add('graul_mauler') + mobileTemplates.add('graul_mangler') + + core.spawnService.addLairTemplate('dantooine_graul_mauler_lair_1', mobileTemplates , 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_evil_fire_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_huurton_howler_lair_1.py b/scripts/mobiles/lairs/dantooine_huurton_howler_lair_1.py new file mode 100644 index 00000000..12dc3b54 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_huurton_howler_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('huurton_howler') + + core.spawnService.addLairTemplate('dantooine_huurton_howler_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/bramble_light.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_huurton_howler_lair_2.py b/scripts/mobiles/lairs/dantooine_huurton_howler_lair_2.py new file mode 100644 index 00000000..9ed66794 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_huurton_howler_lair_2.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('huurton_howler') + mobileTemplates.add('huurton_bloodhunter') + + core.spawnService.addLairTemplate('dantooine_huurton_howler_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_brambles_large_fog_mustard.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_huurton_lair_1.py b/scripts/mobiles/lairs/dantooine_huurton_lair_1.py index 68fe6e33..6b3e89e2 100644 --- a/scripts/mobiles/lairs/dantooine_huurton_lair_1.py +++ b/scripts/mobiles/lairs/dantooine_huurton_lair_1.py @@ -6,4 +6,6 @@ def addTemplate(core): mobileTemplates.add('huurton') mobileTemplates.add('huurton_howler') mobileTemplates.add('huurton_matron') - core.spawnService.addLairTemplate('dantooine_huurton_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') \ No newline at end of file + + core.spawnService.addLairTemplate('dantooine_huurton_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_huurton_lair_2.py b/scripts/mobiles/lairs/dantooine_huurton_lair_2.py index a94d718e..03eb120a 100644 --- a/scripts/mobiles/lairs/dantooine_huurton_lair_2.py +++ b/scripts/mobiles/lairs/dantooine_huurton_lair_2.py @@ -6,4 +6,6 @@ def addTemplate(core): mobileTemplates.add('huurton_pub') mobileTemplates.add('huurton_reaper') mobileTemplates.add('huurton_stalker') - core.spawnService.addLairTemplate('dantooine_huurton_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') \ No newline at end of file + + core.spawnService.addLairTemplate('dantooine_huurton_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_huurton_matron_lair_1.py b/scripts/mobiles/lairs/dantooine_huurton_matron_lair_1.py new file mode 100644 index 00000000..176637aa --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_huurton_matron_lair_1.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('huurton_matron') + + + core.spawnService.addLairTemplate('dantooine_huurton_matron_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/bramble_light.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_piket_lair_1.py b/scripts/mobiles/lairs/dantooine_piket_lair_1.py index a6ccd8a6..baff7b2c 100644 --- a/scripts/mobiles/lairs/dantooine_piket_lair_1.py +++ b/scripts/mobiles/lairs/dantooine_piket_lair_1.py @@ -1,4 +1,5 @@ import sys def addTemplate(core): - core.spawnService.addLairTemplate('dantooine_piket_lair_1', 'piket', 15, 'object/tangible/lair/base/shared_earthmound_light.iff') \ No newline at end of file + core.spawnService.addLairTemplate('dantooine_piket_lair_1', 'piket', 15, 'object/tangible/lair/base/shared_earthmound_light.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_piket_longhorn_lair_1.py b/scripts/mobiles/lairs/dantooine_piket_longhorn_lair_1.py index 1e24cef1..d4f0229e 100644 --- a/scripts/mobiles/lairs/dantooine_piket_longhorn_lair_1.py +++ b/scripts/mobiles/lairs/dantooine_piket_longhorn_lair_1.py @@ -5,5 +5,6 @@ def addTemplate(core): mobileTemplates = Vector() mobileTemplates.add('piket_longhorn') mobileTemplates.add('piket_longhorn_female') - mobileTemplates.add('piket_plains_walker') - core.spawnService.addLairTemplate('dantooine_piket_longhorn_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_earthmound_light.iff') \ No newline at end of file + + core.spawnService.addLairTemplate('dantooine_piket_longhorn_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/lair_base_mound_bramble_dark.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_piket_longhorn_lair_2.py b/scripts/mobiles/lairs/dantooine_piket_longhorn_lair_2.py new file mode 100644 index 00000000..7bad6b0e --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_piket_longhorn_lair_2.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('piket_longhorn') + mobileTemplates.add('piket_longhorn_female') + + core.spawnService.addLairTemplate('dantooine_piket_longhorn_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_piket_plains_walker_lair_1.py b/scripts/mobiles/lairs/dantooine_piket_plains_walker_lair_1.py index b837fe8c..88314728 100644 --- a/scripts/mobiles/lairs/dantooine_piket_plains_walker_lair_1.py +++ b/scripts/mobiles/lairs/dantooine_piket_plains_walker_lair_1.py @@ -4,4 +4,6 @@ from java.util import Vector def addTemplate(core): mobileTemplates = Vector() mobileTemplates.add('piket_plains_walker') - core.spawnService.addLairTemplate('dantooine_piket_plains_walker_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_earthmound_light.iff') \ No newline at end of file + + core.spawnService.addLairTemplate('dantooine_piket_plains_walker_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_earthmound_light.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_piket_protector_lair_1.py b/scripts/mobiles/lairs/dantooine_piket_protector_lair_1.py new file mode 100644 index 00000000..fd64b4e1 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_piket_protector_lair_1.py @@ -0,0 +1,5 @@ +import sys + +def addTemplate(core): + core.spawnService.addLairTemplate('dantooine_piket_protector_lair_1', 'fierce_piket_protector', 15, 'object/tangible/lair/base/poi_all_lair_rocks_large.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_quenker_bile_lair_1.py b/scripts/mobiles/lairs/dantooine_quenker_bile_lair_1.py new file mode 100644 index 00000000..166c54d3 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_quenker_bile_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('bile_drenched_quenker') + + core.spawnService.addLairTemplate('dantooine_quenker_bile_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small_fog_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_quenker_bile_lair_2.py b/scripts/mobiles/lairs/dantooine_quenker_bile_lair_2.py new file mode 100644 index 00000000..061d5ffa --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_quenker_bile_lair_2.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('bile_drenched_quenker') + + core.spawnService.addLairTemplate('dantooine_quenker_bile_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_warren_small_fog_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_quenker_lair_1.py b/scripts/mobiles/lairs/dantooine_quenker_lair_1.py index 4856d31e..204cc448 100644 --- a/scripts/mobiles/lairs/dantooine_quenker_lair_1.py +++ b/scripts/mobiles/lairs/dantooine_quenker_lair_1.py @@ -4,6 +4,6 @@ from java.util import Vector def addTemplate(core): mobileTemplates = Vector() mobileTemplates.add('quenker') - mobileTemplates.add('quenker_ravager') - mobileTemplates.add('quenker_relic_reaper') - core.spawnService.addLairTemplate('dantooine_quenker_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') \ No newline at end of file + + core.spawnService.addLairTemplate('dantooine_quenker_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_fog_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_quenker_ravager_lair_1.py b/scripts/mobiles/lairs/dantooine_quenker_ravager_lair_1.py new file mode 100644 index 00000000..9fba4007 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_quenker_ravager_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('quenker_ravager') + + core.spawnService.addLairTemplate('dantooine_quenker_ravager_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_warren_small_evil_fire_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_quenker_relic_reaper_lair_1.py b/scripts/mobiles/lairs/dantooine_quenker_relic_reaper_lair_1.py new file mode 100644 index 00000000..a4a8011f --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_quenker_relic_reaper_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('quenker_relic_reaper') + + core.spawnService.addLairTemplate('dantooine_quenker_relic_reaper_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_warren_small_fog_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_quenker_savage_lair_1.py b/scripts/mobiles/lairs/dantooine_quenker_savage_lair_1.py new file mode 100644 index 00000000..bbce9ee6 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_quenker_savage_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('savage_quenker') + + core.spawnService.addLairTemplate('dantooine_quenker_savage_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_warren_small_fog_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_quenker_savage_lair_2.py b/scripts/mobiles/lairs/dantooine_quenker_savage_lair_2.py new file mode 100644 index 00000000..3b58cfdb --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_quenker_savage_lair_2.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('savage_quenker') + mobileTemplates.add('terrible_quenker') + + core.spawnService.addLairTemplate('dantooine_quenker_savage_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_warren_small_evil_fire_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_thune_lair_1.py b/scripts/mobiles/lairs/dantooine_thune_lair_1.py index 93962a7a..1ab7ea01 100644 --- a/scripts/mobiles/lairs/dantooine_thune_lair_1.py +++ b/scripts/mobiles/lairs/dantooine_thune_lair_1.py @@ -4,6 +4,6 @@ from java.util import Vector def addTemplate(core): mobileTemplates = Vector() mobileTemplates.add('thune') - mobileTemplates.add('thune_grassland_guardian') - mobileTemplates.add('thune_herd_leader') - core.spawnService.addLairTemplate('dantooine_thune_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/shared_earthmound_light.iff') \ No newline at end of file + + core.spawnService.addLairTemplate('dantooine_thune_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_rocks_large_fog_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_voritor_horned_lizard_lair_1.py b/scripts/mobiles/lairs/dantooine_voritor_horned_lizard_lair_1.py new file mode 100644 index 00000000..0db9d437 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_voritor_horned_lizard_lair_1.py @@ -0,0 +1,6 @@ +import sys +from java.util import Vector + +def addTemplate(core): + core.spawnService.addLairTemplate('dantooine_voritor_horned_lizard_lair_1', 'horned_voritor_jungle_lizard', 15, 'object/tangible/lair/base/poi_all_lair_leaf_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_voritor_horned_lizard_lair_2.py b/scripts/mobiles/lairs/dantooine_voritor_horned_lizard_lair_2.py new file mode 100644 index 00000000..5b387af4 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_voritor_horned_lizard_lair_2.py @@ -0,0 +1,6 @@ +import sys +from java.util import Vector + +def addTemplate(core): + core.spawnService.addLairTemplate('dantooine_voritor_horned_lizard_lair_1', 'horned_voritor_jungle_lizard', 15, 'object/tangible/lair/base/poi_all_lair_thicket_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_voritor_hunter_lair_1.py b/scripts/mobiles/lairs/dantooine_voritor_hunter_lair_1.py new file mode 100644 index 00000000..e466f3fd --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_voritor_hunter_lair_1.py @@ -0,0 +1,6 @@ +import sys +from java.util import Vector + +def addTemplate(core): + core.spawnService.addLairTemplate('dantooine_voritor_hunter_lair_2', 'slinking_voritor_hunter', 15, 'object/tangible/lair/base/poi_all_lair_bones.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_voritor_hunter_lair_2.py b/scripts/mobiles/lairs/dantooine_voritor_hunter_lair_2.py new file mode 100644 index 00000000..2df263de --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_voritor_hunter_lair_2.py @@ -0,0 +1,6 @@ +import sys +from java.util import Vector + +def addTemplate(core): + core.spawnService.addLairTemplate('dantooine_voritor_hunter_lair_1', 'slinking_voritor_hunter', 15, 'object/tangible/lair/base/poi_all_lair_dead_log_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_voritor_jungle_lair_1.py b/scripts/mobiles/lairs/dantooine_voritor_jungle_lair_1.py new file mode 100644 index 00000000..332d53a1 --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_voritor_jungle_lair_1.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('horned_voritor_jungle_lizard') + mobileTemplates.add('spiked_slasher') + + core.spawnService.addLairTemplate('dantooine_voritor_jungle_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_leaf_small_fog_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_voritor_jungle_lair_2.py b/scripts/mobiles/lairs/dantooine_voritor_jungle_lair_2.py new file mode 100644 index 00000000..9dc8a02a --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_voritor_jungle_lair_2.py @@ -0,0 +1,10 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('horned_voritor_jungle_lizard') + mobileTemplates.add('spiked_slasher') + + core.spawnService.addLairTemplate('dantooine_voritor_jungle_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small_fog_red.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_voritor_lair_1.py b/scripts/mobiles/lairs/dantooine_voritor_lair_1.py index 8e1afee4..cb1f3fbf 100644 --- a/scripts/mobiles/lairs/dantooine_voritor_lair_1.py +++ b/scripts/mobiles/lairs/dantooine_voritor_lair_1.py @@ -2,4 +2,8 @@ import sys from java.util import Vector def addTemplate(core): - core.spawnService.addLairTemplate('dantooine_voritor_lair_1', 'voritor_lizard', 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') \ No newline at end of file + mobileTemplates = Vector() + mobileTemplates.add('voritor_lizard') + + core.spawnService.addLairTemplate('dantooine_voritor_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_leaf_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_voritor_lair_2.py b/scripts/mobiles/lairs/dantooine_voritor_lair_2.py index 9352c9f3..8ec37571 100644 --- a/scripts/mobiles/lairs/dantooine_voritor_lair_2.py +++ b/scripts/mobiles/lairs/dantooine_voritor_lair_2.py @@ -3,9 +3,7 @@ from java.util import Vector def addTemplate(core): mobileTemplates = Vector() - mobileTemplates.add('voritor_lizard') - mobileTemplates.add('horned_voritor_jungle_lizard') - mobileTemplates.add('vexed_voritor_lizard') - mobileTemplates.add('voritor_dasher') - mobileTemplates.add('spiked_slasher') - core.spawnService.addLairTemplate('dantooine_voritor_lair_2', mobileTemplates, 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') \ No newline at end of file + mobileTemplates.add('voritor_lizard') + + core.spawnService.addLairTemplate('dantooine_voritor_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/dantooine_voritor_tracker_lair_1.py b/scripts/mobiles/lairs/dantooine_voritor_tracker_lair_1.py new file mode 100644 index 00000000..c144818b --- /dev/null +++ b/scripts/mobiles/lairs/dantooine_voritor_tracker_lair_1.py @@ -0,0 +1,9 @@ +import sys +from java.util import Vector + +def addTemplate(core): + mobileTemplates = Vector() + mobileTemplates.add('grassland_voritor_tracker') + + core.spawnService.addLairTemplate('dantooine_voritor_tracker_lair_1', mobileTemplates, 15, 'object/tangible/lair/base/poi_all_lair_thicket_small_fog_green.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/naboo_chuba_lair_neutral_small.py b/scripts/mobiles/lairs/naboo_chuba_lair_neutral_small.py index ac408bdb..8b1f2057 100644 --- a/scripts/mobiles/lairs/naboo_chuba_lair_neutral_small.py +++ b/scripts/mobiles/lairs/naboo_chuba_lair_neutral_small.py @@ -1,4 +1,5 @@ import sys def addTemplate(core): - core.spawnService.addLairTemplate('naboo_chuba_lair_neutral_small', 'chuba', 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') \ No newline at end of file + core.spawnService.addLairTemplate('naboo_chuba_lair_neutral_small', 'chuba', 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/tatooine_kreetle_lair_neutral_small.py b/scripts/mobiles/lairs/tatooine_kreetle_lair_neutral_small.py index 76e76ebe..c50994d2 100644 --- a/scripts/mobiles/lairs/tatooine_kreetle_lair_neutral_small.py +++ b/scripts/mobiles/lairs/tatooine_kreetle_lair_neutral_small.py @@ -1,4 +1,5 @@ import sys def addTemplate(core): - core.spawnService.addLairTemplate('tatooine_kreetle_lair_neutral_small', 'kreetle', 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') \ No newline at end of file + core.spawnService.addLairTemplate('tatooine_kreetle_lair_neutral_small', 'kreetle', 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') + return \ No newline at end of file diff --git a/scripts/mobiles/lairs/tatooine_womprat_lair_neutral_small.py b/scripts/mobiles/lairs/tatooine_womprat_lair_neutral_small.py index 60400598..6de07bc2 100644 --- a/scripts/mobiles/lairs/tatooine_womprat_lair_neutral_small.py +++ b/scripts/mobiles/lairs/tatooine_womprat_lair_neutral_small.py @@ -1,4 +1,5 @@ import sys def addTemplate(core): - core.spawnService.addLairTemplate('tatooine_womprat_lair_neutral_small', 'womprat', 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') \ No newline at end of file + core.spawnService.addLairTemplate('tatooine_womprat_lair_neutral_small', 'womprat', 15, 'object/tangible/lair/base/shared_poi_all_lair_brambles_small.iff') + return \ No newline at end of file diff --git a/scripts/object/building/player/player_house_mustafar_lg.py b/scripts/object/building/player/player_house_mustafar_lg.py index c768c102..4fc36272 100644 --- a/scripts/object/building/player/player_house_mustafar_lg.py +++ b/scripts/object/building/player/player_house_mustafar_lg.py @@ -8,4 +8,10 @@ def setup(core, object): structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -4.1, 0.55, 6.6, 0.714 ,0.714, 1) #structureterminal.setAttachment('radial_filename', 'structure_management_terminal') structureterminal.setAttachment('housing_parentstruct', object) + + elevatorterminal1 = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_elevator_down.iff', 0, 0.8, -0.655, -0.103, 0.998, 10) + + elevatorterminal2 = core.objectService.createChildobject(object, 'object/tangible/terminal/shared_terminal_elevator.iff', 0, -3, -0.655, 0.994, -0.103, 10) + + elevatorterminal3 = core.objectService.createChildobject(object, 'object/tangible/terminal/shared_terminal_elevator_up.iff', 0, -6, -0.655, 0.994, -0.103, 10) return \ No newline at end of file diff --git a/scripts/radial/terminal/travel_terminal_itv.py b/scripts/radial/terminal/travel_terminal_itv.py index 510d23f9..b9356f38 100644 --- a/scripts/radial/terminal/travel_terminal_itv.py +++ b/scripts/radial/terminal/travel_terminal_itv.py @@ -1,5 +1,5 @@ from resources.common import RadialOptions -from protocol.swg import EnterTicketPurchaseModeMessage +from protocol.swg import EnterTicketPurchaseModeMessageItv import sys def createRadial(core, owner, target, radials): @@ -14,7 +14,7 @@ def handleSelection(core, owner, target, option): if owner.getCombatFlag() == 1: owner.sendSystemMessage('You can\'t use that while in combat.', 0) return - tpm = EnterTicketPurchaseModeMessage(owner.getPlanet().getName(), core.mapService.getClosestCityName(owner), owner) + tpm = EnterTicketPurchaseModeMessage(owner.getPlanet().getName(), core.mapService.getClosestCityName(owner), owner, True) owner.getClient().getSession().write(tpm.serialize()) return return diff --git a/scripts/skillMods/elemental_resistance.py b/scripts/skillMods/elemental_resistance.py new file mode 100644 index 00000000..5a327427 --- /dev/null +++ b/scripts/skillMods/elemental_resistance.py @@ -0,0 +1,16 @@ +import sys + +def add(core, actor, skillMod, divisor): + core.skillModService.addSkillMod(actor, 'acid', skillMod) + core.skillModService.addSkillMod(actor, 'heat', skillMod) + core.skillModService.addSkillMod(actor, 'cold', skillMod) + core.skillModService.addSkillMod(actor, 'electricity', skillMod) + return + +def deduct(core, actor, skillMod, divisor): + core.skillModService.deductSkillMod(actor, 'acid', skillMod) + core.skillModService.deductSkillMod(actor, 'heat', skillMod) + core.skillModService.deductSkillMod(actor, 'cold', skillMod) + core.skillModService.deductSkillMod(actor, 'electricity', skillMod) + return + \ No newline at end of file diff --git a/scripts/skillMods/expertise_innate_protection_acid.py b/scripts/skillMods/expertise_innate_protection_acid.py new file mode 100644 index 00000000..f3597431 --- /dev/null +++ b/scripts/skillMods/expertise_innate_protection_acid.py @@ -0,0 +1,10 @@ +import sys + +def add(core, actor, skillMod, divisor): + core.skillModService.addSkillMod(actor, 'acid', skillMod) + return + +def deduct(core, actor, skillMod, divisor): + core.skillModService.deductSkillMod(actor, 'acid', skillMod) + return + \ No newline at end of file diff --git a/scripts/skillMods/expertise_innate_protection_cold.py b/scripts/skillMods/expertise_innate_protection_cold.py new file mode 100644 index 00000000..8581c26d --- /dev/null +++ b/scripts/skillMods/expertise_innate_protection_cold.py @@ -0,0 +1,10 @@ +import sys + +def add(core, actor, skillMod, divisor): + core.skillModService.addSkillMod(actor, 'cold', skillMod) + return + +def deduct(core, actor, skillMod, divisor): + core.skillModService.deductSkillMod(actor, 'cold', skillMod) + return + \ No newline at end of file diff --git a/scripts/skillMods/expertise_innate_protection_electricity.py b/scripts/skillMods/expertise_innate_protection_electricity.py new file mode 100644 index 00000000..6174b979 --- /dev/null +++ b/scripts/skillMods/expertise_innate_protection_electricity.py @@ -0,0 +1,10 @@ +import sys + +def add(core, actor, skillMod, divisor): + core.skillModService.addSkillMod(actor, 'electricity', skillMod) + return + +def deduct(core, actor, skillMod, divisor): + core.skillModService.deductSkillMod(actor, 'electricity', skillMod) + return + \ No newline at end of file diff --git a/scripts/skillMods/expertise_innate_protection_heat.py b/scripts/skillMods/expertise_innate_protection_heat.py new file mode 100644 index 00000000..19188fc7 --- /dev/null +++ b/scripts/skillMods/expertise_innate_protection_heat.py @@ -0,0 +1,10 @@ +import sys + +def add(core, actor, skillMod, divisor): + core.skillModService.addSkillMod(actor, 'heat', skillMod) + return + +def deduct(core, actor, skillMod, divisor): + core.skillModService.deductSkillMod(actor, 'heat', skillMod) + return + \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/mos_espa_frog.py b/scripts/static_spawns/tatooine/mos_espa_frog.py new file mode 100644 index 00000000..8f87f45c --- /dev/null +++ b/scripts/static_spawns/tatooine/mos_espa_frog.py @@ -0,0 +1,14 @@ +# Project SWG: Mos Espa: Frogbuilding +# (C)2014 ProjectSWG + +import sys + +def addPlanetSpawns(core, planet): + + + stcSvc = core.staticService + objSvc = core.objectService + + stcSvc.spawnObject('object/tangible/terminal/shared_terminal_character_builder.iff', 'tatooine', long(0), float(-3308), float(5.4), float(2174), float(0.70), float(0.71)) + return + diff --git a/src/protocol/swg/EnterTicketPurchaseModeMessage.java b/src/protocol/swg/EnterTicketPurchaseModeMessage.java index 8ba42533..0287c55c 100644 --- a/src/protocol/swg/EnterTicketPurchaseModeMessage.java +++ b/src/protocol/swg/EnterTicketPurchaseModeMessage.java @@ -36,6 +36,14 @@ public class EnterTicketPurchaseModeMessage extends SWGMessage { private String planetName; private String cityName; private SWGObject player; + private boolean isItv = false; + + public EnterTicketPurchaseModeMessage(String planetName, String cityName, SWGObject player, boolean isItv) { + this.planetName = planetName; + this.cityName = cityName; + this.player = player; + this.isItv = true; + } public EnterTicketPurchaseModeMessage(String planetName, String cityName, SWGObject player) { this.planetName = planetName; @@ -51,9 +59,12 @@ public class EnterTicketPurchaseModeMessage extends SWGMessage { @Override public IoBuffer serialize() { final NGECore core = NGECore.getInstance(); - TravelPoint nearestPoint = core.travelService.getNearestTravelPoint(player); - IoBuffer result = IoBuffer.allocate(11 + planetName.length() + nearestPoint.getName().length()).order(ByteOrder.LITTLE_ENDIAN); + TravelPoint nearestPoint = null; + if (!isItv) nearestPoint = core.travelService.getNearestTravelPoint(player); + else nearestPoint = core.travelService.getNearestTravelPoint(player, 5120); + + IoBuffer result = IoBuffer.allocate(11 + planetName.length() + nearestPoint.getName().length()).order(ByteOrder.LITTLE_ENDIAN); result.putShort((short) 3); result.putInt(0x904DAE1A); diff --git a/src/resources/common/BuffBuilder.java b/src/resources/common/BuffBuilder.java index 83b2d9fb..cd3c48a4 100644 --- a/src/resources/common/BuffBuilder.java +++ b/src/resources/common/BuffBuilder.java @@ -30,6 +30,11 @@ public class BuffBuilder { private String statAffects; private String statName; + + public enum BuffCategory {ATTRIBUTES,RESISTANCES,TRADE,COMBAT,MISC}; + private BuffCategory catId; + + public BuffBuilder() { } @@ -42,6 +47,10 @@ public class BuffBuilder { return category; } + public BuffCategory getCategoryId() { + return catId; + } + public int getCost() { return this.cost; } @@ -66,7 +75,26 @@ public class BuffBuilder { this.affectAmount = affectAmount; } - public void setCategory(String category) { + public void setCategory(String category) + { + this.catId=BuffCategory.MISC; + if(category.equals("attributes")) + { + this.catId=BuffCategory.ATTRIBUTES; + } + else if(category.equals("trade")) + { + this.catId=BuffCategory.TRADE; + } + else if(category.equals("resistances")) + { + this.catId=BuffCategory.RESISTANCES; + } + else if(category.equals("combat")) + { + this.catId=BuffCategory.COMBAT; + } + this.category = category; } diff --git a/src/resources/objects/creature/CreatureMessageBuilder.java b/src/resources/objects/creature/CreatureMessageBuilder.java index 33367160..80bd3f58 100644 --- a/src/resources/objects/creature/CreatureMessageBuilder.java +++ b/src/resources/objects/creature/CreatureMessageBuilder.java @@ -138,10 +138,10 @@ public class CreatureMessageBuilder extends TangibleMessageBuilder { buffer.putLong(creature.getOwnerId()); - float height = creature.getHeight(); + //float height = creature.getHeight(); //if (height < 0.7 || height > 1.5) // height = 1; - buffer.putFloat(height); + buffer.putFloat(creature.getHeight()); buffer.putInt(0); // battle fatigue buffer.putLong(creature.getStateBitmask()); int size = buffer.position(); @@ -150,8 +150,6 @@ public class CreatureMessageBuilder extends TangibleMessageBuilder { buffer.flip(); buffer = createBaseline("CREO", (byte) 3, buffer, size); - tools.CharonPacketUtils.printAnalysis(buffer, "CREO 3"); - return buffer; } diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index 332d1731..f0cb1bdc 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -24,6 +24,7 @@ package resources.objects.creature; import java.io.Serializable; import java.lang.System; import java.util.ArrayList; +import java.util.BitSet; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -55,6 +56,7 @@ import resources.objects.ObjectMessageBuilder; import resources.objects.SWGList; import resources.objects.SWGMap; import engine.resources.common.CRC; +import engine.resources.objects.Baseline; import engine.resources.objects.SWGObject; import engine.resources.scene.Planet; import engine.resources.scene.Point3D; @@ -72,7 +74,7 @@ public class CreatureObject extends TangibleObject implements Serializable { // CREO 1 private int bankCredits = 0; private int cashCredits = 0; - private List skills; + private SWGList skills; @NotPersistent private transient int skillsUpdateCounter = 0; @@ -192,7 +194,7 @@ public class CreatureObject extends TangibleObject implements Serializable { super(objectID, planet, position, orientation, Template); messageBuilder = new CreatureMessageBuilder(this); loadTemplateData(); - skills = new ArrayList(); + skills = new SWGList(); skillMods = new SWGMap(this, 4, 3, true); abilities = new SWGMap(this, 4, 14, true); missionCriticalObjects = new SWGMap(this, 4, 13, false); @@ -235,7 +237,38 @@ public class CreatureObject extends TangibleObject implements Serializable { setTurnRadius((float) getTemplateData().getAttribute("turnRate"));*/ } + + /*@Override + public Baseline getBaseline1() { + Baseline baseline = super.getBaseline1(); + baseline.put("bankCredits", 0); + baseline.put("cashCredits", 0); + + // HAM base list stuff + baseline.put("baseHAM", 6); // list size + baseline.put("unk1", 0); // udpate count? + baseline.put("health", 1000); + baseline.put("spacer1", 0); + baseline.put("action", 300); + baseline.put("spacer2", 0); + baseline.put("unk2", 0x2C01); + baseline.put("unk3", 0); + + baseline.put("skills", new SWGList()); + return baseline; + } + @Override + public Baseline getBaseline3() { + Baseline baseline = super.getBaseline3(); + baseline.put("posture", (byte) 0); + baseline.put("creo3unk1", (byte) 0); + baseline.put("ownerId", (long) 0); + baseline.put("height", (float) 1.3); + baseline.put("battleFatigue", 0); + baseline.put("stateBitmask", new BitSet()); + return baseline; + }*/ public int getBankCredits() { synchronized(objectMutex) { return bankCredits; @@ -299,7 +332,7 @@ public class CreatureObject extends TangibleObject implements Serializable { } } - public List getSkills() { + public SWGList getSkills() { return skills; } diff --git a/src/services/BuffService.java b/src/services/BuffService.java index 993c25bb..70a24957 100644 --- a/src/services/BuffService.java +++ b/src/services/BuffService.java @@ -89,7 +89,10 @@ public class BuffService implements INetworkDispatch { Buff buff = buffMap.get(buffName); - if(buff == null) return false; + if(buff == null) + { + return false; + } // Here the necessary checks must be placed to prevent buffs from the same buff group (e.g. Buff D) being stacked! @@ -105,6 +108,10 @@ public class BuffService implements INetworkDispatch { public Buff doAddBuff(final CreatureObject target, String buffName, final CreatureObject buffer) { + //BUG HERE !! watch it + //TODO fix this -- !! this is wrong - I can buff from 5,5 in cantina someone sitting at 20,20 in the universe/planet !!! - accross the galaxy/planet + //cause get position is relative to creature system of coordinates - when one's outside and other inside + //if you must use getPosition() check for isInCell first for both or something like that if (target.getPosition().getDistance(buffer.getPosition()) > 20) { return null; } @@ -119,10 +126,24 @@ public class BuffService implements INetworkDispatch { else buff.setTotalPlayTime(0); - if(FileUtilities.doesFileExist("scripts/buffs/" + buffName + ".py")) core.scriptService.callScript("scripts/buffs/", buffName, "setup", core, buffer, buff); + + if(FileUtilities.doesFileExist("scripts/buffs/" + buffName + ".py")) + { + if(!buffName.equals("buildabuff_inspiration")) + { + core.scriptService.callScript("scripts/buffs/", buffName, "setup", core, buffer, buff); + } + else + { + //!!! for special case inspiration , workshop is attached to target + core.scriptService.callScript("scripts/buffs/", buffName, "add", core, target, buff); + } + } + + for (final Buff otherBuff : target.getBuffList()) { - if (buff.getGroup1().equals(otherBuff.getGroup1())) + if (buff.getGroup1().equals(otherBuff.getGroup1())) if (buff.getPriority() >= otherBuff.getPriority()) { if (buff.getBuffName().equals(otherBuff.getBuffName())) { @@ -143,11 +164,11 @@ public class BuffService implements INetworkDispatch { if (otherBuff.getRemainingDuration() > buff.getDuration() && otherBuff.getStacks() >= otherBuff.getMaxStacks()) return null; } - removeBuffFromCreature(target, otherBuff); break; - } else { - System.out.println("buff not added:" + buffName); + } else + { + return null; } } @@ -218,9 +239,12 @@ public class BuffService implements INetworkDispatch { } @SuppressWarnings("unused") - public void removeBuffFromCreature(CreatureObject creature, Buff buff) { + public void removeBuffFromCreature(CreatureObject creature, Buff buff) + { if(!creature.getBuffList().contains(buff)) - return; + { + return; + } DamageOverTime dot = creature.getDotByBuff(buff); if(dot != null) { dot.getTask().cancel(true); @@ -230,14 +254,40 @@ public class BuffService implements INetworkDispatch { /* if(FileUtilities.doesFileExist("scripts/buffs/" + buff.getBuffName() + ".py")) core.scriptService.callScript("scripts/buffs/", buff.getBuffName(), "remove", core, creature, buff); else {*/ - if(buff.getEffect1Name().length() > 0) core.skillModService.deductSkillMod(creature, buff.getEffect1Name(), (int) buff.getEffect1Value()); - if(buff.getEffect2Name().length() > 0) core.skillModService.deductSkillMod(creature, buff.getEffect2Name(), (int) buff.getEffect2Value()); - if(buff.getEffect1Name().length() > 0) core.skillModService.deductSkillMod(creature, buff.getEffect3Name(), (int) buff.getEffect3Value()); - if(buff.getEffect1Name().length() > 0) core.skillModService.deductSkillMod(creature, buff.getEffect4Name(), (int) buff.getEffect4Value()); - if(buff.getEffect1Name().length() > 0) core.skillModService.deductSkillMod(creature, buff.getEffect5Name(), (int) buff.getEffect5Value()); -// } - if (!buff.getCallback().equals("none") && !buff.getCallback().equals("")) { + if(buff.getEffect1Name().length() > 0) + { + + core.skillModService.deductSkillMod(creature, buff.getEffect1Name(), (int) buff.getEffect1Value()); + + } + + if(buff.getEffect2Name().length() > 0) + { + core.skillModService.deductSkillMod(creature, buff.getEffect2Name(), (int) buff.getEffect2Value()); + } + + if(buff.getEffect3Name().length() > 0) + { + core.skillModService.deductSkillMod(creature, buff.getEffect3Name(), (int) buff.getEffect3Value()); + + } + + if(buff.getEffect4Name().length() > 0) + { + core.skillModService.deductSkillMod(creature, buff.getEffect4Name(), (int) buff.getEffect4Value()); + + } + + if(buff.getEffect5Name().length() > 0) + { + core.skillModService.deductSkillMod(creature, buff.getEffect5Name(), (int) buff.getEffect5Value()); + } +// } + + // ??? callback for what ? toggle buff ? + if (!buff.getCallback().equals("none") && !buff.getCallback().equals("")) + { if (FileUtilities.doesFileExist("scripts/buffs/" + buff.getBuffName() + ".py")) { PyObject method = core.scriptService.getMethod("scripts/buffs/", buff.getBuffName(), buff.getCallback()); @@ -246,6 +296,19 @@ public class BuffService implements INetworkDispatch { } } } + //remove method is more like it + else + { + if (FileUtilities.doesFileExist("scripts/buffs/" + buff.getBuffName() + ".py")) + { + PyObject method = core.scriptService.getMethod("scripts/buffs/", buff.getBuffName(), "remove"); + + if (method != null && method.isCallable()) + { + method.__call__(Py.java2py(core), Py.java2py(creature), Py.java2py(buff)); + } + } + } creature.removeBuff(buff); for (String effect : buff.getParticleEffect().split(",")) { @@ -331,14 +394,16 @@ public class BuffService implements INetworkDispatch { public void addGroupBuff(CreatureObject target, String buffName, CreatureObject buffer) { - if(buffer.getGroupId() == 0) { + if(buffer.getGroupId() == 0) + { doAddBuff(target, buffName, buffer); return; } GroupObject group = (GroupObject) core.objectService.getObject(buffer.getGroupId()); - if(group == null) { + if(group == null) + { doAddBuff(target, buffName, buffer); return; } diff --git a/src/services/EntertainmentService.java b/src/services/EntertainmentService.java index 78c04f0d..645dcd8d 100644 --- a/src/services/EntertainmentService.java +++ b/src/services/EntertainmentService.java @@ -62,6 +62,8 @@ public class EntertainmentService implements INetworkDispatch { private Map performanceEffects = new ConcurrentHashMap(); + + public EntertainmentService(NGECore core) { this.core = core; populateSkillCaps(); @@ -282,7 +284,8 @@ public class EntertainmentService implements INetworkDispatch { buffRecipient.getClient().getSession().write(closeMessage.serialize()); } - if (sender.getObjectId() == buffRecipient.getObjectId()) { + if (sender.getObjectId() == buffRecipient.getObjectId()) + { // send close packet to buffer BuffBuilderEndMessage end = new BuffBuilderEndMessage(sentPacket); end.setObjectId(buffer.getObjectId()); @@ -294,6 +297,8 @@ public class EntertainmentService implements INetworkDispatch { buffer.getClient().getSession().write(closeMessage.serialize()); CreatureObject cre = (CreatureObject) buffer; cre.sendSystemMessage("The buff recipient cancelled the buff builder session.", (byte) 0); + + } } } @@ -534,24 +539,70 @@ public class EntertainmentService implements INetworkDispatch { public void giveInspirationBuff(CreatureObject reciever, CreatureObject buffer, Vector buffVector) { + + if (reciever.hasBuff("buildabuff_inspiration")) + { + core.buffService.removeBuffFromCreature(reciever, reciever.getBuffByName("buildabuff_inspiration")); + } + Vector availableStats = buffBuilderSkills; Vector stats = new Vector(); - for (BuffItem item : buffVector) { - for(BuffBuilder builder : availableStats) { - if(builder.getStatName().equalsIgnoreCase(item.getSkillName())) { + for (BuffItem item : buffVector) + { + for(BuffBuilder builder : availableStats) + { + + if(builder.getStatName().equalsIgnoreCase(item.getSkillName())) + { + + if(builder.getMaxTimesApplied() < item.getInvested()) return; + + int affectTotal=0; + + - // Ent. Expertise Percent + (invested points * affect amount) = stat - int bonusPoints = (int) (builder.getAffectAmount() *((float) item.getEntertainerBonus()/100f)); - int affectTotal = bonusPoints + (item.getInvested() * builder.getAffectAmount()); - BuffItem stat = new BuffItem(builder.getStatAffects(), item.getInvested(), item.getEntertainerBonus()); - stat.setAffectAmount(affectTotal); + + switch(builder.getCategoryId()) + { + + case TRADE: + case RESISTANCES: + case ATTRIBUTES: + { + affectTotal=(int)( ( (1+(float) item.getEntertainerBonus()/100f)*builder.getAffectAmount()) * item.getInvested()); + break; + + } + case COMBAT: + { + affectTotal=(int) (( builder.getAffectAmount()+item.getEntertainerBonus()) * item.getInvested()); + break; + + } + case MISC: + { + affectTotal=(int) (( builder.getAffectAmount()) * item.getInvested()); + break; + + } + default: + { + System.out.println("unhandled builder catId of "+builder.getCategoryId()); + } + + } + + stat.setAffectAmount(affectTotal); stats.add(stat); + + break; } + } } @@ -566,8 +617,7 @@ public class EntertainmentService implements INetworkDispatch { //if (reciever.getAttachment("buffWorkshopTimestamp") != null) //timeStamp = (long) reciever.getAttachment("buffWorkshopTimestamp"); - if (reciever.hasBuff("buildabuff_inspiration")) - core.buffService.removeBuffFromCreature(reciever, reciever.getBuffByName("buildabuff_inspiration")); + core.buffService.addBuffToCreature(reciever, "buildabuff_inspiration", buffer); /*if (core.buffService.addBuffToCreature(reciever, "buildabuff_inspiration", buffer) && !rPlayer.getProfession().equals("entertainer_1a")) { diff --git a/src/services/GroupService.java b/src/services/GroupService.java index 13b46c7b..a311d9e5 100644 --- a/src/services/GroupService.java +++ b/src/services/GroupService.java @@ -126,7 +126,8 @@ public class GroupService implements INetworkDispatch { invited.setInviteSenderName(""); invited.sendSystemMessage(OutOfBand.ProsePackage("TT", leader.getObjectID(), "@group:decline_self"), (byte) 0); invited.updateGroupInviteInfo(); - invited.sendSystemMessage(OutOfBand.ProsePackage("TT", invited.getObjectID(), "@group:decline_leader"), (byte) 0); + + leader.sendSystemMessage(OutOfBand.ProsePackage("TT", invited.getObjectID(), "@group:decline_leader"), (byte) 0); }