Merge pull request #84 from RimNauts/main

Minor update
RimNauts · Jun 27, 2024 · e6bf7bd · e6bf7bd
2 parents e1add7f + b120146
commit e6bf7bd
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 4 deletions.
diff --git a/.github/workflows/major-update.yml b/.github/workflows/major-update.yml
@@ -70,3 +70,17 @@ jobs:
       with:
         webhook-url: ${{ secrets.DISCORD_WEBHOOK }}
         filename: Changelog.md
+
+    - name: Clear ChangeLog.md
+      run: |
+        # remove tmp files created by workflow
+        git clean -fd
+        # update ChangeLog.md
+        echo "# Changelog" > ChangeLog.md
+        echo "" >> ChangeLog.md
+        # configure git user
+        git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git config user.name "github-actions[bot]"
+        # commit and push changes
+        git commit -am "Update ChangeLog.md"
+        git push
diff --git a/.github/workflows/minor-update.yml b/.github/workflows/minor-update.yml
@@ -70,3 +70,17 @@ jobs:
       with:
         webhook-url: ${{ secrets.DISCORD_WEBHOOK }}
         filename: Changelog.md
+
+    - name: Clear ChangeLog.md
+      run: |
+        # remove tmp files created by workflow
+        git clean -fd
+        # update ChangeLog.md
+        echo "# Changelog" > ChangeLog.md
+        echo "" >> ChangeLog.md
+        # configure git user
+        git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git config user.name "github-actions[bot]"
+        # commit and push changes
+        git commit -am "Update ChangeLog.md"
+        git push
diff --git a/.github/workflows/patch-update.yml b/.github/workflows/patch-update.yml
@@ -70,3 +70,17 @@ jobs:
       with:
         webhook-url: ${{ secrets.DISCORD_WEBHOOK }}
         filename: Changelog.md
+
+    - name: Clear ChangeLog.md
+      run: |
+        # remove tmp files created by workflow
+        git clean -fd
+        # update ChangeLog.md
+        echo "# Changelog" > ChangeLog.md
+        echo "" >> ChangeLog.md
+        # configure git user
+        git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git config user.name "github-actions[bot]"
+        # commit and push changes
+        git commit -am "Update ChangeLog.md"
+        git push
diff --git a/About/About.xml b/About/About.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
-	<name>RimNauts 2</name>
 	<packageId>sindre0830.rimnauts2</packageId>
+	<name>RimNauts 2</name>
 	<author>sindre0830</author>
+	<modVersion>5.3.0</modVersion>
 	<supportedVersions>
 		<li>1.4</li>
 		<li>1.5</li>

diff --git a/Assemblies/RimNauts2.dll b/Assemblies/RimNauts2.dll
diff --git a/Changelog.md b/Changelog.md
@@ -1 +1,2 @@
 # Changelog
+- Disable the central entry method for raids on outer space maps (Suggested by cruelmoose)
diff --git a/Source/RimNauts2/RimNauts2/Biome/Patch/IncidentWorker.cs b/Source/RimNauts2/RimNauts2/Biome/Patch/IncidentWorker.cs
@@ -34,7 +34,7 @@ class IncidentWorker_Raid_ResolveRaidArriveMode {
         public static bool Prefix(RimWorld.IncidentParms parms) {
             if (!Settings.Container.get_incident_patch) return true;
             if (!Universum.World.ObjectHolderCache.Exists(parms.target.Tile)) return true;
-            parms.raidArrivalMode = parms.raidArrivalMode = (Rand.Value < 0.6f) ? RimWorld.PawnsArrivalModeDefOf.EdgeDrop : RimWorld.PawnsArrivalModeDefOf.CenterDrop;
+            parms.raidArrivalMode = RimWorld.PawnsArrivalModeDefOf.EdgeDrop;
             return false;
         }
     }

diff --git a/Source/RimNauts2/RimNauts2/Constants.cs b/Source/RimNauts2/RimNauts2/Constants.cs
@@ -1,7 +1,6 @@
 namespace RimNauts2 {
     public static class Info {
         public static readonly string name = "RimNauts 2";
-        public static readonly string version = "5.2.4";
     }
 
     public static class Style {

diff --git a/Source/RimNauts2/RimNauts2/RimNauts2.cs b/Source/RimNauts2/RimNauts2/RimNauts2.cs
@@ -11,7 +11,7 @@ static RimNauts2() {
             Logger.print(
                 Logger.Importance.Info,
                 key: "RimNauts.Info.mod_loaded",
-                args: new NamedArgument[] { Info.name, Info.version }
+                args: new NamedArgument[] { Info.name, RimNauts2_ModContent.instance.Content.ModMetaData.ModVersion }
             );
             Defs.Loader.init();
         }