Skip to content

Y
ygopro-core
Commit 242b903f authored by mercury233's avatar mercury233 Committed by GitHub
Browse files
Options

update Duel.SwapControl (#342)

parent 972a3806
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
operations.cpp
View file @ 242b903f
......@@ -1039,13 +1039,16 @@ int32 field::swap_control(uint16 step, effect* reason_effect, uint8 reason_playe
uint8 s1 = pcard1->current.sequence;
uint32 flag;
get_useable_count(NULL, p1, LOCATION_MZONE, reason_player, LOCATION_REASON_CONTROL, 0xff, &flag);
flag = (flag & ~(1 << s1) & 0xff) | ~0x1f;
if(reason_player == p1)
flag = (flag & ~(1 << s1) & 0xff) | ~0x1f;
else
flag = ((flag & ~(1 << s1)) << 16 & 0xff0000) | ~0x1f0000;
card* pcard2 = *targets2->it;
pduel->write_buffer8(MSG_HINT);
pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(p1);
pduel->write_buffer8(reason_player);
pduel->write_buffer32(pcard2->data.code);
add_process(PROCESSOR_SELECT_PLACE, 0, 0, 0, p1, flag, 1);
add_process(PROCESSOR_SELECT_PLACE, 0, 0, 0, reason_player, flag, 1);
return FALSE;
}
case 2: {
......@@ -1055,13 +1058,16 @@ int32 field::swap_control(uint16 step, effect* reason_effect, uint8 reason_playe
uint8 s2 = pcard2->current.sequence;
uint32 flag;
get_useable_count(NULL, p2, LOCATION_MZONE, reason_player, LOCATION_REASON_CONTROL, 0xff, &flag);
flag = (flag & ~(1 << s2) & 0xff) | ~0x1f;
if(reason_player == p2)
flag = (flag & ~(1 << s2) & 0xff) | ~0x1f;
else
flag = ((flag & ~(1 << s2)) << 16 & 0xff0000) | ~0x1f0000;
card* pcard1 = *targets1->it;
pduel->write_buffer8(MSG_HINT);
pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(p2);
pduel->write_buffer8(reason_player);
pduel->write_buffer32(pcard1->data.code);
add_process(PROCESSOR_SELECT_PLACE, 0, 0, 0, p2, flag, 1);
add_process(PROCESSOR_SELECT_PLACE, 0, 0, 0, reason_player, flag, 1);
return FALSE;
}
case 3: {
......
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