diff --git a/scripts/object/mobile/dressed_imperial_officer_f.py b/scripts/object/mobile/dressed_imperial_officer_f.py index b9963b3e..52476091 100644 --- a/scripts/object/mobile/dressed_imperial_officer_f.py +++ b/scripts/object/mobile/dressed_imperial_officer_f.py @@ -7,4 +7,6 @@ def setup(core, object): object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) object.setStfFilename('mob/creature_names') object.setStfName('imperial_recruiter') + + core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0) return diff --git a/scripts/object/mobile/dressed_imperial_officer_m_2.py b/scripts/object/mobile/dressed_imperial_officer_m_2.py index b9963b3e..52476091 100644 --- a/scripts/object/mobile/dressed_imperial_officer_m_2.py +++ b/scripts/object/mobile/dressed_imperial_officer_m_2.py @@ -7,4 +7,6 @@ def setup(core, object): object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) object.setStfFilename('mob/creature_names') object.setStfName('imperial_recruiter') + + core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0) return diff --git a/scripts/object/mobile/dressed_imperial_officer_m_3.py b/scripts/object/mobile/dressed_imperial_officer_m_3.py index b9963b3e..52476091 100644 --- a/scripts/object/mobile/dressed_imperial_officer_m_3.py +++ b/scripts/object/mobile/dressed_imperial_officer_m_3.py @@ -7,4 +7,6 @@ def setup(core, object): object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) object.setStfFilename('mob/creature_names') object.setStfName('imperial_recruiter') + + core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0) return diff --git a/scripts/object/mobile/dressed_imperial_officer_m_4.py b/scripts/object/mobile/dressed_imperial_officer_m_4.py index b9963b3e..52476091 100644 --- a/scripts/object/mobile/dressed_imperial_officer_m_4.py +++ b/scripts/object/mobile/dressed_imperial_officer_m_4.py @@ -7,4 +7,6 @@ def setup(core, object): object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) object.setStfFilename('mob/creature_names') object.setStfName('imperial_recruiter') + + core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0) return diff --git a/scripts/object/mobile/dressed_imperial_officer_m_5.py b/scripts/object/mobile/dressed_imperial_officer_m_5.py index b9963b3e..52476091 100644 --- a/scripts/object/mobile/dressed_imperial_officer_m_5.py +++ b/scripts/object/mobile/dressed_imperial_officer_m_5.py @@ -7,4 +7,6 @@ def setup(core, object): object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) object.setStfFilename('mob/creature_names') object.setStfName('imperial_recruiter') + + core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0) return diff --git a/scripts/object/mobile/dressed_imperial_officer_m_6.py b/scripts/object/mobile/dressed_imperial_officer_m_6.py index b9963b3e..220d9fd8 100644 --- a/scripts/object/mobile/dressed_imperial_officer_m_6.py +++ b/scripts/object/mobile/dressed_imperial_officer_m_6.py @@ -7,4 +7,6 @@ def setup(core, object): object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE) object.setStfFilename('mob/creature_names') object.setStfName('imperial_recruiter') + + core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:imperial', object.getPosition().x, object.getPosition().z, 46, 48, 0) return diff --git a/scripts/static_spawns/corellia/factional_recruiters.py b/scripts/static_spawns/corellia/factional_recruiters.py new file mode 100644 index 00000000..a2a70bf2 --- /dev/null +++ b/scripts/static_spawns/corellia/factional_recruiters.py @@ -0,0 +1,18 @@ +import sys +# Project SWG: Imperial Recruiters tatooine: Static Spawns +# (C)2014 ProjectSWG + + + +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + stcSvc = core.staticService + objSvc = core.objectService + #recruiter Imp Outpost + + stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_4.iff', 'corellia', long(0), float(6718), float(315), float(-5809), float(0), float(0), float(0), float(0)) + + return \ No newline at end of file diff --git a/scripts/static_spawns/dantooine/factional_recruiters.py b/scripts/static_spawns/dantooine/factional_recruiters.py new file mode 100644 index 00000000..d3514fbf --- /dev/null +++ b/scripts/static_spawns/dantooine/factional_recruiters.py @@ -0,0 +1,18 @@ +import sys +# Project SWG: Imperial Recruiters dantooine: Static Spawns +# (C)2014 ProjectSWG + + + +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + stcSvc = core.staticService + objSvc = core.objectService + #recruiter Imp Outpost + + stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_6.iff', 'dantooine', long(0), float(-4198), float(3), float(-2411), float(0.819), float(-0.572)) + + return \ No newline at end of file diff --git a/scripts/static_spawns/dantooine/imperial_outpost.py b/scripts/static_spawns/dantooine/imperial_outpost.py index 3a61692b..d19b18d5 100644 --- a/scripts/static_spawns/dantooine/imperial_outpost.py +++ b/scripts/static_spawns/dantooine/imperial_outpost.py @@ -16,8 +16,6 @@ def addPlanetSpawns(core, planet): corporal1 = stcSvc.spawnObject('eow_fbase_imperial_corporal', 'dantooine', long(0), float(-4228), float(3), float(-2395), float(0.703), float(0.710)) corporal2 = stcSvc.spawnObject('eow_fbase_imperial_corporal', 'dantooine', long(0), float(-4230), float(3), float(-2394), float(0.703), float(0.710)) - recruiter1 = stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_f.iff', 'dantooine', long(0), float(-4198), float(3), float(-2411), float(0.819), float(-0.572)) - atst1 = stcSvc.spawnObject('object/mobile/shared_atst.iff', 'dantooine', long(0), float(-4291), float(3), float(-2433), float(0.819), float(-0.572)) atst2 = stcSvc.spawnObject('object/mobile/shared_atst.iff', 'dantooine', long(0), float(-4154), float(3), float(-2383), float(0.264), float(0.964)) diff --git a/scripts/static_spawns/lok/factional_recruiters.py b/scripts/static_spawns/lok/factional_recruiters.py new file mode 100644 index 00000000..8a6e3cd3 --- /dev/null +++ b/scripts/static_spawns/lok/factional_recruiters.py @@ -0,0 +1,18 @@ +import sys +# Project SWG: Imperial Recruiters tatooine: Static Spawns +# (C)2014 ProjectSWG + + + +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + stcSvc = core.staticService + objSvc = core.objectService + #recruiter Imp Outpost + + stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_4.iff', 'lok', long(0), float(-1843), float(12), float(-3069), float(0.71), float(0), float(0.70), float(0)) + + return \ No newline at end of file diff --git a/scripts/static_spawns/naboo/factional_recruiters.py b/scripts/static_spawns/naboo/factional_recruiters.py new file mode 100644 index 00000000..5ddcc31b --- /dev/null +++ b/scripts/static_spawns/naboo/factional_recruiters.py @@ -0,0 +1,20 @@ +import sys +# Project SWG: Imperial Recruiters Naboo: Static Spawns +# (C)2014 ProjectSWG + + + +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + stcSvc = core.staticService + objSvc = core.objectService + #recruiter theed + stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_3.iff', 'naboo', long(0), float(-4927.9), float(6), float(4230.5), float(-0.998), float(0), float(0.06), float(0)) + + #deeja Peek + stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_5.iff', 'naboo', long(0), float(5307), float(326), float(-1584), float(0), float(0), float(0), float(0)) + + return \ No newline at end of file diff --git a/scripts/static_spawns/talus/factional_recruiters.py b/scripts/static_spawns/talus/factional_recruiters.py new file mode 100644 index 00000000..6e8e6969 --- /dev/null +++ b/scripts/static_spawns/talus/factional_recruiters.py @@ -0,0 +1,17 @@ +import sys +# Project SWG: Imperial Recruiters talus: Static Spawns +# (C)2014 ProjectSWG + + + +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + stcSvc = core.staticService + objSvc = core.objectService + #recruiter Imp Outpost + stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_6.iff', 'talus', long(0), float(-2192), float(20), float(2269), float(0), float(0), float(0), float(0)) + + return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/factional_recruiters.py b/scripts/static_spawns/tatooine/factional_recruiters.py new file mode 100644 index 00000000..cf02a957 --- /dev/null +++ b/scripts/static_spawns/tatooine/factional_recruiters.py @@ -0,0 +1,24 @@ +import sys +# Project SWG: Imperial Recruiters tatooine: Static Spawns +# (C)2014 ProjectSWG + + + +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + stcSvc = core.staticService + objSvc = core.objectService + #recruiter Eisley + smallImpHouse = core.objectService.getObject(long(1280129)) + stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_f.iff', 'tatooine', smallImpHouse.getCellByCellNumber(3), float(-6), float(1), float(9.2), float(0.71), float(0), float(0.70), float(0)) + + #recruiter Bestine + #Hill + stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_5.iff', 'tatooine', long(0), float(-1138), float(98), float(-3897), float(0.71), float(0), float(0.70), float(0)) + #outside SP + stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_m_3.iff', 'tatooine', long(0), float(-1275), float(12), float(-3594), float(0), float(0), float(0), float(0)) + + return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/mos_eisley.py b/scripts/static_spawns/tatooine/mos_eisley.py index 762c1d0f..158dbc02 100644 --- a/scripts/static_spawns/tatooine/mos_eisley.py +++ b/scripts/static_spawns/tatooine/mos_eisley.py @@ -143,9 +143,8 @@ def addPlanetSpawns(core, planet): #Lucky Despot Interior TODO: Check Cell IDs for Spawned NPCS inside once Lucky Despot is spawning properly again. building = core.objectService.getObject(long(-466404040703447347)) - hansolo1 = stcSvc.spawnObject('object/mobile/shared_han_solo.iff', 'tatooine', building.getCellByCellNumber(9), float(32.3), float(7.0), float(1.6), float(0), float(0), float(0), float(0)) - #hansolo1.setCustomName2('Han Solo') - #hansolo1.setOptionsBitmask(256) + #Han solo + stcSvc.spawnObject('object/mobile/shared_han_solo.iff', 'tatooine', building.getCellByCellNumber(9), float(32.3), float(7.0), float(1.6), float(0), float(0), float(0), float(0)) #Medical Center Interior @@ -314,12 +313,7 @@ def addPlanetSpawns(core, planet): #Eisley Ship Controller stcSvc.spawnObject('object/mobile/shared_distant_ship_controller.iff', 'tatooine', long(0), float(3542.3), float(5.0), float(-4826.0), float(0.42), float(0.91)) - #recruiters - impRecruiter = stcSvc.spawnObject('object/mobile/shared_dressed_imperial_officer_f.iff', 'tatooine', long(1280132), float(-6), float(1), float(9.2), float(0.70), float(0.71)) - #impRecruiter.setOptionsBitmask(264) - - #Profession Counselor stcSvc.spawnObject('object/mobile/shared_respec_seller_f_1.iff', 'tatooine', long(0), float(3533.14), float(5), float(-4788.86), float(-0.3327), float(0.9288)) diff --git a/scripts/static_spawns/tatooine/mos_eisley_kreetles.py b/scripts/static_spawns/tatooine/mos_eisley_kreetles.py index eaf5bf99..ba3f62e0 100644 --- a/scripts/static_spawns/tatooine/mos_eisley_kreetles.py +++ b/scripts/static_spawns/tatooine/mos_eisley_kreetles.py @@ -19,23 +19,20 @@ def addPlanetSpawns(core, planet): carrion_kreetle12 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3540), float(4), float(-5050), float(0), float(0), float(0), float(0), 30) carrion_kreetle13 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3533), float(4), float(-5070), float(0), float(0), float(0), float(0), 30) carrion_kreetle14 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3555), float(4), float(-5072), float(0), float(0), float(0), float(0), 30) - carrion_kreetle15 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3559), float(4), float(-5061), float(0), float(0), float(0), float(0), 30) - carrion_kreetle16 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3562), float(4), float(-5064), float(0), float(0), float(0), float(0), 30) + carrion_kreetle2 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3233), float(8), float(-4457), float(0), float(0), float(0), float(0), 30) carrion_kreetle21 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3223), float(8), float(-4447), float(0), float(0), float(0), float(0), 30) carrion_kreetle22 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3213), float(8), float(-4455), float(0), float(0), float(0), float(0), 30) carrion_kreetle23 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3235), float(8), float(-4440), float(0), float(0), float(0), float(0), 30) carrion_kreetle24 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3245), float(8), float(-4460), float(0), float(0), float(0), float(0), 30) - carrion_kreetle25 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3250), float(8), float(-4461), float(0), float(0), float(0), float(0), 30) - carrion_kreetle26 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3238), float(8), float(-4464), float(0), float(0), float(0), float(0), 30) + carrion_kreetle3 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3147), float(4), float(-4846), float(0), float(0), float(0), float(0), 30) carrion_kreetle31 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3137), float(4), float(-4856), float(0), float(0), float(0), float(0), 30) carrion_kreetle32 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3127), float(4), float(-4836), float(0), float(0), float(0), float(0), 30) carrion_kreetle35 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3145), float(4), float(-4852), float(0), float(0), float(0), float(0), 30) carrion_kreetle36 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3135), float(4), float(-4838), float(0), float(0), float(0), float(0), 30) - carrion_kreetle37 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3150), float(4), float(-4856), float(0), float(0), float(0), float(0), 30) - carrion_kreetle39 = stcSvc.spawnObject('carrion_kreetle', 'tatooine', long(0), float(3140), float(4), float(-4860), float(0), float(0), float(0), float(0), 30) + return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/mos_eisley_mites.py b/scripts/static_spawns/tatooine/mos_eisley_mites.py index fae8bcb0..74e6d37c 100644 --- a/scripts/static_spawns/tatooine/mos_eisley_mites.py +++ b/scripts/static_spawns/tatooine/mos_eisley_mites.py @@ -56,14 +56,7 @@ def addPlanetSpawns(core, planet): rockmite29 = stcSvc.spawnObject('rockmite', 'tatooine', long(0), float(3752), float(5), float(-4659), float(0), float(0), float(0), float(0), 30) rockmite210 = stcSvc.spawnObject('rockmite', 'tatooine', long(0), float(3769), float(5), float(-4650), float(0), float(0), float(0), float(0), 30) rockmite211 = stcSvc.spawnObject('rockmite', 'tatooine', long(0), float(3778), float(5), float(-4647), float(0), float(0), float(0), float(0), 30) - rockmite212 = stcSvc.spawnObject('rockmite', 'tatooine', long(0), float(3727), float(5), float(-4647), float(0), float(0), float(0), float(0), 30) - rockmite213 = stcSvc.spawnObject('rockmite', 'tatooine', long(0), float(3742), float(5), float(-4637), float(0), float(0), float(0), float(0), 30) - rockmite214 = stcSvc.spawnObject('rockmite', 'tatooine', long(0), float(3755), float(5), float(-4635), float(0), float(0), float(0), float(0), 30) - rockmite215 = stcSvc.spawnObject('rockmite', 'tatooine', long(0), float(3771), float(5), float(-4660), float(0), float(0), float(0), float(0), 30) - rockmite216 = stcSvc.spawnObject('rockmite', 'tatooine', long(0), float(3785), float(5), float(-4657), float(0), float(0), float(0), float(0), 30) - rockmite217 = stcSvc.spawnObject('rockmite', 'tatooine', long(0), float(3774), float(5), float(-4663), float(0), float(0), float(0), float(0), 30) - rockmite218 = stcSvc.spawnObject('rockmite', 'tatooine', long(0), float(3767), float(5), float(-4672), float(0), float(0), float(0), float(0), 30) - rockmite219 = stcSvc.spawnObject('rockmite', 'tatooine', long(0), float(3754), float(5), float(-4666), float(0), float(0), float(0), float(0), 30) - rockmite220 = stcSvc.spawnObject('rockmite', 'tatooine', long(0), float(3717), float(5), float(-4633), float(0), float(0), float(0), float(0), 30) + + return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/mos_eisley_tempest_rills.py b/scripts/static_spawns/tatooine/mos_eisley_tempest_rills.py index e135dcb6..e44369e0 100644 --- a/scripts/static_spawns/tatooine/mos_eisley_tempest_rills.py +++ b/scripts/static_spawns/tatooine/mos_eisley_tempest_rills.py @@ -28,13 +28,7 @@ def addPlanetSpawns(core, planet): tempest_rill12 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3716), float(5), float(-4613), float(0), float(0), float(0), float(0), 30) tempest_rill13 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3704), float(5), float(-4624), float(0), float(0), float(0), float(0), 30) tempest_rill14 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3687), float(5), float(-4600), float(0), float(0), float(0), float(0), 30) - tempest_rill15 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3709), float(5), float(-4611), float(0), float(0), float(0), float(0), 30) - tempest_rill16 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3725), float(5), float(-4619), float(0), float(0), float(0), float(0), 30) - tempest_rill17 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3727), float(5), float(-4638), float(0), float(0), float(0), float(0), 30) - tempest_rill18 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3716), float(5), float(-4622), float(0), float(0), float(0), float(0), 30) - tempest_rill19 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3710), float(5), float(-4637), float(0), float(0), float(0), float(0), 30) - tempest_rill20 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3698), float(5), float(-4637), float(0), float(0), float(0), float(0), 30) - tempest_rill21 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3684), float(5), float(-4645), float(0), float(0), float(0), float(0), 30) + # Tempest rills @@ -44,9 +38,7 @@ def addPlanetSpawns(core, planet): tempest_rill43 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3885), float(56), float(-5088), float(0), float(0), float(0), float(0), 30) tempest_rill44 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3892), float(58), float(-5078), float(0), float(0), float(0), float(0), 30) tempest_rill45 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3860), float(44), float(-5043), float(0), float(0), float(0), float(0), 30) - tempest_rill46 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3870), float(44), float(-5053), float(0), float(0), float(0), float(0), 30) - tempest_rill47 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3877), float(53), float(-5082), float(0), float(0), float(0), float(0), 30) - tempest_rill48 = stcSvc.spawnObject('tempest_rill', 'tatooine', long(0), float(3890), float(54), float(-5073), float(0), float(0), float(0), float(0), 30) + return diff --git a/scripts/static_spawns/tatooine/mos_eisley_womprats.py b/scripts/static_spawns/tatooine/mos_eisley_womprats.py index ba10079a..a7bdb444 100644 --- a/scripts/static_spawns/tatooine/mos_eisley_womprats.py +++ b/scripts/static_spawns/tatooine/mos_eisley_womprats.py @@ -22,10 +22,7 @@ def addPlanetSpawns(core, planet): city_sewer4 = stcSvc.spawnObject('city_sewer_swamprat', 'tatooine', long(0), float(3220), float(8), float(-4462), float(0), float(0), float(0), float(0), 30) city_sewer5 = stcSvc.spawnObject('city_sewer_swamprat', 'tatooine', long(0), float(3224), float(8), float(-4469), float(0), float(0), float(0), float(0), 30) city_sewer6 = stcSvc.spawnObject('city_sewer_swamprat', 'tatooine', long(0), float(3218), float(8), float(-4467), float(0), float(0), float(0), float(0), 30) - city_sewer7 = stcSvc.spawnObject('city_sewer_swamprat', 'tatooine', long(0), float(3216), float(8), float(-4458), float(0), float(0), float(0), float(0), 30) - city_sewer8 = stcSvc.spawnObject('city_sewer_swamprat', 'tatooine', long(0), float(3207), float(8), float(-4457), float(0), float(0), float(0), float(0), 30) - city_sewer9 = stcSvc.spawnObject('city_sewer_swamprat', 'tatooine', long(0), float(3211), float(8), float(-4472), float(0), float(0), float(0), float(0), 30) - city_sewer10 = stcSvc.spawnObject('city_sewer_swamprat', 'tatooine', long(0), float(3208), float(8), float(-4474), float(0), float(0), float(0), float(0), 30) + # Sickly Womprats @@ -36,10 +33,6 @@ def addPlanetSpawns(core, planet): sickly_womprat4 = stcSvc.spawnObject('sickly_womprat', 'tatooine', long(0), float(3115), float(9), float(-4750), float(0), float(0), float(0), float(0), 30) sickly_womprat5 = stcSvc.spawnObject('sickly_womprat', 'tatooine', long(0), float(3117), float(9), float(-4760), float(0), float(0), float(0), float(0), 30) sickly_womprat6 = stcSvc.spawnObject('sickly_womprat', 'tatooine', long(0), float(3121), float(9), float(-4766), float(0), float(0), float(0), float(0), 30) - sickly_womprat7 = stcSvc.spawnObject('sickly_womprat', 'tatooine', long(0), float(3124), float(9), float(-4756), float(0), float(0), float(0), float(0), 30) - sickly_womprat8 = stcSvc.spawnObject('sickly_womprat', 'tatooine', long(0), float(3119), float(9), float(-4750), float(0), float(0), float(0), float(0), 30) - sickly_womprat9 = stcSvc.spawnObject('sickly_womprat', 'tatooine', long(0), float(3122), float(9), float(-4754), float(0), float(0), float(0), float(0), 30) - sickly_womprat10 = stcSvc.spawnObject('sickly_womprat', 'tatooine', long(0), float(3104), float(9), float(-4762), float(0), float(0), float(0), float(0), 30) # Normal Womprats womprat = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3587), float(56), float(-4354), float(0), float(0), float(0), float(0), 30) @@ -49,10 +42,7 @@ def addPlanetSpawns(core, planet): womprat4 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3587), float(56), float(-4348), float(0), float(0), float(0), float(0), 30) womprat5 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3587), float(56), float(-4358), float(0), float(0), float(0), float(0), 30) womprat6 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3590), float(56), float(-4360), float(0), float(0), float(0), float(0), 30) - womprat7 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3594), float(56), float(-4364), float(0), float(0), float(0), float(0), 30) - womprat8 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3590), float(56), float(-4372), float(0), float(0), float(0), float(0), 30) - womprat9 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3592), float(56), float(-4376), float(0), float(0), float(0), float(0), 30) - womprat10 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3580), float(56), float(-4350), float(0), float(0), float(0), float(0), 30) + womprat2 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3841), float(49), float(-5072), float(0), float(0), float(0), float(0), 30) womprat21 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3832), float(49), float(-5072), float(0), float(0), float(0), float(0), 30) @@ -61,8 +51,5 @@ def addPlanetSpawns(core, planet): womprat24 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3841), float(49), float(-5060), float(0), float(0), float(0), float(0), 30) womprat25 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3841), float(49), float(-5056), float(0), float(0), float(0), float(0), 30) womprat26 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3839), float(49), float(-5082), float(0), float(0), float(0), float(0), 30) - womprat23 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3836), float(49), float(-5086), float(0), float(0), float(0), float(0), 30) - womprat24 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3837), float(49), float(-5090), float(0), float(0), float(0), float(0), 30) - womprat25 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3832), float(49), float(-5061), float(0), float(0), float(0), float(0), 30) - womprat26 = stcSvc.spawnObject('womprat', 'tatooine', long(0), float(3841), float(49), float(-5069), float(0), float(0), float(0), float(0), 30) + return diff --git a/scripts/static_spawns/tatooine/mos_eisley_worrts.py b/scripts/static_spawns/tatooine/mos_eisley_worrts.py index eff360a0..f6402cf8 100644 --- a/scripts/static_spawns/tatooine/mos_eisley_worrts.py +++ b/scripts/static_spawns/tatooine/mos_eisley_worrts.py @@ -20,10 +20,6 @@ def addPlanetSpawns(core, planet): tame_worrt13 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3163), float(4), float(-4955), float(0), float(0), float(0), float(0), 30) tame_worrt14 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3173), float(4), float(-4965), float(0), float(0), float(0), float(0), 30) tame_worrt15 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3145), float(4), float(-4950), float(0), float(0), float(0), float(0), 30) - tame_worrt16 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3135), float(4), float(-4960), float(0), float(0), float(0), float(0), 30) - tame_worrt17 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3165), float(4), float(-4950), float(0), float(0), float(0), float(0), 30) - tame_worrt18 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3170), float(4), float(-4930), float(0), float(0), float(0), float(0), 30) - tame_worrt19 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3160), float(4), float(-4940), float(0), float(0), float(0), float(0), 30) # Tame Worrts tame_worrt2 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3125), float(4), float(-4726), float(0), float(0), float(0), float(0), 30) @@ -32,9 +28,6 @@ def addPlanetSpawns(core, planet): tame_worrt23 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3135), float(4), float(-4736), float(0), float(0), float(0), float(0), 30) tame_worrt24 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3145), float(4), float(-4746), float(0), float(0), float(0), float(0), 30) tame_worrt25 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3120), float(4), float(-4721), float(0), float(0), float(0), float(0), 30) - tame_worrt26 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3110), float(4), float(-4731), float(0), float(0), float(0), float(0), 30) - tame_worrt27 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3130), float(4), float(-4741), float(0), float(0), float(0), float(0), 30) - tame_worrt28 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3140), float(4), float(-4711), float(0), float(0), float(0), float(0), 30) - tame_worrt29 = stcSvc.spawnObject('tame_worrt', 'tatooine', long(0), float(3130), float(4), float(-4726), float(0), float(0), float(0), float(0), 30) + return \ No newline at end of file