Merge pull request #2784 from beyond-all-reason/Zecrus-Balance-Adjust…

…ments-v13

Balance Patch, mauser/quaker and stiletto rework moved from modoption…

changelog.txt

@@ -1,4 +1,11 @@
 # March 2024
+• [Proposed Units Rework Modoption] Rework to Whistler and Lasher added to modoption, which has the units switch between longer range tracking aa missiles and non-tracking ground missiles.  Mauser, Quaker, Stiletto changes removed from modoption.  
+• [Mauser + Quaker] Rework from proposed_unit_reworks modoption moved to main game with a few additional changes.  This rework aims to give these units a more mobile and aggressive role, which reduces the role overlap with the heavier T2 veh artillery options.  Their ranges are reduced by 120, speed increased by 20%, acceleration increased 50%, health increased 20%, and accuracy is improved.  
+• [Stiletto] Rework from proposed_unit_reworks modoption moved to main game.  This rework aims to give the stiletto a more specialized role for disabling specific targets while being less efficient as a defensive option against groups.  The unit's metal and energy costs are doubled, buildpower cost increased 50%, health increased by 30%, paralyze time increased from 10s->20s, bomb count reduced from 5->3, aoe reduced from 240->200, emp damage per bomb increased 4000->6000
+• [Banshee] Reloadtime reduced by 10% (DPS 34->38)
+• [Dragon Claw] DPS reduced by 14% (185->159)
+• [Razorback] Laser damage vs air reduced from 75% to 50%
+• [Demon] Health reduced from 20000->18000
 • [Crocodile and Cayman (T1 hovertanks)] Crocodile cost reduced 290m2600E->270m2400E, Cayman cost reduced 320m3300E->300m3100E
 • [Salamander] EMP resist reduced from 95%->90%
 • [Epoch and Black Hydra] Projectiles for main cannons increased in size, damage, and aoe, with a reduced fire rate  

gamedata/alldefs_post.lua

@@ -1489,32 +1489,19 @@ if Spring.GetModOptions().skyshift == true then
 end
 
 if Spring.GetModOptions().proposed_unit_reworks == true then
-	if name == "armmart" then
-		uDef.health = 1070
-		uDef.maxacc = 0.033
-		uDef.maxdec = 0.066
-		uDef.speed = 60
-		uDef.weapondefs.arm_artillery.range = 810
-	end
-	if name == "cormart" then
-		uDef.health = 1200
-		uDef.maxacc = 0.03
-		uDef.maxdec = 0.06
-		uDef.speed = 58
-		uDef.weapondefs.cor_artillery.range = 790
+	if name == "armvp" then			
+		for ix, UnitName in pairs(uDef.buildoptions) do
+			if UnitName == "armsam" then
+				uDef.buildoptions[ix] = "armsam2"
+			end
+		end
 	end
-	if name == "armstil" then
-		uDef.metalcost = 460
-		uDef.energycost = 38000
-		uDef.buildtime = 32000
-		uDef.health = 1880
-		uDef.weapondefs.stiletto_bomb.areaofeffect = 160
-		uDef.weapondefs.stiletto_bomb.burst = 3
-		uDef.weapondefs.stiletto_bomb.burstrate = 0.2333
-		uDef.weapondefs.stiletto_bomb.damage = {
-			default = 6000
-		}
-		uDef.weapondefs.stiletto_bomb.paralyzetime = 20
+	if name == "corvp" then			
+		for ix, UnitName in pairs(uDef.buildoptions) do
+			if UnitName == "cormist" then
+				uDef.buildoptions[ix] = "cormist2"
+			end
+		end
 	end
 end
 

gamedata/armordefs.lua

@@ -111,6 +111,7 @@ local armorDefs = {
 		"armrl",
 		"armrock",
 		"armsam",
+		"armsam2",
 		"armscab",
 		"armsd",
 		"armsh",
@@ -183,6 +184,7 @@ local armorDefs = {
 		"cormex",
 		"cormh",
 		"cormist",
+		"cormist2",
 		"cormmkr",
 		"cormoho",
 		"cormort",

gamedata/icontypes.lua

@@ -711,6 +711,10 @@ local icontypes = {
 		bitmap = "icons/vehicle_t1_missile.png",
 		size = 1.04999995
 	},
+	armsam2 = {
+		bitmap = "icons/vehicle_t1_missile.png",
+		size = 1.04999995
+	},
 	armsb = {
 		bitmap = "icons/air_bomber_sea.png",
 		size = 1.41750002
@@ -1535,6 +1539,10 @@ local icontypes = {
 		bitmap = "icons/vehicle_t1_missile.png",
 		size = 1.04999995
 	},
+	cormist2 = {
+		bitmap = "icons/vehicle_t1_missile.png",
+		size = 1.04999995
+	},
 	cormls = {
 		bitmap = "icons/shipengineer.png",
 		size = 1.57499993

language/en/units.json

@@ -191,6 +191,7 @@
 			"armroy": "Corsair",
 			"armsaber": "Sabre",
 			"armsam": "Whistler",
+			"armsam2": "Whistler",
 			"armsb": "Tsunami",
 			"armscab": "Umbrella",
 			"armsd": "Tracer",
@@ -498,6 +499,7 @@
 			"cormine4": "Medium Mine",
 			"corminibuzz": "Mini Calamity",
 			"cormist": "Lasher",
+			"cormist2": "Lasher",
 			"cormls": "Pathfinder",
 			"cormlv": "Trapper",
 			"cormmkr": "Advanced Energy Converter",
@@ -926,6 +928,7 @@
 			"armroy": "Destroyer",
 			"armsaber": "Seaplane Gunship",
 			"armsam": "Missile Truck",
+			"armsam2": "Missile Truck",
 			"armsb": "Seaplane Bomber",
 			"armscab": "Mobile Anti-Nuke",
 			"armsd": "Intrusion Countermeasure System - tracks down stealthy units",
@@ -1234,6 +1237,7 @@
 			"cormine4": "Medium Mine",
 			"corminibuzz": "Mini Rapid-Fire Plasma Cannon",
 			"cormist": "Missile Truck",
+			"cormist2": "Missile Truck",
 			"cormls": "Naval Engineer",
 			"cormlv": "Stealthy Minelayer / Minesweeper",
 			"cormmkr": "Converts 600 energy into 10.3 metal per sec",

luaui/Widgets/unit_dontmove.lua

@@ -25,8 +25,10 @@ local unitNames = {
   "coraak",
 
   "armsam",
+  "armsam2",
   "armyork",
   "cormist",
+  "cormist2",
   "corsent",
 
   "armah",

luaui/configs/buildmenu_sorting.lua

@@ -183,7 +183,9 @@ local unitOrderTable = {
 	['legkark']        = 005610,
 
 	['armsam']         = 005800, --LAND + AA
+	['armsam2']        = 005801, --LAND + AA
 	['cormist']        = 005810,
+	['cormist2']       = 005811,
 	['legrail']		   = 005811,
 
 	['armpincer']      = 005900, --LAND + AMPHIBIOUS

luaui/configs/gridmenu_layouts.lua

@@ -37,13 +37,13 @@ local labGrids = {
 	armvp = {
 		"armcv", "armmlv", "armflash", "armfav",        -- T1 con, minelayer, flash, scout
 		"armstump", "armjanus", "armart", "",          -- stumpy, janus, arty
-		"armbeaver", "armpincer", "armsam", "",        -- amphib con, amphib tank, missile truck
+		"armbeaver", "armpincer", "armsam", "armsam2",        -- amphib con, amphib tank, missile truck
 	},
 
 	corvp = {
 		"corcv", "cormlv", "corgator", "corfav",       -- T1 con, minelayer, gator, scout
 		"corraid", "corlevlr", "corwolv", "",         -- raider, leveler, art
-		"cormuskrat", "corgarp", "cormist", "",       -- amphib con, amphib tank, missile truck
+		"cormuskrat", "corgarp", "cormist", "cormist2",       -- amphib con, amphib tank, missile truck
 	},
 	legvp = {
 		"legcv", "", "leghades", "corfav",       -- T1 con, minelayer, gator, scout