feat: ObjectPosition.check_position_valid

for skill end action, use position, not two attributes.

fix bugs in elemental reaction and catalyzing field.

add PlayerTable.get_active_charactor.

change name of catalyzing field.

server/action.py

@@ -236,8 +236,7 @@ class SkillEndAction(ActionBase):
     Action for ending skill.
     """
     type: Literal[ActionTypes.SKILL_END] = ActionTypes.SKILL_END
-    player_id: int
-    charactor_id: int
+    position: ObjectPosition
     skill_type: SkillType
 
 

server/card/equipment/artifact/version_3_3.py

@@ -1,4 +1,5 @@
 from typing import Literal
+
 from .base import ArtifactBase
 from ....struct import Cost
 from ....modifiable_values import CostValue
@@ -75,14 +76,16 @@ def value_modifier_COST(
         the elemental cost by 1. If element not match, decrease any dice cost
         by 1.
         """
-        if (
-            self.usage > 0 
-            and self.position.area == ObjectPositionType.CHARACTOR
-            and value.position.player_id == self.position.player_id
-        ):  # has usage and equipped and value from self position
+        if self.usage > 0:  
+            # has usage
+            if not self.position.check_position_valid(
+                value.position, value.match,
+                player_id_same = True, 
+                source_area = ObjectPositionType.CHARACTOR,
+            ):
+                # not from self position or not equipped
+                return value
             label = value.cost.label
-            if label == 130:
-                pass
             if label & (
                 DiceCostLabels.NORMAL_ATTACK.value
                 | DiceCostLabels.ELEMENTAL_SKILL.value
@@ -99,17 +102,13 @@ def value_modifier_COST(
                     return value
             elif position.area == ObjectPositionType.HAND:
                 # cost from hand card, is a talent card
-                active_charactor_id = value.match.player_tables[
-                    self.position.player_id].active_charactor_id
-                charactor = value.match.player_tables[
-                    self.position.player_id].charactors[active_charactor_id]
-                if active_charactor_id != self.position.charactor_id:
-                    # not active charactor
-                    return value
+                equipped_charactor = value.match.player_tables[
+                    self.position.player_id
+                ].charactors[self.position.charactor_id]
                 for card in value.match.player_tables[
                         self.position.player_id].hands:
                     if card.id == value.id:
-                        if card.charactor_name != charactor.name:
+                        if card.charactor_name != equipped_charactor.name:
                             # talent card not for this charactor
                             return value
             # can decrease cost

server/card/support/companions.py

@@ -47,7 +47,7 @@ def event_handler_SKILL_END(self, event: SkillEndEventArguments) \
         of next charactor.
         """
         if (self.position.area == ObjectPositionType.SUPPORT
-                and event.action.player_id == self.position.player_id 
+                and event.action.position.player_id == self.position.player_id 
                 and event.action.skill_type == SkillType.ELEMENTAL_SKILL
                 and self.usage > 0):
             table = event.match.player_tables[self.position.player_id]

server/charactor/electro/fischl.py

@@ -111,11 +111,11 @@ def event_handler_SKILL_END(
         if action.skill_type != SkillType.NORMAL_ATTACK:
             # not using normal attack
             return []
-        if self.position.player_id != action.player_id:
+        if self.position.player_id != action.position.player_id:
             # not attack by self
             return []
-        charactor = match.player_tables[action.player_id].charactors[
-            action.charactor_id
+        charactor = match.player_tables[action.position.player_id].charactors[
+            action.position.charactor_id
         ]
         if (
             charactor.talent is not None and charactor.name == 'Fischl'

server/charactor/hydro/mona.py

@@ -111,8 +111,10 @@ def value_modifier_COMBAT_ACTION(
         """
         if value.action_type != 'SWITCH':
             return value
-        if (value.position.player_id != self.position.player_id
-                or value.position.charactor_id != self.position.charactor_id):
+        if not self.position.check_position_valid(
+            value.position, value.match, player_id_same = True,
+            charactor_id_same = True,
+        ):
             return value
         if self.usage <= 0:
             return value
@@ -147,20 +149,16 @@ def value_modifier_DAMAGE_INCREASE(
         If mona is active charactor, and damage triggered hydro reaction,
         which is made by self, increase damage by 2.
         """
-        match = value.match
-        if self.position.area != ObjectPositionType.CHARACTOR:
-            # not equipped, not activate
-            return value
-        if match.player_tables[self.position.player_id].active_charactor_id \
-                != self.position.charactor_id:
-            # not active charactor, not activate
+        if not self.position.check_position_valid(
+            value.position, value.match,
+            source_area = ObjectPositionType.CHARACTOR,  # quipped
+            source_is_active_charactor = True,  # active charactor
+            player_id_same = True,  # self damage
+        ):
             return value
         if ElementType.HYDRO not in value.reacted_elements:
             # no hydro reaction, not activate
             return value
-        if value.position.player_id != self.position.player_id:
-            # not self, not activate
-            return value
         value.damage += 2
         return value
 

server/elemental_reaction.py

@@ -234,7 +234,7 @@ def check_elemental_reaction(
             return (
                 ElementalReactionType.SWIRL, 
                 [ElementType.ANEMO, ElementType.CRYO], 
-                targets[:1]  # cryo must be first
+                targets[1:]  # cryo must be first
             )
         elif ElementType.ELECTRO in targets:
             return (
@@ -388,7 +388,7 @@ def elemental_reaction_side_effect_ver_3_4(
         )
         return CreateObjectAction(
             object_position = position,
-            object_name = 'CatalyzingField',
+            object_name = 'Catalyzing Field',
             object_arguments = {}
         )
     return None
@@ -408,7 +408,7 @@ def elemental_reaction_side_effect_ver_3_3(
         )
         return CreateObjectAction(
             object_position = position,
-            object_name = 'CatalyzingField',
+            object_name = 'Catalyzing Field',
             object_arguments = { 'version': '3.3' }
         )
     return elemental_reaction_side_effect_ver_3_4(

server/match.py

@@ -1170,10 +1170,13 @@ def _respond_use_skill(self, response: UseSkillResponse):
             player_id = response.player_id,
             dice_ids = response.cost_ids,
         )]
-        actions += skill.get_actions(self)  # TODO add information
+        actions += skill.get_actions(self)
         actions.append(SkillEndAction(
-            player_id = response.player_id,
-            charactor_id = request.charactor_id,
+            position = ObjectPosition(
+                player_id = request.player_id,
+                charactor_id = request.charactor_id,
+                area = ObjectPositionType.CHARACTOR
+            ),
             skill_type = skill.skill_type,
         ))
         actions.append(CombatActionAction(
@@ -2055,7 +2058,7 @@ def _action_move_object(self, action: MoveObjectAction) \
 
     def _action_skill_end(self, action: SkillEndAction) \
             -> List[SkillEndEventArguments]:
-        player_id = action.player_id
+        player_id = action.position.player_id
         table = self.player_tables[player_id]
         charactor = table.charactors[table.active_charactor_id]
         logging.info(

server/player_table.py

@@ -121,6 +121,12 @@ def get_object_lists(self) -> List[ObjectBase]:
 
         return result
 
+    def get_active_charactor(self) -> Charactors:
+        """
+        Returns the active charactor.
+        """
+        return self.charactors[self.active_charactor_id]
+
     def next_charactor_id(self, current_id: int | None = None) -> int | None:
         """
         Returns the next charactor ID. If `current_id` is not provided, the

server/status/charactor_status/system.py

@@ -31,9 +31,9 @@ def value_modifier_DAMAGE_INCREASE(
         Increase damage for pyro and physical damages to self by 2, and 
         decrease usage.
         """
-        if (
-            value.target_position.player_id != self.position.player_id
-            or value.target_position.charactor_id != self.position.charactor_id
+        if not self.position.check_position_valid(
+            value.target_position, value.match,
+            player_id_same = True, charactor_id_same = True,
         ):
             # not attack self, not activate
             return value

server/status/team_status/hydro_charactors.py

@@ -25,15 +25,15 @@ def value_modifier_DAMAGE_MULTIPLY(
         """
         Double damage when skill damage made.
         """
+        if not self.position.check_position_valid(
+            value.position, value.match,
+            player_id_same = True, target_area = ObjectPositionType.CHARACTOR,
+        ):
+            # not from self position or not charactor skill
+            return value
         if value.target_position.player_id == self.position.player_id:
             # attack self, not activate
             return value
-        if value.position.player_id != self.position.player_id:
-            # not self, not activate
-            return value
-        if value.position.area != ObjectPositionType.CHARACTOR:
-            # not charactor make damage (i.e. skill), not activate
-            return value
         if self.usage > 0:
             value.damage *= 2
             if mode == 'REAL':

server/status/team_status/old_version.py

@@ -15,7 +15,7 @@ class CatalyzingField(UsageTeamStatus):
     """
     Catalyzing field.
     """
-    name: Literal['CatalyzingField'] = 'CatalyzingField'
+    name: Literal['Catalyzing Field'] = 'Catalyzing Field'
     desc: str = (
         'When you deal Electro DMG or Pyro DMG to an opposing active '
         'charactor, DMG dealt +1.'
@@ -30,6 +30,17 @@ def value_modifier_DAMAGE_INCREASE(
         """
         Increase damage for dendro or electro damages, and decrease usage.
         """
+        if not self.position.check_position_valid(
+            value.position, value.match, player_id_same = True,
+        ):
+            # source not self, not activate
+            return value
+        if not self.position.check_position_valid(
+            value.target_position, value.match, 
+            player_id_same = False, target_is_active_charactor = True,
+        ):
+            # target not enemy, or target not active charactor, not activate
+            return value
         if value.damage_elemental_type in [
             DamageElementalType.DENDRO,
             DamageElementalType.ELECTRO,

server/status/team_status/system.py

@@ -12,7 +12,7 @@ class CatalyzingField(UsageTeamStatus):
     """
     Catalyzing field.
     """
-    name: Literal['CatalyzingField'] = 'CatalyzingField'
+    name: Literal['Catalyzing Field'] = 'Catalyzing Field'
     desc: str = (
         'When you deal Electro DMG or Pyro DMG to an opposing active '
         'charactor, DMG dealt +1.'
@@ -26,13 +26,17 @@ def value_modifier_DAMAGE_INCREASE(
             mode: Literal['TEST', 'REAL']) -> DamageIncreaseValue:
         """
         Increase damage for dendro or electro damages, and decrease usage.
-        TODO only active charactor will count!
         """
-        if value.target_position.player_id == self.position.player_id:
-            # attack self, not activate
+        if not self.position.check_position_valid(
+            value.position, value.match, player_id_same = True,
+        ):
+            # source not self, not activate
             return value
-        if value.position.player_id != self.position.player_id:
-            # not self, not activate
+        if not self.position.check_position_valid(
+            value.target_position, value.match, 
+            player_id_same = False, target_is_active_charactor = True,
+        ):
+            # target not enemy, or target not active charactor, not activate
             return value
         if value.damage_elemental_type in [
             DamageElementalType.DENDRO,
@@ -63,11 +67,16 @@ def value_modifier_DAMAGE_INCREASE(
         """
         Increase damage for electro or pyro damages by 2, and decrease usage.
         """
-        if value.target_position.player_id == self.position.player_id:
-            # attack self, not activate
+        if not self.position.check_position_valid(
+            value.position, value.match, player_id_same = True,
+        ):
+            # source not self, not activate
             return value
-        if value.position.player_id != self.position.player_id:
-            # not self, not activate
+        if not self.position.check_position_valid(
+            value.target_position, value.match, 
+            player_id_same = False, target_is_active_charactor = True,
+        ):
+            # target not enemy, or target not active charactor, not activate
             return value
         if value.damage_elemental_type in [
             DamageElementalType.ELECTRO,

server/struct.py

@@ -23,6 +23,48 @@ class ObjectPosition(BaseModel):
     charactor_id: int  # TODO set default to -1
     area: ObjectPositionType
 
+    def check_position_valid(
+        self, target_position, match: Any,
+        player_id_same: bool | None = None,
+        charactor_id_same: bool | None = None,
+        area_same: bool | None = None,
+        source_area: ObjectPositionType | None = None,
+        target_area: ObjectPositionType | None = None,
+        source_is_active_charactor: bool | None = None,
+        target_is_active_charactor: bool | None = None,
+    ) -> bool:
+        """
+        Based on this position, target position and constraints, give whether
+        two position relations fit the constraints.
+        """
+        if player_id_same is not None:
+            if player_id_same != (self.player_id == target_position.player_id):
+                return False
+        if charactor_id_same is not None:
+            if charactor_id_same != (
+                self.charactor_id == target_position.charactor_id
+            ):
+                return False
+        if area_same is not None:
+            if area_same != (self.area == target_position.area):
+                return False
+        if source_area is not None:
+            if self.area != source_area:
+                return False
+        if target_area is not None:
+            if target_position.area != target_area:
+                return False
+        if source_is_active_charactor is not None:
+            cid = match.player_tables[self.player_id].active_charactor_id
+            if self.charactor_id != cid:
+                return False
+        if target_is_active_charactor is not None:
+            cid = match.player_tables[
+                target_position.player_id].active_charactor_id
+            if target_position.charactor_id != cid:
+                return False
+        return True
+
 
 class DamageValue(BaseModel):
     """