fight context rework cleaned and rebased by hadamard

Author: Hexalgo

pydofus2/binaryData/14_com.ankamagames.dofus.kernel.sound.manager.RegConnectionManager_Reg_com.ankamagames.dofus.kernel.sound.manager.RegConnectionManager_Reg.bin

@@ -46,17 +46,26 @@ class KernelEvent(Enum):
 
     # Fight
     FightSwordShowed = auto()
+    FightTurnReadyRequest = auto()
+    FightTurnStart = auto()
+    FightTurnStartPlaying = auto()
+    FightTurnEnd = auto()
+    FightOptionStateUpdate = auto()
     FightResumed = auto()
     FighterMovementApplied = auto()
     FighterCastedSpell = auto()
     SequenceExecFinished = auto()
+    SequenceEnd = auto()
+    SequenceStart = auto()
     FightStarted = auto()
     FightEnded = auto()
     MuleFightContext = auto()
     FighterShowed = auto()
     FightJoined = auto()
     RoleplayStarted = auto()
     FightLeader = auto()
+    ActionFightNoSpellCast = auto()
+    FightMapNoMovement = auto()
 
     # buffs in fight
     BuffAdd = auto()

pydofus2/com/ankamagames/berilia/managers/KernelEvent.py

@@ -8,6 +8,8 @@
 from pydofus2.com.ankamagames.berilia.managers.KernelEventsManager import KernelEventsManager
 from pydofus2.com.ankamagames.dofus.internalDatacenter.spells.SpellWrapper import SpellWrapper
 from pydofus2.com.ankamagames.dofus.kernel.Kernel import Kernel
+from pydofus2.com.ankamagames.dofus.kernel.net.ConnectionsHandler import ConnectionsHandler
+from pydofus2.com.ankamagames.dofus.logic.common.managers.PlayerManager import PlayerManager
 from pydofus2.com.ankamagames.dofus.logic.common.managers.StatsManager import StatsManager
 from pydofus2.com.ankamagames.dofus.logic.game.common.managers.PlayedCharacterManager import PlayedCharacterManager
 from pydofus2.com.ankamagames.dofus.logic.game.common.misc.DofusEntities import DofusEntities
@@ -69,6 +71,21 @@
 from pydofus2.com.ankamagames.dofus.network.messages.game.context.fight.GameFightTurnListMessage import (
     GameFightTurnListMessage,
 )
+from pydofus2.com.ankamagames.dofus.network.messages.game.context.fight.GameFightTurnReadyMessage import (
+    GameFightTurnReadyMessage,
+)
+from pydofus2.com.ankamagames.dofus.network.messages.game.context.fight.GameFightTurnReadyRequestMessage import (
+    GameFightTurnReadyRequestMessage,
+)
+from pydofus2.com.ankamagames.dofus.network.messages.game.context.fight.GameFightTurnResumeMessage import (
+    GameFightTurnResumeMessage,
+)
+from pydofus2.com.ankamagames.dofus.network.messages.game.context.fight.GameFightTurnStartMessage import (
+    GameFightTurnStartMessage,
+)
+from pydofus2.com.ankamagames.dofus.network.messages.game.context.fight.GameFightTurnStartPlayingMessage import (
+    GameFightTurnStartPlayingMessage,
+)
 from pydofus2.com.ankamagames.dofus.network.messages.game.context.fight.SlaveNoLongerControledMessage import (
     SlaveNoLongerControledMessage,
 )
@@ -189,6 +206,27 @@ def process(self, msg: Message) -> bool:
                 self.updateTurnsList(gftmsg.ids, gftmsg.deadsIds)
             return True
 
+        elif isinstance(msg, GameFightTurnStartMessage):
+            if not Kernel().fightEntitiesFrame:
+                return KernelEventsManager().onceFramePushed(
+                    "FightEntitiesFrame", self.process, [msg], originator=self
+                )
+            Logger().separator(f"Player {msg.id} turn to play", "~")
+            self._currentPlayerId = msg.id
+            if not self._lastPlayerId:
+                self._lastPlayerId = self._currentPlayerId
+            if not isinstance(msg, GameFightTurnResumeMessage):
+                bffm.BuffManager().decrementDuration(msg.id)
+                bffm.BuffManager().resetTriggerCount(msg.id)
+            if Kernel().battleFrame:
+                Kernel().battleFrame.removeSavedPosition(msg.id)
+                if Kernel().fightEntitiesFrame:
+                    for entityId, infos in Kernel().fightEntitiesFrame.entities.items():
+                        if infos and infos.stats.summoner == msg.id:
+                            Kernel().battleFrame.removeSavedPosition(entityId)
+            KernelEventsManager().send(KernelEvent.FightTurnStart, msg.id)
+            return True
+
         elif isinstance(msg, GameFightSynchronizeMessage):
             gftcimsg = msg
             if self._newWave:
@@ -233,7 +271,8 @@ def process(self, msg: Message) -> bool:
                 Kernel().worker.addFrame(self._sequenceFrameSwitcher)
             self._currentSequenceFrame = fseqf.FightSequenceFrame(self, self._currentSequenceFrame)
             self._sequenceFrameSwitcher.currentFrame = self._currentSequenceFrame
-            return False
+            KernelEventsManager().send(KernelEvent.SequenceStart, msg.sequenceType, msg.authorId)
+            return True
 
         elif isinstance(msg, SequenceEndMessage):
             semsg = msg
@@ -253,7 +292,8 @@ def process(self, msg: Message) -> bool:
                 self._currentSequenceFrame.execute()
                 self._sequenceFrameSwitcher.currentFrame = self._currentSequenceFrame.parent
                 self._currentSequenceFrame = self._currentSequenceFrame.parent
-            return False
+            KernelEventsManager().send(KernelEvent.SequenceEnd)
+            return True
 
         elif isinstance(msg, GameFightNewWaveMessage):
             gfnwmsg = msg
@@ -298,7 +338,7 @@ def process(self, msg: Message) -> bool:
                 self.endBattle(gfemsg)
             FightersStateManager().endFight()
             CurrentPlayedFighterManager().endFight()
-            return False
+            return True
 
         elif isinstance(msg, GameContextDestroyMessage):
             if self._battleResults:
@@ -327,6 +367,21 @@ def process(self, msg: Message) -> bool:
         elif isinstance(msg, RemoveSpellModifierMessage):
             SpellModifiersManager().deleteSpellModifierAction(msg.actorId, msg.modifierType, msg.actionType)
             return True
+        elif isinstance(msg, GameFightTurnStartPlayingMessage):
+            if PlayerManager().kisServerPort <= 0:
+                KernelEventsManager().send(KernelEvent.FightTurnStartPlaying)
+
+            return True
+
+        elif isinstance(msg, GameFightTurnReadyRequestMessage):
+            if self.executingSequence:
+                Logger().warn("Delaying turn end acknowledgement because we're still in a sequence.")
+                self._confirmTurnEnd = True
+            else:
+                self.confirmTurnEnd()
+
+            KernelEventsManager().send(KernelEvent.FightTurnReadyRequest)
+            return False
 
         elif isinstance(msg, GameFightTurnEndMessage):
             if not self._confirmTurnEnd:
@@ -336,6 +391,7 @@ def process(self, msg: Message) -> bool:
             entityInfos = Kernel().fightEntitiesFrame.getEntityInfos(msg.id)
             if isinstance(entityInfos, GameFightFighterInformations) and not entityInfos.spawnInfo.alive:
                 bffm.BuffManager().markFinishingBuffs(msg.id)
+                KernelEventsManager().send(KernelEvent.FightTurnEnd, msg.id)
                 if msg.id == CurrentPlayedFighterManager().currentFighterId:
                     CurrentPlayedFighterManager().getSpellCastManager().nextTurn()
                     SpellWrapper.refreshAllPlayerSpellHolder(msg.id)
@@ -370,6 +426,22 @@ def pulled(self) -> bool:
         KernelEventsManager().send(KernelEvent.FightEnded)
         return True
 
+    def confirmTurnEnd(self):
+        fighterInfos = Kernel().fightEntitiesFrame.getEntityInfos(self._lastPlayerId)
+        if fighterInfos:
+            bffm.BuffManager().markFinishingBuffs(self._lastPlayerId)
+            if self._lastPlayerId == CurrentPlayedFighterManager().currentFighterId:
+                SpellWrapper.refreshAllPlayerSpellHolder(self._lastPlayerId)
+            KernelEventsManager().send(KernelEvent.FightTurnEnd, self._lastPlayerId)
+        else:
+            Logger().error(f"Can't find fighter infos for player {self._lastPlayerId}")
+        spellCastManager = CurrentPlayedFighterManager().getSpellCastManagerById(self._lastPlayerId)
+        if spellCastManager:
+            spellCastManager.nextTurn()
+        turnReadyMsg = GameFightTurnReadyMessage()
+        turnReadyMsg.init(True)
+        ConnectionsHandler().send(turnReadyMsg)
+
     def getSequencesStack(self) -> list[fseqf.FightSequenceFrame]:
         res = []
         seq = self._currentSequenceFrame

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

@@ -37,6 +37,7 @@
 )
 from pydofus2.com.ankamagames.dofus.logic.game.fight.managers.SpellModifiersManager import SpellModifiersManager
 from pydofus2.com.ankamagames.dofus.logic.game.fight.types.SpellCastSequenceContext import SpellCastSequenceContext
+from pydofus2.com.ankamagames.dofus.logic.game.roleplay.frames.RoleplayEntitiesFrame import RoleplayEntitiesFrame
 from pydofus2.com.ankamagames.dofus.network.enums.ChallengeBonusEnum import ChallengeBonusEnum
 from pydofus2.com.ankamagames.dofus.network.enums.ChallengeModEnum import ChallengeModEnum
 from pydofus2.com.ankamagames.dofus.network.enums.ChallengeStateEnum import ChallengeStateEnum
@@ -113,6 +114,9 @@
 from pydofus2.com.ankamagames.dofus.network.messages.game.context.fight.GameFightLeaveMessage import (
     GameFightLeaveMessage,
 )
+from pydofus2.com.ankamagames.dofus.network.messages.game.context.fight.GameFightOptionStateUpdateMessage import (
+    GameFightOptionStateUpdateMessage,
+)
 from pydofus2.com.ankamagames.dofus.network.messages.game.context.fight.GameFightResumeMessage import (
     GameFightResumeMessage,
 )
@@ -516,7 +520,8 @@ def process(self, msg: Message) -> bool:
             SpellWrapper.resetAllCoolDown(PlayedCharacterManager().id, None)
             SpellModifiersManager.clear()
             Kernel().worker.removeFrame(self)
-            return False
+            KernelEventsManager().send(KernelEvent.FightEnded)
+            return True
 
         elif isinstance(msg, ChallengeTargetsListRequestAction):
             ctlra = msg
@@ -547,7 +552,8 @@ def process(self, msg: Message) -> bool:
             return True
 
         elif isinstance(msg, GameActionFightNoSpellCastMessage):
-            return False
+            KernelEventsManager().send(KernelEvent.ActionFightNoSpellCast)
+            return True
 
         elif isinstance(msg, UpdateSpellModifierAction):
             usma = msg
@@ -655,6 +661,16 @@ def process(self, msg: Message) -> bool:
             self._challengeBonusType = msg.challengeBonus
             KernelEventsManager().send(KernelEvent.ChallengeBonusSelected, self._challengeBonusType)
             return True
+        # THIS IS CUSTOM INTEGRATION.
+        elif isinstance(msg, GameFightOptionStateUpdateMessage):
+            gfosumsg = msg
+            KernelEventsManager().send(
+                KernelEvent.FightOptionStateUpdate, gfosumsg.fightId, gfosumsg.teamId, gfosumsg.option, gfosumsg.state
+            )
+            if Kernel().worker.getFrameByType(RoleplayEntitiesFrame):
+                return False
+
+            return True
 
         return False
 

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

@@ -1,6 +1,8 @@
 from typing import TYPE_CHECKING
 
 from pydofus2.com.ankamagames.atouin.messages.EntityMovementCompleteMessage import EntityMovementCompleteMessage
+from pydofus2.com.ankamagames.berilia.managers.KernelEvent import KernelEvent
+from pydofus2.com.ankamagames.berilia.managers.KernelEventsManager import KernelEventsManager
 from pydofus2.com.ankamagames.dofus.logic.game.common.misc.DofusEntities import DofusEntities
 from pydofus2.com.ankamagames.dofus.logic.game.fight.managers.CurrentPlayedFighterManager import (
     CurrentPlayedFighterManager,
@@ -83,7 +85,8 @@ def process(self, msg: Message) -> bool:
         if isinstance(msg, GameMapNoMovementMessage):
             if self.myTurn:
                 self._isRequestingMovement = False
-            return False
+                KernelEventsManager().send(KernelEvent.FightMapNoMovement)
+            return True
 
         elif isinstance(msg, EntityMovementCompleteMessage):
             if self.myTurn:

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

@@ -19,6 +19,7 @@ class IdentificationSuccessMessage(NetworkMessage):
     hasForceRight: bool
     wasAlreadyConnected: bool
     hasRights: bool
+    hasReportRight: bool
     hasForceRight: bool
     wasAlreadyConnected: bool
 

pydofus2/com/ankamagames/dofus/network/messages/connection/IdentificationSuccessMessage.py

@@ -23,9 +23,9 @@
 
 
 class Worker(MessageHandler):
-    DEBUG_FRAMES: bool = False
-    DEBUG_MESSAGES: bool = False
-    DEBUG_FRAMES_PROCESSING: bool = False
+    DEBUG_FRAMES: bool = True
+    DEBUG_MESSAGES: bool = True
+    DEBUG_FRAMES_PROCESSING: bool = True
     LOCK = threading.Lock()
     CONDITION = threading.Condition(LOCK)
     LAST_TIME = time.perf_counter()