2dcccd9: Reduced maximum enemy variations to 7. Reduced the range of

sizes enemy structures and units can take. Reduced corpse and particle variations

changelog.txt

@@ -27,6 +27,8 @@ Version: 3.2.0
     - Added death pheromone scent multipler for destroyed enemy structures
     - Settler purple cloud now doesn't trigger until two seconds after a settler group stops and the group and surface must still be valid
     - Removed chunk-scanner entities
+    - Reduced max mod setting for enemy variations to 7 and created migrations for any variations greater than 8
+    - Reduced range of enemy structures and unit sizes
   Bugfixes:
     - Removed layer-13 from projectiles
     - script_raised_built now looks for enemy faction and registers as needed
@@ -47,6 +49,7 @@ Version: 3.2.0
     - Moved neturalObject scan chunk to after a chunk is determined to be passable
     - Centralized base points manipulation and chat messaging (Dagothur)
     - Base point deductions for unit losses are now batched in 20 to reduce chat spam when using the print AI points to chat options (Dagothur)
+    - Reduced corpse and particle variation to optimize increased entity times due to high entity counts
 
 ---------------------------------------------------------------------------------------------------
 Version: 3.1.2

control.lua

@@ -307,7 +307,7 @@ local function onConfigChanged()
     onModSettingsChange({setting="rampant--"})
 
     universe["ENEMY_SEED"] = settings.startup["rampant--enemySeed"].value
-    universe["ENEMY_VARIATIONS"] = 1-- settings.startup["rampant--newEnemyVariations"].value
+    universe["ENEMY_VARIATIONS"] = settings.startup["rampant--newEnemyVariations"].value
     universe["NEW_ENEMIES"] = settings.startup["rampant--newEnemies"].value
 
     -- not a completed implementation needs if checks to use all forces

data-final-fixes.lua

@@ -27,7 +27,7 @@ if settings.startup["rampant--newEnemies"].value then
     if mods["SchallAlienLoot"] then
         local SizeLootRampant = {1, 2, 3, 3, 4, 4, 4, 5, 5, 6}
         for _,faction in pairs(constants.FACTION_SET) do
-            for v=1,1-- settings.startup["rampant--newEnemyVariations"].value
+            for v=1,settings.startup["rampant--newEnemyVariations"].value
             do
                 for factionSize = 1, constants.TIERS do
                     local effectiveLevel = constants.TIER_UPGRADE_SET[factionSize]

libs/Constants.lua

@@ -398,7 +398,7 @@ buildTier(constants.TIERS, tiersSet)
 
 constants.TIER_UPGRADE_SET = tiersSet
 
-local variations = 1-- settings.startup["rampant--newEnemyVariations"].value
+local variations = settings.startup["rampant--newEnemyVariations"].value
 
 constants.ENERGY_THIEF_LOOKUP = {}
 
@@ -1745,7 +1745,7 @@ for i=1,#constants.FACTION_SET do
             end
 
             local variationSet = {}
-            for v=1,1-- settings.startup["rampant--newEnemyVariations"].value
+            for v=1,settings.startup["rampant--newEnemyVariations"].value
             do
                 local entry = faction.type .. "-" .. building.name .. "-v" .. v .. "-t" .. t .. "-rampant"
                 enemyAlignmentLookup[entry] = faction.type

prototypes/SwarmUtils.lua

@@ -879,7 +879,7 @@ local function generateApperance(unit, invert)
     local tier = unit.effectiveLevel
     if unit.scale then
         local scaleValue = unit.scale[tier]
-        local scale = gaussianRandomRangeRG(scaleValue, scaleValue * 0.20, scaleValue * 0.50, scaleValue * 1.30, xorRandom)
+        local scale = gaussianRandomRangeRG(scaleValue, scaleValue * 0.03, scaleValue * 0.15, scaleValue * 1.15, xorRandom)
         unit.scale = scale
     end
     if invert then
@@ -902,7 +902,7 @@ end
 function swarmUtils.buildUnits(template)
     local unitSet = {}
 
-    local variations = 1-- settings.startup["rampant--newEnemyVariations"].value
+    local variations = settings.startup["rampant--newEnemyVariations"].value
 
     for tier=1, TIERS do
         local effectiveLevel = TIER_UPGRADE_SET[tier]
@@ -986,7 +986,7 @@ local function buildEntities(entityTemplates)
 end
 
 function swarmUtils.buildEntitySpawner(template)
-    local variations = 1-- settings.startup["rampant--newEnemyVariations"].value
+    local variations = settings.startup["rampant--newEnemyVariations"].value
 
     for tier=1, TIERS do
         local effectiveLevel = TIER_UPGRADE_SET[tier]
@@ -1013,7 +1013,7 @@ function swarmUtils.buildEntitySpawner(template)
 end
 
 function swarmUtils.buildUnitSpawner(template)
-    local variations = 1-- settings.startup["rampant--newEnemyVariations"].value
+    local variations = settings.startup["rampant--newEnemyVariations"].value
 
     for tier=1, TIERS do
         local effectiveLevel = TIER_UPGRADE_SET[tier]
@@ -1042,7 +1042,7 @@ function swarmUtils.buildUnitSpawner(template)
 end
 
 function swarmUtils.buildWorm(template)
-    local variations = 1-- settings.startup["rampant--newEnemyVariations"].value
+    local variations = settings.startup["rampant--newEnemyVariations"].value
 
     for tier=1, TIERS do
         local effectiveLevel = TIER_UPGRADE_SET[tier]

prototypes/UnitClasses.lua

@@ -26,7 +26,7 @@ function generateMigration()
             -- if t > 5 then
             --     adjT = t - 5
             -- end
-            for v = 2, 20 do
+            for v = 8, 20 do
                 print("        [\"" .. faction .. "-biter-spawner-v" .. v .. "-t" .. t .. "-rampant\", \"" .. faction .. "-biter-spawner-v1-t" .. adjT .. "-rampant\"],")
                 print("        [\"" .. faction .. "-spitter-spawner-v" .. v .. "-t" .. t .. "-rampant\", \"" .. faction .. "-spitter-spawner-v1-t" .. adjT .. "-rampant\"],")
                 print("        [\"" .. faction .. "-worm-v" .. v .. "-t" .. t .. "-rampant\", \"" .. faction .. "-worm-v1-t" .. adjT .. "-rampant\"],")

prototypes/utils/BiterUtils.lua

@@ -42,8 +42,19 @@ local spitter_water_reflection = unitUtils.spitter_water_reflection
 
 local DISALLOW_FRIENDLY_FIRE = settings.startup["rampant--disallowFriendlyFire"].value
 
+local corpseSet = {}
+-- local corpseCount = 0
+
 local function makeSpitterCorpse(attributes)
-    local name = attributes.name .. "-corpse-rampant"
+    local name = "spitter-".. attributes.faction .. "-" .. attributes.effectiveLevel .. "-corpse-rampant"
+
+    if not corpseSet[name] then
+        corpseSet[name] = true
+        -- corpseCount = corpseCount + 1
+        -- print(corpseCount)
+    else
+        return name
+    end
 
     local corpse = {
         type = "corpse",
@@ -103,15 +114,22 @@ local function makeSpitterCorpse(attributes)
                 }
         }
 
-    data:extend(
-        {
+    data:extend({
             corpse
     })
     return name
 end
 
 local function makeBiterCorpse(attributes)
-    local name = attributes.name .. "-corpse-rampant"
+    local name = "biter-" .. attributes.faction .. "-" .. attributes.effectiveLevel .. "-corpse-rampant"
+
+    if not corpseSet[name] then
+        corpseSet[name] = true
+        -- corpseCount = corpseCount + 1
+        -- print(corpseCount)
+    else
+        return name
+    end
 
     local corpse = {
         type = "corpse",
@@ -178,7 +196,15 @@ local function makeBiterCorpse(attributes)
 end
 
 local function makeUnitSpawnerCorpse(attributes)
-    local name = attributes.name .. "-corpse-rampant"
+    local name = "spawner-" .. attributes.faction .. "-" .. attributes.type .. "-" .. attributes.effectiveLevel .. "-corpse-rampant"
+    if not corpseSet[name] then
+        corpseSet[name] = true
+        -- corpseCount = corpseCount + 1
+        -- print(corpseCount)
+    else
+        return name
+    end
+
     data:extend({
             {
                 type = "corpse",
@@ -208,7 +234,15 @@ local function makeUnitSpawnerCorpse(attributes)
 end
 
 local function makeWormCorpse(attributes)
-    local name = attributes.name .. "-corpse-rampant"
+    local name = "worm-" .. attributes.faction .. "-" .. attributes.effectiveLevel .. "-corpse-rampant"
+    if not corpseSet[name] then
+        corpseSet[name] = true
+        -- corpseCount = corpseCount + 1
+        -- print(corpseCount)
+    else
+        return name
+    end
+
     data:extend({
             {
                 type = "corpse",

prototypes/utils/ParticleUtils.lua

@@ -18,8 +18,28 @@ local particleUtils = {}
 
 -- module code
 
+local particleSet = {}
+-- local particleCount = 0
+
 function particleUtils.makeDamagedParticle(attributes)
-    local name = attributes.name .. "-damaged-particle-rampant"
+    local name = "particle-" .. ((attributes.effectiveLevel and (attributes.effectiveLevel .. "-")) or "")
+        .. (attributes.faction or attributes.name) .. "-damaged-particle-rampant"
+
+    local o = {
+        type = "create-entity",
+        entity_name = name,
+        offset_deviation = {{-0.5, -0.5}, {0.5, 0.5}},
+        offsets = {{0,0}},
+        damage_type_filters = {"fire", "acid"}
+    }
+
+    if not particleSet[name] then
+        particleSet[name] = true
+        -- particleCount = particleCount + 1
+        -- print(particleCount)
+    else
+        return o
+    end
 
     data:extend({
             {
@@ -53,20 +73,23 @@ function particleUtils.makeDamagedParticle(attributes)
             }
     })
 
-    return {
-        type = "create-entity",
-        entity_name = name,
-        offset_deviation = {{-0.5, -0.5}, {0.5, 0.5}},
-        offsets = {{0,0}},
-        damage_type_filters = {"fire", "acid"}
-    }
+    return o
 end
 
 
 local function makeBloodParticle(attributes)
-    local name = attributes.name .. "-blood-particle-rampant"
+    local name = "particle-" .. ((attributes.effectiveLevel and (attributes.effectiveLevel .. "-")) or "")
+        .. (attributes.faction or attributes.name) .. "-blood-particle-rampant"
     local tint = attributes.tint2
 
+    if not particleSet[name] then
+        particleSet[name] = true
+        -- particleCount = particleCount + 1
+        -- print(particleCount)
+    else
+        return name
+    end
+
     data:extend({
             {
                 type = "optimized-particle",

settings.lua

@@ -303,17 +303,17 @@ data:extend({
             per_user = false
         },
 
-        -- {
-        --     type = "int-setting",
-        --     name = "rampant--newEnemyVariations",
-        --     description = "rampant--newEnemyVariations",
-        --     setting_type = "startup",
-        --     minimum_value = 1,
-        --     maximum_value = 20,
-        --     default_value = 1,
-        --     order = "l[modifier]-h[unit]",
-        --     per_user = false
-        -- },
+        {
+            type = "int-setting",
+            name = "rampant--newEnemyVariations",
+            description = "rampant--newEnemyVariations",
+            setting_type = "startup",
+            minimum_value = 1,
+            maximum_value = 7,
+            default_value = 1,
+            order = "l[modifier]-h[unit]",
+            per_user = false
+        },
 
         {
             type = "int-setting",