Use dummy item for trade event point

atlasacademy · Nov 14, 2024 · 94d0aa4 · 94d0aa4
1 parent 4d1b81f
commit 94d0aa4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/app/core/nice/event/trade.py b/app/core/nice/event/trade.py
@@ -1,5 +1,7 @@
 from ....config import Settings
 from ....schemas.common import Region
+from ....schemas.enums import NiceItemBGType
+from ....schemas.gameenums import NiceItemType
 from ....schemas.nice import (
     AssetURL,
     NiceEventTradeGoods,
@@ -37,6 +39,31 @@ def get_nice_trade_goods(
     raw_releases: list[MstCommonRelease],
     item_map: dict[int, NiceItem],
 ) -> NiceEventTradeGoods:
+    dummy_point_item = NiceItem(
+        id=5,
+        name="",
+        originalName="",
+        type=NiceItemType.questRewardQp,
+        uses=[],
+        detail="",
+        individuality=[],
+        icon=fmt_url(
+            AssetURL.items,
+            base_url=settings.asset_url,
+            region=region,
+            item_id=5,
+        ),
+        background=NiceItemBGType.questClearQPReward,
+        value=0,
+        eventId=0,
+        eventGroupId=0,
+        priority=0,
+        dropPriority=0,
+        startedAt=0,
+        endedAt=0,
+        itemSelects=[],
+    )
+
     return NiceEventTradeGoods(
         id=trade.id,
         name=trade.name,
@@ -49,7 +76,7 @@ def get_nice_trade_goods(
         gifts=get_nice_gifts(region, trade.giftId, gift_data),
         consumes=get_nice_common_consumes(raw_consumes, trade.commonConsumeId),
         eventPointNum=trade.eventPointNum,
-        eventPointItem=item_map.get(trade.eventPointItemId, None),
+        eventPointItem=item_map.get(trade.eventPointItemId, dummy_point_item),
         tradeTime=trade.tradeTime,
         maxNum=trade.maxNum,
         maxTradeTime=trade.maxTradeTime,

diff --git a/app/schemas/nice.py b/app/schemas/nice.py
@@ -2165,7 +2165,7 @@ class NiceEventTradeGoods(BaseModelORJson):
     gifts: list[NiceGift]
     consumes: list[NiceCommonConsume]
     eventPointNum: int
-    eventPointItem: NiceItem | None
+    eventPointItem: NiceItem
     tradeTime: int
     maxNum: int
     maxTradeTime: int