diff --git a/scripts/character_builder_terminal.py b/scripts/character_builder_terminal.py index 29675e3f..5c8b11b2 100644 --- a/scripts/character_builder_terminal.py +++ b/scripts/character_builder_terminal.py @@ -306,6 +306,7 @@ def miscHandler(owner): window.addListBoxMenuItem('Backpack', 0) window.addListBoxMenuItem('Heroism Jewelry Set', 1) window.addListBoxMenuItem('Belt of Master Bodo Baas', 2) + window.addListBoxMenuItem('Starter Equipment Box', 3) core.suiService.openSUIWindow(window); def miscHandlerCallback(owner, window, eventType, returnList): @@ -323,6 +324,9 @@ def miscHandlerCallback(owner, window, eventType, returnList): if returnList.get(0)=='2': jediBelt(owner, inventory) return + if returnList.get(0)=='3': + starterEquipmentBox(owner, inventory) + return return def combatLevel(owner): @@ -605,6 +609,11 @@ def backpack(owner, inventory): inventory.add(core.objectService.createObject("object/tangible/wearables/backpack/shared_backpack_s01.iff", owner.getPlanet())) screenOne(core, owner) return + +def starterEquipmentBox(owner, inventory): + inventory.add(core.objectService.createObject("object/tangible/npe/shared_npe_uniform_box.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") diff --git a/scripts/object/tangible/crafting/station/item_npe_gen_craft_tool_trader_03_01.py b/scripts/object/tangible/crafting/station/item_npe_gen_craft_tool_trader_03_01.py new file mode 100644 index 00000000..c8257a29 --- /dev/null +++ b/scripts/object/tangible/crafting/station/item_npe_gen_craft_tool_trader_03_01.py @@ -0,0 +1,11 @@ +import sys + +def setup(core, object): + object.setStfFilename('static_item_n') + object.setStfName('item_npe_gen_craft_tool_trader_03_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_npe_gen_craft_tool_trader_03_01') + object.setIntAttribute('no_trade', 1) + object.setIntAttribute('required_combat_level', 1) + + return diff --git a/scripts/object/tangible/npe/npe_uniform_box.py b/scripts/object/tangible/npe/npe_uniform_box.py index ccad8904..e0de3869 100644 --- a/scripts/object/tangible/npe/npe_uniform_box.py +++ b/scripts/object/tangible/npe/npe_uniform_box.py @@ -1,4 +1,147 @@ import sys +from java.util import Vector def setup(core, object): - return \ No newline at end of file + object.setAttachment('radial_filename', 'object/usable') + return + +def use(core, actor, object): + + profession = actor.getSlottedObject('ghost').getProfession() + items = Vector() + + if profession =='force_sensitive_1a': + robe = core.objectService.createObject('object/tangible/wearables/robe/shared_robe_jedi_padawan.iff', actor.getPlanet(), 'item_npe_fs_robe_02_01') + items.add(robe) + + elif profession =='entertainer_1a': + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s04.iff', actor.getPlanet()) + belt = core.objectService.createObject('object/tangible/wearables/belt/shared_belt_s01.iff', actor.getPlanet()) + hat = core.objectService.createObject('object/tangible/wearables/hat/shared_hat_s02.iff', actor.getPlanet()) + items.add(shoes) + items.add(pants) + items.add(shirt) + items.add(belt) + items.add(hat) + + elif profession =='officer_1a': + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s34.iff', actor.getPlanet()) + belt = core.objectService.createObject('object/tangible/wearables/belt/shared_belt_s11.iff', actor.getPlanet()) + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(belt) + + elif profession =='bounty_hunter_1a': + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s12.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', actor.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.iff', actor.getPlanet()) + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(vest) + + elif profession =='smuggler_1a': + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s15.iff', actor.getPlanet(), 'item_smuggler_boots_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s05.iff', actor.getPlanet(), 'item_smuggler_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s16.iff', actor.getPlanet(), 'item_smuggler_shirt_02_01') + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s15.iff', actor.getPlanet(), 'item_smuggler_vest_02_01') + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(vest) + + elif profession =='commando_1a': + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s05.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', actor.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s04.iff', actor.getPlanet()) + bandolier = core.objectService.createObject('object/tangible/wearables/bandolier/shared_bandolier_s04.iff', actor.getPlanet()) + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(vest) + items.add(bandolier) + + elif profession =='spy_1a': + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s12.iff', actor.getPlanet(), 'item_spy_boots_02_01') + gloves = core.objectService.createObject('object/tangible/wearables/gloves/shared_gloves_s12.iff', actor.getPlanet(), 'item_spy_gloves_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s30.iff', actor.getPlanet(), 'item_spy_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s30.iff', actor.getPlanet(), 'item_spy_shirt_02_01') + items.add(boots) + items.add(gloves) + items.add(pants) + items.add(shirt) + + elif profession == 'medic_1a': + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s02.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s27.iff', actor.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s05.iff', actor.getPlanet()) + items.add(shoes) + items.add(pants) + items.add(shirt) + items.add(vest) + + elif "trader" in profession: + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s15.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s05.iff', actor.getPlanet()) + gloves = core.objectService.createObject('object/tangible/wearables/gloves/shared_gloves_s12.iff', actor.getPlanet()) + belt = core.objectService.createObject('object/tangible/wearables/armor/zam/shared_armor_zam_wesell_belt.iff', actor.getPlanet()) + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(gloves) + items.add(belt) + + else: + actor.sendSystemMessage('@base_player:not_correct_skill', 0) + + items.add(createProfessionItem(core, actor)) + core.playerService.giveItems(actor, items) + core.objectService.destroyObject(object) + return + + +def createProfessionItem(core, actor): + profession = actor.getSlottedObject('ghost').getProfession() + + if profession == 'bounty_hunter_1a': + return core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_dh17_black_npe.iff', actor.getPlanet(), 'weapon_npe_carbine_bh_03_01') + + elif profession == 'commando_1a': + return core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_dh17_black_npe.iff', actor.getPlanet(), 'weapon_npe_commando_carbine_03_01') + + elif profession == 'entertainer_1a': + print("Entertainer Professionitem disabled for now") + #return core.objectService.createObject('object/tangible/dance_prob/shared_prop_sparkler_l.iff', actor.getPlanet()) + + elif profession == 'force_sensitive_1a': + return core.objectService.createObject('object/weapon/melee/polearm/shared_polearm_vibro_axe_npe.iff', actor.getPlanet(), 'weapon_polearm_02_03') + + elif profession == 'medic_1a': + return core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_scout_blaster_npe.iff', actor.getPlanet(), 'weapon_npe_medic_pistol_03_01') + + elif profession == 'officer_1a': + return core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_scout_blaster_npe.iff', actor.getPlanet(), 'item_npe_officer_sidearm') + + elif profession == 'smuggler_1a': + return core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_dl44_metal.iff', actor.getPlanet(), 'item_npe_smuggler_han_solo_gun') + + elif profession == 'spy_1a': + return core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_dh17_black_npe.iff', actor.getPlanet(), 'weapon_npe_carbine_spy_03_01') + + elif "trader" in profession: + print("Trader Professionitem disabled until crafting is in") + #return core.objectService.createObject('object/tangible/crafting/station/shared_generic_generic_tool.iff', actor.getPlanet(), 'item_npe_gen_craft_tool_trader_03_01') + + + return + + \ No newline at end of file diff --git a/scripts/object/weapon/melee/polearm/weapon_polearm_02_03.py b/scripts/object/weapon/melee/polearm/weapon_polearm_02_03.py index 7d70c44f..242d16b4 100644 --- a/scripts/object/weapon/melee/polearm/weapon_polearm_02_03.py +++ b/scripts/object/weapon/melee/polearm/weapon_polearm_02_03.py @@ -6,6 +6,7 @@ def setup(core, object): object.setStfName('weapon_polearm_02_03') object.setDetailFilename('static_item_d') object.setDetailName('weapon_polearm_02_03') + object.setIntAttribute('no_trade', 1) object.setIntAttribute('required_combat_level', 1) object.setAttackSpeed(1); object.setMaxRange(5); diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java index e65d989c..04d1b18c 100644 --- a/src/services/PlayerService.java +++ b/src/services/PlayerService.java @@ -1468,6 +1468,19 @@ public class PlayerService implements INetworkDispatch { return formalName; } + public String checkForGender(CreatureObject object) { + String gender =""; + if(object.getTemplate().contains("_female")){ + gender = "female"; + }else if(object.getTemplate().contains("_male")){ + gender = "male"; + }else{ + System.out.println("Error: No Gender"); + gender = "no_gender"; + } + return gender; + } + @Override public void shutdown() { // TODO Auto-generated method stub