Fixed ManaHeal effect.

This commit is contained in:
MobiusDevelopment 2020-04-07 23:01:40 +00:00
parent 00cbed8b2f
commit 117d0c638c
16 changed files with 30 additions and 25 deletions

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -73,8 +73,10 @@ public class ManaHeal extends AbstractEffect
amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0); amount = Math.max(Math.min(amount, effected.getMaxRecoverableMp() - effected.getCurrentMp()), 0);
if (amount != 0) if (amount != 0)
{ {
effected.setCurrentMp(effected.getCurrentMp() + amount);
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
SystemMessage sm; SystemMessage sm;
if (effector.getObjectId() != effected.getObjectId()) if (effector.getObjectId() != effected.getObjectId())
{ {

View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/items.xsd">
<item id="728" name="Mana Potion" type="EtcItem">
<!-- Magical, liquid medicine that restores MP for a certain amount of time. -->
<set name="icon" val="icon.etc_reagent_blue_i00" />
<set name="displayId" val="90310" />
<set name="default_action" val="SKILL_REDUCE" />
<set name="etcitem_type" val="POTION" />
<set name="immediate_effect" val="true" />
<set name="material" val="LIQUID" />
<set name="weight" val="180" />
<set name="price" val="2000" />
<set name="is_stackable" val="true" />
<set name="is_oly_restricted" val="true" />
<set name="handler" val="ItemSkills" />
<set name="commissionItemType" val="POTION" />
<set name="for_npc" val="true" />
<cond addName="1" msgId="113">
<player flyMounted="false" />
</cond>
<skills>
<skill id="26030" level="1" /> <!-- Mana Potion -->
</skills>
</item>
</list>