Return the proper retcode when doing gacha with a full light cone inv…

…entory
Melledy · Dec 11, 2023 · 6c9f674 · 6c9f674
1 parent f3c2840
commit 6c9f674
Show file tree

Hide file tree

Showing 3 changed files with 525 additions and 3 deletions.
diff --git a/src/main/java/emu/lunarcore/game/gacha/GachaService.java b/src/main/java/emu/lunarcore/game/gacha/GachaService.java
@@ -20,6 +20,7 @@
 import emu.lunarcore.proto.ItemOuterClass.Item;
 import emu.lunarcore.server.game.BaseGameService;
 import emu.lunarcore.server.game.GameServer;
+import emu.lunarcore.server.packet.Retcode;
 import emu.lunarcore.server.packet.send.PacketDoGachaScRsp;
 import emu.lunarcore.util.JsonUtils;
 import emu.lunarcore.util.Utils;
@@ -75,21 +76,22 @@ public synchronized void doPulls(Player player, int gachaId, int times) {
 
         // Prevent player from using gacha if they are at max light cones
         if (player.getInventory().getTabByItemType(ItemMainType.Equipment).getSize() >= player.getInventory().getTabByItemType(ItemMainType.Equipment).getMaxCapacity()) {
-            player.sendPacket(new PacketDoGachaScRsp());
+            player.sendPacket(new PacketDoGachaScRsp(Retcode.EQUIPMENT_EXCEED_LIMIT));
             return;
         }
 
         // Get banner
         GachaBanner banner = this.getGachaBanners().get(gachaId);
         if (banner == null) {
-            player.sendPacket(new PacketDoGachaScRsp());
+            player.sendPacket(new PacketDoGachaScRsp(Retcode.GACHA_ID_NOT_EXIST));
             return;
         }
 
         // Spend currency
         if (banner.getGachaType().getCostItem() > 0) {
             GameItem costItem = player.getInventory().getMaterialByItemId(banner.getGachaType().getCostItem());
             if (costItem == null || costItem.getCount() < times) {
+                player.sendPacket(new PacketDoGachaScRsp(Retcode.FAIL));
                 return;
             }