Merge pull request #82 from RimNauts/main

Fix SOS2 EVA suit compatibility
RimNauts · May 22, 2024 · 8399a95 · 8399a95
2 parents 70b34fa + 5b99464
commit 8399a95
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/Assemblies/RimNauts2.dll b/Assemblies/RimNauts2.dll
diff --git a/Defs/ThingDefs_Items/SpaceSuit.xml b/Defs/ThingDefs_Items/SpaceSuit.xml
@@ -38,7 +38,7 @@
             <MoveSpeed>-0.04</MoveSpeed>
             <ShootingAccuracyPawn>-0.1</ShootingAccuracyPawn>
             <HypoxiaResistance MayRequire="kentington.saveourship2">1</HypoxiaResistance>
-            <DecompressionResistance MayRequire="kentington.saveourship2">1</DecompressionResistance>
+            <DecompressionResistance MayRequire="kentington.saveourship2">0.25</DecompressionResistance>
             <VacuumSpeedMultiplier MayRequire="kentington.saveourship2">4</VacuumSpeedMultiplier>
         </equippedStatOffsets>
         <costList>
@@ -69,7 +69,7 @@
         </apparel>
         <comps>
             <li MayRequire="kentington.saveourship2">
-                <compClass>SaveOurShip2.Comp_EVA</compClass>
+                <compClass>SaveOurShip2.CompEVA</compClass>
             </li>
         </comps>
     </ThingDef>
@@ -114,7 +114,7 @@
             <ToxicResistance>1.0</ToxicResistance>
             <SlaveSuppressionOffset MayRequire="Ludeon.RimWorld.Ideology">-0.3</SlaveSuppressionOffset>
             <HypoxiaResistance MayRequire="kentington.saveourship2">1</HypoxiaResistance>
-            <DecompressionResistance MayRequire="kentington.saveourship2">1</DecompressionResistance>
+            <DecompressionResistance MayRequire="kentington.saveourship2">0.75</DecompressionResistance>
             <VacuumSpeedMultiplier MayRequire="kentington.saveourship2">4</VacuumSpeedMultiplier>
         </equippedStatOffsets>
         <thingCategories>
@@ -165,7 +165,7 @@
                 <displayGizmoWhileUndrafted>false</displayGizmoWhileUndrafted>
             </li>
             <li MayRequire="kentington.saveourship2">
-                <compClass>SaveOurShip2.Comp_EVA</compClass>
+                <compClass>SaveOurShip2.CompEVA</compClass>
             </li>
         </comps>
         <verbs>

diff --git a/README.md b/README.md
@@ -1 +1,3 @@
 # RimNauts2
+- Space Station building is now auto claimed by player
+- Fix SOS2 EVA suit compatibility
diff --git a/Source/RimNauts2/RimNauts2/Constants.cs b/Source/RimNauts2/RimNauts2/Constants.cs
@@ -1,7 +1,7 @@
 namespace RimNauts2 {
     public static class Info {
         public static readonly string name = "RimNauts 2";
-        public static readonly string version = "5.2.2";
+        public static readonly string version = "5.2.3";
     }
 
     public static class Style {

diff --git a/Source/RimNauts2/RimNauts2/Map/SpaceStation/Structure.cs b/Source/RimNauts2/RimNauts2/Map/SpaceStation/Structure.cs
@@ -39,7 +39,8 @@ public override void Generate(Map map, GenStepParams parms) {
             // pad
             set_floor_rect(map, 1, 3, new IntVec3(0, 0, 7));
             set_floor_rect(map, 5, 5, new IntVec3(0, 0, 11));
-            GenSpawn.Spawn(ThingDef.Named("RimNauts2_PodLauncher"), new IntVec3(0, 0, 11) + map.Center, map);
+            Thing podLauncher = GenSpawn.Spawn(ThingDef.Named("RimNauts2_PodLauncher"), new IntVec3(0, 0, 11) + map.Center, map);
+            podLauncher.SetFaction(RimWorld.Faction.OfPlayer);
             // set power cables
             set_thing(ThingMaker.MakeThing(RimWorld.ThingDefOf.PowerConduit), map, new IntVec3(16, 0, 0) + map.Center);
             set_thing(ThingMaker.MakeThing(RimWorld.ThingDefOf.PowerConduit), map, new IntVec3(15, 0, 0) + map.Center);
@@ -130,7 +131,8 @@ public void set_floor(Map map, IntVec3 pos) {
         }
 
         public void set_thing(Thing thing, Map map, IntVec3 pos) {
-            GenSpawn.Spawn(thing, pos, map, WipeMode.Vanish);
+            Thing placedThing = GenSpawn.Spawn(thing, pos, map, WipeMode.Vanish);
+            placedThing.SetFaction(RimWorld.Faction.OfPlayer);
         }
 
         public void set_roof(Map map, IntVec3 pos) {

diff --git a/Source/RimNauts2/RimNauts2/Things/TransportPod.cs b/Source/RimNauts2/RimNauts2/Things/TransportPod.cs
@@ -119,7 +119,7 @@ public void launch(Universum.World.CelestialObject targetToOrbit) {
                 }
                 Universum.World.ObjectHolder objectHolder = Universum.World.Generator.CreateObjectHolder(Props.celestialObjectDefName, tile: tile_id);
                 if (objectHolder == null) return;
-                if (Props.createMap) objectHolder.CreateMap(RimWorld.Faction.OfPlayer);
+                if (Props.createMap) objectHolder.CreateMap(RimWorld.Faction.OfPlayer, clearFog: true);
 
                 objectHolder.celestialObject.SetTarget(targetToOrbit);
             } else {