Functional Spirit Turtle

CosmicCrash · Jan 30, 2023 · 30d72da · 30d72da
1 parent 1e08de0
commit 30d72da
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/games/ZumaBlitzRemake/config/shooters/spirit_turtle_hot.json b/games/ZumaBlitzRemake/config/shooters/spirit_turtle_hot.json
@@ -1,7 +1,7 @@
 {
     "$schema": "../../../../schemas/config/shooter.json",
-    "sprite": "sprites/game/shooters/frogatar_basic_hot/shooter.json",
-    "shadowSprite": "sprites/game/shooters/frogatar_basic_hot/shooter_shadow.json",
+    "sprite": "sprites/game/shooters/spirit_turtle_hot/shooter.json",
+    "shadowSprite": "sprites/game/shooters/spirit_turtle_hot/shooter_shadow.json",
     "reticle": {},
     "speedShotBeam": {
         "sprite": "sprites/particles/speed_shot_beam.json",
@@ -36,36 +36,36 @@
     },
     "nextBallSprites": {
         "-3": {
-            "sprite": "sprites/game/shooters/frogatar_basic_hot/next_ball_lightning.json"
+            "sprite": "sprites/game/shooters/spirit_turtle_hot/next_ball_lightning.json"
         },
         "-2": {
-            "sprite": "sprites/game/shooters/frogatar_basic_hot/next_ball_bomb.json"
+            "sprite": "sprites/game/shooters/spirit_turtle_hot/next_ball_bomb.json"
         },
         "-1": {
-            "sprite": "sprites/game/shooters/frogatar_basic_hot/next_ball_wild.json"
+            "sprite": "sprites/game/shooters/spirit_turtle_hot/next_ball_wild.json"
         },
         "0": {
-            "sprite": "sprites/game/shooters/frogatar_basic_hot/next_ball_0.json"
+            "sprite": "sprites/game/shooters/spirit_turtle_hot/next_ball_0.json"
         },
         "1": {
-            "sprite": "sprites/game/shooters/frogatar_basic_hot/next_ball_1.json"
+            "sprite": "sprites/game/shooters/spirit_turtle_hot/next_ball_1.json"
         },
         "2": {
-            "sprite": "sprites/game/shooters/frogatar_basic_hot/next_ball_2.json"
+            "sprite": "sprites/game/shooters/spirit_turtle_hot/next_ball_2.json"
         },
         "3": {
-            "sprite": "sprites/game/shooters/frogatar_basic_hot/next_ball_3.json"
+            "sprite": "sprites/game/shooters/spirit_turtle_hot/next_ball_3.json"
         },
         "4": {
-            "sprite": "sprites/game/shooters/frogatar_basic_hot/next_ball_4.json",
-            "colorblindSprite": "sprites/game/shooters/frogatar_basic_hot/next_ball_4_cb.json"
+            "sprite": "sprites/game/shooters/spirit_turtle_hot/next_ball_4.json",
+            "colorblindSprite": "sprites/game/shooters/spirit_turtle_hot/next_ball_4_cb.json"
         },
         "5": {
-            "sprite": "sprites/game/shooters/frogatar_basic_hot/next_ball_5.json",
-            "colorblindSprite": "sprites/game/shooters/frogatar_basic_hot/next_ball_5_cb.json"
+            "sprite": "sprites/game/shooters/spirit_turtle_hot/next_ball_5.json",
+            "colorblindSprite": "sprites/game/shooters/spirit_turtle_hot/next_ball_5_cb.json"
         },
         "6": {
-            "sprite": "sprites/game/shooters/frogatar_basic/next_ball_5_cb.json"
+            "sprite": "sprites/game/shooters/spirit_turtle/next_ball_5_cb.json"
         }
     }
 }
diff --git a/src/Level.lua b/src/Level.lua
@@ -225,7 +225,12 @@ function Level:updateLogic(dt)
 			-- We're in hot frog mode, reset once the shooter has a ball other than the fireball.
 			if self.shooter.color > 0 then
 				self.blitzMeter = 0
-				self.blitzMeterCooldown = 0
+                self.blitzMeterCooldown = 0
+
+				local skin = _Game:getCurrentProfile():getActiveMonument() or _Game:getCurrentProfile():getFrogatar()
+				if _Game.configManager:getShooter(skin) then
+					self.shooter:changeTo(skin)
+				end
 			end
 		else
 			if self.blitzMeterCooldown == 0 then
@@ -877,6 +882,11 @@ function Level:incrementBlitzMeter(amount)
 		local infernoFrog = _Game:getCurrentProfile():getEquippedPower("inferno_frog")
 		local additiveAmount = (infernoFrog and infernoFrog:getCurrentLevelData().additiveAmount) or 0
 		self.shooter:getMultiSphere(-2, (3 + additiveAmount))
+
+		local hotFrogSkin = (_Game:getCurrentProfile():getActiveMonument() and _Game:getCurrentProfile():getActiveMonument().."_hot") or _Game:getCurrentProfile():getFrogatar().."_hot"
+		if _Game.configManager:getShooter(hotFrogSkin) then
+			self.shooter:changeTo(hotFrogSkin)
+		end
 	end
 end
 

diff --git a/src/Target.lua b/src/Target.lua
@@ -59,6 +59,12 @@ function Target:onShot()
         self.pos,
         "fonts/score0.json"
     )
+
+    -- Activate Hot Frog if we're using the Spirit Turtle
+    if _Game:getCurrentProfile():getActiveMonument() == "spirit_turtle" then
+        _Game.session.level:incrementBlitzMeter(1)
+    end
+
     _Game.session.level.targets = _Game.session.level.targets + 1
 end