From ed4ac085f77dde61ba75a5affb944417014985f1 Mon Sep 17 00:00:00 2001 From: schwiti6190 <58079399+schwiti6190@users.noreply.github.com> Date: Tue, 24 Aug 2021 09:59:46 +0200 Subject: [PATCH 1/2] should fix #7432 --- AIDriver.lua | 5 +++-- courseplay.lua | 8 ++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/AIDriver.lua b/AIDriver.lua index 6894aff99..89e095a76 100644 --- a/AIDriver.lua +++ b/AIDriver.lua @@ -2194,8 +2194,9 @@ function AIDriver:isFuelLevelOk() return false elseif currentFuelPercentage < 20 then self:setInfoText('FUEL_SHOULD') - elseif currentFuelPercentage < 99.99 then - -- self:setInfoText('FUEL_IS') + else + self:clearInfoText('FUEL_MUST') + self:clearInfoText('FUEL_SHOULD') end return true end diff --git a/courseplay.lua b/courseplay.lua index 132f52222..78b44b4e0 100644 --- a/courseplay.lua +++ b/courseplay.lua @@ -173,18 +173,14 @@ local function setVersionData() end; if courseplay.version then - local versionSplitStr = StringUtil.splitString('.', courseplay.version); -- split as strings - versionSplitStr[3] = versionSplitStr[3] or '0000'; - courseplay.versionDisplayStr = string.format('v%s.%s\n.%s', versionSplitStr[1], versionSplitStr[2], versionSplitStr[3]); --multiline display string - courseplay.isDevVersion = tonumber(versionSplitStr[3]) > 0; + courseplay.versionDisplayStr = string.format("v%s",courseplay.version) + courseplay.isDevVersion = true if courseplay.isDevVersion then courseplay.versionDisplayStr = courseplay.versionDisplayStr .. '.dev'; end; - courseplay.versionFlt = tonumber(string.format('%s.%s%s', versionSplitStr[1], versionSplitStr[2], versionSplitStr[3])); else courseplay.version = ' [no version specified]'; courseplay.versionDisplayStr = 'no\nversion'; - courseplay.versionFlt = 0.00000; courseplay.isDevVersion = false; end; end; From b0e66e8fdf6d617dfa9086e96781d16c55fd15c9 Mon Sep 17 00:00:00 2001 From: schwiti6190 <58079399+schwiti6190@users.noreply.github.com> Date: Mon, 13 Sep 2021 12:21:31 +0200 Subject: [PATCH 2/2] Small improvements --- courseplay.lua | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/courseplay.lua b/courseplay.lua index 78b44b4e0..9ac30bd8b 100644 --- a/courseplay.lua +++ b/courseplay.lua @@ -169,21 +169,13 @@ end; local function setVersionData() local modItem = g_modManager:getModByName(courseplay.modName) if modItem and modItem.version then - courseplay.version = modItem.version; - end; - - if courseplay.version then + courseplay.version = modItem.version courseplay.versionDisplayStr = string.format("v%s",courseplay.version) - courseplay.isDevVersion = true - if courseplay.isDevVersion then - courseplay.versionDisplayStr = courseplay.versionDisplayStr .. '.dev'; - end; else - courseplay.version = ' [no version specified]'; - courseplay.versionDisplayStr = 'no\nversion'; - courseplay.isDevVersion = false; - end; -end; + courseplay.version = ' [no version specified]' + courseplay.versionDisplayStr = 'no\nversion' + end +end local function setGlobalData() courseplay.MODE_GRAIN_TRANSPORT = 1; @@ -294,7 +286,7 @@ courseplay.inputBindings.updateInputButtonData(); setGlobalData(); -if courseplay.isDevVersion then +local function displayDevWaring() local maxLength = 91; local s = { ('%-' .. maxLength .. 's'):format('You are using a development version of Courseplay, which may and will contain errors, bugs,'); @@ -304,7 +296,9 @@ if courseplay.isDevVersion then ('%-' .. maxLength .. 's'):format('crop destroyed, savegames deleted or baby pandas killed.'); }; print(' ' .. ('*'):rep((maxLength - 5) * 0.5) .. ' WARNING ' .. ('*'):rep((maxLength - 5) * 0.5) .. '\n * ' .. table.concat(s, ' *\n * ') .. ' *\n ' .. ('*'):rep(maxLength + 4)); -end; +end + +displayDevWaring() --load(), update(), updateTick(), draw() are located in base.lua