From c6542e9a30aa803631ee6940b5fa5fa552ff01fb Mon Sep 17 00:00:00 2001
From: Henrique Gemignani Passos Lima <henrique@gemignani.org>
Date: Fri, 17 Feb 2023 00:22:52 +0200
Subject: [PATCH] MP1R Templates: Fix field order, add CookIfModified

---
 MP1R/Script/PickupMP1.xml             | 21 ++++---
 MP1R/Script/WorldTeleporterTooMP1.xml | 89 ++++++++++++++++-----------
 MP1R/Structs/ActorInformationMP1.xml  | 51 +++++++++++----
 MP1R/Structs/AnimSetMP1.xml           | 13 ++--
 MP1R/Structs/MapInfoMP1.xml           | 12 +++-
 MP1R/Structs/ScannableMP1.xml         |  4 +-
 MP1R/Structs/VectorMP1.xml            | 12 +++-
 MP1R/Structs/VisorMP1.xml             |  4 ++
 8 files changed, 138 insertions(+), 68 deletions(-)

diff --git a/MP1R/Script/PickupMP1.xml b/MP1R/Script/PickupMP1.xml
index 1f7f602..988a5ff 100644
--- a/MP1R/Script/PickupMP1.xml
+++ b/MP1R/Script/PickupMP1.xml
@@ -5,13 +5,6 @@
         <SubProperties>
             <Element Type="Struct" ID="0x70e39ec6" Archetype="VectorMP1" Name="Collision Scale" />
             <Element Type="Struct" ID="0x2d644844" Archetype="VectorMP1" Name="Scan/Collision Offset" />
-            <Element Type="Asset" ID="0xBCE29CB3" Name="GUID 1" />
-            <Element Type="Struct" ID="0x19d911b1" Archetype="AnimSetMP1" Name="AnimationParameters" />
-            <Element Type="Asset" ID="0xe2a07d8e" Name="GUID 2" />
-            <Element Type="Struct" ID="0x853F438A" Archetype="VectorMP1" Name="Unk Vec 3" />
-            <Element Type="Struct" ID="0xBA38A80B" Archetype="MapInfoMP1" Name="Map Info" />
-            <Element Type="Struct" ID="0x68f9d4b6" Archetype="ActorInformationMP1" Name="Actor Info" />
-
             <Element Type="Choice" ID="0xc79794ee" Archetype="PlayerItem" Name="Item" />
             <Element Type="Int" ID="0x76be91d5">
                 <Name>Capacity</Name>
@@ -20,8 +13,8 @@
             <Element Type="Int" ID="0x9FDBD2F6">
                 <Name>Amount</Name>
                 <DefaultValue>1</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
-
             <Element Type="Float" ID="0xfcf349d2">
                 <Name>Drop Rate</Name>
                 <DefaultValue>100.0</DefaultValue>
@@ -34,18 +27,30 @@
                 <Name>Fade Length</Name>
                 <DefaultValue>0.0</DefaultValue>
             </Element>
+
+            <Element Type="Asset" ID="0xBCE29CB3" Name="GUID 1">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Struct" ID="0x19d911b1" Archetype="AnimSetMP1" Name="AnimationParameters" />
             <Element Type="Float" ID="0x3e9f5eff">
                 <Name>Spawn Delay</Name>
                 <DefaultValue>0.0</DefaultValue>
             </Element>
 
+            <Element Type="Asset" ID="0xe2a07d8e" Name="GUID 2" />
+            <Element Type="Struct" ID="0x853F438A" Archetype="VectorMP1" Name="Unk Vec 3" />
+            <Element Type="Struct" ID="0xBA38A80B" Archetype="MapInfoMP1" Name="Map Info" />
+            <Element Type="Struct" ID="0x68f9d4b6" Archetype="ActorInformationMP1" Name="Actor Info" />
+
             <Element Type="Bool" ID="0xBD71E2F2">
                 <Name>Unk Bool 1</Name>
                 <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0xf2165c6e">
                 <Name>Unk Bool 2</Name>
                 <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
         </SubProperties>
     </Properties>
diff --git a/MP1R/Script/WorldTeleporterTooMP1.xml b/MP1R/Script/WorldTeleporterTooMP1.xml
index 4b4dd26..4dfba2b 100644
--- a/MP1R/Script/WorldTeleporterTooMP1.xml
+++ b/MP1R/Script/WorldTeleporterTooMP1.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptObject ArchiveVer="4" Game="PrimeRemastered">
-    <Properties Type="Struct" Incomplete="true">
+    <Properties Type="Struct">
         <Name>WorldTeleporterTooMP1</Name>
         <SubProperties>
-            <Element Type="Struct" ID="0x6AEAEE72" Archetype="AnimSetMP1" Name="AnimationInformation" />
-            <Element Type="Struct" ID="0xc2536679" Archetype="VectorMP1" Name="PlayerScale" />
-            <Element Type="Struct" ID="0x4FB5E821" Archetype="VectorMP1" Name="PlatformScale" />
-            <Element Type="Struct" ID="0xbb3ae62a" Archetype="VectorMP1" Name="ShaftScale" />
-
-            <Element Type="PooledString" ID="0xB8D54E2C" Name="UnkStr" />
-
             <Element Type="Asset" ID="0xd49a517f" Name="World">
                 <TypeFilter>
                     <Element>ROOM</Element>
@@ -20,55 +13,79 @@
                     <Element>ROOM</Element>
                 </TypeFilter>
             </Element>
+            <Element Type="Struct" ID="0x6AEAEE72" Archetype="AnimSetMP1" Name="AnimationInformation" />
+
+            <Element Type="Struct" ID="0xc2536679" Archetype="VectorMP1" Name="PlayerScale" />
+
             <Element Type="Asset" ID="0xa7b31f8e" Name="Platform">
                 <TypeFilter>
                     <Element>CMDL</Element>
                 </TypeFilter>
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Struct" ID="0x4FB5E821" Archetype="VectorMP1" Name="PlatformScale" />
+
+            <Element Type="Struct" ID="0xbb3ae62a" Archetype="VectorMP1" Name="ShaftScale" />
+
+            <Element Type="PooledString" ID="0xB8D54E2C" Name="UnkStr">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Bool" ID="0xa6931c09" Name="UnkBool1">
+                <DefaultValue>true</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Asset" ID="0x5407BB23" Name="Sound">
                 <TypeFilter>
                     <Element>CAUD</Element>
                 </TypeFilter>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
-            <Element Type="Asset" ID="0x980b33e8" Name="Text" />
-
             <Element Type="Int" ID="0x82955270" Name="Volume">
                 <DefaultValue>127</DefaultValue>
-            </Element>
-            <Element Type="Int" ID="0x838c35ff" Name="Pan">
-                <DefaultValue>64</DefaultValue>
-            </Element>
-
-            <Element Type="Float" ID="0x5558f09d" Name="CharFadeInTime">
-                <DefaultValue>0.01</DefaultValue>
-            </Element>
-            <Element Type="Float" ID="0xeefc68e9" Name="CharsPerSecond">
-                <DefaultValue>8.0</DefaultValue>
-            </Element>
-            <Element Type="Float" ID="0xa936d90d" Name="DelayBeforeShow">
-                <DefaultValue>0.0</DefaultValue>
-            </Element>
-            <Element Type="Float" ID="0x53b5754b" Name="UnkFloat1">
-                <DefaultValue>0.0</DefaultValue>
-            </Element>
-            <Element Type="Float" ID="0x977347D4" Name="UnkFloat2">
-                <DefaultValue>2.0</DefaultValue>
-            </Element>
-            <Element Type="Float" ID="0xDC35E803" Name="UnkFloat3">
-                <DefaultValue>3.0</DefaultValue>
-            </Element>
-
-            <Element Type="Bool" ID="0xa6931c09" Name="UnkBool1">
-                <DefaultValue>true</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0x03fa3ea7" Name="UpwardElevator">
                 <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Asset" ID="0x980b33e8" Name="Text">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Int" ID="0x838c35ff" Name="Pan">
+                <DefaultValue>64</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0x952E3BAD" Name="UnkBool2">
                 <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Float" ID="0x5558f09d" Name="CharFadeInTime">
+                <DefaultValue>0.01</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Float" ID="0xeefc68e9" Name="CharsPerSecond">
+                <DefaultValue>8.0</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Float" ID="0xa936d90d" Name="DelayBeforeShow">
+                <DefaultValue>0.0</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0x1b68a003" Name="ShowTextInsteadOfCutscene">
                 <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Float" ID="0x53b5754b" Name="UnkFloat1">
+                <DefaultValue>0.0</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Float" ID="0x977347D4" Name="UnkFloat2">
+                <DefaultValue>2.0</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Float" ID="0xDC35E803" Name="UnkFloat3">
+                <DefaultValue>3.0</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
         </SubProperties>
     </Properties>
diff --git a/MP1R/Structs/ActorInformationMP1.xml b/MP1R/Structs/ActorInformationMP1.xml
index 13ae474..403a914 100644
--- a/MP1R/Structs/ActorInformationMP1.xml
+++ b/MP1R/Structs/ActorInformationMP1.xml
@@ -3,82 +3,107 @@
     <PropertyArchetype Type="Struct">
         <Name>ActorInformationMP1</Name>
         <SubProperties>
-            <Element Type="Asset" ID="0x0036D778" Name="Unk GUID 1" />
-            <Element Type="Asset" ID="0xAB68F7A7" Name="Unk GUID 2" />
-            <Element Type="Asset" ID="0x802A053A" Name="Unk GUID 3" />
-            <Element Type="Asset" ID="0x74822f37" Name="Unk GUID 4" />
-            <Element Type="Asset" ID="0x0364A97A" Name="Unk GUID 5" />
-
-            <Element Type="Struct" ID="0x149e3cf2" Archetype="LightingMP1" Name="Lighting" />
-            <Element Type="Struct" ID="0xE50D083C" Archetype="ScannableMP1" Name="Scannable" />
-            <Element Type="Struct" ID="0xAF510B78" Archetype="VisorMP1" Name="Visor" />
+            <Element Type="Asset" ID="0x0036D778" Name="Unk GUID 1">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Asset" ID="0xAB68F7A7" Name="Unk GUID 2">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Asset" ID="0x802A053A" Name="Unk GUID 3">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Asset" ID="0x74822f37" Name="Unk GUID 4">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Asset" ID="0x0364A97A" Name="Unk GUID 5">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
 
             <Element Type="Float" ID="0x36a5a738">
                 <Name>Unk Float 1</Name>
                 <DefaultValue>1.0</DefaultValue>
             </Element>
+            <Element Type="Bool" ID="0x6251CCA7">
+                <Name>Unk Bool 4</Name>
+                <DefaultValue>false</DefaultValue>
+            </Element>
+
+            <Element Type="Struct" ID="0x149e3cf2" Archetype="LightingMP1" Name="Lighting" />
+            <Element Type="Struct" ID="0xE50D083C" Archetype="ScannableMP1" Name="Scannable" />
+            <Element Type="Struct" ID="0xAF510B78" Archetype="VisorMP1" Name="Visor" />
+
             <Element Type="Float" ID="0x90075D55">
                 <Name>Unk Float 2</Name>
                 <DefaultValue>1.0</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Float" ID="0x1a759ffd">
                 <Name>Unk Float 3</Name>
                 <DefaultValue>1.0</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Float" ID="0xDE5135DD">
                 <Name>Unk Float 4</Name>
                 <DefaultValue>1.0</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
 
             <Element Type="Int" ID="0xBA89B4E8">
                 <Name>Unk Int</Name>
                 <DefaultValue>0</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Int" ID="0xB222556A">
                 <!-- TODO: set up as a Choice -->
                 <Name>Water Sort Type</Name>
                 <DefaultValue>0</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             
             <Element Type="Bool" ID="0x8A410818">
                 <Name>Unk Bool 1</Name>
                 <DefaultValue>true</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0x77066D1B">
                 <Name>Unk Bool 2</Name>
                 <DefaultValue>true</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0x7e405ee2">
                 <Name>Unk Bool 3</Name>
                 <DefaultValue>false</DefaultValue>
-            </Element>
-            <Element Type="Bool" ID="0x6251CCA7">
-                <Name>Unk Bool 4</Name>
-                <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0x050751FB">
                 <Name>Unk Bool 5</Name>
                 <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0xC8BA5DC9">
                 <Name>Unk Bool 6</Name>
                 <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0xC7B23A2C">
                 <Name>Unk Bool 7</Name>
                 <DefaultValue>true</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0x4ACA4EFA">
                 <Name>Unk Bool 8</Name>
                 <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0x6AD8955D">
                 <Name>Unk Bool 9</Name>
                 <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0x61b39963">
                 <Name>Unk Bool 10</Name>
                 <DefaultValue>true</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
         </SubProperties>
     </PropertyArchetype>
diff --git a/MP1R/Structs/AnimSetMP1.xml b/MP1R/Structs/AnimSetMP1.xml
index b3bf82e..e006244 100644
--- a/MP1R/Structs/AnimSetMP1.xml
+++ b/MP1R/Structs/AnimSetMP1.xml
@@ -3,10 +3,15 @@
     <PropertyArchetype Type="Struct">
         <Name>AnimSetMP1</Name>
         <SubProperties>
-            <Element Type="Asset" ID="0xa589d885" Name="id" />
-
-            <Element Type="PooledString" ID="0x87c03a01" Name="str1" />
-            <Element Type="PooledString" ID="0xd6f0c0f0" Name="str2" />
+            <Element Type="Asset" ID="0xa589d885" Name="id">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="PooledString" ID="0xd6f0c0f0" Name="str1">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="PooledString" ID="0x87c03a01" Name="str2">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
         </SubProperties>
     </PropertyArchetype>
 </PropertyTemplate>
diff --git a/MP1R/Structs/MapInfoMP1.xml b/MP1R/Structs/MapInfoMP1.xml
index d05eeea..e77484f 100644
--- a/MP1R/Structs/MapInfoMP1.xml
+++ b/MP1R/Structs/MapInfoMP1.xml
@@ -3,9 +3,15 @@
     <PropertyArchetype Type="Struct">
         <Name>MapInfoMP1</Name>
         <SubProperties>
-            <Element Type="Int" ID="0x70f8474b" Name="Unk Int 1" />
-            <Element Type="Int" ID="0x9CAF8D12" Name="Unk Int 2" />
-            <Element Type="Asset" ID="0x91A53221" Name="Unk GUID" />
+            <Element Type="Int" ID="0x70f8474b" Name="Unk Int 1">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Int" ID="0x9CAF8D12" Name="Unk Int 2">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Asset" ID="0x91A53221" Name="Unk GUID">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
         </SubProperties>
     </PropertyArchetype>
 </PropertyTemplate>
diff --git a/MP1R/Structs/ScannableMP1.xml b/MP1R/Structs/ScannableMP1.xml
index fbcb535..b3c77d7 100644
--- a/MP1R/Structs/ScannableMP1.xml
+++ b/MP1R/Structs/ScannableMP1.xml
@@ -9,7 +9,9 @@
                     <Element>SCAN</Element>
                 </TypeFilter>
             </Element>
-            <Element Type="Bool" ID="0x05264039" Name="Unk Bool" />
+            <Element Type="Bool" ID="0x05264039" Name="Unk Bool">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
         </SubProperties>
     </PropertyArchetype>
 </PropertyTemplate>
diff --git a/MP1R/Structs/VectorMP1.xml b/MP1R/Structs/VectorMP1.xml
index c4d6457..5719f89 100644
--- a/MP1R/Structs/VectorMP1.xml
+++ b/MP1R/Structs/VectorMP1.xml
@@ -3,9 +3,15 @@
     <PropertyArchetype Type="Struct">
         <Name>VectorMP1</Name>
         <SubProperties>
-            <Element Type="Float" ID="0x2649E551" Name="x" />
-            <Element Type="Float" ID="0xd2bb5bc6" Name="y" />
-            <Element Type="Float" ID="0x7F9499B2" Name="z" />
+            <Element Type="Float" ID="0x2649E551" Name="x">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Float" ID="0xd2bb5bc6" Name="y">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
+            <Element Type="Float" ID="0x7F9499B2" Name="z">
+                <CookPreference>OnlyIfModified</CookPreference>
+            </Element>
         </SubProperties>
     </PropertyArchetype>
 </PropertyTemplate>
diff --git a/MP1R/Structs/VisorMP1.xml b/MP1R/Structs/VisorMP1.xml
index 9ee1632..7a202c1 100644
--- a/MP1R/Structs/VisorMP1.xml
+++ b/MP1R/Structs/VisorMP1.xml
@@ -6,14 +6,17 @@
             <Element Type="Bool" ID="0x82f75015">
                 <Name>Unknown 1</Name>
                 <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0x5149fc12">
                 <Name>Unknown 2</Name>
                 <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Bool" ID="0x1382ca50">
                 <Name>Unknown 3</Name>
                 <DefaultValue>false</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
             <Element Type="Flags" ID="0x528a56a5">
                 <Name>Visor Flags</Name>
@@ -24,6 +27,7 @@
                     <Element Name="X-Ray" Mask="0x8"/>
                 </Flags>
                 <DefaultValue>0</DefaultValue>
+                <CookPreference>OnlyIfModified</CookPreference>
             </Element>
         </SubProperties>
     </PropertyArchetype>