Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

scripts/object/mobile/dressed_rebel_recruiter_human_female_01.py

@@ -7,4 +7,6 @@ def setup(core, object):
 	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
 	object.setStfFilename('mob/creature_names')
 	object.setStfName('rebel_recruiter')
+	
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:rebel', object.getPosition().x, object.getPosition().z, 45, 47, 0)
 	return

scripts/object/mobile/dressed_rebel_recruiter_human_female_02.py

@@ -1,4 +1,13 @@
 import sys
+from resources.datatables import Options
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'object/conversation');
+	object.setAttachment('conversationFile','reb_recruiter')
+	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
+	object.setStfFilename('mob/creature_names')
+	object.setStfName('rebel_recruiter')
+	
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:rebel', object.getPosition().x, object.getPosition().z, 45, 47, 0)
+		
+	return

scripts/object/mobile/dressed_rebel_recruiter_moncal_male_01.py

@@ -1,4 +1,13 @@
 import sys
+from resources.datatables import Options
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'object/conversation');
+	object.setAttachment('conversationFile','reb_recruiter')
+	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
+	object.setStfFilename('mob/creature_names')
+	object.setStfName('rebel_recruiter')	
+	
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:rebel', object.getPosition().x, object.getPosition().z, 45, 47, 0)
+	
+	return

scripts/object/mobile/dressed_rebel_recruiter_twilek_female_01.py

@@ -1,4 +1,13 @@
 import sys
+from resources.datatables import Options
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'object/conversation');
+	object.setAttachment('conversationFile','reb_recruiter')
+	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
+	object.setStfFilename('mob/creature_names')
+	object.setStfName('rebel_recruiter')
+	
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:rebel', object.getPosition().x, object.getPosition().z, 45, 47, 0)
+	
+	return

scripts/object/mobile/junk_dealer_f_01.py

@@ -7,4 +7,6 @@ def setup(core, object):
 	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
 	object.setStfFilename('mob/creature_names')
 	object.setStfName('junk_dealer')
+	
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:junkshop', object.getPosition().x, object.getPosition().z, 26, 81, 0)
 	return

scripts/object/mobile/junk_dealer_f_02.py

@@ -7,4 +7,6 @@ def setup(core, object):
 	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
 	object.setStfFilename('mob/creature_names')
 	object.setStfName('junk_dealer_smuggler')
+	
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:junkshop', object.getPosition().x, object.getPosition().z, 26, 81, 0)
 	return

scripts/object/mobile/junk_dealer_f_03.py

@@ -7,4 +7,6 @@ def setup(core, object):
 	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
 	object.setStfFilename('mob/creature_names')
 	object.setStfName('junk_dealer_special')
+	
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:junkshop', object.getPosition().x, object.getPosition().z, 26, 81, 0)
 	return

scripts/object/mobile/junk_dealer_m_01.py

@@ -7,4 +7,6 @@ def setup(core, object):
 	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
 	object.setStfFilename('mob/creature_names')
 	object.setStfName('junk_dealer')
+	
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:junkshop', object.getPosition().x, object.getPosition().z, 26, 81, 0)
 	return

scripts/object/mobile/junk_dealer_m_02.py

@@ -7,4 +7,6 @@ def setup(core, object):
 	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
 	object.setStfFilename('mob/creature_names')
 	object.setStfName('junk_dealer_smuggler')
+	
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:junkshop', object.getPosition().x, object.getPosition().z, 26, 81, 0)
 	return

scripts/object/mobile/junk_dealer_m_03.py

@@ -7,4 +7,6 @@ def setup(core, object):
 	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
 	object.setStfFilename('mob/creature_names')
 	object.setStfName('junk_dealer_special')
+	
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:junkshop', object.getPosition().x, object.getPosition().z, 26, 81, 0)
 	return

scripts/static_spawns/corellia/bela_vistal.py

@@ -0,0 +1,17 @@
+
+import sys
+from resources.datatables import Options
+from resources.datatables import StateStatus
+
+
+def addPlanetSpawns(core, planet):
+
+	stcSvc = core.staticService
+	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))
+	return	

scripts/static_spawns/corellia/coronet.py

@@ -121,5 +121,7 @@ def addPlanetSpawns(core, planet):
 	mackJasper.setCustomName2('Lieutenant Mack Jasper')
 	mackJasper.setOptionsBitmask(256)
 	
+	#Junkdealer will be added as soon as i can find coords
+	
 	
 	return

scripts/static_spawns/corellia/doaba_guerfel.py

@@ -0,0 +1,12 @@
+
+import sys
+from resources.datatables import Options
+from resources.datatables import StateStatus
+
+
+def addPlanetSpawns(core, planet):
+
+
+	#junkdealer will be added as soon as i find coords
+
+	return	

scripts/static_spawns/corellia/factional_recruiters.py

@@ -15,4 +15,13 @@ def addPlanetSpawns(core, planet):
 
 	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))	
 
+	#rebrecruiter tyrena
+	tyrenaCantina = core.objectService.getObject(long(2625352))
+	stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_moncal_male_01.iff', 'corellia', tyrenaCantina.getCellByCellNumber(11), float(-25.8), float(-0.9), float(0.4), float(0), float(-0.707), float(0), float(0.707))		
+	
+	#cnet cantina
+	cnetCantina = core.objectService.getObject(long(8105493))
+	stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_twilek_female_01.iff', 'corellia', cnetCantina.getCellByCellNumber(11), float(-25.8), float(-0.9), float(0.4), float(0), float(-0.707), float(0), float(0.707))		
+	
+
 	return

scripts/static_spawns/corellia/kor_vella.py

@@ -0,0 +1,12 @@
+
+import sys
+from resources.datatables import Options
+from resources.datatables import StateStatus
+
+
+def addPlanetSpawns(core, planet):
+
+
+	#junkdealer will be added as soon as i find coords
+
+	return	

scripts/static_spawns/corellia/tyrena.py

@@ -0,0 +1,12 @@
+
+import sys
+from resources.datatables import Options
+from resources.datatables import StateStatus
+
+
+def addPlanetSpawns(core, planet):
+
+
+	#junkdealer will be added as soon as i find coords
+
+	return	

scripts/static_spawns/dantooine/factional_recruiters.py

@@ -11,8 +11,12 @@ def addPlanetSpawns(core, planet):
 	
 	stcSvc = core.staticService
 	objSvc = core.objectService
-	#recruiter Imp Outpost
+	#imprecruiter 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))
 	 
+	#rebrecruiter abandoned base
+	stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_moncal_male_01.iff', 'dantooine', long(0), float(-6817), float(46), float(5511), float(0), float(-0.707), float(0), float(0.707))		
+	
+
 	return

scripts/static_spawns/lok/nyms_stronghold.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_junk_dealer_m_03.iff', 'lok', long(0), float(366), float(9), float(5202), float(0.71), float(0), float(0.70), float(0))	
+
+	return

scripts/static_spawns/naboo/deeja_peak.py

@@ -0,0 +1,15 @@
+import sys
+from resources.datatables import Options
+from resources.datatables import StateStatus
+
+
+def addPlanetSpawns(core, planet):
+
+	stcSvc = core.staticService
+	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))
+	
+	
+	return	

scripts/static_spawns/naboo/factional_recruiters.py

@@ -17,4 +17,8 @@ def addPlanetSpawns(core, planet):
 	#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))	
 
+	#Rebrecruiter Moenia
+	stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_human_female_02.iff', 'naboo', long(0), float(4827), float(4), float(-4697), float(0), float(-0.707), float(0), float(0.707))		
+	
+	
 	return

scripts/static_spawns/naboo/kaadara.py

@@ -0,0 +1,12 @@
+
+import sys
+from resources.datatables import Options
+from resources.datatables import StateStatus
+
+
+def addPlanetSpawns(core, planet):
+
+
+	#junkdealer will be added as soon as i find coords
+
+	return	

scripts/static_spawns/naboo/keren.py

@@ -0,0 +1,16 @@
+import sys
+from resources.datatables import Options
+from resources.datatables import StateStatus
+
+
+def addPlanetSpawns(core, planet):
+
+	stcSvc = core.staticService
+	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))
+	
+	
+	return	

scripts/static_spawns/naboo/moenia.py

@@ -0,0 +1,17 @@
+
+import sys
+from resources.datatables import Options
+from resources.datatables import StateStatus
+
+
+def addPlanetSpawns(core, planet):
+
+	stcSvc = core.staticService
+	objSvc = core.objectService
+	
+	# 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))
+	
+	return	

scripts/static_spawns/naboo/theed.py

@@ -0,0 +1,24 @@
+import sys
+from resources.datatables import Options
+from resources.datatables import StateStatus
+
+
+def addPlanetSpawns(core, planet):
+
+	stcSvc = core.staticService
+	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))
+
+	return	

scripts/static_spawns/talus/factional_recruiters.py

@@ -14,4 +14,8 @@ def addPlanetSpawns(core, planet):
 	#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))	
 
+	#Reb recruiter
+	dearicCantina = core.objectService.getObject(long(3175388))
+	stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_human_female_02.iff', 'talus', dearicCantina.getCellByCellNumber(11), float(-25.8), float(-0.9), float(-0.7), float(0), float(-0.707), float(0), float(0.707))		
+
 	return

scripts/static_spawns/tatooine/anchorhead.py

@@ -16,9 +16,6 @@ def addPlanetSpawns(core, planet):
 	# TODO Check all NPCs for personalized scripting, change format.
 	
 	# Cantina Interior
-	rebRecruiter = stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_human_female_01.iff', 'tatooine', long(1213345), float(-2.2), float(0.4), float(-5.4), float(0), float(0))	
-	#rebRecruiter.setOptionsBitmask(264)
-
 	borraSetas = stcSvc.spawnObject('object/mobile/shared_dressed_commoner_tatooine_rodian_female_03.iff', 'tatooine', long(1213345), float(9.8), float(0.4), float(-1.2), float(-0.65), float(0.75))
 	#borraSetas.setCustomName2('Borra Setas')
 	#borraSetas.setOptionsBitmask(256)
@@ -47,5 +44,9 @@ def addPlanetSpawns(core, planet):
 	Sorna = stcSvc.spawnObject('object/mobile/shared_dressed_tatooine_tosche_sorna.iff', 'tatooine', long(0), float(-135), float(52.0), float(-5331), float(0.36), float(0.93))
 	Sorna.setCustomName2('Sorna')
 	Sorna.setOptionsBitmask(256)
+	
+	#Junk Dealer
+	stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(110), float(52), float(-5428), float(0.71), float(0.71))
+
 	return
 	

scripts/static_spawns/tatooine/bestine.py

@@ -96,5 +96,12 @@ def addPlanetSpawns(core, planet):
 	#calebKnolar.setCustomName2('Major Caleb Knolar')
 	#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))
 	return
 	

scripts/static_spawns/tatooine/factional_recruiters.py

@@ -1,5 +1,5 @@
 import sys
-# Project SWG:   Imperial Recruiters tatooine:  Static Spawns
+# Project SWG:   Factional Recruiters tatooine:  Static Spawns
 # (C)2014 ProjectSWG
 
 
@@ -11,14 +11,20 @@ def addPlanetSpawns(core, planet):
 	
 	stcSvc = core.staticService
 	objSvc = core.objectService
-	#recruiter Eisley
+	#Imp 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
+	#Imp 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))	
 
+	# Reb Recruiter
+	
+	#Anchorhead cantina
+	anchCantina = core.objectService.getObject(long(1213343)) 
+	stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_human_female_01.iff', 'tatooine', anchCantina.getCellByCellNumber(2), float(-2.2), float(0.4), float(-5.4), float(0), float(0), float(0), float(0))		
+
 	return

scripts/static_spawns/tatooine/mos_entha.py

@@ -20,6 +20,11 @@ def addPlanetSpawns(core, planet):
 	ankwee.setCustomName2('An\'kwee')
 	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))
 	return
 	

scripts/static_spawns/tatooine/mos_espa.py

@@ -67,6 +67,9 @@ def addPlanetSpawns(core, planet):
 	commoner23.setCustomName2('a Commoner')
 	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))
 	
 	
 	return

scripts/static_spawns/tatooine/mos_taike.py

@@ -0,0 +1,22 @@
+import sys
+# Project SWG:   Mos Taike:  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
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+
+	
+	#Junkdealer
+	stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3902), float(33), float(2362), float(0), float(0))
+	return
+	

scripts/static_spawns/tatooine/wayfar.py

@@ -0,0 +1,23 @@
+import sys
+# Project SWG:   Wayfar:  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
+	
+	# TODO Check all NPCs for personalized scripting, change format.
+
+	
+	#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))
+	return
+