From c9f5632b3436e8c6fd53366ade79567291708d2f Mon Sep 17 00:00:00 2001
From: Rumen Nikiforov <unafraid89@gmail.com>
Date: Sun, 23 Feb 2014 00:37:15 +0000
Subject: [PATCH] BETA: DP-Part for [L6419] * Implemented AI for Divine
Beast summon since it works only while it's master is transformed. *
Skills patch by: Nos
---
L2J_DataPack_BETA/dist/game/data/scripts.cfg | 1 +
.../scripts/ai/individual/DivineBeast.java | 69 +++++++
.../scripts/handlers/EffectMasterHandler.java | 1 +
.../handlers/effecthandlers/Summon.java | 107 ++++++++++
.../handlers/targethandlers/CorpseMob.java | 3 +-
.../dist/game/data/stats/npcs/14800-14900.xml | 2 -
.../game/data/stats/skills/00000-00099.xml | 54 ++---
.../game/data/stats/skills/00200-00299.xml | 54 ++---
.../game/data/stats/skills/00300-00399.xml | 30 +--
.../game/data/stats/skills/00400-00499.xml | 25 ++-
.../game/data/stats/skills/00700-00799.xml | 16 +-
.../game/data/stats/skills/00900-00999.xml | 16 +-
.../game/data/stats/skills/01100-01199.xml | 109 +++++-----
.../game/data/stats/skills/01200-01299.xml | 186 ++++++++++--------
.../game/data/stats/skills/01300-01399.xml | 108 +++++-----
.../game/data/stats/skills/01400-01499.xml | 73 ++++---
.../game/data/stats/skills/07000-07099.xml | 39 ++--
.../game/data/stats/skills/08200-08299.xml | 14 +-
.../game/data/stats/skills/22100-22199.xml | 27 ++-
19 files changed, 589 insertions(+), 345 deletions(-)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DivineBeast.java
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Summon.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 03f5560a71..efbaed5d1e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -141,6 +141,7 @@ ai/individual/CrimsonHatuOtis.java
ai/individual/Core.java
ai/individual/DarkWaterDragon.java
ai/individual/DemonPrince.java
+ai/individual/DivineBeast.java
ai/individual/DrChaos.java
ai/individual/Epidos.java
ai/individual/EvasGiftBox.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DivineBeast.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DivineBeast.java
new file mode 100644
index 0000000000..52955d8e37
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DivineBeast.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2004-2014 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack 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.
+ *
+ * L2J DataPack 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 <http://www.gnu.org/licenses/>.
+ */
+package ai.individual;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Simple AI that manages special conditions for Divine Beast summon.
+ * @author UnAfraid
+ */
+public final class DivineBeast extends AbstractNpcAI
+{
+ private static final int DIVINE_BEAST = 14870;
+ private static final int TRANSFORMATION_ID = 258;
+ private static final int CHECK_TIME = 2 * 1000;
+
+ private DivineBeast()
+ {
+ super(DivineBeast.class.getSimpleName(), "ai");
+ addSummonId(DIVINE_BEAST);
+ }
+
+ @Override
+ public void onSummon(L2Summon summon)
+ {
+ startQuestTimer("VALIDATE_TRANSFORMATION", CHECK_TIME, null, summon.getActingPlayer(), true);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ if ((player == null) || !player.hasServitor())
+ {
+ cancelQuestTimer(event, npc, player);
+ }
+ else if (player.getTransformationId() != TRANSFORMATION_ID)
+ {
+ cancelQuestTimer(event, npc, player);
+ player.getSummon().unSummon(player);
+ }
+
+ return super.onAdvEvent(event, npc, player);
+ }
+
+ public static void main(String[] args)
+ {
+ new DivineBeast();
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 6eb2123127..86c8ca1e7e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -154,6 +154,7 @@ public final class EffectMasterHandler
StaticDamage.class,
StealAbnormal.class,
Stun.class,
+ Summon.class,
SummonAgathion.class,
SummonCubic.class,
SummonNpc.class,
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Summon.java
new file mode 100644
index 0000000000..615a1dd4d9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Summon.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2004-2014 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack 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.
+ *
+ * L2J DataPack 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 <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import com.l2jserver.gameserver.datatables.ExperienceTable;
+import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.enums.NpcRace;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+
+/**
+ * @author UnAfraid
+ */
+public class Summon extends AbstractEffect
+{
+ private final int _npcId;
+ private final float _expMultiplier;
+ private final ItemHolder _consumeItem;
+ private final int _lifeTime;
+ private final int _consumeItemInterval;
+
+ public Summon(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
+ {
+ super(attachCond, applyCond, set, params);
+ if (params == null)
+ {
+ throw new IllegalArgumentException("Summon effect without parameters!");
+ }
+ _npcId = params.getInt("npcId");
+ _expMultiplier = params.getFloat("expMultiplier", 1);
+ _consumeItem = new ItemHolder(params.getInt("consumeItemId", 0), params.getInt("consumeItemCount", 1));
+ _consumeItemInterval = params.getInt("consumeItemInterval", 0);
+ _lifeTime = params.getInt("lifeTime", 3600) * 1000;
+ }
+
+ @Override
+ public boolean isInstant()
+ {
+ return true;
+ }
+
+ @Override
+ public void onStart(BuffInfo info)
+ {
+ super.onStart(info);
+
+ if (!info.getEffected().isPlayer() || info.getEffected().hasSummon())
+ {
+ return;
+ }
+
+ final L2PcInstance player = info.getEffected().getActingPlayer();
+ final L2NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
+ final L2ServitorInstance summon = new L2ServitorInstance(IdFactory.getInstance().getNextId(), template, player);
+ final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != NpcRace.SIEGE_WEAPON ? 240 : 60)) * 1000;
+
+ summon.setName(template.getName());
+ summon.setTitle(info.getEffected().getName());
+ summon.setReferenceSkill(info.getSkill().getId());
+ summon.setExpMultiplier(_expMultiplier);
+ summon.setLifeTime(_lifeTime);
+ summon.setItemConsume(_consumeItem);
+ summon.setItemConsumeInterval(consumeItemInterval);
+
+ if (summon.getLevel() >= ExperienceTable.getInstance().getMaxPetLevel())
+ {
+ summon.getStat().setExp(ExperienceTable.getInstance().getExpForLevel(ExperienceTable.getInstance().getMaxPetLevel() - 1));
+ _log.warning(Summon.class.getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceTable.getInstance().getMaxPetLevel() + ". Please rectify.");
+ }
+ else
+ {
+ summon.getStat().setExp(ExperienceTable.getInstance().getExpForLevel(summon.getLevel() % ExperienceTable.getInstance().getMaxPetLevel()));
+ }
+
+ summon.setCurrentHp(summon.getMaxHp());
+ summon.setCurrentMp(summon.getMaxMp());
+ summon.setHeading(player.getHeading());
+
+ player.setPet(summon);
+
+ summon.setRunning();
+ summon.spawnMe();
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpseMob.java
index f2c31d7ece..e8f390f28d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpseMob.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.effects.L2EffectType;
import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
import com.l2jserver.gameserver.network.SystemMessageId;
@@ -44,7 +43,7 @@ public class CorpseMob implements ITargetTypeHandler
return EMPTY_TARGET_LIST;
}
- if ((skill.getSkillType() == L2SkillType.SUMMON) && target.isServitor() && (target.getActingPlayer() != null) && (target.getActingPlayer().getObjectId() == activeChar.getObjectId()))
+ if (skill.hasEffectType(L2EffectType.SUMMON) && target.isServitor() && (target.getActingPlayer() != null) && (target.getActingPlayer().getObjectId() == activeChar.getObjectId()))
{
return EMPTY_TARGET_LIST;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/14800-14900.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/14800-14900.xml
index a27df75441..22fae54754 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/14800-14900.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/14800-14900.xml
@@ -3113,7 +3113,6 @@
<param name="step5_action02" value="1048" />
<param name="step5_action03" value="1049" />
<param name="step5_action04" value="1050" />
- <param name="master_transform_id" value="258" />
<param name="step5_skill_target04" value="1" />
<skill name="step6_skill01" id="5580" level="1" /> <!-- Divine Beast Bite -->
<skill name="step6_skill02" id="5581" level="1" /> <!-- Divine Beast Stun Attack -->
@@ -3123,7 +3122,6 @@
<param name="step6_action02" value="1048" />
<param name="step6_action03" value="1049" />
<param name="step6_action04" value="1050" />
- <param name="master_transform_id" value="258" />
<param name="step6_skill_target04" value="1" />
</parameters>
<race>DIVINE</race>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml
index c98b154c65..0e5c8149b1 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml
@@ -551,20 +551,24 @@
<set name="mpInitialConsume" val="530" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="itemConsumeCountOT" val="40" />
- <set name="itemConsumeIdOT" val="2131" />
- <set name="itemConsumeSteps" val="60" />
- <set name="npcId" val="14737" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="1000" />
- <set name="summonTotalLifeTime" val="1200000" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="14737" />
+ <param consumeItemId="2131" consumeItemCount="40" />
+ <param lifeTime="1200" />
+ </effect>
+ </for>
+ <for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="2131" consumeItemCount="40" />
+ <param lifeTime="1200" />
+ </effect>
+ </for>
</skill>
<skill id="15" levels="52" name="Charm">
<!-- Confirmed CT2.5 -->
@@ -886,32 +890,36 @@
<table name="#magicLvl"> 28 36 43 49 55 60 64 68 72 </table>
<table name="#mpConsume"> 49 62 75 88 100 110 119 126 133 </table>
<table name="#npcIds"> 14663 14664 14665 14666 14667 14668 14669 14670 14671 </table>
- <table name="#ench1expPenalty"> 0.14 0.13 0.12 0.11 0.1 0.09 0.08 0.07 0.06 0.05 0.04 0.03 0.02 0.01 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 </table>
+ <table name="#ench1expPenalty"> 0.86 0.87 0.88 0.89 0.90 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 </table>
<table name="#enchNpcId"> 14672 14673 14674 14675 14676 14677 14678 14679 14680 14681 14682 14683 14684 14685 14686 14687 14688 14689 14690 14691 14692 14693 14694 14695 14696 14697 14698 14699 14700 14701 </table>
<set name="hitTime" val="15000" />
<set name="icon" val="icon.skill0025" />
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="#itemConsumeId" />
- <set name="itemConsumeIdOT" val="#itemConsumeId" />
- <set name="itemConsumeSteps" val="4" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="1200000" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="expPenalty" val="0.15" /> <!-- 15 percent of earned Exp will be consumed -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="expPenalty" val="#ench1expPenalty" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="#itemConsumeId" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="1200" />
+ <param expMultiplier="0.85" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="1459" consumeItemCount="4" />
+ <param lifeTime="1200" />
+ <param expMultiplier="#ench1expPenalty" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="27" levels="14" name="Unlock">
<table name="#chance"> 30 50 75 100 100 100 100 100 100 100 100 100 100 100 </table>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
index e6f93874c4..16fe74d117 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
@@ -2396,34 +2396,38 @@
<table name="#mpConsume"> 56 70 85 92 98 104 109 </table>
<table name="#mpInitialConsume"> 14 18 22 23 25 26 28 </table>
<table name="#npcIds"> 14799 14800 14801 14802 14803 14804 14805 </table>
- <table name="#ench1expPenalty"> 0.14 0.13 0.12 0.11 0.1 0.09 0.08 0.07 0.06 0.05 0.04 0.03 0.02 0.01 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 </table>
+ <table name="#ench1expPenalty"> 0.86 0.87 0.88 0.89 0.90 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 </table>
<table name="#enchNpcIds"> 14806 14807 14808 14809 14810 14811 14812 14813 14814 14815 14816 14817 14818 14819 14820 14821 14822 14823 14824 14825 14826 14827 14828 14829 14830 14831 14832 14833 14834 14835 </table>
<set name="hitTime" val="15000" />
<set name="icon" val="icon.skill0283" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="1459" />
- <set name="itemConsumeIdOT" val="1459" />
- <set name="itemConsumeSteps" val="4" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="1200000" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="expPenalty" val="0.15" /> <!-- 15 percent of acquired Exp will also be consumed. -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="expPenalty" val="#ench1expPenalty" />
- <enchant1 name="npcId" val="#enchNpcIds" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="1459" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="1200" />
+ <param expMultiplier="0.85" />
+ </effect>
+ </for>
+ <for>
+ <effect name="Summon">
+ <param npcId="#enchNpcIds" />
+ <param consumeItemId="1459" consumeItemCount="4" />
+ <param lifeTime="1200" />
+ <param expMultiplier="#ench1expPenalty" />
+ </effect>
+ </for>
</skill>
<skill id="284" levels="40" name="Hurricane Assault" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
<table name="#effectPoints"> -286 -295 -303 -320 -328 -337 -346 -355 -363 -372 -381 -389 -398 -407 -415 -424 -432 -440 -449 -457 -465 -473 -481 -488 -496 -503 -510 -517 -524 -531 -537 -543 -549 -555 -560 -565 -570 -574 -578 -582 </table>
@@ -2895,24 +2899,28 @@
<set name="icon" val="icon.skill0299" />
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="itemConsumeCount" val="70" />
- <set name="itemConsumeCountOT" val="20" />
<set name="itemConsumeId" val="1460" />
- <set name="itemConsumeIdOT" val="2132" />
- <set name="itemConsumeSteps" val="60" />
<set name="magicLvl" val="58" />
<set name="mpInitialConsume" val="530" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="1000" />
- <set name="summonTotalLifeTime" val="1200000" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="npcId" val="14768" />
- <enchant1 name="npcId" val="#enchNpcIds" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="14768" />
+ <param consumeItemId="2132" consumeItemCount="20" />
+ <param lifeTime="1200" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcIds" />
+ <param consumeItemId="2132" consumeItemCount="20" />
+ <param lifeTime="1200" />
+ </effect>
+ </enchant1for>
</skill>
</list>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml
index 3338f48846..2d229d49e6 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml
@@ -5,32 +5,36 @@
<table name="#magicLvl"> 58 62 66 70 74 </table>
<table name="#mpConsume"> 74 82 88 94 100 </table>
<table name="#npcIds"> 14702 14703 14704 14705 14706 </table>
- <table name="#ench1expPenalty"> 0.28 0.26 0.24 0.22 0.2 0.18 0.16 0.14 0.12 0.1 0.08 0.06 0.04 0.02 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 </table>
+ <table name="#ench1expPenalty"> 0.72 0.74 0.76 0.78 0.8 0.82 0.84 0.86 0.88 0.9 0.92 0.94 0.96 0.98 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 </table>
<table name="#enchNpcIds"> 14707 14708 14709 14710 14711 14712 14713 14714 14715 14716 14717 14718 14719 14720 14721 14722 14723 14724 14725 14726 14727 14728 14729 14730 14731 14732 14733 14734 14735 14736 </table>
<set name="hitTime" val="6000" />
<set name="icon" val="icon.skill0301" />
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="5" />
<set name="itemConsumeId" val="1458" />
- <set name="itemConsumeIdOT" val="1458" />
- <set name="itemConsumeSteps" val="4" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="1200000" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="expPenalty" val="0.3" /> <!-- 30 percent of acquired Exp will be consumed. -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="expPenalty" val="#ench1expPenalty" />
- <enchant1 name="npcId" val="#enchNpcIds" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="1458" consumeItemCount="5" />
+ <param lifeTime="1200" />
+ <param expMultiplier="0.7" />
+ </effect>
+ </for>
+ <for>
+ <effect name="Summon">
+ <param npcId="#enchNpcIds" />
+ <param consumeItemId="1458" consumeItemCount="5" />
+ <param lifeTime="1200" />
+ <param expMultiplier="#ench1expPenalty" />
+ </effect>
+ </for>
</skill>
<skill id="302" levels="9" name="Spoil Festival" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<!-- Confirmed CT2.5 -->
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
index 26d8448fe1..e19ede5d9f 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
@@ -1695,25 +1695,30 @@
<set name="icon" val="icon.skill0448" />
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="itemConsumeCount" val="27" />
- <set name="itemConsumeCountOT" val="13" />
<set name="itemConsumeId" val="1461" />
- <set name="itemConsumeIdOT" val="2132" />
<set name="itemConsumeSteps" val="60" />
<set name="magicLvl" val="68" />
<set name="mpInitialConsume" val="530" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="1000" />
- <set name="summonTotalLifeTime" val="1200000" />
- <set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="npcId" val="14839" />
- <enchant1 name="npcId" val="#ench1npcId" />
+ <set name="targetType" val="SELF" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="14839" />
+ <param consumeItemId="2132" consumeItemCount="13" />
+ <param lifeTime="1200" />
+ </effect>
+ </for>
+ <for>
+ <effect name="Summon">
+ <param npcId="#ench1npcId" />
+ <param consumeItemId="2132" consumeItemCount="13" />
+ <param lifeTime="1200" />
+ </effect>
+ </for>
</skill>
<skill id="449" levels="4" name="Summon Attractive Cubic" enchantGroup1="2">
<!-- Confirmed CT2.5 -->
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
index 671241d5f8..6994277c21 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
@@ -288,24 +288,24 @@
<set name="icon" val="icon.skill_transform_etc" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="2" />
- <set name="itemConsumeCountOT" val="1" />
<set name="itemConsumeId" val="1461" />
- <set name="itemConsumeIdOT" val="1461" />
- <set name="itemConsumeSteps" val="4" />
<set name="magicLvl" val="80" />
<set name="mpConsume" val="117" />
<set name="mpInitialConsume" val="28" />
- <set name="npcId" val="14870" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
<set name="targetType" val="SELF" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="14870" />
+ <param consumeItemId="1461" consumeItemCount="1" />
+ <param lifeTime="3600" />
+ <param expMultiplier="0.7" />
+ </effect>
+ </for>
</skill>
<skill id="711" levels="1" name="Divine Summoner Transfer Pain">
<set name="abnormalVisualEffect" val="NONE" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
index f84a309442..f8d9328ce3 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
@@ -313,24 +313,22 @@
<set name="icon" val="icon.skill0912" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="2" />
- <set name="itemConsumeCountOT" val="1" />
<set name="itemConsumeId" val="1461" />
- <set name="itemConsumeIdOT" val="1461" />
- <set name="itemConsumeSteps" val="4" />
<set name="magicLvl" val="81" />
<set name="mpConsume" val="145" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="45000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="npcId" val="14918" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="14918" />
+ <param consumeItemId="1461" consumeItemCount="1" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
</skill>
<skill id="913" levels="1" name="Deflect Magic">
<set name="abnormalLvl" val="1" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml
index 39119c8ccc..7fc32a6133 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml
@@ -238,34 +238,35 @@
<table name="#hitTime"> 15000 15000 15000 15000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 </table>
<table name="#itemConsumeCount"> 1 1 2 2 7 1 1 4 5 6 11 12 2 3 4 4 9 10 </table>
<table name="#itemConsumeCountOT"> 0 0 0 0 0 1 1 1 1 1 1 1 2 2 2 2 2 2 </table>
- <table name="#itemConsumeSteps"> 0 0 0 0 0 14 14 14 14 14 14 14 14 14 14 14 14 14 </table>
<table name="#npcIds"> 14111 14112 14113 14114 14115 14116 14117 14118 14119 14120 14121 14122 14123 14124 14125 14126 14127 14128 </table>
- <table name="#summonTotalLifeTime"> 1200000 1200000 1200000 1200000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 </table>
+ <table name="#summonLifeTime"> 1200 1200 1200 1200 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 </table>
<table name="#enchNpcId"> 14129 14130 14131 14132 14133 14134 14135 14136 14137 14138 14139 14140 14141 14142 14143 14144 14145 14146 14147 14148 14149 14150 14151 14152 14153 14154 14155 14156 14157 14158 </table>
<set name="hitTime" val="#hitTime" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="#itemConsumeSteps" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="#reuseDelay" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="#summonTotalLifeTime" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="#summonLifeTime" />
+ </effect>
+ </for>
+ <for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="3031" consumeItemCount="2" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
</skill>
<skill id="1126" levels="34" name="Servitor Recharge" enchantGroup1="2" enchantGroup2="2">
<table name="#amount"> 41 44 49 52 57 60 66 70 73 77 81 86 90 94 98 102 104 106 108 110 113 115 116 118 120 122 124 126 128 129 131 133 134 136 </table>
@@ -344,33 +345,34 @@
<table name="#hitTime"> 15000 15000 15000 15000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 </table>
<table name="#itemConsumeCount"> 1 1 2 2 7 1 1 4 5 6 11 12 2 3 4 4 9 10 </table>
<table name="#itemConsumeCountOT"> 0 0 0 0 0 1 1 1 1 1 1 1 2 2 2 2 2 2 </table>
- <table name="#itemConsumeSteps"> 0 0 0 0 0 14 14 14 14 14 14 14 14 14 14 14 14 14 </table>
<table name="#npcIds"> 14479 14480 14481 14482 14483 14484 14485 14486 14487 14488 14489 14490 14491 14492 14493 14494 14495 14496 </table>
- <table name="#summonTotalLifeTime"> 1200000 1200000 1200000 1200000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 </table>
+ <table name="#summonLifeTime"> 1200 1200 1200 1200 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 </table>
<set name="hitTime" val="#hitTime" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="#itemConsumeSteps" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="#reuseDelay" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="#summonTotalLifeTime" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="#summonLifeTime" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="3031" consumeItemCount="2" />
+ <param lifeTime="3600" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1129" levels="7" name="Summon Reanimated Man" enchantGroup1="1">
<table name="#itemConsumeCount"> 11 13 6 9 9 6 9 </table>
@@ -384,29 +386,31 @@
<!-- set name="castRange" val="40" / -->
<!-- set name="effectRange" val="400" / -->
<set name="hitTime" val="15000" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="#itemConsumeSteps" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="3031" consumeItemCount="2" />
+ <param lifeTime="3600" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1139" levels="2" name="Servitor Magic Shield" enchantGroup1="1" enchantGroup2="1">
<table name="#abnormalLvls"> 2 3 </table>
@@ -730,28 +734,31 @@
<!-- set name="castRange" val="40" / -->
<!-- set name="effectRange" val="400" / -->
<set name="hitTime" val="15000" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="1" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeSteps" val="0" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="expPenalty" val="0.9" /> <!-- 90 percent of acquired Exp will be consumed. -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param lifeTime="3600" />
+ <param expMultiplier="0.1" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param lifeTime="3600" />
+ <param expMultiplier="0.1" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1155" levels="15" name="Corpse Burst" enchantGroup1="2" enchantGroup2="2">
<table name="#effectPoints"> -219 -229 -239 -248 -257 -266 -275 -283 -291 -299 -306 -312 -318 -323 -328 </table>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml
index 373c6744f7..fa8008f95d 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml
@@ -594,33 +594,36 @@
<table name="#mpInitialConsume"> 8 9 11 12 14 16 18 19 21 22 22 23 24 25 26 26 27 28 </table>
<table name="#npcIds"> 14159 14160 14161 14162 14163 14164 14165 14166 14167 14168 14169 14170 14171 14172 14173 14174 14175 14176 </table>
<table name="#reuseDelay"> 5400000 5400000 5400000 5400000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 </table>
- <table name="#summonTotalLifeTime"> 1200000 1200000 1200000 1200000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 </table>
+ <table name="#summonLifeTime"> 1200 1200 1200 1200 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 </table>
<table name="#enchNpcId"> 14177 14178 14179 14180 14181 14182 14183 14184 14185 14186 14187 14188 14189 14190 14191 14192 14193 14194 14195 14196 14197 14198 14199 14200 14201 14202 14203 14204 14205 14206 </table>
<set name="hitTime" val="#hitTime" />
<set name="icon" val="icon.skill1225" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="1" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeSteps" val="0" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="#reuseDelay" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="#summonTotalLifeTime" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="expPenalty" val="0.9" /> <!-- Consumes 90 percent of acquired Exp -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param lifeTime="#summonLifeTime" />
+ <param expMultiplier="0.1" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param lifeTime="3600" />
+ <param expMultiplier="0.1" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1226" levels="18" name="Summon Boxer the Unicorn" enchantGroup1="1">
<table name="#hitTime"> 15000 15000 15000 15000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 </table> <!-- H5 hitTime -->
@@ -632,34 +635,36 @@
<table name="#mpInitialConsume"> 8 9 11 12 14 16 18 19 21 22 22 23 24 25 26 26 27 28 </table>
<table name="#npcIds"> 14295 14296 14297 14298 14299 14300 14301 14302 14303 14304 14305 14306 14307 14308 14309 14310 14311 14312 </table>
<table name="#reuseDelay"> 5400000 5400000 5400000 5400000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 </table>
- <table name="#summonTotalLifeTime"> 1200000 1200000 1200000 1200000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 </table>
+ <table name="#summonLifeTime"> 1200 1200 1200 1200 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 </table>
<table name="#enchNpcId"> 14313 14314 14315 14316 14317 14318 14319 14320 14321 14322 14323 14324 14325 14326 14327 14328 14329 14330 14331 14332 14333 14334 14335 14336 14337 14338 14339 14340 14341 14342 </table>
<set name="hitTime" val="#hitTime" />
<set name="icon" val="icon.skill1226" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="#itemConsumeSteps" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="#reuseDelay" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="#summonTotalLifeTime" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="#summonLifeTime" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="3031" consumeItemCount="2" />
+ <param lifeTime="3600" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1227" levels="18" name="Summon Mirage the Unicorn" enchantGroup1="1">
<table name="#hitTime"> 15000 15000 15000 15000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 </table> <!-- H5 hitTime -->
@@ -668,33 +673,36 @@
<table name="#mpInitialConsume"> 8 9 11 12 14 16 18 19 21 22 22 23 24 25 26 26 27 28 </table>
<table name="#npcIds"> 14343 14344 14345 14346 14347 14348 14349 14350 14351 14352 14353 14354 14355 14356 14357 14358 14359 14360 </table>
<table name="#reuseDelay"> 5400000 5400000 5400000 5400000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 </table>
- <table name="#summonTotalLifeTime"> 1200000 1200000 1200000 1200000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 </table>
+ <table name="#summonLifeTime"> 1200 1200 1200 1200 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 </table>
<table name="#enchNpcId"> 14361 14362 14363 14364 14365 14366 14367 14368 14369 14370 14371 14372 14373 14374 14375 14376 14377 14378 14379 14380 14381 14382 14383 14384 14385 14386 14387 14388 14389 14390 </table>
<set name="hitTime" val="#hitTime" />
<set name="icon" val="icon.skill1227" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="1" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeSteps" val="0" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="#reuseDelay" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="#summonTotalLifeTime" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="expPenalty" val="0.9" /> <!-- Consumes 90 percent of acquired Exp. -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param lifeTime="#summonLifeTime" />
+ <param expMultiplier="0.1" />
+ </effect>
+ </for>
+ <for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param lifeTime="3600" />
+ <param expMultiplier="0.1" />
+ </effect>
+ </for>
</skill>
<skill id="1228" levels="18" name="Summon Silhouette" enchantGroup1="1">
<table name="#hitTime"> 15000 15000 15000 15000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 6000 </table> <!-- H5 hitTime -->
@@ -703,33 +711,36 @@
<table name="#mpInitialConsume"> 8 9 11 12 14 16 18 19 21 22 22 23 24 25 26 26 27 28 </table>
<table name="#npcIds"> 14527 14528 14529 14530 14531 14532 14533 14534 14535 14536 14537 14538 14539 14540 14541 14542 14543 14544 </table>
<table name="#reuseDelay"> 5400000 5400000 5400000 5400000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 </table>
- <table name="#summonTotalLifeTime"> 1200000 1200000 1200000 1200000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 3600000 </table>
+ <table name="#summonLifeTime"> 1200 1200 1200 1200 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 3600 </table>
<table name="#enchNpcId"> 14545 14546 14547 14548 14549 14550 14551 14552 14553 14554 14555 14556 14557 14558 14559 14560 14561 14562 14563 14564 14565 14566 14567 14568 14569 14570 14571 14572 14573 14574 </table>
<set name="hitTime" val="#hitTime" />
<set name="icon" val="icon.skill1228" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="1" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeSteps" val="0" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="#reuseDelay" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="#summonTotalLifeTime" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="expPenalty" val="0.9" /> <!-- 90 percent of acquired Exp is consumed. -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param lifeTime="#summonLifeTime" />
+ <param expMultiplier="0.1" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param lifeTime="3600" />
+ <param expMultiplier="0.1" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1229" levels="18" name="Chant of Life" enchantGroup1="2" enchantGroup2="2">
<table name="#abnormalLvls"> 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 </table>
@@ -2509,31 +2520,34 @@
<table name="#enchNpcId"> 14221 14222 14223 14224 14225 14226 14227 14228 14229 14230 14231 14232 14233 14234 14235 14236 14237 14238 14239 14240 14241 14242 14243 14244 14245 14246 14247 14248 14249 14250 </table>
<set name="icon" val="icon.skill1276" />
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
<set name="itemConsumeSteps" val="14" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="reuseDelay" val="5000" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
<set name="targetType" val="SELF" />
<!-- H5 hitTime -->
<set name="hitTime" val="6000" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="operateType" val="A1" />
- <set name="skillType" val="SUMMON" />
- <!-- Summon-specific -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="3031" consumeItemCount="6" />
+ <param lifeTime="3600" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1277" levels="14" name="Summon Merrow the Unicorn" enchantGroup1="1">
<table name="#itemConsumeCount"> 1 1 1 2 2 2 1 1 2 2 1 1 2 2 </table>
@@ -2545,31 +2559,33 @@
<table name="#enchNpcId"> 14405 14406 14407 14408 14409 14410 14411 14412 14413 14414 14415 14416 14417 14418 14419 14420 14421 14422 14423 14424 14425 14426 14427 14428 14429 14430 14431 14432 14433 14434 </table>
<set name="icon" val="icon.skill1277" />
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="14" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="reuseDelay" val="5000" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
<set name="targetType" val="SELF" />
<!-- H5 hitTime -->
<set name="hitTime" val="6000" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="operateType" val="A1" />
- <set name="skillType" val="SUMMON" />
- <!-- Summon-specific -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="3031" consumeItemCount="6" />
+ <param lifeTime="3600" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1278" levels="14" name="Summon Soulless" enchantGroup1="1">
<table name="#itemConsumeCount"> 1 1 1 2 2 2 1 1 2 2 1 1 2 2 </table>
@@ -2581,31 +2597,33 @@
<table name="#enchNpcId"> 14589 14590 14591 14592 14593 14594 14595 14596 14597 14598 14599 14600 14601 14602 14603 14604 14605 14606 14607 14608 14609 14610 14611 14612 14613 14614 14615 14616 14617 14618 </table>
<set name="icon" val="icon.skill1278" />
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="14" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="reuseDelay" val="5000" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
<set name="targetType" val="SELF" />
<!-- H5 hitTime -->
<set name="hitTime" val="6000" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="operateType" val="A1" />
- <set name="skillType" val="SUMMON" />
- <!-- Summon-specific -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="3031" consumeItemCount="6" />
+ <param lifeTime="3600" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1279" levels="9" name="Summon Binding Cubic" enchantGroup1="2">
<!-- Confirmed CT2.5 -->
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
index cfb2e8ca92..e36409cf4d 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
@@ -735,32 +735,33 @@
<table name="#enchNpcId"> 14265 14266 14267 14268 14269 14270 14271 14272 14273 14274 14275 14276 14277 14278 14279 14280 14281 14282 14283 14284 14285 14286 14287 14288 14289 14290 14291 14292 14293 14294 </table>
<set name="icon" val="icon.skill1331" />
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="14" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
- <!-- should be consumed over 4 regular intervals -->
<set name="reuseDelay" val="5000" />
<set name="targetType" val="SELF" />
<!-- H5 hitTime -->
<set name="hitTime" val="6000" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="operateType" val="A1" />
- <set name="skillType" val="SUMMON" />
- <!-- Summon-specific -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="3031" consumeItemCount="6" />
+ <param lifeTime="3600" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1332" levels="10" name="Summon Unicorn Seraphim" enchantGroup1="1">
<table name="#itemConsumeCount"> 1 1 2 2 4 1 1 4 1 2 </table>
@@ -772,32 +773,33 @@
<table name="#enchNpcId"> 14449 14450 14451 14452 14453 14454 14455 14456 14457 14458 14459 14460 14461 14462 14463 14464 14465 14466 14467 14468 14469 14470 14471 14472 14473 14474 14475 14476 14477 14478 </table>
<set name="icon" val="icon.skill1332" />
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="14" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
- <!-- should be consumed over 4 regular intervals -->
<set name="reuseDelay" val="5000" />
<set name="targetType" val="SELF" />
<!-- H5 hitTime -->
<set name="hitTime" val="6000" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="operateType" val="A1" />
- <set name="skillType" val="SUMMON" />
- <!-- Summon-specific -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="3031" consumeItemCount="6" />
+ <param lifeTime="3600" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1333" levels="10" name="Summon Nightshade" enchantGroup1="1">
<table name="#itemConsumeCount"> 1 1 2 2 4 1 1 4 1 2 </table>
@@ -809,32 +811,33 @@
<table name="#enchNpcId"> 14633 14634 14635 14636 14637 14638 14639 14640 14641 14642 14643 14644 14645 14646 14647 14648 14649 14650 14651 14652 14653 14654 14655 14656 14657 14658 14659 14660 14661 14662 </table>
<set name="icon" val="icon.skill1333" />
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="14" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
- <!-- should be consumed over 4 regular intervals -->
<set name="reuseDelay" val="5000" />
<set name="targetType" val="SELF" />
<!-- H5 hitTime -->
<set name="hitTime" val="6000" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="operateType" val="A1" />
- <set name="skillType" val="SUMMON" />
- <!-- Summon-specific -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="3031" consumeItemCount="6" />
+ <param lifeTime="3600" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1334" levels="7" name="Summon Cursed Man" enchantGroup1="1">
<table name="#itemConsumeCount"> 3 5 12 1 2 3 4 </table>
@@ -846,33 +849,34 @@
<table name="#enchNpcId"> 14081 14082 14083 14084 14085 14086 14087 14088 14089 14090 14091 14092 14093 14094 14095 14096 14097 14098 14099 14100 14101 14102 14103 14104 14105 14106 14107 14108 14109 14110 </table>
<set name="icon" val="icon.skill1334" />
<set name="itemConsumeCount" val="#itemConsumeCount" />
- <set name="itemConsumeCountOT" val="#itemConsumeCountOT" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="4" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
- <!-- should be consumed over 4 regular intervals -->
<!-- set name="castRange" val="40" / -->
<!-- set name="effectRange" val="400" / -->
<set name="hitTime" val="15000" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="npcId" val="#npcIds" />
- <enchant1 name="npcId" val="#enchNpcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#enchNpcId" />
+ <param consumeItemId="3031" consumeItemCount="2" />
+ <param lifeTime="3600" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1335" levels="1" name="Balance Life">
<!-- Confirmed CT2.5 -->
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
index 911104f327..098fa24190 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
@@ -235,32 +235,35 @@
<table name="#enchMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
<set name="hitTime" val="6000" />
<set name="icon" val="icon.skill1406" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="4" />
- <set name="itemConsumeCountOT" val="11" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="14" />
<set name="magicLvl" val="79" />
<set name="mpConsume" val="115" />
<set name="mpInitialConsume" val="29" />
- <set name="npcId" val="14836" /> <!-- Summon specific -->
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
<set name="targetType" val="SELF" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
<enchant1 name="mpConsume" val="116" />
<enchant1 name="mpInitialConsume" val="29" />
- <enchant1 name="npcId" val="#ench1npcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="14836" />
+ <param consumeItemId="3031" consumeItemCount="11" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#ench1npcId" />
+ <param consumeItemId="3031" consumeItemCount="11" />
+ <param lifeTime="3600" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1407" levels="1" name="Summon Magnus the Unicorn" enchantGroup1="5">
<!-- Confirmed CT2.5 and Updated to H5 -->
@@ -268,32 +271,35 @@
<table name="#enchMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
<set name="hitTime" val="6000" />
<set name="icon" val="icon.skill1407" />
- <set name="inheritElementals" val="true" />
- <set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="4" />
- <set name="itemConsumeCountOT" val="11" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="14" />
<set name="magicLvl" val="79" />
<set name="mpConsume" val="115" />
<set name="mpInitialConsume" val="29" />
- <set name="npcId" val="14837" /> <!-- Summon specific -->
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
<set name="targetType" val="SELF" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
<enchant1 name="mpConsume" val="116" />
<enchant1 name="mpInitialConsume" val="29" />
- <enchant1 name="npcId" val="#ench1npcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="14837" />
+ <param consumeItemId="3031" consumeItemCount="11" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
+ <enchant1for>
+ <effect name="Summon">
+ <param npcId="#ench1npcId" />
+ <param consumeItemId="3031" consumeItemCount="11" />
+ <param lifeTime="3600" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1408" levels="1" name="Summon Spectral Lord" enchantGroup1="5">
<!-- Confirmed CT2.5 and Updated to H5 -->
@@ -305,28 +311,33 @@
<set name="inheritPercent" val="1.00" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="4" />
- <set name="itemConsumeCountOT" val="11" />
<set name="itemConsumeId" val="3031" />
- <set name="itemConsumeIdOT" val="3031" />
- <set name="itemConsumeSteps" val="14" />
<set name="magicLvl" val="79" />
<set name="mpConsume" val="115" />
<set name="mpInitialConsume" val="29" />
- <set name="npcId" val="14838" /> <!-- Summon specific -->
<set name="operateType" val="A1" />
<set name="reuseDelay" val="5000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="3600000" />
<set name="targetType" val="SELF" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
<enchant1 name="mpConsume" val="116" />
<enchant1 name="mpInitialConsume" val="29" />
- <enchant1 name="npcId" val="#ench1npcId" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="14838" />
+ <param consumeItemId="3031" consumeItemCount="11" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
+ <for>
+ <effect name="Summon">
+ <param npcId="#ench1npcId" />
+ <param consumeItemId="3031" consumeItemCount="11" />
+ <param lifeTime="3600" />
+ </effect>
+ </for>
</skill>
<skill id="1409" levels="1" name="Cleanse">
<set name="castRange" val="600" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml
index b663a4a4fa..aea61e3a0d 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml
@@ -298,63 +298,60 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="8" />
<set name="itemConsumeId" val="1458" />
- <set name="itemConsumeSteps" val="0" />
<set name="magicLvl" val="1" />
<set name="mpConsume" val="3" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="4000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="1200000" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="npcId" val="20150" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="20150" />
+ <param lifeTime="1200" />
+ </effect>
+ </for>
</skill>
<skill id="7031" levels="1" name="Summon Skeleton Royal Guard">
<set name="hitTime" val="4000" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="8" />
<set name="itemConsumeId" val="1458" />
- <set name="itemConsumeSteps" val="0" />
<set name="magicLvl" val="1" />
<set name="mpConsume" val="3" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="4000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="1200000" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="npcId" val="20169" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="20169" />
+ <param lifeTime="1200" />
+ </effect>
+ </for>
</skill>
<skill id="7032" levels="1" name="Summon Hunter Gargoyle">
<set name="hitTime" val="4000" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="itemConsumeCount" val="8" />
<set name="itemConsumeId" val="1458" />
- <set name="itemConsumeSteps" val="0" />
<set name="magicLvl" val="1" />
<set name="mpConsume" val="3" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="4000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="1200000" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <set name="npcId" val="20241" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="20241" />
+ <param lifeTime="1200" />
+ </effect>
+ </for>
</skill>
<skill id="7033" levels="1" name="not_used">
<set name="magicLvl" val="1" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml
index fab606767f..0c878d6ca9 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml
@@ -1139,6 +1139,7 @@
<set name="targetType" val="NONE" />
</skill>
<skill id="8250" levels="2" name="Summon Tigress">
+ <table name="#npcIds"> 14916 14917 </table>
<set name="hitTime" val="15000" />
<set name="icon" val="icon.skill0283" />
<set name="isMagic" val="2" /> <!-- Static Skill -->
@@ -1146,18 +1147,17 @@
<set name="mpConsume" val="117" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="20000" />
- <set name="skillType" val="SUMMON" />
- <set name="summonTimeLostActive" val="1000" />
- <set name="summonTimeLostIdle" val="500" />
- <set name="summonTotalLifeTime" val="1200000" />
<set name="targetType" val="SELF" />
- <!-- Summon-specific -->
- <table name="#npcIds"> 14916 14917 </table>
<set name="magicLvl" val="63" />
- <set name="npcId" val="#npcIds" />
<cond>
<player canSummon="true" />
</cond>
+ <for>
+ <effect name="Summon">
+ <param npcId="#npcIds" />
+ <param lifeTime="1200" />
+ </effect>
+ </for>
</skill>
<skill id="8251" levels="1" name="Collection Agathion Release Seal">
<!-- Confirmed CT2.5 -->
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml
index d4fc1e0246..18676f420e 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml
@@ -124,11 +124,8 @@
<set name="itemConsumeCount" val="1" />
<set name="itemConsumeId" val="20707" />
<set name="magicLvl" val="1" />
- <set name="npcDistance" val="40" />
- <set name="npcId" val="20" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="12000" />
- <set name="skillType" val="SUMMON" /> <!-- TODO: SUMMON_NPC_NEAR" -->
<set name="targetType" val="SELF" />
<cond msgId="113" addName="1">
<player active_skill_id="21120" />
@@ -139,6 +136,12 @@
<player weight="80" />
</and>
</cond>
+ <for>
+ <effect name="SummonNpc">
+ <param npcId="20" />
+ <param randomOffset="40" />
+ </effect>
+ </for>
</skill>
<skill id="22106" levels="1" name="Belldandy Summon Scroll (Event)">
<!-- Confirmed CT2.5 -->
@@ -147,11 +150,8 @@
<set name="itemConsumeCount" val="1" />
<set name="itemConsumeId" val="20707" />
<set name="magicLvl" val="1" />
- <set name="npcDistance" val="40" />
- <set name="npcId" val="21" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="12000" />
- <set name="skillType" val="SUMMON" /> <!-- TODO: SUMMON_NPC_NEAR" -->
<set name="targetType" val="SELF" />
<cond msgId="113" addName="1">
<player active_skill_id="21120" />
@@ -162,6 +162,12 @@
<player weight="80" />
</and>
</cond>
+ <for>
+ <effect name="SummonNpc">
+ <param npcId="21" />
+ <param randomOffset="40" />
+ </effect>
+ </for>
</skill>
<skill id="22107" levels="1" name="Skooldie Summon Scroll (Event)">
<!-- Confirmed CT2.5 -->
@@ -170,11 +176,8 @@
<set name="itemConsumeCount" val="1" />
<set name="itemConsumeId" val="20707" />
<set name="magicLvl" val="1" />
- <set name="npcDistance" val="40" />
- <set name="npcId" val="19" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="12000" />
- <set name="skillType" val="SUMMON" /> <!-- TODO: SUMMON_NPC_NEAR" -->
<set name="targetType" val="SELF" />
<cond msgId="113" addName="1">
<player active_skill_id="21120" />
@@ -185,6 +188,12 @@
<player weight="80" />
</and>
</cond>
+ <for>
+ <effect name="SummonNpc">
+ <param npcId="19" />
+ <param randomOffset="40" />
+ </effect>
+ </for>
</skill>
<skill id="22108" levels="1" name="Halloween Toy Box">
<!-- Confirmed CT2.5 -->
--
GitLab