Skip to content

Y
ygopro-core
Commit 8a97fed9 authored by DailyShana's avatar DailyShana
Browse files
Options

fix "battle phase end"

parent ca37f8b6
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
processor.cpp
View file @ 8a97fed9
...@@ -2807,6 +2807,8 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2807,6 +2807,8 @@ int32 field::process_battle_command(uint16 step) {
core.units.begin()->arg2 = 1; core.units.begin()->arg2 = 1;
else core.units.begin()->arg2 = 0; else core.units.begin()->arg2 = 0;
if(!peffect->value) { if(!peffect->value) {
reset_phase(PHASE_BATTLE_STEP);
adjust_all();
infos.phase = PHASE_BATTLE; infos.phase = PHASE_BATTLE;
add_process(PROCESSOR_PHASE_EVENT, 0, 0, 0, PHASE_BATTLE, 0); add_process(PROCESSOR_PHASE_EVENT, 0, 0, 0, PHASE_BATTLE, 0);
} else { } else {
...@@ -3157,6 +3159,8 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3157,6 +3159,8 @@ int32 field::process_battle_command(uint16 step) {
core.attacker->attacked_cards.addcard(core.attack_target); core.attacker->attacked_cards.addcard(core.attack_target);
} }
if(!peffect->value) { if(!peffect->value) {
reset_phase(PHASE_BATTLE_STEP);
adjust_all();
infos.phase = PHASE_BATTLE; infos.phase = PHASE_BATTLE;
add_process(PROCESSOR_PHASE_EVENT, 0, 0, 0, PHASE_BATTLE, 0); add_process(PROCESSOR_PHASE_EVENT, 0, 0, 0, PHASE_BATTLE, 0);
} else { } else {
...@@ -3342,6 +3346,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3342,6 +3346,7 @@ int32 field::process_battle_command(uint16 step) {
|| core.attack_target->current.controler != core.attack_target->attack_controler || core.attack_target->current.controler != core.attack_target->attack_controler
|| core.attack_target->fieldid_r != core.pre_field[1]))) { || core.attack_target->fieldid_r != core.pre_field[1]))) {
reset_phase(PHASE_DAMAGE_CAL); reset_phase(PHASE_DAMAGE_CAL);
adjust_all();
infos.phase = PHASE_DAMAGE; infos.phase = PHASE_DAMAGE;
core.units.begin()->step = 32; core.units.begin()->step = 32;
return FALSE; return FALSE;
......
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