diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-22 15:58:49 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-22 15:58:49 +0000 |
| commit | e03b9539e56c360d9af30c9de2ccdea680ee6eea (patch) | |
| tree | f8ff151d9e150c0283becc5a52db6e70b031a63d | |
| parent | 56e909438c6cf5011eb8ccdbcf0052d79de9d620 (diff) | |
| download | hercules-e03b9539e56c360d9af30c9de2ccdea680ee6eea.tar.gz hercules-e03b9539e56c360d9af30c9de2ccdea680ee6eea.tar.bz2 hercules-e03b9539e56c360d9af30c9de2ccdea680ee6eea.tar.xz hercules-e03b9539e56c360d9af30c9de2ccdea680ee6eea.zip | |
- Fixed a pair of compilation logic errors.
- status_get_sc_tick will now use directly Stun's formula rather than invoking the status sc chance once.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6697 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/status.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 6ebe83c77..fbaa05873 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/05/22
+ * status_get_sc_tick will now use directly Stun's formula rather than
+ invoking the status sc chance once. [Skotlex]
* Fixed a possible null pointer in script command misc_effect [Skotlex]
* Modified Investigate to take into consideration final def/vit-def rather
than base values for damage adjustment. [Skotlex]
diff --git a/src/map/status.c b/src/map/status.c index c5ee70702..20bd840a7 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3079,7 +3079,8 @@ int status_get_amotion(struct block_list *bl) aspd_rate -= aspd_rate * 10*((struct mob_data *)bl)->guardian_data->guardup_lv/100; // Strengthen Guardians - custom value +10% ASPD / lv
} else if(bl->type==BL_PET)
amotion = ((struct pet_data *)bl)->db->amotion;
- else if(bl->type==BL_HOMUNCULUS) ((struct homun_data *)bl)->amotion; //[blackhole89]
+ else if(bl->type==BL_HOMUNCULUS)
+ amotion = ((struct homun_data *)bl)->amotion; //[blackhole89]
aspd_rate = status_calc_aspd_rate(bl,aspd_rate);
@@ -3109,7 +3110,8 @@ int status_get_dmotion(struct block_list *bl) }
else if(bl->type==BL_PET)
ret=((struct pet_data *)bl)->db->dmotion;
- else if(bl->type==BL_HOMUNCULUS) ((struct homun_data *)bl)->dmotion; //[blackhole89]
+ else if(bl->type==BL_HOMUNCULUS)
+ ret=((struct homun_data *)bl)->dmotion; //[blackhole89]
else
return 2000;
@@ -3614,7 +3616,7 @@ int status_get_sc_tick(struct block_list *bl, int type, int tick) rate = 100*status_get_mdef(bl);
break;
case SC_STUN: //Reduction in duration is the same as reduction in rate.
- rate = status_get_sc_def(bl, type);
+ rate = 300 +100*status_get_vit(bl) +33*status_get_luk(bl);
break;
case SC_DPOISON: /* –Ò“Å */
case SC_POISON: /* “Å */
|