Commit 48698bf1 authored by mercury233's avatar mercury233 Committed by GitHub

update Duel.ConfirmCards and MSG_CONFIRM_CARDS (#481)

parent cbb10533
...@@ -1057,8 +1057,12 @@ int32_t scriptlib::duel_confirm_cards(lua_State *L) { ...@@ -1057,8 +1057,12 @@ int32_t scriptlib::duel_confirm_cards(lua_State *L) {
pduel = pgroup->pduel; pduel = pgroup->pduel;
} else } else
return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 2); return luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 2);
uint8_t skip_panel = 0;
if(lua_gettop(L) >= 3)
skip_panel = lua_toboolean(L, 3);
pduel->write_buffer8(MSG_CONFIRM_CARDS); pduel->write_buffer8(MSG_CONFIRM_CARDS);
pduel->write_buffer8(playerid); pduel->write_buffer8(playerid);
pduel->write_buffer8(skip_panel);
if(pcard) { if(pcard) {
pduel->write_buffer8(1); pduel->write_buffer8(1);
pduel->write_buffer32(pcard->data.code); pduel->write_buffer32(pcard->data.code);
......
...@@ -406,6 +406,7 @@ int32_t field::draw(uint16_t step, effect* reason_effect, uint32_t reason, uint8 ...@@ -406,6 +406,7 @@ int32_t field::draw(uint16_t step, effect* reason_effect, uint32_t reason, uint8
if(core.deck_reversed && (public_count < cv.size())) { if(core.deck_reversed && (public_count < cv.size())) {
pduel->write_buffer8(MSG_CONFIRM_CARDS); pduel->write_buffer8(MSG_CONFIRM_CARDS);
pduel->write_buffer8(1 - playerid); pduel->write_buffer8(1 - playerid);
pduel->write_buffer8(0);
pduel->write_buffer8((uint8_t)drawed_set->size()); pduel->write_buffer8((uint8_t)drawed_set->size());
for(auto& pcard : *drawed_set) { for(auto& pcard : *drawed_set) {
pduel->write_buffer32(pcard->data.code); pduel->write_buffer32(pcard->data.code);
...@@ -2632,6 +2633,7 @@ int32_t field::sset_g(uint16_t step, uint8_t setplayer, uint8_t toplayer, group* ...@@ -2632,6 +2633,7 @@ int32_t field::sset_g(uint16_t step, uint8_t setplayer, uint8_t toplayer, group*
if(confirm) { if(confirm) {
pduel->write_buffer8(MSG_CONFIRM_CARDS); pduel->write_buffer8(MSG_CONFIRM_CARDS);
pduel->write_buffer8(toplayer); pduel->write_buffer8(toplayer);
pduel->write_buffer8(0);
pduel->write_buffer8((uint8_t)core.set_group_set.size()); pduel->write_buffer8((uint8_t)core.set_group_set.size());
for(auto& pcard : core.set_group_set) { for(auto& pcard : core.set_group_set) {
pduel->write_buffer32(pcard->data.code); pduel->write_buffer32(pcard->data.code);
......
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