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

Dont remove farmable monsters from the scene when they are defeated

Browse Source
This commit is contained in:
Melledy
2023-11-09 00:35:19 -08:00
parent 2328c26550
commit d1c96aa9a3
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,6 +205,9 @@ public class BattleService extends BaseGameService {
case BATTLE_END_WIN -> { case BATTLE_END_WIN -> {
// Remove monsters from the map - Could optimize it a little better // Remove monsters from the map - Could optimize it a little better
for (var monster : battle.getNpcMonsters()) { for (var monster : battle.getNpcMonsters()) {
// Dont remove farmable monsters from the scene when they are defeated
if (monster.isFarmElement()) continue;
// Remove monster
player.getScene().removeEntity(monster); player.getScene().removeEntity(monster);
} }
// Drops // Drops

7
src/main/java/emu/lunarcore/game/scene/entity/EntityMonster.java
View File

@@ -26,6 +26,8 @@ public class EntityMonster implements GameEntity {
private final Position pos; private final Position pos;
private final Position rot; private final Position rot;
private int farmElementId;
public EntityMonster(Scene scene, NpcMonsterExcel excel, GroupInfo group, MonsterInfo monsterInfo) { public EntityMonster(Scene scene, NpcMonsterExcel excel, GroupInfo group, MonsterInfo monsterInfo) {
this.scene = scene; this.scene = scene;
this.excel = excel; this.excel = excel;
@@ -33,6 +35,11 @@ public class EntityMonster implements GameEntity {
this.rot = monsterInfo.getRot().clone(); this.rot = monsterInfo.getRot().clone();
this.groupId = group.getId(); this.groupId = group.getId();
this.instId = monsterInfo.getID(); this.instId = monsterInfo.getID();
this.farmElementId = monsterInfo.getFarmElementID();
}
public boolean isFarmElement() {
return this.farmElementId > 0;
} }
public int getStageId() { public int getStageId() {