Skip to content

Y
ygopro-core
Commit f9e9eca2 authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

fix

parent fe020efd
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
processor.cpp
View file @ f9e9eca2
...@@ -5083,6 +5083,7 @@ int32 field::adjust_step(uint16 step) { ...@@ -5083,6 +5083,7 @@ int32 field::adjust_step(uint16 step) {
} }
case 5: { case 5: {
//remove brainwashing //remove brainwashing
bool re_adjust = false;
if(core.global_flag & GLOBALFLAG_BRAINWASHING_CHECK) { if(core.global_flag & GLOBALFLAG_BRAINWASHING_CHECK) {
effect_set eset; effect_set eset;
uint32 res = 0; uint32 res = 0;
...@@ -5093,14 +5094,20 @@ int32 field::adjust_step(uint16 step) { ...@@ -5093,14 +5094,20 @@ int32 field::adjust_step(uint16 step) {
for(uint8 i = 0; i < 5; ++i) { for(uint8 i = 0; i < 5; ++i) {
card* pcard = player[p].list_mzone[i]; card* pcard = player[p].list_mzone[i];
// remove EFFECT_SET_CONTROL // remove EFFECT_SET_CONTROL
if(pcard && pcard->is_affected_by_effect(EFFECT_REMOVE_BRAINWASHING)) if(pcard && pcard->is_affected_by_effect(EFFECT_REMOVE_BRAINWASHING)) {
pcard->reset(EFFECT_SET_CONTROL, RESET_CODE); pcard->reset(EFFECT_SET_CONTROL, RESET_CODE);
if(p != pcard->owner)
re_adjust = true;
}
} }
} }
} }
core.remove_brainwashing = res; core.remove_brainwashing = res;
} }
core.units.begin()->step = 7; if(re_adjust)
core.units.begin()->step = 3;
else
core.units.begin()->step = 7;
return FALSE; return FALSE;
} }
case 6: { case 6: {
......
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