summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-02-21 01:27:49 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-02-21 01:27:49 +0000
commited68783b7582113e9696c8310794743d7e2be410 (patch)
treeaad35bbb40578de8ec164ec642184561e04a3c59 /src/map
parent002215117c98a940c90d22b2ae0f7da458adc7a5 (diff)
downloadhercules-ed68783b7582113e9696c8310794743d7e2be410.tar.gz
hercules-ed68783b7582113e9696c8310794743d7e2be410.tar.bz2
hercules-ed68783b7582113e9696c8310794743d7e2be410.tar.xz
hercules-ed68783b7582113e9696c8310794743d7e2be410.zip
* Fixed SP regen not stopping when Maximize Power (BS_MAXIMIZE) is in effect.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14720 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/status.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 45fe3a4cf..a44fbdd44 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -174,7 +174,7 @@ void initChangeTables(void)
set_sc( BS_ADRENALINE , SC_ADRENALINE , SI_ADRENALINE , SCB_ASPD );
set_sc( BS_WEAPONPERFECT , SC_WEAPONPERFECTION, SI_WEAPONPERFECTION, SCB_NONE );
set_sc( BS_OVERTHRUST , SC_OVERTHRUST , SI_OVERTHRUST , SCB_NONE );
- set_sc( BS_MAXIMIZE , SC_MAXIMIZEPOWER , SI_MAXIMIZEPOWER , SCB_NONE );
+ set_sc( BS_MAXIMIZE , SC_MAXIMIZEPOWER , SI_MAXIMIZEPOWER , SCB_REGEN );
add_sc( HT_LANDMINE , SC_STUN );
add_sc( HT_ANKLESNARE , SC_ANKLE );
add_sc( HT_SANDMAN , SC_SLEEP );
@@ -2693,6 +2693,7 @@ void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, str
(((TBL_PC*)bl)->class_&MAPID_UPPERMASK) == MAPID_MONK &&
(sc->data[SC_EXTREMITYFIST] || (sc->data[SC_EXPLOSIONSPIRITS] && (!sc->data[SC_SPIRIT] || sc->data[SC_SPIRIT]->val2 != SL_MONK)))
)
+ || sc->data[SC_MAXIMIZEPOWER]
) //No natural SP regen
regen->flag &=~RGN_SP;