Updated modpack for graphics commit in main game

tetris/modes/credits_a3.lua

@@ -57,7 +57,7 @@ end
 
 function CreditsA3Game:onLineClear(cleared_row_count)
 	if not self.clear then
-		self.norm = self.norm + (cleared_row_count == 4 and 10 or cleared_row_count)
+		self.norm = self.norm + cleared_row_count + (cleared_row_count >= 4 and 6 or 0)
 	end
 end
 
@@ -84,12 +84,14 @@ function CreditsA3Game:drawScoringInfo()
 		strTrueValues(self.prev_inputs)
 	)
 	love.graphics.printf("NEXT", 64, 40, 40, "left")
+	love.graphics.printf("ROLLS COMPLETED", 240, 170, 120, "left")
 	love.graphics.printf("TIME LEFT", 240, 250, 80, "left")
 	love.graphics.printf("NORM", 240, 320, 40, "left")
 
-	self:drawSectionTimesWithSplits(self.section)
-
 	love.graphics.setFont(font_3x5_3)
+
+	love.graphics.printf(self.section, 240, 190, 160, "left")
+
 	-- draw time left, flash red if necessary
 	local time_left = self.section_time_limit - math.max(self:getSectionTime(), 0)
 
@@ -113,7 +115,7 @@ function CreditsA3Game:drawScoringInfo()
 end
 
 function CreditsA3Game:getBackground()
-	return self.section
+	return self.section % 20
 end
 
 return CreditsA3Game

tetris/modes/fpviewer.lua

@@ -2033,7 +2033,7 @@ local function parseMap(str, map)
             elseif char == "Z" then
                 insert_this = { skin = "2tie", colour = "R" }
             elseif char == "C" then
-                insert_this = { skin = "gem", colour = "F" }
+                insert_this = { skin = "gem", colour = "W" }
             end
             row_array[col] = insert_this
         end

tetris/modes/minesweeper.lua

@@ -93,7 +93,7 @@ end
 function Minesweeper:mainGameLoop(inputs)
     self:moveCursor(inputs)
     if not self.prev_inputs.rotate_left and inputs.rotate_left and
-    self.grid.grid[self.cursor.y+4][self.cursor.x].colour ~= "F" and
+    self.grid.grid[self.cursor.y+4][self.cursor.x].colour ~= "W" and
     self.grid.grid[self.cursor.y+4][self.cursor.x].colour ~= "A" then
         playSE("lock")
         if not self:isMine(self.cursor.x, self.cursor.y) then
@@ -136,7 +136,7 @@ end
 
 function Minesweeper:flagCell(x, y)
     if self.flags > 0 and self.grid.grid[y+4][x].skin == "2tie" and
-    self.grid.grid[y+4][x].colour ~= "F" then
+    self.grid.grid[y+4][x].colour ~= "W" then
         self.grid.grid[y+4][x] = {
             skin = "gem", colour = "A"
         }
@@ -165,7 +165,7 @@ function Minesweeper:uncoverCell(x, y)
         local x = current.x
         local y = current.y
 
-        self.grid.grid[y+4][x] = { skin = "2tie", colour = "F" }
+        self.grid.grid[y+4][x] = { skin = "2tie", colour = "W" }
 
         if self:getSurroundingMineCount(x, y) == 0 then
             for dy = -1, 1 do
@@ -173,7 +173,7 @@ function Minesweeper:uncoverCell(x, y)
                     if not (dx == 0 and dy == 0) and
                     x+dx >= 1 and x+dx <= width and
                     y+dy >= 1 and y+dy <= height and
-                    self.grid.grid[y+4+dy][x+dx].colour ~= "F"
+                    self.grid.grid[y+4+dy][x+dx].colour ~= "W"
                     then
                         table.insert(stack, {
                             x = x + dx,
@@ -187,7 +187,7 @@ function Minesweeper:uncoverCell(x, y)
 
     for y = 5, height + 4 do
         for x = 1, width do
-            if self.grid.grid[y][x].colour ~= "F" and
+            if self.grid.grid[y][x].colour ~= "W" and
             not self:isMine(x, y-4) then
                 return
             end
@@ -215,7 +215,7 @@ function Minesweeper:onGameOver()
             if self:isMine(x, y-4) then
                 self.grid.grid[y][x] = { skin = "gem", colour = "R" }
             else
-                self.grid.grid[y][x] = { skin = "2tie", colour = "F" }
+                self.grid.grid[y][x] = { skin = "2tie", colour = "W" }
             end
         end
     end
@@ -233,7 +233,7 @@ function Minesweeper:onGameComplete()
 end
 
 local function opacityFunction(game, block, x, y, age)
-    if block.colour == "F" then
+    if block.colour == "W" then
         return 0.5, 0.5, 0.5, 1, 1
     else
         return 1, 1, 1, 1, 1
@@ -251,7 +251,7 @@ function Minesweeper:drawGrid()
                 love.graphics.rectangle("line", 48+x*16, y*16, 16, 16)
             end
             if self:getSurroundingMineCount(x, y-4) ~= 0 and
-            self.grid.grid[y][x].colour == "F" then
+            self.grid.grid[y][x].colour == "W" then
                 love.graphics.print(self:getSurroundingMineCount(x, y-4), 50+x*16, -2+y*16)
             end
         end

tetris/modes/survival_axh.lua

@@ -75,7 +75,7 @@ function SurvivalAXHGame:drawGrid()
     if self:getHiddenDelay() then
         for i = 1, self.hidden_rows do
             for j = 1, 10 do
-                love.graphics.draw(blocks["2tie"]["F"], 48+j*16, (24-i+1)*16)
+                love.graphics.draw(blocks["2tie"]["W"], 48+j*16, (24-i+1)*16)
             end
         end
     end

tetris/modes/survival_gte.lua

@@ -24,7 +24,7 @@ function SurvivalGTEGame:getGravity() return 20 end
 function SurvivalGTEGame:getARR() return 2 end
 
 function SurvivalGTEGame:getDasLimit()
-    return math.min(self:getLockDelay() - 2, 10)
+    return math.min(math.floor(self:getLockDelay() * 2/3), 10)
 end
 
 function SurvivalGTEGame:getLockDelay()
@@ -51,8 +51,8 @@ function SurvivalGTEGame:getLineClearDelay()
 end
 
 function SurvivalGTEGame:onLineClear(cleared_row_count)
-    self.lines = math.min(self.lines + cleared_row_count, 300)
-    self.completed = self.lines == 300
+    self.lines = self.lines + cleared_row_count
+    self.completed = self.lines >= 300
 end
 
 function SurvivalGTEGame:advanceOneFrame()