diff --git a/rsrc/scenarios/tutorial/scenario.xml b/rsrc/scenarios/tutorial/scenario.xml index 4df32db2..c04c7596 100644 --- a/rsrc/scenarios/tutorial/scenario.xml +++ b/rsrc/scenarios/tutorial/scenario.xml @@ -124,6 +124,11 @@ guard patrol dy guard patrol start close the door! + stopped by window guard + know to ask about patrol + past tired guard + guard paid off + seen boat piece given found boat exit backwoods message diff --git a/rsrc/scenarios/tutorial/towns/talk2.xml b/rsrc/scenarios/tutorial/towns/talk2.xml index 3dbede1f..fadb5c79 100644 --- a/rsrc/scenarios/tutorial/towns/talk2.xml +++ b/rsrc/scenarios/tutorial/towns/talk2.xml @@ -16,16 +16,34 @@ - Unused - - - + Tired Guard + + + + + + + + + + + + - Unused - - - + G + + + + + + + + + + + + Unused @@ -72,10 +90,16 @@ heis vaul - reg + if-sdf + 2 + 5 + 0 + + + tool @@ -90,4 +114,52 @@ + + idea + set-sdf + 2 + 6 + + + + + + patr + duty + set-sdf + 2 + 3 + + + + + + + + + stuc + dead + reg + + + + + + + + + purc + givi + buy-sdf + 400 + 2 + 8 + 1 + + + + + + + diff --git a/rsrc/scenarios/tutorial/towns/town2.map b/rsrc/scenarios/tutorial/towns/town2.map index 9fe42cd1..cbde438b 100644 --- a/rsrc/scenarios/tutorial/towns/town2.map +++ b/rsrc/scenarios/tutorial/towns/town2.map @@ -12,14 +12,14 @@ 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 +2,2,2,2,2,2,2,2,2,122,170:20,170:20,170:20,170:20,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 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 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,112,112,112,112,112,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,112,112,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,138,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,112,2,2,2,2,2,57,50,50,50 -2,2,2,2,2,2,2,2,2,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122,2,2,56,55,55,55,60,50,50,50 -2,2,2,2,2,2,2,2,2,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170:0&9,170,131,2,2,58b1,51,51,51,59,50,50,50 -2,2,2,2,2,2,2,2,2,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122,2,2,2,2,2,2,57,50,50,50 +2,2,2,2,2,2,2,2,2,122,170,170,170,170,170,170,170,170,170:21,170:26,170,170,170:29,122,170,194@0,170,122,170,170,170,170,170,170,170,170,122,122,2:35,2,56,55,55,55,60,50,50,50 +2,2,2,2,2,2,2,2,2,122,170,170,170,170,170,170,170,170,170:27,170:26,170,170,170:29,127,170,170:0&9,170,130,170,170,170,170,170,170,170,170,170$2,123,2:35,2,58b1,51,51,51,59,50,50,50 +2,2,2,2,2,2,2,2,2,122,170,170,170,170,170,170,170,170,170:21,170:26,170,170,170:29,122,170,170,170,122,170,170,170,170,170,170,170,170,122,122,2:35,2,2,2,2,2,57,50,50,50 2,2,2,2,2,2,2,2,2,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,112,2,2,2,2,2,57,50,50,50 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,2,2,2,2,2,2,2,2,2,112,112,112,2,2,2,57,50,50,50 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,2,2,2,2,2,2,2,2,2,2,2,112,112,112,112,57,50,50,50 diff --git a/rsrc/scenarios/tutorial/towns/town2.spec b/rsrc/scenarios/tutorial/towns/town2.spec index eb6a053e..9e12364b 100644 --- a/rsrc/scenarios/tutorial/towns/town2.spec +++ b/rsrc/scenarios/tutorial/towns/town2.spec @@ -1,6 +1,6 @@ @once-give-spec-item = 0 sdf 2, 0 - msg 0, -1, -1 + msg 0, 34, -1 pic 0, 4 ex1 1, 0, -1 ex2 -1, -1, -1 @@ -11,7 +11,7 @@ pic 0, 4 ex1 1, 0, -1 ex2 -1, -1, -1 - goto -1 + goto 31 @if-ter = 2 sdf -1, -1 msg -1, -1, -1 @@ -117,13 +117,13 @@ ex1 -1, -1, -1 ex2 -1, -1, -1 goto 15 -@nop = 17 +@block-move = 17 sdf -1, -1 - msg -1, -1, -1 - pic -1, 4 - ex1 -1, -1, -1 + msg 27, 28, -1 + pic 0, 4 + ex1 1, -1, -1 ex2 -1, -1, -1 - goto -1 + goto 22 @if-sdf = 18 sdf 2, 3 msg -1, -1, -1 @@ -138,9 +138,121 @@ ex1 -1, -1, -1 ex2 -1, -1, -1 goto -1 -@nop = 20 +@if-sdf = 20 + sdf 2, 1 + msg -1, -1, -1 + pic 0, 4 + ex1 3, -1, -1 + ex2 -1, -1, -1 + goto 17 +@if-sdf = 21 + sdf 2, 1 + msg -1, -1, -1 + pic 0, 4 + ex1 3, 17, -1 + ex2 -1, -1, -1 + goto -1 +@set-sdf = 22 + sdf 2, 5 + msg -1, -1, -1 + pic 0, 4 + ex1 1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@if-sdf = 23 + sdf 2, 6 + msg -1, -1, -1 + pic 0, 4 + ex1 1, 24, -1 + ex2 -1, -1, -1 + goto -1 +@disp-msg = 24 + sdf -1, -1 + msg 29, 30, -1 + pic 0, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto 25 +@start-talk = 25 sdf -1, -1 msg -1, -1, -1 + pic 71, 4 + ex1 21, -1, -1 + ex2 -1, -1, -1 + goto -1 +@set-sdf = 26 + sdf 2, 7 + msg -1, -1, -1 + pic 0, 4 + ex1 1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@if-sdf = 27 + sdf 2, 7 + msg -1, -1, -1 + pic 0, 4 + ex1 1, 28, -1 + ex2 -1, -1, -1 + goto 21 +@block-move = 28 + sdf -1, -1 + msg 31, -1, -1 + pic 0, 4 + ex1 1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@if-ter = 29 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 23, 20, -1 + ex2 128, 30, -1 + goto -1 +@disp-msg = 30 + sdf -1, -1 + msg 32, 33, -1 + pic 0, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@change-ter = 31 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 27, 20, -1 + ex2 131, -1, -1 + goto -1 +@if-sdf = 32 + sdf 2, 8 + msg -1, -1, -1 + pic 0, 4 + ex1 1, 33, -1 + ex2 -1, -1, -1 + goto -1 +@destroy-monst = 33 + sdf -1, -1 + msg 35, 36, -1 + pic 0, 4 + ex1 36, 20, -1 + ex2 -1, -1, -1 + goto 34 +@set-sdf = 34 + sdf 2, 8 + msg -1, -1, -1 + pic 0, 4 + ex1 0, -1, -1 + ex2 -1, -1, -1 + goto -1 +@once-dlog = 35 + sdf 2, 9 + msg 37, -1, 1 + pic 0, 19 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@disp-msg = 36 + sdf -1, -1 + msg 43, 36, -1 pic 0, 4 ex1 -1, -1, -1 ex2 -1, -1, -1 diff --git a/rsrc/scenarios/tutorial/towns/town2.xml b/rsrc/scenarios/tutorial/towns/town2.xml index 81033fce..e0401f9d 100644 --- a/rsrc/scenarios/tutorial/towns/town2.xml +++ b/rsrc/scenarios/tutorial/towns/town2.xml @@ -8,10 +8,17 @@ 0 lit - 18 + 18 + 32 + + 0 + 500 + true + true + 19 friendly @@ -23,14 +30,23 @@ 19 friendly 0 - -1 - 31 + 21 + 71 + 23 + + + 19 + friendly + 0 + 22 + 10 + 36 - + @@ -71,4 +87,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +