mirror of
https://github.com/ProjectSWGCore/NGECore2.git
synced 2026-08-27 17:57:22 -04:00
Fixed GCW rank commands not being rewarded,
Fixed GCW rank armor stats.
This commit is contained in:
@@ -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')
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
-6
@@ -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
|
||||
-6
@@ -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
|
||||
-6
@@ -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
|
||||
Reference in New Issue
Block a user