From 724a6a6c5fdb6396cc0ce43f91f720bfab65eaaa Mon Sep 17 00:00:00 2001 From: Zing Date: Wed, 2 Jul 2014 18:05:48 -0700 Subject: [PATCH] Modified Removed Factional Comm-link until pet AI is ready. --- scripts/gcw_rewards_imperial.py | 2 +- scripts/gcw_rewards_rebel.py | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/gcw_rewards_imperial.py b/scripts/gcw_rewards_imperial.py index f94cf77b..a475d9db 100644 --- a/scripts/gcw_rewards_imperial.py +++ b/scripts/gcw_rewards_imperial.py @@ -269,7 +269,7 @@ def lieutenantHandler(owner): window.addListBoxMenuItem('HQ Field Hospital 3600000',4) window.addListBoxMenuItem('SF HQ Tactical Center 2325000',5) window.addListBoxMenuItem('SF HQ Detachment Headquarters 4500000',6) - window.addListBoxMenuItem('Factional Comm link 200000', 7) + #window.addListBoxMenuItem('Factional Comm link 200000', 7) window.setProperty('btnOk:visible', 'True') window.setProperty('btnCancel:visible', 'True') window.setProperty('btnOk:Text', '@ok') diff --git a/scripts/gcw_rewards_rebel.py b/scripts/gcw_rewards_rebel.py index d0ac37cf..e9e099ec 100644 --- a/scripts/gcw_rewards_rebel.py +++ b/scripts/gcw_rewards_rebel.py @@ -204,10 +204,10 @@ def seniorSergeantHandler(owner): window.addListBoxMenuItem('Small Block Turret 120000',0) window.addListBoxMenuItem('Small Dish Turret 120000',1) window.addListBoxMenuItem('Small Tower Turret 120000',2) - #window.addListBoxMenuItem('DRX-55 Mine 12000',3) - #window.addListBoxMenuItem('SR-88 Cyro Mine 12000',4) - #window.addListBoxMenuItem('XG Mine 12000',5) - window.addListBoxMenuItem('Painting We will never surrender 375000',6) + window.addListBoxMenuItem('Painting We will never surrender 375000',3) + #window.addListBoxMenuItem('DRX-55 Mine 12000',4) + #window.addListBoxMenuItem('SR-88 Cyro Mine 12000',5) + #window.addListBoxMenuItem('XG Mine 12000',6) window.setProperty('btnOk:visible', 'True') window.setProperty('btnCancel:visible', 'True') window.setProperty('btnOk:Text', '@ok') @@ -486,20 +486,22 @@ def seniorSergeantRewards(owner, window, eventType, returnList): return if returnList.get(0)=='3': + paintingNeverSurrender(object, owner) + return + + if returnList.get(0)=='4': drx55Mine(object, owner) return - if returnList.get(0)=='4': + if returnList.get(0)=='5': sr88CryoMine(object, owner) return - if returnList.get(0)=='5': + if returnList.get(0)=='6': xgMine(object, owner) return - if returnList.get(0)=='6': - paintingNeverSurrender(object, owner) - return + def sergeantMajorRewards(owner, window, eventType, returnList):