new level-based controllers

[chaz/yoink] / data / scenes / Classic.lua

diff --git a/data/scenes/Classic.lua b/data/scenes/Classic.lua
index 62b8a97045b047790e913392fefe46572e3c3143..4cae26a55966de206ca1b1f7f1950c1554e4f55b 100644 (file)
--- a/data/scenes/Classic.lua
+++ b/data/scenes/Classic.lua
@@ -57,12 +57,12 @@ MakeTilemap({
 -- Right side
 
 ResetTransform()
-Rotate('y', 90)
+Rotate(Y, 90)
 Translate(0, 0, 5)
 Scale(32)
 MakeTilemap({
        width = 5,
-       surface_type = 'right',
+       surface_type = RIGHT,
        tiles = {
                2,      2,      2,      2,      2,
                0,      0,      0,      0,      0,
@@ -85,12 +85,12 @@ MakeTilemap({
 -- Top
 
 ResetTransform()
-Rotate('x', 90)
+Rotate(X, 90)
 Translate(-5, 15, 0)
 Scale(32)
 MakeTilemap({
        width = 5,
-       surface_type = 'top',
+       surface_type = TOP,
        tiles = {
                3,      3,      3,      3,      3,
                3,      3,      3,      3,      3,
@@ -125,7 +125,7 @@ if detail > 1 then
        -- Right side
 
        ResetTransform()
-       Rotate('y', 90)
+       Rotate(Y, 90)
        Translate(7, 0, 0)
        Scale(32)
        MakeTilemap({
@@ -145,7 +145,7 @@ if detail > 1 then
        -- Top
 
        ResetTransform()
-       Rotate('x', 90)
+       Rotate(X, 90)
        Translate(-2, 8, -6)
        Scale(32)
        MakeTilemap({
@@ -167,13 +167,13 @@ end
 -- Left wall
 
 ResetTransform()
-Rotate('y', -90)
+Rotate(Y, -90)
 Translate(10, 0, 1)
 Scale(32)
 SetTexture("Building")
 MakeTilemap({
        width = 4,
-       surface_type = 'left',
+       surface_type = LEFT,
        tiles = {
                -1,     9,      11,     -1,
                9,      10,     12,     11,
@@ -186,12 +186,12 @@ MakeTilemap({
 -- Right wall
 
 ResetTransform()
-Rotate('y', -90)
+Rotate(Y, -90)
 Translate(13, 0, 1)
 Scale(32)
 MakeTilemap({
        width = 4,
-       surface_type = 'right',
+       surface_type = RIGHT,
        tiles = {
                -1,     9,      11,     -1,
                9,      10,     12,     11,
@@ -218,7 +218,7 @@ MakeTilemap({
 -- Pitched roof
 
 ResetTransform()
-Rotate('x', 135)
+Rotate(X, 135)
 Scale(1, 1.5, 1.5)
 Translate(10, 5, 3)
 Scale(32)
@@ -249,7 +249,7 @@ Translate(10, 4, 3)
 Scale(32)
 MakeTilemap({
        width = 3,
-       surface_type = 'top',
+       surface_type = TOP,
        tiles = {
                -1,     -1,     -1
        }
@@ -261,13 +261,13 @@ MakeTilemap({
 -- Courtyard
 
 ResetTransform()
-Rotate('x', 90)
+Rotate(X, 90)
 Translate(-3, 0, 0)
 Scale(32)
 SetTexture("Scenery")
 MakeTilemap({
        width = 13,
-       surface_type = 'top',
+       surface_type = TOP,
        tiles = {
                1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,
                1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,
@@ -306,7 +306,7 @@ if detail > 2 then
 
        ResetTransform()
        Scale(4, 1, 1)
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(1, -0.5, 1)
        Scale(32)
        MakeBillboard({
@@ -318,7 +318,7 @@ if detail > 2 then
 
        ResetTransform()
        Scale(4, 1, 1)
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(9, -0.5, 1)
        Scale(32)
        MakeBillboard({
@@ -363,7 +363,7 @@ if detail > 1 then
        -- Left wall
 
        ResetTransform()
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(19, 0, -3)
        Scale(32)
        MakeTilemap({
@@ -379,7 +379,7 @@ if detail > 1 then
        -- Right wall
 
        ResetTransform()
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(23, 0, -3)
        Scale(32)
        MakeTilemap({
@@ -395,9 +395,9 @@ if detail > 1 then
        -- Left pitched roof
 
        ResetTransform()
-       Rotate('x', 135)
+       Rotate(X, 135)
        Scale(1, 1.5, 1.5)
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(21, 6, -3)
        Scale(32)
        MakeTilemap({
@@ -411,9 +411,9 @@ if detail > 1 then
        -- Right pitched roof
 
        ResetTransform()
-       Rotate('x', -135)
+       Rotate(X, -135)
        Scale(1, 1.5, 1.5)
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(21, 6, -3)
        Scale(32)
        MakeTilemap({
@@ -427,7 +427,7 @@ if detail > 1 then
        -- Finial
 
        ResetTransform()
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(21, 6, -3)
        Scale(32)
        MakeTilemap({
@@ -444,13 +444,13 @@ end
 -- Ground under house
 
 ResetTransform()
-Rotate('x', 90)
+Rotate(X, 90)
 Translate(10, 0, 0)
 Scale(32)
 SetTexture("Scenery")
 MakeTilemap({
        width = 3,
-       surface_type = 'top',
+       surface_type = TOP,
        tiles = {
                1,      1,      1,
                1,      1,      1,
@@ -465,12 +465,12 @@ MakeTilemap({
 -- Left part of center courtyard
 
 ResetTransform()
-Rotate('x', 90)
+Rotate(X, 90)
 Translate(13, 0, 0)
 Scale(32)
 MakeTilemap({
        width = 8,
-       surface_type = 'top',
+       surface_type = TOP,
        tiles = {
                1,      1,      1,      1,      1,      1,      1,      1,
                1,      1,      1,      1,      1,      1,      1,      1,
@@ -528,7 +528,7 @@ if detail > 2 then
        -- Left grass
 
        ResetTransform()
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(14, -0.5, 1)
        Scale(32)
        MakeTilemap({
@@ -541,7 +541,7 @@ if detail > 2 then
        -- Grass left of house
 
        ResetTransform()
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(18, -0.5, 0)
        Scale(32)
        MakeBillboard({
@@ -552,7 +552,7 @@ if detail > 2 then
        -- Grass right of house
 
        ResetTransform()
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(24, -0.5, 0)
        Scale(32)
        MakeBillboard({
@@ -586,7 +586,7 @@ if detail > 2 then
 
        ResetTransform()
        Scale(2, 1, 1)
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(19, -0.5, 2)
        Scale(32)
        MakeBillboard({
@@ -598,7 +598,7 @@ if detail > 2 then
 
        ResetTransform()
        Scale(2, 1, 1)
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(23, -0.5, 2)
        Scale(32)
        MakeBillboard({
@@ -610,12 +610,12 @@ end
 -- Right part of center courtyard
 
 ResetTransform()
-Rotate('x', 90)
+Rotate(X, 90)
 Translate(21, 0, 0)
 Scale(32)
 MakeTilemap({
        width = 7,
-       surface_type = 'top',
+       surface_type = TOP,
        tiles = {
                1,      1,      1,      1,      1,      0,      0,
                1,      1,      1,      1,      1,      0,      0,
@@ -654,7 +654,7 @@ if detail > 2 then
 
        ResetTransform()
        Scale(2, 1, 1)
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(26, -0.5, 5)
        Scale(32)
        MakeBillboard({
@@ -666,7 +666,7 @@ if detail > 2 then
 
        ResetTransform()
        Scale(2, 1, 1)
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(35, -0.5, 5)
        Scale(32)
        MakeBillboard({
@@ -699,7 +699,7 @@ if detail > 2 then
        -- Extra bit of back grass
 
        ResetTransform()
-       Rotate('y', -90)
+       Rotate(Y, -90)
        Translate(34, -0.5, 0)
        Scale(32)
        MakeBillboard({
@@ -711,12 +711,12 @@ end
 -- Ground around tower block
 
 ResetTransform()
-Rotate('x', 90)
+Rotate(X, 90)
 Translate(28, 0, 4)
 Scale(32)
 MakeTilemap({
        width = 5,
-       surface_type = 'top',
+       surface_type = TOP,
        tiles = {
                0,      0,      0,      0,      0,
                0,      0,      0,      0,      0,
@@ -727,12 +727,12 @@ MakeTilemap({
 -- Rightmost ground
 
 ResetTransform()
-Rotate('x', 90)
+Rotate(X, 90)
 Translate(33, 0, 0)
 Scale(32)
 MakeTilemap({
        width = 10,
-       surface_type = 'top',
+       surface_type = TOP,
        tiles = {
                0,      0,      1,      1,      1,      1,      1,      1,      1,      1,
                0,      0,      1,      1,      1,      1,      1,      1,      1,      1,
@@ -769,12 +769,12 @@ MakeTilemap({
 -- Right side
 
 ResetTransform()
-Rotate('y', 90)
+Rotate(Y, 90)
 Translate(33, 0, 4)
 Scale(32)
 MakeTilemap({
        width = 6,
-       surface_type = 'right',
+       surface_type = RIGHT,
        tiles = {
                2,      2,      2,      2,      2,      2,
                0,      1,      0,      0,      1,      0,
@@ -789,12 +789,12 @@ MakeTilemap({
 -- Left side
 
 ResetTransform()
-Rotate('y', 90)
+Rotate(Y, 90)
 Translate(28, 0, 4)
 Scale(32)
 MakeTilemap({
        width = 6,
-       surface_type = 'left',
+       surface_type = LEFT,
        tiles = {
                2,      2,      2,      2,      2,      2,
                0,      1,      6,      0,      1,      0,
@@ -809,12 +809,12 @@ MakeTilemap({
 -- Top
 
 ResetTransform()
-Rotate('x', 90)
+Rotate(X, 90)
 Translate(28, 7, -2)
 Scale(32)
 MakeTilemap({
        width = 5,
-       surface_type = 'top',
+       surface_type = TOP,
        tiles = {
                3,      3,      3,      3,      3,
                3,      3,      3,      3,      3,
@@ -857,12 +857,12 @@ MakeTilemap({
 -- Left side
 
 ResetTransform()
-Rotate('y', 90)
+Rotate(Y, 90)
 Translate(40, 0, 5)
 Scale(32)
 MakeTilemap({
        width = 5,
-       surface_type = 'left',
+       surface_type = LEFT,
        tiles = {
                2,      2,      2,      2,      2,
                6,      0,      0,      0,      0,
@@ -885,12 +885,12 @@ MakeTilemap({
 -- Top
 
 ResetTransform()
-Rotate('x', 90)
+Rotate(X, 90)
 Translate(40, 15, 0)
 Scale(32)
 MakeTilemap({
        width = 5,
-       surface_type = 'top',
+       surface_type = TOP,
        tiles = {
                3,      3,      3,      3,      3,
                3,      3,      3,      3,      3,