added tier settings, organized settings

changelog.txt

@@ -2,10 +2,11 @@
 Version: 0.16.17
 Date: 2. 02. 2018
   Improvements:
-    - Changed defualt for friendly fire to off for worm and spitter splash damage
+    - Added setting to turn off most of the friendly fire for worm and spitter splash damage
     - Generating unit spawner probabilities for each tier instead of sharing a single table
     - Changed electric biters to target multiple entities with their beams at a time
     - Changed electric worms to shoot a projectile that explodes into an electrical cluster
+    - Added settings for controlling what tier enemies start and end at
 
 ---------------------------------------------------------------------------------------------------
 Version: 0.16.16

libs/Constants.lua

@@ -325,8 +325,25 @@ constants.SENTINEL_IMPASSABLE_CHUNK.y = -1
 
 -- unit spawners
 
-constants.TIER_SET_5 = { 1, 3, 5, 7, 10 }
-constants.TIER_SET_10 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }
+local tiers5 = {}
+
+local tierStart = settings.startup["rampant-tierStart"].value
+local tierEnd = settings.startup["rampant-tierEnd"].value
+
+local step5 = (tierEnd - tierStart) / 5
+for i=tierStart,tierEnd,step5 do
+    tiers5[#tiers5+1] = math.ceil(i)
+end
+
+local tiers10 = {}
+
+local step10 = (tierEnd - tierStart) / 10
+for i=tierStart,tierEnd,step10 do
+    tiers10[#tiers10+1] = math.ceil(i)
+end
+
+constants.TIER_SET_5 = tiers5
+constants.TIER_SET_10 = tiers10
 
 local nestVariations = settings.startup["rampant-newEnemyNestVariations"].value
 local nestTiers = settings.startup["rampant-newEnemyNestTiers"].value

locale/en/locale.cfg

@@ -9003,42 +9003,44 @@ laser-worm-v20-t10-rampant=Laser worm: Juggernaut class
 [entity-description]
 
 [mod-setting-name]
-rampant-useDumbProjectiles=Use Dumb Projectiles
-rampant-useNEUnitLaunchers=Use Natural Evolution Unit Launchers (Needs NE)
-rampant-attackWaveGenerationUsePollution=Use Pollution as attack trigger
-rampant-attackWaveGenerationUsePlayerProximity=Use Player Proximity as attack trigger
-rampant-attackWaveGenerationThresholdMax=Starting chunk attack threshold
-rampant-attackWaveGenerationThresholdMin=Ending chunk attack threshold
-rampant-attackWaveMaxSize=Max biter group size that can be directly formed
-rampant-safeBuildings=Enable building safety.
-rampant-safeBuildings-curvedRail=Make curved rails safe from biters
-rampant-safeBuildings-straightRail=Make straight rails safe from biters
-rampant-safeBuildings-bigElectricPole=Make big electric poles safe from biters
-rampant-safeBuildings-railChainSignals=Make rail chain signals safe from biters
-rampant-safeBuildings-railSignals=Make rail signals safe from biters
-rampant-safeBuildings-trainStops=Make train stops safe from biters
-rampant-attackPlayerThreshold=Player score contribution threshold
-rampant-permanentNocturnal=Nocturnal Mode
-rampant-aiPointsScaler=Difficulty Scaling
-rampant-addWallResistanceAcid=Increase wall resistance to spitters
+rampant-useDumbProjectiles=Projectiles: Use non-homing attack
+rampant-useNEUnitLaunchers=Projectiles: Use NE Unit Launchers (Needs NE)
+rampant-attackWaveGenerationUsePollution=Attack Wave: Use Pollution as attack trigger
+rampant-attackWaveGenerationUsePlayerProximity=Attack Wave: Use Player Proximity as attack trigger
+rampant-attackWaveGenerationThresholdMax=Attack Wave: Starting chunk attack threshold
+rampant-attackWaveGenerationThresholdMin=Attack Wave: Ending chunk attack threshold
+rampant-attackWaveMaxSize=Attack Wave: Max biter group size that can be directly formed
+rampant-safeBuildings=Safety: Enable building safety.
+rampant-safeBuildings-curvedRail=Safety: Make curved rails safe from biters
+rampant-safeBuildings-straightRail=Safety: Make straight rails safe from biters
+rampant-safeBuildings-bigElectricPole=Safety: Make big electric poles safe from biters
+rampant-safeBuildings-railChainSignals=Safety: Make rail chain signals safe from biters
+rampant-safeBuildings-railSignals=Safety: Make rail signals safe from biters
+rampant-safeBuildings-trainStops=Safety: Make train stops safe from biters
+rampant-attackPlayerThreshold=Attack Wave: Player score contribution threshold
+rampant-permanentNocturnal=Attack Wave: Nocturnal Mode
+rampant-aiPointsScaler=Attack Wave: Difficulty Scaling
+rampant-addWallResistanceAcid=Safety; Increase wall resistance to spitters
 rampant-useCustomAI=Use Custom AI (Alpha)
-rampant-safeBuildings-lamps=Make lamps safe from biters
-rampant-removeBloodParticles=Remove blood particles (Reduces lag spikes)
+rampant-safeBuildings-lamps=Safety: Make lamps safe from biters
+rampant-removeBloodParticles=Optimization: Remove blood particles (Reduces lag spikes)
 # rampant-enableBuildings=Enable buildings and Technology
-rampant-attack-warning=Enable attack wave warnings
-rampant-enableSwarm=Enable the swarm
-rampant-newEnemies=Enable new enemies
-rampant-enemySeed=Enemy Random Seed
-rampant-deadZoneFrequency=Enemy deadzone frequency
-rampant-newEnemyNestVariations=Nest Variations
-rampant-newEnemyNestTiers=Nest Tiers
-rampant-newEnemyWormVariations=Worm Variations
-rampant-newEnemyWormTiers=Worm Tiers
-rampant-newEnemyUnitVariations=Unit Variations
-rampant-newEnemyUnitTiers=Unit Tiers
-rampant-enableBobsUnits=Enable Bobs as a faction
-rampant-enableNEUnits=Enable NE as a faction
-rampant-disallowFriendlyFire=Disallow Friendly Fire Splash Damage
+rampant-attack-warning=Notification: Enable attack wave warnings
+rampant-enableSwarm=Attack Wave: Enable the swarm
+rampant-newEnemies=World: Enable new enemies
+rampant-enemySeed=World: Enemy Random Seed
+rampant-deadZoneFrequency=World: Enemy deadzone frequency
+rampant-newEnemyNestVariations=World: Nest Variations
+rampant-newEnemyNestTiers=World: Nest Tiers
+rampant-newEnemyWormVariations=World: Worm Variations
+rampant-newEnemyWormTiers=World: Worm Tiers
+rampant-newEnemyUnitVariations=World: Unit Variations
+rampant-newEnemyUnitTiers=World: Unit Tiers
+rampant-enableBobsUnits=World: Enable Bobs as a faction
+rampant-enableNEUnits=World: Enable NE as a faction
+rampant-disallowFriendlyFire=Safety: Disallow Friendly Fire Splash Damage
+rampant-tierStart=World: Beginning enemy level
+rampant-tierEnd=World: Ending enemy level
 
 [mod-setting-description]
 rampant-useDumbProjectiles=Turns off homing projectiles for worms and spitters
@@ -9076,4 +9078,6 @@ rampant-newEnemyUnitVariations=This number corresponds to the number of variatio
 rampant-newEnemyUnitTiers=This number corresponds to number of tiers. The higher the number the smoother the enemy power curve.
 rampant-enableBobsUnits=Adds bobs spawners, units, and worms to the base upgrade and placement list
 rampant-enableNEUnits=Adds NE spawners, units, and worms to the base upgrade and placement list
-rampant-disallowFriendlyFire=Prevents enemy spitters and worms from damaging units or buildings from the same force through splash damage
+rampant-disallowFriendlyFire=Prevents enemy spitters and worms from damaging units or buildings from the same force through splash damage
+rampant-tierStart=This is the starting tier level and increases linearly to the end tier for as many tiers selected
+rampant-tierEnd=This is the ending tier level that is reached after increasing linearly from the start tier for as many tiers selected

settings.lua

@@ -43,7 +43,7 @@ data:extend({
 	    setting_type = "runtime-global",
 	    minimum_value = 0,
 	    default_value = 7,
-	    order = "c[modifier]-c[threshold]",
+	    order = "b[modifier]-c[threshold]",
 	    per_user = false
 	},
 	
@@ -53,7 +53,7 @@ data:extend({
 	    setting_type = "runtime-global",
 	    minimum_value = 0,
 	    default_value = 20,
-	    order = "c[modifier]-b[threshold]",
+	    order = "b[modifier]-d[threshold]",
 	    per_user = false
 	},
 
@@ -63,7 +63,7 @@ data:extend({
 	    setting_type = "runtime-global",
 	    minimum_value = 0,
 	    default_value = 0,
-	    order = "c[modifier]-a[threshold]",
+	    order = "b[modifier]-e[threshold]",
 	    per_user = false
 	},
 	
@@ -74,7 +74,39 @@ data:extend({
 	    minimum_value = 20,
 	    maximum_value = 400,
 	    default_value = 150,
-	    order = "d[modifier]-a[wave]",
+	    order = "b[modifier]-f[wave]",
+	    per_user = false
+	},
+
+	{
+	    type = "bool-setting",
+	    name = "rampant-permanentNocturnal",
+	    description = "rampant-permanentNocturnal",
+	    setting_type = "runtime-global",
+	    default_value = false,
+	    order = "b[modifier]-g[ai]",
+	    per_user = false
+	},
+
+	{
+	    type = "double-setting",
+	    name = "rampant-aiPointsScaler",
+	    description = "rampant-aiPointsScaler",
+	    setting_type = "runtime-global",
+	    default_value = 1.0,
+	    minimum_value = 0.0,
+	    maximum_value = 100.0,
+	    order = "b[modifier]-h[ai]",
+	    per_user = false
+	},
+
+	{
+	    type = "bool-setting",
+	    name = "rampant-enableSwarm",
+	    description = "rampant-enableSwarm",
+	    setting_type = "startup",
+	    default_value = true,
+	    order = "b[modifier]-j[unit]",
 	    per_user = false
 	},
 
@@ -83,7 +115,7 @@ data:extend({
 	    name = "rampant-safeBuildings",
 	    setting_type = "runtime-global",
 	    default_value = false,
-	    order = "e[modifier]-a[safe]",
+	    order = "c[modifier]-a[safe]",
 	    per_user = false
 	},
 	
@@ -92,17 +124,17 @@ data:extend({
 	    name = "rampant-safeBuildings-curvedRail",
 	    setting_type = "runtime-global",
 	    default_value = false,
-	    order = "e[modifier]-b[safe]",
+	    order = "c[modifier]-b[safe]",
 	    per_user = false
 	},
 
-		
+	
 	{
 	    type = "bool-setting",
 	    name = "rampant-safeBuildings-straightRail",
 	    setting_type = "runtime-global",
 	    default_value = false,
-	    order = "e[modifier]-c[safe]",
+	    order = "c[modifier]-c[safe]",
 	    per_user = false
 	},
 
@@ -111,7 +143,7 @@ data:extend({
 	    name = "rampant-safeBuildings-bigElectricPole",
 	    setting_type = "runtime-global",
 	    default_value = false,
-	    order = "e[modifier]-d[safe]",
+	    order = "c[modifier]-d[safe]",
 	    per_user = false
 	},
 
@@ -120,7 +152,7 @@ data:extend({
 	    name = "rampant-safeBuildings-railSignals",
 	    setting_type = "runtime-global",
 	    default_value = false,
-	    order = "e[modifier]-e[safe]",
+	    order = "c[modifier]-e[safe]",
 	    per_user = false
 	},
 	
@@ -129,7 +161,7 @@ data:extend({
 	    name = "rampant-safeBuildings-railChainSignals",
 	    setting_type = "runtime-global",
 	    default_value = false,
-	    order = "e[modifier]-f[safe]",
+	    order = "c[modifier]-f[safe]",
 	    per_user = false
 	},
 
@@ -138,7 +170,7 @@ data:extend({
 	    name = "rampant-safeBuildings-trainStops",
 	    setting_type = "runtime-global",
 	    default_value = false,
-	    order = "e[modifier]-g[safe]",
+	    order = "c[modifier]-g[safe]",
 	    per_user = false
 	},
 
@@ -147,20 +179,29 @@ data:extend({
 	    name = "rampant-safeBuildings-lamps",
 	    setting_type = "runtime-global",
 	    default_value = false,
-	    order = "e[modifier]-h[safe]",
+	    order = "c[modifier]-h[safe]",
 	    per_user = false
 	},
 	
 	{
 	    type = "bool-setting",
-	    name = "rampant-permanentNocturnal",
-	    description = "rampant-permanentNocturnal",
-	    setting_type = "runtime-global",
+	    name = "rampant-addWallResistanceAcid",
+	    description = "rampant-addWallResistanceAcid",
+	    setting_type = "startup",
 	    default_value = false,
-	    order = "f[modifier]-a[ai]",
+	    order = "c[modifier]-j[damage]",
 	    per_user = false
 	},
 
+{
+	    type = "bool-setting",
+	    name = "rampant-disallowFriendlyFire",
+	    setting_type = "startup",
+	    default_value = false,
+	    order = "c[modifier]-k[trigger]",
+	    per_user = false
+	},
+	
 
 	{
 	    type = "double-setting",
@@ -170,62 +211,24 @@ data:extend({
 	    default_value = 0.1,
 	    minimum_value = 0.0,
 	    maximum_value = 1.0,
-	    order = "f[modifier]-c[ai]",
+	    order = "d[modifier]-a[ai]",
 	    per_user = false
 	},
 	
-	{
-	    type = "double-setting",
-	    name = "rampant-aiPointsScaler",
-	    description = "rampant-aiPointsScaler",
-	    setting_type = "runtime-global",
-	    default_value = 1.0,
-	    minimum_value = 0.0,
-	    maximum_value = 100.0,
-	    order = "f[modifier]-b[ai]",
-	    per_user = false
-	},
 
+	
+
+	
+	
 	{
 	    type = "bool-setting",
-	    name = "rampant-addWallResistanceAcid",
-	    description = "rampant-addWallResistanceAcid",
+	    name = "rampant-newEnemies",
+	    description = "rampant-newEnemies",
 	    setting_type = "startup",
 	    default_value = false,
-	    order = "g[modifier]-a[damage]",
+	    order = "e[modifier]-a[unit]",
 	    per_user = false
-	},
-
-	
-	{
-	    type = "bool-setting",
-	    name = "rampant-removeBloodParticles",
-	    description = "rampant-reduceBloodParticles",
-	    setting_type = "startup",
-	    default_value = true,
-	    order = "h[modifier]-a[optimize]",
-	    per_user = false
-	},
-	
-	{
-	    type = "bool-setting",
-	    name = "rampant-attack-warning",
-	    description = "rampant-attack-warning",
-	    setting_type = "runtime-per-user",
-	    default_value = true,
-	    order = "j[modifer]-a[message]",
-	    per_user = true
-	},
-	
-	{
-	    type = "bool-setting",
-	    name = "rampant-enableSwarm",
-	    description = "rampant-enableSwarm",
-	    setting_type = "startup",
-	    default_value = true,
-	    order = "k[modifier]-a[unit]",
-	    per_user = false
-	},
+	},	
 
 	{
 	    type = "int-setting",
@@ -234,17 +237,7 @@ data:extend({
 	    setting_type = "startup",
 	    minimum_value = 0,
 	    default_value = 0,
-	    order = "l[modifer]-a[seed]",
-	    per_user = false
-	},
-
-	{
-	    type = "bool-setting",
-	    name = "rampant-newEnemies",
-	    description = "rampant-newEnemies",
-	    setting_type = "startup",
-	    default_value = false,
-	    order = "l[modifier]-b[unit]",
+	    order = "l[modifer]-b[unit]",
 	    per_user = false
 	},
 
@@ -256,7 +249,7 @@ data:extend({
 	    setting_type = "startup",
 	    default_value = 5,
 	    allowed_values = { 5, 10 },
-	    order = "l[modifer]-b[seed]",
+	    order = "l[modifer]-c[unit]",
 	    per_user = false
 	},
 
@@ -268,7 +261,7 @@ data:extend({
 	    minimum_value = 1,
 	    maximum_value = 20,
 	    default_value = 1,
-	    order = "d[modifier]-b[wave]",
+	    order = "l[modifier]-d[unit]",
 	    per_user = false
 	},
 
@@ -279,7 +272,7 @@ data:extend({
 	    setting_type = "startup",
 	    default_value = 5,
 	    allowed_values = { 5, 10 },
-	    order = "l[modifer]-b[seed]",
+	    order = "l[modifer]-e[unit]",
 	    per_user = false
 	},
 
@@ -291,18 +284,18 @@ data:extend({
 	    minimum_value = 1,
 	    maximum_value = 20,
 	    default_value = 1,
-	    order = "d[modifier]-b[wave]",
+	    order = "l[modifier]-f[unit]",
 	    per_user = false
 	},
 
-		{
+	{
 	    type = "int-setting",
 	    name = "rampant-newEnemyUnitTiers",
 	    description = "rampant-newEnemyUnitTiers",
 	    setting_type = "startup",
 	    default_value = 5,
 	    allowed_values = { 5, 10 },
-	    order = "l[modifer]-b[seed]",
+	    order = "l[modifer]-g[unit]",
 	    per_user = false
 	},
 
@@ -314,7 +307,7 @@ data:extend({
 	    minimum_value = 1,
 	    maximum_value = 20,
 	    default_value = 1,
-	    order = "d[modifier]-b[wave]",
+	    order = "l[modifier]-h[unit]",
 	    per_user = false
 	},
 
@@ -323,7 +316,7 @@ data:extend({
 	    name = "rampant-enableBobsUnits",
 	    setting_type = "startup",
 	    default_value = true,
-	    order = "b[modifier]-c[trigger]",
+	    order = "l[modifier]-i[unit]",
 	    per_user = false
 	},
 	
@@ -332,31 +325,52 @@ data:extend({
 	    name = "rampant-enableNEUnits",
 	    setting_type = "startup",
 	    default_value = true,
-	    order = "b[modifier]-d[trigger]",
+	    order = "l[modifier]-j[unit]",
+	    per_user = false
+	},
+
+	{
+	    type = "int-setting",
+	    name = "rampant-tierStart",
+	    setting_type = "startup",
+	    default_value = 1,
+	    minimum_value = 1,
+	    maximum_value = 10,
+	    order = "l[modifier]-l[unit]",
+	    per_user = false
+	},
+
+	{
+	    type = "int-setting",
+	    name = "rampant-tierEnd",
+	    setting_type = "startup",
+	    minimum_value = 1,
+	    maximum_value = 10,
+	    default_value = 4,
+	    order = "l[modifier]-m[unit]",
 	    per_user = false
 	},
 
 	{
 	    type = "bool-setting",
-	    name = "rampant-disallowFriendlyFire",
+	    name = "rampant-removeBloodParticles",
+	    description = "rampant-reduceBloodParticles",
 	    setting_type = "startup",
 	    default_value = true,
-	    order = "b[modifier]-e[trigger]",
+	    order = "n[modifier]-a[optimize]",
 	    per_user = false
-	}
-
+	},
+	
+	{
+	    type = "bool-setting",
+	    name = "rampant-attack-warning",
+	    description = "rampant-attack-warning",
+	    setting_type = "runtime-per-user",
+	    default_value = true,
+	    order = "o[modifer]-a[message]",
+	    per_user = true
+	},	
 	
-		
-	-- {
-	--     type = "bool-setting",
-	--     name = "rampant-reduceAnimations",
-	--     description = "rampant-reduceAnimations",
-	--     setting_type = "startup",
-	--     default_value = true,
-	--     order = "h[modifier]-b[optimize]",
-	--     per_user = false
-	-- }
-
 
 	-- ,