Merge pull request #106 from jakobharder/devel/compact-menu

menu: split consumables
jakobharder · Jun 9, 2024 · 06ed0ca · 06ed0ca
2 parents 7517711 + 3a0f5c8
commit 06ed0ca
Show file tree

Hide file tree

Showing 22 changed files with 867 additions and 682 deletions.
diff --git a/mods/ui-compact-menu/README.md b/mods/ui-compact-menu/README.md
@@ -1,23 +1,81 @@
 ![](./banner.jpg)
 
-Combine city construction menu icons into categories: tourists, public services, institutions, malls and administration.
+Reduce construction menu scrolling with better grouping of entries.
+
+## Tabs
+
+- Consumables tab is split into Farmer to Investor and Scholar, Tourist and Skyscraper tab
+- Culture tab is merged into City and Public Services tab
+
+## Groups
+
+### Citys Tab Groups
+
+- Marketplace: vanilla, Pescatarian community center
+- Religion: Lion053's chapels, church, Pescatarian community center
+- Education: school, library, music school, university
+- Tourists: public mooring, bus stop, hotel, small hotel, restaurant, cafe, bar, iron tower
+- Malls: department store, furniture store, drug store
+- Culture: zoo, museum, botanical garden, world fair
+
+### Public Services Groups
+
+- Tourists: public mooring, bus stop, hotel, small hotel, restaurant, cafe, bar, iron tower
+- Institutions: fire station, police, hospital
+- Administration: guild house, harbour master, town hall
+- Electricity: vanilla, river power plant, small power plants
+
+### Harbour Groups
+
+- Harbour guns: all vanilla harbour weapons
 
 ## Notes
 
 This mod does not recreate the whole menu, but only combines what is correctly added.
 Some mods add their icon only to either progression type sorting or category type sorting.
 Please contact the respective mod authors for fixes.
 
-Buildings from Muggenstuermer and Xan are included.
-
 Contact me if you have any mod conflicts so that I can take care of them.
 
+## Modders
+
+Add `City` or `Secondary` if you want to change where your building is added to.
+The changes are applied with `LoadAfterIds: '*'`.
+Avoid adding your building in that loading stage, otherwise contact me to add a dependency.
+
+Merge culture building into City tab instead of Public Services tab:
+
+```xml
+<ConstructionCategory>
+  <BuildingList>
+    <Item>
+      <Building>123</Building>
+      <City>1</City>
+    </Item>
+  </BuildingList>
+</ConstructionCategory>
+```
+
+Merge Consumable building into Tourist, Skyscraper, Scholar tab:
+
+```xml
+<ConstructionCategory>
+  <BuildingList>
+    <Item>
+      <Building>123</Building>
+      <Secondary>1</CSecondaryity>
+    </Item>
+  </BuildingList>
+</ConstructionCategory>
+```
+
 ## Changes
 
-### 1.3
+### 2.0
 
-- 1.3.1: Updated Korean translations (thanks to modpark817)
-- Swapped NW warehouse and residence to be consistent with OW
+- Split Consumables into vanilla tiers and DLC tiers
+- Merge Culture tab into City and Public Services
+- Group OW electricity, education and religion, culture buildings
 
 ## Credits
 

diff --git a/mods/ui-compact-menu/data/config/export/main/asset/assets-weapons.include.xml b/mods/ui-compact-menu/data/config/export/main/asset/assets-weapons.include.xml
@@ -8,7 +8,7 @@
         <Standard>
           <GUID>1500011120</GUID>
           <Name>OW Harbor Weapon Menu</Name>
-          <IconFilename>data/kurila/icon_harbor_defence.png</IconFilename>
+          <IconFilename>data/ui/jakob/icon_harbor_defence.png</IconFilename>
         </Standard>
         <ConstructionCategory>
           <BuildingList>
@@ -57,8 +57,11 @@
         <Standard>
           <GUID>1500011121</GUID>
           <Name>NW Harbor Weapon Menu</Name>
-          <IconFilename>data/kurila/icon_harbor_defence.png</IconFilename>
+          <IconFilename>data/ui/jakob/icon_harbor_defence.png</IconFilename>
         </Standard>
+        <Text>
+          <TextOverride>1500011120</TextOverride>
+        </Text>
         <ConstructionCategory>
           <BuildingList>
             <Item>
@@ -103,8 +106,11 @@
         <Standard>
           <GUID>1500011122</GUID>
           <Name>Enbesa Harbor Weapon Menu</Name>
-          <IconFilename>data/kurila/icon_harbor_defence.png</IconFilename>
+          <IconFilename>data/ui/jakob/icon_harbor_defence.png</IconFilename>
         </Standard>
+        <Text>
+          <TextOverride>1500011120</TextOverride>
+        </Text>
         <ConstructionCategory>
           <BuildingList>
             <Item>
@@ -121,7 +127,7 @@
             </Item>
             <Item>
               <Building>4799</Building>
-            </Item>          
+            </Item>
           </BuildingList>
           <CategoryDescription>19173</CategoryDescription>
         </ConstructionCategory>
@@ -149,8 +155,11 @@
         <Standard>
           <GUID>1500011123</GUID>
           <Name>Arctic Harbor Weapon Menu</Name>
-          <IconFilename>data/kurila/icon_harbor_defence.png</IconFilename>
+          <IconFilename>data/ui/jakob/icon_harbor_defence.png</IconFilename>
         </Standard>
+        <Text>
+          <TextOverride>1500011120</TextOverride>
+        </Text>
         <ConstructionCategory>
           <BuildingList>
             <Item>