Skip to content

Y
ygopro-core
Commit 465f5b07 authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'master' of https://github.com/Fluorohydride/ygopro-core

parents 70d42949 74e7ec53
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 3 deletions
operations.cpp
View file @ 465f5b07
...@@ -900,6 +900,7 @@ int32 field::get_control(uint16 step, effect* reason_effect, uint8 reason_player ...@@ -900,6 +900,7 @@ int32 field::get_control(uint16 step, effect* reason_effect, uint8 reason_player
} }
case 3: { case 3: {
if(targets->it == targets->container.end()) { if(targets->it == targets->container.end()) {
adjust_instant();
core.units.begin()->step = 4; core.units.begin()->step = 4;
return FALSE; return FALSE;
} }
...@@ -918,7 +919,6 @@ int32 field::get_control(uint16 step, effect* reason_effect, uint8 reason_player ...@@ -918,7 +919,6 @@ int32 field::get_control(uint16 step, effect* reason_effect, uint8 reason_player
return FALSE; return FALSE;
} }
case 5: { case 5: {
adjust_instant();
for(auto cit = targets->container.begin(); cit != targets->container.end(); ) { for(auto cit = targets->container.begin(); cit != targets->container.end(); ) {
card* pcard = *cit++; card* pcard = *cit++;
if(!(pcard->current.location & LOCATION_ONFIELD)) { if(!(pcard->current.location & LOCATION_ONFIELD)) {
......
processor.cpp
View file @ 465f5b07
...@@ -2169,7 +2169,7 @@ int32 field::process_idle_command(uint16 step) { ...@@ -2169,7 +2169,7 @@ int32 field::process_idle_command(uint16 step) {
if(peffect->type & EFFECT_TYPE_CONTINUOUS) { if(peffect->type & EFFECT_TYPE_CONTINUOUS) {
core.select_chains.clear(); core.select_chains.clear();
solve_continuous(peffect->get_handler_player(), peffect, nil_event); solve_continuous(peffect->get_handler_player(), peffect, nil_event);
core.units.begin()->step = -1; core.units.begin()->step = 2;
return FALSE; return FALSE;
} }
card* phandler = peffect->get_handler(); card* phandler = peffect->get_handler();
...@@ -2240,6 +2240,12 @@ int32 field::process_idle_command(uint16 step) { ...@@ -2240,6 +2240,12 @@ int32 field::process_idle_command(uint16 step) {
core.units.begin()->step = -1; core.units.begin()->step = -1;
return FALSE; return FALSE;
} }
case 3: {
adjust_instant();
add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, 0, 0);
core.units.begin()->step = -1;
return FALSE;
}
case 5: { case 5: {
card* target = core.summonable_cards[returns.ivalue[0] >> 16]; card* target = core.summonable_cards[returns.ivalue[0] >> 16];
core.summon_cancelable = TRUE; core.summon_cancelable = TRUE;
...@@ -2445,7 +2451,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2445,7 +2451,7 @@ int32 field::process_battle_command(uint16 step) {
if(peffect->type & EFFECT_TYPE_CONTINUOUS) { if(peffect->type & EFFECT_TYPE_CONTINUOUS) {
core.select_chains.clear(); core.select_chains.clear();
solve_continuous(peffect->get_handler_player(), peffect, nil_event); solve_continuous(peffect->get_handler_player(), peffect, nil_event);
core.units.begin()->step = -1; core.units.begin()->step = 13;
return FALSE; return FALSE;
} }
card* phandler = peffect->get_handler(); card* phandler = peffect->get_handler();
...@@ -2734,6 +2740,12 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2734,6 +2740,12 @@ int32 field::process_battle_command(uint16 step) {
adjust_all(); adjust_all();
return FALSE; return FALSE;
} }
case 14: {
adjust_instant();
add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, 0, 0);
core.units.begin()->step = -1;
return FALSE;
}
case 19: { case 19: {
infos.phase = PHASE_DAMAGE; infos.phase = PHASE_DAMAGE;
core.chain_attack = FALSE; core.chain_attack = 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