Commit c5f322b3 authored by nanahira's avatar nanahira

Merge branch 'master' of github.com:ZisIsNotZis/ygopro-core

parents 4340adc9 451025a9
...@@ -558,6 +558,7 @@ static const struct luaL_Reg duellib[] = { ...@@ -558,6 +558,7 @@ static const struct luaL_Reg duellib[] = {
{ "SelectOption", scriptlib::duel_select_option }, { "SelectOption", scriptlib::duel_select_option },
{ "SelectSequence", scriptlib::duel_select_sequence }, { "SelectSequence", scriptlib::duel_select_sequence },
{ "SelectPosition", scriptlib::duel_select_position }, { "SelectPosition", scriptlib::duel_select_position },
{ "GetDisableField", scriptlib::duel_get_disable_field },
{ "SelectDisableField", scriptlib::duel_select_disable_field }, { "SelectDisableField", scriptlib::duel_select_disable_field },
{ "AnnounceRace", scriptlib::duel_announce_race }, { "AnnounceRace", scriptlib::duel_announce_race },
{ "AnnounceAttribute", scriptlib::duel_announce_attribute }, { "AnnounceAttribute", scriptlib::duel_announce_attribute },
......
...@@ -3363,6 +3363,11 @@ int32 scriptlib::duel_select_position(lua_State * L) { ...@@ -3363,6 +3363,11 @@ int32 scriptlib::duel_select_position(lua_State * L) {
pduel->game_field->add_process(PROCESSOR_SELECT_POSITION_S, 0, 0, 0, playerid + (positions << 16), pcard->data.code); pduel->game_field->add_process(PROCESSOR_SELECT_POSITION_S, 0, 0, 0, playerid + (positions << 16), pcard->data.code);
return lua_yield(L, 0); return lua_yield(L, 0);
} }
int32 scriptlib::duel_get_disable_field(lua_State * L){
duel* pduel = interpreter::get_duel_info(L);
lua_pushinteger(L, pduel->game_field->player[0].disabled_location + (pduel->game_field->player[1].disabled_location << 16));
return 1;
}
int32 scriptlib::duel_select_disable_field(lua_State * L) { int32 scriptlib::duel_select_disable_field(lua_State * L) {
check_action_permission(L); check_action_permission(L);
check_param_count(L, 5); check_param_count(L, 5);
......
...@@ -540,6 +540,7 @@ public: ...@@ -540,6 +540,7 @@ public:
static int32 duel_get_overlay_count(lua_State *L); static int32 duel_get_overlay_count(lua_State *L);
static int32 duel_check_remove_overlay_card(lua_State *L); static int32 duel_check_remove_overlay_card(lua_State *L);
static int32 duel_remove_overlay_card(lua_State *L); static int32 duel_remove_overlay_card(lua_State *L);
static int32 duel_get_disable_field(lua_State *L);
static int32 duel_hint(lua_State *L); static int32 duel_hint(lua_State *L);
static int32 duel_hint_selection(lua_State *L); static int32 duel_hint_selection(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