Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-23 02:34:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix MoC cycle counter

Browse Source
This commit is contained in:
Melledy
2024-05-09 05:25:01 -07:00
parent 6c5c7d8801
commit f1d3ece247
5 changed files with 244 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,47 +139,47 @@ public class ChallengeInstance {
// Handle result
switch (result) {
case BATTLE_END_WIN:
// Check if any avatar in the lineup has died
battle.getLineup().forEachAvatar(avatar -> {
if (avatar.getCurrentHp(battle.getLineup()) <= 0) {
hasAvatarDied = true;
case BATTLE_END_WIN:
// Check if any avatar in the lineup has died
battle.getLineup().forEachAvatar(avatar -> {
if (avatar.getCurrentHp(battle.getLineup()) <= 0) {
hasAvatarDied = true;
}
});
// Get monster count in stage
long monsters = player.getScene().getEntities().values().stream().filter(e -> e instanceof EntityMonster).count();
if (monsters == 0) {
this.advanceStage();
}
});
// Get monster count in stage
long monsters = player.getScene().getEntities().values().stream().filter(e -> e instanceof EntityMonster).count();
if (monsters == 0) {
this.advanceStage();
}
// Calculate rounds left
if (!this.isStory()) {
this.roundsLeft = Math.min(Math.max(this.roundsLeft - stats.getRoundCnt(), 1), this.roundsLeft);
}
// 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:
// Determine challenge result
if (this.isStory() && stats.getEndReason() == BattleEndReason.BATTLE_END_REASON_TURN_LIMIT) {
this.advanceStage();
} else {
// Fail challenge
this.setStatus(ChallengeStatus.CHALLENGE_FAILED);
// Send challenge result data
player.sendPacket(new PacketChallengeSettleNotify(this));
}
break;
// Calculate rounds left
if (!this.isStory()) {
this.roundsLeft = Math.min(Math.max(this.roundsLeft - stats.getRoundCnt(), 1), this.roundsLeft);
}
// 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:
// Determine challenge result
if (this.isStory() && stats.getEndReason() == BattleEndReason.BATTLE_END_REASON_TURN_LIMIT) {
this.advanceStage();
} else {
// Fail challenge
this.setStatus(ChallengeStatus.CHALLENGE_FAILED);
// Send challenge result data
player.sendPacket(new PacketChallengeSettleNotify(this));
}
break;
}
}

16
src/main/java/emu/lunarcore/server/packet/recv/HandlerGetFriendChallengeLineupCsReq.java Normal file
View File

@@ -0,0 +1,16 @@
package emu.lunarcore.server.packet.recv;
import emu.lunarcore.server.game.GameSession;
import emu.lunarcore.server.packet.CmdId;
import emu.lunarcore.server.packet.Opcodes;
import emu.lunarcore.server.packet.PacketHandler;
@Opcodes(CmdId.GetFriendChallengeLineupCsReq)
public class HandlerGetFriendChallengeLineupCsReq extends PacketHandler {
@Override
public void handle(GameSession session, byte[] data) throws Exception {
session.send(CmdId.GetFriendChallengeLineupScRsp);
}
}