Addition of fences support.
Contributed by Sahar.
This commit is contained in:
MobiusDev
@@ -621,4 +621,11 @@
|
||||
|
||||
<!-- HIDE -->
|
||||
<admin command="admin_hide" accessLevel="30" />
|
||||
|
||||
<!-- FENCES -->
|
||||
<admin command="admin_addfence" accessLevel="100" />
|
||||
<admin command="admin_setfencestate" accessLevel="100" />
|
||||
<admin command="admin_removefence" accessLevel="100" />
|
||||
<admin command="admin_listfence" accessLevel="100" />
|
||||
<admin command="admin_gofence" accessLevel="100" />
|
||||
</list>
|
||||
4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/FenceData.xml
vendored
Normal file
4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/FenceData.xml
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/FenceData.xsd">
|
||||
<fence name="demo" x="-114552" y="-251256" z="-2992" width="100" length="100" height="3" state="CLOSED" />
|
||||
</list>
|
||||
25
L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/fences.htm
vendored
Normal file
25
L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/fences.htm
vendored
Normal file
@@ -0,0 +1,25 @@
|
||||
<html>
|
||||
<head>
|
||||
<title>Fence List</title>
|
||||
</head>
|
||||
<body>
|
||||
<table width="100%">
|
||||
<tr>
|
||||
<td width=45>
|
||||
<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
|
||||
</td>
|
||||
<td width=180>
|
||||
<center><font color="LEVEL">Fence List</font></center>
|
||||
</td>
|
||||
<td width=45>
|
||||
<button value="Back" action="bypass -h admin_current_player" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<br>
|
||||
<table width="100%">
|
||||
%fences%
|
||||
</table>
|
||||
<br>%pages%<br>
|
||||
</body>
|
||||
</html>
|
||||
@@ -75,6 +75,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.AdminGamePoints;
|
||||
@@ -374,6 +375,7 @@ public class MasterHandler
|
||||
AdminEvents.class,
|
||||
AdminExpSp.class,
|
||||
AdminFakePlayers.class,
|
||||
AdminFence.class,
|
||||
AdminFightCalculator.class,
|
||||
AdminFortSiege.class,
|
||||
AdminGamePoints.class,
|
||||
|
||||
230
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java
vendored
Normal file
230
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java
vendored
Normal file
@@ -0,0 +1,230 @@
|
||||
/*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
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.PageResult;
|
||||
import com.l2jmobius.gameserver.model.actor.instance.L2FenceInstance;
|
||||
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
|
||||
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||
import com.l2jmobius.gameserver.util.BuilderUtil;
|
||||
import com.l2jmobius.gameserver.util.HtmlUtil;
|
||||
|
||||
/**
|
||||
* @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 <width> <length> <height>");
|
||||
}
|
||||
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 <fenceObjectId> <fenceState>");
|
||||
}
|
||||
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 = HtmlUtil.createPage(FenceData.getInstance().getFences().values(), page, 10, currentPage ->
|
||||
{
|
||||
return "<td align=center><button action=\"bypass -h admin_listfence " + currentPage + "\" value=\"" + (currentPage + 1) + "\" width=35 height=20 back=\"L2UI_CT1.Button_DF_Down\" fore=\"L2UI_CT1.Button_DF\"></td>";
|
||||
}, fence ->
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append("<tr><td>");
|
||||
sb.append(fence.getName() == null ? fence.getId() : fence.getName());
|
||||
sb.append("</td><td>");
|
||||
sb.append("<button value=\"Go\" action=\"bypass -h admin_gofence ");
|
||||
sb.append(fence.getId());
|
||||
sb.append("\" width=30 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
|
||||
sb.append("</td><td>");
|
||||
sb.append("<button value=\"Hide\" action=\"bypass -h admin_setfencestate ");
|
||||
sb.append(fence.getId());
|
||||
sb.append(" 0");
|
||||
sb.append("\" width=30 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
|
||||
sb.append("</td><td>");
|
||||
sb.append("<button value=\"Off\" action=\"bypass -h admin_setfencestate ");
|
||||
sb.append(fence.getId());
|
||||
sb.append(" 1");
|
||||
sb.append("\" width=30 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
|
||||
sb.append("</td><td>");
|
||||
sb.append("<button value=\"On\" action=\"bypass -h admin_setfencestate ");
|
||||
sb.append(fence.getId());
|
||||
sb.append(" 2");
|
||||
sb.append("\" width=30 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
|
||||
sb.append("</td><td>");
|
||||
sb.append("<button value=\"X\" action=\"bypass -h admin_removefence ");
|
||||
sb.append(fence.getId());
|
||||
sb.append("\" width=30 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
|
||||
sb.append("</td></tr>");
|
||||
return sb.toString();
|
||||
});
|
||||
|
||||
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
|
||||
html.setFile(activeChar, "data/html/admin/fences.htm");
|
||||
html.replace("%pages%", result.getPagerTemplate().toString());
|
||||
html.replace("%announcements%", result.getBodyTemplate().toString());
|
||||
|
||||
if (result.getPages() > 0)
|
||||
{
|
||||
html.replace("%pages%", "<table width=280 cellspacing=0><tr>" + result.getPagerTemplate() + "</tr></table>");
|
||||
}
|
||||
else
|
||||
{
|
||||
html.replace("%pages%", "");
|
||||
}
|
||||
|
||||
html.replace("%fences%", result.getBodyTemplate().toString());
|
||||
activeChar.sendPacket(html);
|
||||
}
|
||||
}
|
||||
37
L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/FenceData.xsd
vendored
Normal file
37
L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/FenceData.xsd
vendored
Normal file
@@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
||||
<xs:complexType name="fence">
|
||||
<xs:attribute type="xs:string" name="name" />
|
||||
<xs:attribute type="xs:integer" name="x" use="required" />
|
||||
<xs:attribute type="xs:integer" name="y" use="required" />
|
||||
<xs:attribute type="xs:integer" name="z" use="required" />
|
||||
<xs:attribute type="xs:positiveInteger" name="width" use="required" />
|
||||
<xs:attribute type="xs:positiveInteger" name="length" use="required" />
|
||||
<xs:attribute name="height" use="required">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:positiveInteger">
|
||||
<xs:minInclusive value="1" />
|
||||
<xs:maxInclusive value="3" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:attribute>
|
||||
<xs:attribute name="state" use="required">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:enumeration value="HIDDEN" />
|
||||
<xs:enumeration value="OPENED" />
|
||||
<xs:enumeration value="CLOSED" />
|
||||
<xs:enumeration value="CLOSED_HIDDEN" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:attribute>
|
||||
</xs:complexType>
|
||||
|
||||
<xs:element name="list">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="fence" maxOccurs="unbounded" type="fence" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:schema>
|
||||
Reference in New Issue
Block a user