Merge pull request #6 from Terragg/dev-test-upcoming-es-changes

R1.1 Update and aligning with revived Extended Storage

About/About.xml

@@ -1,37 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
 	<name>Extended Storage Extended</name>
-	<supportedVersions>
-		<li>1.0</li>
-	</supportedVersions>
 	<author>TerraggosaurusRex</author>
+	<packageId>Extended.ExStorage.Common.Core</packageId>
 	<url>https://steamcommunity.com/id/TerraggosaurusRex/myworkshopfiles/?appid=294100</url>
+	<supportedVersions>
+		<li>1.1</li>
+	</supportedVersions>
+	<modDependencies>
+		<li>
+			<packageId>ExStorage.Common.Core</packageId>
+			<displayName>Extended Storage</displayName>
+			<steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
+		</li>
+	</modDependencies>
+	<loadAfter>
+		<li>ExStorage.Common.Core</li>
+	</loadAfter>
 	<description><![CDATA[ <size=32>Extended Storage - now Extended!</size>
 
 <size=24>About</size>
 ================================================================
 
-Expands the options for storing stuff by providing Extended Storage-derived buildings in a new 'Storage' menu.
+Expands the options for storing stuff by providing Extended Storage-derived buildings.
 
 <size=24>Contents</size>
 ================================================================
 
-There is a limit to Steam description readibility and size.  The breakdown or what building does what is availible online at:
+There is a limit to Steam description readability and size.  The breakdown or what building does what is available online at:
 
    https://github.com/Terragg/Extended-Storage-Extended/blob/master/Docs/Contents.md
 
 <size=24>Dependancies</size>
 ================================================================
 
-Requires a working copy of Extended Storage:
+Requires a working copy of the revived Extended Storage:
 
-   https://steamcommunity.com/sharedfiles/filedetails/?id=731732064
+   https://steamcommunity.com/sharedfiles/filedetails/?id=2006727854
 
 <size=24>Supports</size>
 ================================================================
 <size=18>Combat Extended</size>
 
-Ammo storage in Pallets and Explosives Containers base on type.
+Ammo storage in Pallets and Explosives Containers, based on type of ammo.
 
 Hat-tip: jinlan
 
@@ -41,7 +52,7 @@ Hat-tip: jinlan
 <size=18>Overall: Must be loaded immediately after Extended Storage</size>
 --------------------------------
 
-There is an issue with some other mods that define a FurnitureBase abstract.  To prevent loss of functionality, make sure Extended Storage Exteneded is loaded <b>immediately</b> after Extended Storage.
+To prevent issues, make sure Extended Storage Extended is loaded <b>immediately</b> after Extended Storage.
 
 <size=18>Meat Hooks: Visual glitch</size>
 --------------------------------
@@ -51,7 +62,7 @@ The game will throw a "missing image" icon (the bright magenta X in a cell) once
 <size=18>Meat Hooks: Disappearing corpses glitch</size>
 --------------------------------
 
-A patch to fix a semi-related issue in Extended Storage now allows corspes to be built in a 'bugged' state when splurged.  This bugged state is detected by the game and those corpses are immediately deleted.  There is only one current workaround, do not adjust Meat Hook filters while there are corpses stored - allow pawns to remove all corpses before adjusting filters.
+A patch to fix a semi-related issue in Extended Storage now allows corpses to be built in a 'bugged' state when splurged.  This bugged state is detected by the game and those corpses are immediately deleted.  There is only one current workaround, do not adjust Meat Hook filters while there are corpses stored - allow pawns to remove all corpses before adjusting filters.
 
 <size=18>Weapons Racks: Only top weapon is right-click selectable</size>
 --------------------------------
@@ -61,19 +72,20 @@ Unlike Extended Storage Clothes racks, there is no supporting code to 'Equip' an
 <size=24>Thanks to</size>
 ================================================================
 
-scullywag, DrVanGogh, and others:  Making and maintaining Extended Storage
+Tad, scullywag, DrVanGogh, and others:  Making and maintaining Extended Storage
 typesgal:  Stamper Font
 Marnador:  Rimword Font
 
 <size=24>Version</size>
 ================================================================
 
-This is version 0.5.0.1 and is for RimWorld 1.0.2150.
+This is version 0.6.0.2 and is for RimWorld 1.1.
 
 <size=24>Non-Steam Release URL</size>
 ================================================================
 
-   https://github.com/Terragg/Extended-Storage-Extended/releases/latest on Github.
+Lateset Release   https://github.com/Terragg/Extended-Storage-Extended/releases/latest on Github.
 
+All Releases   https://github.com/Terragg/Extended-Storage-Extended/releases/ on Github.
  ]]></description>
 </ModMetaData>

CHANGELOG.md

@@ -27,7 +27,17 @@
 + Added Weapons Stack (Tribal).
 * Updated Meat Hooks with better Cleanliness.
 * Updated Large Weapons Rack to require Research and added protection to weapons and increase in stats to offset.
-* Patched HazMat Container from Exteneded Storage to increase capacity as Uranium no longer has the x10 multiplier.
-* Trival balance tweaks.
+* Patched HazMat Container from Extended Storage to increase capacity as Uranium no longer has the x10 multiplier.
+* Trivial balance tweaks.
 * Updated for r1.0
 
+# Version 0.6.0.1b
+
+* Testing expected changes from Extended Storage
+* Minor documentation corrections.
+
+# Version 0.6.0.2
+
+* Updated for r1.1
+* Minor documentation corrections.
+

Defs/ThingCategoryDefs/ThingCategories.xml → Common/Defs/ThingCategoryDefs/ThingCategories.xml

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-	<!-- Categorization for furniture -->
-	<ThingCategoryDef>
-		<defName>ExtendedStorageExtended_BuildingsFurnitureStorage</defName>
-		<label>storage</label>
-		<parent>BuildingsFurniture</parent>
-	</ThingCategoryDef>
 	<!-- Category for AnimalFeed (Copied from VGP Vegetable Garden) -->
 	<!-- Depending on Load order will stomp UI by VGP Vegetable Garden icon [my apologies] -->
 	<ThingCategoryDef>

Defs/ThingDefs/Storage/Storage_ExtendedStrorage_Core.xml → Common/Defs/ThingDefs/Storage/Storage_ExtendedStrorage_Core.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-	<ThingDef Name="ExtendedStorageExtended_FurnitureBase" ParentName="FurnitureBase" Abstract="True">
+	<ThingDef Name="ExtendedStorageExtended_FurnitureBase" ParentName="ExtendedStorage_FurnitureBase" Abstract="True">
 		<thingClass>ExtendedStorage.Building_ExtendedStorage</thingClass>
 		<pathCost>60</pathCost>
 		<altitudeLayer>Building</altitudeLayer>
@@ -10,13 +10,9 @@
 		<tickerType>Normal</tickerType>
 		<staticSunShadowHeight>0.5</staticSunShadowHeight>
 		<surfaceType>Item</surfaceType>
-		<inspectorTabs>
-			<li>ExtendedStorage.ITab_Storage</li>
-		</inspectorTabs>
 		<techLevel>Neolithic</techLevel>
 		<thingCategories Inherit="False">
-			<li>ExtendedStorageExtended_BuildingsFurnitureStorage</li>
+			<li>BuildingsFurnitureStorage</li>
 		</thingCategories>
-		<designationCategory Inherit="False">ExtendedStorageExtended_FurnitureStorage</designationCategory>
 	</ThingDef>
 </Defs>

Defs/ThingDefs/Storage/Storage_ExtendedStrorage_MaterialContainers.xml → Common/Defs/ThingDefs/Storage/Storage_ExtendedStrorage_MaterialContainers.xml

@@ -14,6 +14,7 @@
 			<drawSize>(4,3)</drawSize>
 		</graphicData>
 		<statBases>
+			<Mass>30</Mass>
 			<MaxHitPoints>75</MaxHitPoints>
 			<Beauty>-2</Beauty>
 			<ES_StorageFactor>5</ES_StorageFactor>
@@ -132,6 +133,55 @@
 		</building>
 	</ThingDef>
 <!--
+	<ThingDef ParentName="ExtendedStorageExtended_FurnitureBase">
+		<defName>Storage_AnimalFeedTrough_Industrial</defName>
+		<label>Feed Trough</label>
+		<techLevel Inherit="False">Industrial</techLevel>
+		<researchPrerequisites>
+			<li>ComplexFurniture</li>
+			<li>Machining</li>
+		</researchPrerequisites>
+		<staticSunShadowHeight Inherit="False">0.33</staticSunShadowHeight>
+ 		<graphicData>
+			<texPath>Things/Building/Furniture/AnimalFeedTrough_Industrial/AnimalFeedTrough_Industrial</texPath>
+			<graphicClass>Graphic_Multi</graphicClass>
+			<drawSize>(4,3)</drawSize>
+		</graphicData>
+		<statBases>
+			<Mass>15</Mass>
+			<MaxHitPoints>125</MaxHitPoints>
+			<Beauty>-1</Beauty>
+			<ES_StorageFactor>16</ES_StorageFactor>
+		</statBases>
+		<description>Haulers carry Animal Feed here for storage.  Raw vegetarian food is allowed but disabled by default.</description>
+		<size>(2,1)</size>
+		<costList>
+			<Steel>5</Steel>
+		</costList>
+		<stuffCategories>
+			<li>Metallic</li>
+		</stuffCategories>
+		<costStuffCount>40</costStuffCount>
+		<building>
+			<ignoreStoredThingsBeauty>true</ignoreStoredThingsBeauty>
+			<fixedStorageSettings>
+				<filter>
+					<categories>
+						<li>AnimalFeed</li>
+						<li>PlantFoodRaw</li>
+					</categories>
+				</filter>
+			</fixedStorageSettings>
+			<defaultStorageSettings>
+				<priority>Important</priority>
+				<filter>
+					<categories>
+						<li>AnimalFeed</li>
+					</categories>
+				</filter>
+			</defaultStorageSettings>
+		</building>
+	</ThingDef>
 	<ThingDef ParentName="ExtendedStorageExtended_FurnitureBase">
 		<defName>Storage_IndustrialRack</defName>
 		<label>Industrial Rack</label>
@@ -183,6 +233,7 @@
 	<ThingDef ParentName="ExtendedStorageExtended_FurnitureBase">
 		<defName>Storage_BedrollRack</defName>
 		<label>Bedroll Rack</label>
+		<techLevel Inherit="False">Medieval</techLevel>
 		<staticSunShadowHeight>0</staticSunShadowHeight>
 		<castEdgeShadows>false</castEdgeShadows>
 		<graphicData>
@@ -215,6 +266,40 @@
 			</fixedStorageSettings>
 		</building>
 	</ThingDef>
+	<ThingDef ParentName="ExtendedStorageExtended_FurnitureBase">
+		<defName>Storage_BedrollRack_Neolithic</defName>
+		<label>Bedroll Rack (Tribal)</label>
+		<staticSunShadowHeight>0</staticSunShadowHeight>
+		<castEdgeShadows>false</castEdgeShadows>
+		<graphicData>
+			<texPath>Things/Building/Furniture/BedrollRack_Neolithic/BedrollRack_Neolithic</texPath>
+			<graphicClass>Graphic_Multi</graphicClass>
+			<drawSize>(4,3)</drawSize>
+		</graphicData>
+		<statBases>
+			<MaxHitPoints>30</MaxHitPoints>
+			<Mass>3</Mass>
+			<Beauty>-1</Beauty>
+			<ES_StorageFactor>6</ES_StorageFactor>
+		</statBases>
+		<description>Haulers carry bedrolls here to store. Addtional smells included for free.</description>
+		<size>(2,1)</size>
+		<stuffCategories>
+			<li>Woody</li>
+		</stuffCategories>
+		<costStuffCount>15</costStuffCount>
+		<building>
+			<fixedStorageSettings>
+				<priority>Important</priority>
+				<filter>
+					<thingDefs>
+						<li>Bedroll</li>
+						<li>BedrollDouble</li>
+					</thingDefs>
+				</filter>
+			</fixedStorageSettings>
+		</building>
+	</ThingDef>
  -->
 </Defs>
 

Defs/ThingDefs/Storage/Storage_ExtendedStrorage_WeaponContainers.xml → Common/Defs/ThingDefs/Storage/Storage_ExtendedStrorage_WeaponContainers.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 	<ThingDef ParentName="ExtendedStorageExtended_FurnitureBase">
-		<defName>Storage_WeaponStack</defName>
+		<defName>Storage_WeaponsStack</defName>
 		<label>Weapons Stack (Tribal)</label>
 		<castEdgeShadows>false</castEdgeShadows>
 		<staticSunShadowHeight>0</staticSunShadowHeight>

Common/Patches/ESE_CategoryPatches.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+	<!-- Thing category -->
+	<!-- Manually update vanilla objects -->
+	<Operation Class="PatchOperationSequence">
+		<success>Always</success>
+		<operations>
+			<li Class="PatchOperationTest">
+				<xpath>Defs/ThingDef[defName="Shelf"]/thingCategories</xpath>
+				<success>Invert</success>
+			</li>
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="Shelf"]</xpath>
+				<value>
+					<thingCategories Inherit="False" />
+				</value>
+			</li>
+		</operations>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shelf"]/thingCategories</xpath>
+		<value>
+			<thingCategories  Inherit="False">
+				<li>BuildingsFurnitureStorage</li>
+			</thingCategories>
+		</value>
+	</Operation>
+</Patch>

Common/Patches/ESE_DesignationPatches.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+	<!-- Designation Category Updates -->
+	<!-- Manually update vanilla objects -->
+	<Operation Class="PatchOperationSequence">
+		<success>Always</success>
+		<operations>
+			<li Class="PatchOperationTest">
+				<xpath>Defs/ThingDef[defName="Shelf"]/designationCategory</xpath>
+				<success>Invert</success>
+			</li>
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="Shelf"]</xpath>
+				<value>
+					<designationCategory />
+				</value>
+			</li>
+		</operations>
+	</Operation>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Shelf"]/designationCategory</xpath>
+		<value>
+			<designationCategory>FurnitureStorage</designationCategory>
+		</value>
+	</Operation>
+</Patch>

Dev/html2md.pl

@@ -21,8 +21,8 @@
 	$line =~ s#^[ \t]+##g;
 	if ($line =~ m#<h([1-6])>#)
 	{
-		my $tag = ('#' x (int ($1) - 1));
-# 		my $tag = ('#' x (int ($1)));
+# 		my $tag = ('#' x (int ($1) - 1));
+		my $tag = ('#' x (int ($1)));
 		$line =~ s#<h[1-6]>#$tag #g;
 		$line =~ s#</h[1-6]># $tag#g;
 	}