From 8e1a77d038f8f5590da6722658404cdba823591f Mon Sep 17 00:00:00 2001
From: entar <entar@squog.ru>
Date: Tue, 8 Jul 2025 21:43:06 +0700
Subject: [PATCH] Fixed tankman, his stage. Fixed spooky stage and their stage.
 Fixed Dad, fixed GF

---
 characters/dad.json      |  4 ++--
 characters/gf.json       |  2 +-
 characters/spooky.json   |  4 ++--
 characters/tankman.json  |  2 +-
 settings.json            |  1 -
 stages/spooky.lua        |  2 +-
 stages/tank.lua          | 10 +++++-----
 states/freeplaystate.lua |  3 ++-
 8 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 settings.json

diff --git a/characters/dad.json b/characters/dad.json
index 4a84c8d..0d9be69 100644
--- a/characters/dad.json
+++ b/characters/dad.json
@@ -123,8 +123,8 @@
 	"no_antialiasing": false,
 	"image": "sprites/characters/DADDY_DEAREST",
 	"position": [
-		-200,
-		160
+		-400,
+		320
 	],
 	"healthicon": "dad",
 	"flip_x": false,
diff --git a/characters/gf.json b/characters/gf.json
index 6d50380..6697fc2 100644
--- a/characters/gf.json
+++ b/characters/gf.json
@@ -191,7 +191,7 @@
 	"image": "sprites/characters/GF_assets",
 	"position": [
 		0,
-		160
+		320
 	],
 	"healthicon": "gf",
 	"flip_x": false,
diff --git a/characters/spooky.json b/characters/spooky.json
index 909e785..7588f62 100644
--- a/characters/spooky.json
+++ b/characters/spooky.json
@@ -100,8 +100,8 @@
 	"no_antialiasing": false,
 	"image": "sprites/characters/spooky_kids_assets",
 	"position": [
-		-200,
-		270
+		-400,
+		540
 	],
 	"healthicon": "spooky",
 	"flip_x": false,
diff --git a/characters/tankman.json b/characters/tankman.json
index 1a701f8..09d36d4 100644
--- a/characters/tankman.json
+++ b/characters/tankman.json
@@ -126,7 +126,7 @@
 	"image": "sprites/characters/tankmanCaptain",
 	"position": [
 		0,
-		240
+		480
 	],
 	"healthicon": "tankman",
 	"flip_x": true,
diff --git a/settings.json b/settings.json
deleted file mode 100644
index 8e375d8..0000000
--- a/settings.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Keybinds":["a", "s", "up", "right"], "Downscroll":true}
\ No newline at end of file
diff --git a/stages/spooky.lua b/stages/spooky.lua
index 0747b2b..8f8b6a0 100644
--- a/stages/spooky.lua
+++ b/stages/spooky.lua
@@ -8,7 +8,7 @@ return {
         mansion = Sprite("sprites/spooky/halloween_bg.png", "sprites/spooky/halloween_bg.json")
         mansion.resize = Vector2(2,2)
         mansion:PlayAnimation("halloweem bg", 1, false)
-        mansion.position = Vector2(-400, -200)
+        mansion.position = Vector2(-800, -400)
         mansion.layer = -1
         
         for index, anim in next, mansion.quads do
diff --git a/stages/tank.lua b/stages/tank.lua
index 80b0231..0a23699 100644
--- a/stages/tank.lua
+++ b/stages/tank.lua
@@ -67,35 +67,35 @@ return {
 
         audience1 = Sprite("sprites/tank/tank0.png", "sprites/tank/tank0.json")
         audience1:PlayAnimation("fg tankhead far right instance 1", 24, false)
-        audience1.position = Vector2(-200, 350)
+        audience1.position = Vector2(-400, 700)
         audience1.modifier = 1.5
         audience1.layer = 2
         audience1.resize = Vector2(1.6, 1.6)
 
         audience2 = Sprite("sprites/tank/tank2.png", "sprites/tank/tank2.json")
         audience2:PlayAnimation("foreground man 3 instance 1", 24, false)
-        audience2.position = Vector2(0, 400)
+        audience2.position = Vector2(0, 800)
         audience2.modifier = 1.5
         audience2.layer = 3
         audience2.resize = Vector2(1.6, 1.6)
 
         audience3 = Sprite("sprites/tank/tank3.png", "sprites/tank/tank3.json")
         audience3:PlayAnimation("fg tankhead 4 instance 1", 24, false)
-        audience3.position = Vector2(-100, 500)
+        audience3.position = Vector2(-200, 1000)
         audience3.modifier = 2.5
         audience3.layer = 5
         audience3.resize = Vector2(1.6, 1.6)
 
         audience4 = Sprite("sprites/tank/tank4.png", "sprites/tank/tank4.json")
         audience4:PlayAnimation("fg tankman bobbin 3 instance 1", 24, false)
-        audience4.position = Vector2(300, 400)
+        audience4.position = Vector2(600, 800)
         audience4.modifier = 1.5
         audience4.layer = 4
         audience4.resize = Vector2(1.6, 1.6)
 
         audience5 = Sprite("sprites/tank/tank5.png", "sprites/tank/tank5.json")
         audience5:PlayAnimation("fg tankhead far right instance 1", 24, false)
-        audience5.position = Vector2(500, 350)
+        audience5.position = Vector2(1000, 700)
         audience5.modifier = 1.5
         audience5.layer = 3
         audience5.resize = Vector2(1.6, 1.6)
diff --git a/states/freeplaystate.lua b/states/freeplaystate.lua
index f6b9a7a..00f9124 100644
--- a/states/freeplaystate.lua
+++ b/states/freeplaystate.lua
@@ -12,7 +12,6 @@ return function()
     local playableOffsets = charValues.offsets
     local playableFlips = charValues.flips
 
-
     curChar = playables[1] --this needs to be global
     local curCharIndex = 1
 
@@ -137,6 +136,8 @@ return function()
     end
 
     local function run()
+        gameMode = "freeplaymode"
+
         render.destroyAllSprites()
         freaky:stop()