Skip to content

[Test Merge] Attack animations, mage armor fix, block changes, new fight intents, …#359

Merged
unit0016 merged 6 commits intoNovaSector:mainfrom
Juubo:attack-animations
Aug 8, 2025
Merged

[Test Merge] Attack animations, mage armor fix, block changes, new fight intents, …#359
unit0016 merged 6 commits intoNovaSector:mainfrom
Juubo:attack-animations

Conversation

@Juubo
Copy link
Copy Markdown
Contributor

@Juubo Juubo commented Aug 5, 2025

…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
image

image

mage weapons only give one at a time.
image
image

as do mage bricks
image
image

new peel intent, to strip armor integrity
image

and a new ring that acts as mages armor
image
image
image

(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

RegisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, PROC_REF(orbiter_glide_size_update), TRUE)

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.

Juubo added 2 commits August 5, 2025 14:57
…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.
@Juubo Juubo requested a review from unit0016 as a code owner August 5, 2025 19:12
@Juubo Juubo changed the title attack animations, mage armor fix, block changes, new fight intents, … [Test Merge] Attack animations, mage armor fix, block changes, new fight intents, … Aug 5, 2025
@unit0016 unit0016 added the Test Merged This is currently test-merged on the server label Aug 5, 2025
@github-actions github-actions bot added the has conflicts There's conflicts :( label Aug 5, 2025
@unit0016 unit0016 merged commit 525a683 into NovaSector:main Aug 8, 2025
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Balance Code has conflicts There's conflicts :( Sound Sprite Test Merged This is currently test-merged on the server

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants