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

Handle randomized daily instance rewards

Browse Source
This commit is contained in:
Melledy
2025-11-08 18:03:53 -08:00
parent 34e4b1c3f8
commit b9e8be97d1
20 changed files with 313 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,12 +45,11 @@ public class HandlerCharGemInstanceSettleReq extends NetHandler {
.setChange(changes.toProto());
// Add reward items
if (settleData.isWin()) {
data.getRewards().toItemTemplateStream().forEach(rsp::addAwardItems);
if (settleData.isFirst()) {
data.getFirstRewards().toItemTemplateStream().forEach(rsp::addAwardItems);
}
if (settleData.getRewards() != null) {
settleData.getRewards().toItemTemplateStream().forEach(rsp::addAwardItems);
}
if (settleData.getFirstRewards() != null) {
settleData.getFirstRewards().toItemTemplateStream().forEach(rsp::addFirstItems);
}
// Send response

26
src/main/java/emu/nebula/server/handlers/HandlerCharGemInstanceSweepReq.java
View File

@@ -6,7 +6,11 @@ import emu.nebula.proto.CharGemInstanceSweep.CharGemInstanceSweepReq;
import emu.nebula.proto.CharGemInstanceSweep.CharGemInstanceSweepResp;
import emu.nebula.proto.CharGemInstanceSweep.CharGemInstanceSweepReward;
import emu.nebula.net.HandlerId;
import java.util.List;
import emu.nebula.data.GameData;
import emu.nebula.game.inventory.ItemParamMap;
import emu.nebula.game.quest.QuestCondType;
import emu.nebula.net.GameSession;
@@ -42,17 +46,19 @@ public class HandlerCharGemInstanceSweepReq extends NetHandler {
var rsp = CharGemInstanceSweepResp.newInstance()
.setChange(change.toProto());
// Cache reward list
var rewardList = data.getRewards().toItemTemplateStream().toList();
// Add rewards
for (int i = 0; i < req.getTimes(); i++) {
var reward = CharGemInstanceSweepReward.newInstance()
.setExp(data.getEnergyConsume());
// Add reward list to response
if (change.getExtraData() != null) {
@SuppressWarnings("unchecked")
var list = (List<ItemParamMap>) change.getExtraData();
rewardList.forEach(reward::addAwardItems);
rsp.addRewards(reward);
for (var rewards : list) {
var reward = CharGemInstanceSweepReward.newInstance()
.setExp(data.getEnergyConsume());
rewards.toItemTemplateStream().forEach(reward::addAwardItems);
rsp.addRewards(reward);
}
}
// Send response

26
src/main/java/emu/nebula/server/handlers/HandlerDailyInstanceRaidReq.java
View File

@@ -6,7 +6,11 @@ import emu.nebula.proto.DailyInstanceRaid.DailyInstanceRaidReq;
import emu.nebula.proto.DailyInstanceRaid.DailyInstanceRaidResp;
import emu.nebula.proto.DailyInstanceRaid.DailyInstanceReward;
import emu.nebula.net.HandlerId;
import java.util.List;
import emu.nebula.data.GameData;
import emu.nebula.game.inventory.ItemParamMap;
import emu.nebula.game.quest.QuestCondType;
import emu.nebula.net.GameSession;
@@ -47,17 +51,19 @@ public class HandlerDailyInstanceRaidReq extends NetHandler {
var rsp = DailyInstanceRaidResp.newInstance()
.setChange(change.toProto());
// Cache reward list
var rewardList = data.getRewards(req.getRewardType()).toItemProtoStream().toList();
// Add rewards
for (int i = 0; i < req.getTimes(); i++) {
var reward = DailyInstanceReward.newInstance()
.setExp(data.getEnergyConsume());
// Add reward list to response
if (change.getExtraData() != null) {
@SuppressWarnings("unchecked")
var list = (List<ItemParamMap>) change.getExtraData();
rewardList.forEach(reward::addSelect);
rsp.addRewards(reward);
for (var rewards : list) {
var reward = DailyInstanceReward.newInstance()
.setExp(data.getEnergyConsume());
rewards.toItemProtoStream().forEach(reward::addSelect);
rsp.addRewards(reward);
}
}
// Send response

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

@@ -44,14 +44,11 @@ public class HandlerDailyInstanceSettleReq extends NetHandler {
.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);
}
if (settleData.getRewards() != null) {
settleData.getRewards().toItemProtoStream().forEach(rsp::addSelect);
}
if (settleData.getFirstRewards() != null) {
settleData.getFirstRewards().toItemProtoStream().forEach(rsp::addFirst);
}
// Send response

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

@@ -45,12 +45,11 @@ public class HandlerRegionBossLevelSettleReq extends NetHandler {
.setChange(changes.toProto());
// Add reward items
if (settleData.isWin()) {
data.getRewards().toItemTemplateStream().forEach(rsp::addAwardItems);
if (settleData.isFirst()) {
data.getFirstRewards().toItemTemplateStream().forEach(rsp::addAwardItems);
}
if (settleData.getRewards() != null) {
settleData.getRewards().toItemTemplateStream().forEach(rsp::addAwardItems);
}
if (settleData.getFirstRewards() != null) {
settleData.getFirstRewards().toItemTemplateStream().forEach(rsp::addFirstItems);
}
// Send response

26
src/main/java/emu/nebula/server/handlers/HandlerRegionBossLevelSweepReq.java
View File

@@ -6,7 +6,11 @@ import emu.nebula.proto.RegionBossLevelSweep.RegionBossLevelSweepReq;
import emu.nebula.proto.RegionBossLevelSweep.RegionBossLevelSweepResp;
import emu.nebula.proto.RegionBossLevelSweep.RegionBossLevelSweepRewards;
import emu.nebula.net.HandlerId;
import java.util.List;
import emu.nebula.data.GameData;
import emu.nebula.game.inventory.ItemParamMap;
import emu.nebula.game.quest.QuestCondType;
import emu.nebula.net.GameSession;
@@ -42,17 +46,19 @@ public class HandlerRegionBossLevelSweepReq extends NetHandler {
var rsp = RegionBossLevelSweepResp.newInstance()
.setChange(change.toProto());
// Cache reward list
var rewardList = data.getRewards().toItemTemplateStream().toList();
// Add rewards
for (int i = 0; i < req.getTimes(); i++) {
var reward = RegionBossLevelSweepRewards.newInstance()
.setExp(data.getEnergyConsume());
// Add reward list to response
if (change.getExtraData() != null) {
@SuppressWarnings("unchecked")
var list = (List<ItemParamMap>) change.getExtraData();
rewardList.forEach(reward::addAwardItems);
rsp.addRewards(reward);
for (var rewards : list) {
var reward = RegionBossLevelSweepRewards.newInstance()
.setExp(data.getEnergyConsume());
rewards.toItemTemplateStream().forEach(reward::addAwardItems);
rsp.addRewards(reward);
}
}
// Send response

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

@@ -45,12 +45,11 @@ public class HandlerSkillInstanceSettleReq extends NetHandler {
.setChange(changes.toProto());
// Add reward items to proto
if (settleData.isWin()) {
data.getRewards().toItemTemplateStream().forEach(rsp::addAwardItems);
if (settleData.isFirst()) {
data.getFirstRewards().toItemTemplateStream().forEach(rsp::addAwardItems);
}
if (settleData.getRewards() != null) {
settleData.getRewards().toItemTemplateStream().forEach(rsp::addAwardItems);
}
if (settleData.getFirstRewards() != null) {
settleData.getFirstRewards().toItemTemplateStream().forEach(rsp::addFirstItems);
}
// Send response

26
src/main/java/emu/nebula/server/handlers/HandlerSkillInstanceSweepReq.java
View File

@@ -6,7 +6,11 @@ import emu.nebula.proto.SkillInstanceSweep.SkillInstanceSweepReq;
import emu.nebula.proto.SkillInstanceSweep.SkillInstanceSweepResp;
import emu.nebula.proto.SkillInstanceSweep.SkillInstanceSweepRewards;
import emu.nebula.net.HandlerId;
import java.util.List;
import emu.nebula.data.GameData;
import emu.nebula.game.inventory.ItemParamMap;
import emu.nebula.game.quest.QuestCondType;
import emu.nebula.net.GameSession;
@@ -42,17 +46,19 @@ public class HandlerSkillInstanceSweepReq extends NetHandler {
var rsp = SkillInstanceSweepResp.newInstance()
.setChange(change.toProto());
// Cache reward list
var rewardList = data.getRewards().toItemTemplateStream().toList();
// Add rewards
for (int i = 0; i < req.getTimes(); i++) {
var reward = SkillInstanceSweepRewards.newInstance()
.setExp(data.getEnergyConsume());
// Add reward list to response
if (change.getExtraData() != null) {
@SuppressWarnings("unchecked")
var list = (List<ItemParamMap>) change.getExtraData();
rewardList.forEach(reward::addAwardItems);
rsp.addRewards(reward);
for (var rewards : list) {
var reward = SkillInstanceSweepRewards.newInstance()
.setExp(data.getEnergyConsume());
rewards.toItemTemplateStream().forEach(reward::addAwardItems);
rsp.addRewards(reward);
}
}
// Send response

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

@@ -44,12 +44,11 @@ public class HandlerWeekBossSettleReq extends NetHandler {
.setChange(changes.toProto());
// Add reward items
if (settleData.isWin()) {
data.getRewards().toItemTemplateStream().forEach(rsp::addAwardItems);
if (settleData.isFirst()) {
data.getFirstRewards().toItemTemplateStream().forEach(rsp::addAwardItems);
}
if (settleData.getRewards() != null) {
settleData.getRewards().toItemTemplateStream().forEach(rsp::addAwardItems);
}
if (settleData.getFirstRewards() != null) {
settleData.getFirstRewards().toItemTemplateStream().forEach(rsp::addFirstItems);
}
// Send response