dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Fix toggling of abilities of projected fighters

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-11 13:45:25 +03:00
parent fc82e45d6c
commit f2c26af791
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/builtinContextMenus/fighterAbilities.py
View File

@@ -14,6 +14,7 @@ class FighterAbility(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
self.isProjected = None
def display(self, srcContext, selection):
if not self.settings.get('fighterAbilities'):
@@ -23,6 +24,7 @@ class FighterAbility(ContextMenu):
return False
self.fighter = selection[0]
self.isProjected = True if srcContext == "projectedFighter" else False
return True
def getText(self, itmContext, selection):
@@ -60,8 +62,12 @@ class FighterAbility(ContextMenu):
fitID = self.mainFrame.getActiveFit()
fit = Fit.getInstance().getFit(fitID)
index = fit.fighters.index(self.fighter)
self.mainFrame.command.Submit(cmd.GuiToggleFighterAbilityCommand(fitID, index, ability.effectID))
print(self.isProjected)
if self.isProjected:
index = fit.projectedFighters.index(self.fighter)
else:
index = fit.fighters.index(self.fighter)
self.mainFrame.command.Submit(cmd.GuiToggleFighterAbilityCommand(fitID, index, ability.effectID, self.isProjected))
FighterAbility.register()

11
gui/fitCommands/calc/fitToggleFighterAbility.py
View File

@@ -10,16 +10,21 @@ pyfalog = Logger(__name__)
class FitToggleFighterAbilityCommand(wx.Command):
def __init__(self, fitID, position, effectID):
def __init__(self, fitID, position, effectID, isProjected):
wx.Command.__init__(self, True, "Toggle Fighter Ability")
self.fitID = fitID
self.position = position
self.effectID = effectID
self.isProjected = isProjected
def Do(self):
pyfalog.debug("Toggling fighter ability for fit ID: {0}", self.fitID)
fit = Fit.getInstance().getFit(self.fitID)
fighter = fit.fighters[self.position]
if self.isProjected:
fighter = fit.projectedFighters[self.position]
else:
fighter = fit.fighters[self.position]
for fa in fighter.abilities:
if fa.effectID == self.effectID:
ability = fa
@@ -32,5 +37,5 @@ class FitToggleFighterAbilityCommand(wx.Command):
return True
def Undo(self):
cmd = FitToggleFighterAbilityCommand(self.fitID, self.position, self.effectID)
cmd = FitToggleFighterAbilityCommand(self.fitID, self.position, self.effectID, self.isProjected)
return cmd.Do()

5
gui/fitCommands/guiToggleFighterAbility.py
View File

@@ -8,16 +8,17 @@ from .calc.fitToggleFighterAbility import FitToggleFighterAbilityCommand
class GuiToggleFighterAbilityCommand(wx.Command):
def __init__(self, fitID, position, effectID):
def __init__(self, fitID, position, effectID, isProjected):
wx.Command.__init__(self, True, "")
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.internal_history = wx.CommandProcessor()
self.fitID = fitID
self.position = position
self.effectID = effectID
self.isProjected = isProjected
def Do(self):
if self.internal_history.Submit(FitToggleFighterAbilityCommand(self.fitID, self.position, self.effectID)):
if self.internal_history.Submit(FitToggleFighterAbilityCommand(self.fitID, self.position, self.effectID, self.isProjected)):
Fit.getInstance().recalc(self.fitID)
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
return True