Kezdőlap Felfedezés Súgó
Regisztráció Bejelentkezés
L2j
/
l2j-server-datapack
2
0
Másolás 0
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

BETA: Datapack part for [L5261].

Zoey76 13 éve
szülő
50f994ca89
commit
8eda892501
11 módosított fájl, 24 hozzáadás és 25 törlés
Osztott Nézet Diff Statisztika Mutatása
  1. 1 1
      L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_Add.htm
  2. 1 1
      L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_AddOk.htm
  3. 2 2
      L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_ChangeNo.htm
  4. 2 2
      L2J_DataPack_BETA/dist/game/data/instancenames.xml
  5. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SkillTransferValidator.java
  6. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SubClassSkills.java
  7. 7 8
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
  8. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
  9. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
  10. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/village_master/9002_SubClassCertification/__init__.py
  11. 1 1
      L2J_DataPack_BETA/dist/game/data/xsd/instancenames.xsd

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_Add.htm
Fájl Megtekintése 

@@ -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>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_AddOk.htm
Fájl Megtekintése 

@@ -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>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/html/villagemaster/SubClass_ChangeNo.htm
Fájl Megtekintése 

@@ -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>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/instancenames.xml
Fájl Megtekintése 

@@ -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>
 
+</list>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SkillTransferValidator.java
Fájl Megtekintése 

@@ -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);

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/custom/Validators/SubClassSkills.java
Fájl Megtekintése 

@@ -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);

+ 7 - 8
L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Fájl Megtekintése 

@@ -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>");

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
Fájl Megtekintése 

@@ -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);

 	}

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
Fájl Megtekintése 

@@ -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);

 	}

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/village_master/9002_SubClassCertification/__init__.py
Fájl Megtekintése 

@@ -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],"")

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/xsd/instancenames.xsd
Fájl Megtekintése 

@@ -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">