Made scavenger nuke submarines use manual fire. (#4087)

Made scavenger nuke submarines use manual fire.
beyond-all-reason · Dec 27, 2024 · 74672f7 · 74672f7
1 parent 6b4f4f5
commit 74672f7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/gamedata/alldefs_post.lua b/gamedata/alldefs_post.lua
@@ -264,18 +264,20 @@ function UnitDef_Post(name, uDef)
 				armsilo = true,
 				armscab = true,
 				armseadragon = true,
-				cordesolator = true,
 				corfmd = true,
 				corsilo = true,
 				cormabm = true,
+				cordesolator = true,
 				legsilo =  true,
 				legabm = true,
 				armamd_scav = true,
 				armsilo_scav = true,
 				armscab_scav = true,
+				armseadragon_scav = true,
 				corfmd_scav = true,
 				corsilo_scav = true,
 				cormabm_scav = true,
+				cordesolator_scav = true,
 				legsilo_scav =  true,
 				legabm_scav = true,
 			}

diff --git a/luarules/gadgets/pve_nuke_controller.lua b/luarules/gadgets/pve_nuke_controller.lua
@@ -47,7 +47,17 @@ for i = 1, #teams do
 end
 
 local nukeDefs = {}
-for _, unitDefName in ipairs({"raptor_turret_meteor_t4_v1", "corsilo_scav", "armsilo_scav", "legsilo_scav", "corjuno_scav", "armjuno_scav", "legstarfall_scav"}) do 
+for _, unitDefName in ipairs({
+        "raptor_turret_meteor_t4_v1",
+        "corsilo_scav",
+        "armsilo_scav",
+        "legsilo_scav",
+        "corjuno_scav",
+        "armjuno_scav",
+        "legstarfall_scav",
+        "armseadragon_scav",
+        "cordesolator_scav",
+    }) do 
 	if UnitDefNames[unitDefName] then 
 		nukeDefs[UnitDefNames[unitDefName].id] = true
 	end

diff --git a/units/ArmShips/T2/armseadragon.lua b/units/ArmShips/T2/armseadragon.lua
@@ -194,6 +194,7 @@ return {
 				weaponvelocity = 1600,
 				customparams = {
 					place_target_on_ground = "true",
+					scavforcecommandfire = true,
 				},
 				damage = {
 					commanders = 2500,

diff --git a/units/CorShips/T2/cordesolator.lua b/units/CorShips/T2/cordesolator.lua
@@ -168,6 +168,7 @@ return {
 				weaponvelocity = 1600,
 				customparams = {
 					place_target_on_ground = "true",
+					scavforcecommandfire = true,
 				},
 				damage = {
 					commanders = 2500,