diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index c0bd9b74..1c85fe49 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/assets/Tiled/ExampleLevel.tmx b/assets/Tiled/ExampleLevel.tmx index accb55bf..db358279 100644 --- a/assets/Tiled/ExampleLevel.tmx +++ b/assets/Tiled/ExampleLevel.tmx @@ -5,6 +5,7 @@ + @@ -15,23 +16,23 @@ -7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, -7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,0,0,7,7,7,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7, -7,7,7,7,7,7,7,7,0,0,0,0,0,0,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,7,7,7,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7, -7,7,7,7,7,7,7,7,0,0,0,0,0,0,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7, -7,7,7,7,7,7,7,7,0,0,0,0,0,0,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7, -7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, -7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, -7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, -7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, -7,7,7,7,7,7,7,7,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, -7,7,7,7,7,7,7,7,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, -7,7,7,7,7,7,7,7,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, -7,7,7,7,7,7,7,7,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, -7,7,7,7,7,7,7,7,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, -7,7,7,7,7,7,7,7,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, -7,7,7,7,7,7,7,7,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, -7,7,7,7,7,7,7,7,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7 +146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,149,149,149,149,149,149,149,149,149,149,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, +146,146,146,146,146,146,146,146,149,149,149,149,149,146,146,146,146,146,149,149,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,0,0,7,7,7,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7, +146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,7,7,7,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7, +146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7, +146,146,149,149,149,149,149,150,0,0,0,0,0,148,149,149,149,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7, +146,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,145,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, +146,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,145,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, +146,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,145,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, +146,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,145,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, +146,146,142,143,143,143,143,144,0,0,0,0,0,142,143,143,143,143,143,143,143,143,143,143,143,143,146,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, +146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, +146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, +146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, +146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, +146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, +146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7, +146,146,146,146,146,146,146,147,0,0,0,0,0,145,146,146,146,146,146,146,146,146,146,146,146,146,146,146,7,7,7,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7 diff --git a/assets/Tiled/level1Beta.tmx b/assets/Tiled/level1Beta.tmx index 908f5b58..73771b27 100644 --- a/assets/Tiled/level1Beta.tmx +++ b/assets/Tiled/level1Beta.tmx @@ -52,28 +52,36 @@ + + + + + + + + diff --git a/assets/Tiled/level2Prototype.tmx b/assets/Tiled/level2Prototype.tmx index af683f6b..111735c8 100644 --- a/assets/Tiled/level2Prototype.tmx +++ b/assets/Tiled/level2Prototype.tmx @@ -62,66 +62,74 @@ + - + + - + + - + + - + + - + + - + + - + + - + diff --git a/assets/assets.json b/assets/assets.json index bbb80a16..31d59762 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -260,7 +260,7 @@ "level1": "levelsJson/level1Beta.tmj", "level2": "levelsJson/rabbeatLevelBat.tmj", "level3": "levelsJson/rabbeatLaserTest.tmj", - "level4": "levelsJson/rabbeatLevel.tmj", + "level4": "levelsJson/exampleLevel.tmj", "level5": "levelsJson/rabbeatLevel.tmj", "level6": "levelsJson/rabbeatLevel3.tmj", "level7": "levelsJson/rabbeatLevel.tmj", diff --git a/assets/levelsJson/exampleLevel.tmj b/assets/levelsJson/exampleLevel.tmj index bbd72a85..2bcbaf02 100644 --- a/assets/levelsJson/exampleLevel.tmj +++ b/assets/levelsJson/exampleLevel.tmj @@ -4,18 +4,18 @@ "layers":[ { "draworder":"topdown", - "id":3, + "id":2, "name":"background", "objects":[ { - "gid":1, + "gid":48, "height":1088, - "id":1, + "id":204, "name":"", "rotation":0, "type":"", "visible":true, - "width":6459.47, + "width":7040, "x":0, "y":1088 }], @@ -26,73 +26,293 @@ "y":0 }, { - "data":[7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7], + "draworder":"topdown", + "id":18, + "name":"backgroundArt", + "objects":[ + { + "gid":38, + "height":320, + "id":406, + "name":"", + "rotation":0, + "type":"bgpipe", + "visible":true, + "width":320, + "x":0, + "y":640 + }, + { + "gid":38, + "height":320, + "id":407, + "name":"", + "rotation":0, + "type":"bgpipe", + "visible":true, + "width":320, + "x":64, + "y":640 + }, + { + "gid":42, + "height":320, + "id":185, + "name":"", + "rotation":0, + "type":"pipeleftskinny", + "visible":true, + "width":320, + "x":1856, + "y":1088 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "data":[146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 146, 146, 146, 146, 146, 146, 146, 146, 149, 149, 149, 149, 149, 146, 146, 146, 146, 146, 149, 149, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 0, 0, 7, 7, 7, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 146, 146, 146, 146, 146, 146, 146, 147, 0, 0, 0, 0, 0, 145, 146, 146, 146, 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 7, 7, 7, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 146, 146, 146, 146, 146, 146, 146, 147, 0, 0, 0, 0, 0, 145, 146, 146, 146, 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 146, 146, 149, 149, 149, 149, 149, 150, 0, 0, 0, 0, 0, 148, 149, 149, 149, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 146, 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 145, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, + 146, 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 145, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, + 146, 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 145, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, + 146, 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 145, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, + 146, 146, 142, 143, 143, 143, 143, 144, 0, 0, 0, 0, 0, 142, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 146, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, + 146, 146, 146, 146, 146, 146, 146, 147, 0, 0, 0, 0, 0, 145, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, + 146, 146, 146, 146, 146, 146, 146, 147, 0, 0, 0, 0, 0, 145, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, + 146, 146, 146, 146, 146, 146, 146, 147, 0, 0, 0, 0, 0, 145, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, + 146, 146, 146, 146, 146, 146, 146, 147, 0, 0, 0, 0, 0, 145, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, + 146, 146, 146, 146, 146, 146, 146, 147, 0, 0, 0, 0, 0, 145, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, + 146, 146, 146, 146, 146, 146, 146, 147, 0, 0, 0, 0, 0, 145, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, + 146, 146, 146, 146, 146, 146, 146, 147, 0, 0, 0, 0, 0, 145, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7], "height":17, "id":1, "name":"walls", "opacity":1, "type":"tilelayer", "visible":true, - "width":30, + "width":130, "x":0, "y":0 }, { "draworder":"topdown", - "id":7, - "name":"platforms", + "id":10, + "name":"weightedPlatforms", + "objects":[], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":16, + "name":"movingPlatforms", "objects":[ { - "gid":6, + "gid":88, "height":64, - "id":24, - "name":"0", + "id":483, + "name":"", + "properties":[ + { + "name":"num", + "type":"int", + "value":0 + }, + { + "name":"pos", + "type":"int", + "value":1 + }, + { + "name":"speed", + "type":"int", + "value":0 + }, + { + "name":"totalPos", + "type":"int", + "value":2 + }], + "rotation":0, + "type":"", + "visible":true, + "width":192, + "x":2368, + "y":640 + }, + { + "gid":88, + "height":64, + "id":489, + "name":"", + "properties":[ + { + "name":"num", + "type":"int", + "value":0 + }, + { + "name":"pos", + "type":"int", + "value":0 + }, + { + "name":"speed", + "type":"int", + "value":0 + }, + { + "name":"totalPos", + "type":"int", + "value":2 + }], "rotation":0, - "type":"platform", + "type":"", "visible":true, "width":192, - "x":704, + "x":1984, "y":640 }, { - "gid":6, + "gid":88, "height":64, - "id":26, - "name":"1", + "id":534, + "name":"", + "properties":[ + { + "name":"num", + "type":"int", + "value":1 + }, + { + "name":"pos", + "type":"int", + "value":0 + }, + { + "name":"speed", + "type":"int", + "value":0 + }, + { + "name":"totalPos", + "type":"int", + "value":2 + }], "rotation":0, - "type":"platform", + "type":"", "visible":true, "width":192, - "x":960, - "y":512 + "x":3328, + "y":640 }, { - "gid":6, + "gid":88, "height":64, - "id":28, - "name":"2", + "id":535, + "name":"", + "properties":[ + { + "name":"num", + "type":"int", + "value":1 + }, + { + "name":"pos", + "type":"int", + "value":1 + }, + { + "name":"speed", + "type":"int", + "value":0 + }, + { + "name":"totalPos", + "type":"int", + "value":2 + }], "rotation":0, - "type":"platform", + "type":"", "visible":true, "width":192, - "x":1280, + "x":3648, "y":640 + }, + { + "gid":88, + "height":64, + "id":536, + "name":"", + "properties":[ + { + "name":"num", + "type":"int", + "value":2 + }, + { + "name":"pos", + "type":"int", + "value":1 + }, + { + "name":"speed", + "type":"int", + "value":0 + }, + { + "name":"totalPos", + "type":"int", + "value":2 + }], + "rotation":0, + "type":"", + "visible":true, + "width":192, + "x":3904, + "y":384 + }, + { + "gid":88, + "height":64, + "id":537, + "name":"", + "properties":[ + { + "name":"num", + "type":"int", + "value":2 + }, + { + "name":"pos", + "type":"int", + "value":0 + }, + { + "name":"speed", + "type":"int", + "value":0 + }, + { + "name":"totalPos", + "type":"int", + "value":2 + }], + "rotation":0, + "type":"", + "visible":true, + "width":192, + "x":4224, + "y":384 }], "opacity":1, "type":"objectgroup", @@ -102,44 +322,137 @@ }, { "draworder":"topdown", - "id":8, - "name":"platformArt", + "id":13, + "name":"platforms", "objects":[ { - "gid":5, - "height":128, - "id":25, + "gid":99, + "height":120, + "id":479, "name":"", + "properties":[ + { + "name":"align", + "type":"string", + "value":"vertical" + }], "rotation":0, - "type":"radio", + "type":"laser", "visible":true, - "width":192, - "x":704, - "y":768 + "width":168, + "x":6592, + "y":704 }, { - "gid":5, - "height":128, - "id":27, + "gid":100, + "height":64, + "id":481, "name":"", "rotation":0, - "type":"radio", + "type":"laser", "visible":true, - "width":192, - "x":960, - "y":640 + "width":128, + "x":5760, + "y":576 }, { - "gid":5, - "height":128, - "id":29, + "gid":99, + "height":120, + "id":484, "name":"", + "properties":[ + { + "name":"align", + "type":"string", + "value":"vertical" + }], "rotation":0, - "type":"radio", + "type":"laser", "visible":true, - "width":192, - "x":1280, - "y":768 + "width":168, + "x":5632, + "y":704 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":7, + "name":"enemies", + "objects":[ + { + "gid":9, + "height":200, + "id":475, + "name":"", + "properties":[ + { + "name":"beatList", + "type":"string", + "value":"1234" + }, + { + "name":"rollingDistance", + "type":"int", + "value":3 + }], + "rotation":0, + "type":"hedgehog", + "visible":true, + "width":173, + "x":6464, + "y":576 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":8, + "name":"checkpoints", + "objects":[ + { + "gid":57, + "height":130, + "id":498, + "name":"0", + "properties":[ + { + "name":"num", + "type":"int", + "value":0 + }], + "rotation":0, + "type":"", + "visible":true, + "width":130, + "x":256, + "y":576 + }, + { + "gid":57, + "height":130, + "id":499, + "name":"", + "properties":[ + { + "name":"num", + "type":"int", + "value":1 + }], + "rotation":0, + "type":"", + "visible":true, + "width":130, + "x":1728, + "y":320 }], "opacity":1, "type":"objectgroup", @@ -155,14 +468,205 @@ { "gid":3, "height":142, - "id":6, + "id":2, "name":"player", "rotation":0, "type":"", "visible":true, "width":75, + "x":320, + "y":576 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":9, + "name":"goal", + "objects":[], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "class":"bigwire", + "draworder":"topdown", + "id":12, + "name":"foregroundArt", + "objects":[ + { + "gid":21, + "height":256, + "id":73, + "name":"", + "rotation":0, + "type":"dolpod2", + "visible":true, + "width":256, + "x":1088, + "y":576 + }, + { + "gid":27, + "height":192, + "id":156, + "name":"", + "rotation":0, + "type":"light", + "visible":true, + "width":192, + "x":896, + "y":512 + }, + { + "gid":27, + "height":192, + "id":394, + "name":"", + "rotation":0, + "type":"light", + "visible":true, + "width":192, + "x":320, + "y":512 + }, + { + "gid":27, + "height":192, + "id":422, + "name":"", + "rotation":0, + "type":"light", + "visible":true, + "width":192, + "x":1152, + "y":320 + }, + { + "gid":51, + "height":128, + "id":428, + "name":"", + "rotation":0, + "type":"wires1", + "visible":true, + "width":875, "x":448, - "y":640 + "y":256 + }, + { + "gid":55, + "height":128, + "id":440, + "name":"", + "rotation":0, + "type":"wires2", + "visible":true, + "width":875, + "x":1408, + "y":192 + }, + { + "gid":55, + "height":128, + "id":538, + "name":"", + "rotation":0, + "type":"wires2", + "visible":true, + "width":512, + "x":2880, + "y":320 + }, + { + "gid":55, + "height":128, + "id":539, + "name":"", + "rotation":0, + "type":"wires2", + "visible":true, + "width":448, + "x":2240, + "y":192 + }, + { + "gid":27, + "height":192, + "id":540, + "name":"", + "rotation":0, + "type":"light", + "visible":true, + "width":192, + "x":2688, + "y":576 + }, + { + "gid":27, + "height":192, + "id":541, + "name":"", + "rotation":0, + "type":"light", + "visible":true, + "width":192, + "x":3328, + "y":512 + }, + { + "gid":27, + "height":192, + "id":542, + "name":"", + "rotation":0, + "type":"light", + "visible":true, + "width":192, + "x":3520, + "y":512 + }, + { + "gid":55, + "height":128, + "id":543, + "name":"", + "rotation":0, + "type":"wires2", + "visible":true, + "width":512, + "x":3648, + "y":192 + }, + { + "gid":55, + "height":128, + "id":544, + "name":"", + "rotation":0, + "type":"wires2", + "visible":true, + "width":512, + "x":4160, + "y":192 + }, + { + "gid":27, + "height":192, + "id":545, + "name":"", + "rotation":0, + "type":"light", + "visible":true, + "width":192, + "x":4608, + "y":256 }], "opacity":1, "type":"objectgroup", @@ -170,8 +674,8 @@ "x":0, "y":0 }], - "nextlayerid":9, - "nextobjectid":31, + "nextlayerid":20, + "nextobjectid":546, "orientation":"orthogonal", "renderorder":"right-down", "tiledversion":"1.10.2", @@ -179,10 +683,18 @@ "tilesets":[ { "firstgid":1, - "source":"..\/Documents\/3152\/Images.tsx" + "source":"..\/Tiled\/Images.tsx" + }, + { + "firstgid":75, + "source":"..\/Tiled\/platforms.tsx" + }, + { + "firstgid":139, + "source":"..\/Tiled\/walls.tsx" }], "tilewidth":64, "type":"map", "version":"1.10", - "width":30 + "width":130 } \ No newline at end of file diff --git a/assets/levelsJson/level1Beta.tmj b/assets/levelsJson/level1Beta.tmj index 4715d454..348b58cf 100644 --- a/assets/levelsJson/level1Beta.tmj +++ b/assets/levelsJson/level1Beta.tmj @@ -231,11 +231,21 @@ "type":"string", "value":"synth" }, + { + "name":"moveTime", + "type":"int", + "value":2 + }, { "name":"num", "type":"int", "value":0 }, + { + "name":"platformInterval", + "type":"int", + "value":1 + }, { "name":"speed", "type":"int", @@ -259,11 +269,21 @@ "type":"string", "value":"jazz" }, + { + "name":"moveTime", + "type":"int", + "value":2 + }, { "name":"num", "type":"int", "value":0 }, + { + "name":"platformInterval", + "type":"int", + "value":1 + }, { "name":"speed", "type":"int", @@ -287,11 +307,21 @@ "type":"string", "value":"synth" }, + { + "name":"moveTime", + "type":"int", + "value":1 + }, { "name":"num", "type":"int", "value":1 }, + { + "name":"platformInterval", + "type":"int", + "value":1 + }, { "name":"speed", "type":"int", @@ -315,11 +345,21 @@ "type":"string", "value":"jazz" }, + { + "name":"moveTime", + "type":"int", + "value":1 + }, { "name":"num", "type":"int", "value":1 }, + { + "name":"platformInterval", + "type":"int", + "value":1 + }, { "name":"speed", "type":"int", diff --git a/assets/levelsJson/rabbeatLaserTest.tmj b/assets/levelsJson/rabbeatLaserTest.tmj index 8edc2e09..cef8e64a 100644 --- a/assets/levelsJson/rabbeatLaserTest.tmj +++ b/assets/levelsJson/rabbeatLaserTest.tmj @@ -275,6 +275,11 @@ "id":317, "name":"", "properties":[ + { + "name":"moveTime", + "type":"int", + "value":0 + }, { "name":"num", "type":"int", @@ -291,12 +296,12 @@ "value":4 }, { - "name":"wait", + "name":"waitTime", "type":"int", "value":3 }], "rotation":0, - "type":"", + "type":"Moving Platform", "visible":true, "width":192, "x":768, @@ -308,6 +313,11 @@ "id":318, "name":"", "properties":[ + { + "name":"moveTime", + "type":"int", + "value":0 + }, { "name":"num", "type":"int", @@ -319,17 +329,17 @@ "value":1 }, { - "name":"speed", + "name":"totalPos", "type":"int", - "value":0 + "value":4 }, { - "name":"totalPos", + "name":"waitTime", "type":"int", - "value":4 + "value":3 }], "rotation":0, - "type":"", + "type":"Moving Platform", "visible":true, "width":192, "x":1024, @@ -341,6 +351,11 @@ "id":483, "name":"", "properties":[ + { + "name":"moveTime", + "type":"int", + "value":0 + }, { "name":"num", "type":"int", @@ -357,12 +372,12 @@ "value":4 }, { - "name":"wait", + "name":"waitTime", "type":"int", "value":3 }], "rotation":0, - "type":"", + "type":"Moving Platform", "visible":true, "width":192, "x":1280, @@ -374,6 +389,11 @@ "id":485, "name":"", "properties":[ + { + "name":"moveTime", + "type":"int", + "value":1 + }, { "name":"num", "type":"int", @@ -390,12 +410,12 @@ "value":4 }, { - "name":"wait", + "name":"waitTime", "type":"int", - "value":2 + "value":3 }], "rotation":0, - "type":"", + "type":"Moving Platform", "visible":true, "width":192, "x":1792, @@ -407,6 +427,11 @@ "id":486, "name":"", "properties":[ + { + "name":"moveTime", + "type":"int", + "value":1 + }, { "name":"num", "type":"int", @@ -423,9 +448,9 @@ "value":4 }, { - "name":"wait", + "name":"waitTime", "type":"int", - "value":2 + "value":3 }], "rotation":0, "type":"", @@ -440,6 +465,11 @@ "id":487, "name":"", "properties":[ + { + "name":"moveTime", + "type":"int", + "value":1 + }, { "name":"num", "type":"int", @@ -456,12 +486,12 @@ "value":4 }, { - "name":"wait", + "name":"waitTime", "type":"int", - "value":2 + "value":3 }], "rotation":0, - "type":"", + "type":"Moving Platform", "visible":true, "width":192, "x":1792, @@ -473,6 +503,11 @@ "id":489, "name":"", "properties":[ + { + "name":"moveTime", + "type":"int", + "value":0 + }, { "name":"num", "type":"int", @@ -489,12 +524,12 @@ "value":4 }, { - "name":"wait", + "name":"waitTime", "type":"int", "value":3 }], "rotation":0, - "type":"", + "type":"Moving Platform", "visible":true, "width":192, "x":1024, @@ -506,6 +541,11 @@ "id":490, "name":"", "properties":[ + { + "name":"moveTime", + "type":"int", + "value":1 + }, { "name":"num", "type":"int", @@ -522,12 +562,12 @@ "value":4 }, { - "name":"wait", + "name":"waitTime", "type":"int", - "value":2 + "value":3 }], "rotation":0, - "type":"", + "type":"Moving Platform", "visible":true, "width":192, "x":1792, @@ -1923,7 +1963,7 @@ "value":"1234" }], "rotation":0, - "type":"bear", + "type":"Bear", "visible":true, "width":173, "x":2240, @@ -1941,7 +1981,7 @@ "value":"" }], "rotation":0, - "type":"bear", + "type":"Bear", "visible":true, "width":173, "x":3840, @@ -1970,7 +2010,7 @@ "value":0 }], "rotation":0, - "type":"", + "type":"Checkpoint", "visible":true, "width":130, "x":256, @@ -2221,7 +2261,7 @@ "y":0 }], "nextlayerid":20, - "nextobjectid":606, + "nextobjectid":608, "orientation":"orthogonal", "renderorder":"right-down", "tiledversion":"1.10.2", diff --git a/assets/world/lasers/laserBottom.png b/assets/world/lasers/laserBottom.png index a52e3c39..966b4344 100644 Binary files a/assets/world/lasers/laserBottom.png and b/assets/world/lasers/laserBottom.png differ diff --git a/assets/world/lasers/laserMiddle.png b/assets/world/lasers/laserMiddle.png index 1efa6261..342c6bc4 100644 Binary files a/assets/world/lasers/laserMiddle.png and b/assets/world/lasers/laserMiddle.png differ diff --git a/assets/world/lasers/laserTop.png b/assets/world/lasers/laserTop.png index eff2f37c..637fc936 100644 Binary files a/assets/world/lasers/laserTop.png and b/assets/world/lasers/laserTop.png differ diff --git a/core/src/edu/cornell/gdiac/rabbeat/GameController.java b/core/src/edu/cornell/gdiac/rabbeat/GameController.java index 5942b2d2..aa09fec6 100644 --- a/core/src/edu/cornell/gdiac/rabbeat/GameController.java +++ b/core/src/edu/cornell/gdiac/rabbeat/GameController.java @@ -73,7 +73,7 @@ public class GameController implements Screen, ContactListener { public static final int LEVEL = 1; /** The integer that represents the number of levels that the player has unlocked */ - private static int levelsUnlocked = 3; + private static int levelsUnlocked = 4; /** The integer that represents the current level number the player selected from the LevelSelectorScreen */ private static int currentLevelInt = 1; diff --git a/core/src/edu/cornell/gdiac/rabbeat/ObjectController.java b/core/src/edu/cornell/gdiac/rabbeat/ObjectController.java index 96346ba0..63d167d0 100644 --- a/core/src/edu/cornell/gdiac/rabbeat/ObjectController.java +++ b/core/src/edu/cornell/gdiac/rabbeat/ObjectController.java @@ -575,11 +575,12 @@ public void populateObjects(Vector2 scale) { case "genre": genre = prop.getString("value"); break; - case "platInterval": + case "platformInterval": platformInterval = prop.getInt("value"); break; case "moveTime": moveTime= prop.getInt("value"); + break; case "waitTIme": waitTime = prop.getInt("value"); @@ -602,7 +603,9 @@ public void populateObjects(Vector2 scale) { } // Now actually create weighted platforms using synthCoord, jazzCoord, wpSpeed for (int i=0; i0){ - currentSpeed = (magnitude(jazzPosition, synthPosition)*(1/BeatLength)*SPEEDBEAT7*((float) 1 /(1+ platformIntervals))); + currentSpeed = (magnitude(jazzPosition, synthPosition)*(1/BeatLength)*SPEEDBEAT7*((float) 1 /(1+ (float) platformIntervals /2))); } else if (beat == (4+4* waitTime)){ if (currentSpeed>0){ - currentSpeed = (magnitude(jazzPosition, synthPosition)*(1/BeatLength)*SPEEDBEAT8*((float) 1 /(1+ platformIntervals))); + currentSpeed = (magnitude(jazzPosition, synthPosition)*(1/BeatLength)*SPEEDBEAT8*((float) 1 /(1+ (float) platformIntervals /2))); } beat = 0; } diff --git a/desktop/build/resources/main/assets.json b/desktop/build/resources/main/assets.json index bbb80a16..31d59762 100644 --- a/desktop/build/resources/main/assets.json +++ b/desktop/build/resources/main/assets.json @@ -260,7 +260,7 @@ "level1": "levelsJson/level1Beta.tmj", "level2": "levelsJson/rabbeatLevelBat.tmj", "level3": "levelsJson/rabbeatLaserTest.tmj", - "level4": "levelsJson/rabbeatLevel.tmj", + "level4": "levelsJson/exampleLevel.tmj", "level5": "levelsJson/rabbeatLevel.tmj", "level6": "levelsJson/rabbeatLevel3.tmj", "level7": "levelsJson/rabbeatLevel.tmj",