diff --git a/betterContracts.lua b/betterContracts.lua index a75bbb4..4822881 100644 --- a/betterContracts.lua +++ b/betterContracts.lua @@ -1,8 +1,3 @@ ----${title} ----@author ${author} ----@version r_version_r ----@date 18/01/2022 - --======================================================================================================= -- BetterContracts SCRIPT -- @@ -14,10 +9,10 @@ -- v1.1.0.3 24.04.2021 (Mmtrx) gui enhancements: addtl details, sort buttons -- v1.1.0.4 07.07.2021 (Mmtrx) add user-defined missionVehicles.xml, allow missions with no vehicles -- v1.2.0.0 18.01.2022 (Mmtrx) adapt for FS22 +-- v1.2.0.0.rc 22.01.2022 (Mmtrx) release candidate. Gui optics in blue --======================================================================================================= InitRoyalUtility(Utils.getFilename("lib/utility/", g_currentModDirectory)) InitRoyalMod(Utils.getFilename("lib/rmod/", g_currentModDirectory)) -r_debug_r = true SC = { FERTILIZER = 1, -- prices index LIQUIDFERT = 2, @@ -50,7 +45,7 @@ SC = { } } ---@class BetterContracts : RoyalMod -BetterContracts = RoyalMod.new(r_debug_r, false) +BetterContracts = RoyalMod.new(true, false) --params bool debug, bool sync function debugPrint(text, ...) if BetterContracts.debug then @@ -58,7 +53,7 @@ function debugPrint(text, ...) end end function BetterContracts:initialize() - debugPrint("------- initialize(): %s", self.initialized) + debugPrint("[%s] initialize(): %s", self.name,self.initialized) if self.initialized ~= nil then return end -- run only once g_missionManager.missionMapNumChannels = 6 self.missionUpdTimeout = 15000 diff --git a/gui/SCGui.xml b/gui/SCGui.xml index 8250033..1163c95 100644 --- a/gui/SCGui.xml +++ b/gui/SCGui.xml @@ -32,7 +32,7 @@ - + diff --git a/gui/guiProfiles.xml b/gui/guiProfiles.xml index d70a845..01aac62 100644 --- a/gui/guiProfiles.xml +++ b/gui/guiProfiles.xml @@ -13,8 +13,9 @@ - - + + + @@ -37,6 +38,13 @@ + + + + + + + diff --git a/lib/rmod/Main.lua b/lib/rmod/Main.lua index 82a8c91..23bc8f0 100644 --- a/lib/rmod/Main.lua +++ b/lib/rmod/Main.lua @@ -8,6 +8,6 @@ ---@param rmodDirectory string function InitRoyalMod(rmodDirectory) source(Utils.getFilename("RoyalMod.lua", rmodDirectory)) - printDebug("Royal Mod loaded successfully by " .. g_currentModName) + Logging.devInfo("Royal Mod loaded successfully by " .. g_currentModName) return true end diff --git a/modDesc.xml b/modDesc.xml index ad4bab4..d3c41f1 100644 --- a/modDesc.xml +++ b/modDesc.xml @@ -110,10 +110,10 @@ Changelog ${version}: - - - + + + diff --git a/betterContractsClearEvent.lua b/scripts/betterContractsClearEvent.lua similarity index 100% rename from betterContractsClearEvent.lua rename to scripts/betterContractsClearEvent.lua diff --git a/betterContractsNewEvent.lua b/scripts/betterContractsNewEvent.lua similarity index 100% rename from betterContractsNewEvent.lua rename to scripts/betterContractsNewEvent.lua diff --git a/missionManagerFix.lua b/scripts/missionManagerFix.lua similarity index 100% rename from missionManagerFix.lua rename to scripts/missionManagerFix.lua