Change ball sizes to 29x29

This is the actual sphere size used in Zuma Blitz Kroakatoa.

games/ZumaBlitzRemake/sprites/game/ball_1.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_1.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_2.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_2.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_3.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_3.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_4.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_4.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_4_cb.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_4_cb.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_5.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_5.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_5_cb.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_5_cb.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_6.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_6.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_7.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_7.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_cannon.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_cannon.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_fire.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_fire.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_lightning.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_lightning.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_overlay.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_overlay.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_shadow.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_shadow.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

games/ZumaBlitzRemake/sprites/game/ball_wild.json

@@ -1,8 +1,8 @@
 {
     "path": "images/game/ball_wild.png",
     "frame_size": {
-        "x": 32,
-        "y": 32
+        "x": 29,
+        "y": 29
     },
     "states": [
         {

src/Session.lua

@@ -178,7 +178,7 @@ end
 function Session:destroyAllSpheres(noRewards)
 	self:destroyFunction(
 		function(sphere, spherePos) return true end,
-		self.level.shooter.pos + Vec2(0, -32),
+		self.level.shooter.pos + Vec2(0, -29),
 		nil,
 		noRewards
 	)
@@ -202,7 +202,7 @@ end
 function Session:destroyColor(color)
 	self:destroyFunction(
 		function(sphere, spherePos) return sphere.color == color end,
-		self.level.shooter.pos + Vec2(0, -32)
+		self.level.shooter.pos + Vec2(0, -29)
 	)
 end
 
@@ -226,7 +226,7 @@ end
 function Session:destroyVertical(x, width)
 	self:destroyFunction(
 		function(sphere, spherePos) return math.abs(x - spherePos.x) <= width / 2 end,
-		self.level.shooter.pos + Vec2(0, -32)
+		self.level.shooter.pos + Vec2(0, -29)
 	)
 end
 
@@ -252,7 +252,7 @@ end
 function Session:destroyVerticalColor(x, width, color)
 	self:destroyFunction(
 		function(sphere, spherePos) return math.abs(x - spherePos.x) <= width / 2 and self:colorsMatch(color, sphere.color) end,
-		self.level.shooter.pos + Vec2(0, -32)
+		self.level.shooter.pos + Vec2(0, -29)
 	)
 end
 

src/ShotSphere.lua

@@ -88,7 +88,7 @@ function ShotSphere:moveStep()
 
 	-- add if there's a sphere nearby
 	local nearestSphere = _Game.session:getNearestSphere(self.pos)
-	if nearestSphere.dist and nearestSphere.dist < 32 then
+	if nearestSphere.dist and nearestSphere.dist < 29 then
 		-- If hit sphere is fragile, destroy the fragile spheres instead of hitting.
 		if nearestSphere.sphere:isFragile() then
 			nearestSphere.sphere:matchEffectFragile()
@@ -142,7 +142,7 @@ function ShotSphere:moveStep()
 					p = self.hitSphere.sphereGroup:getSpherePos(self.hitSphere.sphereID)
 				else
 					-- the inserted ball IS at the end of the group
-					local o = self.hitSphere.sphereGroup:getLastSphereOffset() + 32
+					local o = self.hitSphere.sphereGroup:getLastSphereOffset() + 29
 					p = self.hitSphere.path:getPos(o)
 				end
 				-- calculate length from the current position
@@ -271,7 +271,7 @@ function ShotSphere:drawDebug()
 		local p = _PosOnScreen(Vec2(self.pos.x, i))
 		love.graphics.circle("fill", p.x, p.y, 2)
 		local nearestSphere = _Game.session:getNearestSphere(Vec2(self.pos.x, i))
-		if nearestSphere.dist and nearestSphere.dist < 32 then
+		if nearestSphere.dist and nearestSphere.dist < 29 then
 			love.graphics.setLineWidth(3)
 			local p = _PosOnScreen(nearestSphere.pos)
 			love.graphics.circle("line", p.x, p.y, 16 * _GetResolutionScale())

src/Sphere.lua

@@ -177,7 +177,7 @@ end
 ---Recalculates the offset this Sphere has from the offset of the Sphere Group it belongs to.
 function Sphere:updateOffset()
 	-- calculate the offset
-	self.offset = self.prevSphere and self.prevSphere.offset + 32 * self.size or 0
+	self.offset = self.prevSphere and self.prevSphere.offset + 29 * self.size or 0
 end
 
 
@@ -573,7 +573,7 @@ end
 ---Returns `true` if this sphere has not escaped the spawn point.
 ---@return boolean
 function Sphere:isOffscreen()
-	return self:getOffset() < 32
+	return self:getOffset() < 29
 end
 
 

src/SphereChain.lua

@@ -188,7 +188,7 @@ function SphereChain:isPushingFrontTrain()
 	if prevChain and not prevChain.delQueue then
 		-- Check whether this sphere chain collides with a front one. If so, return true.
 		local dist = prevChain:getLastSphereGroup():getSphereOffset(1) - self.sphereGroups[1]:getLastSphereOffset()
-		return dist <= 32
+		return dist <= 29
 	end
 end
 

src/SphereGroup.lua

@@ -227,7 +227,7 @@ function SphereGroup:addSphere(color, pos, time, sphereEntity, position, effects
 	end
 	-- if it's a first sphere in the group, lower the offset
 	if position == 1 then
-		self.offset = self.offset - 32
+		self.offset = self.offset - 29
 		self:updateSphereOffsets()
 	end
 	sphere:updateOffset()
@@ -250,7 +250,7 @@ function SphereGroup:destroySphere(position, crushed)
 	if position == 1 then
 		self.spheres[position]:delete(crushed)
 		table.remove(self.spheres, position)
-		self.offset = self.offset + 32
+		self.offset = self.offset + 29
 		self:updateSphereOffsets()
 		self:checkUnfinishedDestructionAtSpawn()
 	elseif position == #self.spheres then
@@ -285,7 +285,7 @@ function SphereGroup:destroySpheres(position1, position2)
 			self.spheres[1]:delete()
 			table.remove(self.spheres, 1)
 		end
-		self.offset = self.offset + position2 * 32
+		self.offset = self.offset + position2 * 29
 		self:updateSphereOffsets()
 		self:checkUnfinishedDestructionAtSpawn()
 	elseif position2 == #self.spheres then -- or maybe on the end?
@@ -1161,7 +1161,7 @@ end
 
 
 function SphereGroup:getBackPos()
-	return self:getSphereOffset(1) - 32 * self.spheres[1].size + 16
+	return self:getSphereOffset(1) - 29 * self.spheres[1].size + 16
 end
 
 
@@ -1347,7 +1347,7 @@ function SphereGroup:deserialize(t)
 			self.spheres[i - 1].nextSphere = s
 		end
 		table.insert(self.spheres, s)
-		offset = offset + 32 * s.size
+		offset = offset + 29 * s.size
 	end
 	self.matchCheck = t.matchCheck
 end