From ea7e242fa76e21321eca77b29b1243d50a0903be Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Fri, 20 Jun 2014 14:55:40 -0400 Subject: [PATCH 01/12] Entertainer Clicky Now Has a Buff Effect --- .../loot/generic_usable/item_entertainer_clicky_01_02.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/object/tangible/loot/generic_usable/item_entertainer_clicky_01_02.py b/scripts/object/tangible/loot/generic_usable/item_entertainer_clicky_01_02.py index dd6a2c0b..2033534c 100644 --- a/scripts/object/tangible/loot/generic_usable/item_entertainer_clicky_01_02.py +++ b/scripts/object/tangible/loot/generic_usable/item_entertainer_clicky_01_02.py @@ -1,9 +1,14 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'object/usable') object.setStfFilename('static_item_n') object.setStfName('item_entertainer_clicky_01_02') object.setDetailFilename('static_item_d') object.setDetailName('item_entertainer_clicky_01_02') object.setStringAttribute('class_required', 'Entertainer') return + +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'roadmapEntertainerClicky', actor) + return From 1262e9304bc3910da03465fc330023b40137febd Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Fri, 20 Jun 2014 14:58:18 -0400 Subject: [PATCH 02/12] Medic Clicky Now Has a Buff Effect --- .../tangible/loot/generic_usable/item_medic_clicky_01_02.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/object/tangible/loot/generic_usable/item_medic_clicky_01_02.py b/scripts/object/tangible/loot/generic_usable/item_medic_clicky_01_02.py index a9a7e24b..8567c5f0 100644 --- a/scripts/object/tangible/loot/generic_usable/item_medic_clicky_01_02.py +++ b/scripts/object/tangible/loot/generic_usable/item_medic_clicky_01_02.py @@ -1,9 +1,13 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'object/usable') object.setStfFilename('static_item_n') object.setStfName('item_medic_clicky_01_02') object.setDetailFilename('static_item_d') object.setDetailName('item_medic_clicky_01_02') object.setStringAttribute('class_required', 'Medic') return +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'roadmapMedicClicky', actor) + return From a4d26408105c032fae97ee3695377c24e5997a47 Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Sat, 21 Jun 2014 17:55:26 -0400 Subject: [PATCH 03/12] Added GCW Binocular Buff Item http://swg.wikia.com/wiki/Tactical_Electrobinoculars --- .../tangible/gcw/gcw_invasion_binoculars_01.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/object/tangible/gcw/gcw_invasion_binoculars_01.py b/scripts/object/tangible/gcw/gcw_invasion_binoculars_01.py index ccad8904..02df443d 100644 --- a/scripts/object/tangible/gcw/gcw_invasion_binoculars_01.py +++ b/scripts/object/tangible/gcw/gcw_invasion_binoculars_01.py @@ -1,4 +1,14 @@ import sys def setup(core, object): - return \ No newline at end of file + object.setIntAttribute('no_trade', 1) + object.setAttachment('radial_filename', 'object/usable') + object.setStfFilename('static_item_n') + object.setStfName('invasion_gcw_binoculars_01_01') + object.setDetailFilename('static_item_d') + object.setDetailName('invasion_gcw_binoculars_01_01') + return + +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'gcw_invasion_binoculars', actor) + return From b57e9209dabe79ca5f7ce75690a2b4b2fad0740d Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Wed, 25 Jun 2014 02:39:57 +0200 Subject: [PATCH 04/12] Corrected multi-colored junk items handling --- .../lootItems/re_junk/wiring_red_yellow.py | 4 +- src/services/LootService.java | 59 +++++++++++++++++++ src/services/housing/HousingService.java | 3 +- src/services/object/ObjectService.java | 19 +++++- 4 files changed, 80 insertions(+), 5 deletions(-) diff --git a/scripts/loot/lootItems/re_junk/wiring_red_yellow.py b/scripts/loot/lootItems/re_junk/wiring_red_yellow.py index 88fd2f59..aa17d304 100644 --- a/scripts/loot/lootItems/re_junk/wiring_red_yellow.py +++ b/scripts/loot/lootItems/re_junk/wiring_red_yellow.py @@ -13,11 +13,11 @@ def lootDescriptor(): def customizationAttributes(): - return ['/private/index_color_1'] + return ['/private/index_color_1','/private/index_color_2'] def customizationValues(): - return [13] #not correct + return [6,12] def reverse_engineering_name(): diff --git a/src/services/LootService.java b/src/services/LootService.java index 35aec14e..e26e4443 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -2805,8 +2805,67 @@ public class LootService implements INetworkDispatch { item24b.setUses(399); core.objectService.addStackableItem(item24b,playerInventory); + TangibleObject item25a = (TangibleObject)core.objectService.createObject("object/tangible/loot/npc_loot/shared_wiring_generic.iff", player.getPlanet()); + item25a.setCustomName("Wiring"); + item25a.setAttachment("reverse_engineering_name", "Red/Yellow"); + item25a.setStackable(true); + item25a.setUses(299); + Vector customizationAttributes = new Vector(); + customizationAttributes.add("/private/index_color_1"); + customizationAttributes.add("/private/index_color_2"); + Vector customizationValues = new Vector(); + customizationValues.add(6); + customizationValues.add(12); + item25a.setAttachment("lootDescriptor", "customattributes"); + setCustomization(item25a,"Wiring", customizationAttributes, customizationValues); + core.objectService.addStackableItem(item25a,playerInventory); + + TangibleObject item25b = (TangibleObject)core.objectService.createObject("object/tangible/loot/npc_loot/shared_launcher_tube_generic.iff", player.getPlanet()); + item25b.setCustomName("Launcher Tube"); + item25b.setStackable(true); + item25b.setUses(399); + core.objectService.addStackableItem(item25b,playerInventory); + + TangibleObject item27b = (TangibleObject)core.objectService.createObject("object/tangible/loot/npc_loot/shared_small_motor_generic.iff", player.getPlanet()); + item27b.setCustomName("Locomotor"); + item27b.setStackable(true); + item27b.setUses(399); + core.objectService.addStackableItem(item27b,playerInventory); + + TangibleObject item26a = (TangibleObject)core.objectService.createObject("object/tangible/loot/npc_loot/shared_copper_battery_generic.iff", player.getPlanet()); + item26a.setCustomName("Droid Battery"); + item26a.setAttachment("reverse_engineering_name", "Black/Green"); + item26a.setStackable(true); + item26a.setUses(299); + customizationAttributes = new Vector(); + customizationAttributes.add("/private/index_color_1"); + customizationAttributes.add("/private/index_color_2"); + customizationValues = new Vector(); + customizationValues.add(0); + customizationValues.add(15); + item26a.setAttachment("lootDescriptor", "customattributes"); + setCustomization(item26a,"Droid Battery", customizationAttributes, customizationValues); + core.objectService.addStackableItem(item26a,playerInventory); + + + TangibleObject item26b = (TangibleObject)core.objectService.createObject("object/tangible/loot/npc_loot/shared_copper_battery_generic.iff", player.getPlanet()); + item26b.setCustomName("Droid Battery"); + item26b.setAttachment("reverse_engineering_name", "Purple/Green"); + item26b.setStackable(true); + item26b.setUses(299); + customizationAttributes = new Vector(); + customizationAttributes.add("/private/index_color_1"); + customizationAttributes.add("/private/index_color_2"); + customizationValues = new Vector(); + customizationValues.add(33); + customizationValues.add(15); + item26b.setAttachment("lootDescriptor", "customattributes"); + setCustomization(item26b,"Droid Battery", customizationAttributes, customizationValues); + core.objectService.addStackableItem(item26b,playerInventory); + + String modifierBitTemplate = "object/tangible/component/reverse_engineering/shared_modifier_bit.iff"; TangibleObject modifierBit = (TangibleObject) core.objectService.createObject(modifierBitTemplate, player.getPlanet()); modifierBit.setCustomName("Droid Experimentation"); diff --git a/src/services/housing/HousingService.java b/src/services/housing/HousingService.java index 63860a89..dfa0e154 100644 --- a/src/services/housing/HousingService.java +++ b/src/services/housing/HousingService.java @@ -113,7 +113,8 @@ public class HousingService implements INetworkDispatch { HouseTemplate houseTemplate = housingTemplates.get(deed.getTemplate()); int structureLotCost = houseTemplate.getLotCost(); String structureTemplate = houseTemplate.getBuildingTemplate(); - PlayerCity city = core.playerCityService.getCityPositionIsIn(new Point3D(positionX, 0, positionZ)); + //PlayerCity city = core.playerCityService.getCityPositionIsIn(new Point3D(positionX, 0, positionZ)); + PlayerCity city = null; if (!houseTemplate.canBePlacedOn(actor.getPlanet().getName())) { actor.sendSystemMessage("You may not place this structure on this planet.", (byte) 0); // should probably load this from an stf diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index 475f7155..fba26116 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -1439,8 +1439,23 @@ public class ObjectService implements INetworkDispatch { @Override public void process(SWGObject obj) { if (obj.getTemplate().equals(item.getTemplate())){ - alikeItemsInContainer.add(obj); - System.out.println(obj.getTemplate()); + // Check if items are Droid Motors or Wirings + if (obj.getTemplate().equals("object/tangible/loot/npc_loot/shared_wiring_generic.iff")){ + if (obj.getAttachment("reverse_engineering_name")!=null){ + if (obj.getAttachment("reverse_engineering_name").equals(item.getAttachment("reverse_engineering_name"))){ + alikeItemsInContainer.add(obj); + } + } + } else if (obj.getTemplate().equals("object/tangible/loot/npc_loot/shared_copper_battery_generic.iff")){ + if (obj.getAttachment("reverse_engineering_name")!=null){ + if (obj.getAttachment("reverse_engineering_name").equals(item.getAttachment("reverse_engineering_name"))){ + alikeItemsInContainer.add(obj); + } + } + } else { + alikeItemsInContainer.add(obj); + } + } } }); From b1d3c4a6e47d12945f8d6723fd1aa757cc72eb3b Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Wed, 25 Jun 2014 16:53:26 +0200 Subject: [PATCH 05/12] Construction pylons added to structure placement service Like harvesters, houses feature the construction pylons now when placing a structure. Partially fixing #840 --- scripts/constructor_build_phase.py | 7 +++++ src/services/DevService.java | 4 +++ src/services/housing/HousingService.java | 33 ++++++++++++++++++++++-- src/services/object/ObjectService.java | 6 +++++ 4 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 scripts/constructor_build_phase.py diff --git a/scripts/constructor_build_phase.py b/scripts/constructor_build_phase.py new file mode 100644 index 00000000..62755eac --- /dev/null +++ b/scripts/constructor_build_phase.py @@ -0,0 +1,7 @@ +import sys +import time + +def buildConstructor(core): + time.sleep(10) + return + \ No newline at end of file diff --git a/src/services/DevService.java b/src/services/DevService.java index 79b3feca..d0b1f39e 100644 --- a/src/services/DevService.java +++ b/src/services/DevService.java @@ -1243,6 +1243,10 @@ public class DevService implements INetworkDispatch { deed.setIntAttribute("examine_maintenance_rate", 15); inventory.add(deed); + deed = (TangibleObject) core.objectService.createObject("object/tangible/deed/guild_deed/shared_tatooine_guild_deed.iff", planet); + deed.setIntAttribute("examine_maintenance_rate", 15); + inventory.add(deed); + return; case 121: diff --git a/src/services/housing/HousingService.java b/src/services/housing/HousingService.java index 63860a89..fd079196 100644 --- a/src/services/housing/HousingService.java +++ b/src/services/housing/HousingService.java @@ -113,8 +113,10 @@ public class HousingService implements INetworkDispatch { HouseTemplate houseTemplate = housingTemplates.get(deed.getTemplate()); int structureLotCost = houseTemplate.getLotCost(); String structureTemplate = houseTemplate.getBuildingTemplate(); - PlayerCity city = core.playerCityService.getCityPositionIsIn(new Point3D(positionX, 0, positionZ)); - + //PlayerCity city = core.playerCityService.getCityPositionIsIn(new Point3D(positionX, 0, positionZ)); + // This function is not implemented, so it had to be commented out, because it resulted in an error + // Whoever wrote this, should still add the method to playerCityService, then it can be uncommented here. + PlayerCity city = null; if (!houseTemplate.canBePlacedOn(actor.getPlanet().getName())) { actor.sendSystemMessage("You may not place this structure on this planet.", (byte) 0); // should probably load this from an stf return null; @@ -142,6 +144,12 @@ public class HousingService implements INetworkDispatch { float positionY = core.terrainService.getHeight(actor.getPlanetId(), positionX, positionZ) + 2f; + String constructorTemplate = mapConstructor(structureTemplate); + InstallationObject constructors = (InstallationObject) core.objectService.createObject(constructorTemplate, 0, actor.getPlanet(), new Point3D(positionX, positionY, positionZ), quaternion); + core.simulationService.add(constructors, positionX, positionZ, true); + core.scriptService.callScript("scripts/", "constructor_build_phase", "buildConstructor", core); + core.objectService.destroyObject(constructors); + // Create the building BuildingObject building = (BuildingObject) core.objectService.createObject(structureTemplate, 0, actor.getPlanet(), new Point3D(positionX, positionY, positionZ), quaternion); @@ -196,6 +204,27 @@ public class HousingService implements INetworkDispatch { return building; } + public String mapConstructor(String structureTemplate) { + String mappedConstructorTemplate = "object/building/player/construction/shared_construction_player_house_generic_small_style_01.iff"; + if (structureTemplate.contains("small")){ + mappedConstructorTemplate = "object/building/player/construction/shared_construction_player_house_generic_small_style_01.iff"; + } else if (structureTemplate.contains("medium")){ + mappedConstructorTemplate = "object/building/player/construction/shared_construction_player_house_generic_medium_style_01.iff"; + } else if (structureTemplate.contains("large")){ + mappedConstructorTemplate = "object/building/player/construction/shared_construction_player_house_generic_large_style_01.iff"; + } + + if (structureTemplate.contains("guildhall") || structureTemplate.contains("cityhall")){ + mappedConstructorTemplate = "object/building/player/construction/shared_construction_player_guildhall_corellia_style_01.iff"; + } else if (structureTemplate.contains("hangar")){ + mappedConstructorTemplate = "object/building/player/construction/shared_construction_player_house_hangar.iff"; + } else if (structureTemplate.contains("meditation")){ + mappedConstructorTemplate = "object/building/player/construction/shared_construction_player_jedi_meditation_room.iff"; + } + // Probably more could be added + return mappedConstructorTemplate; + } + public void startMaintenanceTask(BuildingObject building) { if(building.getAttachment("isCivicStructure") != null && (boolean) building.getAttachment("isCivicStructure")) diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index 475f7155..54fa70e3 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -291,6 +291,12 @@ public class ObjectService implements INetworkDispatch { object = new WeaponObject(objectID, planet, position, orientation, Template); + } else if(Template.startsWith("object/building/player/construction")) { + + float positionY = core.terrainService.getHeight(planet.getID(), position.x, position.z)-1f; + Point3D newpoint = new Point3D(position.x,positionY,position.z); + object = new InstallationObject(objectID, planet, newpoint, orientation, Template); + } else if(Template.startsWith("object/building") || Template.startsWith("object/static/worldbuilding/structures") || Template.startsWith("object/static/structure")){ object = new BuildingObject(objectID, planet, position, orientation, Template); From 21fefece40a2d8250e0251203f92409a2854986d Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Wed, 25 Jun 2014 21:39:52 +0200 Subject: [PATCH 06/12] Fix for issue #543 Fixes Creatures dropping credits --- src/services/LootService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/services/LootService.java b/src/services/LootService.java index 6d713cb7..b452d0f9 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -54,6 +54,7 @@ import resources.objects.group.GroupObject; import resources.objects.intangible.IntangibleObject; import resources.objects.tangible.TangibleObject; import resources.objects.weapon.WeaponObject; +import services.ai.AIActor; import services.sui.SUIService.ListBoxType; import services.sui.SUIService.MessageBoxType; import services.sui.SUIWindow; @@ -193,7 +194,7 @@ public class LootService implements INetworkDispatch { // set info above corpse //System.out.println("lootedObject instanceof CreatureObject " + (lootedObject instanceof CreatureObject)); - if (lootedObject instanceof CreatureObject){ + if (lootedObject instanceof CreatureObject && lootRollSession.getDroppedItems().size()>0){ try { float y = 0.5F; // 1.3356977F float qz= 1.06535322E9F; @@ -1485,7 +1486,9 @@ public class LootService implements INetworkDispatch { public void handleCreditDrop(CreatureObject requester,TangibleObject lootedObject,LootRollSession lootRollSession){ int lootedCredits = 0; - if (lootedObject.isCreditRelieved()) + AIActor ai = (AIActor) lootedObject.getAttachment("AI"); + String resType = ai.getMobileTemplate().getMeatType(); + if (lootedObject.isCreditRelieved() || resType!=null) return; // Credit drop is depending on the CL of the looted CreatureObject From 2de79c80c526dd688d552c1b05c8c561049ee928 Mon Sep 17 00:00:00 2001 From: Zing Date: Sat, 21 Jun 2014 21:15:42 -0700 Subject: [PATCH 07/12] Loot Collections DIY: Glass Shelves Holographic Emitter Cabinetry Tech Craftsman Tools Tech in Maximizing Space Shelving Tech Storage Tech --- .../diy_glass_shelves/diy_glass_shelf_1.py | 29 ++++++++++++++++++ .../diy_glass_shelves/diy_glass_shelf_2.py | 29 ++++++++++++++++++ .../diy_glass_shelves/diy_glass_shelf_3.py | 29 ++++++++++++++++++ .../diy_glass_shelves/diy_glass_shelf_4.py | 29 ++++++++++++++++++ .../diy_glass_shelves/diy_glass_shelf_5.py | 29 ++++++++++++++++++ .../a_holographic_light_source.py | 19 ++++++++++++ .../a_holographic_mirror.py | 19 ++++++++++++ .../holographic_imagery/a_photo_detector.py | 19 ++++++++++++ .../an_electric_circuit.py | 19 ++++++++++++ .../an_optical_processor.py | 19 ++++++++++++ .../cabinetry_techniques_1.py | 29 ++++++++++++++++++ .../cabinetry_techniques_10.py | 29 ++++++++++++++++++ .../cabinetry_techniques_2.py | 29 ++++++++++++++++++ .../cabinetry_techniques_3.py | 29 ++++++++++++++++++ .../cabinetry_techniques_4.py | 29 ++++++++++++++++++ .../cabinetry_techniques_5.py | 29 ++++++++++++++++++ .../cabinetry_techniques_6.py | 29 ++++++++++++++++++ .../cabinetry_techniques_7.py | 29 ++++++++++++++++++ .../cabinetry_techniques_8.py | 29 ++++++++++++++++++ .../cabinetry_techniques_9.py | 29 ++++++++++++++++++ .../craftsman_tools/craftsman_tools_1.py | 29 ++++++++++++++++++ .../craftsman_tools/craftsman_tools_10.py | 29 ++++++++++++++++++ .../craftsman_tools/craftsman_tools_2.py | 29 ++++++++++++++++++ .../craftsman_tools/craftsman_tools_3.py | 29 ++++++++++++++++++ .../craftsman_tools/craftsman_tools_4.py | 29 ++++++++++++++++++ .../craftsman_tools/craftsman_tools_5.py | 29 ++++++++++++++++++ .../craftsman_tools/craftsman_tools_6.py | 29 ++++++++++++++++++ .../craftsman_tools/craftsman_tools_7.py | 29 ++++++++++++++++++ .../craftsman_tools/craftsman_tools_8.py | 29 ++++++++++++++++++ .../craftsman_tools/craftsman_tools_9.py | 29 ++++++++++++++++++ .../maximizing_space/maximizing_space_1.py | 30 +++++++++++++++++++ .../maximizing_space/maximizing_space_10.py | 30 +++++++++++++++++++ .../maximizing_space/maximizing_space_2.py | 30 +++++++++++++++++++ .../maximizing_space/maximizing_space_3.py | 30 +++++++++++++++++++ .../maximizing_space/maximizing_space_4.py | 30 +++++++++++++++++++ .../maximizing_space/maximizing_space_5.py | 30 +++++++++++++++++++ .../maximizing_space/maximizing_space_6.py | 30 +++++++++++++++++++ .../maximizing_space/maximizing_space_7.py | 30 +++++++++++++++++++ .../maximizing_space/maximizing_space_8.py | 30 +++++++++++++++++++ .../maximizing_space/maximizing_space_9.py | 30 +++++++++++++++++++ .../shelving_techniques_1.py | 29 ++++++++++++++++++ .../shelving_techniques_10.py | 29 ++++++++++++++++++ .../shelving_techniques_2.py | 29 ++++++++++++++++++ .../shelving_techniques_3.py | 29 ++++++++++++++++++ .../shelving_techniques_4.py | 29 ++++++++++++++++++ .../shelving_techniques_5.py | 29 ++++++++++++++++++ .../shelving_techniques_6.py | 29 ++++++++++++++++++ .../shelving_techniques_7.py | 29 ++++++++++++++++++ .../shelving_techniques_8.py | 29 ++++++++++++++++++ .../shelving_techniques_9.py | 29 ++++++++++++++++++ .../storage_techniques_1.py | 29 ++++++++++++++++++ .../storage_techniques_10.py | 29 ++++++++++++++++++ .../storage_techniques_2.py | 29 ++++++++++++++++++ .../storage_techniques_3.py | 29 ++++++++++++++++++ .../storage_techniques_4.py | 29 ++++++++++++++++++ .../storage_techniques_5.py | 29 ++++++++++++++++++ .../storage_techniques_6.py | 29 ++++++++++++++++++ .../storage_techniques_7.py | 29 ++++++++++++++++++ .../storage_techniques_8.py | 29 ++++++++++++++++++ .../storage_techniques_9.py | 29 ++++++++++++++++++ 60 files changed, 1700 insertions(+) create mode 100644 scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_1.py create mode 100644 scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_2.py create mode 100644 scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_3.py create mode 100644 scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_4.py create mode 100644 scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_5.py create mode 100644 scripts/loot/lootItems/collections/holographic_imagery/a_holographic_light_source.py create mode 100644 scripts/loot/lootItems/collections/holographic_imagery/a_holographic_mirror.py create mode 100644 scripts/loot/lootItems/collections/holographic_imagery/a_photo_detector.py create mode 100644 scripts/loot/lootItems/collections/holographic_imagery/an_electric_circuit.py create mode 100644 scripts/loot/lootItems/collections/holographic_imagery/an_optical_processor.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_1.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_10.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_2.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_3.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_4.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_5.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_6.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_7.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_8.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_9.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_1.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_10.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_2.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_3.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_4.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_5.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_6.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_7.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_8.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_9.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_1.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_10.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_2.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_3.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_4.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_5.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_6.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_7.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_8.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_9.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_1.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_10.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_2.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_3.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_4.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_5.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_6.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_7.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_8.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_9.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_1.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_10.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_2.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_3.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_4.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_5.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_6.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_7.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_8.py create mode 100644 scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_9.py diff --git a/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_1.py b/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_1.py new file mode 100644 index 00000000..2e1ac9ca --- /dev/null +++ b/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_1.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_col_glass_shelf_book_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [1] + +def STFparams(): + + return ['static_item_n','col_glass_shelf_02_01','static_item_d','col_glass_shelf_02_01'] + +def AddToCollection(): + + return 'col_glass_shelf_01' + +def CollectionItemName(): + + return 'col_glass_shelf_chapter1' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_2.py b/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_2.py new file mode 100644 index 00000000..6ccee2c1 --- /dev/null +++ b/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_2.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_col_glass_shelf_book_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [2] + +def STFparams(): + + return ['static_item_n','col_glass_shelf_02_02','static_item_d','col_glass_shelf_02_02'] + +def AddToCollection(): + + return 'col_glass_shelf_01' + +def CollectionItemName(): + + return 'col_glass_shelf_chapter2' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_3.py b/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_3.py new file mode 100644 index 00000000..153e0de5 --- /dev/null +++ b/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_3.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_col_glass_shelf_book_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [3] + +def STFparams(): + + return ['static_item_n','col_glass_shelf_02_03','static_item_d','col_glass_shelf_02_03'] + +def AddToCollection(): + + return 'col_glass_shelf_01' + +def CollectionItemName(): + + return 'col_glass_shelf_chapter3' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_4.py b/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_4.py new file mode 100644 index 00000000..4dbc9c69 --- /dev/null +++ b/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_4.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_col_glass_shelf_book_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [4] + +def STFparams(): + + return ['static_item_n','col_glass_shelf_02_04','static_item_d','col_glass_shelf_02_04'] + +def AddToCollection(): + + return 'col_glass_shelf_01' + +def CollectionItemName(): + + return 'col_glass_shelf_chapter4' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_5.py b/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_5.py new file mode 100644 index 00000000..9163088e --- /dev/null +++ b/scripts/loot/lootItems/collections/diy_glass_shelves/diy_glass_shelf_5.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_col_glass_shelf_book_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [5] + +def STFparams(): + + return ['static_item_n','col_glass_shelf_02_05','static_item_d','col_glass_shelf_02_05'] + +def AddToCollection(): + + return 'col_glass_shelf_01' + +def CollectionItemName(): + + return 'col_glass_shelf_chapter5' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/holographic_imagery/a_holographic_light_source.py b/scripts/loot/lootItems/collections/holographic_imagery/a_holographic_light_source.py new file mode 100644 index 00000000..33180040 --- /dev/null +++ b/scripts/loot/lootItems/collections/holographic_imagery/a_holographic_light_source.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_col_holo_emitter_light_source.iff'] + +def STFparams(): + + return ['static_item_n','col_holo_emitter_light_source_02_01','static_item_d','col_holo_emitter_light_source_02_01'] + +def AddToCollection(): + + return 'col_holo_emitter_01' + +def CollectionItemName(): + + return 'holo_emitter_part_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/holographic_imagery/a_holographic_mirror.py b/scripts/loot/lootItems/collections/holographic_imagery/a_holographic_mirror.py new file mode 100644 index 00000000..18a0b27d --- /dev/null +++ b/scripts/loot/lootItems/collections/holographic_imagery/a_holographic_mirror.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_col_holo_emitter_receptor.iff'] + +def STFparams(): + + return ['static_item_n','col_holo_emitter_receptor_02_01','static_item_d','col_holo_emitter_receptor_02_01'] + +def AddToCollection(): + + return 'col_holo_emitter_01' + +def CollectionItemName(): + + return 'holo_emitter_part_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/holographic_imagery/a_photo_detector.py b/scripts/loot/lootItems/collections/holographic_imagery/a_photo_detector.py new file mode 100644 index 00000000..aef7d1ee --- /dev/null +++ b/scripts/loot/lootItems/collections/holographic_imagery/a_photo_detector.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_col_holo_emitter_photo_detector.iff'] + +def STFparams(): + + return ['static_item_n','col_holo_emitter_photo_detector_02_01','static_item_d','col_holo_emitter_photo_detector_02_01'] + +def AddToCollection(): + + return 'col_holo_emitter_01' + +def CollectionItemName(): + + return 'holo_emitter_part_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/holographic_imagery/an_electric_circuit.py b/scripts/loot/lootItems/collections/holographic_imagery/an_electric_circuit.py new file mode 100644 index 00000000..6d85300c --- /dev/null +++ b/scripts/loot/lootItems/collections/holographic_imagery/an_electric_circuit.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_col_holo_emitter_curcuit.iff'] + +def STFparams(): + + return ['static_item_n','col_holo_emitter_circuit_02_01','static_item_d','col_holo_emitter_circuit_02_01'] + +def AddToCollection(): + + return 'col_holo_emitter_01' + +def CollectionItemName(): + + return 'holo_emitter_part_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/holographic_imagery/an_optical_processor.py b/scripts/loot/lootItems/collections/holographic_imagery/an_optical_processor.py new file mode 100644 index 00000000..0cf9bf1d --- /dev/null +++ b/scripts/loot/lootItems/collections/holographic_imagery/an_optical_processor.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_col_holo_emitter_processor.iff'] + +def STFparams(): + + return ['static_item_n','col_holo_emitter_processor_02_01','static_item_d','col_holo_emitter_processor_02_01'] + +def AddToCollection(): + + return 'col_holo_emitter_01' + +def CollectionItemName(): + + return 'holo_emitter_part_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_1.py b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_1.py new file mode 100644 index 00000000..da572c3d --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_1.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_04.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [1] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_04_01','static_item_d','item_collection_housing_improvement_04_01'] + +def AddToCollection(): + + return 'housing_improvement_04' + +def CollectionItemName(): + + return 'housing_improvement_04_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_10.py b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_10.py new file mode 100644 index 00000000..63018c13 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_10.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_04.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [10] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_04_10','static_item_d','item_collection_housing_improvement_04_10'] + +def AddToCollection(): + + return 'housing_improvement_04' + +def CollectionItemName(): + + return 'housing_improvement_04_10' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_2.py b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_2.py new file mode 100644 index 00000000..9fbd7731 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_2.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_04.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [2] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_04_02','static_item_d','item_collection_housing_improvement_04_02'] + +def AddToCollection(): + + return 'housing_improvement_04' + +def CollectionItemName(): + + return 'housing_improvement_04_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_3.py b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_3.py new file mode 100644 index 00000000..30910a1b --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_3.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_04.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [3] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_04_03','static_item_d','item_collection_housing_improvement_04_03'] + +def AddToCollection(): + + return 'housing_improvement_04' + +def CollectionItemName(): + + return 'housing_improvement_04_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_4.py b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_4.py new file mode 100644 index 00000000..d0872226 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_4.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_04.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [4] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_04_04','static_item_d','item_collection_housing_improvement_04_04'] + +def AddToCollection(): + + return 'housing_improvement_04' + +def CollectionItemName(): + + return 'housing_improvement_04_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_5.py b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_5.py new file mode 100644 index 00000000..79ce3dbf --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_5.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_04.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [5] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_04_05','static_item_d','item_collection_housing_improvement_04_05'] + +def AddToCollection(): + + return 'housing_improvement_04' + +def CollectionItemName(): + + return 'housing_improvement_04_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_6.py b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_6.py new file mode 100644 index 00000000..1dc202f5 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_6.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_04.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [6] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_04_06','static_item_d','item_collection_housing_improvement_04_06'] + +def AddToCollection(): + + return 'housing_improvement_04' + +def CollectionItemName(): + + return 'housing_improvement_04_06' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_7.py b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_7.py new file mode 100644 index 00000000..6fe49fa9 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_7.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_04.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [7] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_04_07','static_item_d','item_collection_housing_improvement_04_07'] + +def AddToCollection(): + + return 'housing_improvement_04' + +def CollectionItemName(): + + return 'housing_improvement_04_07' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_8.py b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_8.py new file mode 100644 index 00000000..8ed90b58 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_8.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_04.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [8] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_04_08','static_item_d','item_collection_housing_improvement_04_08'] + +def AddToCollection(): + + return 'housing_improvement_04' + +def CollectionItemName(): + + return 'housing_improvement_04_08' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_9.py b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_9.py new file mode 100644 index 00000000..3df1a3d5 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/cabinetry_techniques/cabinetry_techniques_9.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_04.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [9] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_04_09','static_item_d','item_collection_housing_improvement_04_09'] + +def AddToCollection(): + + return 'housing_improvement_04' + +def CollectionItemName(): + + return 'housing_improvement_04_09' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_1.py b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_1.py new file mode 100644 index 00000000..612bdef8 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_1.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_03.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [1] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_03_01','static_item_d','item_collection_housing_improvement_03_01'] + +def AddToCollection(): + + return 'housing_improvement_03' + +def CollectionItemName(): + + return 'housing_improvement_03_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_10.py b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_10.py new file mode 100644 index 00000000..1021d7e4 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_10.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_03.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [10] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_03_10','static_item_d','item_collection_housing_improvement_03_10'] + +def AddToCollection(): + + return 'housing_improvement_03' + +def CollectionItemName(): + + return 'housing_improvement_03_10' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_2.py b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_2.py new file mode 100644 index 00000000..d66ebccd --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_2.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_03.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [2] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_03_02','static_item_d','item_collection_housing_improvement_03_02'] + +def AddToCollection(): + + return 'housing_improvement_03' + +def CollectionItemName(): + + return 'housing_improvement_03_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_3.py b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_3.py new file mode 100644 index 00000000..10ce1ebb --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_3.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_03.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [3] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_03_03','static_item_d','item_collection_housing_improvement_03_03'] + +def AddToCollection(): + + return 'housing_improvement_03' + +def CollectionItemName(): + + return 'housing_improvement_03_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_4.py b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_4.py new file mode 100644 index 00000000..400b5359 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_4.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_03.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [4] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_03_04','static_item_d','item_collection_housing_improvement_03_04'] + +def AddToCollection(): + + return 'housing_improvement_03' + +def CollectionItemName(): + + return 'housing_improvement_03_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_5.py b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_5.py new file mode 100644 index 00000000..fc3b740b --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_5.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_03.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [5] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_03_05','static_item_d','item_collection_housing_improvement_03_05'] + +def AddToCollection(): + + return 'housing_improvement_03' + +def CollectionItemName(): + + return 'housing_improvement_03_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_6.py b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_6.py new file mode 100644 index 00000000..c5522fd9 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_6.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_03.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [6] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_03_06','static_item_d','item_collection_housing_improvement_03_06'] + +def AddToCollection(): + + return 'housing_improvement_03' + +def CollectionItemName(): + + return 'housing_improvement_03_06' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_7.py b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_7.py new file mode 100644 index 00000000..b6326726 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_7.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_03.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [7] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_03_07','static_item_d','item_collection_housing_improvement_03_07'] + +def AddToCollection(): + + return 'housing_improvement_03' + +def CollectionItemName(): + + return 'housing_improvement_03_07' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_8.py b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_8.py new file mode 100644 index 00000000..5a611976 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_8.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_03.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [8] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_03_08','static_item_d','item_collection_housing_improvement_03_08'] + +def AddToCollection(): + + return 'housing_improvement_03' + +def CollectionItemName(): + + return 'housing_improvement_03_08' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_9.py b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_9.py new file mode 100644 index 00000000..04a376ba --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/craftsman_tools/craftsman_tools_9.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_03.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [9] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_03_09','static_item_d','item_collection_housing_improvement_03_09'] + +def AddToCollection(): + + return 'housing_improvement_03' + +def CollectionItemName(): + + return 'housing_improvement_03_09' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_1.py b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_1.py new file mode 100644 index 00000000..9d7abad9 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_1.py @@ -0,0 +1,30 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [1] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_01_01','static_item_d','item_collection_housing_improvement_01_01'] + +def AddToCollection(): + + return 'housing_improvement_01' + +def CollectionItemName(): + + return 'housing_improvement_01_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_10.py b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_10.py new file mode 100644 index 00000000..a3bc51a2 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_10.py @@ -0,0 +1,30 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [10] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_01_10','static_item_d','item_collection_housing_improvement_01_10'] + +def AddToCollection(): + + return 'housing_improvement_01' + +def CollectionItemName(): + + return 'housing_improvement_01_10' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_2.py b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_2.py new file mode 100644 index 00000000..c7a3a840 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_2.py @@ -0,0 +1,30 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [2] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_01_02','static_item_d','item_collection_housing_improvement_01_02'] + +def AddToCollection(): + + return 'housing_improvement_01' + +def CollectionItemName(): + + return 'housing_improvement_01_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_3.py b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_3.py new file mode 100644 index 00000000..0e72292d --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_3.py @@ -0,0 +1,30 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [3] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_01_03','static_item_d','item_collection_housing_improvement_01_03'] + +def AddToCollection(): + + return 'housing_improvement_01' + +def CollectionItemName(): + + return 'housing_improvement_01_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_4.py b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_4.py new file mode 100644 index 00000000..f7d99e0c --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_4.py @@ -0,0 +1,30 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [4] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_01_04','static_item_d','item_collection_housing_improvement_01_04'] + +def AddToCollection(): + + return 'housing_improvement_01' + +def CollectionItemName(): + + return 'housing_improvement_01_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_5.py b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_5.py new file mode 100644 index 00000000..6b10758d --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_5.py @@ -0,0 +1,30 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [5] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_01_05','static_item_d','item_collection_housing_improvement_01_05'] + +def AddToCollection(): + + return 'housing_improvement_01' + +def CollectionItemName(): + + return 'housing_improvement_01_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_6.py b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_6.py new file mode 100644 index 00000000..980592fb --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_6.py @@ -0,0 +1,30 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [6] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_01_06','static_item_d','item_collection_housing_improvement_01_06'] + +def AddToCollection(): + + return 'housing_improvement_01' + +def CollectionItemName(): + + return 'housing_improvement_01_06' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_7.py b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_7.py new file mode 100644 index 00000000..e7bd30bd --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_7.py @@ -0,0 +1,30 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [7] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_01_07','static_item_d','item_collection_housing_improvement_01_07'] + +def AddToCollection(): + + return 'housing_improvement_01' + +def CollectionItemName(): + + return 'housing_improvement_01_07' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_8.py b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_8.py new file mode 100644 index 00000000..916b4502 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_8.py @@ -0,0 +1,30 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [8] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_01_08','static_item_d','item_collection_housing_improvement_01_08'] + +def AddToCollection(): + + return 'housing_improvement_01' + +def CollectionItemName(): + + return 'housing_improvement_01_08' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_9.py b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_9.py new file mode 100644 index 00000000..1fa5eae3 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/maximizing_space/maximizing_space_9.py @@ -0,0 +1,30 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_01.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [9] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_01_09','static_item_d','item_collection_housing_improvement_01_09'] + +def AddToCollection(): + + return 'housing_improvement_01' + +def CollectionItemName(): + + return 'housing_improvement_01_09' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_1.py b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_1.py new file mode 100644 index 00000000..35608064 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_1.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_02.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [1] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_02_01','static_item_d','item_collection_housing_improvement_02_01'] + +def AddToCollection(): + + return 'housing_improvement_02' + +def CollectionItemName(): + + return 'housing_improvement_02_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_10.py b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_10.py new file mode 100644 index 00000000..4ae31629 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_10.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_02.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [1] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_02_10','static_item_d','item_collection_housing_improvement_02_10'] + +def AddToCollection(): + + return 'housing_improvement_02' + +def CollectionItemName(): + + return 'housing_improvement_02_10' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_2.py b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_2.py new file mode 100644 index 00000000..bd6666a2 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_2.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_02.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [2] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_02_02','static_item_d','item_collection_housing_improvement_02_02'] + +def AddToCollection(): + + return 'housing_improvement_02' + +def CollectionItemName(): + + return 'housing_improvement_02_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_3.py b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_3.py new file mode 100644 index 00000000..bf414325 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_3.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_02.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [3] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_02_03','static_item_d','item_collection_housing_improvement_02_03'] + +def AddToCollection(): + + return 'housing_improvement_02' + +def CollectionItemName(): + + return 'housing_improvement_02_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_4.py b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_4.py new file mode 100644 index 00000000..45f2a875 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_4.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_02.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [4] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_02_04','static_item_d','item_collection_housing_improvement_02_04'] + +def AddToCollection(): + + return 'housing_improvement_02' + +def CollectionItemName(): + + return 'housing_improvement_02_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_5.py b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_5.py new file mode 100644 index 00000000..ec13a9f0 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_5.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_02.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [5] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_02_05','static_item_d','item_collection_housing_improvement_02_05'] + +def AddToCollection(): + + return 'housing_improvement_02' + +def CollectionItemName(): + + return 'housing_improvement_02_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_6.py b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_6.py new file mode 100644 index 00000000..bb07df98 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_6.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_02.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [6] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_02_06','static_item_d','item_collection_housing_improvement_02_06'] + +def AddToCollection(): + + return 'housing_improvement_02' + +def CollectionItemName(): + + return 'housing_improvement_02_06' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_7.py b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_7.py new file mode 100644 index 00000000..235a2151 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_7.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_02.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [7] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_02_07','static_item_d','item_collection_housing_improvement_02_07'] + +def AddToCollection(): + + return 'housing_improvement_02' + +def CollectionItemName(): + + return 'housing_improvement_02_07' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_8.py b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_8.py new file mode 100644 index 00000000..507ed1d7 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_8.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_02.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [8] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_02_08','static_item_d','item_collection_housing_improvement_02_08'] + +def AddToCollection(): + + return 'housing_improvement_02' + +def CollectionItemName(): + + return 'housing_improvement_02_08' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_9.py b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_9.py new file mode 100644 index 00000000..2409267d --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/shelving_techniques/shelving_techniques_9.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_02.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [9] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_02_09','static_item_d','item_collection_housing_improvement_02_09'] + +def AddToCollection(): + + return 'housing_improvement_02' + +def CollectionItemName(): + + return 'housing_improvement_02_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_1.py b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_1.py new file mode 100644 index 00000000..2ec51b7c --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_1.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_05.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [1] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_05_01','static_item_d','item_collection_housing_improvement_05_01'] + +def AddToCollection(): + + return 'housing_improvement_05' + +def CollectionItemName(): + + return 'housing_improvement_05_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_10.py b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_10.py new file mode 100644 index 00000000..9c33814f --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_10.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_05.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [10] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_05_10','static_item_d','item_collection_housing_improvement_05_10'] + +def AddToCollection(): + + return 'housing_improvement_05' + +def CollectionItemName(): + + return 'housing_improvement_05_10' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_2.py b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_2.py new file mode 100644 index 00000000..209f09f5 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_2.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_05.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [2] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_05_02','static_item_d','item_collection_housing_improvement_05_02'] + +def AddToCollection(): + + return 'housing_improvement_05' + +def CollectionItemName(): + + return 'housing_improvement_05_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_3.py b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_3.py new file mode 100644 index 00000000..99ad6938 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_3.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_05.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [3] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_05_03','static_item_d','item_collection_housing_improvement_05_03'] + +def AddToCollection(): + + return 'housing_improvement_05' + +def CollectionItemName(): + + return 'housing_improvement_05_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_4.py b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_4.py new file mode 100644 index 00000000..04449b1d --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_4.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_05.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [4] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_05_04','static_item_d','item_collection_housing_improvement_05_04'] + +def AddToCollection(): + + return 'housing_improvement_05' + +def CollectionItemName(): + + return 'housing_improvement_05_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_5.py b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_5.py new file mode 100644 index 00000000..28d98bff --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_5.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_05.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [5] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_05_05','static_item_d','item_collection_housing_improvement_05_05'] + +def AddToCollection(): + + return 'housing_improvement_05' + +def CollectionItemName(): + + return 'housing_improvement_05_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_6.py b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_6.py new file mode 100644 index 00000000..16ae5804 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_6.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_05.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [6] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_05_06','static_item_d','item_collection_housing_improvement_05_06'] + +def AddToCollection(): + + return 'housing_improvement_05' + +def CollectionItemName(): + + return 'housing_improvement_05_06' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_7.py b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_7.py new file mode 100644 index 00000000..8d16bb08 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_7.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_05.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [7] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_05_07','static_item_d','item_collection_housing_improvement_05_07'] + +def AddToCollection(): + + return 'housing_improvement_05' + +def CollectionItemName(): + + return 'housing_improvement_05_07' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_8.py b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_8.py new file mode 100644 index 00000000..6e5125c7 --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_8.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_05.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [8] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_05_08','static_item_d','item_collection_housing_improvement_05_08'] + +def AddToCollection(): + + return 'housing_improvement_05' + +def CollectionItemName(): + + return 'housing_improvement_05_08' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_9.py b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_9.py new file mode 100644 index 00000000..cbbb528c --- /dev/null +++ b/scripts/loot/lootItems/collections/housing_improvements/storage_techniques/storage_techniques_9.py @@ -0,0 +1,29 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_housing_improvement_05.iff'] + +def lootDescriptor(): + + return 'customattributes' + +def customizationAttributes(): + return ['/private/index_color_1'] + +def customizationValues(): + return [9] + +def STFparams(): + + return ['static_item_n','item_collection_housing_improvement_05_09','static_item_d','item_collection_housing_improvement_05_09'] + +def AddToCollection(): + + return 'housing_improvement_05' + +def CollectionItemName(): + + return 'housing_improvement_05_09' + +def stackable(): + + return 1 \ No newline at end of file From 74612814a71093e822bf23623105712568fa4329 Mon Sep 17 00:00:00 2001 From: Zing Date: Sun, 22 Jun 2014 11:23:39 -0700 Subject: [PATCH 08/12] example of world collection setup --- .../collection/rare_pistol_blackfalcon.py | 5 ++++- scripts/radial/item/collection.py | 13 ++++++++----- scripts/radial/item/world_collection.py | 17 +++++++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 scripts/radial/item/world_collection.py diff --git a/scripts/object/tangible/collection/rare_pistol_blackfalcon.py b/scripts/object/tangible/collection/rare_pistol_blackfalcon.py index ccad8904..421ffda3 100644 --- a/scripts/object/tangible/collection/rare_pistol_blackfalcon.py +++ b/scripts/object/tangible/collection/rare_pistol_blackfalcon.py @@ -1,4 +1,7 @@ import sys def setup(core, object): - return \ No newline at end of file + print ('test') + object.setAttachment('CollectionItemName', 'blackfalcon_01') + object.setAttachment('radial_filename', 'item/world_collection') + return diff --git a/scripts/radial/item/collection.py b/scripts/radial/item/collection.py index 0b45c9e4..9e6dc8b7 100644 --- a/scripts/radial/item/collection.py +++ b/scripts/radial/item/collection.py @@ -6,10 +6,13 @@ def createRadial(core, owner, target, radials): radials.add(RadialOptions(0, 7, 1, '')) radials.add(RadialOptions(0, 21, 3, '@collection:consume_item')) return - -def handleSelection(core, owner, target, option): + +def handleSelection(core, actor, target, option): if option == 21 and target: - core.collectionService.addCollection(owner, target.getStfName().rsplit('_n', 1)[0]) - core.objectService.useObject(owner, target) + if target.getAttachment('CollectionItemName'): + print (target.getAttachment('CollectionItemName')) + if core.collectionService.isComplete(actor, target.getAttachment('CollectionItemName')) == False: + core.collectionService.addCollection(actor, target.getAttachment('CollectionItemName')) + core.objectService.useObject(actor, target) + core.objectService.destroyObject(target) return - \ No newline at end of file diff --git a/scripts/radial/item/world_collection.py b/scripts/radial/item/world_collection.py new file mode 100644 index 00000000..084007c8 --- /dev/null +++ b/scripts/radial/item/world_collection.py @@ -0,0 +1,17 @@ +from resources.common import RadialOptions +import sys + +def createRadial(core, owner, target, radials): + radials.add(RadialOptions(0, 21, 1, '')) + radials.add(RadialOptions(0, 7, 1, '')) + radials.add(RadialOptions(0, 21, 3, '@collection:consume_item')) + return + +def handleSelection(core, actor, target, option): + if option == 21 and target: + if target.getAttachment('CollectionItemName'): + print (target.getAttachment('CollectionItemName')) + core.collectionService.addCollection(actor, target.getAttachment('CollectionItemName')) + core.objectService.useObject(actor, target) + core.objectService.destroyObject(target) + return From 0739f87d4b21f62fad7bce29f1818dca1c60644f Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Wed, 25 Jun 2014 22:50:15 +0200 Subject: [PATCH 09/12] Multiple fixes Fix for #849 Fix for #850 --- scripts/object/intangible/vehicle/stap_speeder_pcd.py | 1 + src/services/LootService.java | 4 ++-- src/services/TerrainService.java | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/object/intangible/vehicle/stap_speeder_pcd.py b/scripts/object/intangible/vehicle/stap_speeder_pcd.py index ccad8904..d7c3f4a1 100644 --- a/scripts/object/intangible/vehicle/stap_speeder_pcd.py +++ b/scripts/object/intangible/vehicle/stap_speeder_pcd.py @@ -1,4 +1,5 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'datapad/vehicle_pcd') return \ No newline at end of file diff --git a/src/services/LootService.java b/src/services/LootService.java index b452d0f9..ea50f3b6 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -79,8 +79,8 @@ public class LootService implements INetworkDispatch { private NGECore core; private static int prepInvCnt = 0; - String testDropTemplate = null; - //String testDropTemplate = "kowakian_cage"; + //String testDropTemplate = null; + String testDropTemplate = "stap1_vehicle_deed"; public LootService(NGECore core) { this.core = core; diff --git a/src/services/TerrainService.java b/src/services/TerrainService.java index 9cc2924a..1653690d 100644 --- a/src/services/TerrainService.java +++ b/src/services/TerrainService.java @@ -66,6 +66,11 @@ public class TerrainService { float x = (Float) poiTable.getObject(i, 4); float z = (Float) poiTable.getObject(i, 6); + // Account for more extended no-build radii like they were on live + // Issue #849 + x *= 1.1; + z *= 1.1; + CollidableCircle poiArea = new CollidableCircle(new Point3D(x, 0, z), 150, planet); noBuildAreas.get(planet).add(poiArea); From 41fa010ef51dee5919af6f2906f92ce7500ff9b6 Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Wed, 25 Jun 2014 22:54:22 +0200 Subject: [PATCH 10/12] loot service test state disabled --- src/services/LootService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/LootService.java b/src/services/LootService.java index ea50f3b6..de42eb6e 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -79,8 +79,8 @@ public class LootService implements INetworkDispatch { private NGECore core; private static int prepInvCnt = 0; - //String testDropTemplate = null; - String testDropTemplate = "stap1_vehicle_deed"; + String testDropTemplate = null; + //String testDropTemplate = "stap1_vehicle_deed"; public LootService(NGECore core) { this.core = core; From e92d8378a0861aa6a1043636284f52db6bf89023 Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Thu, 26 Jun 2014 00:12:01 +0200 Subject: [PATCH 11/12] Fixes for older issues Fixes #478 Fixes #599 Added rare components to foraging --- src/resources/common/Forager.java | 80 ++++++++++++++++++++++++++++++- src/services/SurveyService.java | 3 ++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/src/resources/common/Forager.java b/src/resources/common/Forager.java index 71874a78..98911cbc 100644 --- a/src/resources/common/Forager.java +++ b/src/resources/common/Forager.java @@ -22,6 +22,7 @@ package resources.common; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Random; import java.util.Vector; @@ -50,6 +51,71 @@ public class Forager { public static final int WORM_BAIT = 4; public static final int MYSTERIOUS_DATA_DISC = 5; + public static final String[] RARE_COMPONENTS_CORELLIA = new String[]{"object/tangible/loot/creature_loot/collections/fried_icecream_components/corellia/shared_charbote.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/corellia/shared_goldfruit.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/corellia/shared_kavasa_fruit.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/corellia/shared_salthia.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/corellia/shared_sunfruit.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/corellia/shared_vweilu.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/corellia/shared_yam.iff" + }; + + public static final String[] RARE_COMPONENTS_DANTOOINE = new String[]{"object/tangible/loot/creature_loot/collections/fried_icecream_components/dantooine/shared_barabel.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/dantooine/shared_celonslay.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/dantooine/shared_dorian.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/dantooine/shared_kibla_greens.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/dantooine/shared_shefna_fruit.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/dantooine/shared_tritacale.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/dantooine/shared_yot_beans.iff" + }; + + public static final String[] RARE_COMPONENTS_DATHOMIR = new String[]{"object/tangible/loot/creature_loot/collections/fried_icecream_components/dathomir/shared_beebleberry.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/dathomir/shared_driblis.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/dathomir/shared_dricklefruit.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/dathomir/shared_grape.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/dathomir/shared_hwotha.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/dathomir/shared_plaitfruit.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/dathomir/shared_qana.iff" + }; + + public static final String[] RARE_COMPONENTS_ENDOR = new String[]{"object/tangible/loot/creature_loot/collections/fried_icecream_components/endor/shared_acorns.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/endor/shared_blumfruit.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/endor/shared_burr_ball.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/endor/shared_gin_jang_berry.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/endor/shared_honey_melon.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/endor/shared_sunberries.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/endor/shared_yubnut.iff" + }; + + public static final String[] RARE_COMPONENTS_NABOO = new String[]{"object/tangible/loot/creature_loot/collections/fried_icecream_components/naboo/shared_cligs.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/naboo/shared_cracknut.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/naboo/shared_denta.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/naboo/shared_muja.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/naboo/shared_ootoowergs.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/naboo/shared_phraig.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/naboo/shared_stinkmelon.iff" + }; + + public static final String[] RARE_COMPONENTS_TATOOINE = new String[]{"object/tangible/loot/creature_loot/collections/fried_icecream_components/tatooine/shared_banthaweed.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/tatooine/shared_bestinnian.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/tatooine/shared_bloddle.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/tatooine/shared_bristlemelon.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/tatooine/shared_tatoes.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/tatooine/shared_wyykmelons.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/tatooine/shared_zog.iff" + }; + + public static final String[] RARE_COMPONENTS_YAVIN = new String[]{"object/tangible/loot/creature_loot/collections/fried_icecream_components/yavin/shared_blueleaf_shrub.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/yavin/shared_celto.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/yavin/shared_farrberries.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/yavin/shared_sweetmelon.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/yavin/shared_topatoes.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/yavin/shared_trig_berries.iff", + "object/tangible/loot/creature_loot/collections/fried_icecream_components/yavin/shared_wuli_nuts.iff" + }; + + private static final HashMap rareComponentHash= new HashMap(); + private int[] mapPlanetIDs = new int[]{6,7,8}; // consider foraged food food/foraged @@ -77,7 +143,14 @@ public class Forager { int[] forageChances = new int[]{10,10,25,25,25,5}; int[] forageChances2 = new int[]{12,10,21,23,24,10}; // Kommerken Steak int[] forageChances3 = new int[]{20,9,22,22,22,5}; // if you got the pig - + + rareComponentHash.put(1,RARE_COMPONENTS_TATOOINE); + rareComponentHash.put(2,RARE_COMPONENTS_NABOO); + rareComponentHash.put(3,RARE_COMPONENTS_CORELLIA); + rareComponentHash.put(6,RARE_COMPONENTS_DANTOOINE); + rareComponentHash.put(8,RARE_COMPONENTS_YAVIN); + rareComponentHash.put(9,RARE_COMPONENTS_ENDOR); + rareComponentHash.put(10,RARE_COMPONENTS_DATHOMIR); int chosenObject = 0; @@ -120,7 +193,10 @@ public class Forager { forager.sendSystemMessage("",(byte) 0); break; - case RARE_COMPONENT: template = "object/tangible/loot/beast/shared_enzyme_1.iff"; // for now, must find temp + case RARE_COMPONENT: template = ""; + String[] componentArray = rareComponentHash.get(forager.getPlanetId()); + int componentRoll = new Random().nextInt(componentArray.length); + template = componentArray[componentRoll]; foragedObject = (TangibleObject) NGECore.getInstance().objectService.createObject(template, forager.getPlanet()); foragerInventory.add(foragedObject); forager.sendSystemMessage("",(byte) 0); diff --git a/src/services/SurveyService.java b/src/services/SurveyService.java index b218982a..ff01a6fb 100644 --- a/src/services/SurveyService.java +++ b/src/services/SurveyService.java @@ -273,6 +273,9 @@ public class SurveyService implements INetworkDispatch { if (target==null) return; // target object not valid + if (crafter.getContainer()!=null) + return; + SurveyTool surveyTool = (SurveyTool)target; if (surveyTool.getToolType()==-1) return; // Survey tool type was not recognized From 6256d6fc72848b4133d766ef2e461fc17a9821d4 Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Thu, 26 Jun 2014 02:41:27 +0200 Subject: [PATCH 12/12] Fix2 --- src/services/housing/HousingService.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/services/housing/HousingService.java b/src/services/housing/HousingService.java index 237eb56a..fd079196 100644 --- a/src/services/housing/HousingService.java +++ b/src/services/housing/HousingService.java @@ -114,14 +114,9 @@ public class HousingService implements INetworkDispatch { int structureLotCost = houseTemplate.getLotCost(); String structureTemplate = houseTemplate.getBuildingTemplate(); //PlayerCity city = core.playerCityService.getCityPositionIsIn(new Point3D(positionX, 0, positionZ)); -<<<<<<< HEAD - PlayerCity city = null; - -======= // This function is not implemented, so it had to be commented out, because it resulted in an error // Whoever wrote this, should still add the method to playerCityService, then it can be uncommented here. PlayerCity city = null; ->>>>>>> origin/master if (!houseTemplate.canBePlacedOn(actor.getPlanet().getName())) { actor.sendSystemMessage("You may not place this structure on this planet.", (byte) 0); // should probably load this from an stf return null;