2 files changed, 67 insertions(+), 34 deletions(-)

M src/markl.tal
M src/world.tal

@@ 161,7 161,7 @@
 	#0000 .program/size STZ2
 	;move-up <unlock-spell>
 	;spell-idle <unlock-spell>
-	#0005 ;entrance-stage !<enter-room>
+	#0005 ;w0-1-stage !<enter-room>
 
 @start-lobby ( -- )
 	#0100 .program/size STZ2


@@ 177,7 177,7 @@
 	<unlock-all>
 
 	( | room )
-	#0106 ;w1-entrance !<enter-room>
+	#0106 ;w1-1-stage !<enter-room>
 
 @<enter-room> ( x y room* -- )
 	DUP2 <copy-room>

@@ 8,7 8,33 @@
 	| 06 : flip x
 	| 07 : flip y )
 
-@entrance-stage [ 0506 =&events =&tiles =&end ]
+
+
+
+
+@lobby-stage [ 0d0d =&events =&tiles =&end ]
+	&tiles ( )
+	( ) [ 00 00 00 00 00 01 01 01 00 00 00 00 00 ]
+	( ) [ 00 00 00 00 00 01 0a 01 00 00 00 00 00 ]
+	( ) [ 00 00 00 00 00 01 01 01 00 00 00 00 00 ]
+	( ) [ 00 00 00 00 00 00 00 00 00 00 00 00 00 ]
+	( ) [ 00 00 00 00 00 00 01 00 00 00 00 00 00 ]
+	( ) [ 01 01 01 00 00 01 01 01 00 00 01 01 01 ]
+	( ) [ 01 0a 01 01 01 01 02 01 01 01 01 0a 01 ]
+	( ) [ 01 01 01 00 00 01 01 01 00 00 01 01 01 ]
+	( ) [ 00 00 00 00 00 00 00 00 00 00 00 00 00 ]
+	( ) [ 00 00 00 00 00 00 00 00 00 00 00 00 00 ]
+	( ) [ 00 00 00 00 00 01 01 01 00 00 00 00 00 ]
+	( ) [ 00 00 00 00 00 01 0a 01 00 00 00 00 00 ]
+	( ) [ 00 00 00 00 00 01 01 01 00 00 00 00 00 ]
+	( ) &events 02
+	( ) [ 0306 =event-block $2 $2 ]
+	( ) [ 0b06 =event-warp =w1-1-stage 0106 ] &end
+
+(
+@|tutorial )
+
+@w0-1-stage [ 0506 =&events =&tiles =&end ]
 	&tiles ( )
 	( ) [ 01 00 00 00 00 ]
 	( ) [ 02 01 01 01 0a ]


@@ 18,9 44,9 @@
 	( ) [ 02 00 00 00 00 ]
 	( ) &events 02
 	( ) [ 0000 =event-goat =move-right $2 ]
-	( ) [ 0401 =event-warp =stair-stage 0004 ] &end
+	( ) [ 0401 =event-warp =w0-2-stage 0004 ] &end
 
-@stair-stage [ 0606 =&events =&tiles =&end ]
+@w0-2-stage [ 0606 =&events =&tiles =&end ]
 	&tiles ( )
 	( ) [ 00 00 00 01 00 00 ]
 	( ) [ 00 00 01 02 01 00 ]


@@ 31,9 57,9 @@
 	( ) &events 03
 	( ) [ 0300 =event-goat =move-down $2 ]
 	( ) [ 0104 =event-nimp 0100 $2 ]
-	( ) [ 0305 =event-warp =mirror-stage 0002 ] &end
+	( ) [ 0305 =event-warp =w0-3-stage 0002 ] &end
 
-@mirror-stage [ 0804 =&events =&tiles =&end ]
+@w0-3-stage [ 0804 =&events =&tiles =&end ]
 	&tiles ( )
 	( ) [ 00 0a 00 01 01 02 01 00 ]
 	( ) [ 01 07 01 07 01 07 02 00 ]


@@ 47,34 73,10 @@
 	( ) [ 0600 =event-goat =move-left $2 ]
 	( ) [ 0100 =event-warp =lobby-stage 0606 ] &end
 
-@blank [ 0303 =&events =&tiles =&end ]
-	&tiles ( )
-	( ) [ 01 01 01 ]
-	( ) [ 01 01 01 ]
-	( ) [ 01 01 01 ]
-	( ) &events 01
-	( ) [ 0300 =event-goat =move-left $2 ] &end
+(
+@|world1 )
 
-@lobby-stage [ 0d0d =&events =&tiles =&end ]
-	&tiles ( )
-	( ) [ 00 00 00 00 00 01 01 01 00 00 00 00 00 ]
-	( ) [ 00 00 00 00 00 01 0a 01 00 00 00 00 00 ]
-	( ) [ 00 00 00 00 00 01 01 01 00 00 00 00 00 ]
-	( ) [ 00 00 00 00 00 00 00 00 00 00 00 00 00 ]
-	( ) [ 00 00 00 00 00 00 01 00 00 00 00 00 00 ]
-	( ) [ 01 01 01 00 00 01 01 01 00 00 01 01 01 ]
-	( ) [ 01 0a 01 01 01 01 02 01 01 01 01 0a 01 ]
-	( ) [ 01 01 01 00 00 01 01 01 00 00 01 01 01 ]
-	( ) [ 00 00 00 00 00 00 00 00 00 00 00 00 00 ]
-	( ) [ 00 00 00 00 00 00 00 00 00 00 00 00 00 ]
-	( ) [ 00 00 00 00 00 01 01 01 00 00 00 00 00 ]
-	( ) [ 00 00 00 00 00 01 0a 01 00 00 00 00 00 ]
-	( ) [ 00 00 00 00 00 01 01 01 00 00 00 00 00 ]
-	( ) &events 02
-	( ) [ 0306 =event-block $2 $2 ]
-	( ) [ 0b06 =event-warp =w1-entrance 0106 ] &end
-
-@w1-entrance [ 0808 =&events =&tiles =&end ]
+@w1-1-stage [ 0808 =&events =&tiles =&end ]
 	&tiles ( )
 	( ) [ 00 00 0a 00 00 00 00 00 ]
 	( ) [ 00 00 01 00 00 00 00 00 ]


@@ 88,6 90,23 @@
 	( ) [ 0106 =event-warp =lobby-stage 0606 ]
 	( ) [ 0006 =event-goat =jump-right $2 ] &end
 
+@w1-bridge [ 0808 =&events =&tiles =&end ]
+	&tiles ( )
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) &events 02
+	( ) [ 0106 =event-warp =lobby-stage 0606 ]
+	( ) [ 0006 =event-goat =jump-right $2 ] &end
+
+(
+@|scraps )
+
 @playground [ 0707 =&events =&tiles =&end ]
 	&tiles ( )
 	( ) [ 02 01 01 01 01 01 02 ]


@@ 103,5 122,19 @@
 	( ) [ 0003 =event-block $2 $2 ]
 	( ) [ 0306 =event-block $2 $2 ] &end
 
+@blank [ 0808 =&events =&tiles =&end ]
+	&tiles ( )
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) [ 01 01 01 01 01 01 01 01 ]
+	( ) &events 02
+	( ) [ 0106 =event-warp =lobby-stage 0606 ]
+	( ) [ 0006 =event-goat =jump-right $2 ] &end
+
 ~src/events.tal