From e409f08d96b76cb895a92cc00a9d33cdda4c5712 Mon Sep 17 00:00:00 2001
From: Adry_85 <Adrya85@hotmail.it>
Date: Fri, 27 Sep 2013 08:50:36 +0000
Subject: [PATCH] BETA: Removing skilltype CONT. Reviewed by:
!UnAfraid, Zoey76
---
.../handlers/skillhandlers/Continuous.java | 4 +--
.../game/data/stats/skills/00800-00899.xml | 6 ++---
.../game/data/stats/skills/05100-05199.xml | 27 ++++++++++---------
.../game/data/stats/skills/05900-05999.xml | 4 +--
4 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
index 2040893572..4839aeb147 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java
@@ -41,14 +41,12 @@ public class Continuous implements ISkillHandler
{
L2SkillType.BUFF,
L2SkillType.DEBUFF,
- L2SkillType.CONT,
};
@Override
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
boolean acted = true;
-
L2PcInstance player = null;
if (activeChar.isPlayer())
{
@@ -122,7 +120,7 @@ public class Continuous implements ISkillHandler
// if this is a debuff let the duel manager know about it
// so the debuff can be removed after the duel
// (player & target must be in the same duel)
- if (target.isPlayer() && target.getActingPlayer().isInDuel() && ((skill.getSkillType() == L2SkillType.DEBUFF) || (skill.getSkillType() == L2SkillType.BUFF)) && (player != null) && (player.getDuelId() == target.getActingPlayer().getDuelId()))
+ if (target.isPlayer() && target.getActingPlayer().isInDuel() && (player != null) && (player.getDuelId() == target.getActingPlayer().getDuelId()))
{
DuelManager dm = DuelManager.getInstance();
for (L2Effect buff : skill.getEffects(activeChar, target, new Env(shld, ss, sps, bss)))
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml
index 2196d0740c..f4cdb3d4ab 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml
@@ -839,7 +839,7 @@
<set name="mpConsume" val="72" />
<set name="operateType" val="A2" />
<set name="reuseDelay" val="10000" />
- <set name="skillType" val="CONT" />
+ <set name="skillType" val="BUFF" />
<set name="soulMaxConsumeCount" val="20" />
<set name="staticReuse" val="true" />
<set name="stayAfterDeath" val="true" />
@@ -872,7 +872,7 @@
<set name="mpConsume" val="72" />
<set name="operateType" val="A2" />
<set name="reuseDelay" val="10000" />
- <set name="skillType" val="CONT" />
+ <set name="skillType" val="BUFF" />
<set name="stayAfterDeath" val="true" />
<set name="targetType" val="SELF" />
<cond>
@@ -900,7 +900,7 @@
<set name="mpConsume" val="72" />
<set name="operateType" val="A2" />
<set name="reuseDelay" val="10000" />
- <set name="skillType" val="CONT" />
+ <set name="skillType" val="BUFF" />
<set name="stayAfterDeath" val="true" />
<set name="targetType" val="SELF" />
<cond>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml
index ebdb245b95..069bfc7486 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml
@@ -418,6 +418,7 @@
</for>
</skill>
<skill id="5123" levels="1" name="Maximum Defense">
+ <!-- Confirmed CT2.5 -->
<set name="abnormalLvl" val="1" />
<set name="abnormalTime" val="7" />
<set name="abnormalType" val="COMBINATION" />
@@ -426,8 +427,7 @@
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="80" />
<set name="operateType" val="A2" />
- <set name="skillType" val="CONT" />
- <set name="targetType" val="ONE" />
+ <set name="targetType" val="AURA" />
<for>
<effect name="Buff" val="0">
<add order="0x40" stat="pDef" val="1000" />
@@ -437,11 +437,12 @@
</for>
</skill>
<skill id="5124" levels="1" name="Anti-Music">
+ <!-- Confirmed CT2.5 -->
<set name="affectRange" val="200" />
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="80" />
<set name="operateType" val="A1" />
- <set name="targetType" val="ONE" />
+ <set name="targetType" val="AURA" />
<for>
<effect name="DispelBySlotProbability" noicon="1" val="0">
<param dispel="DANCE_OF_AQUA_GUARD;DANCE_OF_CONCENTRATION;DANCE_OF_CONCENTRATION;DANCE_OF_EARTH_GUARD;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_LIGHT;DANCE_OF_MYSTIC;DANCE_OF_PROTECTION;DANCE_OF_SHADOW;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_FLAME_GUARD;SONG_OF_HUNTER;SONG_OF_INVOCATION;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_STORM_GUARD;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BLADESTORM;DANCE_OF_ALIGNMENT;SONG_OF_ELEMENTAL;SONG_OF_WINDSTORM" rate="100" />
@@ -449,6 +450,7 @@
</for>
</skill>
<skill id="5125" levels="1" name="Maximum Resist Status">
+ <!-- Confirmed CT2.5 -->
<set name="abnormalLvl" val="1" />
<set name="abnormalTime" val="7" />
<set name="abnormalType" val="COMBINATION" />
@@ -457,7 +459,7 @@
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="80" />
<set name="operateType" val="A2" />
- <set name="targetType" val="ONE" />
+ <set name="targetType" val="AURA" />
<for>
<effect name="Buff" val="0">
<sub order="0x40" stat="debuffVuln" val="60" />
@@ -465,6 +467,7 @@
</for>
</skill>
<skill id="5126" levels="1" name="Maximum Recovery">
+ <!-- Confirmed CT2.5 -->
<set name="abnormalLvl" val="1" />
<set name="abnormalTime" val="7" />
<set name="abnormalType" val="COMBINATION" />
@@ -473,7 +476,7 @@
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="80" />
<set name="operateType" val="A2" />
- <set name="targetType" val="ONE" />
+ <set name="targetType" val="AURA" />
<for>
<effect name="Buff" val="0">
<mul order="0x30" stat="regHp" val="1.4" />
@@ -482,6 +485,7 @@
</for>
</skill>
<skill id="5127" levels="1" name="Recover Force">
+ <!-- Confirmed CT2.5 -->
<set name="abnormalLvl" val="1" />
<set name="abnormalTime" val="7" />
<set name="abnormalType" val="COMBINATION" />
@@ -490,8 +494,7 @@
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="80" />
<set name="operateType" val="A2" />
- <set name="skillType" val="CONT" /> <!-- FIXME: This is not retail like -->
- <set name="targetType" val="AURA" /> <!-- FIXME: Aura Friendly ? -->
+ <set name="targetType" val="AURA" />
<for>
<effect name="Buff" val="0">
<mul order="0x30" stat="pAtk" val="1.2" />
@@ -500,6 +503,7 @@
</for>
</skill>
<skill id="5128" levels="1" name="Maximize long-range weapon use">
+ <!-- Confirmed CT2.5 -->
<set name="abnormalLvl" val="1" />
<set name="abnormalTime" val="7" />
<set name="abnormalType" val="COMBINATION" />
@@ -508,7 +512,7 @@
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="80" />
<set name="operateType" val="A2" />
- <set name="targetType" val="ONE" />
+ <set name="targetType" val="AURA" />
<for>
<effect name="Buff" val="0">
<mul order="0x30" stat="pAtk" val="1.2">
@@ -521,6 +525,7 @@
</for>
</skill>
<skill id="5129" levels="1" name="Smokescreen">
+ <!-- Confirmed CT2.5 -->
<set name="abnormalLvl" val="1" />
<set name="abnormalTime" val="7" />
<set name="abnormalType" val="COMBINATION" />
@@ -529,7 +534,7 @@
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="80" />
<set name="operateType" val="A2" />
- <set name="targetType" val="ONE" />
+ <set name="targetType" val="AURA" />
<for>
<effect name="Buff" val="0">
<add order="0x40" stat="rEvas" val="15" />
@@ -541,28 +546,24 @@
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="80" />
<set name="operateType" val="A1" />
- <set name="skillType" val="CONT" />
<set name="targetType" val="ONE" />
</skill>
<skill id="5131" levels="1" name="Tsunami">
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="80" />
<set name="operateType" val="A1" />
- <set name="skillType" val="CONT" />
<set name="targetType" val="ONE" />
</skill>
<skill id="5132" levels="1" name="Cyclone">
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="80" />
<set name="operateType" val="A1" />
- <set name="skillType" val="CONT" />
<set name="targetType" val="ONE" />
</skill>
<skill id="5133" levels="1" name="Gehenna">
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="80" />
<set name="operateType" val="A1" />
- <set name="skillType" val="CONT" />
<set name="targetType" val="ONE" />
</skill>
<skill id="5134" levels="1" name="Anti-Summoning Field">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml
index 3fc9e00de7..4e9ec70ed5 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml
@@ -1149,7 +1149,7 @@
<set name="mpConsume" val="75" />
<set name="operateType" val="A2" />
<set name="reuseDelay" val="7200000" />
- <set name="skillType" val="CONT" />
+ <set name="skillType" val="BUFF" />
<set name="targetType" val="ONE" />
<cond>
<player canTransform="true" />
@@ -1175,7 +1175,7 @@
<set name="mpConsume" val="75" />
<set name="operateType" val="A2" />
<set name="reuseDelay" val="7200000" />
- <set name="skillType" val="CONT" />
+ <set name="skillType" val="BUFF" />
<set name="targetType" val="ONE" />
<cond>
<player canTransform="true" />
--
GitLab