From fa1e5caa81085c6806d476a1bd2ff89257df4c9e Mon Sep 17 00:00:00 2001
From: Jakob Harder <12190313+jakobharder@users.noreply.github.com>
Date: Tue, 6 Aug 2024 20:35:08 +0200
Subject: [PATCH] set biogas category to mod name

---
 .../data/config/export/main/asset/assets.xml  |  4 +-
 .../data/config/export/main/asset/assets_.xml | 66 +++++++++++--------
 .../main/asset/gas-power-plant.include.xml}   | 27 +++++++-
 .../data/config/gui/texts_english.xml         | 38 +----------
 4 files changed, 72 insertions(+), 63 deletions(-)
 rename mods/building-biogas-production/data/{jakob/small_gas_power_plant/assets.include.xml => config/export/main/asset/gas-power-plant.include.xml} (96%)

diff --git a/mods/building-biogas-production/data/config/export/main/asset/assets.xml b/mods/building-biogas-production/data/config/export/main/asset/assets.xml
index 39a29588..43f96a5e 100644
--- a/mods/building-biogas-production/data/config/export/main/asset/assets.xml
+++ b/mods/building-biogas-production/data/config/export/main/asset/assets.xml
@@ -1 +1,3 @@
-<ModOps />
\ No newline at end of file
+<ModOps>
+  <ModOp Type="merge" GUID="119" />
+</ModOps>
\ No newline at end of file
diff --git a/mods/building-biogas-production/data/config/export/main/asset/assets_.xml b/mods/building-biogas-production/data/config/export/main/asset/assets_.xml
index 2e8176f1..ef61f971 100644
--- a/mods/building-biogas-production/data/config/export/main/asset/assets_.xml
+++ b/mods/building-biogas-production/data/config/export/main/asset/assets_.xml
@@ -1,18 +1,9 @@
 <!--
-Biogas Production
-
-Git: https://github.com/jakobharder/anno-1800-jakobs-mods
-GUIDs: https://github.com/anno-mods/GuidRanges
-
-1500010010-19
 // 1500010014 obsolete farm waste
 // 1500010017 (conflicts with InfoDescription in other mods)
-1500010037-38
-
 -->
-
 <ModOps>
-  <Include File="/data/jakob/small_gas_power_plant/assets.include.xml" />
+  <Include File="./gas-power-plant.include.xml" />
 
   <!-- # OW Biogas-->
   <ModOp Type="addNextSibling" GUID="100780">
@@ -26,29 +17,29 @@ GUIDs: https://github.com/anno-mods/GuidRanges
           <InfoDescription>1500010011</InfoDescription>
         </Standard>
         <Building>
-          <BuildingCategoryName>100000</BuildingCategoryName> <!-- production -->
+          <BuildingCategoryName>1500011584</BuildingCategoryName>
           <BuildModeRandomRotation>90</BuildModeRandomRotation>
           <AssociatedRegions>Moderate</AssociatedRegions>
           <AllowChangeVariation>1</AllowChangeVariation>
-          <SecondPartyRelevant>0</SecondPartyRelevant> <!-- tell AI to ignore this building -->
+          <SecondPartyRelevant>0</SecondPartyRelevant>
           <BuildModeStartVariation>1</BuildModeStartVariation>
         </Building>
         <Cost>
           <Costs>
             <Item>
-              <Ingredient>1010017</Ingredient> <!-- Credits -->
+              <Ingredient>1010017</Ingredient>
               <Amount>80000</Amount>
             </Item>
             <Item>
-              <Ingredient>1010196</Ingredient> <!-- Timber -->
+              <Ingredient>1010196</Ingredient>
               <Amount>20</Amount>
             </Item>
             <Item>
-              <Ingredient>1010205</Ingredient> <!-- Bricks -->
+              <Ingredient>1010205</Ingredient>
               <Amount>20</Amount>
             </Item>
             <Item>
-              <Ingredient>1010218</Ingredient> <!-- Beams -->
+              <Ingredient>1010218</Ingredient>
               <Amount>20</Amount>
             </Item>
           </Costs>
@@ -57,11 +48,11 @@ GUIDs: https://github.com/anno-mods/GuidRanges
           <IncomeCategory>ProductionBuildings</IncomeCategory>
           <Maintenances>
             <Item>
-              <Product>1010017</Product> <!-- Credits -->
+              <Product>1010017</Product>
               <Amount>400</Amount>
             </Item>
             <Item>
-              <Product>1010115</Product> <!-- Workers -->
+              <Product>1010115</Product>
               <Amount>300</Amount>
             </Item>
           </Maintenances>
@@ -181,10 +172,10 @@ GUIDs: https://github.com/anno-mods/GuidRanges
         </Standard>
         <Blocking />
         <Building>
-          <BuildingCategoryName>11151</BuildingCategoryName> <!-- infrastructure -->
+          <BuildingCategoryName>1500011584</BuildingCategoryName>
           <BuildModeRandomRotation>90</BuildModeRandomRotation>
           <AssociatedRegions>Moderate</AssociatedRegions>
-          <SecondPartyRelevant>0</SecondPartyRelevant> <!-- tell AI to ignore this building -->
+          <SecondPartyRelevant>0</SecondPartyRelevant>
           <!-- Variation 1 is obsolete. You can still switch to it, but it shouldn't not show up by default. -->
           <AllowChangeVariation>1</AllowChangeVariation>
           <BuildModeStartVariation>0</BuildModeStartVariation>
@@ -309,6 +300,9 @@ GUIDs: https://github.com/anno-mods/GuidRanges
           <Name>farm_waste_service</Name>
           <IconFilename>data/ui/2kimages/main/3dicons/icon_dung.png</IconFilename>
         </Standard>
+        <Text>
+          <TextOverride>24806</TextOverride>
+        </Text>
         <Locked>
           <DLCDependency>410042</DLCDependency>
         </Locked>
@@ -331,6 +325,9 @@ GUIDs: https://github.com/anno-mods/GuidRanges
           <IconFilename>data/ui/2kimages/main/3dicons/icon_dung.png</IconFilename>
           <InfoDescription>1500010013</InfoDescription>
         </Standard>
+        <Text>
+          <TextOverride>24806</TextOverride>
+        </Text>
         <ItemEffect>
           <EffectTargets>
             <Item>
@@ -359,6 +356,9 @@ GUIDs: https://github.com/anno-mods/GuidRanges
           <IconFilename>data/ui/2kimages/main/3dicons/icon_dung.png</IconFilename>
           <InfoDescription>1500010013</InfoDescription>
         </Standard>
+        <Text>
+          <TextOverride>24806</TextOverride>
+        </Text>
         <ItemEffect>
           <EffectTargets>
             <Item>
@@ -387,6 +387,9 @@ GUIDs: https://github.com/anno-mods/GuidRanges
           <IconFilename>data/ui/2kimages/main/3dicons/icon_dung.png</IconFilename>
           <InfoDescription>1500010013</InfoDescription>
         </Standard>
+        <Text>
+          <TextOverride>24806</TextOverride>
+        </Text>
         <ItemEffect>
           <EffectTargets>
             <Item>
@@ -434,6 +437,7 @@ GUIDs: https://github.com/anno-mods/GuidRanges
           <GUID>1500010451</GUID>
           <Name>biogas_chain</Name>
           <IconFilename>data/ui/jakob/icon_biogas_plant.png</IconFilename>
+          <InfoDescription>1500011584</InfoDescription>
         </Standard>
         <ProductionChain>
           <Building>1500010010</Building>
@@ -469,22 +473,25 @@ GUIDs: https://github.com/anno-mods/GuidRanges
           <IconFilename>data/ui/jakob/icon_biogas_plant.png</IconFilename>
           <InfoDescription>1500010011</InfoDescription>
         </Standard>
+        <Text>
+          <TextOverride>1500010010</TextOverride>
+        </Text>
         <Building>
-          <BuildingCategoryName>100000</BuildingCategoryName> <!-- production -->
+          <BuildingCategoryName>1500011584</BuildingCategoryName>
           <BuildModeRandomRotation>90</BuildModeRandomRotation>
           <AssociatedRegions>Colony01</AssociatedRegions>
-          <SecondPartyRelevant>0</SecondPartyRelevant> <!-- tell AI to ignore this building -->
+          <SecondPartyRelevant>0</SecondPartyRelevant>
           <AllowChangeVariation>0</AllowChangeVariation>
         </Building>
         <Maintenance>
           <IncomeCategory>AdministrationBuildings</IncomeCategory>
           <Maintenances>
             <Item>
-              <Product>1010017</Product> <!-- Credits -->
+              <Product>1010017</Product>
               <Amount>400</Amount>
             </Item>
             <Item>
-              <Product>1010367</Product> <!-- Obreros -->
+              <Product>1010367</Product>
               <Amount>200</Amount>
             </Item>
           </Maintenances>
@@ -512,11 +519,14 @@ GUIDs: https://github.com/anno-mods/GuidRanges
           <IconFilename>data/ui/2kimages/main/3dicons/icon_dung.png</IconFilename>
           <InfoDescription>1500010013</InfoDescription>
         </Standard>
+        <Text>
+          <TextOverride>1500010015</TextOverride>
+        </Text>
         <Building>
-          <BuildingCategoryName>100000</BuildingCategoryName> <!-- production -->
+          <BuildingCategoryName>1500011584</BuildingCategoryName>
           <BuildModeRandomRotation>180</BuildModeRandomRotation>
           <AssociatedRegions>Colony01</AssociatedRegions>
-          <SecondPartyRelevant>0</SecondPartyRelevant> <!-- tell AI to ignore this building -->
+          <SecondPartyRelevant>0</SecondPartyRelevant>
           <AllowChangeVariation>0</AllowChangeVariation>
         </Building>
         <Object>
@@ -542,7 +552,11 @@ GUIDs: https://github.com/anno-mods/GuidRanges
           <GUID>1500010452</GUID>
           <Name>biogas_chain_nw</Name>
           <IconFilename>data/ui/jakob/icon_biogas_plant.png</IconFilename>
+          <InfoDescription>1500011584</InfoDescription>
         </Standard>
+        <Text>
+          <TextOverride>1500010451</TextOverride>
+        </Text>
         <ProductionChain>
           <Building>1500010450</Building>
           <Tier1>
diff --git a/mods/building-biogas-production/data/jakob/small_gas_power_plant/assets.include.xml b/mods/building-biogas-production/data/config/export/main/asset/gas-power-plant.include.xml
similarity index 96%
rename from mods/building-biogas-production/data/jakob/small_gas_power_plant/assets.include.xml
rename to mods/building-biogas-production/data/config/export/main/asset/gas-power-plant.include.xml
index bd79765f..47f5271a 100644
--- a/mods/building-biogas-production/data/jakob/small_gas_power_plant/assets.include.xml
+++ b/mods/building-biogas-production/data/config/export/main/asset/gas-power-plant.include.xml
@@ -13,7 +13,7 @@
           <InfoDescription>1500010036</InfoDescription>
         </Standard>
         <Building>
-          <BuildingCategoryName>11169</BuildingCategoryName>
+          <BuildingCategoryName>1500011584</BuildingCategoryName>
           <BuildModeRandomRotation>90</BuildModeRandomRotation>
           <AssociatedRegions>Moderate</AssociatedRegions>
           <SecondPartyRelevant>0</SecondPartyRelevant>
@@ -276,6 +276,24 @@
         </TriggerSetup>
       </Values>
     </Asset>
+    <Asset>
+      <Template>Text</Template>
+      <Values>
+        <Standard>
+          <GUID>1500010036</GUID>
+          <Name>Reduced coverage / consumption</Name>
+        </Standard>
+      </Values>
+    </Asset>
+    <Asset>
+      <Template>Text</Template>
+      <Values>
+        <Standard>
+          <GUID>1500011584</GUID>
+          <Name>Mod origin/name: Biogas Production</Name>
+        </Standard>
+      </Values>
+    </Asset>
   </ModOp>
   <!-- Add to Gas Chain -->
   <Group>
@@ -316,6 +334,9 @@
           <Name>NW Gas Power Plant</Name>
           <IconFilename>data/ui/2kimages/main/3dicons/icon_electric_works_gas.png</IconFilename>
         </Standard>
+        <Text>
+          <TextOverride>1500010020</TextOverride>
+        </Text>
         <Building>
           <AssociatedRegions>Colony01</AssociatedRegions>
         </Building>
@@ -367,7 +388,11 @@
           <GUID>1500010456</GUID>
           <Name>Gas Power Plant NW</Name>
           <IconFilename>data/ui/2kimages/main/3dicons/icon_electric_works_gas.png</IconFilename>
+          <InfoDescription>1500011584</InfoDescription>
         </Standard>
+        <Text>
+          <TextOverride>1500010020</TextOverride>
+        </Text>
         <ProductionChain>
           <Building>1500010457</Building>
           <Tier1>
diff --git a/mods/building-biogas-production/data/config/gui/texts_english.xml b/mods/building-biogas-production/data/config/gui/texts_english.xml
index 3fd80031..1c08f382 100644
--- a/mods/building-biogas-production/data/config/gui/texts_english.xml
+++ b/mods/building-biogas-production/data/config/gui/texts_english.xml
@@ -10,15 +10,11 @@
       <Text>Reduced coverage with 1/2 gas consumption.</Text>
     </Text>
     <Text>
-      <GUID>1500010456</GUID>
-      <Text>[AssetData(1500010020) Text]</Text>
-    </Text>
-    <Text>
-      <GUID>1500010457</GUID>
-      <Text>[AssetData(1500010020) Text]</Text>
+      <GUID>1500011584</GUID>
+      <Text>Biogas Production (Jakob)</Text>
     </Text>
   </ModOp>
-  
+
   <!-- # Biogas -->
   <ModOp Type="add" Path="/TextExport/Texts">
     <Text>
@@ -29,10 +25,6 @@
       <GUID>1500010011</GUID>
       <Text>Produces gas using dung from animal farms.</Text>
     </Text>
-    <Text>
-      <GUID>1500010012</GUID>
-      <Text>[AssetData(24806) Text]</Text>
-    </Text>
     <Text>
       <GUID>1500010013</GUID>
       <Text>Animal farms store dung for further processing.</Text>
@@ -41,33 +33,9 @@
       <GUID>1500010015</GUID>
       <Text>Dung Collector</Text>
     </Text>
-    <Text>
-      <GUID>1500010018</GUID>
-      <Text>[AssetData(24806) Text]</Text>
-    </Text>
-    <Text>
-      <GUID>1500010019</GUID>
-      <Text>[AssetData(24806) Text]</Text>
-    </Text>
-    <Text>
-      <GUID>1500010037</GUID>
-      <Text>[AssetData(24806) Text]</Text>
-    </Text>
-    <Text>
-      <GUID>1500010450</GUID>
-      <Text>[AssetData(1500010010) Text]</Text>
-    </Text>
     <Text>
       <GUID>1500010451</GUID>
       <Text>Biogas</Text>
     </Text>
-    <Text>
-      <GUID>1500010452</GUID>
-      <Text>[AssetData(1500010451) Text]</Text>
-    </Text>
-    <Text>
-      <GUID>1500010453</GUID>
-      <Text>[AssetData(1500010015) Text]</Text>
-    </Text>
   </ModOp>
 </ModOps>
\ No newline at end of file