From c02cf6f2489e5f12ea3f831ee581c40fab3640c4 Mon Sep 17 00:00:00 2001 From: tacef Date: Sat, 19 Jul 2014 20:20:56 +0200 Subject: [PATCH] Changed Romo Vax to use correct template Added Mos Eisley Police officer Added Mos Eisley Police Sergeant Changed Romo Vax Henchman to use correct template Changed Smuggler Pilot in front of Jabba's Palace to use correct Template Added Mos Eisley Police and made them patroling around eisley --- scripts/mobiles/tatooine/fighting_romo_vax.py | 2 +- .../tatooine/mos_eisley_police_officer.py | 49 ++++++ .../tatooine/mos_eisley_police_sergeant.py | 38 +++++ scripts/mobiles/tatooine/romovax_henchman.py | 14 +- .../tatooine/jabba_tp_romo_vax_bunker.py | 2 +- .../static_spawns/tatooine/jabbas_palace.py | 2 +- .../tatooine/mos_eisley_police_officer.py | 154 ++++++++++++++++++ 7 files changed, 250 insertions(+), 11 deletions(-) create mode 100644 scripts/mobiles/tatooine/mos_eisley_police_officer.py create mode 100644 scripts/mobiles/tatooine/mos_eisley_police_sergeant.py create mode 100644 scripts/static_spawns/tatooine/mos_eisley_police_officer.py diff --git a/scripts/mobiles/tatooine/fighting_romo_vax.py b/scripts/mobiles/tatooine/fighting_romo_vax.py index 5b5798df..d5acb62e 100644 --- a/scripts/mobiles/tatooine/fighting_romo_vax.py +++ b/scripts/mobiles/tatooine/fighting_romo_vax.py @@ -25,7 +25,7 @@ def addTemplate(core): templates = Vector() - templates.add('object/mobile/shared_dressed_trader_thug_male_human_01.iff') #need to find correct template + templates.add('object/mobile/shared_dressed_cobral_thief_human_male_01.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/mos_eisley_police_officer.py b/scripts/mobiles/tatooine/mos_eisley_police_officer.py new file mode 100644 index 00000000..2e7a335f --- /dev/null +++ b/scripts/mobiles/tatooine/mos_eisley_police_officer.py @@ -0,0 +1,49 @@ +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('mission_mos_eisley_police_officer') + mobileTemplate.setLevel(15) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("Townsmanship") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_dressed_eisley_officer_aqualish_female_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_aqualish_male_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_human_female_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_human_male_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_quarren_male_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_rodian_female_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_rodian_male_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_trandoshan_female_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_trandoshan_male_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_twilek_female_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_twilek_male_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_zabrak_female_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_zabrak_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_scout_blaster.iff', WeaponType.PISTOL, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('mission_mos_eisley_police_officer', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/mos_eisley_police_sergeant.py b/scripts/mobiles/tatooine/mos_eisley_police_sergeant.py new file mode 100644 index 00000000..ad35c65e --- /dev/null +++ b/scripts/mobiles/tatooine/mos_eisley_police_sergeant.py @@ -0,0 +1,38 @@ +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('mission_mos_eisley_police_sergeant') + mobileTemplate.setLevel(15) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("Townsmanship") + mobileTemplate.setAssistRange(0) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_dressed_eisley_officer_bothan_female_01.iff') + templates.add('object/mobile/shared_dressed_eisley_officer_bothan_male_01.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_scout_blaster.iff', WeaponType.PISTOL, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShot') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('mission_mos_eisley_police_sergeant', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/romovax_henchman.py b/scripts/mobiles/tatooine/romovax_henchman.py index c41d0541..8c844dca 100644 --- a/scripts/mobiles/tatooine/romovax_henchman.py +++ b/scripts/mobiles/tatooine/romovax_henchman.py @@ -23,14 +23,12 @@ def addTemplate(core): mobileTemplate.setStalker(False) mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE) - templates = Vector() #need to find correct template - templates.add('object/mobile/shared_dressed_trader_thug_female_human_01.iff') - templates.add('object/mobile/shared_dressed_trader_thug_female_human_02.iff') - templates.add('object/mobile/shared_dressed_trader_thug_female_human_03.iff') - templates.add('object/mobile/shared_dressed_trader_thug_female_twk_01.iff') - templates.add('object/mobile/shared_dressed_trader_thug_female_twk_02.iff') - templates.add('object/mobile/shared_dressed_trader_thug_male_human_02.iff') - templates.add('object/mobile/shared_dressed_trader_thug_male_human_03.iff') + templates = Vector() + templates.add('object/mobile/shared_dressed_cobral_hooligan_bith_female_01.iff') + templates.add('object/mobile/shared_dressed_cobral_hitman_human_female_01.iff') + templates.add('object/mobile/shared_dressed_cobral_overlord_human_male_01.iff') + templates.add('object/mobile/shared_dressed_cobral_boss_twk_female_01.iff') + templates.add('object/mobile/shared_dressed_cobral_assassin_twk_female_01.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/static_spawns/tatooine/jabba_tp_romo_vax_bunker.py b/scripts/static_spawns/tatooine/jabba_tp_romo_vax_bunker.py index 21750ee8..4361ff33 100644 --- a/scripts/static_spawns/tatooine/jabba_tp_romo_vax_bunker.py +++ b/scripts/static_spawns/tatooine/jabba_tp_romo_vax_bunker.py @@ -43,6 +43,6 @@ def addPlanetSpawns(core, planet): stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(7), float(-19.9), float(-16), float(78.8), float(0), float(0), float(0), float(0), 45) stcSvc.spawnObject('romovax_henchman', 'tatooine', bunker.getCellByCellNumber(9), float(32.4), float(-14), float(78.7), float(0), float(0), float(0), float(0), 45) - stcSvc.spawnObject('fighting_romo_vax', 'tatooine', bunker.getCellByCellNumber(9), float(-42.7), float(-14), float(-79.1), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('fighting_romo_vax', 'tatooine', bunker.getCellByCellNumber(9), float(-43.5), float(-14), float(-78.9), float(0), float(0), float(0), float(0), 45) return diff --git a/scripts/static_spawns/tatooine/jabbas_palace.py b/scripts/static_spawns/tatooine/jabbas_palace.py index 15bbc579..acbe4b6a 100644 --- a/scripts/static_spawns/tatooine/jabbas_palace.py +++ b/scripts/static_spawns/tatooine/jabbas_palace.py @@ -74,7 +74,7 @@ def addPlanetSpawns(core, planet): #outside Palace - smuggler = stcSvc.spawnObject('object/mobile/shared_dressed_binayre_hoodlum_zabrak_male_01.iff', 'tatooine', long(0), float(-5863), float(90), float(-6198.2), float(0.71), float(0), float(0.70), float(0)) #still need to find correct template + smuggler = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_jabba_henchman.iff', 'tatooine', long(0), float(-5863), float(90), float(-6198.2), float(0.71), float(0), float(0.70), float(0)) #still need to find correct template smuggler.setCustomName('Smuggler Pilot') smuggler.setOptionsBitmask(256) return diff --git a/scripts/static_spawns/tatooine/mos_eisley_police_officer.py b/scripts/static_spawns/tatooine/mos_eisley_police_officer.py new file mode 100644 index 00000000..f2f5d7e2 --- /dev/null +++ b/scripts/static_spawns/tatooine/mos_eisley_police_officer.py @@ -0,0 +1,154 @@ +# Project SWG: Mos Eisley Police Officers: Static Spawns +# (C)2014 ProjectSWG + +import sys +from resources.datatables import Options +from resources.datatables import State +from java.util import Vector +from engine.resources.scene import Point3D + +def addPlanetSpawns(core, planet): + + stcSvc = core.staticService + objSvc = core.objectService + aiSvc = core.aiService + + me_police_officer = stcSvc.spawnObject('mission_mos_eisley_police_officer', 'tatooine', long(0), float(3481.2), float(5), float(-5007.1), float(0), float(0), float(0), float(0), 60) + me_police_officer1 = stcSvc.spawnObject('mission_mos_eisley_police_officer', 'tatooine', long(0), float(3425.9), float(5), float(-5053.7), float(0), float(0), float(0), float(0), 60) + me_police_officer2 = stcSvc.spawnObject('mission_mos_eisley_police_officer', 'tatooine', long(0), float(3290.6), float(4), float(-4705), float(0), float(0), float(0), float(0), 60) + me_police_officer3 = stcSvc.spawnObject('mission_mos_eisley_police_officer', 'tatooine', long(0), float(3361.9), float(4), float(-4756), float(0), float(0), float(0), float(0), 60) + + me_police_sergeant = stcSvc.spawnObject('mission_mos_eisley_police_sergeant', 'tatooine', long(0), float(3531), float(4), float(-4803.1), float(0), float(0), float(0), float(0), 60) + me_police_sergeant1 = stcSvc.spawnObject('mission_mos_eisley_police_sergeant', 'tatooine', long(0), float(3463.9), float(4), float(-4641.3), float(0), float(0), float(0), float(0), 60) + me_police_sergeant2 = stcSvc.spawnObject('mission_mos_eisley_police_sergeant', 'tatooine', long(0), float(3261.6), float(4.5), float(-4691.6), float(0), float(0), float(0), float(0), 60) + + patrolpoints = Vector() + patrolpoints.add(Point3D(float(3531), float(4), float(-4803.1))) + patrolpoints.add(Point3D(float(3529.7), float(4.8), float(-4813.3))) + patrolpoints.add(Point3D(float(3545.3), float(5), float(-4838.6))) + patrolpoints.add(Point3D(float(3527.5), float(4.8), float(-4863.4))) + patrolpoints.add(Point3D(float(3519.5), float(5), float(-4874.7))) + patrolpoints.add(Point3D(float(3516.3), float(5), float(-4884))) + patrolpoints.add(Point3D(float(3495.2), float(5.5), float(-4908.2))) + patrolpoints.add(Point3D(float(3496.6), float(5.5), float(-4919.5))) + patrolpoints.add(Point3D(float(3505), float(5.5), float(-4915.8))) + patrolpoints.add(Point3D(float(3509.7), float(5.5), float(-4919.1))) + patrolpoints.add(Point3D(float(3505), float(5.5), float(-4926))) + patrolpoints.add(Point3D(float(3511.1), float(5.5), float(-4950.7))) + patrolpoints.add(Point3D(float(3490.9), float(5.5), float(-4953.6))) + patrolpoints.add(Point3D(float(3489.1), float(5.5), float(-4935.5))) + patrolpoints.add(Point3D(float(3484.1), float(5.5), float(-4922.3))) + patrolpoints.add(Point3D(float(3487.1), float(5.5), float(-4917.8))) + patrolpoints.add(Point3D(float(3496.6), float(5.5), float(-4919.1))) + patrolpoints.add(Point3D(float(3495.2), float(5.5), float(-4908.2))) + patrolpoints.add(Point3D(float(3516.3), float(5), float(-4884))) + patrolpoints.add(Point3D(float(3519.5), float(5), float(-4874.7))) + patrolpoints.add(Point3D(float(3527.5), float(4.8), float(-4863.4))) + patrolpoints.add(Point3D(float(3545.3), float(5), float(-4838.6))) + patrolpoints.add(Point3D(float(3529.7), float(4.8), float(-4813.3))) + patrolpoints.add(Point3D(float(3531), float(4), float(-4803.1))) + + + patrolpoints1 = Vector() + patrolpoints1.add(Point3D(float(3481.2), float(5), float(-5007.1))) + patrolpoints1.add(Point3D(float(3448.5), float(5), float(-5048))) + patrolpoints1.add(Point3D(float(3461.3), float(5), float(-5059.7))) + patrolpoints1.add(Point3D(float(3449.4), float(4.5), float(-5072.9))) + patrolpoints1.add(Point3D(float(3425.9), float(5), float(-5053.7))) + patrolpoints1.add(Point3D(float(3401.4), float(5), float(-5034.3))) + patrolpoints1.add(Point3D(float(3446.4), float(5), float(-4978.9))) + + patrolpoints2 = Vector() + patrolpoints2.add(Point3D(float(3425.9), float(5), float(-5053.7))) + patrolpoints2.add(Point3D(float(3401.4), float(5), float(-5034.3))) + patrolpoints2.add(Point3D(float(3446.4), float(5), float(-4978.9))) + patrolpoints2.add(Point3D(float(3481.2), float(5), float(-5007.1))) + patrolpoints2.add(Point3D(float(3448.5), float(5), float(-5048))) + patrolpoints2.add(Point3D(float(3461.3), float(5), float(-5059.7))) + patrolpoints2.add(Point3D(float(3449.4), float(4.5), float(-5072.9))) + + patrolpoints3 = Vector() + patrolpoints3.add(Point3D(float(3290.6), float(4), float(-4705))) + patrolpoints3.add(Point3D(float(3299.3), float(5), float(-4692.2))) + patrolpoints3.add(Point3D(float(3317.3), float(5), float(-4667.5))) + patrolpoints3.add(Point3D(float(3373.4), float(4), float(-4697.3))) + patrolpoints3.add(Point3D(float(3400.2), float(4), float(-4660.2))) + patrolpoints3.add(Point3D(float(3435.6), float(5), float(-4686))) + patrolpoints3.add(Point3D(float(3463.9), float(4), float(-4641.3))) + patrolpoints3.add(Point3D(float(3441.3), float(5), float(-4624))) + patrolpoints3.add(Point3D(float(3380.8), float(4), float(-4650.7))) + patrolpoints3.add(Point3D(float(3344.1), float(4.4), float(-4634.9))) + patrolpoints3.add(Point3D(float(3313.9), float(4), float(-4611.1))) + patrolpoints3.add(Point3D(float(3261.6), float(4.5), float(-4691.6))) + patrolpoints3.add(Point3D(float(3243.2), float(5), float(-4680.5))) + patrolpoints3.add(Point3D(float(3196.5), float(5), float(-4745.1))) + patrolpoints3.add(Point3D(float(3277.1), float(5), float(-4793.2))) + patrolpoints3.add(Point3D(float(3315.1), float(4), float(-4819))) + patrolpoints3.add(Point3D(float(3361.9), float(4), float(-4756))) + + patrolpoints4 = Vector() + patrolpoints4.add(Point3D(float(3463.9), float(4), float(-4641.3))) + patrolpoints4.add(Point3D(float(3441.3), float(5), float(-4624))) + patrolpoints4.add(Point3D(float(3380.8), float(4), float(-4650.7))) + patrolpoints4.add(Point3D(float(3344.1), float(4.4), float(-4634.9))) + patrolpoints4.add(Point3D(float(3313.9), float(4), float(-4611.1))) + patrolpoints4.add(Point3D(float(3261.6), float(4.5), float(-4691.6))) + patrolpoints4.add(Point3D(float(3243.2), float(5), float(-4680.5))) + patrolpoints4.add(Point3D(float(3196.5), float(5), float(-4745.1))) + patrolpoints4.add(Point3D(float(3277.1), float(5), float(-4793.2))) + patrolpoints4.add(Point3D(float(3315.1), float(4), float(-4819))) + patrolpoints4.add(Point3D(float(3361.9), float(4), float(-4756))) + patrolpoints4.add(Point3D(float(3290.6), float(4), float(-4705))) + patrolpoints4.add(Point3D(float(3299.3), float(5), float(-4692.2))) + patrolpoints4.add(Point3D(float(3317.3), float(5), float(-4667.5))) + patrolpoints4.add(Point3D(float(3373.4), float(4), float(-4697.3))) + patrolpoints4.add(Point3D(float(3400.2), float(4), float(-4660.2))) + patrolpoints4.add(Point3D(float(3435.6), float(5), float(-4686))) + + patrolpoints5 = Vector() + patrolpoints5.add(Point3D(float(3261.6), float(4.5), float(-4691.6))) + patrolpoints5.add(Point3D(float(3243.2), float(5), float(-4680.5))) + patrolpoints5.add(Point3D(float(3196.5), float(5), float(-4745.1))) + patrolpoints5.add(Point3D(float(3277.1), float(5), float(-4793.2))) + patrolpoints5.add(Point3D(float(3315.1), float(4), float(-4819))) + patrolpoints5.add(Point3D(float(3361.9), float(4), float(-4756))) + patrolpoints5.add(Point3D(float(3290.6), float(4), float(-4705))) + patrolpoints5.add(Point3D(float(3299.3), float(5), float(-4692.2))) + patrolpoints5.add(Point3D(float(3317.3), float(5), float(-4667.5))) + patrolpoints5.add(Point3D(float(3373.4), float(4), float(-4697.3))) + patrolpoints5.add(Point3D(float(3400.2), float(4), float(-4660.2))) + patrolpoints5.add(Point3D(float(3435.6), float(5), float(-4686))) + patrolpoints5.add(Point3D(float(3463.9), float(4), float(-4641.3))) + patrolpoints5.add(Point3D(float(3441.3), float(5), float(-4624))) + patrolpoints5.add(Point3D(float(3380.8), float(4), float(-4650.7))) + patrolpoints5.add(Point3D(float(3344.1), float(4.4), float(-4634.9))) + patrolpoints5.add(Point3D(float(3313.9), float(4), float(-4611.1))) + + patrolpoints6 = Vector() + patrolpoints6.add(Point3D(float(3361.9), float(4), float(-4756))) + patrolpoints6.add(Point3D(float(3290.6), float(4), float(-4705))) + patrolpoints6.add(Point3D(float(3299.3), float(5), float(-4692.2))) + patrolpoints6.add(Point3D(float(3317.3), float(5), float(-4667.5))) + patrolpoints6.add(Point3D(float(3373.4), float(4), float(-4697.3))) + patrolpoints6.add(Point3D(float(3400.2), float(4), float(-4660.2))) + patrolpoints6.add(Point3D(float(3435.6), float(5), float(-4686))) + patrolpoints6.add(Point3D(float(3463.9), float(4), float(-4641.3))) + patrolpoints6.add(Point3D(float(3441.3), float(5), float(-4624))) + patrolpoints6.add(Point3D(float(3380.8), float(4), float(-4650.7))) + patrolpoints6.add(Point3D(float(3344.1), float(4.4), float(-4634.9))) + patrolpoints6.add(Point3D(float(3313.9), float(4), float(-4611.1))) + patrolpoints6.add(Point3D(float(3261.6), float(4.5), float(-4691.6))) + patrolpoints6.add(Point3D(float(3243.2), float(5), float(-4680.5))) + patrolpoints6.add(Point3D(float(3196.5), float(5), float(-4745.1))) + patrolpoints6.add(Point3D(float(3277.1), float(5), float(-4793.2))) + patrolpoints6.add(Point3D(float(3315.1), float(4), float(-4819))) + + aiSvc.setPatrol(me_police_sergeant, patrolpoints) + aiSvc.setPatrol(me_police_officer, patrolpoints1) + aiSvc.setPatrol(me_police_officer1, patrolpoints2) + aiSvc.setPatrol(me_police_officer2, patrolpoints3) + aiSvc.setPatrol(me_police_sergeant1, patrolpoints4) + aiSvc.setPatrol(me_police_sergeant2, patrolpoints5) + aiSvc.setPatrol(me_police_officer3, patrolpoints6) + + return \ No newline at end of file