Skip to content

Y
ygopro-core
Commit 15122824 authored by 独孤朲's avatar 独孤朲 Committed by GitHub
Browse files
Options

Merge pull request #47 from mercury233/patch-1 

暂且先回了，编个相对正常的realease
parents 913da5e9 c4c67fb6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
processor.cpp
View file @ 15122824
......@@ -3104,9 +3104,10 @@ int32 field::process_battle_command(uint16 step) {
return FALSE;
}
core.select_cards.clear();
get_attack_target(core.attacker, &core.select_cards, core.chain_attack, false);
auto atype = get_attack_target(core.attacker, &core.select_cards, core.chain_attack, false);
if(!core.attack_target && !core.attacker->operation_param
|| core.attack_target && std::find(core.select_cards.begin(), core.select_cards.end(), core.attack_target) == core.select_cards.end())
|| core.attack_target && atype <= 3
&& std::find(core.select_cards.begin(), core.select_cards.end(), core.attack_target) == core.select_cards.end())
rollback = true;
// go to damage step
if(!rollback) {
......
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