From 98d16cfb3dafeb689de7da861b3c288a20a00ed3 Mon Sep 17 00:00:00 2001 From: tacef Date: Mon, 11 Aug 2014 20:11:33 +0200 Subject: [PATCH 1/4] Added Entertainer Missions --- .../terminal/terminal_mission_entertainer.py | 2 +- .../EntertainerMissionObjective.java | 73 +++++++++++++++++++ src/services/mission/MissionService.java | 62 +++++++++++++++- 3 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 src/resources/objectives/EntertainerMissionObjective.java diff --git a/scripts/object/tangible/terminal/terminal_mission_entertainer.py b/scripts/object/tangible/terminal/terminal_mission_entertainer.py index 31bc4a90..efd0e92f 100644 --- a/scripts/object/tangible/terminal/terminal_mission_entertainer.py +++ b/scripts/object/tangible/terminal/terminal_mission_entertainer.py @@ -1,6 +1,6 @@ import sys def setup(core, object): - object.setAttachment("terminalType", 2) + object.setAttachment("terminalType", 3) core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_entertainer', object.getPosition().x, object.getPosition().z, 41, 75, 0) return \ No newline at end of file diff --git a/src/resources/objectives/EntertainerMissionObjective.java b/src/resources/objectives/EntertainerMissionObjective.java new file mode 100644 index 00000000..6cd835bf --- /dev/null +++ b/src/resources/objectives/EntertainerMissionObjective.java @@ -0,0 +1,73 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ +package resources.objectives; + +import java.util.concurrent.atomic.AtomicInteger; + +import main.NGECore; +import resources.common.OutOfBand; +import resources.datatables.DisplayType; +import resources.objects.creature.CreatureObject; +import resources.objects.mission.MissionObject; +import services.mission.MissionObjective; + +public class EntertainerMissionObjective extends MissionObjective{ + + private static final long serialVersionUID = 1L; + + private int entertainerMissionNum; + + public EntertainerMissionObjective(MissionObject parent) { + super(parent); + } + + @Override + public void activate(NGECore core, CreatureObject player) { + + // This way will allow 2 Entertainer missions at a time. + AtomicInteger number = new AtomicInteger(); + player.getSlottedObject("datapad").viewChildren(player, true, false, (obj) -> { + if (obj instanceof MissionObject && ((MissionObject) obj).getMissionType().equals("entertainer")) { number.getAndIncrement(); } + }); + player.setAttachment("entertainerMission" + Integer.valueOf(number.get()), getMissionObject().getObjectID()); + entertainerMissionNum = number.get(); + + } + + @Override + public void complete(NGECore core, CreatureObject player) { + int reward = getMissionObject().getCreditReward(); + player.addBankCredits(getMissionObject().getCreditReward()); + player.setAttachment("entertainerMission" + Integer.valueOf(entertainerMissionNum), 0); + player.sendSystemMessage(OutOfBand.ProsePackage("@mission/mission_generic:success_w_amount", reward), DisplayType.Broadcast); + } + + @Override + public void abort(NGECore core, CreatureObject player) { + player.setAttachment("entertainerMission" + Integer.valueOf(entertainerMissionNum), 0); + } + + @Override + public void update(NGECore core, CreatureObject player) { + } + +} diff --git a/src/services/mission/MissionService.java b/src/services/mission/MissionService.java index ac6c45f8..d0b6d843 100644 --- a/src/services/mission/MissionService.java +++ b/src/services/mission/MissionService.java @@ -50,6 +50,7 @@ import resources.objectives.BountyMissionObjective; import resources.objectives.DeliveryMissionObjective; import resources.objectives.DestroyMissionObjective; import resources.objectives.SurveyMissionObjective; +import resources.objectives.EntertainerMissionObjective; import resources.objects.creature.CreatureObject; import resources.objects.mission.MissionObject; import resources.objects.player.PlayerObject; @@ -164,7 +165,7 @@ public class MissionService implements INetworkDispatch { break; case TerminalType.ENTERTAINER: - //handleMissionListRequest(object, request.getTickCount(), TerminalType.ENTERTAINER); + handleMissionListRequest(object, request.getTickCount(), TerminalType.ENTERTAINER); break; default: break; @@ -310,6 +311,9 @@ public class MissionService implements INetworkDispatch { else if (type == TerminalType.ARTISAN) return; //randomSurveyMission(player, mission); + + else if (type == TerminalType.ENTERTAINER) + randomEntertainerMission(player, mission); else return; @@ -328,6 +332,8 @@ public class MissionService implements INetworkDispatch { else if (type == TerminalType.BOUNTY) randomBountyMission(player, mission); + else if (type == TerminalType.ENTERTAINER) + randomEntertainerMission(player, mission); else return; @@ -447,6 +453,16 @@ public class MissionService implements INetworkDispatch { surveyObjective.activate(core, creature); return surveyObjective; + + case "entertainer": + EntertainerMissionObjective entertainerObjective = new EntertainerMissionObjective(mission); + + mission.setObjective(entertainerObjective); + + if (!silent) + entertainerObjective.activate(core, creature); + + return entertainerObjective; default: return null; } @@ -622,6 +638,50 @@ public class MissionService implements INetworkDispatch { } + private void randomEntertainerMission(SWGObject player, MissionObject mission) { + + CreatureObject creature = (CreatureObject) player; + PlayerObject playera = (PlayerObject) creature.getSlottedObject("ghost"); + + Point3D playerLocation = player.getWorldPosition(); + MissionLocation startLocation = new MissionLocation(creature.getPosition(), creature.getObjectId(), player.getPlanet().name); + MissionLocation destinationLocation = new MissionLocation(creature.getPosition(), creature.getObjectId(), player.getPlanet().name); + + mission.setMissionType("entertainer"); + + String missionStf = null; + + + if(creature.getFaction() == "rebel"){ + missionStf = "mission/mission_npc_dancer_rebel_easy"; + }else if(creature.getFaction() == "imperial"){ + missionStf = "mission/mission_npc_dancer_imperial_easy"; + }else{ + missionStf = "mission/mission_npc_dancer_neutral_easy"; + } + + mission.setMissionId(10); + mission.setTitle("@" + missionStf + ":" + "m" + mission.getMissionId() + "t"); + mission.setDescription("@" + missionStf + ":" + "m" + mission.getMissionId() + "o"); + + if(playera.getProfession() != "entertainer_1a"){ + mission.setDifficultyLevel(5); + }else{ + mission.setDifficultyLevel(creature.getLevel()); + } + mission.setCreator(nameGenerator.compose(2) + " " + nameGenerator.compose(3)); + mission.setCreditReward((int) (200 + ((startLocation.getLocation().getDistance2D(destinationLocation.getLocation()) / 10)))); + + mission.setTemplateObject(CRC.StringtoCRC("object/tangible/mission/shared_mission_datadisk.iff")); + mission.setTargetName("Datadisk"); + + System.out.println("missionstf: " + missionStf); + System.out.println("Level: " + creature.getLevel()); + System.out.println("Profession: " + playera.getProfession()); + System.out.println("Faction: " + creature.getFaction()); + System.out.println("Difficulty: " + mission.getDifficultyLevel()); + } + public enum TerminalType {; public static final int GENERIC = 1; public static final int BOUNTY = 2; From fc9fab4bcf0430d359ba5b88586e7e09fd0649b8 Mon Sep 17 00:00:00 2001 From: tacef Date: Mon, 11 Aug 2014 21:58:01 +0200 Subject: [PATCH 2/4] Changed Missionservice to use Datatable Added Datatable for Terminaltypes Changed Terminals to use Datatable Changed Entertainermissions to use randomized Missions(still dont popup in Mission browser) --- .../tangible/terminal/terminal_mission.py | 4 +-- .../terminal/terminal_mission_artisan.py | 3 +- .../terminal/terminal_mission_bounty.py | 3 +- .../terminal/terminal_mission_entertainer.py | 3 +- src/resources/datatables/TerminalType.java | 32 +++++++++++++++++++ src/services/mission/MissionService.java | 11 +++++-- 6 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 src/resources/datatables/TerminalType.java diff --git a/scripts/object/tangible/terminal/terminal_mission.py b/scripts/object/tangible/terminal/terminal_mission.py index 10fe46c8..4d8fd379 100644 --- a/scripts/object/tangible/terminal/terminal_mission.py +++ b/scripts/object/tangible/terminal/terminal_mission.py @@ -1,7 +1,7 @@ import sys - +from resources.datatables import TerminalType def setup(core, object): core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission', object.getPosition().x, object.getPosition().z, 41, 44, 0) - object.setAttachment("terminalType", 1) + object.setAttachment("terminalType", TerminalType.GENERIC) return \ No newline at end of file diff --git a/scripts/object/tangible/terminal/terminal_mission_artisan.py b/scripts/object/tangible/terminal/terminal_mission_artisan.py index 7bbd42dd..6263cbe4 100644 --- a/scripts/object/tangible/terminal/terminal_mission_artisan.py +++ b/scripts/object/tangible/terminal/terminal_mission_artisan.py @@ -1,7 +1,8 @@ import sys +from resources.datatables import TerminalType def setup(core, object): - object.setAttachment("terminalType", 4) + object.setAttachment("terminalType", TerminalType.ARTISAN) core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_artisan', object.getPosition().x, object.getPosition().z, 41, 76, 0) return \ No newline at end of file diff --git a/scripts/object/tangible/terminal/terminal_mission_bounty.py b/scripts/object/tangible/terminal/terminal_mission_bounty.py index f97abb2a..65e30df3 100644 --- a/scripts/object/tangible/terminal/terminal_mission_bounty.py +++ b/scripts/object/tangible/terminal/terminal_mission_bounty.py @@ -1,6 +1,7 @@ import sys +from resources.datatables import TerminalType def setup(core, object): - object.setAttachment("terminalType", 2) + object.setAttachment("terminalType", TerminalType.BOUNTY) core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_bounty', object.getPosition().x, object.getPosition().z, 41, 78, 0) return \ No newline at end of file diff --git a/scripts/object/tangible/terminal/terminal_mission_entertainer.py b/scripts/object/tangible/terminal/terminal_mission_entertainer.py index efd0e92f..f53c23b2 100644 --- a/scripts/object/tangible/terminal/terminal_mission_entertainer.py +++ b/scripts/object/tangible/terminal/terminal_mission_entertainer.py @@ -1,6 +1,7 @@ import sys +from resources.datatables import TerminalType def setup(core, object): - object.setAttachment("terminalType", 3) + object.setAttachment("terminalType", TerminalType.ENTERTAINER) core.mapService.addLocation(object.getPlanet(), '@map_loc_cat_n:terminal_mission_entertainer', object.getPosition().x, object.getPosition().z, 41, 75, 0) return \ No newline at end of file diff --git a/src/resources/datatables/TerminalType.java b/src/resources/datatables/TerminalType.java new file mode 100644 index 00000000..49c64bf8 --- /dev/null +++ b/src/resources/datatables/TerminalType.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ +package resources.datatables; + +public class TerminalType { + + public static final int GENERIC = 1; + public static final int BOUNTY = 2; + public static final int ENTERTAINER = 3; + public static final int ARTISAN = 4; + public static final int EXPLORER = 5; + +} diff --git a/src/services/mission/MissionService.java b/src/services/mission/MissionService.java index d0b6d843..c9ddba28 100644 --- a/src/services/mission/MissionService.java +++ b/src/services/mission/MissionService.java @@ -55,6 +55,7 @@ import resources.objects.creature.CreatureObject; import resources.objects.mission.MissionObject; import resources.objects.player.PlayerObject; import resources.objects.tangible.TangibleObject; +import resources.datatables.TerminalType; import engine.clientdata.StfTable; import engine.clients.Client; import engine.resources.common.CRC; @@ -660,7 +661,8 @@ public class MissionService implements INetworkDispatch { missionStf = "mission/mission_npc_dancer_neutral_easy"; } - mission.setMissionId(10); + + mission.setMissionId(getRandomStringEntry(missionStf)); mission.setTitle("@" + missionStf + ":" + "m" + mission.getMissionId() + "t"); mission.setDescription("@" + missionStf + ":" + "m" + mission.getMissionId() + "o"); @@ -680,15 +682,18 @@ public class MissionService implements INetworkDispatch { System.out.println("Profession: " + playera.getProfession()); System.out.println("Faction: " + creature.getFaction()); System.out.println("Difficulty: " + mission.getDifficultyLevel()); + System.out.println("missionid: " + mission.getMissionId()); + System.out.println("MissionTitle: " + mission.getTitle().getStfValue()); + System.out.println("Missiondesc: " + mission.getDescription().getStfValue()); } - + /* public enum TerminalType {; public static final int GENERIC = 1; public static final int BOUNTY = 2; public static final int ENTERTAINER = 3; public static final int ARTISAN = 4; public static final int EXPLORER = 5; - } + }*/ public Map getBountyMap() { return this.bountyMap; From d173cb6f59e6afad243e71a6e07c3e4167dc7adb Mon Sep 17 00:00:00 2001 From: tacef Date: Tue, 12 Aug 2014 11:13:53 +0200 Subject: [PATCH 3/4] Updated Standard issued Equipmentbox It now checks for species. TODO: Customservertemplate --- .../object/tangible/npe/npe_uniform_box.py | 287 +++++++++++++----- 1 file changed, 219 insertions(+), 68 deletions(-) diff --git a/scripts/object/tangible/npe/npe_uniform_box.py b/scripts/object/tangible/npe/npe_uniform_box.py index 248ae485..53d3504f 100644 --- a/scripts/object/tangible/npe/npe_uniform_box.py +++ b/scripts/object/tangible/npe/npe_uniform_box.py @@ -15,85 +15,236 @@ def use(core, actor, object): items.add(robe) elif profession =='entertainer_1a': - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s15.iff', actor.getPlanet(), 'item_entertainer_boots_02_01') - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', actor.getPlanet(), 'item_entertainer_pants_02_01') - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s04.iff', actor.getPlanet(), 'item_entertainer_shirt_02_01') - hat = core.objectService.createObject('object/tangible/wearables/hat/shared_hat_s02.iff', actor.getPlanet(), 'item_entertainer_hat_02_01') - items.add(boots) - items.add(pants) - items.add(shirt) - items.add(hat) + if "itho" in actor.getTemplate(): + belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) + items.add(belt) + items.add(pants) + items.add(shirt) + items.add(vest) + if "wookie" in actor.getTemplate(): + gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) + hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) + items.add(gloves) + items.add(skirt) + items.add(shirt) + items.add(hood) + else: + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s15.iff', actor.getPlanet(), 'item_entertainer_boots_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', actor.getPlanet(), 'item_entertainer_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s04.iff', actor.getPlanet(), 'item_entertainer_shirt_02_01') + hat = core.objectService.createObject('object/tangible/wearables/hat/shared_hat_s02.iff', actor.getPlanet(), 'item_entertainer_hat_02_01') + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(hat) elif profession =='officer_1a': - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_officer_boots_02_01') - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', actor.getPlanet(), 'item_officer_pants_02_01') - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s34.iff', actor.getPlanet(), 'item_officer_shirt_02_01') - belt = core.objectService.createObject('object/tangible/wearables/belt/shared_belt_s11.iff', actor.getPlanet(), 'item_officer_belt_02_01') - items.add(boots) - items.add(pants) - items.add(shirt) - items.add(belt) + if "itho" in actor.getTemplate(): + belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) + items.add(belt) + items.add(pants) + items.add(shirt) + items.add(vest) + if "wookie" in actor.getTemplate(): + gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) + hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) + items.add(gloves) + items.add(skirt) + items.add(shirt) + items.add(hood) + else: + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_officer_boots_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', actor.getPlanet(), 'item_officer_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s34.iff', actor.getPlanet(), 'item_officer_shirt_02_01') + belt = core.objectService.createObject('object/tangible/wearables/belt/shared_belt_s11.iff', actor.getPlanet(), 'item_officer_belt_02_01') + 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(), 'item_bounty_hunter_boots_02_01') - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet(), 'item_bounty_hunter_pants_02_01') - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', actor.getPlanet(), 'item_bounty_hunter_shirt_02_01') - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.iff', actor.getPlanet(), 'item_bounty_hunter_vest_02_01') - items.add(boots) - items.add(pants) - items.add(shirt) - items.add(vest) + if "itho" in actor.getTemplate(): + belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) + items.add(belt) + items.add(pants) + items.add(shirt) + items.add(vest) + if "wookie" in actor.getTemplate(): + gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) + hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) + items.add(gloves) + items.add(skirt) + items.add(shirt) + items.add(hood) + else: + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s12.iff', actor.getPlanet(), 'item_bounty_hunter_boots_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet(), 'item_bounty_hunter_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', actor.getPlanet(), 'item_bounty_hunter_shirt_02_01') + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.iff', actor.getPlanet(), 'item_bounty_hunter_vest_02_01') + 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) + if "itho" in actor.getTemplate(): + belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) + items.add(belt) + items.add(pants) + items.add(shirt) + items.add(vest) + if "wookie" in actor.getTemplate(): + gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) + hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) + items.add(gloves) + items.add(skirt) + items.add(shirt) + items.add(hood) + else: + 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(), 'item_commando_boots_02_01') - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s05.iff', actor.getPlanet(), 'item_commando_pants_02_01') - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', actor.getPlanet(), 'item_commando_shirt_02_01') - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s04.iff', actor.getPlanet(), 'item_commando_vest_02_01') - items.add(boots) - items.add(pants) - items.add(shirt) - items.add(vest) + if "itho" in actor.getTemplate(): + belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) + items.add(belt) + items.add(pants) + items.add(shirt) + items.add(vest) + if "wookie" in actor.getTemplate(): + gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) + hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) + items.add(gloves) + items.add(skirt) + items.add(shirt) + items.add(hood) + else: + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_commando_boots_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s05.iff', actor.getPlanet(), 'item_commando_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', actor.getPlanet(), 'item_commando_shirt_02_01') + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s04.iff', actor.getPlanet(), 'item_commando_vest_02_01') + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(vest) 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) - + if "itho" in actor.getTemplate(): + belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) + items.add(belt) + items.add(pants) + items.add(shirt) + items.add(vest) + if "wookie" in actor.getTemplate(): + gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) + hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) + items.add(gloves) + items.add(skirt) + items.add(shirt) + items.add(hood) + else: + 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': - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_medic_boots_02_01') - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet(), 'item_medic_pants_02_01') - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s27.iff', actor.getPlanet(), 'item_medic_shirt_02_01') - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s05.iff', actor.getPlanet(), 'item_medic_vest_02_01') - items.add(boots) - items.add(pants) - items.add(shirt) - items.add(vest) + if "itho" in actor.getTemplate(): + belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) + items.add(belt) + items.add(pants) + items.add(shirt) + items.add(vest) + if "wookie" in actor.getTemplate(): + gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) + hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) + items.add(gloves) + items.add(skirt) + items.add(shirt) + items.add(hood) + else: + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_medic_boots_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet(), 'item_medic_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s27.iff', actor.getPlanet(), 'item_medic_shirt_02_01') + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s05.iff', actor.getPlanet(), 'item_medic_vest_02_01') + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(vest) elif "trader" in profession: - shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', actor.getPlanet(), 'item_trader_shoes_02_01') - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', actor.getPlanet(), 'item_trader_pants_02_01') - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s05.iff', actor.getPlanet(), 'item_trader_shirt_02_01') - belt = core.objectService.createObject('object/tangible/wearables/armor/zam/shared_armor_zam_wesell_belt.iff', actor.getPlanet(), 'item_trader_belt_02_01') - items.add(shoes) - items.add(pants) - items.add(shirt) - items.add(belt) - + if "itho" in actor.getTemplate(): + belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) + pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) + vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) + items.add(belt) + items.add(pants) + items.add(shirt) + items.add(vest) + if "wookie" in actor.getTemplate(): + gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) + skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) + shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) + hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) + items.add(gloves) + items.add(skirt) + items.add(shirt) + items.add(hood) + else: + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', actor.getPlanet(), 'item_trader_shoes_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', actor.getPlanet(), 'item_trader_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s05.iff', actor.getPlanet(), 'item_trader_shirt_02_01') + belt = core.objectService.createObject('object/tangible/wearables/armor/zam/shared_armor_zam_wesell_belt.iff', actor.getPlanet(), 'item_trader_belt_02_01') + items.add(shoes) + items.add(pants) + tems.add(shirt) + items.add(belt) else: actor.sendSystemMessage('@base_player:not_correct_skill', 0) @@ -135,7 +286,7 @@ def createProfessionItem(core, actor): 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 + + From a881fdb5bc72f4d916a1043aba5e8284dd161d31 Mon Sep 17 00:00:00 2001 From: tacef Date: Tue, 12 Aug 2014 11:34:36 +0200 Subject: [PATCH 4/4] Revert "Updated Standard issued Equipmentbox" This reverts commit d173cb6f59e6afad243e71a6e07c3e4167dc7adb. --- .../object/tangible/npe/npe_uniform_box.py | 287 +++++------------- 1 file changed, 68 insertions(+), 219 deletions(-) diff --git a/scripts/object/tangible/npe/npe_uniform_box.py b/scripts/object/tangible/npe/npe_uniform_box.py index 53d3504f..248ae485 100644 --- a/scripts/object/tangible/npe/npe_uniform_box.py +++ b/scripts/object/tangible/npe/npe_uniform_box.py @@ -15,236 +15,85 @@ def use(core, actor, object): items.add(robe) elif profession =='entertainer_1a': - if "itho" in actor.getTemplate(): - belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) - items.add(belt) - items.add(pants) - items.add(shirt) - items.add(vest) - if "wookie" in actor.getTemplate(): - gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) - hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) - items.add(gloves) - items.add(skirt) - items.add(shirt) - items.add(hood) - else: - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s15.iff', actor.getPlanet(), 'item_entertainer_boots_02_01') - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', actor.getPlanet(), 'item_entertainer_pants_02_01') - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s04.iff', actor.getPlanet(), 'item_entertainer_shirt_02_01') - hat = core.objectService.createObject('object/tangible/wearables/hat/shared_hat_s02.iff', actor.getPlanet(), 'item_entertainer_hat_02_01') - items.add(boots) - items.add(pants) - items.add(shirt) - items.add(hat) + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s15.iff', actor.getPlanet(), 'item_entertainer_boots_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s13.iff', actor.getPlanet(), 'item_entertainer_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s04.iff', actor.getPlanet(), 'item_entertainer_shirt_02_01') + hat = core.objectService.createObject('object/tangible/wearables/hat/shared_hat_s02.iff', actor.getPlanet(), 'item_entertainer_hat_02_01') + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(hat) elif profession =='officer_1a': - if "itho" in actor.getTemplate(): - belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) - items.add(belt) - items.add(pants) - items.add(shirt) - items.add(vest) - if "wookie" in actor.getTemplate(): - gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) - hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) - items.add(gloves) - items.add(skirt) - items.add(shirt) - items.add(hood) - else: - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_officer_boots_02_01') - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', actor.getPlanet(), 'item_officer_pants_02_01') - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s34.iff', actor.getPlanet(), 'item_officer_shirt_02_01') - belt = core.objectService.createObject('object/tangible/wearables/belt/shared_belt_s11.iff', actor.getPlanet(), 'item_officer_belt_02_01') - items.add(boots) - items.add(pants) - items.add(shirt) - items.add(belt) + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_officer_boots_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', actor.getPlanet(), 'item_officer_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s34.iff', actor.getPlanet(), 'item_officer_shirt_02_01') + belt = core.objectService.createObject('object/tangible/wearables/belt/shared_belt_s11.iff', actor.getPlanet(), 'item_officer_belt_02_01') + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(belt) elif profession =='bounty_hunter_1a': - if "itho" in actor.getTemplate(): - belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) - items.add(belt) - items.add(pants) - items.add(shirt) - items.add(vest) - if "wookie" in actor.getTemplate(): - gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) - hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) - items.add(gloves) - items.add(skirt) - items.add(shirt) - items.add(hood) - else: - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s12.iff', actor.getPlanet(), 'item_bounty_hunter_boots_02_01') - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet(), 'item_bounty_hunter_pants_02_01') - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', actor.getPlanet(), 'item_bounty_hunter_shirt_02_01') - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.iff', actor.getPlanet(), 'item_bounty_hunter_vest_02_01') - items.add(boots) - items.add(pants) - items.add(shirt) - items.add(vest) + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s12.iff', actor.getPlanet(), 'item_bounty_hunter_boots_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet(), 'item_bounty_hunter_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', actor.getPlanet(), 'item_bounty_hunter_shirt_02_01') + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s09.iff', actor.getPlanet(), 'item_bounty_hunter_vest_02_01') + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(vest) elif profession =='smuggler_1a': - if "itho" in actor.getTemplate(): - belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) - items.add(belt) - items.add(pants) - items.add(shirt) - items.add(vest) - if "wookie" in actor.getTemplate(): - gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) - hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) - items.add(gloves) - items.add(skirt) - items.add(shirt) - items.add(hood) - else: - 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) + 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': - if "itho" in actor.getTemplate(): - belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) - items.add(belt) - items.add(pants) - items.add(shirt) - items.add(vest) - if "wookie" in actor.getTemplate(): - gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) - hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) - items.add(gloves) - items.add(skirt) - items.add(shirt) - items.add(hood) - else: - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_commando_boots_02_01') - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s05.iff', actor.getPlanet(), 'item_commando_pants_02_01') - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', actor.getPlanet(), 'item_commando_shirt_02_01') - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s04.iff', actor.getPlanet(), 'item_commando_vest_02_01') - items.add(boots) - items.add(pants) - items.add(shirt) - items.add(vest) + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_commando_boots_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s05.iff', actor.getPlanet(), 'item_commando_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s42.iff', actor.getPlanet(), 'item_commando_shirt_02_01') + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s04.iff', actor.getPlanet(), 'item_commando_vest_02_01') + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(vest) elif profession =='spy_1a': - if "itho" in actor.getTemplate(): - belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) - items.add(belt) - items.add(pants) - items.add(shirt) - items.add(vest) - if "wookie" in actor.getTemplate(): - gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) - hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) - items.add(gloves) - items.add(skirt) - items.add(shirt) - items.add(hood) - else: - 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) - + 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': - if "itho" in actor.getTemplate(): - belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) - items.add(belt) - items.add(pants) - items.add(shirt) - items.add(vest) - if "wookie" in actor.getTemplate(): - gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) - hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) - items.add(gloves) - items.add(skirt) - items.add(shirt) - items.add(hood) - else: - boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_medic_boots_02_01') - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet(), 'item_medic_pants_02_01') - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s27.iff', actor.getPlanet(), 'item_medic_shirt_02_01') - vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s05.iff', actor.getPlanet(), 'item_medic_vest_02_01') - items.add(boots) - items.add(pants) - items.add(shirt) - items.add(vest) + boots = core.objectService.createObject('object/tangible/wearables/boots/shared_boots_s22.iff', actor.getPlanet(), 'item_medic_boots_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet(), 'item_medic_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s27.iff', actor.getPlanet(), 'item_medic_shirt_02_01') + vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s05.iff', actor.getPlanet(), 'item_medic_vest_02_01') + items.add(boots) + items.add(pants) + items.add(shirt) + items.add(vest) elif "trader" in profession: - if "itho" in actor.getTemplate(): - belt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_belt_s02.iff', actor.getPlanet()) - pants = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_pants_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_shirt_s02.iff', actor.getPlanet()) - vest = core.objectService.createObject('object/tangible/wearables/ithorian/shared_ith_vest_s02.iff', actor.getPlanet()) - items.add(belt) - items.add(pants) - items.add(shirt) - items.add(vest) - if "wookie" in actor.getTemplate(): - gloves = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_gloves_s02.iff', actor.getPlanet()) - skirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_skirt_s02.iff', actor.getPlanet()) - shirt = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_shirt_s02.iff', actor.getPlanet()) - hood = core.objectService.createObject('object/tangible/wearables/wookiee/shared_wke_hood_s02.iff', actor.getPlanet()) - items.add(gloves) - items.add(skirt) - items.add(shirt) - items.add(hood) - else: - shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', actor.getPlanet(), 'item_trader_shoes_02_01') - pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', actor.getPlanet(), 'item_trader_pants_02_01') - shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s05.iff', actor.getPlanet(), 'item_trader_shirt_02_01') - belt = core.objectService.createObject('object/tangible/wearables/armor/zam/shared_armor_zam_wesell_belt.iff', actor.getPlanet(), 'item_trader_belt_02_01') - items.add(shoes) - items.add(pants) - tems.add(shirt) - items.add(belt) + shoes = core.objectService.createObject('object/tangible/wearables/shoes/shared_shoes_s01.iff', actor.getPlanet(), 'item_trader_shoes_02_01') + pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s15.iff', actor.getPlanet(), 'item_trader_pants_02_01') + shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s05.iff', actor.getPlanet(), 'item_trader_shirt_02_01') + belt = core.objectService.createObject('object/tangible/wearables/armor/zam/shared_armor_zam_wesell_belt.iff', actor.getPlanet(), 'item_trader_belt_02_01') + items.add(shoes) + items.add(pants) + items.add(shirt) + items.add(belt) + else: actor.sendSystemMessage('@base_player:not_correct_skill', 0) @@ -286,7 +135,7 @@ def createProfessionItem(core, actor): 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