From 9ea16e6a827d1f933a64475ba92b31179246b879 Mon Sep 17 00:00:00 2001
From: Aaron Veden <veden@vedbyte.com>
Date: Sat, 4 Dec 2021 11:58:07 -0800
Subject: [PATCH] changed argument to entityUpgrade to base instead of
 alignment

---
 control.lua             | 4 ++--
 libs/BaseUtils.lua      | 8 +++++---
 libs/ChunkProcessor.lua | 2 +-
 libs/ChunkUtils.lua     | 3 +--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/control.lua b/control.lua
index 8ca07c7..2088bf2 100644
--- a/control.lua
+++ b/control.lua
@@ -674,7 +674,7 @@ local function onEnemyBaseBuild(event)
                 registerEnemyBaseStructure(map, entity, event.tick, base)
 
                 upgradeEntity(entity,
-                              base.alignment,
+                              base,
                               map,
                               nil,
                               true,
@@ -846,7 +846,7 @@ local function onEntitySpawned(event)
                 registerEnemyBaseStructure(map, entity, event.tick, base)
 
                 upgradeEntity(entity,
-                              base.alignment,
+                              base,
                               map,
                               disPos,
                               true,
diff --git a/libs/BaseUtils.lua b/libs/BaseUtils.lua
index 1009b3b..9e29480 100644
--- a/libs/BaseUtils.lua
+++ b/libs/BaseUtils.lua
@@ -254,12 +254,13 @@ function baseUtils.recycleBases(map)
     end
 end
 
-function baseUtils.upgradeEntity(entity, baseAlignment, map, disPos, evolve, register)
+function baseUtils.upgradeEntity(entity, base, map, disPos, evolve, register)
     local position = entity.position
     local currentEvo = entity.prototype.build_base_evolution_requirement or 0
 
     local distance = mMin(1, euclideanDistancePoints(position.x, position.y, 0, 0) * BASE_DISTANCE_TO_EVO_INDEX)
     local evoIndex = mMax(distance, map.evolutionLevel)
+    local baseAlignment = base.alignment
 
     local pickedBaseAlignment
     if (#baseAlignment == 2) then
@@ -282,7 +283,8 @@ function baseUtils.upgradeEntity(entity, baseAlignment, map, disPos, evolve, reg
         local entityData = {
             ["name"] = spawnerName,
             ["position"] = disPos,
-            ["register"] = register
+            ["register"] = register,
+            ["base"] = base
         }
         map.pendingUpgrades[entity] = entityData
         return spawnerName
@@ -400,7 +402,7 @@ function baseUtils.processBase(chunk, map, tick, base)
             local cost = (universe.costLookup[entity.name] or MAGIC_MAXIMUM_NUMBER)
             if (base.points >= cost) then
                 local newEntity = baseUtils.upgradeEntity(entity,
-                                                          base.alignment,
+                                                          base,
                                                           map)
                 if newEntity then
                     if universe.printBaseUpgrades then
diff --git a/libs/ChunkProcessor.lua b/libs/ChunkProcessor.lua
index e552a76..4ed3ce4 100644
--- a/libs/ChunkProcessor.lua
+++ b/libs/ChunkProcessor.lua
@@ -154,7 +154,7 @@ function chunkProcessor.processPendingUpgrades(map, tick)
             end
             local createdEntity = surface.create_entity(query)
             if createdEntity and createdEntity.valid then
-                registerEnemyBaseStructure(map, createdEntity, tick)
+                registerEnemyBaseStructure(map, createdEntity, tick, entityData.base)
             end
         else
             map.pendingUpgradeIterator = next(pendingUpgrades, entity)
diff --git a/libs/ChunkUtils.lua b/libs/ChunkUtils.lua
index 30ba3df..5177322 100644
--- a/libs/ChunkUtils.lua
+++ b/libs/ChunkUtils.lua
@@ -235,7 +235,6 @@ function chunkUtils.initialScan(chunk, map, tick)
                     if not base then
                         base = createBase(map, chunk, tick)
                     end
-                    local alignment = base.alignment
 
                     local unitList = surface.find_entities_filtered(universe.filteredEntitiesUnitQuery)
                     for i=1,#unitList do
@@ -250,7 +249,7 @@ function chunkUtils.initialScan(chunk, map, tick)
 
                         chunkUtils.registerEnemyBaseStructure(map, enemyBuilding, tick, base)
                         if not buildingHiveTypeLookup[enemyBuilding.name] then
-                            upgradeEntity(enemyBuilding, alignment, map, nil, true)
+                            upgradeEntity(enemyBuilding, base, map, nil, true)
                         end
                     end
                 else