Stun Expiration

TemplePlus/condition.cpp

@@ -324,6 +324,7 @@ class ConditionFunctionReplacement : public TempleFix {
 	static int ManyShotDamage(DispatcherCallbackArgs args);
 
 	static bool StunningFistHook(objHndl objHnd, objHndl caster, int DC, int saveType, int flags);
+	static int StunnedInitiativeUpdate(DispatcherCallbackArgs args);
 
 	static int AnimalCompanionLevelHook(objHndl, Stat shouldBeClassDruid);
 
@@ -573,6 +574,9 @@ class ConditionFunctionReplacement : public TempleFix {
 		// Stunning Fist extension
 		redirectCall(0x100E84B0, StunningFistHook);
 
+		// Fix Stunned countdown
+		replaceFunction<int(DispatcherCallbackArgs)>(0x100E9500, StunnedInitiativeUpdate);
+
 		// Animal Companion Bonus Levels Extension
 		redirectCall(0x100FC18C, AnimalCompanionLevelHook);
 		redirectCall(0x100FC2D6, AnimalCompanionLevelHook);
@@ -4117,6 +4121,48 @@ bool ConditionFunctionReplacement::StunningFistHook(objHndl objHnd, objHndl cast
 	return result;
 }
 
+int ConditionFunctionReplacement::StunnedInitiativeUpdate(DispatcherCallbackArgs args){
+	GET_DISPIO(dispIoTypeSendSignal, DispIoD20Signal);
+
+	auto newInit = dispIo->data1;
+	auto oldInit = dispIo->data2;
+
+	// We shouldn't get initiative updates for turns with the same
+	// initiative. In case we do, exit, because the logic below acts as
+	// if an entire round has ticked in that case.
+	if (newInit == oldInit) return 0;
+
+	auto durIx = args.GetData1();
+	auto initIx = args.GetData2();
+
+	auto duration = args.GetCondArg(durIx);
+	auto tickOn = args.GetCondArg(initIx);
+
+	if (oldInit < newInit) {
+		// Initiative wrapping around from N to N+K, so don't tick
+		// if the target is in the interval [N,N+K)
+		if (newInit > tickOn && tickOn >= oldInit) {
+			return 0;
+		}
+	}
+	else {
+		// Initiative counting down from N+K to N, so don't tick unless
+		// the target is in the interval [N,N+K)
+		if (oldInit <= tickOn || tickOn < newInit) {
+			return 0;
+		}
+	}
+
+	if (duration <= 1) {
+		args.RemoveCondition();
+	}
+	else {
+		args.SetCondArg(durIx, duration-1);
+	}
+
+	return 0;
+}
+
 
 int ConditionFunctionReplacement::TurnUndeadHook(objHndl handle, Stat shouldBeClassCleric, DispIoD20ActionTurnBased * evtObj){
 

TemplePlus/turn_based.cpp

@@ -120,8 +120,15 @@ void TurnBasedSys::InitiativeListNextActor()
 				dispatch.DispatcherProcessor(dispatcher, dispTypeInitiative, 0, 0);
 			}	
 		}
-		actorInitiative = nextInitiativeIdx = 0;
-		InitiativeRefresh(actorInitiative, 0);
+		nextInitiativeIdx = 0;
+
+		// If initiative hasn't already counted down to 0 (or less), make
+		// that happen. Original always counted to 0 here, but that is
+		// problematic.
+		if (actorInitiative > 0) {
+			InitiativeRefresh(actorInitiative, 0);
+			actorInitiative = 0;
+		}
 	}
 
 	objHndl actorNext = objHndl::null;