Skip to content

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

enable selecting effect of extra summon/set

parent 62600336
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 30 deletions
operations.cpp
View file @ fb5aae10
...@@ -1516,8 +1516,6 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui ...@@ -1516,8 +1516,6 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
} }
effect* peffect = core.select_effects[returns.ivalue[0]]; effect* peffect = core.select_effects[returns.ivalue[0]];
core.units.begin()->peffect = peffect; core.units.begin()->peffect = peffect;
int32 unlimited = -1;
bool force_select = false;
core.select_effects.clear(); core.select_effects.clear();
core.select_options.clear(); core.select_options.clear();
if(ignore_count || core.summon_count[sumplayer] < get_summon_count_limit(sumplayer)) { if(ignore_count || core.summon_count[sumplayer] < get_summon_count_limit(sumplayer)) {
...@@ -1532,12 +1530,9 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui ...@@ -1532,12 +1530,9 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
int32 new_zone = retval.size() > 1 ? retval[1] : 0x1f; int32 new_zone = retval.size() > 1 ? retval[1] : 0x1f;
int32 releasable = retval.size() > 2 ? (retval[2] < 0 ? 0xff00ff + retval[2] : retval[2]) : 0xff00ff; int32 releasable = retval.size() > 2 ? (retval[2] < 0 ? 0xff00ff + retval[2] : retval[2]) : 0xff00ff;
new_zone &= zone; new_zone &= zone;
bool unchanged = (new_zone == zone);
if(peffect) { if(peffect) {
if(new_min_tribute < (int32)min_tribute) { if(new_min_tribute < (int32)min_tribute)
new_min_tribute = min_tribute; new_min_tribute = min_tribute;
unchanged = false;
}
if(!target->is_summonable(peffect, new_min_tribute, new_zone, releasable)) if(!target->is_summonable(peffect, new_min_tribute, new_zone, releasable))
continue; continue;
} else { } else {
...@@ -1550,25 +1545,17 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui ...@@ -1550,25 +1545,17 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
min = min_tribute; min = min_tribute;
if(max < min) if(max < min)
continue; continue;
if(min < new_min_tribute) { if(min < new_min_tribute)
min = new_min_tribute; min = new_min_tribute;
unchanged = false;
}
if(!check_tribute(target, min, max, 0, target->current.controler, new_zone, releasable)) if(!check_tribute(target, min, max, 0, target->current.controler, new_zone, releasable))
continue; continue;
} }
if(unlimited < 0 && unchanged)
unlimited = (int32)core.select_effects.size();
if(eset[i]->operation)
force_select = true;
core.select_effects.push_back(eset[i]); core.select_effects.push_back(eset[i]);
core.select_options.push_back(eset[i]->description); core.select_options.push_back(eset[i]->description);
} }
} }
if(core.select_options.size() == 1) if(core.select_options.size() == 1)
returns.ivalue[0] = 0; returns.ivalue[0] = 0;
else if(!force_select && unlimited >= 0)
returns.ivalue[0] = unlimited;
else else
add_process(PROCESSOR_SELECT_OPTION, 0, 0, 0, sumplayer, 0); add_process(PROCESSOR_SELECT_OPTION, 0, 0, 0, sumplayer, 0);
return FALSE; return FALSE;
...@@ -2062,8 +2049,6 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint ...@@ -2062,8 +2049,6 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
} }
effect* peffect = core.select_effects[returns.ivalue[0]]; effect* peffect = core.select_effects[returns.ivalue[0]];
core.units.begin()->peffect = peffect; core.units.begin()->peffect = peffect;
int32 unlimited = -1;
bool force_select = false;
core.select_effects.clear(); core.select_effects.clear();
core.select_options.clear(); core.select_options.clear();
if(ignore_count || core.summon_count[setplayer] < get_summon_count_limit(setplayer)) { if(ignore_count || core.summon_count[setplayer] < get_summon_count_limit(setplayer)) {
...@@ -2078,12 +2063,9 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint ...@@ -2078,12 +2063,9 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
int32 new_zone = retval.size() > 1 ? retval[1] : 0x1f; int32 new_zone = retval.size() > 1 ? retval[1] : 0x1f;
int32 releasable = retval.size() > 2 ? (retval[2] < 0 ? 0xff00ff + retval[2] : retval[2]) : 0xff00ff; int32 releasable = retval.size() > 2 ? (retval[2] < 0 ? 0xff00ff + retval[2] : retval[2]) : 0xff00ff;
new_zone &= zone; new_zone &= zone;
bool unchanged = (new_zone == zone);
if(peffect) { if(peffect) {
if(new_min_tribute < (int32)min_tribute) { if(new_min_tribute < (int32)min_tribute)
new_min_tribute = min_tribute; new_min_tribute = min_tribute;
unchanged = false;
}
if(!target->is_summonable(peffect, new_min_tribute, new_zone, releasable)) if(!target->is_summonable(peffect, new_min_tribute, new_zone, releasable))
continue; continue;
} else { } else {
...@@ -2096,25 +2078,17 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint ...@@ -2096,25 +2078,17 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
min = min_tribute; min = min_tribute;
if(max < min) if(max < min)
continue; continue;
if(min < new_min_tribute) { if(min < new_min_tribute)
min = new_min_tribute; min = new_min_tribute;
unchanged = false;
}
if(!check_tribute(target, min, max, 0, target->current.controler, new_zone, releasable, POS_FACEDOWN_DEFENSE)) if(!check_tribute(target, min, max, 0, target->current.controler, new_zone, releasable, POS_FACEDOWN_DEFENSE))
continue; continue;
} }
if(unlimited < 0 && unchanged)
unlimited = (int32)core.select_effects.size();
if(eset[i]->operation)
force_select = true;
core.select_effects.push_back(eset[i]); core.select_effects.push_back(eset[i]);
core.select_options.push_back(eset[i]->description); core.select_options.push_back(eset[i]->description);
} }
} }
if(core.select_options.size() == 1) if(core.select_options.size() == 1)
returns.ivalue[0] = 0; returns.ivalue[0] = 0;
else if(!force_select && unlimited >= 0)
returns.ivalue[0] = unlimited;
else else
add_process(PROCESSOR_SELECT_OPTION, 0, 0, 0, setplayer, 0); add_process(PROCESSOR_SELECT_OPTION, 0, 0, 0, setplayer, 0);
return FALSE; return 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