From 8eda892501d8805e32a86bf53e6832546e1f4865 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Mon, 9 Apr 2012 01:42:22 +0000
Subject: [PATCH] BETA: Datapack part for [L5261].
---
.../game/data/html/villagemaster/SubClass_Add.htm | 2 +-
.../data/html/villagemaster/SubClass_AddOk.htm | 2 +-
.../data/html/villagemaster/SubClass_ChangeNo.htm | 4 ++--
.../dist/game/data/instancenames.xml | 4 ++--
.../custom/Validators/SkillTransferValidator.java | 2 +-
.../scripts/custom/Validators/SubClassSkills.java | 2 +-
.../admincommandhandlers/AdminEditChar.java | 15 +++++++--------
.../handlers/admincommandhandlers/AdminExpSp.java | 4 ++--
.../handlers/admincommandhandlers/AdminSkill.java | 4 ++--
.../9002_SubClassCertification/__init__.py | 8 ++++----
.../dist/game/data/xsd/instancenames.xsd | 2 +-
11 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_Add.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_Add.htm
index f108d1f81f..9052a07844 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_Add.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_Add.htm
@@ -1,4 +1,4 @@
<html><body>Add a subclass:<br>
-Which sub class do you wish to add?<br>
+Which of the following would you like to add as a subclass?<br>
%list%
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_AddOk.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_AddOk.htm
index c0f8ccc2df..4471c2d241 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_AddOk.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_AddOk.htm
@@ -1,3 +1,3 @@
-<html><body>Add Subclass:<br>
+<html><body>Add a subclass:<br>
Congratulations! You've added a new subclass. Open the Character Information window (ALT + T) to confirm.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_ChangeNo.htm b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_ChangeNo.htm
index 15e7722052..1e78491f23 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_ChangeNo.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_ChangeNo.htm
@@ -1,4 +1,4 @@
-<html><body>Change Subclass:<br>
-You can't change subclasses when you don't have a subclass to begin with.<br>
+<html><body>Change sub class:<br>
+It is impossible to change sub classes when you have no sub class. First, add a sub class.<br>
<a action="bypass -h npc_%objectId%_Subclass 1">Add subclass.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/instancenames.xml b/L2J_DataPack_BETA/dist/game/data/instancenames.xml
index 163ffedff4..bc5df349a2 100644
--- a/L2J_DataPack_BETA/dist/game/data/instancenames.xml
+++ b/L2J_DataPack_BETA/dist/game/data/instancenames.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<instances_list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/instancenames.xsd">
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/instancenames.xsd">
<instance id="1" name="Party Duel" />
<instance id="2" name="Urban Area" />
<instance id="3" name="Tower of Infinitum Demon Prince" />
@@ -160,4 +160,4 @@
<instance id="158" name="Elcadia's Tent" />
<instance id="159" name="Penal Colony of Darkness Raid" />
<instance id="160" name="Rim Kamaloka" />
-</instances_list>
\ No newline at end of file
+</list>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SkillTransferValidator.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SkillTransferValidator.java
index 927a3b5734..74934eb880 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SkillTransferValidator.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SkillTransferValidator.java
@@ -96,7 +96,7 @@ public final class SkillTransferValidator extends Quest
count--;
if (count < 0)
{
- Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " ("+sk.getId() + "/" + sk.getLevel() + "), class:" + ClassListData.getInstance().getClass(player.getClassId()).getClassName(false), 1);
+ Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " ("+sk.getId() + "/" + sk.getLevel() + "), class:" + ClassListData.getInstance().getClass(player.getClassId()).getClassName(), 1);
if (Config.SKILL_CHECK_REMOVE)
{
player.removeSkill(sk);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SubClassSkills.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SubClassSkills.java
index c6838b9a54..7754729b14 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SubClassSkills.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SubClassSkills.java
@@ -82,7 +82,7 @@ public final class SubClassSkills extends Quest
{
for (L2Skill s : certSkills)
{
- Util.handleIllegalPlayerAction(player, "Player "+player.getName() + " has cert skill on subclass :" + s.getName() + "("+s.getId()+"/"+s.getLevel()+"), class:" + ClassListData.getInstance().getClass(player.getClassId()).getClassName(false), 0);
+ Util.handleIllegalPlayerAction(player, "Player "+player.getName() + " has cert skill on subclass :" + s.getName() + "("+s.getId()+"/"+s.getLevel()+"), class:" + ClassListData.getInstance().getClass(player.getClassId()).getClassName(), 0);
if (Config.SKILL_CHECK_REMOVE)
player.removeSkill(s);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 70533f714e..6f2bd4af5a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -59,7 +59,6 @@ import com.l2jserver.gameserver.network.serverpackets.UserInfo;
import com.l2jserver.gameserver.util.Util;
import com.l2jserver.util.StringUtil;
-
/**
* This class handles following admin commands:
* - edit_character
@@ -373,7 +372,7 @@ public class AdminEditChar implements IAdminCommandHandler
player.setClassId(classidval);
if (!player.isSubClassActive())
player.setBaseClass(classidval);
- String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName(false);
+ String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
player.store();
player.sendMessage("A GM changed your class to " + newclass + ".");
player.broadcastUserInfo();
@@ -844,7 +843,7 @@ public class AdminEditChar implements IAdminCommandHandler
"\">",
players[i].getName(),
"</a></td><td width=110>",
- ClassListData.getInstance().getClass(players[i].getClassId()).getClassName(true),
+ ClassListData.getInstance().getClass(players[i].getClassId()).getClientCode(),
"</td><td width=40>",
String.valueOf(players[i].getLevel())
,"</td></tr>");
@@ -905,17 +904,17 @@ public class AdminEditChar implements IAdminCommandHandler
return;
}
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/" + filename);
adminReply.replace("%name%", player.getName());
adminReply.replace("%level%", String.valueOf(player.getLevel()));
adminReply.replace("%clan%", String.valueOf(player.getClan() != null ? "<a action=\"bypass -h admin_clan_info " + player.getObjectId() + "\">" + player.getClan().getName() + "</a>" : null));
adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp()));
- adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClassName(true));
+ adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode());
adminReply.replace("%ordinal%", String.valueOf(player.getClassId().ordinal()));
adminReply.replace("%classid%", String.valueOf(player.getClassId()));
- adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClassName(true));
+ adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX()));
adminReply.replace("%y%", String.valueOf(player.getY()));
adminReply.replace("%z%", String.valueOf(player.getZ()));
@@ -1096,7 +1095,7 @@ public class AdminEditChar implements IAdminCommandHandler
"\">",
name,
"</a></td><td width=110>",
- ClassListData.getInstance().getClass(player.getClassId()).getClassName(true),
+ ClassListData.getInstance().getClass(player.getClassId()).getClientCode(),
"</td><td width=40>",
String.valueOf(player.getLevel()),
"</td></tr>");
@@ -1179,7 +1178,7 @@ public class AdminEditChar implements IAdminCommandHandler
"\">",
name,
"</a></td><td width=110>",
- ClassListData.getInstance().getClass(player.getClassId()).getClassName(true),
+ ClassListData.getInstance().getClass(player.getClassId()).getClientCode(),
"</td><td width=40>",
String.valueOf(player.getLevel()),
"</td></tr>");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
index dc25fca4b2..c2e6b08184 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
@@ -93,13 +93,13 @@ public class AdminExpSp implements IAdminCommandHandler
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/expsp.htm");
adminReply.replace("%name%", player.getName());
adminReply.replace("%level%", String.valueOf(player.getLevel()));
adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp()));
- adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClassName(true));
+ adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode());
activeChar.sendPacket(adminReply);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index e10f140d7f..3916c01a65 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -312,7 +312,7 @@ public class AdminSkill implements IAdminCommandHandler
"<br><table width=270><tr><td>Lv: ",
String.valueOf(player.getLevel()),
" ",
- ClassListData.getInstance().getClass(player.getClassId()).getClassName(true),
+ ClassListData.getInstance().getClass(player.getClassId()).getClientCode(),
"</td></tr></table>" +
"<br><table width=270><tr><td>Note: Dont forget that modifying players skills can</td></tr>" +
"<tr><td>ruin the game...</td></tr></table>" +
@@ -383,7 +383,7 @@ public class AdminSkill implements IAdminCommandHandler
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charskills.htm");
adminReply.replace("%name%", player.getName());
adminReply.replace("%level%", String.valueOf(player.getLevel()));
- adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClassName(true));
+ adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode());
activeChar.sendPacket(adminReply);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9002_SubClassCertification/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9002_SubClassCertification/__init__.py
index 9cae13b6ea..47d17e12ef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9002_SubClassCertification/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/9002_SubClassCertification/__init__.py
@@ -99,16 +99,16 @@ class Quest (JQuest) :
return "9002-03.htm"
elif event == "Obtain65":
html = "<html><body>Subclass Skill Certification:<br>You are trying to obtain level %level% certification of %class%, %skilltype%. Remember that once this subclass is certified, it cannot be re-certified -- even if you delete this class and develop another one -- without a special and expensive cancellation process.<br>Do you still want to be certified?<br><a action=\"bypass -h Quest 9002_SubClassCertification %event%\">Obtain certification.</a><br><a action=\"bypass -h Quest 9002_SubClassCertification 9002-05.htm\">Do not obtain certification.</a></body></html>"
- htmltext = html.replace("%level%","65").replace("%class%",str(ClassListData.getInstance().getClass(player.getActiveClass()).getClassName(1))).replace("%skilltype%","common skill").replace("%event%","lvl65Emergent")
+ htmltext = html.replace("%level%","65").replace("%class%",str(ClassListData.getInstance().getClass(player.getActiveClass()).getEscapedClientCode())).replace("%skilltype%","common skill").replace("%event%","lvl65Emergent")
elif event == "Obtain70":
html = "<html><body>Subclass Skill Certification:<br>You are trying to obtain level %level% certification of %class%, %skilltype%. Remember that once this subclass is certified, it cannot be re-certified -- even if you delete this class and develop another one -- without a special and expensive cancellation process.<br>Do you still want to be certified?<br><a action=\"bypass -h Quest 9002_SubClassCertification %event%\">Obtain certification.</a><br><a action=\"bypass -h Quest 9002_SubClassCertification 9002-05.htm\">Do not obtain certification.</a></body></html>"
- htmltext = html.replace("%level%","70").replace("%class%",str(ClassListData.getInstance().getClass(player.getActiveClass()).getClassName(1))).replace("%skilltype%","common skill").replace("%event%","lvl70Emergent")
+ htmltext = html.replace("%level%","70").replace("%class%",str(ClassListData.getInstance().getClass(player.getActiveClass()).getEscapedClientCode())).replace("%skilltype%","common skill").replace("%event%","lvl70Emergent")
elif event == "Obtain75":
html = "<html><body>Subclass Skill Certification:<br>You are trying to obtain level %level% certification of %class%, %skilltype%. Remember that once this subclass is certified, it cannot be re-certified -- even if you delete this class and develop another one -- without a special and expensive cancellation process.<br>Do you still want to be certified?<br><a action=\"bypass -h Quest 9002_SubClassCertification %event1%\">Obtain class specific skill certification.</a><br><a action=\"bypass -h Quest 9002_SubClassCertification %event2%\">Obtain master skill certification.</a><br><a action=\"bypass -h Quest 9002_SubClassCertification 9002-05.htm\">Do not obtain certification.</a></body></html>"
- htmltext = html.replace("%level%","75").replace("%class%",str(ClassListData.getInstance().getClass(player.getActiveClass()).getClassName(1))).replace("%skilltype%","common skill or special skill").replace("%event1%","lvl75Class").replace("%event2%","lvl75Master")
+ htmltext = html.replace("%level%","75").replace("%class%",str(ClassListData.getInstance().getClass(player.getActiveClass()).getEscapedClientCode())).replace("%skilltype%","common skill or special skill").replace("%event1%","lvl75Class").replace("%event2%","lvl75Master")
elif event == "Obtain80":
html = "<html><body>Subclass Skill Certification:<br>You are trying to obtain level %level% certification of %class%, %skilltype%. Remember that once this subclass is certified, it cannot be re-certified -- even if you delete this class and develop another one -- without a special and expensive cancellation process.<br>Do you still want to be certified?<br><a action=\"bypass -h Quest 9002_SubClassCertification %event%\">Obtain certification.</a><br><a action=\"bypass -h Quest 9002_SubClassCertification 9002-05.htm\">Do not obtain certification.</a></body></html>"
- htmltext = html.replace("%level%","80").replace("%class%",str(ClassListData.getInstance().getClass(player.getActiveClass()).getClassName(1))).replace("%skilltype%","transformation skill").replace("%event%","lvl80Class")
+ htmltext = html.replace("%level%","80").replace("%class%",str(ClassListData.getInstance().getClass(player.getActiveClass()).getEscapedClientCode())).replace("%skilltype%","transformation skill").replace("%event%","lvl80Class")
elif event.startswith("lvl"):
level = int(event[3:5])
type = event.replace(event[0:5],"")
diff --git a/L2J_DataPack_BETA/dist/game/data/xsd/instancenames.xsd b/L2J_DataPack_BETA/dist/game/data/xsd/instancenames.xsd
index 0b714432d2..9ff15f786b 100644
--- a/L2J_DataPack_BETA/dist/game/data/xsd/instancenames.xsd
+++ b/L2J_DataPack_BETA/dist/game/data/xsd/instancenames.xsd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="instances_list">
+ <xs:element name="list">
<xs:complexType>
<xs:sequence minOccurs="1" maxOccurs="1">
<xs:element name="instance" minOccurs="1" maxOccurs="unbounded">
--
GitLab