diff --git a/assets/clown/images/hellclwn/BF/BF_3rd_phase.png b/assets/clown/images/hellclwn/BF/BF_3rd_phase.png index 7a2152ff..ecb4ddc4 100644 Binary files a/assets/clown/images/hellclwn/BF/BF_3rd_phase.png and b/assets/clown/images/hellclwn/BF/BF_3rd_phase.png differ diff --git a/assets/clown/images/hellclwn/BF/BF_3rd_phase.xml b/assets/clown/images/hellclwn/BF/BF_3rd_phase.xml index 595cc7ce..f87f5103 100644 --- a/assets/clown/images/hellclwn/BF/BF_3rd_phase.xml +++ b/assets/clown/images/hellclwn/BF/BF_3rd_phase.xml @@ -1,301 +1,300 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/clown/images/hellclwn/GF/gf_phase_3.png b/assets/clown/images/hellclwn/GF/gf_phase_3.png index 6aeeba76..6b1ba9b5 100644 Binary files a/assets/clown/images/hellclwn/GF/gf_phase_3.png and b/assets/clown/images/hellclwn/GF/gf_phase_3.png differ diff --git a/assets/clown/images/hellclwn/GF/gf_phase_3.xml b/assets/clown/images/hellclwn/GF/gf_phase_3.xml index b802bf15..a94b00a7 100644 --- a/assets/clown/images/hellclwn/GF/gf_phase_3.xml +++ b/assets/clown/images/hellclwn/GF/gf_phase_3.xml @@ -1,173 +1,172 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/clown/images/hellclwn/Hank.png b/assets/clown/images/hellclwn/Hank.png index ea431b27..d7234be5 100644 Binary files a/assets/clown/images/hellclwn/Hank.png and b/assets/clown/images/hellclwn/Hank.png differ diff --git a/assets/clown/images/hellclwn/Hank.xml b/assets/clown/images/hellclwn/Hank.xml index 3703ee26..dea56809 100644 --- a/assets/clown/images/hellclwn/Hank.xml +++ b/assets/clown/images/hellclwn/Hank.xml @@ -1,61 +1,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/clown/images/hellclwn/Tricky/Down.png b/assets/clown/images/hellclwn/Tricky/Down.png index bbc08142..7b9ba9fd 100644 Binary files a/assets/clown/images/hellclwn/Tricky/Down.png and b/assets/clown/images/hellclwn/Tricky/Down.png differ diff --git a/assets/clown/images/hellclwn/Tricky/Down.xml b/assets/clown/images/hellclwn/Tricky/Down.xml index 22536d64..a279ddee 100644 --- a/assets/clown/images/hellclwn/Tricky/Down.xml +++ b/assets/clown/images/hellclwn/Tricky/Down.xml @@ -1,10 +1,9 @@ - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/assets/clown/images/hellclwn/Tricky/Idle.png b/assets/clown/images/hellclwn/Tricky/Idle.png index d1cc3c04..85369f85 100644 Binary files a/assets/clown/images/hellclwn/Tricky/Idle.png and b/assets/clown/images/hellclwn/Tricky/Idle.png differ diff --git a/assets/clown/images/hellclwn/Tricky/Idle.xml b/assets/clown/images/hellclwn/Tricky/Idle.xml index 4cad8051..59a936d7 100644 --- a/assets/clown/images/hellclwn/Tricky/Idle.xml +++ b/assets/clown/images/hellclwn/Tricky/Idle.xml @@ -1,26 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/clown/images/hellclwn/Tricky/Left.png b/assets/clown/images/hellclwn/Tricky/Left.png index 891f9980..32f1ef77 100644 Binary files a/assets/clown/images/hellclwn/Tricky/Left.png and b/assets/clown/images/hellclwn/Tricky/Left.png differ diff --git a/assets/clown/images/hellclwn/Tricky/Left.xml b/assets/clown/images/hellclwn/Tricky/Left.xml index 2662aa9f..f8f911bc 100644 --- a/assets/clown/images/hellclwn/Tricky/Left.xml +++ b/assets/clown/images/hellclwn/Tricky/Left.xml @@ -1,10 +1,9 @@ - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/assets/clown/images/hellclwn/Tricky/Up.png b/assets/clown/images/hellclwn/Tricky/Up.png index 30ddf670..9a402b14 100644 Binary files a/assets/clown/images/hellclwn/Tricky/Up.png and b/assets/clown/images/hellclwn/Tricky/Up.png differ diff --git a/assets/clown/images/hellclwn/Tricky/Up.xml b/assets/clown/images/hellclwn/Tricky/Up.xml index c0adaff5..d6672be1 100644 --- a/assets/clown/images/hellclwn/Tricky/Up.xml +++ b/assets/clown/images/hellclwn/Tricky/Up.xml @@ -1,10 +1,9 @@ - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/assets/clown/images/hellclwn/Tricky/right.png b/assets/clown/images/hellclwn/Tricky/right.png index fc7ff67a..c010d816 100644 Binary files a/assets/clown/images/hellclwn/Tricky/right.png and b/assets/clown/images/hellclwn/Tricky/right.png differ diff --git a/assets/clown/images/hellclwn/Tricky/right.xml b/assets/clown/images/hellclwn/Tricky/right.xml index 90a5392c..9e1a23f1 100644 --- a/assets/clown/images/hellclwn/Tricky/right.xml +++ b/assets/clown/images/hellclwn/Tricky/right.xml @@ -1,10 +1,9 @@ - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/assets/clown/images/hellclwn/island_but_red.png b/assets/clown/images/hellclwn/island_but_red.png index 957f86b5..82864c57 100644 Binary files a/assets/clown/images/hellclwn/island_but_red.png and b/assets/clown/images/hellclwn/island_but_red.png differ diff --git a/source/Character.hx b/source/Character.hx index 584fb3ff..8cc455fe 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -80,11 +80,11 @@ class Character extends FlxSprite animation.addByPrefix('scared', 'GF FEAR', 24); addOffset('cheer'); - addOffset('sad', -2, -2); - addOffset('danceLeft', 0, -9); - addOffset('danceRight', 0, -9); + addOffset('sad', 0, 0); + addOffset('danceLeft', 0, -2); + addOffset('danceRight', 0, -2); - addOffset('scared', -2, -17); + addOffset('scared', 0, -5); playAnim('danceRight'); @@ -167,7 +167,7 @@ class Character extends FlxSprite trace('poggers'); - addOffset("idle", 325, 0); + addOffset("idle", 113, 0); playAnim('idle'); case 'trickyHDown': tex = CachedFrames.cachedInstance.fromSparrow('down','hellclwn/Tricky/Down'); @@ -179,7 +179,7 @@ class Character extends FlxSprite animation.addByPrefix('idle','Proper Down', 24); - addOffset("idle",475, -450); + addOffset("idle", 166, -157); y -= 2000; x -= 1400; @@ -196,7 +196,7 @@ class Character extends FlxSprite animation.addByPrefix('idle','Proper Up', 24); - addOffset("idle", 575, -450); + addOffset("idle", 201, -157); y -= 2000; x -= 1400; @@ -212,7 +212,7 @@ class Character extends FlxSprite animation.addByPrefix('idle','Proper Right', 24); - addOffset("idle",485, -300); + addOffset("idle", 169, -105); y -= 2000; x -= 1400; @@ -228,7 +228,7 @@ class Character extends FlxSprite animation.addByPrefix('idle','Proper Left', 24); - addOffset("idle", 516, 25); + addOffset("idle", 180, 8); y -= 2000; x -= 1400; @@ -311,17 +311,17 @@ class Character extends FlxSprite animation.addByPrefix('stunned', 'BF hit', 24, false); - addOffset('idle', -5); - addOffset("singUP", -29, 27); - addOffset("singRIGHT", -38, -7); - addOffset("singLEFT", 12, -6); - addOffset("singDOWN", -10, -50); - addOffset("singUPmiss", -29, 27); - addOffset("singRIGHTmiss", -30, 21); - addOffset("singLEFTmiss", 12, 24); - addOffset("singDOWNmiss", -11, -19); - - addOffset('scared', -4); + addOffset('idle', -1); + addOffset("singUP", -8, 8); + addOffset("singRIGHT", -11, -2); + addOffset("singLEFT", 3, -1); + addOffset("singDOWN", -3, -15); + addOffset("singUPmiss", -8, 8); + addOffset("singRIGHTmiss", -9, 6); + addOffset("singLEFTmiss", 3, 7); + addOffset("singDOWNmiss", -3, -5); + + addOffset('scared', -1); playAnim('idle'); diff --git a/source/GameOverSubstate.hx b/source/GameOverSubstate.hx index 66625cb0..b7af2198 100644 --- a/source/GameOverSubstate.hx +++ b/source/GameOverSubstate.hx @@ -24,6 +24,11 @@ class GameOverSubstate extends MusicBeatSubstate Conductor.songPosition = 0; bf = new Boyfriend(x, y, daBf); + if (daStage == 'nevadaSpook') + { + bf.setGraphicSize(Std.int(bf.width * 0.3)); + bf.antialiasing = true; + } add(bf); camFollow = new FlxObject(bf.getGraphicMidpoint().x, bf.getGraphicMidpoint().y, 1, 1); diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index a55899a7..b40d9e55 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -70,7 +70,7 @@ class MainMenuState extends MusicBeatState trace(trans.animation.frames); - trans.setGraphicSize(Std.int(trans.width * 1.38)); + trans.setGraphicSize(Std.int(trans.width * 1.4)); var bg:FlxSprite = new FlxSprite(-10,-10).loadGraphic(Paths.image('menu/RedBG','clown')); add(bg); diff --git a/source/PlayState.hx b/source/PlayState.hx index da9bb6b3..ab87a291 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -287,12 +287,12 @@ class PlayState extends MusicBeatState else if (SONG.song.toLowerCase() == 'hellclown') { //trace("line 538"); - defaultCamZoom = 0.35; + defaultCamZoom = 1; curStage = 'nevadaSpook'; tstatic.antialiasing = true; tstatic.scrollFactor.set(0,0); - tstatic.setGraphicSize(Std.int(tstatic.width * 10)); + tstatic.setGraphicSize(Std.int(tstatic.width * 3)); tstatic.screenCenter(Y); tstatic.animation.add('static', [0, 1, 2], 24, true); tstatic.animation.play('static'); @@ -300,27 +300,22 @@ class PlayState extends MusicBeatState tstatic.alpha = 0; - var bg:FlxSprite = new FlxSprite(-1000, -1000).loadGraphic(Paths.image('fourth/bg','clown')); - bg.antialiasing = true; + var bg:FlxSprite = new FlxSprite(-1540, -845).loadGraphic(Paths.image('fourth/bg','clown')); bg.scrollFactor.set(0.9, 0.9); - bg.setGraphicSize(Std.int(bg.width * 5)); + bg.setGraphicSize(Std.int(bg.width * 1.75)); bg.active = false; add(bg); - var stageFront:FlxSprite = new FlxSprite(-2000, -400).loadGraphic(Paths.image('hellclwn/island_but_red','clown')); - stageFront.setGraphicSize(Std.int(stageFront.width * 2.6)); - stageFront.antialiasing = true; + var stageFront:FlxSprite = new FlxSprite(-1840, -750).loadGraphic(Paths.image('hellclwn/island_but_red','clown')); stageFront.scrollFactor.set(0.9, 0.9); stageFront.active = false; add(stageFront); - hank = new FlxSprite(60,-170); + hank = new FlxSprite(-25, -250); hank.frames = Paths.getSparrowAtlas('hellclwn/Hank','clown'); hank.animation.addByPrefix('dance','Hank',24); hank.animation.play('dance'); hank.scrollFactor.set(0.9, 0.9); - hank.setGraphicSize(Std.int(hank.width * 1.55)); - hank.antialiasing = true; add(hank); @@ -434,10 +429,11 @@ class PlayState extends MusicBeatState case 'trickyMask': camPos.x += 400; case 'trickyH': - camPos.set(dad.getGraphicMidpoint().x, dad.getGraphicMidpoint().y + 500); - dad.y -= 2000; - dad.x -= 1400; - gf.x -= 380; + camPos.set(dad.getGraphicMidpoint().x, dad.getGraphicMidpoint().y + 175); + dad.x -= 650; + dad.y -= 965; + gf.x -= 370; + gf.y -= 220; case 'exTricky': dad.x -= 250; dad.y -= 365; @@ -462,7 +458,6 @@ class PlayState extends MusicBeatState switch (curStage) { case 'nevada': - boyfriend.y -= 0; boyfriend.x += 260; case 'auditorHell': boyfriend.y -= 160; @@ -506,9 +501,8 @@ class PlayState extends MusicBeatState if (dad.curCharacter == 'trickyH') { - gf.setGraphicSize(Std.int(gf.width * 0.8)); - boyfriend.setGraphicSize(Std.int(boyfriend.width * 0.8)); - gf.x += 220; + boyfriend.x -= 620; + boyfriend.y -= 480; } if (curStage == 'nevada') @@ -548,7 +542,7 @@ class PlayState extends MusicBeatState if (dad.curCharacter == 'trickyH') { - camFollow.setPosition(dad.getMidpoint().x + 150, dad.getMidpoint().y + 265); + camFollow.setPosition(dad.getMidpoint().x + 50, dad.getMidpoint().y + 90); } @@ -1192,7 +1186,7 @@ class PlayState extends MusicBeatState var playonce:Bool = false; - trans = new FlxSprite(-400,-760); + trans = new FlxSprite(-270, -745); trans.frames = Paths.getSparrowAtlas('Jaws','clown'); trans.antialiasing = true; @@ -1200,7 +1194,7 @@ class PlayState extends MusicBeatState trace(trans.animation.frames); - trans.setGraphicSize(Std.int(trans.width * 1.6)); + trans.setGraphicSize(Std.int(trans.width * 1.85)); trans.scrollFactor.set(); @@ -2003,7 +1997,8 @@ class PlayState extends MusicBeatState case 'trickyMask': camFollow.y = dad.getMidpoint().y + 25; case 'trickyH': - camFollow.y = dad.getMidpoint().y + 375; + camFollow.x = dad.getMidpoint().x - 50; + camFollow.y = dad.getMidpoint().y + 130; case 'senpai': camFollow.y = dad.getMidpoint().y - 430; camFollow.x = dad.getMidpoint().x - 100; @@ -2025,6 +2020,13 @@ class PlayState extends MusicBeatState { camFollow.setPosition(boyfriend.getMidpoint().x - 100, boyfriend.getMidpoint().y - 300); + switch (curStage) + { + case 'nevadaSpook': + camFollow.x = boyfriend.getMidpoint().x - 35; + camFollow.y = boyfriend.getMidpoint().y - 105; + } + if (SONG.song.toLowerCase() == 'tutorial') { FlxTween.tween(FlxG.camera, {zoom: 1}, (Conductor.stepCrochet * 4 / 1000), {ease: FlxEase.elasticInOut}); @@ -2145,7 +2147,7 @@ class PlayState extends MusicBeatState { createSpookyText(TrickyLinesSing[FlxG.random.int(0,TrickyLinesSing.length)]); } - FlxG.camera.shake(0.02,0.2); + FlxG.camera.shake(0.01, 0.2); case 'exTricky': // 60% chance if (FlxG.random.bool(60) && !spookyRendered && !daNote.isSustainNote) // create spooky text :flushed: { diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index caf72932..ba856cfe 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -65,7 +65,7 @@ class StoryMenuState extends MusicBeatState trace(trans.animation.frames); - trans.setGraphicSize(Std.int(trans.width * 1.38)); + trans.setGraphicSize(Std.int(trans.width * 1.4)); transIn = FlxTransitionableState.defaultTransIn;