diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/AdminCommands.xml b/L2J_Mobius_1.0_Ertheia/dist/game/config/AdminCommands.xml index 8ab41e304d..e8332bdf3a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/config/AdminCommands.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/AdminCommands.xml @@ -624,4 +624,11 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/FenceData.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/FenceData.xml new file mode 100644 index 0000000000..44e578b4b7 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/FenceData.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/fences.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/fences.htm new file mode 100644 index 0000000000..d2c27d96e8 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/fences.htm @@ -0,0 +1,25 @@ + + + Fence List + + + + + + + + +
+ +
Fence List
+ 		+
+
+ + %fences% +
+
%pages%
+ + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java index bd1994f812..ffe1a87bd6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java @@ -79,6 +79,7 @@ import handlers.admincommandhandlers.AdminEventEngine; import handlers.admincommandhandlers.AdminEvents; import handlers.admincommandhandlers.AdminExpSp; import handlers.admincommandhandlers.AdminFakePlayers; +import handlers.admincommandhandlers.AdminFence; import handlers.admincommandhandlers.AdminFightCalculator; import handlers.admincommandhandlers.AdminFortSiege; import handlers.admincommandhandlers.AdminGeodata; @@ -411,6 +412,7 @@ public class MasterHandler AdminEvents.class, AdminExpSp.class, AdminFakePlayers.class, + AdminFence.class, AdminFightCalculator.class, AdminFortSiege.class, AdminGeodata.class, diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java new file mode 100644 index 0000000000..db63ae149d --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -0,0 +1,224 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.admincommandhandlers; + +import java.util.NoSuchElementException; +import java.util.StringTokenizer; + +import com.l2jmobius.gameserver.data.xml.impl.FenceData; +import com.l2jmobius.gameserver.enums.FenceState; +import com.l2jmobius.gameserver.handler.IAdminCommandHandler; +import com.l2jmobius.gameserver.model.L2Object; +import com.l2jmobius.gameserver.model.L2World; +import com.l2jmobius.gameserver.model.actor.instance.L2FenceInstance; +import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; +import com.l2jmobius.gameserver.model.html.PageBuilder; +import com.l2jmobius.gameserver.model.html.PageResult; +import com.l2jmobius.gameserver.model.html.styles.ButtonsStyle; +import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import com.l2jmobius.gameserver.util.BuilderUtil; + +/** + * @author Sahar, Nik64 + */ +public class AdminFence implements IAdminCommandHandler +{ + private static final String[] ADMIN_COMMANDS = + { + "admin_addfence", + "admin_setfencestate", + "admin_removefence", + "admin_listfence", + "admin_gofence" + }; + + @Override + public boolean useAdminCommand(String command, L2PcInstance activeChar) + { + final StringTokenizer st = new StringTokenizer(command, " "); + final String cmd = st.nextToken(); + switch (cmd) + { + case "admin_addfence": + { + try + { + final int width = Integer.parseInt(st.nextToken()); + final int length = Integer.parseInt(st.nextToken()); + final int height = Integer.parseInt(st.nextToken()); + if ((width < 1) || (length < 1)) + { + BuilderUtil.sendSysMessage(activeChar, "Width and length values must be positive numbers."); + return false; + } + if ((height < 1) || (height > 3)) + { + BuilderUtil.sendSysMessage(activeChar, "The range for height can only be 1-3."); + return false; + } + + FenceData.getInstance().spawnFence(activeChar.getX(), activeChar.getY(), activeChar.getZ(), width, length, height, activeChar.getInstanceId(), FenceState.CLOSED); + BuilderUtil.sendSysMessage(activeChar, "Fence added succesfully."); + } + catch (NoSuchElementException | NumberFormatException e) + { + BuilderUtil.sendSysMessage(activeChar, "Format must be: //addfence "); + } + break; + } + case "admin_setfencestate": + { + try + { + final int objId = Integer.parseInt(st.nextToken()); + final int fenceTypeOrdinal = Integer.parseInt(st.nextToken()); + + if ((fenceTypeOrdinal < 0) || (fenceTypeOrdinal >= FenceState.values().length)) + { + BuilderUtil.sendSysMessage(activeChar, "Specified FenceType is out of range. Only 0-" + (FenceState.values().length - 1) + " are permitted."); + } + else + { + final L2Object obj = L2World.getInstance().findObject(objId); + if (obj instanceof L2FenceInstance) + { + final L2FenceInstance fence = (L2FenceInstance) obj; + final FenceState state = FenceState.values()[fenceTypeOrdinal]; + fence.setState(state); + BuilderUtil.sendSysMessage(activeChar, "Fence " + fence.getName() + "[" + fence.getId() + "]'s state has been changed to " + state.toString()); + } + else + { + BuilderUtil.sendSysMessage(activeChar, "Target is not a fence."); + } + } + } + catch (NoSuchElementException | NumberFormatException e) + { + BuilderUtil.sendSysMessage(activeChar, "Format mustr be: //setfencestate "); + } + break; + } + case "admin_removefence": + { + try + { + final int objId = Integer.parseInt(st.nextToken()); + final L2Object obj = L2World.getInstance().findObject(objId); + if (obj instanceof L2FenceInstance) + { + ((L2FenceInstance) obj).deleteMe(); + BuilderUtil.sendSysMessage(activeChar, "Fence removed succesfully."); + } + else + { + BuilderUtil.sendSysMessage(activeChar, "Target is not a fence."); + } + } + catch (Exception e) + { + BuilderUtil.sendSysMessage(activeChar, "Invalid object ID or target was not found."); + } + sendHtml(activeChar, 0); + break; + } + case "admin_listfence": + { + int page = 0; + if (st.hasMoreTokens()) + { + page = Integer.parseInt(st.nextToken()); + } + sendHtml(activeChar, page); + break; + } + case "admin_gofence": + { + try + { + final int objId = Integer.parseInt(st.nextToken()); + final L2Object obj = L2World.getInstance().findObject(objId); + if (obj != null) + { + activeChar.teleToLocation(obj); + } + } + catch (Exception e) + { + BuilderUtil.sendSysMessage(activeChar, "Invalid object ID or target was not found."); + } + break; + } + } + + return true; + } + + @Override + public String[] getAdminCommandList() + { + return ADMIN_COMMANDS; + } + + private static void sendHtml(L2PcInstance activeChar, int page) + { + final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> + { + sb.append(""); + sb.append(fence.getName() == null ? fence.getId() : fence.getName()); + sb.append(""); + sb.append("