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

Volcano and Min Damage (#8213)

Browse Source 
- Volcano now increases BaseATK instead of WeaponATK for non-monsters
- Fixed a bug that caused Volcano to increase MATK in pre-re (fixes #8208)
- Fixed min damage not being set correctly
- Fixed a compiler warning
This commit is contained in:
Playtester 2024-04-01 18:35:44 +02:00 committed by GitHub
parent 4247bc50c5
commit b0902a4142
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/pre-re/status.yml
View File

@ -1100,6 +1100,7 @@ Body:
Icon: EFST_GROUNDMAGIC Icon: EFST_GROUNDMAGIC
DurationLookup: SA_VOLCANO DurationLookup: SA_VOLCANO
CalcFlags: CalcFlags:
Batk: true
Watk: true Watk: true
Flags: Flags:
NoSave: true NoSave: true

1
db/re/status.yml
View File

@ -1117,6 +1117,7 @@ Body:
Icon: EFST_GROUNDMAGIC Icon: EFST_GROUNDMAGIC
DurationLookup: SA_VOLCANO DurationLookup: SA_VOLCANO
CalcFlags: CalcFlags:
Batk: true
Watk: true Watk: true
Matk: true Matk: true
Flags: Flags:

10
src/map/battle.cpp
View File

@ -6563,12 +6563,12 @@ static void battle_calc_defense_reduction(struct Damage* wd, struct block_list *
*/ */
static void battle_min_damage(struct Damage* wd, struct block_list* src, uint16 skill_id, int64 min) { static void battle_min_damage(struct Damage* wd, struct block_list* src, uint16 skill_id, int64 min) {
if (is_attack_right_handed(src, skill_id)) { if (is_attack_right_handed(src, skill_id)) {
cap_value(wd->damage, min, INT64_MAX); wd->damage = cap_value(wd->damage, min, INT64_MAX);
cap_value(wd->basedamage, min, INT64_MAX); wd->basedamage = cap_value(wd->basedamage, min, INT64_MAX);
} }
if (is_attack_left_handed(src, skill_id)) { if (is_attack_left_handed(src, skill_id)) {
cap_value(wd->damage2, min, INT64_MAX); wd->damage2 = cap_value(wd->damage2, min, INT64_MAX);
cap_value(wd->basedamage2, min, INT64_MAX); wd->basedamage2 = cap_value(wd->basedamage2, min, INT64_MAX);
} }
} }
@ -7548,7 +7548,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
if (index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == IT_ARMOR) { if (index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == IT_ARMOR) {
//First calculate the random part of the bonus //First calculate the random part of the bonus
int bonus = (7 * sd->inventory_data[index]->weight) / 100; int bonus = (7 * sd->inventory_data[index]->weight) / 100;
bonus += pow(skill_lv + sd->inventory.u.items_inventory[index].refine, 2); bonus += static_cast<decltype(bonus)>(pow(skill_lv + sd->inventory.u.items_inventory[index].refine, 2));
//Now get a random value between 100 and the random part //Now get a random value between 100 and the random part
bonus = max(100, rnd_value(100, bonus)); bonus = max(100, rnd_value(100, bonus));
ATK_ADD(wd.damage, wd.damage2, bonus); ATK_ADD(wd.damage, wd.damage2, bonus);

6
src/map/status.cpp
View File

@ -7011,6 +7011,8 @@ static unsigned short status_calc_batk(struct block_list *bl, status_change *sc,
batk += sc->getSCE(SC_ATKPOTION)->val1; batk += sc->getSCE(SC_ATKPOTION)->val1;
if(sc->getSCE(SC_BATKFOOD)) if(sc->getSCE(SC_BATKFOOD))
batk += sc->getSCE(SC_BATKFOOD)->val1; batk += sc->getSCE(SC_BATKFOOD)->val1;
if (sc->getSCE(SC_VOLCANO))
batk += sc->getSCE(SC_VOLCANO)->val2;
#ifndef RENEWAL #ifndef RENEWAL
if(sc->getSCE(SC_GATLINGFEVER)) if(sc->getSCE(SC_GATLINGFEVER))
batk += sc->getSCE(SC_GATLINGFEVER)->val3; batk += sc->getSCE(SC_GATLINGFEVER)->val3;
@ -7083,7 +7085,7 @@ static unsigned short status_calc_watk(struct block_list *bl, status_change *sc,
watk += sc->getSCE(SC_IMPOSITIO)->val2; watk += sc->getSCE(SC_IMPOSITIO)->val2;
if(sc->getSCE(SC_WATKFOOD)) if(sc->getSCE(SC_WATKFOOD))
watk += sc->getSCE(SC_WATKFOOD)->val1; watk += sc->getSCE(SC_WATKFOOD)->val1;
if(sc->getSCE(SC_VOLCANO)) if (sc->getSCE(SC_VOLCANO) && bl->type == BL_MOB)
watk += sc->getSCE(SC_VOLCANO)->val2; watk += sc->getSCE(SC_VOLCANO)->val2;
if(sc->getSCE(SC_MERC_ATKUP)) if(sc->getSCE(SC_MERC_ATKUP))
watk += sc->getSCE(SC_MERC_ATKUP)->val2; watk += sc->getSCE(SC_MERC_ATKUP)->val2;
@ -7303,9 +7305,9 @@ static unsigned short status_calc_matk(struct block_list *bl, status_change *sc,
matk += matk * sc->getSCE(SC_MTF_MATK)->val1 / 100; matk += matk * sc->getSCE(SC_MTF_MATK)->val1 / 100;
if (sc->getSCE(SC_SHRIMP)) if (sc->getSCE(SC_SHRIMP))
matk += matk * sc->getSCE(SC_SHRIMP)->val2 / 100; matk += matk * sc->getSCE(SC_SHRIMP)->val2 / 100;
#ifdef RENEWAL
if (sc->getSCE(SC_VOLCANO)) if (sc->getSCE(SC_VOLCANO))
matk += sc->getSCE(SC_VOLCANO)->val2; matk += sc->getSCE(SC_VOLCANO)->val2;
#ifdef RENEWAL
if (sc->getSCE(SC_NIBELUNGEN) && sc->getSCE(SC_NIBELUNGEN)->val2 == RINGNBL_MATKRATE) if (sc->getSCE(SC_NIBELUNGEN) && sc->getSCE(SC_NIBELUNGEN)->val2 == RINGNBL_MATKRATE)
matk += matk * 20 / 100; matk += matk * 20 / 100;
#endif #endif