Merge pull request #85 from Epicguru/develop

Release 31
Epicguru · Sep 28, 2024 · 31467b0 · 31467b0
2 parents d2135ea + 652bbc5
commit 31467b0
Show file tree

Hide file tree

Showing 22 changed files with 205 additions and 7 deletions.
diff --git a/.github/workflows/GenerateReleaseZip.yml b/.github/workflows/GenerateReleaseZip.yml
@@ -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.6
+      uses: actions/upload-artifact@v4.4.0
       with:
         name: build-${{ matrix.rimworld-version }}
         retention-days: 1
@@ -100,7 +100,7 @@ jobs:
         zip -r ./${{ env.MOD_NAME }}.zip ./${{ env.MOD_NAME }}/*
 
     - name: Upload Mod Zip Artifact
-      uses: actions/upload-artifact@v4.3.6
+      uses: actions/upload-artifact@v4.4.0
       with:
         name: ${{ env.MOD_NAME }}
         path: ${{ env.MOD_PATH }}.zip

diff --git a/WeaponTweakData/AEXP_WalrusTusk_ludeon.rimworld.json b/WeaponTweakData/AEXP_WalrusTusk_ludeon.rimworld.json
@@ -0,0 +1,12 @@
+{
+  "TextureModID": "ludeon.rimworld",
+  "ItemDefName": "AEXP_WalrusTusk",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.3023622,
+  "OffY": -0.0545929372,
+  "Rotation": 10.0,
+  "BladeStart": 0.02519685,
+  "BladeEnd": 0.7979008,
+  "MeleeWeaponType": 5
+}
diff --git a/WeaponTweakData/CavalrySpear_wonyoungjun.romanequipment.json b/WeaponTweakData/CavalrySpear_wonyoungjun.romanequipment.json
@@ -0,0 +1,13 @@
+{
+  "TextureModID": "wonyoungjun.romanequipment",
+  "ItemDefName": "CavalrySpear",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.45771122,
+  "Rotation": 45.0,
+  "ScaleX": 1.25,
+  "ScaleY": 1.25,
+  "BladeStart": 0.0788777247,
+  "BladeEnd": 1.33202946,
+  "MeleeWeaponType": 5
+}
diff --git a/WeaponTweakData/DecoratedGladius_wonyoungjun.romanequipment.json b/WeaponTweakData/DecoratedGladius_wonyoungjun.romanequipment.json
@@ -0,0 +1,14 @@
+{
+  "TextureModID": "wonyoungjun.romanequipment",
+  "ItemDefName": "DecoratedGladius",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.270476818,
+  "Rotation": 45.0,
+  "ScaleX": 1.3,
+  "ScaleY": 1.3,
+  "HandsMode": 1,
+  "BladeStart": 0.107086614,
+  "BladeEnd": 0.818770468,
+  "MeleeWeaponType": 6
+}
diff --git a/WeaponTweakData/DecoratedPugio_wonyoungjun.romanequipment.json b/WeaponTweakData/DecoratedPugio_wonyoungjun.romanequipment.json
@@ -0,0 +1,14 @@
+{
+  "TextureModID": "wonyoungjun.romanequipment",
+  "ItemDefName": "DecoratedPugio",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.32369554,
+  "Rotation": 45.0,
+  "ScaleX": 1.5,
+  "ScaleY": 1.5,
+  "HandsMode": 1,
+  "BladeStart": 0.06998985,
+  "BladeEnd": 0.447713017,
+  "MeleeWeaponType": 6
+}
diff --git a/WeaponTweakData/GW_SS_Phaseblade_grimworld.core.json b/WeaponTweakData/GW_SS_Phaseblade_grimworld.core.json
@@ -0,0 +1,19 @@
+{
+  "TextureModID": "grimworld.core",
+  "ItemDefName": "GW_SS_Phaseblade",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.594644666,
+  "Rotation": 45.0,
+  "ScaleX": 1.5,
+  "ScaleY": 1.5,
+  "BladeStart": 0.28808862,
+  "BladeEnd": 1.45891058,
+  "MeleeWeaponType": 6,
+  "TrailTint": {
+    "r": 0.103780642,
+    "g": 0.9222221,
+    "b": 0.06967884,
+    "a": 0.826666653
+  }
+}
diff --git a/WeaponTweakData/GladiusAeternus_wonyoungjun.romanequipment.json b/WeaponTweakData/GladiusAeternus_wonyoungjun.romanequipment.json
@@ -0,0 +1,14 @@
+{
+  "TextureModID": "wonyoungjun.romanequipment",
+  "ItemDefName": "GladiusAeternus",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.270476818,
+  "Rotation": 45.0,
+  "ScaleX": 1.3,
+  "ScaleY": 1.3,
+  "HandsMode": 1,
+  "BladeStart": 0.107086614,
+  "BladeEnd": 0.818770468,
+  "MeleeWeaponType": 6
+}
diff --git a/WeaponTweakData/Gladius_wonyoungjun.romanequipment.json b/WeaponTweakData/Gladius_wonyoungjun.romanequipment.json
@@ -0,0 +1,14 @@
+{
+  "TextureModID": "wonyoungjun.romanequipment",
+  "ItemDefName": "Gladius",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.270476818,
+  "Rotation": 45.0,
+  "ScaleX": 1.3,
+  "ScaleY": 1.3,
+  "HandsMode": 1,
+  "BladeStart": 0.107086614,
+  "BladeEnd": 0.818770468,
+  "MeleeWeaponType": 6
+}
diff --git a/WeaponTweakData/KIT_MeleeWeapon_Dolabra_zal.romanweapons.json b/WeaponTweakData/KIT_MeleeWeapon_Dolabra_zal.romanweapons.json
@@ -0,0 +1,10 @@
+{
+  "TextureModID": "zal.romanweapons",
+  "ItemDefName": "KIT_MeleeWeapon_Dolabra",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.243570089,
+  "BladeStart": 0.130184233,
+  "BladeEnd": 0.6593181,
+  "MeleeWeaponType": 2
+}
diff --git a/WeaponTweakData/KIT_MeleeWeapon_Falx_zal.romanweapons.json b/WeaponTweakData/KIT_MeleeWeapon_Falx_zal.romanweapons.json
@@ -0,0 +1,12 @@
+{
+  "TextureModID": "zal.romanweapons",
+  "ItemDefName": "KIT_MeleeWeapon_Falx",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.184777945,
+  "OffY": -0.0545929372,
+  "FlipY": true,
+  "BladeStart": 0.2036748,
+  "BladeEnd": 0.6110236,
+  "MeleeWeaponType": 54
+}
diff --git a/WeaponTweakData/KIT_MeleeWeapon_Hasta_zal.romanweapons.json b/WeaponTweakData/KIT_MeleeWeapon_Hasta_zal.romanweapons.json
@@ -0,0 +1,11 @@
+{
+  "TextureModID": "zal.romanweapons",
+  "ItemDefName": "KIT_MeleeWeapon_Hasta",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.331758976,
+  "Rotation": 45.0,
+  "BladeStart": 0.09028897,
+  "BladeEnd": 1.01837325,
+  "MeleeWeaponType": 5
+}
diff --git a/WeaponTweakData/KIT_MeleeWeapon_Pugio_zal.romanweapons.json b/WeaponTweakData/KIT_MeleeWeapon_Pugio_zal.romanweapons.json
@@ -0,0 +1,12 @@
+{
+  "TextureModID": "zal.romanweapons",
+  "ItemDefName": "KIT_MeleeWeapon_Pugio",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.180577159,
+  "OffY": -0.02939646,
+  "HandsMode": 1,
+  "BladeStart": 0.123885028,
+  "BladeEnd": 0.573228359,
+  "MeleeWeaponType": 48
+}
diff --git a/WeaponTweakData/MPT_MeleeWeapon_PsyfocusStaffBladelink_vanillaexpanded.vtexe.json b/WeaponTweakData/MPT_MeleeWeapon_PsyfocusStaffBladelink_vanillaexpanded.vtexe.json
@@ -0,0 +1,10 @@
+{
+  "TextureModID": "vanillaexpanded.vtexe",
+  "ItemDefName": "MPT_MeleeWeapon_PsyfocusStaffBladelink",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.2102911,
+  "BladeStart": 0.0939597338,
+  "BladeEnd": 0.693512559,
+  "MeleeWeaponType": 9
+}
diff --git a/WeaponTweakData/Pugio_wonyoungjun.romanequipment.json b/WeaponTweakData/Pugio_wonyoungjun.romanequipment.json
@@ -0,0 +1,14 @@
+{
+  "TextureModID": "wonyoungjun.romanequipment",
+  "ItemDefName": "Pugio",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.32369554,
+  "Rotation": 45.0,
+  "ScaleX": 1.5,
+  "ScaleY": 1.5,
+  "HandsMode": 1,
+  "BladeStart": 0.06998985,
+  "BladeEnd": 0.447713017,
+  "MeleeWeaponType": 6
+}
diff --git a/WeaponTweakData/ReviaSerratedSword_sgg1.raviaretexture.json b/WeaponTweakData/ReviaSerratedSword_sgg1.raviaretexture.json
@@ -3,10 +3,10 @@
   "ItemDefName": "ReviaSerratedSword",
   "ItemType": "ThingDef",
   "ItemTypeNamespace": "Verse",
-  "OffX": 0.259397626,
-  "OffY": 0.006032847,
-  "Rotation": 47.61271,
-  "BladeStart": 0.115446784,
-  "BladeEnd": 0.766956747,
+  "OffX": 0.260176837,
+  "OffY": -0.008815765,
+  "Rotation": 50.0,
+  "BladeStart": 0.0459876619,
+  "BladeEnd": 0.7443779,
   "MeleeWeaponType": 6
 }
diff --git a/WeaponTweakData/TCS_ConversionStaff_mss.thirst.json b/WeaponTweakData/TCS_ConversionStaff_mss.thirst.json
@@ -0,0 +1,13 @@
+{
+  "TextureModID": "mss.thirst",
+  "ItemDefName": "TCS_ConversionStaff",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.398950338,
+  "Rotation": 90.0,
+  "ScaleX": 1.3,
+  "ScaleY": 1.3,
+  "BladeStart": 0.12178503,
+  "BladeEnd": 1.0372709,
+  "MeleeWeaponType": 1
+}
diff --git a/WeaponTweakData/WoodLog_regrowth.botr.retextures.json b/WeaponTweakData/WoodLog_regrowth.botr.retextures.json
@@ -0,0 +1,11 @@
+{
+  "TextureModID": "regrowth.botr.retextures",
+  "ItemDefName": "WoodLog",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.2561677,
+  "Rotation": 45.0,
+  "BladeStart": 0.0503937,
+  "BladeEnd": 0.621522844,
+  "MeleeWeaponType": 8
+}
diff --git a/WeaponTweakData/grimworld.core.txt b/WeaponTweakData/grimworld.core.txt
@@ -0,0 +1 @@
+GrimWorld 40,000 - Core Imperialis
diff --git a/WeaponTweakData/mss.thirst.txt b/WeaponTweakData/mss.thirst.txt
@@ -0,0 +1 @@
+(Beta Testing) Thirst Flavour Pack
diff --git a/WeaponTweakData/regrowth.botr.retextures.txt b/WeaponTweakData/regrowth.botr.retextures.txt
@@ -0,0 +1 @@
+ReGrowth: ReTextures
diff --git a/WeaponTweakData/wonyoungjun.romanequipment.txt b/WeaponTweakData/wonyoungjun.romanequipment.txt
@@ -0,0 +1 @@
+Roman Equipment
diff --git a/WeaponTweakData/zal.romanweapons.txt b/WeaponTweakData/zal.romanweapons.txt
@@ -0,0 +1 @@
+Kit's Roman Weapons (Continued)