|
@@ -1,4 +1,5 @@
|
|
|
import random
|
|
import random
|
|
|
|
|
+from functools import wraps
|
|
|
|
|
|
|
|
from module.logger import logger
|
|
from module.logger import logger
|
|
|
from module.atom.image import RuleImage
|
|
from module.atom.image import RuleImage
|
|
@@ -12,6 +13,16 @@ from tasks.Component.GeneralBattle.battle_wait import (
|
|
|
from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig, GreenMarkType
|
|
from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig, GreenMarkType
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+def log_battle_start(func):
|
|
|
|
|
+ @wraps(func)
|
|
|
|
|
+ def wrapper(owner, *args, **kwargs):
|
|
|
|
|
+ logger.hr("General battle start", 2)
|
|
|
|
|
+ return func(owner, *args, **kwargs)
|
|
|
|
|
+
|
|
|
|
|
+ return wrapper
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
class Battle(BattleWait):
|
|
class Battle(BattleWait):
|
|
|
|
|
|
|
|
def start_fire(self, buttons: list[RuleOcr | RuleImage], checks: list[RuleImage]) -> bool:
|
|
def start_fire(self, buttons: list[RuleOcr | RuleImage], checks: list[RuleImage]) -> bool:
|
|
@@ -47,6 +58,7 @@ class Battle(BattleWait):
|
|
|
continue
|
|
continue
|
|
|
return True
|
|
return True
|
|
|
|
|
|
|
|
|
|
+ @log_battle_start
|
|
|
@battle_wait_strategy()
|
|
@battle_wait_strategy()
|
|
|
def battle_wait(self, *args, **kwargs):
|
|
def battle_wait(self, *args, **kwargs):
|
|
|
return self.battle_wait_with_strategy(*args, **kwargs)
|
|
return self.battle_wait_with_strategy(*args, **kwargs)
|