Skip to content

Y
ygopro-core
Commit 01586d9f authored by mercury233's avatar mercury233 Committed by GitHub
Browse files
Options

fix mcount for synchro sum check (#813)

parent 6a650623
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
operations.cpp
View file @ 01586d9f
......@@ -5366,13 +5366,10 @@ int32_t field::select_synchro_material(int16_t step, uint8_t playerid, card* pca
}
if(!smat)
return FALSE;
--min;
--max;
core.units.begin()->arg2 = min + (max << 16);
effect* pcheck = tuner->is_affected_by_effect(EFFECT_SYNCHRO_CHECK);
if(pcheck)
pcheck->get_value(smat);
if(min == 0) {
if(min == 1 && max == 1) {
group* pgroup = pduel->new_group();
pgroup->container.insert(tuner);
pgroup->container.insert(smat);
......@@ -5476,7 +5473,7 @@ int32_t field::select_synchro_material(int16_t step, uint8_t playerid, card* pca
card* pm = *cit;
if(start != cit)
std::iter_swap(start, cit);
if(check_other_synchro_material(nsyn, lv, min - 1, max - 1, mcount + 1))
if(check_other_synchro_material(nsyn, lv, min - mcount, max - mcount, mcount + 1))
core.select_cards.push_back(pm);
if(start != cit)
std::iter_swap(start, cit);
......@@ -5544,6 +5541,7 @@ int32_t field::select_synchro_material(int16_t step, uint8_t playerid, card* pca
}
case 7: {
int32_t lv = pcard->get_level();
int32_t mcount = (int32_t)core.must_select_cards.size();
if(core.global_flag & GLOBALFLAG_SCRAP_CHIMERA) {
effect* peffect = nullptr;
for(auto& pm : core.select_cards) {
......@@ -5590,7 +5588,7 @@ int32_t field::select_synchro_material(int16_t step, uint8_t playerid, card* pca
pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid);
pduel->write_buffer32(512);
add_process(PROCESSOR_SELECT_SUM, 0, 0, 0, lv, playerid, min, max);
add_process(PROCESSOR_SELECT_SUM, 0, 0, 0, lv, playerid, min - (mcount - 1), max - (mcount - 1));
return FALSE;
}
case 8: {
......@@ -5618,6 +5616,7 @@ int32_t field::select_synchro_material(int16_t step, uint8_t playerid, card* pca
}
case 10: {
int32_t lv = pcard->get_level();
int32_t mcount = (int32_t)core.must_select_cards.size();
if(returns.ivalue[0]) {
effect* peffect = nullptr;
for(auto& pm : core.select_cards) {
......@@ -5643,7 +5642,7 @@ int32_t field::select_synchro_material(int16_t step, uint8_t playerid, card* pca
pduel->write_buffer8(HINT_SELECTMSG);
pduel->write_buffer8(playerid);
pduel->write_buffer32(512);
add_process(PROCESSOR_SELECT_SUM, 0, 0, 0, lv, playerid, min, max);
add_process(PROCESSOR_SELECT_SUM, 0, 0, 0, lv, playerid, min - (mcount - 1), max - (mcount - 1));
core.units.begin()->step = 7;
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