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

Calculate challenge rounds left properly

Browse Source
This commit is contained in:
Melledy
2023-10-15 08:25:05 -07:00
parent 60ab978068
commit 29c41b7bba
3 changed files with 430 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/emu/lunarcore/game/challenge/ChallengeData.java
View File

@@ -106,6 +106,10 @@ public class ChallengeData {
getScene().addEntity(monster, sendPacket);
}
}
private int getRoundCount() {
return getExcel().getChallengeCountDown() - this.roundsLimit;
}
public boolean isWin() {
return status == ChallengeStatus.CHALLENGE_FINISH;
@@ -142,6 +146,9 @@ public class ChallengeData {
player.moveTo(this.getStartPos(), this.getStartRot());
}
}
// Calculate rounds left
this.roundsLimit = Math.min(Math.max(this.roundsLimit - stats.getRoundCnt(), 0), this.roundsLimit);
} else {
// Fail challenge
this.status = ChallengeStatus.CHALLENGE_FAILED;
@@ -159,6 +166,7 @@ public class ChallengeData {
var proto = ChallengeInfo.newInstance()
.setChallengeId(this.getExcel().getId())
.setStatus(this.getStatus())
.setRoundCount(this.getRoundCount())
.setExtraLineupType(this.getCurrentExtraLineup());
return proto;