diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:41:31 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:41:31 -0400 |
| commit | 1ba24673e7064e39406e6faf11d790c2dcc2ac00 (patch) | |
| tree | 7e2645f6fdec1dcc63ae56366371246f62865dcd /src/map/battle.cpp | |
| parent | c3e06ffe6437d27a2a7c6ddb2dc487ff2f007adf (diff) | |
| parent | c786a93e91adaf68780a5fd7585f51d0528f92ed (diff) | |
| download | tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.tar.gz tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.tar.bz2 tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.tar.xz tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.zip | |
Merge self-fork from mekolat/magic-v3
Magic v3
Diffstat (limited to 'src/map/battle.cpp')
| -rw-r--r-- | src/map/battle.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/map/battle.cpp b/src/map/battle.cpp index 991a489..031b79d 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -85,6 +85,8 @@ Species battle_get_class(dumb_ptr<block_list> bl) nullpo_retr(Species(), bl); if (bl->bl_type == BL::MOB) return bl->is_mob()->mob_class; + else if (bl->bl_type == BL::NPC) + return bl->is_npc()->npc_class; else if (bl->bl_type == BL::PC) return bl->is_player()->status.species; else @@ -134,7 +136,9 @@ int battle_get_range(dumb_ptr<block_list> bl) if (bl->bl_type == BL::MOB) return get_mob_db(bl->is_mob()->mob_class).range; else if (bl->bl_type == BL::PC) - return bl->is_player()->attackrange; + return (bl->is_player()->attack_spell_override + ? bl->is_player()->attack_spell_range + : bl->is_player()->attackrange); else return 0; } @@ -341,7 +345,6 @@ int battle_get_luk(dumb_ptr<block_list> bl) * 戻りは整数で1以上 *------------------------------------------ */ -static int battle_get_flee(dumb_ptr<block_list> bl) { int flee = 1; @@ -370,7 +373,6 @@ int battle_get_flee(dumb_ptr<block_list> bl) * 戻りは整数で1以上 *------------------------------------------ */ -static int battle_get_hit(dumb_ptr<block_list> bl) { int hit = 1; @@ -398,7 +400,6 @@ int battle_get_hit(dumb_ptr<block_list> bl) * 戻りは整数で1以上 *------------------------------------------ */ -static int battle_get_flee2(dumb_ptr<block_list> bl) { int flee2 = 1; @@ -430,7 +431,6 @@ int battle_get_flee2(dumb_ptr<block_list> bl) * 戻りは整数で1以上 *------------------------------------------ */ -static int battle_get_critical(dumb_ptr<block_list> bl) { int critical = 1; @@ -457,7 +457,6 @@ int battle_get_critical(dumb_ptr<block_list> bl) * 戻りは整数で1以上 *------------------------------------------ */ -static int battle_get_baseatk(dumb_ptr<block_list> bl) { eptr<struct status_change, StatusChange, StatusChange::MAX_STATUSCHANGE> sc_data; @@ -484,7 +483,6 @@ int battle_get_baseatk(dumb_ptr<block_list> bl) * 戻りは整数で0以上 *------------------------------------------ */ -static int battle_get_atk(dumb_ptr<block_list> bl) { eptr<struct status_change, StatusChange, StatusChange::MAX_STATUSCHANGE> sc_data; @@ -507,7 +505,6 @@ int battle_get_atk(dumb_ptr<block_list> bl) * 戻りは整数で0以上 *------------------------------------------ */ -static int battle_get_atk2(dumb_ptr<block_list> bl) { nullpo_retz(bl); @@ -530,7 +527,6 @@ int battle_get_atk2(dumb_ptr<block_list> bl) * 戻りは整数で0以上 *------------------------------------------ */ -static int battle_get_matk1(dumb_ptr<block_list> bl) { eptr<struct status_change, StatusChange, StatusChange::MAX_STATUSCHANGE> sc_data; @@ -554,7 +550,6 @@ int battle_get_matk1(dumb_ptr<block_list> bl) * 戻りは整数で0以上 *------------------------------------------ */ -static int battle_get_matk2(dumb_ptr<block_list> bl) { nullpo_retz(bl); |