diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/skillTrees/pledgeSkillTree.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/skillTrees/pledgeSkillTree.xml
new file mode 100644
index 0000000000..d76a9cbd04
--- /dev/null
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/skillTrees/pledgeSkillTree.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+ DISTINGUISHED_KING
+ 112
+ 114
+ 115
+ 116
+ 117
+ 118
+ 119
+ 120
+ 121
+
+
+ DISTINGUISHED_KING
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+
+
+
+ APPRENTICE
+ 81
+
+
+ APPRENTICE
+ 82
+
+
+ APPRENTICE
+ 83
+
+
+ APPRENTICE
+ 84
+
+
+ APPRENTICE
+ 85
+
+
+ APPRENTICE
+ 86
+
+
+ APPRENTICE
+ 87
+
+
+ APPRENTICE
+ 88
+
+
+ APPRENTICE
+ 89
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/32100-32199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/32100-32199.xml
index f246540769..480258cf50 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/32100-32199.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/32100-32199.xml
@@ -176,41 +176,159 @@
icon.skill32115
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 500
+ DIFF
+
+
+ 500
+ DIFF
+
+
icon.skill32116
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
icon.skill32117
P
+
+
+ -5
+ PK
+
+
icon.skill32118
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 3
+ PER
+
+
+ 3
+ PER
+
+
icon.skill32119
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
icon.skill32120
P
+
+
+ -5
+ PK
+
+
icon.skill32121
P
+
+
+ -1
+
+
+
+
+ -3
+ PK
+
+
+ 3
+
+
+ 3
+
+
icon.skill32121
P
+
+
+ -1
+
+
+
+
+ -2
+ PK
+
+
+ 2
+
+
+ 2
+
+
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd
index 16112d7bdb..4dbc8290f1 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd
@@ -2460,6 +2460,7 @@
+
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Castle.java
index 7a3dde8dbc..cd0825217b 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -1145,7 +1145,11 @@ public class Castle extends AbstractResidence
super.giveResidentialSkills(player);
if ((player.getPledgeClass() == -1) || (player.getPledgeClass() == 100)) // Leader or Elite
{
- player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill());
+ player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.KNIGHT_OF_DARKNESS.getSkill() : CommonSkill.KNIGHT_OF_SPLENDOR.getSkill());
+ }
+ else // Non Elite members
+ {
+ player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.PROTECTION_OF_DARKNESS.getSkill() : CommonSkill.PROTECTION_OF_LIGHT.getSkill());
}
}
@@ -1153,8 +1157,10 @@ public class Castle extends AbstractResidence
public void removeResidentialSkills(PlayerInstance player)
{
super.removeResidentialSkills(player);
- player.removeSkill(CommonSkill.ABILITY_OF_DARKNESS.getId());
- player.removeSkill(CommonSkill.ABILITY_OF_LIGHT.getId());
+ player.removeSkill(CommonSkill.KNIGHT_OF_SPLENDOR.getId());
+ player.removeSkill(CommonSkill.PROTECTION_OF_LIGHT.getId());
+ player.removeSkill(CommonSkill.KNIGHT_OF_DARKNESS.getId());
+ player.removeSkill(CommonSkill.PROTECTION_OF_DARKNESS.getId());
}
public void spawnSideNpcs()
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java
index 3444c8bd4b..928fed13f8 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java
@@ -51,8 +51,10 @@ public enum CommonSkill
SHILENS_BREATH(14571, 1),
IMPRIT_OF_LIGHT(19034, 1),
IMPRIT_OF_DARKNESS(19035, 1),
- ABILITY_OF_LIGHT(19032, 1),
- ABILITY_OF_DARKNESS(19033, 1),
+ KNIGHT_OF_SPLENDOR(32117, 1),
+ PROTECTION_OF_LIGHT(32119, 1),
+ KNIGHT_OF_DARKNESS(32120, 1),
+ PROTECTION_OF_DARKNESS(32122, 1),
CLAN_ADVENT(19009, 1),
HAIR_ACCESSORY_SET(17192, 1),
ALCHEMY_CUBE(17943, 1),
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/skillTrees/pledgeSkillTree.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/skillTrees/pledgeSkillTree.xml
new file mode 100644
index 0000000000..d76a9cbd04
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/skillTrees/pledgeSkillTree.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+ DISTINGUISHED_KING
+ 112
+ 114
+ 115
+ 116
+ 117
+ 118
+ 119
+ 120
+ 121
+
+
+ DISTINGUISHED_KING
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+
+
+
+ APPRENTICE
+ 81
+
+
+ APPRENTICE
+ 82
+
+
+ APPRENTICE
+ 83
+
+
+ APPRENTICE
+ 84
+
+
+ APPRENTICE
+ 85
+
+
+ APPRENTICE
+ 86
+
+
+ APPRENTICE
+ 87
+
+
+ APPRENTICE
+ 88
+
+
+ APPRENTICE
+ 89
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/32100-32199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/32100-32199.xml
index b93b8a3477..d68a5ca7ab 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/32100-32199.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/32100-32199.xml
@@ -176,41 +176,159 @@
icon.skill32115
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 500
+ DIFF
+
+
+ 500
+ DIFF
+
+
icon.skill32116
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
icon.skill32117
P
+
+
+ -5
+ PK
+
+
icon.skill32118
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 3
+ PER
+
+
+ 3
+ PER
+
+
icon.skill32119
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
icon.skill32120
P
+
+
+ -5
+ PK
+
+
icon.skill32121
P
+
+
+ -1
+
+
+
+
+ -3
+ PK
+
+
+ 3
+
+
+ 3
+
+
icon.skill32121
P
+
+
+ -1
+
+
+
+
+ -2
+ PK
+
+
+ 2
+
+
+ 2
+
+
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd
index 16112d7bdb..4dbc8290f1 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd
@@ -2460,6 +2460,7 @@
+
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Castle.java
index 7a3dde8dbc..cd0825217b 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -1145,7 +1145,11 @@ public class Castle extends AbstractResidence
super.giveResidentialSkills(player);
if ((player.getPledgeClass() == -1) || (player.getPledgeClass() == 100)) // Leader or Elite
{
- player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill());
+ player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.KNIGHT_OF_DARKNESS.getSkill() : CommonSkill.KNIGHT_OF_SPLENDOR.getSkill());
+ }
+ else // Non Elite members
+ {
+ player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.PROTECTION_OF_DARKNESS.getSkill() : CommonSkill.PROTECTION_OF_LIGHT.getSkill());
}
}
@@ -1153,8 +1157,10 @@ public class Castle extends AbstractResidence
public void removeResidentialSkills(PlayerInstance player)
{
super.removeResidentialSkills(player);
- player.removeSkill(CommonSkill.ABILITY_OF_DARKNESS.getId());
- player.removeSkill(CommonSkill.ABILITY_OF_LIGHT.getId());
+ player.removeSkill(CommonSkill.KNIGHT_OF_SPLENDOR.getId());
+ player.removeSkill(CommonSkill.PROTECTION_OF_LIGHT.getId());
+ player.removeSkill(CommonSkill.KNIGHT_OF_DARKNESS.getId());
+ player.removeSkill(CommonSkill.PROTECTION_OF_DARKNESS.getId());
}
public void spawnSideNpcs()
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java
index 3444c8bd4b..928fed13f8 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java
@@ -51,8 +51,10 @@ public enum CommonSkill
SHILENS_BREATH(14571, 1),
IMPRIT_OF_LIGHT(19034, 1),
IMPRIT_OF_DARKNESS(19035, 1),
- ABILITY_OF_LIGHT(19032, 1),
- ABILITY_OF_DARKNESS(19033, 1),
+ KNIGHT_OF_SPLENDOR(32117, 1),
+ PROTECTION_OF_LIGHT(32119, 1),
+ KNIGHT_OF_DARKNESS(32120, 1),
+ PROTECTION_OF_DARKNESS(32122, 1),
CLAN_ADVENT(19009, 1),
HAIR_ACCESSORY_SET(17192, 1),
ALCHEMY_CUBE(17943, 1),
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/skillTrees/pledgeSkillTree.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/skillTrees/pledgeSkillTree.xml
new file mode 100644
index 0000000000..d76a9cbd04
--- /dev/null
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/skillTrees/pledgeSkillTree.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+ DISTINGUISHED_KING
+ 112
+ 114
+ 115
+ 116
+ 117
+ 118
+ 119
+ 120
+ 121
+
+
+ DISTINGUISHED_KING
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+
+
+
+ APPRENTICE
+ 81
+
+
+ APPRENTICE
+ 82
+
+
+ APPRENTICE
+ 83
+
+
+ APPRENTICE
+ 84
+
+
+ APPRENTICE
+ 85
+
+
+ APPRENTICE
+ 86
+
+
+ APPRENTICE
+ 87
+
+
+ APPRENTICE
+ 88
+
+
+ APPRENTICE
+ 89
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/32100-32199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/32100-32199.xml
index 35adc59fd3..20ada3fb9e 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/32100-32199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/32100-32199.xml
@@ -176,41 +176,159 @@
icon.skill32115
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 500
+ DIFF
+
+
+ 500
+ DIFF
+
+
icon.skill32116
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
icon.skill32117
P
+
+
+ -5
+ PK
+
+
icon.skill32118
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 3
+ PER
+
+
+ 3
+ PER
+
+
icon.skill32119
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
icon.skill32120
P
+
+
+ -5
+ PK
+
+
icon.skill32121
P
+
+
+ -1
+
+
+
+
+ -3
+ PK
+
+
+ 3
+
+
+ 3
+
+
icon.skill32121
P
+
+
+ -1
+
+
+
+
+ -2
+ PK
+
+
+ 2
+
+
+ 2
+
+
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
index 9e2ceb8a20..70a653dd94 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd
@@ -2460,6 +2460,7 @@
+
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Castle.java
index 7a3dde8dbc..cd0825217b 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -1145,7 +1145,11 @@ public class Castle extends AbstractResidence
super.giveResidentialSkills(player);
if ((player.getPledgeClass() == -1) || (player.getPledgeClass() == 100)) // Leader or Elite
{
- player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill());
+ player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.KNIGHT_OF_DARKNESS.getSkill() : CommonSkill.KNIGHT_OF_SPLENDOR.getSkill());
+ }
+ else // Non Elite members
+ {
+ player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.PROTECTION_OF_DARKNESS.getSkill() : CommonSkill.PROTECTION_OF_LIGHT.getSkill());
}
}
@@ -1153,8 +1157,10 @@ public class Castle extends AbstractResidence
public void removeResidentialSkills(PlayerInstance player)
{
super.removeResidentialSkills(player);
- player.removeSkill(CommonSkill.ABILITY_OF_DARKNESS.getId());
- player.removeSkill(CommonSkill.ABILITY_OF_LIGHT.getId());
+ player.removeSkill(CommonSkill.KNIGHT_OF_SPLENDOR.getId());
+ player.removeSkill(CommonSkill.PROTECTION_OF_LIGHT.getId());
+ player.removeSkill(CommonSkill.KNIGHT_OF_DARKNESS.getId());
+ player.removeSkill(CommonSkill.PROTECTION_OF_DARKNESS.getId());
}
public void spawnSideNpcs()
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java
index 3444c8bd4b..928fed13f8 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java
@@ -51,8 +51,10 @@ public enum CommonSkill
SHILENS_BREATH(14571, 1),
IMPRIT_OF_LIGHT(19034, 1),
IMPRIT_OF_DARKNESS(19035, 1),
- ABILITY_OF_LIGHT(19032, 1),
- ABILITY_OF_DARKNESS(19033, 1),
+ KNIGHT_OF_SPLENDOR(32117, 1),
+ PROTECTION_OF_LIGHT(32119, 1),
+ KNIGHT_OF_DARKNESS(32120, 1),
+ PROTECTION_OF_DARKNESS(32122, 1),
CLAN_ADVENT(19009, 1),
HAIR_ACCESSORY_SET(17192, 1),
ALCHEMY_CUBE(17943, 1),
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/pledgeSkillTree.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/pledgeSkillTree.xml
new file mode 100644
index 0000000000..7d79130bfe
--- /dev/null
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/pledgeSkillTree.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+ DISTINGUISHED_KING
+ 112
+ 114
+ 115
+ 116
+ 117
+ 118
+ 119
+ 120
+ 121
+
+
+ DISTINGUISHED_KING
+ 101
+ 102
+ 103
+ 104
+ 105
+ 106
+ 107
+ 108
+ 109
+ 110
+ 111
+
+
+
+ APPRENTICE
+ 81
+
+
+ APPRENTICE
+ 82
+
+
+ APPRENTICE
+ 83
+
+
+ APPRENTICE
+ 84
+
+
+ APPRENTICE
+ 85
+
+
+ APPRENTICE
+ 86
+
+
+ APPRENTICE
+ 87
+
+
+ APPRENTICE
+ 88
+
+
+ APPRENTICE
+ 89
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/32100-32199.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/32100-32199.xml
index 2aa6e76a05..bb204ce679 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/32100-32199.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/32100-32199.xml
@@ -176,41 +176,159 @@
icon.skill32115
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 500
+ DIFF
+
+
+ 500
+ DIFF
+
+
icon.skill32116
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
icon.skill32117
P
+
+
+ -5
+ PK
+
+
icon.skill32118
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 3
+ PER
+
+
+ 3
+ PER
+
+
icon.skill32119
P
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
+ 10
+ PER
+
+
icon.skill32120
P
+
+
+ -5
+ PK
+
+
icon.skill32121
P
+
+
+ -1
+
+
+
+
+ -3
+ PK
+
+
+ 3
+
+
+ 3
+
+
icon.skill32121
P
+
+
+ -1
+
+
+
+
+ -2
+ PK
+
+
+ 2
+
+
+ 2
+
+
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/skills.xsd b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/skills.xsd
index 4eac2a95c5..9852a44ac0 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/skills.xsd
@@ -2373,6 +2373,7 @@
+
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Castle.java
index 7a3dde8dbc..cd0825217b 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -1145,7 +1145,11 @@ public class Castle extends AbstractResidence
super.giveResidentialSkills(player);
if ((player.getPledgeClass() == -1) || (player.getPledgeClass() == 100)) // Leader or Elite
{
- player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill());
+ player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.KNIGHT_OF_DARKNESS.getSkill() : CommonSkill.KNIGHT_OF_SPLENDOR.getSkill());
+ }
+ else // Non Elite members
+ {
+ player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.PROTECTION_OF_DARKNESS.getSkill() : CommonSkill.PROTECTION_OF_LIGHT.getSkill());
}
}
@@ -1153,8 +1157,10 @@ public class Castle extends AbstractResidence
public void removeResidentialSkills(PlayerInstance player)
{
super.removeResidentialSkills(player);
- player.removeSkill(CommonSkill.ABILITY_OF_DARKNESS.getId());
- player.removeSkill(CommonSkill.ABILITY_OF_LIGHT.getId());
+ player.removeSkill(CommonSkill.KNIGHT_OF_SPLENDOR.getId());
+ player.removeSkill(CommonSkill.PROTECTION_OF_LIGHT.getId());
+ player.removeSkill(CommonSkill.KNIGHT_OF_DARKNESS.getId());
+ player.removeSkill(CommonSkill.PROTECTION_OF_DARKNESS.getId());
}
public void spawnSideNpcs()
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java
index a17955b5ef..b159df01d3 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/CommonSkill.java
@@ -51,8 +51,10 @@ public enum CommonSkill
SHILENS_BREATH(14571, 1),
IMPRIT_OF_LIGHT(19034, 1),
IMPRIT_OF_DARKNESS(19035, 1),
- ABILITY_OF_LIGHT(19032, 1),
- ABILITY_OF_DARKNESS(19033, 1),
+ KNIGHT_OF_SPLENDOR(32117, 1),
+ PROTECTION_OF_LIGHT(32119, 1),
+ KNIGHT_OF_DARKNESS(32120, 1),
+ PROTECTION_OF_DARKNESS(32122, 1),
HAIR_ACCESSORY_SET(17192, 1),
ALCHEMY_CUBE(17943, 1),
ALCHEMY_CUBE_RANDOM_SUCCESS(17966, 1),