lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept basic symbols in buff scheme names.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-10-10 21:40:32 +00:00
parent 54ef18b558
commit 3cdb31b034
15 changed files with 218 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_C6_Interlude/dist/game/config/custom/Buffer.ini → L2J_Mobius_C6_Interlude/dist/game/config/custom/SchemeBuffer.ini vendored
View File

@@ -1,6 +1,7 @@
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Buffer # Scheme Buffer
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Also check data\SchemeBufferSkills.xml
# Maximum number of available schemes per player. # Maximum number of available schemes per player.
BufferMaxSchemesPerChar = 4 BufferMaxSchemesPerChar = 4

0
L2J_Mobius_C6_Interlude/dist/game/data/html/mods/buffer/50008-1.htm → L2J_Mobius_C6_Interlude/dist/game/data/html/mods/SchemeBuffer/50008-1.htm vendored
View File

0
L2J_Mobius_C6_Interlude/dist/game/data/html/mods/buffer/50008-2.htm → L2J_Mobius_C6_Interlude/dist/game/data/html/mods/SchemeBuffer/50008-2.htm vendored
View File

0
L2J_Mobius_C6_Interlude/dist/game/data/html/mods/buffer/50008.htm → L2J_Mobius_C6_Interlude/dist/game/data/html/mods/SchemeBuffer/50008.htm vendored
View File

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java
View File

@@ -90,10 +90,10 @@ public class Config
// custom // custom
private static final String AWAY_CONFIG_FILE = "./config/custom/Away.ini"; private static final String AWAY_CONFIG_FILE = "./config/custom/Away.ini";
private static final String BANK_CONFIG_FILE = "./config/custom/Bank.ini"; private static final String BANK_CONFIG_FILE = "./config/custom/Bank.ini";
private static final String BUFFER_CONFIG_FILE = "./config/custom/Buffer.ini";
private static final String EVENT_CHAMPION_CONFIG_FILE = "./config/custom/Champion.ini"; private static final String EVENT_CHAMPION_CONFIG_FILE = "./config/custom/Champion.ini";
private static final String OFFLINE_CONFIG_FILE = "./config/custom/Offline.ini"; private static final String OFFLINE_CONFIG_FILE = "./config/custom/Offline.ini";
private static final String OTHER_CONFIG_FILE = "./config/custom/Other.ini"; private static final String OTHER_CONFIG_FILE = "./config/custom/Other.ini";
private static final String SCHEME_BUFFER_CONFIG_FILE = "./config/custom/SchemeBuffer.ini";
private static final String EVENT_REBIRTH_CONFIG_FILE = "./config/custom/Rebirth.ini"; private static final String EVENT_REBIRTH_CONFIG_FILE = "./config/custom/Rebirth.ini";
private static final String EVENT_WEDDING_CONFIG_FILE = "./config/custom/Wedding.ini"; private static final String EVENT_WEDDING_CONFIG_FILE = "./config/custom/Wedding.ini";
// login // login
@@ -2109,18 +2109,18 @@ public class Config
{ {
try try
{ {
final Properties BufferSettings = new Properties(); final Properties ShemeBufferSettings = new Properties();
final InputStream is = new FileInputStream(new File(BUFFER_CONFIG_FILE)); final InputStream is = new FileInputStream(new File(SCHEME_BUFFER_CONFIG_FILE));
BufferSettings.load(is); ShemeBufferSettings.load(is);
is.close(); is.close();
BUFFER_MAX_SCHEMES = Integer.parseInt(BufferSettings.getProperty("BufferMaxSchemesPerChar", "4")); BUFFER_MAX_SCHEMES = Integer.parseInt(ShemeBufferSettings.getProperty("BufferMaxSchemesPerChar", "4"));
BUFFER_STATIC_BUFF_COST = Integer.parseInt(BufferSettings.getProperty("BufferStaticCostPerBuff", "-1")); BUFFER_STATIC_BUFF_COST = Integer.parseInt(ShemeBufferSettings.getProperty("BufferStaticCostPerBuff", "-1"));
} }
catch (Exception e) catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
throw new Error("Failed to Load " + BUFFER_CONFIG_FILE + " File."); throw new Error("Failed to Load " + SCHEME_BUFFER_CONFIG_FILE + " File.");
} }
} }

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java
View File

@@ -41,7 +41,7 @@ import org.l2jmobius.commons.util.Util;
import org.l2jmobius.gameserver.cache.CrestCache; import org.l2jmobius.gameserver.cache.CrestCache;
import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager;
import org.l2jmobius.gameserver.datatables.BufferTable; import org.l2jmobius.gameserver.datatables.SchemeBufferTable;
import org.l2jmobius.gameserver.datatables.HeroSkillTable; import org.l2jmobius.gameserver.datatables.HeroSkillTable;
import org.l2jmobius.gameserver.datatables.NobleSkillTable; import org.l2jmobius.gameserver.datatables.NobleSkillTable;
import org.l2jmobius.gameserver.datatables.OfflineTradeTable; import org.l2jmobius.gameserver.datatables.OfflineTradeTable;
@@ -257,7 +257,7 @@ public class GameServer
} }
Util.printSection("Npc"); Util.printSection("Npc");
BufferTable.getInstance(); SchemeBufferTable.getInstance();
NpcWalkerRoutesTable.getInstance().load(); NpcWalkerRoutesTable.getInstance().load();
if (!NpcTable.getInstance().isInitialized()) if (!NpcTable.getInstance().isInitialized())
{ {

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
View File

@@ -22,7 +22,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseBackup;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.datatables.BufferTable; import org.l2jmobius.gameserver.datatables.SchemeBufferTable;
import org.l2jmobius.gameserver.datatables.OfflineTradeTable; import org.l2jmobius.gameserver.datatables.OfflineTradeTable;
import org.l2jmobius.gameserver.instancemanager.AutoSaveManager; import org.l2jmobius.gameserver.instancemanager.AutoSaveManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
@@ -459,7 +459,7 @@ public class Shutdown extends Thread
LOGGER.info("Fishing Championship data has been saved!!"); LOGGER.info("Fishing Championship data has been saved!!");
// Schemes save. // Schemes save.
BufferTable.getInstance().saveSchemes(); SchemeBufferTable.getInstance().saveSchemes();
LOGGER.info("BufferTable data has been saved!!"); LOGGER.info("BufferTable data has been saved!!");
// Save all global (non-player specific) Quest data that needs to persist after reboot // Save all global (non-player specific) Quest data that needs to persist after reboot

79
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
View File

@@ -23,7 +23,7 @@ import java.util.StringTokenizer;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.datatables.BufferTable; import org.l2jmobius.gameserver.datatables.SchemeBufferTable;
import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.Summon;
@@ -43,7 +43,10 @@ public class SchemeBufferInstance extends FolkInstance
@Override @Override
public void onBypassFeedback(PlayerInstance player, String command) public void onBypassFeedback(PlayerInstance player, String command)
{ {
StringTokenizer st = new StringTokenizer(command, " "); // Simple hack to use createscheme bypass with a space.
command = command.replace("createscheme ", "createscheme;");
StringTokenizer st = new StringTokenizer(command, ";");
String currentCommand = st.nextToken(); String currentCommand = st.nextToken();
if (currentCommand.startsWith("menu")) if (currentCommand.startsWith("menu"))
@@ -113,7 +116,7 @@ public class SchemeBufferInstance extends FolkInstance
} }
else if ((cost == 0) || player.reduceAdena("NPC Buffer", cost, this, true)) else if ((cost == 0) || player.reduceAdena("NPC Buffer", cost, this, true))
{ {
for (int skillId : BufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName))
{ {
SkillTable.getInstance().getInfo(skillId, SkillTable.getInstance().getMaxLevel(skillId, 1)).getEffects(this, target); SkillTable.getInstance().getInfo(skillId, SkillTable.getInstance().getMaxLevel(skillId, 1)).getEffects(this, target);
} }
@@ -131,7 +134,7 @@ public class SchemeBufferInstance extends FolkInstance
final int skillId = Integer.parseInt(st.nextToken()); final int skillId = Integer.parseInt(st.nextToken());
final int page = Integer.parseInt(st.nextToken()); final int page = Integer.parseInt(st.nextToken());
final List<Integer> skills = BufferTable.getInstance().getScheme(player.getObjectId(), schemeName); final List<Integer> skills = SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName);
if (currentCommand.startsWith("skillselect") && !schemeName.equalsIgnoreCase("none")) if (currentCommand.startsWith("skillselect") && !schemeName.equalsIgnoreCase("none"))
{ {
@@ -155,14 +158,20 @@ public class SchemeBufferInstance extends FolkInstance
{ {
try try
{ {
final String schemeName = st.nextToken(); final String schemeName = st.nextToken().trim();
if (schemeName.length() > 14) if (schemeName.length() > 14)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
return;
}
// Simple hack to use spaces, dots, commas, exclamations or question marks.
if (!Util.isAlphaNumeric(schemeName.replace(" ", "").replace(".", "").replace(",", "").replace("!", "").replace("?", "")))
{
player.sendMessage("Please use plain alphanumeric characters.");
return; return;
} }
final Map<String, ArrayList<Integer>> schemes = BufferTable.getInstance().getPlayerSchemes(player.getObjectId()); final Map<String, ArrayList<Integer>> schemes = SchemeBufferTable.getInstance().getPlayerSchemes(player.getObjectId());
if (schemes != null) if (schemes != null)
{ {
if (schemes.size() == Config.BUFFER_MAX_SCHEMES) if (schemes.size() == Config.BUFFER_MAX_SCHEMES)
@@ -178,12 +187,12 @@ public class SchemeBufferInstance extends FolkInstance
} }
} }
BufferTable.getInstance().setScheme(player.getObjectId(), schemeName.trim(), new ArrayList<Integer>()); SchemeBufferTable.getInstance().setScheme(player.getObjectId(), schemeName.trim(), new ArrayList<>());
showGiveBuffsWindow(player); showGiveBuffsWindow(player);
} }
catch (Exception e) catch (Exception e)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
} }
} }
else if (currentCommand.startsWith("deletescheme")) else if (currentCommand.startsWith("deletescheme"))
@@ -191,7 +200,7 @@ public class SchemeBufferInstance extends FolkInstance
try try
{ {
final String schemeName = st.nextToken(); final String schemeName = st.nextToken();
final Map<String, ArrayList<Integer>> schemes = BufferTable.getInstance().getPlayerSchemes(player.getObjectId()); final Map<String, ArrayList<Integer>> schemes = SchemeBufferTable.getInstance().getPlayerSchemes(player.getObjectId());
if ((schemes != null) && schemes.containsKey(schemeName)) if ((schemes != null) && schemes.containsKey(schemeName))
{ {
@@ -214,14 +223,14 @@ public class SchemeBufferInstance extends FolkInstance
String filename = ""; String filename = "";
if (val == 0) if (val == 0)
{ {
filename = "" + npcId; filename = Integer.toString(npcId);
} }
else else
{ {
filename = npcId + "-" + val; filename = npcId + "-" + val;
} }
return "data/html/mods/buffer/" + filename + ".htm"; return "data/html/mods/SchemeBuffer/" + filename + ".htm";
} }
/** /**
@@ -232,7 +241,7 @@ public class SchemeBufferInstance extends FolkInstance
{ {
final StringBuilder sb = new StringBuilder(200); final StringBuilder sb = new StringBuilder(200);
final Map<String, ArrayList<Integer>> schemes = BufferTable.getInstance().getPlayerSchemes(player.getObjectId()); final Map<String, ArrayList<Integer>> schemes = SchemeBufferTable.getInstance().getPlayerSchemes(player.getObjectId());
if ((schemes == null) || schemes.isEmpty()) if ((schemes == null) || schemes.isEmpty())
{ {
sb.append("<font color=\"LEVEL\">You haven't defined any scheme.</font>"); sb.append("<font color=\"LEVEL\">You haven't defined any scheme.</font>");
@@ -243,10 +252,10 @@ public class SchemeBufferInstance extends FolkInstance
{ {
final int cost = getFee(scheme.getValue()); final int cost = getFee(scheme.getValue());
StringUtil.append(sb, "<font color=\"LEVEL\">", scheme.getKey(), " [", scheme.getValue().size(), " / ", player.getMaxBuffCount(), "]", ((cost > 0) ? " - cost: " + StringUtil.formatNumber(cost) : ""), "</font><br1>"); StringUtil.append(sb, "<font color=\"LEVEL\">", scheme.getKey(), " [", scheme.getValue().size(), " / ", player.getMaxBuffCount(), "]", ((cost > 0) ? " - cost: " + StringUtil.formatNumber(cost) : ""), "</font><br1>");
StringUtil.append(sb, "<a action=\"bypass -h npc_%objectId%_givebuffs ", scheme.getKey(), " ", cost, "\">Use on Me</a>&nbsp;|&nbsp;"); StringUtil.append(sb, "<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + "\">Use on Me</a>&nbsp;|&nbsp;");
StringUtil.append(sb, "<a action=\"bypass -h npc_%objectId%_givebuffs ", scheme.getKey(), " ", cost, " pet\">Use on Pet</a>&nbsp;|&nbsp;"); StringUtil.append(sb, "<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + ";pet\">Use on Pet</a>&nbsp;|&nbsp;");
StringUtil.append(sb, "<a action=\"bypass -h npc_%objectId%_editschemes Buffs ", scheme.getKey(), " 1\">Edit</a>&nbsp;|&nbsp;"); StringUtil.append(sb, "<a action=\"bypass -h npc_%objectId%_editschemes;Buffs;" + scheme.getKey() + ";1\">Edit</a>&nbsp;|&nbsp;");
StringUtil.append(sb, "<a action=\"bypass -h npc_%objectId%_deletescheme ", scheme.getKey(), "\">Delete</a><br>"); StringUtil.append(sb, "<a action=\"bypass -h npc_%objectId%_deletescheme;" + scheme.getKey() + "\">Delete</a><br>");
} }
} }
@@ -268,7 +277,7 @@ public class SchemeBufferInstance extends FolkInstance
private void showEditSchemeWindow(PlayerInstance player, String groupType, String schemeName, int page) private void showEditSchemeWindow(PlayerInstance player, String groupType, String schemeName, int page)
{ {
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
final List<Integer> schemeSkills = BufferTable.getInstance().getScheme(player.getObjectId(), schemeName); final List<Integer> schemeSkills = SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName);
html.setFile(getHtmlPath(getNpcId(), 2)); html.setFile(getHtmlPath(getNpcId(), 2));
html.replace("%schemename%", schemeName); html.replace("%schemename%", schemeName);
@@ -289,7 +298,7 @@ public class SchemeBufferInstance extends FolkInstance
private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int page) private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int page)
{ {
// Retrieve the entire skills list based on group type. // Retrieve the entire skills list based on group type.
List<Integer> skills = BufferTable.getInstance().getSkillsIdsByType(groupType); List<Integer> skills = SchemeBufferTable.getInstance().getSkillsIdsByType(groupType);
if (skills.isEmpty()) if (skills.isEmpty())
{ {
return "That group doesn't contain any skills."; return "That group doesn't contain any skills.";
@@ -305,7 +314,7 @@ public class SchemeBufferInstance extends FolkInstance
// Cut skills list up to page number. // Cut skills list up to page number.
skills = skills.subList((page - 1) * PAGE_LIMIT, Math.min(page * PAGE_LIMIT, skills.size())); skills = skills.subList((page - 1) * PAGE_LIMIT, Math.min(page * PAGE_LIMIT, skills.size()));
final List<Integer> schemeSkills = BufferTable.getInstance().getScheme(player.getObjectId(), schemeName); final List<Integer> schemeSkills = SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName);
final StringBuilder sb = new StringBuilder(skills.size() * 150); final StringBuilder sb = new StringBuilder(skills.size() * 150);
int row = 0; int row = 0;
@@ -317,33 +326,33 @@ public class SchemeBufferInstance extends FolkInstance
{ {
if (schemeSkills.contains(skillId)) if (schemeSkills.contains(skillId))
{ {
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill00", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", BufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect ", groupType, " ", schemeName, " ", skillId, " ", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>"); StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill00", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
} }
else else
{ {
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill00", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", BufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect ", groupType, " ", schemeName, " ", skillId, " ", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>"); StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill00", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
} }
} }
else if (skillId < 1000) else if (skillId < 1000)
{ {
if (schemeSkills.contains(skillId)) if (schemeSkills.contains(skillId))
{ {
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill0", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", BufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect ", groupType, " ", schemeName, " ", skillId, " ", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>"); StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill0", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
} }
else else
{ {
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill0", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", BufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect ", groupType, " ", schemeName, " ", skillId, " ", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>"); StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill0", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
} }
} }
else else
{ {
if (schemeSkills.contains(skillId)) if (schemeSkills.contains(skillId))
{ {
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", BufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect ", groupType, " ", schemeName, " ", skillId, " ", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>"); StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
} }
else else
{ {
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", BufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect ", groupType, " ", schemeName, " ", skillId, " ", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>"); StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
} }
} }
@@ -356,22 +365,22 @@ public class SchemeBufferInstance extends FolkInstance
if (page > 1) if (page > 1)
{ {
StringUtil.append(sb, "<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes ", groupType, " ", schemeName, " ", page - 1, "\">Previous</a></td>"); sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page - 1) + "\">Previous</a></td>");
} }
else else
{ {
StringUtil.append(sb, "<td align=left width=70>Previous</td>"); sb.append("<td align=left width=70>Previous</td>");
} }
StringUtil.append(sb, "<td align=center width=100>Page ", page, "</td>"); sb.append("<td align=center width=100>Page " + page + "</td>");
if (page < max) if (page < max)
{ {
StringUtil.append(sb, "<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes ", groupType, " ", schemeName, " ", page + 1, "\">Next</a></td>"); sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page + 1) + "\">Next</a></td>");
} }
else else
{ {
StringUtil.append(sb, "<td align=right width=70>Next</td>"); sb.append("<td align=right width=70>Next</td>");
} }
sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>"); sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>");
@@ -390,7 +399,7 @@ public class SchemeBufferInstance extends FolkInstance
sb.append("<table>"); sb.append("<table>");
int count = 0; int count = 0;
for (String type : BufferTable.getInstance().getSkillTypes()) for (String type : SchemeBufferTable.getInstance().getSkillTypes())
{ {
if (count == 0) if (count == 0)
{ {
@@ -399,11 +408,11 @@ public class SchemeBufferInstance extends FolkInstance
if (groupType.equalsIgnoreCase(type)) if (groupType.equalsIgnoreCase(type))
{ {
StringUtil.append(sb, "<td width=65>", type, "</td>"); sb.append("<td width=65>" + type + "</td>");
} }
else else
{ {
StringUtil.append(sb, "<td width=65><a action=\"bypass -h npc_%objectId%_editschemes ", type, " ", schemeName, " 1\">", type, "</a></td>"); sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes;" + type + ";" + schemeName + ";1\">" + type + "</a></td>");
} }
count++; count++;
@@ -438,7 +447,7 @@ public class SchemeBufferInstance extends FolkInstance
int fee = 0; int fee = 0;
for (int sk : list) for (int sk : list)
{ {
fee += BufferTable.getInstance().getAvailableBuff(sk).getPrice(); fee += SchemeBufferTable.getInstance().getAvailableBuff(sk).getPrice();
} }
return fee; return fee;

36
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
View File

@@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.Util;
public class SchemeBufferInstance extends Npc public class SchemeBufferInstance extends Npc
{ {
@@ -45,7 +46,10 @@ public class SchemeBufferInstance extends Npc
@Override @Override
public void onBypassFeedback(PlayerInstance player, String command) public void onBypassFeedback(PlayerInstance player, String command)
{ {
StringTokenizer st = new StringTokenizer(command, " "); // Simple hack to use createscheme bypass with a space.
command = command.replace("createscheme ", "createscheme;");
StringTokenizer st = new StringTokenizer(command, ";");
String currentCommand = st.nextToken(); String currentCommand = st.nextToken();
if (currentCommand.startsWith("menu")) if (currentCommand.startsWith("menu"))
@@ -172,10 +176,16 @@ public class SchemeBufferInstance extends Npc
{ {
try try
{ {
final String schemeName = st.nextToken(); final String schemeName = st.nextToken().trim();
if (schemeName.length() > 14) if (schemeName.length() > 14)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
return;
}
// Simple hack to use spaces, dots, commas, exclamations or question marks.
if (!Util.isAlphaNumeric(schemeName.replace(" ", "").replace(".", "").replace(",", "").replace("!", "").replace("?", "")))
{
player.sendMessage("Please use plain alphanumeric characters.");
return; return;
} }
@@ -200,7 +210,7 @@ public class SchemeBufferInstance extends Npc
} }
catch (Exception e) catch (Exception e)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
} }
} }
else if (currentCommand.startsWith("deletescheme")) else if (currentCommand.startsWith("deletescheme"))
@@ -258,10 +268,10 @@ public class SchemeBufferInstance extends Npc
{ {
final int cost = getFee(scheme.getValue()); final int cost = getFee(scheme.getValue());
sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>"); sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + "\">Use on Me</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + "\">Use on Me</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + " pet\">Use on Pet</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + ";pet\">Use on Pet</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_editschemes Buffs " + scheme.getKey() + " 1\">Edit</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_editschemes;Buffs;" + scheme.getKey() + ";1\">Edit</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme " + scheme.getKey() + "\">Delete</a><br>"); sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme;" + scheme.getKey() + "\">Delete</a><br>");
} }
} }
@@ -331,11 +341,11 @@ public class SchemeBufferInstance extends Npc
final Skill skill = SkillData.getInstance().getSkill(skillId, 1); final Skill skill = SkillData.getInstance().getSkill(skillId, 1);
if (schemeSkills.contains(skillId)) if (schemeSkills.contains(skillId))
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
} }
else else
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
} }
sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>"); sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>");
@@ -347,7 +357,7 @@ public class SchemeBufferInstance extends Npc
if (page > 1) if (page > 1)
{ {
sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page - 1) + "\">Previous</a></td>"); sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page - 1) + "\">Previous</a></td>");
} }
else else
{ {
@@ -358,7 +368,7 @@ public class SchemeBufferInstance extends Npc
if (page < max) if (page < max)
{ {
sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page + 1) + "\">Next</a></td>"); sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page + 1) + "\">Next</a></td>");
} }
else else
{ {
@@ -394,7 +404,7 @@ public class SchemeBufferInstance extends Npc
} }
else else
{ {
sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes " + type + " " + schemeName + " 1\">" + type + "</a></td>"); sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes;" + type + ";" + schemeName + ";1\">" + type + "</a></td>");
} }
count++; count++;

36
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
View File

@@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.Util;
public class SchemeBufferInstance extends Npc public class SchemeBufferInstance extends Npc
{ {
@@ -45,7 +46,10 @@ public class SchemeBufferInstance extends Npc
@Override @Override
public void onBypassFeedback(PlayerInstance player, String command) public void onBypassFeedback(PlayerInstance player, String command)
{ {
StringTokenizer st = new StringTokenizer(command, " "); // Simple hack to use createscheme bypass with a space.
command = command.replace("createscheme ", "createscheme;");
StringTokenizer st = new StringTokenizer(command, ";");
String currentCommand = st.nextToken(); String currentCommand = st.nextToken();
if (currentCommand.startsWith("menu")) if (currentCommand.startsWith("menu"))
@@ -172,10 +176,16 @@ public class SchemeBufferInstance extends Npc
{ {
try try
{ {
final String schemeName = st.nextToken(); final String schemeName = st.nextToken().trim();
if (schemeName.length() > 14) if (schemeName.length() > 14)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
return;
}
// Simple hack to use spaces, dots, commas, exclamations or question marks.
if (!Util.isAlphaNumeric(schemeName.replace(" ", "").replace(".", "").replace(",", "").replace("!", "").replace("?", "")))
{
player.sendMessage("Please use plain alphanumeric characters.");
return; return;
} }
@@ -200,7 +210,7 @@ public class SchemeBufferInstance extends Npc
} }
catch (Exception e) catch (Exception e)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
} }
} }
else if (currentCommand.startsWith("deletescheme")) else if (currentCommand.startsWith("deletescheme"))
@@ -258,10 +268,10 @@ public class SchemeBufferInstance extends Npc
{ {
final int cost = getFee(scheme.getValue()); final int cost = getFee(scheme.getValue());
sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>"); sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + "\">Use on Me</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + "\">Use on Me</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + " pet\">Use on Pet</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + ";pet\">Use on Pet</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_editschemes Buffs " + scheme.getKey() + " 1\">Edit</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_editschemes;Buffs;" + scheme.getKey() + ";1\">Edit</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme " + scheme.getKey() + "\">Delete</a><br>"); sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme;" + scheme.getKey() + "\">Delete</a><br>");
} }
} }
@@ -331,11 +341,11 @@ public class SchemeBufferInstance extends Npc
final Skill skill = SkillData.getInstance().getSkill(skillId, 1); final Skill skill = SkillData.getInstance().getSkill(skillId, 1);
if (schemeSkills.contains(skillId)) if (schemeSkills.contains(skillId))
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillunselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillunselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
} }
else else
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
} }
sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>"); sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>");
@@ -347,7 +357,7 @@ public class SchemeBufferInstance extends Npc
if (page > 1) if (page > 1)
{ {
sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page - 1) + "\">Previous</a></td>"); sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page - 1) + "\">Previous</a></td>");
} }
else else
{ {
@@ -358,7 +368,7 @@ public class SchemeBufferInstance extends Npc
if (page < max) if (page < max)
{ {
sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page + 1) + "\">Next</a></td>"); sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page + 1) + "\">Next</a></td>");
} }
else else
{ {
@@ -394,7 +404,7 @@ public class SchemeBufferInstance extends Npc
} }
else else
{ {
sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes " + type + " " + schemeName + " 1\">" + type + "</a></td>"); sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes;" + type + ";" + schemeName + ";1\">" + type + "</a></td>");
} }
count++; count++;

36
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
View File

@@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.Util;
public class SchemeBufferInstance extends Npc public class SchemeBufferInstance extends Npc
{ {
@@ -45,7 +46,10 @@ public class SchemeBufferInstance extends Npc
@Override @Override
public void onBypassFeedback(PlayerInstance player, String command) public void onBypassFeedback(PlayerInstance player, String command)
{ {
StringTokenizer st = new StringTokenizer(command, " "); // Simple hack to use createscheme bypass with a space.
command = command.replace("createscheme ", "createscheme;");
StringTokenizer st = new StringTokenizer(command, ";");
String currentCommand = st.nextToken(); String currentCommand = st.nextToken();
if (currentCommand.startsWith("menu")) if (currentCommand.startsWith("menu"))
@@ -172,10 +176,16 @@ public class SchemeBufferInstance extends Npc
{ {
try try
{ {
final String schemeName = st.nextToken(); final String schemeName = st.nextToken().trim();
if (schemeName.length() > 14) if (schemeName.length() > 14)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
return;
}
// Simple hack to use spaces, dots, commas, exclamations or question marks.
if (!Util.isAlphaNumeric(schemeName.replace(" ", "").replace(".", "").replace(",", "").replace("!", "").replace("?", "")))
{
player.sendMessage("Please use plain alphanumeric characters.");
return; return;
} }
@@ -200,7 +210,7 @@ public class SchemeBufferInstance extends Npc
} }
catch (Exception e) catch (Exception e)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
} }
} }
else if (currentCommand.startsWith("deletescheme")) else if (currentCommand.startsWith("deletescheme"))
@@ -258,10 +268,10 @@ public class SchemeBufferInstance extends Npc
{ {
final int cost = getFee(scheme.getValue()); final int cost = getFee(scheme.getValue());
sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>"); sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + "\">Use on Me</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + "\">Use on Me</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + " pet\">Use on Pet</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + ";pet\">Use on Pet</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_editschemes Buffs " + scheme.getKey() + " 1\">Edit</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_editschemes;Buffs;" + scheme.getKey() + ";1\">Edit</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme " + scheme.getKey() + "\">Delete</a><br>"); sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme;" + scheme.getKey() + "\">Delete</a><br>");
} }
} }
@@ -331,11 +341,11 @@ public class SchemeBufferInstance extends Npc
final Skill skill = SkillData.getInstance().getSkill(skillId, 1); final Skill skill = SkillData.getInstance().getSkill(skillId, 1);
if (schemeSkills.contains(skillId)) if (schemeSkills.contains(skillId))
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillunselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillunselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
} }
else else
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
} }
sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>"); sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>");
@@ -347,7 +357,7 @@ public class SchemeBufferInstance extends Npc
if (page > 1) if (page > 1)
{ {
sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page - 1) + "\">Previous</a></td>"); sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page - 1) + "\">Previous</a></td>");
} }
else else
{ {
@@ -358,7 +368,7 @@ public class SchemeBufferInstance extends Npc
if (page < max) if (page < max)
{ {
sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page + 1) + "\">Next</a></td>"); sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page + 1) + "\">Next</a></td>");
} }
else else
{ {
@@ -394,7 +404,7 @@ public class SchemeBufferInstance extends Npc
} }
else else
{ {
sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes " + type + " " + schemeName + " 1\">" + type + "</a></td>"); sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes;" + type + ";" + schemeName + ";1\">" + type + "</a></td>");
} }
count++; count++;

36
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
View File

@@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.Util;
public class SchemeBufferInstance extends Npc public class SchemeBufferInstance extends Npc
{ {
@@ -45,7 +46,10 @@ public class SchemeBufferInstance extends Npc
@Override @Override
public void onBypassFeedback(PlayerInstance player, String command) public void onBypassFeedback(PlayerInstance player, String command)
{ {
StringTokenizer st = new StringTokenizer(command, " "); // Simple hack to use createscheme bypass with a space.
command = command.replace("createscheme ", "createscheme;");
StringTokenizer st = new StringTokenizer(command, ";");
String currentCommand = st.nextToken(); String currentCommand = st.nextToken();
if (currentCommand.startsWith("menu")) if (currentCommand.startsWith("menu"))
@@ -172,10 +176,16 @@ public class SchemeBufferInstance extends Npc
{ {
try try
{ {
final String schemeName = st.nextToken(); final String schemeName = st.nextToken().trim();
if (schemeName.length() > 14) if (schemeName.length() > 14)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
return;
}
// Simple hack to use spaces, dots, commas, exclamations or question marks.
if (!Util.isAlphaNumeric(schemeName.replace(" ", "").replace(".", "").replace(",", "").replace("!", "").replace("?", "")))
{
player.sendMessage("Please use plain alphanumeric characters.");
return; return;
} }
@@ -200,7 +210,7 @@ public class SchemeBufferInstance extends Npc
} }
catch (Exception e) catch (Exception e)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
} }
} }
else if (currentCommand.startsWith("deletescheme")) else if (currentCommand.startsWith("deletescheme"))
@@ -258,10 +268,10 @@ public class SchemeBufferInstance extends Npc
{ {
final int cost = getFee(scheme.getValue()); final int cost = getFee(scheme.getValue());
sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>"); sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + "\">Use on Me</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + "\">Use on Me</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + " pet\">Use on Pet</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + ";pet\">Use on Pet</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_editschemes Buffs " + scheme.getKey() + " 1\">Edit</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_editschemes;Buffs;" + scheme.getKey() + ";1\">Edit</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme " + scheme.getKey() + "\">Delete</a><br>"); sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme;" + scheme.getKey() + "\">Delete</a><br>");
} }
} }
@@ -331,11 +341,11 @@ public class SchemeBufferInstance extends Npc
final Skill skill = SkillData.getInstance().getSkill(skillId, 1); final Skill skill = SkillData.getInstance().getSkill(skillId, 1);
if (schemeSkills.contains(skillId)) if (schemeSkills.contains(skillId))
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillunselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillunselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
} }
else else
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
} }
sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>"); sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>");
@@ -347,7 +357,7 @@ public class SchemeBufferInstance extends Npc
if (page > 1) if (page > 1)
{ {
sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page - 1) + "\">Previous</a></td>"); sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page - 1) + "\">Previous</a></td>");
} }
else else
{ {
@@ -358,7 +368,7 @@ public class SchemeBufferInstance extends Npc
if (page < max) if (page < max)
{ {
sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page + 1) + "\">Next</a></td>"); sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page + 1) + "\">Next</a></td>");
} }
else else
{ {
@@ -394,7 +404,7 @@ public class SchemeBufferInstance extends Npc
} }
else else
{ {
sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes " + type + " " + schemeName + " 1\">" + type + "</a></td>"); sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes;" + type + ";" + schemeName + ";1\">" + type + "</a></td>");
} }
count++; count++;

36
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
View File

@@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.Util;
public class SchemeBufferInstance extends Npc public class SchemeBufferInstance extends Npc
{ {
@@ -45,7 +46,10 @@ public class SchemeBufferInstance extends Npc
@Override @Override
public void onBypassFeedback(PlayerInstance player, String command) public void onBypassFeedback(PlayerInstance player, String command)
{ {
StringTokenizer st = new StringTokenizer(command, " "); // Simple hack to use createscheme bypass with a space.
command = command.replace("createscheme ", "createscheme;");
StringTokenizer st = new StringTokenizer(command, ";");
String currentCommand = st.nextToken(); String currentCommand = st.nextToken();
if (currentCommand.startsWith("menu")) if (currentCommand.startsWith("menu"))
@@ -172,10 +176,16 @@ public class SchemeBufferInstance extends Npc
{ {
try try
{ {
final String schemeName = st.nextToken(); final String schemeName = st.nextToken().trim();
if (schemeName.length() > 14) if (schemeName.length() > 14)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
return;
}
// Simple hack to use spaces, dots, commas, exclamations or question marks.
if (!Util.isAlphaNumeric(schemeName.replace(" ", "").replace(".", "").replace(",", "").replace("!", "").replace("?", "")))
{
player.sendMessage("Please use plain alphanumeric characters.");
return; return;
} }
@@ -200,7 +210,7 @@ public class SchemeBufferInstance extends Npc
} }
catch (Exception e) catch (Exception e)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
} }
} }
else if (currentCommand.startsWith("deletescheme")) else if (currentCommand.startsWith("deletescheme"))
@@ -258,10 +268,10 @@ public class SchemeBufferInstance extends Npc
{ {
final int cost = getFee(scheme.getValue()); final int cost = getFee(scheme.getValue());
sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>"); sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + "\">Use on Me</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + "\">Use on Me</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + " pet\">Use on Pet</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + ";pet\">Use on Pet</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_editschemes Buffs " + scheme.getKey() + " 1\">Edit</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_editschemes;Buffs;" + scheme.getKey() + ";1\">Edit</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme " + scheme.getKey() + "\">Delete</a><br>"); sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme;" + scheme.getKey() + "\">Delete</a><br>");
} }
} }
@@ -331,11 +341,11 @@ public class SchemeBufferInstance extends Npc
final Skill skill = SkillData.getInstance().getSkill(skillId, 1); final Skill skill = SkillData.getInstance().getSkill(skillId, 1);
if (schemeSkills.contains(skillId)) if (schemeSkills.contains(skillId))
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillunselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillunselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
} }
else else
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
} }
sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>"); sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>");
@@ -347,7 +357,7 @@ public class SchemeBufferInstance extends Npc
if (page > 1) if (page > 1)
{ {
sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page - 1) + "\">Previous</a></td>"); sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page - 1) + "\">Previous</a></td>");
} }
else else
{ {
@@ -358,7 +368,7 @@ public class SchemeBufferInstance extends Npc
if (page < max) if (page < max)
{ {
sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page + 1) + "\">Next</a></td>"); sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page + 1) + "\">Next</a></td>");
} }
else else
{ {
@@ -394,7 +404,7 @@ public class SchemeBufferInstance extends Npc
} }
else else
{ {
sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes " + type + " " + schemeName + " 1\">" + type + "</a></td>"); sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes;" + type + ";" + schemeName + ";1\">" + type + "</a></td>");
} }
count++; count++;

36
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
View File

@@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.Util;
public class SchemeBufferInstance extends Npc public class SchemeBufferInstance extends Npc
{ {
@@ -45,7 +46,10 @@ public class SchemeBufferInstance extends Npc
@Override @Override
public void onBypassFeedback(PlayerInstance player, String command) public void onBypassFeedback(PlayerInstance player, String command)
{ {
StringTokenizer st = new StringTokenizer(command, " "); // Simple hack to use createscheme bypass with a space.
command = command.replace("createscheme ", "createscheme;");
StringTokenizer st = new StringTokenizer(command, ";");
String currentCommand = st.nextToken(); String currentCommand = st.nextToken();
if (currentCommand.startsWith("menu")) if (currentCommand.startsWith("menu"))
@@ -172,10 +176,16 @@ public class SchemeBufferInstance extends Npc
{ {
try try
{ {
final String schemeName = st.nextToken(); final String schemeName = st.nextToken().trim();
if (schemeName.length() > 14) if (schemeName.length() > 14)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
return;
}
// Simple hack to use spaces, dots, commas, exclamations or question marks.
if (!Util.isAlphaNumeric(schemeName.replace(" ", "").replace(".", "").replace(",", "").replace("!", "").replace("?", "")))
{
player.sendMessage("Please use plain alphanumeric characters.");
return; return;
} }
@@ -200,7 +210,7 @@ public class SchemeBufferInstance extends Npc
} }
catch (Exception e) catch (Exception e)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
} }
} }
else if (currentCommand.startsWith("deletescheme")) else if (currentCommand.startsWith("deletescheme"))
@@ -258,10 +268,10 @@ public class SchemeBufferInstance extends Npc
{ {
final int cost = getFee(scheme.getValue()); final int cost = getFee(scheme.getValue());
sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>"); sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + "\">Use on Me</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + "\">Use on Me</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + " pet\">Use on Pet</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + ";pet\">Use on Pet</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_editschemes Buffs " + scheme.getKey() + " 1\">Edit</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_editschemes;Buffs;" + scheme.getKey() + ";1\">Edit</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme " + scheme.getKey() + "\">Delete</a><br>"); sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme;" + scheme.getKey() + "\">Delete</a><br>");
} }
} }
@@ -331,11 +341,11 @@ public class SchemeBufferInstance extends Npc
final Skill skill = SkillData.getInstance().getSkill(skillId, 1); final Skill skill = SkillData.getInstance().getSkill(skillId, 1);
if (schemeSkills.contains(skillId)) if (schemeSkills.contains(skillId))
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillunselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillunselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
} }
else else
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
} }
sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>"); sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>");
@@ -347,7 +357,7 @@ public class SchemeBufferInstance extends Npc
if (page > 1) if (page > 1)
{ {
sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page - 1) + "\">Previous</a></td>"); sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page - 1) + "\">Previous</a></td>");
} }
else else
{ {
@@ -358,7 +368,7 @@ public class SchemeBufferInstance extends Npc
if (page < max) if (page < max)
{ {
sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page + 1) + "\">Next</a></td>"); sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page + 1) + "\">Next</a></td>");
} }
else else
{ {
@@ -394,7 +404,7 @@ public class SchemeBufferInstance extends Npc
} }
else else
{ {
sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes " + type + " " + schemeName + " 1\">" + type + "</a></td>"); sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes;" + type + ";" + schemeName + ";1\">" + type + "</a></td>");
} }
count++; count++;

36
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
View File

@@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.util.Util;
public class SchemeBufferInstance extends Npc public class SchemeBufferInstance extends Npc
{ {
@@ -45,7 +46,10 @@ public class SchemeBufferInstance extends Npc
@Override @Override
public void onBypassFeedback(PlayerInstance player, String command) public void onBypassFeedback(PlayerInstance player, String command)
{ {
StringTokenizer st = new StringTokenizer(command, " "); // Simple hack to use createscheme bypass with a space.
command = command.replace("createscheme ", "createscheme;");
StringTokenizer st = new StringTokenizer(command, ";");
String currentCommand = st.nextToken(); String currentCommand = st.nextToken();
if (currentCommand.startsWith("menu")) if (currentCommand.startsWith("menu"))
@@ -172,10 +176,16 @@ public class SchemeBufferInstance extends Npc
{ {
try try
{ {
final String schemeName = st.nextToken(); final String schemeName = st.nextToken().trim();
if (schemeName.length() > 14) if (schemeName.length() > 14)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
return;
}
// Simple hack to use spaces, dots, commas, exclamations or question marks.
if (!Util.isAlphaNumeric(schemeName.replace(" ", "").replace(".", "").replace(",", "").replace("!", "").replace("?", "")))
{
player.sendMessage("Please use plain alphanumeric characters.");
return; return;
} }
@@ -200,7 +210,7 @@ public class SchemeBufferInstance extends Npc
} }
catch (Exception e) catch (Exception e)
{ {
player.sendMessage("Scheme's name must contain up to 14 chars. Spaces are trimmed."); player.sendMessage("Scheme's name must contain up to 14 chars.");
} }
} }
else if (currentCommand.startsWith("deletescheme")) else if (currentCommand.startsWith("deletescheme"))
@@ -258,10 +268,10 @@ public class SchemeBufferInstance extends Npc
{ {
final int cost = getFee(scheme.getValue()); final int cost = getFee(scheme.getValue());
sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>"); sb.append("<font color=\"LEVEL\">" + scheme.getKey() + " [" + scheme.getValue().size() + " skill(s)]" + ((cost > 0) ? " - cost: " + NumberFormat.getInstance(Locale.ENGLISH).format(cost) : "") + "</font><br1>");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + "\">Use on Me</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + "\">Use on Me</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs " + scheme.getKey() + " " + cost + " pet\">Use on Pet</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_givebuffs;" + scheme.getKey() + ";" + cost + ";pet\">Use on Pet</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_editschemes Buffs " + scheme.getKey() + " 1\">Edit</a>&nbsp;|&nbsp;"); sb.append("<a action=\"bypass -h npc_%objectId%_editschemes;Buffs;" + scheme.getKey() + ";1\">Edit</a>&nbsp;|&nbsp;");
sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme " + scheme.getKey() + "\">Delete</a><br>"); sb.append("<a action=\"bypass -h npc_%objectId%_deletescheme;" + scheme.getKey() + "\">Delete</a><br>");
} }
} }
@@ -331,11 +341,11 @@ public class SchemeBufferInstance extends Npc
final Skill skill = SkillData.getInstance().getSkill(skillId, 1); final Skill skill = SkillData.getInstance().getSkill(skillId, 1);
if (schemeSkills.contains(skillId)) if (schemeSkills.contains(skillId))
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillunselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillunselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
} }
else else
{ {
sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillselect " + groupType + " " + schemeName + " " + skillId + " " + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>"); sb.append("<td height=40 width=40><img src=\"" + skill.getIcon() + "\" width=32 height=32></td><td width=190>" + skill.getName() + "<br1><font color=\"B09878\">" + SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription() + "</font></td><td><button value=\" \" action=\"bypass -h npc_%objectId%_skillselect;" + groupType + ";" + schemeName + ";" + skillId + ";" + page + "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
} }
sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>"); sb.append("</tr></table><img src=\"L2UI.SquareGray\" width=277 height=1>");
@@ -347,7 +357,7 @@ public class SchemeBufferInstance extends Npc
if (page > 1) if (page > 1)
{ {
sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page - 1) + "\">Previous</a></td>"); sb.append("<td align=left width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page - 1) + "\">Previous</a></td>");
} }
else else
{ {
@@ -358,7 +368,7 @@ public class SchemeBufferInstance extends Npc
if (page < max) if (page < max)
{ {
sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes " + groupType + " " + schemeName + " " + (page + 1) + "\">Next</a></td>"); sb.append("<td align=right width=70><a action=\"bypass -h npc_" + getObjectId() + "_editschemes;" + groupType + ";" + schemeName + ";" + (page + 1) + "\">Next</a></td>");
} }
else else
{ {
@@ -394,7 +404,7 @@ public class SchemeBufferInstance extends Npc
} }
else else
{ {
sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes " + type + " " + schemeName + " 1\">" + type + "</a></td>"); sb.append("<td width=65><a action=\"bypass -h npc_%objectId%_editschemes;" + type + ";" + schemeName + ";1\">" + type + "</a></td>");
} }
count++; count++;