Merge remote-tracking branch 'origin/master'

Author: snightshade

README.md

@@ -26,6 +26,7 @@ Requires the above to compile and run. The "res" directory in the "required file
 * _Score Trial_ - An approximation of the SCORE ATTACK modes in DTET.
 * _Shadow Marahton_ - Build your own pieces in this extended Marathon.
 * _Single Death Marathon_ - Marathon, but the pieces queue up to become big.
+* _Subscriber Challenge_ - git gud, get subscriber!
 
 ## Libraries Available:
 

src/zeroxfc/nullpo/custom/modes/MarathonTwo.java

@@ -746,27 +746,29 @@ public void startGame(GameEngine engine, int playerID) {
 	@Override
 	public boolean onGameOver(GameEngine engine, int playerID) {
 		if (engine.statc[0] == 0) {
-			for (int y = engine.field.getHiddenHeight() * -1; y < engine.field.getHeight(); y++) {
-				for (int x = 0; x < engine.field.getWidth(); x++) {
-					Block blk = engine.field.getBlock(x, y);
-					if (blk != null) {
-						if (blk.color > Block.BLOCK_COLOR_NONE) {
-							blk.secondaryColor = 0;
-							blk.hard = 0;
+			if (engine.statistics.lines < 100) {
+				for (int y = engine.field.getHiddenHeight() * -1; y < engine.field.getHeight(); y++) {
+					for (int x = 0; x < engine.field.getWidth(); x++) {
+						Block blk = engine.field.getBlock(x, y);
+						if (blk != null) {
+							if (blk.color > Block.BLOCK_COLOR_NONE) {
+								blk.secondaryColor = 0;
+								blk.hard = 0;
+							}
 						}
 					}
 				}
-			}
 
-			if (engine.statistics.lines < 100) fs = new FieldScatter(receiver, engine, playerID);
+				fs = new FieldScatter(receiver, engine, playerID);
+			}
 		}
 
 		return false;
 	}
 
 	@Override
 	public void renderGameOver(GameEngine engine, int playerID) {
-		if (engine.statistics.lines >= 100) {
+		if (engine.statistics.lines >= 100 && engine.statistics.lines < tableGameClearLines[goaltype]) {
 			for (int y = 0; y < 480 / 32; y++) {
 				for (int x = 0; x < 640 / 32; x++) {
 					receiver.drawSingleBlock(engine, playerID,
@@ -1124,6 +1126,12 @@ public boolean onCustom(GameEngine engine, int playerID) {
 		return s;
 	}
 
+	/*
+	 * TODO:
+	 *  Implement the following effects -
+	 *  https://canary.discordapp.com/channels/@me/561721947176697867/626143449837731860
+	 */
+
 	private void executeEffect(GameEngine engine, int playerID) {
 		double procRoll = effectRandomiser.nextDouble();
 		if (procRoll < BASE_EFFECT_PROC_CHANCE * (spookyValue / 50d)) {