From b193faa4263a30b919f234076a501c68f924dee7 Mon Sep 17 00:00:00 2001 From: Gary Preston Date: Thu, 18 Feb 2016 13:53:14 +0000 Subject: [PATCH 001/467] Ensure definitions from cmake files that make use of generator expressions (such as UseQt4.cmake) are retained but do not cause a empty "-D" to be output when the generator evaluates to the empty string. Fixes debug build failure on Linux using Qt4/tools/WITH_PCH. --HG-- branch : develop --- code/CMakeModules/PCHSupport.cmake | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/code/CMakeModules/PCHSupport.cmake b/code/CMakeModules/PCHSupport.cmake index 20539e87f..92b76513b 100644 --- a/code/CMakeModules/PCHSupport.cmake +++ b/code/CMakeModules/PCHSupport.cmake @@ -56,33 +56,37 @@ MACRO(PCH_SET_COMPILE_FLAGS _target) LIST(APPEND _FLAGS " -I\"${item}\"") ENDFOREACH() + # NOTE: As cmake files (eg FindQT4) may now use generator expressions around their defines that evaluate + # to an empty string, wrap all "items" in an expression that outputs a -D IFF the generated + # expression is not empty. + # Required for CMake 2.6 SET(GLOBAL_DEFINITIONS) GET_DIRECTORY_PROPERTY(DEFINITIONS COMPILE_DEFINITIONS) IF(DEFINITIONS) FOREACH(item ${DEFINITIONS}) - LIST(APPEND GLOBAL_DEFINITIONS " -D${item}") + LIST(APPEND GLOBAL_DEFINITIONS "$<$:-D$>") ENDFOREACH() ENDIF() GET_DIRECTORY_PROPERTY(DEFINITIONS COMPILE_DEFINITIONS_${_UPPER_BUILD}) IF(DEFINITIONS) FOREACH(item ${DEFINITIONS}) - LIST(APPEND GLOBAL_DEFINITIONS " -D${item}") + LIST(APPEND GLOBAL_DEFINITIONS "$<$:-D$>") ENDFOREACH() ENDIF() GET_DIRECTORY_PROPERTY(DEFINITIONS DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS) IF(DEFINITIONS) FOREACH(item ${DEFINITIONS}) - LIST(APPEND GLOBAL_DEFINITIONS " -D${item}") + LIST(APPEND GLOBAL_DEFINITIONS "$<$:-D$>") ENDFOREACH() ENDIF() GET_DIRECTORY_PROPERTY(DEFINITIONS DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS_${_UPPER_BUILD}) IF(DEFINITIONS) FOREACH(item ${DEFINITIONS}) - LIST(APPEND GLOBAL_DEFINITIONS " -D${item}") + LIST(APPEND GLOBAL_DEFINITIONS "$<$:-D$>") ENDFOREACH() ENDIF() @@ -106,14 +110,14 @@ MACRO(PCH_SET_COMPILE_FLAGS _target) GET_TARGET_PROPERTY(DEFINITIONS ${_target} COMPILE_DEFINITIONS) IF(DEFINITIONS) FOREACH(item ${DEFINITIONS}) - LIST(APPEND GLOBAL_DEFINITIONS " -D${item}") + LIST(APPEND GLOBAL_DEFINITIONS "$<$:-D$>") ENDFOREACH() ENDIF() GET_TARGET_PROPERTY(DEFINITIONS ${_target} COMPILE_DEFINITIONS_${_UPPER_BUILD}) IF(DEFINITIONS) FOREACH(item ${DEFINITIONS}) - LIST(APPEND GLOBAL_DEFINITIONS " -D${item}") + LIST(APPEND GLOBAL_DEFINITIONS "$<$:-D$>") ENDFOREACH() ENDIF() @@ -135,10 +139,7 @@ MACRO(PCH_SET_COMPILE_FLAGS _target) IF(_DEFINITIONS) FOREACH(item ${_DEFINITIONS}) - # don't use dynamic expressions - IF(NOT item MATCHES "\\$<") - LIST(APPEND GLOBAL_DEFINITIONS " -D${item}") - ENDIF() + LIST(APPEND GLOBAL_DEFINITIONS "$<$:-D$>") ENDFOREACH() ENDIF() ENDIF() @@ -149,7 +150,7 @@ MACRO(PCH_SET_COMPILE_FLAGS _target) IF(GLOBAL_DEFINITIONS MATCHES "QT_CORE_LIB") # Hack to define missing QT_NO_DEBUG with Qt 5.2 IF(_UPPER_BUILD STREQUAL "RELEASE") - LIST(APPEND GLOBAL_DEFINITIONS " -DQT_NO_DEBUG") + LIST(APPEND GLOBAL_DEFINITIONS "-DQT_NO_DEBUG") ENDIF() # Qt5_POSITION_INDEPENDENT_CODE should be true if Qt was compiled with PIC @@ -162,8 +163,6 @@ MACRO(PCH_SET_COMPILE_FLAGS _target) ENDIF() ENDIF() - LIST(APPEND _FLAGS " ${GLOBAL_DEFINITIONS}") - IF(CMAKE_VERSION VERSION_LESS "3.3.0") GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS) GET_DIRECTORY_PROPERTY(_directory_definitions DIRECTORY ${CMAKE_SOURCE_DIR} DEFINITIONS) @@ -180,6 +179,9 @@ MACRO(PCH_SET_COMPILE_FLAGS _target) SEPARATE_ARGUMENTS(_FLAGS) ENDIF() + # Already in list form and items may contain non-leading spaces that should not be split on + LIST(INSERT _FLAGS 0 "${GLOBAL_DEFINITIONS}") + IF(CLANG) # Determining all architectures and get common flags SET(_ARCH_NEXT) From 67f1797f6db9d9e243ea2fb9befcf4c27962605d Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 24 Sep 2016 13:26:45 +0200 Subject: [PATCH 002/467] Changed: Updated German translations --HG-- branch : develop --- .../translations/ryzom_installer_de.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts index 73b8d51bf..b3d2668ba 100644 --- a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts @@ -16,12 +16,12 @@ Unable to write file - Kann Datei nicht schreiben + Datei kann nicht geschrieben werden Timeout - Timeout + Zeitüberschreitung @@ -31,7 +31,7 @@ Incorrect status code: %1 - Falscher Status Code: %1 + Falscher Status-Code: %1 @@ -107,12 +107,12 @@ Program to install, download and manage Ryzom profiles. - Programm um Ryzom-Profile zu installieren, herunterzuladen und zu verwalten. + Programm, um Ryzom-Profile zu installieren, herunterzuladen und zu verwalten. Author: %1 - Author: %1 + Autor: %1 @@ -164,7 +164,7 @@ Warning, this server doesn't support resume! If you stop download now, you won't be able to resume it later. Are you sure to abort download? - Warnung, dieser Server unterstützt kein Fortsetzen! Wenn du jetzt den Download abbrichst. wirst du nicht in der Lage sein ihn später wieder fortzusetzen. Willst du den Download wirklich abbrechen? + Warnung: dieser Server unterstützt kein Fortsetzen! Wenn du jetzt den Download abbrichst, wirst du nicht in der Lage sein, ihn später wieder fortzusetzen. Willst du den Download wirklich abbrechen? @@ -208,7 +208,7 @@ Are you sure to abort download? Extract client files required by server %1 - Entpacke Client Dateien, die vom Server %1 benötigt werden + Entpacke Client-Dateien, die vom Server %1 benötigt werden @@ -245,7 +245,7 @@ Are you sure to abort download? An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? - Eine ältere Version von Ryzom wurde auf diesem System gefunden, möchtest du sie deinstallieren um Festplattenspeicher zu sparen? + Eine ältere Version von Ryzom wurde auf diesem System gefunden, möchtest du sie deinstallieren, um Festplattenspeicher zu sparen? @@ -273,7 +273,7 @@ Are you sure to abort download? Delete client files - Lösche Client Dateien + Lösche Client-Dateien @@ -653,7 +653,7 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. 0 - 0 + 0 From 3c4f5bfd4c5accfa91943e35f8be351365602a81 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 24 Sep 2016 13:59:09 +0200 Subject: [PATCH 003/467] Changed: Moved Syphox mod to ryzom/data/mods to not conflict when creating gamedev.bnp --HG-- branch : develop --- .../data/{gamedev => mods}/syui_v3/interaction.lua | 0 .../data/{gamedev => mods}/syui_v3/syui/compass.xml | 0 .../data/{gamedev => mods}/syui_v3/syui/config.xml | 0 .../{gamedev => mods}/syui_v3/syui/game_config.xml | 0 .../data/{gamedev => mods}/syui_v3/syui/guild.xml | 0 .../{gamedev => mods}/syui_v3/syui/interaction.xml | 0 .../data/{gamedev => mods}/syui_v3/syui/player.lua | 0 .../data/{gamedev => mods}/syui_v3/syui/player.xml | 0 .../data/{gamedev => mods}/syui_v3/syui/syui.lua | 0 .../syui_v3/syui/texture_interfaces_v3.tga | Bin .../syui_v3/syui/texture_interfaces_v3.txt | 0 .../data/{gamedev => mods}/syui_v3/syui/widgets.xml | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename code/ryzom/client/data/{gamedev => mods}/syui_v3/interaction.lua (100%) rename code/ryzom/client/data/{gamedev => mods}/syui_v3/syui/compass.xml (100%) rename code/ryzom/client/data/{gamedev => mods}/syui_v3/syui/config.xml (100%) rename code/ryzom/client/data/{gamedev => mods}/syui_v3/syui/game_config.xml (100%) rename code/ryzom/client/data/{gamedev => mods}/syui_v3/syui/guild.xml (100%) rename code/ryzom/client/data/{gamedev => mods}/syui_v3/syui/interaction.xml (100%) rename code/ryzom/client/data/{gamedev => mods}/syui_v3/syui/player.lua (100%) rename code/ryzom/client/data/{gamedev => mods}/syui_v3/syui/player.xml (100%) rename code/ryzom/client/data/{gamedev => mods}/syui_v3/syui/syui.lua (100%) rename code/ryzom/client/data/{gamedev => mods}/syui_v3/syui/texture_interfaces_v3.tga (100%) rename code/ryzom/client/data/{gamedev => mods}/syui_v3/syui/texture_interfaces_v3.txt (100%) rename code/ryzom/client/data/{gamedev => mods}/syui_v3/syui/widgets.xml (100%) diff --git a/code/ryzom/client/data/gamedev/syui_v3/interaction.lua b/code/ryzom/client/data/mods/syui_v3/interaction.lua similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/interaction.lua rename to code/ryzom/client/data/mods/syui_v3/interaction.lua diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml b/code/ryzom/client/data/mods/syui_v3/syui/compass.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml rename to code/ryzom/client/data/mods/syui_v3/syui/compass.xml diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/config.xml b/code/ryzom/client/data/mods/syui_v3/syui/config.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/config.xml rename to code/ryzom/client/data/mods/syui_v3/syui/config.xml diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/game_config.xml b/code/ryzom/client/data/mods/syui_v3/syui/game_config.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/game_config.xml rename to code/ryzom/client/data/mods/syui_v3/syui/game_config.xml diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/guild.xml b/code/ryzom/client/data/mods/syui_v3/syui/guild.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/guild.xml rename to code/ryzom/client/data/mods/syui_v3/syui/guild.xml diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/interaction.xml b/code/ryzom/client/data/mods/syui_v3/syui/interaction.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/interaction.xml rename to code/ryzom/client/data/mods/syui_v3/syui/interaction.xml diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/player.lua b/code/ryzom/client/data/mods/syui_v3/syui/player.lua similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/player.lua rename to code/ryzom/client/data/mods/syui_v3/syui/player.lua diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/player.xml b/code/ryzom/client/data/mods/syui_v3/syui/player.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/player.xml rename to code/ryzom/client/data/mods/syui_v3/syui/player.xml diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/syui.lua b/code/ryzom/client/data/mods/syui_v3/syui/syui.lua similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/syui.lua rename to code/ryzom/client/data/mods/syui_v3/syui/syui.lua diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/texture_interfaces_v3.tga b/code/ryzom/client/data/mods/syui_v3/syui/texture_interfaces_v3.tga similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/texture_interfaces_v3.tga rename to code/ryzom/client/data/mods/syui_v3/syui/texture_interfaces_v3.tga diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/texture_interfaces_v3.txt b/code/ryzom/client/data/mods/syui_v3/syui/texture_interfaces_v3.txt similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/texture_interfaces_v3.txt rename to code/ryzom/client/data/mods/syui_v3/syui/texture_interfaces_v3.txt diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml b/code/ryzom/client/data/mods/syui_v3/syui/widgets.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml rename to code/ryzom/client/data/mods/syui_v3/syui/widgets.xml From 1ce480a8096bc0f46a14a63759d3af16a33b6e41 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 24 Sep 2016 14:00:01 +0200 Subject: [PATCH 004/467] Changed: Minor change --HG-- branch : develop --- code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml index b8bf5277c..5f2b5da8c 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml @@ -1767,7 +1767,7 @@ name="uiOpen" handler="item_text_display" params="ui:interface:edit_custom" /> - + From 162e683803c3a7959bbf99dffbc18f1ce335352d Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 24 Sep 2016 14:17:43 +0200 Subject: [PATCH 005/467] Changed: New methods loadFromSettings and saveToSettings for CProfile and CServer, see #279 --HG-- branch : develop --- .../client/ryzom_installer/src/configfile.cpp | 80 +------------------ .../client/ryzom_installer/src/profile.cpp | 24 ++++++ .../client/ryzom_installer/src/profile.h | 3 + .../client/ryzom_installer/src/server.cpp | 62 ++++++++++++++ .../tools/client/ryzom_installer/src/server.h | 4 + 5 files changed, 97 insertions(+), 76 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index 38c945ade..8ee369b5c 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -109,34 +109,7 @@ bool CConfigFile::load(const QString &filename) CServer &server = m_servers[i]; settings.beginGroup(QString("server_%1").arg(i)); - - server.id = settings.value("id").toString(); - server.name = settings.value("name").toString(); - server.displayUrl = settings.value("display_url").toString(); - server.dataDownloadUrl = settings.value("data_download_url").toString(); - server.dataDownloadFilename = settings.value("data_download_filename").toString(); - server.dataCompressedSize = settings.value("data_compressed_size").toULongLong(); - server.dataUncompressedSize = settings.value("data_uncompressed_size").toULongLong(); - server.clientDownloadUrl = settings.value("client_download_url").toString(); - server.clientDownloadFilename = settings.value("client_download_filename").toString(); -#if defined(Q_OS_WIN) - server.clientFilename = settings.value("client_filename_windows").toString(); - server.clientFilenameOld = settings.value("client_filename_old_windows").toString(); - server.configurationFilename = settings.value("configuration_filename_windows").toString(); - server.installerFilename = settings.value("installer_filename_windows").toString(); -#elif defined(Q_OS_MAC) - server.clientFilename = settings.value("client_filename_osx").toString(); - server.clientFilenameOld = settings.value("client_filename_old_osx").toString(); - server.configurationFilename = settings.value("configuration_filename_osx").toString(); - server.installerFilename = settings.value("installer_filename_osx").toString(); -#else - server.clientFilename = settings.value("client_filename_linux").toString(); - server.clientFilenameOld = settings.value("client_filename_old_linux").toString(); - server.configurationFilename = settings.value("configuration_filename_linux").toString(); - server.installerFilename = settings.value("installer_filename_linux").toString(); -#endif - server.comments = settings.value("comments").toString(); - + server.loadFromSettings(settings); settings.endGroup(); } } @@ -154,16 +127,7 @@ bool CConfigFile::load(const QString &filename) CProfile &profile = m_profiles[i]; settings.beginGroup(QString("profile_%1").arg(i)); - - profile.id = settings.value("id").toString(); - profile.name = settings.value("name").toString(); - profile.server = settings.value("server").toString(); - profile.executable = settings.value("executable").toString(); - profile.arguments = settings.value("arguments").toString(); - profile.comments = settings.value("comments").toString(); - profile.desktopShortcut = settings.value("desktop_shortcut").toBool(); - profile.menuShortcut = settings.value("menu_shortcut").toBool(); - + profile.loadFromSettings(settings); settings.endGroup(); } @@ -203,34 +167,7 @@ bool CConfigFile::save() const const CServer &server = m_servers[i]; settings.beginGroup(QString("server_%1").arg(i)); - - settings.setValue("id", server.id); - settings.setValue("name", server.name); - settings.setValue("display_url", server.displayUrl); - settings.setValue("data_download_url", server.dataDownloadUrl); - settings.setValue("data_download_filename", server.dataDownloadFilename); - settings.setValue("data_compressed_size", server.dataCompressedSize); - settings.setValue("data_uncompressed_size", server.dataUncompressedSize); - settings.setValue("client_download_url", server.clientDownloadUrl); - settings.setValue("client_download_filename", server.clientDownloadFilename); -#if defined(Q_OS_WIN) - settings.setValue("client_filename_windows", server.clientFilename); - settings.setValue("client_filename_old_windows", server.clientFilenameOld); - settings.setValue("configuration_filename_windows", server.configurationFilename); - settings.setValue("installer_filename_windows", server.installerFilename); -#elif defined(Q_OS_MAC) - settings.setValue("client_filename_osx", server.clientFilename); - settings.setValue("client_filename_old_osx", server.clientFilenameOld); - settings.setValue("configuration_filename_osx", server.configurationFilename); - settings.setValue("installer_filename_osx", server.installerFilename); -#else - settings.setValue("client_filename_linux", server.clientFilename); - settings.setValue("client_filename_old_linux", server.clientFilenameOld); - settings.setValue("configuration_filename_linux", server.configurationFilename); - settings.setValue("installer_filename_linux", server.installerFilename); -#endif - settings.setValue("comments", server.comments); - + server.saveToSettings(settings); settings.endGroup(); } @@ -244,16 +181,7 @@ bool CConfigFile::save() const const CProfile &profile = m_profiles[i]; settings.beginGroup(QString("profile_%1").arg(i)); - - settings.setValue("id", profile.id); - settings.setValue("name", profile.name); - settings.setValue("server", profile.server); - settings.setValue("executable", profile.executable); - settings.setValue("arguments", profile.arguments); - settings.setValue("comments", profile.comments); - settings.setValue("desktop_shortcut", profile.desktopShortcut); - settings.setValue("menu_shortcut", profile.menuShortcut); - + profile.saveToSettings(settings); settings.endGroup(); } diff --git a/code/ryzom/tools/client/ryzom_installer/src/profile.cpp b/code/ryzom/tools/client/ryzom_installer/src/profile.cpp index b80c368df..83cbe4205 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/profile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/profile.cpp @@ -25,6 +25,30 @@ const CProfile NoProfile; +void CProfile::loadFromSettings(const QSettings &settings) +{ + id = settings.value("id").toString(); + name = settings.value("name").toString(); + server = settings.value("server").toString(); + executable = settings.value("executable").toString(); + arguments = settings.value("arguments").toString(); + comments = settings.value("comments").toString(); + desktopShortcut = settings.value("desktop_shortcut").toBool(); + menuShortcut = settings.value("menu_shortcut").toBool(); +} + +void CProfile::saveToSettings(QSettings &settings) const +{ + settings.setValue("id", id); + settings.setValue("name", name); + settings.setValue("server", server); + settings.setValue("executable", executable); + settings.setValue("arguments", arguments); + settings.setValue("comments", comments); + settings.setValue("desktop_shortcut", desktopShortcut); + settings.setValue("menu_shortcut", menuShortcut); +} + QString CProfile::getDirectory() const { return CConfigFile::getInstance()->getProfileDirectory() + "/" + id; diff --git a/code/ryzom/tools/client/ryzom_installer/src/profile.h b/code/ryzom/tools/client/ryzom_installer/src/profile.h index 1fa901c64..774d55193 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/profile.h +++ b/code/ryzom/tools/client/ryzom_installer/src/profile.h @@ -37,6 +37,9 @@ public: bool desktopShortcut; bool menuShortcut; + void loadFromSettings(const QSettings &settings); + void saveToSettings(QSettings &settings) const; + // helpers QString getDirectory() const; QString getClientFullPath() const; diff --git a/code/ryzom/tools/client/ryzom_installer/src/server.cpp b/code/ryzom/tools/client/ryzom_installer/src/server.cpp index 0a415d0fb..6ce9bf6b8 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/server.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/server.cpp @@ -24,6 +24,68 @@ const CServer NoServer; +void CServer::loadFromSettings(const QSettings &settings) +{ + id = settings.value("id").toString(); + name = settings.value("name").toString(); + displayUrl = settings.value("display_url").toString(); + filesListUrl = settings.value("files_list_url").toString(); + dataDownloadUrl = settings.value("data_download_url").toString(); + dataDownloadFilename = settings.value("data_download_filename").toString(); + dataCompressedSize = settings.value("data_compressed_size").toULongLong(); + dataUncompressedSize = settings.value("data_uncompressed_size").toULongLong(); + clientDownloadUrl = settings.value("client_download_url").toString(); + clientDownloadFilename = settings.value("client_download_filename").toString(); +#if defined(Q_OS_WIN) + clientFilename = settings.value("client_filename_windows").toString(); + clientFilenameOld = settings.value("client_filename_old_windows").toString(); + configurationFilename = settings.value("configuration_filename_windows").toString(); + installerFilename = settings.value("installer_filename_windows").toString(); +#elif defined(Q_OS_MAC) + clientFilename = settings.value("client_filename_osx").toString(); + clientFilenameOld = settings.value("client_filename_old_osx").toString(); + configurationFilename = settings.value("configuration_filename_osx").toString(); + installerFilename = settings.value("installer_filename_osx").toString(); +#else + clientFilename = settings.value("client_filename_linux").toString(); + clientFilenameOld = settings.value("client_filename_old_linux").toString(); + configurationFilename = settings.value("configuration_filename_linux").toString(); + installerFilename = settings.value("installer_filename_linux").toString(); +#endif + comments = settings.value("comments").toString(); +} + +void CServer::saveToSettings(QSettings &settings) const +{ + settings.setValue("id", id); + settings.setValue("name", name); + settings.setValue("display_url", displayUrl); + settings.setValue("files_list_url", filesListUrl); + settings.setValue("data_download_url", dataDownloadUrl); + settings.setValue("data_download_filename", dataDownloadFilename); + settings.setValue("data_compressed_size", dataCompressedSize); + settings.setValue("data_uncompressed_size", dataUncompressedSize); + settings.setValue("client_download_url", clientDownloadUrl); + settings.setValue("client_download_filename", clientDownloadFilename); +#if defined(Q_OS_WIN) + settings.setValue("client_filename_windows", clientFilename); + settings.setValue("client_filename_old_windows", clientFilenameOld); + settings.setValue("configuration_filename_windows", configurationFilename); + settings.setValue("installer_filename_windows", installerFilename); +#elif defined(Q_OS_MAC) + settings.setValue("client_filename_osx", clientFilename); + settings.setValue("client_filename_old_osx", clientFilenameOld); + settings.setValue("configuration_filename_osx", configurationFilename); + settings.setValue("installer_filename_osx", installerFilename); +#else + settings.setValue("client_filename_linux", clientFilename); + settings.setValue("client_filename_old_linux", clientFilenameOld); + settings.setValue("configuration_filename_linux", configurationFilename); + settings.setValue("installer_filename_linux", installerFilename); +#endif + settings.setValue("comments", comments); +} + QString CServer::getDirectory() const { return CConfigFile::getInstance()->getInstallationDirectory() + "/" + id; diff --git a/code/ryzom/tools/client/ryzom_installer/src/server.h b/code/ryzom/tools/client/ryzom_installer/src/server.h index ee6da9f57..61c788c4d 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/server.h +++ b/code/ryzom/tools/client/ryzom_installer/src/server.h @@ -31,6 +31,7 @@ public: QString id; QString name; QString displayUrl; + QString filesListUrl; QString dataDownloadUrl; QString dataDownloadFilename; qint64 dataCompressedSize; @@ -43,6 +44,9 @@ public: QString installerFilename; QString comments; + void loadFromSettings(const QSettings &settings); + void saveToSettings(QSettings &settings) const; + // helpers QString getDirectory() const; QString getClientFullPath() const; From af1f02c53f442c994d23f0d23f81b2675b95a937 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 24 Sep 2016 14:18:44 +0200 Subject: [PATCH 006/467] Changed: Download from "installer" directory now, see #279 --HG-- branch : develop --- .../client/ryzom_installer/res/ryzom_installer.ini | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini b/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini index 699cfa118..f82e707c9 100644 --- a/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini +++ b/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini @@ -1,4 +1,4 @@ -version=1 +version=2 [common] installation_directory= @@ -17,11 +17,12 @@ size=2 id=ryzom_live name=Atys display_url="http://app.ryzom.com/app_releasenotes/index.php?lang=$LANG" -data_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_data.7z?r=&ts=$TIMESTAMP" +files_list_url="https://sourceforge.net/projects/ryzom/rss?path=/installer" +data_download_url="http://downloads.sourceforge.net/project/ryzom/installer/ryzom_live_data.7z?r=&ts=$TIMESTAMP" data_download_filename=ryzom_live_data.7z data_compressed_size=1500000000 data_uncompressed_size=7000000000 -client_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_client_$ARCH.7z?r=&ts=$TIMESTAMP" +client_download_url="http://downloads.sourceforge.net/project/ryzom/installer/ryzom_live_client_$ARCH.7z?r=&ts=$TIMESTAMP" client_download_filename=ryzom_live_client_$ARCH.7z client_filename_windows=ryzom_client_r.exe client_filename_osx=Ryzom.app/Contents/MacOS/Ryzom @@ -39,11 +40,12 @@ comments= id=ryzom_dev name=Yubo display_url="http://app.ryzom.com/app_releasenotes/index.php?lang=$LANG" -data_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_data.7z?r=&ts=$TIMESTAMP" +files_list_url="https://sourceforge.net/projects/ryzom/rss?path=/installer" +data_download_url="http://downloads.sourceforge.net/project/ryzom/installer/ryzom_live_data.7z?r=&ts=$TIMESTAMP" data_download_filename=ryzom_live_data.7z data_compressed_size=1500000000 data_uncompressed_size=7000000000 -client_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_client_$ARCH.7z?r=&ts=$TIMESTAMP" +client_download_url="http://downloads.sourceforge.net/project/ryzom/installer/ryzom_live_client_$ARCH.7z?r=&ts=$TIMESTAMP" client_download_filename=ryzom_live_client_$ARCH.7z client_filename_windows=ryzom_client_r.exe client_filename_osx=Ryzom.app/Contents/MacOS/Ryzom From ec5deea3f01e86508d2028d6d8147053a9217818 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 24 Sep 2016 14:19:35 +0200 Subject: [PATCH 007/467] Changed: Generate an exception if file is not a supported bitmap format --HG-- branch : develop --- code/nel/tools/3d/build_interface/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/nel/tools/3d/build_interface/main.cpp b/code/nel/tools/3d/build_interface/main.cpp index 04213d34b..c56934662 100644 --- a/code/nel/tools/3d/build_interface/main.cpp +++ b/code/nel/tools/3d/build_interface/main.cpp @@ -263,10 +263,12 @@ int main(int argc, char **argv) pBtmp = new NLMISC::CBitmap; NLMISC::CIFile inFile; - if (!inFile.open(AllMapNames[i])) throw NLMISC::Exception("Unable to open " + AllMapNames[i]); + if (!inFile.open(AllMapNames[i])) throw NLMISC::Exception(toString("Unable to open %s", AllMapNames[i].c_str())); uint8 colors = pBtmp->load(inFile); + if (!colors) throw NLMISC::Exception(toString("%s is not a bitmap", AllMapNames[i].c_str())); + if (pBtmp->getPixelFormat() != CBitmap::RGBA) { outString(toString("Converting %s to RGBA (32 bits), originally using %u bits...", AllMapNames[i].c_str(), (uint)colors)); From b1f28ace36676f68f98e63f2a28346abc321bba3 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 24 Sep 2016 15:53:58 +0200 Subject: [PATCH 008/467] Changed: Updated German translations --HG-- branch : develop --- .../translations/ryzom_installer_de.ts | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts index b3d2668ba..443fb7432 100644 --- a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts @@ -308,7 +308,7 @@ Are you sure to abort download? Delete installer - Lösche installer + Lösche Installer @@ -327,13 +327,13 @@ Are you sure to abort download? You're going to delete a profile, files won't be deleted and you'll have to do that manually. Are you sure to delete this profile? - Du bist dabei ein Profil zu löschen, es werden keine Dateien gelöscht, das musst du manuell tun. + Du bist dabei, ein Profil zu löschen. Es werden keine Dateien gelöscht, das musst du manuell tun. Bist du sicher, dass du dieses Profil löschen willst? Please choose Ryzom client executable to launch - Bitte wähle die ausführbare Datei um den Ryzom Client zu starten + Bitte wähle die ausführbare Datei, um den Ryzom-Client zu starten @@ -395,7 +395,7 @@ Bist du sicher, dass du dieses Profil löschen willst? Ryzom Installer - Ryzom Installationsprogramm + Ryzom-Installationsprogramm @@ -404,11 +404,11 @@ Bist du sicher, dass du dieses Profil löschen willst? This program will allow you to download, install, configure and manage Ryzom on your computer. Just follow the different steps and make your choice between the options presented. - Willkommen zum Ryzom Installationsprogramm! + Willkommen zum Ryzom-Installationsprogramm! -Dieses Programm wird es dir ermöglichen Ryzom auf deinen Computer herunterzuladen, zu installieren, zu konfigurieren und zu verwalten. +Dieses Programm wird es dir ermöglichen, Ryzom auf deinen Computer herunterzuladen, zu installieren, zu konfigurieren und zu verwalten. -Folge den verschiedenen Schritten und wähle aus den Optionen die dir angeboten werden. +Folge den verschiedenen Schritten und wähle aus den Optionen, die dir angeboten werden. @@ -444,7 +444,7 @@ Folge den verschiedenen Schritten und wähle aus den Optionen die dir angeboten Files will be installed to (requires 10 GiB): - Dateien werden installiert nach (benötigt 10GiB): + Dateien werden installiert nach (benötigt 10 GiB): @@ -454,7 +454,7 @@ Folge den verschiedenen Schritten und wähle aus den Optionen die dir angeboten Do you prefer to use a 64 or 32 bit client? - Möchtest du einen 64 bit oder 32 bit Client verwenden? + Möchtest du einen 64 bit oder 32 bit-Client verwenden? @@ -472,7 +472,7 @@ Folge den verschiedenen Schritten und wähle aus den Optionen die dir angeboten Ryzom Installer - Ryzom Installationsprogramm + Ryzom-Installationsprogramm @@ -544,7 +544,7 @@ p, li { white-space: pre-wrap; } Ryzom Installer - Ryzom Installationsprogramm + Ryzom-Installationsprogramm @@ -553,7 +553,7 @@ p, li { white-space: pre-wrap; } This program will migrate Ryzom version 2.1 to 3.0. Your files will be updated, cleaned and moved to a new location. Just press Continue button and follow the different steps until everything is done. - Willkommen zum Ryzom Installationsprogramm! + Willkommen zum Ryzom-Installationsprogramm! Dieses Programm wird Ryzom 2.1 zu Ryzom 3.0 migrieren. Deine Dateien werden aktualisiert, gesäubert und an einen neuen Ort verschoben werden. @@ -582,7 +582,7 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. Do you prefer to use a 64 or 32 bit client? - Möchtest du einen 64 bit oder 32 bit Client verwenden? + Möchtest du einen 64 bit oder 32 bit-Client verwenden? @@ -610,17 +610,17 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. Ryzom Installer - Ryzom Installationsprogramm + Ryzom-Installationsprogramm Operation - Vorgang + Verarbeitung Operation progress - Vorgangsfortschritt + Verarbeitungsfortschritt @@ -733,7 +733,7 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. Start Menu - Start Menü + Start-Menü @@ -783,7 +783,7 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. 7zip decoder doesn't support this archive - 7zip decoder unterstützt dieses Archiv nicht + 7zip-Decoder unterstützt dieses Archiv nicht @@ -879,7 +879,7 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. Use 64 bit client - Benutze 64 Client + Benutze 64 bit-Client @@ -900,7 +900,7 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. Location of source Ryzom files: - Ort der Ryzom Quelldateien: + Ort der Ryzom-Quelldateien: @@ -918,12 +918,12 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. Ryzom Installer - Ryzom Installationsprogramm + Ryzom-Installationsprogramm You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (Warning, it cannot be undone). - Du bist dabei einige oder alle Komponenten von Ryzom zu deinstallieren. Bitte überprüfe jede Komponente, die du entfernen möchtest (Warnung: dies kann nicht rückgängig gemacht werden). + Du bist dabei, einige oder alle Komponenten von Ryzom zu deinstallieren. Bitte überprüfe jede Komponente, die du entfernen möchtest (Warnung: dies kann nicht rückgängig gemacht werden). From 130b270380e4a74456f588a1bd5db4a3691f1caa Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 24 Sep 2016 15:54:28 +0200 Subject: [PATCH 009/467] Fixed: tga2dds doesn't generate mipmaps --HG-- branch : develop --- code/nel/tools/3d/tga_2_dds/tga2dds.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/nel/tools/3d/tga_2_dds/tga2dds.cpp b/code/nel/tools/3d/tga_2_dds/tga2dds.cpp index 5e40a4cca..5f0ee4181 100644 --- a/code/nel/tools/3d/tga_2_dds/tga2dds.cpp +++ b/code/nel/tools/3d/tga_2_dds/tga2dds.cpp @@ -311,6 +311,9 @@ int main(int argc, char **argv) if (args.haveArg("o")) OptOutputFileName = args.getArg("o").front(); + if (args.haveArg("m")) + OptMipMap = true; + if (args.haveArg("a")) { std::string strAlgo = args.getArg("a").front(); From 33dfd39409526fda4d7d6e56952b23d409619151 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 25 Sep 2016 10:20:49 +0200 Subject: [PATCH 010/467] Changed: Use CCmdArgs for sheets_packer, see #281 --HG-- branch : develop --- code/ryzom/tools/sheets_packer/sheets_packer.cpp | 11 +++++++++++ code/ryzom/tools/sheets_packer/stdpch.h | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/code/ryzom/tools/sheets_packer/sheets_packer.cpp b/code/ryzom/tools/sheets_packer/sheets_packer.cpp index 9b6eef725..ce4467137 100644 --- a/code/ryzom/tools/sheets_packer/sheets_packer.cpp +++ b/code/ryzom/tools/sheets_packer/sheets_packer.cpp @@ -57,6 +57,17 @@ static uint32 Version = 1; // Client Version. //--------------------------------------------------- int main(int argc, char **argv) { + CApplicationContext applicationContext; + + // Parse Command Line. + NLMISC::CCmdArgs args; + + args.setDescription("Pack all sheets needed by client. All parameters must be defined in sheets_packer.cfg and there is no parameters from command-line."); + + if (!args.parse(argc, argv)) return 1; + + CFileDisplayer *fd = NULL; + ///////////////////////////////// // Initialize the application. // try diff --git a/code/ryzom/tools/sheets_packer/stdpch.h b/code/ryzom/tools/sheets_packer/stdpch.h index df8f1370f..a8f68441a 100644 --- a/code/ryzom/tools/sheets_packer/stdpch.h +++ b/code/ryzom/tools/sheets_packer/stdpch.h @@ -31,6 +31,10 @@ #include #include #include +#include +#include +#include +#include #ifdef NL_OS_WINDOWS #define NOMINMAX From e6fa251d92dd60907a65a4923ce72de7f86c9a62 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 25 Sep 2016 10:23:34 +0200 Subject: [PATCH 011/467] Changed: Moved init code in sheets_packer.cpp Changed: Expand environment variables for other variables too Changed: Don't create log.log Changed: Added missing AGPL headers --HG-- branch : develop --- .../tools/sheets_packer/sheets_packer.cpp | 68 +++++++--- .../sheets_packer/sheets_packer_init.cpp | 126 ------------------ .../tools/sheets_packer/sheets_packer_init.h | 35 ----- code/ryzom/tools/sheets_packer/stdpch.cpp | 15 +++ code/ryzom/tools/sheets_packer/stdpch.h | 27 +++- 5 files changed, 88 insertions(+), 183 deletions(-) delete mode 100644 code/ryzom/tools/sheets_packer/sheets_packer_init.cpp delete mode 100644 code/ryzom/tools/sheets_packer/sheets_packer_init.h diff --git a/code/ryzom/tools/sheets_packer/sheets_packer.cpp b/code/ryzom/tools/sheets_packer/sheets_packer.cpp index ce4467137..25e53b57c 100644 --- a/code/ryzom/tools/sheets_packer/sheets_packer.cpp +++ b/code/ryzom/tools/sheets_packer/sheets_packer.cpp @@ -21,17 +21,11 @@ // INCLUDES // ////////////// #include "stdpch.h" -// Misc. -#include "nel/misc/types_nl.h" -#include "nel/misc/debug.h" -#if defined(NL_OS_WINDOWS) -#include -#include -#endif - -// Client -#include "sheets_packer_init.h" +// Application +#include "sheets_packer_cfg.h" +#include "sheet_manager.h" +#include "continent_manager_build.h" /////////// @@ -43,7 +37,7 @@ using namespace NLMISC; ///////////// // GLOBALS // ///////////// -static uint32 Version = 1; // Client Version. +NLLIGO::CLigoConfig LigoConfig; /////////////// @@ -72,9 +66,46 @@ int main(int argc, char **argv) // Initialize the application. // try { - // If the init fail -> return Failure. - if(!init()) - return EXIT_FAILURE; + // Add a displayer for Debug Infos, disable log.log. + createDebug(NULL, false); + + CLog::setProcessName("sheets_packer"); + + fd = new CFileDisplayer(getLogDirectory() + "sheets_packer.log", true, "SHEETS_PACKER.LOG"); + + // register ligo 'standard' class + NLLIGO::Register(); + + DebugLog->addDisplayer(fd); + InfoLog->addDisplayer(fd); + WarningLog->addDisplayer(fd); + ErrorLog->addDisplayer(fd); + AssertLog->addDisplayer(fd); + + // Load the application configuration. + nlinfo("Loading config file..."); + AppCfg.init(ConfigFileName); + + // Define the root path that contains all data needed for the application. + nlinfo("Adding search paths..."); + for (uint i = 0; i < AppCfg.DataPath.size(); i++) + CPath::addSearchPath(NLMISC::expandEnvironmentVariables(AppCfg.DataPath[i]), true, false); + + // Initialize Sheet IDs. + nlinfo("Init SheetId..."); + CSheetId::init(true); + + // load packed sheets + nlinfo("Loading sheets..."); + IProgressCallback callback; + SheetMngr.setOutputDataPath(NLMISC::expandEnvironmentVariables(AppCfg.OutputDataPath)); + SheetMngr.load(callback, true, true, AppCfg.DumpVisualSlotsIndex); + + // Make the lmconts.packed file + if (!LigoConfig.readPrimitiveClass(AppCfg.LigoPrimitiveClass.c_str(), false)) + nlwarning("Can't load primitive class file %s", AppCfg.LigoPrimitiveClass.c_str()); + NLLIGO::CPrimitiveContext::instance().CurrentLigoConfig = &LigoConfig; + buildLMConts(AppCfg.WorldSheet, NLMISC::expandEnvironmentVariables(AppCfg.PrimitivesPath), NLMISC::expandEnvironmentVariables(AppCfg.OutputDataPath)); } catch(const EFatalError &) { return EXIT_FAILURE; /* nothing to do */ } catch(const Exception &e) @@ -96,7 +127,14 @@ int main(int argc, char **argv) // Release all the memory. // try { - release(); + DebugLog->removeDisplayer("SHEETS_PACKER.LOG"); + InfoLog->removeDisplayer("SHEETS_PACKER.LOG"); + WarningLog->removeDisplayer("SHEETS_PACKER.LOG"); + ErrorLog->removeDisplayer("SHEETS_PACKER.LOG"); + AssertLog->removeDisplayer("SHEETS_PACKER.LOG"); + + if (fd) delete fd; + fd = NULL; } catch(const EFatalError &) { return EXIT_FAILURE; /* nothing to do */ } catch(const Exception &e) diff --git a/code/ryzom/tools/sheets_packer/sheets_packer_init.cpp b/code/ryzom/tools/sheets_packer/sheets_packer_init.cpp deleted file mode 100644 index 1490895c6..000000000 --- a/code/ryzom/tools/sheets_packer/sheets_packer_init.cpp +++ /dev/null @@ -1,126 +0,0 @@ -// Ryzom - MMORPG Framework -// Copyright (C) 2010 Winch Gate Property Limited -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - - - - -////////////// -// INCLUDES // -////////////// -#include "stdpch.h" -// Misc. -#include "nel/misc/debug.h" -#include "nel/misc/displayer.h" -#include "nel/misc/path.h" -#include "nel/misc/log.h" -#include "nel/misc/sheet_id.h" - -#include "nel/ligo/ligo_config.h" -#include "nel/ligo/primitive.h" -// Application -#include "sheets_packer_init.h" -#include "sheets_packer_cfg.h" -#include "sheet_manager.h" - -#include "continent_manager_build.h" - -/////////// -// USING // -/////////// -using namespace NLMISC; -//using namespace NL3D; -using namespace std; - - -///////////// -// GLOBALS // -///////////// -CFileDisplayer *fd = NULL; - -NLLIGO::CLigoConfig LigoConfig; - -/////////////// -// FUNCTIONS // -/////////////// -//--------------------------------------------------- -// init : -// Initialize the application. -// Return false if the init fails. -//--------------------------------------------------- -bool init() -{ - // Add a displayer for Debug Infos. - createDebug(); - - fd = new CFileDisplayer(getLogDirectory() + "sheets_packer.log", true, "SHEETS_PACKER.LOG"); - - // register ligo 'standard' class - NLLIGO::Register(); - - DebugLog->addDisplayer (fd); - InfoLog->addDisplayer (fd); - WarningLog->addDisplayer (fd); - ErrorLog->addDisplayer (fd); - AssertLog->addDisplayer (fd); - - // Load the application configuration. - nlinfo("Loading config file..."); - AppCfg.init(ConfigFileName); - - // Define the root path that contains all data needed for the application. - nlinfo("Adding search paths..."); - for(uint i = 0; i < AppCfg.DataPath.size(); i++) - CPath::addSearchPath(NLMISC::expandEnvironmentVariables(AppCfg.DataPath[i]), true, false); - - // Initialize Sheet IDs. - nlinfo("Init SheetId..."); - CSheetId::init(true); - - // load packed sheets - nlinfo("Loading sheets..."); - IProgressCallback callback; - SheetMngr.setOutputDataPath(AppCfg.OutputDataPath); - SheetMngr.load (callback, true, true, AppCfg.DumpVisualSlotsIndex); - - // Make the lmconts.packed file - if (!LigoConfig.readPrimitiveClass (AppCfg.LigoPrimitiveClass.c_str(), false)) - nlwarning ("Can't load primitive class file %s", AppCfg.LigoPrimitiveClass.c_str()); - NLLIGO::CPrimitiveContext::instance().CurrentLigoConfig = &LigoConfig; - buildLMConts(AppCfg.WorldSheet, AppCfg.PrimitivesPath, AppCfg.OutputDataPath); - - // The init is a success. - return true; -}// init // - -//--------------------------------------------------- -// release : -// Release all the memory. -//--------------------------------------------------- -void release() -{ - DebugLog->removeDisplayer ("SHEETS_PACKER.LOG"); - InfoLog->removeDisplayer ("SHEETS_PACKER.LOG"); - WarningLog->removeDisplayer ("SHEETS_PACKER.LOG"); - ErrorLog->removeDisplayer ("SHEETS_PACKER.LOG"); - AssertLog->removeDisplayer ("SHEETS_PACKER.LOG"); - - delete fd; - fd = NULL; -}// release // - -void outputSomeDebugInfoForPackedSheetCrash() -{ -} diff --git a/code/ryzom/tools/sheets_packer/sheets_packer_init.h b/code/ryzom/tools/sheets_packer/sheets_packer_init.h deleted file mode 100644 index 4015679ea..000000000 --- a/code/ryzom/tools/sheets_packer/sheets_packer_init.h +++ /dev/null @@ -1,35 +0,0 @@ -// Ryzom - MMORPG Framework -// Copyright (C) 2010 Winch Gate Property Limited -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - - - - -#ifndef TL_SHEETS_PACKER_INIT_H -#define TL_SHEETS_PACKER_INIT_H - - - -#include "nel/misc/types_nl.h" - -// Initialize the application. -bool init(); - -// Release all. -void release(); - -#endif // TL_SHEETS_PACKER_INIT_H - -/* End of sheets_packer_init.h */ diff --git a/code/ryzom/tools/sheets_packer/stdpch.cpp b/code/ryzom/tools/sheets_packer/stdpch.cpp index 99215b203..a3d45576c 100644 --- a/code/ryzom/tools/sheets_packer/stdpch.cpp +++ b/code/ryzom/tools/sheets_packer/stdpch.cpp @@ -1,2 +1,17 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "stdpch.h" diff --git a/code/ryzom/tools/sheets_packer/stdpch.h b/code/ryzom/tools/sheets_packer/stdpch.h index a8f68441a..5938546dc 100644 --- a/code/ryzom/tools/sheets_packer/stdpch.h +++ b/code/ryzom/tools/sheets_packer/stdpch.h @@ -1,3 +1,22 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +#ifndef STDPCH_H +#define STDPCH_H + #include #include @@ -12,11 +31,9 @@ #include #include #include -//#include #include #include #include -#include #include #include @@ -36,8 +53,4 @@ #include #include -#ifdef NL_OS_WINDOWS -#define NOMINMAX -#include -#include -#endif // NL_OS_WINDOWS +#endif From 72ed8b2c614ac98bd73369f35fc72fe440846f68 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 25 Sep 2016 10:23:57 +0200 Subject: [PATCH 012/467] Changed: Client directory already processed --HG-- branch : develop --- code/ryzom/tools/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/ryzom/tools/CMakeLists.txt b/code/ryzom/tools/CMakeLists.txt index 2c4118e24..9061d1e0f 100644 --- a/code/ryzom/tools/CMakeLists.txt +++ b/code/ryzom/tools/CMakeLists.txt @@ -43,9 +43,6 @@ ADD_SUBDIRECTORY(server) #test_files #build_data -# Folders with subfolders, TODO -#client - # folders not handled yet. #connection_stats #reynolds From 4b4b3211691791bee617ba80a23be79c86b662eb Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 25 Sep 2016 10:24:51 +0200 Subject: [PATCH 013/467] Changed: Allow to compile Ryzom tools even without MySQL (mysql client library has compilation problems with VC++ 2015) --HG-- branch : develop --- code/ryzom/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt index 46c8bcb68..5ce811872 100644 --- a/code/ryzom/CMakeLists.txt +++ b/code/ryzom/CMakeLists.txt @@ -13,6 +13,8 @@ ADD_SUBDIRECTORY(client) IF(WITH_RYZOM_SERVER OR WITH_RYZOM_TOOLS) # Need servershare for build packed collision tool # Need aishare for build wmap tool - FIND_PACKAGE(MySQL REQUIRED) - ADD_SUBDIRECTORY(server) + FIND_PACKAGE(MySQL) + IF(MYSQL_FOUND) + ADD_SUBDIRECTORY(server) + ENDIF() ENDIF() From a41ae065d8f38e5cf8ea732aacd48da590378920 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 25 Sep 2016 10:49:55 +0200 Subject: [PATCH 014/467] Changed: Remove alternative formats for parameters (too verbose) --HG-- branch : develop --- code/nel/src/misc/cmd_args.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/nel/src/misc/cmd_args.cpp b/code/nel/src/misc/cmd_args.cpp index d9370b831..04cdec4eb 100644 --- a/code/nel/src/misc/cmd_args.cpp +++ b/code/nel/src/misc/cmd_args.cpp @@ -443,7 +443,6 @@ void CCmdArgs::displayHelp() if (!arg.helpName.empty()) { syntaxes.push_back(toString("-%s <%s>", arg.shortName.c_str(), arg.helpName.c_str())); - syntaxes.push_back(toString("-%s<%s>", arg.shortName.c_str(), arg.helpName.c_str())); } else { @@ -459,12 +458,6 @@ void CCmdArgs::displayHelp() // display first syntax for long argument, --arg syntaxes.push_back(toString("--%s <%s>", arg.longName.c_str(), arg.helpName.c_str())); } - - if (!arg.helpName.empty()) - { - // display second syntax for long argument, --arg= - syntaxes.push_back(toString("--%s=<%s>", arg.longName.c_str(), arg.helpName.c_str())); - } else { syntaxes.push_back(toString("--%s", arg.longName.c_str())); From 07ddb63d61a85b8952cbaeed266c50ad71e88e7a Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 25 Sep 2016 10:50:13 +0200 Subject: [PATCH 015/467] Changed: Add a new line after description --HG-- branch : develop --- code/nel/src/misc/cmd_args.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/src/misc/cmd_args.cpp b/code/nel/src/misc/cmd_args.cpp index 04cdec4eb..6ec3fd485 100644 --- a/code/nel/src/misc/cmd_args.cpp +++ b/code/nel/src/misc/cmd_args.cpp @@ -418,7 +418,7 @@ void CCmdArgs::displayHelp() if (!_Description.empty()) { - printf("\n%s", _Description.c_str()); + printf("\n%s\n", _Description.c_str()); } printf("\nWhere options are:\n"); From 2fc39bc14d63df3af094b5424d7c33ca2cd1a38d Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 25 Sep 2016 14:17:30 +0200 Subject: [PATCH 016/467] Added: Missing files from data_common.bnp --HG-- branch : compatibility-develop --- .../landscape_col_prim_pacs_list.txt | 493 +++ .../data_common/r2/IslandScreenshots.cfg | 27 + .../common/data_common/r2/r2_entry_points.txt | 1068 +++++++ .../common/data_common/r2/r2_islands.xml | 2847 +++++++++++++++++ code/ryzom/common/data_common/visual_slot.tab | Bin 0 -> 9972 bytes code/ryzom/common/data_common/weather.cfg | 14 + 6 files changed, 4449 insertions(+) create mode 100644 code/ryzom/common/data_common/landscape_col_prim_pacs_list.txt create mode 100644 code/ryzom/common/data_common/r2/IslandScreenshots.cfg create mode 100644 code/ryzom/common/data_common/r2/r2_entry_points.txt create mode 100644 code/ryzom/common/data_common/r2/r2_islands.xml create mode 100644 code/ryzom/common/data_common/visual_slot.tab create mode 100644 code/ryzom/common/data_common/weather.cfg diff --git a/code/ryzom/common/data_common/landscape_col_prim_pacs_list.txt b/code/ryzom/common/data_common/landscape_col_prim_pacs_list.txt new file mode 100644 index 000000000..a1e4fb801 --- /dev/null +++ b/code/ryzom/common/data_common/landscape_col_prim_pacs_list.txt @@ -0,0 +1,493 @@ +FY_S1_baobab_A.pacs_prim +FY_S1_baobab_B.pacs_prim +FY_S1_baobab_C.pacs_prim +FY_S1_burnedtree_A.pacs_prim +FY_S1_burnedtree_B.pacs_prim +FY_S2_coconuts_A.pacs_prim +FY_S2_coconuts_B.pacs_prim +FY_S2_palmtree_A.pacs_prim +FY_S2_palmtree_B.pacs_prim +FY_S2_palmtree_C.pacs_prim +FY_S2_palmtree_D.pacs_prim +FY_S2_palmtree_E.pacs_prim +FY_S3_Termitiere_A.pacs_prim +FY_S3_Termitiere_B.pacs_prim +FY_S3_Termitiere_C.pacs_prim +FY_S3_Termitiere_D.pacs_prim +fy_acc_asc_appart_joueur.pacs_prim +fy_acc_asc_hall_conseil.pacs_prim +fy_acc_asc_hall_vitrine_hall_reunion_rdc_1.pacs_prim +fy_acc_asc_hall_vitrine_hall_reunion_rdc_2.pacs_prim +fy_acc_asc_hall_vitrine_hall_reunion_ss_1.pacs_prim +fy_acc_asc_hall_vitrine_hall_reunion_ss_2.pacs_prim +fy_acc_asc_hall_vitrine_hall_reunion_ss_3.pacs_prim +fy_acc_asc_hall_vitrine_hall_reunion_ss_4.pacs_prim +fy_acc_asc_oasis_1er.pacs_prim +fy_acc_asc_oasis_rdc.pacs_prim +fy_acc_asc_salle_npc.pacs_prim +fy_acc_ascenseur_01_city.pacs_prim +fy_acc_ascenseur_01_war.pacs_prim +fy_acc_ascenseur_02_city.pacs_prim +fy_acc_ascenseur_02_war.pacs_prim +fy_acc_ascenseur_03_city.pacs_prim +fy_acc_ascenseur_04_city.pacs_prim +fy_acc_ascenseur_05_city.pacs_prim +fy_acc_ascenseur_06_city.pacs_prim +fy_acc_ascenseur_07_city.pacs_prim +fy_acc_ascenseur_08_city.pacs_prim +fy_acc_ascenseur_09_city.pacs_prim +fy_acc_ascenseur_10_city.pacs_prim +fy_acc_ascenseur_11_city.pacs_prim +fy_acc_ascenseur_12_city.pacs_prim +fy_asc_151_dy.pacs_prim +fy_asc_161_dy.pacs_prim +fy_asc_164_eg.pacs_prim +fy_asc_168_ew.pacs_prim +fy_asc_1porte.pacs_prim +fy_asc_fortress_1er.pacs_prim +fy_asc_fortress_rdc.pacs_prim +fy_asc_village_nb01.pacs_prim +fy_asc_village_nb02.pacs_prim +fy_asc_village_nb03.pacs_prim +fy_asc_village_nb04.pacs_prim +fy_asc_village_nb05.pacs_prim +fy_bt_sheriff_ok_ascen_1er.pacs_prim +fy_bt_sheriff_ok_ascen_rdc.pacs_prim +fy_bt_sheriff_ok_elevator_armurie_1er.pacs_prim +fy_bt_sheriff_ok_elevator_armurie_rdc.pacs_prim +fy_ecorce_collision.pacs_prim +fy_s1_burnedtree_c.pacs_prim +fy_s1_burnedtree_d.pacs_prim +fy_s1_burnedtree_growth_a.pacs_prim +fy_s1_burnedtree_growth_b.pacs_prim +fy_s2_lovejail_a.pacs_prim +fy_s2_lovejail_b.pacs_prim +fy_s2_lovejail_c.pacs_prim +fy_s2_papaleaf_a.pacs_prim +fy_s2_papaleaf_b.pacs_prim +fy_s2_savantree_a.pacs_prim +fy_s2_savantree_b.pacs_prim +fy_s2_savantree_c.pacs_prim +fy_s2_savantree_d.pacs_prim +fy_smoke_elevateur_1er.pacs_prim +fy_smoke_elevateur_rdc.pacs_prim +FO_S1_giant_tree.pacs_prim +FO_S1_giant_trunk.pacs_prim +FO_S2_arbragrelot.pacs_prim +FO_S2_big_tree.pacs_prim +FO_S2_bigroot_A.pacs_prim +FO_S2_bigroot_B.pacs_prim +FO_S2_bigroot_C.pacs_prim +FO_S2_birch.pacs_prim +FO_S2_spiketree.pacs_prim +FO_S3_birch.pacs_prim +FO_S3_buissonaepine.pacs_prim +FO_S3_champignou_A.pacs_prim +FO_S3_champignou_B.pacs_prim +FO_S3_fougere.pacs_prim +JU_S1_bamboo.pacs_prim +JU_S1_canopy_tree.pacs_prim +JU_S2_big_tree.pacs_prim +JU_S2_young_tree.pacs_prim +JU_S3_Banana_tree.pacs_prim +JU_S3_Bush_tree.pacs_prim +JU_S3_bamboo.pacs_prim +JU_S3_dead_tree.pacs_prim +JU_S3_fantree.pacs_prim +JU_S3_plante.pacs_prim +JU_S3_plantegrasse.pacs_prim +JU_S3_tree.pacs_prim +Ma_barriere_A_02.pacs_prim +Ma_barriere_B_02.pacs_prim +fo_s1_arbragrelot.pacs_prim +gen_bt_col_ext.pacs_prim +ma_asc_17_portal_trykers.pacs_prim +ma_asc_3portes.pacs_prim +ma_asc_3portes_bourgeons.pacs_prim +ma_asc_6_portal_prime_racine.pacs_prim +ma_asc_appart_joueur.pacs_prim +ma_asc_hall_du_conseil.pacs_prim +ma_asc_hall_vitrine_hall_reunion_1ss_d.pacs_prim +ma_asc_hall_vitrine_hall_reunion_1ss_g.pacs_prim +ma_asc_hall_vitrine_hall_reunion_rdc_d.pacs_prim +ma_asc_hall_vitrine_hall_reunion_rdc_g.pacs_prim +ma_asc_hall_vitrine_hall_reunion_ss_d.pacs_prim +ma_asc_hall_vitrine_hall_reunion_ss_g.pacs_prim +ma_asc_nb_01_a.pacs_prim +ma_asc_nb_01_b.pacs_prim +ma_asc_nb_01_c.pacs_prim +ma_asc_nb_02_a.pacs_prim +ma_asc_nb_02_b.pacs_prim +ma_asc_nb_02_c.pacs_prim +ma_asc_nb_03_a.pacs_prim +ma_asc_nb_03_b.pacs_prim +ma_asc_nb_03_c.pacs_prim +ma_asc_nb_04_a.pacs_prim +ma_asc_nb_04_b.pacs_prim +ma_asc_nb_04_c.pacs_prim +ma_asc_nb_05_a.pacs_prim +ma_asc_nb_05_b.pacs_prim +ma_asc_nb_05_c.pacs_prim +ma_asc_plateau-frontiere-2.pacs_prim +ma_asc_salle_npc.pacs_prim +ma_asc_village_a_bar_ext_1.pacs_prim +ma_asc_village_a_bar_ext_2.pacs_prim +ma_asc_village_a_bar_int_1.pacs_prim +ma_asc_village_a_bar_int_2.pacs_prim +ma_asc_village_a_imm1_a.pacs_prim +ma_asc_village_a_imm1_b.pacs_prim +ma_asc_village_a_imm1_c.pacs_prim +ma_asc_village_a_imm2_a.pacs_prim +ma_asc_village_a_imm2_b.pacs_prim +ma_asc_village_a_imm2_c.pacs_prim +ma_asc_village_a_imm3_a.pacs_prim +ma_asc_village_a_imm3_b.pacs_prim +ma_asc_village_a_imm3_c.pacs_prim +ma_asc_village_a_imm4_a.pacs_prim +ma_asc_village_a_imm4_b.pacs_prim +ma_asc_village_a_imm4_c.pacs_prim +ma_asc_village_a_mairie_1er.pacs_prim +ma_asc_village_a_mairie_rdc.pacs_prim +ma_asc_village_a_serre_1.pacs_prim +ma_asc_village_a_serre_2.pacs_prim +ma_asc_village_a_serre_npc1.pacs_prim +ma_asc_village_a_serre_npc2.pacs_prim +ma_asc_village_b_bar_ext_1.pacs_prim +ma_asc_village_b_bar_ext_2.pacs_prim +ma_asc_village_b_bar_int_1.pacs_prim +ma_asc_village_b_bar_int_2.pacs_prim +ma_asc_village_b_imm1_a.pacs_prim +ma_asc_village_b_imm1_b.pacs_prim +ma_asc_village_b_imm1_c.pacs_prim +ma_asc_village_b_imm2_a.pacs_prim +ma_asc_village_b_imm2_b.pacs_prim +ma_asc_village_b_imm2_c.pacs_prim +ma_asc_village_b_mairie_1er.pacs_prim +ma_asc_village_b_mairie_rdc.pacs_prim +ma_asc_village_c_bar_ext_1.pacs_prim +ma_asc_village_c_bar_ext_2.pacs_prim +ma_asc_village_c_bar_int_1.pacs_prim +ma_asc_village_c_bar_int_2.pacs_prim +ma_asc_village_c_imm1_a.pacs_prim +ma_asc_village_c_imm1_b.pacs_prim +ma_asc_village_c_imm1_c.pacs_prim +ma_asc_village_c_imm2_a.pacs_prim +ma_asc_village_c_imm2_b.pacs_prim +ma_asc_village_c_imm2_c.pacs_prim +ma_asc_village_c_mairie_1er.pacs_prim +ma_asc_village_c_mairie_rdc.pacs_prim +ma_asc_village_d_bar_ext_1.pacs_prim +ma_asc_village_d_bar_ext_2.pacs_prim +ma_asc_village_d_bar_int_1.pacs_prim +ma_asc_village_d_bar_int_2.pacs_prim +ma_asc_village_d_imm1_a.pacs_prim +ma_asc_village_d_imm1_b.pacs_prim +ma_asc_village_d_imm1_c.pacs_prim +ma_asc_village_d_imm2_a.pacs_prim +ma_asc_village_d_imm2_b.pacs_prim +ma_asc_village_d_imm2_c.pacs_prim +ma_asc_village_d_mairie_1er.pacs_prim +ma_asc_village_d_mairie_rdc.pacs_prim +ma_lampadaire_blue.pacs_prim +ma_lampadaire_red.pacs_prim +ma_lampadaire_white.pacs_prim +ma_lampadaire_yellow.pacs_prim +ma_milestone.pacs_prim +ma_paneau_armure.pacs_prim +ma_paneau_melee.pacs_prim +ma_paneau_object.pacs_prim +ma_paneau_range.pacs_prim +ma_paneau_tool.pacs_prim +nx_asc_40_cg.pacs_prim +nx_asc_44_by.pacs_prim +nx_asc_51_cd.pacs_prim +zo_acc_asc-01_hall_reunion.pacs_prim +zo_acc_asc-02_hall_reunion.pacs_prim +zo_acc_asc-03_hall_reunion.pacs_prim +zo_acc_asc-04_hall_reunion.pacs_prim +zo_acc_asc-05_hall_reunion.pacs_prim +zo_acc_asc-06_hall_reunion.pacs_prim +zo_acc_asc_appart_joueur.pacs_prim +zo_acc_asc_hall_du_conseil.pacs_prim +zo_acc_asc_salle_npc.pacs_prim +zo_acc_rdc_mairie_village_c.pacs_prim +zo_acc_ss_mairie_village_c.pacs_prim +zo_acc_village_a_imm1_a.pacs_prim +zo_acc_village_a_imm1_b.pacs_prim +zo_acc_village_a_imm1_c.pacs_prim +zo_acc_village_a_imm2_a.pacs_prim +zo_acc_village_a_imm2_b.pacs_prim +zo_acc_village_a_imm2_c.pacs_prim +zo_acc_village_a_imm3_a.pacs_prim +zo_acc_village_a_imm3_b.pacs_prim +zo_acc_village_a_imm3_c.pacs_prim +zo_acc_village_a_imm4_a.pacs_prim +zo_acc_village_a_imm4_b.pacs_prim +zo_acc_village_a_imm4_c.pacs_prim +zo_acc_village_b_imm1_a.pacs_prim +zo_acc_village_b_imm1_b.pacs_prim +zo_acc_village_b_imm1_c.pacs_prim +zo_acc_village_b_imm2_a.pacs_prim +zo_acc_village_b_imm2_b.pacs_prim +zo_acc_village_b_imm2_c.pacs_prim +zo_acc_village_c_imm1_a.pacs_prim +zo_acc_village_c_imm1_b.pacs_prim +zo_acc_village_c_imm1_c.pacs_prim +zo_acc_village_c_imm2_a.pacs_prim +zo_acc_village_c_imm2_b.pacs_prim +zo_acc_village_c_imm2_c.pacs_prim +zo_acc_village_d_imm1_a.pacs_prim +zo_acc_village_d_imm1_b.pacs_prim +zo_acc_village_d_imm1_c.pacs_prim +zo_acc_village_d_imm2_a.pacs_prim +zo_acc_village_d_imm2_b.pacs_prim +zo_acc_village_d_imm2_c.pacs_prim +zo_asc_13_cp.pacs_prim +zo_asc_15_by.pacs_prim +zo_asc_29_cq.pacs_prim +zo_asc_2portes.pacs_prim +zo_asc_nb_01_a.pacs_prim +zo_asc_nb_01_b.pacs_prim +zo_asc_nb_01_c.pacs_prim +zo_asc_nb_02_a.pacs_prim +zo_asc_nb_02_b.pacs_prim +zo_asc_nb_02_c.pacs_prim +zo_asc_nb_03_a.pacs_prim +zo_asc_nb_03_b.pacs_prim +zo_asc_nb_03_c.pacs_prim +zo_asc_nb_04_a.pacs_prim +zo_asc_nb_04_b.pacs_prim +zo_asc_nb_04_c.pacs_prim +zo_asc_nb_05_a.pacs_prim +zo_asc_nb_05_b.pacs_prim +zo_asc_nb_05_c.pacs_prim +zo_asc_plateau-frontiere-13_br.pacs_prim +zo_asc_village_a_rdc.pacs_prim +zo_asc_village_a_ss.pacs_prim +zo_asc_village_b_rdc.pacs_prim +zo_asc_village_b_ss.pacs_prim +zo_asc_village_d_rdc.pacs_prim +zo_asc_village_d_ss.pacs_prim +zo_lampadaire_black.pacs_prim +zo_lampadaire_blue.pacs_prim +zo_lampadaire_green.pacs_prim +zo_lampadaire_yellow.pacs_prim +zo_paneau_armure.pacs_prim +zo_paneau_melee.pacs_prim +zo_paneau_object.pacs_prim +zo_paneau_range.pacs_prim +zo_paneau_tool.pacs_prim +tr_asc_186_ep.pacs_prim +tr_asc_187_ea.pacs_prim +tr_asc_188_ed.pacs_prim +tr_asc_192_ea.pacs_prim +tr_asc_193_ec.pacs_prim +tr_asc_194_dy.pacs_prim +tr_asc_194_el.pacs_prim +tr_asc_194_eo.pacs_prim +tr_asc_196_ea.pacs_prim +tr_asc_197_ds.pacs_prim +tr_asc_198_dq.pacs_prim +tr_asc_1porte.pacs_prim +tr_asc_201_dq.pacs_prim +tr_asc_201_dt.pacs_prim +tr_asc_203_di.pacs_prim +tr_asc_208_dl.pacs_prim +tr_asc_208_ek.pacs_prim +tr_asc_210_el.pacs_prim +tr_asc_212_dm.pacs_prim +tr_asc_214_dw.pacs_prim +tr_asc_214_ea.pacs_prim +tr_asc_215_du.pacs_prim +tr_asc_217_ec.pacs_prim +tr_asc_appart_joueur.pacs_prim +tr_asc_hall_conseil.pacs_prim +tr_asc_hall_vitrine_hall_reunion_rdc_1.pacs_prim +tr_asc_hall_vitrine_hall_reunion_rdc_2.pacs_prim +tr_asc_hall_vitrine_hall_reunion_ss_1.pacs_prim +tr_asc_hall_vitrine_hall_reunion_ss_2.pacs_prim +tr_asc_hall_vitrine_hall_reunion_ss_3.pacs_prim +tr_asc_salle_npc.pacs_prim +tr_asc_saucisse_fond_ilot_4_a.pacs_prim +tr_asc_saucisse_fond_ilot_4_b.pacs_prim +tr_asc_saucisse_fond_ilot_4_c.pacs_prim +tr_asc_saucisse_fond_ilot_4_d.pacs_prim +tr_asc_saucisse_fond_ilot_4_e.pacs_prim +tr_asc_saucisse_fond_ilot_4_f.pacs_prim +tr_asc_saucisse_village_nb01_a.pacs_prim +tr_asc_saucisse_village_nb01_b.pacs_prim +tr_asc_saucisse_village_nb01_c.pacs_prim +tr_asc_saucisse_village_nb01_d.pacs_prim +tr_asc_saucisse_village_nb01_e.pacs_prim +tr_asc_saucisse_village_nb01_f.pacs_prim +tr_asc_saucisse_village_nb02_a.pacs_prim +tr_asc_saucisse_village_nb02_b.pacs_prim +tr_asc_saucisse_village_nb02_c.pacs_prim +tr_asc_saucisse_village_nb02_d.pacs_prim +tr_asc_saucisse_village_nb02_e.pacs_prim +tr_asc_saucisse_village_nb02_f.pacs_prim +tr_asc_saucisse_village_nb03_a.pacs_prim +tr_asc_saucisse_village_nb03_b.pacs_prim +tr_asc_saucisse_village_nb03_c.pacs_prim +tr_asc_saucisse_village_nb03_d.pacs_prim +tr_asc_saucisse_village_nb03_e.pacs_prim +tr_asc_saucisse_village_nb03_f.pacs_prim +tr_asc_saucisse_village_nb04_a.pacs_prim +tr_asc_saucisse_village_nb04_b.pacs_prim +tr_asc_saucisse_village_nb04_c.pacs_prim +tr_asc_saucisse_village_nb04_d.pacs_prim +tr_asc_saucisse_village_nb04_e.pacs_prim +tr_asc_saucisse_village_nb04_f.pacs_prim +tr_asc_saucisse_village_nb05_a.pacs_prim +tr_asc_saucisse_village_nb05_b.pacs_prim +tr_asc_saucisse_village_nb05_c.pacs_prim +tr_asc_saucisse_village_nb05_d.pacs_prim +tr_asc_saucisse_village_nb05_e.pacs_prim +tr_asc_saucisse_village_nb05_f.pacs_prim +tr_mairie_asc_00_village_a.pacs_prim +tr_mairie_asc_01_village_a.pacs_prim +tr_mairie_asc_01_village_b.pacs_prim +tr_mairie_asc_01_village_d.pacs_prim +tr_mairie_asc_02_village_a.pacs_prim +tr_mairie_asc_02_village_b.pacs_prim +tr_mairie_asc_02_village_d.pacs_prim +tr_mairie_asc_03_village_a.pacs_prim +tr_mairie_asc_03_village_b.pacs_prim +tr_mairie_asc_03_village_d.pacs_prim +tr_mairie_asc_04_village_a.pacs_prim +tr_mairie_asc_04_village_b.pacs_prim +tr_mairie_asc_04_village_d.pacs_prim +tr_mairie_asc_05_village_a.pacs_prim +tr_mairie_asc_05_village_b.pacs_prim +tr_mairie_asc_05_village_d.pacs_prim +tr_mairie_asc_06_village_a.pacs_prim +tr_mairie_asc_06_village_b.pacs_prim +tr_mairie_asc_06_village_d.pacs_prim +tr_mairie_asc_07_village_a.pacs_prim +tr_mairie_asc_07_village_b.pacs_prim +tr_mairie_asc_07_village_d.pacs_prim +tr_mairie_asc_08_village_b.pacs_prim +tr_mairie_asc_08_village_d.pacs_prim +tr_mairie_ascr_01_village_c.pacs_prim +tr_mairie_ascr_02_village_c.pacs_prim +tr_mairie_ascr_03_village_c.pacs_prim +tr_mairie_ascr_04_village_c.pacs_prim +tr_mairie_ascr_05_village_c.pacs_prim +tr_mairie_ascr_06_village_c.pacs_prim +tr_mairie_ascr_07_village_c.pacs_prim +tr_mairie_ascr_08_village_c.pacs_prim +tr_s1_bambo_a.pacs_prim +tr_s1_bamboo_a.pacs_prim +tr_s2_bamboo_a.pacs_prim +tr_s2_champiflot_a.pacs_prim +tr_s2_lokness_a.pacs_prim +tr_s2_lokness_b.pacs_prim +tr_s2_lokness_c.pacs_prim +tr_s2_mangrove_a.pacs_prim +tr_s2_mangrove_b.pacs_prim +tr_s2_nenufly_a.pacs_prim +tr_s2_palmtree_a.pacs_prim +tr_s2_palmtree_b.pacs_prim +tr_s2_palmtree_c.pacs_prim +tr_s2_palmtree_d.pacs_prim +tr_s2_palmtree_e.pacs_prim +tr_s2_palmtree_f.pacs_prim +tr_s2_sailtree_a.pacs_prim +tr_s2_wigweed_a.pacs_prim +tr_s3_aquabole_a.pacs_prim +tr_s3_aquabole_b.pacs_prim +tr_s3_nenufly_b.pacs_prim +tr_saucisse_asc01_01_village_a.pacs_prim +tr_saucisse_asc01_01_village_d.pacs_prim +tr_saucisse_asc01_02_village_a.pacs_prim +tr_saucisse_asc01_02_village_d.pacs_prim +tr_saucisse_asc01_03_village_a.pacs_prim +tr_saucisse_asc01_04_village_a.pacs_prim +tr_saucisse_asc01_village_a.pacs_prim +tr_saucisse_asc01_village_b.pacs_prim +tr_saucisse_asc02_01_village_d.pacs_prim +tr_saucisse_asc02_02_village_a.pacs_prim +tr_saucisse_asc02_02_village_d.pacs_prim +tr_saucisse_asc02_03_village_a.pacs_prim +tr_saucisse_asc02_04_village_a.pacs_prim +tr_saucisse_asc02_village_a.pacs_prim +tr_saucisse_asc02_village_b.pacs_prim +tr_saucisse_asc03_01_village_d.pacs_prim +tr_saucisse_asc03_02_village_a.pacs_prim +tr_saucisse_asc03_02_village_d.pacs_prim +tr_saucisse_asc03_03_village_a.pacs_prim +tr_saucisse_asc03_04_village_a.pacs_prim +tr_saucisse_asc03_village_a.pacs_prim +tr_saucisse_asc03_village_b.pacs_prim +tr_saucisse_asc04_01_village_d.pacs_prim +tr_saucisse_asc04_02_village_a.pacs_prim +tr_saucisse_asc04_02_village_d.pacs_prim +tr_saucisse_asc04_03_village_a.pacs_prim +tr_saucisse_asc04_04_village_a.pacs_prim +tr_saucisse_asc04_village_a.pacs_prim +tr_saucisse_asc04_village_b.pacs_prim +tr_saucisse_asc05_01_village_d.pacs_prim +tr_saucisse_asc05_02_village_a.pacs_prim +tr_saucisse_asc05_02_village_d.pacs_prim +tr_saucisse_asc05_03_village_a.pacs_prim +tr_saucisse_asc05_04_village_a.pacs_prim +tr_saucisse_asc05_village_a.pacs_prim +tr_saucisse_asc05_village_b.pacs_prim +tr_saucisse_asc06_01_village_d.pacs_prim +tr_saucisse_asc06_02_village_a.pacs_prim +tr_saucisse_asc06_02_village_d.pacs_prim +tr_saucisse_asc06_03_village_a.pacs_prim +tr_saucisse_asc06_04_village_a.pacs_prim +tr_saucisse_asc06_village_b.pacs_prim +tr_saucisse_asc_01_app_02_village_c.pacs_prim +tr_saucisse_asc_02_app_02_village_c.pacs_prim +tr_saucisse_asc_03_app_02_village_c.pacs_prim +tr_saucisse_asc_04_app_02_village_c.pacs_prim +tr_saucisse_asc_05_app_02_village_c.pacs_prim +tr_saucisse_asc_06_app_02_village_c.pacs_prim +tr_saucisse_asr01_02_village_b.pacs_prim +tr_saucisse_asr02_02_village_b.pacs_prim +tr_saucisse_asr03_02_village_b.pacs_prim +tr_saucisse_asr04_02_village_b.pacs_prim +tr_saucisse_asr05_02_village_b.pacs_prim +tr_saucisse_asr06_02_village_b.pacs_prim +tr_saucisse_asr_01_app_01_village_c.pacs_prim +tr_saucisse_asr_02_app_01_village_c.pacs_prim +tr_saucisse_asr_03_app_01_village_c.pacs_prim +tr_saucisse_asr_04_app_01_village_c.pacs_prim +tr_saucisse_asr_05_app_01_village_c.pacs_prim +tr_saucisse_asr_06_app_01_village_c.pacs_prim +PR_S1_rotaflore_A.pacs_prim +PR_S1_rotaflore_B.pacs_prim +PR_S1_rotaflore_C.pacs_prim +PR_S2_Mycotree_A.pacs_prim +PR_S2_Mycotree_B.pacs_prim +PR_S2_Toopetz_A.pacs_prim +PR_S2_Toopetz_B.pacs_prim +PR_S2_Toopetz_C.pacs_prim +PR_S3_cokamool_A.pacs_prim +PR_S3_cokamool_B.pacs_prim +PR_S3_cokamool_C.pacs_prim +PR_S3_ploomweed_A.pacs_prim +PR_S3_ploomweed_B.pacs_prim +pr_asc_104_bi.pacs_prim +pr_asc_105_bs.pacs_prim +pr_asc_61_bj.pacs_prim +pr_asc_62_ai.pacs_prim +pr_asc_62_av.pacs_prim +pr_asc_70_ae.pacs_prim +pr_asc_71_au.pacs_prim +pr_asc_77_bp.pacs_prim +pr_asc_89_ar.pacs_prim +pr_asc_91_ad.pacs_prim +pr_s1_lumiseed_a.pacs_prim +pr_s1_lumiseed_b.pacs_prim +pr_s1_lumiseed_c.pacs_prim +pr_s1_lumiseed_d.pacs_prim +pr_s3_amoeba_a.pacs_prim +pr_s3_amoeba_b.pacs_prim +pr_s3_amoeba_c.pacs_prim +pr_s3_small_lumiseed_a.pacs_prim +pr_s3_small_lumiseed_b.pacs_prim +ma_asc_to_kitiniere.pacs_prim +pr_asc_kitiniere.pacs_prim diff --git a/code/ryzom/common/data_common/r2/IslandScreenshots.cfg b/code/ryzom/common/data_common/r2/IslandScreenshots.cfg new file mode 100644 index 000000000..a2360f996 --- /dev/null +++ b/code/ryzom/common/data_common/r2/IslandScreenshots.cfg @@ -0,0 +1,27 @@ +SearchPaths = +{ + "r:/code/ryzom/data_common/r2", // entry points file + "R:/code/ryzom/data_shard/collisions", + "F:/r2 daily", +}; + +Continents = {"r2_jungle", "r2_forest", "r2_lakes", "r2_desert","r2_roots"}; + +SeasonSuffixes = { "_sp"}; //{ "_sp", "_su", "_au", "_wi" }; + +MeterPixelSize = 2; + +OutDir = "F:/perso/code/HelloWorld/Affichage/Final"; + +CompleteIslandsFile= "r2_islands.xml"; + +EntryPointsFile= "r2_entry_points.txt"; + +Vegetation = true; + +InverseZTest = true; + + + + + diff --git a/code/ryzom/common/data_common/r2/r2_entry_points.txt b/code/ryzom/common/data_common/r2/r2_entry_points.txt new file mode 100644 index 000000000..643a416c7 --- /dev/null +++ b/code/ryzom/common/data_common/r2/r2_entry_points.txt @@ -0,0 +1,1068 @@ +a1 uiR2_Lakes01 uiR2EntryPoint01 31346 -1310 N +a1 uiR2_Lakes01 uiR2EntryPoint02 31269 -1238 E +a1 uiR2_Lakes01 uiR2EntryPoint03 31456 -1379 N + +a1 uiR2_Lakes07 uiR2EntryPoint01 36264 -1103 S +a1 uiR2_Lakes07 uiR2EntryPoint02 36208 -1353 N +a1 uiR2_Lakes07 uiR2EntryPoint03 36478 -1269 W +a1 uiR2_Lakes07 uiR2EntryPoint04 36478 -1105 SW + +a1 uiR2_Lakes22 uiR2EntryPoint01 32250 -2800 W +a1 uiR2_Lakes22 uiR2EntryPoint02 31920 -3160 N +a1 uiR2_Lakes22 uiR2EntryPoint03 32080 -3090 N +a1 uiR2_Lakes22 uiR2EntryPoint04 32250 -3065 NE + +l1 uiR2_Lakes15 uiR2EntryPoint01 34634 -1872 SW +l1 uiR2_Lakes15 uiR2EntryPoint02 34258 -1991 W +l1 uiR2_Lakes15 uiR2EntryPoint03 34321 -1860 S +l1 uiR2_Lakes15 uiR2EntryPoint04 34510 -2060 W + +l1 uiR2_Lakes17 uiR2EntryPoint01 36150 -2310 NE +l1 uiR2_Lakes17 uiR2EntryPoint02 35936 -2243 S +l1 uiR2_Lakes17 uiR2EntryPoint03 35920 -1844 W +l1 uiR2_Lakes17 uiR2EntryPoint04 36103 -1923 SW +l1 uiR2_Lakes17 uiR2EntryPoint05 35895 -1935 S + +l1 uiR2_Lakes18 uiR2EntryPoint01 36725 -1993 E +l1 uiR2_Lakes18 uiR2EntryPoint02 36688 -2159 N +l1 uiR2_Lakes18 uiR2EntryPoint03 36879 -2217 N +l1 uiR2_Lakes18 uiR2EntryPoint04 36941 -1970 SW + +l1 uiR2_Lakes26 uiR2EntryPoint01 34460 -3120 E +l1 uiR2_Lakes26 uiR2EntryPoint02 34689 -2756 SW +l1 uiR2_Lakes26 uiR2EntryPoint03 34681 -3111 N +l1 uiR2_Lakes26 uiR2EntryPoint04 34671 -2931 N + +l1 uiR2_Lakes27 uiR2EntryPoint01 35605 -3080 NW +l1 uiR2_Lakes27 uiR2EntryPoint02 35520 -2780 S +l1 uiR2_Lakes27 uiR2EntryPoint03 35133 -2663 SE +l1 uiR2_Lakes27 uiR2EntryPoint04 35283 -3051 N + +l1 uiR2_Lakes38 uiR2EntryPoint01 36720 -3740 S +l1 uiR2_Lakes38 uiR2EntryPoint02 36751 -4024 NW +l1 uiR2_Lakes38 uiR2EntryPoint03 36230 -3767 E +l1 uiR2_Lakes38 uiR2EntryPoint04 36481 -3564 S + +l1 uiR2_Lakes39 uiR2EntryPoint01 37510 -3900 N +l1 uiR2_Lakes39 uiR2EntryPoint02 37299 -3575 SE +l1 uiR2_Lakes39 uiR2EntryPoint03 37861 -3719 W + +l2 uiR2_Lakes03 uiR2EntryPoint01 32961 -1388 N +l2 uiR2_Lakes03 uiR2EntryPoint02 32784 -1507 NE +l2 uiR2_Lakes03 uiR2EntryPoint03 33390 -1517 NW +l2 uiR2_Lakes03 uiR2EntryPoint04 33365 -916 SW +l2 uiR2_Lakes03 uiR2EntryPoint05 33033 -991 S + +l2 uiR2_Lakes08 uiR2EntryPoint01 36991 -1311 E +l2 uiR2_Lakes08 uiR2EntryPoint02 37197 -1547 NW +l2 uiR2_Lakes08 uiR2EntryPoint03 37230 -1035 S +l2 uiR2_Lakes08 uiR2EntryPoint04 37111 -1264 SE +l2 uiR2_Lakes08 uiR2EntryPoint05 37393 -1285 W + +l2 uiR2_Lakes16 uiR2EntryPoint01 35330 -2120 W +l2 uiR2_Lakes16 uiR2EntryPoint02 35180 -2010 S +l2 uiR2_Lakes16 uiR2EntryPoint03 35145 -2135 NE + +l2 uiR2_Lakes19 uiR2EntryPoint01 37681 -2167 N +l2 uiR2_Lakes19 uiR2EntryPoint02 37367 -2341 NW +l2 uiR2_Lakes19 uiR2EntryPoint03 37331 -2070 NE +l2 uiR2_Lakes19 uiR2EntryPoint04 37521 -1929 S +l2 uiR2_Lakes19 uiR2EntryPoint05 37773 -2008 W + +l2 uiR2_Lakes23 uiR2EntryPoint01 32727 -3120 W +l2 uiR2_Lakes23 uiR2EntryPoint02 32694 -2802 W +l2 uiR2_Lakes23 uiR2EntryPoint03 32523 -2995 E + +l2 uiR2_Lakes10 uiR2EntryPoint01 38531 -1379 NE +l2 uiR2_Lakes10 uiR2EntryPoint02 38962 -1092 S +l2 uiR2_Lakes10 uiR2EntryPoint03 38677 -1146 SE +l2 uiR2_Lakes10 uiR2EntryPoint04 38953 -1444 NW + +l2 uiR2_Lakes11 uiR2EntryPoint01 31531 -2280 NW +l2 uiR2_Lakes11 uiR2EntryPoint02 31517 -1946 SW +l2 uiR2_Lakes11 uiR2EntryPoint03 31107 -2130 NE +l2 uiR2_Lakes11 uiR2EntryPoint04 31203 -1938 SE +l2 uiR2_Lakes11 uiR2EntryPoint05 31358 -2065 NW + +l3 uiR2_Lakes14 uiR2EntryPoint01 33438 -2169 E +l3 uiR2_Lakes14 uiR2EntryPoint02 33562 -2128 SW +l3 uiR2_Lakes14 uiR2EntryPoint03 33590 -2230 NW + +l3 uiR2_Lakes21 uiR2EntryPoint01 31247 -2790 E +l3 uiR2_Lakes21 uiR2EntryPoint02 31128 -3031 N +l3 uiR2_Lakes21 uiR2EntryPoint03 31536 -2778 W +l3 uiR2_Lakes21 uiR2EntryPoint04 31413 -3101 NE +l3 uiR2_Lakes21 uiR2EntryPoint05 31306 -3168 NW + +l3 uiR2_Lakes31 uiR2EntryPoint01 31295 -4080 N +l3 uiR2_Lakes31 uiR2EntryPoint02 31425 -3724 SW +l3 uiR2_Lakes31 uiR2EntryPoint03 31258 -3747 SE + +l3 uiR2_Lakes04 uiR2EntryPoint01 33740 -1068 E +l3 uiR2_Lakes04 uiR2EntryPoint02 34268 -1202 W +l3 uiR2_Lakes04 uiR2EntryPoint03 34145 -1045 SW +l3 uiR2_Lakes04 uiR2EntryPoint04 33996 -1283 N +l3 uiR2_Lakes04 uiR2EntryPoint05 33691 -1206 E + +l3 uiR2_Lakes06 uiR2EntryPoint01 35468 -1272 N +l3 uiR2_Lakes06 uiR2EntryPoint02 35954 -1080 SW +l3 uiR2_Lakes06 uiR2EntryPoint03 35764 -1026 E +l3 uiR2_Lakes06 uiR2EntryPoint04 35438 -890 SE +l3 uiR2_Lakes06 uiR2EntryPoint05 35634 -1288 N + +l3 uiR2_Lakes09 uiR2EntryPoint01 37916 -1124 S +l3 uiR2_Lakes09 uiR2EntryPoint02 37709 -1451 NE +l3 uiR2_Lakes09 uiR2EntryPoint03 38149 -1051 SW +l3 uiR2_Lakes09 uiR2EntryPoint04 38073 -1412 NW + +l3 uiR2_Lakes20 uiR2EntryPoint01 38155 -2000 E +l3 uiR2_Lakes20 uiR2EntryPoint02 38290 -1813 E +l3 uiR2_Lakes20 uiR2EntryPoint03 38488 -1996 W +l3 uiR2_Lakes20 uiR2EntryPoint04 38289 -2183 S + +l4 uiR2_Lakes33 uiR2EntryPoint01 32370 -3880 N +l4 uiR2_Lakes33 uiR2EntryPoint02 32447 -3577 SE +l4 uiR2_Lakes33 uiR2EntryPoint03 32561 -3774 SW +l4 uiR2_Lakes33 uiR2EntryPoint04 32716 -3591 S +l4 uiR2_Lakes33 uiR2EntryPoint05 32721 -3914 N + +l4 uiR2_Lakes02 uiR2EntryPoint01 32059 -1392 N +l4 uiR2_Lakes02 uiR2EntryPoint02 32267 -1181 W +l4 uiR2_Lakes02 uiR2EntryPoint03 32053 -1159 SE + +l4 uiR2_Lakes05 uiR2EntryPoint01 34650 -1133 NE +l4 uiR2_Lakes05 uiR2EntryPoint02 35018 -1280 SW +l4 uiR2_Lakes05 uiR2EntryPoint03 34984 -889 SW +l4 uiR2_Lakes05 uiR2EntryPoint04 34769 -1166 NE + +l4 uiR2_Lakes12 uiR2EntryPoint01 32040 -2368 N +l4 uiR2_Lakes12 uiR2EntryPoint02 32401 -2210 SW +l4 uiR2_Lakes12 uiR2EntryPoint03 32019 -1939 S +l4 uiR2_Lakes12 uiR2EntryPoint04 31891 -2241 E + +l4 uiR2_Lakes24 uiR2EntryPoint01 33350 -3120 N +l4 uiR2_Lakes24 uiR2EntryPoint02 33200 -2865 N +l4 uiR2_Lakes24 uiR2EntryPoint03 33450 -2950 W + +l4 uiR2_Lakes34 uiR2EntryPoint01 33520 -3910 N +l4 uiR2_Lakes34 uiR2EntryPoint02 33206 -3990 W +l4 uiR2_Lakes34 uiR2EntryPoint03 33276 -3784 N +l4 uiR2_Lakes34 uiR2EntryPoint04 33619 -3638 NW +l4 uiR2_Lakes34 uiR2EntryPoint05 33335 -3829 NE + +o1 uiR2_Lakes25 uiR2EntryPoint01 33980 -3110 N +o1 uiR2_Lakes25 uiR2EntryPoint02 33900 -2990 NE +o1 uiR2_Lakes25 uiR2EntryPoint03 34105 -2760 SW + +o1 uiR2_Lakes28 uiR2EntryPoint01 36480 -3100 N +o1 uiR2_Lakes28 uiR2EntryPoint02 36146 -2679 SE +o1 uiR2_Lakes28 uiR2EntryPoint03 36324 -2871 S + +o1 uiR2_Lakes29 uiR2EntryPoint01 37500 -3110 N +o1 uiR2_Lakes29 uiR2EntryPoint02 37078 -2937 SW +o1 uiR2_Lakes29 uiR2EntryPoint03 37389 -2802 S + +o1 uiR2_Lakes30 uiR2EntryPoint01 38100 -2850 E +o1 uiR2_Lakes30 uiR2EntryPoint02 38414 -2715 S +o1 uiR2_Lakes30 uiR2EntryPoint03 38489 -3116 NW + +o1 uiR2_Lakes32 uiR2EntryPoint01 31900 -3600 E +o1 uiR2_Lakes32 uiR2EntryPoint02 32108 -3832 N +o1 uiR2_Lakes32 uiR2EntryPoint03 32112 -3672 W + +o1 uiR2_Lakes35 uiR2EntryPoint01 34200 -4080 E +o1 uiR2_Lakes35 uiR2EntryPoint02 34145 -3645 SE +o1 uiR2_Lakes35 uiR2EntryPoint03 34387 -3988 S + +o1 uiR2_Lakes36 uiR2EntryPoint01 34960 -3770 N +o1 uiR2_Lakes36 uiR2EntryPoint02 35149 -3703 SW +o1 uiR2_Lakes36 uiR2EntryPoint03 34957 -3586 S + +o1 uiR2_Lakes37 uiR2EntryPoint01 35760 -3750 N +o1 uiR2_Lakes37 uiR2EntryPoint02 35577 -3640 SE +o1 uiR2_Lakes37 uiR2EntryPoint03 35912 -3874 N +o1 uiR2_Lakes37 uiR2EntryPoint04 35902 -3589 SE + +o1 uiR2_Lakes40 uiR2EntryPoint01 38180 -3470 SE +o1 uiR2_Lakes40 uiR2EntryPoint01 38416 -3819 NE +o1 uiR2_Lakes40 uiR2EntryPoint01 38151 -3740 N + + +//z1 uiR2_Lakes13 uiR2EntryPoint01 32479 -2298 E +//z1 uiR2_Lakes13 uiR2EntryPoint02 32880 -2080 S +//z1 uiR2_Lakes13 uiR2EntryPoint03 33050 -2265 NW + +// Desert + + +a1 uiR2_Deserts03 uiR2EntryPoint01 22791 -1289 N +a1 uiR2_Deserts03 uiR2EntryPoint02 23041 -1284 NW +a1 uiR2_Deserts03 uiR2EntryPoint03 22873 -1110 SE + +a1 uiR2_Deserts21 uiR2EntryPoint01 25980 -2015 E +a1 uiR2_Deserts21 uiR2EntryPoint02 26452 -1963 W +a1 uiR2_Deserts21 uiR2EntryPoint03 26353 -1872 SW +a1 uiR2_Deserts21 uiR2EntryPoint04 26214 -1961 S + +a1 uiR2_Deserts32 uiR2EntryPoint01 28070 -2340 E +a1 uiR2_Deserts32 uiR2EntryPoint02 28240 -2719 N +a1 uiR2_Deserts32 uiR2EntryPoint03 28318 -2643 W +a1 uiR2_Deserts32 uiR2EntryPoint04 28293 -2445 W + +d1 uiR2_Deserts02 uiR2EntryPoint01 22383 -1512 N +d1 uiR2_Deserts02 uiR2EntryPoint02 22454 -1186 SW +d1 uiR2_Deserts02 uiR2EntryPoint03 22062 -1050 S +d1 uiR2_Deserts02 uiR2EntryPoint04 22072 -1289 NE + +d1 uiR2_Deserts10 uiR2EntryPoint01 28923 -1434 N +d1 uiR2_Deserts10 uiR2EntryPoint02 29217 -1371 E +d1 uiR2_Deserts10 uiR2EntryPoint03 28901 -1115 SW + +d1 uiR2_Deserts22 uiR2EntryPoint01 26950 -2015 N +d1 uiR2_Deserts22 uiR2EntryPoint02 26937 -1864 S +d1 uiR2_Deserts22 uiR2EntryPoint03 27089 -2042 NW + +d1 uiR2_Deserts23 uiR2EntryPoint01 27600 -1924 S +d1 uiR2_Deserts23 uiR2EntryPoint02 27575 -2351 NW +d1 uiR2_Deserts23 uiR2EntryPoint03 27545 -2211 N +d1 uiR2_Deserts23 uiR2EntryPoint04 27442 -1866 S + +d1 uiR2_Deserts28 uiR2EntryPoint01 25050 -2650 S +d1 uiR2_Deserts28 uiR2EntryPoint02 24910 -2819 E +d1 uiR2_Deserts28 uiR2EntryPoint03 24881 -2720 N +d1 uiR2_Deserts28 uiR2EntryPoint04 24915 -2511 SW + +d1 uiR2_Deserts29 uiR2EntryPoint01 25880 -2630 E +d1 uiR2_Deserts29 uiR2EntryPoint02 26022 -2374 SW +d1 uiR2_Deserts29 uiR2EntryPoint03 26156 -2560 N +d1 uiR2_Deserts29 uiR2EntryPoint04 26163 -2402 S + +d1 uiR2_Deserts31 uiR2EntryPoint01 27760 -2700 N +d1 uiR2_Deserts31 uiR2EntryPoint02 27404 -2588 S +d1 uiR2_Deserts31 uiR2EntryPoint03 27538 -2606 S +d1 uiR2_Deserts31 uiR2EntryPoint04 27413 -2744 NE + +d1 uiR2_Deserts05 uiR2EntryPoint01 24257 -1520 NE +d1 uiR2_Deserts05 uiR2EntryPoint02 24593 -1447 N +d1 uiR2_Deserts05 uiR2EntryPoint03 24341 -1184 NE +d1 uiR2_Deserts05 uiR2EntryPoint04 24535 -1054 S + +d1 uiR2_Deserts13 uiR2EntryPoint01 28942 -1919 S +d1 uiR2_Deserts13 uiR2EntryPoint02 28538 -2241 E +d1 uiR2_Deserts13 uiR2EntryPoint03 28814 -2251 NW +d1 uiR2_Deserts13 uiR2EntryPoint04 28956 -2079 W +d1 uiR2_Deserts13 uiR2EntryPoint05 28794 -1912 S + +d1 uiR2_Deserts17 uiR2EntryPoint01 23250 -1840 W +d1 uiR2_Deserts17 uiR2EntryPoint02 23096 -1943 NE +d1 uiR2_Deserts17 uiR2EntryPoint03 23034 -1839 E +d1 uiR2_Deserts17 uiR2EntryPoint04 23096 -1713 S + +d1 uiR2_Deserts24 uiR2EntryPoint01 27915 -1875 S +d1 uiR2_Deserts24 uiR2EntryPoint02 28136 -1960 S +d1 uiR2_Deserts24 uiR2EntryPoint03 28233 -1746 S +d1 uiR2_Deserts24 uiR2EntryPoint04 28324 -1841 W + +d3 uiR2_Deserts27 uiR2EntryPoint01 23305 -2454 E +d3 uiR2_Deserts27 uiR2EntryPoint02 23313 -2682 N +d3 uiR2_Deserts27 uiR2EntryPoint03 23464 -2611 N +d3 uiR2_Deserts27 uiR2EntryPoint04 23496 -2442 SW + +d3 uiR2_Deserts04 uiR2EntryPoint01 23452 -1050 SE +d3 uiR2_Deserts04 uiR2EntryPoint02 23846 -1435 W +d3 uiR2_Deserts04 uiR2EntryPoint03 23599 -1418 N +d3 uiR2_Deserts04 uiR2EntryPoint04 23927 -1163 W + +d3 uiR2_Deserts11 uiR2EntryPoint01 29554 -1468 N +d3 uiR2_Deserts11 uiR2EntryPoint02 29922 -1222 W +d3 uiR2_Deserts11 uiR2EntryPoint03 29622 -1048 S +d3 uiR2_Deserts11 uiR2EntryPoint04 29615 -1306 SE +d3 uiR2_Deserts11 uiR2EntryPoint05 29755 -1447 NW + +d3 uiR2_Deserts16 uiR2EntryPoint01 22304 -1856 E +d3 uiR2_Deserts16 uiR2EntryPoint02 22513 -1995 E +d3 uiR2_Deserts16 uiR2EntryPoint03 22687 -1891 N +d3 uiR2_Deserts16 uiR2EntryPoint04 22537 -1877 N + +d4 uiR2_Deserts18 uiR2EntryPoint01 23730 -2280 N +d4 uiR2_Deserts18 uiR2EntryPoint02 23666 -2154 NE +d4 uiR2_Deserts18 uiR2EntryPoint03 23871 -1977 SE +d4 uiR2_Deserts18 uiR2EntryPoint04 23570 -2056 NE +d4 uiR2_Deserts18 uiR2EntryPoint05 23834 -1997 W + +d4 uiR2_Deserts19 uiR2EntryPoint01 24560 -2015 N +d4 uiR2_Deserts19 uiR2EntryPoint02 24267 -1998 E +d4 uiR2_Deserts19 uiR2EntryPoint03 24841 -2002 W +d4 uiR2_Deserts19 uiR2EntryPoint04 24562 -1914 S + +d4 uiR2_Deserts09 uiR2EntryPoint01 27814 -1375 N +d4 uiR2_Deserts09 uiR2EntryPoint02 27471 -1503 E +d4 uiR2_Deserts09 uiR2EntryPoint03 27609 -1197 E +d4 uiR2_Deserts09 uiR2EntryPoint04 27730 -1088 S +d4 uiR2_Deserts09 uiR2EntryPoint05 27529 -1014 SE + +d4 uiR2_Deserts14 uiR2EntryPoint01 30629 -2300 N +// d4 uiR2_Deserts14 uiR2EntryPoint04 30747 -2023 SW +d4 uiR2_Deserts14 uiR2EntryPoint02 30577 -1836 S +d4 uiR2_Deserts14 uiR2EntryPoint03 30347 -2140 SE +// d4 uiR2_Deserts14 uiR2EntryPoint05 30407 -1835 SE + +d5 uiR2_Deserts15 uiR2EntryPoint01 21500 -1830 E +d5 uiR2_Deserts15 uiR2EntryPoint02 21933 -1833 W +d5 uiR2_Deserts15 uiR2EntryPoint03 21763 -1839 E +d5 uiR2_Deserts15 uiR2EntryPoint04 21515 -1913 N + +d5 uiR2_Deserts30 uiR2EntryPoint01 26650 -2650 E +d5 uiR2_Deserts30 uiR2EntryPoint02 27036 -2638 W +d5 uiR2_Deserts30 uiR2EntryPoint03 26922 -2433 SE +d5 uiR2_Deserts30 uiR2EntryPoint04 26779 -2504 S + +d5 uiR2_Deserts33 uiR2EntryPoint01 29510 -2040 S +d5 uiR2_Deserts33 uiR2EntryPoint02 29517 -2239 N +d5 uiR2_Deserts33 uiR2EntryPoint03 29712 -2523 NW +d5 uiR2_Deserts33 uiR2EntryPoint04 29920 -2157 W +d5 uiR2_Deserts33 uiR2EntryPoint05 29758 -2318 W + +d5 uiR2_Deserts08 uiR2EntryPoint01 26694 -1485 N +d5 uiR2_Deserts08 uiR2EntryPoint02 26949 -1512 NW +d5 uiR2_Deserts08 uiR2EntryPoint03 26482 -1366 E +d5 uiR2_Deserts08 uiR2EntryPoint04 26875 -1010 S +d5 uiR2_Deserts08 uiR2EntryPoint05 26460 -1205 NE + +d6 uiR2_Deserts06 uiR2EntryPoint01 25523 -1500 NW +d6 uiR2_Deserts06 uiR2EntryPoint02 25419 -1142 SW +d6 uiR2_Deserts06 uiR2EntryPoint03 25220 -1416 W +d6 uiR2_Deserts06 uiR2EntryPoint04 25168 -1168 SW + +d6 uiR2_Deserts20 uiR2EntryPoint01 25206 -2118 N +d6 uiR2_Deserts20 uiR2EntryPoint02 25435 -1997 W +d6 uiR2_Deserts20 uiR2EntryPoint03 25410 -2177 N +d6 uiR2_Deserts20 uiR2EntryPoint04 25532 -1942 N +d6 uiR2_Deserts20 uiR2EntryPoint05 25724 -2192 W + +d6 uiR2_Deserts25 uiR2EntryPoint01 21845 -2475 S +d6 uiR2_Deserts25 uiR2EntryPoint02 21891 -2836 W +d6 uiR2_Deserts25 uiR2EntryPoint03 21442 -2799 NW +d6 uiR2_Deserts25 uiR2EntryPoint04 21460 -2447 S +d6 uiR2_Deserts25 uiR2EntryPoint05 21765 -2480 W + +d6 uiR2_Deserts26 uiR2EntryPoint01 22627 -2480 W +d6 uiR2_Deserts26 uiR2EntryPoint02 22352 -2474 E +d6 uiR2_Deserts26 uiR2EntryPoint03 22925 -2483 W +d6 uiR2_Deserts26 uiR2EntryPoint04 22790 -2627 N + + + +o1 uiR2_Deserts07 uiR2EntryPoint01 26051 -1405 N +o1 uiR2_Deserts07 uiR2EntryPoint02 26153 -1044 S +o1 uiR2_Deserts07 uiR2EntryPoint03 25855 -1233 E +o1 uiR2_Deserts07 uiR2EntryPoint04 25818 -1027 SE + +o1 uiR2_Deserts12 uiR2EntryPoint01 30818 -1487 NW +o1 uiR2_Deserts12 uiR2EntryPoint02 30726 -1023 S +o1 uiR2_Deserts12 uiR2EntryPoint03 30369 -1083 SE +o1 uiR2_Deserts12 uiR2EntryPoint04 30389 -1307 E +o1 uiR2_Deserts12 uiR2EntryPoint05 30539 -1440 NW + + + +//z1 uiR2_Deserts01 uiR2EntryPoint01 21570 -1363 N +//z1 uiR2_Deserts01 uiR2EntryPoint02 21340 -1066 SE +//z1 uiR2_Deserts01 uiR2EntryPoint03 21678 -1129 SW +//z1 uiR2_Deserts01 uiR2EntryPoint04 21503 -1296 N + + + + +// Forest + + +a1 uiR2_Forest04 uiR2EntryPoint01 24213 -11157 W +a1 uiR2_Forest04 uiR2EntryPoint02 23975 -11225 E +a1 uiR2_Forest04 uiR2EntryPoint03 23827 -11373 NE +a1 uiR2_Forest04 uiR2EntryPoint04 24180 -11383 NW +a1 uiR2_Forest04 uiR2EntryPoint05 23871 -11059 SE +a1 uiR2_Forest04 uiR2EntryPoint06 24189 -10982 SW + +a1 uiR2_Forest05 uiR2EntryPoint01 24752 -11360 N +a1 uiR2_Forest05 uiR2EntryPoint02 24602 -11060 SE +a1 uiR2_Forest05 uiR2EntryPoint03 24865 -11100 SW +a1 uiR2_Forest05 uiR2EntryPoint04 25046 -11197 W +a1 uiR2_Forest05 uiR2EntryPoint05 24640 -11453 N +a1 uiR2_Forest05 uiR2EntryPoint06 24537 -11201 E + +a1 uiR2_Forest14 uiR2EntryPoint01 21282 -12196 N +a1 uiR2_Forest14 uiR2EntryPoint02 21276 -11986 S +a1 uiR2_Forest14 uiR2EntryPoint03 21276 -11766 S + +a1 uiR2_Forest27 uiR2EntryPoint01 21173 -12644 W +a1 uiR2_Forest27 uiR2EntryPoint02 21068 -12561 S +a1 uiR2_Forest27 uiR2EntryPoint03 21113 -12714 N +a1 uiR2_Forest27 uiR2EntryPoint04 21119 -12639 S + +a1 uiR2_Forest32 uiR2EntryPoint01 24680 -12600 SE +a1 uiR2_Forest32 uiR2EntryPoint02 24538 -13025 N +a1 uiR2_Forest32 uiR2EntryPoint03 24822 -13039 N +a1 uiR2_Forest32 uiR2EntryPoint04 24718 -12889 N +a1 uiR2_Forest32 uiR2EntryPoint05 24830 -12554 SW +a1 uiR2_Forest32 uiR2EntryPoint06 24659 -12750 E + +f1 uiR2_Forest03 uiR2EntryPoint01 23010 -11209 E +f1 uiR2_Forest03 uiR2EntryPoint02 23080 -11152 E +f1 uiR2_Forest03 uiR2EntryPoint03 23400 -11400 NW +f1 uiR2_Forest03 uiR2EntryPoint04 23400 -11000 SW +f1 uiR2_Forest03 uiR2EntryPoint05 23000 -11000 SE + +f1 uiR2_Forest19 uiR2EntryPoint01 24944 -12220 N +f1 uiR2_Forest19 uiR2EntryPoint02 25357 -12233 N +f1 uiR2_Forest19 uiR2EntryPoint03 25265 -12240 W +f1 uiR2_Forest19 uiR2EntryPoint04 24971 -11947 S +f1 uiR2_Forest19 uiR2EntryPoint05 25155 -12081 SE + +f1 uiR2_Forest23 uiR2EntryPoint01 28465 -12056 W +f1 uiR2_Forest23 uiR2EntryPoint02 28011 -12082 E +f1 uiR2_Forest23 uiR2EntryPoint03 28496 -12248 N +f1 uiR2_Forest23 uiR2EntryPoint04 28375 -11911 SE +f1 uiR2_Forest23 uiR2EntryPoint05 28194 -12118 E +f1 uiR2_Forest23 uiR2EntryPoint06 27926 -11988 SE + +f1 uiR2_Forest39 uiR2EntryPoint01 30520 -12600 S +f1 uiR2_Forest39 uiR2EntryPoint02 30143 -12958 E +f1 uiR2_Forest39 uiR2EntryPoint03 30195 -12559 SE +f1 uiR2_Forest39 uiR2EntryPoint04 30621 -12958 NW +f1 uiR2_Forest39 uiR2EntryPoint05 30298 -12694 SE +f1 uiR2_Forest39 uiR2EntryPoint06 30524 -12799 W +f1 uiR2_Forest39 uiR2EntryPoint07 30291 -12910 NE + +f1 uiR2_Forest41 uiR2EntryPoint01 22140 -13150 SE +f1 uiR2_Forest41 uiR2EntryPoint02 22401 -13440 NW +f1 uiR2_Forest41 uiR2EntryPoint03 22263 -13269 S +f1 uiR2_Forest41 uiR2EntryPoint04 22338 -13133 SW +f1 uiR2_Forest41 uiR2EntryPoint05 22173 -13476 NE + +f1 uiR2_Forest20 uiR2EntryPoint01 26110 -11936 SW +f1 uiR2_Forest20 uiR2EntryPoint02 25734 -11920 SE +f1 uiR2_Forest20 uiR2EntryPoint03 25691 -12200 SW +f1 uiR2_Forest20 uiR2EntryPoint04 26113 -12164 NW +f1 uiR2_Forest20 uiR2EntryPoint05 25950 -12097 N + +f1 uiR2_Forest31 uiR2EntryPoint01 23470 -12600 SE +f1 uiR2_Forest31 uiR2EntryPoint02 23681 -12712 S +f1 uiR2_Forest31 uiR2EntryPoint03 23510 -13001 NE +f1 uiR2_Forest31 uiR2EntryPoint04 23948 -13020 W +f1 uiR2_Forest31 uiR2EntryPoint05 23598 -12850 SW +f1 uiR2_Forest31 uiR2EntryPoint06 23995 -12787 W +f1 uiR2_Forest31 uiR2EntryPoint07 23879 -12573 W + +f2 uiR2_Forest34 uiR2EntryPoint01 26220 -12600 SE +f2 uiR2_Forest34 uiR2EntryPoint02 26613 -12753 NW +f2 uiR2_Forest34 uiR2EntryPoint03 26413 -12556 S +f2 uiR2_Forest34 uiR2EntryPoint04 26238 -12888 N +f2 uiR2_Forest34 uiR2EntryPoint05 26661 -12640 W + +f2 uiR2_Forest35 uiR2EntryPoint01 27100 -12600 S +f2 uiR2_Forest35 uiR2EntryPoint02 27043 -12938 N +f2 uiR2_Forest35 uiR2EntryPoint03 27222 -12726 W + +f2 uiR2_Forest45 uiR2EntryPoint01 26000 -13600 SW +f2 uiR2_Forest45 uiR2EntryPoint02 25983 -13976 NW +f2 uiR2_Forest45 uiR2EntryPoint03 25684 -13611 SE +f2 uiR2_Forest45 uiR2EntryPoint04 25835 -13674 SE +f2 uiR2_Forest45 uiR2EntryPoint05 26004 -13834 NW +f2 uiR2_Forest45 uiR2EntryPoint06 25786 -13883 N + +f2 uiR2_Forest08 uiR2EntryPoint01 26957 -11364 NE +f2 uiR2_Forest08 uiR2EntryPoint02 27200 -11178 S +f2 uiR2_Forest08 uiR2EntryPoint03 27360 -11040 SW +f2 uiR2_Forest08 uiR2EntryPoint04 27002 -10967 SE +f2 uiR2_Forest08 uiR2EntryPoint05 27406 -11414 NW + +f2 uiR2_Forest12 uiR2EntryPoint01 29919 -11062 N +f2 uiR2_Forest12 uiR2EntryPoint02 29855 -11111 NE +f2 uiR2_Forest12 uiR2EntryPoint03 29986 -10996 SW + +f2 uiR2_Forest33 uiR2EntryPoint01 25300 -12600 S +f2 uiR2_Forest33 uiR2EntryPoint02 25598 -13023 N +f2 uiR2_Forest33 uiR2EntryPoint03 25598 -12632 W +f2 uiR2_Forest33 uiR2EntryPoint04 25299 -12957 N + +f3 uiR2_Forest38 uiR2EntryPoint01 29630 -12600 SW +f3 uiR2_Forest38 uiR2EntryPoint02 29735 -12939 NW +f3 uiR2_Forest38 uiR2EntryPoint03 29350 -12779 E +f3 uiR2_Forest38 uiR2EntryPoint04 29525 -12714 SE +f3 uiR2_Forest38 uiR2EntryPoint05 29391 -12585 SE +f3 uiR2_Forest38 uiR2EntryPoint06 29465 -13029 NE + +f3 uiR2_Forest46 uiR2EntryPoint01 27000 -13600 S +f3 uiR2_Forest46 uiR2EntryPoint02 28057 -14465 N +f3 uiR2_Forest46 uiR2EntryPoint03 26890 -14013 NE +f3 uiR2_Forest46 uiR2EntryPoint04 27254 -13872 S + +f3 uiR2_Forest02 uiR2EntryPoint01 22236 -11281 NE +f3 uiR2_Forest02 uiR2EntryPoint02 22468 -11198 W +f3 uiR2_Forest02 uiR2EntryPoint03 22222 -11426 NE +f3 uiR2_Forest02 uiR2EntryPoint04 22353 -11000 S +f3 uiR2_Forest02 uiR2EntryPoint05 22446 -11374 NW +f3 uiR2_Forest02 uiR2EntryPoint06 22137 -11199 E +f3 uiR2_Forest02 uiR2EntryPoint07 22158 -10990 E +f3 uiR2_Forest02 uiR2EntryPoint08 22259 -11108 E + +f3 uiR2_Forest07 uiR2EntryPoint01 26322 -11348 N +f3 uiR2_Forest07 uiR2EntryPoint02 26310 -11200 E +f3 uiR2_Forest07 uiR2EntryPoint03 26545 -11157 W +f3 uiR2_Forest07 uiR2EntryPoint04 26185 -10967 E +f3 uiR2_Forest07 uiR2EntryPoint05 26171 -11200 E +f3 uiR2_Forest07 uiR2EntryPoint06 26446 -11021 SW +f3 uiR2_Forest07 uiR2EntryPoint07 26222 -11401 NE +f3 uiR2_Forest07 uiR2EntryPoint08 26498 -11359 W + +f3 uiR2_Forest16 uiR2EntryPoint01 23114 -11953 W +f3 uiR2_Forest16 uiR2EntryPoint02 22883 -11999 E +f3 uiR2_Forest16 uiR2EntryPoint03 22743 -12136 N +f3 uiR2_Forest16 uiR2EntryPoint04 22735 -11817 SE +f3 uiR2_Forest16 uiR2EntryPoint05 23038 -12182 NW + +f3 uiR2_Forest18 uiR2EntryPoint01 24326 -11878 SE +f3 uiR2_Forest18 uiR2EntryPoint02 24390 -12095 N +f3 uiR2_Forest18 uiR2EntryPoint03 24525 -12090 E +f3 uiR2_Forest18 uiR2EntryPoint04 24225 -11836 E + +f4 uiR2_Forest25 uiR2EntryPoint01 29903 -11886 SO +f4 uiR2_Forest25 uiR2EntryPoint02 29714 -12046 NE +f4 uiR2_Forest25 uiR2EntryPoint03 29730 -11826 SE +f4 uiR2_Forest25 uiR2EntryPoint04 29959 -11791 SW + +f4 uiR2_Forest01 uiR2EntryPoint01 21581 -11056 S +f4 uiR2_Forest01 uiR2EntryPoint02 21733 -11412 NW +f4 uiR2_Forest01 uiR2EntryPoint03 21648 -11248 S +f4 uiR2_Forest01 uiR2EntryPoint04 21510 -11443 NE +f4 uiR2_Forest01 uiR2EntryPoint05 21400 -11247 E +f4 uiR2_Forest01 uiR2EntryPoint06 21762 -10995 S +f4 uiR2_Forest01 uiR2EntryPoint07 21855 -11231 W +f4 uiR2_Forest01 uiR2EntryPoint08 21355 -11040 E +f4 uiR2_Forest01 uiR2EntryPoint09 21596 -10946 S + +f4 uiR2_Forest10 uiR2EntryPoint01 28673 -11191 N +f4 uiR2_Forest10 uiR2EntryPoint02 28645 -11007 S +f4 uiR2_Forest10 uiR2EntryPoint03 28566 -11110 E + +f4 uiR2_Forest24 uiR2EntryPoint01 29365 -11968 W +f4 uiR2_Forest24 uiR2EntryPoint02 28963 -11969 E +f4 uiR2_Forest24 uiR2EntryPoint03 29146 -11817 S +f4 uiR2_Forest24 uiR2EntryPoint04 29117 -12186 N +f4 uiR2_Forest24 uiR2EntryPoint05 29139 -12001 N + +f4 uiR2_Forest30 uiR2EntryPoint01 22865 -12920 N +f4 uiR2_Forest30 uiR2EntryPoint02 23068 -12632 W +f4 uiR2_Forest30 uiR2EntryPoint03 22773 -12782 E +f4 uiR2_Forest30 uiR2EntryPoint04 22901 -12688 S + +f4 uiR2_Forest40 uiR2EntryPoint01 21150 -13350 N +f4 uiR2_Forest40 uiR2EntryPoint02 21536 -13506 N +f4 uiR2_Forest40 uiR2EntryPoint03 21359 -13195 S +f4 uiR2_Forest40 uiR2EntryPoint04 21162 -13553 NE +f4 uiR2_Forest40 uiR2EntryPoint05 21267 -13280 W +f4 uiR2_Forest40 uiR2EntryPoint06 21118 -13278 SE + + + +o1 uiR2_Forest09 uiR2EntryPoint01 28210 -10964 SW +o1 uiR2_Forest09 uiR2EntryPoint02 28058 -11137 S +o1 uiR2_Forest09 uiR2EntryPoint03 27855 -11099 E + +o1 uiR2_Forest13 uiR2EntryPoint01 30783 -11199 W +o1 uiR2_Forest13 uiR2EntryPoint02 30569 -10957 S +o1 uiR2_Forest13 uiR2EntryPoint03 30355 -11071 E + +o1 uiR2_Forest21 uiR2EntryPoint01 26547 -12021 E +o1 uiR2_Forest21 uiR2EntryPoint02 26748 -11980 SW +o1 uiR2_Forest21 uiR2EntryPoint03 26636 -12215 N +o1 uiR2_Forest21 uiR2EntryPoint04 26560 -11775 S + +o1 uiR2_Forest26 uiR2EntryPoint01 30827 -11803 W +o1 uiR2_Forest26 uiR2EntryPoint02 30559 -11816 E +o1 uiR2_Forest26 uiR2EntryPoint03 30347 -11839 E + +o1 uiR2_Forest28 uiR2EntryPoint01 21720 -12717 N +o1 uiR2_Forest28 uiR2EntryPoint02 21559 -12569 S +o1 uiR2_Forest28 uiR2EntryPoint03 21581 -12739 NE +o1 uiR2_Forest28 uiR2EntryPoint04 21831 -12579 SW +o1 uiR2_Forest28 uiR2EntryPoint05 21676 -12643 E + + + +//z1 uiR2_Forest06 uiR2EntryPoint01 25424 -11251 E +//z1 uiR2_Forest06 uiR2EntryPoint02 25768 -11068 SW +//z1 uiR2_Forest06 uiR2EntryPoint03 25616 -11254 NW + +//z1 uiR2_Forest11 uiR2EntryPoint01 29400 -11408 NW +//z1 uiR2_Forest11 uiR2EntryPoint02 29273 -11198 S +//z1 uiR2_Forest11 uiR2EntryPoint03 29112 -11028 SE + +//z1 uiR2_Forest15 uiR2EntryPoint01 22136 -11787 S +//z1 uiR2_Forest15 uiR2EntryPoint02 21908 -12109 NE +//z1 uiR2_Forest15 uiR2EntryPoint03 21903 -11855 SE +//z1 uiR2_Forest15 uiR2EntryPoint04 22206 -12161 NW +//z1 uiR2_Forest15 uiR2EntryPoint05 22066 -11993 N + +//z1 uiR2_Forest17 uiR2EntryPoint01 23533 -11761 SE +//z1 uiR2_Forest17 uiR2EntryPoint02 23689 -12007 N +//z1 uiR2_Forest17 uiR2EntryPoint03 23688 -12223 N +//z1 uiR2_Forest17 uiR2EntryPoint04 23850 -11791 SW +//z1 uiR2_Forest17 uiR2EntryPoint05 23464 -12000 E +//z1 uiR2_Forest17 uiR2EntryPoint06 23862 -12143 NW + +//z1 uiR2_Forest22 uiR2EntryPoint01 27153 -12009 E +//z1 uiR2_Forest22 uiR2EntryPoint02 27581 -11992 SW +//z1 uiR2_Forest22 uiR2EntryPoint03 27374 -12176 N +//z1 uiR2_Forest22 uiR2EntryPoint04 27381 -11938 S +//z1 uiR2_Forest22 uiR2EntryPoint05 27260 -12085 E +//z1 uiR2_Forest22 uiR2EntryPoint06 27444 -12071 W + +//z1 uiR2_Forest29 uiR2EntryPoint01 22306 -12674 W +//z1 uiR2_Forest29 uiR2EntryPoint02 22404 -12746 N +//z1 uiR2_Forest29 uiR2EntryPoint03 22152 -12719 NE + +//z1 uiR2_Forest36 uiR2EntryPoint01 27800 -12770 E +//z1 uiR2_Forest36 uiR2EntryPoint02 28127 -12573 SW +//z1 uiR2_Forest36 uiR2EntryPoint03 28218 -13020 NW +//z1 uiR2_Forest36 uiR2EntryPoint04 27909 -12736 SW +//z1 uiR2_Forest36 uiR2EntryPoint05 27805 -12614 S +//z1 uiR2_Forest36 uiR2EntryPoint06 27896 -12855 E +//z1 uiR2_Forest36 uiR2EntryPoint07 27794 -13005 NW +//z1 uiR2_Forest36 uiR2EntryPoint08 28058 -12493 SE + +//z1 uiR2_Forest37 uiR2EntryPoint01 28980 -12920 W +//z1 uiR2_Forest37 uiR2EntryPoint02 28880 -12886 SE +//z1 uiR2_Forest37 uiR2EntryPoint03 28879 -13020 NE +//z1 uiR2_Forest37 uiR2EntryPoint04 28522 -12562 E +//z1 uiR2_Forest37 uiR2EntryPoint05 28712 -12686 s +//z1 uiR2_Forest37 uiR2EntryPoint06 28747 -12911 N + +//z1 uiR2_Forest42 uiR2EntryPoint01 22830 -13600 NE +//z1 uiR2_Forest42 uiR2EntryPoint02 23342 -13475 W +//z1 uiR2_Forest42 uiR2EntryPoint03 22853 -13394 SE +//z1 uiR2_Forest42 uiR2EntryPoint04 23099 -13430 S + +//z1 uiR2_Forest43 uiR2EntryPoint01 24000 -13600 N +//z1 uiR2_Forest43 uiR2EntryPoint02 24076 -13838 W +//z1 uiR2_Forest43 uiR2EntryPoint03 23825 -13411 SE +//z1 uiR2_Forest43 uiR2EntryPoint04 24208 -13583 W +//z1 uiR2_Forest43 uiR2EntryPoint05 24000 -13364 S +//z1 uiR2_Forest43 uiR2EntryPoint06 24039 -13492 W + +//z1 uiR2_Forest44 uiR2EntryPoint01 24670 -13600 S +//z1 uiR2_Forest44 uiR2EntryPoint02 24877 -14823 N +//z1 uiR2_Forest44 uiR2EntryPoint03 24959 -14224 W +//z1 uiR2_Forest44 uiR2EntryPoint04 24653 -14092 N +//z1 uiR2_Forest44 uiR2EntryPoint05 24565 -13357 S +//z1 uiR2_Forest44 uiR2EntryPoint06 24642 -14325 E + + + + +// Jungle + +a1 uiR2_Jungle14 uiR2EntryPoint01 40700 -11200 E +a1 uiR2_Jungle14 uiR2EntryPoint02 40876 -11370 W +a1 uiR2_Jungle14 uiR2EntryPoint03 40681 -11376 W +a1 uiR2_Jungle14 uiR2EntryPoint04 40841 -10966 W + +a1 uiR2_Jungle23 uiR2EntryPoint01 38200 -12000 N +a1 uiR2_Jungle23 uiR2EntryPoint02 38163 -11917 W +a1 uiR2_Jungle23 uiR2EntryPoint03 37956 -12037 E +a1 uiR2_Jungle23 uiR2EntryPoint04 38356 -11999 NW +a1 uiR2_Jungle23 uiR2EntryPoint05 38489 -11936 NW +a1 uiR2_Jungle23 uiR2EntryPoint06 38196 -11782 S + +a1 uiR2_Jungle27 uiR2EntryPoint01 31200 -12700 N +a1 uiR2_Jungle27 uiR2EntryPoint02 31207 -12533 S +a1 uiR2_Jungle27 uiR2EntryPoint03 31299 -12813 NW + +j1 uiR2_Jungle06 uiR2EntryPoint01 34426 -11339 NE +j1 uiR2_Jungle06 uiR2EntryPoint02 34698 -11060 W +j1 uiR2_Jungle06 uiR2EntryPoint03 34836 -11243 W +j1 uiR2_Jungle06 uiR2EntryPoint04 34651 -11405 S +j1 uiR2_Jungle06 uiR2EntryPoint05 34372 -11029 E + +j1 uiR2_Jungle07 uiR2EntryPoint01 35300 -11200 SE +j1 uiR2_Jungle07 uiR2EntryPoint02 35534 -11057 SW +j1 uiR2_Jungle07 uiR2EntryPoint03 35424 -11378 N +j1 uiR2_Jungle07 uiR2EntryPoint04 35100 -11026 SE + +j1 uiR2_Jungle15 uiR2EntryPoint01 31300 -12000 N +j1 uiR2_Jungle15 uiR2EntryPoint02 31181 -11823 SE +j1 uiR2_Jungle15 uiR2EntryPoint03 31185 -12211 NE +j1 uiR2_Jungle15 uiR2EntryPoint04 31549 -12148 NW +j1 uiR2_Jungle15 uiR2EntryPoint05 31549 -11920 W + +j1 uiR2_Jungle18 uiR2EntryPoint01 34000 -12000 S +j1 uiR2_Jungle18 uiR2EntryPoint02 34234 -12243 N +j1 uiR2_Jungle18 uiR2EntryPoint03 34161 -11953 E +j1 uiR2_Jungle18 uiR2EntryPoint04 34191 -11792 S +j1 uiR2_Jungle18 uiR2EntryPoint05 33799 -11882 SE +j1 uiR2_Jungle18 uiR2EntryPoint06 33832 -12256 N + +j1 uiR2_Jungle36 uiR2EntryPoint01 37074 -12782 N +j1 uiR2_Jungle36 uiR2EntryPoint02 37071 -12878 SW +j1 uiR2_Jungle36 uiR2EntryPoint03 36896 -12875 E +j1 uiR2_Jungle36 uiR2EntryPoint04 36934 -12737 S +j1 uiR2_Jungle36 uiR2EntryPoint05 36978 -13070 N +j1 uiR2_Jungle36 uiR2EntryPoint06 36800 -13062 NE + +j1 uiR2_Jungle41 uiR2EntryPoint01 40648 -12573 N +j1 uiR2_Jungle41 uiR2EntryPoint02 40696 -12807 E +j1 uiR2_Jungle41 uiR2EntryPoint03 40771 -13042 N + +j1 uiR2_Jungle53 uiR2EntryPoint01 39683 -13678 W +j1 uiR2_Jungle53 uiR2EntryPoint02 39413 -13784 NE +j1 uiR2_Jungle53 uiR2EntryPoint03 39514 -13435 SE +j1 uiR2_Jungle53 uiR2EntryPoint04 39718 -13338 S + +j2 uiR2_Jungle01 uiR2EntryPoint01 31300 -11100 S +j2 uiR2_Jungle01 uiR2EntryPoint02 31257 -10932 E +j2 uiR2_Jungle01 uiR2EntryPoint03 31594 -11118 N +j2 uiR2_Jungle01 uiR2EntryPoint04 31080 -11296 NE + +j2 uiR2_Jungle28 uiR2EntryPoint01 31600 -12550 N +j2 uiR2_Jungle28 uiR2EntryPoint02 31788 -12534 S + +j2 uiR2_Jungle32 uiR2EntryPoint01 33720 -12700 SW +j2 uiR2_Jungle32 uiR2EntryPoint02 33855 -12620 W +j2 uiR2_Jungle32 uiR2EntryPoint03 33646 -12853 SE +j2 uiR2_Jungle32 uiR2EntryPoint04 33757 -12969 NW + +j2 uiR2_Jungle34 uiR2EntryPoint01 35220 -12610 N +j2 uiR2_Jungle34 uiR2EntryPoint02 35030 -12535 SW +j2 uiR2_Jungle34 uiR2EntryPoint03 35028 -12728 SE +j2 uiR2_Jungle34 uiR2EntryPoint04 35304 -12781 W +j2 uiR2_Jungle34 uiR2EntryPoint05 35419 -12726 S + +j2 uiR2_Jungle51 uiR2EntryPoint01 38204 -13916 N +j2 uiR2_Jungle51 uiR2EntryPoint02 38135 -13696 NW +j2 uiR2_Jungle51 uiR2EntryPoint03 38032 -13508 E + +j2 uiR2_Jungle02 uiR2EntryPoint01 32203 -11283 NW +j2 uiR2_Jungle02 uiR2EntryPoint02 32062 -10944 E +j2 uiR2_Jungle02 uiR2EntryPoint03 32396 -11409 N +j2 uiR2_Jungle02 uiR2EntryPoint04 32557 -11107 S +j2 uiR2_Jungle02 uiR2EntryPoint05 32533 -10964 W + +j2 uiR2_Jungle05 uiR2EntryPoint01 33768 -11278 N +j2 uiR2_Jungle05 uiR2EntryPoint02 33981 -11292 W + +j3 uiR2_Jungle38 uiR2EntryPoint01 38290 -12740 E +j3 uiR2_Jungle38 uiR2EntryPoint02 38288 -12905 E +j3 uiR2_Jungle38 uiR2EntryPoint03 38446 -13070 E +j3 uiR2_Jungle38 uiR2EntryPoint04 38665 -12895 NW +j3 uiR2_Jungle38 uiR2EntryPoint05 38475 -12755 S + +j3 uiR2_Jungle49 uiR2EntryPoint01 36953 -13596 N +j3 uiR2_Jungle49 uiR2EntryPoint02 36931 -13379 SW +j3 uiR2_Jungle49 uiR2EntryPoint03 36564 -13630 NE +j3 uiR2_Jungle49 uiR2EntryPoint04 36901 -13803 N + +j3 uiR2_Jungle52 uiR2EntryPoint01 39145 -13665 W +j3 uiR2_Jungle52 uiR2EntryPoint02 39053 -13517 E +j3 uiR2_Jungle52 uiR2EntryPoint03 38963 -13387 N +j3 uiR2_Jungle52 uiR2EntryPoint04 38710 -13477 S +j3 uiR2_Jungle52 uiR2EntryPoint05 38931 -13723 W +j3 uiR2_Jungle52 uiR2EntryPoint06 38915 -13580 N + +j3 uiR2_Jungle03 uiR2EntryPoint01 33100 -11200 NE +j3 uiR2_Jungle03 uiR2EntryPoint02 32837 -11458 E +j3 uiR2_Jungle03 uiR2EntryPoint03 33230 -11343 N +j3 uiR2_Jungle03 uiR2EntryPoint04 33304 -11015 SW + +j3 uiR2_Jungle24 uiR2EntryPoint01 39000 -12000 W +j3 uiR2_Jungle24 uiR2EntryPoint02 39297 -11888 S +j3 uiR2_Jungle24 uiR2EntryPoint03 38832 -11886 SE +j3 uiR2_Jungle24 uiR2EntryPoint04 38847 -12265 NE +j3 uiR2_Jungle24 uiR2EntryPoint05 39289 -12258 NE + +j3 uiR2_Jungle25 uiR2EntryPoint01 39621 -12083 NW +j3 uiR2_Jungle25 uiR2EntryPoint02 39938 -12037 S +j3 uiR2_Jungle25 uiR2EntryPoint03 39916 -12213 SE +j3 uiR2_Jungle25 uiR2EntryPoint04 40114 -11884 W +j3 uiR2_Jungle25 uiR2EntryPoint05 39955 -11803 W +j3 uiR2_Jungle25 uiR2EntryPoint06 39786 -11886 W + +j3 uiR2_Jungle29 uiR2EntryPoint01 31753 -12934 N +j3 uiR2_Jungle29 uiR2EntryPoint02 31766 -13034 W +j3 uiR2_Jungle29 uiR2EntryPoint03 31948 -12894 NW +j3 uiR2_Jungle29 uiR2EntryPoint04 31574 -12918 N + +j4 uiR2_Jungle50 uiR2EntryPoint01 37426 -13620 N +j4 uiR2_Jungle50 uiR2EntryPoint02 37482 -13875 E +j4 uiR2_Jungle50 uiR2EntryPoint03 37596 -13682 E +j4 uiR2_Jungle50 uiR2EntryPoint04 37700 -13544 NE +j4 uiR2_Jungle50 uiR2EntryPoint05 37685 -13388 NW + +j4 uiR2_Jungle08 uiR2EntryPoint01 36200 -11200 SE +j4 uiR2_Jungle08 uiR2EntryPoint02 36390 -11360 W +j4 uiR2_Jungle08 uiR2EntryPoint03 36076 -11069 W + +j4 uiR2_Jungle12 uiR2EntryPoint01 39235 -11288 N +j4 uiR2_Jungle12 uiR2EntryPoint02 39448 -10932 W +j4 uiR2_Jungle12 uiR2EntryPoint03 38946 -11120 E +j4 uiR2_Jungle12 uiR2EntryPoint04 39153 -11467 N +j4 uiR2_Jungle12 uiR2EntryPoint05 39130 -11005 NE +j4 uiR2_Jungle12 uiR2EntryPoint06 39426 -11406 S + +j4 uiR2_Jungle16 uiR2EntryPoint01 32200 -12000 E +j4 uiR2_Jungle16 uiR2EntryPoint02 32017 -11813 S +j4 uiR2_Jungle16 uiR2EntryPoint03 32332 -12242 N +j4 uiR2_Jungle16 uiR2EntryPoint04 32459 -11865 W +j4 uiR2_Jungle16 uiR2EntryPoint05 32047 -12201 N + +j4 uiR2_Jungle22 uiR2EntryPoint01 37400 -12000 N +j4 uiR2_Jungle22 uiR2EntryPoint02 37515 -11789 N +j4 uiR2_Jungle22 uiR2EntryPoint03 37631 -12105 N +j4 uiR2_Jungle22 uiR2EntryPoint04 37530 -12275 NE +j4 uiR2_Jungle22 uiR2EntryPoint05 37339 -12275 NW +j4 uiR2_Jungle22 uiR2EntryPoint06 37167 -11731 S + +j4 uiR2_Jungle42 uiR2EntryPoint01 31103 -13282 E +j4 uiR2_Jungle42 uiR2EntryPoint02 31352 -13419 W +j4 uiR2_Jungle42 uiR2EntryPoint03 31285 -13573 S +j4 uiR2_Jungle42 uiR2EntryPoint04 31307 -13712 N +j4 uiR2_Jungle42 uiR2EntryPoint05 31420 -13639 SW +j4 uiR2_Jungle42 uiR2EntryPoint06 31083 -13691 NE + + +o1 uiR2_Jungle11 uiR2EntryPoint01 38400 -11200 N +o1 uiR2_Jungle11 uiR2EntryPoint02 38565 -11080 W +o1 uiR2_Jungle11 uiR2EntryPoint03 38389 -11029 E + +o1 uiR2_Jungle19 uiR2EntryPoint01 35000 -12000 N +o1 uiR2_Jungle19 uiR2EntryPoint02 34752 -12146 NE +o1 uiR2_Jungle19 uiR2EntryPoint03 34749 -11909 SE +o1 uiR2_Jungle19 uiR2EntryPoint04 35292 -12042 S +o1 uiR2_Jungle19 uiR2EntryPoint05 35320 -12203 S + +o1 uiR2_Jungle21 uiR2EntryPoint01 36600 -12000 N +o1 uiR2_Jungle21 uiR2EntryPoint02 36833 -11757 SW +o1 uiR2_Jungle21 uiR2EntryPoint03 36443 -12055 E +o1 uiR2_Jungle21 uiR2EntryPoint04 36504 -12275 NW +o1 uiR2_Jungle21 uiR2EntryPoint05 36657 -12265 NW + +o1 uiR2_Jungle26 uiR2EntryPoint01 40600 -12000 W +o1 uiR2_Jungle26 uiR2EntryPoint02 40903 -11996 W +o1 uiR2_Jungle26 uiR2EntryPoint03 40429 -12233 NE + +o1 uiR2_Jungle30 uiR2EntryPoint01 32318 -12599 N +o1 uiR2_Jungle30 uiR2EntryPoint02 32444 -12765 N +o1 uiR2_Jungle30 uiR2EntryPoint03 32497 -12629 W + +o1 uiR2_Jungle33 uiR2EntryPoint01 34230 -12745 N +o1 uiR2_Jungle33 uiR2EntryPoint02 34311 -12806 SE +o1 uiR2_Jungle33 uiR2EntryPoint03 34399 -12967 W +o1 uiR2_Jungle33 uiR2EntryPoint04 34221 -12959 E + +o1 uiR2_Jungle35 uiR2EntryPoint01 35800 -13010 N +o1 uiR2_Jungle35 uiR2EntryPoint02 36057 -12912 W +o1 uiR2_Jungle35 uiR2EntryPoint03 35755 -12619 E +o1 uiR2_Jungle35 uiR2EntryPoint04 36228 -12618 W +o1 uiR2_Jungle35 uiR2EntryPoint05 35934 -12714 E + +o1 uiR2_Jungle44 uiR2EntryPoint01 32799 -13439 N +o1 uiR2_Jungle44 uiR2EntryPoint02 32628 -13363 SE +o1 uiR2_Jungle44 uiR2EntryPoint03 32928 -13375 SW +o1 uiR2_Jungle44 uiR2EntryPoint04 32828 -13484 SE +o1 uiR2_Jungle44 uiR2EntryPoint05 32954 -13703 N + +o1 uiR2_Jungle45 uiR2EntryPoint01 33599 -13741 N +o1 uiR2_Jungle45 uiR2EntryPoint02 33422 -13656 NE +o1 uiR2_Jungle45 uiR2EntryPoint03 33762 -13543 NW +o1 uiR2_Jungle45 uiR2EntryPoint04 33521 -13372 SE + +o1 uiR2_Jungle46 uiR2EntryPoint01 34218 -13905 N +o1 uiR2_Jungle46 uiR2EntryPoint02 34374 -13798 NE +o1 uiR2_Jungle46 uiR2EntryPoint03 34517 -13771 S +o1 uiR2_Jungle46 uiR2EntryPoint04 34582 -13541 SE +o1 uiR2_Jungle46 uiR2EntryPoint05 34311 -13491 N +o1 uiR2_Jungle46 uiR2EntryPoint06 34194 -13371 NW + +o1 uiR2_Jungle47 uiR2EntryPoint01 35624 -13369 N +o1 uiR2_Jungle47 uiR2EntryPoint02 35613 -13526 W +o1 uiR2_Jungle47 uiR2EntryPoint03 35446 -13684 E +o1 uiR2_Jungle47 uiR2EntryPoint04 35162 -13683 W +o1 uiR2_Jungle47 uiR2EntryPoint05 35118 -13442 E +o1 uiR2_Jungle47 uiR2EntryPoint06 35379 -13426 SE + +o1 uiR2_Jungle48 uiR2EntryPoint01 35989 -13425 N +o1 uiR2_Jungle48 uiR2EntryPoint02 36122 -13469 SW +o1 uiR2_Jungle48 uiR2EntryPoint03 36107 -13750 N + + + +//z1 uiR2_Jungle04 uiR2EntryPoint01 33840 -11000 N + +//z1 uiR2_Jungle09 uiR2EntryPoint01 36694 -11144 E +//z1 uiR2_Jungle09 uiR2EntryPoint02 36947 -11190 N +//z1 uiR2_Jungle09 uiR2EntryPoint03 36698 -10954 S +//z1 uiR2_Jungle09 uiR2EntryPoint04 36679 -11467 N +//z1 uiR2_Jungle09 uiR2EntryPoint05 36880 -11041 S +//z1 uiR2_Jungle09 uiR2EntryPoint06 36870 -11253 E +//z1 uiR2_Jungle09 uiR2EntryPoint07 37203 -11179 N + +//z1 uiR2_Jungle10 uiR2EntryPoint01 37790 -11080 E +//z1 uiR2_Jungle10 uiR2EntryPoint02 37909 -11413 N +//z1 uiR2_Jungle10 uiR2EntryPoint03 37530 -11208 NE +//z1 uiR2_Jungle10 uiR2EntryPoint04 37588 -11375 N + +//z1 uiR2_Jungle13 uiR2EntryPoint01 40000 -11200 W +//z1 uiR2_Jungle13 uiR2EntryPoint02 40187 -11030 S +//z1 uiR2_Jungle13 uiR2EntryPoint03 39771 -10957 E +//z1 uiR2_Jungle13 uiR2EntryPoint04 39793 -11177 E +//z1 uiR2_Jungle13 uiR2EntryPoint05 40057 -11356 E + +//z1 uiR2_Jungle17 uiR2EntryPoint01 33000 -12000 N +//z1 uiR2_Jungle17 uiR2EntryPoint02 33158 -12149 N +//z1 uiR2_Jungle17 uiR2EntryPoint03 33211 -11895 N +//z1 uiR2_Jungle17 uiR2EntryPoint04 33199 -12007 W +//z1 uiR2_Jungle17 uiR2EntryPoint05 32971 -11754 S +//z1 uiR2_Jungle17 uiR2EntryPoint06 33038 -11926 E + +//z1 uiR2_Jungle20 uiR2EntryPoint01 35650 -12140 N + +//z1 uiR2_Jungle31 uiR2EntryPoint01 33149 -12874 N +//z1 uiR2_Jungle31 uiR2EntryPoint02 33066 -13037 S +//z1 uiR2_Jungle31 uiR2EntryPoint03 33043 -12726 NW + +//z1 uiR2_Jungle37 uiR2EntryPoint01 37929 -12925 N + +//z1 uiR2_Jungle39 uiR2EntryPoint01 38971 -12788 N +//z1 uiR2_Jungle39 uiR2EntryPoint02 39024 -13072 NE +//z1 uiR2_Jungle39 uiR2EntryPoint03 39159 -12877 E +//z1 uiR2_Jungle39 uiR2EntryPoint04 39432 -13045 N +//z1 uiR2_Jungle39 uiR2EntryPoint05 39280 -12841 N +//z1 uiR2_Jungle39 uiR2EntryPoint06 39255 -12682 N +//z1 uiR2_Jungle39 uiR2EntryPoint07 39433 -12707 E + +//z1 uiR2_Jungle40 uiR2EntryPoint01 40132 -12610 N + +//z1 uiR2_Jungle43 uiR2EntryPoint01 31767 -13391 N + + +// Prime Roots + +p1 uiR2_Primes04 uiR2EntryPoint01 33300 -21200 S +p1 uiR2_Primes04 uiR2EntryPoint02 33454 -21456 NW +p1 uiR2_Primes04 uiR2EntryPoint03 33029 -21522 E + +p1 uiR2_Primes06 uiR2EntryPoint01 34700 -21070 SE +p1 uiR2_Primes06 uiR2EntryPoint02 34905 -21093 SW +p1 uiR2_Primes06 uiR2EntryPoint03 34733 -21359 N + +p1 uiR2_Primes22 uiR2EntryPoint01 37500 -21960 S +p1 uiR2_Primes22 uiR2EntryPoint02 37524 -22163 N +p1 uiR2_Primes22 uiR2EntryPoint03 37394 -22286 NE + +p1 uiR2_Primes09 uiR2EntryPoint01 36950 -21200 E +p1 uiR2_Primes09 uiR2EntryPoint02 37532 -21366 W +p1 uiR2_Primes09 uiR2EntryPoint03 37208 -21170 S + +p3 uiR2_Primes29 uiR2EntryPoint01 33140 -22910 W +p3 uiR2_Primes29 uiR2EntryPoint02 33016 -22602 S +p3 uiR2_Primes29 uiR2EntryPoint03 32776 -23057 NE + +p3 uiR2_Primes01 uiR2EntryPoint01 31110 -21520 E +p3 uiR2_Primes01 uiR2EntryPoint02 31198 -21061 S +p3 uiR2_Primes01 uiR2EntryPoint03 31132 -21312 E + +p3 uiR2_Primes05 uiR2EntryPoint01 34250 -21300 W +p3 uiR2_Primes05 uiR2EntryPoint02 33891 -21271 E +p3 uiR2_Primes05 uiR2EntryPoint03 34151 -21558 N + +p5 uiR2_Primes16 uiR2EntryPoint01 32970 -22100 NW +p5 uiR2_Primes16 uiR2EntryPoint02 32763 -21871 SE +p5 uiR2_Primes16 uiR2EntryPoint03 32890 -21990 S + +p5 uiR2_Primes18 uiR2EntryPoint01 34600 -22075 W +p5 uiR2_Primes18 uiR2EntryPoint02 34205 -22078 E +p5 uiR2_Primes18 uiR2EntryPoint03 34651 -21825 S + +p5 uiR2_Primes25 uiR2EntryPoint01 39910 -22320 E +p5 uiR2_Primes25 uiR2EntryPoint02 39757 -22077 E +p5 uiR2_Primes25 uiR2EntryPoint03 39979 -22132 NW + +p6 uiR2_Primes03 uiR2EntryPoint01 32300 -21100 SE +p6 uiR2_Primes03 uiR2EntryPoint02 32288 -21484 N +p6 uiR2_Primes03 uiR2EntryPoint03 32691 -21085 SW + +p6 uiR2_Primes07 uiR2EntryPoint01 35350 -21300 NE +p6 uiR2_Primes07 uiR2EntryPoint02 35519 -21067 S +p6 uiR2_Primes07 uiR2EntryPoint03 35601 -21405 N + +p6 uiR2_Primes13 uiR2EntryPoint01 40330 -21600 N +p6 uiR2_Primes13 uiR2EntryPoint02 40127 -21438 E +p6 uiR2_Primes13 uiR2EntryPoint03 40537 -21438 W + +p7 uiR2_Primes19 uiR2EntryPoint01 35000 -22300 N +p7 uiR2_Primes19 uiR2EntryPoint02 35456 -22007 W +p7 uiR2_Primes19 uiR2EntryPoint03 35022 -21891 SE + +p7 uiR2_Primes26 uiR2EntryPoint01 40500 -22100 N +p7 uiR2_Primes26 uiR2EntryPoint02 40694 -22284 NW +p7 uiR2_Primes26 uiR2EntryPoint03 40426 -22298 NE + +p7 uiR2_Primes08 uiR2EntryPoint01 36200 -21100 E +p7 uiR2_Primes08 uiR2EntryPoint02 36393 -21558 N +p7 uiR2_Primes08 uiR2EntryPoint03 36077 -21345 S + +p8 uiR2_Primes10 uiR2EntryPoint01 38002 -21293 N +p8 uiR2_Primes10 uiR2EntryPoint02 38006 -21532 N +p8 uiR2_Primes10 uiR2EntryPoint03 38094 -21040 S + +p8 uiR2_Primes11 uiR2EntryPoint01 38970 -21520 W +p8 uiR2_Primes11 uiR2EntryPoint02 38721 -21047 S +p8 uiR2_Primes11 uiR2EntryPoint03 38577 -21350 NW + +p8 uiR2_Primes15 uiR2EntryPoint01 31980 -21880 SE +p8 uiR2_Primes15 uiR2EntryPoint02 32365 -22121 NW +p8 uiR2_Primes15 uiR2EntryPoint03 32159 -22032 N + +p11 uiR2_Primes30 uiR2EntryPoint01 33730 -22860 N +p11 uiR2_Primes30 uiR2EntryPoint02 33656 -22604 E +p11 uiR2_Primes30 uiR2EntryPoint03 33843 -22997 E + +p11 uiR2_Primes12 uiR2EntryPoint01 39500 -21280 NE +p11 uiR2_Primes12 uiR2EntryPoint02 39240 -21197 E +p11 uiR2_Primes12 uiR2EntryPoint03 39800 -21352 W + +p11 uiR2_Primes14 uiR2EntryPoint01 31350 -21960 S +p11 uiR2_Primes14 uiR2EntryPoint02 31373 -22074 S +p11 uiR2_Primes14 uiR2EntryPoint03 31166 -22272 NE + +p12 uiR2_Primes17 uiR2EntryPoint01 33660 -22000 SW +p12 uiR2_Primes17 uiR2EntryPoint02 33397 -21879 SE +p12 uiR2_Primes17 uiR2EntryPoint03 33347 -22331 N + +p12 uiR2_Primes21 uiR2EntryPoint01 37000 -22150 W +p12 uiR2_Primes21 uiR2EntryPoint02 36645 -21864 SE +p12 uiR2_Primes21 uiR2EntryPoint03 36964 -21813 SE + +p12 uiR2_Primes27 uiR2EntryPoint01 31530 -22700 SW +p12 uiR2_Primes27 uiR2EntryPoint02 31533 -23080 NW +p12 uiR2_Primes27 uiR2EntryPoint03 31078 -22800 N + + + +o1 uiR2_Primes02 uiR2EntryPoint01 31640 -21140 SE +o1 uiR2_Primes02 uiR2EntryPoint02 31593 -21374 N +o1 uiR2_Primes02 uiR2EntryPoint03 31818 -21204 W + +o1 uiR2_Primes28 uiR2EntryPoint01 32270 -23000 N +o1 uiR2_Primes28 uiR2EntryPoint02 32316 -22662 S +o1 uiR2_Primes28 uiR2EntryPoint03 31933 -22734 SE + + + +//z1 uiR2_Primes20 uiR2EntryPoint01 35790 -22100 N + +//z1 uiR2_Primes23 uiR2EntryPoint01 38360 -21970 N + +//z1 uiR2_Primes24 uiR2EntryPoint02 38906 -21891 SE + +//z1 uiR2_Primes24 uiR2EntryPoint03 39086 -22287 NW diff --git a/code/ryzom/common/data_common/r2/r2_islands.xml b/code/ryzom/common/data_common/r2/r2_islands.xml new file mode 100644 index 000000000..a8209512d --- /dev/null +++ b/code/ryzom/common/data_common/r2/r2_islands.xml @@ -0,0 +1,2847 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/ryzom/common/data_common/visual_slot.tab b/code/ryzom/common/data_common/visual_slot.tab new file mode 100644 index 0000000000000000000000000000000000000000..d0c4dacd975ab81a6b9168605167c64d2a822049 GIT binary patch literal 9972 zcmYk>b#xuo_XY6XNZs89D=j4ymmeHJ7G@y3}Xh`n~ z(1<=7;3E21fQ#uf0WP7>2Dp@V2yhwg7@#qIDZu6QA(Qj(Ln*Or^5o=K!*pokxmM56P+C3W;!Rp zEp%>x7IayFTj}xux6w`(x6_J+xPw+IL`zz^5O>llg}94eD8$_q3EV@AC2%jzNZ>x2 znZW(DW&#h;S_wQzYbWp!t&_mRv~B{A(BTO@O2;Pf7@eHJ<8)>MPtf@ZJV}=(@D$ye zz|(YF0=aa10v6Ex#HG~+upn(+>r@jx?vt!Df>&G;Rf@s^tL2Q}jlX~v({jOS{` z^EBgaHRGXXJYO^ZhGzUt&A8Q!f2bMnrWr5NjDMpU|5h{pn`ZoX&3IqUct6ef5Y70% zn(=X(@$s7R8Jh8#n(;-N@x_|)4w~_jn({GMe#Yn(^a>lJOITlJS#;lJQf8 zlJWAI@d}#pikk6Cn(@k-@p_u^`kL_un(>C3@kW~Qp_=j0n(>L6@#&iJxtj6C3CZ~S zgk*d}LNdNFAsIiLkc?*}CF4a&5L=-T0DlKO=Wg+niXM!`<$L3ci3m}pSi<6le)t`eNVWd>__brg)4tMu0+=6` zJ+au6d*U{oq1$zajLy&tIzwOS41KLLG)8A=tjlpdzv~Qjw{lPXVbPNR{eN1yCwf@9Cwf}BCwf_# zq25+zsE?Hy>T6|&`dPUr`dhgt23WZ#23ol%23ff${<3mU47PGl{B7l)_{YjUF~rI} z@voJ8;y)|*#84~u#4s!O#BeM3#0V=hG}6ipjj}RBqpi%)7%MY0*2)Zxvob^Dt<2B_ zD>F3F$_!1iGDDNC%+M4oGc?u83{A5#L({Fy&;j38-a7PMUrl@i0D>}u5_D4if*@v z=?;r-bf-lT-DU9+-EHwP-DB|y-D~kF-DmL`-EZ+ZJz((#J!tVIJ!J6}J#6tcJ!0_< z%__vVG`kSr(c*>po|Y)Y5A?qTex#!k_=!$P;Ac85fnVsH1b(H968Md-N#J+7Hi7PR zT>^j5GYR}jizU&64o;#c{X2Cxzj3Zwe#mz7$5% z{V9y12T~YK52i4N9!g;>J)FWgdL)JMG&@e8`8iGE^js9dh`_pmV zpUUX|R8jY*YPvtw*8S;8-JhP-{V7lPr;fTm8DGx+>vey+LHDOSb$_}`_os(-e|kjs zCr|e$U-zeWx<9qo{po+YKfS2?(_4D>zpZC~7d`t6_3Zyh&;F0~?Eg;B{_pkd@2>mP zAG$yF*ZpaL?oa>e{xnqgrwO`0P1OBqmhMlpb$?o-`_s}uIzmT1`^)P7R8IG&^144& z(EaJO?oVfQe>$uC(>dLr&KJtrUq$z)s=7Z_)BUNs?oTyze;TIy(-_^KCh7h(L-(h7 zx<4(^{b`f#Pn&gr+M@f@Io+Q!wIhtxjxbR>!c^@DGj)F|AsNrPB2Moz>8zL6J*SrL zISq8rxfJPpB>gp!&cjDK51;Eie53R5lg`8MIuAW{9{TG%4Ay!0Pv>Ej&ck?}hYdOp z8+9Hw={#)KdDx=!uvO<_o6f^_oriKd50!NuYUn)F)p>YA=fT%`Xsz?mUgx2+&coF@ z57+2Cw9t9DRp;S;orec>9-h>BcuMD?wa!Buorlgk4}s3ZYdR0F>pXm*^H8AkkkWaG zbsoOZdH7Q2;TN5UUv(aO>pb+)dH7rB;UArcQ92K!bsnbaJWSVlSfKN;Q0JkY&V#!N zTk;$%rt^@Y^N^|Ya8T#rkj}$lorfbj4@Y$#O6fe5)_EwS^H5gjp`6aczd8>ibsom+ zJWSPjn62}$Q0HN#&ciC5ht)a{r*$6O&HXI@{8_Q=LYM!)vpuOfbxiauV|KE)hxfKS$a2saYPPSstNT9;aEJqFJ7$Sze%7UZz=Iu3288Sw5v%zM$QBw4Uwb z^=zN4XZv(L+cWiSZye)-JG9g1_WoSyum^Ib!ye3)4tpq9I_%+G6z7~A$(0U!G*>$8 zv0Uk}$8)8_p2(FBdoou#?5SMou%~mS!=A~N4tq9NI_$Yz>9FT>rNdsxl@9BgOV#wb zqUUyoCmlA^lMb8ZNr%n$q{FuIq{Ft>4%F<&pO}sq{F`BNr!#c!}a_*yyr=WeczJ~`++ANw!o7PYdz_(A9~VZ3q9$u2@kjN z_fPg@kD2O8hn?n0)~9=t^$VV4-8IF#(?54#I&6k79rh+)I_%B9bl6*b*<)Jx(qUWr z(qZrQrNchuONV{kmk#@eFCF$xUpnktzI52Ped)08`qE+F^QFVS?@NdMz;{V-fBphr zI;{1j!+z+?x!uK=bGy)&4x8|$!}iXT4%;VBI&9xO>9GCsq{H^lLwkPT0eRA4C+10q zos=gXc5|OB?C1WsG##vPL>= zIU^mmypaxD!AOU#Xpru(m5g-Q%0@bD6(b$Cs*w&`%}9r>ZluH3Fw$Xb8tJgLjC9!A zMmlUABOSJ`kq%qWNQbR&q{B8a(qS7K>9CEAbl8iGbl8iHbl6Lbbl6LcblA&`blAp5 zI_%{}I&2do9k!{#ME+c_FqlM}8BC^E8cd-%22<%(2GeMBgX#2YgBkQ1gPHVNgIV-C zgW2?YgE{mDgSqrZgL(8OgZcDkg9Y>!gN3w(!6JIA!D4!w!4i7A!BTpM!7|#?U^%_h zU$wHU_E`%U;}-~U?Y9lU=w}BU^9KxU<-ZB zU@LvxU>kkHU^{)%UD6b*iAiyJ=8bYOXr2yN9TvwPZxwZKo^EMNEd}T zL>GrROqYZ>LYIa(N|%K=Mwf>;PFI9DL05)2Nmqq9MOTM7P1l4tL)V5lOV@=sN7siq zPd9|PKsSczi$7;mh+=L5$k`ksgKi0tNw)=|(7hqb(tRPy(fuLH(*q$Y(1Rf=(nBFC(ZeAs(<33O(4!%$(qkd2(c>Yi(-R?T z(32r*(o-R7(bFMn(=#FJ(6b@x(sLo|(eokd(+eRQP4^gO?{c0jz*Y2A z0h-g(1-P1?DZn-KYyqyN=L&EgJzs$9>4gH^K;3D6BQ55hVbcuv44Y=UXV^5$J;SEi z?in^M?w(=O67Cr`E$Mb$TFO1crls98Y+A-W!={1jZFGlw*GYG}cb#;Xd)G;KyLX** zk9!Y9_qtt|?sK~?-S2i?dcf_v^q|{y=^?l4(!*}orAOSZOOLu;mmYJwE-9?Yi`9x9iex+^$Q9yIq%#aPNWWNcSFyj&kpT=o$AO zh@N%tf#^B+9*CZI?}6wA_a2D4+pse&79pS+5e&_Y@B+<>5Yp@j`LuY1|Irc=UZf=> zyhKYyc$t=t@Cq#x;Z<5T!fUi#gx6{L2yf5|5#FQ~BfLc`MR=Q5j_?kx65(B1HNtze zT7>s$^#~u(8W9R;%?Os(itr(=9ia=Y6QPjSjgX-AA|z@32oY@%p(|||Aw?TSi0MTU zy3vax6wyl}d_*se@G-qC!Y8zGgiq<^5k8|$B79DpM)-nW5#dYPEW%gx$_QW6oCx30 zt0H_$n@9MLULE0kdQF5M=(Q1kq}N6GiC!P!XL>_~U+9eyex)}>_>JBi;dgpVgzmIO zgg@x55&opNMd(3qkI<7o9-$X~B0_KaWQ0ESsR(`P(-Hd7+z9=t7hwSPBMhX^L>NS$ zjqn$JF2Z2iD#G8ib%cLtn+QW_UW9*X+X(;Bb`gfs_7R5B4iSdajuA%CP7y}Z=Oc`w zog<8NoMt{6u@?27R;$34TQEn-Zhcf^=Pd&ihe`^1<+`^K0``^A_>`^T70 z2gH~`2gaC52gR60hsKyqhsBsfhsT&pN5q&%N5+^>N5xn`N5@!5$HZ7f$HrJp$HiDe z$H!PoC&XArC&pM#C&gGnC&ySxr^HxAr^Z-Kr^Q%9r^i@JXT(@XXU14hXT{h+XUEt` z=fv1V=f>Df=f&7U=f~Je7sS{`7sl957sc2?7suF1m&Djbm&Vvlm&Mpam&e#kSH##y zSH{>+yLZC@`e!#Bq&>Rf5bfCwhiR{FI6`}O!%^C&8;;THML14t6yXG|S%j0cRuN9o z+C?}`FDt?s+PDa3>E%T@N1GJkJZ)N(?)*7d6s7y0`z4n_ea_{&ZYDpwu9`(%*UYAw zzI6XAA0_xX+n4TN+?VcO!k6w}(wFXE%9rk6+L!L{I-+}Yj2ze9D$t}a-9PfB`*-!F z`=@;A{;qqayZ`JwRO8pr$&>EycJ&(k>~{5<)a}OZQM5awjC6mui`L<1w~N-LZuhH4 z-R@VPK4awl^|J;I`T046MzocY_t&kByuWT^Hhtb()|Y{rTY&|O7|a>lh6Se_jh-~?fl#_mhOM0{J+o1 HDZ>8&$do2g literal 0 HcmV?d00001 diff --git a/code/ryzom/common/data_common/weather.cfg b/code/ryzom/common/data_common/weather.cfg new file mode 100644 index 000000000..897e99e68 --- /dev/null +++ b/code/ryzom/common/data_common/weather.cfg @@ -0,0 +1,14 @@ +/////////////////////////// +/////////////////////////// +/// Weather CONFIG FILE /// +/////////////////////////// +/////////////////////////// + + +RealDayLength = 3000.0; // real length of the day, in seconds (3000 = 50mn) +NumHours = 24.0; // number of ryzom hours in a day +NightTransitionStartHour = 19.0; // start of night transition +NightTransitionEndHour = 21.0; // end of night transition +DawnTransitionStartHour = 5.0; // start of dawn transition +DawnTransitionEndHour = 7.0; // end of dawn transition +MaxNumColorSteps = 25; // the max number of color steps From 032e46b97a0f94d5a8c12dac165f8fe708087b96 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 25 Sep 2016 14:21:42 +0200 Subject: [PATCH 017/467] Added: Ryzhome files --HG-- branch : compatibility-develop --- .../gamedev/interfaces_v3/ryzhome_toolbar.lua | 251 ++++++++++ .../gamedev/interfaces_v3/ryzhome_toolbar.xml | 443 ++++++++++++++++++ 2 files changed, 694 insertions(+) create mode 100644 code/ryzom/client/data/gamedev/interfaces_v3/ryzhome_toolbar.lua create mode 100644 code/ryzom/client/data/gamedev/interfaces_v3/ryzhome_toolbar.xml diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/ryzhome_toolbar.lua b/code/ryzom/client/data/gamedev/interfaces_v3/ryzhome_toolbar.lua new file mode 100644 index 000000000..cf36aa3f6 --- /dev/null +++ b/code/ryzom/client/data/gamedev/interfaces_v3/ryzhome_toolbar.lua @@ -0,0 +1,251 @@ + +if getUI("ui:interface:webig_ryzhome_toolbar") == nil then + local f = io.open("user/ryzhome_toolbar.xml", "r") + local xml = f:read("*a") + parseInterfaceFromString(xml) +end + +if RyzhomeBar == nil then + RyzhomeBar = { + id = "ui:interface:webig_ryzhome_toolbar", + saveuri = "http://app.ryzom.com/app_ryzhome/index.php?action=toolbar_save", + selectedPage = 1 + } +end + +function RyzhomeBar:close() + getUI("ui:interface:webig_ryzhome_toolbar").active=false + self:saveConfig() + +end + +function RyzhomeBar:addItems() + local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_LuaListItems&command=add" + getUI("ui:interface:web_transactions:content:html"):browse(url) +end + +function RyzhomeBar:moveItems() + local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_LuaListItems&command=move" + getUI("ui:interface:web_transactions:content:html"):browse(url) +end + +function RyzhomeBar:removeItems() + local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_LuaListItems&command=remove" + getUI("ui:interface:web_transactions:content:html"):browse(url) +end + +function RyzhomeBar:inviteFriend() + local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_InviteFriend" + getUI("ui:interface:web_transactions:content:html"):browse(url) +end + +function RyzhomeBar:listFriends() + getUI("ui:interface:web_transactions:content:html"):browse(RyzhomeBar.listFriendsUrl) + getUI("ui:interface:web_transactions:header_opened:browse_undo").active=false + getUI("ui:interface:web_transactions:header_opened:browse_redo").active=false + getUI("ui:interface:web_transactions:header_opened:browse_refresh").active=false + getUI("ui:interface:web_transactions:header_opened:browse_home").active=false + local wt = getUI("ui:interface:web_transactions") + wt.w=316 + wt.h=420 + wt.pop_min_w=316 + wt.pop_max_w=316 + wt.pop_min_h=420 + wt.pop_max_h=420 + + local framewin = getUI("ui:interface:webig_ryzhome_list_item") + if framewin ~= nil then + framewin.active=false + wt.x = framewin.x + wt.y = framewin.y + end + + getUI("ui:interface:web_transactions").active=true + + setOnDraw(getUI("ui:interface:web_transactions"), "RyzhomeBar:autocloseWebTransactions()") +end + +function RyzhomeBar:autocloseWebTransactions() + local current_url = getUI("ui:interface:web_transactions:content:html").url + if (current_url ~= RyzhomeBar.listFriendsUrl and current_url ~= inviteFriendsUrl) then + local framewin = getUI("ui:interface:webig_ryzhome_list_item") + framewin.x = getUI("ui:interface:web_transactions").x + framewin.y = getUI("ui:interface:web_transactions").y + getUI("ui:interface:web_transactions").active=false + setOnDraw(getUI("ui:interface:web_transactions"), "") + end +end + + +function RyzhomeBar:serialize() + local ui = getUI(self.id) + local url = "&posx=" .. tostring(ui.x) .. "&posy=" .. tostring(ui.y) + return url +end + +function RyzhomeBar:updateNbrItems(offset) + RyzhomeBar.nbrItems = RyzhomeBar.nbrItems + offset + if RyzhomeBar.nbrItems == 0 then + getUI("ui:interface:webig_ryzhome_toolbar:content:new_items_quantity").hardtext="" + else + getUI("ui:interface:webig_ryzhome_toolbar:content:new_items_quantity").hardtext=tostring(RyzhomeBar.nbrItems) + end +end + +function RyzhomeBar:saveConfig() + local url = self.saveuri .. self:serialize() + getUI("ui:interface:web_transactions:content:html"):browse(url) +end + +function RyzhomeBar:movePage(offset) + RyzhomeBar.selectedPage = RyzhomeBar.selectedPage + offset + if RyzhomeBar.selectedPage <= 0 then + RyzhomeBar.selectedPage = 1 + elseif RyzhomeBar.selectedPage > RyzhomeBar.nbrPages then + RyzhomeBar.selectedPage = RyzhomeBar.nbrPages + end + getUI("ui:interface:webig_ryzhome_list_item:header_opened:page").hardtext=tostring(RyzhomeBar.selectedPage).." / "..tostring(RyzhomeBar.nbrPages) + RyzhomeBar:setupItems() +end + +function RyzhomeBar:listItems() + RyzhomeBar.recently_removed_item = false + + local framewin = getUI("ui:interface:webig_ryzhome_list_item") + framewin.opened=true + framewin.active=true + if framewin.x == 0 and framewin.y == 0 then + local ui = getUI("ui:interface") + framewin.x = (ui.w - framewin.w) / 2 + framewin.y = (ui.h + framewin.h) / 2 + end + + if RyzhomeBar.Items == nil then + RyzhomeBar.Items = {} + end +end + +function RyzhomeBar:useItem(id) + id = tostring(RyzhomeBar.Items[RyzhomeBar.selectedPage][id][1]) + if RyzhomeBar.itemCommand == "add" then + RyzhomeBar:addItem(id) + elseif RyzhomeBar.itemCommand == "remove" then + RyzhomeBar:removeItem(id) + elseif RyzhomeBar.itemCommand == "move" then + RyzhomeBar:moveItem(id) + end +end + +function RyzhomeBar:addItem(id) + local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_Place&command=add&id="..id + getUI("ui:interface:web_transactions:content:html"):browse(url) +end + +function RyzhomeBar:removeItem(id) + RyzhomeBar.recently_removed_item = true + RyzhomeBar:spawnItems() + local v = RyzhomeBar.spawnedItems[id] + runAH(nil,"add_shape", "shape=sp_mort.ps|x="..v[2].."|y="..v[3].."|z="..v[4].."|angle="..v[5].."|scale="..tostring(tonumber(v[6])*4)..v[7]..v[8]..v[9]) + local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_Remove&id="..id + getUI("ui:interface:web_transactions:content:html"):browse(url) +end + +function RyzhomeBar:moveItem(id) + local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_Place&command=move&id="..id + getUI("ui:interface:web_transactions:content:html"):browse(url) +end + +function RyzhomeBar:highlightItem(id) + if RyzhomeBar.itemCommand == "add" then + return + end + if RyzhomeBar.recently_removed_item then + RyzhomeBar.recently_removed_item = false + else + RyzhomeBar:spawnItems() + local v = RyzhomeBar.spawnedItems[tostring(RyzhomeBar.Items[RyzhomeBar.selectedPage][id][1])] + if v then + runAH(nil, "add_shape", "shape=ma_acc_ascenseur.ps|x="..v[2].."|y="..v[3].."|z="..v[4].."|angle="..v[5].."|scale="..tostring(tonumber(v[6])*2)..v[7]..v[8]..v[9]) + end + end +end + +function RyzhomeBar:callFriendUrl(action, target) + local url = "http://app.ryzom.com/app_arcc/index.php?action=player_ryzhome_"..action.."&target="..target + getUI("ui:interface:web_transactions:content:html"):browse(url) +end + +function RyzhomeBar:spawnItems() + runAH(nil, "remove_shapes", "") + for k,v in pairs(RyzhomeBar.spawnedItems) do + runAH(nil, "add_shape", "shape="..v[1].."|x="..v[2].."|y="..v[3].."|z="..v[4].."|angle="..v[5].."|scale="..v[6]..v[7]..v[8]..v[9]) + end + +end + +function RyzhomeBar:setupItems() + for k = 1, 8 do + getUI("ui:interface:webig_ryzhome_list_item:header_opened"):find(":but"..tostring(k)).active=false + getUI("ui:interface:webig_ryzhome_list_item:header_opened"):find(":icon"..tostring(k)).active=false + getUI("ui:interface:webig_ryzhome_list_item:header_opened"):find(":text"..tostring(k)).uc_hardtext="" + getUI("ui:interface:webig_ryzhome_list_item:header_opened"):find(":info"..tostring(k)).uc_hardtext="" + end + for k,v in pairs(RyzhomeBar.Items[RyzhomeBar.selectedPage]) do + if k ~= nil then + getUI("ui:interface:webig_ryzhome_list_item:header_opened"):find(":icon"..tostring(k)).active=true + getUI("ui:interface:webig_ryzhome_list_item:header_opened"):find(":but"..tostring(k)).active=true + local text = ucstring() + text:fromUtf8(v[3]) + getUI("ui:interface:webig_ryzhome_list_item:header_opened"):find(":text"..tostring(k)).uc_hardtext=text + text:fromUtf8(v[4]) + getUI("ui:interface:webig_ryzhome_list_item:header_opened"):find(":info"..tostring(k)).uc_hardtext=text + end + end +end + +if RyzhomePlace == nil then + RyzhomePlace = { + saveuri = "", + } +end + +function RyzhomePlace:move(x, y, z) + pos_x=pos_x+x + pos_y=pos_y+y + pos_z=pos_z+z + RyzhomePlace:update() +end + +function RyzhomePlace:rot(a) + pos_a=pos_a+a + RyzhomePlace:update() +end + +function RyzhomePlace:reset() + --Ryzhome:addShapes() + pos_x, pos_y, pos_z = getPlayerPos() + pos_a = (3.14*getUI("ui:interface:compass:arrow3d:arrow").rotz)/18 + RyzhomePlace:addShape() + RyzhomeBar:spawnItems() +end + +function RyzhomePlace:update() + RyzhomePlace:addShapes() + RyzhomePlace:addShape() + RyzhomeBar:spawnItems() +end + +function RyzhomePlace:apply() + getUI("ui:interface:web_transactions:content:html"):browse(RyzhomePlace.saveuri.."&pos_x="..pos_x.."&pos_y="..pos_y.."&pos_z="..pos_z.."&pos_a="..pos_a) +end + +function RyzhomePlace:close() + --runAH(nil, "remove_shapes", "") + getUI("ui:interface:webig_ryzhome_place_item").active=false +end + +function debug(text) + local uc = ucstring() + uc:fromUtf8(tostring(text)) + displaySystemInfo(ucstring(uc), "sys") +end \ No newline at end of file diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/ryzhome_toolbar.xml b/code/ryzom/client/data/gamedev/interfaces_v3/ryzhome_toolbar.xml new file mode 100644 index 000000000..b6a8dc09c --- /dev/null +++ b/code/ryzom/client/data/gamedev/interfaces_v3/ryzhome_toolbar.xml @@ -0,0 +1,443 @@ + +webig_ryzhome_list_item + +