Skip to content

Y
ygopro-core
Commit 800ecbbf authored by DailyShana's avatar DailyShana
Browse files
Options

add selection msg for selecting attack target

parent 91dc62a6
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 6 deletions
processor.cpp
View file @ 800ecbbf
...@@ -2968,12 +2968,19 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2968,12 +2968,19 @@ int32 field::process_battle_command(uint16 step) {
pduel->write_buffer8(MSG_BECOME_TARGET); pduel->write_buffer8(MSG_BECOME_TARGET);
pduel->write_buffer8(1); pduel->write_buffer8(1);
pduel->write_buffer32(core.attacker->get_info_location()); pduel->write_buffer32(core.attacker->get_info_location());
pduel->write_buffer8(MSG_HINT);
pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(1 - infos.turn_player);
pduel->write_buffer32(549);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, 1 - infos.turn_player, 0x10001); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, 1 - infos.turn_player, 0x10001);
} }
} else if(core.units.begin()->arg1) { } else {
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, infos.turn_player + 0x20000, 0x10001); pduel->write_buffer8(MSG_HINT);
} else pduel->write_buffer8(HINT_SELECTMSG);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, infos.turn_player, 0x10001); pduel->write_buffer8(infos.turn_player);
pduel->write_buffer32(549);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, infos.turn_player + (core.units.begin()->arg1 ? 0x20000 : 0), 0x10001);
}
core.units.begin()->step = 5; core.units.begin()->step = 5;
return FALSE; return FALSE;
} }
...@@ -2982,9 +2989,13 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2982,9 +2989,13 @@ int32 field::process_battle_command(uint16 step) {
if(returns.ivalue[0]) { if(returns.ivalue[0]) {
returns.ivalue[0] = -2; returns.ivalue[0] = -2;
} else { } else {
if(core.select_cards.size()) if(core.select_cards.size()) {
pduel->write_buffer8(MSG_HINT);
pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(infos.turn_player);
pduel->write_buffer32(549);
add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, infos.turn_player, 0x10001); add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, infos.turn_player, 0x10001);
else { } else {
core.chain_attack = FALSE; core.chain_attack = FALSE;
core.units.begin()->step = -1; core.units.begin()->step = -1;
} }
......
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