diff --git a/charts/ugh/ugh-hard.json b/charts/ugh/ugh-hard.json index b3c23db..8ab622a 100644 --- a/charts/ugh/ugh-hard.json +++ b/charts/ugh/ugh-hard.json @@ -2,7 +2,7 @@ "song": { "player1": "bf", "events": [], - "gfVersion": "gf", + "gfVersion": "gf-tankmen", "notes": [ { "sectionNotes": [ diff --git a/stages/tank.lua b/stages/tank.lua index c3431a7..8986d3f 100644 --- a/stages/tank.lua +++ b/stages/tank.lua @@ -1,7 +1,7 @@ local myTypes = require("modules.types") local rollingBGTank -local bgTankX = 300 -local bgTankY = 300 +local bgTankX = 200 +local bgTankY = 50 local bgTankRotate = 0 local watchtower, audience1, audience2, audience3, audience4, audience5, audience6 @@ -9,26 +9,27 @@ return { onCreate = function(song) local tankSky = myTypes.Image("images/tank/tankSky.png") tankSky.layer = -10 - tankSky.position = myTypes.Vector2(-400, -400) + tankSky.position = myTypes.Vector2(-800, -400) tankSky.modifer = 0 + tankSky.resize = myTypes.Vector2(2.5, 2.5) local tankMountains = myTypes.Image("images/tank/tankMountains.png") tankMountains.layer = -9 - tankMountains.position = myTypes.Vector2(-280, -20) + tankMountains.position = myTypes.Vector2(-150, 150) tankMountains.modifier = 0.2 - tankMountains.resize = myTypes.Vector2(1.2, 1.2) + tankMountains.resize = myTypes.Vector2(1.7, 1.7) local tankBuildings = myTypes.Image("images/tank/tankBuildings.png") - tankBuildings.position = myTypes.Vector2(-180, 0) + tankBuildings.position = myTypes.Vector2(-400, -100) tankBuildings.modifier = 0.3 tankBuildings.layer = -7 - tankBuildings.resize = myTypes.Vector2(1.1, 1.1) + tankBuildings.resize = myTypes.Vector2(1.6, 1.6) local tankRuins = myTypes.Image("images/tank/tankRuins.png") - tankRuins.position = myTypes.Vector2(-180, 0) + tankRuins.position = myTypes.Vector2(-400, -100) tankRuins.modifier = 0.35 tankRuins.layer = -6 - tankRuins.resize = myTypes.Vector2(1.1, 1.1) + tankRuins.resize = myTypes.Vector2(1.6, 1.6) local clouds = myTypes.Image("images/tank/tankClouds.png") clouds.position = myTypes.Vector2(0, 0) @@ -37,13 +38,13 @@ return { local smokeLeft = myTypes.Sprite("sprites/tank/smokeLeft.png", "sprites/tank/smokeLeft.json") smokeLeft:PlayAnimation("SmokeBlurLeft instance 1", 24, true) - smokeLeft.position = myTypes.Vector2(-200, 0) + smokeLeft.position = myTypes.Vector2(-100, 0) smokeLeft.modifier = 0.4 smokeLeft.layer = -5 local smokeRight = myTypes.Sprite("sprites/tank/smokeRight.png", "sprites/tank/smokeRight.json") smokeRight:PlayAnimation("SmokeRight instance 1", 24, true) - smokeRight.position = myTypes.Vector2(1100, -100) + smokeRight.position = myTypes.Vector2(700, -100) smokeRight.modifier = 0.4 smokeRight.layer = -5 @@ -68,39 +69,46 @@ return { audience1 = myTypes.Sprite("sprites/tank/tank0.png", "sprites/tank/tank0.json") audience1:PlayAnimation("fg tankhead far right instance 1", 24, false) - audience1.position = myTypes.Vector2(-500, 650) + audience1.position = myTypes.Vector2(-200, 350) audience1.modifier = 1.5 audience1.layer = 2 + audience1.resize = myTypes.Vector2(1.6, 1.6) audience2 = myTypes.Sprite("sprites/tank/tank2.png", "sprites/tank/tank2.json") audience2:PlayAnimation("foreground man 3 instance 1", 24, false) - audience2.position = myTypes.Vector2(360, 980) + audience2.position = myTypes.Vector2(0, 400) audience2.modifier = 1.5 audience2.layer = 3 + audience2.resize = myTypes.Vector2(1.6, 1.6) audience3 = myTypes.Sprite("sprites/tank/tank3.png", "sprites/tank/tank3.json") audience3:PlayAnimation("fg tankhead 4 instance 1", 24, false) - audience3.position = myTypes.Vector2(1050, 1240) + audience3.position = myTypes.Vector2(-100, 500) audience3.modifier = 2.5 audience3.layer = 5 + audience3.resize = myTypes.Vector2(1.6, 1.6) audience4 = myTypes.Sprite("sprites/tank/tank4.png", "sprites/tank/tank4.json") audience4:PlayAnimation("fg tankman bobbin 3 instance 1", 24, false) - audience4.position = myTypes.Vector2(1200, 900) + audience4.position = myTypes.Vector2(300, 400) audience4.modifier = 1.5 audience4.layer = 4 + audience4.resize = myTypes.Vector2(1.6, 1.6) audience5 = myTypes.Sprite("sprites/tank/tank5.png", "sprites/tank/tank5.json") audience5:PlayAnimation("fg tankhead far right instance 1", 24, false) - audience5.position = myTypes.Vector2(1550, 700) + audience5.position = myTypes.Vector2(500, 350) audience5.modifier = 1.5 audience5.layer = 3 + audience5.resize = myTypes.Vector2(1.6, 1.6) - audience6 = myTypes.Sprite("sprites/tank/tank1.png", "sprites/tank/tank1.json") + --I'm not even gonna try what is this + --[[audience6 = myTypes.Sprite("sprites/tank/tank1.png", "sprites/tank/tank1.json") audience6:PlayAnimation("fg tankhead 5 instance 1", 24, false) - audience6.position = myTypes.Vector2(-300, 750) + audience6.position = myTypes.Vector2(700, 500) audience6.modifier = 1.5 audience6.layer = 2 + audience6.resize = myTypes.Vector2(1.6, 1.6)]] end, onBeat = function(beat) @@ -111,14 +119,14 @@ return { audience3:PlayAnimation("fg tankhead 4 instance 1", 24, false) audience4:PlayAnimation("fg tankman bobbin 3 instance 1", 24, false) audience5:PlayAnimation("fg tankhead far right instance 1", 24, false) - audience6:PlayAnimation("fg tankhead 5 instance 1", 24, false) + --audience6:PlayAnimation("fg tankhead 5 instance 1", 24, false) end end, --zero fucking idea what im doing onUpdate = function(dt) - bgTankX = math.sin(math.rad(0.1)) * 50 - bgTankY = math.cos(math.rad(0.1)) * 50 - bgTankRotate = bgTankRotate + 1 + bgTankX = math.sin(math.rad(1)) * 200 + bgTankY = math.cos(math.rad(1)) * 200 + bgTankRotate = bgTankRotate + 10 end } \ No newline at end of file