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

scripts/character_builder_terminal.py

@@ -0,0 +1,662 @@
+#This file is to only be edited by Project SWG Staff.
+#Do not commit any changes to this file unless authorized.
+
+
+from resources.common import RadialOptions
+from resources.common import OutOfBand
+from protocol.swg import ResourceListForSurveyMessage
+from services.sui.SUIService import MessageBoxType
+from services.sui.SUIWindow import Trigger
+from java.util import Vector
+from java.lang import System
+from java.lang import Long
+from java.util import Map
+from java.util import TreeMap
+from resources.datatables import WeaponType
+from engine.resources.scene import Point3D
+import main.NGECore
+import sys
+import math
+
+core = main.NGECore.getInstance()
+
+def screenOne (core, owner):
+	window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0);
+	window.setProperty('bg.caption.lblTitle:Text', 'Character Builder Terminal')
+	window.setProperty('Prompt.lblPrompt:Text', 'Welcome to the Project SWG Test Center.')
+	window.setProperty('btnOk:visible', 'True')
+	window.setProperty('btnCancel:visible', 'True')
+	window.setProperty('btnOk:Text', '@ok')
+	window.setProperty('btnCancel:Text', '@cancel')	
+	returnList = Vector()
+	returnList.add('List.lstList:SelectedRow')
+	window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, screenOneCallback)
+	window.addListBoxMenuItem('Character', 0)
+	window.addListBoxMenuItem('Items', 1)
+	window.addListBoxMenuItem('Instant Travel Locations', 2)
+	window.addListBoxMenuItem('Resources', 3)
+	if owner.getClient() and owner.getClient().isGM() == True:
+		window.addListBoxMenuItem('Admin', 4)
+	core.suiService.openSUIWindow(window);
+		
+def screenOneCallback(owner, window, eventType, returnList):
+	if returnList.size()==0:
+		owner.sendSystemMessage('NULL', 0)	
+		return
+		
+	if returnList.get(0)=='0':
+		characterHandler(owner)
+		return
+	if returnList.get(0)=='1':
+		itemsHandler(owner)
+		return
+	if returnList.get(0)=='2':
+		travelHandler(owner)
+		return
+	if returnList.get(0)=='3':
+		resourceHandler(owner)
+		return
+	if returnList.get(0)=='4':
+		adminHandler(owner)
+		return
+	return
+	
+def	characterHandler(owner):
+	window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0);
+	window.setProperty('bg.caption.lblTitle:Text', 'Character Builder Terminal')
+	window.setProperty('Prompt.lblPrompt:Text', 'Welcome to Project SWG Test Center.')
+	window.setProperty('btnOk:visible', 'True')
+	window.setProperty('btnCancel:visible', 'True')
+	window.setProperty('btnOk:Text', '@ok')
+	window.setProperty('btnCancel:Text', '@cancel')	
+	returnList = Vector()
+	returnList.add('List.lstList:SelectedRow')
+	window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, characterHandlerCallback)
+	window.addListBoxMenuItem('Set Combat Level To 90', 0)
+	window.addListBoxMenuItem('Give 50,000 Credits', 1)
+	window.addListBoxMenuItem('Give Character Buffs', 2)
+	window.addListBoxMenuItem('Reset Combat Level To 1', 3)
+	core.suiService.openSUIWindow(window);
+	
+def characterHandlerCallback(owner, window, eventType, returnList):
+	if returnList.size()==0:
+		owner.sendSystemMessage('NULL', 0)	
+		return
+		
+	if returnList.get(0)=='0':
+		combatLevel(owner)
+		return
+	if returnList.get(0)=='1':
+		credits(owner)
+		return
+	if returnList.get(0)=='2':
+		buff(owner)
+		return
+	if returnList.get(0)=='3':
+		combatLevelDown(owner)
+		return
+	return
+	
+def	itemsHandler(owner):
+	window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0);
+	window.setProperty('bg.caption.lblTitle:Text', 'Character Builder Terminal')
+	window.setProperty('Prompt.lblPrompt:Text', 'Welcome to Project SWG Test Center.')
+	window.setProperty('btnOk:visible', 'True')
+	window.setProperty('btnCancel:visible', 'True')
+	window.setProperty('btnOk:Text', '@ok')
+	window.setProperty('btnCancel:Text', '@cancel')	
+	returnList = Vector()
+	returnList.add('List.lstList:SelectedRow')
+	window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, itemsHandlerCallback)
+	window.addListBoxMenuItem('Weapons', 0)
+	window.addListBoxMenuItem('Armor', 1)
+	window.addListBoxMenuItem('Misc Equipment', 2)
+	core.suiService.openSUIWindow(window);
+	
+def itemsHandlerCallback(owner, window, eventType, returnList):
+	if returnList.size()==0:
+		owner.sendSystemMessage('NULL', 0)	
+		return
+		
+	if returnList.get(0)=='0':
+		weaponsHandler(owner)
+		return
+	if returnList.get(0)=='1':
+		armorHandler(owner)
+		return
+	if returnList.get(0)=='2':
+		miscHandler(owner)
+		return
+	return
+	
+def	travelHandler(owner):
+	window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0);
+	window.setProperty('bg.caption.lblTitle:Text', 'Character Builder Terminal')
+	window.setProperty('Prompt.lblPrompt:Text', 'Welcome to Project SWG Test Center.')
+	window.setProperty('btnOk:visible', 'True')
+	window.setProperty('btnCancel:visible', 'True')
+	window.setProperty('btnOk:Text', '@ok')
+	window.setProperty('btnCancel:Text', '@cancel')	
+	returnList = Vector()
+	returnList.add('List.lstList:SelectedRow')
+	window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, travelHandlerCallback)
+	window.addListBoxMenuItem('Tatooine, Mos Eisley', 0)
+	window.addListBoxMenuItem('Dantooine, Jedi Ruins', 1)
+	window.addListBoxMenuItem('Blank', 2)
+	window.addListBoxMenuItem('Blank', 3)
+	core.suiService.openSUIWindow(window);
+	
+def travelHandlerCallback(owner, window, eventType, returnList):
+	inventory = owner.getSlottedObject('inventory')
+	if returnList.size()==0:
+		owner.sendSystemMessage('NULL', 0)	
+		return
+		
+	if returnList.get(0)=='0':
+		eisleyTravel(owner)
+		return
+	if returnList.get(0)=='1':
+		jediRuinsTravel(owner)
+		return
+	return
+	
+	
+def	resourceHandler(owner):
+	window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0);
+	window.setProperty('bg.caption.lblTitle:Text', 'Character Builder Terminal')
+	window.setProperty('Prompt.lblPrompt:Text', 'Welcome to Project SWG Test Center.')
+	window.setProperty('btnOk:visible', 'True')
+	window.setProperty('btnCancel:visible', 'True')
+	window.setProperty('btnOk:Text', '@ok')
+	window.setProperty('btnCancel:Text', '@cancel')	
+	returnList = Vector()
+	returnList.add('List.lstList:SelectedRow')
+	window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, resourceHandlerCallback)
+	window.addListBoxMenuItem('Survey Devices', 0)
+	core.suiService.openSUIWindow(window);
+	
+def resourceHandlerCallback(owner, window, eventType, returnList):
+	inventory = owner.getSlottedObject('inventory')
+	if returnList.size()==0:
+		owner.sendSystemMessage('NULL', 0)	
+		return
+		
+	if returnList.get(0)=='0':
+		surveyDevices(owner, inventory)
+		return
+		
+	
+def	adminHandler(owner):
+	window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0);
+	window.setProperty('bg.caption.lblTitle:Text', 'Character Builder Terminal')
+	window.setProperty('Prompt.lblPrompt:Text', 'Welcome to Project SWG Test Center.')
+	window.setProperty('btnOk:visible', 'True')
+	window.setProperty('btnCancel:visible', 'True')
+	window.setProperty('btnOk:Text', '@ok')
+	window.setProperty('btnCancel:Text', '@cancel')	
+	returnList = Vector()
+	returnList.add('List.lstList:SelectedRow')
+	window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, adminHandlerCallback)
+	window.addListBoxMenuItem('Vehicle', 0)
+	window.addListBoxMenuItem('Crafting', 1)
+	window.addListBoxMenuItem('Character Builder Terminal', 2)
+	window.addListBoxMenuItem('Placeholder', 3)
+	core.suiService.openSUIWindow(window);
+	
+def	adminHandlerCallback(owner, window, eventType, returnList):
+	inventory = owner.getSlottedObject('inventory')
+	if returnList.size()==0:
+		owner.sendSystemMessage('NULL', 0)	
+		return
+		
+	if returnList.get(0)=='0':
+		vehicleHandler(owner, inventory)
+		return
+		
+	if returnList.get(0)=='2':
+		cbtHandler(owner, inventory)
+		return
+	return
+	
+def	weaponsHandler(owner):
+	window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0);
+	window.setProperty('bg.caption.lblTitle:Text', 'Character Builder Terminal')
+	window.setProperty('Prompt.lblPrompt:Text', 'Welcome to Project SWG Test Center.')
+	window.setProperty('btnOk:visible', 'True')
+	window.setProperty('btnCancel:visible', 'True')
+	window.setProperty('btnOk:Text', '@ok')
+	window.setProperty('btnCancel:Text', '@cancel')	
+	returnList = Vector()
+	returnList.add('List.lstList:SelectedRow')
+	window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, weaponsHandlerCallback)
+	window.addListBoxMenuItem('Melee', 0)
+	window.addListBoxMenuItem('Ranged', 1)
+	window.addListBoxMenuItem('Lightsabers', 2)
+	window.addListBoxMenuItem('Krayt Pearls', 3)
+	window.addListBoxMenuItem('Color Crystals', 4)
+	core.suiService.openSUIWindow(window);
+	
+def weaponsHandlerCallback(owner, window, eventType, returnList):
+	inventory = owner.getSlottedObject('inventory')
+	if returnList.size()==0:
+		owner.sendSystemMessage('NULL', 0)	
+		return
+		
+	if returnList.get(0)=='0':
+		meleeWeapons(owner, inventory)
+		return
+	if returnList.get(0)=='1':
+		rangedWeapons(owner, inventory)
+		return
+	if returnList.get(0)=='2':
+		lightsabers(owner, inventory)
+		return
+	if returnList.get(0)=='3':
+		lightsaberPowerCrystals(owner, inventory)
+		return
+	if returnList.get(0)=='4':
+		lightsaberColorCrystals(owner, inventory)
+		return	
+	
+	return
+	
+def	armorHandler(owner):
+	window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0);
+	window.setProperty('bg.caption.lblTitle:Text', 'Character Builder Terminal')
+	window.setProperty('Prompt.lblPrompt:Text', 'Welcome to Project SWG Test Center.')
+	window.setProperty('btnOk:visible', 'True')
+	window.setProperty('btnCancel:visible', 'True')
+	window.setProperty('btnOk:Text', '@ok')
+	window.setProperty('btnCancel:Text', '@cancel')	
+	returnList = Vector()
+	returnList.add('List.lstList:SelectedRow')
+	window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, armorHandlerCallback)
+	window.addListBoxMenuItem('Composite', 0)
+	window.addListBoxMenuItem('Jedi Master Cloak', 1)
+	window.addListBoxMenuItem('Jedi Knight Robes', 2)
+	core.suiService.openSUIWindow(window);
+	
+def armorHandlerCallback(owner, window, eventType, returnList):
+	inventory = owner.getSlottedObject('inventory')
+	if returnList.size()==0:
+		owner.sendSystemMessage('NULL', 0)	
+		return
+		
+	if returnList.get(0)=='0':
+		compositeArmor(owner, inventory)
+		return
+	if returnList.get(0)=='1':
+		jediMasterCloak(owner, inventory)
+		return
+	if returnList.get(0)=='2':
+		jediKnightRobes(owner, inventory)
+		return
+		
+def	miscHandler(owner):
+	window = core.suiService.createSUIWindow('Script.listBox', owner, owner, 0);
+	window.setProperty('bg.caption.lblTitle:Text', 'Character Builder Terminal')
+	window.setProperty('Prompt.lblPrompt:Text', 'Welcome to Project SWG Test Center.')
+	window.setProperty('btnOk:visible', 'True')
+	window.setProperty('btnCancel:visible', 'True')
+	window.setProperty('btnOk:Text', '@ok')
+	window.setProperty('btnCancel:Text', '@cancel')	
+	returnList = Vector()
+	returnList.add('List.lstList:SelectedRow')
+	window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, miscHandlerCallback)
+	window.addListBoxMenuItem('Backpack', 0)
+	window.addListBoxMenuItem('Heroism Jewelry Set', 1)	
+	window.addListBoxMenuItem('Belt of Master Bodo Baas', 2)
+	core.suiService.openSUIWindow(window);
+	
+def miscHandlerCallback(owner, window, eventType, returnList):
+	inventory = owner.getSlottedObject('inventory')
+	if returnList.size()==0:
+		owner.sendSystemMessage('NULL', 0)	
+		return
+		
+	if returnList.get(0)=='0':
+		backpack(owner, inventory)
+		return
+	if returnList.get(0)=='1':
+		heroismJewelry(owner, inventory)
+		return
+	if returnList.get(0)=='2':
+		jediBelt(owner, inventory)
+		return
+	return
+	
+def combatLevel(owner):
+	if (owner.getLevel() < 90):
+		core.playerService.grantLevel(owner, 90);
+		screenOne(core, owner)
+	return
+	
+def credits(owner):
+	owner.setCashCredits(owner.getCashCredits() + 50000);
+	owner.sendSystemMessage('The Project SWG team has pitched in and given you ' + "50,000" + ' credits for your service.', 0)
+	screenOne(core, owner)
+	return
+	
+def buff(owner):
+	core.buffService.addBuffToCreature(owner, 'me_buff_health_2', owner)
+	buff = owner.getBuffByName('me_buff_health_2')
+	buff.setDuration(5400)
+	
+	core.buffService.addBuffToCreature(owner, 'me_buff_action_3', owner)
+	buff1 = owner.getBuffByName('me_buff_action_3')
+	buff1.setDuration(5400)
+	
+	core.buffService.addBuffToCreature(owner, 'me_buff_agility_3', owner)
+	buff2 = owner.getBuffByName('me_buff_agility_3')
+	buff2.setDuration(5400)
+	
+	core.buffService.addBuffToCreature(owner, 'me_buff_melee_gb_1', owner)
+	buff3 = owner.getBuffByName('me_buff_melee_gb_1')
+	buff3.setDuration(5400)
+	
+	core.buffService.addBuffToCreature(owner, 'me_buff_ranged_gb_1', owner)
+	buff4 = owner.getBuffByName('me_buff_ranged_gb_1')
+	buff4.setDuration(5400)
+	
+	core.buffService.addBuffToCreature(owner, 'me_buff_precision_3', owner)
+	buff5 = owner.getBuffByName('me_buff_precision_3')
+	buff5.setDuration(5400)
+	
+	core.buffService.addBuffToCreature(owner, 'me_buff_strength_3', owner)
+	buff6 = owner.getBuffByName('me_buff_strength_3')
+	buff6.setDuration(5400)
+	screenOne(core, owner)
+	return
+
+def combatLevelDown(owner):
+	if (owner.getLevel() == 1):
+		screenOne(core, owner)
+		return
+	if (owner.getLevel() > 1):
+		core.playerService.grantLevel(owner, 1)
+		screenOne(core, owner)
+	return
+	
+def rangedWeapons(owner, inventory):
+	rifle = core.objectService.createObject('object/weapon/ranged/rifle/shared_rifle_e11.iff', owner.getPlanet())
+	rifle.setDamageType("energy");
+	rifle.setWeaponType(WeaponType.RIFLE);
+	rifle.setAttackSpeed(0.8);
+	rifle.setMinDamage(518);
+	rifle.setMaxDamage(1035);
+	rifle.setMaxRange(64)
+	
+	pistol = core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_dl44.iff', owner.getPlanet())
+	pistol.setDamageType("energy");
+	pistol.setWeaponType(WeaponType.PISTOL);
+	pistol.setAttackSpeed(0.4);
+	pistol.setMinDamage(259);
+	pistol.setMaxDamage(518);
+	pistol.setMaxRange(35);
+	
+	carbine = core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_e11.iff', owner.getPlanet())
+	carbine.setDamageType("energy");
+	carbine.setWeaponType(WeaponType.CARBINE);
+	carbine.setAttackSpeed(0.6);
+	carbine.setMinDamage(389);
+	carbine.setMaxDamage(780);
+	carbine.setMaxRange(50);
+	
+	heavy = core.objectService.createObject('object/weapon/ranged/heavy/shared_som_lava_cannon.iff', owner.getPlanet())
+	heavy.setDamageType("energy");
+	heavy.setWeaponType(WeaponType.HEAVYWEAPON);
+	heavy.setAttackSpeed(1);
+	heavy.setMinDamage(850);
+	heavy.setMaxDamage(1350);
+	heavy.setStringAttribute('wpn_elemental_type', 'Heat')
+	heavy.setStringAttribute('wpn_elemental_value', '50')
+	heavy.setMaxRange(64)
+	
+	inventory.add(rifle)
+	inventory.add(pistol)
+	inventory.add(carbine)
+	inventory.add(heavy)
+	screenOne(core, owner)
+	return
+	
+def meleeWeapons(owner, inventory):
+	polearm = core.objectService.createObject('object/weapon/melee/polearm/shared_polearm_vibro_axe.iff', owner.getPlanet())
+	polearm.setAttackSpeed(1.0)
+	polearm.setMaxRange(5)
+	polearm.setDamageType('kinetic')
+	polearm.setMinDamage(700)
+	polearm.setMaxDamage(990)
+	polearm.setWeaponType(WeaponType.POLEARMMELEE)
+	inventory.add(polearm)
+	screenOne(core, owner)
+	return
+	
+def compositeArmor(owner, inventory):
+	comp_bicep_r = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_bicep_r.iff", owner.getPlanet())
+	comp_bicep_r.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
+	comp_bicep_r.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
+	comp_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
+	comp_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
+	comp_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
+	comp_bicep_r.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
+						
+	comp_bicep_l = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_bicep_l.iff", owner.getPlanet())
+	comp_bicep_l.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
+	comp_bicep_l.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
+	comp_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
+	comp_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
+	comp_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
+	comp_bicep_l.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
+						
+	comp_bracer_r = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_bracer_r.iff", owner.getPlanet())
+	comp_bracer_r.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
+	comp_bracer_r.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
+	comp_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
+	comp_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
+	comp_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
+	comp_bracer_r.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
+						
+	comp_bracer_l = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_bracer_l.iff", owner.getPlanet())
+	comp_bracer_l.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
+	comp_bracer_l.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
+	comp_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
+	comp_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
+	comp_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
+	comp_bracer_l.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
+						
+	comp_leggings = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_leggings.iff", owner.getPlanet())
+	comp_leggings.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
+	comp_leggings.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
+	comp_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
+	comp_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
+	comp_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
+	comp_leggings.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
+						
+	comp_helmet = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_helmet.iff", owner.getPlanet())
+	comp_helmet.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
+	comp_helmet.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
+	comp_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
+	comp_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
+	comp_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
+	comp_helmet.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);
+						
+	comp_chest = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_chest_plate.iff", owner.getPlanet())
+	comp_chest.setIntAttribute("cat_armor_standard_protection.armor_eff_kinetic", 7000);
+	comp_chest.setIntAttribute("cat_armor_standard_protection.armor_eff_energy", 5000);
+	comp_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_heat", 6000);
+	comp_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_cold", 6000);
+	comp_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_acid", 6000);
+	comp_chest.setIntAttribute("cat_armor_special_protection.special_protection_type_electricity", 6000);						
+	comp_boots = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_boots.iff", owner.getPlanet())
+	comp_gloves = core.objectService.createObject("object/tangible/wearables/armor/composite/shared_armor_composite_gloves.iff", owner.getPlanet())											
+	inventory.add(comp_bicep_r);
+	inventory.add(comp_bicep_l);
+	inventory.add(comp_bracer_r);
+	inventory.add(comp_bracer_l);
+	inventory.add(comp_leggings);
+	inventory.add(comp_helmet);
+	inventory.add(comp_chest);
+	inventory.add(comp_boots);
+	inventory.add(comp_gloves);
+	screenOne(core, owner)
+	return
+	
+def jediMasterCloak(owner, inventory):
+	cloak = core.objectService.createObject('object/tangible/wearables/robe/shared_robe_s05_h1.iff', owner.getPlanet(), 'item_jedi_robe_06_01')	
+	inventory.add(cloak)
+	screenOne(core, owner)
+	return
+	
+def jediKnightRobes(owner, inventory):
+	robe1 = core.objectService.createObject("object/tangible/wearables/robe/shared_robe_jedi_light_s03.iff", owner.getPlanet())
+	robe2 = core.objectService.createObject("object/tangible/wearables/robe/shared_robe_jedi_dark_s03.iff", owner.getPlanet())
+	inventory.add(robe1)
+	inventory.add(robe2)
+	screenOne(core, owner)
+	return
+	
+def lightsabers(owner, inventory):
+	lightsaber1 = core.objectService.createObject("object/weapon/melee/sword/crafted_saber/shared_sword_lightsaber_one_handed_gen5.iff", owner.getPlanet())
+	lightsaber1.setIntAttribute("required_combat_level", 90);
+	lightsaber1.setStringAttribute("class_required", "Jedi");
+	lightsaber1.setAttackSpeed(1);
+	lightsaber1.setDamageType("energy");
+	lightsaber1.setMaxRange(5);
+	lightsaber1.setMinDamage(689);
+	lightsaber1.setMaxDamage(1379);
+	lightsaber1.setWeaponType(WeaponType.ONEHANDEDSABER);
+						
+	lightsaber2 = core.objectService.createObject("object/weapon/melee/2h_sword/crafted_saber/shared_sword_lightsaber_two_handed_gen5.iff", owner.getPlanet())
+	lightsaber2.setIntAttribute("required_combat_level", 90);
+	lightsaber2.setStringAttribute("class_required", "Jedi");
+	lightsaber2.setAttackSpeed(1);
+	lightsaber2.setDamageType("energy");
+	lightsaber2.setMaxRange(5);
+	lightsaber2.setMinDamage(689);
+	lightsaber2.setMaxDamage(1379);
+	lightsaber2.setWeaponType(WeaponType.TWOHANDEDSABER);
+						
+	lightsaber3 = core.objectService.createObject("object/weapon/melee/polearm/crafted_saber/shared_sword_lightsaber_polearm_gen5.iff", owner.getPlanet())
+	lightsaber3.setIntAttribute("required_combat_level", 90);
+	lightsaber3.setStringAttribute("class_required", "Jedi");
+	lightsaber3.setAttackSpeed(1);
+	lightsaber3.setDamageType("energy");
+	lightsaber3.setMaxRange(5);
+	lightsaber3.setMinDamage(689);
+	lightsaber3.setMaxDamage(1379);
+	lightsaber3.setWeaponType(WeaponType.POLEARMSABER);
+	
+	inventory.add(lightsaber1)
+	inventory.add(lightsaber2)
+	inventory.add(lightsaber3)
+	screenOne(core, owner)
+	return
+	
+def lightsaberPowerCrystals(owner, inventory):
+	kraytPearl = core.objectService.createObject("object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff", owner.getPlanet())
+	kraytPearl.setAttachment("LootItemName", "kraytpearl_premium");
+	core.lootService.handleSpecialItems(kraytPearl, "kraytpearl");
+	kraytPearl2 = core.objectService.createObject("object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff", owner.getPlanet())
+	kraytPearl2.setAttachment("LootItemName", "kraytpearl_premium");
+	core.lootService.handleSpecialItems(kraytPearl2, "kraytpearl");
+	kraytPearl3 = core.objectService.createObject("object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff", owner.getPlanet())
+	kraytPearl3.setAttachment("LootItemName", "kraytpearl_premium");
+	core.lootService.handleSpecialItems(kraytPearl3, "kraytpearl");
+	kraytPearl4 = core.objectService.createObject("object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff", owner.getPlanet())
+	kraytPearl4.setAttachment("LootItemName", "kraytpearl_premium");
+	core.lootService.handleSpecialItems(kraytPearl4, "kraytpearl");
+	kraytPearl5 = core.objectService.createObject("object/tangible/component/weapon/lightsaber/shared_lightsaber_module_krayt_dragon_pearl.iff", owner.getPlanet())
+	kraytPearl5.setAttachment("LootItemName", "kraytpearl_premium");
+	core.lootService.handleSpecialItems(kraytPearl5, "kraytpearl");
+	inventory.add(kraytPearl);
+	inventory.add(kraytPearl2);
+	inventory.add(kraytPearl3);
+	inventory.add(kraytPearl4);
+	inventory.add(kraytPearl5);
+	screenOne(core, owner)
+	return
+	
+def lightsaberColorCrystals(owner, inventory):
+	colorCrystal = core.objectService.createObject("object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff", owner.getPlanet())
+	colorCrystal.getAttributes().put("@obj_attr_n:condition", "100/100");
+	colorCrystal.getAttributes().put("@obj_attr_n:crystal_owner", "\\#D1F56F UNTUNED \\#FFFFFF ");
+	colorCrystal.setAttachment("radial_filename", "item/tunable");
+	colorCrystal.setCustomizationVariable('/private/index_color_1', 5)
+	
+	colorCrystal2 = core.objectService.createObject("object/tangible/component/weapon/lightsaber/shared_lightsaber_module_force_crystal.iff", owner.getPlanet())
+	colorCrystal2.getAttributes().put("@obj_attr_n:condition", "100/100");
+	colorCrystal2.getAttributes().put("@obj_attr_n:crystal_owner", "\\#D1F56F UNTUNED \\#FFFFFF ");
+	colorCrystal2.setAttachment("radial_filename", "item/tunable");
+	colorCrystal2.setCustomizationVariable('/private/index_color_1', 1)
+	
+	lavaCrystal = core.objectService.createObject("object/tangible/component/weapon/lightsaber/shared_lightsaber_module_lava_crystal.iff", owner.getPlanet())
+	inventory.add(colorCrystal)
+	inventory.add(colorCrystal2)
+	inventory.add(lavaCrystal)
+	screenOne(core, owner)
+	return
+	
+def jediBelt(owner, inventory):
+	inventory.add(core.objectService.createObject("object/tangible/wearables/backpack/shared_fannypack_s01.iff", owner.getPlanet()))
+	screenOne(core, owner)
+	return
+	
+def backpack(owner, inventory):
+	inventory.add(core.objectService.createObject("object/tangible/wearables/backpack/shared_backpack_s01.iff", owner.getPlanet()))
+	screenOne(core, owner)
+	return
+	
+def heroismJewelry(owner, inventory):
+	heroismBand = core.objectService.createObject("object/tangible/wearables/ring/shared_ring_s04.iff", owner.getPlanet(), "item_band_set_hero_01_01")					
+	heroismRing = core.objectService.createObject("object/tangible/wearables/ring/shared_ring_s02.iff", owner.getPlanet(), "item_ring_set_hero_01_01")			
+	heroismNecklace = core.objectService.createObject("object/tangible/wearables/necklace/shared_necklace_s10.iff", owner.getPlanet(), "item_necklace_set_hero_01_01")			
+	heroismBraceletRight = core.objectService.createObject("object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff", owner.getPlanet(), "item_bracelet_r_set_hero_01_01")			
+	heroismBraceletLeft = core.objectService.createObject("object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff", owner.getPlanet(), "item_bracelet_l_set_hero_01_01")
+						
+	inventory.add(heroismBand)
+	inventory.add(heroismRing)
+	inventory.add(heroismNecklace)
+	inventory.add(heroismBraceletRight)
+	inventory.add(heroismBraceletLeft)
+	screenOne(core, owner)
+	return
+	
+def vehicleHandler(owner, inventory):
+	speederbike = core.objectService.createObject('object/tangible/deed/vehicle_deed/shared_speederbike_swoop_deed.iff', owner.getPlanet())
+	inventory.add(speederbike)
+	screenOne(core, owner)
+	return
+	
+def cbtHandler(owner, inventory):
+	cbt = core.objectService.createObject('object/tangible/terminal/shared_terminal_character_builder.iff', owner.getPlanet())
+	inventory.add(cbt)
+	screenOne(core, owner)
+	return
+	
+def eisleyTravel(owner):
+	position = Point3D(3472, 4, -4870)
+	core.simulationService.transferToPlanet(owner, core.terrainService.getPlanetByName("tatooine"), position, owner.getOrientation(), None)
+	return
+	
+def jediRuinsTravel(owner):
+	position = Point3D(4260, 4, 5373)
+	core.simulationService.transferToPlanet(owner, core.terrainService.getPlanetByName("dantooine"), position, owner.getOrientation(), None)
+	return
+	
+def surveyDevices(owner, inventory):
+	mineralSurveyTool = core.objectService.createObject("object/tangible/survey_tool/shared_survey_tool_mineral.iff", owner.getPlanet())			
+	chemicalSurveyTool = core.objectService.createObject("object/tangible/survey_tool/shared_survey_tool_inorganic.iff", owner.getPlanet())		
+	floraSurveyTool = core.objectService.createObject("object/tangible/survey_tool/shared_survey_tool_lumber.iff", owner.getPlanet())
+	gasSurveyTool = core.objectService.createObject("object/tangible/survey_tool/shared_survey_tool_gas.iff", owner.getPlanet())
+	waterSurveyTool = core.objectService.createObject("object/tangible/survey_tool/shared_survey_tool_moisture.iff", owner.getPlanet())
+	windSurveyTool = core.objectService.createObject("object/tangible/survey_tool/shared_survey_tool_wind.iff", owner.getPlanet())
+	solarSurveyTool = core.objectService.createObject("object/tangible/survey_tool/shared_survey_tool_solar.iff", owner.getPlanet())
+	inventory.add(mineralSurveyTool)
+	inventory.add(chemicalSurveyTool)
+	inventory.add(floraSurveyTool)
+	inventory.add(gasSurveyTool)
+	inventory.add(waterSurveyTool)
+	inventory.add(windSurveyTool)
+	inventory.add(solarSurveyTool)
+	return
+	

scripts/commands/giveitem.py

@@ -5,16 +5,24 @@ def setup():
 
 def run(core, actor, target, commandString):
 
+	commandArgs = commandString.split(' ')
+	arg1 = commandArgs[0]
+	if len(commandArgs) > 1:
+		arg2 = commandArgs[1]
+
 	if actor.getClient() and actor.getClient().isGM() == False:
 		return
-
+		
 	if not commandString.startswith('object/tangible') and not commandString.startswith('object/weapon'):
 		return
-
-	object = core.objectService.createObject(commandString, actor.getPlanet())
-
-	#object.setCustomizationVariable('/private/index_color_blade', 0x02)
-	#object.setCustomizationVariable('private/alternate_shader_blade', 0x02)
+		
+	
+	if  len(commandArgs) == 2:
+		object = core.objectService.createObject((arg1), actor.getPlanet(), (arg2))
+		
+	if  len(commandArgs) == 1:
+		object = core.objectService.createObject((arg1), actor.getPlanet())
+	
 
 	if not object:
 		return

scripts/equipment/bonus_sets/set_bonus_jedi_robe.py

@@ -27,6 +27,8 @@ def addBonusSet(core):
 	bonusSet.addRequiredItem("object/tangible/wearables/robe/shared_robe_s32_h1.iff")
 	bonusSet.addRequiredItem("object/tangible/wearables/robe/shared_robe_s33.iff")
 	bonusSet.addRequiredItem("object/tangible/wearables/robe/shared_robe_s33_h1.iff")
+	bonusSet.addRequiredItem("item_jedi_robe_06_01")
+
 	
 	core.equipmentService.addBonusSetTemplate(bonusSet)
 	

scripts/object/tangible/component/weapon/lightsaber/item_color_crystal_02_20.py

@@ -11,6 +11,6 @@ def setup(core, object):
 	object.setStringAttribute('condition', '1000/1000')
 	object.setStringAttribute("@obj_attr_n:color", "Windu's Guile")
 	object.setAttachment('radial_filename', 'item/tunable')
-	object.setStringAttribute('@obj_attr_n:crystal_owner", "\\#D1F56F UNTUNED \\#FFFFFF ')
+	object.setStringAttribute('@obj_attr_n:crystal_owner', "\\#D1F56F UNTUNED \\#FFFFFF ", )
 	return
 	

scripts/object/tangible/terminal/terminal_character_builder.py

@@ -5,5 +5,5 @@ def setup(core, object):
 	return
 
 def use(core, owner, target):
-	core.devService.sendCharacterBuilderSUI(owner, 0);
+	core.scriptService.callScript("scripts/", "character_builder_terminal", "screenOne", core, owner);
 	return

scripts/object/tangible/wearables/robe/item_jedi_robe_06_01.py

@@ -0,0 +1,24 @@
+import sys
+
+def setup(core, object):
+	object.setStfFilename('static_item_n')
+	object.setStfName('item_jedi_robe_06_01')
+	object.setDetailFilename('static_item_d')
+	object.setDetailName('item_jedi_robe_06_01')
+	
+	object.setStringAttribute('protection_level', 'Luminous')
+	object.setStringAttribute('class_required', 'Jedi')
+	object.setIntAttribute('required_combat_level', 80)
+	
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 100)
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 100)
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 100)
+	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 100)
+	
+	object.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_jedi_robe_1')
+	
+	object.setAttachment('type', 'jedi_cloak')
+	object.setAttachment('setBonus', 'set_bonus_jedi_robe')
+	object.setAttachment('radial_filename', 'equipment/jedi_master_robes');
+	
+	return

scripts/object/tangible/wearables/robe/robe_s05_h1.py

@@ -1,22 +1,6 @@
 import sys
 
 def setup(core, object):
-	object.setStfFilename('static_item_n')
-	object.setStfName('item_jedi_robe_06_01')
-	object.setDetailFilename('static_item_d')
-	object.setDetailName('item_jedi_robe_06_01')
-	
-	object.setStringAttribute('protection_level', 'Luminous')
-	object.setStringAttribute('class_required', 'Jedi')
-	object.setIntAttribute('required_combat_level', 80)
-	
-	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 100)
-	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:strength_modified', 100)
-	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 100)
-	object.setIntAttribute('cat_stat_mod_bonus.@stat_n:luck_modified', 100)
-	
-	object.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_jedi_robe_1')
-	
-	object.setAttachment('type', 'jedi_robe')
-	object.setAttachment('setBonus', 'set_bonus_jedi_robe')
-	return
+	return
+
+	

scripts/radial/equipment/jedi_master_robes.py

@@ -3,13 +3,13 @@ import sys
 
 def createRadial(core, owner, target, radials):
 	
-	if target.getContainer() == owner:
-		return
+	#if target.getContainer() == owner:
+	#	return
 	
-	if target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s32.iff" or target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s33.iff":
+	if target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s32.iff" or target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s33.iff" or target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s05.iff":
 		radials.add(RadialOptions(0, 98, 1, 'Hood up'))
 		
-	elif target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s32_h1.iff" or target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s33_h1.iff":
+	elif target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s32_h1.iff" or target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s33_h1.iff" or target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s05_h1.iff":
 		radials.add(RadialOptions(0, 99, 1, 'Hood down'))
 		
 	return
@@ -28,7 +28,15 @@ def handleSelection(core, owner, target, option):
 			elif target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s33.iff":
 				newTemplate = "object/tangible/wearables/robe/shared_robe_s33_h1.iff"
 			
-			if newTemplate != "":
+			elif target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s05.iff":
+				newTemplate = "object/tangible/wearables/robe/shared_robe_s05_h1.iff"
+			
+			if newTemplate == "object/tangible/wearables/robe/shared_robe_s05_h1.iff":
+				object = core.objectService.createObject('object/tangible/wearables/robe/shared_robe_s05_h1.iff', owner.getPlanet(), 'item_jedi_robe_06_01')
+				core.objectService.destroyObject(target)
+				inventory.add(object)
+				
+			elif newTemplate != "":
 				object = core.objectService.createObject(newTemplate, owner.getPlanet())	
 				core.objectService.destroyObject(target)
 				inventory.add(object)
@@ -40,8 +48,16 @@ def handleSelection(core, owner, target, option):
 				
 			elif target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s33_h1.iff":
 				newTemplate = "object/tangible/wearables/robe/shared_robe_s33.iff"
-			
-			if newTemplate != "":
+				
+			elif target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s05_h1.iff":
+				newTemplate = "object/tangible/wearables/robe/shared_robe_s05.iff"
+				
+			if newTemplate == "object/tangible/wearables/robe/shared_robe_s05.iff":
+				object = core.objectService.createObject('object/tangible/wearables/robe/shared_robe_s05.iff', owner.getPlanet(), 'item_jedi_robe_06_01')
+				core.objectService.destroyObject(target)
+				inventory.add(object)
+				
+			elif newTemplate != "":
 				object = core.objectService.createObject(newTemplate, owner.getPlanet())	
 				core.objectService.destroyObject(target)
 				inventory.add(object)

src/main/NGECore.java

@@ -62,7 +62,6 @@ import services.BuffService;
 import services.CharacterService;
 import services.ConnectionService;
 import services.ConversationService;
-import services.DevService;
 import services.EntertainmentService;
 import services.GroupService;
 import services.housing.HousingService;
@@ -197,7 +196,6 @@ public class NGECore {
 	public AIService aiService;
 	public MissionService missionService;
 	public InstanceService instanceService;
-	public DevService devService;
 	public SurveyService surveyService;
 	public ResourceService resourceService;
 	public ConversationService conversationService;
@@ -554,7 +552,6 @@ public class NGECore {
 		
 		browserService = new BrowserService(this);
 		//battlefieldService = new BattlefieldService(this);
-		devService = new DevService(this);
 		
 		DevLogQueuer devLogQueuer = new DevLogQueuer();
 		

src/services/GuildService.java

@@ -1124,8 +1124,14 @@ public class GuildService implements INetworkDispatch {
 	public boolean removeGuild(int id) {
 		Guild guild = getGuildById(id);
 		
-		if (guild != null) 
-			return true;
+		if (guild != null) {
+			if (object.getGuildList().remove(guild.getString())) {
+				object.getGuilds().remove(id);
+				if (!object.getGuilds().containsKey(id)) return true;
+				else return false;
+			}
+			else return false;
+		}
 		
 		return false;
 	}