mirror of
https://github.com/Melledy/LunarCore.git
synced 2025-12-23 10:44:36 +01:00
Implement rogue npc info
This commit is contained in:
@@ -20,6 +20,7 @@ public class GameDepot {
|
||||
@Getter private static Int2ObjectMap<int[]> rogueMapGen = new Int2ObjectOpenHashMap<>();
|
||||
@Getter private static List<RogueBuffExcel> rogueRandomBuffList = new ArrayList<>();
|
||||
@Getter private static List<RogueMiracleExcel> rogueRandomMiracleList = new ArrayList<>();
|
||||
@Getter private static List<RogueNPCExcel> rogueRandomNpcList = new ArrayList<>();
|
||||
private static Int2ObjectMap<List<RogueMapExcel>> rogueMapDepot = new Int2ObjectOpenHashMap<>();
|
||||
|
||||
public static void addRelicMainAffix(RelicMainAffixExcel affix) {
|
||||
|
||||
25
src/main/java/emu/lunarcore/data/excel/RogueNPCExcel.java
Normal file
25
src/main/java/emu/lunarcore/data/excel/RogueNPCExcel.java
Normal file
@@ -0,0 +1,25 @@
|
||||
package emu.lunarcore.data.excel;
|
||||
|
||||
import emu.lunarcore.data.GameDepot;
|
||||
import emu.lunarcore.data.GameResource;
|
||||
import emu.lunarcore.data.ResourceType;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@ResourceType(name = {"RogueNPC.json"})
|
||||
public class RogueNPCExcel extends GameResource {
|
||||
private int RogueNPCID;
|
||||
private int NPCID;
|
||||
|
||||
@Override
|
||||
public int getId() {
|
||||
return RogueNPCID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLoad() {
|
||||
if (NPCID == 3013) {
|
||||
GameDepot.getRogueRandomNpcList().add(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,18 +1,23 @@
|
||||
package emu.lunarcore.game.rogue;
|
||||
|
||||
import emu.lunarcore.data.GameData;
|
||||
import emu.lunarcore.data.GameDepot;
|
||||
import emu.lunarcore.data.config.GroupInfo;
|
||||
import emu.lunarcore.data.config.MonsterInfo;
|
||||
import emu.lunarcore.data.config.NpcInfo;
|
||||
import emu.lunarcore.data.config.PropInfo;
|
||||
import emu.lunarcore.data.excel.NpcMonsterExcel;
|
||||
import emu.lunarcore.data.excel.PropExcel;
|
||||
import emu.lunarcore.data.excel.RogueMonsterExcel;
|
||||
import emu.lunarcore.data.excel.RogueNPCExcel;
|
||||
import emu.lunarcore.game.enums.PropState;
|
||||
import emu.lunarcore.game.scene.Scene;
|
||||
import emu.lunarcore.game.scene.SceneEntityLoader;
|
||||
import emu.lunarcore.game.scene.entity.EntityMonster;
|
||||
import emu.lunarcore.game.scene.entity.EntityNpc;
|
||||
import emu.lunarcore.game.scene.entity.EntityProp;
|
||||
import emu.lunarcore.game.scene.entity.extra.PropRogueData;
|
||||
import emu.lunarcore.util.Utils;
|
||||
|
||||
public class RogueEntityLoader extends SceneEntityLoader {
|
||||
|
||||
@@ -103,4 +108,17 @@ public class RogueEntityLoader extends SceneEntityLoader {
|
||||
|
||||
return prop;
|
||||
}
|
||||
|
||||
public EntityNpc loadNpc(Scene scene, GroupInfo group, NpcInfo npcInfo) {
|
||||
// Create npc from group npc info
|
||||
EntityNpc npc = super.loadNpc(scene, group, npcInfo);
|
||||
|
||||
// Add rogue dialogue
|
||||
if (npc.getNpcId() == 3013) {
|
||||
RogueNPCExcel rogueNpcExcel = Utils.randomElement(GameDepot.getRogueRandomNpcList());
|
||||
npc.setRogueNpcId(rogueNpcExcel.getId());
|
||||
}
|
||||
|
||||
return npc;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package emu.lunarcore.game.scene.entity;
|
||||
|
||||
import emu.lunarcore.game.scene.Scene;
|
||||
import emu.lunarcore.proto.MotionInfoOuterClass.MotionInfo;
|
||||
import emu.lunarcore.proto.NpcRogueInfoOuterClass.NpcRogueInfo;
|
||||
import emu.lunarcore.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
|
||||
import emu.lunarcore.proto.SceneNpcInfoOuterClass.SceneNpcInfo;
|
||||
import emu.lunarcore.util.Position;
|
||||
@@ -19,6 +20,8 @@ public class EntityNpc implements GameEntity {
|
||||
private final Position pos;
|
||||
private final Position rot;
|
||||
|
||||
@Setter private int rogueNpcId;
|
||||
|
||||
public EntityNpc(Scene scene, int npcId, Position pos) {
|
||||
this.scene = scene;
|
||||
this.npcId = npcId;
|
||||
@@ -28,9 +31,19 @@ public class EntityNpc implements GameEntity {
|
||||
|
||||
@Override
|
||||
public SceneEntityInfo toSceneEntityProto() {
|
||||
// Base npc info
|
||||
var npc = SceneNpcInfo.newInstance()
|
||||
.setNpcId(this.getNpcId());
|
||||
|
||||
// Rogue data
|
||||
if (this.rogueNpcId > 0) {
|
||||
var rogue = NpcRogueInfo.newInstance()
|
||||
.setRogueNpcId(this.rogueNpcId);
|
||||
|
||||
npc.getMutableExtraInfo().setRogueInfo(rogue);
|
||||
}
|
||||
|
||||
// Main entity proto
|
||||
var proto = SceneEntityInfo.newInstance()
|
||||
.setEntityId(this.getEntityId())
|
||||
.setGroupId(this.getGroupId())
|
||||
|
||||
Reference in New Issue
Block a user