Skip to content

Commit

Permalink
Fix status path in character files
Browse files Browse the repository at this point in the history
  • Loading branch information
yihuai-gao committed Jun 25, 2023
1 parent 7ae4132 commit 64903de
Show file tree
Hide file tree
Showing 19 changed files with 27 additions and 20 deletions.
8 changes: 4 additions & 4 deletions gisim/Status/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

from gisim.classes.enums import CharPos, ElementType, PlayerID, StatusType
from gisim.env import INF_INT
from gisim.status.base import CharacterStatusEntity, CombatStatusEntity
from gisim.status.character_status import *
from gisim.status.combat_status import get_combat_status_entity
from gisim.status.reaction_status import *
from gisim.classes.status import CharacterStatusEntity, CombatStatusEntity
from gisim.classes.status.character_status import *
from gisim.classes.status.combat_status import get_combat_status_entity
from gisim.classes.status.reaction_status import *


def get_character_status_entity(
Expand Down
2 changes: 1 addition & 1 deletion gisim/Status/character_status/RaidenShogun.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from gisim.classes.enums import AttackType, StatusType
from gisim.classes.message import DealDamageMsg
from gisim.env import INF_INT
from gisim.status import CharacterStatusEntity
from gisim.classes.status import CharacterStatusEntity


class ChakraDesiderata(CharacterStatusEntity):
Expand Down
2 changes: 1 addition & 1 deletion gisim/Status/character_status/Razor.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from gisim.classes.enums import AttackType, ElementType, StatusType
from gisim.classes.message import DealDamageMsg, RoundEndMsg
from gisim.env import INF_INT
from gisim.status import CharacterStatusEntity
from gisim.classes.status import CharacterStatusEntity


class TheWolfWithin(CharacterStatusEntity):
Expand Down
2 changes: 1 addition & 1 deletion gisim/Status/character_status/Tighnari.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from gisim.classes.enums import *
from gisim.classes.message import DealDamageMsg, RoundEndMsg
from gisim.env import INF_INT
from gisim.status.base import CharacterStatusEntity
from gisim.classes.status import CharacterStatusEntity


class VijanaSuffusion(CharacterStatusEntity):
Expand Down
2 changes: 1 addition & 1 deletion gisim/Status/character_status/elemental_infusion.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from gisim.classes.enums import *
from gisim.classes.message import DealDamageMsg, RoundEndMsg
from gisim.env import INF_INT
from gisim.status.base import CharacterStatusEntity
from gisim.classes.status import CharacterStatusEntity


class ElementalInfusion(CharacterStatusEntity):
Expand Down
2 changes: 1 addition & 1 deletion gisim/Status/combat_status/Chongyun.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from queue import PriorityQueue

from gisim.env import INF_INT
from gisim.status import CombatStatusEntity
from gisim.classes.status import CombatStatusEntity


class ChonghuasFrostField(CombatStatusEntity):
Expand Down
2 changes: 1 addition & 1 deletion gisim/Status/combat_status/Shield.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from gisim.classes.message import DealDamageMsg
from gisim.env import INF_INT
from gisim.status import CombatStatusEntity
from gisim.classes.status import CombatStatusEntity


class Shield(CombatStatusEntity):
Expand Down
2 changes: 1 addition & 1 deletion gisim/Status/combat_status/Xingqiu.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from gisim.classes.enums import *
from gisim.classes.message import AfterUsingSkillMsg, DealDamageMsg, RoundEndMsg
from gisim.env import INF_INT
from gisim.status.base import CombatStatusEntity
from gisim.classes.status import CombatStatusEntity


class RainSword(CombatStatusEntity):
Expand Down
2 changes: 1 addition & 1 deletion gisim/Status/combat_status/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from gisim.classes.enums import PlayerID
from gisim.env import INF_INT
from gisim.status.base import CombatStatusEntity
from gisim.classes.status import CombatStatusEntity

from .Chongyun import *
from .dendro_reaction import *
Expand Down
2 changes: 1 addition & 1 deletion gisim/Status/combat_status/dendro_reaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from gisim.classes.enums import *
from gisim.classes.message import DealDamageMsg
from gisim.env import INF_INT
from gisim.status.base import CombatStatusEntity
from gisim.classes.status import CombatStatusEntity


class DendroCore(CombatStatusEntity):
Expand Down
2 changes: 1 addition & 1 deletion gisim/Status/reaction_status/frozen_effect.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from gisim.classes.enums import *
from gisim.classes.message import DealDamageMsg, RoundEndMsg
from gisim.status.base import CharacterStatusEntity
from gisim.classes.status import CharacterStatusEntity


class FrozenEffect(CharacterStatusEntity):
Expand Down
2 changes: 1 addition & 1 deletion gisim/cards/characters/Anemo/Venti.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from gisim.classes.message import PayChangeCharacterCostMsg
from gisim.classes.summon import AttackSummon
from gisim.env import INF_INT
from gisim.status import CombatStatusEntity
from gisim.classes.status import CombatStatusEntity


class DivineMarksmanship(GenericSkill):
Expand Down
2 changes: 1 addition & 1 deletion gisim/cards/characters/Anemo/Xiao.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from gisim.cards.characters.base import CharacterCard, CharacterSkill, GenericSkill
from gisim.classes.enums import ElementType, Nation, SkillType, StatusType, WeaponType
from gisim.classes.message import DealDamageMsg
from gisim.status import CharacterStatusEntity
from gisim.classes.status import CharacterStatusEntity


class WhirlwindThrust(GenericSkill):
Expand Down
2 changes: 1 addition & 1 deletion gisim/cards/characters/Cryo/Eula.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from gisim.classes.enums import ElementType, Nation, SkillType, StatusType, WeaponType
from gisim.classes.message import DealDamageMsg
from gisim.classes.summon import AttackSummon
from gisim.status import CharacterStatusEntity
from gisim.classes.status import CharacterStatusEntity


class FavoniusBladeworkEdel(GenericSkill):
Expand Down
4 changes: 4 additions & 0 deletions gisim/cards/characters/Electro/RaidenShogun.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
from queue import PriorityQueue
from typing import TYPE_CHECKING, Dict, cast

from classes.status import CharacterStatusEntity

from gisim.cards.characters.base import CharacterCard, CharacterSkill, GenericSkill
from gisim.classes.enums import (
AttackType,
Expand Down Expand Up @@ -217,3 +219,5 @@ class RaidenShogun(CharacterCard):
SecretArtMusouShinsetsu(),
ChakraDesiderata(),
]


4 changes: 3 additions & 1 deletion gisim/cards/characters/Pyro/Hutao.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
from queue import PriorityQueue
from typing import TYPE_CHECKING, Dict, List, cast

from classes.status import CharacterStatusEntity

from gisim.cards.characters.base import CharacterCard, CharacterSkill, GenericSkill
from gisim.classes.enums import (
AttackType,
Expand All @@ -11,7 +13,7 @@
StatusType,
WeaponType,
)
from gisim.classes.message import DealDamageMsg, HealHpMsg, UseSkillMsg
from gisim.classes.message import DealDamageMsg, HealHpMsg, RoundEndMsg, UseSkillMsg
from gisim.env import INF_INT

if TYPE_CHECKING:
Expand Down
1 change: 1 addition & 0 deletions gisim/classes/status.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ def encode(self):


class ElementalInfusion(CharacterStatusEntity):
"""元素附魔"""
name: str
element: ElementType
description: str = "Convert physical damage into elemental damage"
Expand Down
4 changes: 2 additions & 2 deletions gisim/player_area.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
)

# from gisim.classes.status import CharacterStatusEntity, get_character_status_entity
from gisim.status import (
from gisim.classes.status import (
CharacterStatusEntity,
CombatStatusEntity,
get_character_status_entity,
Expand All @@ -47,7 +47,7 @@
from gisim.classes.summon import Summon
from gisim.classes.support import Support
from gisim.game import Game
from gisim.status import CombatStatusEntity
from gisim.classes.status import CombatStatusEntity


class BaseZone(ABC):
Expand Down
File renamed without changes.

0 comments on commit 64903de

Please sign in to comment.