Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-16 15:24:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle challenge reset button properly

Browse Source
This commit is contained in:
Melledy
2023-11-27 05:48:13 -08:00
parent 640d59fd90
commit 31d8885b97
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java
View File

@@ -14,6 +14,7 @@ import emu.lunarcore.proto.ChallengeStatusOuterClass.ChallengeStatus;
import emu.lunarcore.proto.ExtraLineupTypeOuterClass.ExtraLineupType; import emu.lunarcore.proto.ExtraLineupTypeOuterClass.ExtraLineupType;
import emu.lunarcore.server.packet.send.PacketChallengeLineupNotify; import emu.lunarcore.server.packet.send.PacketChallengeLineupNotify;
import emu.lunarcore.server.packet.send.PacketChallengeSettleNotify; import emu.lunarcore.server.packet.send.PacketChallengeSettleNotify;
import emu.lunarcore.server.packet.send.PacketSyncLineupNotify;
import emu.lunarcore.util.Position; import emu.lunarcore.util.Position;
import lombok.Getter; import lombok.Getter;
@@ -32,6 +33,7 @@ public class ChallengeInstance {
private int status; private int status;
private boolean hasAvatarDied; private boolean hasAvatarDied;
@Setter private int savedMp;
@Setter private int roundsLeft; @Setter private int roundsLeft;
@Setter private int stars; @Setter private int stars;
@@ -79,7 +81,8 @@ public class ChallengeInstance {
} }
public void onBattleFinish(Battle battle, BattleEndStatus result, BattleStatistics stats) { public void onBattleFinish(Battle battle, BattleEndStatus result, BattleStatistics stats) {
if (result == BattleEndStatus.BATTLE_END_WIN) { switch (result) {
case BATTLE_END_WIN:
// Check if any avatar in the lineup has died // Check if any avatar in the lineup has died
battle.getLineup().forEachAvatar(avatar -> { battle.getLineup().forEachAvatar(avatar -> {
if (avatar.getCurrentHp(battle.getLineup()) <= 0) { if (avatar.getCurrentHp(battle.getLineup()) <= 0) {
@@ -109,6 +112,7 @@ public class ChallengeInstance {
this.setCurrentExtraLineup(ExtraLineupType.LINEUP_CHALLENGE_2); this.setCurrentExtraLineup(ExtraLineupType.LINEUP_CHALLENGE_2);
player.getLineupManager().setCurrentExtraLineup(this.getCurrentExtraLineup(), true); player.getLineupManager().setCurrentExtraLineup(this.getCurrentExtraLineup(), true);
player.sendPacket(new PacketChallengeLineupNotify(this.getCurrentExtraLineup())); player.sendPacket(new PacketChallengeLineupNotify(this.getCurrentExtraLineup()));
this.savedMp = player.getCurrentLineup().getMp();
// Move player // Move player
player.moveTo(this.getStartPos(), this.getStartRot()); player.moveTo(this.getStartPos(), this.getStartRot());
} }
@@ -116,9 +120,21 @@ public class ChallengeInstance {
// Calculate rounds left // Calculate rounds left
this.roundsLeft = Math.min(Math.max(this.roundsLeft - stats.getRoundCnt(), 1), this.roundsLeft); this.roundsLeft = Math.min(Math.max(this.roundsLeft - stats.getRoundCnt(), 1), this.roundsLeft);
} else {
// Set saved technique points (This will be restored if the player resets the challenge)
this.savedMp = player.getCurrentLineup().getMp();
break;
case BATTLE_END_QUIT:
// Reset technique points and move back to start position
var lineup = player.getCurrentLineup();
lineup.setMp(this.savedMp);
player.moveTo(this.getStartPos(), this.getStartRot());
player.sendPacket(new PacketSyncLineupNotify(lineup));
break;
default:
// Fail challenge // Fail challenge
this.setStatus(ChallengeStatus.CHALLENGE_FAILED); this.setStatus(ChallengeStatus.CHALLENGE_FAILED);
break;
} }
} }

1
src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java
View File

@@ -86,6 +86,7 @@ public class ChallengeManager extends BasePlayerManager {
// Save start positions // Save start positions
instance.getStartPos().set(getPlayer().getPos()); instance.getStartPos().set(getPlayer().getPos());
instance.getStartRot().set(getPlayer().getRot()); instance.getStartRot().set(getPlayer().getRot());
instance.setSavedMp(getPlayer().getCurrentLineup().getMp());
// Send packet // Send packet
getPlayer().sendPacket(new PacketStartChallengeScRsp(getPlayer(), challengeId)); getPlayer().sendPacket(new PacketStartChallengeScRsp(getPlayer(), challengeId));