Added gacha release

Author: narumi147

app/core/nice/gacha.py

@@ -2,10 +2,11 @@
 
 from ...schemas.common import Language
 from ...schemas.gameenums import COND_TYPE_NAME, GACHA_FLAG_NAME, PAY_TYPE_NAME
-from ...schemas.nice import GachaStoryAdjust, NiceGacha, NiceGachaSub
+from ...schemas.nice import GachaStoryAdjust, NiceGacha, NiceGachaRelease, NiceGachaSub
 from ...schemas.raw import (
     GachaEntity,
     MstCommonRelease,
+    MstGachaRelease,
     MstGachaStoryAdjust,
     MstGachaSub,
 )
@@ -45,6 +46,14 @@ def get_nice_gacha_sub(
     )
 
 
+def get_nice_gacha_release(gacha_release: MstGachaRelease) -> NiceGachaRelease:
+    return NiceGachaRelease(
+        type=COND_TYPE_NAME[gacha_release.type],
+        targetId=gacha_release.targetId,
+        value=gacha_release.value,
+    )
+
+
 def get_nice_gacha(gacha: GachaEntity, lang: Language = Language.jp) -> NiceGacha:
     return NiceGacha(
         id=gacha.mstGacha.id,
@@ -71,6 +80,9 @@ def get_nice_gacha(gacha: GachaEntity, lang: Language = Language.jp) -> NiceGach
         featuredSvtIds=(
             gacha.viewGachaFeaturedSvt[0].svtIds if gacha.viewGachaFeaturedSvt else []
         ),
+        releaseConditions=[
+            get_nice_gacha_release(release) for release in gacha.mstGachaRelease
+        ],
     )
 
 

app/db/helpers/gacha.py

@@ -4,6 +4,7 @@
 from ...models.raw import (
     mstCommonRelease,
     mstGacha,
+    mstGachaRelease,
     mstGachaStoryAdjust,
     mstGachaSub,
     viewGachaFeaturedSvt,
@@ -22,6 +23,7 @@
         mstGachaStoryAdjust, mstGacha.c.id == mstGachaStoryAdjust.c.gachaId
     )
     .outerjoin(mstGachaSub, mstGacha.c.id == mstGachaSub.c.gachaId)
+    .outerjoin(mstGachaRelease, mstGacha.c.id == mstGachaRelease.c.gachaId)
     .outerjoin(mstCommonRelease, mstGachaSub.c.commonReleaseId == mstCommonRelease.c.id)
     .outerjoin(viewGachaFeaturedSvt, mstGacha.c.id == viewGachaFeaturedSvt.c.gachaId)
 )

app/models/raw.py

@@ -1294,6 +1294,17 @@
     Column("commonReleaseId", Integer),
 )
 
+
+mstGachaRelease = Table(
+    "mstGachaRelease",
+    metadata,
+    Column("gachaId", Integer, index=True),
+    Column("type", Integer),
+    Column("targetId", Integer),
+    Column("value", Integer),
+)
+
+
 viewGachaFeaturedSvt = Table(
     "viewGachaFeaturedSvt",
     metadata,
@@ -3020,7 +3031,7 @@
     [mstClassBoardLock, mstClassBoardSquare],
     [mstGrandGraph, mstGrandGraphDetail],
     [mstFuncTypeDetail, mstBuffTypeDetail],
-    [mstGacha, mstGachaStoryAdjust, mstGachaSub, viewGachaFeaturedSvt],
+    [mstGacha, mstGachaStoryAdjust, mstGachaSub, mstGachaRelease, viewGachaFeaturedSvt],
     [mstItemDropEfficiency],
     [mstImagePartsGroup],
 ]

app/schemas/nice.py

@@ -3332,6 +3332,13 @@ class NiceGachaSub(BaseModelORJson):
     script: dict[str, Any] | None = None
 
 
+class NiceGachaRelease(BaseModelORJson):
+    # gachaId: int
+    type: NiceCondType
+    targetId: int
+    value: int
+
+
 class NiceGacha(BaseModelORJson):
     id: int
     name: str
@@ -3350,3 +3357,4 @@ class NiceGacha(BaseModelORJson):
     storyAdjusts: list[GachaStoryAdjust]
     gachaSubs: list[NiceGachaSub]
     featuredSvtIds: list[int]
+    releaseConditions: list[NiceGachaRelease]

app/schemas/raw.py

@@ -1128,6 +1128,13 @@ class MstGachaSub(BaseModelORJson):
     commonReleaseId: int
 
 
+class MstGachaRelease(BaseModelORJson):
+    gachaId: int
+    type: int
+    targetId: int
+    value: int
+
+
 class ViewGachaFeaturedSvt(BaseModelORJson):
     gachaId: int
     svtIds: list[int]
@@ -2683,6 +2690,7 @@ class GachaEntity(BaseModelORJson):
     mstGacha: MstGacha
     mstGachaStoryAdjust: list[MstGachaStoryAdjust]
     mstGachaSub: list[MstGachaSub]
+    mstGachaRelease: list[MstGachaRelease]
     viewGachaFeaturedSvt: list[ViewGachaFeaturedSvt]
     mstCommonRelease: list[MstCommonRelease]