From a67b59cb82e9339e12efff37ee6ba0602b5d7903 Mon Sep 17 00:00:00 2001
From: Ishaan Bhardwaj <sashlilac109@gmail.com>
Date: Mon, 8 Feb 2021 23:24:05 -0500
Subject: [PATCH] v0.3-beta3

---
 tetris/rulesets/asc.lua     |  1 +
 tetris/rulesets/bonkers.lua |  1 +
 tetris/rulesets/crap.lua    |  1 +
 tetris/rulesets/mizu_rs.lua |  1 +
 tetris/rulesets/pptprs.lua  | 10 +++++-----
 tetris/rulesets/shirase.lua |  2 +-
 tetris/rulesets/tengen.lua  |  1 +
 tetris/rulesets/thenew.lua  |  1 +
 8 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tetris/rulesets/asc.lua b/tetris/rulesets/asc.lua
index 6804546..f3cc01c 100644
--- a/tetris/rulesets/asc.lua
+++ b/tetris/rulesets/asc.lua
@@ -16,6 +16,7 @@ Ascension.colourscheme = {
 }
 Ascension.softdrop_lock = false
 Ascension.harddrop_lock = true
+Ascension.spawn_above_field = true
 
 Ascension.spawn_positions = {
 	I = { x=4, y=4 },
diff --git a/tetris/rulesets/bonkers.lua b/tetris/rulesets/bonkers.lua
index 052f0b0..b5538a0 100644
--- a/tetris/rulesets/bonkers.lua
+++ b/tetris/rulesets/bonkers.lua
@@ -5,6 +5,7 @@ local BONKERS = Ruleset:extend()
 BONKERS.name = "B.O.N.K.E.R.S."
 BONKERS.hash = "Bonkers"
 BONKERS.world = true
+BONKERS.spawn_above_field = true
 
 BONKERS.spawn_positions = {
 	I = { x=5, y=4 },
diff --git a/tetris/rulesets/crap.lua b/tetris/rulesets/crap.lua
index 2ad2024..6d3a781 100644
--- a/tetris/rulesets/crap.lua
+++ b/tetris/rulesets/crap.lua
@@ -18,6 +18,7 @@ CRAP.colourscheme = {
 }
 CRAP.softdrop_lock = true
 CRAP.harddrop_lock = false
+CRAP.spawn_above_field = true
 
 CRAP.spawn_positions = {
 	I = { x=5, y=4 },
diff --git a/tetris/rulesets/mizu_rs.lua b/tetris/rulesets/mizu_rs.lua
index b379fb7..3233031 100644
--- a/tetris/rulesets/mizu_rs.lua
+++ b/tetris/rulesets/mizu_rs.lua
@@ -8,6 +8,7 @@ MizuRS.hash = "MizuRS"
 
 MizuRS.softdrop_lock = false
 MizuRS.harddrop_lock = true
+MizuRS.spawn_above_field = true
 
 MizuRS.colourscheme = {
 	I = "R",
diff --git a/tetris/rulesets/pptprs.lua b/tetris/rulesets/pptprs.lua
index aa9e9b0..445b70a 100644
--- a/tetris/rulesets/pptprs.lua
+++ b/tetris/rulesets/pptprs.lua
@@ -8,12 +8,12 @@ PPTPRS.hash = "Puyo Tetris Pentos"
 
 PPTPRS.spawn_positions = {
 	I = { x=5, y=4 },
-	J = { x=4, y=4 },
-	L = { x=4, y=4 },
-	O = { x=5, y=4 },
-	S = { x=4, y=5 },
+	J = { x=4, y=5 },
+	L = { x=4, y=5 },
+	O = { x=5, y=5 },
+	S = { x=5, y=5 },
 	T = { x=4, y=5 },
-	Z = { x=4, y=4 },
+	Z = { x=4, y=5 },
 }
 
 PPTPRS.block_offsets = {
diff --git a/tetris/rulesets/shirase.lua b/tetris/rulesets/shirase.lua
index d88270e..998a536 100644
--- a/tetris/rulesets/shirase.lua
+++ b/tetris/rulesets/shirase.lua
@@ -1,4 +1,4 @@
-local SRS = require 'tetris.rulesets.standard_exp'
+local SRS = require 'tetris.rulesets.standard'
 
 local Shirase = SRS:extend()
 
diff --git a/tetris/rulesets/tengen.lua b/tetris/rulesets/tengen.lua
index 6019d9f..b88eff3 100644
--- a/tetris/rulesets/tengen.lua
+++ b/tetris/rulesets/tengen.lua
@@ -14,6 +14,7 @@ Tengen.colourscheme = {
 	T = "Y",
 	Z = "C"
 }
+Tengen.spawn_above_field = true
 
 Tengen.spawn_positions = {
 	I = { x=3, y=4 },
diff --git a/tetris/rulesets/thenew.lua b/tetris/rulesets/thenew.lua
index 1246243..8ebd681 100644
--- a/tetris/rulesets/thenew.lua
+++ b/tetris/rulesets/thenew.lua
@@ -18,6 +18,7 @@ TheNew.colourscheme = {
     Z = "R",
     T = "Y"
 }
+TheNew.spawn_above_field = true
 
 TheNew.spawn_positions = {
 	I = { x=5, y=4 },