From b61800d4e0d068e16efcd523cc553e352099bbe5 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 30 May 2020 22:02:02 +0000
Subject: [PATCH] Proper Zaken's Earring skills. Contributed by Sahar.
---
.../game/data/stats/items/90700-90799.xml | 6 +-
.../game/data/stats/skills/45000-45099.xml | 48 ++--
.../game/data/stats/items/90700-90799.xml | 6 +-
.../game/data/stats/skills/45000-45099.xml | 48 ++--
.../game/data/stats/items/90700-90799.xml | 6 +-
.../game/data/stats/skills/45000-45099.xml | 229 ++++++++---------
.../game/data/stats/skills/03500-03599.xml | 231 ++++++++++--------
.../game/data/stats/skills/03500-03599.xml | 231 ++++++++++--------
.../serverpackets/AcquireSkillList.java | 4 +-
9 files changed, 424 insertions(+), 385 deletions(-)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/90700-90799.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/90700-90799.xml
index 81d97a5f06..6d93229a2d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/90700-90799.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/90700-90799.xml
@@ -564,7 +564,7 @@
-
+
60
@@ -580,7 +580,7 @@
-
+
70
@@ -596,7 +596,7 @@
-
+
80
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/45000-45099.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/45000-45099.xml
index 39ab377a8a..b334555d07 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/45000-45099.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/45000-45099.xml
@@ -891,20 +891,7 @@
P
5
-
-
- 0
- 0
- 8
-
- 80
-
-
- 5
- 10
- 15
-
10
15
@@ -912,16 +899,16 @@
5
- 15
+ 10
15
+
+ 5
+ 10
+ 15
+
-
- 5
- 10
- 15
-
10
15
@@ -932,6 +919,19 @@
10
15
+
+ 5
+ 10
+ 15
+
+
+
+
+ 4
+ 6
+ 8
+
+ PER
@@ -941,13 +941,9 @@
PER
-
-
- 4
- 6
- 10
-
- PER
+
+ 8
+ 80
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/90700-90799.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/90700-90799.xml
index 513ea8325b..9220e03654 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/90700-90799.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/90700-90799.xml
@@ -564,7 +564,7 @@
-
+
60
@@ -580,7 +580,7 @@
-
+
70
@@ -596,7 +596,7 @@
-
+
80
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/45000-45099.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/45000-45099.xml
index 8512c398e4..dd2ac24366 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/45000-45099.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/45000-45099.xml
@@ -891,20 +891,7 @@
P
5
-
-
- 0
- 0
- 8
-
- 80
-
-
- 5
- 10
- 15
-
10
15
@@ -912,16 +899,16 @@
5
- 15
+ 10
15
+
+ 5
+ 10
+ 15
+
-
- 5
- 10
- 15
-
10
15
@@ -932,6 +919,19 @@
10
15
+
+ 5
+ 10
+ 15
+
+
+
+
+ 4
+ 6
+ 8
+
+ PER
@@ -941,13 +941,9 @@
PER
-
-
- 4
- 6
- 10
-
- PER
+
+ 8
+ 80
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/90700-90799.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/90700-90799.xml
index bbaf65354e..b351dd7ef6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/90700-90799.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/90700-90799.xml
@@ -564,7 +564,7 @@
-
+
60
@@ -580,7 +580,7 @@
-
+
70
@@ -596,7 +596,7 @@
-
+
80
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/45000-45099.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/45000-45099.xml
index 402ccf9c97..7acad8d9d1 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/45000-45099.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/45000-45099.xml
@@ -891,10 +891,110 @@
P
5
-
+
+
+ 10
+ 15
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+
+
+ 5
+ 10
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+
+
+ 5
+ 10
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+
+
+
+
+ 10
+ 15
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+
+
+ 5
+ 10
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+
+
+ 5
+ 10
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+
+
+
- 0
- 0
+ 4
+ 6
8
8
8
@@ -908,107 +1008,7 @@
8
8
- 80
-
-
-
- 5
- 10
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
-
-
- 10
- 15
- 20
- 20
- 20
- 20
- 20
- 20
- 20
- 20
- 20
- 20
- 20
- 20
-
-
- 5
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
-
-
-
-
- 5
- 10
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
-
-
- 10
- 15
- 20
- 20
- 20
- 20
- 20
- 20
- 20
- 20
- 20
- 20
- 20
- 20
-
-
- 5
- 10
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
-
+ PER
@@ -1029,24 +1029,9 @@
PER
-
-
- 4
- 6
- 10
- 10
- 10
- 10
- 10
- 10
- 10
- 10
- 10
- 10
- 10
- 10
-
- PER
+
+ 8
+ 80
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/03500-03599.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/03500-03599.xml
index 01e66b53a1..3dacf95220 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/03500-03599.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/03500-03599.xml
@@ -1589,127 +1589,158 @@
icon.accessory_earring_of_zaken_i03
icon.accessory_earring_of_zaken_i04
- 75
P
5
- 30
+
+ 10
+ 15
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+
- 20
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
+ 5
+ 10
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
- 20
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
+ 5
+ 10
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
-
- 20
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
-
+
+ 10
+ 15
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+
- 20
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
+ 5
+ 10
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
- 30
-
-
- 4
- 80
+
+ 5
+ 10
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+
- 10
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
+ 4
+ 6
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
PER
-
+
- 0
+ 10
15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
- DARK
+ PER
+
+
+ 8
+ 80
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/03500-03599.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/03500-03599.xml
index 01e66b53a1..3dacf95220 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/03500-03599.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/03500-03599.xml
@@ -1589,127 +1589,158 @@
icon.accessory_earring_of_zaken_i03
icon.accessory_earring_of_zaken_i04
- 75
P
5
- 30
+
+ 10
+ 15
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+
- 20
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
+ 5
+ 10
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
- 20
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
+ 5
+ 10
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
-
- 20
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
-
+
+ 10
+ 15
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+
- 20
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
- 30
+ 5
+ 10
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
- 30
-
-
- 4
- 80
+
+ 5
+ 10
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+ 15
+
- 10
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
+ 4
+ 6
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
+ 8
PER
-
+
- 0
+ 10
15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
- 15
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
+ 20
- DARK
+ PER
+
+
+ 8
+ 80
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
index 596accf282..d5e5e084f2 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
@@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
* @author Sdw, Mobius
- * @version Classic 2.0
*/
public class AcquireSkillList implements IClientOutgoingPacket
{
@@ -61,11 +60,12 @@ public class AcquireSkillList implements IClientOutgoingPacket
{
continue;
}
+
packet.writeD(skill.getSkillId());
packet.writeH(skill.getSkillLevel());
packet.writeQ(skill.getLevelUpSp());
packet.writeC(skill.getGetLevel());
- packet.writeC(0x00);
+ packet.writeC(0x00); // Skill dual class level.
if (skill.getRequiredItems().size() > 0)
{
for (ItemHolder item : skill.getRequiredItems())