Skip to content

Y
ygopro-core
Commit 5a280b99 authored by DailyShana's avatar DailyShana
Browse files
Options

update attack all target check

parent f16a258d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
libduel.cpp
View file @ 5a280b99
...@@ -1417,6 +1417,7 @@ int32 scriptlib::duel_change_attacker(lua_State *L) { ...@@ -1417,6 +1417,7 @@ int32 scriptlib::duel_change_attacker(lua_State *L) {
card* attack_target = pduel->game_field->core.attack_target; card* attack_target = pduel->game_field->core.attack_target;
pduel->game_field->core.attacker->announce_count++; pduel->game_field->core.attacker->announce_count++;
pduel->game_field->core.attacker->announced_cards.addcard(attack_target); pduel->game_field->core.attacker->announced_cards.addcard(attack_target);
pduel->game_field->attack_all_target_check();
pduel->game_field->core.attacker = attacker; pduel->game_field->core.attacker = attacker;
attacker->attack_controler = attacker->current.controler; attacker->attack_controler = attacker->current.controler;
pduel->game_field->core.pre_field[0] = attacker->fieldid_r; pduel->game_field->core.pre_field[0] = attacker->fieldid_r;
...@@ -1457,7 +1458,6 @@ int32 scriptlib::duel_change_attack_target(lua_State *L) { ...@@ -1457,7 +1458,6 @@ int32 scriptlib::duel_change_attack_target(lua_State *L) {
if(pcard) if(pcard)
pduel->game_field->core.opp_mzone.insert(pcard->fieldid_r); pduel->game_field->core.opp_mzone.insert(pcard->fieldid_r);
} }
pduel->game_field->attack_all_target_check();
pduel->write_buffer8(MSG_ATTACK); pduel->write_buffer8(MSG_ATTACK);
pduel->write_buffer32(attacker->get_info_location()); pduel->write_buffer32(attacker->get_info_location());
if(target) { if(target) {
......
processor.cpp
View file @ 5a280b99
...@@ -3066,7 +3066,6 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3066,7 +3066,6 @@ int32 field::process_battle_command(uint16 step) {
return FALSE; return FALSE;
} }
case 8: { case 8: {
attack_all_target_check();
pduel->write_buffer8(MSG_ATTACK); pduel->write_buffer8(MSG_ATTACK);
pduel->write_buffer32(core.attacker->get_info_location()); pduel->write_buffer32(core.attacker->get_info_location());
if(core.attack_target) { if(core.attack_target) {
...@@ -3170,6 +3169,8 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3170,6 +3169,8 @@ int32 field::process_battle_command(uint16 step) {
case 13: { case 13: {
core.attacker->announce_count++; core.attacker->announce_count++;
core.attacker->announced_cards.addcard(core.attack_target); core.attacker->announced_cards.addcard(core.attack_target);
if(core.attacker->fieldid_r == core.pre_field[0])
attack_all_target_check();
core.chain_attack = FALSE; core.chain_attack = FALSE;
core.units.begin()->step = -1; core.units.begin()->step = -1;
reset_phase(PHASE_DAMAGE); reset_phase(PHASE_DAMAGE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment