Commit c752dee9 authored by Chen Bill's avatar Chen Bill

always take mg first

parent 5c76006c
...@@ -2528,14 +2528,14 @@ void field::get_synchro_material(uint8 playerid, card_set* material, effect* tun ...@@ -2528,14 +2528,14 @@ void field::get_synchro_material(uint8 playerid, card_set* material, effect* tun
int32 field::check_synchro_material(lua_State* L, card* pcard, int32 findex1, int32 findex2, int32 min, int32 max, card* smat, group* mg) { int32 field::check_synchro_material(lua_State* L, card* pcard, int32 findex1, int32 findex2, int32 min, int32 max, card* smat, group* mg) {
if(mg) { if(mg) {
for(auto& tuner : mg->container) { for(auto& tuner : mg->container) {
if(check_tuner_material(L, pcard, tuner, findex1, findex2, min, max, smat, mg)) if(check_tuner_material(L, pcard, tuner, findex1, findex2, min, max, nullptr, mg))
return TRUE; return TRUE;
} }
} else { } else {
card_set material; card_set material;
get_synchro_material(pcard->current.controler, &material); get_synchro_material(pcard->current.controler, &material);
for(auto& tuner : material) { for(auto& tuner : material) {
if(check_tuner_material(L, pcard, tuner, findex1, findex2, min, max, smat, mg)) if(check_tuner_material(L, pcard, tuner, findex1, findex2, min, max, smat, nullptr))
return TRUE; return TRUE;
} }
} }
......
...@@ -3305,7 +3305,7 @@ int32 scriptlib::duel_check_tuner_material(lua_State *L) { ...@@ -3305,7 +3305,7 @@ int32 scriptlib::duel_check_tuner_material(lua_State *L) {
check_param(L, PARAM_TYPE_GROUP, 7); check_param(L, PARAM_TYPE_GROUP, 7);
mg = *(group**) lua_touserdata(L, 7); mg = *(group**) lua_touserdata(L, 7);
} }
lua_pushboolean(L, pduel->game_field->check_tuner_material(L, pcard, tuner, 3, 4, min, max, 0, mg)); lua_pushboolean(L, pduel->game_field->check_tuner_material(L, pcard, tuner, 3, 4, min, max, nullptr, mg));
return 1; return 1;
} }
int32 scriptlib::duel_get_ritual_material(lua_State *L) { int32 scriptlib::duel_get_ritual_material(lua_State *L) {
......
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