Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Epicguru committed Jun 19, 2023
2 parents 52ffb62 + f17bf7f commit a438e58
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 8 deletions.
2 changes: 1 addition & 1 deletion About/About.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Draft a melee colonist and you can right-click on targets to execute or lasso them.
* Place down a Duel Spot (under the Misc tab) to have your colonists engage in friendly duels.
* Craft Lassos at a tailor bench and equip them to pawns for an edge against gunfighters.

* Cast powerful Unique Skills when certain requirements are met (see steam page).
Load as low down as possible.</description>
<modDependencies>
<li>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Melee Animation Mod
A Rimworld mod that adds detailed melee combat animations, lassos, and animated melee-related skills.

You can download the [latest release here.](https://github.com/Epicguru/AdvancedAnimationMod/releases/latest)
You can download the [latest release here](https://github.com/Epicguru/AdvancedAnimationMod/releases/latest) or get it [on Steam here](https://steamcommunity.com/sharedfiles/filedetails/?id=2944488802).

[Click here to see a non-exhaustive list of compatible mods.](https://github.com/Epicguru/AdvancedAnimationMod/blob/master/WeaponTweakData/Compatible%20Mods.md)
Other mods may be compatible. The mods listed above are just the mods that have patches made by Epicguru.
Expand Down
40 changes: 34 additions & 6 deletions WeaponTweakData/Compatible Mods.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Compatible Mods List
`Updated 19 Apr 2023, 2:40 PM.`
`Updated 19 Jun 2023, 8:54 PM.`

**Melee Animation supports 1624 weapons from 194 mods.**
**Melee Animation supports 1800 weapons from 222 mods.**

Other weapons may be compatible if the mod author has made a patch:
[Click here to see how you can create a patch yourself!](https://github.com/Epicguru/AnimationMod/blob/master/Source/TweakTutorial/AuthorTweaks.md)
Expand All @@ -25,8 +25,10 @@ Open an issue or leave a comment on the Workshop page - or even better, submit a
| **[1.4]Idearn Race** | ayameduki.haridearn | 1 | *Epicguru* |
| **[1.4]Silkiera Race** | ayameduki.harsilkiera | 3 | *Epicguru* |
| **[1.4]Xenoorca Race** | ayameduki.harxenoorca | 1 | *Epicguru* |
| **[K4G] Empires of Old - Core** | k4g.core | 6 | *Epicguru* |
| **[K4G] Vanilla Weapon Retextures** | k4g.vwr | 17 | *Epicguru* |
| **[LTS]Tenants** | limetreesnake.tenants | 3 | *Epicguru* |
| **[Race]WarShipGirl R|战舰少女R** | warshipgirlr.alienraces | 3 | *Epicguru* |
| **[RF]Berserk - Character Apparel Pack** | rf.berserk.armory | 1 | *Epicguru* |
| **[RH2] Faction: V.O.I.D.** | rh2.faction.void | 5 | *Epicguru* |
| **[RH2] Rimmu-Nation² - Weapons** | cp.rimmunation.2.weapons | 28 | *Epicguru* |
Expand All @@ -48,18 +50,22 @@ Open an issue or leave a comment on the Workshop page - or even better, submit a
| **Alpha Biomes** | sarg.alphabiomes | 3 | *Epicguru* |
| **Ambition of the Cosmic: True Pinnacle of Creation** | explodoboy.snsambitioncosmic.gen4addon | 1 | *Epicguru* |
| **Amplified Mobility Platform** | aoba.amp | 1 | *Epicguru* |
| **Ancient Armory** | botchjob.ancientarmory | 6 | *Epicguru* |
| **Ancient Species** | haduki.ancientspecies | 6 | *Epicguru* |
| **Android Tiers Reforged** | killathon.androidtiersreforged | 1 | *Epicguru* |
| **Anima Gear** | xrushha.animagear | 1 | *Epicguru* |
| **Antimatter Annihilation** | co.uk.epicguru.antimatterannihilation | 5 | *Epicguru* |
| **Anty the war ant race** | roo.antyracemod | 4 | *Epicguru* |
| **AOC The Cleanup Devil** | millap.aoc | 5 | *Epicguru* |
| **Apothecary (Continued)** | mlie.apothecary | 1 | *Epicguru* |
| **Arasaka Corporation** | alien.arasakacorporation | 2 | *Epicguru* |
| **Archotech Weaponry** | edern.archotechweaponry | 2 | *Epicguru* |
| **Arsenal of Reaction** | 4ydra.arsenalofreaction | 11 | *Epicguru* |
| **Arsenal of Revolution** | 4ydra.arsenalofrevolution | 8 | *Epicguru* |
| **Aspirrator's Arsenal** | aspirrator.arsenal | 7 | *Epicguru* |
| **Beam Katanas** | nmh.beamkat | 2 | *Epicguru* |
| **Better Humanoid Mechanoid** | better.humanoid.mechanoid.cn | 2 | *Epicguru* |
| **Big and Small Genes** | redmattis.bigsmall.core | 8 | *Epicguru* |
| **Bill Doors' modular wolf girl weapon module** | 3hstltd.wolf.geneweapon | 17 | *Epicguru* |
| **Biomes! Prehistoric** | biomesteam.biomesprehistoric | 3 | *Epicguru* |
| **BondageBed Torture (Continued)** | mlie.bondagebedtorture | 1 | *Epicguru* |
Expand All @@ -73,39 +79,49 @@ Open an issue or leave a comment on the Workshop page - or even better, submit a
| **Dragonian Prime Race2.0** | vazrua.dragonianraceprime2.0 | 4 | *Epicguru* |
| **Dragons Descent** | onyxae.dragonsdescent | 5 | *Epicguru* |
| **Dune FedaykinArmor** | pphhyy.fedaykinjihadarmor | 1 | *Epicguru* |
| **Dusk Armory** | harkon.df.dusk | 3 | *Epicguru* |
| **Early Metalworking** | mekon.earlymetals | 8 | *Epicguru* |
| **Early Times** | rd.earlytimes | 19 | *Epicguru* |
| **Eccentric Extras - Signature Weapons** | aelanna.eccentricextras.signatureweapons | 1 | *Epicguru* |
| **Eccentric Tech - Foxy's Armory 2.0** | aelanna.eccentrictech.foxysarmory2 | 1 | *Epicguru* |
| **Edge of Descension - Monoblades** | rabbit.edgeofdescension | 6 | *Epicguru* |
| **Edo Themed Expansion** | heis.edo.themed.expansion | 18 | *Epicguru* |
| **Elden Rim: Armory** | sharpie.eldenrima | 12 | *Epicguru* |
| **Eltex Weaponry** | sirvan.eltexweaponry | 1 | *Epicguru* |
| **Epona race Renaissance** | epona.eponarenaissance | 10 | *Epicguru* |
| **Forsakens** | kikohi.forsakens | 4 | *Epicguru* |
| **Gimmicks (Continued)** | mlie.gimmicks | 17 | *Epicguru* |
| **Girl's Frontline: Sangvis Ferri Weapons** | brassy.sfguns.vanilla | 2 | *Epicguru* |
| **Glitter Weaponry** | detvisor.glitterweaponry | 1 | *Epicguru* |
| **Gloomy Dragonian race** | rooandgloomy.dragonianracemod | 1 | *Epicguru* |
| **Gods of Elona [1.4]** | karukus.godsofelona | 4 | *Epicguru* |
| **Grimworld: Melee** | grimworld.melee | 6 | *Epicguru* |
| **Heavy Melee Weapons (Continued)** | mlie.heavymeleeweapons | 11 | *Epicguru* |
| **Hellsing ARMS Ultimate** | baskerville.hellsingarmsultimate | 13 | *Epicguru* |
| **Heyra the Horned** | bando.heyrathehorned | 11 | *Epicguru* |
| **Ilya Tech - Core** | suvi.techcore | 2 | *Epicguru* |
| **Industrial Armory** | tyrannicalelmo.industrialarmory | 13 | *Epicguru* |
| **Impact Weaponry** | detvisor.impactweaponry | 2 | *Epicguru* |
| **Industrial Armory** | tyrannicalelmo.industrialarmory | 15 | *Epicguru* |
| **Industrial Melee Weaponry** | iexist.industrial.melee.weaponry | 12 | *Epicguru* |
| **Industrialisation** | trasheddt.industrialisation | 4 | *Epicguru* |
| **Kalia Race** | foxbots.kalia.race | 9 | *Epicguru* |
| **Kemetic Decorations** | sovereign.kemet | 1 | *Epicguru* |
| **kemomimihouse** | psyche.kemomimihouse | 2 | *Epicguru* |
| **Kenshi Armory (1.4)** | biowreck.kenshiarmory | 12 | *Epicguru* |
| **Kiiro Race** | ancot.kiirorace | 10 | *Epicguru* |
| **Kijin Race 3.0** | ssulunge.kijinrace3 | 5 | *Epicguru* |
| **Kurin HAR Edition** | seioch.kurin.har | 3 | *Epicguru* |
| **Kurin, The Three Tailed Fox [Deluxe Edition]** | inoshishi3.kttfde | 3 | *Epicguru* |
| **Logistics_Mechanoid** | pal5k.logisticsmechanoid | 1 | *Epicguru* |
| **M.I.S. - Arknights** | mis.arknights | 98 | *Epicguru* |
| **MakaiTech** | aranmaho.makai | 7 | *Epicguru* |
| **MakaiTech - Psycast** | aranmaho.makai.psycast | 1 | *Epicguru* |
| **Makeshift Melee Weapons** | detvisor.makeshiftweapons | 3 | *Epicguru* |
| **Malay Themed Expansion** | nstr.malay.themed.expansion | 6 | *Epicguru* |
| **Maru Race** | vamv.maruracemod | 7 | *Epicguru* |
| **Mechanite Plague** | chairheir.mechaniteplague | 3 | *Epicguru* |
| **Medieval Fantasy Quest Rewards Retexture** | serek.fantasyquestrewardsretexture | 7 | *Epicguru* |
| **Medieval Fantasy Themed Quest Rewards** | botchjob.medievalfantasyquestrewards | 7 | *Epicguru* |
| **Medieval Madness: Tools of the Trade** | madman.toolsofthetrade | 44 | *Epicguru* |
| **Medieval Overhaul** | dankpyon.medieval.overhaul | 68 | *Epicguru* |
| **Medieval Overhaul: Arcane Archaeologists** | ogam.medievaloverhaul.arcanearchaeologists | 4 | *Epicguru* |
Expand Down Expand Up @@ -140,8 +156,11 @@ Open an issue or leave a comment on the Workshop page - or even better, submit a
| **Pawnmorpher** | tachyonite.pawnmorpherpublic | 1 | *Epicguru* |
| **PLA-Armory** | issaczhuang.pla.armory | 3 | *Epicguru* |
| **Polarisbloc - Mechenemy** | rsmaintain.vanya.polarisbloc.mechenemy | 2 | *Epicguru* |
| **Possessed Weapons** | botchjob.possessedweapons | 10 | *Epicguru* |
| **Power Tools** | simmin.powertools | 4 | *Epicguru* |
| **pphhyy's Tox Weapons** | pphhyy.toxweapons | 4 | *Epicguru* |
| **Primitive Tools** | primitivetools.velcroboy333 | 11 | *Epicguru* |
| **Primitive Workbenches** | primitiveproduction.velcroboy333 | 8 | *Epicguru* |
| **Psysword** | xedos.psyblade | 2 | *Epicguru* |
| **Pyramid Heads Helmet** | kropolis.pyramidhead | 1 | *Epicguru* |
| **Race to the Rim** | sargoskar.racetotherim | 2 | *Epicguru* |
Expand All @@ -158,23 +177,27 @@ Open an issue or leave a comment on the Workshop page - or even better, submit a
| **RimFantasy - Medieval Overhaul Edition** | sierra.rf.medievaloverhaul | 18 | *Epicguru* |
| **RimForge** | co.uk.epicguru.rimforge | 6 | *Epicguru* |
| **RimFortress: Dwarven Plants** | dismarzero.vgp.rimfortressdwarvenplants | 6 | *Epicguru* |
| **Rimsenal - Core** | rimsenal.core | 5 | *Epicguru* |
| **Rimhammer - The End Times - Magic** | sickboywi.theendtimes.magic | 6 | *Epicguru* |
| **Rimhammer - The End Times - Skaven** | sickboywi.theendtimes.skaven | 11 | *Epicguru* |
| **Rimsenal - Core** | rimsenal.core | 7 | *Epicguru* |
| **Rimsenal - Federation Faction Pack** | rimsenal.federation | 2 | *Epicguru* |
| **Rimsenal - Feral Faction Pack** | rimsenal.feral | 4 | *Epicguru* |
| **Rimwars:Vibro weapons** | sov.kotorone | 13 | *Epicguru* |
| **Rimworld Ultratech** | conner.rimworldultratech | 2 | *Epicguru* |
| **Rimworld Westernization Project (Continued)** | mlie.rimworldwesternizationproject | 4 | *Epicguru* |
| **Roo's Minotaur Xenotype** | rooboid.minotaur | 5 | *Epicguru* |
| **Roo's Minotaur Xenotype Expanded** | rooboid.minotaur.expanded | 1 | *Epicguru* |
| **Royal Arsenal** | bucko.royalarsenal | 4 | *Epicguru* |
| **Royal Thrumbos (Continued)** | mlie.royalthrumbos | 2 | *Epicguru* |
| **Royalty** | ludeon.rimworld.royalty | 12 | *Epicguru* |
| **Royalty** | ludeon.rimworld.royalty | 13 | *Epicguru* |
| **Simple Medieval Axe And Mace** | miko.simplemedievalaxeandmace | 5 | *Epicguru* |
| **Simple Medieval Saber And Spear** | miko.simplemedievalsaberandspear | 7 | *Epicguru* |
| **Simple Medieval Sword(retexture version)** | miko.simplemedievalswordrv | 16 | *Epicguru* |
| **Simple Medieval Weapon** | miko.simplemedievalweapon | 16 | *Epicguru* |
| **Simply Melee Weapons (Continued)** | zal.simplymelee | 5 | *Epicguru* |
| **Simply More Melee (Continued)** | mlie.simplymoremelee | 34 | *Epicguru* |
| **Sparkling Worlds - Full Mod** | albion.sparklingworlds.full | 2 | *Epicguru* |
| **Sparkling Worlds - Modular Core - Reduced features** | albion.sparklingworlds.core | 1 | *Epicguru* |
| **Sparkling Worlds Addon - Weapons - Standalone Addon** | albion.sparklingworlds.addon.weapons | 2 | *Epicguru* |
| **Star Crafters Armory** | akri.starcraftersarmory | 1 | *Epicguru* |
| **Star Wars - Fully Functional Lightsabers** | projectjedi.lightsabers | 14 | *Epicguru* |
Expand All @@ -184,6 +207,7 @@ Open an issue or leave a comment on the Workshop page - or even better, submit a
| **The Joris Experience** | sarg.jorisexperience | 1 | *Epicguru* |
| **The Wild Fields - apparel and weapons** | serek.thewildfields | 4 | *Epicguru* |
| **TOT's CMC Weaponry** | tot.cmc.weaponry | 2 | *Epicguru* |
| **T's Conversion Staff** | trickity.conversion.staff | 1 | *Epicguru* |
| **T's Samurai Faction** | trickity.samurai.faction | 8 | *Epicguru* |
| **Ultratech Weapons Plus** | side1iner.ultratechweaponsplusdev | 2 | *Epicguru* |
| **Vali's Charged Arsenal** | vali.ca | 13 | *Epicguru* |
Expand All @@ -195,7 +219,7 @@ Open an issue or leave a comment on the Workshop page - or even better, submit a
| **Vanilla Factions Expanded - Empire** | oskarpotocki.vfe.empire | 2 | *Epicguru* |
| **Vanilla Factions Expanded - Insectoids** | oskarpotocki.vfe.insectoid | 1 | *Epicguru* |
| **Vanilla Factions Expanded - Medieval** | oskarpotocki.vanillafactionsexpanded.medievalmodule | 2 | *Epicguru* |
| **Vanilla Factions Expanded - Pirates** | oskarpotocki.vfe.pirates | 5 | *Epicguru* |
| **Vanilla Factions Expanded - Pirates** | oskarpotocki.vfe.pirates | 6 | *Epicguru* |
| **Vanilla Factions Expanded - Vikings** | oskarpotocki.vfe.vikings | 7 | *Epicguru* |
| **Vanilla Melee Retexture** | zodgilla.vanillameleeretexture | 9 | *Epicguru* |
| **Vanilla Psycasts Expanded** | vanillaexpanded.vpsycastse | 3 | *Epicguru* |
Expand All @@ -205,14 +229,18 @@ Open an issue or leave a comment on the Workshop page - or even better, submit a
| **Vanilla Weapons Expanded - Non-Lethal** | vanillaexpanded.vwenl | 1 | *Epicguru* |
| **Vanilla Weapons Expanded - Tribal** | vanillaexpanded.vwetb | 4 | *Epicguru* |
| **Van's Retexture : Melee Weapons** | sirvan.mwretextured | 18 | *Epicguru* |
| **Vaults of Vagar** | alexprotopopov.vaultsofvagar | 1 | *Epicguru* |
| **VGP Garden Drinks** | dismarzero.vgp.vgpgardendrinks | 10 | *Epicguru* |
| **VGP Vegetable Garden** | dismarzero.vgp.vgpvegetablegarden | 2 | *Epicguru* |
| **Warcasket Persona Weapons** | metalocif.warcasketpersonaweapons | 4 | *Epicguru* |
| **Warcaskets: Adeptus Astartes** | buffsboy474.smwarcaskets.ideology.testing | 3 | *Epicguru* |
| **Weapons+** | kyrrisayo.weaponsplus | 18 | *Epicguru* |
| **Weapons+ Retexture** | dandman68.weaponplusretexture | 18 | *Epicguru* |
| **Westerado (Continued)** | mlie.westerado | 15 | *Epicguru* |
| **Wisteria Corporation** | suvi.wc | 10 | *Epicguru* |
| **Xeva Faction** | xeva.xevafaction.11 | 24 | *Epicguru* |
| **Yuran race** | rooandgloomy.yuranracemod | 4 | *Epicguru* |
| **Zombieland** | brrainz.zombieland | 1 | *Epicguru* |
| **妖怪村** | yokaimura.1.32 | 10 | *Epicguru* |
| **虫娘 Insect Girls** | pupa.insectgirls | 2 | *Epicguru* |

0 comments on commit a438e58

Please sign in to comment.