From 2f6bbd906bd378abef7a2ad0c31ebfb00537e8f6 Mon Sep 17 00:00:00 2001
From: Mustafa Alperen Seki <mustafaoyunda37@gmail.com>
Date: Sun, 31 Dec 2017 10:11:04 +0300
Subject: [PATCH] Ignore Silos for SW Targeting on Harkonnen Missions

Also Defences for Saboteur
---
 mods/d2k/maps/harkonnen-07/harkonnen07.lua   | 1 +
 mods/d2k/maps/harkonnen-08/harkonnen08.lua   | 8 ++++++--
 mods/d2k/maps/harkonnen-09a/harkonnen09a.lua | 1 +
 mods/d2k/maps/harkonnen-09b/harkonnen09b.lua | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mods/d2k/maps/harkonnen-07/harkonnen07.lua b/mods/d2k/maps/harkonnen-07/harkonnen07.lua
index 9371e0554b..a0a2d98dc9 100644
--- a/mods/d2k/maps/harkonnen-07/harkonnen07.lua
+++ b/mods/d2k/maps/harkonnen-07/harkonnen07.lua
@@ -158,6 +158,7 @@ SendAirStrike = function()
 			actor.Type ~= "wall" and
 			actor.Type ~= "medium_gun_turret" and
 			actor.Type ~= "large_gun_turret" and
+			actor.Type ~= "silo" and
 			actor.Type ~= "wind_trap"
 	end)
 
diff --git a/mods/d2k/maps/harkonnen-08/harkonnen08.lua b/mods/d2k/maps/harkonnen-08/harkonnen08.lua
index c81ee24c46..a5f06b80ac 100644
--- a/mods/d2k/maps/harkonnen-08/harkonnen08.lua
+++ b/mods/d2k/maps/harkonnen-08/harkonnen08.lua
@@ -128,6 +128,7 @@ SendAirStrike = function()
 			actor.Type ~= "wall" and
 			actor.Type ~= "medium_gun_turret" and
 			actor.Type ~= "large_gun_turret" and
+			actor.Type ~= "silo" and
 			actor.Type ~= "wind_trap"
 	end)
 
@@ -141,8 +142,11 @@ end
 GetSaboteurTargets = function(player)
 	return Utils.Where(player.GetActors(), function(actor)
 		return
-			actor.HasProperty("Sell")
-			and actor.Type ~= "wall"
+			actor.HasProperty("Sell") and
+			actor.Type ~= "wall" and
+			actor.Type ~= "medium_gun_turret" and
+			actor.Type ~= "large_gun_turret" and
+			actor.Type ~= "silo"
 	end)
 end
 
diff --git a/mods/d2k/maps/harkonnen-09a/harkonnen09a.lua b/mods/d2k/maps/harkonnen-09a/harkonnen09a.lua
index 1a6a51124a..74d4d8d045 100644
--- a/mods/d2k/maps/harkonnen-09a/harkonnen09a.lua
+++ b/mods/d2k/maps/harkonnen-09a/harkonnen09a.lua
@@ -173,6 +173,7 @@ SendAirStrike = function()
 			actor.Type ~= "wall" and
 			actor.Type ~= "medium_gun_turret" and
 			actor.Type ~= "large_gun_turret" and
+			actor.Type ~= "silo" and
 			actor.Type ~= "wind_trap"
 	end)
 
diff --git a/mods/d2k/maps/harkonnen-09b/harkonnen09b.lua b/mods/d2k/maps/harkonnen-09b/harkonnen09b.lua
index c31c23dfeb..74f4d234d0 100644
--- a/mods/d2k/maps/harkonnen-09b/harkonnen09b.lua
+++ b/mods/d2k/maps/harkonnen-09b/harkonnen09b.lua
@@ -179,6 +179,7 @@ SendAirStrike = function()
 			actor.Type ~= "wall" and
 			actor.Type ~= "medium_gun_turret" and
 			actor.Type ~= "large_gun_turret" and
+			actor.Type ~= "silo" and
 			actor.Type ~= "wind_trap"
 	end)