Skip to content

Y
ygopro-core
Commit 976e3a51 authored by DailyShana's avatar DailyShana
Browse files
Options

fix chain attack 

after applying Duel.ChainAttack, other attack can only select chain_attack target
parent 73b237d0
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
processor.cpp
View file @ 976e3a51
...@@ -2466,6 +2466,10 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2466,6 +2466,10 @@ int32 field::process_battle_command(uint16 step) {
core.attacker->set_status(STATUS_ATTACK_CANCELED, FALSE); core.attacker->set_status(STATUS_ATTACK_CANCELED, FALSE);
core.attacker->attack_controler = core.attacker->current.controler; core.attacker->attack_controler = core.attacker->current.controler;
core.pre_field[0] = core.attacker->fieldid_r; core.pre_field[0] = core.attacker->fieldid_r;
if(core.chain_attack && core.chain_attacker_id != core.attacker->fieldid) {
core.chain_attack = FALSE;
core.chain_attacker_id = 0;
}
effect_set eset; effect_set eset;
filter_player_effect(infos.turn_player, EFFECT_ATTACK_COST, &eset, FALSE); filter_player_effect(infos.turn_player, EFFECT_ATTACK_COST, &eset, FALSE);
core.attacker->filter_effect(EFFECT_ATTACK_COST, &eset); core.attacker->filter_effect(EFFECT_ATTACK_COST, &eset);
...@@ -2598,10 +2602,6 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2598,10 +2602,6 @@ int32 field::process_battle_command(uint16 step) {
case 7: { case 7: {
if(!core.units.begin()->arg1) { if(!core.units.begin()->arg1) {
core.phase_action = TRUE; core.phase_action = TRUE;
if(core.chain_attack && core.chain_attacker_id != core.attacker->fieldid) {
core.chain_attack = FALSE;
core.chain_attacker_id = 0;
}
core.attack_state_count[infos.turn_player]++; core.attack_state_count[infos.turn_player]++;
check_card_counter(core.attacker, 5, infos.turn_player); check_card_counter(core.attacker, 5, infos.turn_player);
core.attacker->attack_announce_count++; core.attacker->attack_announce_count++;
......
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