Skip to content
This repository has been archived by the owner on May 6, 2024. It is now read-only.

Commit

Permalink
Change scoring to +10 per sphere
Browse files Browse the repository at this point in the history
Also fixes an oversight that was meant to be added last commit to add a plus sign to the score added.
  • Loading branch information
ShamblesSM committed Jan 1, 2023
1 parent e324d14 commit 0962059
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/Level.lua
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,8 @@ function Level:spawnLightningStormPiece()

-- spawn a particle, add points etc
local pos = sphere:getPos()
self:grantScore(100)
self:spawnFloatingText(_NumStr(100), pos, _Game.configManager.spheres[sphere.color].matchFont)
self:grantScore(10)
self:spawnFloatingText(_NumStr(10), pos, _Game.configManager.spheres[sphere.color].matchFont)
_Game:spawnParticle("particles/lightning_beam.json", pos)
_Game:playSound("sound_events/lightning_storm_destroy.json")
-- destroy it
Expand Down
2 changes: 1 addition & 1 deletion src/Scorpion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function Scorpion:explode()
end

local pos = self:getPos()
local score = self.destroyedSpheres * 100
local score = self.destroyedSpheres * 10

_Game.session.level:grantScore(score)
_Game.session.level:spawnFloatingText(_NumStr(score), pos, self.config.scoreFont)
Expand Down
2 changes: 1 addition & 1 deletion src/Session.lua
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ function Session:destroyFunction(f, scorePos, scoreFont, noRewards)
if f(sphere, spherePos) and sphere.color ~= 0 then
sphereGroup:destroySphere(l)
if not noRewards then
score = score + 100
score = score + 10
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions src/SphereGroup.lua
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ function SphereGroup:matchAndDeleteEffect(position, effect)
end

-- Calculate and grant score.
local score = length * 100
local score = length * 10
if boostCombo then
score = score + math.max(self.map.level.combo - 3, 0) * 100
end
Expand All @@ -637,7 +637,7 @@ function SphereGroup:matchAndDeleteEffect(position, effect)
self.sphereChain.comboScore = self.sphereChain.comboScore + score

-- Determine and display the floating text.
local scoreText = _NumStr(score)
local scoreText = "+".._NumStr(score)
-- Zuma's meanings of "Combo" and "Chain" is reverse from Luxor's.
-- Keep this in mind when modifying code as OpenSMCE is based off Luxor.
if boostCombo and self.map.level.combo > 2 then
Expand Down

0 comments on commit 0962059

Please sign in to comment.