From 69fcaa3861c38a5d71702382e82c4a77ed4931c9 Mon Sep 17 00:00:00 2001 From: James B Date: Mon, 29 Jul 2024 15:36:13 +0200 Subject: [PATCH] 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](https://github.com/actions/checkout/compare/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] 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](https://github.com/actions/upload-artifact/compare/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] 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](https://github.com/actions/download-artifact/compare/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] 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](https://github.com/actions/setup-dotnet/compare/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] 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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/BuildModCheck.yml | 4 ++-- .../workflows/GenerateCompatibilityList.yml | 4 ++-- .github/workflows/GenerateReleaseZip.yml | 12 ++++++------ Source/1.5/AnimationMod/Core.cs | 8 ++++++-- ...PlasmaCleaverBladelink_cat.plasmapack.json | 19 +++++++++++++++++++ .../CAT_PlasmaCleaver_cat.plasmapack.json | 19 +++++++++++++++++++ ...gonfireLauncher_onyxae.dragonsdescent.json | 12 ++++++++++++ ...eeWeapon_SparkSabre_det.spacerarsenal.json | 11 +++++++++++ ..._Weapon_Sword_a_ayameduki.harnearmare.json | 14 ++++++++++++++ ...leeWeapon_Longsword_inoshishi3.kttfde.json | 11 +++++++++++ WeaponTweakData/MR_C_CO_vamv.maruracemod.json | 10 ++++++++++ WeaponTweakData/MR_C_CT_vamv.maruracemod.json | 11 +++++++++++ .../MR_WH_COT_vamv.maruracemod.json | 12 ++++++++++++ .../MR_WH_CO_vamv.maruracemod.json | 12 ++++++++++++ .../MR_WH_CTT_vamv.maruracemod.json | 12 ++++++++++++ .../MR_WH_CT_vamv.maruracemod.json | 12 ++++++++++++ ...eapon_BreachAxe_vanillaexpanded.vtexe.json | 13 +++++++++++++ .../MeleeWeapon_Spoon_inoshishi3.kttfde.json | 15 +++++++++++++++ ...on_PowerHammer_miho.fortifiedoutremer.json | 13 +++++++++++++ ...ecoillessSharp_miho.fortifiedoutremer.json | 13 +++++++++++++ ...Milian_KnightHalberd_ancot.milirarace.json | 14 ++++++++++++++ .../Milian_KnightHammer_ancot.milirarace.json | 13 +++++++++++++ .../Milian_KnightLance_ancot.milirarace.json | 13 +++++++++++++ .../Milian_KnightSword_ancot.milirarace.json | 13 +++++++++++++ .../Milian_RookBladeII_ancot.milirarace.json | 14 ++++++++++++++ .../Milian_RookBlade_ancot.milirarace.json | 13 +++++++++++++ .../Milira_Hammer_ancot.milirarace.json | 14 ++++++++++++++ .../Milira_Lance_ancot.milirarace.json | 13 +++++++++++++ .../Milira_Sickle_ancot.milirarace.json | 14 ++++++++++++++ .../Milira_Spear_ancot.milirarace.json | 13 +++++++++++++ .../Milira_TwoHandSword_ancot.milirarace.json | 13 +++++++++++++ ...tsutman.minchothemintchocoslimeharver.json | 13 +++++++++++++ ...k_AA_oark.ratkinfaction.oberoniaaurea.json | 18 ++++++++++++++++++ ...k_AB_oark.ratkinfaction.oberoniaaurea.json | 12 ++++++++++++ ...ck_D_oark.ratkinfaction.oberoniaaurea.json | 13 +++++++++++++ ...ck_E_oark.ratkinfaction.oberoniaaurea.json | 13 +++++++++++++ ...ck_F_oark.ratkinfaction.oberoniaaurea.json | 13 +++++++++++++ ...ck_G_oark.ratkinfaction.oberoniaaurea.json | 13 +++++++++++++ WeaponTweakData/VV_Mead_gguake.race.vivi.json | 14 ++++++++++++++ .../VV_RitualLance_gguake.race.vivi.json | 13 +++++++++++++ .../VV_ViviSpear_gguake.race.vivi.json | 11 +++++++++++ WeaponTweakData/ancot.milirarace.txt | 1 + WeaponTweakData/ayameduki.harnearmare.txt | 1 + WeaponTweakData/det.spacerarsenal.txt | 1 + WeaponTweakData/gguake.race.vivi.txt | 1 + 45 files changed, 509 insertions(+), 12 deletions(-) create mode 100644 WeaponTweakData/CAT_PlasmaCleaverBladelink_cat.plasmapack.json create mode 100644 WeaponTweakData/CAT_PlasmaCleaver_cat.plasmapack.json create mode 100644 WeaponTweakData/DD_Gun_DragonfireLauncher_onyxae.dragonsdescent.json create mode 100644 WeaponTweakData/DV_MeleeWeapon_SparkSabre_det.spacerarsenal.json create mode 100644 WeaponTweakData/HAR_NM_Weapon_Sword_a_ayameduki.harnearmare.json create mode 100644 WeaponTweakData/Kurin_MeleeWeapon_Longsword_inoshishi3.kttfde.json create mode 100644 WeaponTweakData/MR_C_CO_vamv.maruracemod.json create mode 100644 WeaponTweakData/MR_C_CT_vamv.maruracemod.json create mode 100644 WeaponTweakData/MR_WH_COT_vamv.maruracemod.json create mode 100644 WeaponTweakData/MR_WH_CO_vamv.maruracemod.json create mode 100644 WeaponTweakData/MR_WH_CTT_vamv.maruracemod.json create mode 100644 WeaponTweakData/MR_WH_CT_vamv.maruracemod.json create mode 100644 WeaponTweakData/MeleeWeapon_BreachAxe_vanillaexpanded.vtexe.json create mode 100644 WeaponTweakData/MeleeWeapon_Spoon_inoshishi3.kttfde.json create mode 100644 WeaponTweakData/Miho_Weapon_PowerHammer_miho.fortifiedoutremer.json create mode 100644 WeaponTweakData/Miho_Weapon_RifleRecoillessSharp_miho.fortifiedoutremer.json create mode 100644 WeaponTweakData/Milian_KnightHalberd_ancot.milirarace.json create mode 100644 WeaponTweakData/Milian_KnightHammer_ancot.milirarace.json create mode 100644 WeaponTweakData/Milian_KnightLance_ancot.milirarace.json create mode 100644 WeaponTweakData/Milian_KnightSword_ancot.milirarace.json create mode 100644 WeaponTweakData/Milian_RookBladeII_ancot.milirarace.json create mode 100644 WeaponTweakData/Milian_RookBlade_ancot.milirarace.json create mode 100644 WeaponTweakData/Milira_Hammer_ancot.milirarace.json create mode 100644 WeaponTweakData/Milira_Lance_ancot.milirarace.json create mode 100644 WeaponTweakData/Milira_Sickle_ancot.milirarace.json create mode 100644 WeaponTweakData/Milira_Spear_ancot.milirarace.json create mode 100644 WeaponTweakData/Milira_TwoHandSword_ancot.milirarace.json create mode 100644 WeaponTweakData/Mincho_PlateMintchocoBlade_sutsutman.minchothemintchocoslimeharver.json create mode 100644 WeaponTweakData/OA_RK_Mountain_Stick_AA_oark.ratkinfaction.oberoniaaurea.json create mode 100644 WeaponTweakData/OA_RK_Mountain_Stick_AB_oark.ratkinfaction.oberoniaaurea.json create mode 100644 WeaponTweakData/OA_RK_Mountain_Stick_D_oark.ratkinfaction.oberoniaaurea.json create mode 100644 WeaponTweakData/OA_RK_Mountain_Stick_E_oark.ratkinfaction.oberoniaaurea.json create mode 100644 WeaponTweakData/OA_RK_Mountain_Stick_F_oark.ratkinfaction.oberoniaaurea.json create mode 100644 WeaponTweakData/OA_RK_Mountain_Stick_G_oark.ratkinfaction.oberoniaaurea.json create mode 100644 WeaponTweakData/VV_Mead_gguake.race.vivi.json create mode 100644 WeaponTweakData/VV_RitualLance_gguake.race.vivi.json create mode 100644 WeaponTweakData/VV_ViviSpear_gguake.race.vivi.json create mode 100644 WeaponTweakData/ancot.milirarace.txt create mode 100644 WeaponTweakData/ayameduki.harnearmare.txt create mode 100644 WeaponTweakData/det.spacerarsenal.txt create mode 100644 WeaponTweakData/gguake.race.vivi.txt diff --git a/.github/workflows/BuildModCheck.yml b/.github/workflows/BuildModCheck.yml index 6f4eb93..030ab11 100644 --- 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/checkout@v4.1.4 + uses: actions/checkout@v4.1.7 - name: Setup Dotnet - uses: actions/setup-dotnet@v4.0.0 + uses: actions/setup-dotnet@v4.0.1 with: dotnet-version: 8.0.x diff --git a/.github/workflows/GenerateCompatibilityList.yml b/.github/workflows/GenerateCompatibilityList.yml index 0b3da7b..65deaa3 100644 --- a/.github/workflows/GenerateCompatibilityList.yml +++ b/.github/workflows/GenerateCompatibilityList.yml @@ -16,10 +16,10 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v4.1.4 + - uses: actions/checkout@v4.1.7 - name: Setup Dotnet - uses: actions/setup-dotnet@v4.0.0 + uses: actions/setup-dotnet@v4.0.1 with: dotnet-version: 8.0.x diff --git a/.github/workflows/GenerateReleaseZip.yml b/.github/workflows/GenerateReleaseZip.yml index 86843b0..f9eb672 100644 --- 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/checkout@v4.1.4 + uses: actions/checkout@v4.1.7 - name: Setup Dotnet - uses: actions/setup-dotnet@v4.0.0 + uses: actions/setup-dotnet@v4.0.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/upload-artifact@v4.3.3 + uses: actions/upload-artifact@v4.3.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/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.1.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/upload-artifact@v4.3.3 + uses: actions/upload-artifact@v4.3.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/download-artifact@v4.1.7 + uses: actions/download-artifact@v4.1.8 with: name: ${{ env.MOD_NAME }} diff --git a/Source/1.5/AnimationMod/Core.cs b/Source/1.5/AnimationMod/Core.cs index 490b925..5f9a336 100644 --- 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 ForceConsiderTheseMeleeWeapons = new HashSet(); public static Func 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 new file mode 100644 index 0000000..e9ea0ee --- /dev/null +++ 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 + } +} \ No newline at end of file diff --git a/WeaponTweakData/CAT_PlasmaCleaver_cat.plasmapack.json b/WeaponTweakData/CAT_PlasmaCleaver_cat.plasmapack.json new file mode 100644 index 0000000..5d51e4f --- /dev/null +++ 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 + } +} \ No newline at end of file diff --git a/WeaponTweakData/DD_Gun_DragonfireLauncher_onyxae.dragonsdescent.json b/WeaponTweakData/DD_Gun_DragonfireLauncher_onyxae.dragonsdescent.json new file mode 100644 index 0000000..cfde499 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/DV_MeleeWeapon_SparkSabre_det.spacerarsenal.json b/WeaponTweakData/DV_MeleeWeapon_SparkSabre_det.spacerarsenal.json new file mode 100644 index 0000000..de4031b --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/HAR_NM_Weapon_Sword_a_ayameduki.harnearmare.json b/WeaponTweakData/HAR_NM_Weapon_Sword_a_ayameduki.harnearmare.json new file mode 100644 index 0000000..fd82ed4 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/Kurin_MeleeWeapon_Longsword_inoshishi3.kttfde.json b/WeaponTweakData/Kurin_MeleeWeapon_Longsword_inoshishi3.kttfde.json new file mode 100644 index 0000000..9185faa --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/MR_C_CO_vamv.maruracemod.json b/WeaponTweakData/MR_C_CO_vamv.maruracemod.json new file mode 100644 index 0000000..6b64333 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/MR_C_CT_vamv.maruracemod.json b/WeaponTweakData/MR_C_CT_vamv.maruracemod.json new file mode 100644 index 0000000..1ac2bc8 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/MR_WH_COT_vamv.maruracemod.json b/WeaponTweakData/MR_WH_COT_vamv.maruracemod.json new file mode 100644 index 0000000..ad03bcf --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/MR_WH_CO_vamv.maruracemod.json b/WeaponTweakData/MR_WH_CO_vamv.maruracemod.json new file mode 100644 index 0000000..a61f206 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/MR_WH_CTT_vamv.maruracemod.json b/WeaponTweakData/MR_WH_CTT_vamv.maruracemod.json new file mode 100644 index 0000000..347e872 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/MR_WH_CT_vamv.maruracemod.json b/WeaponTweakData/MR_WH_CT_vamv.maruracemod.json new file mode 100644 index 0000000..1b09897 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/MeleeWeapon_BreachAxe_vanillaexpanded.vtexe.json b/WeaponTweakData/MeleeWeapon_BreachAxe_vanillaexpanded.vtexe.json new file mode 100644 index 0000000..b6f91b8 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/MeleeWeapon_Spoon_inoshishi3.kttfde.json b/WeaponTweakData/MeleeWeapon_Spoon_inoshishi3.kttfde.json new file mode 100644 index 0000000..fba72ee --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/Miho_Weapon_PowerHammer_miho.fortifiedoutremer.json b/WeaponTweakData/Miho_Weapon_PowerHammer_miho.fortifiedoutremer.json new file mode 100644 index 0000000..a14aedd --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/Miho_Weapon_RifleRecoillessSharp_miho.fortifiedoutremer.json b/WeaponTweakData/Miho_Weapon_RifleRecoillessSharp_miho.fortifiedoutremer.json new file mode 100644 index 0000000..479e27a --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/Milian_KnightHalberd_ancot.milirarace.json b/WeaponTweakData/Milian_KnightHalberd_ancot.milirarace.json new file mode 100644 index 0000000..53e2f45 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/Milian_KnightHammer_ancot.milirarace.json b/WeaponTweakData/Milian_KnightHammer_ancot.milirarace.json new file mode 100644 index 0000000..8a2911e --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/Milian_KnightLance_ancot.milirarace.json b/WeaponTweakData/Milian_KnightLance_ancot.milirarace.json new file mode 100644 index 0000000..2e6e655 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/WeaponTweakData/Milian_KnightSword_ancot.milirarace.json b/WeaponTweakData/Milian_KnightSword_ancot.milirarace.json new file mode 100644 index 0000000..9f8aadf --- /dev/null +++ b/WeaponTweakData/Milian_KnightSword_ancot.milirarace.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "ancot.milirarace", + "ItemDefName": "Milian_KnightSword", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.42181462, + "OffY": -0.0153945684, + "ScaleX": 1.5, + "ScaleY": 1.5, + "BladeStart": 0.1739597, + "BladeEnd": 1.10071969, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/Milian_RookBladeII_ancot.milirarace.json b/WeaponTweakData/Milian_RookBladeII_ancot.milirarace.json new file mode 100644 index 0000000..13beea1 --- /dev/null +++ b/WeaponTweakData/Milian_RookBladeII_ancot.milirarace.json @@ -0,0 +1,14 @@ +{ + "TextureModID": "ancot.milirarace", + "ItemDefName": "Milian_RookBladeII", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.2740252, + "OffY": -0.0123156905, + "Rotation": 45.0, + "ScaleX": 1.5, + "ScaleY": 1.5, + "BladeStart": -0.0323290564, + "BladeEnd": 1.29469252, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/Milian_RookBlade_ancot.milirarace.json b/WeaponTweakData/Milian_RookBlade_ancot.milirarace.json new file mode 100644 index 0000000..32edcf3 --- /dev/null +++ b/WeaponTweakData/Milian_RookBlade_ancot.milirarace.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "ancot.milirarace", + "ItemDefName": "Milian_RookBlade", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.387946129, + "OffY": 0.0123159587, + "ScaleX": 1.5, + "ScaleY": 1.5, + "BladeStart": 0.217064783, + "BladeEnd": 1.09456146, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/Milira_Hammer_ancot.milirarace.json b/WeaponTweakData/Milira_Hammer_ancot.milirarace.json new file mode 100644 index 0000000..a05f25f --- /dev/null +++ b/WeaponTweakData/Milira_Hammer_ancot.milirarace.json @@ -0,0 +1,14 @@ +{ + "TextureModID": "ancot.milirarace", + "ItemDefName": "Milira_Hammer", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.6712079, + "OffY": 0.00307884812, + "Rotation": 45.0, + "ScaleX": 1.5, + "ScaleY": 1.5, + "BladeStart": 1.03298271, + "BladeEnd": 1.350113, + "MeleeWeaponType": 1 +} \ No newline at end of file diff --git a/WeaponTweakData/Milira_Lance_ancot.milirarace.json b/WeaponTweakData/Milira_Lance_ancot.milirarace.json new file mode 100644 index 0000000..4267d5c --- /dev/null +++ b/WeaponTweakData/Milira_Lance_ancot.milirarace.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "ancot.milirarace", + "ItemDefName": "Milira_Lance", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.591156065, + "Rotation": 45.0, + "ScaleX": 1.5, + "ScaleY": 1.5, + "BladeStart": 0.7620364, + "BladeEnd": 1.58719146, + "MeleeWeaponType": 5 +} \ No newline at end of file diff --git a/WeaponTweakData/Milira_Sickle_ancot.milirarace.json b/WeaponTweakData/Milira_Sickle_ancot.milirarace.json new file mode 100644 index 0000000..a812f2e --- /dev/null +++ b/WeaponTweakData/Milira_Sickle_ancot.milirarace.json @@ -0,0 +1,14 @@ +{ + "TextureModID": "ancot.milirarace", + "ItemDefName": "Milira_Sickle", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.495708764, + "OffY": -0.126236349, + "Rotation": 55.0, + "ScaleX": 1.5, + "ScaleY": 1.5, + "BladeStart": 0.558826447, + "BladeEnd": 1.1961664, + "MeleeWeaponType": 2 +} \ No newline at end of file diff --git a/WeaponTweakData/Milira_Spear_ancot.milirarace.json b/WeaponTweakData/Milira_Spear_ancot.milirarace.json new file mode 100644 index 0000000..2438d0c --- /dev/null +++ b/WeaponTweakData/Milira_Spear_ancot.milirarace.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "ancot.milirarace", + "ItemDefName": "Milira_Spear", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.5880772, + "Rotation": 45.0, + "ScaleX": 1.5, + "ScaleY": 1.5, + "BladeStart": 0.9190624, + "BladeEnd": 1.639533, + "MeleeWeaponType": 7 +} \ No newline at end of file diff --git a/WeaponTweakData/Milira_TwoHandSword_ancot.milirarace.json b/WeaponTweakData/Milira_TwoHandSword_ancot.milirarace.json new file mode 100644 index 0000000..2ec0da4 --- /dev/null +++ b/WeaponTweakData/Milira_TwoHandSword_ancot.milirarace.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "ancot.milirarace", + "ItemDefName": "Milira_TwoHandSword", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.6096297, + "Rotation": 45.0, + "ScaleX": 1.5, + "ScaleY": 1.5, + "BladeStart": 0.217064783, + "BladeEnd": 1.63645422, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/Mincho_PlateMintchocoBlade_sutsutman.minchothemintchocoslimeharver.json b/WeaponTweakData/Mincho_PlateMintchocoBlade_sutsutman.minchothemintchocoslimeharver.json new file mode 100644 index 0000000..1be1f8c --- /dev/null +++ b/WeaponTweakData/Mincho_PlateMintchocoBlade_sutsutman.minchothemintchocoslimeharver.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "sutsutman.minchothemintchocoslimeharver", + "ItemDefName": "Mincho_PlateMintchocoBlade", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.73586607, + "Rotation": 45.0, + "ScaleX": 1.5, + "ScaleY": 1.5, + "BladeStart": 0.432590127, + "BladeEnd": 1.53484929, + "MeleeWeaponType": 7 +} \ No newline at end of file diff --git a/WeaponTweakData/OA_RK_Mountain_Stick_AA_oark.ratkinfaction.oberoniaaurea.json b/WeaponTweakData/OA_RK_Mountain_Stick_AA_oark.ratkinfaction.oberoniaaurea.json new file mode 100644 index 0000000..4869b7b --- /dev/null +++ b/WeaponTweakData/OA_RK_Mountain_Stick_AA_oark.ratkinfaction.oberoniaaurea.json @@ -0,0 +1,18 @@ +{ + "TextureModID": "oark.ratkinfaction.oberoniaaurea", + "ItemDefName": "OA_RK_Mountain_Stick_AA", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.197052166, + "OffY": -0.0184736736, + "Rotation": 55.0, + "HandsMode": 1, + "BladeStart": 0.1093021, + "MeleeWeaponType": 48, + "TrailTint": { + "r": 0.999, + "g": 0.0669999644, + "b": 0.0669999644, + "a": 0.779 + } +} \ No newline at end of file diff --git a/WeaponTweakData/OA_RK_Mountain_Stick_AB_oark.ratkinfaction.oberoniaaurea.json b/WeaponTweakData/OA_RK_Mountain_Stick_AB_oark.ratkinfaction.oberoniaaurea.json new file mode 100644 index 0000000..2572169 --- /dev/null +++ b/WeaponTweakData/OA_RK_Mountain_Stick_AB_oark.ratkinfaction.oberoniaaurea.json @@ -0,0 +1,12 @@ +{ + "TextureModID": "oark.ratkinfaction.oberoniaaurea", + "ItemDefName": "OA_RK_Mountain_Stick_AB", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.2370784, + "OffY": -0.0554205142, + "Rotation": -12.25437, + "BladeStart": 0.0292496867, + "BladeEnd": 0.4756952, + "MeleeWeaponType": 8 +} \ No newline at end of file diff --git a/WeaponTweakData/OA_RK_Mountain_Stick_D_oark.ratkinfaction.oberoniaaurea.json b/WeaponTweakData/OA_RK_Mountain_Stick_D_oark.ratkinfaction.oberoniaaurea.json new file mode 100644 index 0000000..dc56141 --- /dev/null +++ b/WeaponTweakData/OA_RK_Mountain_Stick_D_oark.ratkinfaction.oberoniaaurea.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "oark.ratkinfaction.oberoniaaurea", + "ItemDefName": "OA_RK_Mountain_Stick_D", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.255551577, + "OffY": -0.0215530321, + "Rotation": 56.11645, + "HandsMode": 1, + "BladeStart": 0.121617548, + "BladeEnd": 0.6050109, + "MeleeWeaponType": 48 +} \ No newline at end of file diff --git a/WeaponTweakData/OA_RK_Mountain_Stick_E_oark.ratkinfaction.oberoniaaurea.json b/WeaponTweakData/OA_RK_Mountain_Stick_E_oark.ratkinfaction.oberoniaaurea.json new file mode 100644 index 0000000..c6aaf4f --- /dev/null +++ b/WeaponTweakData/OA_RK_Mountain_Stick_E_oark.ratkinfaction.oberoniaaurea.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "oark.ratkinfaction.oberoniaaurea", + "ItemDefName": "OA_RK_Mountain_Stick_E", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.190893918, + "OffY": 0.0215525329, + "Rotation": 56.47478, + "HandsMode": 1, + "BladeStart": 0.09082843, + "BladeEnd": 0.463379741, + "MeleeWeaponType": 48 +} \ No newline at end of file diff --git a/WeaponTweakData/OA_RK_Mountain_Stick_F_oark.ratkinfaction.oberoniaaurea.json b/WeaponTweakData/OA_RK_Mountain_Stick_F_oark.ratkinfaction.oberoniaaurea.json new file mode 100644 index 0000000..ce18901 --- /dev/null +++ b/WeaponTweakData/OA_RK_Mountain_Stick_F_oark.ratkinfaction.oberoniaaurea.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "oark.ratkinfaction.oberoniaaurea", + "ItemDefName": "OA_RK_Mountain_Stick_F", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.344840527, + "OffY": 0.0277102571, + "Rotation": -90.0, + "HandsMode": 1, + "BladeStart": 0.07851248, + "BladeEnd": 0.7897471, + "MeleeWeaponType": 1 +} \ No newline at end of file diff --git a/WeaponTweakData/OA_RK_Mountain_Stick_G_oark.ratkinfaction.oberoniaaurea.json b/WeaponTweakData/OA_RK_Mountain_Stick_G_oark.ratkinfaction.oberoniaaurea.json new file mode 100644 index 0000000..cdb6263 --- /dev/null +++ b/WeaponTweakData/OA_RK_Mountain_Stick_G_oark.ratkinfaction.oberoniaaurea.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "oark.ratkinfaction.oberoniaaurea", + "ItemDefName": "OA_RK_Mountain_Stick_G", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.344840527, + "OffY": 0.0277102571, + "Rotation": -90.0, + "HandsMode": 1, + "BladeStart": 0.07851248, + "BladeEnd": 0.7589575, + "MeleeWeaponType": 1 +} \ No newline at end of file diff --git a/WeaponTweakData/VV_Mead_gguake.race.vivi.json b/WeaponTweakData/VV_Mead_gguake.race.vivi.json new file mode 100644 index 0000000..b857242 --- /dev/null +++ b/WeaponTweakData/VV_Mead_gguake.race.vivi.json @@ -0,0 +1,14 @@ +{ + "TextureModID": "gguake.race.vivi", + "ItemDefName": "VV_Mead", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.166262567, + "Rotation": -90.0, + "ScaleX": 0.7, + "ScaleY": 0.7, + "HandsMode": 1, + "BladeStart": 0.09698615, + "BladeEnd": 0.484932274, + "MeleeWeaponType": 8 +} \ No newline at end of file diff --git a/WeaponTweakData/VV_RitualLance_gguake.race.vivi.json b/WeaponTweakData/VV_RitualLance_gguake.race.vivi.json new file mode 100644 index 0000000..64b8049 --- /dev/null +++ b/WeaponTweakData/VV_RitualLance_gguake.race.vivi.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "gguake.race.vivi", + "ItemDefName": "VV_RitualLance", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.5418927, + "Rotation": 45.0, + "ScaleX": 1.3, + "ScaleY": 1.3, + "BladeStart": 0.854404747, + "BladeEnd": 1.408613, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/VV_ViviSpear_gguake.race.vivi.json b/WeaponTweakData/VV_ViviSpear_gguake.race.vivi.json new file mode 100644 index 0000000..e3a3dea --- /dev/null +++ b/WeaponTweakData/VV_ViviSpear_gguake.race.vivi.json @@ -0,0 +1,11 @@ +{ + "TextureModID": "gguake.race.vivi", + "ItemDefName": "VV_ViviSpear", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.2617092, + "Rotation": 45.0, + "BladeStart": 0.1431706, + "BladeEnd": 0.8882727, + "MeleeWeaponType": 5 +} \ No newline at end of file diff --git a/WeaponTweakData/ancot.milirarace.txt b/WeaponTweakData/ancot.milirarace.txt new file mode 100644 index 0000000..69723d9 --- /dev/null +++ b/WeaponTweakData/ancot.milirarace.txt @@ -0,0 +1 @@ +Milira Race \ No newline at end of file diff --git a/WeaponTweakData/ayameduki.harnearmare.txt b/WeaponTweakData/ayameduki.harnearmare.txt new file mode 100644 index 0000000..315b49c --- /dev/null +++ b/WeaponTweakData/ayameduki.harnearmare.txt @@ -0,0 +1 @@ +[Aya]Nearmare Race \ No newline at end of file diff --git a/WeaponTweakData/det.spacerarsenal.txt b/WeaponTweakData/det.spacerarsenal.txt new file mode 100644 index 0000000..1d74921 --- /dev/null +++ b/WeaponTweakData/det.spacerarsenal.txt @@ -0,0 +1 @@ +Spacer Arsenal \ No newline at end of file diff --git a/WeaponTweakData/gguake.race.vivi.txt b/WeaponTweakData/gguake.race.vivi.txt new file mode 100644 index 0000000..76da9e9 --- /dev/null +++ b/WeaponTweakData/gguake.race.vivi.txt @@ -0,0 +1 @@ +Vivi Race \ No newline at end of file