dragonscript: added noDelayWait action mode

LordOfDragons · Mar 3, 2025 · 59edad3 · 59edad3
1 parent 283a5d0
commit 59edad3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/modules/scripting/dragonscript/scripts/conversation/simple/SimpleConversationAction.ds b/src/modules/scripting/dragonscript/scripts/conversation/simple/SimpleConversationAction.ds
@@ -265,6 +265,9 @@ class SimpleConversationAction
 		/** Use 0 second delay for actor camera change and speak. */
 		noDelay
 
+		/** Use 0 second delay for actor camera change and speak and no waiting. */
+		noDelayWait
+
 		/** Do not change camera. */
 		noCamera
 

diff --git a/...modules/scripting/dragonscript/scripts/conversation/simple/SimpleConversationConverter.ds b/...modules/scripting/dragonscript/scripts/conversation/simple/SimpleConversationConverter.ds
@@ -532,16 +532,18 @@ class SimpleConversationConverter
 	protected func void applyCameraWaitMode(State state, ConversationAction action, Enumeration mode)
 		select state.waitMode
 		case SimpleConversationAction.WaitMode.waitSpeak,\
-		SimpleConversationAction.WaitMode.waitCameraSpeak
-			action.setWaitSpeakOnly(true)
+			SimpleConversationAction.WaitMode.waitCameraSpeak
+				action.setWaitSpeakOnly(true)
 
 		case SimpleConversationAction.WaitMode.noWait
 			action.setWaitForActor(false)
 		end
 
-		if mode == SimpleConversationAction.SpecialMode.noCameraDelayWait
-			action.setWaitSpeakOnly(false)
-			action.setWaitForActor(false)
+		select mode
+		case SimpleConversationAction.SpecialMode.noCameraDelayWait,\
+			SimpleConversationAction.SpecialMode.noDelayWait
+				action.setWaitSpeakOnly(false)
+				action.setWaitForActor(false)
 		end
 	end
 
@@ -864,6 +866,7 @@ class SimpleConversationConverter
 	protected func float cameraDelay(State state, SimpleConversationCamera camera, Enumeration mode)
 		select mode
 		case SimpleConversationAction.SpecialMode.noDelay,\
+			SimpleConversationAction.SpecialMode.noDelayWait,\
 			SimpleConversationAction.SpecialMode.noCameraDelay,\
 			SimpleConversationAction.SpecialMode.noCameraDelayWait
 				return state.pauseTime