From 559d37a88a98ff5befe8aa19545c1e66fc6c530f Mon Sep 17 00:00:00 2001 From: Robbie Antenesse Date: Tue, 5 Apr 2016 17:59:10 -0600 Subject: [PATCH] Set up files for test loading, fixed misplaced semicolon in oceanTilePrefab.js, removed Title Screen for testing. --- loadRooms.js | 10 ++++++---- prefabs/islandPrefab.js | 1 + prefabs/oceanTilePrefab.js | 2 +- prefabs/wavePrefab.js | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 prefabs/islandPrefab.js create mode 100644 prefabs/wavePrefab.js diff --git a/loadRooms.js b/loadRooms.js index 07d9f59..192ca00 100644 --- a/loadRooms.js +++ b/loadRooms.js @@ -1,13 +1,15 @@ -var rm_TitleScreen = OS.R.Add("Default"); -var rm_Ocean = OS.R.Add("Ocean", { +// var rm_TitleScreen = OS.R.Add("Default"); +// var rm_Ocean = OS.R.Add("Ocean", { +var rm_Ocean = OS.R.Add("Default", { width: 64 * 1000 * OS.S.pixelScale, height: 64 * 1000 * OS.S.pixelScale, backgroundColor: "#1b2632" }); function loadRooms() { - OS.AddScript("rooms/titleScreen.js"); + // OS.AddScript("rooms/titleScreen.js"); OS.AddScript("rooms/oceanRoom.js"); - OS.SetRoom(rm_TitleScreen); + // OS.SetRoom(rm_TitleScreen); + OS.SetRoom(rm_Ocean); } diff --git a/prefabs/islandPrefab.js b/prefabs/islandPrefab.js new file mode 100644 index 0000000..724dff9 --- /dev/null +++ b/prefabs/islandPrefab.js @@ -0,0 +1 @@ +function islandPrefab() {} \ No newline at end of file diff --git a/prefabs/oceanTilePrefab.js b/prefabs/oceanTilePrefab.js index dc85691..3e61c39 100644 --- a/prefabs/oceanTilePrefab.js +++ b/prefabs/oceanTilePrefab.js @@ -9,7 +9,7 @@ var pr_ocean = OS.P.Add("Ocean Particle", { positionCheckStep: 30, positionCheckProgress: 30, - doCheckPosition: false; + doCheckPosition: false }); pr_ocean.BeforeDo = function () { diff --git a/prefabs/wavePrefab.js b/prefabs/wavePrefab.js new file mode 100644 index 0000000..15af008 --- /dev/null +++ b/prefabs/wavePrefab.js @@ -0,0 +1 @@ +function wavePrefab() {} \ No newline at end of file