Fixed the pacer test mode's backgrounds and strikes.

ARR and drop speed are handled by getters now.

CONTRIBUTING.md

@@ -3,8 +3,28 @@ Coding conventions
 
 * Use tabs to indent, spaces to align.
 	* Specifically, spaces should not appear at the beginning of a line, and tabs should not appear _except_ at the beginning of a line.
-	* The sole exception is in a multiline `if` statement; the initial `if` should have four spaces before it to align it with an `elseif` on the next line.
-	* Comments with lines at the end of code must be one line long. Multi-line comments must appeare in their own block.
+	* The sole exception is in a multiline `if` statement; the initial `if` should have four spaces before it to align it with an `elseif` on the next line. For example:
+
+```lua
+	    if self.level <  900 then return 12
+	elseif self.level < 1200 then return 8
+	else return 6 end
+```
+
+* Comments at the end of lines of code must be one line long. Multi-line comments must appear in their own block.
+
+```lua
+	if self.piece:isDropBlocked(self.grid) then
+		-- for bottomed out pieces, decrease the drop bonus if they stall on dropping it
+		self.drop_bonus = math.min(self.drop_bonus - 1, 0) -- by 1 point per frame
+	else                                                            
+		if piece_dy >= 1 then                                       -- basically
+			self.drop_bonus = self.drop_bonus + piece_dy * 20       -- this sort of
+		end                                                         -- multiline comment
+		self.drop_bonus = self.drop_bonus + 1                       -- is completely
+	end                                                             -- unacceptable
+```
+
 * Use `snake_case` for variables, `camelCase` for functions.
 
 
@@ -15,4 +35,4 @@ By contributing source code or other assets (e.g. music, artwork, graphics) to C
 
 You also waive all moral rights to your contributions insofar as they are used in the Cambridge repository or in any code or works deriving therefrom.
 
-(Regarding the above clause, I will still make my best effort to provide sufficient attribution to all contributions. At the very least you'll get documentation of your contributions under SOURCES, and probably a special place in the credit roll as well.)
+(Notwithstanding the above clause, I will still make my best effort to provide sufficient attribution to all contributions. At the very least you'll get documentation of your contributions under SOURCES, and probably a special place in the credit roll as well.)

LICENSE

@@ -1,6 +1,6 @@
 The code in Cambridge is licensed under the MIT license.
 
-Copyright (c) 2018 Joe Zeng
+Copyright (c) 2018-2019 Joe Zeng
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -26,4 +26,4 @@ Some code and assets in this repository are contributed by members of the
 community, as well as borrowed from other places, either with licensing
 or as placeholders until suitable material can be found that is properly
 licensed. Their original sources, and copyright notices if applicable, are
-listed in the file SOURCES.
+listed in the file SOURCES.

docs/gamemodes.md

@@ -9,35 +9,22 @@ MARATHON
 
 Modes in which the goal is to play as well as possible over a limited game interval, to ultimately achieve the title of Grand Master.
 
-* **MARATHON**: Get to level 999!
-* **MARATHON 2020**: 2020 levels of pure pain.
+* **MARATHON 2020**: 2020 levels of pure pain. Can you make it all the way?
 
 From other games:
 * **MARATHON A1**: Tetris the Grand Master 1.
 * **MARATHON A2**: Tetris the Grand Master 2 (TAP Master).
 * **MARATHON A3**: Tetris the Grand Master 3 (no exams).
 
-* **MARATHON N1**: NES Tetris A-type.
-
 
 SURVIVAL
 --------
 
 Modes that concentrate on how long you can survive an increasingly fast and difficult game.
 
-* **SURVIVAL**: 
+* **SURVIVAL 2020**: It only gets worse. Beware of bone blocks!
 
 From other games:
+* **SURVIVAL A1**: 20G mode from Tetris the Grand Master.
 * **SURVIVAL A2**: T.A. Death.
 * **SURVIVAL A3**: Ti Shirase.
-
-
-RACE
-----
-
-Modes in which the goal is to achieve a fixed goal in the shortest time.
-
-* **RACE 40L**: Clear 40 lines as fast as possible.
-* **RACE 100L**: Clear 100 lines as fast as possible.
-* **RACE 5K**: Clear 5,000 lines as fast as possible. Don't worry about topping out!
-* **RACE 10K**: Clear 10,000 lines as fast as possible. Don't worry about topping out!

docs/rulesets.md

@@ -17,17 +17,9 @@ A rotation system defines the following things:
  * The block offsets of each piece orientation.
  * The wall or floor kicks that will be attempted for each type of rotation.
 
-There are three main classes/families of rotation systems:
+There are four rotation systems currently supported:
 
-* **ARIKA**, commonly known as ARS.
-  * **ARIKA-CLASSIC**, commonly known as Classic ARS.
-  * **ARIKA-TI**, commonly known as Ti-ARS, or "ARS with floorkicks".
-* **STANDARD**, commonly known as SRS.
-  * **STANDARD**, or normal SRS.
-  * **STANDARD-EXP**, known as SRS-X in its original Heboris incarnation.
-  * **STANDARD-WORLD**, known as World Rule in TGM3.
-* **CLASSIC**, commonly known as ORS or NRS (Nintendo). Also houses some traditional rotation systems.
-  * **CLASSIC-1989**, the no-wallkick system used by NES Tetris.
-  * **CLASSIC-1984**, the Electonika-60 system, where the I piece is one space higher than in CLASSIC-1989.
-  * **CLASSIC-SEGA**, the original Sega rotation system that spawned Arika.
-  * **CLASSIC-TENGEN**, the weird one with orientation problems.
+* Cambridge
+* Classic ARS
+* Ti-ARS
+* SRS

main.lua

@@ -11,6 +11,9 @@ function love.load()
 	config["side_next"] = false
 	config["reverse_rotate"] = true
 	config["fullscreen"] = false
+
+	love.window.setMode(love.graphics.getWidth(), love.graphics.getHeight(), {resizable = true});
+
 	if not config.input then
 		config.input = {}
 		scene = InputConfigScene()
@@ -61,18 +64,18 @@ end
 
 function love.draw()
 	love.graphics.push()
-	if love.window.getFullscreen() then
-		-- get offset matrix
-		love.graphics.setDefaultFilter("linear", "nearest")
-		local width = love.graphics.getWidth()
-		local height = love.graphics.getHeight()
-		local scale_factor = math.min(width / 640, height / 480)
-		love.graphics.translate(
-			(width - scale_factor * 640) / 2,
-			(height - scale_factor * 480) / 2
-		)
-		love.graphics.scale(scale_factor)
-	end
+	
+	-- get offset matrix
+	love.graphics.setDefaultFilter("linear", "nearest")
+	local width = love.graphics.getWidth()
+	local height = love.graphics.getHeight()
+	local scale_factor = math.min(width / 640, height / 480)
+	love.graphics.translate(
+		(width - scale_factor * 640) / 2,
+		(height - scale_factor * 480) / 2
+	)
+	love.graphics.scale(scale_factor)
+
 	scene:render()
 	love.graphics.pop()
 end

scene/mode_select.lua

@@ -8,10 +8,10 @@ current_ruleset = 1
 game_modes = {
 	require 'tetris.modes.marathon_2020',
 	require 'tetris.modes.survival_2020',
-	require 'tetris.modes.demon_mode',
 	require 'tetris.modes.strategy',
 	require 'tetris.modes.interval_training',
 	require 'tetris.modes.pacer_test',
+	require 'tetris.modes.demon_mode',
 	require 'tetris.modes.phantom_mania',
 	require 'tetris.modes.phantom_mania2',
 	require 'tetris.modes.phantom_mania_n',

tetris/modes/demon_mode.lua

@@ -11,8 +11,8 @@ DemonModeGame.name = "Demon Mode"
 DemonModeGame.hash = "DemonMode"
 DemonModeGame.tagline = "Can you handle the ludicrous speed past level 20?"
 
-DemonModeGame.arr = 1
-DemonModeGame.drop_speed = 1
+
+
 
 function DemonModeGame:new()
 	DemonModeGame.super:new()

tetris/modes/gamemode.lua

@@ -114,26 +114,33 @@ function GameMode:update(inputs, ruleset)
 			self.hard_drop_locked = false
 		end
 
+		local piece_y = self.piece.position.y
+
 		ruleset:processPiece(
 			inputs, self.piece, self.grid, self:getGravity(), self.prev_inputs,
 			self.move, self:getLockDelay(), self:getDropSpeed(),
 			self.drop_locked, self.hard_drop_locked, self.enable_hard_drop
 		)
 
+		local piece_dy = self.piece.position.y - piece_y
+
 		if inputs["up"] == true and
 			self.piece:isDropBlocked(self.grid) and
-			not self.hard_drop_locked and
-			self.instant_hard_drop
-		then
-			self.piece.locked = true
+			not self.hard_drop_locked then
+			self:onHardDrop(piece_dy)
+			if self.instant_hard_drop then
+				self.piece.locked = true
+			end
 		end
 
-		if inputs["down"] == true and
-			self.piece:isDropBlocked(self.grid) and
-			not self.drop_locked and
-			self.instant_soft_drop
-		then
-			self.piece.locked = true
+		if inputs["down"] == true then
+			self:onSoftDrop(piece_dy)
+			if self.piece:isDropBlocked(self.grid) and
+				not self.drop_locked and
+				self.instant_soft_drop
+			then
+				self.piece.locked = true
+			end
 		end
 
 		if self.piece.locked == true then
@@ -189,6 +196,14 @@ function GameMode:onLineClear(cleared_row_count) end
 function GameMode:onPieceEnter() end
 function GameMode:onHold() end
 
+function GameMode:onSoftDrop(dropped_row_count)
+	self.drop_bonus = self.drop_bonus + 1 * dropped_row_count
+end
+
+function GameMode:onHardDrop(dropped_row_count)
+	self.drop_bonus = self.drop_bonus + 2 * dropped_row_count
+end
+
 function GameMode:onGameOver()
 	switchBGM(nil)
 end
@@ -374,7 +389,8 @@ function GameMode:drawScoringInfo()
 	love.graphics.print(
 		self.das.direction .. " " ..
 		self.das.frames .. " " ..
-		st(self.prev_inputs)
+		st(self.prev_inputs) ..
+		self.drop_bonus
 	)
 
 	love.graphics.setFont(font_8x11)

tetris/modes/interval_training.lua

@@ -11,8 +11,8 @@ IntervalTrainingGame.name = "Interval Training"
 IntervalTrainingGame.hash = "IntervalTraining"
 IntervalTrainingGame.tagline = "Can you clear the time hurdles when the game goes this fast?"
 
-IntervalTrainingGame.arr = 1
-IntervalTrainingGame.drop_speed = 1
+
+
 
 function IntervalTrainingGame:new()
 	IntervalTrainingGame.super:new()
@@ -144,7 +144,7 @@ function IntervalTrainingGame:drawScoringInfo()
 end
 
 function IntervalTrainingGame:getSectionEndLevel()
-	if self.level > 900 then return 999
+	if self.level >= 900 then return 999
 	else return math.floor(self.level / 100 + 1) * 100 end
 end
 

tetris/modes/ligne.lua

@@ -11,8 +11,8 @@ LigneGame.name = "Ligne"
 LigneGame.hash = "Ligne"
 LigneGame.tagline = "How fast can you clear 40 lines?"
 
-LigneGame.arr = 1
-LigneGame.drop_speed = 1
+
+
 
 function LigneGame:new()
 	LigneGame.super:new()

tetris/modes/marathon_2020.lua

@@ -165,7 +165,9 @@ function Marathon2020Game:onPieceEnter()
 end
 
 function Marathon2020Game:whilePieceActive()
-	self.grade_point_decay_counter = self.grade_point_decay_counter + self.grade + 2
+	if not self.clear then
+		self.grade_point_decay_counter = self.grade_point_decay_counter + self.grade + 2
+	end
 	if self.grade_point_decay_counter > 240 then
 		self.grade_point_decay_counter = 0
 		self.grade_points = math.max(0, self.grade_points - 1)
@@ -375,19 +377,29 @@ function Marathon2020Game:updateScore(level, drop_bonus, cleared_lines)
 	end
 end
 
-Marathon2020Game.mRollOpacityFunction = function(age)
+Marathon2020Game.rollOpacityFunction = function(age)
 	if age > 300 then return 0
 	elseif age < 240 then return 1
 	else return (300 - age) / 60 end
 end
 
-Marathon2020Game.rollOpacityFunction = function(age)
+Marathon2020Game.mRollOpacityFunction = function(age)
 	if age > 4 then return 0
 	else return 1 - age / 4 end
 end
 
 function Marathon2020Game:qualifiesForMRoll()
 	return false -- until I actually have grading working
+--[[
+
+GM-roll requirements
+
+You qualify for the GM roll if you:
+- Reach level 2020
+- with a grade of 50
+- in less than 13:30.00 total.
+
+]]--
 end
 
 function Marathon2020Game:drawGrid()

tetris/modes/marathon_a1.lua

@@ -11,8 +11,7 @@ MarathonA1Game.name = "Marathon A1"
 MarathonA1Game.hash = "MarathonA1"
 MarathonA1Game.tagline = "Can you score enough points to reach the title of Grand Master?"
 
-MarathonA1Game.arr = 1
-MarathonA1Game.drop_speed = 1
+
 
 function MarathonA1Game:new()
     MarathonA1Game.super:new()
@@ -34,11 +33,11 @@ function MarathonA1Game:new()
 end
 
 function MarathonA1Game:getARE()
-	return 25
+	return 30
 end
 
 function MarathonA1Game:getLineARE()
-	return 25
+	return 27
 end
 
 function MarathonA1Game:getDasLimit()
@@ -46,7 +45,7 @@ function MarathonA1Game:getDasLimit()
 end
 
 function MarathonA1Game:getLineClearDelay()
-	return 40
+	return 44
 end
 
 function MarathonA1Game:getLockDelay()
@@ -142,12 +141,12 @@ end
 
 function MarathonA1Game:updateScore(level, drop_bonus, cleared_lines)
 	if cleared_lines > 0 then
+		self.combo = self.combo + (cleared_lines - 1) * 2
 		self.score = self.score + (
 			(math.ceil((level + cleared_lines) / 4) + drop_bonus) *
-			cleared_lines * (cleared_lines * 2 - 1) * self.combo
+			cleared_lines * self.combo
 		)
-		self.lines = self.lines + cleared_lines
-		self.combo = self.combo + (cleared_lines - 1) * 2
+        self.lines = self.lines + cleared_lines
 	else
 		self.drop_bonus = 0
 		self.combo = 1
@@ -172,6 +171,9 @@ end
 
 function MarathonA1Game:drawGrid()
 	self.grid:draw()
+	if self.piece ~= nil and self.level < 100 then
+		self:drawGhostPiece(ruleset)
+	end
 end
 
 function MarathonA1Game:drawScoringInfo()
@@ -206,7 +208,7 @@ function MarathonA1Game:drawScoringInfo()
 end
 
 function MarathonA1Game:getSectionEndLevel()
-	if self.level > 900 then return 999
+	if self.level >= 900 then return 999
 	else return math.floor(self.level / 100 + 1) * 100 end
 end
 

tetris/modes/marathon_a2.lua

@@ -11,8 +11,8 @@ MarathonA2Game.name = "Marathon A2"
 MarathonA2Game.hash = "MarathonA2"
 MarathonA2Game.tagline = "The points don't matter! Can you reach the invisible roll?"
 
-MarathonA2Game.arr = 1
-MarathonA2Game.drop_speed = 1
+
+
 
 function MarathonA2Game:new()
     MarathonA2Game.super:new()
@@ -35,16 +35,16 @@ function MarathonA2Game:new()
 end
 
 function MarathonA2Game:getARE()
-        if self.level < 700 then return 25
-    elseif self.level < 800 then return 16
-    else return 12 end
+        if self.level < 700 then return 27
+    elseif self.level < 800 then return 18
+    else return 14 end
 end
 
 function MarathonA2Game:getLineARE()
-        if self.level < 600 then return 25
-    elseif self.level < 700 then return 16
-    elseif self.level < 800 then return 12
-    else return 6 end
+        if self.level < 600 then return 27
+    elseif self.level < 700 then return 18
+    elseif self.level < 800 then return 14
+    else return 8 end
 end
 
 function MarathonA2Game:getDasLimit()
@@ -352,7 +352,7 @@ function MarathonA2Game:getHighscoreData()
 end
 
 function MarathonA2Game:getSectionEndLevel()
-	if self.level > 900 then return 999
+	if self.level >= 900 then return 999
 	else return math.floor(self.level / 100 + 1) * 100 end
 end
 

tetris/modes/marathon_a3.lua

@@ -11,8 +11,8 @@ MarathonA3Game.name = "Marathon A3"
 MarathonA3Game.hash = "MarathonA3"
 MarathonA3Game.tagline = "The game gets faster way more quickly! Can you get all the Section COOLs?"
 
-MarathonA3Game.arr = 1
-MarathonA3Game.drop_speed = 1
+
+
 
 function MarathonA3Game:new()
     MarathonA3Game.super:new()
@@ -346,6 +346,9 @@ function MarathonA3Game:drawGrid()
 		end
 	else
 		self.grid:draw()
+		if self.piece ~= nil and self.level < 100 then
+			self:drawGhostPiece(ruleset)
+		end
 	end
 end
 
@@ -420,7 +423,7 @@ function MarathonA3Game:getHighscoreData()
 end
 
 function MarathonA3Game:getSectionEndLevel()
-	if self.level > 900 then return 999
+	if self.level >= 900 then return 999
 	else return math.floor(self.level / 100 + 1) * 100 end
 end
 

tetris/modes/marathon_l1.lua

@@ -11,8 +11,8 @@ MarathonL1Game.name = "Line Attack"
 MarathonL1Game.hash = "MarathonL1"
 MarathonL1Game.tagline = "Can you clear the time hurdles when the game goes this fast?"
 
-MarathonL1Game.arr = 1
-MarathonL1Game.drop_speed = 1
+
+
 
 function MarathonL1Game:new()
 	MarathonL1Game.super:new()

tetris/modes/pacer_test.lua

@@ -11,8 +11,8 @@ PacerTest.name = "TetrisGram™ Pacer Test"
 PacerTest.hash = "PacerTest"
 PacerTest.tagline = ""
 
-PacerTest.arr = 1
-PacerTest.drop_speed = 1
+
+
 
 local function getLevelFrames(level)
 	if level == 1 then return 72 * 60 / 8.0
@@ -113,7 +113,7 @@ function PacerTest:checkSectionStatus()
 		self.section_clear = false
 	else
 		self.strikes = self.strikes + 1
-		if self.strikes >= 200 then
+		if self.strikes >= 2 then
 			self.game_over = true
 			fadeoutBGM(2.5)
 		end
@@ -164,7 +164,7 @@ function PacerTest:drawScoringInfo()
 end
 
 function PacerTest:getBackground()
-	return self.level - 1
+	return math.min(self.level - 1, 20)
 end
 
 return PacerTest

tetris/modes/phantom_mania.lua

@@ -11,8 +11,8 @@ PhantomManiaGame.name = "Phantom Mania"
 PhantomManiaGame.hash = "PhantomMania"
 PhantomManiaGame.tagline = "The blocks disappear as soon as they're locked! Can you remember where everything is?"
 
-PhantomManiaGame.arr = 1
-PhantomManiaGame.drop_speed = 1
+
+
 
 function PhantomManiaGame:new()
 	PhantomManiaGame.super:new()
@@ -181,7 +181,7 @@ function PhantomManiaGame:drawScoringInfo()
 end
 
 function PhantomManiaGame:getSectionEndLevel()
-	if self.level > 900 then return 999
+	if self.level >= 900 then return 999
 	else return math.floor(self.level / 100 + 1) * 100 end
 end
 

tetris/modes/phantom_mania2.lua

@@ -11,8 +11,8 @@ PhantomMania2Game.name = "Phantom Mania 2"
 PhantomMania2Game.hash = "PhantomMania2"
 PhantomMania2Game.tagline = "The blocks disappear even faster now! Can you make it to level 1300?"
 
-PhantomMania2Game.arr = 1
-PhantomMania2Game.drop_speed = 1
+
+
 
 function PhantomMania2Game:new()
 	PhantomMania2Game.super:new()

tetris/modes/phantom_mania_n.lua

@@ -11,8 +11,8 @@ PhantomManiaGame.name = "Phantom Mania N"
 PhantomManiaGame.hash = "PhantomManiaN"
 PhantomManiaGame.tagline = "The old mode from Nullpomino."
 
-PhantomManiaGame.arr = 1
-PhantomManiaGame.drop_speed = 1
+
+
 
 function PhantomManiaGame:new()
 	PhantomManiaGame.super:new()
@@ -182,7 +182,7 @@ function PhantomManiaGame:drawScoringInfo()
 end
 
 function PhantomManiaGame:getSectionEndLevel()
-	if self.level > 900 then return 999
+	if self.level >= 900 then return 999
 	else return math.floor(self.level / 100 + 1) * 100 end
 end
 

tetris/modes/strategy.lua

@@ -11,8 +11,8 @@ StrategyGame.name = "Strategy"
 StrategyGame.hash = "Strategy"
 StrategyGame.tagline = "You have lots of time to think! Can you use it to place a piece fast?"
 
-StrategyGame.arr = 1
-StrategyGame.drop_speed = 1
+
+
 
 function StrategyGame:new()
 	StrategyGame.super:new()

tetris/modes/survival_2020.lua

@@ -11,8 +11,8 @@ Survival2020Game.name = "Survival 2020"
 Survival2020Game.hash = "Survival2020"
 Survival2020Game.tagline = "A new time limit on the blocks! Can you handle being forced to perform under the total delay?"
 
-Survival2020Game.arr = 1
-Survival2020Game.drop_speed = 1
+
+
 
 function Survival2020Game:new()
 	Survival2020Game.super:new()
@@ -36,8 +36,8 @@ function Survival2020Game:getARE()
 	elseif self.level < 300 then return 10
 	elseif self.level < 500 then return 6
 	elseif self.level < 1000 then return 4
-	elseif self.level < 1500 then return 3
-	else return 2 end
+	elseif self.level < 1500 then return 5
+	else return 6 end
 end
 
 function Survival2020Game:getLineARE()
@@ -71,12 +71,12 @@ end
 
 function Survival2020Game:getTotalDelay()
 		if self.level < 500 then return 60
-	elseif self.level < 600 then return 45  -- lock delay: 15
+	elseif self.level < 600 then return 45  -- lock delay: 13
 	elseif self.level < 700 then return 36
 	elseif self.level < 800 then return 27
 	elseif self.level < 900 then return 21
 	elseif self.level < 1000 then return 15
-	elseif self.level < 1100 then return 36  -- lock delay: 11
+	elseif self.level < 1100 then return 36  -- lock delay: 10
 	elseif self.level < 1200 then return 27
 	elseif self.level < 1300 then return 21
 	elseif self.level < 1400 then return 15

tetris/modes/survival_a1.lua

@@ -11,8 +11,8 @@ SurvivalA1Game.name = "Survival A1"
 SurvivalA1Game.hash = "SurvivalA1"
 SurvivalA1Game.tagline = "The game starts fast and only gets faster!"
 
-SurvivalA1Game.arr = 1
-SurvivalA1Game.drop_speed = 1
+
+
 
 function SurvivalA1Game:new()
     SurvivalA1Game.super:new()
@@ -34,11 +34,11 @@ function SurvivalA1Game:new()
 end
 
 function SurvivalA1Game:getARE()
-	return 25
+	return 30
 end
 
 function SurvivalA1Game:getLineARE()
-	return 25
+	return 27
 end
 
 function SurvivalA1Game:getDasLimit()
@@ -46,7 +46,7 @@ function SurvivalA1Game:getDasLimit()
 end
 
 function SurvivalA1Game:getLineClearDelay()
-	return 40
+	return 44
 end
 
 function SurvivalA1Game:getLockDelay()
@@ -141,9 +141,6 @@ end
 
 function SurvivalA1Game:drawGrid()
 	self.grid:draw()
-	if self.piece ~= nil and self.level < 100 then
-		self:drawGhostPiece(ruleset)
-	end
 end
 
 function SurvivalA1Game:drawScoringInfo()
@@ -178,7 +175,7 @@ function SurvivalA1Game:drawScoringInfo()
 end
 
 function SurvivalA1Game:getSectionEndLevel()
-	if self.level > 900 then return 999
+	if self.level >= 900 then return 999
 	else return math.floor(self.level / 100 + 1) * 100 end
 end
 

tetris/modes/survival_a2.lua

@@ -11,8 +11,8 @@ SurvivalA2Game.name = "Survival A2"
 SurvivalA2Game.hash = "SurvivalA2"
 SurvivalA2Game.tagline = "The game starts fast and only gets faster!"
 
-SurvivalA2Game.arr = 1
-SurvivalA2Game.drop_speed = 1
+
+
 
 function SurvivalA2Game:new()
 	SurvivalA2Game.super:new()
@@ -46,7 +46,7 @@ function SurvivalA2Game:getDasLimit()
 end
 
 function SurvivalA2Game:getLineClearDelay()
-	return self:getLineARE()
+	return self:getLineARE() - 2
 end
 
 function SurvivalA2Game:getLockDelay()
@@ -148,7 +148,7 @@ end
 
 function SurvivalA2Game:getSectionEndLevel()
 	if self.clear then return self.level
-	elseif self.level > 900 then return 999
+	elseif self.level >= 900 then return 999
 	else return math.floor(self.level / 100 + 1) * 100 end
 end
 

tetris/modes/survival_a3.lua

@@ -11,8 +11,8 @@ SurvivalA3Game.name = "Survival A3"
 SurvivalA3Game.hash = "SurvivalA3"
 SurvivalA3Game.tagline = "The blocks turn black and white! Can you make it to level 1300?"
 
-SurvivalA3Game.arr = 1
-SurvivalA3Game.drop_speed = 1
+
+
 
 function SurvivalA3Game:new()
 	SurvivalA3Game.super:new()