Removed lifetime from summons.
This commit is contained in:
parent
1fa5a70d60
commit
97b4148a7d
@ -54,7 +54,7 @@ public final class Summon extends AbstractEffect
|
||||
_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) > 0 ? params.getInt("lifeTime", 3600) * 1000 : -1;
|
||||
_lifeTime = params.getInt("lifeTime", 0) > 0 ? params.getInt("lifeTime") * 1000 : -1; // Classic change.
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -90,7 +90,7 @@ public final class Summon extends AbstractEffect
|
||||
summon.setTitle(effected.getName());
|
||||
summon.setReferenceSkill(skill.getId());
|
||||
summon.setExpMultiplier(_expMultiplier);
|
||||
summon.setLifeTime(_lifeTime);
|
||||
summon.setLifeTime(_lifeTime <= 0 ? Integer.MAX_VALUE : _lifeTime); // Classic hack. Resummon upon entering game.
|
||||
summon.setItemConsume(_consumeItem);
|
||||
summon.setItemConsumeInterval(consumeItemInterval);
|
||||
|
||||
|
@ -6897,7 +6897,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14768</npcId> <!-- Wild Hog Cannon -->
|
||||
<lifeTime>1200</lifeTime>
|
||||
<consumeItemId>2132</consumeItemId> <!-- Gemstone (B-grade) -->
|
||||
<consumeItemCount>20</consumeItemCount>
|
||||
</effect>
|
||||
|
@ -44,7 +44,6 @@
|
||||
<value level="4">14705</value>
|
||||
<value level="5">14706</value>
|
||||
</npcId>
|
||||
<lifeTime>1200</lifeTime>
|
||||
<consumeItemId>1458</consumeItemId> <!-- Crystal (D-grade) -->
|
||||
<consumeItemCount>5</consumeItemCount>
|
||||
<expMultiplier>0.7</expMultiplier>
|
||||
|
@ -3044,7 +3044,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14839</npcId> <!-- Swoop Cannon -->
|
||||
<lifeTime>1200</lifeTime>
|
||||
<consumeItemId>2132</consumeItemId> <!-- Gemstone (B-grade) -->
|
||||
<consumeItemCount>13</consumeItemCount>
|
||||
</effect>
|
||||
|
@ -560,7 +560,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14870</npcId> <!-- Divine Beast -->
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>1461</consumeItemId> <!-- Crystal (A-grade) -->
|
||||
<consumeItemCount>1</consumeItemCount>
|
||||
<expMultiplier>0.7</expMultiplier>
|
||||
|
@ -854,7 +854,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14918</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>1461</consumeItemId> <!-- Crystal (A-grade) -->
|
||||
<consumeItemCount>1</consumeItemCount>
|
||||
</effect>
|
||||
|
@ -1172,7 +1172,6 @@
|
||||
<value level="13">14263</value>
|
||||
<value level="14">14264</value>
|
||||
</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
|
||||
<consumeItemCount>
|
||||
<value level="1">2</value>
|
||||
@ -1271,7 +1270,6 @@
|
||||
<value level="13">14447</value>
|
||||
<value level="14">14448</value>
|
||||
</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
|
||||
<consumeItemCount>
|
||||
<value level="1">2</value>
|
||||
@ -1370,7 +1368,6 @@
|
||||
<value level="13">14631</value>
|
||||
<value level="14">14632</value>
|
||||
</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
|
||||
<consumeItemCount>
|
||||
<value level="1">2</value>
|
||||
|
@ -54,7 +54,7 @@ public final class Summon extends AbstractEffect
|
||||
_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) > 0 ? params.getInt("lifeTime", 3600) * 1000 : -1;
|
||||
_lifeTime = params.getInt("lifeTime", 0) > 0 ? params.getInt("lifeTime") * 1000 : -1; // Classic change.
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -90,7 +90,7 @@ public final class Summon extends AbstractEffect
|
||||
summon.setTitle(effected.getName());
|
||||
summon.setReferenceSkill(skill.getId());
|
||||
summon.setExpMultiplier(_expMultiplier);
|
||||
summon.setLifeTime(_lifeTime);
|
||||
summon.setLifeTime(_lifeTime <= 0 ? Integer.MAX_VALUE : _lifeTime); // Classic hack. Resummon upon entering game.
|
||||
summon.setItemConsume(_consumeItem);
|
||||
summon.setItemConsumeInterval(consumeItemInterval);
|
||||
|
||||
|
@ -6897,7 +6897,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14768</npcId> <!-- Wild Hog Cannon -->
|
||||
<lifeTime>1200</lifeTime>
|
||||
<consumeItemId>2132</consumeItemId> <!-- Gemstone (B-grade) -->
|
||||
<consumeItemCount>20</consumeItemCount>
|
||||
</effect>
|
||||
|
@ -44,7 +44,6 @@
|
||||
<value level="4">14705</value>
|
||||
<value level="5">14706</value>
|
||||
</npcId>
|
||||
<lifeTime>1200</lifeTime>
|
||||
<consumeItemId>1458</consumeItemId> <!-- Crystal (D-grade) -->
|
||||
<consumeItemCount>5</consumeItemCount>
|
||||
<expMultiplier>0.7</expMultiplier>
|
||||
|
@ -3044,7 +3044,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14839</npcId> <!-- Swoop Cannon -->
|
||||
<lifeTime>1200</lifeTime>
|
||||
<consumeItemId>2132</consumeItemId> <!-- Gemstone (B-grade) -->
|
||||
<consumeItemCount>13</consumeItemCount>
|
||||
</effect>
|
||||
|
@ -560,7 +560,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14870</npcId> <!-- Divine Beast -->
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>1461</consumeItemId> <!-- Crystal (A-grade) -->
|
||||
<consumeItemCount>1</consumeItemCount>
|
||||
<expMultiplier>0.7</expMultiplier>
|
||||
|
@ -854,7 +854,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14918</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>1461</consumeItemId> <!-- Crystal (A-grade) -->
|
||||
<consumeItemCount>1</consumeItemCount>
|
||||
</effect>
|
||||
|
@ -1172,7 +1172,6 @@
|
||||
<value level="13">14263</value>
|
||||
<value level="14">14264</value>
|
||||
</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
|
||||
<consumeItemCount>
|
||||
<value level="1">2</value>
|
||||
@ -1271,7 +1270,6 @@
|
||||
<value level="13">14447</value>
|
||||
<value level="14">14448</value>
|
||||
</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
|
||||
<consumeItemCount>
|
||||
<value level="1">2</value>
|
||||
@ -1370,7 +1368,6 @@
|
||||
<value level="13">14631</value>
|
||||
<value level="14">14632</value>
|
||||
</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
|
||||
<consumeItemCount>
|
||||
<value level="1">2</value>
|
||||
|
@ -54,7 +54,7 @@ public final class Summon extends AbstractEffect
|
||||
_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) > 0 ? params.getInt("lifeTime", 3600) * 1000 : -1;
|
||||
_lifeTime = params.getInt("lifeTime", 0) > 0 ? params.getInt("lifeTime") * 1000 : -1; // Classic change.
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -90,7 +90,7 @@ public final class Summon extends AbstractEffect
|
||||
summon.setTitle(effected.getName());
|
||||
summon.setReferenceSkill(skill.getId());
|
||||
summon.setExpMultiplier(_expMultiplier);
|
||||
summon.setLifeTime(_lifeTime);
|
||||
summon.setLifeTime(_lifeTime <= 0 ? Integer.MAX_VALUE : _lifeTime); // Classic hack. Resummon upon entering game.
|
||||
summon.setItemConsume(_consumeItem);
|
||||
summon.setItemConsumeInterval(consumeItemInterval);
|
||||
|
||||
|
@ -7405,7 +7405,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14768</npcId> <!-- Wild Hog Cannon -->
|
||||
<lifeTime>1200</lifeTime>
|
||||
<consumeItemId>2132</consumeItemId> <!-- Gemstone (B-grade) -->
|
||||
<consumeItemCount>20</consumeItemCount>
|
||||
</effect>
|
||||
|
@ -44,7 +44,6 @@
|
||||
<value level="4">14705</value>
|
||||
<value level="5">14706</value>
|
||||
</npcId>
|
||||
<lifeTime>1200</lifeTime>
|
||||
<consumeItemId>1458</consumeItemId> <!-- Crystal (D-grade) -->
|
||||
<consumeItemCount>5</consumeItemCount>
|
||||
<expMultiplier>0.7</expMultiplier>
|
||||
|
@ -2745,7 +2745,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14839</npcId> <!-- Swoop Cannon -->
|
||||
<lifeTime>1200</lifeTime>
|
||||
<consumeItemId>2132</consumeItemId> <!-- Gemstone (B-grade) -->
|
||||
<consumeItemCount>13</consumeItemCount>
|
||||
</effect>
|
||||
|
@ -560,7 +560,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14870</npcId> <!-- Divine Beast -->
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>1461</consumeItemId> <!-- Crystal (A-grade) -->
|
||||
<consumeItemCount>1</consumeItemCount>
|
||||
<expMultiplier>0.7</expMultiplier>
|
||||
|
@ -854,7 +854,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14918</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>1461</consumeItemId> <!-- Crystal (A-grade) -->
|
||||
<consumeItemCount>1</consumeItemCount>
|
||||
</effect>
|
||||
|
@ -1172,7 +1172,6 @@
|
||||
<value level="13">14263</value>
|
||||
<value level="14">14264</value>
|
||||
</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
|
||||
<consumeItemCount>
|
||||
<value level="1">2</value>
|
||||
@ -1271,7 +1270,6 @@
|
||||
<value level="13">14447</value>
|
||||
<value level="14">14448</value>
|
||||
</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
|
||||
<consumeItemCount>
|
||||
<value level="1">2</value>
|
||||
@ -1370,7 +1368,6 @@
|
||||
<value level="13">14631</value>
|
||||
<value level="14">14632</value>
|
||||
</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
|
||||
<consumeItemCount>
|
||||
<value level="1">2</value>
|
||||
|
@ -54,7 +54,7 @@ public final class Summon extends AbstractEffect
|
||||
_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) > 0 ? params.getInt("lifeTime", 3600) * 1000 : -1;
|
||||
_lifeTime = params.getInt("lifeTime", 0) > 0 ? params.getInt("lifeTime") * 1000 : -1; // Classic change.
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -90,7 +90,7 @@ public final class Summon extends AbstractEffect
|
||||
summon.setTitle(effected.getName());
|
||||
summon.setReferenceSkill(skill.getId());
|
||||
summon.setExpMultiplier(_expMultiplier);
|
||||
summon.setLifeTime(_lifeTime);
|
||||
summon.setLifeTime(_lifeTime <= 0 ? Integer.MAX_VALUE : _lifeTime); // Classic hack. Resummon upon entering game.
|
||||
summon.setItemConsume(_consumeItem);
|
||||
summon.setItemConsumeInterval(consumeItemInterval);
|
||||
|
||||
|
@ -7397,7 +7397,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14768</npcId> <!-- Wild Hog Cannon -->
|
||||
<lifeTime>1200</lifeTime>
|
||||
<consumeItemId>2132</consumeItemId> <!-- Gemstone (B-grade) -->
|
||||
<consumeItemCount>20</consumeItemCount>
|
||||
</effect>
|
||||
|
@ -44,7 +44,6 @@
|
||||
<value level="4">14705</value>
|
||||
<value level="5">14706</value>
|
||||
</npcId>
|
||||
<lifeTime>1200</lifeTime>
|
||||
<consumeItemId>1458</consumeItemId> <!-- Crystal (D-grade) -->
|
||||
<consumeItemCount>5</consumeItemCount>
|
||||
<expMultiplier>0.7</expMultiplier>
|
||||
|
@ -2754,7 +2754,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14839</npcId> <!-- Swoop Cannon -->
|
||||
<lifeTime>1200</lifeTime>
|
||||
<consumeItemId>2132</consumeItemId> <!-- Gemstone (B-grade) -->
|
||||
<consumeItemCount>13</consumeItemCount>
|
||||
</effect>
|
||||
|
@ -560,7 +560,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14870</npcId> <!-- Divine Beast -->
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>1461</consumeItemId> <!-- Crystal (A-grade) -->
|
||||
<consumeItemCount>1</consumeItemCount>
|
||||
<expMultiplier>0.7</expMultiplier>
|
||||
|
@ -854,7 +854,6 @@
|
||||
<effects>
|
||||
<effect name="Summon">
|
||||
<npcId>14918</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>1461</consumeItemId> <!-- Crystal (A-grade) -->
|
||||
<consumeItemCount>1</consumeItemCount>
|
||||
</effect>
|
||||
|
@ -1172,7 +1172,6 @@
|
||||
<value level="13">14263</value>
|
||||
<value level="14">14264</value>
|
||||
</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
|
||||
<consumeItemCount>
|
||||
<value level="1">2</value>
|
||||
@ -1271,7 +1270,6 @@
|
||||
<value level="13">14447</value>
|
||||
<value level="14">14448</value>
|
||||
</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
|
||||
<consumeItemCount>
|
||||
<value level="1">2</value>
|
||||
@ -1370,7 +1368,6 @@
|
||||
<value level="13">14631</value>
|
||||
<value level="14">14632</value>
|
||||
</npcId>
|
||||
<lifeTime>3600</lifeTime>
|
||||
<consumeItemId>3031</consumeItemId> <!-- Spirit Ore -->
|
||||
<consumeItemCount>
|
||||
<value level="1">2</value>
|
||||
|
Loading…
Reference in New Issue
Block a user