Fixed summer lip 3rd skill script

Author: squaresmile

app/core/nice/skill.py

@@ -6,14 +6,20 @@
 from ...config import Settings
 from ...schemas.common import Language, Region
 from ...schemas.enums import SKILL_TYPE_NAME, SkillScriptCond
-from ...schemas.gameenums import CARD_TYPE_NAME, COND_TYPE_NAME
+from ...schemas.gameenums import (
+    BATTLE_BRANCH_SKILL_COND_BRANCH_TYPE_NAME,
+    CARD_TYPE_NAME,
+    COND_TYPE_NAME,
+    BattleBranchSkillCondBranchType,
+)
 from ...schemas.nice import (
     AssetURL,
     CondBranchSkillInfo,
     ExtraPassive,
     NiceSelectAddInfoBtnCond,
     NiceSkill,
     NiceSkillAdd,
+    NiceSkillEntityScript,
     NiceSkillReverse,
     NiceSkillSvt,
     NiceSvtSkillRelease,
@@ -121,18 +127,6 @@ def get_nice_skill_script(skill_script: dict[str, Any]) -> dict[str, Any]:
                 parse_skill_script_cond(cond) for cond in button["conds"]
             ]
 
-    if "condBranchSkillInfo" in skill_script:
-        skill_script["condBranchSkillInfo"] = [
-            CondBranchSkillInfo(
-                condType=COND_TYPE_NAME[info.condType],
-                condValue=info.condValue,
-                skillId=info.skillId,
-                detailText=info.detailText,
-                iconBuffId=info.iconBuffId,
-            )
-            for info in skill_script["condBranchSkillInfo"]
-        ]
-
     return skill_script
 
 
@@ -162,6 +156,29 @@ def get_nice_select_td_info(select_info: Any) -> SelectTreasureDeviceInfo:
     )
 
 
+def get_nice_skill_entity_script(
+    script: dict[str, Any],
+) -> NiceSkillEntityScript | None:
+    if not script:
+        return None
+
+    if "condBranchSkillInfo" in script:
+        script["condBranchSkillInfo"] = [
+            CondBranchSkillInfo(
+                condType=BATTLE_BRANCH_SKILL_COND_BRANCH_TYPE_NAME[
+                    BattleBranchSkillCondBranchType[info["condType"]].value
+                ],
+                condValue=info["condValue"],
+                skillId=info["skillId"],
+                detailText=info["detailText"],
+                iconBuffId=info["iconBuffId"],
+            )
+            for info in script["condBranchSkillInfo"]
+        ]
+
+    return NiceSkillEntityScript.model_validate(script)
+
+
 async def get_nice_skill_with_svt(
     conn: AsyncConnection,
     skillEntity: SkillEntityNoReverse,
@@ -189,6 +206,7 @@ async def get_nice_skill_with_svt(
             get_nice_skill_svt(td_svt, skillEntity.mstSvtSkillRelease)
             for td_svt in sorted_svtSkill
         ],
+        "skillEntityScript": get_nice_skill_entity_script(skillEntity.mstSkill.script),
     }
 
     if mstSvtPassiveSkills:

app/schemas/gameenums.py

@@ -6899,6 +6899,29 @@ class NiceQuestExtensionSubType(StrEnum):
 }
 
 
+class BattleBranchSkillCondBranchType(IntEnum):
+    None_ = 0
+    IsSelfTarget = 1
+    Individuality = 2
+
+
+class NiceBattleBranchSkillCondBranchType(StrEnum):
+    """Battle Branch Skill Cond Branch Type"""
+
+    none = "none"
+    isSelfTarget = "isSelfTarget"
+    individuality = "individuality"
+
+
+BATTLE_BRANCH_SKILL_COND_BRANCH_TYPE_NAME: dict[
+    int, NiceBattleBranchSkillCondBranchType
+] = {
+    0: NiceBattleBranchSkillCondBranchType.none,
+    1: NiceBattleBranchSkillCondBranchType.isSelfTarget,
+    2: NiceBattleBranchSkillCondBranchType.individuality,
+}
+
+
 class BuffConditionType(IntEnum):
     HP_HIGHER = 0
     HP_LOWER = 1

app/schemas/nice.py

@@ -44,6 +44,7 @@
     NiceAiActType,
     NiceAiAllocationSvtFlag,
     NiceAiCond,
+    NiceBattleBranchSkillCondBranchType,
     NiceBattleFieldEnvironmentGrantType,
     NiceBattlePointFlag,
     NiceBuffType,
@@ -754,14 +755,6 @@ class SelectTreasureDeviceInfo(BaseModel):
     messageOnSelected: str
 
 
-class CondBranchSkillInfo(BaseModel):
-    condType: NiceCondType
-    condValue: list[int]
-    skillId: int
-    detailText: str
-    iconBuffId: int
-
-
 class NiceSkillScript(BaseModel):
     NP_HIGHER: Optional[list[int]] = None
     NP_LOWER: Optional[list[int]] = None
@@ -782,6 +775,17 @@ class NiceSkillScript(BaseModel):
     IgnoreBattlePointUp: list[list[int]] | None = None
     tdChangeByBattlePoint: list[TdChangeByBattlePoint] | None = None
     selectTreasureDeviceInfo: list[SelectTreasureDeviceInfo] | None = None
+
+
+class CondBranchSkillInfo(BaseModel):
+    condType: NiceBattleBranchSkillCondBranchType
+    condValue: list[int]
+    skillId: int
+    detailText: str
+    iconBuffId: int
+
+
+class NiceSkillEntityScript(BaseModel):
     condBranchSkillInfo: list[CondBranchSkillInfo] | None = None
 
 
@@ -853,6 +857,7 @@ class NiceSkill(BaseModelORJson):
     coolDown: list[int]
     actIndividuality: list[NiceTrait]
     script: NiceSkillScript
+    skillEntityScript: NiceSkillEntityScript | None = None
     extraPassive: list[ExtraPassive]
     skillAdd: list[NiceSkillAdd]
     skillSvts: list[NiceSkillSvt] = []