From 1ec9d8d43335596171a903ddee73182a02feadb5 Mon Sep 17 00:00:00 2001
From: MarcelineVQ <marcythevq@gmail.com>
Date: Mon, 2 Mar 2026 04:23:56 -0800
Subject: [PATCH] =?UTF-8?q?Smooth=20Stand=E2=86=92Hold=20animation=20trans?=
 =?UTF-8?q?ition=20with=20100ms=20blend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Set Hold blendTime=100ms in all 5 M2 files (was 0ms, causing jarring snap)
- Play Hold 100ms before Stand ends (3900ms) for overlap blend
- Set Stand.nextAnim=1, Hold.nextAnim=1 in M2 data for engine chaining
- Revert Hold duration from 300000ms (test residue) back to 4000ms
---
 src/markers/assets/Spells/Raid_UI_FX_Cyan.m2  | Bin 43308 -> 43308 bytes
 src/markers/assets/Spells/Raid_UI_FX_Green.m2 | Bin 43311 -> 43311 bytes
 .../assets/Spells/Raid_UI_FX_Purple.m2        | Bin 43177 -> 43177 bytes
 src/markers/assets/Spells/Raid_UI_FX_Red.m2   | Bin 43168 -> 43168 bytes
 .../assets/Spells/Raid_UI_FX_Yellow.m2        | Bin 43308 -> 43308 bytes
 src/markers/markers.zig                       |   2 +-
 6 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/markers/assets/Spells/Raid_UI_FX_Cyan.m2 b/src/markers/assets/Spells/Raid_UI_FX_Cyan.m2
index 8787fdef91edf9bbda8ed388df4202d05a7d98e5..5ed1e6f1e00f869926a966df28f42dd79db06fab 100644
GIT binary patch
delta 20
ccmZ2;iD}IxrVS?<8B-?nG0AU!$>_Ws09<kiDF6Tf

delta 18
acmZ2;iD}IxrVS?<C$};xZGO$@xEugePzXH$

diff --git a/src/markers/assets/Spells/Raid_UI_FX_Green.m2 b/src/markers/assets/Spells/Raid_UI_FX_Green.m2
index 73e46f67932faefe3048c85bd3159bb01978a94f..c6f49122f8d1a5cba897dd8a2d802947c41424f4 100644
GIT binary patch
delta 20
ccmZ2~iD~^MrVXbU8B-?nGs$m$#pt>m09^hEGynhq

delta 18
acmZ2~iD~^MrVXbUC$}*wZGOY(yc_^i&Im{V

diff --git a/src/markers/assets/Spells/Raid_UI_FX_Purple.m2 b/src/markers/assets/Spells/Raid_UI_FX_Purple.m2
index 4dfeefe6a57aa8ee7882e98028e92f0852a137d1..d85f32a28c72eceaf6e5d7eb204bda24db4e02bd 100644
GIT binary patch
delta 20
ccmZ2^k!j^crVXbV8B-<;Fv)Lz&A4wF09^+Np#T5?

delta 18
acmZ2^k!j^crVXbVC$}>yZGOwRXBhxf@d&j5

diff --git a/src/markers/assets/Spells/Raid_UI_FX_Red.m2 b/src/markers/assets/Spells/Raid_UI_FX_Red.m2
index 1acf4c29d91673b65b4f53d34cf85cee826800c5..205c5f5582cee1192bf4d6adbd8ad66be77ed015 100644
GIT binary patch
delta 20
ccmZ2*k!it2rVS?;8B-?nGRbd#!MI}?09#`SfB*mh

delta 18
acmZ2*k!it2rVS?;C$}&vZGOeLZ5aSkcL<aK

diff --git a/src/markers/assets/Spells/Raid_UI_FX_Yellow.m2 b/src/markers/assets/Spells/Raid_UI_FX_Yellow.m2
index d1c9474457c5f96d9f27a62385f537306c6884fd..28044b2cb55a48cc92a3cb1a652ba7a34ee8c115 100644
GIT binary patch
delta 20
ccmZ2;iD}IxrVXbV8B-<;Fv)Lz&FHus09>F5EdT%j

delta 18
acmZ2;iD}IxrVXbVC$}>yZGOvWzZ?KldI&)P

diff --git a/src/markers/markers.zig b/src/markers/markers.zig
index d118517..62596b9 100644
--- a/src/markers/markers.zig
+++ b/src/markers/markers.zig
@@ -67,7 +67,7 @@ var marker_entities: [NUM_MARKERS]?*anyopaque = .{null} ** NUM_MARKERS;
 var marker_created_tick: [NUM_MARKERS]u32 = .{0} ** NUM_MARKERS;
 var hold_queued: [NUM_MARKERS]bool = .{false} ** NUM_MARKERS;
 
-const STAND_DURATION_MS: u32 = 4000;
+const STAND_DURATION_MS: u32 = 3900;
 
 // Entities playing their Decay animation before destruction.
 // Cleaned up every frame by luaProcessAnimations (via Lua OnUpdate).