From c3355d136de30e882ae4beb8a2c0f7dfe08498cd Mon Sep 17 00:00:00 2001 From: Aaron Veden Date: Thu, 9 Dec 2021 22:41:20 -0800 Subject: [PATCH] moved temperament range and divider moved into constants --- libs/AIPlanning.lua | 7 +++++-- libs/Constants.lua | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libs/AIPlanning.lua b/libs/AIPlanning.lua index 9c88483..15adac8 100644 --- a/libs/AIPlanning.lua +++ b/libs/AIPlanning.lua @@ -10,6 +10,9 @@ local mathUtils = require("MathUtils") -- constants +local TEMPERAMENT_RANGE_MAX = constants.TEMPERAMENT_RANGE_MAX +local TEMPERAMENT_RANGE_MIN = constants.TEMPERAMENT_RANGE_MIN +local TEMPERAMENT_DIVIDER = constants.TEMPERAMENT_DIVIDER local AGGRESSIVE_CAN_ATTACK_WAIT_MAX_DURATION = constants.AGGRESSIVE_CAN_ATTACK_WAIT_MAX_DURATION local AGGRESSIVE_CAN_ATTACK_WAIT_MIN_DURATION = constants.AGGRESSIVE_CAN_ATTACK_WAIT_MIN_DURATION local ACTIVE_NESTS_PER_AGGRESSIVE_GROUPS = constants.ACTIVE_NESTS_PER_AGGRESSIVE_GROUPS @@ -402,8 +405,8 @@ local function temperamentPlanner(map) local universe = map.universe delta = delta * universe.temperamentRateModifier - map.temperamentScore = mMin(10000, mMax(-10000, currentTemperament + delta)) - map.temperament = ((map.temperamentScore + 10000) * 0.00005) + map.temperamentScore = mMin(TEMPERAMENT_RANGE_MAX, mMax(TEMPERAMENT_RANGE_MIN, currentTemperament + delta)) + map.temperament = ((map.temperamentScore + TEMPERAMENT_RANGE_MAX) * TEMPERAMENT_DIVIDER) if universe.debugTemperament then if game.tick % 243 == 0 then diff --git a/libs/Constants.lua b/libs/Constants.lua index 195a04b..6387277 100644 --- a/libs/Constants.lua +++ b/libs/Constants.lua @@ -43,6 +43,10 @@ constants.MAGIC_MAXIMUM_BASE_NUMBER = 100000000 constants.RETREAT_MOVEMENT_PHEROMONE_LEVEL_MIN = 1000 constants.RETREAT_MOVEMENT_PHEROMONE_LEVEL_MAX = 130000 +constants.TEMPERAMENT_RANGE_MAX = 10000 +constants.TEMPERAMENT_RANGE_MIN = -constants.TEMPERAMENT_RANGE_MAX +constants.TEMPERAMENT_DIVIDER = 1 / (2 * constants.TEMPERAMENT_RANGE_MAX) + constants.PROCESS_QUEUE_SIZE = 105 constants.SCAN_QUEUE_SIZE = 2 constants.RESOURCE_QUEUE_SIZE = 2