[Test Merge] Attack animations, mage armor fix, block changes, new fight intents, …#359
Merged
unit0016 merged 6 commits intoNovaSector:mainfrom Aug 8, 2025
Merged
Conversation
…new weapons There's a looooot here. One thing led to another to achieve this, but this should help add some more complexity to combat and fix some backend errors.
just seeing if I can resolve this dmi conflict
another try to resolve the dmi issues
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
…new weapons
There's a looooot here. One thing led to another to achieve this, but this should help add some more complexity to combat and fix some backend errors.
About The Pull Request
There's a looooot here. One thing led to another to achieve this, but this should help add some more complexity to combat and fix some backend errors.
first we have new attack animations that will telegraph the weapon being used
https://discord.com/channels/1171566433923239977/1401733586733891588/1402099924799197295
we also have new dodge and parry mechanics and a block ability when left clicking
https://discord.com/channels/1171566433923239977/1401733586733891588/1402358314737733702
new militia weapons and axes

mage weapons only give one at a time.


as do mage bricks


new peel intent, to strip armor integrity

and a new ring that acts as mages armor



(the desc should be "An arcyne creation to protect its wearer. It protects is wearer by tugging things gently toward less fatal potentials." now)
this in all includes
Ports Vanderlin's Attack Animations (with Azure Tweaks) #2582: Azure-Peak/Azure-Peak#2582
fixes double attack animation #2796: Azure-Peak/Azure-Peak#2796
harddel fixes #2858: Azure-Peak/Azure-Peak#2858
No more infinite brickworks: conjure armor (and a misc others) #2942: Azure-Peak/Azure-Peak#2942
Adds a new intent — Peel #1876: Azure-Peak/Azure-Peak#1876
Adds an integrity damage factor to weapons #2204: Azure-Peak/Azure-Peak#2204
Reworks Blunt Damage, Adds Mordhau Grip #2226: Azure-Peak/Azure-Peak#2226
Adds armor defines #2557: Azure-Peak/Azure-Peak#2557
Peasant Militia Weapon Pack #2187: Azure-Peak/Azure-Peak#2187
Adds Dodge control and a chance to take parry damage for dodge users #2240: Azure-Peak/Azure-Peak#2240
fixes whetstone recipe again #2246: Azure-Peak/Azure-Peak#2246
Adds in three new melee weapons (Greataxe, Steel Greataxe, and double-headed steel greataxe) #2063: Azure-Peak/Azure-Peak#2063
Adds a conjured shaft to conjured weapons #2318: Azure-Peak/Azure-Peak#2318
Adds Guard Stance, Disarming and Weapon Clashes #2531: Azure-Peak/Azure-Peak#2531
There was also one fix in the orbiter.dm file
The "TRUE" at the end lets it override errors, which wisps were giving because they were updating the glide size. I didn't see any negative effects and this was from a prior PR
Testing Evidence
See the above, but this is a large one, so test merging is recommended.
Why It's Good For The Game
fixes errors, new animations, new weapons, and better combat intents.