From 83cb7c4150e2a1b76b3fbc2c66cb97b33090b7dc Mon Sep 17 00:00:00 2001 From: tacef Date: Sun, 20 Jul 2014 15:35:09 +0200 Subject: [PATCH] Changed Junkdealer Spawns on all Planets to use Mobiletemplate Fixed Rotation on Tatooine Junkdealers --- scripts/static_spawns/corellia/bela_vistal.py | 8 +++---- scripts/static_spawns/corellia/coronet.py | 8 +++---- .../static_spawns/corellia/doaba_guerfel.py | 4 ++-- scripts/static_spawns/corellia/kor_vella.py | 8 +++---- scripts/static_spawns/corellia/tyrena.py | 10 ++++----- .../static_spawns/corellia/vreni_island.py | 4 ++-- scripts/static_spawns/lok/nyms_stronghold.py | 2 +- scripts/static_spawns/naboo/deeja_peak.py | 2 +- scripts/static_spawns/naboo/keren.py | 4 ++-- scripts/static_spawns/naboo/moenia.py | 2 +- scripts/static_spawns/naboo/theed.py | 22 +++++++++---------- scripts/static_spawns/tatooine/bestine.py | 12 +++++----- scripts/static_spawns/tatooine/mos_eisley.py | 17 +++++++------- scripts/static_spawns/tatooine/mos_entha.py | 10 ++++----- scripts/static_spawns/tatooine/mos_espa.py | 14 ++++++------ scripts/static_spawns/tatooine/mos_taike.py | 2 +- scripts/static_spawns/tatooine/wayfar.py | 4 ++-- 17 files changed, 66 insertions(+), 67 deletions(-) diff --git a/scripts/static_spawns/corellia/bela_vistal.py b/scripts/static_spawns/corellia/bela_vistal.py index 45ea12ee..342d142c 100644 --- a/scripts/static_spawns/corellia/bela_vistal.py +++ b/scripts/static_spawns/corellia/bela_vistal.py @@ -10,8 +10,8 @@ def addPlanetSpawns(core, planet): objSvc = core.objectService #junkdealer - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(6840), float(315), float(-5630), float(0.707), float(-0.707)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(6852), float(315), float(-5802), float(0.71), float(-0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(6756), float(315), float(-5778), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(6970), float(330), float(-5588), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(6840), float(315), float(-5630), float(0.707), float(-0.707)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(6852), float(315), float(-5802), float(0.71), float(-0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(6756), float(315), float(-5778), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(6970), float(330), float(-5588), float(0.71), float(0.71)) return diff --git a/scripts/static_spawns/corellia/coronet.py b/scripts/static_spawns/corellia/coronet.py index 7bd491dd..969074dc 100644 --- a/scripts/static_spawns/corellia/coronet.py +++ b/scripts/static_spawns/corellia/coronet.py @@ -126,9 +126,9 @@ def addPlanetSpawns(core, planet): stcSvc.spawnObject('object/mobile/shared_respec_seller_f_1.iff', 'corellia', long(0), float(-129), float(28), float(-4758), float(-0.3327), float(0.9288)) #Junk Dealer - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-118), float(28), float(-4792), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(22), float(28), float(-4773), float(0.71), float(-0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-42), float(28), float(-4612), float(0), float(0)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-68), float(28), float(-4585), float(0), float(1)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-118), float(28), float(-4792), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(22), float(28), float(-4773), float(0.71), float(-0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-42), float(28), float(-4612), float(0), float(0)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-68), float(28), float(-4585), float(0), float(1)) return \ No newline at end of file diff --git a/scripts/static_spawns/corellia/doaba_guerfel.py b/scripts/static_spawns/corellia/doaba_guerfel.py index f25520a5..2f0b71a2 100644 --- a/scripts/static_spawns/corellia/doaba_guerfel.py +++ b/scripts/static_spawns/corellia/doaba_guerfel.py @@ -10,7 +10,7 @@ def addPlanetSpawns(core, planet): #doaba guerfel - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(3190), float(300.2), float(5387), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(3227), float(300.2), float(5387), float(0.71), float(-0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(3190), float(300.2), float(5387), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(3227), float(300.2), float(5387), float(0.71), float(-0.71)) return diff --git a/scripts/static_spawns/corellia/kor_vella.py b/scripts/static_spawns/corellia/kor_vella.py index a256b03a..5355dd48 100644 --- a/scripts/static_spawns/corellia/kor_vella.py +++ b/scripts/static_spawns/corellia/kor_vella.py @@ -10,9 +10,9 @@ def addPlanetSpawns(core, planet): stcSvc = core.staticService #korvella - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-3151), float(31), float(2790), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-3567), float(86), float(3143), float(0.71), float(-0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-3788), float(86), float(-3190), float(0), float(0)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-3390), float(86), float(-3288), float(0), float(1)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-3151), float(31), float(2790), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-3567), float(86), float(3143), float(0.71), float(-0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-3788), float(86), float(-3190), float(0), float(0)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-3390), float(86), float(-3288), float(0), float(1)) return diff --git a/scripts/static_spawns/corellia/tyrena.py b/scripts/static_spawns/corellia/tyrena.py index e0759c24..b75146c3 100644 --- a/scripts/static_spawns/corellia/tyrena.py +++ b/scripts/static_spawns/corellia/tyrena.py @@ -9,9 +9,9 @@ def addPlanetSpawns(core, planet): stcSvc = core.staticService #junkdealer will be added as soon as i find coords - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5088), float(21.3), float(-2384), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5125.2), float(21.3), float(-2384), float(0.71), float(-0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5278), float(21), float(-2510), float(0), float(0)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5469), float(21), float(-2657), float(0), float(1)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5502), float(21), float(-2709), float(0), float(1)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-5088), float(21.3), float(-2384), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-5125.2), float(21.3), float(-2384), float(0.71), float(-0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-5278), float(21), float(-2510), float(0), float(0)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-5469), float(21), float(-2657), float(0), float(1)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-5502), float(21), float(-2709), float(0), float(1)) return diff --git a/scripts/static_spawns/corellia/vreni_island.py b/scripts/static_spawns/corellia/vreni_island.py index cbc2f84a..cc1cbe35 100644 --- a/scripts/static_spawns/corellia/vreni_island.py +++ b/scripts/static_spawns/corellia/vreni_island.py @@ -9,8 +9,8 @@ def addPlanetSpawns(core, planet): stcSvc = core.staticService #vreni - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5542), float(23.4), float(-6228.7), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'corellia', long(0), float(-5552), float(16.1), float(-6071), float(0.71), float(-0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-5542), float(23.4), float(-6228.7), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'corellia', long(0), float(-5552), float(16.1), float(-6071), float(0.71), float(-0.71)) return diff --git a/scripts/static_spawns/lok/nyms_stronghold.py b/scripts/static_spawns/lok/nyms_stronghold.py index c45e284d..21e89b23 100644 --- a/scripts/static_spawns/lok/nyms_stronghold.py +++ b/scripts/static_spawns/lok/nyms_stronghold.py @@ -13,6 +13,6 @@ def addPlanetSpawns(core, planet): objSvc = core.objectService #recruiter Imp Outpost - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'lok', long(0), float(366), float(9), float(5202), float(0.71), float(0), float(0.70), float(0)) + stcSvc.spawnObject('junkdealer', 'lok', long(0), float(366), float(9), float(5202), float(0.71), float(0), float(0.70), float(0)) return \ No newline at end of file diff --git a/scripts/static_spawns/naboo/deeja_peak.py b/scripts/static_spawns/naboo/deeja_peak.py index 6fdf650b..4989a58d 100644 --- a/scripts/static_spawns/naboo/deeja_peak.py +++ b/scripts/static_spawns/naboo/deeja_peak.py @@ -9,7 +9,7 @@ def addPlanetSpawns(core, planet): objSvc = core.objectService #junkdealer - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(5135), float(346.5), float(-1514), float(0.707), float(0.707)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(5135), float(346.5), float(-1514), float(0.707), float(0.707)) return diff --git a/scripts/static_spawns/naboo/keren.py b/scripts/static_spawns/naboo/keren.py index 2c6c6ce0..78ecc274 100644 --- a/scripts/static_spawns/naboo/keren.py +++ b/scripts/static_spawns/naboo/keren.py @@ -9,8 +9,8 @@ def addPlanetSpawns(core, planet): objSvc = core.objectService #junkdealer - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(1242), float(13), float(2732), float(0.707), float(0.707)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(1774), float(12.5), float(2625), float(0.707), float(0.707)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(1242), float(13), float(2732), float(0.707), float(0.707)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(1774), float(12.5), float(2625), float(0.707), float(0.707)) return diff --git a/scripts/static_spawns/naboo/moenia.py b/scripts/static_spawns/naboo/moenia.py index 4c63c0fc..e7b6de38 100644 --- a/scripts/static_spawns/naboo/moenia.py +++ b/scripts/static_spawns/naboo/moenia.py @@ -12,6 +12,6 @@ def addPlanetSpawns(core, planet): # TODO Check all NPCs for personalized scripting, change format. #Junkdealer - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'naboo', long(0), float(4318.83), float(5.15), float(-4797.57), float(0), float(1)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(4318.83), float(5.15), float(-4797.57), float(0), float(1)) return diff --git a/scripts/static_spawns/naboo/theed.py b/scripts/static_spawns/naboo/theed.py index 292e9649..c750fcab 100644 --- a/scripts/static_spawns/naboo/theed.py +++ b/scripts/static_spawns/naboo/theed.py @@ -9,16 +9,16 @@ def addPlanetSpawns(core, planet): objSvc = core.objectService #junkdealer - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(-5694), float(6.5), float(4182), float(0.707), float(-0.707)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(-5717), float(6.5), float(4159), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(-5086), float(6), float(4142), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(-5147), float(6.5), float(4158), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(-5114), float(6.5), float(4161), float(0.71), float(-0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(-5222), float(6), float(4217), float(0.71), float(-0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(-5127), float(6), float(4239), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(-5761), float(6.6), float(4234), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(-5475), float(6), float(4105), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(-4999), float(6), float(4119), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'naboo', long(0), float(-5883), float(6), float(4214), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(-5694), float(6.5), float(4182), float(0.707), float(-0.707)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(-5717), float(6.5), float(4159), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(-5086), float(6), float(4142), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(-5147), float(6.5), float(4158), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(-5114), float(6.5), float(4161), float(0.71), float(-0.71)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(-5222), float(6), float(4217), float(0.71), float(-0.71)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(-5127), float(6), float(4239), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(-5761), float(6.6), float(4234), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(-5475), float(6), float(4105), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(-4999), float(6), float(4119), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'naboo', long(0), float(-5883), float(6), float(4214), float(0.71), float(0.71)) return diff --git a/scripts/static_spawns/tatooine/bestine.py b/scripts/static_spawns/tatooine/bestine.py index 7a124bd6..76e935af 100644 --- a/scripts/static_spawns/tatooine/bestine.py +++ b/scripts/static_spawns/tatooine/bestine.py @@ -97,11 +97,11 @@ def addPlanetSpawns(core, planet): #calebKnolar.setOptionsBitmask(256) #Junk Dealers - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(-1287), float(12), float(-3655), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(-1259), float(12), float(-3673), float(0.71), float(-0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(-1026), float(10), float(-3557), float(0), float(0)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(-1260), float(12), float(-3573), float(0), float(1)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(-1126), float(12), float(-3674), float(0.71), float(-0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(-1118), float(12), float(-3687), float(0), float(0)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-1290.23), float(12.5278), float(-3655.77), float(0.850), float(0.526)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-1257.72), float(12.5278), float(-3673.51), float(-0.525), float(0.851)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-1025.98), float(10), float(-3558.69), float(0.830), float(-0.558)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-1260), float(12), float(-3573), float(0.864), float(-0.503)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-1126), float(12), float(-3674), float(0.71), float(-0.71)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-1118), float(12), float(-3687), float(0.932), float(-0.364)) return diff --git a/scripts/static_spawns/tatooine/mos_eisley.py b/scripts/static_spawns/tatooine/mos_eisley.py index 13f969de..16d5c183 100644 --- a/scripts/static_spawns/tatooine/mos_eisley.py +++ b/scripts/static_spawns/tatooine/mos_eisley.py @@ -323,14 +323,13 @@ def addPlanetSpawns(core, planet): #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)) #Junk Dealers - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3355), float(5), float(-4823), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3412), float(5), float(-4713), float(0.71), float(-0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3500), float(5), float(-4960), float(0), float(0)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3497), float(5), float(-4928), float(0), float(1)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3377), float(5), float(-4524), float(0.71), float(0.71)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3271), float(5), float(-4704), float(0), float(0)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3476), float(5), float(-4665), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(3355), float(5), float(-4823), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(3412), float(5), float(-4713), float(0.71), float(-0.71)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(3500.96), float(5.5), float(-4961.4), float(-0.050), float(0.998)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(3496.29), float(5.5), float(-4926.52), float(0.995), float(0.090)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(3377), float(5), float(-4524), float(0.71), float(0.71)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(3271), float(5), float(-4704), float(0), float(0)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(3476.9), float(5), float(-460.35), float(0.189), float(0.981)) - return - + return \ No newline at end of file diff --git a/scripts/static_spawns/tatooine/mos_entha.py b/scripts/static_spawns/tatooine/mos_entha.py index 4686d285..0455d44a 100644 --- a/scripts/static_spawns/tatooine/mos_entha.py +++ b/scripts/static_spawns/tatooine/mos_entha.py @@ -21,10 +21,10 @@ def addPlanetSpawns(core, planet): ankwee.setOptionsBitmask(256) #Junkdealer - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(1271), float(7.7), float(2919), float(0), float(0)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(1271), float(7.7), float(2960), float(1), float(0)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(1396), float(7), float(3026), float(0), float(0)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(1471), float(7), float(3325), float(0), float(1)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(1463), float(7), float(3126), float(0.71), float(-0.71)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(1271), float(7.7), float(2919), float(0), float(0)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(1271), float(7.7), float(2960), float(1), float(0)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(1396), float(7), float(3026), float(0.745), float(0.666)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(1471), float(7), float(3325), float(0), float(1)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(1463), float(7), float(3126), float(0.71), float(-0.71)) return diff --git a/scripts/static_spawns/tatooine/mos_espa.py b/scripts/static_spawns/tatooine/mos_espa.py index 1cae7735..7d704567 100644 --- a/scripts/static_spawns/tatooine/mos_espa.py +++ b/scripts/static_spawns/tatooine/mos_espa.py @@ -68,12 +68,12 @@ def addPlanetSpawns(core, planet): commoner23.setOptionsBitmask(256) #Junkdealer will be added as soon as i can find coords - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-3060.50), float(5), float(2181.71), float(0), float(1)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-2924.53), float(5), float(2173.97), float(0), float(1)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-2977), float(5.5), float(2327), float(0), float(1)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-3008), float(5.5), float(2347), float(0), float(1)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-2903), float(5), float(2446), float(0), float(1)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-2085), float(5), float(2195), float(0), float(1)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_03.iff', 'tatooine', long(0), float(-2085), float(5), float(2230), float(0), float(1)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-3060.50), float(5), float(2181.71), float(0), float(1)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-2924.53), float(5), float(2173.97), float(-0.391), float(0.920)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-2977), float(5.5), float(2327), float(-0.490), float(0.872)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-3008), float(5.5), float(2347), float(0.885), float(0.464)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-2903), float(5), float(2446), float(0.782), float(-0.622)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-2933), float(5), float(2124), float(0.446), float(0.896)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-2846), float(5), float(2196), float(-0.389), float(0.9211)) return diff --git a/scripts/static_spawns/tatooine/mos_taike.py b/scripts/static_spawns/tatooine/mos_taike.py index e3e78bf7..814d7b2e 100644 --- a/scripts/static_spawns/tatooine/mos_taike.py +++ b/scripts/static_spawns/tatooine/mos_taike.py @@ -17,6 +17,6 @@ def addPlanetSpawns(core, planet): #Junkdealer - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3902), float(33), float(2362), float(0), float(0)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(3902), float(33), float(2362), float(0), float(0)) return diff --git a/scripts/static_spawns/tatooine/wayfar.py b/scripts/static_spawns/tatooine/wayfar.py index 4864ed87..0f9fd3f0 100644 --- a/scripts/static_spawns/tatooine/wayfar.py +++ b/scripts/static_spawns/tatooine/wayfar.py @@ -17,7 +17,7 @@ def addPlanetSpawns(core, planet): #Junkdealer - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(-5242), float(75), float(-6495), float(0), float(0)) - stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(-5129), float(75), float(-6584), float(0), float(0)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-5240.87), float(75), float(-641.015), float(0.879), float(0.476)) + stcSvc.spawnObject('junkdealer', 'tatooine', long(0), float(-5132.33), float(75), float(-6584.92), float(0.637), float(0.771)) return