From fe0577b69bdadd1cb0a23b1fd8a02c30c2c89ced Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 5 Feb 2019 06:17:16 +0000 Subject: [PATCH] Various potion item related improvements. Contributed by facab. --- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../game/data/stats/items/23700-23799.xml | 36 ++++++--- .../game/data/stats/items/37000-37099.xml | 9 +++ .../game/data/stats/items/37500-37599.xml | 18 +++++ .../game/data/stats/skills/17100-17199.xml | 58 +++++++++++++- .../game/data/stats/skills/21300-21399.xml | 69 +++++++++++------ .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../game/data/stats/items/23700-23799.xml | 36 ++++++--- .../game/data/stats/items/37000-37099.xml | 9 +++ .../game/data/stats/items/37500-37599.xml | 18 +++++ .../game/data/stats/skills/17100-17199.xml | 58 +++++++++++++- .../game/data/stats/skills/21300-21399.xml | 69 +++++++++++------ .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../game/data/stats/items/23700-23799.xml | 36 ++++++--- .../game/data/stats/items/37000-37099.xml | 9 +++ .../game/data/stats/items/37500-37599.xml | 18 +++++ .../game/data/stats/skills/17100-17199.xml | 58 +++++++++++++- .../game/data/stats/skills/21300-21399.xml | 69 +++++++++++------ .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../game/data/stats/items/23700-23799.xml | 36 ++++++--- .../game/data/stats/items/37000-37099.xml | 9 +++ .../game/data/stats/items/37500-37599.xml | 18 +++++ .../game/data/stats/skills/17100-17199.xml | 76 ++++++++++++++++--- .../game/data/stats/skills/21300-21399.xml | 69 +++++++++++------ .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../game/data/stats/items/23700-23799.xml | 36 ++++++--- .../game/data/stats/items/37000-37099.xml | 9 +++ .../game/data/stats/items/37500-37599.xml | 18 +++++ .../game/data/stats/skills/17100-17199.xml | 76 ++++++++++++++++--- .../game/data/stats/skills/21300-21399.xml | 69 +++++++++++------ .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../game/data/stats/items/23700-23799.xml | 36 ++++++--- .../game/data/stats/items/37000-37099.xml | 9 +++ .../game/data/stats/items/37500-37599.xml | 18 +++++ .../game/data/stats/skills/17100-17199.xml | 76 ++++++++++++++++--- .../game/data/stats/skills/21300-21399.xml | 69 +++++++++++------ .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- 60 files changed, 963 insertions(+), 291 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java index a39da1c0eb..9c34f60b62 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java index f19d9dec50..cd28f926cb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 713af002bc..617fcc3fdb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml index b07ce2308a..cd40347798 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/23700-23799.xml @@ -497,13 +497,17 @@ - - + - - + + + + + + + @@ -512,13 +516,17 @@ - - + - - + + + + + + + @@ -527,13 +535,17 @@ - - + - - + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37000-37099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37000-37099.xml index 1249bf3dfa..1fe1a04845 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37000-37099.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37000-37099.xml @@ -133,6 +133,9 @@ + + + @@ -146,6 +149,9 @@ + + + @@ -158,6 +164,9 @@ + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37500-37599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37500-37599.xml index c63895216c..fb3cbb9b80 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37500-37599.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37500-37599.xml @@ -751,6 +751,12 @@ + + + + + + @@ -759,6 +765,12 @@ + + + + + + @@ -767,6 +779,12 @@ + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml index 5dca2d8300..85f182595d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml @@ -105,16 +105,68 @@ 4 + 2 + 1 + 37560 + 1 A1 - 3600000 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 35000 + + + 1 + 37561 + 1 A1 - 3600000 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 70000 + + + 1 + 37562 + 1 A1 - 3600000 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 105000 + + A1 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/21300-21399.xml index 615bda373a..c2f554cc93 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/21300-21399.xml @@ -933,23 +933,30 @@ icon.etc_potion_red_i00 + 1 + 23728 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + 100 @@ -960,23 +967,30 @@ icon.etc_potion_blue_i00 + 1 + 23729 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + -100 @@ -987,23 +1001,30 @@ icon.etc_potion_yellow_i00 + 1 + 23730 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + 50 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java index a39da1c0eb..9c34f60b62 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java index f19d9dec50..cd28f926cb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 713af002bc..617fcc3fdb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml index cac26f7335..582d1105c0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/23700-23799.xml @@ -497,13 +497,17 @@ - - + - - + + + + + + + @@ -512,13 +516,17 @@ - - + - - + + + + + + + @@ -527,13 +535,17 @@ - - + - - + + + + + + + diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37000-37099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37000-37099.xml index f2a4c5f31c..14f4b49a67 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37000-37099.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37000-37099.xml @@ -133,6 +133,9 @@ + + + @@ -146,6 +149,9 @@ + + + @@ -158,6 +164,9 @@ + + + diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37500-37599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37500-37599.xml index eefe96d6e9..0602c3ff2e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37500-37599.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37500-37599.xml @@ -751,6 +751,12 @@ + + + + + + @@ -759,6 +765,12 @@ + + + + + + @@ -767,6 +779,12 @@ + + + + + + diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17100-17199.xml index 322f749d66..d154664295 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17100-17199.xml @@ -105,16 +105,68 @@ 4 + 2 + 1 + 37560 + 1 A1 - 3600000 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 35000 + + + 1 + 37561 + 1 A1 - 3600000 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 70000 + + + 1 + 37562 + 1 A1 - 3600000 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 105000 + + A1 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/21300-21399.xml index 9c7cac9d27..af9833a77c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/21300-21399.xml @@ -933,23 +933,30 @@ icon.etc_potion_red_i00 + 1 + 23728 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + 100 @@ -960,23 +967,30 @@ icon.etc_potion_blue_i00 + 1 + 23729 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + -100 @@ -987,23 +1001,30 @@ icon.etc_potion_yellow_i00 + 1 + 23730 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + 50 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java index a39da1c0eb..9c34f60b62 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java index f19d9dec50..cd28f926cb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 713af002bc..617fcc3fdb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml index 30f1e6346d..6ee8cacd95 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/23700-23799.xml @@ -497,13 +497,17 @@ - - + - - + + + + + + + @@ -512,13 +516,17 @@ - - + - - + + + + + + + @@ -527,13 +535,17 @@ - - + - - + + + + + + + diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37000-37099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37000-37099.xml index fac7037c82..91cd198f98 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37000-37099.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37000-37099.xml @@ -133,6 +133,9 @@ + + + @@ -146,6 +149,9 @@ + + + @@ -158,6 +164,9 @@ + + + diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37500-37599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37500-37599.xml index fd6fc81a0b..0542866929 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37500-37599.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37500-37599.xml @@ -751,6 +751,12 @@ + + + + + + @@ -759,6 +765,12 @@ + + + + + + @@ -767,6 +779,12 @@ + + + + + + diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17100-17199.xml index a4545271d2..45cbe44036 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17100-17199.xml @@ -105,16 +105,68 @@ 4 + 2 + 1 + 37560 + 1 A1 - 3600000 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 35000 + + + 1 + 37561 + 1 A1 - 3600000 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 70000 + + + 1 + 37562 + 1 A1 - 3600000 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 105000 + + A1 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/21300-21399.xml index 2ccb2b2a14..1761655843 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/21300-21399.xml @@ -933,23 +933,30 @@ icon.etc_potion_red_i00 + 1 + 23728 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + 100 @@ -960,23 +967,30 @@ icon.etc_potion_blue_i00 + 1 + 23729 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + -100 @@ -987,23 +1001,30 @@ icon.etc_potion_yellow_i00 + 1 + 23730 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + 50 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java index a39da1c0eb..9c34f60b62 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java index f19d9dec50..cd28f926cb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 713af002bc..617fcc3fdb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml index 30f1e6346d..6ee8cacd95 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/23700-23799.xml @@ -497,13 +497,17 @@ - - + - - + + + + + + + @@ -512,13 +516,17 @@ - - + - - + + + + + + + @@ -527,13 +535,17 @@ - - + - - + + + + + + + diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37000-37099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37000-37099.xml index fac7037c82..91cd198f98 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37000-37099.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37000-37099.xml @@ -133,6 +133,9 @@ + + + @@ -146,6 +149,9 @@ + + + @@ -158,6 +164,9 @@ + + + diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37500-37599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37500-37599.xml index d7e60e0440..7b9816737b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37500-37599.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37500-37599.xml @@ -740,6 +740,12 @@ + + + + + + @@ -748,6 +754,12 @@ + + + + + + @@ -756,6 +768,12 @@ + + + + + + diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml index 880bafbbf3..0118b8162e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml @@ -104,18 +104,70 @@ 5000 4 - - A1 - 3600000 - - - A1 - 3600000 - - - A1 - 3600000 - + + 2 + 1 + 37560 + 1 + A1 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 35000 + + + + + 1 + 37561 + 1 + A1 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 70000 + + + + + 1 + 37562 + 1 + A1 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 105000 + + + A1 3600000 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml index 2a3d51aac5..fc7f474445 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml @@ -933,23 +933,30 @@ icon.etc_potion_red_i00 + 1 + 23728 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + 100 @@ -960,23 +967,30 @@ icon.etc_potion_blue_i00 + 1 + 23729 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + -100 @@ -987,23 +1001,30 @@ icon.etc_potion_yellow_i00 + 1 + 23730 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + 50 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java index a39da1c0eb..9c34f60b62 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java index f19d9dec50..cd28f926cb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 713af002bc..617fcc3fdb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/23700-23799.xml index ebc194f6e0..98b65d6955 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/23700-23799.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/23700-23799.xml @@ -497,13 +497,17 @@ - - + - - + + + + + + + @@ -512,13 +516,17 @@ - - + - - + + + + + + + @@ -527,13 +535,17 @@ - - + - - + + + + + + + diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37000-37099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37000-37099.xml index 4398c2ae96..d3052fa9f6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37000-37099.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37000-37099.xml @@ -133,6 +133,9 @@ + + + @@ -146,6 +149,9 @@ + + + @@ -158,6 +164,9 @@ + + + diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37500-37599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37500-37599.xml index 9bd0b0ad84..38a7e17490 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37500-37599.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37500-37599.xml @@ -740,6 +740,12 @@ + + + + + + @@ -748,6 +754,12 @@ + + + + + + @@ -756,6 +768,12 @@ + + + + + + diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17100-17199.xml index 2f9984336f..517a6bcbec 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17100-17199.xml @@ -104,18 +104,70 @@ 5000 4 - - A1 - 3600000 - - - A1 - 3600000 - - - A1 - 3600000 - + + 2 + 1 + 37560 + 1 + A1 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 35000 + + + + + 1 + 37561 + 1 + A1 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 70000 + + + + + 1 + 37562 + 1 + A1 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 105000 + + + A1 3600000 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/21300-21399.xml index f1c0b43883..ae6d735921 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/21300-21399.xml @@ -933,23 +933,30 @@ icon.etc_potion_red_i00 + 1 + 23728 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + 100 @@ -960,23 +967,30 @@ icon.etc_potion_blue_i00 + 1 + 23729 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + -100 @@ -987,23 +1001,30 @@ icon.etc_potion_yellow_i00 + 1 + 23730 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + 50 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java index a39da1c0eb..9c34f60b62 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java index f19d9dec50..cd28f926cb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 713af002bc..617fcc3fdb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/23700-23799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/23700-23799.xml index 21293e8f82..ee6fc1059d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/23700-23799.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/23700-23799.xml @@ -497,13 +497,17 @@ - - + - - + + + + + + + @@ -512,13 +516,17 @@ - - + - - + + + + + + + @@ -527,13 +535,17 @@ - - + - - + + + + + + + diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37000-37099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37000-37099.xml index bbd91c972b..dfa663f3bd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37000-37099.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37000-37099.xml @@ -133,6 +133,9 @@ + + + @@ -146,6 +149,9 @@ + + + @@ -158,6 +164,9 @@ + + + diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37500-37599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37500-37599.xml index 59fa078725..eb947fe8da 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37500-37599.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37500-37599.xml @@ -740,6 +740,12 @@ + + + + + + @@ -748,6 +754,12 @@ + + + + + + @@ -756,6 +768,12 @@ + + + + + + diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml index 0d79367e0d..5d75a03751 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml @@ -104,18 +104,70 @@ 5000 4 - - A1 - 3600000 - - - A1 - 3600000 - - - A1 - 3600000 - + + 2 + 1 + 37560 + 1 + A1 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 35000 + + + + + 1 + 37561 + 1 + A1 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 70000 + + + + + 1 + 37562 + 1 + A1 + 60000 + 5 + -1 + 0 + true + SELF + SINGLE + + + + + + 105000 + + + A1 3600000 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml index 5f3128cd62..55f137aae5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml @@ -933,23 +933,30 @@ icon.etc_potion_red_i00 + 1 + 23728 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + 100 @@ -960,23 +967,30 @@ icon.etc_potion_blue_i00 + 1 + 23729 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + -100 @@ -987,23 +1001,30 @@ icon.etc_potion_yellow_i00 + 1 + 23730 A2 - 3000 3600000 VP_UP - NONE - 5 -1 - 0 - 0 26 - 300 - ETC + 3600 true - true + true + VP_UP 4 SELF SINGLE + + + + + VP_UP + 26 + false + CASTER + + 50 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java index a39da1c0eb..9c34f60b62 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java index f19d9dec50..cd28f926cb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 713af002bc..617fcc3fdb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java index a39da1c0eb..9c34f60b62 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java index f19d9dec50..cd28f926cb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 713af002bc..617fcc3fdb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java index a39da1c0eb..9c34f60b62 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java index f19d9dec50..cd28f926cb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 713af002bc..617fcc3fdb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java index a39da1c0eb..9c34f60b62 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java index f19d9dec50..cd28f926cb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -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; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 713af002bc..617fcc3fdb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -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; } }