Feature qvn1

.gitignore

@@ -5,3 +5,4 @@ maps/*.backup2
 maps/*.backup3
 [Bb]in
 *.db
+*.danproj

GLDEFS.txt

@@ -1 +1,2 @@
-#include "gldefs/staticlite.txt"
+#include "gldefs/staticlite.txt"
+#include "gldefs/skybox.txt"

QDIALOG.acs

@@ -9,10 +9,8 @@
 #include "zcommon.acs"
 #import "qvn.acs"
 
-str setstate;
 str dialnext;
-str chresult;
-int fromchoice = 0;
+int fromchoice;
 int radioinit;
 int radiofirst;
 str radiosecond;
@@ -24,41 +22,36 @@ str radiosecond;
 //
 //DIAL <TEXT> <NEXT>
 //CHOI <CHOICES STRING>
-//PORT <TYPE> <PORTRAIT STRING> <NEXT>
+//PORT <PORTRAIT STRING> <NEXT>
+//CMND <NAMED SCRIPT> <NEXT>
 //
 //For choices, do not mention a next number
 //since you could use DIAL to lead to the next
 //string sets.
 //
 
 Script "DoDialog" (int Text){
-	log(s:"DoDialog");
+	log(s:"\n----\nDoDialog");
 	Delay(1);	
 	str findialog;
-	str inittext, pretext;
-	str com, first, second, third;
+	str pretext;
+	str com, first;
+	int initlen;
 	int strl;
 
-	If(dialnext == "0END"){
-		log(s:"at end");
-		ACS_NamedExecute("VN_Stop",0);
-    VN_CurrentChoice = 0;
-		SetResultValue (2);
-		terminate;
-	}
-
 	If (VN_DisplayState == 1){
 		findialog = StrParam(l:Text);
-		pretext = StrMid(Text, 0, 5);
+		initlen = StrLen(Text)-4;
+		pretext = StrLeft(Text, initlen);
 		com = StrMid(findialog,0,4);
-		log(s:com);
+		log(s:"> com = ",s:com);
 
 		if (com == "DIAL"){
 			strl = StrLen(findialog)-10;
 			first = StrMid(findialog,5,strl);
 			if (radioinit){
 				Delay(1);
-				ACS_NamedExecuteWait("VN_Parser",0,first);
+				ACS_NamedExecuteWait("VN_Parser",0,first,True);
 				//Draw the radio portrait first if radio is used.
 				ACS_NamedExecute("VN_DrawPortrait",0,radiofirst);
 			} 
@@ -69,74 +62,102 @@ Script "DoDialog" (int Text){
 			first = StrMid(findialog,5,strl);
 			Delay(3);
 			ACS_NamedExecuteWait("VN_DrawPortrait",0,first);
-			if (VN_CurrentState){
+			if (VN_currentState){
 				radioinit = true;
 				radiofirst = first;		
 			}
 		}else if (com == "CHOI"){
+			fromchoice = 0;
 			strl = StrLen(findialog)-5;
 			first = StrMid(findialog,5,strl);
-			second = "NULL";
 			dialnext = Text;
 			Delay(3);
 			ACS_NamedExecuteWithResult("VN_DrawChoices",first);
-			chresult = VN_ChoiceNext;
-			Log(s:"chresult = ",s:chresult);
+		}else if (com == "CMND"){
+			strl = StrLen(findialog)-10;
+			first = StrMid(findialog,5,strl);
+			log(s:"> command = ",s:first);
+			ACS_NamedExecute(first,0);
 		}else{
 			log(s:"QDIALOG - Corrupted.");
 			terminate;
 		}
 
 		if (com != "CHOI"){
-			if (StrRight(findialog,4) != "0END") dialnext = StrParam(s:pretext,s:StrRight(findialog,4));
-			else dialnext = StrRight(findialog,4);
+			dialnext = StrParam(s:pretext,s:StrRight(findialog,4));
 		}
-		log(s:"findialog = ",s:findialog);
-		log(s:"first = ",s:first);
-		log(s:"second = ",s:second);
-		log(s:"dialnext = ",s:dialnext);
 
-		if (com == "PORT") ACS_NamedExecute("DoDialogCatch",0);
-	}Else Log(s:"QDIALOG - QVN is not initialized! Check script if VN_Show function is called!");
+		log(s:"> findialog = ",s:findialog);
+		log(s:"> first = ",s:first);
+		log(s:"> dialnext = ",s:dialnext);
+		Delay(1);
+
+		If(StrRight(findialog,4) == "0END" && com == "CMND"){
+			log(s:"> Ending ...");
+			ACS_NamedExecute("VN_Stop",0);
+			VN_currentChoice = 0;
+			SetResultValue (2);
+			terminate;
+		}
+
+		if (com == "PORT" || com == "CMND") ACS_NamedExecute("DoDialogCatch",0);
+		Delay(1);
+
+	}Else{
+		Log(s:"QDIALOG - QVN is not initialized! Check script if VN_Show function is called!");
+		Terminate;
+	}
 
+	ACS_NamedExecuteWait("VN_Update",0);
 	Delay(1);
-  If(VN_CurrentState == 2){
-      if(chstate != 3){
-      		Delay(1);
-          ACS_NamedExecuteWait("VN_Update",0);
-          Log(s:"Break - Moving pointer");
-      }else{
-          chstate = 0;
-          fromchoice = 1;
-          Log(s:"Break - Pressed enter");
-      }
-  }Else If(com != "PORT"){
-  	Delay(1);
-    ACS_NamedExecuteWait("VN_Update",0);
-    Log(s:"Break");
-  }
+
+	If(VN_currentState == 2){
+		Log(s:"> VN_choiceState = ",i:VN_choiceState);
+		if(VN_choiceState == 3){
+			fromchoice = 1;
+			Log(s:">> Break - Pressed enter");
+		}else{
+			Log(s:">> Break - Moving pointer");
+		}
+	}Else{
+		Log(s:">> Break");
+	}
+
+	If(StrRight(findialog,4) == "0END" && com != "CMND"){
+		log(s:"> Ending ...");
+		ACS_NamedExecute("VN_Stop",0);
+		VN_currentChoice = 0;
+		SetResultValue (2);
+		terminate;
+	}
+
 	ACS_NamedExecute("DoDialogCatch",0);
 }
 
 Script "DoDialogCatch" (void){
+	ACS_NamedTerminate("DoDialog",0);
+	ACS_NamedTerminate("VN_KeyInput",0);
+	Log(s:"DoDialogCatch");
     Delay(1);
-    if (!fromchoice){
-    	Log(s:"dialnext = ",s:dialnext);
-    	ACS_NamedExecute("DoDialog",0,dialnext);
+	log (s:"> VN_currentState = ",i:VN_currentState);
+	log (s:"> vnPrevState = ",i:vnPrevState);
+    if (fromchoice == 1){
+		VN_currentState = vnPrevState;
+		vnPrevState = 0;
+		fromchoice = 0;
+		VN_choiceState = 0;
+		VN_Show(VN_currentState);
+		Delay(1);
+		ACS_NamedExecute("DoDialog",0,VN_choiceNext);			
     }else{
-		 	fromchoice = 0;
-		 	Log(s:"chresult = ",s:chresult);
-		 	Log(s:"setstate = ",i:setstate);
-		 	VN_Show(setstate);
-		 	ACS_NamedExecute("DoDialog",0,chresult);
-		}
+		Log(s:"> dialnext = ",s:dialnext);
+    	ACS_NamedExecute("DoDialog",0,dialnext);
+	}
 }
 
 Function void QD_Init (int type){
-    setstate = type;
     dialnext = "";
-    chresult = "";
-		radioinit = false;
+	radioinit = false;
 
     VN_Show(type);
 }

code/weapons/stunner.txt

@@ -56,26 +56,34 @@ ACTOR Stunner : Weapon
 			TNT1 A 1 A_Lower
 			TNT1 A 0 A_Lower
 			Loop
+
 		Fire: //Stun
 			TAZR D 2 Offset(35, 33)
 			TAZR D 2 Offset(81, 59)
 			TAZR G 1 Offset(120, 105)
-			TNT1 A 5 Offset(120, 105)A_WeaponReady
+			Goto StartFire
+
+		StartFire:
+			TNT1 A 5 Offset(-13, 151) A_WeaponReady(WRF_NOBOB)
 
 			TAZR E 1 Offset(56, 87)
 			TAZR E 1 Offset(35, 57)
 			TNT1 A 0 A_PlaySound("weapons/nikkiattack")
 			TAZR F 8 Offset(-11, 2) A_Saw("weapons/stunnerhit","weapons/stunnerhit", 4, "StunnerDummy")
-			TAZR F 2 Offset(1, 12)
+			TAZR F 4 Offset(1, 12)
 			TAZR F 2 Offset(34, 49)
 			TAZR E 1 Offset(48, 61)
 			TAZR E 1 Offset(112, 97)
 
-			TNT1 A 5 Offset(-13, 151) A_Refire
+			TNT1 A 5 Offset(-13, 151) A_Refire("StartFire")
+			Goto FinishFire	
+
+		FinishFire:
 			TAZR D 1 Offset(0, 99)
 			TAZR D 2 Offset(0, 64)
-			TAZR D 2 Offset(0, 20) 
-			Goto Bobbing
+			TAZR D 2 Offset(0, 20)
+			Goto Bobbing 
+
 		AltFire: //Melee
 			TAZR D 2 Offset(35, 33)
 			TAZR D 2 Offset(81, 59)

gldefs/skybox.txt

@@ -0,0 +1,9 @@
+Skybox VPCLS fliptop
+{
+  VPCLS_N
+  VPCLS_E
+  VPCLS_S
+  VPCLS_W
+  VPCLS_T
+  VPCLS_B
+}