Bug.

- History 4-rolls, history 6-rolls and history 6-rolls 35-bag no longer deal S, Z or O as their first piece
- Added a 7-bag randomiser with the same behaviour (bag7noSZOstart)
- Tweaked the "35-bag" part of the history 6-rolls 35-bag randomiser to work closer to what it's supposed to be
- Switched Marathon AX4's randomiser from history 6-rolls to 7-bag no SZO start

load/graphics.lua

@@ -20,6 +20,7 @@ backgrounds = {
 	love.graphics.newImage("res/backgrounds/1800-railways.png"),
 	love.graphics.newImage("res/backgrounds/1900-world-wide-web.png"),
 	title = love.graphics.newImage("res/backgrounds/title_v0.1.png"),
+    input_config = love.graphics.newImage("res/backgrounds/options-gears.png")
 }
 
 blocks = {

scene.lua

@@ -7,6 +7,7 @@ function Scene:update() end
 function Scene:render() end
 function Scene:onKeyPress() end
 
+ExitScene = require "scene.exit"
 GameScene = require "scene.game"
 ModeSelectScene = require "scene.mode_select"
 InputConfigScene = require "scene.input_config"

scene/exit.lua

@@ -0,0 +1,23 @@
+local ExitScene = Scene:extend()
+require 'load.save'
+
+ExitScene.title = "Exit Game"
+
+function ExitScene:new()
+end
+
+function ExitScene:update()
+    love.event.quit()
+end
+
+function ExitScene:render()
+end
+
+function ExitScene:changeOption(rel)
+end
+
+function ExitScene:onKeyPress(e)
+end
+
+return ExitScene
+

scene/game.lua

@@ -57,11 +57,21 @@ end
 
 function GameScene:onKeyPress(e)
 	if (self.game.completed) and
-		e.scancode == "return" and e.isRepeat == false then
+		(e.scancode == "return" or e.scancode == "escape") and e.isRepeat == false then
 		highscore_entry = self.game:getHighscoreData()
 		highscore_hash = self.game.hash .. "-" .. self.ruleset.hash
 		submitHighscore(highscore_hash, highscore_entry)
 		scene = ModeSelectScene()
+    elseif (e.scancode == config.input.retry) then
+        -- fuck this, this is hacky but the way this codebase is setup prevents anything else
+        -- it seems like all the values that get touched in the child gamemode class
+        -- stop being linked to the values of the GameMode superclass because of how `mt.__index` works
+        -- not even sure this is the actual problem, but I don't want to have to rebuild everything about 
+        -- the core organisation of everything. this hacky way will have to do until someone figures out something.
+        love.keypressed("escape", "escape", false)
+        love.keypressed("return", "return", false)
+    elseif e.scancode == "escape" then
+        scene = ModeSelectScene()
 	end
 end
 

scene/input_config.lua

@@ -15,6 +15,7 @@ local configurable_inputs = {
     "rotate_right2",
     "rotate_180",
     "hold",
+    "retry",
 }
 
 function ConfigScene:new()
@@ -27,6 +28,13 @@ function ConfigScene:update()
 end
 
 function ConfigScene:render()
+	love.graphics.setColor(1, 1, 1, 1)
+	love.graphics.draw(
+		backgrounds["input_config"],
+		0, 0, 0,
+		0.5, 0.5
+	)
+    
 	love.graphics.setFont(font_3x5_2)
 	for i, input in pairs(configurable_inputs) do
 		if config.input[input] then

scene/mode_select.lua

@@ -32,6 +32,7 @@ rulesets = {
 	require 'tetris.rulesets.cambridge',
 	require 'tetris.rulesets.arika',
 	require 'tetris.rulesets.arika_ti',
+	require 'tetris.rulesets.ti_srs',
 	require 'tetris.rulesets.arika_ace',
 	require 'tetris.rulesets.arika_srs',
 	require 'tetris.rulesets.standard_exp',
@@ -100,6 +101,8 @@ function ModeSelectScene:onKeyPress(e)
 	elseif (e.scancode == config.input["left"] or e.scancode == "left") or
 		(e.scancode == config.input["right"] or e.scancode == "right") then
 		self:switchSelect()
+    elseif e.scancode == "escape" then
+        scene = TitleScene()
 	end
 end
 

scene/title.lua

@@ -3,6 +3,7 @@ local TitleScene = Scene:extend()
 local main_menu_screens = {
 	ModeSelectScene,
 	InputConfigScene,
+    ExitScene,
 }
 
 function TitleScene:new()
@@ -43,6 +44,8 @@ function TitleScene:onKeyPress(e)
 		self:changeOption(-1)
 	elseif (e.scancode == config.input["down"] or e.scancode == "down") and e.isRepeat == false then
 		self:changeOption(1)
+    elseif e.scancode == "escape" and e.isRepeat == false then
+        love.event.quit()
 	end
 end
 

tetris/components/grid.lua

@@ -185,6 +185,49 @@ function Grid:applyBigPiece(piece)
 	end
 end
 
+function Grid:checkForBravo(cleared_row_count)
+	for i = 0, 23 - cleared_row_count do
+                for j = 0, 9 do
+                        if self:isOccupied(j, i) then return false end
+                end
+        end
+	return true
+end
+
+function Grid:checkSecretGrade()
+    local sgrade = 0
+    for i=23,5,-1 do
+        local validLine = true
+        local emptyCell = 0
+        if i > 13 then
+            emptyCell = 23-i
+        end
+        if i <= 13 then
+            emptyCell = i-5
+        end
+        for j=0,9 do
+            if (not self:isOccupied(j,i) and j ~= emptyCell) or (j == emptyCell and self:isOccupied(j,i)) then
+                validLine = false
+            end
+        end
+        if not self:isOccupied(emptyCell,i-1) then
+            validLine = false
+        end
+        if(validLine) then
+                    sgrade = sgrade + 1
+        else
+            -- return sgrade
+        end
+    end
+    --[[
+    if(sgrade == 0) then return ""
+    elseif(sgrade < 10) then return 10-sgrade
+    elseif(sgrade < 19) then return "S"..(sgrade-9) end
+    return "GM"
+    --]]
+    return sgrade
+end
+
 function Grid:update()
 	for y = 1, 24 do
 		for x = 1, 10 do

tetris/modes/big_a2.lua

@@ -15,7 +15,7 @@ MarathonA2Game.tagline = "The points don't matter! Can you reach the invisible r
 
 
 function MarathonA2Game:new()
-    MarathonA2Game.super:new()
+    self.super:new()
     self.big_mode = true
 	self.roll_frames = 0
     self.combo = 1

tetris/modes/gamemode.lua

@@ -68,6 +68,7 @@ end
 
 function GameMode:initialize(ruleset)
 	-- generate next queue
+    self:new()
 	for i = 1, self.next_queue_length do
 		table.insert(self.next_queue, self:getNextPiece(ruleset))
 	end

tetris/modes/konoha.lua

@@ -127,15 +127,7 @@ function KonohaGame:onLineClear(cleared_row_count)
     local oldtime = self.time_limit
 	
     self.level = self.level + cleared_row_levels[cleared_row_count / 2]
-	self.bravo = true
-	for i = 0, 23 - cleared_row_count do
-		for j = 0, 9 do
-			if self.grid:isOccupied(j, i) then
-				self.bravo = false
-			end
-		end
-	end
-	if self.bravo then
+	if self.grid:checkForBravo(cleared_row_count) then
 		self.bravos = self.bravos + 1
 		if self.level < 1000 then self.time_limit = self.time_limit + bravo_bonus[cleared_row_count / 2]
 		else self.time_limit = self.time_limit + bravo_ot_bonus[cleared_row_count / 2]
@@ -153,7 +145,7 @@ function KonohaGame:onLineClear(cleared_row_count)
 end
 
 function KonohaGame:getBackground()
-	return math.min(math.floor(self.level / 100), 9)
+	return math.floor(self.level / 100)
 end
 
 function KonohaGame:drawScoringInfo()
@@ -175,10 +167,10 @@ function KonohaGame:drawScoringInfo()
                 love.graphics.setColor(1, 0.3, 0.3, 1)
         end
 	love.graphics.printf(formatTime(self.time_limit), 240, 140, 120, "right")
+	love.graphics.setColor(1, 1, 1, 1)
     if self.last_bonus_display_time > 0 then
         love.graphics.printf("+"..formatTime(self.last_bonus_amount), 240, 160, 120, "right")
     end
-	love.graphics.setColor(1, 1, 1, 1)
 	love.graphics.printf(self.bravos, 240, 220, 90, "left")
 	love.graphics.printf(self.level, 240, 340, 50, "right")
 	love.graphics.printf(self:getSectionEndLevel(), 240, 370, 50, "right")

tetris/modes/marathon_a1.lua

@@ -23,6 +23,11 @@ function MarathonA1Game:new()
 		level500 = false,
 		level999 = false
     }
+    self.SGnames = {
+        "9", "8", "7", "6", "5", "4", "3", "2", "1",
+        "S1", "S2", "S3", "S4", "S5", "S6", "S7", "S8", "S9",
+        "GM"
+    }
     
 	self.randomizer = History4RollsRandomizer()
 
@@ -191,6 +196,10 @@ function MarathonA1Game:drawScoringInfo()
 	love.graphics.printf("SCORE", 240, 200, 40, "left")
 	love.graphics.printf("NEXT RANK", 240, 260, 90, "left")
 	love.graphics.printf("LEVEL", 240, 320, 40, "left")
+    local sg = self.grid:checkSecretGrade()
+    if sg >= 5 then 
+        love.graphics.printf("SECRET GRADE", 240, 430, 180, "left")
+    end
 
 	love.graphics.setFont(font_3x5_3)
 	love.graphics.printf(self.score, 240, 220, 90, "left")
@@ -202,7 +211,10 @@ function MarathonA1Game:drawScoringInfo()
 	love.graphics.printf(getRankForScore(self.score).next, 240, 280, 90, "left")
 	love.graphics.printf(self.level, 240, 340, 40, "right")
 	love.graphics.printf(self:getSectionEndLevel(), 240, 370, 40, "right")
-
+    if sg >= 5 then
+        love.graphics.printf(self.SGnames[sg], 240, 450, 180, "left")
+    end
+    
 	love.graphics.setFont(font_8x11)
 	love.graphics.printf(formatTime(self.frames), 64, 420, 160, "center")
 end

tetris/modes/marathon_a2.lua

@@ -27,6 +27,12 @@ function MarathonA2Game:new()
 	self.section_times = { [0] = 0 }
 	self.section_tetrises = { [0] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
     
+    self.SGnames = {
+        "9", "8", "7", "6", "5", "4", "3", "2", "1",
+        "S1", "S2", "S3", "S4", "S5", "S6", "S7", "S8", "S9",
+        "GM"
+    }
+    
 	self.randomizer = History6RollsRandomizer()
 
     self.lock_drop = false
@@ -273,7 +279,7 @@ function MarathonA2Game:qualifiesForMRoll()
 			return false
 		end
 	end
-	if self.grade < 17 or self.frames > frameTime(8,45) then
+	if self.grade < 17 or self.frames > frameTime(9,30) then
 		return false
 	end
 	return true
@@ -331,12 +337,19 @@ function MarathonA2Game:drawScoringInfo()
 	love.graphics.printf("GRADE", 240, 120, 40, "left")
 	love.graphics.printf("SCORE", 240, 200, 40, "left")
 	love.graphics.printf("LEVEL", 240, 320, 40, "left")
+    local sg = self.grid:checkSecretGrade()
+    if sg >= 5 then 
+        love.graphics.printf("SECRET GRADE", 240, 430, 180, "left")
+    end
 
 	love.graphics.setFont(font_3x5_3)
 	love.graphics.printf(self:getLetterGrade(), 240, 140, 90, "left")
 	love.graphics.printf(self.score, 240, 220, 90, "left")
 	love.graphics.printf(self.level, 240, 340, 40, "right")
 	love.graphics.printf(self:getSectionEndLevel(), 240, 370, 40, "right")
+    if sg >= 5 then
+        love.graphics.printf(self.SGnames[sg], 240, 450, 180, "left")
+    end
 
 	love.graphics.setFont(font_8x11)
 	love.graphics.printf(formatTime(self.frames), 64, 420, 160, "center")

tetris/modes/marathon_a3.lua

@@ -32,10 +32,19 @@ function MarathonA3Game:new()
     
 	self.randomizer = History6RollsRandomizer()
 
+self.SGnames = {
+        "9", "8", "7", "6", "5", "4", "3", "2", "1",
+        "S1", "S2", "S3", "S4", "S5", "S6", "S7", "S8", "S9",
+        "GM"
+    }
+	
     self.lock_drop = true
     self.lock_hard_drop = true
 	self.enable_hold = true
 	self.next_queue_length = 3
+	
+	self.coolregret_message = "COOL!!"
+	self.coolregret_timer = 0
 end
 
 function MarathonA3Game:getARE()
@@ -182,17 +191,23 @@ function MarathonA3Game:updateSectionTimes(old_level, new_level)
 		if section_time > regret_cutoffs[section] then
 			self.section_cool_grade = self.section_cool_grade - 1
 			table.insert(self.section_status, "regret")
+			self.coolregret_message = "REGRET!!"
+			self.coolregret_timer = 300
 		elseif section <= 9 and self.section_status[section - 1] == "cool" and
 		self.section_70_times[section] < self.section_70_times[section - 1] + 120 then
 			self.section_cool_grade = self.section_cool_grade + 1
 			self.speed_level = self.speed_level + 100
 			table.insert(self.section_status, "cool")
+			self.coolregret_message = "COOL!!"
+			self.coolregret_timer = 300
 		elseif self.section_status[section - 1] == "cool" then
 			table.insert(self.section_status, "none")
 		elseif section <= 9 and self.section_70_times[section] < cool_cutoffs[section] then
 			self.section_cool_grade = self.section_cool_grade + 1
 			self.speed_level = self.speed_level + 100
 			table.insert(self.section_status, "cool")
+			self.coolregret_message = "COOL!!"
+			self.coolregret_timer = 300
 		else
 			table.insert(self.section_status, "none")
 		end
@@ -378,6 +393,10 @@ function MarathonA3Game:drawScoringInfo()
 	love.graphics.printf("GRADE", 240, 120, 40, "left")
 	love.graphics.printf("SCORE", 240, 200, 40, "left")
 	love.graphics.printf("LEVEL", 240, 320, 40, "left")
+	local sg = self.grid:checkSecretGrade()
+    if sg >= 5 then
+        love.graphics.printf("SECRET GRADE", 240, 430, 180, "left")
+    end
 
 	-- draw section time data
 	current_section = math.floor(self.level / 100) + 1
@@ -405,13 +424,21 @@ function MarathonA3Game:drawScoringInfo()
 	end
 
 	love.graphics.printf(formatTime(self.frames - self.section_start_time), current_x, 40 + 20 * current_section, 90, "left")
+	
+	if(self.coolregret_timer > 0) then
+                love.graphics.printf(self.coolregret_message, 64, 400, 160, "center")
+                self.coolregret_timer = self.coolregret_timer - 1
+        end
 
 	love.graphics.setFont(font_3x5_3)
 	love.graphics.printf(self.score, 240, 220, 90, "left")
 	love.graphics.printf(self:getLetterGrade(), 240, 140, 90, "left")
 	love.graphics.printf(self.level, 240, 340, 40, "right")
 	love.graphics.printf(self:getSectionEndLevel(), 240, 370, 40, "right")
-	
+	if sg >= 5 then
+        love.graphics.printf(self.SGnames[sg], 240, 450, 180, "left")
+    end
+
 	love.graphics.setFont(font_8x11)
 	love.graphics.printf(formatTime(self.frames), 64, 420, 160, "center")
 end

tetris/modes/marathon_ax4.lua

@@ -3,7 +3,7 @@ require 'funcs'
 local GameMode = require 'tetris.modes.gamemode'
 local Piece = require 'tetris.components.piece'
 
-local History6RollsRandomizer = require 'tetris.randomizers.history_6rolls'
+local Bag7NoSZOStartRandomizer = require 'tetris.randomizers.bag7noSZOstart'
 
 local MarathonAX4Game = GameMode:extend()
 
@@ -16,7 +16,7 @@ function MarathonAX4Game:new()
 	MarathonAX4Game.super:new()
 
 	self.roll_frames = 0
-	self.randomizer = History6RollsRandomizer()
+	self.randomizer = Bag7NoSZOStartRandomizer()
 
 	self.section_time_limit = 3600
 	self.section_start_time = 0

tetris/modes/survival_a1.lua

@@ -25,6 +25,12 @@ function SurvivalA1Game:new()
 		level999 = false
     }
     
+    self.SGnames = {
+        "9", "8", "7", "6", "5", "4", "3", "2", "1",
+        "S1", "S2", "S3", "S4", "S5", "S6", "S7", "S8", "S9",
+        "GM"
+    }
+    
 	self.randomizer = History4RollsRandomizer()
 
     self.lock_drop = false
@@ -158,6 +164,10 @@ function SurvivalA1Game:drawScoringInfo()
 	love.graphics.printf("SCORE", 240, 200, 40, "left")
 	love.graphics.printf("NEXT RANK", 240, 260, 90, "left")
 	love.graphics.printf("LEVEL", 240, 320, 40, "left")
+    local sg = self.grid:checkSecretGrade()
+    if sg >= 5 then 
+        love.graphics.printf("SECRET GRADE", 240, 430, 180, "left")
+    end
 
 	love.graphics.setFont(font_3x5_3)
 	love.graphics.printf(self.score, 240, 220, 90, "left")
@@ -169,6 +179,9 @@ function SurvivalA1Game:drawScoringInfo()
 	love.graphics.printf(getRankForScore(self.score).next, 240, 280, 90, "left")
 	love.graphics.printf(self.level, 240, 340, 40, "right")
 	love.graphics.printf(self:getSectionEndLevel(), 240, 370, 40, "right")
+    if sg >= 5 then
+        love.graphics.printf(self.SGnames[sg], 240, 450, 180, "left")
+    end
 
 	love.graphics.setFont(font_8x11)
 	love.graphics.printf(formatTime(self.frames), 64, 420, 160, "center")

tetris/modes/survival_a2.lua

@@ -19,6 +19,12 @@ function SurvivalA2Game:new()
 	self.roll_frames = 0
 	self.combo = 1
 	self.randomizer = History6RollsRandomizer()
+    
+    self.SGnames = {
+        "9", "8", "7", "6", "5", "4", "3", "2", "1",
+        "S1", "S2", "S3", "S4", "S5", "S6", "S7", "S8", "S9",
+        "GM"
+    }
 
 	self.lock_drop = true
 end
@@ -138,12 +144,19 @@ function SurvivalA2Game:drawScoringInfo()
 	love.graphics.printf("GRADE", text_x, 120, 40, "left")
 	love.graphics.printf("SCORE", text_x, 200, 40, "left")
 	love.graphics.printf("LEVEL", text_x, 320, 40, "left")
+    local sg = self.grid:checkSecretGrade()
+    if sg >= 5 then 
+        love.graphics.printf("SECRET GRADE", 240, 430, 180, "left")
+    end
 
 	love.graphics.setFont(font_3x5_3)
 	love.graphics.printf(self.score, text_x, 220, 90, "left")
 	love.graphics.printf(self:getLetterGrade(), text_x, 140, 90, "left")
 	love.graphics.printf(self.level, text_x, 340, 40, "right")
 	love.graphics.printf(self:getSectionEndLevel(), text_x, 370, 40, "right")
+    if sg >= 5 then
+        love.graphics.printf(self.SGnames[sg], 240, 450, 180, "left")
+    end
 end
 
 function SurvivalA2Game:getSectionEndLevel()

tetris/modes/survival_a3.lua

@@ -24,10 +24,19 @@ function SurvivalA3Game:new()
 	self.roll_frames = 0
 	self.combo = 1
 	self.randomizer = History6RollsRandomizer()
+    
+    self.SGnames = {
+        "S1", "S2", "S3", "S4", "S5", "S6", "S7", "S8", "S9",
+        "m1", "m2", "m3", "m4", "m5", "m6", "m7", "m8", "m9",
+        "GM"
+    }
 
 	self.lock_drop = true
 	self.enable_hold = true
 	self.next_queue_length = 3
+
+	self.coolregret_message = "COOL!!"
+	self.coolregret_timer = 0
 end
 
 function SurvivalA3Game:getARE()
@@ -170,6 +179,9 @@ function SurvivalA3Game:updateSectionTimes(old_level, new_level)
 		self.section_start_time = self.frames
 		if section_time <= frameTime(1,00) then
 			self.grade = self.grade + 1
+		else
+			self.coolregret_message = "REGRET!!"
+			self.coolregret_timer = 300
 		end
 	end
 end
@@ -207,6 +219,15 @@ function SurvivalA3Game:drawScoringInfo()
 	love.graphics.printf("GRADE", text_x, 120, 40, "left")
 	love.graphics.printf("SCORE", text_x, 200, 40, "left")
 	love.graphics.printf("LEVEL", text_x, 320, 40, "left")
+    local sg = self.grid:checkSecretGrade()
+    if sg >= 5 then 
+        love.graphics.printf("SECRET GRADE", 240, 430, 180, "left")
+    end
+	
+	if(self.coolregret_timer > 0) then
+		love.graphics.printf(self.coolregret_message, 64, 400, 160, "center")
+		self.coolregret_timer = self.coolregret_timer - 1
+	end
 
 	local current_section = math.floor(self.level / 100) + 1
 	self:drawSectionTimesWithSplits(current_section)
@@ -220,6 +241,9 @@ function SurvivalA3Game:drawScoringInfo()
 	else
 		love.graphics.printf(math.floor(self.level / 100 + 1) * 100, text_x, 370, 50, "right")
 	end
+    if sg >= 5 then
+        love.graphics.printf(self.SGnames[sg], 240, 450, 180, "left")
+    end
 end
 
 function SurvivalA3Game:getBackground()

tetris/randomizers/bag7noSZOstart.lua

@@ -0,0 +1,31 @@
+local Randomizer = require 'tetris.randomizers.randomizer'
+
+local Bag7NoSZOStartRandomizer = Randomizer:extend()
+
+function Bag7NoSZOStartRandomizer:shuffleBag()
+    local b = self.bag
+    local ln = #b
+    for i = 1, ln do
+        local j = math.random(i, ln)
+        b[i], b[j] = b[j], b[i]
+    end
+end
+
+local function isnotSZO(x) return not(x == "S" or x == "Z" or x == "O") end 
+
+function Bag7NoSZOStartRandomizer:initialize()
+	self.bag = {"I", "J", "L", "O", "S", "T", "Z"}
+    repeat
+        self:shuffleBag()
+    until isnotSZO(self.bag[7])
+end
+
+function Bag7NoSZOStartRandomizer:generatePiece()
+	if #self.bag == 0 then
+		self.bag = {"I", "J", "L", "O", "S", "T", "Z"}
+        self:shuffleBag()
+	end
+	return table.remove(self.bag)
+end
+
+return Bag7NoSZOStartRandomizer

tetris/randomizers/history_4rolls.lua

@@ -3,17 +3,23 @@ local Randomizer = require 'tetris.randomizers.randomizer'
 local History4RollsRandomizer = Randomizer:extend()
 
 function History4RollsRandomizer:initialize()
-	self.history = {"Z", "S", "Z", "S"}
+	self.history = {"Z", "Z", "Z", "Z"}
+    self.first = true
 end
 
 function History4RollsRandomizer:generatePiece()
-	local shapes = {"I", "J", "L", "O", "S", "T", "Z"}
-	for i = 1, 4 do
-		local x = math.random(7)
-		if not inHistory(shapes[x], self.history) or i == 4 then
-			return self:updateHistory(shapes[x])
-		end
-	end
+    if self.first then
+        self.first = false
+        return self:updateHistory(({"L", "J", "I", "T"})[math.random(4)])
+    else
+        local shapes = {"I", "J", "L", "O", "S", "T", "Z"}
+        for i = 1, 4 do
+            local x = math.random(7)
+            if not inHistory(shapes[x], self.history) or i == 4 then
+                return self:updateHistory(shapes[x])
+            end
+        end
+    end
 end
 
 function History4RollsRandomizer:updateHistory(shape)

tetris/randomizers/history_6rolls.lua

@@ -4,16 +4,22 @@ local History6RollsRandomizer = Randomizer:extend()
 
 function History6RollsRandomizer:initialize()
 	self.history = {"Z", "S", "Z", "S"}
+    self.first = true
 end
 
 function History6RollsRandomizer:generatePiece()
-	local shapes = {"I", "J", "L", "O", "S", "T", "Z"}
-	for i = 1, 6 do
-		local x = math.random(7)
-		if not inHistory(shapes[x], self.history) or i == 6 then
-			return self:updateHistory(shapes[x])
-		end
-	end
+    if self.first then
+        self.first = false
+        return self:updateHistory(({"L", "J", "I", "T"})[math.random(4)])
+    else
+        local shapes = {"I", "J", "L", "O", "S", "T", "Z"}
+        for i = 1, 6 do
+            local x = math.random(7)
+            if not inHistory(shapes[x], self.history) or i == 6 then
+                return self:updateHistory(shapes[x])
+            end
+        end
+    end
 end
 
 function History6RollsRandomizer:updateHistory(shape)

tetris/randomizers/history_6rolls_35bag.lua

@@ -1,38 +1,70 @@
 local Randomizer = require 'tetris.randomizers.randomizer'
 
-local History6RollsRandomizer = Randomizer:extend()
+local History6Rolls35PoolRandomizer = Randomizer:extend()
 
-function History6RollsRandomizer:initialize()
+function History6Rolls35PoolRandomizer:initialize()
+    self.first = true
 	self.history = {"Z", "S", "Z", "S"}
-	self.bag_counts = {
-		I = 5, J = 5, L = 5, O = 5, S = 3, T = 5, Z = 3
+	self.pool = {
+		"I", "I", "I", "I", "I",
+        "T", "T", "T", "T", "T",
+        "L", "L", "L", "L", "L",
+        "J", "J", "J", "J", "J",
+        "S", "S", "S", "S", "S",
+        "Z", "Z", "Z", "Z", "Z",
+        "O", "O", "O", "O", "O",
 	}
+    self.droughts = {
+        I = 0,
+        T = 0,
+        L = 0,
+        J = 0,
+        S = 0,
+        Z = 0,
+        O = 0,
+    }
 end
 
-function History6RollsRandomizer:getBagPiece(n)
-	for shape, count in pairs(self.bag_counts) do
-		n = n - count
-		if n <= 0 then
-			return shape
-		end
-	end
+function History6Rolls35PoolRandomizer:generatePiece()
+    local index, x
+    if self.first then
+        local prevent = {"S", "Z", "O"}
+        repeat
+            index = math.random(#self.pool)
+            x = self.pool[index]
+        until not inHistory(x, prevent)
+        self.first = false
+    else
+        for i = 1, 6 do
+            index = math.random(#self.pool)
+            x = self.pool[index]
+            if not inHistory(x, self.history) or i == 6 then
+                break
+            end
+        end
+    end
+    self.pool[index] = self:updateHistory(x)
+    return x
 end
 
-function History6RollsRandomizer:generatePiece()
-	for i = 1, 6 do
-		local x = self:getBagPiece(math.random(31))
-		if not inHistory(x, self.history) or i == 6 then
-			return self:updateHistory(x)
-		end
-	end
-end
-
-function History6RollsRandomizer:updateHistory(shape)
-	self.bag_counts[shape] = self.bag_counts[shape] - 1
-	local replaced_piece = table.remove(self.history, 1)
+function History6Rolls35PoolRandomizer:updateHistory(shape)
+	table.remove(self.history, 1)
 	table.insert(self.history, shape)
-	self.bag_counts[replaced_piece] = self.bag_counts[replaced_piece] + 1
-	return shape
+
+    local highdrought
+    local highdroughtcount = 0
+    for k, v in pairs(self.droughts) do 
+        if k == shape then
+            self.droughts[k] = 0
+        else
+            self.droughts[k] = v + 1
+            if v >= highdroughtcount then
+                highdrought = k
+                highdroughtcount = v
+            end
+        end
+    end
+	return highdrought
 end
 
 function inHistory(piece, history)
@@ -44,4 +76,4 @@ function inHistory(piece, history)
 	return false
 end
 
-return History6RollsRandomizer
+return History6Rolls35PoolRandomizer

tetris/rulesets/ti_srs.lua

@@ -0,0 +1,177 @@
+local Piece = require 'tetris.components.piece'
+local Ruleset = require 'tetris.rulesets.ruleset'
+
+local SRS = Ruleset:extend()
+
+SRS.name = "Ti-World"
+SRS.hash = "Bad I-kicks"
+
+SRS.enable_IRS_wallkicks = true
+
+SRS.spawn_positions = {
+	I = { x=5, y=4 },
+	J = { x=4, y=5 },
+	L = { x=4, y=5 },
+	O = { x=5, y=5 },
+	S = { x=4, y=5 },
+	T = { x=4, y=5 },
+	Z = { x=4, y=5 },
+}
+
+SRS.big_spawn_positions = {
+	I = { x=2, y=2 },
+	J = { x=2, y=3 },
+	L = { x=2, y=3 },
+	O = { x=2, y=3 },
+	S = { x=2, y=3 },
+	T = { x=2, y=3 },
+	Z = { x=2, y=3 },
+}
+
+SRS.block_offsets = {
+	I={
+		{ {x=0, y=0}, {x=-1, y=0}, {x=-2, y=0}, {x=1, y=0} },
+		{ {x=0, y=0}, {x=0, y=-1}, {x=0, y=1}, {x=0, y=2} },
+		{ {x=0, y=1}, {x=-1, y=1}, {x=-2, y=1}, {x=1, y=1} },
+		{ {x=-1, y=0}, {x=-1, y=-1}, {x=-1, y=1}, {x=-1, y=2} },
+	},
+	J={
+		{ {x=0, y=0}, {x=-1, y=0}, {x=1, y=0}, {x=-1, y=-1} },
+		{ {x=0, y=0}, {x=0, y=-1}, {x=0, y=1} , {x=1, y=-1} },
+		{ {x=0, y=0}, {x=1, y=0}, {x=-1, y=0}, {x=1, y=1} },
+		{ {x=0, y=0}, {x=0, y=1}, {x=0, y=-1}, {x=-1, y=1} },
+	},
+	L={
+		{ {x=0, y=0}, {x=-1, y=0}, {x=1, y=0}, {x=1, y=-1} },
+		{ {x=0, y=0}, {x=0, y=-1}, {x=0, y=1}, {x=1, y=1} },
+		{ {x=0, y=0}, {x=1, y=0}, {x=-1, y=0}, {x=-1, y=1} },
+		{ {x=0, y=0}, {x=0, y=1}, {x=0, y=-1}, {x=-1, y=-1} },
+	},
+	O={
+		{ {x=0, y=0}, {x=-1, y=0}, {x=-1, y=-1}, {x=0, y=-1} },
+		{ {x=0, y=0}, {x=-1, y=0}, {x=-1, y=-1}, {x=0, y=-1} },
+		{ {x=0, y=0}, {x=-1, y=0}, {x=-1, y=-1}, {x=0, y=-1} },
+		{ {x=0, y=0}, {x=-1, y=0}, {x=-1, y=-1}, {x=0, y=-1} },
+	},
+	S={
+		{ {x=1, y=-1}, {x=0, y=-1}, {x=0, y=0}, {x=-1, y=0} },
+		{ {x=1, y=1}, {x=1, y=0}, {x=0, y=0}, {x=0, y=-1} },
+		{ {x=-1, y=1}, {x=0, y=1}, {x=0, y=0}, {x=1, y=0} },
+		{ {x=-1, y=-1}, {x=-1, y=0}, {x=0, y=0}, {x=0, y=1} },
+	},
+	T={
+		{ {x=0, y=0}, {x=-1, y=0}, {x=1, y=0}, {x=0, y=-1} },
+		{ {x=0, y=0}, {x=0, y=-1}, {x=0, y=1}, {x=1, y=0} },
+		{ {x=0, y=0}, {x=1, y=0}, {x=-1, y=0}, {x=0, y=1} },
+		{ {x=0, y=0}, {x=0, y=1}, {x=0, y=-1}, {x=-1, y=0} },
+	},
+	Z={
+		{ {x=-1, y=-1}, {x=0, y=-1}, {x=0, y=0}, {x=1, y=0} },
+		{ {x=1, y=-1}, {x=1, y=0}, {x=0, y=0}, {x=0, y=1} },
+		{ {x=1, y=1}, {x=0, y=1}, {x=0, y=0}, {x=-1, y=0} },
+		{ {x=-1, y=1}, {x=-1, y=0}, {x=0, y=0}, {x=0, y=-1} },
+	}
+}
+
+SRS.wallkicks_3x3 = {
+	[0]={
+		[1]={{x=-1, y=0}, {x=-1, y=-1}, {x=0, y=2}, {x=-1, y=2}},
+		[2]={{x=0, y=1}, {x=0, y=-1}},
+		[3]={{x=1, y=0}, {x=1, y=-1}, {x=0, y=2}, {x=1, y=2}},
+	},
+	[1]={
+		[0]={{x=1, y=0}, {x=1, y=1}, {x=0, y=-2}, {x=1, y=-2}},
+		[2]={{x=1, y=0}, {x=1, y=1}, {x=0, y=-2}, {x=1, y=-2}},
+		[3]={{x=0, y=1}, {x=0, y=-1}},
+	},
+	[2]={
+		[0]={{x=0, y=1}, {x=0, y=-1}},
+		[1]={{x=-1, y=0}, {x=-1, y=-1}, {x=0, y=2}, {x=-1, y=2}},
+		[3]={{x=1, y=0}, {x=1, y=-1}, {x=0, y=2}, {x=1, y=2}},
+	},
+	[3]={
+		[0]={{x=-1, y=0}, {x=-1, y=1}, {x=0, y=-2}, {x=-1, y=-2}},
+		[1]={{x=0, y=1}, {x=0, y=-1}},
+		[2]={{x=-1, y=0}, {x=-1, y=1}, {x=0, y=-2}, {x=-1, y=-2}},
+	},
+};
+
+SRS.wallkicks_line = {
+	[0]={
+		[1]={{x=-2, y=0}, {x=1, y=0}, {x=-2, y=1}, {x=1, y=-2}},
+		[2]={},
+		[3]={{x=-1, y=0}, {x=2, y=0}, {x=-1, y=-2}, {x=2, y=1}},
+	},
+	[1]={
+		[0]={{x=2, y=0}, {x=-1, y=0}, {x=2, y=-1}, {x=-1, y=2}},
+		[2]={{x=-1, y=0}, {x=2, y=0}, {x=-1, y=-2}, {x=2, y=1}},
+		[3]={{x=0, y=1}, {x=0, y=-1}, {x=0, y=2}, {x=0, y=-2}},
+	},
+	[2]={
+		[0]={},
+		[1]={{x=1, y=0}, {x=-2, y=0}, {x=1, y=2}, {x=-2, y=-1}},
+		[3]={{x=2, y=0}, {x=-1, y=0}, {x=2, y=-1}, {x=-1, y=2}},
+	},
+	[3]={
+		[0]={{x=1, y=0}, {x=-2, y=0}, {x=1, y=2}, {x=-2, y=-1}},
+		[1]={{x=0, y=1}, {x=0, y=-1}, {x=0, y=2}, {x=0, y=-2}},
+		[2]={{x=-2, y=0}, {x=1, y=0}, {x=-2, y=1}, {x=1, y=-2}},
+	},
+};
+
+-- Component functions.
+
+function SRS:attemptWallkicks(piece, new_piece, rot_dir, grid)
+
+	local kicks
+	if piece.shape == "O" then
+		return
+	elseif piece.shape == "I" then
+		kicks = SRS.wallkicks_line[piece.rotation][new_piece.rotation]
+	else
+		kicks = SRS.wallkicks_3x3[piece.rotation][new_piece.rotation]
+	end
+
+	assert(piece.rotation ~= new_piece.rotation)
+
+	for idx, offset in pairs(kicks) do
+		kicked_piece = new_piece:withOffset(offset)
+		if grid:canPlacePiece(kicked_piece) then
+			piece:setRelativeRotation(rot_dir)
+			piece:setOffset(offset)
+			self:onPieceRotate(piece, grid)
+			return
+		end
+	end
+
+end
+
+function SRS:onPieceCreate(piece, grid)
+	piece.manipulations = 0
+end
+
+function SRS:onPieceDrop(piece, grid)
+	piece.lock_delay = 0 -- step reset
+end
+
+function SRS:onPieceMove(piece, grid)
+	piece.lock_delay = 0 -- move reset
+	if piece:isDropBlocked(grid) then
+		piece.manipulations = piece.manipulations + 1
+		if piece.manipulations >= 8 then
+			piece.locked = true
+		end
+	end
+end
+
+function SRS:onPieceRotate(piece, grid)
+	piece.lock_delay = 0 -- rotate reset
+	if piece:isDropBlocked(grid) then
+		piece.manipulations = piece.manipulations + 1
+		if piece.manipulations >= 8 then
+			piece.locked = true
+		end
+	end
+end
+
+return SRS