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

Fix basic trials not rewarding materials

Browse Source
This commit is contained in:
Melledy
2025-10-29 20:49:34 -07:00
parent d024ab62a8
commit e002bec13a
13 changed files with 147 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/emu/nebula/server/handlers/HandlerCharGemInstanceApplyReq.java
View File

@@ -16,19 +16,14 @@ public class HandlerCharGemInstanceApplyReq extends NetHandler {
var req = CharGemInstanceApplyReq.parseFrom(message);
var data = GameData.getCharGemInstanceDataTable().get(req.getId());
if (data == null) {
if (data == null || !data.hasEnergy(session.getPlayer())) {
return this.encodeMsg(NetMsgId.char_gem_instance_apply_failed_ack);
}
// Check player energy
if (data.getEnergyConsume() > session.getPlayer().getEnergy()) {
return this.encodeMsg(NetMsgId.char_gem_instance_apply_failed_ack);
}
// Set player
// Set player instance id
session.getPlayer().getInstanceManager().setCurInstanceId(req.getId());
// Template
// Send response
return this.encodeMsg(NetMsgId.char_gem_instance_apply_succeed_ack);
}

10
src/main/java/emu/nebula/server/handlers/HandlerDailyInstanceApplyReq.java
View File

@@ -16,19 +16,19 @@ public class HandlerDailyInstanceApplyReq extends NetHandler {
var req = DailyInstanceApplyReq.parseFrom(message);
var data = GameData.getDailyInstanceDataTable().get(req.getId());
if (data == null) {
if (data == null || !data.hasEnergy(session.getPlayer())) {
return this.encodeMsg(NetMsgId.daily_instance_apply_failed_ack);
}
// Check player energy
if (data.getEnergyConsume() > session.getPlayer().getEnergy()) {
// Check reward group
if (data.getRewardGroup(req.getRewardType()) == null) {
return this.encodeMsg(NetMsgId.daily_instance_apply_failed_ack);
}
// Set player
session.getPlayer().getInstanceManager().setCurInstanceId(req.getId());
session.getPlayer().getInstanceManager().setCurInstanceId(req.getId(), req.getRewardType());
// Template
// Send response
return this.encodeMsg(NetMsgId.daily_instance_apply_succeed_ack);
}

11
src/main/java/emu/nebula/server/handlers/HandlerDailyInstanceSettleReq.java
View File

@@ -41,6 +41,17 @@ public class HandlerDailyInstanceSettleReq extends NetHandler {
.setExp(settleData.getExp())
.setChange(changes.toProto());
// Add reward items
if (settleData.isWin()) {
int rewardType = player.getInstanceManager().getRewardType();
data.getRewards(rewardType).toItemProtoStream().forEach(rsp::addSelect);
if (settleData.isFirst()) {
data.getFirstRewards(rewardType).toItemProtoStream().forEach(rsp::addFirst);
}
}
// Send response
return this.encodeMsg(NetMsgId.daily_instance_settle_succeed_ack, rsp);
}

11
src/main/java/emu/nebula/server/handlers/HandlerRegionBossLevelApplyReq.java
View File

@@ -16,19 +16,14 @@ public class HandlerRegionBossLevelApplyReq extends NetHandler {
var req = RegionBossLevelApplyReq.parseFrom(message);
var data = GameData.getRegionBossLevelDataTable().get(req.getId());
if (data == null) {
if (data == null || !data.hasEnergy(session.getPlayer())) {
return this.encodeMsg(NetMsgId.region_boss_level_apply_failed_ack);
}
// Check player energy
if (data.getEnergyConsume() > session.getPlayer().getEnergy()) {
return this.encodeMsg(NetMsgId.region_boss_level_apply_failed_ack);
}
// Set player
// Set player instance id
session.getPlayer().getInstanceManager().setCurInstanceId(req.getId());
// Template
// Send response
return this.encodeMsg(NetMsgId.region_boss_level_apply_succeed_ack);
}

11
src/main/java/emu/nebula/server/handlers/HandlerSkillInstanceApplyReq.java
View File

@@ -16,19 +16,14 @@ public class HandlerSkillInstanceApplyReq extends NetHandler {
var req = SkillInstanceApplyReq.parseFrom(message);
var data = GameData.getSkillInstanceDataTable().get(req.getId());
if (data == null) {
if (data == null || !data.hasEnergy(session.getPlayer())) {
return this.encodeMsg(NetMsgId.skill_instance_apply_failed_ack);
}
// Check player energy
if (data.getEnergyConsume() > session.getPlayer().getEnergy()) {
return this.encodeMsg(NetMsgId.skill_instance_apply_failed_ack);
}
// Set player
// Set player instance id
session.getPlayer().getInstanceManager().setCurInstanceId(req.getId());
// Template
// Send response
return this.encodeMsg(NetMsgId.skill_instance_apply_succeed_ack);
}

6
src/main/java/emu/nebula/server/handlers/HandlerWeekBossApplyReq.java
View File

@@ -16,14 +16,14 @@ public class HandlerWeekBossApplyReq extends NetHandler {
var req = WeekBossApplyReq.parseFrom(message);
var data = GameData.getWeekBossLevelDataTable().get(req.getId());
if (data == null) {
if (data == null || !data.hasEnergy(session.getPlayer())) {
return this.encodeMsg(NetMsgId.week_boss_apply_failed_ack);
}
// Set player
// Set player instance id
session.getPlayer().getInstanceManager().setCurInstanceId(req.getId());
// Template
// Send response
return this.encodeMsg(NetMsgId.week_boss_apply_succeed_ack);
}