From 4f742b51f7f1796ba9e1f22d4aa3e75e85099858 Mon Sep 17 00:00:00 2001
From: MetalStormGhost <ghosti@smytky.org>
Date: Mon, 9 Oct 2023 10:43:25 +0300
Subject: [PATCH] Moved SAM site presets from presets.defenses.sam to
 presets.defenses.red/blue

---
 game/pretense/pretenseluagenerator.py      |   4 +-
 resources/plugins/pretense/init_header.lua | 128 +++++++++++++++------
 2 files changed, 94 insertions(+), 38 deletions(-)

diff --git a/game/pretense/pretenseluagenerator.py b/game/pretense/pretenseluagenerator.py
index af97601b..d29880f0 100644
--- a/game/pretense/pretenseluagenerator.py
+++ b/game/pretense/pretenseluagenerator.py
@@ -74,7 +74,9 @@ class PretenseLuaGenerator(LuaGenerator):
         preset: str, cp_side_str: str, cp_name_trimmed: str
     ) -> str:
         lua_string_zones = (
-            "                presets.defenses.sam."
+            "                presets.defenses."
+            + cp_side_str
+            + "."
             + preset
             + ":extend({ name='"
             + cp_name_trimmed
diff --git a/resources/plugins/pretense/init_header.lua b/resources/plugins/pretense/init_header.lua
index a8585391..c73f5444 100644
--- a/resources/plugins/pretense/init_header.lua
+++ b/resources/plugins/pretense/init_header.lua
@@ -514,34 +514,34 @@ presets = {
 				type='defense', 
 				template='shorad-red',
 			}),
-			sam = Preset:new({
-				display = 'SAM', 
-				cost=3000, 
-				type='defense', 
-				template='sam-red',
+			sa2 = Preset:new({
+				display = 'SAM',
+				cost=3000,
+				type='defense',
+				template='sa2',
 			}),
 			sa10 = Preset:new({
-				display = 'SAM', 
-				cost=3000, 
-				type='defense', 
+				display = 'SAM',
+				cost=3000,
+				type='defense',
 				template='sa10',
 			}),
 			sa5 = Preset:new({
-				display = 'SAM', 
-				cost=3000, 
-				type='defense', 
+				display = 'SAM',
+				cost=3000,
+				type='defense',
 				template='sa5',
 			}),
 			sa3 = Preset:new({
-				display = 'SAM', 
-				cost=3000, 
-				type='defense', 
+				display = 'SAM',
+				cost=3000,
+				type='defense',
 				template='sa3',
 			}),
 			sa6 = Preset:new({
-				display = 'SAM', 
-				cost=3000, 
-				type='defense', 
+				display = 'SAM',
+				cost=3000,
+				type='defense',
 				template='sa6',
 			}),
 			sa11 = Preset:new({
@@ -550,42 +550,96 @@ presets = {
 				type='defense',
 				template='sa11',
 			}),
+			hawk = Preset:new({
+				display = 'SAM',
+				cost=3000,
+				type='defense',
+				template='hawk',
+			}),
+			patriot = Preset:new({
+				display = 'SAM',
+				cost=3000,
+				type='defense',
+				template='patriot',
+			}),
+			nasams = Preset:new({
+				display = 'SAM',
+				cost=3000,
+				type='defense',
+				template='nasams',
+			}),
 			redShipGroup = Preset:new({
-				display = 'SAM', 
-				cost=3000, 
-				type='defense', 
+				display = 'SAM',
+				cost=3000,
+				type='defense',
 				template='redShipGroup',
 			})
 		},
 		blue = {
 			infantry = Preset:new({
-				display = 'Infantry', 
-				cost=2000, 
-				type='defense', 
+				display = 'Infantry',
+				cost=2000,
+				type='defense',
 				template='infantry-blue',
 			}),
 			shorad = Preset:new({
-				display = 'SAM', 
-				cost=2500, 
-				type='defense', 
+				display = 'SAM',
+				cost=2500,
+				type='defense',
 				template='shorad-blue',
 			}),
-			sam = Preset:new({
-				display = 'SAM', 
-				cost=3000, 
-				type='defense', 
-				template='sam-blue',
+			sa2 = Preset:new({
+				display = 'SAM',
+				cost=3000,
+				type='defense',
+				template='sa2',
+			}),
+			sa10 = Preset:new({
+				display = 'SAM',
+				cost=3000,
+				type='defense',
+				template='sa10',
+			}),
+			sa5 = Preset:new({
+				display = 'SAM',
+				cost=3000,
+				type='defense',
+				template='sa5',
+			}),
+			sa3 = Preset:new({
+				display = 'SAM',
+				cost=3000,
+				type='defense',
+				template='sa3',
+			}),
+			sa6 = Preset:new({
+				display = 'SAM',
+				cost=3000,
+				type='defense',
+				template='sa6',
+			}),
+			sa11 = Preset:new({
+				display = 'SAM',
+				cost=3000,
+				type='defense',
+				template='sa11',
+			}),
+			hawk = Preset:new({
+				display = 'SAM',
+				cost=3000,
+				type='defense',
+				template='hawk',
 			}),
 			patriot = Preset:new({
-				display = 'SAM', 
-				cost=3000, 
-				type='defense', 
+				display = 'SAM',
+				cost=3000,
+				type='defense',
 				template='patriot',
 			}),
 			nasams = Preset:new({
-				display = 'SAM', 
-				cost=3000, 
-				type='defense', 
+				display = 'SAM',
+				cost=3000,
+				type='defense',
 				template='nasams',
 			}),
 			blueShipGroup = Preset:new({