Merge branch 'develop'

Epicguru · Mar 13, 2023 · e44c5bf · e44c5bf
2 parents 93e8d3a + 813f7bf
commit e44c5bf
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 3 deletions.
diff --git a/WeaponTweakData/Compatible Mods.md b/WeaponTweakData/Compatible Mods.md
@@ -1,7 +1,7 @@
 # Compatible Mods List
-`Updated 12 Mar 2023, 6:01 PM.`  
+`Updated 13 Mar 2023, 10:57 AM.`  
 
-**Melee Animation supports 1075 weapons from 138 mods.**  
+**Melee Animation supports 1098 weapons from 142 mods.**  
 
 Mods listed here are fully compatible with this mod.  
 Weapons from mods that are not listed here will not be able to be used in animations.  
@@ -27,6 +27,7 @@ Open an issue or leave a comment on the Workshop page - or even better, submit a
 | **[RH2] Rimmu-Nation² - Weapons** | cp.rimmunation.2.weapons | 28 | *Epicguru* |
 | **[RH2] Weapons: Simple Retexture** | arektpp.simplerh2weap | 27 | *Epicguru* |
 | **[SYR] Thrumkin** | syrchalis.thrumkin | 1 | *Epicguru* |
+| **ↁ Elves** | devdesigner.elves | 17 | *Epicguru* |
 | **ↁ House Sanguin** | devdesigner.blood | 5 | *Epicguru* |
 | **A RimWorld of Magic** | torann.arimworldofmagic | 8 | *Epicguru* |
 | **Advanced Animation** | co.uk.epicguru.advancedanimation | 1 | *Epicguru* |
@@ -53,10 +54,13 @@ Open an issue or leave a comment on the Workshop page - or even better, submit a
 | **Core** | ludeon.rimworld | 17 | *Epicguru* |
 | **Cybernetic Warfare and Special Weapons (Continued)** | mlie.cyberneticwarfare | 4 | *Epicguru* |
 | **Dragons Descent** | onyxae.dragonsdescent | 5 | *Epicguru* |
+| **Eccentric Extras - Signature Weapons** | aelanna.eccentricextras.signatureweapons | 1 | *Epicguru* |
+| **Eccentric Tech - Foxy's Armory 2.0** | aelanna.eccentrictech.foxysarmory2 | 1 | *Epicguru* |
 | **Edo Themed Expansion** | heis.edo.themed.expansion | 18 | *Epicguru* |
 | **Eltex Weaponry** | sirvan.eltexweaponry | 1 | *Epicguru* |
 | **Gimmicks (Continued)** | mlie.gimmicks | 17 | *Epicguru* |
 | **Girl's Frontline: Sangvis Ferri Weapons** | brassy.sfguns.vanilla | 2 | *Epicguru* |
+| **Glitter Weaponry** | detvisor.glitterweaponry | 1 | *Epicguru* |
 | **Grimworld: Melee** | grimworld.melee | 6 | *Epicguru* |
 | **Heavy Melee Weapons (Continued)** | mlie.heavymeleeweapons | 11 | *Epicguru* |
 | **Hellsing ARMS Ultimate** | baskerville.hellsingarmsultimate | 13 | *Epicguru* |
@@ -145,7 +149,7 @@ Open an issue or leave a comment on the Workshop page - or even better, submit a
 | **Vanilla Factions Expanded - Vikings** | oskarpotocki.vfe.vikings | 7 | *Epicguru* |
 | **Vanilla Melee Retexture** | zodgilla.vanillameleeretexture | 9 | *Epicguru* |
 | **Vanilla Psycasts Expanded** | vanillaexpanded.vpsycastse | 3 | *Epicguru* |
-| **Vanilla Textures Expanded** | vanillaexpanded.vtexe | 18 | *Epicguru* |
+| **Vanilla Textures Expanded** | vanillaexpanded.vtexe | 21 | *Epicguru* |
 | **Vanilla Weapons Expanded** | vanillaexpanded.vwe | 7 | *Epicguru* |
 | **Vanilla Weapons Expanded - Laser** | vanillaexpanded.vwel | 1 | *Epicguru* |
 | **Vanilla Weapons Expanded - Non-Lethal** | vanillaexpanded.vwenl | 1 | *Epicguru* |

diff --git a/WeaponTweakData/Laser_Saber_detvisor.glitterweaponry.json b/WeaponTweakData/Laser_Saber_detvisor.glitterweaponry.json
@@ -0,0 +1,18 @@
+{
+  "TextureModID": "detvisor.glitterweaponry",
+  "ItemDefName": "Laser_Saber",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.36793226,
+  "ScaleX": 1.2,
+  "ScaleY": 1.2,
+  "BladeStart": 0.074261494,
+  "BladeEnd": 0.8810128,
+  "MeleeWeaponType": 6,
+  "TrailTint": {
+    "r": 0.709151864,
+    "g": 0.992142558,
+    "b": 0.995999932,
+    "a": 0.9693333
+  }
+}
diff --git a/WeaponTweakData/Nr_MiniSword_vanillaexpanded.vtexe.json b/WeaponTweakData/Nr_MiniSword_vanillaexpanded.vtexe.json
@@ -0,0 +1,10 @@
+{
+  "TextureModID": "vanillaexpanded.vtexe",
+  "ItemDefName": "Nr_MiniSword",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.291689128,
+  "BladeStart": 0.08579089,
+  "BladeEnd": 0.7463811,
+  "MeleeWeaponType": 6
+}
diff --git a/WeaponTweakData/Nr_PlasmSword_vanillaexpanded.vtexe.json b/WeaponTweakData/Nr_PlasmSword_vanillaexpanded.vtexe.json
@@ -0,0 +1,12 @@
+{
+  "TextureModID": "vanillaexpanded.vtexe",
+  "ItemDefName": "Nr_PlasmSword",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.313198835,
+  "ScaleX": 1.1,
+  "ScaleY": 1.1,
+  "BladeStart": 0.15659982,
+  "BladeEnd": 0.800895154,
+  "MeleeWeaponType": 6
+}
diff --git a/WeaponTweakData/Nr_Xeushammer_vanillaexpanded.vtexe.json b/WeaponTweakData/Nr_Xeushammer_vanillaexpanded.vtexe.json
@@ -0,0 +1,10 @@
+{
+  "TextureModID": "vanillaexpanded.vtexe",
+  "ItemDefName": "Nr_Xeushammer",
+  "ItemType": "ThingDef",
+  "ItemTypeNamespace": "Verse",
+  "OffX": 0.1844505,
+  "BladeStart": 0.3560323,
+  "BladeEnd": 0.6906169,
+  "MeleeWeaponType": 1
+}
diff --git a/WeaponTweakData/detvisor.glitterweaponry.txt b/WeaponTweakData/detvisor.glitterweaponry.txt
@@ -0,0 +1 @@
+Glitter Weaponry