fix guard repositioning logic

rsrc/scenarios/tutorial/scenario.xml

@@ -120,7 +120,7 @@
         <sdf row="1" col="3">exit message</sdf>
         <sdf row="1" col="4">artifact pieces</sdf>
         <sdf row="2" col="0">piece given</sdf>
-        <sdf row="2" col="1">guard patrol dx</sdf>
+        <sdf row="2" col="1">guard patrol direction</sdf>
         <sdf row="2" col="2">guard patrol dy</sdf>
         <sdf row="2" col="3">guard patrol start</sdf>
         <sdf row="2" col="4">close the door!</sdf>

rsrc/scenarios/tutorial/towns/town2.map

@@ -9,7 +9,7 @@
 2,2,2,2,2,2,2,2,2:2,122,170:19,170,170,170,122,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,57,50,50,50
 2,2,2,2,122,122,122,122,122,122,170:4,170:4,170:4,170,122,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,57,50,50,50
 2,2,2,2,122,2,2,2,2,122,122,260,122,122,122,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,57,50,50,50
-2,2,2,2,122,2,2,2,2,122,170,170,170,170,122,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,57,50,50,50
+2,2,2,2,122,2,2,2,2,122,170:12,170:12,170:12,170,122,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,57,50,50,50
 2,2,2,2,2,2,2,2,2,122,170,170,170,170,122,122,122,122,122,122,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,57,50,50,50
 2,2,2,2,2,2,2,2,2,122,170,170,170,170,138,170$1,170,170,170,122,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,57,50,50,50
 2,2,2,2,2,2,2,2,2,122,170,170,170,170,122,170,170,170,170,122,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,57,50,50,50

rsrc/scenarios/tutorial/towns/town2.spec

@@ -79,8 +79,8 @@
 	sdf -1, -1
 	msg -1, -1, -1
 	pic 0, 4
-	ex1 -101, -102, -1
-	ex2 1, 1, -1
+	ex1 2, 4, -1
+	ex2 101, -101, -1
 	goto 16
 @set-ptr = 12
 	sdf 2, 1
@@ -89,39 +89,39 @@
 	ex1 101, -1, -1
 	ex2 -1, -1, -1
 	goto 13
-@set-ptr = 13
-	sdf 2, 2
+@set-sdf = 13
+	sdf 2, 1
 	msg -1, -1, -1
 	pic 0, 4
-	ex1 102, -1, -1
+	ex1 1, -1, -1
 	ex2 -1, -1, -1
-	goto 14
+	goto -1
 @set-sdf = 14
 	sdf 2, 1
 	msg -1, -1, -1
 	pic 0, 4
-	ex1 2, -1, -1
-	ex2 -1, -1, -1
-	goto 15
-@set-sdf = 15
-	sdf 2, 2
-	msg -1, -1, -1
-	pic 0, 4
-	ex1 4, -1, -1
+	ex1 3, -1, -1
 	ex2 -1, -1, -1
 	goto -1
-@sdf-times = 16
+@if-sdf = 15
 	sdf 2, 1
 	msg -1, -1, -1
 	pic 0, 4
-	ex1 2, 1, -1
+	ex1 3, 13, -1
 	ex2 -1, -1, -1
-	goto 17
-@sdf-times = 17
-	sdf 2, 2
-	msg -1, -1, -1
+	goto 14
+@disp-sm-msg = 16
+	sdf -1, -1
+	msg 26, -1, -1
 	pic 0, 4
-	ex1 2, 2, -1
+	ex1 -1, -1, -1
+	ex2 -1, -1, -1
+	goto 15
+@nop = 17
+	sdf -1, -1
+	msg -1, -1, -1
+	pic -1, 4
+	ex1 -1, -1, -1
 	ex2 -1, -1, -1
 	goto -1
 @if-sdf = 18
@@ -138,3 +138,10 @@
 	ex1 -1, -1, -1
 	ex2 -1, -1, -1
 	goto -1
+@nop = 20
+	sdf -1, -1
+	msg -1, -1, -1
+	pic 0, 4
+	ex1 -1, -1, -1
+	ex2 -1, -1, -1
+	goto -1

rsrc/scenarios/tutorial/towns/town2.xml

@@ -68,5 +68,7 @@
     <string id="22">
         <![CDATA[To give an item from one character to another click the button with a 'G' next to the lockpicks. Select Frrrrrr, who is your best lockpicker right now. Then make sure they're equipped.]]>
     </string>
-    <string id="25" />
+    <string id="26">
+        <![CDATA[The guard changes positions.]]>
+    </string>
 </town>