From bae95657d8efb8f5ce8ebfc41ed6695d48aa13d8 Mon Sep 17 00:00:00 2001 From: Zing Date: Thu, 7 Aug 2014 21:15:05 -0700 Subject: [PATCH] Fixed GCW rank commands not being rewarded, Fixed GCW rank armor stats. --- scripts/collections/gcwrank_imperial.py | 20 +++++++++---------- scripts/collections/gcwrank_rebel.py | 20 +++++++++---------- .../armor_rebel_spec_ops_belt.py | 6 ------ .../armor_rebel_spec_ops_boots.py | 6 ------ .../armor_rebel_spec_ops_gloves.py | 6 ------ ..._pvp_spec_ops_imperial_black_belt_05_01.py | 6 ------ ...pvp_spec_ops_imperial_black_boots_05_01.py | 6 ------ ...vp_spec_ops_imperial_black_gloves_05_01.py | 6 ------ 8 files changed, 20 insertions(+), 56 deletions(-) diff --git a/scripts/collections/gcwrank_imperial.py b/scripts/collections/gcwrank_imperial.py index 19e67fe5..584d18a6 100644 --- a/scripts/collections/gcwrank_imperial.py +++ b/scripts/collections/gcwrank_imperial.py @@ -3,23 +3,23 @@ from resources.datatables import GcwRank def handleRankUp(core, actor, newrank): if newrank >= GcwRank.LIEUTENANT: - actor.addAbility('pvp_retaliation_ability') + actor.addAbility('command_pvp_retaliation_ability') core.collectionService.addCollection(actor, 'pvp_imperial_lieutenant') if newrank >= GcwRank.CAPTAIN: - actor.addAbility('pvp_adrenaline_ability') + actor.addAbility('command_pvp_adrenaline_ability') core.collectionService.addCollection(actor, 'pvp_imperial_captain') if newrank >= GcwRank.MAJOR: - actor.addAbility('pvp_unstoppable_ability') + actor.addAbility('command_pvp_unstoppable_ability') core.collectionService.addCollection(actor, 'pvp_imperial_major') if newrank >= GcwRank.LTCOLONEL: - actor.addAbility('pvp_last_man_ability') + actor.addAbility('command_pvp_last_man_ability') core.collectionService.addCollection(actor, 'pvp_imperial_lt_colonel') if newrank >= GcwRank.COLONEL: - actor.addAbility('pvp_aura_buff_self_ability') + actor.addAbility('pvp_aura_buff_imperial_self') core.collectionService.addCollection(actor, 'pvp_imperial_colonel') if newrank >= GcwRank.GENERAL: @@ -30,19 +30,19 @@ def handleRankUp(core, actor, newrank): def handleRankDown(actor, newrank): if newrank < GcwRank.LIEUTENANT: - actor.removeAbility('pvp_retaliation_ability') + actor.removeAbility('command_pvp_retaliation_ability') if newrank < GcwRank.CAPTAIN: - actor.removeAbility('pvp_adrenaline_ability') + actor.removeAbility('command_pvp_adrenaline_ability') if newrank < GcwRank.MAJOR: - actor.removeAbility('pvp_unstoppable_ability') + actor.removeAbility('command_pvp_unstoppable_ability') if newrank < GcwRank.LTCOLONEL: - actor.removeAbility('pvp_last_man_ability') + actor.removeAbility('command_pvp_last_man_ability') if newrank < GcwRank.COLONEL: - actor.removeAbility('pvp_aura_buff_self_ability') + actor.removeAbility('pvp_aura_buff_imperial_self') if newrank < GcwRank.GENERAL: actor.removeAbility('pvp_airstrike_ability') diff --git a/scripts/collections/gcwrank_rebel.py b/scripts/collections/gcwrank_rebel.py index 7cd757fc..3ba4222b 100644 --- a/scripts/collections/gcwrank_rebel.py +++ b/scripts/collections/gcwrank_rebel.py @@ -3,23 +3,23 @@ from resources.datatables import GcwRank def handleRankUp(core, actor, newrank): if newrank >= GcwRank.LIEUTENANT: - actor.addAbility('pvp_retaliation_rebel_ability') + actor.addAbility('command_pvp_retaliation_rebel_ability') core.collectionService.addCollection(actor, 'pvp_rebel_lieutenant') if newrank >= GcwRank.CAPTAIN: - actor.addAbility('pvp_adrenaline_rebel_ability') + actor.addAbility('command_pvp_adrenaline_rebel_ability') core.collectionService.addCollection(actor, 'pvp_rebel_captain') if newrank >= GcwRank.MAJOR: - actor.addAbility('pvp_unstoppable_rebel_ability') + actor.addAbility('command_pvp_unstoppable_rebel_ability') core.collectionService.addCollection(actor, 'pvp_rebel_major') if newrank >= GcwRank.COMMANDER: - actor.addAbility('pvp_last_man_rebel_ability') + actor.addAbility('command_pvp_last_man_rebel_ability') core.collectionService.addCollection(actor, 'pvp_rebel_commander') if newrank >= GcwRank.COLONEL: - actor.addAbility('pvp_aura_buff_self_rebel_ability') + actor.addAbility('pvp_aura_buff_rebel_self') core.collectionService.addCollection(actor, 'pvp_rebel_colonel') if newrank >= GcwRank.GENERAL: @@ -30,19 +30,19 @@ def handleRankUp(core, actor, newrank): def handleRankDown(actor, newrank): if newrank < GcwRank.LIEUTENANT: - actor.removeAbility('pvp_retaliation_rebel_ability') + actor.removeAbility('command_pvp_retaliation_rebel_ability') if newrank < GcwRank.CAPTAIN: - actor.removeAbility('pvp_adrenaline_rebel_ability') + actor.removeAbility('command_pvp_adrenaline_rebel_ability') if newrank < GcwRank.MAJOR: - actor.removeAbility('pvp_unstoppable_rebel_ability') + actor.removeAbility('command_pvp_unstoppable_rebel_ability') if newrank < GcwRank.COMMANDER: - actor.removeAbility('pvp_last_man_rebel_ability') + actor.removeAbility('command_pvp_last_man_rebel_ability') if newrank < GcwRank.COLONEL: - actor.removeAbility('pvp_aura_buff_self_rebel_ability') + actor.removeAbility('pvp_aura_buff_rebel_self') if newrank < GcwRank.GENERAL: actor.removeAbility('pvp_airstrike_rebel_ability') diff --git a/scripts/object/tangible/wearables/armor/rebel_assault/armor_rebel_spec_ops_belt.py b/scripts/object/tangible/wearables/armor/rebel_assault/armor_rebel_spec_ops_belt.py index 1be134b6..b589b6e8 100644 --- a/scripts/object/tangible/wearables/armor/rebel_assault/armor_rebel_spec_ops_belt.py +++ b/scripts/object/tangible/wearables/armor/rebel_assault/armor_rebel_spec_ops_belt.py @@ -10,10 +10,4 @@ def setup(core, object): object.setIntAttribute('no_trade', 1) object.setStringAttribute('faction_restriction', 'Rebel') object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') - object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) - object.setIntAttribute('cat_armor_standard_protection.energy', 4608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/rebel_assault/armor_rebel_spec_ops_boots.py b/scripts/object/tangible/wearables/armor/rebel_assault/armor_rebel_spec_ops_boots.py index f7d17219..c79a2747 100644 --- a/scripts/object/tangible/wearables/armor/rebel_assault/armor_rebel_spec_ops_boots.py +++ b/scripts/object/tangible/wearables/armor/rebel_assault/armor_rebel_spec_ops_boots.py @@ -10,10 +10,4 @@ def setup(core, object): object.setIntAttribute('no_trade', 1) object.setStringAttribute('faction_restriction', 'Rebel') object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') - object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) - object.setIntAttribute('cat_armor_standard_protection.energy', 4608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/rebel_assault/armor_rebel_spec_ops_gloves.py b/scripts/object/tangible/wearables/armor/rebel_assault/armor_rebel_spec_ops_gloves.py index 2e0a2417..ff30b43a 100644 --- a/scripts/object/tangible/wearables/armor/rebel_assault/armor_rebel_spec_ops_gloves.py +++ b/scripts/object/tangible/wearables/armor/rebel_assault/armor_rebel_spec_ops_gloves.py @@ -10,10 +10,4 @@ def setup(core, object): object.setIntAttribute('no_trade', 1) object.setStringAttribute('faction_restriction', 'Rebel') object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') - object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) - object.setIntAttribute('cat_armor_standard_protection.energy', 4608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_belt_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_belt_05_01.py index 3c98941f..3ebc0dbf 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_belt_05_01.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_belt_05_01.py @@ -11,10 +11,4 @@ def setup(core, object): object.setIntAttribute('no_trade', 1) object.setStringAttribute('faction_restriction', 'Imperial') object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') - object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) - object.setIntAttribute('cat_armor_standard_protection.energy', 4608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_boots_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_boots_05_01.py index 5e993cf8..ffcc1157 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_boots_05_01.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_boots_05_01.py @@ -11,10 +11,4 @@ def setup(core, object): object.setIntAttribute('no_trade', 1) object.setStringAttribute('faction_restriction', 'Imperial') object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') - object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) - object.setIntAttribute('cat_armor_standard_protection.energy', 4608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) return \ No newline at end of file diff --git a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_gloves_05_01.py b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_gloves_05_01.py index bfcbba83..8781ee28 100644 --- a/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_gloves_05_01.py +++ b/scripts/object/tangible/wearables/armor/stormtrooper/armor_pvp_spec_ops_imperial_black_gloves_05_01.py @@ -11,10 +11,4 @@ def setup(core, object): object.setIntAttribute('no_trade', 1) object.setStringAttribute('faction_restriction', 'Imperial') object.setStringAttribute('armor_category', '@obj_attr_n:armor_assault') - object.setIntAttribute('cat_armor_standard_protection.kinetic', 6608) - object.setIntAttribute('cat_armor_standard_protection.energy', 4608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_heat', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_cold', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_acid', 5608) - object.setIntAttribute('cat_armor_special_protection.special_protection_type_electricity', 5608) return \ No newline at end of file