Skip to content

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

fix

parent c8aa2374
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
operations.cpp
View file @ 7e25037d
...@@ -5491,8 +5491,10 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable, ...@@ -5491,8 +5491,10 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable,
core.operated_set.insert(pcard); core.operated_set.insert(pcard);
core.release_cards.erase(pcard); core.release_cards.erase(pcard);
if(min <= (int32)pcard->release_param) { if(min <= (int32)pcard->release_param) {
if(max > 1 && (!core.release_cards.empty() || !core.release_cards_ex.empty() || !core.release_cards_ex_sum.empty())) if(max > 1 && core.release_cards_ex.empty() && (!core.release_cards.empty() || !core.release_cards_ex_sum.empty()))
add_process(PROCESSOR_SELECT_YESNO, 0, 0, 0, playerid, 210); add_process(PROCESSOR_SELECT_YESNO, 0, 0, 0, playerid, 210);
else if(max > 1 && !core.release_cards_ex.empty())
returns.ivalue[0] = TRUE;
else else
core.units.begin()->step = 8; core.units.begin()->step = 8;
} else } else
...@@ -5601,6 +5603,8 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable, ...@@ -5601,6 +5603,8 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable,
rmax += (*cit)->release_param; rmax += (*cit)->release_param;
min -= rmax; min -= rmax;
max -= rmin; max -= rmin;
min = min > 0 ? min : 0;
max = max > 0 ? max : 0;
core.units.begin()->arg2 = (max << 16) + min; core.units.begin()->arg2 = (max << 16) + min;
if(min <= 0) { if(min <= 0) {
if(max > 0 && !core.release_cards.empty()) if(max > 0 && !core.release_cards.empty())
...@@ -5706,6 +5710,8 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable, ...@@ -5706,6 +5710,8 @@ int32 field::select_tribute_cards(int16 step, uint8 playerid, uint8 cancelable,
max--; max--;
fcount++; fcount++;
} }
min = min > 0 ? min : 0;
max = max > 0 ? max : 0;
core.units.begin()->arg2 = (max << 16) + min; core.units.begin()->arg2 = (max << 16) + min;
if(core.release_cards.size() == 0 if(core.release_cards.size() == 0
|| (fcount <= 0 && min < 2)) { || (fcount <= 0 && min < 2)) {
......
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