Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected Gatling Fever damage (#4493)

Browse Source 
* Fixes #4492.
* Damage no longer depends on the target's size.
Thanks to @kyurejl!
This commit is contained in:
Aleos
2019-12-30 07:44:13 -05:00
committed by GitHub
parent 0e8fab0c82
commit 1884f4d503
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/map/battle.cpp
View File

@@ -4494,14 +4494,8 @@ static void battle_attack_sc_bonus(struct Damage* wd, struct block_list *src, st
ATK_ADD(wd->weaponAtk, wd->weaponAtk2, i64max(sstatus->matk_min - tmdef, 0)); ATK_ADD(wd->weaponAtk, wd->weaponAtk2, i64max(sstatus->matk_min - tmdef, 0));
} }
} }
if (sc->data[SC_GATLINGFEVER]) { if (sc->data[SC_GATLINGFEVER])
if (tstatus->size == SZ_SMALL) { ATK_ADD(wd->equipAtk, wd->equipAtk2, sc->data[SC_GATLINGFEVER]->val3);
ATK_ADD(wd->equipAtk, wd->equipAtk2, 10 * sc->data[SC_GATLINGFEVER]->val1);
} else if (tstatus->size == SZ_MEDIUM) {
ATK_ADD(wd->equipAtk, wd->equipAtk2, 5 * sc->data[SC_GATLINGFEVER]->val1);
} else if (tstatus->size == SZ_BIG)
ATK_ADD(wd->equipAtk, wd->equipAtk2, sc->data[SC_GATLINGFEVER]->val1);
}
#else #else
if (sc->data[SC_TRUESIGHT]) if (sc->data[SC_TRUESIGHT])
ATK_ADDRATE(wd->damage, wd->damage2, 2 * sc->data[SC_TRUESIGHT]->val1); ATK_ADDRATE(wd->damage, wd->damage2, 2 * sc->data[SC_TRUESIGHT]->val1);

8
src/map/status.cpp
View File

@@ -513,11 +513,11 @@ void initChangeTables(void)
#ifdef RENEWAL #ifdef RENEWAL
set_sc( GS_MAGICALBULLET , SC_MAGICALBULLET , EFST_GS_MAGICAL_BULLET , SCB_NONE ); set_sc( GS_MAGICALBULLET , SC_MAGICALBULLET , EFST_GS_MAGICAL_BULLET , SCB_NONE );
#endif #endif
set_sc( GS_GATLINGFEVER , SC_GATLINGFEVER , EFST_GS_GATLINGFEVER, set_sc( GS_GATLINGFEVER , SC_GATLINGFEVER , EFST_GS_GATLINGFEVER, SCB_FLEE|SCB_SPEED|SCB_ASPD
#ifndef RENEWAL #ifndef RENEWAL
SCB_BATK|SCB_FLEE|SCB_SPEED|SCB_ASPD ); |SCB_BATK );
#else #else
SCB_FLEE|SCB_SPEED|SCB_ASPD ); );
#endif #endif
add_sc( NJ_TATAMIGAESHI , SC_TATAMIGAESHI ); add_sc( NJ_TATAMIGAESHI , SC_TATAMIGAESHI );
set_sc( NJ_SUITON , SC_SUITON , EFST_BLANK , SCB_AGI|SCB_SPEED ); set_sc( NJ_SUITON , SC_SUITON , EFST_BLANK , SCB_AGI|SCB_SPEED );
@@ -10249,9 +10249,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
// gs_something1 [Vicious] // gs_something1 [Vicious]
case SC_GATLINGFEVER: case SC_GATLINGFEVER:
val2 = 20*val1; // Aspd increase val2 = 20*val1; // Aspd increase
#ifndef RENEWAL
val3 = 20+10*val1; // Atk increase val3 = 20+10*val1; // Atk increase
#endif
val4 = 5*val1; // Flee decrease val4 = 5*val1; // Flee decrease
break; break;