diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-04 18:20:02 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-04 18:20:02 +0000 |
| commit | 06387a85ce94281d1652ab4bc61c5b9c0971832a (patch) | |
| tree | 1a0252e640010de1834a5013a9e9bce55f33c286 /src/map/battle.c | |
| parent | e40c33a87b1c84767c6823de1fdd2051ca13f3d1 (diff) | |
| download | hercules-06387a85ce94281d1652ab4bc61c5b9c0971832a.tar.gz hercules-06387a85ce94281d1652ab4bc61c5b9c0971832a.tar.bz2 hercules-06387a85ce94281d1652ab4bc61c5b9c0971832a.tar.xz hercules-06387a85ce94281d1652ab4bc61c5b9c0971832a.zip | |
- Some minor code cleanups.
- Cleaned up skill code for NJ_BAKUENRYU
- Unified splash-damage packet display for NJ_HUUMA and other splash skills (like Brandish spear)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8134 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index a2a5147bc..c84fecffd 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2117,7 +2117,7 @@ struct Damage battle_calc_magic_attack( struct map_session_data *sd, *tsd; struct Damage ad; - struct status_change *sc; + struct status_change *tsc; struct status_data *sstatus = status_get_status_data(src); struct status_data *tstatus = status_get_status_data(target); struct { @@ -2234,7 +2234,7 @@ struct Damage battle_calc_magic_attack( //Adds an absolute value to damage. 100 = +100 damage #define MATK_ADD( a ) { ad.damage+= a; } - sc= status_get_sc(target); // used for NJ_SUITON increasing NJ_HYOUSENSOU damages + tsc= status_get_sc(target); // used for NJ_SUITON increasing NJ_HYOUSENSOU damages switch (skill_num) { //Calc base damage according to skill @@ -2358,8 +2358,8 @@ struct Damage battle_calc_magic_attack( break; case NJ_HYOUSENSOU: skillratio -= 30; - if (sc && sc->data[SC_SUITON].timer != -1) - skillratio += sc->data[SC_SUITON].val4; + if (tsc && tsc->data[SC_SUITON].timer != -1) + skillratio += tsc->data[SC_SUITON].val4; break; case NJ_HYOUSYOURAKU: skillratio += 50*skill_lv; // recorrected after calculation from vids @@ -3856,8 +3856,8 @@ void battle_set_defaults() { battle_config.left_cardfix_to_right=0; battle_config.skill_add_range=0; battle_config.skill_out_range_consume=1; - battle_config.skillrange_by_distance=BL_MOB|BL_PET|BL_HOM; - battle_config.use_weapon_skill_range=BL_MOB|BL_PET|BL_HOM; + battle_config.skillrange_by_distance=~BL_PC; + battle_config.use_weapon_skill_range=~BL_PC; battle_config.pc_damage_delay_rate=100; battle_config.defnotenemy=0; battle_config.vs_traps_bctall=BL_PC; |