diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll index 33071fb..56971e3 100644 Binary files a/1.6/1.6/Assemblies/ArachnaeSwarm.dll and b/1.6/1.6/Assemblies/ArachnaeSwarm.dll differ diff --git a/1.6/1.6/Defs/Thing_building/ARA_BioforgeIncubator.xml b/1.6/1.6/Defs/Thing_building/ARA_BioforgeIncubator.xml index 8ccb10d..c0985aa 100644 --- a/1.6/1.6/Defs/Thing_building/ARA_BioforgeIncubator.xml +++ b/1.6/1.6/Defs/Thing_building/ARA_BioforgeIncubator.xml @@ -9,6 +9,10 @@ Things/Building/Misc/ToolCabinet Graphic_Multi + + (0.7, 0.4, 0.7) + (0,0,-0.1) + (1,1) @@ -32,6 +36,10 @@ Graphic_Single CutoutComplex (5,6) + + (4.0, 0.5, 4.0) + (0,0,-0.1) + (5,5) Normal @@ -149,12 +157,16 @@ 一个大型的、需要消耗大量营养物质的孵化设施，可以同时孵化多个单位，并能通过链接外部设备来提高效率。 - Things/Building/AncientHeatVent + ArachnaeSwarm/Building/ARA_BioforgeIncubatorPawn Graphic_Single CutoutComplex - (7,7) + (8,8) + + (6.0, 0.6, 4.0) + (0,0,-0.1) + - (7,7) + (7,5) Normal 0 @@ -243,9 +255,14 @@ 一个活体虫族器官，通过分别消化植物和肉类物质，来缓慢培育出营养丰富的阿拉克涅虫蜜。需要同时填充素食和肉类才能工作。 Building - Things/Building/Natural/Hive - Graphic_Random - 2 + ArachnaeSwarm/Building/ARA_JellyVat + Graphic_Single + CutoutComplex + (2.2,2.2) + + (1.6, 0.5, 1.6) + (0,0,-0.1) + (2,2) Normal @@ -298,7 +315,7 @@
  • veg_vat - 植物原料 + 素食
  • PlantFoodRaw
    • @@ -312,7 +329,7 @@
  • meat_vat - 动物蛋白 + 肉食
  • MeatRaw
    • diff --git a/1.6/1.6/Defs/Thing_building/ARA_Building.xml b/1.6/1.6/Defs/Thing_building/ARA_Building.xml index c7d6ad0..e8902df 100644 --- a/1.6/1.6/Defs/Thing_building/ARA_Building.xml +++ b/1.6/1.6/Defs/Thing_building/ARA_Building.xml @@ -58,10 +58,15 @@ ArachnaeSwarm/Building/Linked/ARA_InsectWall Graphic_Single CutoutComplex + + (0.7, 0.4, 0.2) + (0,0,-0.1) + ARA_Buildings true + 0 0 -6 @@ -119,6 +124,10 @@ ArachnaeSwarm/Building/Door/ARA_InsectDoor Graphic_Multi + + (0.7, 0.6, 0.7) + (0,0,-0.1) + @@ -151,7 +160,7 @@ ARA_Buildings true - 1.0 + 0 true RealtimeOnly EatVegetarian @@ -342,6 +351,10 @@ Graphic_Multi CutoutComplex (3,4.5) + + (2.5, 0.5, 2.5) + (0,0,-0.1) + false 0 @@ -388,6 +401,10 @@ Graphic_Multi CutoutComplex (2,2) + + (0.8, 0.4, 1.7) + (0,0,-0.1) + False diff --git a/1.6/1.6/Defs/Thing_building/ARA_InteractiveProducer.xml b/1.6/1.6/Defs/Thing_building/ARA_InteractiveProducer.xml index 840b605..cec828e 100644 --- a/1.6/1.6/Defs/Thing_building/ARA_InteractiveProducer.xml +++ b/1.6/1.6/Defs/Thing_building/ARA_InteractiveProducer.xml @@ -6,6 +6,10 @@ ArachnaeSwarm/Building/ARA_Cocoon Graphic_Single (1.1,1.1) + + (0.7, 0.4, 0.7) + (0,0,-0.1) + (1,1) Building diff --git a/1.6/1.6/Defs/Thing_building/Building_SmartThermostat.xml b/1.6/1.6/Defs/Thing_building/Building_SmartThermostat.xml index b838d25..71a92fa 100644 --- a/1.6/1.6/Defs/Thing_building/Building_SmartThermostat.xml +++ b/1.6/1.6/Defs/Thing_building/Building_SmartThermostat.xml @@ -9,6 +9,10 @@ Things/Building/Misc/TempControl/Cooler Graphic_Multi + + (0.6, 0.4, 0.3) + (0,0,-0.1) + Building Impassable @@ -19,7 +23,7 @@ true true false - 1.0 + 0 400 100 @@ -52,7 +56,7 @@ -
  • +
  • 34
    • diff --git a/Content/Textures/ArachnaeSwarm/Building/ARA_BioforgeIncubatorPawn.png b/Content/Textures/ArachnaeSwarm/Building/ARA_BioforgeIncubatorPawn.png new file mode 100644 index 0000000..7244342 Binary files /dev/null and b/Content/Textures/ArachnaeSwarm/Building/ARA_BioforgeIncubatorPawn.png differ diff --git a/Content/Textures/ArachnaeSwarm/Building/ARA_JellyVat.png b/Content/Textures/ArachnaeSwarm/Building/ARA_JellyVat.png new file mode 100644 index 0000000..9c4c71d Binary files /dev/null and b/Content/Textures/ArachnaeSwarm/Building/ARA_JellyVat.png differ diff --git a/Source/ArachnaeSwarm/ArachnaeSwarm.csproj b/Source/ArachnaeSwarm/ArachnaeSwarm.csproj index 04de4a0..e340c96 100644 --- a/Source/ArachnaeSwarm/ArachnaeSwarm.csproj +++ b/Source/ArachnaeSwarm/ArachnaeSwarm.csproj @@ -223,6 +223,9 @@ + + + diff --git a/Source/ArachnaeSwarm/Utils/CompTempControl_Fixed.cs b/Source/ArachnaeSwarm/Utils/CompTempControl_Fixed.cs new file mode 100644 index 0000000..97d9f80 --- /dev/null +++ b/Source/ArachnaeSwarm/Utils/CompTempControl_Fixed.cs @@ -0,0 +1,33 @@ +using RimWorld; +using Verse; + +namespace ArachnaeSwarm +{ + // First, we need a new properties class that points to our new component class + public class CompProperties_TempControl_Fixed : CompProperties_TempControl + { + public CompProperties_TempControl_Fixed() + { + compClass = typeof(CompTempControl_Fixed); + } + } + + // This is our new component class that inherits from the original + public class CompTempControl_Fixed : CompTempControl + { + // We override the problematic method + public override string CompInspectStringExtra() + { + // Call the original method to get its string + string baseString = base.CompInspectStringExtra(); + + // If the string is not null, trim any whitespace from the end and return it + if (!string.IsNullOrEmpty(baseString)) + { + return baseString.TrimEnd(); + } + + return baseString; + } + } +} \ No newline at end of file