v1.5.5

Author: adam10603

Advanced Gamepad Assist/apps/lua/Advanced Gamepad Assist Config/Advanced Gamepad Assist Config.lua

@@ -1,5 +1,6 @@
 local lib = require "../../../extension/lua/joypad-assist/Advanced Gamepad Assist/AGALib"
 local _json = require "json"
+local updater = require "updater"
 
 local uiData = ac.connect{
     ac.StructItem.key("AGAData"),
@@ -53,7 +54,7 @@ local presetKeys = {
     "maxDynamicLimitReduction",
 }
 
-local _factoryPresetsStr = '{"Loose":{"dampingStrength":0.3,"filterSetting":0.5,"useFilter":false,"selfSteerResponse":0.3,"maxSelfSteerAngle":4,"targetSlip":1,"countersteerResponse":0.3,"rateIncreaseWithSpeed":0.1,"maxDynamicLimitReduction":4.5,"steeringRate":0.5},"Default":{"dampingStrength":0.37,"filterSetting":0.5,"useFilter":true,"selfSteerResponse":0.37,"maxSelfSteerAngle":14,"targetSlip":0.95,"countersteerResponse":0.2,"rateIncreaseWithSpeed":0.1,"maxDynamicLimitReduction":5,"steeringRate":0.5},"Stable":{"dampingStrength":0.75,"filterSetting":0.5,"useFilter":false,"selfSteerResponse":0.65,"maxSelfSteerAngle":90,"targetSlip":0.93,"countersteerResponse":0.15,"rateIncreaseWithSpeed":0.0,"maxDynamicLimitReduction":6,"steeringRate":0.35},"Drift":{"dampingStrength":0.5,"filterSetting":0.5,"useFilter":false,"selfSteerResponse":0.35,"maxSelfSteerAngle":90,"targetSlip":1,"countersteerResponse":0.5,"rateIncreaseWithSpeed":0.1,"maxDynamicLimitReduction":4,"steeringRate":0.4},"Author\'s preference":{"dampingStrength":0.4,"filterSetting":0.5,"useFilter":false,"selfSteerResponse":0.35,"maxSelfSteerAngle":90,"targetSlip":0.95,"countersteerResponse":0.2,"rateIncreaseWithSpeed":0,"maxDynamicLimitReduction":5,"steeringRate":0.5}}'
+local _factoryPresetsStr = '{"Loose":{"dampingStrength":0.3,"filterSetting":0.5,"useFilter":false,"selfSteerResponse":0.3,"maxSelfSteerAngle":4,"targetSlip":1,"countersteerResponse":0.3,"rateIncreaseWithSpeed":0.1,"maxDynamicLimitReduction":4.5,"steeringRate":0.5},"Default":{"dampingStrength":0.37,"filterSetting":0.5,"useFilter":true,"selfSteerResponse":0.37,"maxSelfSteerAngle":14,"targetSlip":0.95,"countersteerResponse":0.2,"rateIncreaseWithSpeed":0.1,"maxDynamicLimitReduction":5,"steeringRate":0.5},"Stable":{"dampingStrength":0.75,"filterSetting":0.5,"useFilter":false,"selfSteerResponse":0.65,"maxSelfSteerAngle":90,"targetSlip":0.93,"countersteerResponse":0.15,"rateIncreaseWithSpeed":0.0,"maxDynamicLimitReduction":6,"steeringRate":0.35},"Drift":{"dampingStrength":0.5,"filterSetting":0.5,"useFilter":false,"selfSteerResponse":0.35,"maxSelfSteerAngle":90,"targetSlip":1,"countersteerResponse":0.5,"rateIncreaseWithSpeed":0.1,"maxDynamicLimitReduction":4,"steeringRate":0.4},"Author\'s preference":{"dampingStrength":0.4,"filterSetting":0.5,"useFilter":false,"selfSteerResponse":0.35,"maxSelfSteerAngle":90,"targetSlip":0.95,"countersteerResponse":0.2,"rateIncreaseWithSpeed":-0.25,"maxDynamicLimitReduction":5,"steeringRate":0.5}}'
 local factoryPresets     = _json.decode(_factoryPresetsStr)
 
 local savedPresets = ac.storage({presets = "{}"}, "AGA_PRESETS_")
@@ -79,7 +80,7 @@ local tooltips = {
     autoClutch               = "Automatically controls the clutch if the engine would otherwise stall, or when setting off from a standstill.\n\nThis setting doesn't affect gear changes, that part is controlled by the 'Shifting mode' setting.",
     autoShiftingMode         = "Default = AC's own gear shifting, no change.\n\nManual = custom rev-matching and clutch logic (if the car allows it), but manual shifting only.\n\nAutomatic = custom rev-matching and clutch logic (if the car allows it), as well as automatic gear shifting. You can still shift manually to override a gear for a short time though.\n\nThe 'Automatic' mode uses a custom algorithm which also takes the engine's power curve into account for optimal shifting points.\n\nIMPORTANT: Options other than 'Default' only work properly if 'Automatic shifting' is DISABLED in AC's assist settings!",
     autoShiftingCruise       = "Allows the automatic shifting to go between cruise mode and performance mode depending on your throttle input.\n\nUseful if you want to do both performance driving and casual cruising, but you can disable it for racing (especially for rolling starts).",
-    autoShiftingDownBias     = "Higher = more aggressive downshifting when using automatic mode.\n\nFor example at the maximum setting the car will downshift almost immediately when you brake for a turn, however, this might leave you very close to the top of a gear when going back on the throttle again.",
+    autoShiftingDownBias     = "Higher = more aggressive downshifting when using automatic mode.\n\nFor example at the maximum setting the car will downshift almost immediately when you brake for a turn, however, this might leave you very close to the top of a gear when going back on the throttle again.\n\nIn most cases I recommend leaving this at maximum.",
     triggerFeedbackL         = "Vibration feedback on the left trigger when braking.\n\nA lighter vibration means you're approaching the grip limit, and a heavy vibration means you're locking up the wheels.\n\nOnly works with compatible Xbox controllers!",
     triggerFeedbackR         = "Vibration feedback on the right trigger when accelerating.\n\nA lighter vibration means you're approaching the grip limit, and a heavy vibration means you're getting wheelspin.\n\nOnly works with compatible Xbox controllers!",
     triggerFeedbackAlwaysOn  = "Allows trigger vibrations even when TCS or ABS are enabled.",
@@ -100,6 +101,22 @@ local tooltips = {
     _gameRumble              = "Controls AC's own 'Rumble effects' setting."
 }
 
+-- Checking if a new version is available
+
+local newVersionAvailable = false
+-- local newVersionURL       = ""
+
+updater.getLatestVersion(function (versionString, releaseNotes, downloadURL)
+    local currentVersion = updater.versionStringToNumber(updater.getCurrentVersionString())
+    local latestVersion  = updater.versionStringToNumber(versionString)
+
+    if currentVersion ~= 0 and latestVersion ~= 0 and latestVersion > currentVersion and releaseNotes ~= "" and downloadURL ~= "" then
+        newVersionAvailable      = true
+        tooltips["releaseNotes"] = "Release notes for version " .. versionString .. ":\n\n" .. releaseNotes
+        -- newVersionURL            = downloadURL
+    end
+end)
+
 local sectionPadding = 10
 
 local black              = rgbm(0.0, 0.0, 0.0, 1.0)
@@ -669,9 +686,16 @@ function script.windowMain(dt)
     showConfigSlider("maxSelfSteerAngle", "Max angle", "%.1f°", 0.0,  90.0,   1.0, uiData.useFilter)
     showConfigSlider("dampingStrength",   "Damping",   "%.f%%", 0.0, 100.0, 100.0, uiData.useFilter)
 
-    showDummyLine(0.25)
-    ui.alignTextToFramePadding()
-    ui.textWrapped("Tip: Hold SHIFT to fine-tune sliders, or CTRL-click them to edit the values!")
+    showDummyLine(0.5)
+
+    if newVersionAvailable then
+        if showButton("📲 Update available! Click to download!", "releaseNotes", nil, 0, rgbm(1.0, 0.9, 0.0, 1.0)) then
+            os.execute("start https://www.overtake.gg/downloads/advanced-gamepad-assist.62485/")
+        end
+    else
+        ui.alignTextToFramePadding()
+        ui.textWrapped("Tip: Hold SHIFT to fine-tune sliders, or CTRL-click them to edit the values!")
+    end
 
     -- ui.pushFont(ui.Font.Tiny)
     -- showDummyLine(0.5)

Advanced Gamepad Assist/apps/lua/Advanced Gamepad Assist Config/manifest.ini

@@ -1,7 +1,7 @@
 [ABOUT]
 NAME = Advanced Gamepad Assist Config
 AUTHOR = adam10603
-VERSION = 1.5.4
+VERSION = 1.5.5
 DESCRIPTION = Settings for the Advanced Gamepad Assist mod.
 
 [CORE]

Advanced Gamepad Assist/apps/lua/Advanced Gamepad Assist Config/updater.lua

@@ -0,0 +1,62 @@
+local _json = require "json"
+
+local M = {}
+
+local versionRequestURL = "https://api.github.com/repos/adam10603/AC-Advanced-Gamepad-Assist/releases?per_page=1"
+local versionRequestHeaders = {
+    ["Accept"]               = "application/vnd.github+json",
+    ["X-GitHub-Api-Version"] = "2022-11-28"
+}
+
+M.versionStringToNumber = function(str)
+    local mult          = 100
+    local versionNumber = 0
+    for c in str:gmatch("%d") do
+        versionNumber = versionNumber + mult * tonumber(c)
+        mult = mult / 10
+    end
+    return versionNumber
+end
+
+M.getCurrentVersionString = function()
+    local manifest = ac.INIConfig.load("manifest.ini", ac.INIFormat.Extended)
+
+    local versionString = manifest:get("ABOUT", "VERSION", "")
+
+    if versionString == nil or versionString == "" then return "" end
+
+    return versionString
+end
+
+---@param callback fun(versionString: string, releaseNotes: string, downloadURL: string)
+M.getLatestVersion = function(callback)
+
+    -- callback("1.5.6", " - Testing\r\n - Patch notes")
+
+    web.get(versionRequestURL, versionRequestHeaders, function (err, response)
+        if (err ~= nil and err ~= "") or response.status ~= 200 then
+            ac.error("Failed to retrieve the latest version string.")
+            return
+        end
+
+        local parsed = _json.decode(response.body)
+
+        if parsed[1] and type(parsed[1]["tag_name"]) == "string" and type(parsed[1]["body"]) == "string" and type(parsed[1]["assets"]) == "table" and type(parsed[1]["assets"][1]) == "table" and type(parsed[1]["assets"][1]["browser_download_url"]) == "string" then
+            local tag = parsed[1]["tag_name"]
+            if string.startsWith(tag, "v") then tag = tag:sub(2) end
+            callback(tag, parsed[1]["body"], parsed[1]["assets"][1]["browser_download_url"])
+            return
+        end
+
+        ac.error("Invalid response when retrieving the latest version string")
+    end)
+end
+
+-- M.performUpdate = function(downloadURL)
+--     web.loadRemoteAssets(downloadURL, function (err, folder)
+--         ac.log(err)
+--         ac.log(folder)
+--     end)
+-- end
+
+return M

Advanced Gamepad Assist/extension/lua/joypad-assist/Advanced Gamepad Assist/AGALib.lua

@@ -365,7 +365,7 @@ function M.SmoothTowards:reset()
 end
 
 -- SmoothTowards2 class
--- would be a better version of SmoothTowards, but im lazy to migrate the whole project to use this
+-- would be a better version of SmoothTowards, but im lazy to migrate the whole project to use this, the rates would all need to be adjusted slightly
 
 -- M.SmoothTowards2 = {}
 
@@ -384,9 +384,11 @@ end
 -- function M.SmoothTowards2:get(val, dt)
 --     local x1             = self.linearity - 0.5
 --     local rateCorrection = x1 * x1 * 0.2 + 0.95
---     local change         = dt * self.range * self.rate * rateCorrection
---     local v0             = self.state + (val - self.state) * (change * 2.0)
---     local v1             = (math.abs(val - self.state) <= change) and val or (self.state + math.sign(val - self.state) * change)
+--     local normalizedRate = self.rate * self.range * rateCorrection
+--     local maxChange      = normalizedRate * dt
+--     local factor         = 1.0 - math.exp(-2.0 * maxChange / math.max(self.range, 1e-13))
+--     local v0             = self.state + (val - self.state) * factor
+--     local v1             = (math.abs(val - self.state) <= maxChange) and val or (self.state + math.sign(val - self.state) * maxChange)
 --     self.state           = v0 + (v1 - v0) * self.linearity
 
 --     return self.state
@@ -413,7 +415,7 @@ end
 --     self.state = self.startingValue
 -- end
 
--- 
+
 
 local _valueHistory = {}
 function M.measureUpdateRate(key, value, dt)

Advanced Gamepad Assist/extension/lua/joypad-assist/Advanced Gamepad Assist/CarPerformanceData.lua

@@ -150,7 +150,7 @@ function M:getMaxTQ(rpm, gear)
     local totalBoost = 0.0 -- Total boost from all turbos
 
     for _, turbo in ipairs(self.turboData) do
-        local tBoost = 0.0 -- Boost from this turbo
+        local currentTurboBoost = (rpm / turbo.referenceRPM) ^ turbo.gamma -- 0 -- Boost from this turbo
 
         if table.nkeys(turbo.controllers) > 0 then
             for _, controller in ipairs(turbo.controllers) do
@@ -160,22 +160,19 @@ function M:getMaxTQ(rpm, gear)
                     controller.LUT.useCubicInterpolation = true
                     controllerValue = controller.LUT:get(rpm)
                 elseif turbo.controllerInput == "GEAR" then
-                    turbo.controllerLUT.useCubicInterpolation = false
-                    controllerValue = turbo.controllerLUT:get(gear)
+                    controller.LUT.useCubicInterpolation = false
+                    controllerValue = controller.LUT:get(gear)
                 end
 
                 if controller.combinator == "ADD" then
-                    tBoost = tBoost + controllerValue
+                    currentTurboBoost = currentTurboBoost + controllerValue
                 elseif controller.combinator == "MULT" then
-                    tBoost = tBoost * controllerValue
+                    currentTurboBoost = currentTurboBoost * controllerValue
                 end
             end
-        else
-            -- No special controllers, standard boost math
-            tBoost = tBoost + (rpm / turbo.referenceRPM) ^ turbo.gamma
         end
 
-        totalBoost = totalBoost + math.min(tBoost, turbo.boostLimit)
+        totalBoost = totalBoost + math.min(currentTurboBoost, turbo.boostLimit)
     end
 
     return baseTorque * (1.0 + totalBoost)
@@ -210,14 +207,14 @@ function M:calcShiftingTable(minNormRPM, maxNormRPM)
 
     local minRPM          = self:getAbsoluteRPM(minNormRPM)
     local maxShiftRPM     = self:getAbsoluteRPM(maxNormRPM)
-    local defaultFallback = self.defaultShiftUpRPM * 1.03
+    local defaultFallback = self.defaultShiftUpRPM
 
     for gear = 1, self.vehicle.gearCount - 1, 1 do
         local bestUpshiftRPM = defaultFallback
 
         if self.vehicle.mgukDeliveryCount == 0 then
             local bestArea = 0
-            local areaSkew = math.lerp(1.0, 1.2, (gear - 1) / (self.vehicle.gearCount - 2)) -- shifts the bias of the power integral higher as the gear number increases
+            local areaSkew = math.lerp(1.0, 1.25, (gear - 1) / (self.vehicle.gearCount - 2)) -- shifts the bias of the power integral higher as the gear number increases
             local nextOverCurrentRatio = self:getGearRatio(gear + 1) / self:getGearRatio(gear)
             for i = 0, 300, 1 do
                 local upshiftRPM = self:getAbsoluteRPM(i / 300.0)
@@ -226,7 +223,7 @@ function M:calcShiftingTable(minNormRPM, maxNormRPM)
                     local area = 0
                     for j = 0, 100, 1 do
                         local simRPM = math.lerp(nextGearRPM, upshiftRPM, j / 100.0)
-                        area = area + self:getMaxHP(simRPM, gear) / 100.0 * math.lerp(1.0, areaSkew, (j / 100.0))
+                        area = area + self:getMaxHP(simRPM, gear + 1) / 100.0 * math.lerp(1.0, areaSkew, (j / 100.0))
                     end
                     if area > bestArea then
                         bestArea = area