Changeset 3218

Timestamp:

01/16/10 19:06:39 (8 weeks ago)

Author:

sience

Message:

-CustomArtFilterFile sample (iris.filter.lua) for Shards added to "/config" and "/config/shards/zwischenwelt.xml
-obsolete shardconfig removed from config defaults
-gUOAMEnabled added to config defaults
-uoam folder moved from "/data" to "/config"  (should be in shard config later)
-"/tmp" dir moved from default "/data" to "iris2" root
-mark.uoam file moved to "/tmp"
-some optimizations to default dir handling in main.lua

Location:

trunk

Files:

• config/iris.filter.lua (added)
• config/shards/zwischenwelt.xml (modified) (1 diff)
• config/uoam (added)
• config/uoam/EMPTY (added)
• lua/config_declarations.lua (modified) (4 diffs)
• lua/lib.compass.lua (modified) (2 diffs)
• lua/lib.macrolist.lua (modified) (1 diff)
• lua/lib.mainmenu.lua (modified) (2 diffs)
• lua/main.lua (modified) (4 diffs)
• tmp (added)
• tmp/EMPTY (added)

trunk/config/shards/zwischenwelt.xml

@@ -6 +6 @@
     <string key="gPassword"></string>
     <string key="gLoginServerIP">zwischenwelt.org</string>
+    <string key="gCustomArtFilterFile">iris.filter.lua</string>
     <table key="gMaps" keytype="string">
         <table key="0" keytype="number">

trunk/lua/config_declarations.lua

@@ -144 +144 @@
 gShardList = {}
 
-
 --~ preset shards now loaded from config/shards/*.xml
-
---[[
-gShardList["localhost"] = {
-                gLoginname = "admin",   -- Loginname
-                gPassword = "admin",    -- Password
-                gLoginServerIP = "localhost",
-                gLoginServerPort = 2593,
-                gServerSeed = hex2num("0xFFFFFFFF"),
-                gPolServer = false
-        }
-
-gShardList["vetus-mundus"] = {
-                gLoginname = "",        -- Loginname
-                gPassword = "",         -- Password
-                gLoginServerIP = "shard.vetus-mundus.de",
-                gLoginServerPort = 2594,
-                gWalkMinDiagonalBlock = 2,
-                gServerSeed = hex2num("0xFFFFFFFF"),
-                gPolServer = false
-        }
-
-gShardList["Jarrys (chinese)"] = {
-                gLoginname = "",        -- Loginname
-                gPassword = "",         -- Password
-                gLoginServerIP = "login.uofans.com", 
-                gLoginServerPort = 2593, 
-                gServerSeed = 1, 
-                gPolServer = false 
-        }
-
--- demise admins banned iris =(  http://www.uodemise.com/forum/showthread.php?p=477997
---~ gShardList["uodemise.com"] = {
-                --~ gLoginname = "",    -- Loginname
-                --~ gPassword = "",             -- Password
-                --~ gLoginServerIP = "login.uodemise.com",
-                --~ gLoginServerPort = 2593,
-                --~ gServerSeed = hex2num("0xFFFFFFFF"),
-                --~ gPolServer = false
-        --~ }
-
-gShardList["uogamers.com"] = {
-                gLoginname = "",        -- Loginname
-                gPassword = "",         -- Password
-                gLoginServerIP = "login.uogamers.com",
-                gLoginServerPort = 2593,
-                gServerSeed = hex2num("0xFFFFFFFF"),
-                gPolServer = false,
-                --~ gbAutoClickItems = true -- preaos (causes lag)
-        }
-
-gShardList["defianceuo.com"] = { 
-                gLoginname = "",        -- Loginname
-                gPassword = "",         -- Password
-                gLoginServerIP = "dfi.defianceuo.com", 
-                gLoginServerPort = 2593,
-                gServerSeed = hex2num("0xFFFFFFFF"),
-                gPolServer = false
-        }
-]]--
-
--- in config.lua you can add shards like this:  
--- gShardList["myshard"] = { ..... } 
-
--- in config.lua you can set login infos like this: (not recommended for security reasons)  
--- gShardList["uogamers.com"].gLoginname = "YOUR_USERNAME" 
--- gShardList["uogamers.com"].gPassword = "YOUR_PASSWORD" 
-
--- for pol servers use this:
--- gShardList["localhost"].gPolServer=true
--- gShardList["localhost"].gLoginServerPort=5003
--- gShardList["localhost"].gGameServerPort=5003
-
--- you can specify a specialised filter file for your shard
--- gShardList["localhost"].gCustomArtFilterFilePath = "config\\iris.filter.lua"
 
 
@@ -226 +151 @@
 gConfig:DeclareBoolean("gStartGameWithoutNetwork", "client", "start without network", 'TODO', false)
 gConfig:DeclareBoolean("gStartInDebugMode", "client", "start in debug mode", 'TODO', false)
-
-gConfig:DeclareString("gCustomArtFilterFilePath", "path", "art filter path", 'TODO', "")
 
 gServerEmulator=0
@@ -495 +418 @@
 gConfig:DeclareBoolean("gEnableGotoOnClick", "input", "goto on click", 'TODO', false)
 
-gMarkFile = "../data/uoam/mark.uoam"
+-- UOAM Server support
+gConfig:DeclareBoolean("gUOAMEnabled", "protocol", "Enabled UOAM", 'TODO', false)
 
 gConfig:DeclareBoolean("gTileFreeWalkDiagonalOptimization", "input", "diagonal walk optimize", 'experimental code for faster diagonal movement (tries to avoid stair effect)', true)
@@ -518 +442 @@
 
 gConfig:DeclareFloat("gMaxFPS", "gfx", "max fps", 'upper fps limit', 50)
-
 
 

trunk/lua/lib.compass.lua

@@ -60 +60 @@
 
 function MarkCurrentPosition    (name)
-    if gMarkFile then
-        local fp = io.open(gMarkFile,"a")
+    if gUoamMarkFilePath then
+        local fp = io.open(gUoamMarkFilePath,"a")
         if (fp) then
             local x,y,z = MacroRead_GetPlayerPosition()
@@ -70 +70 @@
     end
     gPositionMarkers = {}
-    LoadUOAutomapFiles("../data/uoam/", gPositionMarkers)
-end
-
-LoadUOAutomapFiles("../data/uoam/", gPositionMarkers)
+    LoadUOAutomapFiles(gUOAMDir, gPositionMarkers)
+end
+
+LoadUOAutomapFiles(gUOAMDir, gPositionMarkers)
 
 function SetPositionMarker(mapindex,name,xloc,yloc,r,g,b,a)

trunk/lua/lib.macrolist.lua

@@ -1284 +1284 @@
         local shard = gShardList[shardname]  assert(shard)
         gShardName = shardname
-    LoadShardfilter(shard.gCustomArtFilterFilePath) -- todo : revert on error or back-button ?
+    LoadShardfilter(shard.gCustomArtFilterFile) -- todo : revert on error or back-button ?
         
     -- load global config from shard

trunk/lua/lib.mainmenu.lua

@@ -89 +89 @@
 -- ***** ***** ***** ***** ***** Shardfilter
 
-function LoadShardfilter (filterfilepath)
-    if (filterfilepath) then
-        if (file_exists(gMainWorkingDir..filterfilepath) ) then
-            print("Load custom shard-specific Filter: "..gMainWorkingDir..filterfilepath)
-            dofile(gMainWorkingDir..filterfilepath)
+function LoadShardfilter (filterfile)
+    if (filterfile) then
+        if (file_exists(gConfigPath..filterfile) ) then
+            print("Load custom shard-specific Filter: "..gConfigPath..filterfile)
+            dofile(gConfigPath..filterfile)
         else
-            print("Shard-specific Filter not found: "..gMainWorkingDir..filterfilepath)
+            print("Shard-specific Filter not found: "..gConfigPath..filterfile)
         end
     end
@@ -106 +106 @@
     MainMenuStopAllMenus()
     
-    LoadShardfilter(shard.gCustomArtFilterFilePath) -- todo : revert on error or back-button ?
+    LoadShardfilter(shard.gCustomArtFilterFile) -- todo : revert on error or back-button ?
     
     -- load global config from shard

trunk/lua/main.lua

@@ -3 +3 @@
 --###############################
 
-
+-- Iris2 Directories/Files
 gMainWorkingDir     = GetMainWorkingDir and GetMainWorkingDir() or ""
 datapath            = gMainWorkingDir.."data/"
 libpath             = gMainWorkingDir.."lua/"
-lugreluapath        = (file_exists(gMainWorkingDir.."mylugre") and gMainWorkingDir.."mylugre/lua/" or GetLugreLuaPath())
 gMacroPathFallback  = gMainWorkingDir.."lua/config_macros_declarations.lua"
 gMainPluginDir      = gMainWorkingDir.."plugins/"
+gIrisWidgetDir      = libpath.."widgets/"
+
+lugreluapath        = (file_exists(gMainWorkingDir.."mylugre") and gMainWorkingDir.."mylugre/lua/" or GetLugreLuaPath()) -- this is should also in USERHOME dir
+
+-- User Directories/Files
+gTempPath           = gMainWorkingDir.."tmp/"
+gUoamMarkFile           = "mark.uoam"
+gUoamMarkFilePath       = gTempPath..gUoamMarkFile
+gScreenshotDir          = gMainWorkingDir.."screenshots/"
 gConfigPath         = gMainWorkingDir.."config/"
-gScreenshotDir          = gMainWorkingDir.."screenshots/"
+gConfigFile         = "config.lua"
+gConfigPathFile     = gConfigPath..gConfigFile
+gConfigPathFile_old = datapath..gConfigFile         -- only as Fallback for old users
 gMacroFile          = "mymacros.lua"
 gMacroPathFile      = gConfigPath..gMacroFile
 gMacroPathFile_old  = datapath..gMacroFile          -- only as Fallback for old users
-gConfigFile         = "config.lua"
-gConfigPathFile     = gConfigPath..gConfigFile
-gConfigPathFile_old = datapath..gConfigFile         -- only as Fallback for old users
-gIrisWidgetDir      = libpath.."widgets/"
 gDesktopDir                     = gConfigPath.."desktop/" -- old was data/desktop/
-gTempPath           = datapath.."tmp/"
 gPacketVideoFileName_folderpath = gMainWorkingDir.."videos/"
+gUOAMDir                        = gConfigPath.."uoam/"
+
 gSecondsSinceLastFrame = 0
-
 gInGameStarted = false
 gNet_State = false
@@ -39 +45 @@
                 if (not home) then return end
 
-                if (WIN32) then home = home .. "/Anwendungsdaten" end
+                if (WIN32) then home = home .. "/Anwendungsdaten" end   -- TODO: other Languages!!!
                 
                 gHomeIrisPath           = home.."/.iris/"
@@ -49 +55 @@
                 gDesktopDir                     = gConfigPath.."desktop/"
                 gPacketVideoFileName_folderpath = gHomeIrisPath.."videos/" -- todo : text='will be saved as .ipv files in iris/videos/'
+                gUOAMDir                        = gConfigPath.."uoam/"
                 
-                
-                if (not file_exists(gHomeIrisPath)) then
+                -- check if config.lua is already copied
+                if (not file_exists(gConfigPathFile)) then
                         print("initializing "..gHomeIrisPath)
                         mkdir(gHomeIrisPath)
@@ -59 +66 @@
                         mkdir(gDesktopDir)
                         mkdir(gPacketVideoFileName_folderpath)
+                        mkdir(gUOAMDir)
 
                         print("Copy config from: " .. gMainWorkingDir.."config/" .. " to: " .. gConfigPath)