From efe24af63d19f1ac8fef10377a958679d2b46478 Mon Sep 17 00:00:00 2001
From: xezon <4720891+xezon@users.noreply.github.com>
Date: Sat, 11 Feb 2023 23:40:03 +0100
Subject: [PATCH] Fix: GLA Salvage Crate can no longer be removed by scaffolds

---
 .../v1.0/1676_salvage_crate_exploit.yaml      | 20 +++++++++++++++++++
 .../GameFilesEdited/Data/INI/Crate.ini        |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 Patch104pZH/Design/Changes/v1.0/1676_salvage_crate_exploit.yaml

diff --git a/Patch104pZH/Design/Changes/v1.0/1676_salvage_crate_exploit.yaml b/Patch104pZH/Design/Changes/v1.0/1676_salvage_crate_exploit.yaml
new file mode 100644
index 0000000000..48df1deda4
--- /dev/null
+++ b/Patch104pZH/Design/Changes/v1.0/1676_salvage_crate_exploit.yaml
@@ -0,0 +1,20 @@
+---
+date: 2023-02-11
+
+title: Fixes GLA Salvage Crate being deleted by scaffolds
+
+changes:
+  - fix: The GLA Salvage Crate is no longer deleted when a scaffold is placed on top of it. It remains intact under the scaffold until it is picked up or times out.
+
+labels:
+  - bug
+  - controversial
+  - gla
+  - major
+  - v1.0
+
+links:
+  - https://github.com/TheSuperHackers/GeneralsGamePatch/pull/1676
+
+authors:
+  - xezon
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Crate.ini b/Patch104pZH/GameFilesEdited/Data/INI/Crate.ini
index c4cc304266..2679cd0cac 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Crate.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Crate.ini
@@ -194,7 +194,8 @@ Object SalvageCrate
   ; *** ENGINEERING Parameters ***
   ; Patch104p @fix xezon 11/02/2023 Adds missing crate flag.
   ; Patch104p @fix xezon 11/02/2023 Removes selectable flag to avoid crate eventually being selectable over terrain with non GLA faction.
-  KindOf = PARACHUTABLE CRATE
+  ; Patch104p @bugfix xezon 11/02/2023 Adds inert flag to avoid removal by scaffolds.
+  KindOf = PARACHUTABLE CRATE INERT
 
   Behavior = SalvageCrateCollide ModuleTag_02
     ForbiddenKindOf = PROJECTILE