add GetLocationCountFromEx

interpreter.cpp

@@ -407,6 +407,7 @@ static const struct luaL_Reg duellib[] = {
 	{ "IncreaseSummonedCount", scriptlib::duel_increase_summon_count },
 	{ "CheckSummonedCount", scriptlib::duel_check_summon_count },
 	{ "GetLocationCount", scriptlib::duel_get_location_count },
+	{ "GetLocationCountFromEx", scriptlib::duel_get_location_count_fromex },
 	{ "GetFieldCard", scriptlib::duel_get_field_card },
 	{ "CheckLocation", scriptlib::duel_check_location },
 	{ "GetCurrentChain", scriptlib::duel_get_current_chain },

libduel.cpp

@@ -1514,6 +1514,25 @@ int32 scriptlib::duel_get_location_count(lua_State *L) {
 		return 1;
 	}
 }
+int32 scriptlib::duel_get_location_count_fromex(lua_State *L) {
+	check_param_count(L, 1);
+	uint32 playerid = lua_tointeger(L, 1);
+	if(playerid != 0 && playerid != 1)
+		return 0;
+	duel* pduel = interpreter::get_duel_info(L);
+	uint32 uplayer = pduel->game_field->core.reason_player;
+	if(lua_gettop(L) >= 2)
+		uplayer = lua_tointeger(L, 2);
+	uint32 zone = 0xff;
+	if(pduel->game_field->core.duel_rule >= 4) {
+		lua_pushinteger(L, pduel->game_field->get_useable_count_fromex(0, playerid, uplayer, zone));
+		lua_pushinteger(L, pduel->game_field->get_spsummonable_count_fromex(0, playerid, uplayer, zone));
+	} else {
+		lua_pushinteger(L, pduel->game_field->get_useable_count(playerid, LOCATION_MZONE, uplayer, LOCATION_REASON_TOFIELD, zone));
+		lua_pushinteger(L, pduel->game_field->get_tofield_count(playerid, LOCATION_MZONE, uplayer, zone));
+	}
+	return 2;
+}
 int32 scriptlib::duel_get_field_card(lua_State *L) {
 	check_param_count(L, 3);
 	uint32 playerid = lua_tointeger(L, 1);

scriptlib.h

@@ -404,6 +404,7 @@ public:
 	static int32 duel_increase_summon_count(lua_State *L);
 	static int32 duel_check_summon_count(lua_State *L);
 	static int32 duel_get_location_count(lua_State *L);
+	static int32 duel_get_location_count_fromex(lua_State *L);
 	static int32 duel_get_field_card(lua_State *L);
 	static int32 duel_check_location(lua_State *L);
 	static int32 duel_get_current_chain(lua_State *L);