Skip to content

Commit e05a121

Browse files
author
Hexalgo
committed
add autoflake delete of unused imports and variables
1 parent 1c67b0d commit e05a121

File tree

18 files changed

+47
-26
lines changed

18 files changed

+47
-26
lines changed

.pre-commit-config.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
repos:
2+
- repo: https://github.com/myint/autoflake
3+
rev: v1.4 # Use the latest revision
4+
hooks:
5+
- id: autoflake
6+
args: ["--in-place", "--remove-all-unused-imports", "--remove-unused-variables", "--recursive"]
7+
additional_dependencies: [black==21.12b0] # Ensure compatible black version is installed if not globally available
28
- repo: https://github.com/pre-commit/pre-commit-hooks
39
rev: v4.6.0
410
hooks:
@@ -10,7 +16,8 @@ repos:
1016
name: isort (Python imports)
1117
args: ['--profile', 'black', '--line-length', '119']
1218
- repo: https://github.com/psf/black
13-
rev: 24.4.0
19+
rev: 21.12b0 # Use the latest stable version
1420
hooks:
1521
- id: black
16-
args: ['--line-length', '119']
22+
additional_dependencies: ['click==8.0.1'] # specify a compatible version of click
23+
args: ['--line-length', '119']

pydofus2/com/ankamagames/dofus/datacenter/spells/Spell.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import re
2-
from typing import TYPE_CHECKING, Any
1+
from typing import TYPE_CHECKING
32

43
from pydofus2.com.ankamagames.dofus.datacenter.spells.BoundScriptUsageData import BoundScriptUsageData
54
from pydofus2.com.ankamagames.dofus.datacenter.spells.SpellScript import SpellScript
@@ -12,7 +11,7 @@
1211

1312
if TYPE_CHECKING:
1413
from pydofus2.com.ankamagames.dofus.datacenter.spells.EffectZone import EffectZone
15-
from pydofus2.com.ankamagames.dofus.datacenter.spells.SpellLevel import SpellLevel
14+
from pydofus2.com.ankamagames.dofus.datacenter.spells.SpellLevel import SpellLevel # noqa
1615

1716

1817
class Spell(IDataCenter):

pydofus2/com/ankamagames/dofus/datacenter/world/Area.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from pydofus2.com.ankamagames.dofus.datacenter.world.WorldMap import WorldMap
33
from pydofus2.com.ankamagames.dofus.types.IdAccessors import IdAccessors
44
from pydofus2.com.ankamagames.jerakine.data.GameData import GameData
5-
from pydofus2.com.ankamagames.jerakine.data.GameDataField import GameDataField
65
from pydofus2.com.ankamagames.jerakine.data.I18n import I18n
76
from pydofus2.com.ankamagames.jerakine.interfaces.IDataCenter import IDataCenter
87
from pydofus2.com.ankamagames.jerakine.utils.misc.StringUtils import StringUtils

pydofus2/com/ankamagames/dofus/logic/common/managers/PlayerManager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
if TYPE_CHECKING:
1010
from pydofus2.com.ankamagames.dofus.internalDatacenter.connection.BasicCharacterWrapper import (
1111
BasicCharacterWrapper,
12-
)
12+
) # noqa
1313

1414
from pydofus2.com.ankamagames.dofus.network.types.game.havenbag.HavenBagRoomPreviewInformation import (
1515
HavenBagRoomPreviewInformation,

pydofus2/com/ankamagames/dofus/logic/game/fight/frames/FightSequenceFrame.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
GameActionFightInvisibilityStateEnum,
8484
)
8585
from pydofus2.com.ankamagames.dofus.network.enums.GameActionMarkTypeEnum import GameActionMarkTypeEnum
86-
from pydofus2.com.ankamagames.dofus.scripts.SpellScriptContext import SpellScriptContext
8786
from pydofus2.com.ankamagames.dofus.scripts.SpellScriptManager import SpellScriptManager
8887
from pydofus2.com.ankamagames.jerakine.entities.interfaces.IMovable import IMovable
8988
from pydofus2.com.ankamagames.jerakine.logger.Logger import Logger
@@ -97,7 +96,6 @@
9796
)
9897

9998
from pydofus2.com.ankamagames.dofus.datacenter.effects.Effect import Effect
100-
from pydofus2.com.ankamagames.dofus.datacenter.effects.instances.EffectInstanceDice import EffectInstanceDice
10199
from pydofus2.com.ankamagames.dofus.datacenter.monsters.Monster import Monster
102100
from pydofus2.com.ankamagames.dofus.datacenter.spells.Spell import Spell
103101
from pydofus2.com.ankamagames.dofus.enums.ActionIds import ActionIds
@@ -109,7 +107,6 @@
109107
from pydofus2.com.ankamagames.dofus.logic.game.fight.managers.CurrentPlayedFighterManager import (
110108
CurrentPlayedFighterManager,
111109
)
112-
from pydofus2.com.ankamagames.dofus.logic.game.fight.types.BasicBuff import BasicBuff
113110
from pydofus2.com.ankamagames.dofus.logic.game.fight.types.SpellCastSequenceContext import SpellCastSequenceContext
114111
from pydofus2.com.ankamagames.dofus.misc.utils.GameDebugManager import GameDebugManager
115112
from pydofus2.com.ankamagames.dofus.network.enums.FightSpellCastCriticalEnum import FightSpellCastCriticalEnum
@@ -253,9 +250,6 @@
253250
RefreshCharacterStatsMessage,
254251
)
255252
from pydofus2.com.ankamagames.dofus.network.messages.game.context.GameMapMovementMessage import GameMapMovementMessage
256-
from pydofus2.com.ankamagames.dofus.network.types.game.actions.fight.AbstractFightDispellableEffect import (
257-
AbstractFightDispellableEffect,
258-
)
259253
from pydofus2.com.ankamagames.dofus.network.types.game.actions.fight.FightTemporaryBoostEffect import (
260254
FightTemporaryBoostEffect,
261255
)

pydofus2/com/ankamagames/dofus/logic/game/fight/managers/MarkedCellsManager.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
from pydofus2.com.ankamagames.dofus.network.enums.GameActionMarkTypeEnum import GameActionMarkTypeEnum
1111
from pydofus2.com.ankamagames.dofus.network.enums.TeamEnum import TeamEnum
1212
from pydofus2.com.ankamagames.dofus.network.types.game.actions.fight.GameActionMarkedCell import GameActionMarkedCell
13-
from pydofus2.com.ankamagames.dofus.scripts.SpellScriptContext import SpellScriptContext
1413
from pydofus2.com.ankamagames.dofus.types.entities.Glyph import Glyph
1514
from pydofus2.com.ankamagames.jerakine.interfaces.IDestroyable import IDestroyable
1615
from pydofus2.com.ankamagames.jerakine.logger.Logger import Logger

pydofus2/com/ankamagames/dofus/logic/game/fight/managers/SpellZoneManager.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
GameFightFighterInformations,
1717
)
1818
from pydofus2.com.ankamagames.dofus.uiApi.PlayedCharacterApi import PlayedCharacterApi
19-
from pydofus2.com.ankamagames.jerakine.logger.Logger import Logger
2019
from pydofus2.com.ankamagames.jerakine.metaclasses.Singleton import Singleton
2120
from pydofus2.com.ankamagames.jerakine.types.positions.MapPoint import MapPoint
2221
from pydofus2.com.ankamagames.jerakine.types.zones.Cone import Cone

pydofus2/com/ankamagames/dofus/logic/game/fight/miscs/DamageUtil.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import logging
2-
31
from pydofus2.com.ankamagames.dofus.kernel.Kernel import Kernel
42
from pydofus2.com.ankamagames.dofus.logic.game.fight.frames.Preview.FighterTranslator import FighterTranslator
53
from pydofus2.com.ankamagames.dofus.logic.game.fight.frames.Preview.MapTranslator import MapTranslator

pydofus2/com/ankamagames/dofus/logic/game/fight/steps/FightPlaySpellScriptStep.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from pydofus2.com.ankamagames.dofus.scripts.SpellScriptContext import SpellScriptContext
88
from pydofus2.com.ankamagames.jerakine.logger.Logger import Logger
99
from pydofus2.com.ankamagames.jerakine.sequencer.AbstractSequencable import AbstractSequencable
10-
from pydofus2.com.ankamagames.jerakine.types.Callback import Callback
1110

1211

1312
class FightPlaySpellScriptStep(AbstractSequencable, IFightStep):

pydofus2/com/ankamagames/dofus/logic/game/roleplay/frames/RoleplayEntitiesFrame.py

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
from pydofus2.com.ankamagames.dofus.logic.game.roleplay.types.FightTeam import FightTeam
2121
from pydofus2.com.ankamagames.dofus.network.enums.MapObstacleStateEnum import MapObstacleStateEnum
2222
from pydofus2.com.ankamagames.dofus.network.messages.common.basic.BasicPingMessage import BasicPingMessage
23+
from pydofus2.com.ankamagames.dofus.network.messages.game.context.fight.GameFightOptionStateUpdateMessage import (
24+
GameFightOptionStateUpdateMessage,
25+
)
2326
from pydofus2.com.ankamagames.dofus.network.messages.game.context.fight.GameFightUpdateTeamMessage import (
2427
GameFightUpdateTeamMessage,
2528
)
@@ -143,6 +146,7 @@ def __init__(self):
143146
super().__init__()
144147

145148
def pulled(self) -> bool:
149+
Logger().debug("pulled")
146150
self._fights.clear()
147151
self._objects.clear()
148152
self._npcList.clear()
@@ -151,6 +155,7 @@ def pulled(self) -> bool:
151155
return super().pulled()
152156

153157
def pushed(self) -> bool:
158+
Logger().debug("pushed")
154159
self.nbrFails = 0
155160
self.initNewMap()
156161
self.mcidm_processed = False
@@ -360,6 +365,24 @@ def process(self, msg: Message):
360365
self.updateFight(gfutmsg.fightId, gfutmsg.team)
361366
return True
362367

368+
elif isinstance(msg, GameFightOptionStateUpdateMessage):
369+
gfosumsg = msg
370+
self.updateSwordOptions(gfosumsg.fightId, gfosumsg.teamId, gfosumsg.option, gfosumsg.state)
371+
KernelEventsManager().send(
372+
KernelEvent.FightOptionStateUpdate, gfosumsg.fightId, gfosumsg.teamId, gfosumsg.option, gfosumsg.state
373+
)
374+
375+
return True
376+
377+
elif isinstance(msg, GameFightOptionStateUpdateMessage):
378+
gfosumsg = msg
379+
self.updateSwordOptions(gfosumsg.fightId, gfosumsg.teamId, gfosumsg.option, gfosumsg.state)
380+
KernelEventsManager().send(
381+
KernelEvent.FightOptionStateUpdate, gfosumsg.fightId, gfosumsg.teamId, gfosumsg.option, gfosumsg.state
382+
)
383+
384+
return True
385+
363386
elif isinstance(msg, GameRolePlayShowChallengeMessage):
364387
grpsclmsg = msg
365388
self.addFight(grpsclmsg.commonsInfos)
@@ -430,6 +453,17 @@ def removeFight(self, fightId: int) -> None:
430453
del team.teamEntity
431454
del self._fights[fightId]
432455

456+
def updateSwordOptions(self, fightId: int, teamId: int, option: int = -1, state: bool = False):
457+
fight: Fight = self._fights.get(fightId, None)
458+
if not fight:
459+
return
460+
fightTeam: FightTeam = fight.getTeamById(teamId)
461+
462+
if not fightTeam:
463+
return
464+
if option != -1:
465+
fightTeam.teamOptions[option] = state
466+
433467
def updateFight(self, fightId: int, team: FightTeamInformations) -> None:
434468
present: bool = False
435469
fight: Fight = self._fights.get(fightId)

0 commit comments

Comments
 (0)