Release 24 (#66)

* Bump actions/checkout from 4.1.4 to 4.1.7 (#59) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4.1.4...v4.1.7) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/upload-artifact from 4.3.3 to 4.3.4 (#61) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.3 to 4.3.4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v4.3.3...v4.3.4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/download-artifact from 4.1.7 to 4.1.8 (#62) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.1.7 to 4.1.8. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](actions/download-artifact@v4.1.7...v4.1.8) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-dotnet from 4.0.0 to 4.0.1 (#63) Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](actions/setup-dotnet@v4.0.0...v4.0.1) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Mod compat & disable logging (#65) * Disable missing patch logging for now. * More mod compatibility. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Epicguru · Jul 29, 2024 · 69fcaa3 · 69fcaa3
1 parent 043ab0f
commit 69fcaa3
Show file tree

Hide file tree

Showing 45 changed files with 509 additions and 12 deletions.
diff --git a/.github/workflows/BuildModCheck.yml b/.github/workflows/BuildModCheck.yml
@@ -28,10 +28,10 @@ jobs:
         rimworld-version: [1.4, 1.5]
     steps:
     - name: Checkout Repository
-      uses: actions/[email protected].4
+      uses: actions/[email protected].7
 
     - name: Setup Dotnet
-      uses: actions/[email protected].0
+      uses: actions/[email protected].1
       with:
         dotnet-version: 8.0.x
 

diff --git a/.github/workflows/GenerateCompatibilityList.yml b/.github/workflows/GenerateCompatibilityList.yml
@@ -16,10 +16,10 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/[email protected].4
+    - uses: actions/[email protected].7
 
     - name: Setup Dotnet
-      uses: actions/[email protected].0
+      uses: actions/[email protected].1
       with:
         dotnet-version: 8.0.x
 

diff --git a/.github/workflows/GenerateReleaseZip.yml b/.github/workflows/GenerateReleaseZip.yml
@@ -47,10 +47,10 @@ jobs:
         rimworld-version: [1.4, 1.5] # Add Rimworld version here!
     steps:
     - name: Checkout Repository
-      uses: actions/[email protected].4
+      uses: actions/[email protected].7
 
     - name: Setup Dotnet
-      uses: actions/[email protected].0
+      uses: actions/[email protected].1
       with:
         dotnet-version: 8.0.x
 
@@ -61,7 +61,7 @@ jobs:
     # whatever you want. It will not upload any empty directories, those with only
     # hidden files will also be excluded.
     - name: Upload Mod Artifacts (RW ${{ matrix.rimworld-version }})
-      uses: actions/[email protected].3
+      uses: actions/[email protected].4
       with:
         name: build-${{ matrix.rimworld-version }}
         retention-days: 1
@@ -87,7 +87,7 @@ jobs:
       run: mkdir -p ${{ env.MOD_PATH }}
 
     - name: Download Mod Artifacts from Build Step
-      uses: actions/[email protected].7
+      uses: actions/[email protected].8
       with:
         # Note that 'name' is not specified, this will cause all artifacts from this run to be downloaded.
         merge-multiple: true # Important, this merges the different rimworld version outputs
@@ -99,7 +99,7 @@ jobs:
         zip -r ./${{ env.MOD_NAME }}.zip ./${{ env.MOD_NAME }}/*
 
     - name: Upload Mod Zip Artifact
-      uses: actions/[email protected].3
+      uses: actions/[email protected].4
       with:
         name: ${{ env.MOD_NAME }}
         path: ${{ env.MOD_PATH }}.zip
@@ -123,7 +123,7 @@ jobs:
 
     - name: Download Mod Artifacts from Build Step
       id: download_zip
-      uses: actions/[email protected].7
+      uses: actions/[email protected].8
       with:
         name: ${{ env.MOD_NAME }}
 

diff --git a/Source/1.5/AnimationMod/Core.cs b/Source/1.5/AnimationMod/Core.cs
@@ -22,6 +22,8 @@ namespace AM;
 [HotSwapAll]
 public class Core : Mod
 {
+    public const bool ENABLE_PATCH_REQUEST_API = false;
+
     public static readonly HashSet<ThingDef> ForceConsiderTheseMeleeWeapons = new HashSet<ThingDef>();
     public static Func<Pawn, float> GetBodyDrawSizeFactor = _ => 1f;
     public static string ModTitle => ModContent?.Name;
@@ -258,7 +260,8 @@ private void LoadAllTweakData()
             Warn($"{pair.Key} '{pair.Value.name}' has {pair.Value.wc} missing weapon tweak data.");
         }
 
-        if (Settings.SendStatistics && !Settings.IsFirstTimeRunning)
+#pragma warning disable CS0162 // Unreachable code detected
+        if (Settings.SendStatistics && !Settings.IsFirstTimeRunning && ENABLE_PATCH_REQUEST_API)
         {
             var modBuildTime = GetBuildDate(Assembly.GetExecutingAssembly());
 
@@ -282,11 +285,12 @@ private void LoadAllTweakData()
                 Warn($"Reporting missing mod/weapons failed with exception:\n{t.Exception}");
             });
         }
+#pragma warning restore CS0162 // Unreachable code detected
         else
         {
             Log(Settings.IsFirstTimeRunning
                 ? "Mod is running for the first time - log sending is disabled."
-                : "Skipping reporting of missing mod/weapons because user opted out.");
+                : "Skipping reporting of missing mod/weapons because user opted out or the feature is disabled by the developer.");
         }
 
         if (!Settings.IsFirstTimeRunning)

diff --git a/WeaponTweakData/CAT_PlasmaCleaverBladelink_cat.plasmapack.json b/WeaponTweakData/CAT_PlasmaCleaverBladelink_cat.plasmapack.json
@@ -0,0 +1,19 @@
+{
+  "TextureModID": "cat.plasmapack",
+  "ItemDefName": "CAT_PlasmaCleaverBladelink",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.514182448,
+  "Rotation": 45.0,
+  "ScaleX": 1.3,
+  "ScaleY": 1.3,
+  "BladeStart": 0.340222269,
+  "BladeEnd": 1.307008,
+  "MeleeWeaponType": 6,
+  "TrailTint": {
+    "r": 0.9,
+    "g": 0.689,
+    "b": 0.11,
+    "a": 1.0
+  }
+}
diff --git a/WeaponTweakData/CAT_PlasmaCleaver_cat.plasmapack.json b/WeaponTweakData/CAT_PlasmaCleaver_cat.plasmapack.json
@@ -0,0 +1,19 @@
+{
+  "TextureModID": "cat.plasmapack",
+  "ItemDefName": "CAT_PlasmaCleaver",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.514182448,
+  "Rotation": 45.0,
+  "ScaleX": 1.3,
+  "ScaleY": 1.3,
+  "BladeStart": 0.340222269,
+  "BladeEnd": 1.307008,
+  "MeleeWeaponType": 6,
+  "TrailTint": {
+    "r": 0.9,
+    "g": 0.689,
+    "b": 0.11,
+    "a": 1.0
+  }
+}
diff --git a/WeaponTweakData/DD_Gun_DragonfireLauncher_onyxae.dragonsdescent.json b/WeaponTweakData/DD_Gun_DragonfireLauncher_onyxae.dragonsdescent.json
@@ -0,0 +1,12 @@
+{
+  "TextureModID": "onyxae.dragonsdescent",
+  "ItemDefName": "DD_Gun_DragonfireLauncher",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.230920166,
+  "OffY": 0.0554205142,
+  "Rotation": 5.0,
+  "BladeStart": 0.08467071,
+  "BladeEnd": 0.706615865,
+  "MeleeWeaponType": 8
+}
diff --git a/WeaponTweakData/DV_MeleeWeapon_SparkSabre_det.spacerarsenal.json b/WeaponTweakData/DV_MeleeWeapon_SparkSabre_det.spacerarsenal.json
@@ -0,0 +1,11 @@
+{
+  "TextureModID": "det.spacerarsenal",
+  "ItemDefName": "DV_MeleeWeapon_SparkSabre",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.298656642,
+  "OffY": -0.0307893753,
+  "BladeStart": 0.1585649,
+  "BladeEnd": 0.7774312,
+  "MeleeWeaponType": 6
+}
diff --git a/WeaponTweakData/HAR_NM_Weapon_Sword_a_ayameduki.harnearmare.json b/WeaponTweakData/HAR_NM_Weapon_Sword_a_ayameduki.harnearmare.json
@@ -0,0 +1,14 @@
+{
+  "TextureModID": "ayameduki.harnearmare",
+  "ItemDefName": "HAR_NM_Weapon_Sword_a",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.7112341,
+  "OffY": -0.0492633022,
+  "Rotation": 1.001124,
+  "ScaleX": 2.0,
+  "ScaleY": 2.0,
+  "BladeStart": 0.244775042,
+  "BladeEnd": 1.70727,
+  "MeleeWeaponType": 6
+}
diff --git a/WeaponTweakData/Kurin_MeleeWeapon_Longsword_inoshishi3.kttfde.json b/WeaponTweakData/Kurin_MeleeWeapon_Longsword_inoshishi3.kttfde.json
@@ -0,0 +1,11 @@
+{
+  "TextureModID": "inoshishi3.kttfde",
+  "ItemDefName": "Kurin_MeleeWeapon_Longsword",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.360235333,
+  "Rotation": 45.0,
+  "BladeStart": 0.09698615,
+  "BladeEnd": 0.9190624,
+  "MeleeWeaponType": 6
+}
diff --git a/WeaponTweakData/MR_C_CO_vamv.maruracemod.json b/WeaponTweakData/MR_C_CO_vamv.maruracemod.json
@@ -0,0 +1,10 @@
+{
+  "TextureModID": "vamv.maruracemod",
+  "ItemDefName": "MR_C_CO",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.16934143,
+  "OffY": 0.03386849,
+  "BladeStart": 0.08774957,
+  "MeleeWeaponType": 48
+}
diff --git a/WeaponTweakData/MR_C_CT_vamv.maruracemod.json b/WeaponTweakData/MR_C_CT_vamv.maruracemod.json
@@ -0,0 +1,11 @@
+{
+  "TextureModID": "vamv.maruracemod",
+  "ItemDefName": "MR_C_CT",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.160104826,
+  "OffY": 0.0338682234,
+  "BladeStart": 0.08467071,
+  "BladeEnd": 0.6327212,
+  "MeleeWeaponType": 48
+}
diff --git a/WeaponTweakData/MR_WH_COT_vamv.maruracemod.json b/WeaponTweakData/MR_WH_COT_vamv.maruracemod.json
@@ -0,0 +1,12 @@
+{
+  "TextureModID": "vamv.maruracemod",
+  "ItemDefName": "MR_WH_COT",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.415656358,
+  "OffY": -0.00615822524,
+  "Rotation": 43.55044,
+  "BladeStart": 0.09698615,
+  "BladeEnd": 0.7435627,
+  "MeleeWeaponType": 9
+}
diff --git a/WeaponTweakData/MR_WH_CO_vamv.maruracemod.json b/WeaponTweakData/MR_WH_CO_vamv.maruracemod.json
@@ -0,0 +1,12 @@
+{
+  "TextureModID": "vamv.maruracemod",
+  "ItemDefName": "MR_WH_CO",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.415656358,
+  "OffY": -0.00615822524,
+  "Rotation": 43.55044,
+  "BladeStart": 0.09698615,
+  "BladeEnd": 0.7435627,
+  "MeleeWeaponType": 9
+}
diff --git a/WeaponTweakData/MR_WH_CTT_vamv.maruracemod.json b/WeaponTweakData/MR_WH_CTT_vamv.maruracemod.json
@@ -0,0 +1,12 @@
+{
+  "TextureModID": "vamv.maruracemod",
+  "ItemDefName": "MR_WH_CTT",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.415656358,
+  "OffY": -0.00615822524,
+  "Rotation": 43.55044,
+  "BladeStart": 0.09698615,
+  "BladeEnd": 0.7435627,
+  "MeleeWeaponType": 9
+}
diff --git a/WeaponTweakData/MR_WH_CT_vamv.maruracemod.json b/WeaponTweakData/MR_WH_CT_vamv.maruracemod.json
@@ -0,0 +1,12 @@
+{
+  "TextureModID": "vamv.maruracemod",
+  "ItemDefName": "MR_WH_CT",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.415656358,
+  "OffY": -0.00615822524,
+  "Rotation": 43.55044,
+  "BladeStart": 0.09698615,
+  "BladeEnd": 0.7435627,
+  "MeleeWeaponType": 9
+}
diff --git a/WeaponTweakData/MeleeWeapon_BreachAxe_vanillaexpanded.vtexe.json b/WeaponTweakData/MeleeWeapon_BreachAxe_vanillaexpanded.vtexe.json
@@ -0,0 +1,13 @@
+{
+  "TextureModID": "vanillaexpanded.vtexe",
+  "ItemDefName": "MeleeWeapon_BreachAxe",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.144498765,
+  "OffY": -0.0394088663,
+  "ScaleX": 1.1,
+  "ScaleY": 1.1,
+  "BladeStart": 0.328407615,
+  "BladeEnd": 0.6765197,
+  "MeleeWeaponType": 18
+}
diff --git a/WeaponTweakData/MeleeWeapon_Spoon_inoshishi3.kttfde.json b/WeaponTweakData/MeleeWeapon_Spoon_inoshishi3.kttfde.json
@@ -0,0 +1,15 @@
+{
+  "TextureModID": "inoshishi3.kttfde",
+  "ItemDefName": "MeleeWeapon_Spoon",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.113920361,
+  "OffY": 0.01231619,
+  "Rotation": 9.493865,
+  "ScaleX": 0.35,
+  "ScaleY": 0.35,
+  "HandsMode": 1,
+  "BladeStart": 0.06619704,
+  "BladeEnd": 0.2878801,
+  "MeleeWeaponType": 8
+}
diff --git a/WeaponTweakData/Miho_Weapon_PowerHammer_miho.fortifiedoutremer.json b/WeaponTweakData/Miho_Weapon_PowerHammer_miho.fortifiedoutremer.json
@@ -0,0 +1,13 @@
+{
+  "TextureModID": "miho.fortifiedoutremer",
+  "ItemDefName": "Miho_Weapon_PowerHammer",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.3663936,
+  "OffY": -0.0184734464,
+  "ScaleX": 1.3,
+  "ScaleY": 1.3,
+  "BladeStart": 0.09390729,
+  "BladeEnd": 0.9406149,
+  "MeleeWeaponType": 5
+}
diff --git a/WeaponTweakData/Miho_Weapon_RifleRecoillessSharp_miho.fortifiedoutremer.json b/WeaponTweakData/Miho_Weapon_RifleRecoillessSharp_miho.fortifiedoutremer.json
@@ -0,0 +1,13 @@
+{
+  "TextureModID": "miho.fortifiedoutremer",
+  "ItemDefName": "Miho_Weapon_RifleRecoillessSharp",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.252472669,
+  "OffY": 0.0215525329,
+  "ScaleX": 1.25,
+  "ScaleY": 1.25,
+  "BladeStart": 0.100065015,
+  "BladeEnd": 0.845167637,
+  "MeleeWeaponType": 1
+}
diff --git a/WeaponTweakData/Milian_KnightHalberd_ancot.milirarace.json b/WeaponTweakData/Milian_KnightHalberd_ancot.milirarace.json
@@ -0,0 +1,14 @@
+{
+  "TextureModID": "ancot.milirarace",
+  "ItemDefName": "Milian_KnightHalberd",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.591156,
+  "OffY": -0.0307891183,
+  "Rotation": 46.63805,
+  "ScaleX": 1.5,
+  "ScaleY": 1.5,
+  "BladeStart": 0.5003271,
+  "BladeEnd": 1.50098133,
+  "MeleeWeaponType": 7
+}
diff --git a/WeaponTweakData/Milian_KnightHammer_ancot.milirarace.json b/WeaponTweakData/Milian_KnightHammer_ancot.milirarace.json
@@ -0,0 +1,13 @@
+{
+  "TextureModID": "ancot.milirarace",
+  "ItemDefName": "Milian_KnightHammer",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.2832623,
+  "OffY": -0.00615799427,
+  "ScaleX": 1.2,
+  "ScaleY": 1.2,
+  "BladeStart": 0.358695924,
+  "BladeEnd": 0.67890507,
+  "MeleeWeaponType": 1
+}
diff --git a/WeaponTweakData/Milian_KnightLance_ancot.milirarace.json b/WeaponTweakData/Milian_KnightLance_ancot.milirarace.json
@@ -0,0 +1,13 @@
+{
+  "TextureModID": "ancot.milirarace",
+  "ItemDefName": "Milian_KnightLance",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.628102839,
+  "Rotation": 45.0,
+  "ScaleX": 1.4,
+  "ScaleY": 1.4,
+  "BladeStart": 0.429511279,
+  "BladeEnd": 1.56871772,
+  "MeleeWeaponType": 5
+}