diff options
author | Led Mitz <smoothshifter@tuta.io> | 2023-08-03 04:21:23 +0000 |
---|---|---|
committer | Led Mitz <smoothshifter@tuta.io> | 2023-08-03 04:21:23 +0000 |
commit | e8fbc9c718ac01aa10ce82d5bfc58754e8ba1e13 (patch) | |
tree | d47485bdedb606507f483d1403db8bb1865b3631 /src/map/battle.cpp | |
parent | 5951f881178cc785438a829604888fbf7ffd3e07 (diff) | |
parent | 28f1cdc73799c43f4112f524a64fa6d3b26ba696 (diff) | |
download | tmwa-e8fbc9c718ac01aa10ce82d5bfc58754e8ba1e13.tar.gz tmwa-e8fbc9c718ac01aa10ce82d5bfc58754e8ba1e13.tar.bz2 tmwa-e8fbc9c718ac01aa10ce82d5bfc58754e8ba1e13.tar.xz tmwa-e8fbc9c718ac01aa10ce82d5bfc58754e8ba1e13.zip |
Merge branch 'atk_delays' into 'master'
weapon base attack delay standardization
See merge request legacy/tmwa!249
Diffstat (limited to 'src/map/battle.cpp')
-rw-r--r-- | src/map/battle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.cpp b/src/map/battle.cpp index eaa37a0..b745e05 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -1561,7 +1561,7 @@ struct Damage battle_calc_pc_weapon_attack(dumb_ptr<block_list> src, } OMATCH_END (); } - if (sd->status.weapon == ItemLook::BOW) + if (sd->status.weapon == ItemLook::W_BOW) { // 武器が弓矢の場合 | If the weapon is a bow and arrow atkmin = watk * ((atkmin < watk) ? atkmin : watk) / 100; // 弓用最低ATK計算 | Bows are calculated with minimum ATK flag = (flag & ~BF::RANGEMASK) | BF::LONG; // 遠距離攻撃フラグを有効 | Enable ranged attack flag @@ -2058,7 +2058,7 @@ ATK battle_weapon_attack(dumb_ptr<block_list> src, dumb_ptr<block_list> target, battle_check_range(src, target, 0)) { // 攻撃対象となりうるので攻撃 | Attack because it can be attacked - if (sd && sd->status.weapon == ItemLook::BOW) + if (sd && sd->status.weapon == ItemLook::W_BOW) { IOff0 aidx = sd->equip_index_maybe[EQUIP::ARROW]; if (aidx.ok()) |