From d80d6e83eef2805bf2685bf88211ed1881af41f1 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Mon, 1 Jan 2024 20:01:58 -0800
Subject: [PATCH] Update start challenge retcodes

---
 .../game/challenge/ChallengeManager.java          | 15 +++++++++++----
 .../packet/send/PacketStartChallengeScRsp.java    |  5 +++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java b/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java
index 7599a0c..110593d 100644
--- a/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java
+++ b/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java
@@ -13,6 +13,7 @@ import emu.lunarcore.game.player.Player;
 import emu.lunarcore.game.player.lineup.PlayerLineup;
 import emu.lunarcore.proto.ExtraLineupTypeOuterClass.ExtraLineupType;
 import emu.lunarcore.proto.StartChallengeStoryBuffInfoOuterClass.StartChallengeStoryBuffInfo;
+import emu.lunarcore.server.packet.Retcode;
 import emu.lunarcore.server.packet.send.PacketStartChallengeScRsp;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
@@ -33,7 +34,7 @@ public class ChallengeManager extends BasePlayerManager {
         // Get challenge excel
         ChallengeExcel excel = GameData.getChallengeExcelMap().get(challengeId);
         if (excel == null) {
-            getPlayer().sendPacket(new PacketStartChallengeScRsp());
+            getPlayer().sendPacket(new PacketStartChallengeScRsp(Retcode.CHALLENGE_NOT_EXIST));
             return;
         }
         
@@ -42,7 +43,10 @@ public class ChallengeManager extends BasePlayerManager {
             // Get lineup
             PlayerLineup lineup = getPlayer().getLineupManager().getExtraLineupByType(ExtraLineupType.LINEUP_CHALLENGE_VALUE);
             // Make sure this lineup has avatars set
-            if (lineup.getAvatars().size() == 0) return;
+            if (lineup.getAvatars().size() == 0) {
+                getPlayer().sendPacket(new PacketStartChallengeScRsp(Retcode.CHALLENGE_LINEUP_EMPTY));
+                return;
+            }
             // Reset hp/sp
             lineup.forEachAvatar(avatar -> {
                 avatar.setCurrentHp(lineup, 10000);
@@ -56,7 +60,10 @@ public class ChallengeManager extends BasePlayerManager {
             // Get lineup
             PlayerLineup lineup = getPlayer().getLineupManager().getExtraLineupByType(ExtraLineupType.LINEUP_CHALLENGE_2_VALUE);
             // Make sure this lineup has avatars set
-            if (lineup.getAvatars().size() == 0) return;
+            if (lineup.getAvatars().size() == 0) {
+                getPlayer().sendPacket(new PacketStartChallengeScRsp(Retcode.CHALLENGE_LINEUP_EMPTY));
+                return;
+            }
             // Reset hp/sp
             lineup.forEachAvatar(avatar -> {
                 avatar.setCurrentHp(lineup, 10000);
@@ -80,7 +87,7 @@ public class ChallengeManager extends BasePlayerManager {
             getPlayer().getLineupManager().setCurrentExtraLineup(0, false);
             getPlayer().setChallengeInstance(null);
             // Send error packet
-            getPlayer().sendPacket(new PacketStartChallengeScRsp());
+            getPlayer().sendPacket(new PacketStartChallengeScRsp(Retcode.CHALLENGE_NOT_EXIST));
             return;
         }
         
diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketStartChallengeScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketStartChallengeScRsp.java
index a82888e..ff32339 100644
--- a/src/main/java/emu/lunarcore/server/packet/send/PacketStartChallengeScRsp.java
+++ b/src/main/java/emu/lunarcore/server/packet/send/PacketStartChallengeScRsp.java
@@ -4,14 +4,15 @@ import emu.lunarcore.game.player.Player;
 import emu.lunarcore.proto.StartChallengeScRspOuterClass.StartChallengeScRsp;
 import emu.lunarcore.server.packet.BasePacket;
 import emu.lunarcore.server.packet.CmdId;
+import emu.lunarcore.server.packet.Retcode;
 
 public class PacketStartChallengeScRsp extends BasePacket {
     
-    public PacketStartChallengeScRsp() {
+    public PacketStartChallengeScRsp(Retcode retcode) {
         super(CmdId.StartChallengeScRsp);
         
         var data = StartChallengeScRsp.newInstance()
-                .setRetcode(1);
+                .setRetcode(retcode.getVal());
         
         this.setData(data);
     }