From 113b6e572489fbbfd5216760d0688d8c3ad4c21b Mon Sep 17 00:00:00 2001
From: alanblack <31726131+alanblack166@users.noreply.github.com>
Date: Mon, 23 Aug 2021 15:44:17 +0300
Subject: [PATCH 1/2] Fix WB assert for MultiplayerBeacon

Missing DamageFX throws a non-fatal assert in Worldbuilder.  This adds a token ArmorSet that resolves the issue.
---
 .../GameFilesEdited/Data/INI/Object/FactionProp.ini   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionProp.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionProp.ini
index 49f7591c1..a55cbf2af 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionProp.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/Object/FactionProp.ini
@@ -27,6 +27,17 @@ Object MultiplayerBeacon
   ; Patch104p: Add IMMOBILE to satisfiy Game Engine expectation that structure is immobile.
   KindOf = UNATTACKABLE SELECTABLE NO_COLLIDE ALWAYS_VISIBLE ALWAYS_SELECTABLE STRUCTURE IMMOBILE
 
+
+  ; @bugfix - hanfield
+  ; Added a token ArmorSet to fix Worldbuilder assert regarding missing DamageFX.
+  ; 23/08/2021
+
+  ArmorSet        
+    Conditions      = None
+    Armor           = InvulnerableAllArmor
+    DamageFX        = DamageFX_Empty
+  End
+
   ClientUpdate = BeaconClientUpdate ModuleTag_02
     RadarPulseFrequency = 1000
     RadarPulseDuration = 500

From 929feea4ca8e4f8a243c4eee5c5ec057ee8bec82 Mon Sep 17 00:00:00 2001
From: alanblack <31726131+alanblack166@users.noreply.github.com>
Date: Mon, 23 Aug 2021 15:45:42 +0300
Subject: [PATCH 2/2] Updates CommandSet.ini

Adds EmptyCommandSet for use in solving scaffold building exploit.
---
 Patch104pZH/GameFilesEdited/Data/INI/CommandSet.ini | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/CommandSet.ini b/Patch104pZH/GameFilesEdited/Data/INI/CommandSet.ini
index c0bcef436..f8baacf4f 100644
--- a/Patch104pZH/GameFilesEdited/Data/INI/CommandSet.ini
+++ b/Patch104pZH/GameFilesEdited/Data/INI/CommandSet.ini
@@ -29,6 +29,14 @@ CommandSet StopOnlyGenericCommandSet
   14 = Command_Stop
 End
 
+
+; @bugfix - hanfield
+; Added an empty commandset for things that require no buttons at all.
+; 23/08/2021
+
+CommandSet EmptyCommandSet
+End
+
 ; Dozer Command Sets ----------------------------------------------------------
 CommandSet AmericaDozerCommandSet
   1  = Command_ConstructAmericaPowerPlant