diff --git a/Upgrade.lua b/Upgrade.lua index 1fe21c2..52edceb 100644 --- a/Upgrade.lua +++ b/Upgrade.lua @@ -119,6 +119,11 @@ function upgrade.attempt(natives, regionMap) game.surfaces[1].print("Rampant - Version 0.15.8") global.version = constants.VERSION_20 end + if (global.version < constants.VERSION_21) then + + game.surfaces[1].print("Rampant - Version 0.15.9") + global.version = constants.VERSION_21 + end return starting ~= global.version end diff --git a/info.json b/info.json index cbb069d..eb604b5 100644 --- a/info.json +++ b/info.json @@ -1,7 +1,7 @@ { "name" : "Rampant", "factorio_version" : "0.15", - "version" : "0.15.8", + "version" : "0.15.9", "title" : "Rampant AI", "author" : "Veden", "homepage" : "https://forums.factorio.com/viewtopic.php?f=94&t=31445", diff --git a/libs/AIPlanning.lua b/libs/AIPlanning.lua index f06742b..9996ead 100644 --- a/libs/AIPlanning.lua +++ b/libs/AIPlanning.lua @@ -38,10 +38,12 @@ function aiPlanning.planning(natives, evolution_factor, tick, surface) maxPoints = maxPoints * 0.85 end if (natives.points < maxPoints) then - -- check for ai points scaler being nil - if not natives.aiPointsScaler then - natives.aiPointsScaler = settings.global["rampant-aiPointsScaler"].value - end + --[[ check for ai points scaler being nil, potential race condition with mod config being run + discovered 0.15.8 + --]] + -- if not natives.aiPointsScaler then + -- natives.aiPointsScaler = settings.global["rampant-aiPointsScaler"].value + -- end natives.points = natives.points + math.floor((AI_POINT_GENERATOR_AMOUNT * math.random()) + ((AI_POINT_GENERATOR_AMOUNT * 0.7) * (evolution_factor ^ 2.5)) * natives.aiPointsScaler) end diff --git a/libs/Constants.lua b/libs/Constants.lua index dbb58f1..4235d13 100644 --- a/libs/Constants.lua +++ b/libs/Constants.lua @@ -15,6 +15,7 @@ constants.VERSION_17 = 17 constants.VERSION_18 = 18 constants.VERSION_19 = 19 constants.VERSION_20 = 20 +constants.VERSION_21 = 21 -- misc diff --git a/make.rkt b/make.rkt index e356174..715b0c8 100644 --- a/make.rkt +++ b/make.rkt @@ -75,7 +75,7 @@ (copyDirectory "prototypes" modFolder))) (define (run) - ;;(copyFiles modFolder) - (makeZip modFolder) + (copyFiles modFolder) + ;;(makeZip modFolder) ) )