summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-02 13:42:47 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-02 13:42:47 +0000
commit0306381dab8703f632ace7d7301cb991e9828149 (patch)
treef77f951335f242f7dac61613de495a5d29ca31f5
parentadd356a92e12b56c87cb335591a87390e4a663f2 (diff)
downloadhercules-0306381dab8703f632ace7d7301cb991e9828149.tar.gz
hercules-0306381dab8703f632ace7d7301cb991e9828149.tar.bz2
hercules-0306381dab8703f632ace7d7301cb991e9828149.tar.xz
hercules-0306381dab8703f632ace7d7301cb991e9828149.zip
- Fixed Freeze/Stone/Benedictio not changing your elemental LEVEL to 1.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6931 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/status.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 41ec5cb4e..a0fe0ad95 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/06/02
+ * Fixed Freeze/Stone/Benedictio not changing your elemental LEVEL to 1.
+ [Skotlex]
* [Fixed]
- Yet another compilation warning. [Lance]
2006/06/01
diff --git a/src/map/status.c b/src/map/status.c
index 95d001008..428d76fdd 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3329,9 +3329,15 @@ static unsigned char status_calc_element_lv(struct block_list *bl, struct status
{
if(!sc || !sc->count)
return lv;
+ if( sc->data[SC_FREEZE].timer!=-1 )
+ return 1;
+ if( sc->data[SC_STONE].timer!=-1 && sc->opt1 == OPT1_STONE)
+ return 1;
+ if( sc->data[SC_BENEDICTIO].timer!=-1 )
+ return 1;
if(sc->data[SC_ELEMENTALCHANGE].timer!=-1)
return sc->data[SC_ELEMENTALCHANGE].val4;
- return cap_value(lv,0,UCHAR_MAX);
+ return cap_value(lv,1,4);
}