diff --git a/rsrc/scenarios/tutorial/monsters.xml b/rsrc/scenarios/tutorial/monsters.xml index b03cf218..acb6625d 100644 --- a/rsrc/scenarios/tutorial/monsters.xml +++ b/rsrc/scenarios/tutorial/monsters.xml @@ -1283,6 +1283,7 @@ hostile-a 1 0 + 4 2d4 @@ -1353,6 +1354,7 @@ hostile-a 3 0 + 5 3d8 1d13 @@ -1450,7 +1452,7 @@ - Spectre + Death 60 undead 14 @@ -1934,6 +1936,7 @@ 2 2 2 + 3 0d0 1d10 diff --git a/rsrc/scenarios/tutorial/scenario.spec b/rsrc/scenarios/tutorial/scenario.spec index 58f28dfa..ce4feba7 100644 --- a/rsrc/scenarios/tutorial/scenario.spec +++ b/rsrc/scenarios/tutorial/scenario.spec @@ -19,3 +19,24 @@ ex1 3, 1, 7 ex2 258, -1, -1 goto 1 +@once-dlog = 3 + sdf 3, 3 + msg 2, -1, 1 + pic 74, 3 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@once-dlog = 4 + sdf 3, 2 + msg 8, -1, 1 + pic 55, 3 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@once-dlog = 5 + sdf 3, 4 + msg 14, -1, 1 + pic 58, 3 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 diff --git a/rsrc/scenarios/tutorial/scenario.xml b/rsrc/scenarios/tutorial/scenario.xml index c04c7596..22b21c44 100644 --- a/rsrc/scenarios/tutorial/scenario.xml +++ b/rsrc/scenarios/tutorial/scenario.xml @@ -93,6 +93,25 @@ + + + + + + + + + + + + + + + + + + + 2 @@ -130,6 +149,13 @@ guard paid off seen boat piece given + death message + learned about zombies + learned about imp + learned about ghast + party loop index + saw skill trainer + death gone found boat exit backwoods message resting message diff --git a/rsrc/scenarios/tutorial/terrain.xml b/rsrc/scenarios/tutorial/terrain.xml index 40ccb113..dbc55eab 100644 --- a/rsrc/scenarios/tutorial/terrain.xml +++ b/rsrc/scenarios/tutorial/terrain.xml @@ -6391,4 +6391,30 @@ + + Cave Floor + 0 + 0 + none + 0 + false + false + true + true + 0 + step + none + 0 + -1 + 1 + + monst-block + -1 + 0 + 0 + + + c + + diff --git a/rsrc/scenarios/tutorial/towns/talk3.xml b/rsrc/scenarios/tutorial/towns/talk3.xml index f67f942a..70f489ab 100644 --- a/rsrc/scenarios/tutorial/towns/talk3.xml +++ b/rsrc/scenarios/tutorial/towns/talk3.xml @@ -1,28 +1,64 @@ - Unused - - - + Death + + + + + + + + + + + + - Unused - - - + Healer + + + + + + + + + + + + - Unused - - - + Trainer + + + + + + + + + + + + - Unused - - - + Merchant + + + + + + + + + + + + Unused @@ -60,4 +96,103 @@ + + deat + lost + reg + + + + + + conc + reg + + + + + + + + + norm + kind + reg + + + + + + + + + petr + ston + reg + + + + + + dust + reg + + + + + + + + + situ + heal + shop + 0 + 0 + + + + + + + + + save + relo + reg + + + + + + + + + keep + good + call-local + 23 + + + + trai + purc + train + + + + iden + id + 50 + + + + + + curs + reg + + + + diff --git a/rsrc/scenarios/tutorial/towns/town1.map b/rsrc/scenarios/tutorial/towns/town1.map index fac5811f..5cfae865 100644 --- a/rsrc/scenarios/tutorial/towns/town1.map +++ b/rsrc/scenarios/tutorial/towns/town1.map @@ -14,7 +14,7 @@ 2,2,2,2,2,2,2,2,2,2,122,122,122,122,122,2,2,2,2,2,2,2,2,2 2,2,2,2,2,2,2,2,2,122,122,170,251,170,122,122,122,122,2,2,2,2,2,2 2,2,2,2,2,2,2,2,2,122,187,170,170,170,187,122,122,122,2,2,2,2,2,2 -2,2,2,2,2,2,2,2,2,122,206,170,170,170,170,173:29,251,122,2,2,2,2,2,2 +2,2,2,2,2,2,2,2,2,122,206,170,170,170,170,173:29,251:31,122,2,2,2,2,2,2 2,2,2,2,2,2,2,2,2,122,122,170,170,170,122,132!0,122,122,2,2,2,2,2,2 2,2,2,2,2,2,2,2,2,2,122,122,170:27&9,122,122,2,2,2,2,2,2,2,2,2 2,2,2,2,2,2,2,2,2,2,2,122,131v<^>,122,2,2,2,2,2,2,2,2,2,2 diff --git a/rsrc/scenarios/tutorial/towns/town1.spec b/rsrc/scenarios/tutorial/towns/town1.spec index 99d02294..518c34fd 100644 --- a/rsrc/scenarios/tutorial/towns/town1.spec +++ b/rsrc/scenarios/tutorial/towns/town1.spec @@ -215,3 +215,10 @@ ex1 1, -1, -1 ex2 -1, -1, -1 goto -1 +@end-scen = 31 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 diff --git a/rsrc/scenarios/tutorial/towns/town3.map b/rsrc/scenarios/tutorial/towns/town3.map index 15020754..538cf5d9 100644 --- a/rsrc/scenarios/tutorial/towns/town3.map +++ b/rsrc/scenarios/tutorial/towns/town3.map @@ -8,35 +8,35 @@ 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,6,6,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,0,0,0,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,8,0,0,0,0,0,0,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,0,98,0,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,8,0,0,0$6,0,1,0,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,21,6,6,6,8,0,0,0,0,0,0,0,0,0,0,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,21,6,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,21,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,9,0,0,0,0,0,0,0,14,12,12,12,12,11,0,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,9,0,0,0,0,0,0,0,15,5,5,5,5,20,12,11,0,0,0,0,0,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,9,0,0,0,0,0,14,12,19,5,5,5,5,5,5,20,12,11,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,9,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,20,12,12,11,0,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,9,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,21,8,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -6,6,6,6,6,6,8,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -0,0,0,0,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,21,6,8,0,0,0,0,0,0,0,0,0$2,0,0,0,1,0$8,0,0,98,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,21,8,0,0,1,1,0,0,0$1,0,0,1,0,0,0,0,0,1,0,261,261,261,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,9,0,98,0,0,1,0,0,0,98,0,0,0,0,0$7,0,0,0,1,261,0,0,1,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,9,0,0,1,0,0,0,0,14,12,12,12,12,11,0,0,261,261,261,261,0,0,101@0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,9,0,0,1,1,0,1,0,15,5,5,5,5,20,12,11,261,0,1,0,0:4&9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,9,0,0,0,0,0,14,12,19,5,5,5,5,5,5,20,12,11,0,98,0,0$3,1$4,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,9,1,0,0$0,98,0,15,5,5,5,5,5,5,5,5,5,5,20,12,12,12,12,11,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,9,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,8,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,21,8,0,0,1,14,19,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,1,0:28,0:28,0:28,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +6,6,6,6,6,6,8,1,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +0,0,0,0,0,0,98,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,0,0,0$5,0,98,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 0,0,0,0,0v<^>,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -0,0,0,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,21,8,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -12,12,12,12,12,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +0,0,0,1,0,0,0,0,1,14,19,5,5,5,5,5,5,5,5,5,5,5,21,8,0,98,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +12,12,12,12,12,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,0,0,1,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,0,0,0,98,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,98,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,8,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,8,0,0,0,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,0,0,0,0,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0:0&9,0,0,0,0,0,0,0,14,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 -5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,12,12,12,12,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,8,0,0,0,0,0,0,1,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,8,101@1@2,0,0,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,101@3@10@11@12,0,98,0,0,0,0,0,0,0,98,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +5,5,5,5,5,5,5,5,5,5,21,6,18,9,101@4@5,0,1,1,0$9,0,0,0,0,1,0,0,0,1,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +6,6,6,6,6,6,6,6,6,6,8,0,16,10,0,0:0&9,0,0,0,1,1,0,0,14,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +0,0,0,0,0,0,0,0,0,0,0,0,15,9,101@6@7,107!0,101@8,98,0,1,101@9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 +12,12,12,12,12,12,12,12,12,12,12,12,19,20,12,12,12,12,12,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 diff --git a/rsrc/scenarios/tutorial/towns/town3.spec b/rsrc/scenarios/tutorial/towns/town3.spec index 9f1fdcac..0b274512 100644 --- a/rsrc/scenarios/tutorial/towns/town3.spec +++ b/rsrc/scenarios/tutorial/towns/town3.spec @@ -26,3 +26,192 @@ ex1 25, -1, -1 ex2 -1, -1, -1 goto -1 +@if-monsters-alive = 4 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 0, -1, -1 + ex2 1, -1, -1 + goto 16 +@once-dlog = 5 + sdf -1, -1 + msg 7, -1, 1 + pic 60, 3 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto 6 +@set-ptr = 6 + sdf 3, 1 + msg -1, -1, -1 + pic 0, 4 + ex1 103, -1, -1 + ex2 -1, -1, -1 + goto 19 +@if-alive = 7 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 0, 8, -1 + ex2 -1, -1, -1 + goto 21 +@set-sdf = 8 + sdf 3, 1 + msg -1, -1, -1 + pic 0, 4 + ex1 13, -1, -1 + ex2 -1, -1, -1 + goto 10 +@set-sdf = 9 + sdf 3, 1 + msg -1, -1, -1 + pic 0, 4 + ex1 14, -1, -1 + ex2 -1, -1, -1 + goto 11 +@disp-msg = 10 + sdf -1, -1 + msg 15, -103, -1 + pic 0, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@select-pc = 11 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 0, -1, -1 + ex2 1, -1, -1 + goto 12 +@death = 12 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 0, 1, -1 + ex2 -1, -1, -1 + goto 10 +@call-global = 13 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto 3 +@call-global = 14 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto 4 +@call-global = 15 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto 5 +@if-sdf = 16 + sdf 3, 1 + msg -1, -1, -1 + pic 0, 4 + ex1 1, 30, -1 + ex2 -1, -1, -1 + goto 5 +@disp-msg = 17 + sdf -1, -1 + msg 16, -1, -1 + pic 0, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@select-pc = 18 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 1, -1, -1 + ex2 2, -104, -1 + goto 7 +@set-ptr = 19 + sdf 3, 5 + msg -1, -1, -1 + pic 0, 4 + ex1 104, -1, -1 + ex2 -1, -1, -1 + goto 18 +@nop = 20 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@inc-sdf = 21 + sdf 3, 5 + msg -1, -1, -1 + pic 0, 4 + ex1 1, 0, -1 + ex2 -1, -1, -1 + goto 22 +@if-sdf = 22 + sdf 3, 5 + msg -1, -1, -1 + pic 0, 4 + ex1 6, 9, -1 + ex2 -1, -1, -1 + goto 18 +@block-move = 23 + sdf -1, -1 + msg 17, -1, -1 + pic 0, 4 + ex1 1, -1, -1 + ex2 -1, -1, -1 + goto 24 +@destroy-monst = 24 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 29, 18, -1 + ex2 -1, -1, -1 + goto 25 +@destroy-monst = 25 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 28, 18, -1 + ex2 -1, -1, -1 + goto 29 +@select-pc = 26 + sdf -1, -1 + msg -1, -1, -1 + pic 0, 4 + ex1 2, -1, -1 + ex2 -1, -1, -1 + goto 27 +@skill-pts = 27 + sdf -1, -1 + msg 18, 19, -1 + pic 0, 4 + ex1 10, 0, -1 + ex2 -1, -1, -1 + goto -1 +@once = 28 + sdf 3, 6 + msg -1, -1, -1 + pic 0, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto 26 +@set-sdf = 29 + sdf 3, 7 + msg -1, -1, -1 + pic 0, 4 + ex1 -1, -1, -1 + ex2 -1, -1, -1 + goto -1 +@if-sdf = 30 + sdf 3, 7 + msg -1, -1, -1 + pic 0, 4 + ex1 1, -1, -1 + ex2 -1, -1, -1 + goto 17 diff --git a/rsrc/scenarios/tutorial/towns/town3.xml b/rsrc/scenarios/tutorial/towns/town3.xml index 90f591c1..b5e003d2 100644 --- a/rsrc/scenarios/tutorial/towns/town3.xml +++ b/rsrc/scenarios/tutorial/towns/town3.xml @@ -12,6 +12,138 @@ + + 0 + 1500 + true + + + 261 + true + + + 262 + true + + + 201 + true + + + 103 + true + + + 115 + true + + + 96 + true + + + 51 + true + + + 122 + true + + + 245 + true + + + 3 + 4 + true + + + 1 + 6 + true + + + 2 + 5 + true + + + 84 + hostile-a + 1 + -1 + 0 + 13 + + + 60 + hostile-a + 1 + -1 + 0 + 14 + + + 63 + hostile-a + 1 + -1 + 0 + 15 + + + 67 + docile + 0 + 30 + 21 + + + 22 + docile + 0 + 31 + 41 + + + 15 + docile + 0 + 32 + 12 + + + 82 + hostile-a + 1 + -1 + 0 + + + 82 + hostile-a + 1 + -1 + 0 + + + 82 + hostile-a + 1 + -1 + 0 + + + 2 + docile + 0 + 33 + 8 + + + + @@ -27,5 +159,28 @@ - + + + + + + + + + + + + + + + + + + + + + + + +