Commit d7c5bec5 authored by VanillaSalt's avatar VanillaSalt

fix

parent e1324596
...@@ -2229,12 +2229,13 @@ int32 scriptlib::duel_select_tribute(lua_State *L) { ...@@ -2229,12 +2229,13 @@ int32 scriptlib::duel_select_tribute(lua_State *L) {
uint32 ex = 0; uint32 ex = 0;
if(lua_gettop(L) >= 6) if(lua_gettop(L) >= 6)
ex = lua_toboolean(L, 6); ex = lua_toboolean(L, 6);
uint32 zone = 0x1f;
duel* pduel = interpreter::get_duel_info(L); duel* pduel = interpreter::get_duel_info(L);
pduel->game_field->core.release_cards.clear(); pduel->game_field->core.release_cards.clear();
pduel->game_field->core.release_cards_ex.clear(); pduel->game_field->core.release_cards_ex.clear();
pduel->game_field->core.release_cards_ex_sum.clear(); pduel->game_field->core.release_cards_ex_sum.clear();
pduel->game_field->get_summon_release_list(target, &pduel->game_field->core.release_cards, &pduel->game_field->core.release_cards_ex, &pduel->game_field->core.release_cards_ex_sum, mg, ex); pduel->game_field->get_summon_release_list(target, &pduel->game_field->core.release_cards, &pduel->game_field->core.release_cards_ex, &pduel->game_field->core.release_cards_ex_sum, mg, ex);
pduel->game_field->add_process(PROCESSOR_SELECT_TRIBUTE_S, 0, 0, 0, playerid, (max << 16) + min); pduel->game_field->add_process(PROCESSOR_SELECT_TRIBUTE_S, 0, 0, 0, playerid, (max << 16) + min, zone);
return lua_yield(L, 0); return lua_yield(L, 0);
} }
/** /**
......
...@@ -1531,6 +1531,10 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui ...@@ -1531,6 +1531,10 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
zone &= new_zone; zone &= new_zone;
core.units.begin()->arg1 = sumplayer + (ignore_count << 8) + (min_tribute << 16) + (zone << 24); core.units.begin()->arg1 = sumplayer + (ignore_count << 8) + (min_tribute << 16) + (zone << 24);
} }
if(proc) {
core.units.begin()->step = 3;
return FALSE;
}
core.select_cards.clear(); core.select_cards.clear();
int32 required = target->get_summon_tribute_count(); int32 required = target->get_summon_tribute_count();
int32 min = required & 0xffff; int32 min = required & 0xffff;
...@@ -2076,6 +2080,10 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint ...@@ -2076,6 +2080,10 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
zone &= new_zone; zone &= new_zone;
core.units.begin()->arg1 = setplayer + (ignore_count << 8) + (min_tribute << 16) + (zone << 24); core.units.begin()->arg1 = setplayer + (ignore_count << 8) + (min_tribute << 16) + (zone << 24);
} }
if(proc) {
core.units.begin()->step = 3;
return FALSE;
}
core.select_cards.clear(); core.select_cards.clear();
int32 required = target->get_set_tribute_count(); int32 required = target->get_set_tribute_count();
int32 min = required & 0xffff; int32 min = required & 0xffff;
......
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