From 291d358b7eeff208f6c5dcdad98f52443fd9c433 Mon Sep 17 00:00:00 2001 From: Info Teddy Date: Mon, 3 Feb 2020 13:24:30 -0800 Subject: [PATCH] Add and draw one more row to all rooms with roomnames Since translucent roomname backgrounds were introduced in TerryCavanagh/VVVVVV#122, it exposes one glaring flaw with the game that until now has been kept hidden: in rooms with room names, the game cheapens out with the tile data and doesn't have a 30th row, because the room name would hide the missing row. As a result, rooms with room names have 29 rows instead of 30 to fill up the entire screen. And it looks really weird when there's nothing but empty space behind the translucent room name background. To remedy this, I added one row to each room with a room name in the level. First, I had to filter out all the rooms with no room names. However, that's actually all contained in Otherlevel.cpp, the Overworld, which contains 221 rooms (8 of which are the Secret Lab, 6 more of which are the Ship, so 207 are the actual Overworld, right? Wrong, 2 of those Overworld no-roomname rooms are in the Lab, so there are actually 205 Overworld rooms). The remaining level data files all contain rooms with room names. But the process wasn't that easy. I noticed a while ago that each room contains 29 `tmap.push_back()`s, one for each row of the room, and each row is simply a string containing the 40 tiles for that row, concatenated with commas. However, I decided to actually check my intuition by doing a grep on each level file and counting the number of results, for example `grep 'push_back' Labclass.cpp | wc -l`. Whatever number comes out should be divisible by 29. That particular grep on Labclass.cpp returns 1306, which divided by 29 is 45 with a remainder of 1. So what does that mean? Does that mean there's 45 rooms each, and 1 leftover row? Well, not exactly. The extra row comes from the fact that Outer Space has 30 rows instead of 29. Outer Space is the room that comes up when the game finds a room is non-existent, which shouldn't happen with a properly-working game, except in Outside Dimension VVVVVV. In fact, each level file has their own Outer Space, and every single Outer Space also has 30 rooms. So really, this means there are 44 rooms in the Lab and one Outer Space room. (Well, in reality, there are 46 rooms in the Lab, because 2 of them use the Outside tileset but have no room names, so they're stored in Otherlevel.cpp instead.) We find the same result for the Warp Zone. `grep 'push_back' WarpClass.cpp | wc -l` returns 697, which is 24 remainder 1, meaning 23 rooms of 29 rows and 1 room of 30 rows, which corresponds with 23 rooms in the Warp Zone and one Outer Space room. However, Outside Dimension VVVVVV + Tower Hallways and Space Station 1 and 2 are both odd curiosities. Finalclass.cpp contains Outside Dimension VVVVVV, (which is Intermission 1 and 2 and the Final Level), but also the Tower Hallway rooms, i.e. the auxiliary Tower rooms that are not a part of the main tower. Spacestation2.cpp contains both Space Station 1 and 2, so don't be deceived by the name. `grep 'push_back' Finalclass.cpp | wc -l` returns 1597, which is actually 55 remainder 2. So... are there two rooms with 30 rows? Yes, in fact, The Gravitron and Outer Space both contain 30 rows. So there are actually 55 rooms stored in Finalclass.cpp (not including the minitowers Panic Room and The Final Challenge), 54 rooms of actual level data and one Outer Space room, and breaking down the 54 rooms even further, 51 of them are actually in Outside Dimension VVVVVV and 3 of them are Tower Hallways. Of the 51 Outside Dimension VVVVVV rooms, 14 of those are Intermission 1, 4 of them are Intermission 2, and the rest of the 33 rooms are the Final Level (again, not including the minitowers). `grep 'push_back' Spacestation2.cpp | wc -l` returns 2148, which is 74 remainder 2. Are there two rooms with 30 rows again? No; one of those counted 2148 rows is a false-positive, because there's an if-else in Prize for the Reckless that replaces the row with spikes with a row without spikes if you are in a time trial or in No Death Mode. So there's 73 rooms in Space Station 1 and 2, and one Outer Space room. With all this in mind, I decided to duplicate the current last row of each room, the 29th row, to add a 30th row. However, I wasn't going to do this automatically! But neither was I going to write some kludge-y code to parse each nightmare of a level file and duplicate the rows that way. Enter: Vim macros! (Er, well, actually, I use Neovim.) I first did `/push_back`, so that pressing `n` would keep going to the next `push_back` in the file. Then I went to the 29th row of the first room in the file, did a `Yp`, and then started my macro with `qq`. The macro went like this: `30nYp`, which is simply going to the 29th row of the next room over and duplicating it. And that's all there was to it. However, I had to make sure that (1) my cursor was before the `push_back` on the line of the 29th row of the room, and (2) that I didn't skip rooms, both of which were problems I encountered when pressing Ctrl+Z a given invocation of the macro (the Ctrl+Z is just a metaphor, you actually undo by typing `u` in Vim). And also I had to make sure to be careful around the extra lines of `push_back`s in Prize for the Reckless and The Gravitron, and make sure I didn't run past the end of the file and loop back around. Thankfully, all Outer Space rooms are at the end of each file. But first, I had to increase the number of rows drawn in Graphics.cpp by 1 in order to compensate for this, and do the same when reading the tile data in Map.cpp. I had to change fillcontent(), drawmap(), drawfinalmap(), drawtowermap(), and drawtowermap_nobackground(). Funnily enough, the tower functions already used 30 rows, but I guess it's an off-by-one due to the camera scrolling, so they now draw 31 rows each. Then, I went in-game to make sure that the row behind each room name looked fine. I checked EVERY single room with a room name. I turned on invincibility mode and added a temporary line to hardreset() that always turned on game.nocutscenes for a smoother playtesting experience. And to make sure that rooms which have entirely empty bottom rows actually still have 30 rows, instead of having 29 and the game assuming that the 30th row was empty (because that sounds like it could lead to Undefined Behavior), I added this temporary debugging line to the start of mapclass::fillcontent(): printf("(%i,%i) has %i rows\n", game.roomx, game.roomy, (int) tmap.size()); Everywhere I checked - and I made sure to check all rooms - every room had 30 rows and not 29 rows. Unfortunately, some rooms simply couldn't be left alone with their 29th row duplicated and had to be manually edited. This was because the 29th row would contain some edge tiles because the player would be able to walk somewhere on the 28th, 27th, and 26th rows, and if you duplicated said edge tiles behind the room name, it would look bad. Here's a list of rooms whose 30th rows I had to manually edit: - Comms Relay - The Yes Men - Stop and Reflect - They Call Him Flipper - Double-slit Experiment - Square Root - Brought to you by the letter G - The Bernoulli Principle - Purest Unobtainium - I Smell Ozone - Conveying a New Idea - Upstream Downstream - Give Me A V - $eeing Dollar $ign$ - Doing Things The Hard Way - Very Good - Must I Do Everything For You? - Now Stay Close To Me... - ...But Not Too Close - ...Not as I Do - Do Try To Keep Up - Whee Sports - As you like it This is actually a strange case where it looked bad because of the 29th row, instead of the 30th row, and I had to change the 29th row instead of the 30th row to fix it. - Maze With No Entrance - Ascending and Descending - Mind The Gap Same strange case as "As you like it" (it's the 29th row I had to change that was the problem, not the 30th). - 1950 Silverstone Grand V - The Villi People I found that Panic Room and The Final Challenge also looked strange behind the roomname background, but I can't do much about either because towers' tile data wrap around at the top and bottom, and if I added another row to either it would be visible above the room name. I've considered updating the development editors with these new level tiles, but I decided against it as the development editors are already pretty outdated anyway. --- desktop_version/src/Finalclass.cpp | 159 ++++++++++++------- desktop_version/src/Graphics.cpp | 14 +- desktop_version/src/Labclass.cpp | 132 ++++++++++------ desktop_version/src/Spacestation2.cpp | 219 +++++++++++++++++--------- desktop_version/src/WarpClass.cpp | 69 +++++--- 5 files changed, 393 insertions(+), 200 deletions(-) diff --git a/desktop_version/src/Finalclass.cpp b/desktop_version/src/Finalclass.cpp index cca7ef68..2199ae74 100644 --- a/desktop_version/src/Finalclass.cpp +++ b/desktop_version/src/Finalclass.cpp @@ -51,6 +51,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,180,0,0,0,0,0,0,0,178,179,179,179,179,179,179,179,179,179,179,179, 98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98, 98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98, + 98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98, }; obj.createentity(163, 32, 12, 168); // (vertical gravity line) @@ -61,7 +62,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpx = true; roomname = "1954 World Cup Vinyl"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -98,6 +99,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 0,0,0,6,6,6,6,0,0,0,0,0,0,0,6,6,6,6,0,0,0,0,0,0,0,6,6,6,6,0,0,0,0,0,0,0,218,98,220,740, 0,0,0,178,179,179,180,0,0,0,0,0,0,0,178,179,179,180,0,0,0,0,0,0,0,178,179,179,180,0,0,0,0,0,0,0,218,98,220,740, 0,0,0,218,98,98,220,0,0,0,0,0,0,0,218,98,98,220,0,0,0,0,0,0,0,218,98,98,220,0,0,0,0,0,0,0,218,98,220,740, + 0,0,0,218,98,98,220,0,0,0,0,0,0,0,218,98,98,220,0,0,0,0,0,0,0,218,98,98,220,0,0,0,0,0,0,0,218,98,220,740, }; obj.createentity(-8, 116, 11, 40); // (horizontal gravity line) @@ -108,7 +110,7 @@ std::vector finalclass::loadlevel(int rx, int ry) obj.createentity(256, 128, 10, 0, 51503); // (savepoint) warpy = true; roomname = "The V Stooges"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -146,6 +148,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,6,6,6,6,0,0,0,0,0,0,0,0,0,0,6,6,6,6,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,50,178,179,179,180,49,0,0,0,0,0,0,0,0,50,178,179,179,180,49,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,50,218,98,98,220,49,0,0,0,0,0,0,0,0,50,218,98,98,220,49,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,50,218,98,98,220,49,0,0,0,0,0,0,0,0,50,218,98,98,220,49,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(-8, 116, 11, 40); // (horizontal gravity line) @@ -155,7 +158,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpy = true; roomname = "glitch"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -192,6 +195,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(-8, 116, 11, 40); // (horizontal gravity line) @@ -204,7 +208,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpy = true; roomname = "glitch"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -241,6 +245,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(-8, 148, 11, 104); // (horizontal gravity line) @@ -251,7 +256,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpy = true; roomname = "change"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -288,6 +293,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(-8, 84, 11, 328); // (horizontal gravity line) @@ -300,7 +306,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpy = true; roomname = "change"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -337,6 +343,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(248, 84, 11, 72); // (horizontal gravity line) @@ -346,7 +353,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpy = true; roomname = "change"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -384,6 +391,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(64+32-8, 32-16, 1, 0, 7, 0, -48, 320, 312); // Enemy, bounded @@ -402,7 +410,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpy = true; roomname = "Vertigo"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -439,6 +447,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,6,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,178,179,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(155, 24, 12, 184); // (vertical gravity line) @@ -455,7 +464,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpy = true; roomname = "The Voon Show"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -492,6 +501,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(168, 72, 10, 0, 51420); // (savepoint) @@ -500,7 +510,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpy = true; roomname = "glitch"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -538,6 +548,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,218,98,220,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,218,98,99,259,259,259,259,259,259,259,259,259,259,259,259,259,259, 740,740,218,98,220,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740, 740,740,218,98,220,0,0,0,0,0,218,220,178,179,179,179,179,179,179,179,179,179,180,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740, + 740,740,218,98,220,0,0,0,0,0,218,220,218,98,98,98,98,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740, }; obj.createentity(280, 120, 10, 1, 51410); // (savepoint) @@ -548,7 +559,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpx = true; roomname = "1950 Silverstone Grand V"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -586,6 +597,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,218,98,220,0,0,0,0,0,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, 740,740,218,98,220,0,0,0,0,0,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, 740,740,218,98,220,0,0,0,0,0,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, + 740,740,218,98,220,0,0,0,0,0,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, }; obj.createentity(264, 168, 10, 1, 52410); // (savepoint) @@ -606,7 +618,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "DIY V Repair"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; }; @@ -643,9 +655,10 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,740,740,740,740,740,740,740,740,218,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,218,98,220,218,98,99,259,259,259,259,259,259,259,259,100,98,220,218,98,220,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,218,98,220,218,98,220,740,740,740,740,740,740,740,740,218,98,220,218,98,220,740,740,740,740,740,740,740,740,740,740, + 740,740,740,740,740,740,740,740,740,740,218,98,220,218,98,220,740,740,740,740,740,740,740,740,218,98,220,218,98,220,740,740,740,740,740,740,740,740,740,740, }; roomname = "Party Time!"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -683,6 +696,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 218,98,98,220,218,98,98,220,218,98,98,220,178,179,179,180,0,0,0,0,178,179,179,180,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220, 218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,178,179,179,180,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220, 218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220, + 218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220, }; obj.createentity(264, 176, 10, 1, 52430); // (savepoint) @@ -692,7 +706,7 @@ std::vector finalclass::loadlevel(int rx, int ry) obj.createentity(96, 88, 1, 3, 8); // Enemy obj.createentity(72, 32, 10, 0, 52431); // (savepoint) roomname = "Upstairs, Downstairs"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -730,6 +744,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 98,98,98,98,98,98,220,218,220,178,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,180,218,98,98, 98,98,98,98,98,98,220,218,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,98, 98,98,98,98,98,98,220,218,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,98, + 98,98,98,98,98,98,220,218,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,98, }; obj.createentity(64, 112, 2, 11, 4); //Big Threadmill, <<<<<< @@ -748,7 +763,7 @@ std::vector finalclass::loadlevel(int rx, int ry) //obj.createentity(224, 168, 1, 1, 5, 0, 120, 320, 200); // Enemy, bounded obj.createentity(24, 184, 10, 1, 52440); // (savepoint) roomname = "Timeslip"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -785,6 +800,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,218,98,220,218,98,99,259,259,100,98,220,178,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,180,218,98,99,259,259,259,259,259,259,259, 740,218,98,220,218,98,220,740,740,218,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740, 740,218,98,220,218,98,220,740,740,218,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740, + 740,218,98,220,218,98,220,740,740,218,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740, }; obj.createentity(40, 176, 10, 1, 52450); // (savepoint) @@ -792,7 +808,7 @@ std::vector finalclass::loadlevel(int rx, int ry) obj.createentity(128, 88, 10, 1, 52451); // (savepoint) obj.createentity(160, 76, 11, 96); // (horizontal gravity line) roomname = "Three's Company"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -829,6 +845,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,218,98,220,6,6,6,6,6,6,6,6,6,218,220,6,6,6,6,6,6,6,6,6,6,6,6,6,218,98,220,740,740,740,740,740,740,740,740,740, 740,218,98,220,178,179,179,179,179,179,179,179,180,218,220,178,179,179,179,179,179,179,179,179,179,179,179,180,218,98,220,740,740,740,740,740,740,740,740,740, 740,218,98,220,218,98,98,98,98,98,98,98,220,218,220,218,98,98,98,98,98,98,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740,740,740, + 740,218,98,220,218,98,98,98,98,98,98,98,220,218,220,218,98,98,98,98,98,98,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740,740,740, }; obj.createentity(68-4, 56, 2, 11, 4); //Big Threadmill, <<<<<< @@ -838,7 +855,7 @@ std::vector finalclass::loadlevel(int rx, int ry) obj.createentity(120, 192, 2, 3, 6); // Platform obj.createentity(264, 48, 2, 2, 6); // Platform roomname = "Cosmic Creepers"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; }; @@ -875,6 +892,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 259,259,259,259,259,259,259,259,260,49,0,0,0,0,0,0,0,0,0,0,0,0,50,740,49,0,0,0,0,0,0,0,0,0,0,0,0,50,258,259, 179,179,179,179,179,179,179,179,179,180,6,6,6,6,6,6,6,6,6,6,6,6,178,179,180,6,6,6,6,6,6,6,6,6,6,6,6,178,179,179, 98,98,98,98,98,98,98,98,98,220,178,179,179,179,179,179,179,179,179,179,179,180,218,98,220,178,179,179,179,179,179,179,179,179,179,179,180,218,98,98, + 98,98,98,98,98,98,98,98,98,220,218,98,98,98,98,98,98,98,98,98,98,220,218,98,220,218,98,98,98,98,98,98,98,98,98,98,220,218,98,98, }; obj.createentity(16, 112, 10, 1, 52480); // (savepoint) @@ -885,7 +903,7 @@ std::vector finalclass::loadlevel(int rx, int ry) obj.createentity(123, 128, 12, 88); // (vertical gravity line) roomname = "The Villi People"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -922,6 +940,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 179,180,0,0,0,218,98,98,98,98,220,218,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740,740,740,218,98,220,178,179,179,179,179,179,179, 98,220,0,0,0,218,98,98,98,98,220,218,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740,740,740,218,98,220,218,98,98,98,98,98,98, 98,220,0,0,0,218,98,98,98,98,220,218,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740,740,740,218,98,220,218,98,98,98,98,98,98, + 98,220,0,0,0,218,98,98,98,98,220,218,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,740,740,740,218,98,220,218,98,98,98,98,98,98, }; obj.createentity(192, 56, 10, 1, 53500); // (savepoint) @@ -937,7 +956,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpx = true; roomname = "change"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -974,6 +993,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98, 259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259, 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, + 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, }; obj.createentity(24, 88, 10, 1, 54500); // (savepoint) @@ -986,7 +1006,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpx = true; roomname = "change"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1024,6 +1044,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, + 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, }; obj.createentity(16, 48, 10, 1, 53520); // (savepoint) @@ -1035,7 +1056,7 @@ std::vector finalclass::loadlevel(int rx, int ry) obj.createentity(272, 80, 3); //Disappearing Platform obj.createentity(304, 80, 3); //Disappearing Platform roomname = "The Last Straw"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1072,6 +1093,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,740,740,740,740,740,740,740,740,740,740,740,6,740,740,740,740,740,740,740,740,740,6,0,6,740,740,740,740,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,6,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, + 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, }; obj.createentity(0, 80, 3); //Disappearing Platform @@ -1085,7 +1107,7 @@ std::vector finalclass::loadlevel(int rx, int ry) obj.createentity(128, 88, 3); //Disappearing Platform obj.createentity(160, 88, 3); //Disappearing Platform roomname = "W"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1122,6 +1144,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, + 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, }; obj.createentity(0, 88, 3); //Disappearing Platform @@ -1130,7 +1153,7 @@ std::vector finalclass::loadlevel(int rx, int ry) obj.createentity(120, 128, 9, 19); // (shiny trinket) roomname="V"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1168,9 +1191,10 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, + 740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740, }; roomname = "VV"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1208,9 +1232,10 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740, + 740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740, }; roomname = "VVV"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1248,9 +1273,10 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740, + 740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740, }; roomname = "VVVV"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1287,10 +1313,11 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740, 740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740, + 740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740, }; roomname = "VVVVV"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1327,6 +1354,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740, 740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740, 740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740, + 740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740, }; obj.createblock(0, 0, 0, 5, 240); @@ -1342,7 +1370,7 @@ std::vector finalclass::loadlevel(int rx, int ry) obj.createblock(1, 0, 0, 320, 120, 3500); //Game complete } roomname = "VVVVVV"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1380,12 +1408,13 @@ std::vector finalclass::loadlevel(int rx, int ry) 98,98,220,178,179,179,179,179,179,179,179,179,179,179,179,179,179,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 98,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 98,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 98,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; rcol = 6; warpy = true; roomname = "Temporary Fault..."; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1422,10 +1451,11 @@ std::vector finalclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; warpy = true; roomname = "Do Not Adjust the V-hold"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1462,6 +1492,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,178,179,180,218,98,220,218,98,220,218,98,220,218,98,220,740,740,740,740,740,740, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,178,179,180,218,98,220,218,98,220,218,98,220,218,98,220,218,98,220,740,740,740,740,740,740, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,220,218,98,220,218,98,220,218,98,220,218,98,220,218,98,220,740,740,740,740,740,740, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,220,218,98,220,218,98,220,218,98,220,218,98,220,218,98,220,740,740,740,740,740,740, }; obj.createentity(264, 32, 10, 0, 54480); // (savepoint) @@ -1472,7 +1503,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpy = true; roomname = "Regular Service Will Return Shortly"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1509,12 +1540,13 @@ std::vector finalclass::loadlevel(int rx, int ry) 740,740,740,218,98,220,0,0,218,220,0,0,178,179,180,0,0,0,0,218,220,0,0,0,0,218,98,220,0,0,218,220,0,0,218,98,98,98,98,98, 740,740,740,218,98,220,0,0,218,220,0,0,218,98,220,0,0,0,0,218,220,0,0,0,0,218,98,220,0,0,218,220,0,0,218,98,98,98,98,98, 740,740,740,218,98,220,0,0,218,220,0,0,218,98,220,0,0,0,0,218,220,0,0,0,0,218,98,220,0,0,218,220,0,0,218,98,98,98,98,98, + 740,740,740,218,98,220,0,0,218,220,0,0,218,98,220,0,0,0,0,218,220,0,0,0,0,218,98,220,0,0,218,220,0,0,218,98,98,98,98,98, }; obj.createentity(120, 116, 11, 80); // (horizontal gravity line) warpy = true; roomname = "Origami Room"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1553,12 +1585,13 @@ std::vector finalclass::loadlevel(int rx, int ry) 12,12,12,12,12,12,12,21,28,28,28,0,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,20,12, 12,12,12,12,12,12,12,15,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,16,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, }; obj.createentity(40, 80, 10, 1, 50500); // (savepoint) roomname = "Teleporter Divot"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1595,6 +1628,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 12,12,12,12,12,12,12,15,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, }; obj.createentity(16, 112, 10, 1, 50520); // (savepoint) @@ -1608,7 +1642,7 @@ std::vector finalclass::loadlevel(int rx, int ry) obj.createblock(1, 26*8, 0, 32, 240, 36); } } - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1645,6 +1679,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,16,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, }; obj.createentity(128-16, 80-32, 14); //Teleporter! @@ -1654,7 +1689,7 @@ std::vector finalclass::loadlevel(int rx, int ry) { obj.createblock(1, 40, 0, 32, 240, 82); } - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1692,11 +1727,12 @@ std::vector finalclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,218,98,98,220,0,0,0,0,218,98,98,220,0,0,0,0,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,258,259,259,260,0,0,0,0,218,98,98,220,0,0,0,0,258,259,260,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 179,179,179,179,179,179,179,179,179,180,0,0,0,0,218,98,98,220,0,0,0,0,178,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179, + 98,98,98,98,98,98,98,98,98,220,0,0,0,0,218,98,98,220,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98, }; roomname = "Whee Sports"; warpx = true; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1733,11 +1769,12 @@ std::vector finalclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; roomname = "Whizz Down The Shaft"; warpx = true; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1821,6 +1858,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 219,218,98,220,0,0,0,0,218,98,99,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259, 219,218,98,220,0,0,0,0,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, 219,218,98,220,0,0,0,0,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, + 219,218,98,220,0,0,0,0,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, }; obj.createentity(264, 176, 10, 1, 51530); // (savepoint) @@ -1853,7 +1891,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpx = true; game.swnmode = false; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1891,13 +1929,14 @@ std::vector finalclass::loadlevel(int rx, int ry) 219,219,219,219,219,219,219,219,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, 219,219,219,219,219,219,219,219,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, 219,219,219,219,219,219,219,219,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, + 219,219,219,219,219,219,219,219,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, }; obj.createentity((22 * 8)+4, (9 * 8) + 4, 14); //Teleporter! roomname = "House of Mirrors"; warpx = true; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1936,13 +1975,14 @@ std::vector finalclass::loadlevel(int rx, int ry) 219,219,219,219,219,219,219,219,219,219,218,98,220,0,218,98,98,220,0,218,98,98,98,220,0,218,98,98,98,98,220,0,218,98,99,259,259,259,259,259, 219,219,219,219,219,219,219,219,219,219,218,98,220,0,218,98,98,220,0,218,98,98,98,220,0,218,98,98,98,98,220,0,218,98,220,219,219,219,219,219, 219,219,219,219,219,219,219,219,219,219,218,98,220,0,218,98,98,220,0,218,98,98,98,220,0,218,98,98,98,98,220,0,218,98,220,219,219,219,219,219, + 219,219,219,219,219,219,219,219,219,219,218,98,220,0,218,98,98,220,0,218,98,98,98,220,0,218,98,98,98,98,220,0,218,98,220,219,219,219,219,219, }; //obj.createentity(164, 96, 10, 1, 56410); // (savepoint) warpy = true; roomname = "Now Take My Lead"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1980,6 +2020,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 259,100,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98, 219,218,98,220,218,98,99,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259, 219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, + 219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, }; if(!game.nodeathmode) @@ -1990,7 +2031,7 @@ std::vector finalclass::loadlevel(int rx, int ry) roomname = "What Are You Waiting For?"; warpy = true; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2027,6 +2068,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98, 259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259, 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, + 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, }; if(!game.nodeathmode) @@ -2039,7 +2081,7 @@ std::vector finalclass::loadlevel(int rx, int ry) warpy = true; roomname = "Don't Get Ahead of Yourself!"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2076,6 +2118,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,178,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179, 259,259,259,259,259,259,259,259,259,259,259,259,259,100,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98, 219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,99,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259, + 219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, }; obj.createentity(144, 40, 10, 1, 56440); // (savepoint) @@ -2088,7 +2131,7 @@ std::vector finalclass::loadlevel(int rx, int ry) roomname = "Very Good"; warpy = true; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2125,6 +2168,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179, 98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98, 259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259, + 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, }; obj.createentity(104, 152, 1, 0, 3); // Enemy @@ -2133,7 +2177,7 @@ std::vector finalclass::loadlevel(int rx, int ry) roomname = "Must I Do Everything For You?"; warpy = true; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2170,6 +2214,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179, 98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98, 259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259, + 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, }; obj.createentity(56, 192, 10, 1, 56460); // (savepoint) @@ -2181,7 +2226,7 @@ std::vector finalclass::loadlevel(int rx, int ry) roomname = "Now Stay Close To Me..."; warpy = true; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2218,13 +2263,14 @@ std::vector finalclass::loadlevel(int rx, int ry) 179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,180,0,0,0,0,218,98,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219, 98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,6,6,6,6,218,98,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219, 259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,100,98,220,178,179,179,180,218,98,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219, + 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,98,220,218,98,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219, }; obj.createentity(144, 64, 2, 0, 2, 144, 64, 176, 216); // Platform, bounded roomname = "...But Not Too Close"; warpy = true; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2261,11 +2307,12 @@ std::vector finalclass::loadlevel(int rx, int ry) 219,219,219,218,98,220,218,98,99,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259, 219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, 219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, + 219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, }; warpy = true; roomname = "Don't Be Afraid"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2302,6 +2349,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259, 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, + 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, }; obj.createentity(152, 176, 10, 1, 56490); // (savepoint) @@ -2311,7 +2359,7 @@ std::vector finalclass::loadlevel(int rx, int ry) } warpy = true; roomname = "Do as I Say..."; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2348,6 +2396,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 259,259,259,259,259,259,100,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,178,179,179,180,218,98, 219,219,219,219,219,219,218,98,220,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,218,98,98,220,218,98, 219,219,219,219,219,219,218,98,220,178,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,180,218,98,98,220,218,98, + 219,219,219,219,219,219,218,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,98,220,218,98, }; obj.createentity(88, 200, 2, 1, 4, 88, 128, 216, 208); // Platform, bounded @@ -2356,7 +2405,7 @@ std::vector finalclass::loadlevel(int rx, int ry) roomname = "...Not as I Do"; warpy = true; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2393,6 +2442,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, + 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, }; obj.createentity(192, 136, 10, 1, 56510); // (savepoint) @@ -2402,7 +2452,7 @@ std::vector finalclass::loadlevel(int rx, int ry) } warpy = true; roomname = "Mind Your Head"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2439,6 +2489,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 219,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,220,219, 219,218,98,220,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,218,98,220,219, 219,218,98,220,178,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,180,218,98,220,219, + 219,218,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,220,219, }; obj.createentity(48, 200, 2, 1, 6, 48, 48, 272, 208); // Platform, bounded @@ -2451,7 +2502,7 @@ std::vector finalclass::loadlevel(int rx, int ry) roomname = "Do Try To Keep Up"; warpy = true; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2488,13 +2539,14 @@ std::vector finalclass::loadlevel(int rx, int ry) 219,219,219,219,219,218,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98, 219,219,219,219,219,218,98,220,218,98,99,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259, 219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, + 219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, }; obj.createentity(72, 72, 10, 1, 56530); // (savepoint) roomname = "You're Falling Behind"; warpy = true; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2531,6 +2583,7 @@ std::vector finalclass::loadlevel(int rx, int ry) 98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98, 259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259, 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, + 219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219, }; obj.createentity((18 * 8) + 4, (10 * 8) + 4, 14); //Teleporter! @@ -2542,7 +2595,7 @@ std::vector finalclass::loadlevel(int rx, int ry) roomname = "Class Dismissed!"; warpy = true; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp index 14116b39..4eeb821d 100644 --- a/desktop_version/src/Graphics.cpp +++ b/desktop_version/src/Graphics.cpp @@ -2091,7 +2091,7 @@ void Graphics::drawmap() FillRect(foregroundBuffer, 0x00000000); if(map.tileset==0) { - for (j = 0; j < 29+map.extrarow; j++) + for (j = 0; j < 30; j++) { for (int i = 0; i < 40; i++) { @@ -2101,7 +2101,7 @@ void Graphics::drawmap() } else if (map.tileset == 1) { - for (int jt = 0; jt < 29+map.extrarow; jt++) + for (int jt = 0; jt < 30; jt++) { for (int it = 0; it < 40; it++) { @@ -2111,7 +2111,7 @@ void Graphics::drawmap() } else if (map.tileset == 2) { - for (j = 0; j < 29+map.extrarow; j++) + for (j = 0; j < 30; j++) { for (int i = 0; i < 40; i++) { @@ -2146,14 +2146,14 @@ void Graphics::drawfinalmap() if (!foregrounddrawn) { FillRect(foregroundBuffer, 0x00000000); if(map.tileset==0){ - for (int j = 0; j < 29+map.extrarow; j++) { + for (int j = 0; j < 30; j++) { for (int i = 0; i < 40; i++) { if((map.contents[i + map.vmult[j]])>0) drawforetile(i * 8, j * 8, map.finalat(i,j)); } } }else if (map.tileset == 1) { - for (int j = 0; j < 29+map.extrarow; j++) { + for (int j = 0; j < 30; j++) { for (int i = 0; i < 40; i++) { if((map.contents[i + map.vmult[j]])>0) drawforetile2(i * 8, j * 8, map.finalat(i,j)); @@ -2169,7 +2169,7 @@ void Graphics::drawfinalmap() void Graphics::drawtowermap() { int temp; - for (int j = 0; j < 30; j++) + for (int j = 0; j < 31; j++) { for (int i = 0; i < 40; i++) { @@ -2182,7 +2182,7 @@ void Graphics::drawtowermap() void Graphics::drawtowermap_nobackground() { int temp; - for (j = 0; j < 30; j++) + for (j = 0; j < 31; j++) { for (int i = 0; i < 40; i++) { diff --git a/desktop_version/src/Labclass.cpp b/desktop_version/src/Labclass.cpp index a2a28659..fa2c6b17 100644 --- a/desktop_version/src/Labclass.cpp +++ b/desktop_version/src/Labclass.cpp @@ -62,6 +62,7 @@ std::vector labclass::loadlevel(int rx, int ry) 283,283,405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,403,283,405,0,0,0,0,0,0,403,283,283,283,283,283,283, 283,283,324,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,325,283,405,0,0,0,0,0,0,403,283,283,283,283,283,283, 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,405,0,0,0,0,0,0,403,283,283,283,283,283,283, + 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,405,0,0,0,0,0,0,403,283,283,283,283,283,283, }; obj.createentity(232, 24, 10, 0, 250500); // (savepoint) @@ -73,7 +74,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=1; roomname = "Get Ready To Bounce"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -110,13 +111,14 @@ std::vector labclass::loadlevel(int rx, int ry) 280,280,280,280,280,280,280,280,280,280,280,280,321,362,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,360,322, 280,280,280,280,280,280,280,280,280,280,280,280,280,321,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,322,280, 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, + 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, }; obj.createentity(112, 180, 11, 192); // (horizontal gravity line) rcol = 0; roomname = "It's Perfectly Safe"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -153,6 +155,7 @@ std::vector labclass::loadlevel(int rx, int ry) 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,0,0,0,412,292,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,0,0,0,412,292,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,0,0,0,412,292,292,292,292, + 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,0,0,0,412,292,292,292,292, }; obj.createentity(96, 124, 11, 120); // (horizontal gravity line) @@ -160,7 +163,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 4; roomname = "Rascasse"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -197,6 +200,7 @@ std::vector labclass::loadlevel(int rx, int ry) 286,286,286,286,286,286,286,408,67,67,67,67,67,67,67,67,406,286,286,408,67,67,67,67,67,67,67,67,406,286,286,286,286,286,286,286,286,286,286,286, 286,286,286,286,286,286,286,327,367,367,367,367,367,367,367,367,328,286,286,327,367,367,367,367,367,367,367,367,328,286,286,286,286,286,286,286,286,286,286,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, + 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, }; obj.createentity(248, 136, 10, 1, 252490); // (savepoint) @@ -207,7 +211,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 2; roomname = "Keep Going"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -244,6 +248,7 @@ std::vector labclass::loadlevel(int rx, int ry) 289,411,0,0,0,0,0,0,0,0,0,409,289,289,289,289,289,289,411,0,0,0,0,0,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, 289,411,0,0,0,0,0,0,0,0,0,409,289,289,289,289,289,289,330,370,370,370,370,370,331,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, 289,411,0,0,0,0,0,0,0,0,0,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, + 289,411,0,0,0,0,0,0,0,0,0,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, }; obj.createentity(280, 136, 10, 1, 252480); // (savepoint) @@ -253,7 +258,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=3; roomname = "Single-slit Experiment"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -291,6 +296,7 @@ std::vector labclass::loadlevel(int rx, int ry) 295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, 295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, 295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, + 295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, }; obj.createentity(32, 128, 10, 1, 253480); // (savepoint) @@ -299,7 +305,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 5; roomname = "Don't Flip Out"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -336,6 +342,7 @@ std::vector labclass::loadlevel(int rx, int ry) 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, + 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, }; obj.createentity(43, 88, 12, 56); // (vertical gravity line) @@ -348,7 +355,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 1; roomname = "Shuffled Hallway"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -385,6 +392,7 @@ std::vector labclass::loadlevel(int rx, int ry) 289,289,289,289,289,289,289,289,330,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,371,0,0,0,0,0,0,0,0, 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,69,69,69,69,69,69,69,69, 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,330,370,370,370,370,370,370,370,370, + 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, }; obj.createentity(96, 192, 10, 1, 253500); // (savepoint) @@ -392,7 +400,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 3; roomname = "Double-slit Experiment"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -429,6 +437,7 @@ std::vector labclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, 67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,406,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, 367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,328,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, + 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, }; obj.createentity(264, 104, 10, 1, 253510); // (savepoint) @@ -437,7 +446,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.createentity(40, 112, 10, 0, 253511); // (savepoint) rcol = 2; roomname = "They Call Him Flipper"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -474,13 +483,14 @@ std::vector labclass::loadlevel(int rx, int ry) 292,292,292,292,292,292,292,292,292,292,292,292,292,414,71,71,71,71,71,412,292,292,292,414,71,71,71,71,71,412,292,292,292,292,292,292,292,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,333,373,373,373,373,373,334,292,292,292,333,373,373,373,373,373,334,292,292,292,292,292,292,292,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, + 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, }; obj.createentity(24, 184, 10, 1, 253520); // (savepoint) obj.createentity(64, 164, 11, 200); // (horizontal gravity line) rcol = 4; roomname = "Three's a Crowd"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -517,6 +527,7 @@ std::vector labclass::loadlevel(int rx, int ry) 286,286,286,286,286,286,286,408,0,0,0,0,0,0,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,67,406,286,286,286,286,286, 286,286,286,286,286,286,286,408,0,0,0,0,0,0,366,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,328,286,286,286,286,286, 286,286,286,286,286,286,286,408,0,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, + 286,286,286,286,286,286,286,408,0,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, }; obj.createentity(195, 24, 12, 80); // (vertical gravity line) @@ -525,7 +536,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.createentity(80, 96, 10, 1, 252521); // (savepoint) rcol = 2; roomname = "Hitting the Apex"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -562,6 +573,7 @@ std::vector labclass::loadlevel(int rx, int ry) 280,402,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,400,280,280,280,280,280,280,280, 280,321,362,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,360,322,280,280,280,280,280,280,280, 280,280,321,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,322,280,280,280,280,280,280,280,280, + 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, }; obj.createentity(24, 188, 11, 224); // (horizontal gravity line) @@ -572,7 +584,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=0; roomname = "Square Root"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -610,13 +622,14 @@ std::vector labclass::loadlevel(int rx, int ry) 292,414,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,333,374,71,71,71,71,71,71,71,71,71,71,71,71,71,71,372,334,292,292, 292,414,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,292,333,373,373,373,373,373,373,373,373,373,373,373,373,373,373,334,292,292,292, 292,414,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, + 292,414,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, }; obj.createentity(24, 44, 11, 112); // (horizontal gravity line) obj.createentity(176, 180, 11, 112); // (horizontal gravity line) rcol = 4; roomname = "Thorny Exchange"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -653,6 +666,7 @@ std::vector labclass::loadlevel(int rx, int ry) 283,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,403,405,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,283, 283,283,324,365,65,65,65,65,65,65,65,65,65,65,65,65,65,65,363,325,405,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,283, 283,283,283,324,364,364,364,364,364,364,364,364,364,364,364,364,364,364,325,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,283, + 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,283, }; obj.createentity(32, 28, 11, 296); // (horizontal gravity line) @@ -661,7 +675,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.createentity(88, 112, 10, 0, 250510); // (savepoint) roomname = "Brought to you by the letter G"; rcol = 1; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -698,6 +712,7 @@ std::vector labclass::loadlevel(int rx, int ry) 286,286,286,286,286,286,286,286,408,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 286,286,286,286,286,286,286,286,408,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 286,286,286,286,286,286,286,286,408,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 286,286,286,286,286,286,286,286,408,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(-8, 28, 11, 336); // (horizontal gravity line) @@ -705,7 +720,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=2; roomname = "Free Your Mind"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -742,12 +757,13 @@ std::vector labclass::loadlevel(int rx, int ry) 280,280,280,280,280,280,280,280,280,321,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361, 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, + 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, }; obj.createentity(80, 180, 11, 248); // (horizontal gravity line) rcol=0; roomname = "I Changed My Mind, Thelma..."; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -784,6 +800,7 @@ std::vector labclass::loadlevel(int rx, int ry) 373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,334,292,292,292,333,373,373,373,373,373,373,373,373,373,373, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, + 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, }; obj.createentity(-8, 180, 11, 208); // (horizontal gravity line) @@ -791,7 +808,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=4; roomname = "Indirect Jump Vector"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -828,13 +845,14 @@ std::vector labclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,415,295,417,61,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,415,295,417,61,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,415,295,417,61,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,415,295,417,61,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(-8, 28, 11, 336); // (horizontal gravity line) rcol=5; roomname = "In a Single Bound"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -871,6 +889,7 @@ std::vector labclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,54,363,353,365,53,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0, }; obj.createentity(-8, 28, 11, 80); // (horizontal gravity line) @@ -879,7 +898,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=1; roomname = "Barani, Barani"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -917,6 +936,7 @@ std::vector labclass::loadlevel(int rx, int ry) 367,367,367,367,367,367,367,367,367,328,286,286,286,327,367,367,367,367,367,367,367,367,367,367,367,367,328,286,286,286,327,367,367,367,367,367,367,367,367,367, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, + 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, }; obj.createentity(-8, 180, 11, 80); // (horizontal gravity line) @@ -925,7 +945,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=2; roomname = "Safety Dance"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -962,13 +982,14 @@ std::vector labclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,409,411,0,0,0,0,0,0,409,289,289,289, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,409,411,0,0,0,0,0,0,409,289,289,289, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,409,411,0,0,0,0,0,0,409,289,289,289, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,409,411,0,0,0,0,0,0,409,289,289,289, }; obj.createentity(-8, 28, 11, 40); // (horizontal gravity line) rcol=3; roomname = "Heady Heights"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1005,6 +1026,7 @@ std::vector labclass::loadlevel(int rx, int ry) 295,295,295,295,295,295,417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,415,295, 295,295,295,295,295,295,417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,415,295, 295,295,295,295,295,295,417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,415,295, + 295,295,295,295,295,295,417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,415,295, }; @@ -1018,7 +1040,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 5; roomname = "Entanglement Generator"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1056,13 +1078,14 @@ std::vector labclass::loadlevel(int rx, int ry) 361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,322,280,402,0,0,0,0,0,0,400,280,280,280, 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,402,0,0,0,0,0,0,400,280,280,280, 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,402,0,0,0,0,0,0,400,280,280,280, + 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,402,0,0,0,0,0,0,400,280,280,280, }; obj.createentity(-8, 180, 11, 224); // (horizontal gravity line) rcol = 0; roomname = "Exhausted?"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1100,6 +1123,7 @@ std::vector labclass::loadlevel(int rx, int ry) 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,59,0,0,0,0,0,0,0,60,412,292,414,0,0,0,0,0,0,412,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,59,0,0,0,0,0,0,0,60,412,292,414,0,0,0,0,0,0,412,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,59,0,0,0,0,0,0,0,60,412,292,414,0,0,0,0,0,0,412,292,292,292, + 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,59,0,0,0,0,0,0,0,60,412,292,414,0,0,0,0,0,0,412,292,292,292, }; obj.createentity(32, 64, 9, 10); // (shiny trinket) @@ -1107,7 +1131,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 4; roomname = "The Tantalizing Trinket"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1144,6 +1168,7 @@ std::vector labclass::loadlevel(int rx, int ry) 283,283,283,283,283,283,283,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,405,0,0,0,0,0,0,403,283,283,283, 283,283,283,283,283,283,283,283,324,365,65,65,65,65,65,65,65,65,0,0,0,0,0,0,0,0,54,403,283,405,0,0,0,0,0,0,403,283,283,283, 283,283,283,283,283,283,283,283,283,324,364,364,364,364,364,364,364,365,53,0,0,0,0,0,0,0,54,403,283,405,0,0,0,0,0,0,403,283,283,283, + 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,405,53,0,0,0,0,0,0,0,54,403,283,405,0,0,0,0,0,0,403,283,283,283, }; obj.createentity(272, 144, 10, 1, 253550); // (savepoint) @@ -1153,7 +1178,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=1; roomname = "The Bernoulli Principle"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1190,6 +1215,7 @@ std::vector labclass::loadlevel(int rx, int ry) 295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, 295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, 295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, + 295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, }; obj.createentity(216, 144, 10, 1, 254550); // (savepoint) @@ -1198,7 +1224,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 5; roomname = "Standing Wave"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1235,6 +1261,7 @@ std::vector labclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,366,328,286,286,286,286,286,286,286,286,286,286, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286, }; obj.createentity(-8, 60, 11, 336); // (horizontal gravity line) @@ -1243,7 +1270,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.fatal_top(); roomname = "Topsy Turvyism"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1280,6 +1307,7 @@ std::vector labclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(-8, 60, 11, 120); // (horizontal gravity line) @@ -1294,7 +1322,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.fatal_top(); roomname = "Spike Strip Deployed"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1331,6 +1359,7 @@ std::vector labclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(-8, 60, 11, 336); // (horizontal gravity line) @@ -1342,7 +1371,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.fatal_top(); roomname = "Vibrating String Problem"; rcol = 5; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1379,6 +1408,7 @@ std::vector labclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(176, 60, 11, 152); // (horizontal gravity line) @@ -1390,7 +1420,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.fatal_top(); roomname = "Merge"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1427,6 +1457,7 @@ std::vector labclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(-8, 84, 11, 336); // (horizontal gravity line) @@ -1439,7 +1470,7 @@ std::vector labclass::loadlevel(int rx, int ry) obj.fatal_top(); roomname = "Kids His Age Bounce"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1476,6 +1507,7 @@ std::vector labclass::loadlevel(int rx, int ry) 286,286,286,286,408,55,0,0,0,0,0,0,56,430,55,0,0,0,0,0,0,56,430,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 286,286,286,286,408,55,0,0,0,0,0,0,56,430,55,0,0,0,0,0,0,56,430,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 286,286,286,286,408,55,0,0,0,0,0,0,56,430,55,0,0,0,0,0,0,56,430,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 286,286,286,286,408,55,0,0,0,0,0,0,56,430,55,0,0,0,0,0,0,56,430,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(264, 84, 11, 64); // (horizontal gravity line) @@ -1485,7 +1517,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=2; roomname = "I'm Sorry"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1523,6 +1555,7 @@ std::vector labclass::loadlevel(int rx, int ry) 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, + 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, }; obj.createentity(48, 156, 11, 200); // (horizontal gravity line) @@ -1530,7 +1563,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=4; roomname = "Please Forgive Me!"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1567,6 +1600,7 @@ std::vector labclass::loadlevel(int rx, int ry) 283,283,283,283,283,283,283,283,283,324,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,325,283,283, 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, + 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, }; obj.createentity(131, 48, 12, 152); // (vertical gravity line) @@ -1576,7 +1610,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=1; roomname = "Playing Foosball"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1613,6 +1647,7 @@ std::vector labclass::loadlevel(int rx, int ry) 295,295,295,295,295,336,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,337,295,295,295,295, 295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, 295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, + 295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, }; obj.createentity(91, 168, 12, 32); // (vertical gravity line) @@ -1629,7 +1664,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=5; roomname = "A Difficult Chord"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1666,6 +1701,7 @@ std::vector labclass::loadlevel(int rx, int ry) 280,280,280,280,280,280,280,280,280,321,361,361,361,361,361,322,402,51,0,0,0,0,0,52,400,321,361,361,361,361,361,322,280,280,280,280,280,280,280,280, 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,402,51,0,0,0,0,0,52,400,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,402,51,0,0,0,0,0,52,400,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, + 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,402,51,0,0,0,0,0,52,400,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, }; obj.createentity(16, 184, 10, 1, 255520); // (savepoint) @@ -1676,7 +1712,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol = 0; roomname = "The Living Dead End"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1713,11 +1749,12 @@ std::vector labclass::loadlevel(int rx, int ry) 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,57,0,0,0,0,0,58,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,57,0,0,0,0,0,58,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,57,0,0,0,0,0,58,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, + 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,57,0,0,0,0,0,58,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, }; rcol=3; roomname = "AAAAAA"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1754,11 +1791,12 @@ std::vector labclass::loadlevel(int rx, int ry) 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,327,367,368,0,0,0,0,0,366,367,328,286,286,286,286,286,286,286,286,286,286,286,286,286,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,408,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,408,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, + 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,408,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, }; rcol = 2; roomname = "Diode"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1796,6 +1834,7 @@ std::vector labclass::loadlevel(int rx, int ry) 280,280,280,280,280,280,280,280,402,0,0,0,0,0,360,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,322,280, 280,280,280,280,280,280,280,280,402,0,0,0,0,0,400,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, 280,280,280,280,280,280,280,280,402,0,0,0,0,0,400,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, + 280,280,280,280,280,280,280,280,402,0,0,0,0,0,400,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, }; obj.createentity(267, 24, 12, 184); // (vertical gravity line) @@ -1808,7 +1847,7 @@ std::vector labclass::loadlevel(int rx, int ry) rcol=0; roomname = "Young Man, It's Worth the Challenge"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1845,12 +1884,13 @@ std::vector labclass::loadlevel(int rx, int ry) 292,292,292,414,400,280,280,280,280,280,402,409,289,289,289,289,289,289,289,290,450,450,450,450,451,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295, 292,292,292,414,400,280,280,280,280,280,402,409,289,289,289,289,289,289,289,411,375,376,376,376,376,337,295,295,295,295,295,295,295,295,295,295,295,295,295,295, 292,292,292,414,400,280,280,280,280,280,402,409,289,289,289,289,289,289,289,411,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, + 292,292,292,414,400,280,280,280,280,280,402,409,289,289,289,289,289,289,289,411,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, }; rcol = 6; roomname = "Anomaly"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1887,13 +1927,14 @@ std::vector labclass::loadlevel(int rx, int ry) 289,289,289,289,289,411,446,288,286,327,367,368,443,444,444,445,366,367,328,286,287,448,409,289,289,289,289,289,289,289,289,289,289,289,289,330,370,371,452,453, 289,289,289,289,289,330,371,446,447,288,286,327,367,367,367,367,328,286,287,447,448,369,331,289,289,289,289,289,289,289,289,289,289,289,289,289,289,330,370,370, 289,289,289,289,289,289,330,370,371,406,286,286,286,286,286,286,286,286,408,369,370,331,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, + 289,289,289,289,289,289,289,289,411,406,286,286,286,286,286,286,286,286,408,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, }; obj.createentity(104, 128, 9, 11); // (shiny trinket) rcol = 6; roomname = "Purest Unobtainium"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1931,13 +1972,14 @@ std::vector labclass::loadlevel(int rx, int ry) 295,295,295,295,295,417,0,415,295,295,417,0,455,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,457,0,415,295,295,295,295, 295,295,295,295,295,417,0,415,295,295,417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,295,295,295,295, 295,295,295,295,295,417,0,415,295,295,336,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,337,295,295,295,295, + 295,295,295,295,295,417,0,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, }; obj.createentity(112, 184, 10, 1, 258520); // (savepoint) rcol = 5; roomname = "I Smell Ozone"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1974,6 +2016,7 @@ std::vector labclass::loadlevel(int rx, int ry) 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, + 280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280, }; rcol=0; @@ -1988,7 +2031,7 @@ std::vector labclass::loadlevel(int rx, int ry) roomname = "Why So Blue?"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2025,6 +2068,7 @@ std::vector labclass::loadlevel(int rx, int ry) 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, + 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, }; rcol=3; @@ -2037,7 +2081,7 @@ std::vector labclass::loadlevel(int rx, int ry) } roomname = "Philadelphia Experiment"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } diff --git a/desktop_version/src/Spacestation2.cpp b/desktop_version/src/Spacestation2.cpp index 4de6d823..60fe8259 100644 --- a/desktop_version/src/Spacestation2.cpp +++ b/desktop_version/src/Spacestation2.cpp @@ -52,6 +52,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,196,197,197,197,197,197,198,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,277,277,277,277,277,278,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(96, 40, 10, 0, 450500); // (savepoint) @@ -62,7 +63,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) roomname = "Outer Hull"; //If not yet in level, use "The Space Station"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -99,10 +100,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; roomname = "The Filter"; //If not yet in level, use "The Space Station" - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -139,6 +141,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 107,107,107,107,107,107,229,689,689,689,689,227,107,107,107,107,107,107,107,229,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,227,107,107,107, 107,107,107,107,107,107,229,689,689,689,689,227,107,107,107,107,107,107,107,148,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,149,107,107,107, 107,107,107,107,107,107,229,689,689,689,689,227,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, + 107,107,107,107,107,107,229,689,689,689,689,227,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, }; obj.createentity(128, 176, 10, 1, 449490); // (savepoint) @@ -150,7 +153,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(184-24, 96, 1, 1, 4, 160, 88, 256, 192); // Enemy, bounded obj.createentity(256, 8, 2, 10, 4); //Big Threadmill, >>>>>> roomname = "Boldly To Go"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -188,11 +191,12 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 289,289,289,289,289,289,411,680,680,680,680,409,289,289,411,680,680,680,680,680,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, 289,289,289,289,289,289,411,680,680,680,680,409,289,289,411,680,680,680,680,680,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, 289,289,289,289,289,289,411,680,680,680,680,409,289,289,411,680,680,680,680,680,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, + 289,289,289,289,289,289,411,680,680,680,680,409,289,289,411,680,680,680,680,680,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, }; obj.createentity(192, 96, 9, 2); // (shiny trinket) roomname = "One Way Room"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -230,6 +234,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 92,92,92,92,92,92,214,0,0,803,683,212,92,92,214,683,683,683,683,683,683,683,683,805,0,0,0,0,0,0,0,0,0,0,0,0,212,92,92,92, 92,92,92,92,92,92,214,0,0,803,683,212,92,92,214,683,683,683,683,683,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,92,92,92, 92,92,92,92,92,92,214,0,0,803,683,212,92,92,214,683,683,683,683,683,172,173,173,173,173,173,173,173,173,173,173,174,0,0,0,0,212,92,92,92, + 92,92,92,92,92,92,214,0,0,803,683,212,92,92,214,683,683,683,683,683,212,92,92,92,92,92,92,92,92,92,92,214,0,0,0,0,212,92,92,92, }; obj.createentity(56, 24, 2, 10, 4); //Big Threadmill, >>>>>> @@ -251,7 +256,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(224, 120, 10, 0, 447491); // (savepoint) roomname = "Conveying a New Idea"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -289,6 +294,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 98,98,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,98,220,0,0,0,0,218,98,98,98, 98,98,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,98,220,0,0,0,0,218,98,98,98, 98,98,98,220,0,0,0,0,178,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,140,98,98,220,0,0,0,0,218,98,98,98, + 98,98,98,220,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,218,98,98,98, }; obj.createentity(0, 72, 2, 10, 4); //Big Threadmill, >>>>>> @@ -309,7 +315,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(192, 72, 2, 10, 4); //Big Threadmill, >>>>>> obj.createentity(192, 112, 2, 8, 4); //Threadmill, >>> roomname = "Upstream Downstream"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -346,6 +352,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, + 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, }; obj.platformtile = 119; @@ -357,7 +364,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(224, 112, 2, 0, 4, 64, 72, 256, 160); // Platform, bounded obj.createentity(264, 96, 10, 1, 448500); // (savepoint) roomname = "The High Road is Low"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -394,6 +401,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,154,195,0,0,0,0,193,155,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113, 113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,235,8,8,8,8,233,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113, 113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,154,194,194,194,194,155,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113, + 113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113, }; obj.createentity(144, 200, 3, 51); //Disappearing Platform @@ -404,7 +412,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(224, 8, 2, 11, 4); //Big Threadmill, <<<<<< obj.createentity(288, 8, 2, 9, 4); //Threadmill, <<< roomname = "Give Me A V"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -441,6 +449,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 83,83,83,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164, 83,83,83,124,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,125,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83, 83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83, + 83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83, }; obj.createentity(0, 8, 2, 11, 4); //Big Threadmill, <<<<<< @@ -458,7 +467,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(64, 208, 2, 10, 4); //Big Threadmill, >>>>>> obj.createentity(128, 208, 2, 10, 4); //Big Threadmill, >>>>>> roomname = "Select Track"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -495,6 +504,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364, 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, + 283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, }; obj.createentity(0, 104, 2, 11, 4); //Big Threadmill, <<<<<< @@ -513,7 +523,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(192, 32, 3,10); //Disappearing Platform obj.createentity(224, 32, 3,10); //Disappearing Platform roomname = "You Chose... Poorly"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -550,6 +560,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188, 107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, 107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, + 107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, }; obj.createentity(0, 104, 2, 11, 4); //Big Threadmill, <<<<<< @@ -563,7 +574,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(192, 112, 2, 10, 4); //Big Threadmill, >>>>>> obj.createentity(256, 112, 2, 10, 4); //Big Threadmill, >>>>>> roomname = "Hyperspace Bypass 5"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -600,6 +611,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,173,134,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, 92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, 92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, + 92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, }; obj.platformtile = 319; @@ -612,7 +624,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(80, 112, 2, 8, 4); //Threadmill, >>> obj.createentity(80, 104, 2, 9, 4); //Threadmill, <<< roomname = "Plain Sailing from Here On"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -650,6 +662,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 483,483,524,564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,525,483,605,0,0,0,0,0,0,0,0,603,483,483,483, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,0,0,0,0,0,0,0,0,603,483,483,483, 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,0,0,0,0,0,0,0,0,603,483,483,483, + 483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,0,0,0,0,0,0,0,0,603,483,483,483, }; obj.platformtile = 10; @@ -662,7 +675,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(64, 16, 2, 8, 4); //Threadmill, >>> obj.createentity(104, 24, 10, 0, 448541); // (savepoint) roomname = "Ha Ha Ha Not Really"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -700,6 +713,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 591,591,591,591,552,510,510,510,632,0,0,0,0,818,698,698,630,510,510,510,510,510,510,632,698,698,820,0,0,0,0,630,510,510,510,510,510,510,510,510, 510,510,510,510,510,510,510,510,632,0,0,0,0,818,698,698,630,510,510,510,510,510,510,632,698,698,820,0,0,0,0,630,510,510,510,510,510,510,510,510, 510,510,510,510,510,510,510,510,632,0,0,0,0,818,698,698,630,510,510,510,510,510,510,632,698,698,820,0,0,0,0,630,510,510,510,510,510,510,510,510, + 510,510,510,510,510,510,510,510,632,0,0,0,0,818,698,698,630,510,510,510,510,510,510,632,698,698,820,0,0,0,0,630,510,510,510,510,510,510,510,510, }; obj.platformtile = 279; @@ -717,7 +731,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(48, 104, 2, 10, 4); //Big Threadmill, >>>>>> roomname="You Just Keep Coming Back"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -754,6 +768,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 370,370,331,289,289,289,289,289,330,370,370,370,370,370,370,370,331,289,289,289,289,289,289,330,370,370,370,370,370,370,370,331,289,289,289,289,289,330,370,370, 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, + 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, }; obj.platformtile = 359; @@ -768,7 +783,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(232, 144, 10, 0, 448522); // (savepoint) obj.createentity(72, 144, 10, 0, 448523); // (savepoint) roomname = "Gordian Knot"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -806,6 +821,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 313,313,313,313,313,313,313,313,313,354,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394,394, 313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313, 313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313, + 313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313, }; obj.createentity(256, 112, 2, 11, 4); //Big Threadmill, <<<<<< @@ -824,7 +840,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(216+16, 128, 1, 0, 5, 104, 120, 288, 200); // Enemy, bounded roomname = "Backsliders"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -861,6 +877,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 283,283,283,283,283,283,283,405,0,0,0,0,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,405,0,0,0,0,0,0,0,0,0,0, 283,283,283,283,283,283,283,405,0,0,0,0,363,364,364,364,325,283,283,283,283,283,283,283,283,283,283,283,283,324,364,364,364,364,364,364,364,364,364,364, 283,283,283,283,283,283,283,405,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, + 283,283,283,283,283,283,283,405,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, }; obj.createentity(72, 184, 10, 0, 447510); // (savepoint) @@ -876,7 +893,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) //LIES emitter starts here roomname = "The Cuckoo"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -913,6 +930,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,430,432,0,0,0,0,0,0,0,0,430,310,310,432,0,0,0,0,0,0,0,0,8,8,8,8,8,8,8,8, 391,391,391,391,391,391,391,391,391,391,352,351,391,391,391,391,391,391,391,391,352,310,310,351,391,391,391,391,391,391,391,391,391,391,391,391,391,391,391,391, 310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310, + 310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310, }; obj.createentity(8, 200, 10, 1, 447520); // (savepoint) @@ -926,7 +944,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(24 - 60 - 8 + (117 * 3), 144 - 8, 1, 10, 1); // Enemy //LIES Emitter, manually positioned roomname = "Clarion Call"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -963,6 +981,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,232,0,0,0,0,230,110,110,110,110,110,110,110,110,110,110,110,110,110,110, 110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,232,0,0,0,0,230,110,110,110,110,110,110,110,110,110,110,110,110,110,110, 110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,232,0,0,0,0,230,110,110,110,110,110,110,110,110,110,110,110,110,110,110, + 110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,232,0,0,0,0,230,110,110,110,110,110,110,110,110,110,110,110,110,110,110, }; obj.createentity(176, 104, 10, 0, 446510); // (savepoint) @@ -972,7 +991,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(7*8, 2*8, 1, 12, 1); // Enemy //FACTORY emitter starts here roomname = "The Solution is Dilution"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1009,6 +1028,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 92,92,92,92,92,92,214,683,683,683,683,683,683,683,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, 92,92,92,92,92,92,214,683,683,683,683,683,172,173,134,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, 92,92,92,92,92,92,214,683,683,683,683,683,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, + 92,92,92,92,92,92,214,683,683,683,683,683,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, }; obj.createentity(96, 168, 10, 0, 445510); // (savepoint) @@ -1020,7 +1040,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) //FACTORY emitter starts here (manually placed) roomname = "Lighter Than Air"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1058,6 +1078,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 292,292,292,292,414,701,701,701,701,701,701,701,412,292,292,292,292,292,292,292,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,292,292, 292,292,292,292,333,373,374,701,701,701,701,701,412,292,292,292,292,292,292,292,414,0,0,0,0,372,373,373,373,373,373,373,373,373,373,373,373,334,292,292, 292,292,292,292,292,292,414,701,701,701,701,701,412,292,292,292,292,292,292,292,414,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292, + 292,292,292,292,292,292,414,701,701,701,701,701,412,292,292,292,292,292,292,292,414,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292, }; obj.createentity(224, 200, 10, 1, 444510); // (savepoint) @@ -1075,7 +1096,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(18 * 8, (5 * 8) + 4, 14); //Teleporter! } roomname = "Level Complete!"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1113,9 +1134,10 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,327,367,367, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, + 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, }; roomname = "Green Grotto"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1152,6 +1174,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 98,98,98,98,220,0,0,0,0,0,800,680,680,680,680,680,680,680,680,680,802,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 98,98,98,98,220,0,0,0,0,0,800,680,680,680,680,680,680,680,680,680,802,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 98,98,98,98,220,0,0,0,0,0,800,680,680,680,680,680,680,680,680,680,802,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 98,98,98,98,220,0,0,0,0,0,800,680,680,680,680,680,680,680,680,680,802,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(248 - 4, 160 - 48, 1, 1, 0); // Enemy @@ -1162,7 +1185,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createblock(5, 156-4, 40, 20, 16, 15); roomname = "The Hanged Man, Reversed"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1199,11 +1222,12 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 370,370,370,370,370,370,370,370,370,370,370,370,370,370,370,371,0,0,0,0,0,0,0,0,369,370,370,370,370,370,370,370,370,370,370,370,370,370,370,370, 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,330,370,371,0,0,0,0,369,370,331,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, + 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289, }; obj.createentity(152, 120, 10, 0, 445530); // (savepoint) roomname = "doomS"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1240,6 +1264,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 8,8,8,8,8,8,209,89,89,211,8,8,8,8,8,8,8,8,209,89,89,211,8,8,8,8,8,8,8,8,209,89,89,211,8,8,8,8,8,8, 170,170,170,170,170,170,131,89,89,130,170,170,170,170,170,170,170,170,131,89,89,130,170,170,170,170,170,170,170,170,131,89,89,130,170,170,170,170,170,170, 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, + 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, }; obj.createentity(24-60-8, 144-8, 1, 10, 0); // Enemy @@ -1250,7 +1275,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(24 - 60 - 8 + (117 * 3), 144 - 8, 1, 10, 1); // Enemy roomname = "Chinese Rooms"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1287,11 +1312,12 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(152, 96, 10, 1, 446530); // (savepoint) roomname = "Swoop"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1328,6 +1354,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,229,0,0,0,0,227,229,0,0,0,0,0,0, 107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,229,0,0,0,0,227,229,0,0,0,0,0,0, 107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,229,0,0,0,0,227,229,0,0,0,0,0,0, + 107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,229,0,0,0,0,227,229,0,0,0,0,0,0, }; obj.createentity(64, 40, 10, 1, 446520); // (savepoint) @@ -1336,7 +1363,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(96, 88, 3, 827); //Disappearing Platform obj.createentity(40, 160, 3, 827); //Disappearing Platform roomname = "Manic Mine"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1374,9 +1401,10 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; roomname = "Sorrow"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1414,6 +1442,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 394,394,394,394,394,355,313,354,394,394,394,394,394,394,394,394,395,0,0,0,0,0,0,0,0,0,0,393,394,394,394,394,394,394,394,355,313,313,313,313, 313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,435,0,0,0,0,0,0,0,0,0,0,433,313,313,313,313,313,313,313,313,313,313,313,313, 313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,354,394,394,394,394,394,394,394,394,394,394,355,313,313,313,313,313,313,313,313,313,313,313,313, + 313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313, }; obj.createentity(144-4, 208, 1, 1, 6); // Enemy @@ -1438,7 +1467,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(104, 160, 2, 9, 4); //Threadmill, <<< roomname = "$eeing Dollar $ign$"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1475,6 +1504,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 0,0,0,0,0,206,86,208,0,0,818,698,206,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,208,698,698,820,0,0,206,86,86,86,86, 0,0,0,0,0,206,86,208,0,0,818,698,206,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,208,698,698,820,0,0,206,86,86,86,86, 0,0,0,0,0,206,86,208,0,0,818,698,206,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,208,698,698,820,0,0,206,86,86,86,86, + 0,0,0,0,0,206,86,208,0,0,818,698,206,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,208,698,698,820,0,0,206,86,86,86,86, }; obj.createentity(184, 56, 2, 10, 4); //Big Threadmill, >>>>>> @@ -1491,7 +1521,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(152, 192, 2, 8, 4); //Threadmill, >>> obj.createentity(240, 88, 2, 9, 4); //Threadmill, <<< roomname = "Parabolica"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1528,6 +1558,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 8,8,8,8,206,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, 167,167,167,167,128,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, + 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, }; obj.createentity(96, 80, 10, 1, 447540); // (savepoint) @@ -1550,7 +1581,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) //LIES Emitter, manually positioned roomname = "Spikes Do!"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1587,6 +1618,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(64, 152, 10, 1, 446540); // (savepoint) @@ -1594,7 +1626,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(248, 72, 3, 707); //Disappearing Platform obj.createentity(184, 200, 3, 707); //Disappearing Platform roomname = "What Lies Beneath?"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1631,6 +1663,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, + 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, }; obj.createentity(0, 128, 2, 10, 4); //Big Threadmill, >>>>>> @@ -1647,7 +1680,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(24 - 60 - 8 + (117 * 2), 144 - 8, 1, 10, 1); // Enemy //LIES Emitter, manually positioned, collector! roomname = "Chipper Cipher"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1684,11 +1717,12 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,803,683,683,683,683,683,683,683,624,504,626,683,683,683,683,683,683,683,805,0,0,0,0,0,624,504,504,504,504,504,504,504,504, 0,0,0,0,0,0,0,803,683,683,683,683,683,683,683,624,504,626,683,683,683,683,683,683,683,805,0,0,0,0,0,624,504,504,504,504,504,504,504,504, 0,0,0,0,0,0,0,803,683,683,683,683,683,683,683,624,504,626,683,683,683,683,683,683,683,805,0,0,0,0,0,624,504,504,504,504,504,504,504,504, + 0,0,0,0,0,0,0,803,683,683,683,683,683,683,683,624,504,626,683,683,683,683,683,683,683,805,0,0,0,0,0,624,504,504,504,504,504,504,504,504, }; obj.createentity(40, 72, 3, 787); //Disappearing Platform roomname = "If You Fall Up"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1725,6 +1759,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 498,498,539,579,579,579,579,579,579,579,579,579,579,579,579,579,579,580,695,695,695,695,618,498,539,579,579,579,579,579,540,498,498,498,498,498,498,498,498,498, 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,695,695,695,695,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,695,695,695,695,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, + 498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,695,695,695,695,618,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, }; obj.platformtile = 159; @@ -1732,7 +1767,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(64, 176, 10, 0, 445550); // (savepoint) obj.createentity(216 - 4, 192, 10, 1, 445551); // (savepoint) roomname = "Just Pick Yourself Down"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1770,6 +1805,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,408,0,0,0,0,406,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,408,0,0,0,0,406,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,408,0,0,0,0,406,286, + 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,408,0,0,0,0,406,286, }; obj.createentity(32, 40, 10, 1, 444560); // (savepoint) @@ -1804,7 +1840,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(192, 128, 2, 11, 4); //Big Threadmill, <<<<<< obj.createentity(240, 128, 2, 9, 4); //Threadmill, <<< roomname = "The Warning"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1842,6 +1878,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 420,49,0,0,0,0,50,418,298,420,9,9,0,0,0,0,0,0,0,0,50,418,298,298,298,298,420,49,0,0,0,0,0,0,0,0,9,9,418,298, 420,49,0,0,0,0,50,418,298,420,0,0,0,0,0,0,0,0,0,0,50,418,298,298,298,298,420,49,0,0,0,0,0,0,0,0,0,0,418,298, 420,49,0,0,0,0,50,418,298,420,0,0,0,0,0,0,0,0,0,0,50,418,298,298,298,298,420,49,0,0,0,0,0,0,0,0,0,0,418,298, + 420,49,0,0,0,0,50,418,298,420,0,0,0,0,0,0,0,0,0,0,50,418,298,298,298,298,420,49,0,0,0,0,0,0,0,0,0,0,418,298, }; obj.createentity(176, 80, 3, 55); //Disappearing Platform @@ -1854,7 +1891,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) roomname = "Getting Here is Half the Fun"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1891,10 +1928,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 614,49,0,0,0,0,50,612,492,492,492,492,492,492,492,492,492,492,492,492,492,614,49,0,0,0,0,0,0,0,0,50,652,494,492,492,492,492,492,492, 614,49,0,0,0,0,50,612,492,492,492,492,492,492,492,492,492,492,492,492,492,533,574,49,0,0,0,0,0,0,0,0,50,612,492,492,492,492,492,492, 614,49,0,0,0,0,50,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,49,0,0,0,0,0,0,0,0,50,612,492,492,492,492,492,492, + 614,49,0,0,0,0,50,612,492,492,492,492,492,492,492,492,492,492,492,492,492,492,614,49,0,0,0,0,0,0,0,0,50,612,492,492,492,492,492,492, }; roomname = "Your Bitter Tears... Delicious"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1931,10 +1969,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 208,49,0,0,0,0,50,206,86,86,86,86,86,86,86,86,86,208,0,0,0,0,50,206,86,86,208,0,0,0,0,206,86,86,86,86,86,86,86,86, 208,49,0,0,0,0,50,206,86,86,86,86,86,86,86,86,86,208,0,0,0,0,50,206,86,86,208,0,0,0,0,206,86,86,86,86,86,86,86,86, 208,49,0,0,0,0,50,206,86,86,86,86,86,86,86,86,86,208,0,0,0,0,50,206,86,86,208,0,0,0,0,206,86,86,86,86,86,86,86,86, + 208,49,0,0,0,0,50,206,86,86,86,86,86,86,86,86,86,208,0,0,0,0,50,206,86,86,208,0,0,0,0,206,86,86,86,86,86,86,86,86, }; roomname = "Easy Mode Unlocked"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1971,10 +2010,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 217,49,0,0,0,0,50,215,95,95,95,95,95,95,95,95,95,217,49,0,0,0,0,215,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 217,49,0,0,0,0,50,215,95,95,95,95,95,95,95,95,95,217,49,0,0,0,0,215,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 217,49,0,0,0,0,50,215,95,95,95,95,95,95,95,95,95,217,49,0,0,0,0,215,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, + 217,49,0,0,0,0,50,215,95,95,95,95,95,95,95,95,95,217,49,0,0,0,0,215,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, }; roomname = "Vici!"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2011,10 +2051,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 432,49,0,0,0,0,50,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,351,392,0,0,0,0,50,430,310,310, 432,49,0,0,0,0,50,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,432,0,0,0,0,50,430,310,310, 432,49,0,0,0,0,50,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,432,0,0,0,0,50,430,310,310, + 432,49,0,0,0,0,50,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,432,0,0,0,0,50,430,310,310, }; roomname = "Vidi"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2051,10 +2092,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 220,49,0,0,0,0,50,218,98,98,98,98,98,98,98,98,220,49,0,0,0,0,0,0,0,0,0,0,0,0,0,50,218,98,98,98,98,98,98,98, 220,49,0,0,0,0,50,218,98,98,98,98,98,98,98,98,220,49,0,0,0,0,0,0,0,0,0,0,0,0,0,50,218,98,98,98,98,98,98,98, 220,49,0,0,0,0,50,218,98,98,98,98,98,98,98,98,220,49,0,0,0,0,0,0,0,0,0,0,0,0,0,50,218,98,98,98,98,98,98,98, + 220,49,0,0,0,0,50,218,98,98,98,98,98,98,98,98,220,49,0,0,0,0,0,0,0,0,0,0,0,0,0,50,218,98,98,98,98,98,98,98, }; roomname="Veni"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2091,6 +2133,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 89,89,89,89,89,89,211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,209,89,89, 89,89,89,89,89,89,211,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,169,170,170,170,170,170,170,170,131,89,89, 89,89,89,89,89,89,130,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,131,89,89,89,89,89,89,89,89,89,89, + 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, }; obj.createentity(224, 144, 9, 5); // (shiny trinket) @@ -2099,7 +2142,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(24, 152, 20, 1); // (terminal) obj.createblock(5, 24-4, 152, 20, 16, 16); roomname = "Doing Things The Hard Way"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2138,6 +2181,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495, 495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495, 495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495, + 495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495, }; obj.platformtile = 707; @@ -2149,7 +2193,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.fatal_top(); } roomname = "Exhaust Chute"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2186,6 +2230,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 382,382,382,382,382,382,382,383,0,0,0,0,421,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301, 301,301,301,301,301,301,301,423,0,0,0,0,421,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301, 301,301,301,301,301,301,301,423,0,0,0,0,421,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301, + 301,301,301,301,301,301,301,423,0,0,0,0,421,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301, }; obj.createentity(0, 168, 2, 11, 4); //Big Threadmill, <<<<<< @@ -2214,7 +2259,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) } } roomname = "A Wrinkle in Time"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2252,6 +2297,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, + 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, }; obj.createentity(0, 168, 2, 11, 4); //Big Threadmill, <<<<<< @@ -2265,7 +2311,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(160 - 48, 184 - 8, 1, 3, 5);// , 160, 0, 320, 240); // Enemy, bounded obj.createentity(160 - 28 + 48, 184 - 8, 1, 2, 5);// , 0, 0, 160, 240); // Enemy, bounded roomname = "Brass Sent Us Under The Top"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2302,6 +2348,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 507,507,548,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588, 507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, 507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, + 507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, }; obj.createentity(64, 168, 2, 11, 4); //Big Threadmill, <<<<<< @@ -2313,7 +2360,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(136 + 4, 96, 10, 1, 443541); // (savepoint) roomname = "The Tomb of Mad Carew"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2350,12 +2397,13 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 391,391,391,391,392,0,0,0,0,0,812,692,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,432,0,0,0,0,0,0,430,310,310,310,310, 310,310,310,310,432,0,0,0,0,0,812,692,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,432,0,0,0,0,0,0,430,310,310,310,310, 310,310,310,310,432,0,0,0,0,0,812,692,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,432,0,0,0,0,0,0,430,310,310,310,310, + 310,310,310,310,432,0,0,0,0,0,812,692,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,432,0,0,0,0,0,0,430,310,310,310,310, }; obj.createentity(56, 144, 10, 0, 443520); // (savepoint) obj.createentity(152, 80, 10, 1, 443521); // (savepoint) roomname = "The Sensible Room"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2392,11 +2440,12 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170, 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, + 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, }; obj.createentity(0, -200, 1, 16, 6, -64, -500, 320 + 64, 340); roomname = "B-B-B-Busted"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2434,6 +2483,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 367,367,367,368,8,8,8,8,366,367,367,368,8,8,8,8,366,367,367,368,8,8,8,8,366,367,367,368,8,8,8,8,366,367,367,367,367,367,367,367, 286,286,286,327,367,367,367,367,328,286,286,327,367,367,367,367,328,286,286,327,367,367,367,367,328,286,286,327,367,367,367,367,328,286,286,286,286,286,286,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, + 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, }; obj.createentity(280, 192, 10, 1, 443500); // (savepoint) @@ -2444,7 +2494,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createblock(1, 0, 0, 112, 112, 8); } roomname = "V Stitch"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2483,6 +2533,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573, 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, + 492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492, }; if(game.nodeathmode || game.intimetrial) { @@ -2509,7 +2560,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) { roomname = "Imagine Spikes There, if You Like"; } - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2546,6 +2597,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 89,89,130,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170, 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, + 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, }; obj.createentity(152, 32, 10, 1, 443480); // (savepoint) @@ -2559,7 +2611,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(120, 144, 2, 10, 4); //Big Threadmill, >>>>>> obj.createentity(184, 144, 2, 8, 4); //Threadmill, >>> roomname = "A Deception"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2596,6 +2648,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 310,310,432,692,692,692,692,390,391,391,391,352,310,310,432,8,8,8,8,8,8,430,310,310,310,310,432,8,8,8,8,8,8,8,8,430,310,310,310,310, 310,310,432,692,692,692,692,430,310,310,310,310,310,310,351,391,391,391,391,391,391,352,310,310,310,310,351,391,391,391,391,391,391,391,391,352,310,310,310,310, 310,310,432,692,692,692,692,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310, + 310,310,432,692,692,692,692,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310, }; obj.platformtile = 239; @@ -2607,7 +2660,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(280, 152, 10, 1, 442481); // (savepoint) roomname = "Down Under"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2644,6 +2697,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 295,417,0,0,0,0,375,376,376,376,376,376,376,337,295,295,295,295,295,295,295,295,295,295,295,295,295,417,698,698,698,820,0,0,415,295,295,295,295,295, 295,417,779,779,779,779,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,417,698,698,698,820,0,0,415,295,295,295,295,295, 295,417,698,698,698,698,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,417,698,698,698,820,0,0,415,295,295,295,295,295, + 295,417,698,698,698,698,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,417,698,698,698,820,0,0,415,295,295,295,295,295, }; obj.createentity(16, 104, 2, 10, 4); //Big Threadmill, >>>>>> @@ -2651,7 +2705,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(144, 168, 10, 1, 442490); // (savepoint) obj.createentity(24, 112, 10, 0, 442491); // (savepoint) roomname = "Shenanigan"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2688,6 +2742,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,611,0,0,0,809,689,689,609,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,611,0,0,0,809,689,689,609,489,489,489,489,489, 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,611,0,0,0,809,689,689,609,489,489,489,489,489, + 489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,611,0,0,0,809,689,689,609,489,489,489,489,489, }; obj.createentity(192, 88, 10, 0, 441490); // (savepoint) @@ -2701,7 +2756,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) } } roomname = "Frown Upside Down"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2738,6 +2793,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298, 298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298, 298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298, + 298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298, }; obj.createentity((5 * 8) - 4, (8 * 8) + 4, 14); //Teleporter! @@ -2747,7 +2803,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createblock(1, 280, 0, 32, 240, 82); } roomname = "Energize"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2784,13 +2840,14 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, + 292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, }; obj.createentity(40, 24, 10, 0, 442530); // (savepoint) obj.createentity(264, 24, 10, 0, 442531); // (savepoint) roomname = "Driller"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2827,6 +2884,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,214,0,0,0,0,0,0,0,0,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, 92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,214,0,0,0,0,0,0,172,173,134,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, 92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,214,0,0,0,0,0,0,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, + 92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,214,0,0,0,0,0,0,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, }; obj.createentity(128, 80, 3, 867); //Disappearing Platform @@ -2857,7 +2915,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) } } roomname = "Quicksand"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2894,12 +2952,13 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,217,0,0,809,689,689,689,689,689,215,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,217,0,0,809,689,689,689,689,689,215,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,217,0,0,809,689,689,689,689,689,215,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, + 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,217,0,0,809,689,689,689,689,689,215,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, }; obj.createentity(144, 40, 3); //Disappearing Platform obj.createentity(200, 128, 3); //Disappearing Platform roomname = "Boo! Think Fast!"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2936,6 +2995,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 495,495,495,495,495,617,0,0,0,0,0,0,615,495,617,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,615,495,495,495,495, 495,495,495,495,495,617,0,0,0,0,0,0,615,495,617,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,615,495,495,495,495, 495,495,495,495,495,617,0,0,0,0,0,0,615,495,536,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,576,537,495,495,495,495, + 495,495,495,495,495,617,0,0,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, }; obj.createentity(288, 160, 10, 1, 442500); // (savepoint) @@ -2945,7 +3005,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(185, 110, 2, 0, 3, 100, 70, 320, 160); obj.createentity(235, 145, 2, 0, 3, 100, 70, 320, 160); roomname = "Stop and Reflect"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -2982,6 +3042,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 86,86,86,86,86,86,86,86,86,86,86,86,208,698,698,698,206,86,86,86,208,698,698,698,206,86,86,86,208,698,698,698,206,86,86,86,86,86,86,86, 86,86,86,86,86,86,86,86,86,86,86,86,127,167,167,167,128,86,86,86,127,167,167,167,128,86,86,86,127,167,167,167,128,86,86,86,86,86,86,86, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, + 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, }; obj.platformtile = 207; @@ -2997,7 +3058,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) } roomname = "Trench Warfare"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -3034,6 +3095,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 92,92,92,92,92,214,683,683,683,683,683,683,212,92,214,683,683,683,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, 92,92,92,92,92,214,683,683,683,683,683,683,212,92,214,683,683,683,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, 92,92,92,92,92,214,683,683,683,683,683,683,212,92,133,173,173,173,134,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, + 92,92,92,92,92,214,683,683,683,683,683,683,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92, }; obj.createentity(120+2, 8, 1, 0, 3); // Enemy @@ -3046,7 +3108,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(64, 136, 10, 0, 441502); // (savepoint) roomname = "The Yes Men"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -3083,6 +3145,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 283,283,283,283,283,405,0,0,0,0,0,0,363,364,365,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,363,364,364,364,364,364,364,364,364, 283,283,283,283,283,405,0,0,0,0,0,0,403,283,324,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,325,283,283,283,283,283,283,283,283, 283,283,283,283,283,405,0,0,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, + 283,283,283,283,283,405,0,0,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283, }; obj.platformtile = 10; @@ -3094,7 +3157,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(280, 192, 10, 1, 440501); // (savepoint) roomname = "Gantry and Dolly"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -3131,6 +3194,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 576,576,576,576,576,576,576,537,495,617,680,680,680,680,680,680,680,680,680,615,495,495,495,495,617,680,680,680,680,680,680,680,680,680,680,615,495,495,495,495, 495,495,495,495,495,495,495,495,495,617,680,680,680,680,680,680,680,680,680,615,495,495,495,495,617,680,680,680,680,680,680,680,680,680,680,615,495,495,495,495, 495,495,495,495,495,495,495,495,495,536,576,576,576,576,576,576,576,576,576,537,495,495,495,495,536,576,576,576,576,576,576,576,576,576,576,537,495,495,495,495, + 495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495, }; obj.createentity(88, 104, 21, 1); // (savepoint) @@ -3147,7 +3211,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) } roomname = "Comms Relay"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -3184,13 +3248,14 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 292,292,292,292,292,414,0,0,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, 292,292,292,292,292,414,0,0,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, 292,292,292,292,292,414,0,0,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, + 292,292,292,292,292,414,0,0,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292, }; obj.createentity(200, 32, 1, 0, 8); // Enemy obj.createentity(168, 104, 10, 1, 439500); // (savepoint) roomname = "Security Sweep"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -3227,6 +3292,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,217,0,0,0,0,0,0,0,0,0,215,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,136,176,176,176,176,176,176,176,176,176,137,95,95, 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, + 95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95, }; obj.createentity(24, 168, 10, 1, 439510); // (savepoint) @@ -3237,7 +3303,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(256-4, 200, 20, 1); // (terminal) obj.createblock(5, 256-8, 200, 20, 16, 6); roomname = "Linear Collider"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -3274,12 +3340,13 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,841,841,841,841,409,289,289,289,289,289,289,289,289,289, 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,409,289,289,289,289,289,289,289,289,289, 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,409,289,289,289,289,289,289,289,289,289, + 289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,409,289,289,289,289,289,289,289,289,289, }; obj.createentity(192, 48, 10, 0, 439520); // (savepoint) obj.createentity(112, 160, 10, 1, 439521); // (savepoint) roomname = "Atmospheric Filtering Unit"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -3316,6 +3383,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 483,483,605,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483, 483,483,605,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483, 483,483,605,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483, + 483,483,605,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,483,483, }; roomname = "Traffic Jam"; @@ -3325,7 +3393,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createentity(125, 18, 1, 0, 4); obj.createentity(232, 184, 10, 0, 1); - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -3362,9 +3430,10 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 310,310,432,692,692,692,692,692,692,814,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,812,692,692,692,692,692,692,692,692,692,430,310,310, 310,310,432,692,692,692,692,692,692,814,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,812,692,692,692,692,692,692,692,692,692,430,310,310, 310,310,432,692,692,692,692,692,692,814,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,812,692,692,692,692,692,692,692,692,692,430,310,310, + 310,310,432,692,692,692,692,692,692,814,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,812,692,692,692,692,692,692,692,692,692,430,310,310, }; roomname = "Leap of Faith"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -3401,6 +3470,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, + 286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286, }; obj.createentity(152, 168, 10, 1, 441530); // (savepoint) @@ -3411,7 +3481,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) } roomname = "Solitude"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -3448,6 +3518,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83, 83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83, 83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83, + 83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83, }; roomname = "Conundrum"; @@ -3457,7 +3528,7 @@ std::vector spacestation2class::loadlevel(int rx, int ry) obj.createblock(1, 10, 0, 60, 240, 22); obj.createblock(1, 280, 0, 320, 240, 21); } - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; }; @@ -3494,10 +3565,11 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, + 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, }; roomname = "Welcome Aboard"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -3534,13 +3606,14 @@ std::vector spacestation2class::loadlevel(int rx, int ry) 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, + 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, }; obj.createentity(216, 144, 10, 1, 440520); // (savepoint) obj.createentity(16, 136, 9, 0); // (shiny trinket) roomname = "It's a Secret to Nobody"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } diff --git a/desktop_version/src/WarpClass.cpp b/desktop_version/src/WarpClass.cpp index 3b954a30..4b34c403 100644 --- a/desktop_version/src/WarpClass.cpp +++ b/desktop_version/src/WarpClass.cpp @@ -56,6 +56,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 120,120,120,120,120,120,120,120,120,120,120,120,120,200,80,202,0,0,0,0,0,0,0,0,200,80,202,120,120,120,120,120,120,120,120,120,120,120,120,120, 120,120,120,120,120,120,120,120,120,120,120,120,120,200,80,202,0,0,0,0,0,0,0,0,200,80,202,120,120,120,120,120,120,120,120,120,120,120,120,120, 120,120,120,120,120,120,120,120,120,120,120,120,120,200,80,202,0,0,0,0,0,0,0,0,200,80,202,120,120,120,120,120,120,120,120,120,120,120,120,120, + 120,120,120,120,120,120,120,120,120,120,120,120,120,200,80,202,0,0,0,0,0,0,0,0,200,80,202,120,120,120,120,120,120,120,120,120,120,120,120,120, }; obj.createentity(288, 168, 10, 1, 50500); // (savepoint) @@ -68,7 +69,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 0; warpy = true; roomname = "This is how it is"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -105,11 +106,12 @@ std::vector warpclass::loadlevel(int rx, int ry) 126,126,126,206,86,208,0,0,0,0,0,0,0,0,0,0,206,86,208,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126, 126,126,126,206,86,208,0,0,0,0,166,167,167,167,167,168,206,86,208,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126, 126,126,126,206,86,208,0,0,0,0,206,86,86,86,86,208,206,86,208,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126, + 126,126,126,206,86,208,0,0,0,0,206,86,86,86,86,208,206,86,208,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126, }; rcol = 2; warpx = true; roomname = "A Bisected Spiral"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -147,6 +149,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 164,164,164,164,164,165,0,0,0,0,163,164,164,164,164,164,164,165,0,0,0,0,163,164,164,164,164,164,164,165,0,0,0,0,163,164,164,164,164,164, 83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83, 83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83, + 83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83, }; obj.createentity(248, 80, 10, 1, 51510); // (savepoint) @@ -155,7 +158,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 1; warpy = true; roomname = "Take the Red Pill"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -192,6 +195,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 135,135,135,135,135,135,135,135,135,135,215,95,217,175,176,176,176,176,176,176,176,176,176,177,215,95,217,135,135,135,135,135,135,135,135,135,135,135,135,135, 135,135,135,135,135,135,135,135,135,135,215,95,217,215,95,95,95,95,95,95,95,95,95,217,215,95,217,135,135,135,135,135,135,135,135,135,135,135,135,135, 135,135,135,135,135,135,135,135,135,135,215,95,217,215,95,95,95,95,95,95,95,95,95,217,215,95,217,135,135,135,135,135,135,135,135,135,135,135,135,135, + 135,135,135,135,135,135,135,135,135,135,215,95,217,215,95,95,95,95,95,95,95,95,95,217,215,95,217,135,135,135,135,135,135,135,135,135,135,135,135,135, }; obj.createentity(32, 24, 1, 3, 4, -56, -40, 384, 312); // Enemy, bounded @@ -202,7 +206,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 5; warpx = true; roomname = "Short Circuit"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -238,6 +242,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 213,212,92,214,0,0,0,0,0,0,0,0,212,214,0,0,0,0,0,0,6,6,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,92,92,92, 213,212,92,214,0,0,0,0,0,0,0,0,212,214,0,0,0,0,0,0,172,174,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,92,92,92, 213,212,92,214,172,174,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,92,92,92, + 213,212,92,214,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,92,92,92, 213,212,92,214,252,254,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,92,92,92, }; @@ -245,7 +250,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 4; warpy = true; roomname = "As you like it"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -283,13 +288,14 @@ std::vector warpclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,209,211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,209,211,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,209,211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,209,211,0,0,0,0,0, 170,170,170,170,170,170,170,170,170,170,170,170,170,170,171,209,211,169,170,170,170,170,170,170,170,170,170,170,170,170,170,170,171,209,211,169,170,170,170,170, + 89,89,89,89,89,89,89,89,89,89,89,89,89,89,211,209,211,209,89,89,89,89,89,89,89,89,89,89,89,89,89,89,211,209,211,209,89,89,89,89, }; obj.createentity(16, 120, 10, 1, 50530); // (savepoint) rcol = 3; warpx = true; roomname = "Maze With No Entrance"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -326,13 +332,14 @@ std::vector warpclass::loadlevel(int rx, int ry) 126,126,126,126,206,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 126,126,126,126,206,86,208,0,0,0,166,167,168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,166,167, 126,126,126,126,206,86,208,0,0,0,206,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86, + 126,126,126,126,206,86,208,0,0,0,206,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86, }; obj.createentity(64, 152, 10, 0, 49530); // (savepoint) rcol = 2; warpy = true; roomname = "As we go up, we go down"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -369,6 +376,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,200,202,0,0,0,0,6,6,6,6,6,6,6,240,241,241,242,6,6,6,6,6,6,6,6,6,200,202,0,0, 161,161,161,161,161,161,161,161,161,162,200,202,0,0,0,0,160,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,162,200,202,160,161, 80,80,80,80,80,80,80,80,80,202,200,202,0,0,0,0,200,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,202,200,202,200,80, + 80,80,80,80,80,80,80,80,80,202,200,202,0,0,0,0,200,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,202,200,202,200,80, }; obj.createentity(296, 64, 10, 1, 49540); // (savepoint) @@ -378,7 +386,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 0; warpx = true; roomname = "Time to get serious"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -416,6 +424,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 86,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86,86, 86,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86,86, 86,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86,86, + 86,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86,86, }; if(!game.intimetrial) { @@ -424,7 +433,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 2; warpy = true; roomname = "Wheeler's Wormhole"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -461,6 +470,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 212,92,92,214,172,173,173,174,0,0,0,0,0,0,0,0,0,0,0,0,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214, 212,92,92,214,212,92,92,214,172,173,173,174,0,0,0,0,0,0,0,0,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214, 212,92,92,214,212,92,92,214,212,92,92,214,172,173,173,174,0,0,0,0,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214, + 212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,0,0,0,0,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214, }; obj.createentity(96, 72, 1, 3, 8, 64, 56, 256, 152); // Enemy, bounded @@ -470,7 +480,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 4; warpx = true; roomname = "Ascending and Descending"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -507,6 +517,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 83,83,83,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,205,0,0,0,0,203,83, 83,83,83,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,163,165,0,0,0,0,163,165,0,0,0,0,203,205,0,0,0,0,203,83, 83,83,83,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83, + 83,83,83,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83, }; obj.createentity(280, 24, 1, 2, 3, 128, 16, 304, 216); // Enemy, bounded @@ -518,7 +529,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 1; warpy = true; roomname = "Shockwave Rider"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -555,6 +566,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,171,169,170,170,171,169,170,170,170,170,170,170,170,170,171,0,0,0,0,169,170,170,170, 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,211,209,89,89,211,209,89,89,89,89,89,89,89,89,211,0,0,0,0,209,89,89,89, + 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,211,209,89,89,211,209,89,89,89,89,89,89,89,89,211,0,0,0,0,209,89,89,89, }; obj.createentity(296, 32, 10, 1, 51540); // (savepoint) @@ -569,7 +581,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 3; warpx = true; roomname = "Sweeney's Maze"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -605,6 +617,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,95, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,256, 176,176,176,177,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,177,0,0,0,0,175,176,176,176, + 95,95,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,217,0,0,0,0,215,95,95,95, 95,95,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,257,0,0,0,0,215,95,95,95, }; @@ -623,7 +636,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 5; warpy = true; roomname = "Mind The Gap"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -660,6 +673,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167,167, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, + 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, }; obj.createentity(152, 200, 10, 1, 52530); // (savepoint) @@ -677,7 +691,7 @@ std::vector warpclass::loadlevel(int rx, int ry) rcol = 2; warpx = true; roomname = "Edge Games"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -714,6 +728,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 83,83,205,0,0,0,0,203,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83,83, 83,83,205,0,0,0,0,203,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83,83, 83,83,205,0,0,0,0,203,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83,83, + 83,83,205,0,0,0,0,203,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83,83, }; obj.createentity(152, 112, 13); @@ -721,7 +736,7 @@ std::vector warpclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "The Brown Gate"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -758,6 +773,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 0,0,212,92,214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,92,214,0,0, 0,0,212,92,214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,92,214,0,0, 0,0,212,92,214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,92,214,0,0, + 0,0,212,92,214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,92,214,0,0, }; obj.createentity(152, 112, 13); @@ -766,7 +782,7 @@ std::vector warpclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "To The Batcave!"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -803,6 +819,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(152, 112, 13); @@ -811,7 +828,7 @@ std::vector warpclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "This will make you flip"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -848,6 +865,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,95,217,216,216,216,216,215,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,95,217,216,216,216,216,215,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,95,217,216,216,216,216,215,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,95,217,216,216,216,216,215,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; obj.createentity(152, 112, 13); @@ -856,7 +874,7 @@ std::vector warpclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "Twisty Little Passages"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -893,6 +911,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 83,83,83,83,83,83,83,83,83,83,83,83,83,205,243,244,245,243,244,244,244,244,244,244,244,245,0,0,0,0,203,83,83,83,83,83,83,83,83,83, 83,83,83,83,83,83,83,83,83,83,83,83,83,205,163,164,164,164,164,164,164,164,164,164,164,165,0,0,0,0,203,83,83,83,83,83,83,83,83,83, 83,83,83,83,83,83,83,83,83,83,83,83,83,205,203,83,83,83,83,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,83,83,83, + 83,83,83,83,83,83,83,83,83,83,83,83,83,205,203,83,83,83,83,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,83,83,83, }; obj.createentity(152, 112, 13); @@ -905,7 +924,7 @@ std::vector warpclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "That's Why I Have To Kill You"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -942,6 +961,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 167,167,167,167,167,168,0,0,0,0,206,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,208,0,0,0,0,166,167,167,167,167,167, 86,86,86,86,86,208,0,0,0,0,206,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,208,0,0,0,0,206,86,86,86,86,86, 86,86,86,86,86,208,0,0,0,0,206,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,208,0,0,0,0,206,86,86,86,86,86, + 86,86,86,86,86,208,0,0,0,0,206,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,208,0,0,0,0,206,86,86,86,86,86, }; obj.createentity(152, 112, 13); @@ -955,7 +975,7 @@ std::vector warpclass::loadlevel(int rx, int ry) warpx = true; warpy = true; roomname = "I Love You"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -992,11 +1012,12 @@ std::vector warpclass::loadlevel(int rx, int ry) 83,83,205,0,0,0,0,0,203,83,83,83,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,83,83,83,205,0,0,0,0,0,203,83, 83,83,205,0,0,0,0,0,203,83,83,83,205,163,164,164,164,164,164,164,164,164,165,0,0,0,0,0,203,83,83,83,205,0,0,0,0,0,203,83, 83,83,205,0,0,0,0,0,203,83,83,83,205,203,83,83,83,83,83,83,83,83,205,0,0,0,0,0,203,83,83,83,205,0,0,0,0,0,203,83, + 83,83,205,0,0,0,0,0,203,83,83,83,205,203,83,83,83,83,83,83,83,83,205,0,0,0,0,0,203,83,83,83,205,0,0,0,0,0,203,83, }; rcol = 1; warpy = true; roomname = "Green Dudes Can't Flip"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1034,6 +1055,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; warpx = true; warpy = true; @@ -1047,7 +1069,7 @@ std::vector warpclass::loadlevel(int rx, int ry) } roomname = "Murdering Twinmaker"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; } @@ -1084,6 +1106,7 @@ std::vector warpclass::loadlevel(int rx, int ry) 161,161,161,161,161,161,161,161,161,161,161,161,161,161,161,162,0,0,0,0,0,0,0,200,80,202,201,201,201,201,201,201,201,201,201,201,201,201,201,201, 80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,202,0,0,0,0,0,0,0,200,80,202,201,201,201,201,201,201,201,201,201,201,201,201,201,201, 80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,202,0,0,0,0,0,0,0,200,80,202,201,201,201,201,201,201,201,201,201,201,201,201,201,201, + 80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,202,0,0,0,0,0,0,0,200,80,202,201,201,201,201,201,201,201,201,201,201,201,201,201,201, }; rcol = 0; warpy = true; @@ -1097,7 +1120,7 @@ std::vector warpclass::loadlevel(int rx, int ry) } } roomname = "It's Not Easy Being Green"; - result.insert(result.end(), contents, contents+1160); + result.insert(result.end(), contents, contents+1200); break; }