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

Various potion item related improvements.

Browse Source 
Contributed by facab.
This commit is contained in:
MobiusDev
2019-02-05 06:17:16 +00:00
parent 4c958b1e71
commit fe0577b69b
60 changed files with 963 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java vendored
View File

@@ -64,7 +64,7 @@ public final class Cp extends AbstractEffect
}
case PER:
{
amount = Math.min((effected.getCurrentCp() * _amount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp());
amount = Math.min((effected.getMaxCp() * _amount) / 100.0, effected.getMaxRecoverableCp() - effected.getCurrentCp());
break;
}
}

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java vendored
View File

@@ -64,7 +64,7 @@ public final class Hp extends AbstractEffect
}
case PER:
{
amount = Math.min((effected.getCurrentHp() * _amount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp());
amount = Math.min((effected.getMaxHp() * _amount) / 100.0, effected.getMaxRecoverableHp() - effected.getCurrentHp());
break;
}
}

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java vendored
View File

@@ -64,7 +64,7 @@ public final class Mp extends AbstractEffect
}
case PER:
{
amount = Math.min((effected.getCurrentMp() * _amount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp());
amount = Math.min((effected.getMaxMp() * _amount) / 100.0, effected.getMaxRecoverableMp() - effected.getCurrentMp());
break;
}
}

36
L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/23700-23799.xml vendored
View File

@@ -497,13 +497,17 @@
<set name="is_mailable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_dropable" val="false" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="is_private_storeable" val="true" />
<set name="is_freightable" val="true" />
<set name="etcitem_type" val="POTION" />
<set name="is_stackable" val="true" />
<set name="reuse_delay" val="3600000" />
<set name="default_action" val="SKILL_REDUCE" />
<set name="etcitem_type" val="POTION" />
<set name="handler" val="ItemSkills" />
<set name="is_stackable" val="true" />
<skills>
<skill id="21355" level="1" /> <!-- Erupting Vitality XP Potion -->
</skills>
</item>
<item id="23729" name="Erupting Vitality Replenishing Potion" type="EtcItem">
<!-- For 1 hr., Vitality Recovery +100%. -->
@@ -512,13 +516,17 @@
<set name="is_mailable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_dropable" val="false" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="is_private_storeable" val="true" />
<set name="is_freightable" val="true" />
<set name="etcitem_type" val="POTION" />
<set name="is_stackable" val="true" />
<set name="reuse_delay" val="3600000" />
<set name="default_action" val="SKILL_REDUCE" />
<set name="etcitem_type" val="POTION" />
<set name="handler" val="ItemSkills" />
<set name="is_stackable" val="true" />
<skills>
<skill id="21356" level="1" /> <!-- Erupting Vitality Replenishing Potion -->
</skills>
</item>
<item id="23730" name="Erupting Vitality Conservation Potion" type="EtcItem">
<!-- For 1 hr., Vitality Consumption -50%. -->
@@ -527,13 +535,17 @@
<set name="is_mailable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_dropable" val="false" />
<set name="is_sellable" val="false" />
<set name="is_commissionable" val="false" />
<set name="is_private_storeable" val="false" />
<set name="is_private_storeable" val="true" />
<set name="is_freightable" val="true" />
<set name="etcitem_type" val="POTION" />
<set name="is_stackable" val="true" />
<set name="reuse_delay" val="3600000" />
<set name="default_action" val="SKILL_REDUCE" />
<set name="etcitem_type" val="POTION" />
<set name="handler" val="ItemSkills" />
<set name="is_stackable" val="true" />
<skills>
<skill id="21357" level="1" /> <!-- Erupting Vitality Conservation Potion -->
</skills>
</item>
<item id="23731" name="Divine Scroll: Enchant Weapon (A-grade)" type="EtcItem">
<!-- 100% enchant success rate. Can be enchanted up to +4. When enchanted, increases P. Atk. by 4 for A-grade one-handed swords, one-handed blunts, one-handed staffs, daggers, spears, and other weapons. Increases P. Atk. by 5 for two-handed swords, two-handed blunts, two-handed staffs, dual daggers, dual swords, and fist weapons. Increases P. Atk. by 8 for bow weapons. Increases M. Atk. by 3 for all weapons. P. Atk./ M. Atk doubles starting at +4. -->

9
L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37000-37099.xml vendored
View File

@@ -133,6 +133,9 @@
<item id="37008" name="Strawberry Cake (HP)" type="EtcItem">
<!-- Restores HP by 50%. Cooldown is 2 min. -->
<set name="icon" val="BranchSys.icon.br_valentine_cake_3_i00" />
<set name="default_action" val="SKILL_REDUCE" />
<set name="immediate_effect" val="true" />
<set name="reuse_delay" val="120000" />
<set name="weight" val="2" />
<set name="is_stackable" val="true" />
<set name="is_sellable" val="false" />
@@ -146,6 +149,9 @@
<item id="37009" name="Blueberry Cake (MP)" type="EtcItem">
<!-- Restores MP by 20%. Cooldown is 2 min. -->
<set name="icon" val="BranchSys.icon.br_valentine_cake_2_i00" />
<set name="default_action" val="SKILL_REDUCE" />
<set name="immediate_effect" val="true" />
<set name="reuse_delay" val="120000" />
<set name="weight" val="2" />
<set name="is_sellable" val="false" />
<set name="etcitem_type" val="ELIXIR" />
@@ -158,6 +164,9 @@
<item id="37010" name="Cheese Cake (CP)" type="EtcItem">
<!-- Restores CP by 50%. Cooldown is 2 min. -->
<set name="icon" val="BranchSys.icon.br_valentine_cake_1_i00" />
<set name="default_action" val="SKILL_REDUCE" />
<set name="immediate_effect" val="true" />
<set name="reuse_delay" val="120000" />
<set name="weight" val="2" />
<set name="is_stackable" val="true" />
<set name="is_sellable" val="false" />

18
L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37500-37599.xml vendored
View File

@@ -740,6 +740,12 @@
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="POTION" />
<set name="is_stackable" val="true" />
<set name="default_action" val="SKILL_REDUCE" />
<set name="reuse_delay" val="60000" />
<set name="handler" val="ItemSkills" />
<skills>
<skill id="17119" level="1" /> <!-- Emperor's Vitality Tonic -->
</skills>
</item>
<item id="37561" name="Emperor's Vitality Tonic (Medium)" type="EtcItem">
<!-- Water of Vitality containing the strength of the lord. Recovers 2 of the 4 Vitality slots. Cooldown time is 1 min. Cannot be used in the Olympiad. No weekly usage limit. -->
@@ -748,6 +754,12 @@
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="POTION" />
<set name="is_stackable" val="true" />
<set name="default_action" val="SKILL_REDUCE" />
<set name="reuse_delay" val="60000" />
<set name="handler" val="ItemSkills" />
<skills>
<skill id="17120" level="1" /> <!-- Emperor's Vitality Tonic -->
</skills>
</item>
<item id="37562" name="Emperor's Vitality Tonic (Large)" type="EtcItem">
<!-- Water of Vitality containing the strength of the lord. Recovers 3 of the 4 Vitality slots. Cooldown time is 1 min. Cannot be used in the Olympiad. No weekly usage limit. -->
@@ -756,6 +768,12 @@
<set name="is_commissionable" val="false" />
<set name="etcitem_type" val="POTION" />
<set name="is_stackable" val="true" />
<set name="default_action" val="SKILL_REDUCE" />
<set name="reuse_delay" val="60000" />
<set name="handler" val="ItemSkills" />
<skills>
<skill id="17121" level="1" /> <!-- Emperor's Vitality Tonic -->
</skills>
</item>
<item id="37563" name="Emperor's Growth Scroll" type="EtcItem">
<!-- When used, the emperor's experience is infused so that the character's acquired XP and SP are increased by 30% for 1 hr. Cannot be used in the Olympiad. -->

76
L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml vendored
View File

@@ -104,18 +104,70 @@
<reuseDelay>5000</reuseDelay>
<isMagic>4</isMagic>
</skill>
<skill id="17119" toLevel="1" name="Emperor's Vitality Tonic">
<operateType>A1</operateType>
<reuseDelay>3600000</reuseDelay>
</skill>
<skill id="17120" toLevel="1" name="Emperor's Vitality Tonic (Medium)">
<operateType>A1</operateType>
<reuseDelay>3600000</reuseDelay>
</skill>
<skill id="17121" toLevel="1" name="Emperor's Special Vitality Tonic (3 bars)">
<operateType>A1</operateType>
<reuseDelay>3600000</reuseDelay>
</skill>
<skill id="17119" toLevel="1" name="Emperor's Vitality Tonic">
<isMagic>2</isMagic> <!-- Static Skill -->
<itemConsumeCount>1</itemConsumeCount>
<itemConsumeId>37560</itemConsumeId> <!-- Emperor's Vitality Tonic -->
<magicLvl>1</magicLvl>
<operateType>A1</operateType>
<reuseDelay>60000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate>
<specialLevel>-1</specialLevel>
<hitCancelTime>0</hitCancelTime>
<staticReuse>true</staticReuse>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
</conditions>
<effects>
<effect name="VitalityPointUp">
<value>35000</value>
</effect>
</effects>
</skill>
<skill id="17120" toLevel="1" name="Emperor's Vitality Tonic (Medium)">
<itemConsumeCount>1</itemConsumeCount>
<itemConsumeId>37561</itemConsumeId> <!-- Emperor's Vitality Tonic -->
<magicLvl>1</magicLvl>
<operateType>A1</operateType>
<reuseDelay>60000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate>
<specialLevel>-1</specialLevel>
<hitCancelTime>0</hitCancelTime>
<staticReuse>true</staticReuse>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
</conditions>
<effects>
<effect name="VitalityPointUp">
<value>70000</value>
</effect>
</effects>
</skill>
<skill id="17121" toLevel="1" name="Emperor's Special Vitality Tonic (3 bars)">
<itemConsumeCount>1</itemConsumeCount>
<itemConsumeId>37562</itemConsumeId> <!-- Emperor's Vitality Tonic -->
<magicLvl>1</magicLvl>
<operateType>A1</operateType>
<reuseDelay>60000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate>
<specialLevel>-1</specialLevel>
<hitCancelTime>0</hitCancelTime>
<staticReuse>true</staticReuse>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
</conditions>
<effects>
<effect name="VitalityPointUp">
<value>105000</value>
</effect>
</effects>
</skill>
<skill id="17122" toLevel="1" name="Returning Hero's Vitality Replenishing Juice">
<operateType>A1</operateType>
<reuseDelay>3600000</reuseDelay>

69
L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml vendored
View File

@@ -933,23 +933,30 @@
<skill id="21355" toLevel="1" name="Erupting Vitality XP Potion">
<!-- For 1 hr., Vitality Bonus +100%. Cooldown is 1 hr. -->
<icon>icon.etc_potion_red_i00</icon>
<itemConsumeCount>1</itemConsumeCount>
<itemConsumeId>23728</itemConsumeId> <!-- Erupting Vitality XP Potion -->
<operateType>A2</operateType>
<hitTime>3000</hitTime>
<reuseDelay>3600000</reuseDelay>
<abnormalType>VP_UP</abnormalType>
<basicProperty>NONE</basicProperty>
<magicCriticalRate>5</magicCriticalRate>
<specialLevel>-1</specialLevel>
<hitCancelTime>0</hitCancelTime>
<activateRate>0</activateRate>
<abnormalLvl>26</abnormalLvl>
<abnormalTime>300</abnormalTime>
<trait>ETC</trait>
<abnormalTime>3600</abnormalTime>
<irreplacableBuff>true</irreplacableBuff>
<blockActionUseSkill>true</blockActionUseSkill>
<staticReuse>true</staticReuse>
<abnormalVisualEffect>VP_UP</abnormalVisualEffect>
<isMagic>4</isMagic>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>26</level>
<hasAbnormal>false</hasAbnormal>
<affectType>CASTER</affectType>
</condition>
</conditions>
<effects>
<effect name="VitalityExpRate">
<amount>100</amount>
@@ -960,23 +967,30 @@
<skill id="21356" toLevel="1" name="Erupting Vitality Replenishing Potion">
<!-- For 1 hr., Vitality Recovery +100%. Cooldown is 1 hr. -->
<icon>icon.etc_potion_blue_i00</icon>
<itemConsumeCount>1</itemConsumeCount>
<itemConsumeId>23729</itemConsumeId> <!-- Erupting Vitality Replenishing Potion -->
<operateType>A2</operateType>
<hitTime>3000</hitTime>
<reuseDelay>3600000</reuseDelay>
<abnormalType>VP_UP</abnormalType>
<basicProperty>NONE</basicProperty>
<magicCriticalRate>5</magicCriticalRate>
<specialLevel>-1</specialLevel>
<hitCancelTime>0</hitCancelTime>
<activateRate>0</activateRate>
<abnormalLvl>26</abnormalLvl>
<abnormalTime>300</abnormalTime>
<trait>ETC</trait>
<abnormalTime>3600</abnormalTime>
<irreplacableBuff>true</irreplacableBuff>
<blockActionUseSkill>true</blockActionUseSkill>
<staticReuse>true</staticReuse>
<abnormalVisualEffect>VP_UP</abnormalVisualEffect>
<isMagic>4</isMagic>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>26</level>
<hasAbnormal>false</hasAbnormal>
<affectType>CASTER</affectType>
</condition>
</conditions>
<effects>
<effect name="VitalityPointsRate">
<amount>-100</amount>
@@ -987,23 +1001,30 @@
<skill id="21357" toLevel="1" name="Erupting Vitality Conservation Potion">
<!-- For 1 hr., Vitality Consumption -50%. Cooldown is 1 hr. -->
<icon>icon.etc_potion_yellow_i00</icon>
<itemConsumeCount>1</itemConsumeCount>
<itemConsumeId>23730</itemConsumeId> <!-- Erupting Vitality Conservation Potion -->
<operateType>A2</operateType>
<hitTime>3000</hitTime>
<reuseDelay>3600000</reuseDelay>
<abnormalType>VP_UP</abnormalType>
<basicProperty>NONE</basicProperty>
<magicCriticalRate>5</magicCriticalRate>
<specialLevel>-1</specialLevel>
<hitCancelTime>0</hitCancelTime>
<activateRate>0</activateRate>
<abnormalLvl>26</abnormalLvl>
<abnormalTime>300</abnormalTime>
<trait>ETC</trait>
<abnormalTime>3600</abnormalTime>
<irreplacableBuff>true</irreplacableBuff>
<blockActionUseSkill>true</blockActionUseSkill>
<staticReuse>true</staticReuse>
<abnormalVisualEffect>VP_UP</abnormalVisualEffect>
<isMagic>4</isMagic>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>26</level>
<hasAbnormal>false</hasAbnormal>
<affectType>CASTER</affectType>
</condition>
</conditions>
<effects>
<effect name="VitalityPointsRate">
<amount>50</amount>