Skip to content

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

update quick_f process

parent fb5aae10
Show whitespace changes
Inline Side-by-side
Showing with 174 additions and 162 deletions
processor.cpp
View file @ ddd92752
...@@ -1994,35 +1994,56 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free ...@@ -1994,35 +1994,56 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free
int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priority) { int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priority) {
switch(step) { switch(step) {
case 0: { case 0: {
core.tpchain.clear(); uint8 check_player = infos.turn_player;
core.ntpchain.clear(); if(core.units.begin()->arg3)
if(!core.quick_f_chain.size()) check_player = 1 - infos.turn_player;
return FALSE; core.select_chains.clear();
for(auto ifit = core.quick_f_chain.begin(); ifit != core.quick_f_chain.end(); ++ifit) { for(auto ifit = core.quick_f_chain.begin(); ifit != core.quick_f_chain.end(); ) {
effect* peffect = ifit->first; effect* peffect = ifit->first;
card* phandler = peffect->get_handler(); card* phandler = peffect->get_handler();
if(peffect->is_chainable(ifit->second.triggering_player) && peffect->check_count_limit(ifit->second.triggering_player) if(peffect->is_chainable(ifit->second.triggering_player) && peffect->check_count_limit(ifit->second.triggering_player)
&& phandler->is_has_relation(ifit->second)) { && phandler->is_has_relation(ifit->second)) {
if(ifit->second.triggering_player == infos.turn_player) { if(ifit->second.triggering_player == check_player)
core.tpchain.push_back(ifit->second); core.select_chains.push_back(ifit->second);
phandler->set_status(STATUS_CHAINING, TRUE);
peffect->dec_count(infos.turn_player);
} else { } else {
core.ntpchain.push_back(ifit->second); core.quick_f_chain.erase(ifit++);
phandler->set_status(STATUS_CHAINING, TRUE); continue;
peffect->dec_count(1 - infos.turn_player);
}
} }
++ifit;
} }
core.quick_f_chain.clear(); if(core.select_chains.size() == 0)
if(core.tpchain.size() > 1) returns.ivalue[0] = -1;
add_process(PROCESSOR_SORT_CHAIN, 0, 0, 0, 1, infos.turn_player); else if(core.select_chains.size() == 1)
if(core.ntpchain.size() > 1) returns.ivalue[0] = 0;
add_process(PROCESSOR_SORT_CHAIN, 0, 0, 0, 0, infos.turn_player); else
add_process(PROCESSOR_SELECT_CHAIN, 0, 0, 0, check_player, 0x10000);
return FALSE; return FALSE;
} }
case 1: { case 1: {
if(core.tpchain.size() == 0 && core.ntpchain.size() == 0) { if(returns.ivalue[0] == -1) {
if(core.quick_f_chain.size()) {
core.units.begin()->arg3 = TRUE;
core.units.begin()->step = -1;
} else if(core.new_chains.size()) {
add_process(PROCESSOR_ADD_CHAIN, 0, 0, 0, 0, 0);
add_process(PROCESSOR_QUICK_EFFECT, 0, 0, 0, FALSE, 1 - core.new_chains.back().triggering_player);
infos.priorities[0] = 0;
infos.priorities[1] = 0;
return TRUE;
}
return FALSE;
}
chain newchain = core.select_chains[returns.ivalue[0]];
effect* peffect = newchain.triggering_effect;
uint8 tp = newchain.triggering_player;
peffect->get_handler()->set_status(STATUS_CHAINING, TRUE);
peffect->dec_count(tp);
core.new_chains.push_back(newchain);
core.quick_f_chain.erase(peffect);
core.units.begin()->step = -1;
return FALSE;
}
case 2: {
chain newchain; chain newchain;
auto evit = core.point_event.begin(); auto evit = core.point_event.begin();
bool pev = true; bool pev = true;
...@@ -2178,18 +2199,9 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori ...@@ -2178,18 +2199,9 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
if(core.current_chain.size() || (core.hint_timing[0] & TIMING_ATTACK) || (core.hint_timing[1] & TIMING_ATTACK)) if(core.current_chain.size() || (core.hint_timing[0] & TIMING_ATTACK) || (core.hint_timing[1] & TIMING_ATTACK))
core.spe_effect[priority] = core.select_chains.size(); core.spe_effect[priority] = core.select_chains.size();
add_process(PROCESSOR_SELECT_CHAIN, 0, 0, 0, priority, core.spe_effect[priority]); add_process(PROCESSOR_SELECT_CHAIN, 0, 0, 0, priority, core.spe_effect[priority]);
} else {
core.new_chains.splice(core.new_chains.end(), core.tpchain);
core.new_chains.splice(core.new_chains.end(), core.ntpchain);
add_process(PROCESSOR_ADD_CHAIN, 0, 0, 0, 0, 0);
add_process(PROCESSOR_QUICK_EFFECT, 0, 0, 0, FALSE, 1 - core.new_chains.back().triggering_player);
infos.priorities[0] = 0;
infos.priorities[1] = 0;
return TRUE;
}
return FALSE; return FALSE;
} }
case 2: { case 3: {
if(core.select_chains.size() && returns.ivalue[0] != -1) { if(core.select_chains.size() && returns.ivalue[0] != -1) {
chain newchain = core.select_chains[returns.ivalue[0]]; chain newchain = core.select_chains[returns.ivalue[0]];
core.new_chains.push_back(newchain); core.new_chains.push_back(newchain);
......
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