Merge branch 'master' of https://github.com/purerosefallen/ygopro-222DIY into 2p

ocgcore/libduel.cpp

@@ -1976,6 +1976,8 @@ int32 scriptlib::duel_get_location_count_fromex(lua_State *L) {
 		scard = *(card**)lua_touserdata(L, 4);
 	}
 	uint32 zone = 0xff;
+	if(lua_gettop(L) >= 5)
+		zone = lua_tonumberint(L, 5);
 	if(pduel->game_field->core.duel_rule >= 4)
 		lua_pushinteger(L, pduel->game_field->get_useable_count_fromex(scard, playerid, uplayer, zone));
 	else