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

Fix cataclysm survivor score calculation

Browse Source
This commit is contained in:
Melledy
2025-11-21 20:36:35 -08:00
parent e8a3576d8b
commit 3059c549d5
6 changed files with 155 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/emu/nebula/server/handlers/HandlerVampireSurvivorAreaChangeReq.java
View File

@@ -2,6 +2,7 @@ package emu.nebula.server.handlers;
import emu.nebula.net.NetHandler;
import emu.nebula.net.NetMsgId;
import emu.nebula.proto.VampireSurvivorAreaChange.VampireSurvivorAreaChangeReq;
import emu.nebula.net.HandlerId;
import emu.nebula.net.GameSession;
@@ -10,6 +11,19 @@ public class HandlerVampireSurvivorAreaChangeReq extends NetHandler {
@Override
public byte[] handle(GameSession session, byte[] message) throws Exception {
// Parse req
var req = VampireSurvivorAreaChangeReq.parseFrom(message);
// Get vampire survivor game
var game = session.getPlayer().getVampireSurvivorManager().getGame();
if (game == null) {
session.encodeMsg(NetMsgId.vampire_survivor_area_change_failed_ack);
}
// Calculate score for area
game.settleArea(req.getTime(), req.getKillCount().toArray());
// Encode and send
return session.encodeMsg(NetMsgId.vampire_survivor_area_change_succeed_ack);
}

32
src/main/java/emu/nebula/server/handlers/HandlerVampireSurvivorSettleReq.java
View File

@@ -2,7 +2,6 @@ package emu.nebula.server.handlers;
import emu.nebula.net.NetHandler;
import emu.nebula.net.NetMsgId;
import emu.nebula.proto.VampireSurvivorSettle.VampireSurvivorAreaInfo;
import emu.nebula.proto.VampireSurvivorSettle.VampireSurvivorSettleReq;
import emu.nebula.proto.VampireSurvivorSettle.VampireSurvivorSettleResp;
import emu.nebula.net.HandlerId;
@@ -16,40 +15,35 @@ public class HandlerVampireSurvivorSettleReq extends NetHandler {
// Parse request
var req = VampireSurvivorSettleReq.parseFrom(message);
// Sanity check
// Get vampire survivor game
var game = session.getPlayer().getVampireSurvivorManager().getGame();
if (game == null) {
session.encodeMsg(NetMsgId.vampire_survivor_settle_failed_ack);
}
// Calculate victory + score
// Calculate victory
boolean victory = !req.getDefeat();
int score = 1;
// Settle
session.getPlayer().getVampireSurvivorManager().settle(victory, score);
// Settle area
var area = game.settleArea(req.getTime(), req.getKillCount().toArray());
// Settle game
session.getPlayer().getVampireSurvivorManager().settle(victory, area.getScore());
// Build response
var rsp = VampireSurvivorSettleResp.newInstance();
if (victory) {
var areaInfo = VampireSurvivorAreaInfo.newInstance()
.setBossTime(1)
.setScore(score);
// TODO
for (int i : req.getKillCount()) {
areaInfo.addKillCount(i);
areaInfo.addKillScore(0);
}
rsp.getMutableVictory()
.setFinalScore(score)
.addInfos(areaInfo);
.setFinalScore(game.getTotalScore());
for (var a : game.getAreas()) {
rsp.getMutableVictory().addInfos(a.toProto());
}
} else {
rsp.getMutableDefeat()
.setFinalScore(score);
.setFinalScore(game.getTotalScore());
}
// Encode and send