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

Fix battle start logic with assisting monsters

Browse Source
This commit is contained in:
Melledy
2023-10-15 07:04:44 -07:00
parent 4f45e54e12
commit 68978dc0f2
3 changed files with 117 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/emu/lunarcore/game/battle/BattleService.java
View File

@@ -22,7 +22,7 @@ import emu.lunarcore.server.packet.send.PacketSceneCastSkillScRsp;
import emu.lunarcore.server.packet.send.PacketStartCocoonStageScRsp;
import emu.lunarcore.server.packet.send.PacketSyncLineupNotify;
import us.hebi.quickbuf.RepeatedInt;
import it.unimi.dsi.fastutil.ints.IntSet;
public class BattleService extends BaseGameService {
@@ -30,7 +30,7 @@ public class BattleService extends BaseGameService {
super(server);
}
public void startBattle(Player player, int casterId, int attackedGroupId, boolean castedSkill, RepeatedInt attackedList) {
public void startBattle(Player player, int casterId, int attackedGroupId, boolean castedSkill, IntSet targetList) {
// Sanity check to make sure player isnt in a battle
if (player.isInBattle()) {
player.sendPacket(new PacketSceneCastSkillScRsp());
@@ -38,19 +38,17 @@ public class BattleService extends BaseGameService {
}
// Setup variables
List<GameEntity> entities = new ArrayList<>();
List<EntityMonster> monsters = new ArrayList<>();
List<GameEntity> targetEntities = new ArrayList<>();
boolean isPlayerCaster = false; // Set true if the player is the one casting
// Check if attacker is the player or not
if (player.getScene().getAvatarEntityIds().contains(casterId)) {
// Attacker is the player
for (int entityId : attackedList) {
// Player is the attacker
for (int entityId : targetList) {
GameEntity entity = player.getScene().getEntities().get(entityId);
if (entity != null) {
entities.add(entity);
targetEntities.add(entity);
}
}
@@ -60,18 +58,30 @@ public class BattleService extends BaseGameService {
GameEntity entity = player.getScene().getEntities().get(casterId);
if (entity != null) {
entities.add(entity);
targetEntities.add(entity);
}
// Add any assisting monsters from target list
for (int entityId : targetList) {
entity = player.getScene().getEntities().get(entityId);
if (entity != null) {
targetEntities.add(entity);
}
}
}
// Give the client an error if no attacked entities detected
if (entities.size() == 0) {
if (targetEntities.size() == 0) {
player.sendPacket(new PacketSceneCastSkillScRsp());
return;
}
// Monster list
List<EntityMonster> monsters = new ArrayList<>();
// Destroy props
var it = entities.iterator();
var it = targetEntities.iterator();
while (it.hasNext()) {
GameEntity entity = it.next();

14
src/main/java/emu/lunarcore/server/packet/recv/HandlerSceneCastSkillCsReq.java
View File

@@ -10,9 +10,13 @@ import emu.lunarcore.server.packet.PacketHandler;
import emu.lunarcore.server.packet.send.PacketSceneCastSkillMpUpdateScNotify;
import emu.lunarcore.server.packet.send.PacketSceneCastSkillScRsp;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
@Opcodes(CmdId.SceneCastSkillCsReq)
public class HandlerSceneCastSkillCsReq extends PacketHandler {
@SuppressWarnings("deprecation")
@Override
public void handle(GameSession session, byte[] header, byte[] data) throws Exception {
var req = SceneCastSkillCsReq.parseFrom(data);
@@ -34,8 +38,14 @@ public class HandlerSceneCastSkillCsReq extends PacketHandler {
}
}
if (req.hasAttackedEntityIdList()) {
session.getServer().getBattleService().startBattle(session.getPlayer(), req.getCasterId(), req.getAttackedGroupId(), castedSkill, req.getAttackedEntityIdList());
if (req.hasHitTargetIdList()) {
// Create target list
IntSet targetList = new IntOpenHashSet();
req.getHitTargetIdList().forEach(targetList::add);
req.getAssistMonsterIdList().forEach(targetList::add);
// Start battle
session.getServer().getBattleService().startBattle(session.getPlayer(), req.getCasterId(), req.getAttackedGroupId(), castedSkill, targetList);
} else {
session.send(new PacketSceneCastSkillScRsp(req.getAttackedGroupId()));
}