From cabce0658938dd5e328c12e2a5c6e5bd78de5aca Mon Sep 17 00:00:00 2001 From: Zing Date: Thu, 19 Jun 2014 18:49:42 -0700 Subject: [PATCH 01/30] Loot fixes --- .../collections/inv_holocron_collection_01.py | 15 ++++++++++++++ .../collections/relics/jedi_relic_1.py | 20 +++++++++++++++++++ scripts/loot/lootItems/relics/jedi_relic_2.py | 6 ------ scripts/loot/lootPools/jediholocrons.py | 6 ++++-- scripts/loot/lootPools/junk.py | 2 +- scripts/loot/lootPools/sithholocrons.py | 6 ++++-- scripts/mobiles/dantooine/dark_jedi_master.py | 2 +- 7 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 scripts/collections/inv_holocron_collection_01.py create mode 100644 scripts/loot/lootItems/collections/relics/jedi_relic_1.py delete mode 100644 scripts/loot/lootItems/relics/jedi_relic_2.py diff --git a/scripts/collections/inv_holocron_collection_01.py b/scripts/collections/inv_holocron_collection_01.py new file mode 100644 index 00000000..82708850 --- /dev/null +++ b/scripts/collections/inv_holocron_collection_01.py @@ -0,0 +1,15 @@ +from java.lang import System +import sys + +def modify(core, actor, count): + return + +def complete(core, actor, collection): + ghost = actor.getSlottedObject('ghost') + actor.sendSystemMessage('@collection_n:inv_holocron_collection_01_finished', 0) + print ('Collection Finished Test') + bb = core.objectService.createObject('object/tangible/wearables/backpack/shared_fannypack_s01.iff', object.getPlanet()) + core.playerService.giveItem(actor, bb) + print ('test2') + + return \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/relics/jedi_relic_1.py b/scripts/loot/lootItems/collections/relics/jedi_relic_1.py new file mode 100644 index 00000000..1885ce9c --- /dev/null +++ b/scripts/loot/lootItems/collections/relics/jedi_relic_1.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff'] + +def STFparams(): + + return ['static_item_n','col_lightsaber_1h_01_03','static_item_d','col_lightsaber_1h_01_03'] + +def AddToCollection(): + + return 'col_lightsaber_1h_01' + +def CollectionItemName(): + + return 'col_lightsaber_1h_01_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/relics/jedi_relic_2.py b/scripts/loot/lootItems/relics/jedi_relic_2.py deleted file mode 100644 index 1460ae13..00000000 --- a/scripts/loot/lootItems/relics/jedi_relic_2.py +++ /dev/null @@ -1,6 +0,0 @@ - -def itemTemplate(): - - return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff'] - - diff --git a/scripts/loot/lootPools/jediholocrons.py b/scripts/loot/lootPools/jediholocrons.py index a227cbe8..af0a9daa 100644 --- a/scripts/loot/lootPools/jediholocrons.py +++ b/scripts/loot/lootPools/jediholocrons.py @@ -1,8 +1,10 @@ def itemNames(): - return ['jedi_holocron_1_5','jedi_holocron_2_5','jedi_holocron_3_5','jedi_holocron_4_5','jedi_holocron_5_5'] + items=['jedi_holocron_1_5','jedi_holocron_2_5','jedi_holocron_3_5','jedi_holocron_4_5','jedi_holocron_5_5'] + items=items+['jedi_holocron_1_5_wp','jedi_holocron_2_5_wp','jedi_holocron_3_5_wp','jedi_holocron_4_5_wp','jedi_holocron_5_5_wp'] + return names def itemChances(): - return [25,15,30,5,25] \ No newline at end of file + return [9,9,15,6,12,10,9,15,3,12] \ No newline at end of file diff --git a/scripts/loot/lootPools/junk.py b/scripts/loot/lootPools/junk.py index ef757825..cb0b44c6 100644 --- a/scripts/loot/lootPools/junk.py +++ b/scripts/loot/lootPools/junk.py @@ -2,7 +2,7 @@ def itemNames(): templates=['damaged_datapad','red_wiring','worklight_generic','antenna','brain','eye','gland','heart','stomach','armor_repair_device'] #10 - templates=templates+['brain','chassis_blueprint','comlink','explosive_dud','hyperdrive_unit','id_chip','impulse_detector','laser_trap'] #8 + templates=templates+['brain','chassis_blueprints','comlink','explosive_dud','hyperdrive_unit','id_chip','impulse_detector','laser_trap'] #8 templates=templates+['launcher_tube','ledger','magseal_detector','medical_console','medical_device','motor','power_output_analyzer','shield_module'] #8 templates=templates+['software_module','survival_gear','underpowered_survey_pad','unidentified_serum_vial','used_notebook','weak_droid_battery'] #6 return templates diff --git a/scripts/loot/lootPools/sithholocrons.py b/scripts/loot/lootPools/sithholocrons.py index b264dabe..1e18966a 100644 --- a/scripts/loot/lootPools/sithholocrons.py +++ b/scripts/loot/lootPools/sithholocrons.py @@ -1,8 +1,10 @@ def itemNames(): - return ['sith_holocron_1_5','sith_holocron_2_5','sith_holocron_3_5','sith_holocron_4_5','sith_holocron_5_5'] + items=['sith_holocron_1_5','sith_holocron_2_5','sith_holocron_3_5','sith_holocron_4_5','sith_holocron_5_5'] + items=items+['sith_holocron_1_5_wp','sith_holocron_2_5_wp','sith_holocron_3_5_wp','sith_holocron_4_5_wp','sith_holocron_5_5_wp'] + return items def itemChances(): - return [25,15,30,5,25] \ No newline at end of file + return [9,9,15,6,12,10,9,15,3,12] \ No newline at end of file diff --git a/scripts/mobiles/dantooine/dark_jedi_master.py b/scripts/mobiles/dantooine/dark_jedi_master.py index 00b9c0f8..da18e248 100644 --- a/scripts/mobiles/dantooine/dark_jedi_master.py +++ b/scripts/mobiles/dantooine/dark_jedi_master.py @@ -54,7 +54,7 @@ def addTemplate(core): lootPoolNames_2 = ['jedi_relic_1'] lootPoolChances_2 = [100] - lootGroupChance_2 = 85 + lootGroupChance_2 = 30 mobileTemplate.addToLootGroups(lootPoolNames_2,lootPoolChances_2,lootGroupChance_2) lootPoolNames_3 = ['powercrystals_hiq'] From d330be45539314f4bc0b50207f022225d23b9b3a Mon Sep 17 00:00:00 2001 From: Zing Date: Thu, 19 Jun 2014 18:50:05 -0700 Subject: [PATCH 02/30] missed one --- scripts/loot/lootItems/relics/jedi_relic_1.py | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 scripts/loot/lootItems/relics/jedi_relic_1.py diff --git a/scripts/loot/lootItems/relics/jedi_relic_1.py b/scripts/loot/lootItems/relics/jedi_relic_1.py deleted file mode 100644 index 321819e2..00000000 --- a/scripts/loot/lootItems/relics/jedi_relic_1.py +++ /dev/null @@ -1,8 +0,0 @@ - -def itemTemplate(): - - return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff'] - -def usedInCollection(): - - return 'One-Handed Fifth Generation Lightsaber' From a8e77ddee8ce4660367f0f5922ff0f0a8081c0bb Mon Sep 17 00:00:00 2001 From: tacef Date: Fri, 20 Jun 2014 19:31:33 +0200 Subject: [PATCH 03/30] More Work on Jabba TP Locations Populated Dragonet area Added Dragonet runt npc script Fixed some issues with NPCs --- .../tatooine/adolescent_krayt_dragon.py | 2 - scripts/mobiles/tatooine/armodragon.py | 2 - scripts/mobiles/tatooine/bantha.py | 2 - scripts/mobiles/tatooine/bantha_low.py | 2 - scripts/mobiles/tatooine/bantha_matriarch.py | 2 - scripts/mobiles/tatooine/blight_boar.py | 2 - scripts/mobiles/tatooine/bocatt.py | 2 - .../mobiles/tatooine/bonecracker_bantha.py | 2 - scripts/mobiles/tatooine/bull_bantha.py | 2 - scripts/mobiles/tatooine/bull_ronto.py | 2 - scripts/mobiles/tatooine/cannibal_dewback.py | 2 - .../mobiles/tatooine/canyon_krayt_dragon.py | 2 - scripts/mobiles/tatooine/carion_kreetle.py | 2 - scripts/mobiles/tatooine/cave_beetle.py | 2 - scripts/mobiles/tatooine/cave_beetle2.py | 2 - scripts/mobiles/tatooine/city_rockmite.py | 2 - scripts/mobiles/tatooine/diseased_bocatt.py | 2 - scripts/mobiles/tatooine/domestic_eopie.py | 2 - scripts/mobiles/tatooine/dragonet.py | 4 +- scripts/mobiles/tatooine/dragonet_runt.py | 46 +++++++++++++++++ scripts/mobiles/tatooine/drooling_nuna.py | 2 - .../tatooine/jabba_tp_dragonet.py | 50 +++++++++++++++++++ 22 files changed, 97 insertions(+), 41 deletions(-) create mode 100644 scripts/mobiles/tatooine/dragonet_runt.py create mode 100644 scripts/static_spawns/tatooine/jabba_tp_dragonet.py diff --git a/scripts/mobiles/tatooine/adolescent_krayt_dragon.py b/scripts/mobiles/tatooine/adolescent_krayt_dragon.py index 0a4a6f76..33996719 100644 --- a/scripts/mobiles/tatooine/adolescent_krayt_dragon.py +++ b/scripts/mobiles/tatooine/adolescent_krayt_dragon.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('krayt_dragon_adolescent') mobileTemplate.setLevel(84) - mobileTemplate.setMinLevel(80) - mobileTemplate.setMaxLevel(84) mobileTemplate.setDifficulty(Difficulty.BOSS) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/armodragon.py b/scripts/mobiles/tatooine/armodragon.py index d143a628..d3063adf 100644 --- a/scripts/mobiles/tatooine/armodragon.py +++ b/scripts/mobiles/tatooine/armodragon.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('dragonet_armodragon') mobileTemplate.setLevel(25) - mobileTemplate.setMinLevel(25) - mobileTemplate.setMaxLevel(27) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/bantha.py b/scripts/mobiles/tatooine/bantha.py index 6ea6ba97..2b0dd9f0 100644 --- a/scripts/mobiles/tatooine/bantha.py +++ b/scripts/mobiles/tatooine/bantha.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('bantha') mobileTemplate.setLevel(14) - mobileTemplate.setMinLevel(14) - mobileTemplate.setMaxLevel(15) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/bantha_low.py b/scripts/mobiles/tatooine/bantha_low.py index c23fe3a4..f62fb1b2 100644 --- a/scripts/mobiles/tatooine/bantha_low.py +++ b/scripts/mobiles/tatooine/bantha_low.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('bantha') mobileTemplate.setLevel(8) - mobileTemplate.setMinLevel(8) - mobileTemplate.setMaxLevel(10) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/bantha_matriarch.py b/scripts/mobiles/tatooine/bantha_matriarch.py index 2fc7aacd..41cf643c 100644 --- a/scripts/mobiles/tatooine/bantha_matriarch.py +++ b/scripts/mobiles/tatooine/bantha_matriarch.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('matriarch_bantha') mobileTemplate.setLevel(15) - mobileTemplate.setMinLevel(15) - mobileTemplate.setMaxLevel(17) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/blight_boar.py b/scripts/mobiles/tatooine/blight_boar.py index 3e24ff37..e76eaff7 100644 --- a/scripts/mobiles/tatooine/blight_boar.py +++ b/scripts/mobiles/tatooine/blight_boar.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('zucca_boar_blight') mobileTemplate.setLevel(9) - mobileTemplate.setMinLevel(9) - mobileTemplate.setMaxLevel(10) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/bocatt.py b/scripts/mobiles/tatooine/bocatt.py index 4ee6af8b..c54dfc39 100644 --- a/scripts/mobiles/tatooine/bocatt.py +++ b/scripts/mobiles/tatooine/bocatt.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('bocatt') mobileTemplate.setLevel(17) - mobileTemplate.setMinLevel(17) - mobileTemplate.setMaxLevel(18) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/bonecracker_bantha.py b/scripts/mobiles/tatooine/bonecracker_bantha.py index df12423c..df78a383 100644 --- a/scripts/mobiles/tatooine/bonecracker_bantha.py +++ b/scripts/mobiles/tatooine/bonecracker_bantha.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('bantha_bonecracker') mobileTemplate.setLevel(21) - mobileTemplate.setMinLevel(21) - mobileTemplate.setMaxLevel(22) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/bull_bantha.py b/scripts/mobiles/tatooine/bull_bantha.py index 8659f273..fa028dc4 100644 --- a/scripts/mobiles/tatooine/bull_bantha.py +++ b/scripts/mobiles/tatooine/bull_bantha.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('bull_bantha') mobileTemplate.setLevel(15) - mobileTemplate.setMinLevel(15) - mobileTemplate.setMaxLevel(17) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/bull_ronto.py b/scripts/mobiles/tatooine/bull_ronto.py index 51cfaac2..20c65f67 100644 --- a/scripts/mobiles/tatooine/bull_ronto.py +++ b/scripts/mobiles/tatooine/bull_ronto.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('ronto_male') mobileTemplate.setLevel(18) - mobileTemplate.setMinLevel(18) - mobileTemplate.setMaxLevel(19) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/cannibal_dewback.py b/scripts/mobiles/tatooine/cannibal_dewback.py index 9e1e4a6f..122fb026 100644 --- a/scripts/mobiles/tatooine/cannibal_dewback.py +++ b/scripts/mobiles/tatooine/cannibal_dewback.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('dewback_cannibal') mobileTemplate.setLevel(13) - mobileTemplate.setMinLevel(13) - mobileTemplate.setMaxLevel(14) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/canyon_krayt_dragon.py b/scripts/mobiles/tatooine/canyon_krayt_dragon.py index 36143886..b307e4cc 100644 --- a/scripts/mobiles/tatooine/canyon_krayt_dragon.py +++ b/scripts/mobiles/tatooine/canyon_krayt_dragon.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('canyon_krayt_dragon') mobileTemplate.setLevel(85) - mobileTemplate.setMinLevel(80) - mobileTemplate.setMaxLevel(86) mobileTemplate.setDifficulty(Difficulty.BOSS) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/carion_kreetle.py b/scripts/mobiles/tatooine/carion_kreetle.py index fc0049db..1529623d 100644 --- a/scripts/mobiles/tatooine/carion_kreetle.py +++ b/scripts/mobiles/tatooine/carion_kreetle.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('fragile_kreetle') mobileTemplate.setLevel(2) - mobileTemplate.setMinLevel(2) - mobileTemplate.setMaxLevel(7) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/cave_beetle.py b/scripts/mobiles/tatooine/cave_beetle.py index 4d6f3cae..aa1e9047 100644 --- a/scripts/mobiles/tatooine/cave_beetle.py +++ b/scripts/mobiles/tatooine/cave_beetle.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('cave_beetle') mobileTemplate.setLevel(20) - mobileTemplate.setMinLevel(20) - mobileTemplate.setMaxLevel(21) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/cave_beetle2.py b/scripts/mobiles/tatooine/cave_beetle2.py index cb369419..abdd2c4b 100644 --- a/scripts/mobiles/tatooine/cave_beetle2.py +++ b/scripts/mobiles/tatooine/cave_beetle2.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('cave_beetle') mobileTemplate.setLevel(20) - mobileTemplate.setMinLevel(20) - mobileTemplate.setMaxLevel(22) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/city_rockmite.py b/scripts/mobiles/tatooine/city_rockmite.py index bbbe5af7..dee920a5 100644 --- a/scripts/mobiles/tatooine/city_rockmite.py +++ b/scripts/mobiles/tatooine/city_rockmite.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('city_rockmite') mobileTemplate.setLevel(5) - mobileTemplate.setMinLevel(5) - mobileTemplate.setMaxLevel(7) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/diseased_bocatt.py b/scripts/mobiles/tatooine/diseased_bocatt.py index d573b1a0..e3697c05 100644 --- a/scripts/mobiles/tatooine/diseased_bocatt.py +++ b/scripts/mobiles/tatooine/diseased_bocatt.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('bocatt_diseased') mobileTemplate.setLevel(5) - mobileTemplate.setMinLevel(5) - mobileTemplate.setMaxLevel(6) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/domestic_eopie.py b/scripts/mobiles/tatooine/domestic_eopie.py index 7991bb59..fd94bf67 100644 --- a/scripts/mobiles/tatooine/domestic_eopie.py +++ b/scripts/mobiles/tatooine/domestic_eopie.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('domestic_eopie') mobileTemplate.setLevel(1) - mobileTemplate.setMinLevel(1) - mobileTemplate.setMaxLevel(3) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/dragonet.py b/scripts/mobiles/tatooine/dragonet.py index 3f91b87f..bc5cf523 100644 --- a/scripts/mobiles/tatooine/dragonet.py +++ b/scripts/mobiles/tatooine/dragonet.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('dragonet') mobileTemplate.setLevel(24) - mobileTemplate.setMinLevel(24) - mobileTemplate.setMaxLevel(27) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) @@ -32,7 +30,7 @@ def addTemplate(core): mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE) templates = Vector() - templates.add('object/mobile/shared_dune_lizard.iff') + templates.add('object/mobile/shared_dragonet.iff') mobileTemplate.setTemplates(templates) weaponTemplates = Vector() diff --git a/scripts/mobiles/tatooine/dragonet_runt.py b/scripts/mobiles/tatooine/dragonet_runt.py new file mode 100644 index 00000000..ddac6f7b --- /dev/null +++ b/scripts/mobiles/tatooine/dragonet_runt.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('dragonet_runt') + mobileTemplate.setLevel(19) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Carnivore Meat") + mobileTemplate.setMeatAmount(125) + mobileTemplate.setHideType("Bristly Hide") + mobileTemplate.setBoneAmount(75) + mobileTemplate.setBoneType("Animal Bone") + mobileTemplate.setHideAmount(68) + mobileTemplate.setSocialGroup("dragonet") + mobileTemplate.setAssistRange(10) + mobileTemplate.setStalker(True) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_dragonet.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/creature/shared_creature_spit_small_toxicgreen.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureRangedAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('dragonet_runt', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/drooling_nuna.py b/scripts/mobiles/tatooine/drooling_nuna.py index b2467732..e36a562e 100644 --- a/scripts/mobiles/tatooine/drooling_nuna.py +++ b/scripts/mobiles/tatooine/drooling_nuna.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('dwarf_nuna_drooling') mobileTemplate.setLevel(2) - mobileTemplate.setMinLevel(2) - mobileTemplate.setMaxLevel(3) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/static_spawns/tatooine/jabba_tp_dragonet.py b/scripts/static_spawns/tatooine/jabba_tp_dragonet.py new file mode 100644 index 00000000..d1c5e651 --- /dev/null +++ b/scripts/static_spawns/tatooine/jabba_tp_dragonet.py @@ -0,0 +1,50 @@ +import sys +# Project SWG: Jabba TP Dragonet: Static Spawns +# (C)2014 ProjectSWG + + + +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + + stcSvc = core.staticService + objSvc = core.objectService + + #TODO Check all NPCs for personalized scripting, change format. + + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4643), float(35.2), float(-4727), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4648.5), float(36.1), float(-4743.6), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4661.9), float(35.6), float(-4751.6), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4676), float(32.8), float(-4752.3), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4693.6), float(27.8), float(-4735.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4702.1), float(30.2), float(-4722.8), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4679.9), float(33.3), float(-4711), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4660.6), float(32.5), float(-4701.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4635.9), float(35.7), float(-4701.6), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4612.9), float(42.9), float(-4712.7), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4580.9), float(51.3), float(-4737.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4580.3), float(51.6), float(-4753), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4604.5), float(50.7), float(-4765.2), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4617.6), float(49.3), float(-4783.8), float(0), float(0), float(0), float(0), 45) + + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4661.4), float(32), float(-4723.8), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4676.4), float(29.8), float(-4736.3), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4693.2), float(32.5), float(-4759.3), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4696.7), float(36.8), float(-4769.5), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4683.1), float(39.9), float(-4769.9), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4668.8), float(41.4), float(-4773.5), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4653.3), float(43.8), float(-4771.1), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4634.8), float(46.5), float(-4764.9), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4615.7), float(46.4), float(-4749.6), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4621.1), float(41.3), float(-4736.6), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4597.7), float(41.6), float(-4706), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4613.2), float(33.2), float(-4689.8), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4636.7), float(28.7), float(-4680.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4677.5), float(28.4), float(-4691.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('dragonet_runt', 'tatooine', long(0), float(-4698.9), float(27.7), float(-4698.8), float(0), float(0), float(0), float(0), 45) + + return + From b1befe62959edad133d3623e9651517feffae4f3 Mon Sep 17 00:00:00 2001 From: tacef Date: Fri, 20 Jun 2014 20:15:09 +0200 Subject: [PATCH 04/30] More Work on Jabba TP Locations and NPC's Populated Zucca boar area Fixed more level issues in npcs --- scripts/mobiles/tatooine/tusken_bantha.py | 2 - .../mobiles/tatooine/tusken_raider_soldier.py | 2 - scripts/mobiles/tatooine/tusken_zealot.py | 2 - scripts/mobiles/tatooine/twisted_rill.py | 2 - scripts/mobiles/tatooine/twisted_womprat.py | 2 - .../mobiles/tatooine/variegated_womprat.py | 2 - scripts/mobiles/tatooine/vicious_rill.py | 2 - scripts/mobiles/tatooine/volatile_scyk.py | 2 - scripts/mobiles/tatooine/wasteland_cupa.py | 2 - .../mobiles/tatooine/wild_bladeback_boar.py | 2 - scripts/mobiles/tatooine/wild_dune_boar.py | 2 - scripts/mobiles/tatooine/wild_zucca_boar.py | 46 +++++++++++++++++++ scripts/mobiles/tatooine/womprat.py | 2 - scripts/mobiles/tatooine/wonderous_cupa.py | 2 - scripts/mobiles/tatooine/worrt.py | 2 - scripts/mobiles/tatooine/worrt_gutbuster.py | 2 - scripts/mobiles/tatooine/zucca_boar.py | 2 - .../tatooine/jabba_tp_zucca_boars.py | 28 +++++++++++ 18 files changed, 74 insertions(+), 32 deletions(-) create mode 100644 scripts/mobiles/tatooine/wild_zucca_boar.py create mode 100644 scripts/static_spawns/tatooine/jabba_tp_zucca_boars.py diff --git a/scripts/mobiles/tatooine/tusken_bantha.py b/scripts/mobiles/tatooine/tusken_bantha.py index a5e3ca82..5ff1295a 100644 --- a/scripts/mobiles/tatooine/tusken_bantha.py +++ b/scripts/mobiles/tatooine/tusken_bantha.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('feeder_tusken_bantha') mobileTemplate.setLevel(30) - mobileTemplate.setMinLevel(29) - mobileTemplate.setMaxLevel(31) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/tusken_raider_soldier.py b/scripts/mobiles/tatooine/tusken_raider_soldier.py index bc60a686..c46931ee 100644 --- a/scripts/mobiles/tatooine/tusken_raider_soldier.py +++ b/scripts/mobiles/tatooine/tusken_raider_soldier.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('tusken_raider_soldier') mobileTemplate.setLevel(5) - mobileTemplate.setMinLevel(5) - mobileTemplate.setMaxLevel(6) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/tusken_zealot.py b/scripts/mobiles/tatooine/tusken_zealot.py index f6b2d3fd..1127c2e4 100644 --- a/scripts/mobiles/tatooine/tusken_zealot.py +++ b/scripts/mobiles/tatooine/tusken_zealot.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('tusken_raider_zealot') mobileTemplate.setLevel(5) - mobileTemplate.setMinLevel(5) - mobileTemplate.setMaxLevel(6) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/twisted_rill.py b/scripts/mobiles/tatooine/twisted_rill.py index 84273b57..11815373 100644 --- a/scripts/mobiles/tatooine/twisted_rill.py +++ b/scripts/mobiles/tatooine/twisted_rill.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('twisted_rill') mobileTemplate.setLevel(11) - mobileTemplate.setMinLevel(10) - mobileTemplate.setMaxLevel(13) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/twisted_womprat.py b/scripts/mobiles/tatooine/twisted_womprat.py index 9d795994..e669a4b1 100644 --- a/scripts/mobiles/tatooine/twisted_womprat.py +++ b/scripts/mobiles/tatooine/twisted_womprat.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('twisted_womprat') mobileTemplate.setLevel(11) - mobileTemplate.setMinLevel(10) - mobileTemplate.setMaxLevel(12) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/variegated_womprat.py b/scripts/mobiles/tatooine/variegated_womprat.py index b1b002b0..3a3e5fbe 100644 --- a/scripts/mobiles/tatooine/variegated_womprat.py +++ b/scripts/mobiles/tatooine/variegated_womprat.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('variegated_womprat') mobileTemplate.setLevel(12) - mobileTemplate.setMinLevel(11) - mobileTemplate.setMaxLevel(14) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/vicious_rill.py b/scripts/mobiles/tatooine/vicious_rill.py index c87c30e2..526634e8 100644 --- a/scripts/mobiles/tatooine/vicious_rill.py +++ b/scripts/mobiles/tatooine/vicious_rill.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('vicious_rill') mobileTemplate.setLevel(3) - mobileTemplate.setMinLevel(2) - mobileTemplate.setMaxLevel(4) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/volatile_scyk.py b/scripts/mobiles/tatooine/volatile_scyk.py index cb905448..82e0c614 100644 --- a/scripts/mobiles/tatooine/volatile_scyk.py +++ b/scripts/mobiles/tatooine/volatile_scyk.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('scyk_volatile') mobileTemplate.setLevel(12) - mobileTemplate.setMinLevel(11) - mobileTemplate.setMaxLevel(13) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/wasteland_cupa.py b/scripts/mobiles/tatooine/wasteland_cupa.py index 75ee7f84..09c58791 100644 --- a/scripts/mobiles/tatooine/wasteland_cupa.py +++ b/scripts/mobiles/tatooine/wasteland_cupa.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('wasteland_cu_pa') mobileTemplate.setLevel(20) - mobileTemplate.setMinLevel(19) - mobileTemplate.setMaxLevel(21) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/wild_bladeback_boar.py b/scripts/mobiles/tatooine/wild_bladeback_boar.py index 5b278ab8..71440f3e 100644 --- a/scripts/mobiles/tatooine/wild_bladeback_boar.py +++ b/scripts/mobiles/tatooine/wild_bladeback_boar.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('quest_hero_of_tatooine_ferocious_beast') mobileTemplate.setLevel(40) - mobileTemplate.setMinLevel(39) - mobileTemplate.setMaxLevel(41) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/wild_dune_boar.py b/scripts/mobiles/tatooine/wild_dune_boar.py index 718dec0a..cb516041 100644 --- a/scripts/mobiles/tatooine/wild_dune_boar.py +++ b/scripts/mobiles/tatooine/wild_dune_boar.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('wild_dune_boar') mobileTemplate.setLevel(50) - mobileTemplate.setMinLevel(49) - mobileTemplate.setMaxLevel(51) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/wild_zucca_boar.py b/scripts/mobiles/tatooine/wild_zucca_boar.py new file mode 100644 index 00000000..d48d7a1e --- /dev/null +++ b/scripts/mobiles/tatooine/wild_zucca_boar.py @@ -0,0 +1,46 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('zucca_boar_porcellus') + mobileTemplate.setLevel(19) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setMeatType("Herbivore Meat") + mobileTemplate.setMeatAmount(65) + mobileTemplate.setHideType("Leathery Hide") + mobileTemplate.setBoneAmount(40) + mobileTemplate.setBoneType("Animal Bone") + mobileTemplate.setHideAmount(25) + mobileTemplate.setSocialGroup("zucca boar") + mobileTemplate.setAssistRange(12) + mobileTemplate.setStalker(False) + mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE | Options.ATTACKABLE) + + templates = Vector() + templates.add('object/mobile/shared_zucca_boar.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 6, 'kinetic') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('creatureMeleeAttack') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('wild_zucca_boar', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/womprat.py b/scripts/mobiles/tatooine/womprat.py index 5517dd86..aa52b641 100644 --- a/scripts/mobiles/tatooine/womprat.py +++ b/scripts/mobiles/tatooine/womprat.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('womprat') mobileTemplate.setLevel(4) - mobileTemplate.setMinLevel(3) - mobileTemplate.setMaxLevel(6) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/wonderous_cupa.py b/scripts/mobiles/tatooine/wonderous_cupa.py index 9606da33..ee747842 100644 --- a/scripts/mobiles/tatooine/wonderous_cupa.py +++ b/scripts/mobiles/tatooine/wonderous_cupa.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('cu_pa_wonderous') mobileTemplate.setLevel(12) - mobileTemplate.setMinLevel(11) - mobileTemplate.setMaxLevel(13) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/worrt.py b/scripts/mobiles/tatooine/worrt.py index f4b4e06b..d8c52b70 100644 --- a/scripts/mobiles/tatooine/worrt.py +++ b/scripts/mobiles/tatooine/worrt.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('worrt') mobileTemplate.setLevel(5) - mobileTemplate.setMinLevel(4) - mobileTemplate.setMaxLevel(6) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/worrt_gutbuster.py b/scripts/mobiles/tatooine/worrt_gutbuster.py index b3e58711..b9d02a3c 100644 --- a/scripts/mobiles/tatooine/worrt_gutbuster.py +++ b/scripts/mobiles/tatooine/worrt_gutbuster.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('worrt_gutbuster') mobileTemplate.setLevel(13) - mobileTemplate.setMinLevel(12) - mobileTemplate.setMaxLevel(14) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/zucca_boar.py b/scripts/mobiles/tatooine/zucca_boar.py index 9cf3cbaa..ff4c3f95 100644 --- a/scripts/mobiles/tatooine/zucca_boar.py +++ b/scripts/mobiles/tatooine/zucca_boar.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('zucca_boar') mobileTemplate.setLevel(8) - mobileTemplate.setMinLevel(7) - mobileTemplate.setMaxLevel(9) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/static_spawns/tatooine/jabba_tp_zucca_boars.py b/scripts/static_spawns/tatooine/jabba_tp_zucca_boars.py new file mode 100644 index 00000000..84b59d49 --- /dev/null +++ b/scripts/static_spawns/tatooine/jabba_tp_zucca_boars.py @@ -0,0 +1,28 @@ +import sys +# Project SWG: Jabba TP Alkharan Camp: Static Spawns +# (C)2014 ProjectSWG + + + +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + + stcSvc = core.staticService + objSvc = core.objectService + + # TODO Check all NPCs for personalized scripting, change format. + + stcSvc.spawnObject('wild_zucca_boar', 'tatooine', long(0), float(-4502), float(45.3), float(-4023), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('wild_zucca_boar', 'tatooine', long(0), float(-4489), float(45.6), float(-4020.7), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('wild_zucca_boar', 'tatooine', long(0), float(-4476.6), float(44.6), float(-4038.8), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('wild_zucca_boar', 'tatooine', long(0), float(-4479.8), float(43.1), float(-4048.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('wild_zucca_boar', 'tatooine', long(0), float(-4443.6), float(43.6), float(-4024.5), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('wild_zucca_boar', 'tatooine', long(0), float(-4445.1), float(42.1), float(-4044.9), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('wild_zucca_boar', 'tatooine', long(0), float(-4465.9), float(41.6), float(-4064.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('wild_zucca_boar', 'tatooine', long(0), float(-4480.5), float(41.3), float(-4069.5), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('wild_zucca_boar', 'tatooine', long(0), float(-4501.2), float(43.6), float(-4040.9), float(0), float(0), float(0), float(0), 45) + return + From c2df2d2566e9cd3f567fdecd10ea5a7d90b010f9 Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Fri, 20 Jun 2014 14:54:39 -0400 Subject: [PATCH 05/30] Commando Clicky Now Has a Buff Effect --- .../loot/generic_usable/item_commando_clicky_01_02.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/object/tangible/loot/generic_usable/item_commando_clicky_01_02.py b/scripts/object/tangible/loot/generic_usable/item_commando_clicky_01_02.py index 5041ee3b..165755c5 100644 --- a/scripts/object/tangible/loot/generic_usable/item_commando_clicky_01_02.py +++ b/scripts/object/tangible/loot/generic_usable/item_commando_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_commando_clicky_01_02') object.setDetailFilename('static_item_d') object.setDetailName('item_commando_clicky_01_02') object.setStringAttribute('class_required', 'Commando') return + +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'roadmapCommandoClicky', actor) + return From 666aeb617dff4b1e52503332b381710383686133 Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Fri, 20 Jun 2014 14:57:04 -0400 Subject: [PATCH 06/30] Jedi Clicky Now Has a Buff Effect --- .../loot/generic_usable/item_force_sensitive_clicky_01_02.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/object/tangible/loot/generic_usable/item_force_sensitive_clicky_01_02.py b/scripts/object/tangible/loot/generic_usable/item_force_sensitive_clicky_01_02.py index e6745838..261d9930 100644 --- a/scripts/object/tangible/loot/generic_usable/item_force_sensitive_clicky_01_02.py +++ b/scripts/object/tangible/loot/generic_usable/item_force_sensitive_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_force_sensitive_clicky_01_02') object.setDetailFilename('static_item_d') object.setDetailName('item_force_sensitive_clicky_01_02') object.setStringAttribute('class_required', 'Jedi') return + +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'roadmapFsClicky', actor) + return From ad4b2b9406fb7333e3fcd686b4cd578b5a08ba3e Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Fri, 20 Jun 2014 15:00:12 -0400 Subject: [PATCH 07/30] Officer Clicky Now Has a Buff Effect --- .../loot/generic_usable/item_officer_clicky_01_02.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/object/tangible/loot/generic_usable/item_officer_clicky_01_02.py b/scripts/object/tangible/loot/generic_usable/item_officer_clicky_01_02.py index b5797a7d..712c17ba 100644 --- a/scripts/object/tangible/loot/generic_usable/item_officer_clicky_01_02.py +++ b/scripts/object/tangible/loot/generic_usable/item_officer_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_officer_clicky_01_02') object.setDetailFilename('static_item_d') object.setDetailName('item_officer_clicky_01_02') object.setStringAttribute('class_required', 'Officer') return + +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'roadmapOfficerClicky', actor) + return From fc28df0d5d855ef4afc212e44b58d80599044408 Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Fri, 20 Jun 2014 15:03:39 -0400 Subject: [PATCH 08/30] Smuggler Clicky Now Has a Buff Effect --- .../loot/generic_usable/item_smuggler_clicky_01_02.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/object/tangible/loot/generic_usable/item_smuggler_clicky_01_02.py b/scripts/object/tangible/loot/generic_usable/item_smuggler_clicky_01_02.py index 65b88834..2c0614bc 100644 --- a/scripts/object/tangible/loot/generic_usable/item_smuggler_clicky_01_02.py +++ b/scripts/object/tangible/loot/generic_usable/item_smuggler_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_smuggler_clicky_01_02') object.setDetailFilename('static_item_d') object.setDetailName('item_smuggler_clicky_01_02') object.setStringAttribute('class_required', 'Smuggler') return + +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'roadmapSmugglerClicky', actor) + return From 701023ea66d6db90fa35350ccafedcb97d9b2155 Mon Sep 17 00:00:00 2001 From: Mesagoppinmypants Date: Fri, 20 Jun 2014 15:05:01 -0400 Subject: [PATCH 09/30] Spy Clicky Now Has Buff Effect --- .../tangible/loot/generic_usable/item_spy_clicky_01_02.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/object/tangible/loot/generic_usable/item_spy_clicky_01_02.py b/scripts/object/tangible/loot/generic_usable/item_spy_clicky_01_02.py index dd1385a7..d55d710d 100644 --- a/scripts/object/tangible/loot/generic_usable/item_spy_clicky_01_02.py +++ b/scripts/object/tangible/loot/generic_usable/item_spy_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_spy_clicky_01_02') object.setDetailFilename('static_item_d') object.setDetailName('item_spy_clicky_01_02') object.setStringAttribute('class_required', 'Spy') return + +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'roadmapSpyClicky', actor) + return From c81c1322d3df8b5682b65d5b2c00ce6b9f1190ad Mon Sep 17 00:00:00 2001 From: tacef Date: Fri, 20 Jun 2014 21:20:05 +0200 Subject: [PATCH 10/30] More work on Jabba TP Locations and NPC's Populated second valarian shuttle port More level fixes to npc's --- scripts/mobiles/tatooine/plaque_rat.py | 2 - scripts/mobiles/tatooine/razorback_felspur.py | 2 - scripts/mobiles/tatooine/rill.py | 2 - scripts/mobiles/tatooine/rockmite.py | 2 - scripts/mobiles/tatooine/ronto.py | 2 - scripts/mobiles/tatooine/runted_rill.py | 2 - scripts/mobiles/tatooine/sand_beetle.py | 2 - scripts/mobiles/tatooine/sandreaver.py | 2 - scripts/mobiles/tatooine/savage_zucca_boar.py | 2 - scripts/mobiles/tatooine/scyk.py | 2 - scripts/mobiles/tatooine/sevorrt.py | 2 - scripts/mobiles/tatooine/sewer_worrt.py | 2 - scripts/mobiles/tatooine/slum_rat.py | 2 - scripts/mobiles/tatooine/snarlfang.py | 2 - scripts/mobiles/tatooine/squill.py | 2 - .../mobiles/tatooine/stormtrooper_dewback.py | 2 - .../mobiles/tatooine/sunstained_dunelizard.py | 2 - .../tatooine/swarming_lesser_dewback.py | 2 - scripts/mobiles/tatooine/tame_rill.py | 2 - scripts/mobiles/tatooine/tame_womprat.py | 2 - scripts/mobiles/tatooine/tame_worrt.py | 2 - scripts/mobiles/tatooine/tatooine_mynock.py | 2 - scripts/mobiles/tatooine/tempest_rill.py | 2 - scripts/mobiles/tatooine/tormented_bocatt.py | 2 - scripts/mobiles/tatooine/twisted_dewback.py | 2 - .../tatooine/jabba_tp_valarian_camp_2.py | 56 +++++++++++++++++++ 26 files changed, 56 insertions(+), 50 deletions(-) create mode 100644 scripts/static_spawns/tatooine/jabba_tp_valarian_camp_2.py diff --git a/scripts/mobiles/tatooine/plaque_rat.py b/scripts/mobiles/tatooine/plaque_rat.py index 43fc8b2d..7bfa9450 100644 --- a/scripts/mobiles/tatooine/plaque_rat.py +++ b/scripts/mobiles/tatooine/plaque_rat.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('womprat_plague') mobileTemplate.setLevel(11) - mobileTemplate.setMinLevel(10) - mobileTemplate.setMaxLevel(12) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/razorback_felspur.py b/scripts/mobiles/tatooine/razorback_felspur.py index ded7877a..723e6f0c 100644 --- a/scripts/mobiles/tatooine/razorback_felspur.py +++ b/scripts/mobiles/tatooine/razorback_felspur.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('desert_razorback_felspur') mobileTemplate.setLevel(24) - mobileTemplate.setMinLevel(23) - mobileTemplate.setMaxLevel(25) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/rill.py b/scripts/mobiles/tatooine/rill.py index ad2ab02e..ff66a715 100644 --- a/scripts/mobiles/tatooine/rill.py +++ b/scripts/mobiles/tatooine/rill.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('rill') mobileTemplate.setLevel(5) - mobileTemplate.setMinLevel(4) - mobileTemplate.setMaxLevel(6) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/rockmite.py b/scripts/mobiles/tatooine/rockmite.py index 868dacce..e2f93ab0 100644 --- a/scripts/mobiles/tatooine/rockmite.py +++ b/scripts/mobiles/tatooine/rockmite.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('rockmite') mobileTemplate.setLevel(8) - mobileTemplate.setMinLevel(7) - mobileTemplate.setMaxLevel(9) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/ronto.py b/scripts/mobiles/tatooine/ronto.py index 7b7aa601..940b1ef7 100644 --- a/scripts/mobiles/tatooine/ronto.py +++ b/scripts/mobiles/tatooine/ronto.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('ronto') mobileTemplate.setLevel(7) - mobileTemplate.setMinLevel(16) - mobileTemplate.setMaxLevel(18) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/runted_rill.py b/scripts/mobiles/tatooine/runted_rill.py index 52b55d3e..d54d4d21 100644 --- a/scripts/mobiles/tatooine/runted_rill.py +++ b/scripts/mobiles/tatooine/runted_rill.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('runted_rill') mobileTemplate.setLevel(1) - mobileTemplate.setMinLevel(1) - mobileTemplate.setMaxLevel(3) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/sand_beetle.py b/scripts/mobiles/tatooine/sand_beetle.py index 0a8d99c3..eb3ac748 100644 --- a/scripts/mobiles/tatooine/sand_beetle.py +++ b/scripts/mobiles/tatooine/sand_beetle.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('sand_beetle') mobileTemplate.setLevel(22) - mobileTemplate.setMinLevel(22) - mobileTemplate.setMaxLevel(24) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/sandreaver.py b/scripts/mobiles/tatooine/sandreaver.py index 7da69271..4405ce81 100644 --- a/scripts/mobiles/tatooine/sandreaver.py +++ b/scripts/mobiles/tatooine/sandreaver.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('dewback_sandreaver') mobileTemplate.setLevel(18) - mobileTemplate.setMinLevel(17) - mobileTemplate.setMaxLevel(19) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/savage_zucca_boar.py b/scripts/mobiles/tatooine/savage_zucca_boar.py index d4868c4b..f7fe965f 100644 --- a/scripts/mobiles/tatooine/savage_zucca_boar.py +++ b/scripts/mobiles/tatooine/savage_zucca_boar.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('elite_zucca_boar') mobileTemplate.setLevel(8) - mobileTemplate.setMinLevel(8) - mobileTemplate.setMaxLevel(9) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/scyk.py b/scripts/mobiles/tatooine/scyk.py index b9534279..65313883 100644 --- a/scripts/mobiles/tatooine/scyk.py +++ b/scripts/mobiles/tatooine/scyk.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('scyk') mobileTemplate.setLevel(11) - mobileTemplate.setMinLevel(11) - mobileTemplate.setMaxLevel(13) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/sevorrt.py b/scripts/mobiles/tatooine/sevorrt.py index 8728ed4f..9f87e760 100644 --- a/scripts/mobiles/tatooine/sevorrt.py +++ b/scripts/mobiles/tatooine/sevorrt.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('sevorrt') mobileTemplate.setLevel(5) - mobileTemplate.setMinLevel(4) - mobileTemplate.setMaxLevel(6) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/sewer_worrt.py b/scripts/mobiles/tatooine/sewer_worrt.py index cbc62441..72e7a950 100644 --- a/scripts/mobiles/tatooine/sewer_worrt.py +++ b/scripts/mobiles/tatooine/sewer_worrt.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('sewer_worrt') mobileTemplate.setLevel(5) - mobileTemplate.setMinLevel(4) - mobileTemplate.setMaxLevel(6) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/slum_rat.py b/scripts/mobiles/tatooine/slum_rat.py index b12310c6..ac8a0308 100644 --- a/scripts/mobiles/tatooine/slum_rat.py +++ b/scripts/mobiles/tatooine/slum_rat.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('womprat_city') mobileTemplate.setLevel(5) - mobileTemplate.setMinLevel(4) - mobileTemplate.setMaxLevel(6) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/snarlfang.py b/scripts/mobiles/tatooine/snarlfang.py index 593b9f5a..0725b177 100644 --- a/scripts/mobiles/tatooine/snarlfang.py +++ b/scripts/mobiles/tatooine/snarlfang.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('elite_bocatt') mobileTemplate.setLevel(17) - mobileTemplate.setMinLevel(17) - mobileTemplate.setMaxLevel(18) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/squill.py b/scripts/mobiles/tatooine/squill.py index 5be20476..25bcb635 100644 --- a/scripts/mobiles/tatooine/squill.py +++ b/scripts/mobiles/tatooine/squill.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('squill') mobileTemplate.setLevel(12) - mobileTemplate.setMinLevel(11) - mobileTemplate.setMaxLevel(13) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/stormtrooper_dewback.py b/scripts/mobiles/tatooine/stormtrooper_dewback.py index 4bf68450..71f4cd78 100644 --- a/scripts/mobiles/tatooine/stormtrooper_dewback.py +++ b/scripts/mobiles/tatooine/stormtrooper_dewback.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('stormtrooper_dewback') mobileTemplate.setLevel(14) - mobileTemplate.setMinLevel(13) - mobileTemplate.setMaxLevel(15) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/sunstained_dunelizard.py b/scripts/mobiles/tatooine/sunstained_dunelizard.py index ddb0d957..a24fa1d1 100644 --- a/scripts/mobiles/tatooine/sunstained_dunelizard.py +++ b/scripts/mobiles/tatooine/sunstained_dunelizard.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('dune_lizard_sunstained') mobileTemplate.setLevel(19) - mobileTemplate.setMinLevel(18) - mobileTemplate.setMaxLevel(20) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/swarming_lesser_dewback.py b/scripts/mobiles/tatooine/swarming_lesser_dewback.py index 0859f8ff..2fe5c191 100644 --- a/scripts/mobiles/tatooine/swarming_lesser_dewback.py +++ b/scripts/mobiles/tatooine/swarming_lesser_dewback.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('swarming_lesser_dewback') mobileTemplate.setLevel(13) - mobileTemplate.setMinLevel(12) - mobileTemplate.setMaxLevel(14) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/tame_rill.py b/scripts/mobiles/tatooine/tame_rill.py index f13f917f..9e22d89b 100644 --- a/scripts/mobiles/tatooine/tame_rill.py +++ b/scripts/mobiles/tatooine/tame_rill.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('tame_rill') mobileTemplate.setLevel(1) - mobileTemplate.setMinLevel(1) - mobileTemplate.setMaxLevel(3) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/tame_womprat.py b/scripts/mobiles/tatooine/tame_womprat.py index ed245a1d..e0196e02 100644 --- a/scripts/mobiles/tatooine/tame_womprat.py +++ b/scripts/mobiles/tatooine/tame_womprat.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('tame_womprat') mobileTemplate.setLevel(2) - mobileTemplate.setMinLevel(1) - mobileTemplate.setMaxLevel(4) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/tame_worrt.py b/scripts/mobiles/tatooine/tame_worrt.py index 51e4192b..df46f335 100644 --- a/scripts/mobiles/tatooine/tame_worrt.py +++ b/scripts/mobiles/tatooine/tame_worrt.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('tame_worrt') mobileTemplate.setLevel(5) - mobileTemplate.setMinLevel(4) - mobileTemplate.setMaxLevel(6) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/tatooine_mynock.py b/scripts/mobiles/tatooine/tatooine_mynock.py index 744cb4f1..b540e344 100644 --- a/scripts/mobiles/tatooine/tatooine_mynock.py +++ b/scripts/mobiles/tatooine/tatooine_mynock.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('tatooine_mynock') mobileTemplate.setLevel(2) - mobileTemplate.setMinLevel(1) - mobileTemplate.setMaxLevel(3) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/tempest_rill.py b/scripts/mobiles/tatooine/tempest_rill.py index cc82a42c..d3f01e31 100644 --- a/scripts/mobiles/tatooine/tempest_rill.py +++ b/scripts/mobiles/tatooine/tempest_rill.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('rill_tempest') mobileTemplate.setLevel(8) - mobileTemplate.setMinLevel(8) - mobileTemplate.setMaxLevel(10) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/tormented_bocatt.py b/scripts/mobiles/tatooine/tormented_bocatt.py index 6e7effd5..2c1230e2 100644 --- a/scripts/mobiles/tatooine/tormented_bocatt.py +++ b/scripts/mobiles/tatooine/tormented_bocatt.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('bocatt_tormented') mobileTemplate.setLevel(18) - mobileTemplate.setMinLevel(17) - mobileTemplate.setMaxLevel(19) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/twisted_dewback.py b/scripts/mobiles/tatooine/twisted_dewback.py index 24fd8022..0c7862c1 100644 --- a/scripts/mobiles/tatooine/twisted_dewback.py +++ b/scripts/mobiles/tatooine/twisted_dewback.py @@ -12,8 +12,6 @@ def addTemplate(core): mobileTemplate.setCreatureName('twisted_dewback') mobileTemplate.setLevel(11) - mobileTemplate.setMinLevel(10) - mobileTemplate.setMaxLevel(12) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/static_spawns/tatooine/jabba_tp_valarian_camp_2.py b/scripts/static_spawns/tatooine/jabba_tp_valarian_camp_2.py new file mode 100644 index 00000000..3a1284b2 --- /dev/null +++ b/scripts/static_spawns/tatooine/jabba_tp_valarian_camp_2.py @@ -0,0 +1,56 @@ +import sys +# Project SWG: Jabba TP Valarian Camp: Static Spawns +# (C)2014 ProjectSWG + + + +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + + stcSvc = core.staticService + objSvc = core.objectService + + # TODO Check all NPCs for personalized scripting, change format. + + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3906.3), float(30.8), float(-4364), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_swooper', 'tatooine', long(0), float(-3913.1), float(30.8), float(-4360.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_scout', 'tatooine', long(0), float(-3918.5), float(31), float(-4355.1), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3927.8), float(27.7), float(-4346), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_enforcer', 'tatooine', long(0), float(-3932.2), float(22.6), float(-4331.5), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3924.2), float(21), float(-4324.7), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_assassin', 'tatooine', long(0), float(-3911.9), float(21.8), float(-4322.8), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_henchman', 'tatooine', long(0), float(-3897.1), float(23.9), float(-4322.3), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3881.1), float(25.9), float(-4322.9), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3871.6), float(23.2), float(-4302.9), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_swooper', 'tatooine', long(0), float(-3860.4), float(19.4), float(-4294.7), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3873.2), float(20.4), float(-4288.1), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_scout', 'tatooine', long(0), float(-3882.1), float(22.6), float(-4287.9), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3888.6), float(22.9), float(-4279.9), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_enforcer', 'tatooine', long(0), float(-3889.3), float(20), float(-4259.7), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_worker', 'tatooine', long(0), float(-3888.7), float(19.4), float(-4221.7), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_assassin', 'tatooine', long(0), float(-3903.4), float(18.8), float(-4227.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_scout', 'tatooine', long(0), float(-3915.2), float(16.6), float(-4245), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3913.9), float(16.8), float(-4255.9), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3907), float(19.2), float(-4266.1), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_scout', 'tatooine', long(0), float(-3898.3), float(21.4), float(-4278.8), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3893.9), float(22.5), float(-4287.8), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_enforcer', 'tatooine', long(0), float(-3878.3), float(19.8), float(-4250.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3876.4), float(19.6), float(-4237), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_assassin', 'tatooine', long(0), float(-3898), float(30.1), float(-4347.8), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3902.9), float(27.3), float(-4338.2), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_swooper', 'tatooine', long(0), float(-3919.5), float(19.8), float(-4307.9), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_henchman', 'tatooine', long(0), float(-3917.6), float(20.1), float(-4293.2), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_worker', 'tatooine', long(0), float(-3913.1), float(20.2), float(-4280.7), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3928.4), float(17.7), float(-4265), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_scout', 'tatooine', long(0), float(-3927.5), float(16.4), float(-4240.5), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3947.4), float(18.5), float(-4256.9), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_henchman', 'tatooine', long(0), float(-3949), float(20.7), float(-4270.5), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_depot_worker', 'tatooine', long(0), float(-3947.1), float(22.3), float(-4291.6), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_assassin', 'tatooine', long(0), float(-3951.7), float(22.4), float(-4311.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_soldier', 'tatooine', long(0), float(-3890.2), float(29.2), float(-4342.9), float(0), float(0), float(0), float(0), 45) + + return + From 9df5bebf982ecfb840761409e196094dcb398516 Mon Sep 17 00:00:00 2001 From: tacef Date: Fri, 20 Jun 2014 22:23:29 +0200 Subject: [PATCH 11/30] More work on Jabba TP Locations and NPC's Fixed Description in Valarian camp 2 Populated Pod racer bunker Fixed levels for valarian npc scripts Added Doane Watki NPC script --- scripts/mobiles/tatooine/doane_watki.py | 40 +++++++++++++ .../mobiles/tatooine/valarian_crew_chief.py | 4 +- scripts/mobiles/tatooine/valarian_mechanic.py | 2 +- .../mobiles/tatooine/valarian_pod_racer.py | 2 +- .../tatooine/jabba_tp_pod_racer_bunker.py | 58 +++++++++++++++++++ .../tatooine/jabba_tp_valarian_camp_2.py | 2 +- 6 files changed, 103 insertions(+), 5 deletions(-) create mode 100644 scripts/mobiles/tatooine/doane_watki.py create mode 100644 scripts/static_spawns/tatooine/jabba_tp_pod_racer_bunker.py diff --git a/scripts/mobiles/tatooine/doane_watki.py b/scripts/mobiles/tatooine/doane_watki.py new file mode 100644 index 00000000..3d6f69f7 --- /dev/null +++ b/scripts/mobiles/tatooine/doane_watki.py @@ -0,0 +1,40 @@ +import sys +from services.spawn import MobileTemplate +from services.spawn import WeaponTemplate +from resources.datatables import WeaponType +from resources.datatables import Difficulty +from resources.datatables import Options +from java.util import Vector + + +def addTemplate(core): + mobileTemplate = MobileTemplate() + + mobileTemplate.setCreatureName('tatooine_valarian_doane_watki') + mobileTemplate.setLevel(20) + mobileTemplate.setDifficulty(Difficulty.NORMAL) + + mobileTemplate.setMinSpawnDistance(4) + mobileTemplate.setMaxSpawnDistance(8) + mobileTemplate.setDeathblow(False) + mobileTemplate.setScale(1) + mobileTemplate.setSocialGroup("valarian") + mobileTemplate.setAssistRange(4) + mobileTemplate.setStalker(False) + + + templates = Vector() + templates.add('object/mobile/shared_dressed_tatooine_valarian_swooper.iff') + mobileTemplate.setTemplates(templates) + + weaponTemplates = Vector() + weapontemplate = WeaponTemplate('object/weapon/ranged/pistol/shared_pistol_cdef.iff', WeaponType.PISTOL, 1.0, 15, 'energy') + weaponTemplates.add(weapontemplate) + mobileTemplate.setWeaponTemplateVector(weaponTemplates) + + attacks = Vector() + mobileTemplate.setDefaultAttack('rangedShotpistol') + mobileTemplate.setAttacks(attacks) + + core.spawnService.addMobileTemplate('doane_watki', mobileTemplate) + return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/valarian_crew_chief.py b/scripts/mobiles/tatooine/valarian_crew_chief.py index 72bfb349..4ab331a6 100644 --- a/scripts/mobiles/tatooine/valarian_crew_chief.py +++ b/scripts/mobiles/tatooine/valarian_crew_chief.py @@ -11,7 +11,7 @@ def addTemplate(core): mobileTemplate = MobileTemplate() mobileTemplate.setCreatureName('valarian_crew_chief') - mobileTemplate.setLevel(13) + mobileTemplate.setLevel(20) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) @@ -36,5 +36,5 @@ def addTemplate(core): mobileTemplate.setDefaultAttack('rangedShotpistol') mobileTemplate.setAttacks(attacks) - core.spawnService.addMobileTemplate('valarian_chief', mobileTemplate) + core.spawnService.addMobileTemplate('valarian_crew_chief', mobileTemplate) return \ No newline at end of file diff --git a/scripts/mobiles/tatooine/valarian_mechanic.py b/scripts/mobiles/tatooine/valarian_mechanic.py index 05923e7e..cffa628a 100644 --- a/scripts/mobiles/tatooine/valarian_mechanic.py +++ b/scripts/mobiles/tatooine/valarian_mechanic.py @@ -11,7 +11,7 @@ def addTemplate(core): mobileTemplate = MobileTemplate() mobileTemplate.setCreatureName('valarian_mechanic') - mobileTemplate.setLevel(13) + mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/mobiles/tatooine/valarian_pod_racer.py b/scripts/mobiles/tatooine/valarian_pod_racer.py index 9cf03478..e2cfe1b8 100644 --- a/scripts/mobiles/tatooine/valarian_pod_racer.py +++ b/scripts/mobiles/tatooine/valarian_pod_racer.py @@ -11,7 +11,7 @@ def addTemplate(core): mobileTemplate = MobileTemplate() mobileTemplate.setCreatureName('valarian_pod_racer') - mobileTemplate.setLevel(13) + mobileTemplate.setLevel(18) mobileTemplate.setDifficulty(Difficulty.NORMAL) mobileTemplate.setMinSpawnDistance(4) diff --git a/scripts/static_spawns/tatooine/jabba_tp_pod_racer_bunker.py b/scripts/static_spawns/tatooine/jabba_tp_pod_racer_bunker.py new file mode 100644 index 00000000..9fba0576 --- /dev/null +++ b/scripts/static_spawns/tatooine/jabba_tp_pod_racer_bunker.py @@ -0,0 +1,58 @@ +import sys +# Project SWG: Jabba TP Pod Racer Bunker: Static Spawns +# (C)2014 ProjectSWG + + + +from resources.datatables import Options +from resources.datatables import State + +def addPlanetSpawns(core, planet): + + + stcSvc = core.staticService + objSvc = core.objectService + + # TODO Check all NPCs for personalized scripting, change format. + + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-714.5), float(11), float(-6281), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-708.6), float(11.9), float(-6268.9), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-691.2), float(12.2), float(-6269.3), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-673.8), float(12.9), float(-6271.2), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-673.5), float(11.9), float(-6297.2), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-653.3), float(14), float(-6307.1), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-650.5), float(14.8), float(-6318.5), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-659.3), float(14.1), float(-6321.3), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-684.3), float(11.8), float(-6309.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-697.4), float(11.4), float(-6305.6), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-706.8), float(11.6), float(-6311.7), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-727.2), float(12.1), float(-6312.2), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-728.5), float(9), float(-6337.4), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-733.6), float(14.1), float(-6347.7), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-724.7), float(10.7), float(-6294.8), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-728.2), float(10.6), float(-6280), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-734.1), float(10.9), float(-6270.7), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_pod_racer', 'tatooine', long(0), float(-728.1), float(11), float(-6255.1), float(0), float(0), float(0), float(0), 45) + + bunker = core.objectService.getObject(long(-466404037726719318)) + + stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(2), float(-4.1), float(0.3), float(1.6), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(3), float(4.1), float(0.3), float(-3.5), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(4), float(3.2), float(-12), float(26.6), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_crew_chief', 'tatooine', bunker.getCellByCellNumber(4), float(14.1), float(-12), float(31.2), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_crew_chief', 'tatooine', bunker.getCellByCellNumber(5), float(29.4), float(-12), float(27.1), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_crew_chief', 'tatooine', bunker.getCellByCellNumber(5), float(29.5), float(-12), float(35.3), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(7), float(8.5), float(-14), float(59.3), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_crew_chief', 'tatooine', bunker.getCellByCellNumber(7), float(-3), float(-16), float(67.6), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_crew_chief', 'tatooine', bunker.getCellByCellNumber(7), float(0.6), float(-16), float(84), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(7), float(20.9), float(-16), float(78.6), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(7), float(28), float(-16), float(78.8), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_crew_chief', 'tatooine', bunker.getCellByCellNumber(9), float(-42.2), float(-14), float(74.7), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(9), float(-36.5), float(-14), float(84.8), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(8), float(54.8), float(-16), float(77.9), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('doane_watki', 'tatooine', bunker.getCellByCellNumber(8), float(80.6), float(-16), float(79.8), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(8), float(78.3), float(-16), float(62.3), float(0), float(0), float(0), float(0), 45) + stcSvc.spawnObject('valarian_mechanic', 'tatooine', bunker.getCellByCellNumber(8), float(61.2), float(-16), float(58), float(0), float(0), float(0), float(0), 45) + + return + diff --git a/scripts/static_spawns/tatooine/jabba_tp_valarian_camp_2.py b/scripts/static_spawns/tatooine/jabba_tp_valarian_camp_2.py index 3a1284b2..58f720fa 100644 --- a/scripts/static_spawns/tatooine/jabba_tp_valarian_camp_2.py +++ b/scripts/static_spawns/tatooine/jabba_tp_valarian_camp_2.py @@ -1,5 +1,5 @@ import sys -# Project SWG: Jabba TP Valarian Camp: Static Spawns +# Project SWG: Jabba TP Valarian Camp 2: Static Spawns # (C)2014 ProjectSWG From e31ec2c59e3067fb76e184a8c84d55645f15d1cf Mon Sep 17 00:00:00 2001 From: Seefo Date: Fri, 20 Jun 2014 18:55:36 -0400 Subject: [PATCH 12/30] Scripted Jedi Master Robes (Hood up/Hood down) --- .../tangible/wearables/robe/robe_s32.py | 1 + .../tangible/wearables/robe/robe_s32_h1.py | 1 + .../tangible/wearables/robe/robe_s33.py | 1 + .../tangible/wearables/robe/robe_s33_h1.py | 1 + scripts/radial/equipment/jedi_master_robes.py | 49 +++++++++++++++++++ 5 files changed, 53 insertions(+) create mode 100644 scripts/radial/equipment/jedi_master_robes.py diff --git a/scripts/object/tangible/wearables/robe/robe_s32.py b/scripts/object/tangible/wearables/robe/robe_s32.py index 68484d13..624832cd 100644 --- a/scripts/object/tangible/wearables/robe/robe_s32.py +++ b/scripts/object/tangible/wearables/robe/robe_s32.py @@ -20,6 +20,7 @@ def setup(core, object): object.setAttachment('type', 'jedi_cloak') object.setAttachment('setBonus', 'set_bonus_jedi_robe') + object.setAttachment('radial_filename', 'equipment/jedi_master_robes'); return diff --git a/scripts/object/tangible/wearables/robe/robe_s32_h1.py b/scripts/object/tangible/wearables/robe/robe_s32_h1.py index fdbb2840..55106573 100644 --- a/scripts/object/tangible/wearables/robe/robe_s32_h1.py +++ b/scripts/object/tangible/wearables/robe/robe_s32_h1.py @@ -20,6 +20,7 @@ def setup(core, object): object.setAttachment('type', 'jedi_cloak') object.setAttachment('setBonus', 'set_bonus_jedi_robe') + object.setAttachment('radial_filename', 'equipment/jedi_master_robes'); return diff --git a/scripts/object/tangible/wearables/robe/robe_s33.py b/scripts/object/tangible/wearables/robe/robe_s33.py index e5bded55..a4a9bfaa 100644 --- a/scripts/object/tangible/wearables/robe/robe_s33.py +++ b/scripts/object/tangible/wearables/robe/robe_s33.py @@ -22,6 +22,7 @@ def setup(core, object): object.setAttachment('type', 'jedi_cloak') object.setAttachment('setBonus', 'set_bonus_jedi_robe') + object.setAttachment('radial_filename', 'equipment/jedi_master_robes'); return diff --git a/scripts/object/tangible/wearables/robe/robe_s33_h1.py b/scripts/object/tangible/wearables/robe/robe_s33_h1.py index 3d700373..2fdcb9c5 100644 --- a/scripts/object/tangible/wearables/robe/robe_s33_h1.py +++ b/scripts/object/tangible/wearables/robe/robe_s33_h1.py @@ -22,6 +22,7 @@ def setup(core, object): object.setAttachment('type', 'jedi_cloak') object.setAttachment('setBonus', 'set_bonus_jedi_robe') + object.setAttachment('radial_filename', 'equipment/jedi_master_robes'); return diff --git a/scripts/radial/equipment/jedi_master_robes.py b/scripts/radial/equipment/jedi_master_robes.py new file mode 100644 index 00000000..40012d5f --- /dev/null +++ b/scripts/radial/equipment/jedi_master_robes.py @@ -0,0 +1,49 @@ +from resources.common import RadialOptions +import sys + +def createRadial(core, owner, target, radials): + + if target.getContainer() == owner: + return + + if target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s32.iff" or target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s33.iff": + radials.add(RadialOptions(0, 98, 1, 'Hood up')) + + elif target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s32_h1.iff" or target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s33_h1.iff": + radials.add(RadialOptions(0, 99, 1, 'Hood down')) + + return + +def handleSelection(core, owner, target, option): + inventory = owner.getSlottedObject('inventory') + + if inventory: + newTemplate = "" + + if option == 98 and target: + + if target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s32.iff": + newTemplate = "object/tangible/wearables/robe/shared_robe_s32_h1.iff" + + elif target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s33.iff": + newTemplate = "object/tangible/wearables/robe/shared_robe_s33_h1.iff" + + if newTemplate != "": + object = core.objectService.createObject(newTemplate, owner.getPlanet()) + core.objectService.destroyObject(target) + inventory.add(object) + + elif option == 99 and target: + + if target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s32_h1.iff": + newTemplate = "object/tangible/wearables/robe/shared_robe_s32.iff" + + elif target.getTemplate() == "object/tangible/wearables/robe/shared_robe_s33_h1.iff": + newTemplate = "object/tangible/wearables/robe/shared_robe_s33.iff" + + if newTemplate != "": + object = core.objectService.createObject(newTemplate, owner.getPlanet()) + core.objectService.destroyObject(target) + inventory.add(object) + return + \ No newline at end of file From 8dc34266e0c5c29bb3e1a45617e4ad048e7c76bd Mon Sep 17 00:00:00 2001 From: Seefo Date: Fri, 20 Jun 2014 19:52:18 -0400 Subject: [PATCH 13/30] Fixed moveable object's radial menu --- .../terminal/terminal_player_structure.py | 1 + scripts/radial/structure/moveable.py | 36 +++++++++++++------ src/services/sui/SUIService.java | 16 ++++----- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/scripts/object/tangible/terminal/terminal_player_structure.py b/scripts/object/tangible/terminal/terminal_player_structure.py index dd5b18cd..64d94efc 100644 --- a/scripts/object/tangible/terminal/terminal_player_structure.py +++ b/scripts/object/tangible/terminal/terminal_player_structure.py @@ -2,4 +2,5 @@ import sys def setup(core, object): object.setAttachment('radial_filename', 'structure/structure_management_terminal') + object.setAttachment('moveable', False) return \ No newline at end of file diff --git a/scripts/radial/structure/moveable.py b/scripts/radial/structure/moveable.py index 1419fae6..70bc951e 100644 --- a/scripts/radial/structure/moveable.py +++ b/scripts/radial/structure/moveable.py @@ -2,24 +2,38 @@ from resources.common import RadialOptions import sys def createRadial(core, owner, target, radials): - radials.add(RadialOptions(0, 7, 1, '')) - radials.add(RadialOptions(0, 11, 1, '')) - + radials.add(RadialOptions(0, 11, 0, '')) radials.add(RadialOptions(0, 55, 0, '')) - radials.add(RadialOptions(3, 56, 1, '')) - radials.add(RadialOptions(3, 57, 1, '')) - radials.add(RadialOptions(3, 58, 1, '')) - radials.add(RadialOptions(3, 59, 1, '')) - radials.add(RadialOptions(0, 52, 0, '')) - radials.add(RadialOptions(4, 53, 1, '')) - radials.add(RadialOptions(4, 54, 1, '')) - return + + radials.add(RadialOptions(3, 56, 0, '')) + radials.add(RadialOptions(3, 57, 0, '')) + radials.add(RadialOptions(3, 58, 0, '')) + radials.add(RadialOptions(3, 59, 0, '')) + + radials.add(RadialOptions(4, 53, 0, '')) + radials.add(RadialOptions(4, 54, 0, '')) + return def handleSelection(core, owner, target, option): if option == 56: core.commandService.callCommand(owner, 'movefurniture', target, 'forward 10') + if option == 57: + core.commandService.callCommand(owner, 'movefurniture', target, 'back 10') + + if option == 58: + core.commandService.callCommand(owner, 'movefurniture', target, 'up 10') + + if option == 59: + core.commandService.callCommand(owner, 'movefurniture', target, 'down 10') + + if option == 53: + core.commandService.callCommand(owner, 'rotatefurniture', target, 'yaw -90') + + if option == 54: + core.commandService.callCommand(owner, 'rotatefurniture', target, 'yaw 90') + return \ No newline at end of file diff --git a/src/services/sui/SUIService.java b/src/services/sui/SUIService.java index 1fcee751..323a71a8 100644 --- a/src/services/sui/SUIService.java +++ b/src/services/sui/SUIService.java @@ -139,14 +139,11 @@ public class SUIService implements INetworkDispatch { return; } - if(target.getGrandparent() != null && target.getGrandparent().getAttachment("structureAdmins") != null) + if(core.housingService.getPermissions(owner, target.getContainer()) && !getRadialFilename(target).equals("structure/structure_management_terminal")) { - if(core.housingService.getPermissions(owner, target.getContainer()) && !getRadialFilename(target).equals("structure/structure_management_terminal")) - { - core.scriptService.callScript("scripts/radial/", "structure/moveable", "createRadial", core, owner, target, request.getRadialOptions()); - sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount()); - return; - } + core.scriptService.callScript("scripts/radial/", "structure/moveable", "createRadial", core, owner, target, request.getRadialOptions()); + sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount()); + return; } core.scriptService.callScript("scripts/radial/", getRadialFilename(target), "createRadial", core, owner, target, request.getRadialOptions()); @@ -185,13 +182,12 @@ public class SUIService implements INetworkDispatch { return; } - if(target.getGrandparent() != null && target.getGrandparent().getAttachment("structureAdmins") != null) { - if(core.housingService.getPermissions(owner, target.getContainer()) && !getRadialFilename(target).equals("structure/structure_management_terminal")) { + if(core.housingService.getPermissions(owner, target.getContainer()) && (target.getAttachment("moveable") == null || (boolean) target.getAttachment("moveable") != false)) { core.scriptService.callScript("scripts/radial/", "structure/moveable", "handleSelection", core, owner, target, objMenuSelect.getSelection()); return; - } } + core.scriptService.callScript("scripts/radial/", getRadialFilename(target), "handleSelection", core, owner, target, objMenuSelect.getSelection()); } From 6ca2e2a25389a51e7feef69511429613678550d2 Mon Sep 17 00:00:00 2001 From: Seefo Date: Fri, 20 Jun 2014 20:21:11 -0400 Subject: [PATCH 14/30] Accidentally forgot a line for previous commit --- src/services/sui/SUIService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/services/sui/SUIService.java b/src/services/sui/SUIService.java index 323a71a8..e031040a 100644 --- a/src/services/sui/SUIService.java +++ b/src/services/sui/SUIService.java @@ -139,8 +139,7 @@ public class SUIService implements INetworkDispatch { return; } - if(core.housingService.getPermissions(owner, target.getContainer()) && !getRadialFilename(target).equals("structure/structure_management_terminal")) - { + if(core.housingService.getPermissions(owner, target.getContainer()) && (target.getAttachment("moveable") == null || (boolean) target.getAttachment("moveable") != false)) { core.scriptService.callScript("scripts/radial/", "structure/moveable", "createRadial", core, owner, target, request.getRadialOptions()); sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount()); return; @@ -187,7 +186,6 @@ public class SUIService implements INetworkDispatch { return; } - core.scriptService.callScript("scripts/radial/", getRadialFilename(target), "handleSelection", core, owner, target, objMenuSelect.getSelection()); } From dd39f1617c6cd644db51ef4996fd69a430bac30f Mon Sep 17 00:00:00 2001 From: Seefo Date: Sat, 21 Jun 2014 03:35:28 -0400 Subject: [PATCH 15/30] Fixed several equipment bugs where stats wouldn't be properly removed or added Updated engine must be committed for this fix to work - please wait --- scripts/commands/transferitemarmor.py | 72 +++++----- scripts/commands/transferitemmisc.py | 130 +++++++++---------- scripts/commands/transferitemweapon.py | 34 ++--- src/services/equipment/EquipmentService.java | 4 + 4 files changed, 106 insertions(+), 134 deletions(-) diff --git a/scripts/commands/transferitemarmor.py b/scripts/commands/transferitemarmor.py index 8e166cbc..c78c862c 100644 --- a/scripts/commands/transferitemarmor.py +++ b/scripts/commands/transferitemarmor.py @@ -12,51 +12,41 @@ def run(core, actor, target, commandString): canEquip = core.equipmentService.canEquip(actor, target) + if target and container and target.getContainer(): + oldContainer = target.getContainer() + + if container == oldContainer: + print 'Error: New container is same as old container.' + return; + if canEquip[0] is False and container == actor: actor.sendSystemMessage(canEquip[1], 0) return + + replacedObject = None + slotName = None + replacedObjects = [] + slotNames = None + + if actor == container: + slotNames = container.getSlotNamesForObject(target) + + for slotName in slotNames: + object = container.getSlottedObject(slotName) + + if not object in replacedObjects and not object == None: + replacedObjects.append(object) + + if object != None: + actor.transferTo(actor, oldContainer, object) - if target and container and target.getContainer(): - oldContainer = target.getContainer() - if container == oldContainer: - print 'Error: New container is same as old container.' - return; - replacedObject = None - slotName = None - replacedObjects = [] - slotNames = None - if actor == container: - slotNames = container.getSlotNamesForObject(target) - for slotName in slotNames: - object = container.getSlottedObject(slotName) - if not object in replacedObjects and not object == None: - replacedObjects.append(object) - - oldContainer.transferTo(actor, container, target) - - if actor == container: - if target.getTemplate().find('/wearables/') or target.getTemplate().find('/weapon/'): - core.equipmentService.equip(actor, target) - for object in replacedObjects: - core.equipmentService.unequip(actor, object) - #path = 'scripts/' + target.getTemplate().rpartition('/')[0] + '/' - #module = target.getTemplate().rpartition('/')[2].replace('shared_', '').replace('.iff', '') - #core.scriptService.callScript(path, 'equip', module, core, actor, target) - - if container == actor.getSlottedObject('appearance_inventory'): - actor.addObjectToAppearanceEquipList(target) - for object in replacedObjects: - actor.removeObjectFromAppearanceEquipList(object) - - if oldContainer == actor.getSlottedObject('appearance_inventory'): - actor.removeObjectFromAppearanceEquipList(target) - - if actor == oldContainer: - if target.getTemplate().find('/wearables/') or target.getTemplate().find('/weapon/'): - #path = 'scripts/' + target.getTemplate().rpartition('/')[0] + '/' - #module = target.getTemplate().rpartition('/')[2].replace('shared_', '').replace('.iff', '') - #core.scriptService.callScript(path, 'unequip', module, core, actor, target) - core.equipmentService.unequip(actor, target, replacedObject) + oldContainer.transferTo(actor, container, target) + if oldContainer == actor.getSlottedObject('appearance_inventory'): + actor.removeObjectFromAppearanceEquipList(target) + + if container == actor.getSlottedObject('appearance_inventory'): + actor.addObjectToAppearanceEquipList(target) + return \ No newline at end of file diff --git a/scripts/commands/transferitemmisc.py b/scripts/commands/transferitemmisc.py index 9680da3e..fe26a0fa 100644 --- a/scripts/commands/transferitemmisc.py +++ b/scripts/commands/transferitemmisc.py @@ -2,102 +2,90 @@ import sys from engine.resources.scene import Quaternion def setup(): - return - + return + def run(core, actor, target, commandString): - parsedMsg = commandString.split(' ', 3) - objService = core.objectService - containerID = long(parsedMsg[1]) - container = objService.getObject(containerID) - actorContainer = actor.getContainer() - - if container == None: return - - if not 'cell' in container.getTemplate() and container.isFull(): - actor.sendSystemMessage('@container_error_message:container03', 0) - return - if container.getTemplate().startswith("object/tangible/inventory/shared_lightsaber_inventory") or target.getContainer().getTemplate().startswith("object/tangible/inventory/shared_lightsaber_inventory"): - core.equipmentService.calculateLightsaberAttributes(actor, target, container) - return; + parsedMsg = commandString.split(' ', 3) + objService = core.objectService + containerID = long(parsedMsg[1]) + container = objService.getObject(containerID) + actorContainer = actor.getContainer() + + if container == None: return + + if not 'cell' in container.getTemplate() and container.isFull(): + actor.sendSystemMessage('@container_error_message:container03', 0) + return - if target.getTemplate() == 'object/tangible/item/shared_loot_cash.iff': - core.lootService.handleCreditPickUp(actor,target) - if target.getGrandparent().getInventoryItemCount()==1: - core.lootService.setLooted(actor,target.getGrandparent()) - core.objectService.destroyObject(target) - return + if container.getTemplate().startswith("object/tangible/inventory/shared_lightsaber_inventory") or target.getContainer().getTemplate().startswith("object/tangible/inventory/shared_lightsaber_inventory"): + core.equipmentService.calculateLightsaberAttributes(actor, target, container) + return; + + if target.getTemplate() == 'object/tangible/item/shared_loot_cash.iff': + core.lootService.handleCreditPickUp(actor,target) + if target.getGrandparent().getInventoryItemCount()==1: + core.lootService.setLooted(actor,target.getGrandparent()) + core.objectService.destroyObject(target) + return - if target.isLootItem(): - target.setLootItem(0) - actor.sendSystemMessage('You looted ' + target.getObjectName().getStfValue() + ' from corpse.', 0) - #actor.sendSystemMessage('container.getInventoryItemCount() %s' % target.getGrandparent().getInventoryItemCount(), 0) - if target.getGrandparent().getInventoryItemCount()==1: - core.lootService.setLooted(actor,target.getGrandparent()) - - if actorContainer != None and (container.getTemplate() == "object/cell/shared_cell.iff") & core.housingService.getPermissions(actor, actorContainer): + if target.isLootItem(): + target.setLootItem(0) + actor.sendSystemMessage('You looted ' + target.getObjectName().getStfValue() + ' from corpse.', 0) + #actor.sendSystemMessage('container.getInventoryItemCount() %s' % target.getGrandparent().getInventoryItemCount(), 0) + if target.getGrandparent().getInventoryItemCount()==1: + core.lootService.setLooted(actor,target.getGrandparent()) + + if actorContainer != None and (container.getTemplate() == "object/cell/shared_cell.iff") & core.housingService.getPermissions(actor, actorContainer): target.getContainer().transferTo(actor, container, target) core.simulationService.teleport(target, actor.getPosition(), Quaternion(1,0,0,0), containerID) return - elif target.getContainer().getTemplate() == "object/cell/shared_cell.iff" and core.housingService.getPermissions(actor, target.getContainer()): + elif target.getContainer().getTemplate() == "object/cell/shared_cell.iff" and core.housingService.getPermissions(actor, target.getContainer()): target.getContainer().transferTo(actor, container, target) return - elif actorContainer != None and container.getTemplate() == "object/cell/shared_cell.iff": - actor.sendSystemMessage("You do not have permission to access that container!", 0) - return + elif actorContainer != None and container.getTemplate() == "object/cell/shared_cell.iff": + actor.sendSystemMessage("You do not have permission to access that container!", 0) + return - canEquip = core.equipmentService.canEquip(actor, target) + canEquip = core.equipmentService.canEquip(actor, target) - if canEquip[0] is False and container == actor: - actor.sendSystemMessage(canEquip[1], 0) - return + if canEquip[0] is False and container == actor: + actor.sendSystemMessage(canEquip[1], 0) + return - if target and container and target.getContainer(): - oldContainer = target.getContainer() - - if container == oldContainer: - print 'Error: New container is same as old container.' - return; - + if target and container and target.getContainer(): + oldContainer = target.getContainer() + + if container == oldContainer: + print 'Error: New container is same as old container.' + return; + replacedObject = None slotName = None - replacedObjects = [] + replacedObjects = [] slotNames = None - if actor == container: + + if actor == container: slotNames = container.getSlotNamesForObject(target) + for slotName in slotNames: object = container.getSlottedObject(slotName) + if not object in replacedObjects and not object == None: replacedObjects.append(object) - - oldContainer.transferTo(actor, container, target) - - for object in replacedObjects: - core.equipmentService.unequip(actor, object) - - if actor == container: - if target.getTemplate().find('/wearables/') or target.getTemplate().find('/weapon/'): - core.equipmentService.equip(actor, target) - #path = 'scripts/' + target.getTemplate().rpartition('/')[0] + '/' - #module = target.getTemplate().rpartition('/')[2].replace('shared_', '').replace('.iff', '') - #core.scriptService.callScript(path, 'equip', module, core, actor, target) - if container == actor.getSlottedObject('appearance_inventory'): - actor.addObjectToAppearanceEquipList(target) - for object in replacedObjects: - actor.removeObjectFromAppearanceEquipList(object) + if object != None: + container.transferTo(actor, container, object) + + oldContainer.transferTo(actor, container, target) if oldContainer == actor.getSlottedObject('appearance_inventory'): actor.removeObjectFromAppearanceEquipList(target) + + if container == actor.getSlottedObject('appearance_inventory'): + actor.addObjectToAppearanceEquipList(target) - if actor == oldContainer: - if target.getTemplate().find('/wearables/') or target.getTemplate().find('/weapon/'): - #path = 'scripts/' + target.getTemplate().rpartition('/')[0] + '/' - #module = target.getTemplate().rpartition('/')[2].replace('shared_', '').replace('.iff', '') - #core.scriptService.callScript(path, 'unequip', module, core, actor, target) - core.equipmentService.unequip(actor, target) - - return + return diff --git a/scripts/commands/transferitemweapon.py b/scripts/commands/transferitemweapon.py index b07c4e03..500ee505 100644 --- a/scripts/commands/transferitemweapon.py +++ b/scripts/commands/transferitemweapon.py @@ -14,8 +14,8 @@ def run(core, actor, target, commandString): if target and container and target.getContainer(): oldContainer = target.getContainer() if container == oldContainer: - print 'Error: New container is same as old container.' - return; + print 'Error: New container is same as old container.' + return; canEquip = core.equipmentService.canEquip(actor, target) @@ -25,32 +25,22 @@ def run(core, actor, target, commandString): replacedObject = None slotName = None - replacedObjects = [] + replacedObjects = [] slotNames = None - if actor == container: + + if actor == container: slotNames = container.getSlotNamesForObject(target) + for slotName in slotNames: object = container.getSlottedObject(slotName) + if not object in replacedObjects and not object == None: replacedObjects.append(object) + + if object != None: + container.transferTo(actor, container, object) + + oldContainer.transferTo(actor, container, target) - oldContainer.transferTo(actor, container, target) - - if actor == container: - if target.getTemplate().find('/wearables/') or target.getTemplate().find('/weapon/'): - core.equipmentService.equip(actor, target) - for object in replacedObjects: - core.equipmentService.unequip(actor, object) - #path = 'scripts/' + target.getTemplate().rpartition('/')[0] + '/' - #module = target.getTemplate().rpartition('/')[2].replace('shared_', '').replace('.iff', '') - #core.scriptService.callScript(path, 'equip', module, core, actor, target) - - if actor == oldContainer: - if target.getTemplate().find('/wearables/') or target.getTemplate().find('/weapon/'): - #path = 'scripts/' + target.getTemplate().rpartition('/')[0] + '/' - #module = target.getTemplate().rpartition('/')[2].replace('shared_', '').replace('.iff', '') - #core.scriptService.callScript(path, 'unequip', module, core, actor, target) - core.equipmentService.unequip(actor, target, replacedObject) - actor.setWeaponId(target.getObjectID()) return \ No newline at end of file diff --git a/src/services/equipment/EquipmentService.java b/src/services/equipment/EquipmentService.java index 5da16f29..9a989109 100644 --- a/src/services/equipment/EquipmentService.java +++ b/src/services/equipment/EquipmentService.java @@ -166,6 +166,8 @@ public class EquipmentService implements INetworkDispatch { if(!actor.getEquipmentList().contains(item.getObjectID())) { + if(item instanceof WeaponObject) actor.setWeaponId(item.getObjectID()); + actor.addObjectToEquipList(item); processItemAtrributes(actor, item, true); } @@ -182,6 +184,8 @@ public class EquipmentService implements INetworkDispatch { if(actor.getEquipmentList().contains(item.getObjectID())) { + if(item instanceof WeaponObject) actor.setWeaponId(actor.getSlottedObject("default_weapon").getObjectID()); + actor.removeObjectFromEquipList(item); processItemAtrributes(actor, item, false); } From 213a068c286debc2492e0d35142cf30f8229d62d Mon Sep 17 00:00:00 2001 From: Zing Date: Sat, 21 Jun 2014 00:49:31 -0700 Subject: [PATCH 16/30] Loot collection will auto delete if successfully added. --- .../bantha_braided_bracelet.py | 20 +++++++++++++++++++ .../tusken_valuables/broken_gaderaffi.py | 20 +++++++++++++++++++ .../tusken_valuables/hubba_gourd.py | 20 +++++++++++++++++++ .../tusken_valuables/massif_thorn.py | 20 +++++++++++++++++++ .../tusken_valuables/scavenged_metal.py | 20 +++++++++++++++++++ .../tusken_bantha_braided_sling.py | 20 +++++++++++++++++++ .../tusken_valuables/tusken_spirit_mask.py | 20 +++++++++++++++++++ .../tusken_valuables/tusken_talisman.py | 20 +++++++++++++++++++ .../tusken_valuables/womp_rat_tusk.py | 20 +++++++++++++++++++ .../radial/item/collection/loot_collection.py | 7 ++++--- 10 files changed, 184 insertions(+), 3 deletions(-) create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/bantha_braided_bracelet.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/broken_gaderaffi.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/hubba_gourd.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/massif_thorn.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/scavenged_metal.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/tusken_bantha_braided_sling.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/tusken_spirit_mask.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/tusken_talisman.py create mode 100644 scripts/loot/lootItems/collections/tusken_valuables/womp_rat_tusk.py diff --git a/scripts/loot/lootItems/collections/tusken_valuables/bantha_braided_bracelet.py b/scripts/loot/lootItems/collections/tusken_valuables/bantha_braided_bracelet.py new file mode 100644 index 00000000..2367cdb9 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/bantha_braided_bracelet.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_bracelet.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_bantha_bracelet_02_01','static_item_d','col_tusken_bantha_bracelet_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_bantha_bracelet_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/broken_gaderaffi.py b/scripts/loot/lootItems/collections/tusken_valuables/broken_gaderaffi.py new file mode 100644 index 00000000..fd58b1b8 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/broken_gaderaffi.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_gaderffi.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_gaderffi_02_01','static_item_d','col_tusken_gaderffi_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_gaderffi_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/hubba_gourd.py b/scripts/loot/lootItems/collections/tusken_valuables/hubba_gourd.py new file mode 100644 index 00000000..188cf15c --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/hubba_gourd.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_hubba_gourd.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_hubba_gourd_02_01','static_item_d','col_tusken_hubba_gourd_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_hubba_gourd_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/massif_thorn.py b/scripts/loot/lootItems/collections/tusken_valuables/massif_thorn.py new file mode 100644 index 00000000..fc5f0ca7 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/massif_thorn.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_massif_thorn.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_massif_thorn_02_01','static_item_d','col_tusken_massif_thorn_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_massif_thorn_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/scavenged_metal.py b/scripts/loot/lootItems/collections/tusken_valuables/scavenged_metal.py new file mode 100644 index 00000000..fed7a706 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/scavenged_metal.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_metal.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_metal_02_01','static_item_d','col_tusken_metal_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_metal_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/tusken_bantha_braided_sling.py b/scripts/loot/lootItems/collections/tusken_valuables/tusken_bantha_braided_sling.py new file mode 100644 index 00000000..3bd06f29 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/tusken_bantha_braided_sling.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_bantha_braid.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_bantha_braid_02_01','static_item_d','col_tusken_bantha_braid_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_bantha_braid_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/tusken_spirit_mask.py b/scripts/loot/lootItems/collections/tusken_valuables/tusken_spirit_mask.py new file mode 100644 index 00000000..4c5b4138 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/tusken_spirit_mask.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_spirit_mask.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_spirit_mask_02_01','static_item_d','col_tusken_spirit_mask_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_spirit_mask_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/tusken_talisman.py b/scripts/loot/lootItems/collections/tusken_valuables/tusken_talisman.py new file mode 100644 index 00000000..db936f17 --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/tusken_talisman.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_talisman.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_talisman_02_01','static_item_d','col_tusken_talisman_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_talisman_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/tusken_valuables/womp_rat_tusk.py b/scripts/loot/lootItems/collections/tusken_valuables/womp_rat_tusk.py new file mode 100644 index 00000000..c6f8438d --- /dev/null +++ b/scripts/loot/lootItems/collections/tusken_valuables/womp_rat_tusk.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_tusken_womp_rat_tusk.iff'] + +def STFparams(): + + return ['static_item_n','col_tusken_womp_rat_tusk_02_01','static_item_d','col_tusken_womp_rat_tusk_02_01'] + +def AddToCollection(): + + return 'col_tusken_valuables' + +def CollectionItemName(): + + return 'tusken_womp_rat_tusk_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/radial/item/collection/loot_collection.py b/scripts/radial/item/collection/loot_collection.py index 51fd1e57..f72a1fd2 100644 --- a/scripts/radial/item/collection/loot_collection.py +++ b/scripts/radial/item/collection/loot_collection.py @@ -11,8 +11,9 @@ 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) + 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 From fdcd7d2e44c8b83b52bcd13a369cb502fc46824a Mon Sep 17 00:00:00 2001 From: Seefo Date: Sat, 21 Jun 2014 04:52:03 -0400 Subject: [PATCH 17/30] Fixed #759 --- src/services/bazaar/BazaarService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/bazaar/BazaarService.java b/src/services/bazaar/BazaarService.java index 6d27303c..0956c417 100644 --- a/src/services/bazaar/BazaarService.java +++ b/src/services/bazaar/BazaarService.java @@ -797,7 +797,7 @@ public class BazaarService implements INetworkDispatch { auctionItem.setItemTypeCRC(CRC.StringtoCRC(item.getTemplate().replace("shared_", ""))); auctionItem.setStatus(AuctionItem.FORSALE); //auctionItem.setItemName("@" + item.getStfFilename() + ":" + item.getStfName()); - String name = item.getCustomName() == null ? item.getObjectName().getStfValue() : item.getCustomName(); + String name = item.getLookAtText(); auctionItem.setItemName(name); auctionItem.setVendorId(vendor.getObjectID()); auctionItem.setPlanet(vendor.getPlanet().getName()); From 6400a7b9b0b5cc45925ffc12a62308f87a685f51 Mon Sep 17 00:00:00 2001 From: Seefo Date: Sat, 21 Jun 2014 18:15:28 -0400 Subject: [PATCH 18/30] Fixed an issue where items weren't being properly removed when respeccing --- src/services/PlayerService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java index 591d31aa..8cb1d8ff 100644 --- a/src/services/PlayerService.java +++ b/src/services/PlayerService.java @@ -674,13 +674,14 @@ public class PlayerService implements INetworkDispatch { */ public void resetLevel(CreatureObject creature) { PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost"); + SWGObject inventory = creature.getSlottedObject("inventory"); try { for (Long equipmentId : new ArrayList(creature.getEquipmentList())) { SWGObject equipment = core.objectService.getObject(equipmentId); - if (equipment == null) { + if (equipment == null || equipment.getTemplate().startsWith("object/tangible/hair/")) { continue; } @@ -693,7 +694,7 @@ public class PlayerService implements INetworkDispatch { case "object/weapon/creature/shared_creature_default_weapon.iff": continue; default: - core.equipmentService.unequip(creature, equipment); + creature.transferTo(creature, inventory, equipment); } } } catch (Exception e) { From 8d1cc1722061e28b68927a9faa8d86c83ac2f2a4 Mon Sep 17 00:00:00 2001 From: Zing Date: Sat, 21 Jun 2014 15:18:17 -0700 Subject: [PATCH 19/30] More Loot Collections Moved loot collection radial into collection radial (can be used for other consume item collections. added: Nightsister Valuables, Gem, Prototype IG-88, and StormTrooper collections. --- .../green_cusion_cut_gem/green_artusian.py | 19 ++++++++++++++++++ .../green_cusion_cut_gem/green_baltaran.py | 19 ++++++++++++++++++ .../gem/green_cusion_cut_gem/green_bondar.py | 19 ++++++++++++++++++ .../green_cusion_cut_gem/green_chrysopaz.py | 19 ++++++++++++++++++ .../gem/green_cusion_cut_gem/green_dragite.py | 19 ++++++++++++++++++ .../green_cusion_cut_gem/green_durindfire.py | 19 ++++++++++++++++++ .../green_cusion_cut_gem/green_firefacet.py | 19 ++++++++++++++++++ .../gem/green_cusion_cut_gem/green_jenruax.py | 19 ++++++++++++++++++ .../gem/green_cusion_cut_gem/green_pikach.py | 19 ++++++++++++++++++ .../gem/green_cusion_cut_gem/green_vertex.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_artusian.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_baltaran.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_bondar.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_chrysopaz.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_dragite.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_durindfire.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_firefacet.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_jenruax.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_pikach.py | 19 ++++++++++++++++++ .../gem/red_round_cut_gem/red_vertex.py | 19 ++++++++++++++++++ .../set_of_singing_mountain_clan_earrings.py | 20 +++++++++++++++++++ .../singing_mountain_clan_bracelet.py | 20 +++++++++++++++++++ .../singing_mountain_clan_broach.py | 20 +++++++++++++++++++ .../singing_mountain_clan_pendant.py | 20 +++++++++++++++++++ .../singing_mountain_clan_ring.py | 20 +++++++++++++++++++ .../collections/prototype_ig_88/ig_88_head.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_left_arm.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_left_leg.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_right_arm.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_right_leg.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_stand.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_torso.py | 20 +++++++++++++++++++ .../prototype_ig_88/ig_88_wooden_dowel.py | 12 +++++++++++ .../stormtrooper_head.py | 20 +++++++++++++++++++ .../stormtrooper_left_arm.py | 20 +++++++++++++++++++ .../stormtrooper_left_leg.py | 20 +++++++++++++++++++ .../stormtrooper_right_arm.py | 20 +++++++++++++++++++ .../stormtrooper_right_leg.py | 20 +++++++++++++++++++ .../stormtrooper_stand.py | 20 +++++++++++++++++++ .../stormtrooper_torso.py | 20 +++++++++++++++++++ .../stormtrooper_wooden_dowel.py | 12 +++++++++++ scripts/radial/item/collection.py | 10 +++++++--- .../radial/item/collection/loot_collection.py | 19 ------------------ src/services/LootService.java | 4 ++-- 44 files changed, 793 insertions(+), 24 deletions(-) create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_artusian.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_baltaran.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_bondar.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_chrysopaz.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_dragite.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_durindfire.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_firefacet.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_jenruax.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_pikach.py create mode 100644 scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_vertex.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_artusian.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_baltaran.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_bondar.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_chrysopaz.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_dragite.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_durindfire.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_firefacet.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_jenruax.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_pikach.py create mode 100644 scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_vertex.py create mode 100644 scripts/loot/lootItems/collections/nightsister_valuables/set_of_singing_mountain_clan_earrings.py create mode 100644 scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_bracelet.py create mode 100644 scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_broach.py create mode 100644 scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_pendant.py create mode 100644 scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_ring.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_head.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_arm.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_leg.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_arm.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_leg.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_stand.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_torso.py create mode 100644 scripts/loot/lootItems/collections/prototype_ig_88/ig_88_wooden_dowel.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_head.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_arm.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_leg.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_arm.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_leg.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_stand.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_torso.py create mode 100644 scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_wooden_dowel.py delete mode 100644 scripts/radial/item/collection/loot_collection.py diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_artusian.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_artusian.py new file mode 100644 index 00000000..50f88977 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_artusian.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_02','static_item_d','col_green_sq_cut_gem_style1_02_02'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_baltaran.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_baltaran.py new file mode 100644 index 00000000..3b1d9dea --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_baltaran.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_03','static_item_d','col_green_sq_cut_gem_style1_02_03'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_bondar.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_bondar.py new file mode 100644 index 00000000..721d7681 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_bondar.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_04','static_item_d','col_green_sq_cut_gem_style1_02_04'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_chrysopaz.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_chrysopaz.py new file mode 100644 index 00000000..0a10d74c --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_chrysopaz.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_05','static_item_d','col_green_sq_cut_gem_style1_02_05'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_dragite.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_dragite.py new file mode 100644 index 00000000..95ac01b9 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_dragite.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_08','static_item_d','col_green_sq_cut_gem_style1_02_08'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_08' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_durindfire.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_durindfire.py new file mode 100644 index 00000000..62a0cb60 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_durindfire.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_06','static_item_d','col_green_sq_cut_gem_style1_02_06'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_06' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_firefacet.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_firefacet.py new file mode 100644 index 00000000..ca518c62 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_firefacet.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_09','static_item_d','col_green_sq_cut_gem_style1_02_09'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_09' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_jenruax.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_jenruax.py new file mode 100644 index 00000000..7e61874a --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_jenruax.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_10','static_item_d','col_green_sq_cut_gem_style1_02_10'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_10' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_pikach.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_pikach.py new file mode 100644 index 00000000..6f3fa6dd --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_pikach.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_01','static_item_d','col_green_sq_cut_gem_style1_02_01'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_vertex.py b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_vertex.py new file mode 100644 index 00000000..47430210 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/green_cusion_cut_gem/green_vertex.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_green_sq_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_green_sq_cut_gem_style1_02_07','static_item_d','col_green_sq_cut_gem_style1_02_07'] + +def AddToCollection(): + + return 'col_square_green_cut_gem_01' + +def CollectionItemName(): + + return 'square_green_gem_style1_07' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_artusian.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_artusian.py new file mode 100644 index 00000000..2b544015 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_artusian.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_02','static_item_d','col_red_rnd_cut_gem_style1_02_02'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_02' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_baltaran.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_baltaran.py new file mode 100644 index 00000000..2315ce1e --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_baltaran.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_03','static_item_d','col_red_rnd_cut_gem_style1_02_03'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_03' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_bondar.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_bondar.py new file mode 100644 index 00000000..2b6dd744 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_bondar.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_04','static_item_d','col_red_rnd_cut_gem_style1_02_04'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_04' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_chrysopaz.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_chrysopaz.py new file mode 100644 index 00000000..c569e47c --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_chrysopaz.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_05','static_item_d','col_red_rnd_cut_gem_style1_02_05'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_05' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_dragite.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_dragite.py new file mode 100644 index 00000000..9145a5d1 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_dragite.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_08','static_item_d','col_red_rnd_cut_gem_style1_02_08'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_08' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_durindfire.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_durindfire.py new file mode 100644 index 00000000..a3c80bb8 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_durindfire.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_06','static_item_d','col_red_rnd_cut_gem_style1_02_06'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_06' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_firefacet.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_firefacet.py new file mode 100644 index 00000000..00c65c86 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_firefacet.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_09','static_item_d','col_red_rnd_cut_gem_style1_02_09'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_09' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_jenruax.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_jenruax.py new file mode 100644 index 00000000..7c13a2fc --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_jenruax.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_10','static_item_d','col_red_rnd_cut_gem_style1_02_10'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_10' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_pikach.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_pikach.py new file mode 100644 index 00000000..dfa1c5b3 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_pikach.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_01','static_item_d','col_red_rnd_cut_gem_style1_02_01'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_vertex.py b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_vertex.py new file mode 100644 index 00000000..d3122ef5 --- /dev/null +++ b/scripts/loot/lootItems/collections/gem/red_round_cut_gem/red_vertex.py @@ -0,0 +1,19 @@ +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_red_rnd_cut_gem_style1.iff'] + +def STFparams(): + + return ['static_item_n','col_red_rnd_cut_gem_style1_02_07','static_item_d','col_red_rnd_cut_gem_style1_02_07'] + +def AddToCollection(): + + return 'col_round_red_cut_gem_01' + +def CollectionItemName(): + + return 'round_red_gem_style1_07' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/nightsister_valuables/set_of_singing_mountain_clan_earrings.py b/scripts/loot/lootItems/collections/nightsister_valuables/set_of_singing_mountain_clan_earrings.py new file mode 100644 index 00000000..bfb33ed5 --- /dev/null +++ b/scripts/loot/lootItems/collections/nightsister_valuables/set_of_singing_mountain_clan_earrings.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_nightsister_earrings.iff'] + +def STFparams(): + + return ['static_item_n','col_nightsister_earrings_01','static_item_d','col_nightsister_earrings_01'] + +def AddToCollection(): + + return 'col_nightsister_valuables' + +def CollectionItemName(): + + return 'nightsister_earrings_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_bracelet.py b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_bracelet.py new file mode 100644 index 00000000..029711ca --- /dev/null +++ b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_bracelet.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_nightsister_bracelet.iff'] + +def STFparams(): + + return ['static_item_n','col_nightsister_bracelet_01','static_item_d','col_nightsister_bracelet_01'] + +def AddToCollection(): + + return 'col_nightsister_valuables' + +def CollectionItemName(): + + return 'nightsister_bracelet_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_broach.py b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_broach.py new file mode 100644 index 00000000..f822586a --- /dev/null +++ b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_broach.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_nightsister_broach.iff'] + +def STFparams(): + + return ['static_item_n','col_nightsister_broach_01','static_item_d','col_nightsister_broach_01'] + +def AddToCollection(): + + return 'col_nightsister_valuables' + +def CollectionItemName(): + + return 'nightsister_broach_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_pendant.py b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_pendant.py new file mode 100644 index 00000000..81c67b54 --- /dev/null +++ b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_pendant.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_nightsister_pendant.iff'] + +def STFparams(): + + return ['static_item_n','col_nightsister_pendant_01','static_item_d','col_nightsister_pendant_01'] + +def AddToCollection(): + + return 'col_nightsister_valuables' + +def CollectionItemName(): + + return 'nightsister_pendant_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_ring.py b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_ring.py new file mode 100644 index 00000000..d4e0c59d --- /dev/null +++ b/scripts/loot/lootItems/collections/nightsister_valuables/singing_mountain_clan_ring.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_nightsister_ring.iff'] + +def STFparams(): + + return ['static_item_n','col_nightsister_ring_01','static_item_d','col_nightsister_ring_01'] + +def AddToCollection(): + + return 'col_nightsister_valuables' + +def CollectionItemName(): + + return 'nightsister_ring_01' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_head.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_head.py new file mode 100644 index 00000000..c32ff78f --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_head.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_head.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_head_02_01','static_item_d','col_ig_88_head_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_head' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_arm.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_arm.py new file mode 100644 index 00000000..088b892c --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_arm.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_left_arm.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_left_arm_02_01','static_item_d','col_ig_88_left_arm_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_left_arm' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_leg.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_leg.py new file mode 100644 index 00000000..243932c9 --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_left_leg.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_left_leg.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_left_leg_02_01','static_item_d','col_ig_88_left_leg_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_left_leg' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_arm.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_arm.py new file mode 100644 index 00000000..965fb9ba --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_arm.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_right_arm.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_right_arm_02_01','static_item_d','col_ig_88_right_arm_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_right_arm' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_leg.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_leg.py new file mode 100644 index 00000000..a572c54c --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_right_leg.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_right_leg.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_right_leg_02_01','static_item_d','col_ig_88_right_leg_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_right_leg' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_stand.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_stand.py new file mode 100644 index 00000000..1c590c94 --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_stand.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_stand_base.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_metal_stand_02_01','static_item_d','col_ig_88_metal_stand_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_stand_base' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_torso.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_torso.py new file mode 100644 index 00000000..0fcc996a --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_torso.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_eng_torso.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_torso_02_01','static_item_d','col_ig_88_torso_02_01'] + +def AddToCollection(): + + return 'col_eng_trader' + +def CollectionItemName(): + + return 'trader_eng_torso' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_wooden_dowel.py b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_wooden_dowel.py new file mode 100644 index 00000000..93783d3c --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_ig_88/ig_88_wooden_dowel.py @@ -0,0 +1,12 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_ig_88_wooden_dowel.iff'] + +def STFparams(): + + return ['static_item_n','col_ig_88_wooden_dowel_02_01','static_item_d','col_ig_88_wooden_dowel_02_01'] + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_head.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_head.py new file mode 100644 index 00000000..699ce198 --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_head.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_head.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_head_02_01','static_item_d','col_stormtrooper_head_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_head' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_arm.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_arm.py new file mode 100644 index 00000000..731e0233 --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_arm.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_left_arm.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_left_arm_02_01','static_item_d','col_stormtrooper_left_arm_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_left_arm' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_leg.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_leg.py new file mode 100644 index 00000000..34659202 --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_left_leg.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_left_leg.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_left_leg_02_01','static_item_d','col_stormtrooper_left_leg_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_left_leg' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_arm.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_arm.py new file mode 100644 index 00000000..728150ec --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_arm.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_right_arm.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_right_arm_02_01','static_item_d','col_stormtrooper_right_arm_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_right_arm' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_leg.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_leg.py new file mode 100644 index 00000000..60dc5e04 --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_right_leg.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_right_leg.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_right_leg_02_01','static_item_d','col_stormtrooper_right_leg_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_right_leg' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_stand.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_stand.py new file mode 100644 index 00000000..2d59886b --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_stand.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_stand_base.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_metal_stand_02_01','static_item_d','col_stormtrooper_metal_stand_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_stand_base' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_torso.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_torso.py new file mode 100644 index 00000000..2f07827c --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_torso.py @@ -0,0 +1,20 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_trader_mun_torso.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_torso_02_01','static_item_d','col_stormtrooper_torso_02_01'] + +def AddToCollection(): + + return 'col_mun_trader' + +def CollectionItemName(): + + return 'trader_mun_torso' + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_wooden_dowel.py b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_wooden_dowel.py new file mode 100644 index 00000000..7f60ba3b --- /dev/null +++ b/scripts/loot/lootItems/collections/prototype_stormtrooper/stormtrooper_wooden_dowel.py @@ -0,0 +1,12 @@ + +def itemTemplate(): + + return ['object/tangible/loot/creature_loot/collections/shared_stormtrooper_wooden_dowel.iff'] + +def STFparams(): + + return ['static_item_n','col_stormtrooper_wooden_dowel_02_01','static_item_d','col_stormtrooper_wooden_dowel_02_01'] + +def stackable(): + + return 1 \ No newline at end of file diff --git a/scripts/radial/item/collection.py b/scripts/radial/item/collection.py index 0b45c9e4..f72a1fd2 100644 --- a/scripts/radial/item/collection.py +++ b/scripts/radial/item/collection.py @@ -7,9 +7,13 @@ def createRadial(core, owner, target, radials): 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/collection/loot_collection.py b/scripts/radial/item/collection/loot_collection.py deleted file mode 100644 index f72a1fd2..00000000 --- a/scripts/radial/item/collection/loot_collection.py +++ /dev/null @@ -1,19 +0,0 @@ -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')) - 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/src/services/LootService.java b/src/services/LootService.java index 35aec14e..0b45fd30 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -758,7 +758,7 @@ public class LootService implements INetworkDispatch { droppedItem.getAttributes().put("@obj_attr_n:collection_name", "@collection_n:"+addToCollection); //droppedItem.getAttributes().put("@obj_attr_n:collection_name", "\\#FFFF00 @collection_n:"+addToCollection + " \\#FFFFFF "); //core.collectionService.addCollection(actor, "new_prof_officer_master") - droppedItem.setAttachment("radial_filename", "item/collection/loot_collection"); + droppedItem.setAttachment("radial_filename", "item/collection"); //System.out.println("collection"); } @@ -1224,7 +1224,7 @@ public class LootService implements INetworkDispatch { droppedItem.getAttributes().put("@obj_attr_n:collection_name", "@collection_n:"+addToCollection); //droppedItem.getAttributes().put("@obj_attr_n:collection_name", "\\#FFFF00 @collection_n:"+addToCollection + " \\#FFFFFF "); //core.collectionService.addCollection(actor, "new_prof_officer_master") - droppedItem.setAttachment("radial_filename", "item/loot_collection"); + droppedItem.setAttachment("radial_filename", "item/collection"); } From 0b315503f0b083e9ac712dbc102305085c7f7aec Mon Sep 17 00:00:00 2001 From: Seefo Date: Sat, 21 Jun 2014 23:03:15 -0400 Subject: [PATCH 20/30] Added coloring to the 'Used in Collection' attribute for collection items --- src/services/AttributeService.java | 16 ++++++++++++++-- src/services/LootService.java | 3 ++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/services/AttributeService.java b/src/services/AttributeService.java index f5da7e71..97e52c1f 100644 --- a/src/services/AttributeService.java +++ b/src/services/AttributeService.java @@ -28,9 +28,9 @@ import java.util.TreeMap; import org.apache.mina.core.buffer.SimpleBufferAllocator; import main.NGECore; - import protocol.swg.AttributeListMessage; - +import resources.objects.creature.CreatureObject; +import engine.resources.common.Stf; import engine.resources.objects.SWGObject; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; @@ -65,6 +65,18 @@ public class AttributeService implements INetworkDispatch { if(requester.getClient() == null || requester.getClient().getSession() == null) return; + // Color collection used in attribute based on whether collection is complete or not + if(target.getAttachment("CollectionItemName") != null) + { + String collectionName = new Stf("@collection_n:" + (String) target.getAttachment("AddToCollection")).getStfValue().replace(":", " -"); + + if(core.collectionService.isComplete((CreatureObject) requester, (String) target.getAttachment("CollectionItemName"))) + { + target.getAttributes().put("@obj_attr_n:collection_name", "\\#FF0000 " + collectionName); + } + else target.getAttributes().put("@obj_attr_n:collection_name", "\\#00FF00 " + collectionName); + } + AttributeListMessage message = new AttributeListMessage(target, bufferPool); requester.getClient().getSession().write(message.serialize()); } diff --git a/src/services/LootService.java b/src/services/LootService.java index 35aec14e..60ae4a66 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -754,11 +754,12 @@ public class LootService implements INetworkDispatch { setSTFParams(droppedItem, STFparams); } - if (addToCollection!=null){ + if (addToCollection!=null) { droppedItem.getAttributes().put("@obj_attr_n:collection_name", "@collection_n:"+addToCollection); //droppedItem.getAttributes().put("@obj_attr_n:collection_name", "\\#FFFF00 @collection_n:"+addToCollection + " \\#FFFFFF "); //core.collectionService.addCollection(actor, "new_prof_officer_master") droppedItem.setAttachment("radial_filename", "item/collection/loot_collection"); + droppedItem.setAttachment("AddToCollection", addToCollection); //System.out.println("collection"); } From b6fd2643c8ce991c399f9a66bb7c4027900a09fb Mon Sep 17 00:00:00 2001 From: Zing Date: Sat, 21 Jun 2014 21:15:42 -0700 Subject: [PATCH 21/30] 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 0b17a0b26e735da3ebcc682441d911fb0addd9a6 Mon Sep 17 00:00:00 2001 From: Seefo Date: Sun, 22 Jun 2014 03:25:53 -0400 Subject: [PATCH 22/30] Fixed container limits and added wearable coloring for admins --- scripts/radial/item/recolorable.py | 15 ++++++++ .../objects/tangible/TangibleObject.java | 3 +- src/services/sui/SUIService.java | 37 +++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 scripts/radial/item/recolorable.py diff --git a/scripts/radial/item/recolorable.py b/scripts/radial/item/recolorable.py new file mode 100644 index 00000000..bd13e64b --- /dev/null +++ b/scripts/radial/item/recolorable.py @@ -0,0 +1,15 @@ +from resources.common import RadialOptions +import sys + +def createRadial(core, owner, target, radials): + radials.add(RadialOptions(0, 98, 0, 'Modify primary color')) + radials.add(RadialOptions(0, 99, 0, 'Modify secondary color')) + return + +def handleSelection(core, owner, target, option): + if option == 98 and target: + core.suiService.sendColorPicker(owner, target, '/private/index_color_1') + if option == 99 and target: + core.suiService.sendColorPicker(owner, target, '/private/index_color_2') + return + \ No newline at end of file diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java index 70c5957e..407ea38e 100644 --- a/src/resources/objects/tangible/TangibleObject.java +++ b/src/resources/objects/tangible/TangibleObject.java @@ -570,10 +570,11 @@ public class TangibleObject extends SWGObject implements Serializable { } public boolean isFull() { + if (getTemplateData().getAttribute("containerVolumeLimit") == null) return false; - int containerVolumeLimit = (int) getTemplateData().getAttribute("containerVolumeLimit") >> 8; // Shifting because it seems to be returning an extra byte before it should + int containerVolumeLimit = (int) getTemplateData().getAttribute("containerVolumeLimit"); if (containerVolumeLimit == 0 || getTemplate() == "object/tangible/inventory/shared_appearance_inventory.iff") // appearance inventory - issue #755 return false; diff --git a/src/services/sui/SUIService.java b/src/services/sui/SUIService.java index e031040a..ab354051 100644 --- a/src/services/sui/SUIService.java +++ b/src/services/sui/SUIService.java @@ -49,6 +49,7 @@ import resources.common.RadialOptions; import resources.loot.LootRollSession; import resources.objects.creature.CreatureObject; import resources.objects.harvester.HarvesterObject; +import resources.objects.tangible.TangibleObject; import services.sui.SUIWindow.SUICallback; import services.sui.SUIWindow.Trigger; import engine.clients.Client; @@ -144,6 +145,12 @@ public class SUIService implements INetworkDispatch { sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount()); return; } + + if(target.getTemplate().contains("object/tangible/wearables") && ((CreatureObject)owner).hasAbility("admin")) + { + core.scriptService.callScript("scripts/radial/", "item/recolorable", "createRadial", core, owner, target, request.getRadialOptions()); + if(getRadialFilename(target).equals("default")) sendRadial(owner, target, request.getRadialOptions(), request.getRadialCount()); + } core.scriptService.callScript("scripts/radial/", getRadialFilename(target), "createRadial", core, owner, target, request.getRadialOptions()); if(getRadialFilename(target).equals("default")) @@ -185,6 +192,12 @@ public class SUIService implements INetworkDispatch { core.scriptService.callScript("scripts/radial/", "structure/moveable", "handleSelection", core, owner, target, objMenuSelect.getSelection()); return; } + + + if(target.getTemplate().contains("object/tangible/wearables") && ((CreatureObject)owner).hasAbility("admin")) + { + core.scriptService.callScript("scripts/radial/", "item/recolorable", "handleSelection", core, owner, target, objMenuSelect.getSelection()); + } core.scriptService.callScript("scripts/radial/", getRadialFilename(target), "handleSelection", core, owner, target, objMenuSelect.getSelection()); @@ -422,6 +435,30 @@ public class SUIService implements INetworkDispatch { return window; } + public void sendColorPicker(CreatureObject creature, TangibleObject target, String customizationType) + { + final SUIWindow suiWindow = core.suiService.createSUIWindow("Script.ColorPicker", creature, creature, 0); + + suiWindow.setProperty("bg.caption.lblTitle:Text", "@base_player:swg"); + suiWindow.setProperty("ColorPicker:TargetRangeMax", "500"); + suiWindow.setProperty("ColorPicker:TargetNetworkId", Long.toString(target.getObjectID())); + suiWindow.setProperty("ColorPicker:TargetVariable", customizationType); + + Vector returnList = new Vector(); + returnList.add("ColorPicker:SelectedIndex"); + + suiWindow.addHandler(0, "", Trigger.TRIGGER_OK, returnList, new SUICallback() + { + public void process(SWGObject owner, int eventType, Vector returnList) + { + int index = Integer.parseInt(returnList.get(0)); + target.setCustomizationVariable(customizationType, (byte) index); + } + }); + + core.suiService.openSUIWindow(suiWindow); + } + public void closeSUIWindow(SWGObject owner, int id) { if(owner.getClient() == null || owner.getClient().getSession() == null) From 585469571ab14c5aa65a07b10ba1ab911ea1c14a Mon Sep 17 00:00:00 2001 From: Zing Date: Sun, 22 Jun 2014 11:23:39 -0700 Subject: [PATCH 23/30] 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 b1d3c4a6e47d12945f8d6723fd1aa757cc72eb3b Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Wed, 25 Jun 2014 16:53:26 +0200 Subject: [PATCH 24/30] 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 25/30] 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 26/30] 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 27/30] 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 28/30] 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 29/30] 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 30/30] 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