This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/L2J_Server/dist/game/config/Character.properties b/L2J_Server/dist/game/config/Character.properties | |
index 1e5bcc0..5565c1c 100644 | |
--- a/L2J_Server/dist/game/config/Character.properties | |
+++ b/L2J_Server/dist/game/config/Character.properties | |
@@ -206,10 +206,6 @@ | |
# Default: False | |
AltSubClassWithoutQuests = False | |
-# Allow player to add/change subclass at all village master | |
-# Default: False |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/L2J_DataPack/dist/game/data/html/default/30991-1.htm b/L2J_DataPack/dist/game/data/html/default/30991-1.htm | |
index f846d50..1f4a75f 100644 | |
--- a/L2J_DataPack/dist/game/data/html/default/30991-1.htm | |
+++ b/L2J_DataPack/dist/game/data/html/default/30991-1.htm | |
@@ -1,11 +1,10 @@ | |
-<html><body> | |
-Lottery Ticket Seller:<br> | |
+<html><body>Lottery Ticket Seller:<br> | |
Thank you for playing the lottery.<br> | |
One lottery Ticket costs %ticket_price% Adena.<br> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/L2J_Server/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Server/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java | |
index 697dab2..d907559 100644 | |
--- a/L2J_Server/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java | |
+++ b/L2J_Server/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java | |
@@ -10713,7 +10713,8 @@ | |
} | |
ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()); | |
dlg.addPcName(reviver); | |
- dlg.addString(Integer.toString(restoreExp)); | |
+ dlg.addInt(restoreExp); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/L2J_DataPack/dist/game/data/buylists/3393400.xml b/L2J_DataPack/dist/game/data/buylists/3393400.xml | |
new file mode 100644 | |
index 0000000..6cde474 | |
--- /dev/null | |
+++ b/L2J_DataPack/dist/game/data/buylists/3393400.xml | |
@@ -0,0 +1,38 @@ | |
+<?xml version="1.0" encoding="UTF-8"?> | |
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd"> | |
+ <npcs> | |
+ <npc>33934</npc> <!-- Denya --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/L2J_DataPack/dist/game/data/html/default/33951-1.htm b/L2J_DataPack/dist/game/data/html/default/33951-1.htm | |
new file mode 100644 | |
index 0000000..b3feea8 | |
--- /dev/null | |
+++ b/L2J_DataPack/dist/game/data/html/default/33951-1.htm | |
@@ -0,0 +1,7 @@ | |
+<html><body>Forest Patrol Sivanthe:<br> | |
+<font color="LEVEL">On the day Faeron was thrown into this world</font>, countless monsters ambushed this place. Everyone fought, including the Queen. <font color="LEVEL">Lorne</font> also fought...<br> | |
+We all fought to protect Faeron and our loved ones. And some returned to Sayha.<br> | |
+That's how we protected this beautiful town. We must not forget those that died for us.<br> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/L2J_DataPack/dist/game/data/multisell/2021.xml b/L2J_DataPack/dist/game/data/multisell/2021.xml | |
new file mode 100644 | |
index 0000000..41956ce | |
--- /dev/null | |
+++ b/L2J_DataPack/dist/game/data/multisell/2021.xml | |
@@ -0,0 +1,18 @@ | |
+<?xml version="1.0" encoding="UTF-8"?> | |
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd"> | |
+ <npcs> | |
+ <npc>33511</npc> <!-- Priest of Mammon --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/L2J_Server/dist/game/config/Feature.properties b/L2J_Server/dist/game/config/Feature.properties | |
index d8a6bf0..6289f46 100644 | |
--- a/L2J_Server/dist/game/config/Feature.properties | |
+++ b/L2J_Server/dist/game/config/Feature.properties | |
@@ -13,6 +13,19 @@ | |
# Default: 16,20 | |
SiegeHourList = 16,20 | |
+# Taxes for castles | |
+# Tax in percent when is castle owned by npc's. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/L2J_Server/java/com/l2jserver/gameserver/model/actor/tasks/player/WarnUserTakeBreakTask.java b/L2J_Server/java/com/l2jserver/gameserver/model/actor/tasks/player/WarnUserTakeBreakTask.java | |
index 7a40b70..4effbdf 100644 | |
--- a/L2J_Server/java/com/l2jserver/gameserver/model/actor/tasks/player/WarnUserTakeBreakTask.java | |
+++ b/L2J_Server/java/com/l2jserver/gameserver/model/actor/tasks/player/WarnUserTakeBreakTask.java | |
@@ -18,14 +18,17 @@ | |
*/ | |
package com.l2jserver.gameserver.model.actor.tasks.player; | |
+import java.util.concurrent.TimeUnit; | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/L2J_DataPack/dist/game/data/html/default/30598-1.htm b/L2J_DataPack/dist/game/data/html/default/30598-1.htm | |
deleted file mode 100644 | |
index 5479258..0000000 | |
--- a/L2J_DataPack/dist/game/data/html/default/30598-1.htm | |
+++ /dev/null | |
@@ -1,7 +0,0 @@ | |
-<html><body>My word, you've made progress all right! But so far you haven't had to use your head must at all -- from now on, you'll need to think and plan if you want to survive. In particular, I want you to ask me questions now, and remember the answers -- this is very important stuff. And when you reach level 11, I'll have more information for you.<br> | |
-<a action="bypass -h npc_%objectId%_Chat 2">What should I do now?</a><br> | |
-<a action="bypass -h npc_%objectId%_Chat 3">What is the best equipment for me?</a><br> | |
-<a action="bypass -h npc_%objectId%_Chat 4">What is the best hunting site for me?</a><br> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<list> | |
<Number><![CDATA["ᄆ(list) | |
(teamInfo name='' comment='') | |
(position name='Senior Executive Producer' comment='') | |
(member name='Taek-Jin Kim' comment=''/)(/position) | |
(position name='Supervising Producer' comment='') | |
(member name='Won-Sik Woo' comment=''/)(/position) | |
(position name='Producer' comment='') | |
(member name='Gon Namkung' comment=''/)(/position)(/teamInfo) | |
(teamInfo name='PM' comment='') |