Commit 6ee8b0dd authored by nanahira's avatar nanahira

Revert "merge Duel.CheckAdditionalSummon into Duel.IsPlayerCanSummon"

This reverts commit 861b5bcd.
parent dff6d024
......@@ -564,6 +564,7 @@ static const struct luaL_Reg duellib[] = {
{ "IsPlayerCanSendtoHand", scriptlib::duel_is_player_can_send_to_hand },
{ "IsPlayerCanSendtoGrave", scriptlib::duel_is_player_can_send_to_grave },
{ "IsPlayerCanSendtoDeck", scriptlib::duel_is_player_can_send_to_deck },
{ "CheckAdditionalSummon", scriptlib::duel_check_additional_summon },
{ "IsChainNegatable", scriptlib::duel_is_chain_negatable },
{ "IsChainDisablable", scriptlib::duel_is_chain_disablable },
{ "CheckChainTarget", scriptlib::duel_check_chain_target },
......
......@@ -3440,23 +3440,14 @@ int32 scriptlib::duel_is_player_can_summon(lua_State * L) {
return 1;
}
duel* pduel = interpreter::get_duel_info(L);
int32 check_additional;
if(lua_gettop(L) <= 2) {
check_additional = lua_toboolean(L, 2);
if(check_additional && pduel->game_field->core.extra_summon[playerid])
lua_pushboolean(L, 0);
else
lua_pushboolean(L, pduel->game_field->is_player_can_summon(playerid));
} else {
if(lua_gettop(L) == 1)
lua_pushboolean(L, pduel->game_field->is_player_can_summon(playerid));
else {
check_param_count(L, 3);
check_param(L, PARAM_TYPE_CARD, 3);
int32 sumtype = lua_tointeger(L, 2);
card* pcard = *(card**) lua_touserdata(L, 3);
check_additional = lua_toboolean(L, 4);
if(check_additional && pduel->game_field->core.extra_summon[playerid])
lua_pushboolean(L, 0);
else
lua_pushboolean(L, pduel->game_field->is_player_can_summon(sumtype, playerid, pcard));
lua_pushboolean(L, pduel->game_field->is_player_can_summon(sumtype, playerid, pcard));
}
return 1;
}
......@@ -3610,6 +3601,20 @@ int32 scriptlib::duel_is_player_can_send_to_deck(lua_State * L) {
lua_pushboolean(L, pduel->game_field->is_player_can_send_to_deck(playerid, pcard));
return 1;
}
int32 scriptlib::duel_check_additional_summon(lua_State * L) {
check_param_count(L, 1);
int32 playerid = lua_tointeger(L, 1);
if(playerid != 0 && playerid != 1) {
lua_pushboolean(L, 0);
return 1;
}
duel* pduel = interpreter::get_duel_info(L);
if(pduel->game_field->core.extra_summon[playerid] == 0)
lua_pushboolean(L, 1);
else
lua_pushboolean(L, 0);
return 1;
}
int32 scriptlib::duel_is_chain_negatable(lua_State * L) {
check_param_count(L, 1);
int32 chaincount = lua_tointeger(L, 1);
......
......@@ -558,6 +558,7 @@ public:
static int32 duel_is_player_can_send_to_hand(lua_State *L);
static int32 duel_is_player_can_send_to_grave(lua_State *L);
static int32 duel_is_player_can_send_to_deck(lua_State *L);
static int32 duel_check_additional_summon(lua_State *L);
static int32 duel_is_chain_negatable(lua_State *L);
static int32 duel_is_chain_disablable(lua_State *L);
static int32 duel_check_chain_target(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