From d8005c98c15c8cd11fafa0629f9126c5d67fc4d7 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 8 Nov 2017 14:10:00 +0000 Subject: [PATCH] Removed unused alter skill holder. --- .../game/data/stats/skills/10000-10099.xml | 40 --------------- .../game/data/stats/skills/10200-10299.xml | 5 -- .../game/data/stats/skills/10500-10599.xml | 5 -- .../game/data/stats/skills/10700-10799.xml | 5 -- .../game/data/stats/skills/11000-11099.xml | 5 -- .../game/data/stats/skills/11200-11299.xml | 5 -- .../game/data/stats/skills/11500-11599.xml | 5 -- .../game/data/stats/skills/11700-11799.xml | 5 -- .../game/data/stats/skills/14500-14599.xml | 25 --------- .../game/data/stats/skills/14600-14699.xml | 15 ------ .../game/data/stats/skills/23400-23499.xml | 5 -- .../model/holders/AlterSkillHolder.java | 51 ------------------- .../gameserver/model/skills/Skill.java | 8 --- .../game/data/stats/skills/10000-10099.xml | 40 --------------- .../game/data/stats/skills/10200-10299.xml | 5 -- .../game/data/stats/skills/10500-10599.xml | 5 -- .../game/data/stats/skills/10700-10799.xml | 5 -- .../game/data/stats/skills/11000-11099.xml | 5 -- .../game/data/stats/skills/11200-11299.xml | 5 -- .../game/data/stats/skills/11500-11599.xml | 5 -- .../game/data/stats/skills/11700-11799.xml | 5 -- .../game/data/stats/skills/14500-14599.xml | 25 --------- .../game/data/stats/skills/14600-14699.xml | 15 ------ .../game/data/stats/skills/23400-23499.xml | 5 -- .../model/holders/AlterSkillHolder.java | 51 ------------------- .../gameserver/model/skills/Skill.java | 8 --- .../game/data/stats/skills/10000-10099.xml | 40 --------------- .../game/data/stats/skills/10200-10299.xml | 5 -- .../game/data/stats/skills/10500-10599.xml | 5 -- .../game/data/stats/skills/10700-10799.xml | 5 -- .../game/data/stats/skills/11000-11099.xml | 5 -- .../game/data/stats/skills/11200-11299.xml | 5 -- .../game/data/stats/skills/11500-11599.xml | 5 -- .../game/data/stats/skills/11700-11799.xml | 5 -- .../game/data/stats/skills/14500-14599.xml | 25 --------- .../game/data/stats/skills/14600-14699.xml | 15 ------ .../game/data/stats/skills/23400-23499.xml | 5 -- .../model/holders/AlterSkillHolder.java | 51 ------------------- .../gameserver/model/skills/Skill.java | 8 --- .../model/holders/AlterSkillHolder.java | 51 ------------------- .../gameserver/model/skills/Skill.java | 8 --- 41 files changed, 596 deletions(-) delete mode 100644 L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java delete mode 100644 L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java delete mode 100644 L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml index 0515f25ec3..32860ac720 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml @@ -510,11 +510,6 @@ -719 -722 - - - - - ENEMY SINGLE @@ -2882,11 +2877,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -2956,11 +2946,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3030,11 +3015,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3104,11 +3084,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3178,11 +3153,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3252,11 +3222,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3704,11 +3669,6 @@ true ENEMY SINGLE - - - - - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml index 81524bdcda..2346c903f0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml @@ -705,11 +705,6 @@ NONE true - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml index 50dbb19e48..46357a3085 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml @@ -578,11 +578,6 @@ NONE NONE 5000 - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml index d67b807e80..013ad6351a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml @@ -1066,11 +1066,6 @@ 0;0;700;50 NONE - - - - - ENEMY SQUARE NOT_FRIEND diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml index f92975dc70..9749290781 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml @@ -358,11 +358,6 @@ {base + base / 100 * subIndex} 1 - - - - - 11007 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml index 6abbc0db97..a51a722d7f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml @@ -869,11 +869,6 @@ 20 DOT_POISON true - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml index 32692ce8d8..031b4d20d9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml @@ -527,11 +527,6 @@ NONE 5 true - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml index 34880aa039..0a973d548b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml @@ -1328,11 +1328,6 @@ {base + base / 100 * subIndex} 1 - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14500-14599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14500-14599.xml index 5e69036b32..f8c8b6f003 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14500-14599.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14500-14599.xml @@ -2544,11 +2544,6 @@ 85 ENEMY SINGLE - - - - - @@ -2691,11 +2686,6 @@ 85 ENEMY SINGLE - - - - - @@ -2854,11 +2844,6 @@ 85 ENEMY SINGLE - - - - - @@ -2998,11 +2983,6 @@ 85 ENEMY SINGLE - - - - - @@ -3138,11 +3118,6 @@ 85 ENEMY SINGLE - - - - - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14600-14699.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14600-14699.xml index e4ec11fd6c..17c094857e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14600-14699.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14600-14699.xml @@ -11,11 +11,6 @@ 85 ENEMY SINGLE - - - - - @@ -155,11 +150,6 @@ 85 ENEMY SINGLE - - - - - @@ -301,11 +291,6 @@ 85 ENEMY SINGLE - - - - - diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/23400-23499.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/23400-23499.xml index 44ff8d9ee9..a643eb93c3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/23400-23499.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/23400-23499.xml @@ -2138,11 +2138,6 @@ NONE 5 true - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java deleted file mode 100644 index 1e583957a0..0000000000 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.l2jmobius.gameserver.model.holders; - -import com.l2jmobius.gameserver.model.StatsSet; -import com.l2jmobius.gameserver.model.skills.AbnormalType; - -/** - * @author UnAfraid - */ -public class AlterSkillHolder extends SkillHolder -{ - private final int _chance; - private final AbnormalType _abnormalType; - - public AlterSkillHolder(int skillId, int skillLevel, int chance, AbnormalType abnormalType) - { - super(skillId, skillLevel); - _chance = chance; - _abnormalType = abnormalType; - } - - public int getChance() - { - return _chance; - } - - public AbnormalType getAbnormalType() - { - return _abnormalType; - } - - public static AlterSkillHolder fromStatsSet(StatsSet set) - { - return new AlterSkillHolder(set.getInt(".id"), set.getInt(".level", 1), set.getInt(".chance"), set.getEnum(".abnormalType", AbnormalType.class)); - } -} diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java index c26837705a..98f374c294 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -53,7 +53,6 @@ import com.l2jmobius.gameserver.model.cubic.CubicInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; -import com.l2jmobius.gameserver.model.holders.AlterSkillHolder; import com.l2jmobius.gameserver.model.holders.AttachSkillHolder; import com.l2jmobius.gameserver.model.interfaces.IIdentifiable; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -205,7 +204,6 @@ public final class Skill implements IIdentifiable private final int _toggleGroupId; private final int _attachToggleGroupId; - private final List _alterSkills; private final List _attachSkills; private final Set _abnormalResists; @@ -414,7 +412,6 @@ public final class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _alterSkills = set.getList("alterSkill", StatsSet.class, Collections.emptyList()).stream().map(AlterSkillHolder::fromStatsSet).collect(Collectors.toList()); _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); @@ -1833,11 +1830,6 @@ public final class Skill implements IIdentifiable return _attachToggleGroupId; } - public List getAlterSkills() - { - return _alterSkills; - } - public List getAttachSkills() { return _attachSkills; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml index b0add262b2..36acb20ed7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml @@ -510,11 +510,6 @@ -719 -722 - - - - - ENEMY SINGLE @@ -2892,11 +2887,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -2966,11 +2956,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3040,11 +3025,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3114,11 +3094,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3188,11 +3163,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3262,11 +3232,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3714,11 +3679,6 @@ true ENEMY SINGLE - - - - - diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml index 6a135533e8..e1e340d5b3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml @@ -705,11 +705,6 @@ NONE true - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml index c60512258b..14accde9bd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml @@ -578,11 +578,6 @@ NONE NONE 5000 - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml index 3659a6b07d..9aa2bbae76 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml @@ -1115,11 +1115,6 @@ 0;0;700;50 NONE - - - - - ENEMY SQUARE NOT_FRIEND diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml index de9da4722a..1e4910cc61 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml @@ -358,11 +358,6 @@ {base + base / 100 * subIndex} 1 - - - - - 11007 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml index 81dbe79c09..b4efd741e2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml @@ -876,11 +876,6 @@ 20 DOT_POISON true - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml index d496d8db4b..b1c5e26a1e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml @@ -529,11 +529,6 @@ NONE 5 true - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml index f4e0c53d21..e4c32c8625 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml @@ -1450,11 +1450,6 @@ {base + base / 100 * subIndex} 1 - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14500-14599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14500-14599.xml index 23349cfcc2..b0ace17a28 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14500-14599.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14500-14599.xml @@ -2544,11 +2544,6 @@ 85 ENEMY SINGLE - - - - - @@ -2691,11 +2686,6 @@ 85 ENEMY SINGLE - - - - - @@ -2854,11 +2844,6 @@ 85 ENEMY SINGLE - - - - - @@ -2998,11 +2983,6 @@ 85 ENEMY SINGLE - - - - - @@ -3138,11 +3118,6 @@ 85 ENEMY SINGLE - - - - - diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14600-14699.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14600-14699.xml index 306430fb7c..53731c0027 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14600-14699.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14600-14699.xml @@ -11,11 +11,6 @@ 85 ENEMY SINGLE - - - - - @@ -155,11 +150,6 @@ 85 ENEMY SINGLE - - - - - @@ -301,11 +291,6 @@ 85 ENEMY SINGLE - - - - - diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/23400-23499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/23400-23499.xml index 334466c58c..d5448963eb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/23400-23499.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/23400-23499.xml @@ -2138,11 +2138,6 @@ NONE 5 true - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java deleted file mode 100644 index 1e583957a0..0000000000 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.l2jmobius.gameserver.model.holders; - -import com.l2jmobius.gameserver.model.StatsSet; -import com.l2jmobius.gameserver.model.skills.AbnormalType; - -/** - * @author UnAfraid - */ -public class AlterSkillHolder extends SkillHolder -{ - private final int _chance; - private final AbnormalType _abnormalType; - - public AlterSkillHolder(int skillId, int skillLevel, int chance, AbnormalType abnormalType) - { - super(skillId, skillLevel); - _chance = chance; - _abnormalType = abnormalType; - } - - public int getChance() - { - return _chance; - } - - public AbnormalType getAbnormalType() - { - return _abnormalType; - } - - public static AlterSkillHolder fromStatsSet(StatsSet set) - { - return new AlterSkillHolder(set.getInt(".id"), set.getInt(".level", 1), set.getInt(".chance"), set.getEnum(".abnormalType", AbnormalType.class)); - } -} diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java index e49b37c6fc..83f6e88b77 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -53,7 +53,6 @@ import com.l2jmobius.gameserver.model.cubic.CubicInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; -import com.l2jmobius.gameserver.model.holders.AlterSkillHolder; import com.l2jmobius.gameserver.model.holders.AttachSkillHolder; import com.l2jmobius.gameserver.model.interfaces.IIdentifiable; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -205,7 +204,6 @@ public final class Skill implements IIdentifiable private final int _toggleGroupId; private final int _attachToggleGroupId; - private final List _alterSkills; private final List _attachSkills; private final Set _abnormalResists; @@ -414,7 +412,6 @@ public final class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _alterSkills = set.getList("alterSkill", StatsSet.class, Collections.emptyList()).stream().map(AlterSkillHolder::fromStatsSet).collect(Collectors.toList()); _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); @@ -1833,11 +1830,6 @@ public final class Skill implements IIdentifiable return _attachToggleGroupId; } - public List getAlterSkills() - { - return _alterSkills; - } - public List getAttachSkills() { return _attachSkills; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml index dac5bad084..482f488da2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml @@ -509,11 +509,6 @@ -719 -722 - - - - - ENEMY SINGLE @@ -2891,11 +2886,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -2965,11 +2955,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3039,11 +3024,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3113,11 +3093,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3187,11 +3162,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3261,11 +3231,6 @@ 10 true true - - - - - ENEMY SINGLE @@ -3713,11 +3678,6 @@ true ENEMY SINGLE - - - - - diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml index fffea31767..38a87412bd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml @@ -705,11 +705,6 @@ NONE true - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml index 7362fbf40f..81b39315cb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml @@ -578,11 +578,6 @@ NONE NONE 5000 - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml index 7609168fb7..00311b4d20 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml @@ -1115,11 +1115,6 @@ 0;0;700;50 NONE - - - - - ENEMY SQUARE NOT_FRIEND diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml index 5aaa251bc1..7ce0e54d85 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml @@ -358,11 +358,6 @@ {base + base / 100 * subIndex} 1 - - - - - 11007 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml index 4fd66ace5b..a08098641f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml @@ -882,11 +882,6 @@ 20 DOT_POISON true - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml index f5fd14145b..030f753573 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml @@ -529,11 +529,6 @@ NONE 5 true - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml index f4e0c53d21..e4c32c8625 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml @@ -1450,11 +1450,6 @@ {base + base / 100 * subIndex} 1 - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14500-14599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14500-14599.xml index 23349cfcc2..b0ace17a28 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14500-14599.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14500-14599.xml @@ -2544,11 +2544,6 @@ 85 ENEMY SINGLE - - - - - @@ -2691,11 +2686,6 @@ 85 ENEMY SINGLE - - - - - @@ -2854,11 +2844,6 @@ 85 ENEMY SINGLE - - - - - @@ -2998,11 +2983,6 @@ 85 ENEMY SINGLE - - - - - @@ -3138,11 +3118,6 @@ 85 ENEMY SINGLE - - - - - diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14600-14699.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14600-14699.xml index 4318b32011..bdba7a8c2d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14600-14699.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14600-14699.xml @@ -11,11 +11,6 @@ 85 ENEMY SINGLE - - - - - @@ -155,11 +150,6 @@ 85 ENEMY SINGLE - - - - - @@ -301,11 +291,6 @@ 85 ENEMY SINGLE - - - - - diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/23400-23499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/23400-23499.xml index 334466c58c..d5448963eb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/23400-23499.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/23400-23499.xml @@ -2138,11 +2138,6 @@ NONE 5 true - - - - - ENEMY SINGLE diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java deleted file mode 100644 index 1e583957a0..0000000000 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.l2jmobius.gameserver.model.holders; - -import com.l2jmobius.gameserver.model.StatsSet; -import com.l2jmobius.gameserver.model.skills.AbnormalType; - -/** - * @author UnAfraid - */ -public class AlterSkillHolder extends SkillHolder -{ - private final int _chance; - private final AbnormalType _abnormalType; - - public AlterSkillHolder(int skillId, int skillLevel, int chance, AbnormalType abnormalType) - { - super(skillId, skillLevel); - _chance = chance; - _abnormalType = abnormalType; - } - - public int getChance() - { - return _chance; - } - - public AbnormalType getAbnormalType() - { - return _abnormalType; - } - - public static AlterSkillHolder fromStatsSet(StatsSet set) - { - return new AlterSkillHolder(set.getInt(".id"), set.getInt(".level", 1), set.getInt(".chance"), set.getEnum(".abnormalType", AbnormalType.class)); - } -} diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java index e49b37c6fc..83f6e88b77 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -53,7 +53,6 @@ import com.l2jmobius.gameserver.model.cubic.CubicInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; -import com.l2jmobius.gameserver.model.holders.AlterSkillHolder; import com.l2jmobius.gameserver.model.holders.AttachSkillHolder; import com.l2jmobius.gameserver.model.interfaces.IIdentifiable; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -205,7 +204,6 @@ public final class Skill implements IIdentifiable private final int _toggleGroupId; private final int _attachToggleGroupId; - private final List _alterSkills; private final List _attachSkills; private final Set _abnormalResists; @@ -414,7 +412,6 @@ public final class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _alterSkills = set.getList("alterSkill", StatsSet.class, Collections.emptyList()).stream().map(AlterSkillHolder::fromStatsSet).collect(Collectors.toList()); _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); @@ -1833,11 +1830,6 @@ public final class Skill implements IIdentifiable return _attachToggleGroupId; } - public List getAlterSkills() - { - return _alterSkills; - } - public List getAttachSkills() { return _attachSkills; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java deleted file mode 100644 index 1e583957a0..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/AlterSkillHolder.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.l2jmobius.gameserver.model.holders; - -import com.l2jmobius.gameserver.model.StatsSet; -import com.l2jmobius.gameserver.model.skills.AbnormalType; - -/** - * @author UnAfraid - */ -public class AlterSkillHolder extends SkillHolder -{ - private final int _chance; - private final AbnormalType _abnormalType; - - public AlterSkillHolder(int skillId, int skillLevel, int chance, AbnormalType abnormalType) - { - super(skillId, skillLevel); - _chance = chance; - _abnormalType = abnormalType; - } - - public int getChance() - { - return _chance; - } - - public AbnormalType getAbnormalType() - { - return _abnormalType; - } - - public static AlterSkillHolder fromStatsSet(StatsSet set) - { - return new AlterSkillHolder(set.getInt(".id"), set.getInt(".level", 1), set.getInt(".chance"), set.getEnum(".abnormalType", AbnormalType.class)); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java index e49b37c6fc..83f6e88b77 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -53,7 +53,6 @@ import com.l2jmobius.gameserver.model.cubic.CubicInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; -import com.l2jmobius.gameserver.model.holders.AlterSkillHolder; import com.l2jmobius.gameserver.model.holders.AttachSkillHolder; import com.l2jmobius.gameserver.model.interfaces.IIdentifiable; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -205,7 +204,6 @@ public final class Skill implements IIdentifiable private final int _toggleGroupId; private final int _attachToggleGroupId; - private final List _alterSkills; private final List _attachSkills; private final Set _abnormalResists; @@ -414,7 +412,6 @@ public final class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _alterSkills = set.getList("alterSkill", StatsSet.class, Collections.emptyList()).stream().map(AlterSkillHolder::fromStatsSet).collect(Collectors.toList()); _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); @@ -1833,11 +1830,6 @@ public final class Skill implements IIdentifiable return _attachToggleGroupId; } - public List getAlterSkills() - { - return _alterSkills; - } - public List getAttachSkills() { return _attachSkills;