Merge pull request #8 from ScottTRichmond/master

Updated to A17
Morgloz · Jul 7, 2017 · f95ba1b · f95ba1b
2 parents 5399fcd + 693e6b8
commit f95ba1b
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 48 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -4,7 +4,7 @@
     <author>Morgloz</author>
     <url>https://ludeon.com/forums/index.php?topic=21770.0</url>
 
-    <targetVersion>0.16.1393</targetVersion>
+    <targetVersion>0.17.1557</targetVersion>
 
     <description>
 This mods adds small/medium/industrial versions of the vanilla temperature buildings.
@@ -15,5 +15,6 @@ Credits
     -justarandomgeek, the author of "Signals, you can't stop them!"
     -mrofa, who helped me in the pipe's graphic code
     -Latta, the previous owner of the mod
+    -richmost, who updated it for a17
     </description>
 </ModMetaData>
diff --git a/RedistHeat/Building/Building_AirNets/Building_DuctComp.cs b/RedistHeat/Building/Building_AirNets/Building_DuctComp.cs
@@ -49,9 +49,9 @@ protected bool WorkingState
 
         public override string LabelNoCount => base.LabelNoCount + " (" + compAir.currentLayer.ToString().ToLower() + ")";
 
-        public override void SpawnSetup(Map map)
+        public override void SpawnSetup(Map map, bool respawningAfterLoad)
         {
-            base.SpawnSetup(map);
+            base.SpawnSetup(map, respawningAfterLoad);
             compAir = GetComp< CompAirTrader >();
 
             Common.WipeExistingPipe( Position );
@@ -60,7 +60,7 @@ public override void SpawnSetup(Map map)
         public override void ExposeData()
         {
             base.ExposeData();
-            Scribe_Values.LookValue( ref isLocked, "isLocked", false );
+            Scribe_Values.Look( ref isLocked, "isLocked", false );
         }
 
         public override void Tick()
@@ -195,13 +195,13 @@ protected virtual void Equalize()
                     }
                     if (force >= room.CellCount)
                     {
-                        room.Temperature = avgTemp;
+                        room.Group.Temperature = avgTemp;
                     }
                     else
                     {
                         float diff = room.CellCount - force;
                         float result = ((diff * room.Temperature) + (avgTemp * force)) / room.CellCount;
-                        room.Temperature = result;
+                        room.Group.Temperature = result;
                     }
 #if DEBUG
                     Log.Message("RedistHeat: Intake room result temp: " + result);
@@ -223,7 +223,7 @@ protected virtual void Equalize()
                 }
                 if (force >= count)
                 {
-                    room.Temperature = temp;
+                    room.Group.Temperature = temp;
                 }
                 else
                 {
@@ -235,7 +235,7 @@ protected virtual void Equalize()
 #if DEBUG
                     Log.Message("RedistHeat: Outlet result temp: " + result + " with diff: " + diff + " force: " + force + " temp: " + temp + " count: " + count);
 #endif
-                    room.Temperature = result;
+                    room.Group.Temperature = result;
                 }
             }
             /*float pointTemp;
@@ -318,31 +318,31 @@ private void FindAdjacentRooms()
                         var door = Find.VisibleMap.thingGrid.ThingsAt(new IntVec3(c.x,c.y,c.z+1)).ToList().Find(s => s.def.defName == "Door" );
                         if(door != null)
                         {
-                            adjacentRooms.Add(RoomQuery.RoomAt(new IntVec3(c.x, c.y, c.z + 2), Map));
+                            adjacentRooms.Add(RegionAndRoomQuery.RoomAt(new IntVec3(c.x, c.y, c.z + 2), Map));
                         }
                     }
                     if(c.x < x - 1 && !fieldGrid[c.x + 1, c.z])
                     {
                         var door = Find.VisibleMap.thingGrid.ThingsAt(new IntVec3(c.x + 1, c.y, c.z)).ToList().Find(s => s.def.defName == "Door");
                         if (door != null)
                         {
-                            adjacentRooms.Add(RoomQuery.RoomAt(new IntVec3(c.x + 2, c.y, c.z), Map));
+                            adjacentRooms.Add(RegionAndRoomQuery.RoomAt(new IntVec3(c.x + 2, c.y, c.z), Map));
                         }
                     }
                     if (c.z > 0 && !fieldGrid[c.x, c.z - 1])
                     {
                         var door = Find.VisibleMap.thingGrid.ThingsAt(new IntVec3(c.x, c.y, c.z - 1)).ToList().Find(s => s.def.defName == "Door");
                         if (door != null)
                         {
-                            adjacentRooms.Add(RoomQuery.RoomAt(new IntVec3(c.x, c.y, c.z - 2), Map));
+                            adjacentRooms.Add(RegionAndRoomQuery.RoomAt(new IntVec3(c.x, c.y, c.z - 2), Map));
                         }
                     }
                     if (c.z > 0 && !fieldGrid[c.x - 1, c.z])
                     {
                         var door = Find.VisibleMap.thingGrid.ThingsAt(new IntVec3(c.x - 1, c.y, c.z)).ToList().Find(s => s.def.defName == "Door");
                         if (door != null)
                         {
-                            adjacentRooms.Add(RoomQuery.RoomAt(new IntVec3(c.x - 2, c.y, c.z), Map));
+                            adjacentRooms.Add(RegionAndRoomQuery.RoomAt(new IntVec3(c.x - 2, c.y, c.z), Map));
                         }
                     }
                 }

diff --git a/RedistHeat/Building/Building_AirNets/Building_DuctPipe.cs b/RedistHeat/Building/Building_AirNets/Building_DuctPipe.cs
@@ -25,9 +25,9 @@ public override Graphic Graphic
             }
         }
 
-        public override void SpawnSetup(Map map)
+        public override void SpawnSetup(Map map, bool respawningAfterLoad)
         {
-            base.SpawnSetup(map);
+            base.SpawnSetup(map, respawningAfterLoad);
             GetGraphic();
         }
 

diff --git a/RedistHeat/Building/Building_AirNets/Building_DuctSwitchable.cs b/RedistHeat/Building/Building_AirNets/Building_DuctSwitchable.cs
@@ -39,9 +39,9 @@ protected bool WorkingState
             }
         }
 
-        public override void SpawnSetup(Map map)
+        public override void SpawnSetup(Map map, bool respawningAfterLoad)
         {
-            base.SpawnSetup(map);
+            base.SpawnSetup(map, respawningAfterLoad);
             compAir = GetComp<CompAirTrader>();
 
             Common.WipeExistingPipe(Position);
@@ -89,7 +89,7 @@ protected virtual bool Validate()
         public override void ExposeData()
         {
             base.ExposeData();
-            Scribe_Values.LookValue(ref Net, "net", true);
+            Scribe_Values.Look(ref Net, "net", true);
         }
     }
 }
diff --git a/RedistHeat/Building/Building_AirNets/Building_MultipurposeCooler.cs b/RedistHeat/Building/Building_AirNets/Building_MultipurposeCooler.cs
@@ -15,9 +15,9 @@ public Building_MultipurposeCooler()
             Net = true;
         }
 
-        public override void SpawnSetup(Map map)
+        public override void SpawnSetup(Map map, bool respawningAfterLoad)
         {
-            base.SpawnSetup(map);
+            base.SpawnSetup(map, respawningAfterLoad);
             //pipe = (Building_DuctPipe) GenSpawn.Spawn(ThingDef.Named("RedistHeat_DuctPipeLower"), Position, map);
         }
 
@@ -104,7 +104,7 @@ protected void Equalize()
                     return;
                 }
 
-                room.Temperature += coldAir;
+                room.Group.Temperature += coldAir;
 
 
             }

diff --git a/RedistHeat/Building/Building_TempControl/Building_Cooler.cs b/RedistHeat/Building/Building_TempControl/Building_Cooler.cs
@@ -47,7 +47,7 @@ public override void Tick()
                 flag = !Mathf.Approximately( num4, 0f );
                 if (flag)
                 {
-                    intVec.GetRoom(this.Map).Temperature += num4;
+                    intVec.GetRoom(this.Map).Group.Temperature += num4;
                     GenTemperature.PushHeat( intVec2, this.Map, - num3*1.25f );
                 }
             }

diff --git a/RedistHeat/Building/Building_TempControl/Building_ExhaustPort.cs b/RedistHeat/Building/Building_TempControl/Building_ExhaustPort.cs
@@ -13,9 +13,9 @@ public class Building_ExhaustPort : Building_DuctSwitchable
 
         private Building_IndustrialCooler neighCooler;
 
-        public override void SpawnSetup(Map map)
+        public override void SpawnSetup(Map map, bool respawningAfterLoad)
         {
-            base.SpawnSetup(map);
+            base.SpawnSetup(map, respawningAfterLoad);
             VecNorth = Position + IntVec3.North.RotatedBy( Rotation );
             VecSouth = Position + IntVec3.South.RotatedBy( Rotation );
         }

diff --git a/RedistHeat/Building/Building_TempControl/Building_Heater.cs b/RedistHeat/Building/Building_TempControl/Building_Heater.cs
@@ -44,7 +44,7 @@ public override void Tick()
             var flag = !Mathf.Approximately( num2, 0f );
             if (flag)
             {
-                Position.GetRoom(this.Map).Temperature += num2;
+                Position.GetRoom(this.Map).Group.Temperature += num2;
                 compPowerTrader.PowerOutput = -compPowerTrader.Props.basePowerConsumption;
             }
             else

diff --git a/RedistHeat/Building/Building_TempControl/Building_IndustrialCooler.cs b/RedistHeat/Building/Building_TempControl/Building_IndustrialCooler.cs
@@ -15,9 +15,9 @@ public class Building_IndustrialCooler : Building_DuctSwitchable
 
         private float Energy => compTempControl.Props.energyPerSecond;
 
-        public override void SpawnSetup(Map map)
+        public override void SpawnSetup(Map map, bool respawningAfterLoad)
         {
-            base.SpawnSetup(map);
+            base.SpawnSetup(map, respawningAfterLoad);
             vecSouth = Position + IntVec3.South.RotatedBy( Rotation );
             vecSouthEast = vecSouth + IntVec3.East.RotatedBy( Rotation );
         }
@@ -103,7 +103,7 @@ private void ControlTemperature()
             }
             else
             {
-                roomSouth.Temperature += coldAir;
+                roomSouth.Group.Temperature += coldAir;
             }
 
             var hotAir = (float) (-energyLimit*1.25/activeExhausts.Count);

diff --git a/RedistHeat/Building/Building_TempControl/Building_IndustrialHeater.cs b/RedistHeat/Building/Building_TempControl/Building_IndustrialHeater.cs
@@ -86,7 +86,7 @@ private void ControlTemperature()
             }
             else
             {
-                room.Temperature += hotAir;
+                room.Group.Temperature += hotAir;
             }
 
         }

diff --git a/RedistHeat/Building/Building_TempControl/Building_MediumHeater.cs b/RedistHeat/Building/Building_TempControl/Building_MediumHeater.cs
@@ -39,9 +39,9 @@ private bool WorkingState
             }
         }
 
-        public override void SpawnSetup(Map map)
+        public override void SpawnSetup(Map map, bool respawningAfterLoad)
         {
-            base.SpawnSetup(map);
+            base.SpawnSetup(map, respawningAfterLoad);
             vecNorth = Position + IntVec3.North.RotatedBy( Rotation );
 
             glower = GenSpawn.Spawn( ThingDef.Named( "RedistHeat_HeaterGlower" ), vecNorth, map);
@@ -120,7 +120,7 @@ private void ControlTemperature()
             var hotIsHot = !Mathf.Approximately( hotAir, 0f );
             if (hotIsHot)
             {
-                roomNorth.Temperature += hotAir;
+                roomNorth.Group.Temperature += hotAir;
                 WorkingState = true;
             }
             else

diff --git a/RedistHeat/Building/Building_Vents/Building_Vent.cs b/RedistHeat/Building/Building_Vents/Building_Vent.cs
@@ -42,12 +42,12 @@ private bool WorkingState
         public override void ExposeData()
         {
             base.ExposeData();
-            Scribe_Values.LookValue( ref isLocked, "isLocked", false );
+            Scribe_Values.Look( ref isLocked, "isLocked", false );
         }
 
-        public override void SpawnSetup(Map map)
+        public override void SpawnSetup(Map map, bool respawningAfterLoad)
         {
-            base.SpawnSetup(map);
+            base.SpawnSetup(map, respawningAfterLoad);
             vecNorth = Position + IntVec3.North.RotatedBy( Rotation );
             vecSouth = Position + IntVec3.South.RotatedBy( Rotation );
         }
@@ -113,11 +113,11 @@ protected virtual void Equalize( Room room, float targetTemp, float rate )
             var tempRated = tempDiff*rate;
             if (targetTemp < room.Temperature)
             {
-                room.Temperature = Mathf.Max( targetTemp, room.Temperature - tempRated );
+                room.Group.Temperature = Mathf.Max( targetTemp, room.Temperature - tempRated );
             }
             else if (targetTemp > room.Temperature)
             {
-                room.Temperature = Mathf.Min( targetTemp, room.Temperature + tempRated );
+                room.Group.Temperature = Mathf.Min( targetTemp, room.Temperature + tempRated );
             }
         }
 

diff --git a/RedistHeat/ThingComps/CompAir.cs b/RedistHeat/ThingComps/CompAir.cs
@@ -17,9 +17,9 @@ public virtual bool IsLayerOf( NetLayer ly )
             return currentLayer == ly;
         }
 
-        public override void PostSpawnSetup()
+        public override void PostSpawnSetup(bool respawningAfterLoad)
         {
-            base.PostSpawnSetup();
+            base.PostSpawnSetup(respawningAfterLoad);
             //ResourceBank.UILower = ContentFinder<Texture2D>.Get("UI/Commands/Lower", true);
             //ResourceBank.UIUpper = ContentFinder<Texture2D>.Get("UI/Commands/Upper", true);
             AirNetManager.NotifyCompSpawn( this );
@@ -34,7 +34,7 @@ public override void PostDestroy( DestroyMode mode, Map previousMap)
         public override void PostExposeData()
         {
             base.PostExposeData();
-            Scribe_Values.LookValue( ref currentLayer, "currentLayer", NetLayer.Lower );
+            Scribe_Values.Look( ref currentLayer, "currentLayer", NetLayer.Lower );
         }
 
         public void CompPrintForAirGrid( SectionLayer layer )

diff --git a/RedistHeat/ThingComps/CompAirTrader.cs b/RedistHeat/ThingComps/CompAirTrader.cs
@@ -15,9 +15,9 @@ public CompAirTraderProperties Props
             }
         }
 
-        public override void PostSpawnSetup()
+        public override void PostSpawnSetup(bool respawningAfterLoad)
         {
-            base.PostSpawnSetup();
+            base.PostSpawnSetup(respawningAfterLoad);
             if (netTemp == 0f)
             {
                 netTemp = this.parent.Map.mapTemperature.OutdoorTemp;
@@ -36,11 +36,11 @@ public void EqualizeWithRoom( Room room, float targetTemp, float rate )
 
             if (targetTemp < room.Temperature)
             {
-                room.Temperature = Mathf.Max(targetTemp, room.Temperature - tempRated );
+                room.Group.Temperature = Mathf.Max(targetTemp, room.Temperature - tempRated );
             }
             else if (targetTemp > room.Temperature)
             {
-                room.Temperature = Mathf.Min(targetTemp, room.Temperature + tempRated );
+                room.Group.Temperature = Mathf.Min(targetTemp, room.Temperature + tempRated );
             }
         }
 
@@ -73,7 +73,7 @@ public override void PostExposeData()
         {
             base.PostExposeData();
 
-            Scribe_Values.LookValue( ref netTemp, "netTemp", 999 );
+            Scribe_Values.Look( ref netTemp, "netTemp", 999 );
         }
     }
 }
diff --git a/RedistHeat/ThingComps/CompAirTransmitter.cs b/RedistHeat/ThingComps/CompAirTransmitter.cs
@@ -5,7 +5,7 @@ namespace RedistHeat
 {
     public class CompAirTransmitter : CompAir
     {
-        public override void PostSpawnSetup()
+        public override void PostSpawnSetup(bool respawningAfterLoad)
         {
             var compAirProps = props as CompAirTransmitterProperties;
             if (compAirProps == null)
@@ -18,7 +18,7 @@ public override void PostSpawnSetup()
                 currentLayer = compAirProps.layer;
             }
 
-            base.PostSpawnSetup();
+            base.PostSpawnSetup(respawningAfterLoad);
         }
 
         public override IEnumerable<Gizmo> CompGetGizmosExtra()

diff --git a/RedistHeat/ThingComps/CompMyGlower.cs b/RedistHeat/ThingComps/CompMyGlower.cs
@@ -26,14 +26,14 @@ public void UpdateLit(bool lit)
             }
         }
 
-        public override void PostSpawnSetup()
+        public override void PostSpawnSetup(bool respawningAfterLoad)
         {
             this.UpdateLit(false);
         }
 
         public override void PostExposeData()
         {
-            Scribe_Values.LookValue<bool>(ref this.glowOnInt, "glowOn", false, false);
+            Scribe_Values.Look<bool>(ref this.glowOnInt, "glowOn", false, false);
         }
 
         public override void PostDeSpawn(Map map)