From a49c1703ae1f43b72a3093ffee8a769402d80e5d Mon Sep 17 00:00:00 2001 From: P0nk Date: Mon, 18 Sep 2023 23:26:37 +0200 Subject: [PATCH] Remove developer player npc --- .../java/server/life/PlayerNPCFactory.java | 107 ------------------ src/main/java/server/maps/MapFactory.java | 12 +- 2 files changed, 4 insertions(+), 115 deletions(-) diff --git a/src/main/java/server/life/PlayerNPCFactory.java b/src/main/java/server/life/PlayerNPCFactory.java index a0a8de7f59..bacf994a1b 100644 --- a/src/main/java/server/life/PlayerNPCFactory.java +++ b/src/main/java/server/life/PlayerNPCFactory.java @@ -19,124 +19,17 @@ */ package server.life; -import constants.id.ItemId; -import constants.id.MapId; -import constants.id.NpcId; -import net.server.Server; -import provider.Data; import provider.DataProvider; import provider.DataProviderFactory; -import provider.DataTool; import provider.wz.WZFiles; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - /** * @author RonanLana */ public class PlayerNPCFactory { private static final DataProvider npcData = DataProviderFactory.getDataProvider(WZFiles.NPC); - private static final Map> dnpcMaps = new HashMap<>(); - private static Integer runningDeveloperOid = 2147483000; // 647 slots, long enough - public synchronized static boolean isExistentScriptid(int scriptid) { return npcData.getData(scriptid + ".img") != null; } - - private static void loadDeveloperRoomMetadata(DataProvider npc) { - Data thisData = npc.getData(NpcId.CUSTOM_DEV + ".img"); - if (thisData != null) { - DataProvider map = DataProviderFactory.getDataProvider(WZFiles.MAP); - - thisData = map.getData("Map/Map7/" + MapId.DEVELOPERS_HQ + ".img"); - if (thisData != null) { - DataProvider sound = DataProviderFactory.getDataProvider(WZFiles.SOUND); - - thisData = sound.getData("Field.img"); - if (thisData != null) { - Data md = thisData.getChildByPath("anthem/brazil"); - if (md != null) { - Server.getInstance().setAvailableDeveloperRoom(); - } - } - } - } - } - - public synchronized static void loadFactoryMetadata() { - DataProvider npc = npcData; - loadDeveloperRoomMetadata(npc); - - DataProvider etc = DataProviderFactory.getDataProvider(WZFiles.ETC); - Data dnpcData = etc.getData("DeveloperNpc.img"); - if (dnpcData != null) { - for (Data data : dnpcData.getChildren()) { - int scriptId = Integer.parseInt(data.getName()); - - String name = DataTool.getString("name", data, ""); - int face = DataTool.getIntConvert("face", data, 20000); - int hair = DataTool.getIntConvert("hair", data, 30000); - int gender = DataTool.getIntConvert("gender", data, 0); - byte skin = (byte) DataTool.getIntConvert("skin", data, 0); - int dir = DataTool.getIntConvert("dir", data, 0); - int mapid = DataTool.getIntConvert("map", data, 0); - int FH = DataTool.getIntConvert("fh", data, 0); - int RX0 = DataTool.getIntConvert("rx0", data, 0); - int RX1 = DataTool.getIntConvert("rx1", data, 0); - int CX = DataTool.getIntConvert("cx", data, 0); - int CY = DataTool.getIntConvert("cy", data, 0); - - Map equips = new HashMap<>(); - for (Data edata : data.getChildByPath("equips").getChildren()) { - short equippos = (short) DataTool.getIntConvert("pos", edata); - int equipid = DataTool.getIntConvert("itemid", edata); - - equips.put(equippos, equipid); - } - - List dnpcSet = dnpcMaps.get(mapid); - if (dnpcSet == null) { - dnpcSet = new LinkedList<>(); - dnpcMaps.put(mapid, dnpcSet); - } - - dnpcSet.add(new PlayerNPC(name, scriptId, face, hair, gender, skin, equips, dir, FH, RX0, RX1, CX, CY, runningDeveloperOid)); - runningDeveloperOid++; - } - } else { - Data thisData = npc.getData(NpcId.CUSTOM_DEV + ".img"); - - if (thisData != null) { - byte[] encData = {0x52, 0x6F, 0x6E, 0x61, 0x6E}; - String name = new String(encData); - int face = 20104, hair = 30215, gender = 0, skin = 0, dir = 0, mapid = MapId.DEVELOPERS_HQ; - int FH = 4, RX0 = -143, RX1 = -243, CX = -193, CY = 117, scriptId = NpcId.CUSTOM_DEV; - - Map equips = new HashMap<>(); - equips.put((short) -1, ItemId.GREEN_HEADBAND); - equips.put((short) -11, ItemId.TIMELESS_NIBLEHEIM); - equips.put((short) -8, ItemId.BLUE_KORBEN); - equips.put((short) -6, ItemId.MITHRIL_PLATINE_PANTS); - equips.put((short) -7, ItemId.BLUE_CARZEN_BOOTS); - equips.put((short) -5, ItemId.MITHRIL_PLATINE); - - List dnpcSet = dnpcMaps.get(mapid); - if (dnpcSet == null) { - dnpcSet = new LinkedList<>(); - dnpcMaps.put(mapid, dnpcSet); - } - - dnpcSet.add(new PlayerNPC(name, scriptId, face, hair, gender, (byte) skin, equips, dir, FH, RX0, RX1, CX, CY, runningDeveloperOid)); - runningDeveloperOid++; - } - } - } - - public synchronized static List getDeveloperNpcsFromMapid(int mapid) { - return dnpcMaps.get(mapid); - } } diff --git a/src/main/java/server/maps/MapFactory.java b/src/main/java/server/maps/MapFactory.java index 1c7a85cd0c..a1c3f14c21 100644 --- a/src/main/java/server/maps/MapFactory.java +++ b/src/main/java/server/maps/MapFactory.java @@ -28,7 +28,10 @@ import provider.DataProviderFactory; import provider.DataTool; import provider.wz.WZFiles; import scripting.event.EventInstanceManager; -import server.life.*; +import server.life.AbstractLoadedLife; +import server.life.LifeFactory; +import server.life.Monster; +import server.life.PlayerNPC; import server.partyquest.GuardianSpawnPoint; import tools.DatabaseConnection; import tools.StringUtil; @@ -249,13 +252,6 @@ public class MapFactory { } catch (SQLException e) { e.printStackTrace(); } - - List dnpcs = PlayerNPCFactory.getDeveloperNpcsFromMapid(mapid); - if (dnpcs != null) { - for (PlayerNPC dnpc : dnpcs) { - map.addPlayerNPCMapObject(dnpc); - } - } } loadLifeFromWz(map, mapData);