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

scripts/commands/grantzoningrights.py

@@ -0,0 +1,40 @@
+import sys
+from java.lang import System
+from resources.common import OutOfBand
+from resources.common import ProsePackage
+import main.NGECore
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+
+	if target == None:
+		return
+	
+	#if !actor.hasSkill('Politician'):
+		#You must be a Politician to enable city zoning.
+		#actor.sendSystemMessage('@city/city:zoning_skill', 0)
+		#return
+	
+	thisCity = main.NGECore.getInstance().playerCityService.getCityObjectIsIn(actor)
+	
+	if thisCity == None:
+		#not_in_city_limits
+		actor.sendSystemMessage('@city/city:not_in_city_limits', 0)
+		return
+		
+	if thisCity.getMayorID()!=actor.getObjectID() and not thisCity.isMilitiaMember(actor.getObjectID()):	
+		#You must be the mayor of the city or a member of the city militia to grant zoning rights.	
+		actor.sendSystemMessage('@city/city:grant_rights_fail', 0)
+		actor.sendSystemMessage('thisCity.getMayorID() %s' % thisCity.getMayorID(), 0)
+		actor.sendSystemMessage('actor.getObjectID() %s' % actor.getObjectID(), 0)
+		return
+		
+	#You have granted %TO zoning rights for 24 hours.
+	actor.sendSystemMessage(OutOfBand.ProsePackage("@city/city:rights_granted_self", "TO", target.getCustomName()), 0)
+	target.setAttachment('Has24HZoningFor',thisCity.getCityID())
+	target.setAttachment('Has24HZoningUntil',System.currentTimeMillis()+60*60*24)
+	target.sendSystemMessage(OutOfBand.ProsePackage("@city/city:rights_granted", "TO", thisCity.getCityName()), 0)
+		
+	return

scripts/commands/setgodmode.py

@@ -113,11 +113,8 @@ def run(core, actor, target, commandString):
 			actor.removeAbility("admin")
 			playerObject.setGodLevel(0)
 	
-	elif command == 'setBounty' and arg1:
-		if not core.missionService.addToExistingBounty(actor, int(arg1)):
-			core.missionService.createNewBounty(actor, int(arg1))
-		
-		actor.sendSystemMessage('Your bounty has been set to an additional ' + str(arg1) + ' credits.', 0)
+	elif command == 'setBounty':
+		core.playerService.sendSetBountyWindow(actor, actor)
 		return
 	
 	return

scripts/houses/player_garden_tatooine_sml_01.py

@@ -0,0 +1,15 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(housingTemplates):
+	houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_garden_tatooine_sml_01_deed.iff", "object/building/player/city/shared_garden_tatooine_sml_01.iff", 0)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.addPlaceablePlanet("dantooine")
+	houseTemplate.addPlaceablePlanet("lok")
+	houseTemplate.setDefaultItemLimit(0)
+	
+	housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
+	return

scripts/houses/player_shuttleport_tatooine.py

@@ -0,0 +1,12 @@
+import sys
+from services.housing import HouseTemplate
+from engine.resources.scene import Point3D
+
+def setup(housingTemplates):
+	houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_shuttleport_tatooine_deed.iff", "object/building/tatooine/shared_shuttleport_tatooine.iff", 1)
+	
+	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3.5),float(-0.3),float(3.5)))
+	houseTemplate.addPlaceablePlanet("tatooine")
+	houseTemplate.setDefaultItemLimit(0)
+	housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
+	return

scripts/object/building/player/city/garden_tatooine_sml_01.py

@@ -1,4 +1,14 @@
 import sys
+from engine.resources.scene import Point3D
+from engine.resources.scene import Quaternion
 
 def setup(core, object):
+	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -13.7, 3, 9.1, -1, 0, -1)
+	print(sign)
+	object.setAttachment("structureSign", sign)
+	
+	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -17.2, 1.5 , 8, 1, 0 ,4)
+	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
+	structureterminal.setAttachment('housing_parentstruct', object)
+	
 	return

scripts/object/mobile/dressed_imperial_officer_f.py

@@ -1,4 +1,10 @@
 import sys
+from resources.datatables import Options
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'object/conversation');
+	object.setAttachment('conversationFile','imp_recruiter')
+	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
+	object.setStfFilename('mob/creature_names')
+	object.setStfName('imperial_recruiter')
+	return

scripts/object/mobile/dressed_imperial_officer_m_2.py

@@ -1,4 +1,10 @@
 import sys
+from resources.datatables import Options
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'object/conversation');
+	object.setAttachment('conversationFile','imp_recruiter')
+	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
+	object.setStfFilename('mob/creature_names')
+	object.setStfName('imperial_recruiter')
+	return

scripts/object/mobile/dressed_imperial_officer_m_3.py

@@ -1,4 +1,10 @@
 import sys
+from resources.datatables import Options
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'object/conversation');
+	object.setAttachment('conversationFile','imp_recruiter')
+	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
+	object.setStfFilename('mob/creature_names')
+	object.setStfName('imperial_recruiter')
+	return

scripts/object/mobile/dressed_imperial_officer_m_4.py

@@ -1,4 +1,10 @@
 import sys
+from resources.datatables import Options
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'object/conversation');
+	object.setAttachment('conversationFile','imp_recruiter')
+	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
+	object.setStfFilename('mob/creature_names')
+	object.setStfName('imperial_recruiter')
+	return

scripts/object/mobile/dressed_imperial_officer_m_5.py

@@ -1,4 +1,10 @@
 import sys
+from resources.datatables import Options
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'object/conversation');
+	object.setAttachment('conversationFile','imp_recruiter')
+	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
+	object.setStfFilename('mob/creature_names')
+	object.setStfName('imperial_recruiter')
+	return

scripts/object/mobile/dressed_imperial_officer_m_6.py

@@ -1,4 +1,10 @@
 import sys
+from resources.datatables import Options
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'object/conversation');
+	object.setAttachment('conversationFile','imp_recruiter')
+	object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
+	object.setStfFilename('mob/creature_names')
+	object.setStfName('imperial_recruiter')
+	return

scripts/object/mobile/dressed_rebel_recruiter_human_female_01.py

@@ -1,4 +1,10 @@
 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')
+	return

scripts/object/tangible/deed/city_deed/garden_tatooine_sml_01_deed.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/city_deed/shuttleport_tatooine_deed.py

@@ -1,4 +1,8 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'deeds/structureDeed')
+	return
+
+def use(core, actor, object):
 	return

scripts/object/tangible/deed/vehicle_deed/landspeeder_tantive4_deed.py

@@ -1,7 +1,7 @@
 import sys
 
 def setup(core, object):
-	object.setAttachment('radial_filename', 'vehicleDeed')
+	object.setAttachment('radial_filename', 'deeds/vehicleDeed')
 	return
 
 def use(core, actor, object):
@@ -21,4 +21,4 @@ def use(core, actor, object):
 			core.simulationService.add(vehicle, vehicle.getPosition().x, vehicle.getPosition().z, True)
 			actor.setAttachment('activeVehicleID', vehicle.getObjectID())
 	
-	return
+	return

scripts/object/tangible/terminal/terminal_bank.py

@@ -2,6 +2,6 @@ import sys
 
 def setup(core, object):
 	object.setAttachment('radial_filename', 'terminal/bank')
-	core.mapService.addLocation(object.getPlanet(), 'Bank Terminal', object.getPosition().x, object.getPosition().z, 41, 42, 0)
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_bank', object.getPosition().x, object.getPosition().z, 2, 42, 0)
 	return
 	

scripts/object/tangible/terminal/terminal_bazaar.py

@@ -1,7 +1,6 @@
 import sys
 
 def setup(core, object):
-
-	core.mapService.addLocation(object.getPlanet(), 'Bazaar Terminal', object.getPosition().x, object.getPosition().z, 41, 43, 0)
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_bazaar', object.getPosition().x, object.getPosition().z, 41, 43, 0)
 	return
 	

scripts/object/tangible/terminal/terminal_city_junk_dealer.py

@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:junk_dealer', object.getPosition().x, object.getPosition().z, 26, 81, 0)
 	return

scripts/object/tangible/terminal/terminal_cloning.py

@@ -2,5 +2,6 @@ import sys
 
 def setup(core, object):
 	object.setAttachment('radial_filename', 'terminal/cloning_terminal')
+	
 	return
 	

scripts/object/tangible/terminal/terminal_mission_artisan.py

@@ -2,6 +2,6 @@ import sys
 
 def setup(core, object):
 
-	core.mapService.addLocation(object.getPlanet(), 'Artisan Mission Terminal', object.getPosition().x, object.getPosition().z, 41, 21, 0)
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_artisan', object.getPosition().x, object.getPosition().z, 41, 76, 0)
 	return
 	

scripts/object/tangible/terminal/terminal_mission_entertainer.py

@@ -1,7 +1,6 @@
 import sys
 
 def setup(core, object):
-
-	core.mapService.addLocation(object.getPlanet(), 'Entertainer Mission Terminal', object.getPosition().x, object.getPosition().z, 41, 24, 0)
-	return
-	
+	object.setAttachment("terminalType", 2)
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_entertainer', object.getPosition().x, object.getPosition().z, 41, 75, 0)
+	return

scripts/object/tangible/terminal/terminal_mission_imperial.py

@@ -1,7 +1,6 @@
 import sys
 
 def setup(core, object):
-
-	core.mapService.addLocation(object.getPlanet(), 'Imperial Mission Terminal', object.getPosition().x, object.getPosition().z, 41, 46, 0)
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_imperial', object.getPosition().x, object.getPosition().z, 41, 80, 0)
 	return
 	

scripts/object/tangible/terminal/terminal_mission_rebel.py

@@ -1,7 +1,6 @@
 import sys
 
 def setup(core, object):
-
-	core.mapService.addLocation(object.getPlanet(), 'Rebel Mission Terminal', object.getPosition().x, object.getPosition().z, 41, 45, 0)
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_rebel', object.getPosition().x, object.getPosition().z, 41, 79, 0)
 	return
 	

scripts/object/tangible/terminal/terminal_mission_scout.py

@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_scout', object.getPosition().x, object.getPosition().z, 41, 77, 0)
 	return

scripts/radial/terminal/city_maintenance_terminal.py

@@ -24,6 +24,10 @@ def createRadial(core, owner, target, radials):
 	radials.add(RadialOptions(3, 121, 0, '@city/city:non_citizen_city_status'))	
 	radials.add(RadialOptions(3, 122, 0, '@city/city:rank_info_t'))
 	radials.add(RadialOptions(3, 123, 0, '@city/city:citizen_list_t'))
+	radials.add(RadialOptions(3, 230, 0, '@city/city:revoke_citizenship'))
+	
+	radials.add(RadialOptions(3, 231, 0, 'Add 10 citizens'))
+	radials.add(RadialOptions(3, 232, 0, 'Deduct 10 citizens'))
 
 	return
 	
@@ -80,14 +84,26 @@ def handleSelection(core, owner, target, option):
 		if owner is not None:
 			handleCitizenList(core, owner, target, option)
 			return
-	
-def handleSetCityName(core, owner, target, option):	
-	window = core.suiService.createInputBox(2,'@city/city:city_name_new_t','@city/city:city_name_new_d', owner, target, 0)
-	returnList = Vector()
-	returnList.add('txtInput:LocalText')
-	window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, setnameCallBack)
-	window.addHandler(1, '', Trigger.TRIGGER_CANCEL, returnList, setnameCallBack)	
-	core.suiService.openSUIWindow(window);
+			
+	if option == 231:
+		if owner is not None:
+			handle10Add(core, owner, target, option)
+			return
+			
+	if option == 232:
+		if owner is not None:
+			handle10Deduct(core, owner, target, option)
+			return
+
+def handle10Add(core, owner, target, option):	
+	playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner)
+	playerCity.Add10MoreCitizens()
+	return
+
+			
+def handle10Deduct(core, owner, target, option):	
+	playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner)
+	playerCity.Deduct10Citizens()
 	return
 	
 def setnameCallBack(owner, window, eventType, returnList):

scripts/static_spawns/kaas.py

@@ -14,14 +14,14 @@ def addPlanetSpawns(core, planet):
 	objSvc = core.objectService
 #Dark Temple Area
 	#Structures
-	stcSvc.spawnObject('object/building/military/shared_military_base_police_station_imperial_lok_otto.iff', 'kaas', long(0), float(-5117.8), float(80.0), float(-2314.1), float(0), float(0))
-	stcSvc.spawnObject('object/building/player/shared_player_house_corellia_medium_style_01.iff', 'kaas', long(0), float(-5078.6), float(80.0), float(-2302.5), float(0), float(0))
-	stcSvc.spawnObject('object/building/general/shared_bunker_imperial_weapons_research_facility_01.iff', 'kaas', long(0), float(-5159.5), float(80.0), float(-2298.7), float(0), float(0))
-	stcSvc.spawnObject('object/building/content/aurilia/shared_aurilia_pyramid_hut.iff', 'kaas', long(0), float(-5163.9), float(79.0), float(-2369.6), float(0.71), float(0.71))
-	stcSvc.spawnObject('object/building/content/aurilia/shared_aurilia_pyramid_hut.iff', 'kaas', long(0), float(-5163.9), float(79.0), float(-2351.6), float(0.71), float(0.71))
-	stcSvc.spawnObject('object/building/content/aurilia/shared_aurilia_pyramid_hut.iff', 'kaas', long(0), float(-5072.1), float(79.0), float(-2369.6), float(-0.71), float(0.71))
-	stcSvc.spawnObject('object/building/content/aurilia/shared_aurilia_pyramid_hut.iff', 'kaas', long(0), float(-5072.1), float(79.0), float(-2351.6), float(-0.71), float(0.71))
-	stcSvc.spawnObject('object/building/military/shared_outpost_cloning_facility_s02.iff', long(0), 'kaas', long(0), float(-5072.1), float(80.0), float(-2279.5), float(0.71), float(0), float(-0.71), float(0))
+	#stcSvc.spawnObject('object/building/military/shared_military_base_police_station_imperial_lok_otto.iff', 'kaas', long(0), float(-5117.8), float(80.0), float(-2314.1), float(0), float(0))
+	#stcSvc.spawnObject('object/building/player/shared_player_house_corellia_medium_style_01.iff', 'kaas', long(0), float(-5078.6), float(80.0), float(-2302.5), float(0), float(0))
+	#stcSvc.spawnObject('object/building/general/shared_bunker_imperial_weapons_research_facility_01.iff', 'kaas', long(0), float(-5159.5), float(80.0), float(-2298.7), float(0), float(0))
+	#stcSvc.spawnObject('object/building/content/aurilia/shared_aurilia_pyramid_hut.iff', 'kaas', long(0), float(-5163.9), float(79.0), float(-2369.6), float(0.71), float(0.71))
+	#stcSvc.spawnObject('object/building/content/aurilia/shared_aurilia_pyramid_hut.iff', 'kaas', long(0), float(-5163.9), float(79.0), float(-2351.6), float(0.71), float(0.71))
+	#stcSvc.spawnObject('object/building/content/aurilia/shared_aurilia_pyramid_hut.iff', 'kaas', long(0), float(-5072.1), float(79.0), float(-2369.6), float(-0.71), float(0.71))
+	#stcSvc.spawnObject('object/building/content/aurilia/shared_aurilia_pyramid_hut.iff', 'kaas', long(0), float(-5072.1), float(79.0), float(-2351.6), float(-0.71), float(0.71))
+	#stcSvc.spawnObject('object/building/military/shared_outpost_cloning_facility_s02.iff', 'kaas', long(0), float(-5072.1), float(80.0), float(-2279.5), float(0.71), float(0), float(-0.71), float(0))
 	
 	#Terminals
 	stcSvc.spawnObject('object/tangible/terminal/shared_terminal_bank.iff', 'kaas', long(0), float(-5080.8), float(80.0), float(-2275.7), float(-0.71), float(0.71))
@@ -58,20 +58,20 @@ def addPlanetSpawns(core, planet):
 	
 	
 #Village of the Descendants Area
-	stcSvc.spawnObject('object/building/general/shared_cave_01.iff', 'kaas', long(0), float(3348.1), float(110), float(2562.1), float(0), float(0))
+	#stcSvc.spawnObject('object/building/general/shared_cave_01.iff', 'kaas', long(0), float(3348.1), float(110), float(2562.1), float(0), float(0))
 
 #Kaas City Ruins
 
 #Tomb of Vitiate	
 	
 #Northwest Cave
-	stcSvc.spawnObject('object/building/general/shared_cave_01.iff', 'kaas', long(0), float(-6135.3), float(185), float(6575.0), float(0), float(0))
+	#stcSvc.spawnObject('object/building/general/shared_cave_01.iff', 'kaas', long(0), float(-6135.3), float(185), float(6575.0), float(0), float(0))
 
 #Abandoned Separatist Base
-	stcSvc.spawnObject('object/building/military/shared_military_base_police_station_rebel_style_01.iff', 'kaas', long(0), float(-3538), float(80), float(6758), float(0), float(0))
+	#stcSvc.spawnObject('object/building/military/shared_military_base_police_station_rebel_style_01.iff', 'kaas', long(0), float(-3538), float(80), float(6758), float(0), float(0))
 
 #Sith Meditation Chamber
-	stcSvc.spawnObject('object/building/player/shared_player_house_sith_meditation_room.iff', 'kaas', long(0), float(4766), float(126), float(-7307), float(0), float(0))
+	#stcSvc.spawnObject('object/building/player/shared_player_house_sith_meditation_room.iff', 'kaas', long(0), float(4766), float(126), float(-7307), float(0), float(0))
 
 #Large Ruin
 	stcSvc.spawnObject('object/static/structure/dantooine/shared_dant_jedi_main_structure.iff', 'kaas', long(0), float(-434), float(77), float(-2252), float(0), float(0))

scripts/static_spawns/tatooine.py

@@ -23,6 +23,13 @@ def addPlanetSpawns(core, planet):
 	stcSvc.spawnObject('object/mobile/shared_junk_dealer_m_01.iff', 'tatooine', long(0), float(3525), float(4), float(-4804), float(0.70), float(0.71))
 
 	#stcSvc.spawnObject('object/mobile/shared_3po_protocol_droid_red.iff', 'tatooine', long(26582), float(-14.3), float(2.0), float(47.4), float(0.70), float(0.71))
+		
+	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)
+	
+	rebRecruiter = stcSvc.spawnObject('object/mobile/shared_dressed_rebel_recruiter_human_female_01.iff', 'tatooine', long(1082887), float(-30.5), float(-0.5), float(6.2), float(0.70), float(0.71))	
+	rebRecruiter.setOptionsBitmask(264)
+	
 	
 	return