Merge branch 'main' of https://github.com/hegugu-ng/genius-invokation…

…-gym

gisim/cards/characters/Dendro/Tighnari.py

@@ -2,11 +2,11 @@
 from typing import cast
 
 from classes.message import DealDamageMsg, RoundEndMsg
-from gisim.classes.status import CharacterStatusEntity
 from env import INF_INT
 
 from gisim.cards.characters.base import CharacterCard, CharacterSkill, GenericSkill
 from gisim.classes.enums import ElementType, Nation, SkillType, WeaponType
+from gisim.classes.status import CharacterStatusEntity
 from gisim.classes.summon import AttackSummon
 
 

gisim/cards/characters/Electro/RaidenShogun.py

@@ -2,8 +2,6 @@
 from queue import PriorityQueue
 from typing import TYPE_CHECKING, Dict, cast
 
-from gisim.classes.status import CharacterStatusEntity
-
 from gisim.cards.characters.base import CharacterCard, CharacterSkill, GenericSkill
 from gisim.classes.enums import (
     AttackType,
@@ -22,6 +20,7 @@
     RoundEndMsg,
     UseSkillMsg,
 )
+from gisim.classes.status import CharacterStatusEntity
 from gisim.classes.summon import AttackSummon
 from gisim.env import INF_INT
 

gisim/cards/characters/Hydro/Xingqiu.py

@@ -19,6 +19,7 @@
 from gisim.classes.status import CombatStatusEntity
 from gisim.classes.summon import AttackSummon, Summon
 from gisim.env import INF_INT
+from gisim.get_game_info import get_game_info
 
 
 class GuhuaStyle(GenericSkill):

gisim/cards/characters/Pyro/Hutao.py

@@ -2,8 +2,6 @@
 from queue import PriorityQueue
 from typing import TYPE_CHECKING, Dict, List, cast
 
-from gisim.classes.status import CharacterStatusEntity
-
 from gisim.cards.characters.base import CharacterCard, CharacterSkill, GenericSkill
 from gisim.classes.enums import (
     AttackType,
@@ -14,6 +12,7 @@
     WeaponType,
 )
 from gisim.classes.message import DealDamageMsg, HealHpMsg, RoundEndMsg, UseSkillMsg
+from gisim.classes.status import CharacterStatusEntity
 from gisim.env import INF_INT
 
 if TYPE_CHECKING:

gisim/game.py

@@ -15,7 +15,13 @@
 
 
 class Game:
-    def __init__(
+    def __new__(cls):
+        """Singleton Mode for global game info access"""
+        if not hasattr(cls, "instance"):
+            cls.instance = super(Game, cls).__new__(cls)
+        return cls.instance
+
+    def init_deck(
         self, player1_deck: dict, player2_deck: dict, seed: Optional[int] = None
     ):
         if seed is None:

gisim/get_game_info.py

@@ -0,0 +1,5 @@
+def get_game_info():
+    from gisim.game import Game
+
+    game = Game()
+    return game.encode_game_info()

tests/test_element_reaction.py

@@ -4,9 +4,10 @@
 from gisim.classes.reaction import (
     can_attachable,
     element_reaction,
+    get_reaction_system,
+    get_reaction_system_by_type,
     sum_element_reaction,
 )
-from gisim.elemental_reaction import get_reaction_system, get_reaction_system_by_type
 
 # 获取反应体系 多元素反应
 

tests/test_framework.py

@@ -18,7 +18,8 @@
         "characters": ["Kamisato Ayaka", "Kamisato Ayaka", "Kamisato Ayaka"],
         "cards": [],
     }
-    game = Game(player1_deck, player2_deck, seed=10)
+    game = Game()
+    game.init_deck(player1_deck, player2_deck, seed=10)
     player1_agent = AttackOnlyAgent(PlayerID.PLAYER1)
     player2_agent = NoAttackAgent(PlayerID.PLAYER2)
     game_end = False

tests/test_framework_with_reaction.py

@@ -19,7 +19,9 @@
         "characters": ["KamisatoAyaka", "Xingqiu", "Sucrose"],
         "cards": [],
     }
-    game = Game(player1_deck, player2_deck, seed=10)
+    game = Game()
+    game.init_deck(player1_deck=player1_deck, player2_deck=player1_deck, seed=10)
+
     player1_agent = AttackOnlyAgent(PlayerID.PLAYER1)
     player2_agent = AttackOnlyAgent(PlayerID.PLAYER2)
     # player2_agent = NoAttackAgent(PlayerID.PLAYER2)