lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed summon points logic.

Browse Source
This commit is contained in:
MobiusDev
2015-05-11 14:22:36 +00:00
parent 033cc35f80
commit f3458d8c39
26 changed files with 169 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -110,6 +110,8 @@ public final class Summon extends AbstractEffect
{
player.addServitor(summon);
}
player.setUsedSummonPoints(player.getUsedSummonPoints() + _summonPoints);
summon.setShowSummonAnimation(true);
summon.setRunning();
summon.spawnMe();

7
trunk/dist/game/data/stats/skills/00000-00099.xml vendored
View File

@@ -573,7 +573,7 @@
<and>
<player canSummonServitor="true" />
<player canSummonSiegeGolem="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -581,6 +581,7 @@
<param npcId="14737" />
<param consumeItemId="2131" consumeItemCount="40" />
<param lifeTime="1200" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -588,6 +589,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="2131" consumeItemCount="40" />
<param lifeTime="1200" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -935,7 +937,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -944,6 +946,7 @@
<param consumeItemId="#itemConsumeId" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="1200" />
<param expMultiplier="0.85" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>

8
trunk/dist/game/data/stats/skills/00200-00299.xml vendored
View File

@@ -2497,7 +2497,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -2506,6 +2506,7 @@
<param consumeItemId="1459" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="1200" />
<param expMultiplier="0.85" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -2514,6 +2515,7 @@
<param consumeItemId="1459" consumeItemCount="4" />
<param lifeTime="1200" />
<param expMultiplier="#ench1expPenalty" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -3033,7 +3035,7 @@
<and>
<player canSummonServitor="true" />
<player canSummonSiegeGolem="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -3041,6 +3043,7 @@
<param npcId="14768" />
<param consumeItemId="2132" consumeItemCount="20" />
<param lifeTime="1200" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -3048,6 +3051,7 @@
<param npcId="#enchNpcIds" />
<param consumeItemId="2132" consumeItemCount="20" />
<param lifeTime="1200" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

4
trunk/dist/game/data/stats/skills/00300-00399.xml vendored
View File

@@ -20,7 +20,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -29,6 +29,7 @@
<param consumeItemId="1458" consumeItemCount="5" />
<param lifeTime="1200" />
<param expMultiplier="0.7" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -37,6 +38,7 @@
<param consumeItemId="1458" consumeItemCount="5" />
<param lifeTime="1200" />
<param expMultiplier="#ench1expPenalty" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

4
trunk/dist/game/data/stats/skills/00400-00499.xml vendored
View File

@@ -1760,7 +1760,7 @@
<and>
<player canSummonServitor="true" />
<player canSummonSiegeGolem="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -1768,6 +1768,7 @@
<param npcId="14839" />
<param consumeItemId="2132" consumeItemCount="13" />
<param lifeTime="1200" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -1775,6 +1776,7 @@
<param npcId="#ench1npcId" />
<param consumeItemId="2132" consumeItemCount="13" />
<param lifeTime="1200" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

3
trunk/dist/game/data/stats/skills/00700-00799.xml vendored
View File

@@ -320,7 +320,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -329,6 +329,7 @@
<param consumeItemId="1461" consumeItemCount="1" />
<param lifeTime="3600" />
<param expMultiplier="0.7" />
<param summonPoints="4" />
</effect>
</for>
</skill>

3
trunk/dist/game/data/stats/skills/00900-00999.xml vendored
View File

@@ -341,7 +341,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -349,6 +349,7 @@
<param npcId="14918" />
<param consumeItemId="1461" consumeItemCount="1" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
</skill>

16
trunk/dist/game/data/stats/skills/01100-01199.xml vendored
View File

@@ -270,7 +270,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -278,6 +278,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="#summonLifeTime" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -285,6 +286,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="2" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -390,7 +392,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -398,6 +400,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="#summonLifeTime" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -405,6 +408,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="2" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -430,7 +434,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -438,6 +442,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -445,6 +450,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="2" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -799,7 +805,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -807,6 +813,7 @@
<param npcId="#npcIds" />
<param lifeTime="3600" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -814,6 +821,7 @@
<param npcId="#enchNpcId" />
<param lifeTime="3600" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

28
trunk/dist/game/data/stats/skills/01200-01299.xml vendored
View File

@@ -651,7 +651,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -659,6 +659,7 @@
<param npcId="#npcIds" />
<param lifeTime="#summonLifeTime" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -666,6 +667,7 @@
<param npcId="#enchNpcId" />
<param lifeTime="3600" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -696,7 +698,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -704,6 +706,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="#summonLifeTime" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -711,6 +714,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="2" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -738,7 +742,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -746,6 +750,7 @@
<param npcId="#npcIds" />
<param lifeTime="#summonLifeTime" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -753,6 +758,7 @@
<param npcId="#enchNpcId" />
<param lifeTime="3600" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -780,7 +786,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -788,6 +794,7 @@
<param npcId="#npcIds" />
<param lifeTime="#summonLifeTime" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -795,6 +802,7 @@
<param npcId="#enchNpcId" />
<param lifeTime="3600" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -2699,7 +2707,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -2707,6 +2715,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -2714,6 +2723,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="6" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -2741,7 +2751,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -2749,6 +2759,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -2756,6 +2767,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="6" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -2783,7 +2795,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -2791,6 +2803,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -2798,6 +2811,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="6" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

16
trunk/dist/game/data/stats/skills/01300-01399.xml vendored
View File

@@ -795,7 +795,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -803,6 +803,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -810,6 +811,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="6" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -837,7 +839,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -845,6 +847,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -852,6 +855,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="6" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -879,7 +883,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -887,6 +891,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -894,6 +899,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="6" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -921,7 +927,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -929,6 +935,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -936,6 +943,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="2" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

12
trunk/dist/game/data/stats/skills/01400-01499.xml vendored
View File

@@ -269,7 +269,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -277,6 +277,7 @@
<param npcId="14836" />
<param consumeItemId="3031" consumeItemCount="11" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -284,6 +285,7 @@
<param npcId="#ench1npcId" />
<param consumeItemId="3031" consumeItemCount="11" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -309,7 +311,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -317,6 +319,7 @@
<param npcId="14837" />
<param consumeItemId="3031" consumeItemCount="11" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -324,6 +327,7 @@
<param npcId="#ench1npcId" />
<param consumeItemId="3031" consumeItemCount="11" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -351,7 +355,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -359,6 +363,7 @@
<param npcId="14838" />
<param consumeItemId="3031" consumeItemCount="11" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -366,6 +371,7 @@
<param npcId="#ench1npcId" />
<param consumeItemId="3031" consumeItemCount="11" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

2
trunk/dist/game/data_classic/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -110,6 +110,8 @@ public final class Summon extends AbstractEffect
{
player.addServitor(summon);
}
player.setUsedSummonPoints(player.getUsedSummonPoints() + _summonPoints);
summon.setShowSummonAnimation(true);
summon.setRunning();
summon.spawnMe();

8
trunk/dist/game/data_classic/stats/skills/00000-00099.xml vendored
View File

@@ -573,7 +573,7 @@
<and>
<player canSummonServitor="true" />
<player canSummonSiegeGolem="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -581,6 +581,7 @@
<param npcId="14737" />
<param consumeItemId="2131" consumeItemCount="40" />
<param lifeTime="1200" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -588,6 +589,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="2131" consumeItemCount="40" />
<param lifeTime="1200" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -935,7 +937,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -944,6 +946,7 @@
<param consumeItemId="#itemConsumeId" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="1200" />
<param expMultiplier="0.85" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -952,6 +955,7 @@
<param consumeItemId="1459" consumeItemCount="4" />
<param lifeTime="1200" />
<param expMultiplier="#ench1expPenalty" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

8
trunk/dist/game/data_classic/stats/skills/00200-00299.xml vendored
View File

@@ -2497,7 +2497,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -2506,6 +2506,7 @@
<param consumeItemId="1459" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="1200" />
<param expMultiplier="0.85" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -2514,6 +2515,7 @@
<param consumeItemId="1459" consumeItemCount="4" />
<param lifeTime="1200" />
<param expMultiplier="#ench1expPenalty" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -3033,7 +3035,7 @@
<and>
<player canSummonServitor="true" />
<player canSummonSiegeGolem="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -3041,6 +3043,7 @@
<param npcId="14768" />
<param consumeItemId="2132" consumeItemCount="20" />
<param lifeTime="1200" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -3048,6 +3051,7 @@
<param npcId="#enchNpcIds" />
<param consumeItemId="2132" consumeItemCount="20" />
<param lifeTime="1200" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

4
trunk/dist/game/data_classic/stats/skills/00300-00399.xml vendored
View File

@@ -20,7 +20,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -29,6 +29,7 @@
<param consumeItemId="1458" consumeItemCount="5" />
<param lifeTime="1200" />
<param expMultiplier="0.7" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -37,6 +38,7 @@
<param consumeItemId="1458" consumeItemCount="5" />
<param lifeTime="1200" />
<param expMultiplier="#ench1expPenalty" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

4
trunk/dist/game/data_classic/stats/skills/00400-00499.xml vendored
View File

@@ -1703,7 +1703,7 @@
<and>
<player canSummonServitor="true" />
<player canSummonSiegeGolem="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -1711,6 +1711,7 @@
<param npcId="14839" />
<param consumeItemId="2132" consumeItemCount="13" />
<param lifeTime="1200" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -1718,6 +1719,7 @@
<param npcId="#ench1npcId" />
<param consumeItemId="2132" consumeItemCount="13" />
<param lifeTime="1200" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

3
trunk/dist/game/data_classic/stats/skills/00700-00799.xml vendored
View File

@@ -320,7 +320,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -329,6 +329,7 @@
<param consumeItemId="1461" consumeItemCount="1" />
<param lifeTime="3600" />
<param expMultiplier="0.7" />
<param summonPoints="4" />
</effect>
</for>
</skill>

3
trunk/dist/game/data_classic/stats/skills/00900-00999.xml vendored
View File

@@ -341,7 +341,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -349,6 +349,7 @@
<param npcId="14918" />
<param consumeItemId="1461" consumeItemCount="1" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
</skill>

16
trunk/dist/game/data_classic/stats/skills/01100-01199.xml vendored
View File

@@ -270,7 +270,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -278,6 +278,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="#summonLifeTime" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -285,6 +286,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="2" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -390,7 +392,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -398,6 +400,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="#summonLifeTime" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -405,6 +408,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="2" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -430,7 +434,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -438,6 +442,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -445,6 +450,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="2" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -799,7 +805,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -807,6 +813,7 @@
<param npcId="#npcIds" />
<param lifeTime="3600" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -814,6 +821,7 @@
<param npcId="#enchNpcId" />
<param lifeTime="3600" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

28
trunk/dist/game/data_classic/stats/skills/01200-01299.xml vendored
View File

@@ -651,7 +651,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -659,6 +659,7 @@
<param npcId="#npcIds" />
<param lifeTime="#summonLifeTime" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -666,6 +667,7 @@
<param npcId="#enchNpcId" />
<param lifeTime="3600" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -696,7 +698,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -704,6 +706,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="#summonLifeTime" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -711,6 +714,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="2" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -738,7 +742,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -746,6 +750,7 @@
<param npcId="#npcIds" />
<param lifeTime="#summonLifeTime" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -753,6 +758,7 @@
<param npcId="#enchNpcId" />
<param lifeTime="3600" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -780,7 +786,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -788,6 +794,7 @@
<param npcId="#npcIds" />
<param lifeTime="#summonLifeTime" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -795,6 +802,7 @@
<param npcId="#enchNpcId" />
<param lifeTime="3600" />
<param expMultiplier="0.1" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -2699,7 +2707,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -2707,6 +2715,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -2714,6 +2723,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="6" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -2741,7 +2751,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -2749,6 +2759,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -2756,6 +2767,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="6" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -2783,7 +2795,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -2791,6 +2803,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -2798,6 +2811,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="6" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

16
trunk/dist/game/data_classic/stats/skills/01300-01399.xml vendored
View File

@@ -674,7 +674,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -682,6 +682,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -689,6 +690,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="6" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -716,7 +718,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -724,6 +726,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -731,6 +734,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="6" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -758,7 +762,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -766,6 +770,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -773,6 +778,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="6" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -800,7 +806,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -808,6 +814,7 @@
<param npcId="#npcIds" />
<param consumeItemId="3031" consumeItemCount="#itemConsumeCountOT" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -815,6 +822,7 @@
<param npcId="#enchNpcId" />
<param consumeItemId="3031" consumeItemCount="2" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

12
trunk/dist/game/data_classic/stats/skills/01400-01499.xml vendored
View File

@@ -269,7 +269,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -277,6 +277,7 @@
<param npcId="14836" />
<param consumeItemId="3031" consumeItemCount="11" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -284,6 +285,7 @@
<param npcId="#ench1npcId" />
<param consumeItemId="3031" consumeItemCount="11" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -309,7 +311,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -317,6 +319,7 @@
<param npcId="14837" />
<param consumeItemId="3031" consumeItemCount="11" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -324,6 +327,7 @@
<param npcId="#ench1npcId" />
<param consumeItemId="3031" consumeItemCount="11" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>
@@ -351,7 +355,7 @@
<cond>
<and>
<player canSummonServitor="true" />
<player hasFreeSummonPoints="0" />
<player hasFreeSummonPoints="4" />
</and>
</cond>
<for>
@@ -359,6 +363,7 @@
<param npcId="14838" />
<param consumeItemId="3031" consumeItemCount="11" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</for>
<enchant1for>
@@ -366,6 +371,7 @@
<param npcId="#ench1npcId" />
<param consumeItemId="3031" consumeItemCount="11" />
<param lifeTime="3600" />
<param summonPoints="4" />
</effect>
</enchant1for>
</skill>

2
trunk/java/com/l2jserver/gameserver/model/actor/L2Summon.java
View File

@@ -392,6 +392,7 @@ public abstract class L2Summon extends L2Playable
{
party.broadcastToPartyMembers(owner, new ExPartyPetWindowDelete(this));
}
owner.setUsedSummonPoints(owner.getUsedSummonPoints() - _summonPoints);
}
// pet will be deleted along with all his items
@@ -473,6 +474,7 @@ public abstract class L2Summon extends L2Playable
owner.disableAutoShot(itemId);
}
}
owner.setUsedSummonPoints(owner.getUsedSummonPoints() - _summonPoints);
}
}
}

13
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -609,6 +609,7 @@ public final class L2PcInstance extends L2Playable
private L2Summon _pet = null;
/** Servitors of the L2PcInstance */
private volatile Map<Integer, L2Summon> _servitors = null;
private int _usedSummonPoints = 0;
/** The L2Decoy of the L2PcInstance */
private L2Decoy _decoy = null;
/** The L2Trap of the L2PcInstance */
@@ -15036,15 +15037,21 @@ public final class L2PcInstance extends L2Playable
*/
public int getMaxSummonPoints()
{
return (int) getStat().calcStat(Stats.MAX_SUMMON_POINTS, 0, null, null);
// return (int) getStat().calcStat(Stats.MAX_SUMMON_POINTS, 0, null, null);
return 4;
}
/**
* @return the amount of points that player used
*/
public int getSummonPoints()
public int getUsedSummonPoints()
{
return getServitors().values().stream().mapToInt(L2Summon::getSummonPoints).sum();
return _usedSummonPoints;
}
public void setUsedSummonPoints(int points)
{
_usedSummonPoints = points;
}
/**

2
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java
View File

@@ -53,7 +53,7 @@ public class ConditionPlayerHasFreeSummonPoints extends Condition
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THE_S1_SKILL_DUE_TO_INSUFFICIENT_SUMMON_POINTS);
canSummon = false;
}
else if ((player.getSummonPoints() + _summonPoints) > player.getMaxSummonPoints())
else if ((player.getUsedSummonPoints() + _summonPoints) > player.getMaxSummonPoints())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_CANNOT_USE_THE_S1_SKILL_DUE_TO_INSUFFICIENT_SUMMON_POINTS);
sm.addSkillName(skill);

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/PetInfo.java
View File

@@ -175,7 +175,7 @@ public class PetInfo extends L2GameServerPacket
writeD(0x00); // TODO: Find me
writeD(_summon.getFormId()); // Transformation ID - Confirmed
writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points
writeC(_summon.getOwner().getUsedSummonPoints()); // Used Summon Points
writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
final Set<AbnormalVisualEffect> aves = _summon.getCurrentAbnormalVisualEffects();