FACTO-92: Corrected missing locale entities for en

changelog.txt

@@ -1,9 +1,10 @@
 ---------------------------------------------------------------------------------------------------
 Version: 3.0.0
-  Contributions:
-    - Added custom colors from ErdwurmJim
   Notes:
     - Will reset maps of in progress games. This means that all enemy units will be removed and new enemy faction mutations will be reset.
+  Contributions:
+    - Added custom colors from ErdwurmJim
+    - Simplification and refactor of locale generation from PlexPt
   Improvement:
     - Modified death pheromone squad path scoring
     - AI is now per regional base

libs/Constants.lua

@@ -930,7 +930,7 @@ if settings.startup["rampant--waspEnemy"].value then
             {
                 type = "drone",
                 attackAttributes = {"spit", "acid"},
-                name = "wasp",
+                name = "spitter-wasp",
                 attributes = {"followsPlayer"},
                 drops = {}
             },
@@ -943,7 +943,7 @@ if settings.startup["rampant--waspEnemy"].value then
             },
             {
                 type = "spitter",
-                attackAttributes = {"capsule", {"drone", "wasp"}},
+                attackAttributes = {"capsule", {"drone", "spitter-wasp"}},
                 name = "spitter",
                 attributes = {},
                 drops = {"purpleArtifact"}
@@ -1007,7 +1007,7 @@ if settings.startup["rampant--spawnerEnemy"].value then
             {
                 type = "drone",
                 attackAttributes = {"touch", "acid"},
-                name = "egg",
+                name = "spitter-egg",
                 attributes = {"stationary", "bigger", {"clusterDeath", "spawn"}},
                 drops = {}
             },
@@ -1020,7 +1020,7 @@ if settings.startup["rampant--spawnerEnemy"].value then
             },
             {
                 type = "spitter",
-                attackAttributes = {"capsule", {"drone", "egg"}},
+                attackAttributes = {"capsule", {"drone", "spitter-egg"}},
                 name = "spitter",
                 attributes = {"selfDamaging"},
                 drops = {"orangeArtifact"}

locale/en/locale.cfg

@@ -1,49 +1,49 @@
-chunk-scanner-squad-movement-rampant=BOSS2 ?
-chunk-scanner-squad-rampant=BOSS ?
-
 [rampant]
 
-neutral=Common
-acid=Acidic
-physical=Brutal
-electric=Electric
-suicide=Suicide
-nuclear=Nuclear
-fire=Fire
-inferno=Inferno
-troll=Regenerative
-fast=Fast
-laser=Laser
-wasp=Wasp
-spawner=Spawner
-energy=Sapper
-poison=Poison
-energy-thief=Sapper
+neutral=Common 
+acid=Acidic 
+physical=Brutal 
+electric=Electric 
+suicide=Suicide 
+nuclear=Nuclear 
+fire=Fire 
+inferno=Inferno 
+troll=Regenerative 
+fast=Fast 
+laser=Laser 
+wasp=Wasp 
+spawner=Spawner 
+poison=Poison 
+energy=Sapper 
+energy-thief=Sapper 
+entity-proxy=
 
-biter=biter:
-spitter=spitter:
-biter-spawner=biter nest:
-spitter-spawner=spitter nest:
-worm=worm:
-hive=hive:
-worm-drone=Wasp:
-worm-wasp=Wasp:
-drone=eggs:
-worm-egg=eggs:
-spawn=biter:
-egg=eggs:
+biter=Biter: 
+spitter=Spitter: 
+biter-spawner=Biter Nest: 
+spitter-spawner=Spitter Nest: 
+worm=Worm: 
+turret=Worm: 
+hive=Hive: 
+spitter-wasp=Drone: 
+worm-wasp=Drone: 
+spawn=Biter: 
+spitter-egg=Eggs: 
+worm-egg=Eggs: 
 
-t1=t1 Larva
-t2=t2 Pupae
-t3=t3 Worker
-t4=t4 Grunt
-t5=t5 Soldier
-t6=t6 Elite
-t7=t7 Champion
-t8=t8 Overlord
-t9=t9 Titan
-t10=t10 Leviathan
+t1=Larva T1
+t2=Pupae T2
+t3=Worker T3
+t4=Grunt T4
+t5=Soldier T5
+t6=Elite T6
+t7=Champion T7
+t8=Overlord T8
+t9=Titan T9
+t10=Leviathan T10
 
+acid-pool=Acid Pool
+fire-pool=Fire
 
 [entity-name]
 crystal-v1-drain-rampant=Power Draining Crystal
@@ -72,14 +72,6 @@ spawner-proxy-1-rampant=Spawner Proxy
 spawner-proxy-2-rampant=Spawner Proxy
 spawner-proxy-3-rampant=Spawner Proxy
 
-entity-proxy-trap-t1-rampant=Traps: t1 Larva
-entity-proxy-turret-t1-rampant=Worm: t1 Larva
-entity-proxy-utility-t1-rampant=Utilities: t1 Larva
-entity-proxy-spitter-spawner-t1-rampant=Spitter Nest: t1 Larva
-entity-proxy-biter-spawner-t1-rampant=Biter Nest: t1 Larva
-entity-proxy-hive-t1-rampant=Hives: t1 Larva
-
-
 [entity-description]
 
 [mod-setting-name]

prototypes/SwarmUtils.lua

@@ -739,8 +739,7 @@ function swarmUtils.buildUnits(template)
         for i=1,variations do
             local unit = deepcopy(template)
             unit.name = unit.name .. "-v" .. i .. "-t" .. tier
-            unit.v = i
-            unit.t = tier
+            unit.tier = tier
             -- unit.nameSuffix = "-v" .. i .. "-t" .. tier
             unit.effectiveLevel = effectiveLevel
             unit.variation = i
@@ -815,8 +814,7 @@ function swarmUtils.buildEntitySpawner(template)
         for i=1,variations do
             local unitSpawner = deepcopy(template)
             unitSpawner.name = unitSpawner.name .. "-v" .. i .. "-t" .. tier
-            unitSpawner.v = i
-            unitSpawner.t = tier
+            unitSpawner.tier = tier
             unitSpawner.effectiveLevel = effectiveLevel
             unitSpawner.variation = i
             generateApperance(unitSpawner, true)
@@ -842,8 +840,7 @@ function swarmUtils.buildUnitSpawner(template)
         for i=1,variations do
             local unitSpawner = deepcopy(template)
             unitSpawner.name = unitSpawner.name .. "-v" .. i .. "-t" .. tier
-            unitSpawner.v = i
-            unitSpawner.t = tier
+            unitSpawner.tier = tier
             unitSpawner.effectiveLevel = effectiveLevel
             unitSpawner.variation = i
             local unitTable = unitSetToProbabilityTable(template.unitSet)
@@ -870,8 +867,7 @@ function swarmUtils.buildWorm(template)
         for i=1,variations do
             local worm = deepcopy(template)
             worm.name = worm.name .. "-v" .. i .. "-t" .. tier
-            worm.v = i
-            worm.t = tier
+            worm.tier = tier
             worm.effectiveLevel = effectiveLevel
             worm.variation = i
             generateApperance(worm)

prototypes/buildings/ChunkScanner.lua

@@ -14,19 +14,19 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-local biterFunctions = require("prototypes/utils/BiterUtils")
+local biterUtils = require("prototypes/utils/BiterUtils")
 local constants = require("libs/Constants")
 local smokeUtils = require("prototypes/utils/SmokeUtils")
 
 data:extend({
-        biterFunctions.makeBiter({
+        biterUtils.makeBiter({
                 name = "chunk-scanner-squad",
                 scale=15,
                 movement=1,
                 effectiveLevel=1,
                 resistances = {},
                 hitSprayName = "blood-fountain-hit-spray",
-                attack = biterFunctions.createMeleeAttack({
+                attack = biterUtils.createMeleeAttack({
                         radius=1,
                         damage=1,
                         scale=15,
@@ -34,14 +34,14 @@ data:extend({
                 })
         }),
 
-        biterFunctions.makeBiter({
+        biterUtils.makeBiter({
                 name = "chunk-scanner-squad-movement",
                 scale=2.5,
                 movement=1,
                 effectiveLevel=1,
                 resistances = {},
                 hitSprayName = "blood-fountain-hit-spray",
-                attack = biterFunctions.createMeleeAttack({
+                attack = biterUtils.createMeleeAttack({
                         radius=1,
                         damage=1,
                         scale=15,
@@ -76,11 +76,6 @@ local scales = {
         [1] = 0.70, [2] = 0.83, [3] = 0.96, [4] = 1.09, [5] = 1.22,
         [6] = 1.35, [7] = 1.48, [8] = 1.61, [9] = 1.74, [10] = 1.87
     },
-    -- ["biter-spawner"] = {
-    --     [1] = 0.70, [2] = 0.83, [3] = 0.96, [4] = 1.09, [5] = 1.22,
-    --     [6] = 1.35, [7] = 1.48, [8] = 1.61, [9] = 1.74, [10] = 1.87,
-    --     [11] = 2.0
-    -- },
     ["biter-spawner"] = {
         [1] = 0.83, [2] = 0.96, [3] = 1.09, [4] = 1.22, [5] = 1.35,
         [6] = 1.48, [7] = 1.61, [8] = 1.74, [9] = 1.87, [10] = 2.0
@@ -97,6 +92,7 @@ local scales = {
 
 local subTypes = constants.HIVE_BUILDINGS_TYPES
 
+
 for si=1,#subTypes do
     local st = subTypes[si]
     if scales[st] then
@@ -109,6 +105,12 @@ for si=1,#subTypes do
                     {
                         type = "land-mine",
                         name = "entity-proxy-" .. st .. "-t" .. t .. "-rampant",
+                        localised_name = biterUtils.getLocalisedName({
+                                faction="entity-proxy",
+                                unit_name=st,
+                                tier=t,
+                                isRampant=true
+                        }),
                         icon = "__base__/graphics/icons/steel-chest.png",
                         icon_size = 32,
                         flags = {},

prototypes/utils/BiterUtils.lua

@@ -14,7 +14,7 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 
-local biterFunctions = {}
+local biterUtils = {}
 
 local sounds = require("__base__.prototypes.entity.sounds")
 local particleUtils = require("ParticleUtils")
@@ -232,19 +232,20 @@ local function makeWormCorpse(attributes)
     return name
 end
 
-function biterFunctions.get_localised_name(attributes)
+function biterUtils.getLocalisedName(attributes)
     if attributes.isRampant then
-        return {"",
-                {"rampant."..attributes.faction},
-                {"rampant."..attributes.unit_name},
-                {"rampant.t"..attributes.t},
-                " V" ..attributes.v}
+        return {
+            "",
+            {"rampant."..attributes.faction},
+            {"rampant."..attributes.unit_name},
+            {"rampant.t"..attributes.tier}
+        }
     end
 
     return {attributes.name .. "-rampant"}
 end
 
-function biterFunctions.makeBiter(attributes)
+function biterUtils.makeBiter(attributes)
     local resistances = {}
     for k,v in pairs(attributes.resistances) do
         v.type = k
@@ -254,7 +255,7 @@ function biterFunctions.makeBiter(attributes)
     local entity = {
         type = "unit",
         name = attributes.name .. "-rampant",
-        localised_name = biterFunctions.get_localised_name(attributes),
+        localised_name = biterUtils.getLocalisedName(attributes),
         icon = "__base__/graphics/icons/small-biter.png",
         icon_size = 64,
         icon_mipmaps = 4,
@@ -303,7 +304,7 @@ function biterFunctions.makeBiter(attributes)
     return entity
 end
 
-function biterFunctions.makeSpitter(attributes)
+function biterUtils.makeSpitter(attributes)
     local resistances = {}
     for k,v in pairs(attributes.resistances) do
         v.type = k
@@ -313,7 +314,7 @@ function biterFunctions.makeSpitter(attributes)
     local entity = {
         type = "unit",
         name = attributes.name .. "-rampant",
-        localised_name = biterFunctions.get_localised_name(attributes),
+        localised_name = biterUtils.getLocalisedName(attributes),
         icon = "__base__/graphics/icons/small-spitter.png",
         icon_size = 64,
         icon_mipmaps = 4,
@@ -357,7 +358,7 @@ function biterFunctions.makeSpitter(attributes)
     return entity
 end
 
-function biterFunctions.makeUnitSpawner(attributes)
+function biterUtils.makeUnitSpawner(attributes)
     local resistances = {}
     for k,v in pairs(attributes.resistances) do
         v.type = k
@@ -367,7 +368,7 @@ function biterFunctions.makeUnitSpawner(attributes)
     local o = {
         type = "unit-spawner",
         name = attributes.name .. "-rampant",
-        localised_name = biterFunctions.get_localised_name(attributes),
+        localised_name = biterUtils.getLocalisedName(attributes),
         icon = "__base__/graphics/icons/biter-spawner.png",
         icon_size = 64,
         icon_mipmaps = 4,
@@ -503,7 +504,7 @@ function biterFunctions.makeUnitSpawner(attributes)
     return o
 end
 
-function biterFunctions.makeWorm(attributes)
+function biterUtils.makeWorm(attributes)
     local resistances = {}
     for k,v in pairs(attributes.resistances) do
         v.type = k
@@ -513,7 +514,7 @@ function biterFunctions.makeWorm(attributes)
     local o = {
         type = "turret",
         name = attributes.name .. "-rampant",
-        localised_name = biterFunctions.get_localised_name(attributes),
+        localised_name = biterUtils.getLocalisedName(attributes),
         icon = "__base__/graphics/icons/medium-worm.png",
         icon_size = 64, icon_mipmaps = 4,
         flags = attributes.flags or {"placeable-player", "placeable-enemy", "not-repairable", "not-repairable", "breaths-air"},
@@ -611,7 +612,7 @@ function biterFunctions.makeWorm(attributes)
 
 end
 
-function biterFunctions.createSuicideAttack(attributes, blastWave, animation)
+function biterUtils.createSuicideAttack(attributes, blastWave, animation)
     local o = {
         type = "projectile",
         range = -- attributes.range or
@@ -900,7 +901,7 @@ function biterFunctions.createSuicideAttack(attributes, blastWave, animation)
     return o
 end
 
-function biterFunctions.makeWormAlienLootTable(name)
+function biterUtils.makeWormAlienLootTable(name)
     local biterLoot
 
     local a = settings.startup["bobmods-enemies-enableartifacts"]
@@ -941,7 +942,7 @@ function biterFunctions.makeWormAlienLootTable(name)
     return biterLoot
 end
 
-function biterFunctions.makeSpawnerAlienLootTable(name)
+function biterUtils.makeSpawnerAlienLootTable(name)
     local biterLoot
     local a = settings.startup["bobmods-enemies-enableartifacts"]
     local b = settings.startup["NE_Alien_Artifacts"]
@@ -981,7 +982,7 @@ function biterFunctions.makeSpawnerAlienLootTable(name)
     return biterLoot
 end
 
-function biterFunctions.makeUnitAlienLootTable(name)
+function biterUtils.makeUnitAlienLootTable(name)
     local biterLoot
     local a = settings.startup["bobmods-enemies-enableartifacts"]
     local b = settings.startup["NE_Alien_Artifacts"]
@@ -1035,7 +1036,7 @@ function biterFunctions.makeUnitAlienLootTable(name)
     return biterLoot
 end
 
-function biterFunctions.findRange(entity)
+function biterUtils.findRange(entity)
     return entity.attack_parameters.range
 end
 
@@ -1052,15 +1053,15 @@ local function findKey(key, obj)
     end
 end
 
-function biterFunctions.findRunScale(entity)
+function biterUtils.findRunScale(entity)
     return findKey("scale", entity.run_animation.layers)
 end
 
-function biterFunctions.findTint(entity)
+function biterUtils.findTint(entity)
     return findKey("tint", entity.run_animation.layers)
 end
 
-function biterFunctions.createElectricAttack(attributes, electricBeam, animation)
+function biterUtils.createElectricAttack(attributes, electricBeam, animation)
     return
         {
             type = "beam",
@@ -1090,7 +1091,7 @@ function biterFunctions.createElectricAttack(attributes, electricBeam, animation
         }
 end
 
-function biterFunctions.createBeamAttack(attributes, electricBeam, animation)
+function biterUtils.createBeamAttack(attributes, electricBeam, animation)
     return
         {
             type = "beam",
@@ -1119,7 +1120,7 @@ function biterFunctions.createBeamAttack(attributes, electricBeam, animation)
         }
 end
 
-function biterFunctions.createProjectileAttack(attributes, projectile, animation)
+function biterUtils.createProjectileAttack(attributes, projectile, animation)
     return {
         type = "projectile",
         ammo_category = "biological",
@@ -1153,7 +1154,7 @@ function biterFunctions.createProjectileAttack(attributes, projectile, animation
     }
 end
 
-function biterFunctions.createMeleeAttack(attackAttributes)
+function biterUtils.createMeleeAttack(attackAttributes)
     local meleeAttackEffects = {
         type = "damage",
         damage = { amount = attackAttributes.damage * 0.25, type = attackAttributes.damageType or "physical" }
@@ -1208,7 +1209,7 @@ function biterFunctions.createMeleeAttack(attackAttributes)
     }
 end
 
-function biterFunctions.biterAttackSounds(effectiveLevel)
+function biterUtils.biterAttackSounds(effectiveLevel)
     return {
         {
             filename = "__base__/sound/creatures/Spiters_1_1.ogg",
@@ -1253,17 +1254,17 @@ function biterFunctions.biterAttackSounds(effectiveLevel)
     }
 end
 
-function biterFunctions.createRangedAttack(attributes, attack, animation)
+function biterUtils.createRangedAttack(attributes, attack, animation)
     if (attributes.attackType == "stream") then
-        return biterFunctions.createStreamAttack(attributes, attack, animation)
+        return biterUtils.createStreamAttack(attributes, attack, animation)
     elseif (attributes.attackType == "projectile") then
-        return biterFunctions.createProjectileAttack(attributes, attack, animation)
+        return biterUtils.createProjectileAttack(attributes, attack, animation)
     else
         error("Unknown range attack")
     end
 end
 
-function biterFunctions.createStreamAttack(attributes, fireAttack, animation)
+function biterUtils.createStreamAttack(attributes, fireAttack, animation)
     local attack = {
         type = "stream",
         ammo_category = "biological",
@@ -1309,7 +1310,7 @@ function biterFunctions.createStreamAttack(attributes, fireAttack, animation)
 
         cyclic_sound =
             {
-                begin_sound = biterFunctions.biterAttackSounds(attributes.effectiveLevel),
+                begin_sound = biterUtils.biterAttackSounds(attributes.effectiveLevel),
                 middle_sound =
                     {
                         {
@@ -1331,7 +1332,7 @@ function biterFunctions.createStreamAttack(attributes, fireAttack, animation)
     return attack
 end
 
-function biterFunctions.makeResistance(name, decrease, percentage)
+function biterUtils.makeResistance(name, decrease, percentage)
     local obj = {
         type = name,
     }
@@ -1344,4 +1345,4 @@ function biterFunctions.makeResistance(name, decrease, percentage)
     return obj
 end
 
-return biterFunctions
+return biterUtils

prototypes/utils/DroneUtils.lua

@@ -13,7 +13,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-
+local biterUtils = require("BiterUtils")
 local util = require ("util")
 
 local droneUtils = {}
@@ -30,6 +30,7 @@ function droneUtils.makeDrone(attributes)
     local drone = {
         type = "combat-robot",
         name = n,
+        localised_name = biterUtils.getLocalisedName(attributes),
         icon = "__base__/graphics/icons/defender.png",
         icon_size = 32,
         flags = {"placeable-off-grid", "not-on-map", "not-repairable", "breaths-air", "hidden"},

prototypes/utils/FireUtils.lua

@@ -18,6 +18,7 @@ local fireUtils = {}
 
 -- imported
 
+local biterUtils = require("BiterUtils")
 local colorUtils = require("ColorUtils")
 local imageUtils = require("ImageUtils")
 
@@ -126,6 +127,7 @@ function fireUtils.makeFire(attributes)
     data:extend({{
                 type = "fire",
                 name = name,
+                localised_name = {"", {"rampant.fire-pool"}},
                 flags = {"placeable-off-grid", "not-on-map"},
                 color = attributes.tint2,
                 damage_per_tick = { amount = attributes.fireDamagePerTick or 45/60, type = attributes.fireDamagePerTickType or "fire"  },
@@ -256,6 +258,7 @@ function fireUtils.makeAcidSplashFire(attributes, stickerName)
     local acidFire = {
         type = "fire",
         name = name,
+        localised_name = {"", {"rampant.acid-pool"}},
         flags = {"placeable-off-grid", "not-on-map"},
         damage_per_tick = {amount = 0, type = "acid"},
         maximum_damage_multiplier = 3,