From e948d4d57d212c307714285aaaeff79a2194e261 Mon Sep 17 00:00:00 2001 From: Zing Date: Tue, 3 Jun 2014 22:08:22 -0700 Subject: [PATCH 1/3] (Added) Correct Mustafarian Injector Template for RLS. Set details in server template so it can be used for mustafar quest as well --- .../loot/lootItems/rarelootchest/mustafarian_injector.py | 2 +- .../tangible/loot/mustafar/old_republic_tech_02.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/loot/lootItems/rarelootchest/mustafarian_injector.py b/scripts/loot/lootItems/rarelootchest/mustafarian_injector.py index 5eb85000..0fa3f8b7 100644 --- a/scripts/loot/lootItems/rarelootchest/mustafarian_injector.py +++ b/scripts/loot/lootItems/rarelootchest/mustafarian_injector.py @@ -1,4 +1,4 @@ def itemTemplate(): - return ['bject/tangible/gcw/crafting_quest/shared_gcw_bacta_injectors.iff'] # this is wrong needs correct iff still + return ['object/tangible/loot/mustafar/shared_old_republic_tech_02.iff'] diff --git a/scripts/object/tangible/loot/mustafar/old_republic_tech_02.py b/scripts/object/tangible/loot/mustafar/old_republic_tech_02.py index ccad8904..753fa78b 100644 --- a/scripts/object/tangible/loot/mustafar/old_republic_tech_02.py +++ b/scripts/object/tangible/loot/mustafar/old_republic_tech_02.py @@ -1,4 +1,13 @@ import sys def setup(core, object): + object.setAttachment('radial_filename', 'object/usable') + object.setStfFilename('static_item_n') + object.setStfName('item_tow_proc_generic_03_01') + object.setDetailFilename('static_item_d') + object.setDetailName('item_tow_proc_generic_03_01') + return + +def use(core, actor, object): + core.buffService.addBuffToCreature(actor, 'towPoisonResistAbsorb_3', actor) return \ No newline at end of file From dd7d0921ae10b6499fd88d35a1a87166eea73b61 Mon Sep 17 00:00:00 2001 From: Zing Date: Tue, 3 Jun 2014 23:08:08 -0700 Subject: [PATCH 2/3] Cleaned up more loot Added correct template for AT-ST reward. Removed armor stats from pieces that should not have them. Set Jedi Relics to use the correct template. (also clothing and armor loot should have random stat's for RE'ing also.) --- scripts/loot/lootItems/armor/bone/bone_armor_boots.py | 9 +-------- .../loot/lootItems/armor/bone/bone_armor_gloves.py | 9 +-------- .../loot/lootItems/armor/chitin/chitin_armor_boots.py | 9 +-------- .../lootItems/armor/chitin/chitin_armor_gloves.py | 9 +-------- .../armor/composite/composite_armor_boots.py | 9 +-------- .../armor/composite/composite_armor_gloves.py | 9 +-------- .../ithorian_defender_armor_boots.py | 9 +-------- .../ithorian_defender_armor_gloves.py | 9 +-------- .../ithorian_guardian_armor_boots.py | 9 +-------- .../ithorian_guardian_armor_gloves.py | 9 +-------- .../ithorian_sentinel_armor_boots.py | 9 +-------- .../ithorian_sentinel_armor_gloves.py | 9 +-------- .../lootItems/armor/marauder/marauder_armor_boots.py | 9 +-------- .../lootItems/armor/marauder/marauder_armor_gloves.py | 9 +-------- .../loot/lootItems/armor/padded/padded_armor_boots.py | 9 +-------- .../lootItems/armor/padded/padded_armor_gloves.py | 9 +-------- .../loot/lootItems/armor/tantel/tantel_armor_boots.py | 9 +-------- .../lootItems/armor/tantel/tantel_armor_gloves.py | 9 +-------- .../lootItems/armor/ubese/ubese_armor_bandolier.py | 7 ------- .../loot/lootItems/armor/ubese/ubese_armor_boots.py | 9 +-------- .../loot/lootItems/armor/ubese/ubese_armor_gloves.py | 11 ++--------- .../loot/lootItems/armor/ubese/ubese_armor_shirt.py | 9 +-------- .../lootItems/rarelootchest/at_st_pilots_helmet.py | 4 +--- scripts/loot/lootItems/relics/jedi_relic_1.py | 4 ++-- scripts/loot/lootItems/relics/jedi_relic_2.py | 2 +- 25 files changed, 26 insertions(+), 182 deletions(-) diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_boots.py b/scripts/loot/lootItems/armor/bone/bone_armor_boots.py index d2debb33..da526052 100644 --- a/scripts/loot/lootItems/armor/bone/bone_armor_boots.py +++ b/scripts/loot/lootItems/armor/bone/bone_armor_boots.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/bone/bone_armor_gloves.py b/scripts/loot/lootItems/armor/bone/bone_armor_gloves.py index c888e788..a4730f12 100644 --- a/scripts/loot/lootItems/armor/bone/bone_armor_gloves.py +++ b/scripts/loot/lootItems/armor/bone/bone_armor_gloves.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_boots.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_boots.py index 4163c447..127dd61d 100644 --- a/scripts/loot/lootItems/armor/chitin/chitin_armor_boots.py +++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_boots.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/chitin/chitin_armor_gloves.py b/scripts/loot/lootItems/armor/chitin/chitin_armor_gloves.py index 0fec0496..30701432 100644 --- a/scripts/loot/lootItems/armor/chitin/chitin_armor_gloves.py +++ b/scripts/loot/lootItems/armor/chitin/chitin_armor_gloves.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/composite/composite_armor_boots.py b/scripts/loot/lootItems/armor/composite/composite_armor_boots.py index f996bfa7..9ae88c3a 100644 --- a/scripts/loot/lootItems/armor/composite/composite_armor_boots.py +++ b/scripts/loot/lootItems/armor/composite/composite_armor_boots.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/composite/composite_armor_gloves.py b/scripts/loot/lootItems/armor/composite/composite_armor_gloves.py index acd4a1cf..91d2be4c 100644 --- a/scripts/loot/lootItems/armor/composite/composite_armor_gloves.py +++ b/scripts/loot/lootItems/armor/composite/composite_armor_gloves.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_boots.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_boots.py index 6c6c1ca4..bccf5133 100644 --- a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_boots.py +++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_boots.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_gloves.py b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_gloves.py index 5d1f4535..0804e505 100644 --- a/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_gloves.py +++ b/scripts/loot/lootItems/armor/ithorian_defender/ithorian_defender_armor_gloves.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_boots.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_boots.py index 3b27d829..fe01888d 100644 --- a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_boots.py +++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_boots.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_gloves.py b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_gloves.py index 002612cb..2b413665 100644 --- a/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_gloves.py +++ b/scripts/loot/lootItems/armor/ithorian_guardian/ithorian_guardian_armor_gloves.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_boots.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_boots.py index e961438f..8e14d51b 100644 --- a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_boots.py +++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_boots.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_gloves.py b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_gloves.py index 439d857e..5dce5bc1 100644 --- a/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_gloves.py +++ b/scripts/loot/lootItems/armor/ithorian_sentinel/ithorian_sentinel_armor_gloves.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_boots.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_boots.py index 4fff799b..ad6e208c 100644 --- a/scripts/loot/lootItems/armor/marauder/marauder_armor_boots.py +++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_boots.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/marauder/marauder_armor_gloves.py b/scripts/loot/lootItems/armor/marauder/marauder_armor_gloves.py index 79bf35b1..abb7b2a4 100644 --- a/scripts/loot/lootItems/armor/marauder/marauder_armor_gloves.py +++ b/scripts/loot/lootItems/armor/marauder/marauder_armor_gloves.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_boots.py b/scripts/loot/lootItems/armor/padded/padded_armor_boots.py index a1767be7..407c80a0 100644 --- a/scripts/loot/lootItems/armor/padded/padded_armor_boots.py +++ b/scripts/loot/lootItems/armor/padded/padded_armor_boots.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/padded/padded_armor_gloves.py b/scripts/loot/lootItems/armor/padded/padded_armor_gloves.py index 72001ed2..bf324908 100644 --- a/scripts/loot/lootItems/armor/padded/padded_armor_gloves.py +++ b/scripts/loot/lootItems/armor/padded/padded_armor_gloves.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_boots.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_boots.py index 7920a987..3f4374f5 100644 --- a/scripts/loot/lootItems/armor/tantel/tantel_armor_boots.py +++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_boots.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/tantel/tantel_armor_gloves.py b/scripts/loot/lootItems/armor/tantel/tantel_armor_gloves.py index 555b5ab1..4bfcb2ca 100644 --- a/scripts/loot/lootItems/armor/tantel/tantel_armor_gloves.py +++ b/scripts/loot/lootItems/armor/tantel/tantel_armor_gloves.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_bandolier.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_bandolier.py index 17fcecd9..40c275b0 100644 --- a/scripts/loot/lootItems/armor/ubese/ubese_armor_bandolier.py +++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_bandolier.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] return stats diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_boots.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_boots.py index 9720add5..eb3b46d6 100644 --- a/scripts/loot/lootItems/armor/ubese/ubese_armor_boots.py +++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_boots.py @@ -20,12 +20,5 @@ def customizationValues(): return [] def itemStats(): - - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - return stats + return [] diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_gloves.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_gloves.py index 38d47564..3a4063c9 100644 --- a/scripts/loot/lootItems/armor/ubese/ubese_armor_gloves.py +++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_gloves.py @@ -5,7 +5,7 @@ def itemTemplate(): def customItemName(): - return 'Ubese Armor Gloves' + return 'test' def customItemStackCount(): @@ -21,11 +21,4 @@ def customizationValues(): def itemStats(): - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - - return stats + return [] diff --git a/scripts/loot/lootItems/armor/ubese/ubese_armor_shirt.py b/scripts/loot/lootItems/armor/ubese/ubese_armor_shirt.py index 0ad493a1..edbe2572 100644 --- a/scripts/loot/lootItems/armor/ubese/ubese_armor_shirt.py +++ b/scripts/loot/lootItems/armor/ubese/ubese_armor_shirt.py @@ -21,11 +21,4 @@ def customizationValues(): def itemStats(): - stats = ['armor_efficiency_kinetic','5000','6800'] - stats += ['armor_efficiency_energy','3000','4800'] - stats += ['special_protection_heat','4000','5800'] - stats += ['special_protection_cold','4000','5800'] - stats += ['special_protection_acid','4000','5800'] - stats += ['special_protection_electricity','4000','5800'] - - return stats + return [] diff --git a/scripts/loot/lootItems/rarelootchest/at_st_pilots_helmet.py b/scripts/loot/lootItems/rarelootchest/at_st_pilots_helmet.py index 5f2421f7..511decc6 100644 --- a/scripts/loot/lootItems/rarelootchest/at_st_pilots_helmet.py +++ b/scripts/loot/lootItems/rarelootchest/at_st_pilots_helmet.py @@ -1,9 +1,7 @@ def itemTemplate(): - return ['object/tangible/wearables/helmet/shared_helmet_atat.iff'] # iff not exact, tre files suck + return ['object/tangible/mission/quest_item/shared_bren_kingal_q4_needed.iff'] #def customItemName(): -# -# return 'Adjusted CDEF Rifle' diff --git a/scripts/loot/lootItems/relics/jedi_relic_1.py b/scripts/loot/lootItems/relics/jedi_relic_1.py index 04e3b978..90ee35e4 100644 --- a/scripts/loot/lootItems/relics/jedi_relic_1.py +++ b/scripts/loot/lootItems/relics/jedi_relic_1.py @@ -1,11 +1,11 @@ def itemTemplate(): - return ['object/tangible/loot/generic_usable/shared_jedi_relic_01_generic.iff'] + return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff'] def customItemName(): - return 'A Jedi Relic' + return '@string/en/static_item_n:col_lightsaber_1h_01_03' def usedInCollection(): diff --git a/scripts/loot/lootItems/relics/jedi_relic_2.py b/scripts/loot/lootItems/relics/jedi_relic_2.py index a7dccedc..df3bf107 100644 --- a/scripts/loot/lootItems/relics/jedi_relic_2.py +++ b/scripts/loot/lootItems/relics/jedi_relic_2.py @@ -1,7 +1,7 @@ def itemTemplate(): - return ['object/tangible/loot/generic_usable/shared_jedi_relic_01_generic.iff'] + return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff'] def customItemName(): From 115cad23a404d439ad1da87d53769b672733745d Mon Sep 17 00:00:00 2001 From: Zing Date: Tue, 3 Jun 2014 23:32:32 -0700 Subject: [PATCH 3/3] small fix --- scripts/loot/lootItems/relics/jedi_relic_1.py | 4 ---- scripts/loot/lootItems/relics/jedi_relic_2.py | 3 --- 2 files changed, 7 deletions(-) diff --git a/scripts/loot/lootItems/relics/jedi_relic_1.py b/scripts/loot/lootItems/relics/jedi_relic_1.py index 90ee35e4..321819e2 100644 --- a/scripts/loot/lootItems/relics/jedi_relic_1.py +++ b/scripts/loot/lootItems/relics/jedi_relic_1.py @@ -2,10 +2,6 @@ def itemTemplate(): return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff'] - -def customItemName(): - - return '@string/en/static_item_n:col_lightsaber_1h_01_03' def usedInCollection(): diff --git a/scripts/loot/lootItems/relics/jedi_relic_2.py b/scripts/loot/lootItems/relics/jedi_relic_2.py index df3bf107..1460ae13 100644 --- a/scripts/loot/lootItems/relics/jedi_relic_2.py +++ b/scripts/loot/lootItems/relics/jedi_relic_2.py @@ -3,7 +3,4 @@ def itemTemplate(): return ['object/tangible/loot/mustafar/shared_jedi_relic_03.iff'] -def customItemName(): - - return 'A Jedi Relic'