Merge branch 'beyond-all-reason:master' into master

TheSilverHornet · Jun 24, 2024 · 30d91d8 · 30d91d8
2 parents 39fe5dd + 9b7ec06
commit 30d91d8
Show file tree

Hide file tree

Showing 29 changed files with 396 additions and 217 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -3,6 +3,18 @@ description: Raise a game-related bug report
 labels: ["Bug"]
 
 body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for reporting a bug! This template will help you create a report we can use to understand the bug.
+        
+        - Volunteers maintain this repository, it may take a while for them to come back to you.
+        - Please make sure to include enough details and context.
+        - If you have multiple questions, suggestions, or bugs, please submit them in separate issues.
+        - We accept pull requests. If you know how to fix it - go ahead!
+        
+        Please provide the following details about the issue you encountered.
+
   - type: textarea
     id: description
     attributes:
@@ -38,3 +50,7 @@ body:
     attributes:
       label: Other
       description: Note any additional info here
+  - type: markdown
+    attributes:
+      value: _This bug report will be read by people who have not experienced the bug themselves - this report is all they have to investigate. The more precise your report, the easier it becomes for us to help you._
+
diff --git a/language/en/units.json b/language/en/units.json
@@ -740,6 +740,7 @@
 			"legperdition": "Perdition",
 			"legphoenix": "Phoenix",
 			"legpontus": "Pontus",
+			"legportent": "Portent",
 			"legrad": "Radar Tower",
 			"legrail": "Lance",
 			"legrl": "Bramble",
@@ -755,7 +756,7 @@
 			"legtide": "Tidalis",
 			"legtl": "Piscator",
 			"legtriarius": "Triarius",
-			"legtriariusalt": "Portent",
+			"legtriariusdrone": "Triarius",
 			"legvcarry": "Mantis",
 			"legvenator": "Venator",
 			"legvision": "Vision",
@@ -1552,6 +1553,7 @@
 			"legperdition": "Long Range Napalm Launcher",
 			"legphoenix": "Heavy Ground Assault Aircraft",
 			"legpontus": "Anti Submarine Scout Craft",
+			"legportent": "Bombardment Support Vessel",
 			"legrad": "Early Warning System",
 			"legjam": "Medium-Range Jamming Device",
 			"legrail": "Long-range Skirmisher / Anti-air",
@@ -1568,7 +1570,7 @@
 			"legtide": "Produces Energy (depends on map)",
 			"legtl": "Offshore Torpedo Launcher",
 			"legtriarius": "Destroyer",
-			"legtriariusalt": "Bombardment Support Vessel",
+			"legtriariusdrone": "Destroyer",
 			"legvcarry": "Carries 4 Drones (costs 15m 500E each)",
 			"legvenator": "Fast High Damage Interceptor",
 			"legvision": "Provides Temporary Vision",

diff --git a/luarules/configs/scav_spawn_defs.lua b/luarules/configs/scav_spawn_defs.lua
@@ -35,7 +35,7 @@ local difficultyParameters = {
 		minScavs		  		= 5 * economyScale,
 		maxScavs		  		= 25 * economyScale,
 		scavPerPlayerMultiplier = 0.25,
-		bossName         		= 'armscavengerbossv2_veryeasy_scav',
+		bossName         		= 'scavengerbossv4_veryeasy_scav',
 		bossResistanceMult   	= 1 * economyScale,
 	},
 
@@ -54,7 +54,7 @@ local difficultyParameters = {
 		minScavs		  		= 10 * economyScale,
 		maxScavs		  		= 30 * economyScale,
 		scavPerPlayerMultiplier = 0.25,
-		bossName         		= 'armscavengerbossv2_easy_scav',
+		bossName         		= 'scavengerbossv4_easy_scav',
 		bossResistanceMult   	= 1.5 * economyScale,
 	},
 	[difficulties.normal] = {
@@ -72,7 +72,7 @@ local difficultyParameters = {
 		minScavs		  		= 15 * economyScale,
 		maxScavs		  		= 35 * economyScale,
 		scavPerPlayerMultiplier = 0.25,
-		bossName         		= 'armscavengerbossv2_normal_scav',
+		bossName         		= 'scavengerbossv4_normal_scav',
 		bossResistanceMult  	= 2 * economyScale,
 	},
 	[difficulties.hard] = {
@@ -90,7 +90,7 @@ local difficultyParameters = {
 		minScavs		  		= 20 * economyScale,
 		maxScavs		  		= 40 * economyScale,
 		scavPerPlayerMultiplier = 0.25,
-		bossName         		= 'armscavengerbossv2_hard_scav',
+		bossName         		= 'scavengerbossv4_hard_scav',
 		bossResistanceMult   	= 2.5 * economyScale,
 	},
 	[difficulties.veryhard] = {
@@ -108,7 +108,7 @@ local difficultyParameters = {
 		minScavs		  		= 25 * economyScale,
 		maxScavs		  		= 45 * economyScale,
 		scavPerPlayerMultiplier = 0.25,
-		bossName         		= 'armscavengerbossv2_veryhard_scav',
+		bossName         		= 'scavengerbossv4_veryhard_scav',
 		bossResistanceMult   	= 3 * economyScale,
 	},
 	[difficulties.epic] = {
@@ -126,7 +126,7 @@ local difficultyParameters = {
 		minScavs		  		= 30 * economyScale,
 		maxScavs		  		= 50 * economyScale,
 		scavPerPlayerMultiplier = 0.25,
-		bossName         		= 'armscavengerbossv2_epic_scav',
+		bossName         		= 'scavengerbossv4_epic_scav',
 		bossResistanceMult   	= 3.5 * economyScale,
 	},
 
@@ -997,6 +997,25 @@ local Turrets = {
 		["cormakr_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.1, maxExisting = 1},
 		["armfmkr_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.1, maxExisting = 1},
 		["corfmkr_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.1, maxExisting = 1},
+		--Factories
+		["armlab_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["armvp_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["armap_scav"] = {type = "antiair", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["armhp_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["corlab_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["corvp_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["corap_scav"] = {type = "antiair", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["corhp_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["leglab_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["legvp_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["legap_scav"] = {type = "antiair", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["leghp_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["armfhp_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
+		["armsy_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
+		["corfhp_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
+		["corsy_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
+		["legfhp_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
+		["legsy_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
 	},
 	[3] = {
 		["armbeamer_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.1, maxExisting = 5},
@@ -1075,6 +1094,24 @@ local Turrets = {
 		["cormmkr_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.1, maxExisting = 1},
 		["armuwmmm_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.1, maxExisting = 1},
 		["coruwmmm_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.1, maxExisting = 1},
+		-- Factories
+		["armalab_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["armavp_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["armaap_scav"] = {type = "antiair", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["coralab_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["coravp_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["coraap_scav"] = {type = "antiair", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["legalab_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["legavp_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["legaap_scav"] = {type = "antiair", surface = "land", spawnedPerWave = 0.05, maxExisting = 1},
+		["armamsub_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
+		["armasy_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
+		["armplat_scav"] = {type = "antiair", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
+		["coramsub_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
+		["corasy_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
+		["corplat_scav"] = {type = "antiair", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
+		["legamsub_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
+		["legasy_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.05, maxExisting = 1},
 	},
 	[5] = {
 		-- T2 popup arty
@@ -1114,6 +1151,12 @@ local Turrets = {
 		--Eco
 		["armafus_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.1, maxExisting = 5},
 		["corafus_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.1, maxExisting = 5},
+		--Factories
+		["armshltx_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.1, maxExisting = 1},
+		["corgant_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.1, maxExisting = 1},
+		["leggant_scav"] = {type = "normal", surface = "land", spawnedPerWave = 0.1, maxExisting = 1},
+		["armshltxuw_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.1, maxExisting = 1},
+		["corgantuw_scav"] = {type = "normal", surface = "sea", spawnedPerWave = 0.1, maxExisting = 1},
 	},
 	[7] = {
 		--Epic Bulwark and Pulsar/rag/cal
@@ -1223,12 +1266,12 @@ scavBehaviours = {
 		[UnitDefNames["legcomlvl8_scav"].id] = { distance = 5000, chance = 0.01 },
 		[UnitDefNames["legcomlvl9_scav"].id] = { distance = 5000, chance = 0.01 },
 		[UnitDefNames["legcomlvl10_scav"].id] = { distance = 5000, chance = 0.01 },
-		[UnitDefNames["armscavengerbossv2_veryeasy_scav"].id]	= { distance = 2000, chance = 0.001},
-		[UnitDefNames["armscavengerbossv2_easy_scav"].id] 		= { distance = 2000, chance = 0.001},
-		[UnitDefNames["armscavengerbossv2_normal_scav"].id] 	= { distance = 2000, chance = 0.001},
-		[UnitDefNames["armscavengerbossv2_hard_scav"].id] 		= { distance = 2000, chance = 0.001},
-		[UnitDefNames["armscavengerbossv2_veryhard_scav"].id] 	= { distance = 2000, chance = 0.001},
-		[UnitDefNames["armscavengerbossv2_epic_scav"].id]		= { distance = 2000, chance = 0.001},
+		[UnitDefNames["scavengerbossv4_veryeasy_scav"].id]	= { distance = 50000, chance = 0.003},
+		[UnitDefNames["scavengerbossv4_easy_scav"].id] 		= { distance = 50000, chance = 0.003},
+		[UnitDefNames["scavengerbossv4_normal_scav"].id] 	= { distance = 50000, chance = 0.003},
+		[UnitDefNames["scavengerbossv4_hard_scav"].id] 		= { distance = 50000, chance = 0.003},
+		[UnitDefNames["scavengerbossv4_veryhard_scav"].id] 	= { distance = 50000, chance = 0.003},
+		[UnitDefNames["scavengerbossv4_epic_scav"].id]		= { distance = 50000, chance = 0.003},
 		[UnitDefNames["scavmist_scav"].id]			= { distance = 2000, chance = 1},
 		[UnitDefNames["scavmistxl_scav"].id]		= { distance = 2000, chance = 1},
 		[UnitDefNames["scavmistxxl_scav"].id]		= { distance = 2000, chance = 1},

diff --git a/luarules/gadgets/fx_depthcharge_splash.lua b/luarules/gadgets/fx_depthcharge_splash.lua
@@ -7,7 +7,7 @@ function gadget:GetInfo()
         date      = "July 2014",
         license   = "GNU GPL, v2 or later",
         layer     = 0,
-        enabled   = true,
+        enabled   = false,
     }
 end
 

diff --git a/luarules/gadgets/fx_missile_smoke.lua b/luarules/gadgets/fx_missile_smoke.lua
@@ -11,7 +11,7 @@ function gadget:GetInfo()
         date      = "October 2017",
 		license   = "GNU GPL, v2 or later",
         layer     = 0,
-        enabled   = true,
+        enabled   = false,
     }
 end
 

diff --git a/luarules/gadgets/fx_missile_starburst_liftoff.lua b/luarules/gadgets/fx_missile_starburst_liftoff.lua
@@ -11,7 +11,7 @@ function gadget:GetInfo()
 		date = "February 2018",
 		license = "GNU GPL, v2 or later",
 		layer = 0,
-		enabled = true,
+		enabled = false,
 	}
 end