diff --git a/rsrc/scenarios/tutorial/scenario.spec b/rsrc/scenarios/tutorial/scenario.spec index febe0082..58f28dfa 100644 --- a/rsrc/scenarios/tutorial/scenario.spec +++ b/rsrc/scenarios/tutorial/scenario.spec @@ -1,10 +1,10 @@ -@status = 0 +@select-pc = 0 sdf -1, -1 msg 0, 1, -1 pic 0, 4 - ex1 3, 1, 7 - ex2 258, -1, -1 - goto 1 + ex1 0, -1, 7 + ex2 1, -1, -1 + goto 2 @change-ter = 1 sdf -1, -1 msg -1, -1, -1 @@ -12,3 +12,10 @@ ex1 -10, -11, -1 ex2 259, -1, -1 goto -1 +@status = 2 + sdf -1, -1 + msg 0, 1, -1 + pic 0, 4 + ex1 3, 1, 7 + ex2 258, -1, -1 + goto 1 diff --git a/rsrc/scenarios/tutorial/scenario.xml b/rsrc/scenarios/tutorial/scenario.xml index fa343fc4..4746bd60 100644 --- a/rsrc/scenarios/tutorial/scenario.xml +++ b/rsrc/scenarios/tutorial/scenario.xml @@ -100,6 +100,10 @@ party cleaned webs spider combat done gave piece + archery message + mage spells message + priest spells combat message + spell help message looked at book book node entry message diff --git a/rsrc/scenarios/tutorial/towns/town0.map b/rsrc/scenarios/tutorial/towns/town0.map index 28fba768..13925f19 100644 --- a/rsrc/scenarios/tutorial/towns/town0.map +++ b/rsrc/scenarios/tutorial/towns/town0.map @@ -10,20 +10,20 @@ 112,112,112,112,112,170,170,170,170,170,170,170,170,170,170,170,170,170,122,170,170,170:5,133,170,170,170,122,170,170,170,122,170,170,170,170,170,170,170,170,170,170,170,170,112,112,112,112,112 112,112,112,112,112,170,170,170,170,170,170,170,170,170,170,170,170,170,136,170,170,170:5,138,170,170:6&9,170,138,170,170,170,136,170,170,170,170,170,170,170,170,170,170,170,170,112,112,112,112,112 112,112,112,112,112,170,170,170,170,170,170,170,170,122,122,122,122,122,122,125,122,122,122,122,130,122,122,122,122,125,122,122,122,122,122,122,170,170,170,170,170,170,170,112,112,112,112,112 -112,112,112,112,112,170,170,122,122,122,122,122,122,122,174,170,170,170,170,170,170,170,170,170,170,170,170,257,170,170,170,170,170,170,174,122,170,170,170,170,170,170,170,112,112,112,112,112 -112,112,112,112,112,170,170,122,197,197,170,170,170,125:7,170,170,170,170,170,170,170,170,170,170,170:10&9,170,170,257,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 -112,112,112,112,112,170,170,122,185,183,170,197,197,122,170,170,174,122,122,122,122,122,122,136,130,136,122,122,122,122,122,122,174,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 -112,112,112,112,112,170,170,122,195,195,170,185,183,122,257,257,170,122,2,2,2,115,2,111,2,2,3,111,111,2,111,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 -112,112,112,112,112,170,170,122,170,170,170,195,195,122,170,257,257,122,111,2,111,2,2,2,3,111,2,3,114,115,111,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 -112,112,112,112,112,170,170,122,129:8,122,122,122,122,122,170,170,170,122,114,3,3,111,2,115,2,2,111,2,111,2,114,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 -112,112,112,112,112,170,170,122,171,171&10,178@5,177,177,122,170,170,170,122,111,2,111,56,55,55,55,55,55,55,55,54,111,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 -112,112,112,112,112,170,170,122,170&10,170,170&10,170$1,170$2,122,170,170,170,122,2,111,2,57,50,50,62,51,59,50,50,53,2,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 -112,112,112,112,112,170,170,122,202,202,170@6$0,170&10,170:19&10&9,134,170,170,170,122,2,2,111,57,50,50,53,2:24&9,58,59,50,53,111,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 -112,112,112,112,112,170,170,122,122,122,122,122,122,122,170,170,170,122,111,111,2,58,51,51,52,111,111,58,51,52,2,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 +112,112,112,112,112,170,122,122,122,122,122,122,122,122,174,170,170,170,170,170,170,170,170,170,170,170,170,257,170,170,170,170,170,170,174,122,170,170,170,170,170,170,170,112,112,112,112,112 +112,112,112,112,112,170,122,170,197,197,170,170,170,125:7,170,170,170,170,170,170,170,170,170,170,170:10&9,170,170,257,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 +112,112,112,112,112,170,122,198,185,183,170,197,197,122,170,170,174,122,122,122,122,122,122,136,130,136,122,122,122,122,122,122,174,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 +112,112,112,112,112,170,122,170,195,195,170,185,183,122,257,257,170,122,2,2,2,115,2,111,2,2,3,111,111,2,111,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 +112,112,112,112,112,170,122,170,170,170,170,195,195,122,170,257,257,122,111,2,111,2,2,2,3,111,2,3,114,115,111,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 +112,112,112,112,112,170,122,122,129:8,122,122,122,122,122,170,170,170,122,114,3,3,111,2,115,2,2,111,2,111,2,114,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 +112,112,112,112,112,170,122,171:37,171:37,171:37&10,178@5,177,177,122,170,170,170,122,111,2,111,56,55,55,55,55,55,55,55,54,111,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 +112,112,112,112,112,170,122,170,170&10,170,170&10,170$1,170$2,122,170:48,170,170,122,2,111,2,57,50,50,62,51,59,50,50,53,2,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 +112,112,112,112,112,170,122,170,202,202,170@6$0,170&10,170:19&10&9,134,170:48,170,170,122,2,2,111,57,50,50,53,2:24&9,58,59,50,53,111,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 +112,112,112,112,112,170,122,122,122,122,122,122,122,122,170:48,170,170,122,111,111,2,58,51,51,52,111,111,58,51,52,2,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 112,112,112,112,112,170,170,170,170,170,170,170,170,122,170,170,170,122,114,2,111,2,2,111,2,111,2,2,111,2,2,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 112,112,112,112,112,170,170,170,170,170,170,170,170,122,170,170,170,122,2,111,2,2,111,2,111,2,2,2,2,2,111,122,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 112,112,112,112,112>,170,170,170,170,170,170,170,170,122,170,170,174,122,122,122,122,122,122,122,136,130,136,122,122,122,122,122,174,170,170,122,170,170,170,170,170,170,170,112<,112,112,112,112 -112,112,112,112,112,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,170,170,208:27,170:25&9,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 +112,112,112,112,112,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,170,170,208:28,170:25&9,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,112,112,112,112,112 112,112,112,112,112,170,170,170,170,170,170,170,170,122,174,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,174,122,170,170,170,170,170,170,170,112,112,112,112,112 112,112,112,112,112,170,170,170,170,170,170,170,170,122,122,122,122,122,122,122,122,122,122,122,122,125,122,122,122,122,122,122,122,122,122,122,170,170,170,170,170,170,170,112,112,112,112,112 112,112,112,112,112,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122,204:30,170:30,204:30,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,112,112,112,112,112 diff --git a/rsrc/scenarios/tutorial/towns/town0.spec b/rsrc/scenarios/tutorial/towns/town0.spec index 98d5de9c..68904386 100644 --- a/rsrc/scenarios/tutorial/towns/town0.spec +++ b/rsrc/scenarios/tutorial/towns/town0.spec @@ -194,11 +194,11 @@ ex1 25, 24, -1 ex2 131, -1, -1 goto -1 -@nop = 28 +@lever-generic = 28 sdf -1, -1 msg -1, -1, -1 pic 0, 4 - ex1 -1, -1, -1 + ex1 -1, 27, -1 ex2 -1, -1, -1 goto -1 @change-ter = 29 @@ -257,3 +257,87 @@ ex1 1, 0, -1 ex2 -1, -1, -1 goto -1 +@if-context = 37 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 2, -1, 45 + ex2 -1, -1, -1 + goto 46 +@if-statistic = 38 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 2, 39, -1 + ex2 9, -1, -1 + goto 40 +@once-dlog = 39 + sdf 0, 9 + msg 57, -1, 1 + pic 25, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto 42 +@if-statistic = 40 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 4, 41, -1 + ex2 7, -1, -1 + goto 43 +@once-dlog = 41 + sdf 0, 8 + msg 63, -1, 1 + pic 57, 7 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@nop = 42 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@if-statistic = 43 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 3, 44, -1 + ex2 10, -1, -1 + goto -1 +@once-dlog = 44 + sdf 0, 0 + msg 69, -1, 1 + pic 26, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@block-move = 45 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 0, -1, -1 + ex2 1, -1, -1 + goto 38 +@if-sdf = 46 + sdf 0, 6 + msg -1, -1, -1 + pic 0, 4 + ex1 1, -1, -1 + ex2 -1, -1, -1 + goto 47 +@block-move = 47 + sdf -1, -1 + msg 75, -1, -1 + pic 0, 4 + ex1 1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@once-dlog = 48 + sdf 0, 11 + msg 76, -1, 1 + pic 14, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 diff --git a/rsrc/scenarios/tutorial/towns/town0.xml b/rsrc/scenarios/tutorial/towns/town0.xml index b6607a69..977eae44 100644 --- a/rsrc/scenarios/tutorial/towns/town0.xml +++ b/rsrc/scenarios/tutorial/towns/town0.xml @@ -65,7 +65,7 @@ 9 - + @@ -94,9 +94,6 @@ - - - @@ -154,4 +151,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + +