diff options
| author | Jesusalva Jesusalva <jesusalva@themanaworld.org> | 2022-12-15 13:49:20 +0000 |
|---|---|---|
| committer | Jesusalva Jesusalva <jesusalva@themanaworld.org> | 2022-12-15 13:49:20 +0000 |
| commit | fdc6b727e76a695daf225787181f249c390a1541 (patch) | |
| tree | 1e75030ad5b951355cbb7d93c0e1f90e7d430aeb /src/map/battle.hpp | |
| parent | 4c2896b1de11e607b30672d88c428e63bb4b18df (diff) | |
| parent | 74dc34c3ec8bdd6413b546142f1e016871d91bc3 (diff) | |
| download | tmwa-fdc6b727e76a695daf225787181f249c390a1541.tar.gz tmwa-fdc6b727e76a695daf225787181f249c390a1541.tar.bz2 tmwa-fdc6b727e76a695daf225787181f249c390a1541.tar.xz tmwa-fdc6b727e76a695daf225787181f249c390a1541.zip | |
Merge branch 'bonus' into 'master'
item bonus and showexprate
See merge request legacy/tmwa!240
Diffstat (limited to 'src/map/battle.hpp')
| -rw-r--r-- | src/map/battle.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/battle.hpp b/src/map/battle.hpp index 2925b58..b1b3c0f 100644 --- a/src/map/battle.hpp +++ b/src/map/battle.hpp @@ -35,7 +35,7 @@ namespace tmwa { namespace map { -// ダメージ +// ダメージ | damage struct Damage { int damage; @@ -46,22 +46,22 @@ struct Damage ATK dmg_lv; }; -// ダメージ計算 +// ダメージ計算 | damage calculation struct Damage battle_calc_attack(BF attack_type, dumb_ptr<block_list> bl, dumb_ptr<block_list> target, SkillID skill_num, int skill_lv, int flag); -// 実際にHPを増減 +// 実際にHPを増減 | Actual HP increase/decrease int battle_damage(dumb_ptr<block_list> bl, dumb_ptr<block_list> target, int damage, int flag); int battle_heal(dumb_ptr<block_list> bl, dumb_ptr<block_list> target, int hp, int sp, int flag); -// 攻撃や移動を止める +// 攻撃や移動を止める | stop attacking or moving int battle_stopattack(dumb_ptr<block_list> bl); -// 通常攻撃処理まとめ +// 通常攻撃処理まとめ | Normal attack processing summary ATK battle_weapon_attack(dumb_ptr<block_list> bl, dumb_ptr<block_list> target, tick_t tick); |