v1.101

AndroidQuazar · Apr 20, 2020 · fd8d93f · fd8d93f
1 parent f268ed1
commit fd8d93f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/1.1/Assemblies/VanillaPowerExpanded.dll b/1.1/Assemblies/VanillaPowerExpanded.dll
diff --git a/1.1/Source/VanillaPowerExpanded/.vs/VanillaPowerExpanded/v15/.suo b/1.1/Source/VanillaPowerExpanded/.vs/VanillaPowerExpanded/v15/.suo
diff --git a/1.1/Source/VanillaPowerExpanded/.vs/VanillaPowerExpanded/v15/Server/sqlite3/storage.ide-wal b/1.1/Source/VanillaPowerExpanded/.vs/VanillaPowerExpanded/v15/Server/sqlite3/storage.ide-wal
diff --git a/1.1/Source/VanillaPowerExpanded/VanillaPowerExpanded/PipeNet/CompPipe.cs b/1.1/Source/VanillaPowerExpanded/VanillaPowerExpanded/PipeNet/CompPipe.cs
@@ -71,19 +71,23 @@ public virtual void SetUpPowerVars()
         public override void PostExposeData()
         {
             Thing thing = null;
-            if (Scribe.mode == LoadSaveMode.Saving && this.connectParent != null)
+            if ((this.parent.def.defName != "VPE_HelixienGenerator")&& (this.parent.def.defName != "VPE_IndustrialHelixienGenerator"))
             {
-                thing = this.connectParent.parent;
-            }
-            Scribe_References.Look<Thing>(ref thing, "parentThing", false);
-            if (thing != null)
-            {
-                this.connectParent = ((ThingWithComps)thing).GetComp<CompPipe>();
-            }
-            if (Scribe.mode == LoadSaveMode.PostLoadInit && this.connectParent != null)
-            {
-                this.ConnectToTransmitter(this.connectParent, true);
+                if (Scribe.mode == LoadSaveMode.Saving && this.connectParent != null)
+                {
+                    thing = this.connectParent.parent;
+                }
+                Scribe_References.Look<Thing>(ref thing, "parentThing", false);
+                if (thing != null)
+                {
+                    this.connectParent = ((ThingWithComps)thing).GetComp<CompPipe>();
+                }
+                if (Scribe.mode == LoadSaveMode.PostLoadInit && this.connectParent != null)
+                {
+                    this.ConnectToTransmitter(this.connectParent, true);
+                }
             }
+
         }
 
         public override void PostSpawnSetup(bool respawningAfterLoad)

diff --git a/1.1/Source/VanillaPowerExpanded/VanillaPowerExpanded/PipeNet/CompPipeTrader.cs b/1.1/Source/VanillaPowerExpanded/VanillaPowerExpanded/PipeNet/CompPipeTrader.cs
@@ -159,7 +159,11 @@ public override void PostDeSpawn(Map map)
         public override void PostExposeData()
         {
             base.PostExposeData();
-            Scribe_Values.Look<bool>(ref this.powerOnInt, "powerOn", true, false);
+            if (this.parent.def.defName != "VPE_HelixienGenerator")
+            {
+                Scribe_Values.Look<bool>(ref this.powerOnInt, "powerOn", true, false);
+            }
+
         }
 
         public override void PostDraw()

diff --git a/1.1/Source/VanillaPowerExpanded/VanillaPowerExpanded/obj/Debug/VanillaPowerExpanded.dll b/1.1/Source/VanillaPowerExpanded/VanillaPowerExpanded/obj/Debug/VanillaPowerExpanded.dll