v1.205

1.2/Defs/ThingDefs_Buildings/Buildings_AdvancedPower.xml

@@ -242,7 +242,7 @@
     </building>
     <constructEffect>ConstructMetal</constructEffect>
     <designationHotKey>Misc6</designationHotKey>
-    <researchPrerequisites><li>GeothermalPower</li></researchPrerequisites>
+    <researchPrerequisites><li>GeothermalPower</li><li>VFE_AdvancedPowerSources</li></researchPrerequisites>
     <constructionSkillPrerequisite>9</constructionSkillPrerequisite>
   </ThingDef>
 

1.2/Defs/ThingDefs_Buildings/Buildings_Gas.xml

@@ -28,7 +28,7 @@
 				<texPath>Things/Building/Linked/GasPipe_Blueprint_Atlas</texPath>
 			</blueprintGraphicData>
 		</building>
-		<altitudeLayer>FloorEmplacement</altitudeLayer>
+		<altitudeLayer>SmallWire</altitudeLayer>
 		<passability>Standable</passability>
 		<leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
 		<statBases>
@@ -535,8 +535,8 @@
 
 			<li Class="GasNetwork.CompProperties_GasTrader">
 				<compClass>GasNetwork.CompGasTrader</compClass>
-				<gasConsumption>1</gasConsumption>
-				<gasConsumptionWhenUsed>25</gasConsumptionWhenUsed>
+				<gasConsumption>25</gasConsumption>
+				<gasConsumptionWhenUsed>26</gasConsumptionWhenUsed>
 			</li>
 
 			<li Class="CompProperties_Flickable">
@@ -624,8 +624,8 @@
 		<comps>
 			<li Class="GasNetwork.CompProperties_GasTrader">
 				<compClass>GasNetwork.CompGasTrader</compClass>
-				<gasConsumption>10</gasConsumption>
-				<gasConsumptionWhenUsed>75</gasConsumptionWhenUsed>
+				<gasConsumption>75</gasConsumption>
+				<gasConsumptionWhenUsed>76</gasConsumptionWhenUsed>
 			</li>
 
 			<li Class="CompProperties_Flickable">
@@ -716,8 +716,8 @@
 		<comps>
 			<li Class="GasNetwork.CompProperties_GasTrader">
 				<compClass>GasNetwork.CompGasTrader</compClass>
-				<gasConsumption>1</gasConsumption>
-				<gasConsumptionWhenUsed>40</gasConsumptionWhenUsed>
+				<gasConsumption>40</gasConsumption>
+				<gasConsumptionWhenUsed>41</gasConsumptionWhenUsed>
 			</li>
 
 			<li Class="CompProperties_Flickable">
@@ -760,14 +760,14 @@
 		<graphicData>
 			<graphicClass>Graphic_Single</graphicClass>
 			<texPath>Things/Building/GasMachines/GasPoweredExcavator</texPath>
-			<drawSize>(2,2)</drawSize>
+			<drawSize>(1,1)</drawSize>
 			<drawRotated>false</drawRotated>
 			<shadowData>
 				<volume>(0.52, 0.53, 0.09)</volume>
 				<offset>(0,0,-0.43)</offset>
 			</shadowData>
 		</graphicData>
-		<size>(2,2)</size>
+		<size>(1,1)</size>
 		<altitudeLayer>Building</altitudeLayer>
 		<passability>PassThroughOnly</passability>
 		<pathCost>70</pathCost>
@@ -776,7 +776,7 @@
 		<interactionCellOffset>(0,0,-1)</interactionCellOffset>
 		<designationCategory>Production</designationCategory>
 		<designationHotKey>Misc12</designationHotKey>
-		<specialDisplayRadius>1.5</specialDisplayRadius>
+		<specialDisplayRadius>2.6</specialDisplayRadius>
 		<rotatable>true</rotatable>
 		<terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
 		<constructionSkillPrerequisite>4</constructionSkillPrerequisite>
@@ -1023,7 +1023,7 @@
 		<defName>VPE_GasSmithy</defName>
 		<label>helixien gas smithy</label>
 		<description>A gas-powered station for smithing non-mechanical weapons and tools.</description>
-		<thingClass>Building_WorkTable</thingClass>
+		<thingClass>GasNetwork.Building_WorkTable_Gas</thingClass>
 		<graphicData>
 			<texPath>Things/Building/GasMachines/GasSmithy</texPath>
 			<graphicClass>Graphic_Multi</graphicClass>
@@ -1070,8 +1070,8 @@
 		<comps>
 			<li Class="GasNetwork.CompProperties_GasTrader">
 				<compClass>GasNetwork.CompGasTrader</compClass>
-				<gasConsumption>1</gasConsumption>
-				<gasConsumptionWhenUsed>50</gasConsumptionWhenUsed>
+				<gasConsumption>50</gasConsumption>
+				<gasConsumptionWhenUsed>51</gasConsumptionWhenUsed>
 			</li>
 			<li Class="CompProperties_Flickable" />
 			<li Class="CompProperties_AffectedByFacilities">
@@ -1125,6 +1125,42 @@
 		</researchPrerequisites>
 	</ThingDef>
 
+	<ThingDef ParentName="StandingLampBase">
+		<defName>VPE_GasWallLight</defName>
+		<label>gas wall light</label>
+		<graphicData>
+			<texPath>Things/Building/GasMachines/VPE_GasWallLight</texPath>
+			<graphicClass>Graphic_Multi</graphicClass>
+			 <shadowData>
+        <volume>(0, 0, 0)</volume>
+        <offset>(0,0,0)</offset>
+      </shadowData>
+		</graphicData>
+		<altitudeLayer>Item</altitudeLayer>
+		<description>A gas-powered wall light that lights an area. People need light to move and work at full speed. Needs to be connected to the helixien gas network. Can be safely placed outdoors.</description>
+		<comps Inherit='False'>
+			<li Class="CompProperties_Glower">
+				<glowRadius>8</glowRadius>
+				<glowColor>(90,140,90,0)</glowColor>
+			</li>
+			<li Class="GasNetwork.CompProperties_GasTrader">
+				<compClass>GasNetwork.CompGasTrader</compClass>
+				<gasConsumption>1</gasConsumption>
+			</li>
+			<li Class="CompProperties_Flickable" />
+		</comps>
+		<building>
+			<isEdifice>false</isEdifice>
+			<canPlaceOverWall>true</canPlaceOverWall>
+		</building>
+		<rotatable>true</rotatable>
+		<clearBuildingArea>false</clearBuildingArea>
+		<defaultPlacingRot>South</defaultPlacingRot>
+		<researchPrerequisites Inherit='False'>
+			<li>VFE_GasExtraction</li>
+		</researchPrerequisites>
+	</ThingDef>
+
 	<ThingDef ParentName="StandingLampBase">
 		<defName>VPE_GasFloodlight</defName>
 		<label>gas floodlight</label>
@@ -1157,7 +1193,7 @@
 		<defName>VPE_GasBiofuelRefinery</defName>
 		<label>gas-powered refinery</label>
 		<description>Refines biological matter like wood or plant matter into chemfuel. Needs to be connected to the helixien gas network.</description>
-		<thingClass>Building_WorkTable</thingClass>
+		<thingClass>GasNetwork.Building_WorkTable_Gas</thingClass>
 		<altitudeLayer>Building</altitudeLayer>
 		<passability>PassThroughOnly</passability>
 		<pathCost>50</pathCost>
@@ -1176,8 +1212,8 @@
 		<comps>
 			<li Class="GasNetwork.CompProperties_GasTrader">
 				<compClass>GasNetwork.CompGasTrader</compClass>
-				<gasConsumption>1</gasConsumption>
-				<gasConsumptionWhenUsed>50</gasConsumptionWhenUsed>
+				<gasConsumption>50</gasConsumption>
+				<gasConsumptionWhenUsed>51</gasConsumptionWhenUsed>
 			</li>
 			<li Class="CompProperties_Flickable" />
 			<li Class="CompProperties_Breakdownable" />
@@ -1332,7 +1368,7 @@
 				<compClass>GasNetwork.CompGasTrader_Buffer</compClass>
 
 				<!-- maximum buffer storage size -->
-				<maxBuffer>50</maxBuffer>
+				<maxBuffer>125</maxBuffer>
 
 				<!-- inherits from CompGasTrader, so all those props apply here too.
 					In the context of a buffer, gasConsumption becomes the refill rate.

1.2/Defs/WorkGiverDefs/WorkGivers.xml

@@ -113,7 +113,7 @@
 	<WorkGiverDef>
 		<defName>VPE_WorkAtGasExcavator</defName>
 		<label>drill at gas excavator</label>
-		<giverClass>VanillaPowerExpanded.WorkGiver_GasExcavator</giverClass>
+		<giverClass>GasNetwork.WorkGiver_GasExcavator</giverClass>
 
 		<workType>Mining</workType>
 		<priorityInType>50</priorityInType>

1.2/Patches/VanillaFurnitureExpandedProductionPatch.xml

@@ -25,6 +25,15 @@
 						</li>
 					</value>
 				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>/Defs/ThingDef[defName = "VPE_GasSmithy"]/comps/li[@Class="CompProperties_AffectedByFacilities"]/linkableFacilities</xpath>
+					<value>
+
+								<li>VFE_SmithyCabinet</li>
+
+					</value>
+				</li>
 
 
 

1.2/Source/VanillaPowerExpanded/VanillaPowerExpanded/GasNet/Comps/CompGasTrader_Buffer.cs

@@ -131,7 +131,7 @@ public class Command_Buffer : Command
 
     public class CompProperties_GasTrader_Buffer : CompProperties_GasTrader
     {
-        public float maxBuffer        = 50;
+        public float maxBuffer        = 125;
         public bool  showBufferSlider = true;
         public bool  showBufferToggle = true;
     }

1.2/Source/VanillaPowerExpanded/VanillaPowerExpanded/PipeNet (obsolete)/WorkGiver_GasExcavator.cs → 1.2/Source/VanillaPowerExpanded/VanillaPowerExpanded/GasNet/WorkGiver_GasExcavator.cs

@@ -4,7 +4,7 @@
 using Verse.AI;
 using RimWorld;
 
-namespace VanillaPowerExpanded
+namespace GasNetwork
 {
     public class WorkGiver_GasExcavator : WorkGiver_Scanner
     {
@@ -37,8 +37,8 @@ public override bool ShouldSkip(Pawn pawn, bool forced = false)
                 Building building = allBuildingsColonist[i];
                 if (building.def == ThingDef.Named("VPE_GasDrill"))
                 {
-                    CompPipeTrader comp = building.GetComp<CompPipeTrader>();
-                    if ((comp == null || comp.PowerOn) && building.Map.designationManager.DesignationOn(building, DesignationDefOf.Uninstall) == null)
+                    CompGasTrader comp = building.GetComp<CompGasTrader>();
+                    if ((comp == null || comp.GasOn) && building.Map.designationManager.DesignationOn(building, DesignationDefOf.Uninstall) == null)
                     {
                         return false;
                     }

1.2/Source/VanillaPowerExpanded/VanillaPowerExpanded/Utils/I18n.cs

@@ -4,7 +4,7 @@ namespace GasNetwork
 {
     public static class I18n
     {
-        public const string Unit = " m³";
+        public const string Unit = " m3";
 
         public static readonly string GasOff                 = "GasOff".Translate();
         public static readonly string NoNetwork              = "NoNetwork".Translate();

1.2/Source/VanillaPowerExpanded/VanillaPowerExpanded/VanillaPowerExpanded.csproj

@@ -318,7 +318,7 @@
     <Compile Include="GasNet\Patches\GlobalControlsUtility.cs" />
     <Compile Include="GasNet\Patches\PathGrid.cs" />
     <Compile Include="PipeNet %28obsolete%29\Building_GasHeater.cs" />
-    <Compile Include="PipeNet %28obsolete%29\WorkGiver_GasExcavator.cs" />
+    <Compile Include="GasNet\WorkGiver_GasExcavator.cs" />
     <Compile Include="GasNet\Comps\CompGas.cs" />
     <Compile Include="GasNet\Comps\CompGasHeatPusher.cs" />
     <Compile Include="GasNet\Comps\CompGasPowerPlant.cs" />

1.2/Source/VanillaPowerExpanded/VanillaPowerExpanded/obj/Release/VanillaPowerExpanded.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-42868d6fa5da327f669e345769f8c0844330af20
+121d70e0d03393a4b0f328d5e444a784d9119092

1.2/Source/VanillaPowerExpanded/VanillaPowerExpanded/obj/Release/VanillaPowerExpanded.csproj.FileListAbsolute.txt

@@ -13,7 +13,6 @@ E:\Games\steamapps\common\RimWorld\Mods\VanillaFurnitureExpanded-Power\1.2\Sourc
 E:\Games\steamapps\common\RimWorld\Mods\VanillaFurnitureExpanded-Power\1.2\Source\VanillaPowerExpanded\VanillaPowerExpanded\obj\Release\VanillaPowerExpanded.csproj.CoreCompileInputs.cache
 E:\Games\steamapps\common\RimWorld\Mods\VanillaFurnitureExpanded-Power\1.2\Source\VanillaPowerExpanded\VanillaPowerExpanded\obj\Release\VanillaPowerExpanded.dll
 E:\Games\steamapps\common\RimWorld\Mods\VanillaFurnitureExpanded-Power\1.2\Source\VanillaPowerExpanded\VanillaPowerExpanded\obj\Release\VanillaPowerExpanded.csproj.CopyComplete
-C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\VanillaFurnitureExpanded-Power\1.2\Source\VanillaPowerExpanded\VanillaPowerExpanded\obj\Release\VanillaPowerExpanded.csproj.CopyComplete
 E:\SteamLibrary\steamapps\common\RimWorld\Mods\VanillaFurnitureExpanded-Power\1.2\Assemblies\VanillaPowerExpanded.dll
 E:\SteamLibrary\steamapps\common\RimWorld\Mods\VanillaFurnitureExpanded-Power\1.2\Source\VanillaPowerExpanded\VanillaPowerExpanded\obj\Release\VanillaPowerExpanded.csprojAssemblyReference.cache
 E:\SteamLibrary\steamapps\common\RimWorld\Mods\VanillaFurnitureExpanded-Power\1.2\Source\VanillaPowerExpanded\VanillaPowerExpanded\obj\Release\VanillaPowerExpanded.csproj.CoreCompileInputs.cache