diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-07-02 19:57:37 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-07-02 19:57:37 +0000 |
| commit | 1753f67c212d765fa5cd0290444bb79ba7edb881 (patch) | |
| tree | 80da34d3f816f5fa51599201949b3e94ab8b8fe7 | |
| parent | 521b9c159e8d6eab32e467ee9a6987658d98f87d (diff) | |
| download | hercules-1753f67c212d765fa5cd0290444bb79ba7edb881.tar.gz hercules-1753f67c212d765fa5cd0290444bb79ba7edb881.tar.bz2 hercules-1753f67c212d765fa5cd0290444bb79ba7edb881.tar.xz hercules-1753f67c212d765fa5cd0290444bb79ba7edb881.zip | |
Undid the change from r10298, frozen status again modifies def/mdef
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10840 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/status.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 31ee02c80..1f8b3afdc 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2007/07/02 + * Undid the change from r10298, frozen status again modifies def/mdef 2007/07/01 * TXT->SQL converter fixup [ultramage] - Added missing char_id insert which totally messed up the conversion diff --git a/src/map/status.c b/src/map/status.c index 75f2cbdfe..8672f81a8 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3540,6 +3540,8 @@ static signed char status_calc_def(struct block_list *bl, struct status_change * def += def * sc->data[SC_INCDEFRATE].val1/100; if(sc->data[SC_STONE].timer!=-1 && sc->opt1 == OPT1_STONE) def >>=1; + if(sc->data[SC_FREEZE].timer!=-1) + def >>=1; if(sc->data[SC_SIGNUMCRUCIS].timer!=-1) def -= def * sc->data[SC_SIGNUMCRUCIS].val2/100; if(sc->data[SC_CONCENTRATION].timer!=-1) @@ -3605,6 +3607,8 @@ static signed char status_calc_mdef(struct block_list *bl, struct status_change return 90; if(sc->data[SC_STONE].timer!=-1 && sc->opt1 == OPT1_STONE) mdef += 25*mdef/100; + if(sc->data[SC_FREEZE].timer!=-1) + mdef += 25*mdef/100; if(sc->data[SC_ENDURE].timer!=-1 && sc->data[SC_ENDURE].val4 == 0) mdef += sc->data[SC_ENDURE].val1; |