diff --git a/assets/preload/data/characterList.txt b/assets/preload/data/characterList.txt index 89f1bb03..baccf6e1 100644 --- a/assets/preload/data/characterList.txt +++ b/assets/preload/data/characterList.txt @@ -1,21 +1,10 @@ bf dad gf -spooky -pico -mom -mom-car -bf-car -parents-christmas -monster-christmas -bf-christmas -gf-christmas -monster -bf-pixel -senpai -senpai-angry -spirit tricky trickyMask trickyH -trickyEx \ No newline at end of file +trickyEx +bf-hell +gf-hell +gf-tied \ No newline at end of file diff --git a/assets/preload/data/cutMyBalls.txt b/assets/preload/data/cutMyBalls.txt new file mode 100644 index 00000000..b0015675 --- /dev/null +++ b/assets/preload/data/cutMyBalls.txt @@ -0,0 +1,3 @@ +OMFG CLOWN!!!! +YOU DO NOT KILL CLOWN +CLOWN KILLS YOU!!!!!! \ No newline at end of file diff --git a/assets/preload/data/gfVersionList.txt b/assets/preload/data/gfVersionList.txt new file mode 100644 index 00000000..e837d394 --- /dev/null +++ b/assets/preload/data/gfVersionList.txt @@ -0,0 +1,3 @@ +gf +gf-hell +gf-tied \ No newline at end of file diff --git a/assets/preload/data/stageList.txt b/assets/preload/data/stageList.txt new file mode 100644 index 00000000..eaea9c50 --- /dev/null +++ b/assets/preload/data/stageList.txt @@ -0,0 +1,4 @@ +stage +nevada +nevada-spook +auditor-hell \ No newline at end of file diff --git a/assets/preload/data/trickyExSingStrings.txt b/assets/preload/data/trickyExSingStrings.txt new file mode 100644 index 00000000..68bb3091 --- /dev/null +++ b/assets/preload/data/trickyExSingStrings.txt @@ -0,0 +1,12 @@ +YOU AREN'T HANK +WHERE IS HANK +HANK??? +WHO ARE YOU +WHERE AM I +THIS ISN'T RIGHT +MIDGET +SYSTEM UNRESPONSIVE +WHY CAN'T I KILL????? +CRITICAL FAILURE +HANK!!!! +BRING ME HANK \ No newline at end of file diff --git a/assets/preload/data/trickyMissStrings.txt b/assets/preload/data/trickyMissStrings.txt new file mode 100644 index 00000000..2dcce241 --- /dev/null +++ b/assets/preload/data/trickyMissStrings.txt @@ -0,0 +1,14 @@ +TERRIBLE +WASTE +MISS CALCULTED +PREDICTED +FAILURE +DISGUSTING +ABHORRENT +FORESEEN +CONTEMPTIBLE +PROGNOSTICATE +DISPICABLE +REPREHENSIBLE +UNSURPRISING +PREDETERMINED \ No newline at end of file diff --git a/assets/preload/data/trickySingStrings.txt b/assets/preload/data/trickySingStrings.txt new file mode 100644 index 00000000..77ccf86f --- /dev/null +++ b/assets/preload/data/trickySingStrings.txt @@ -0,0 +1,13 @@ +SUFFER +INCORRECT +INCOMPLETE +INSUFFICIENT +INVALID +CORRECTION +MISTAKE +REDUCE +ERROR +ADJUSTING +IMPROBABLE +IMPLAUSIBLE +MISJUDGED \ No newline at end of file diff --git a/1002539.jpg b/assets/shared/images/lol.jpg similarity index 100% rename from 1002539.jpg rename to assets/shared/images/lol.jpg diff --git a/source/BackgroundDancer.hx b/source/BackgroundDancer.hx deleted file mode 100644 index a619dacc..00000000 --- a/source/BackgroundDancer.hx +++ /dev/null @@ -1,30 +0,0 @@ -package; - -import flixel.FlxSprite; -import flixel.graphics.frames.FlxAtlasFrames; - -class BackgroundDancer extends FlxSprite -{ - public function new(x:Float, y:Float) - { - super(x, y); - - frames = Paths.getSparrowAtlas("limo/limoDancer"); - animation.addByIndices('danceLeft', 'bg dancer sketch PINK', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); - animation.addByIndices('danceRight', 'bg dancer sketch PINK', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false); - animation.play('danceLeft'); - antialiasing = true; - } - - var danceDir:Bool = false; - - public function dance():Void - { - danceDir = !danceDir; - - if (danceDir) - animation.play('danceRight', true); - else - animation.play('danceLeft', true); - } -} diff --git a/source/BackgroundGirls.hx b/source/BackgroundGirls.hx deleted file mode 100644 index c37b16f9..00000000 --- a/source/BackgroundGirls.hx +++ /dev/null @@ -1,39 +0,0 @@ -package; - -import flixel.FlxSprite; -import flixel.graphics.frames.FlxAtlasFrames; - -class BackgroundGirls extends FlxSprite -{ - public function new(x:Float, y:Float) - { - super(x, y); - - // BG fangirls dissuaded - frames = Paths.getSparrowAtlas('weeb/bgFreaks'); - - animation.addByIndices('danceLeft', 'BG girls group', CoolUtil.numberArray(14), "", 24, false); - animation.addByIndices('danceRight', 'BG girls group', CoolUtil.numberArray(30, 15), "", 24, false); - - animation.play('danceLeft'); - } - - var danceDir:Bool = false; - - public function getScared():Void - { - animation.addByIndices('danceLeft', 'BG fangirls dissuaded', CoolUtil.numberArray(14), "", 24, false); - animation.addByIndices('danceRight', 'BG fangirls dissuaded', CoolUtil.numberArray(30, 15), "", 24, false); - dance(); - } - - public function dance():Void - { - danceDir = !danceDir; - - if (danceDir) - animation.play('danceRight', true); - else - animation.play('danceLeft', true); - } -} diff --git a/source/BeatBattle.hx b/source/BeatBattle.hx deleted file mode 100644 index e69de29b..00000000 diff --git a/source/Character.hx b/source/Character.hx index 54979ab9..584fb3ff 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -87,50 +87,7 @@ class Character extends FlxSprite addOffset('scared', -2, -17); playAnim('danceRight'); - case 'gf-christmas': - tex = Paths.getSparrowAtlas('christmas/gfChristmas'); - frames = tex; - animation.addByPrefix('cheer', 'GF Cheer', 24, false); - animation.addByPrefix('singLEFT', 'GF left note', 24, false); - animation.addByPrefix('singRIGHT', 'GF Right Note', 24, false); - animation.addByPrefix('singUP', 'GF Up Note', 24, false); - animation.addByPrefix('singDOWN', 'GF Down Note', 24, false); - animation.addByIndices('sad', 'gf sad', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], "", 24, false); - animation.addByIndices('danceLeft', 'GF Dancing Beat', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); - animation.addByIndices('danceRight', 'GF Dancing Beat', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false); - animation.addByIndices('hairBlow', "GF Dancing Beat Hair blowing", [0, 1, 2, 3], "", 24); - animation.addByIndices('hairFall', "GF Dancing Beat Hair Landing", [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], "", 24, false); - animation.addByPrefix('scared', 'GF FEAR', 24); - - addOffset('cheer'); - addOffset('sad', -2, -2); - addOffset('danceLeft', 0, -9); - addOffset('danceRight', 0, -9); - - addOffset("singUP", 0, 4); - addOffset("singRIGHT", 0, -20); - addOffset("singLEFT", 0, -19); - addOffset("singDOWN", 0, -20); - addOffset('hairBlow', 45, -8); - addOffset('hairFall', 0, -9); - - addOffset('scared', -2, -17); - - playAnim('danceRight'); - - case 'gf-car': - tex = Paths.getSparrowAtlas('gfCar'); - frames = tex; - animation.addByIndices('singUP', 'GF Dancing Beat Hair blowing CAR', [0], "", 24, false); - animation.addByIndices('danceLeft', 'GF Dancing Beat Hair blowing CAR', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); - animation.addByIndices('danceRight', 'GF Dancing Beat Hair blowing CAR', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, - false); - - addOffset('danceLeft', 0); - addOffset('danceRight', 0); - - playAnim('danceRight'); - + case 'gf-tied': tex = Paths.getSparrowAtlas('fourth/EX Tricky GF','clown'); frames = tex; @@ -146,21 +103,6 @@ class Character extends FlxSprite playAnim('danceRight'); trace(animation.curAnim); - case 'gf-pixel': - tex = Paths.getSparrowAtlas('weeb/gfPixel'); - frames = tex; - animation.addByIndices('singUP', 'GF IDLE', [2], "", 24, false); - animation.addByIndices('danceLeft', 'GF IDLE', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); - animation.addByIndices('danceRight', 'GF IDLE', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false); - - addOffset('danceLeft', 0); - addOffset('danceRight', 0); - - playAnim('danceRight'); - - setGraphicSize(Std.int(width * PlayState.daPixelZoom)); - updateHitbox(); - antialiasing = false; case 'dad': // DAD ANIMATION LOADING CODE @@ -309,134 +251,7 @@ class Character extends FlxSprite addOffset("singDOWN", 32, -168); playAnim('idle'); - - case 'spooky': - tex = Paths.getSparrowAtlas('spooky_kids_assets'); - frames = tex; - animation.addByPrefix('singUP', 'spooky UP NOTE', 24, false); - animation.addByPrefix('singDOWN', 'spooky DOWN note', 24, false); - animation.addByPrefix('singLEFT', 'note sing left', 24, false); - animation.addByPrefix('singRIGHT', 'spooky sing right', 24, false); - animation.addByIndices('danceLeft', 'spooky dance idle', [0, 2, 6], "", 12, false); - animation.addByIndices('danceRight', 'spooky dance idle', [8, 10, 12, 14], "", 12, false); - - addOffset('danceLeft'); - addOffset('danceRight'); - - addOffset("singUP", -20, 26); - addOffset("singRIGHT", -130, -14); - addOffset("singLEFT", 130, -10); - addOffset("singDOWN", -50, -130); - - playAnim('danceRight'); - case 'mom': - tex = Paths.getSparrowAtlas('Mom_Assets'); - frames = tex; - - animation.addByPrefix('idle', "Mom Idle", 24, false); - animation.addByPrefix('singUP', "Mom Up Pose", 24, false); - animation.addByPrefix('singDOWN', "MOM DOWN POSE", 24, false); - animation.addByPrefix('singLEFT', 'Mom Left Pose', 24, false); - // ANIMATION IS CALLED MOM LEFT POSE BUT ITS FOR THE RIGHT - // CUZ DAVE IS DUMB! - animation.addByPrefix('singRIGHT', 'Mom Pose Left', 24, false); - - addOffset('idle'); - addOffset("singUP", 14, 71); - addOffset("singRIGHT", 10, -60); - addOffset("singLEFT", 250, -23); - addOffset("singDOWN", 20, -160); - - playAnim('idle'); - - case 'mom-car': - tex = Paths.getSparrowAtlas('momCar'); - frames = tex; - - animation.addByPrefix('idle', "Mom Idle", 24, false); - animation.addByPrefix('singUP', "Mom Up Pose", 24, false); - animation.addByPrefix('singDOWN', "MOM DOWN POSE", 24, false); - animation.addByPrefix('singLEFT', 'Mom Left Pose', 24, false); - // ANIMATION IS CALLED MOM LEFT POSE BUT ITS FOR THE RIGHT - // CUZ DAVE IS DUMB! - animation.addByPrefix('singRIGHT', 'Mom Pose Left', 24, false); - - addOffset('idle'); - addOffset("singUP", 14, 71); - addOffset("singRIGHT", 10, -60); - addOffset("singLEFT", 250, -23); - addOffset("singDOWN", 20, -160); - - playAnim('idle'); - case 'monster': - tex = Paths.getSparrowAtlas('Monster_Assets'); - frames = tex; - animation.addByPrefix('idle', 'monster idle', 24, false); - animation.addByPrefix('singUP', 'monster up note', 24, false); - animation.addByPrefix('singDOWN', 'monster down', 24, false); - animation.addByPrefix('singLEFT', 'Monster left note', 24, false); - animation.addByPrefix('singRIGHT', 'Monster Right note', 24, false); - - addOffset('idle'); - addOffset("singUP", -20, 50); - addOffset("singRIGHT", -51); - addOffset("singLEFT", -30); - addOffset("singDOWN", -30, -40); - playAnim('idle'); - case 'monster-christmas': - tex = Paths.getSparrowAtlas('christmas/monsterChristmas'); - frames = tex; - animation.addByPrefix('idle', 'monster idle', 24, false); - animation.addByPrefix('singUP', 'monster up note', 24, false); - animation.addByPrefix('singDOWN', 'monster down', 24, false); - animation.addByPrefix('singLEFT', 'Monster left note', 24, false); - animation.addByPrefix('singRIGHT', 'Monster Right note', 24, false); - - addOffset('idle'); - addOffset("singUP", -20, 50); - addOffset("singRIGHT", -51); - addOffset("singLEFT", -30); - addOffset("singDOWN", -40, -94); - playAnim('idle'); - case 'pico': - tex = Paths.getSparrowAtlas('Pico_FNF_assetss'); - frames = tex; - animation.addByPrefix('idle', "Pico Idle Dance", 24); - animation.addByPrefix('singUP', 'pico Up note0', 24, false); - animation.addByPrefix('singDOWN', 'Pico Down Note0', 24, false); - if (isPlayer) - { - animation.addByPrefix('singLEFT', 'Pico NOTE LEFT0', 24, false); - animation.addByPrefix('singRIGHT', 'Pico Note Right0', 24, false); - animation.addByPrefix('singRIGHTmiss', 'Pico Note Right Miss', 24, false); - animation.addByPrefix('singLEFTmiss', 'Pico NOTE LEFT miss', 24, false); - } - else - { - // Need to be flipped! REDO THIS LATER! - animation.addByPrefix('singLEFT', 'Pico Note Right0', 24, false); - animation.addByPrefix('singRIGHT', 'Pico NOTE LEFT0', 24, false); - animation.addByPrefix('singRIGHTmiss', 'Pico NOTE LEFT miss', 24, false); - animation.addByPrefix('singLEFTmiss', 'Pico Note Right Miss', 24, false); - } - - animation.addByPrefix('singUPmiss', 'pico Up note miss', 24); - animation.addByPrefix('singDOWNmiss', 'Pico Down Note MISS', 24); - - addOffset('idle'); - addOffset("singUP", -29, 27); - addOffset("singRIGHT", -68, -7); - addOffset("singLEFT", 65, 9); - addOffset("singDOWN", 200, -70); - addOffset("singUPmiss", -19, 67); - addOffset("singRIGHTmiss", -60, 41); - addOffset("singLEFTmiss", 62, 64); - addOffset("singDOWNmiss", 210, -28); - - playAnim('idle'); - - flipX = true; - + case 'bf': var tex = Paths.getSparrowAtlas('BOYFRIEND'); frames = tex; @@ -478,6 +293,7 @@ class Character extends FlxSprite playAnim('idle'); flipX = true; + case 'bf-hell': var tex = Paths.getSparrowAtlas('hellclwn/BF/BF_3rd_phase','clown'); frames = tex; @@ -511,34 +327,6 @@ class Character extends FlxSprite flipX = true; - case 'bf-christmas': - var tex = Paths.getSparrowAtlas('christmas/bfChristmas'); - frames = tex; - animation.addByPrefix('idle', 'BF idle dance', 24, false); - animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false); - animation.addByPrefix('singLEFT', 'BF NOTE LEFT0', 24, false); - animation.addByPrefix('singRIGHT', 'BF NOTE RIGHT0', 24, false); - animation.addByPrefix('singDOWN', 'BF NOTE DOWN0', 24, false); - animation.addByPrefix('singUPmiss', 'BF NOTE UP MISS', 24, false); - animation.addByPrefix('singLEFTmiss', 'BF NOTE LEFT MISS', 24, false); - animation.addByPrefix('singRIGHTmiss', 'BF NOTE RIGHT MISS', 24, false); - animation.addByPrefix('singDOWNmiss', 'BF NOTE DOWN MISS', 24, false); - animation.addByPrefix('hey', 'BF HEY', 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("hey", 7, 4); - - playAnim('idle'); - - flipX = true; case 'bf-car': var tex = Paths.getSparrowAtlas('bfCar'); frames = tex; @@ -564,56 +352,7 @@ class Character extends FlxSprite playAnim('idle'); flipX = true; - case 'bf-pixel': - frames = Paths.getSparrowAtlas('weeb/bfPixel'); - animation.addByPrefix('idle', 'BF IDLE', 24, false); - animation.addByPrefix('singUP', 'BF UP NOTE', 24, false); - animation.addByPrefix('singLEFT', 'BF LEFT NOTE', 24, false); - animation.addByPrefix('singRIGHT', 'BF RIGHT NOTE', 24, false); - animation.addByPrefix('singDOWN', 'BF DOWN NOTE', 24, false); - animation.addByPrefix('singUPmiss', 'BF UP MISS', 24, false); - animation.addByPrefix('singLEFTmiss', 'BF LEFT MISS', 24, false); - animation.addByPrefix('singRIGHTmiss', 'BF RIGHT MISS', 24, false); - animation.addByPrefix('singDOWNmiss', 'BF DOWN MISS', 24, false); - - addOffset('idle'); - addOffset("singUP"); - addOffset("singRIGHT"); - addOffset("singLEFT"); - addOffset("singDOWN"); - addOffset("singUPmiss"); - addOffset("singRIGHTmiss"); - addOffset("singLEFTmiss"); - addOffset("singDOWNmiss"); - - setGraphicSize(Std.int(width * 6)); - updateHitbox(); - - playAnim('idle'); - - width -= 100; - height -= 100; - - antialiasing = false; - - flipX = true; - case 'bf-pixel-dead': - frames = Paths.getSparrowAtlas('weeb/bfPixelsDEAD'); - animation.addByPrefix('singUP', "BF Dies pixel", 24, false); - animation.addByPrefix('firstDeath', "BF Dies pixel", 24, false); - animation.addByPrefix('deathLoop', "Retry Loop", 24, true); - animation.addByPrefix('deathConfirm', "RETRY CONFIRM", 24, false); - animation.play('firstDeath'); - addOffset('firstDeath'); - addOffset('deathLoop', -37); - addOffset('deathConfirm', -37); - playAnim('firstDeath'); - // pixel bullshit - setGraphicSize(Std.int(width * 6)); - updateHitbox(); - antialiasing = false; - flipX = true; case 'signDeath': frames = Paths.getSparrowAtlas('signDeath','clown'); animation.addByPrefix('firstDeath', 'BF dies', 24, false); @@ -631,6 +370,7 @@ class Character extends FlxSprite updateHitbox(); antialiasing = false; flipX = true; + case 'exTricky': frames = Paths.getSparrowAtlas('fourth/EXTRICKY','clown'); exSpikes = new FlxSprite(x - 350,y - 170); @@ -653,93 +393,6 @@ class Character extends FlxSprite addOffset("singLEFT",127,20); addOffset("singDOWN",-100,-340); - playAnim('idle'); - - case 'senpai': - frames = Paths.getSparrowAtlas('weeb/senpai'); - animation.addByPrefix('idle', 'Senpai Idle', 24, false); - animation.addByPrefix('singUP', 'SENPAI UP NOTE', 24, false); - animation.addByPrefix('singLEFT', 'SENPAI LEFT NOTE', 24, false); - animation.addByPrefix('singRIGHT', 'SENPAI RIGHT NOTE', 24, false); - animation.addByPrefix('singDOWN', 'SENPAI DOWN NOTE', 24, false); - - addOffset('idle'); - addOffset("singUP", 5, 37); - addOffset("singRIGHT"); - addOffset("singLEFT", 40); - addOffset("singDOWN", 14); - - playAnim('idle'); - - setGraphicSize(Std.int(width * 6)); - updateHitbox(); - - antialiasing = false; - case 'senpai-angry': - frames = Paths.getSparrowAtlas('weeb/senpai'); - animation.addByPrefix('idle', 'Angry Senpai Idle', 24, false); - animation.addByPrefix('singUP', 'Angry Senpai UP NOTE', 24, false); - animation.addByPrefix('singLEFT', 'Angry Senpai LEFT NOTE', 24, false); - animation.addByPrefix('singRIGHT', 'Angry Senpai RIGHT NOTE', 24, false); - animation.addByPrefix('singDOWN', 'Angry Senpai DOWN NOTE', 24, false); - - addOffset('idle'); - addOffset("singUP", 5, 37); - addOffset("singRIGHT"); - addOffset("singLEFT", 40); - addOffset("singDOWN", 14); - playAnim('idle'); - - setGraphicSize(Std.int(width * 6)); - updateHitbox(); - - antialiasing = false; - - case 'spirit': - frames = Paths.getPackerAtlas('weeb/spirit'); - animation.addByPrefix('idle', "idle spirit_", 24, false); - animation.addByPrefix('singUP', "up_", 24, false); - animation.addByPrefix('singRIGHT', "right_", 24, false); - animation.addByPrefix('singLEFT', "left_", 24, false); - animation.addByPrefix('singDOWN', "spirit down_", 24, false); - - addOffset('idle', -220, -280); - addOffset('singUP', -220, -240); - addOffset("singRIGHT", -220, -280); - addOffset("singLEFT", -200, -280); - addOffset("singDOWN", 170, 110); - - setGraphicSize(Std.int(width * 6)); - updateHitbox(); - - playAnim('idle'); - - antialiasing = false; - - case 'parents-christmas': - frames = Paths.getSparrowAtlas('christmas/mom_dad_christmas_assets'); - animation.addByPrefix('idle', 'Parent Christmas Idle', 24, false); - animation.addByPrefix('singUP', 'Parent Up Note Dad', 24, false); - animation.addByPrefix('singDOWN', 'Parent Down Note Dad', 24, false); - animation.addByPrefix('singLEFT', 'Parent Left Note Dad', 24, false); - animation.addByPrefix('singRIGHT', 'Parent Right Note Dad', 24, false); - - animation.addByPrefix('singUP-alt', 'Parent Up Note Mom', 24, false); - - animation.addByPrefix('singDOWN-alt', 'Parent Down Note Mom', 24, false); - animation.addByPrefix('singLEFT-alt', 'Parent Left Note Mom', 24, false); - animation.addByPrefix('singRIGHT-alt', 'Parent Right Note Mom', 24, false); - - addOffset('idle'); - addOffset("singUP", -47, 24); - addOffset("singRIGHT", -1, -23); - addOffset("singLEFT", -30, 16); - addOffset("singDOWN", -31, -29); - addOffset("singUP-alt", -47, 24); - addOffset("singRIGHT-alt", -1, -24); - addOffset("singLEFT-alt", -30, 15); - addOffset("singDOWN-alt", -30, -27); - playAnim('idle'); } @@ -840,38 +493,7 @@ class Character extends FlxSprite else playAnim('danceLeft'); } - - case 'gf-christmas': - if (!animation.curAnim.name.startsWith('hair')) - { - danced = !danced; - - if (danced) - playAnim('danceRight'); - else - playAnim('danceLeft'); - } - - case 'gf-car': - if (!animation.curAnim.name.startsWith('hair')) - { - danced = !danced; - - if (danced) - playAnim('danceRight'); - else - playAnim('danceLeft'); - } - case 'gf-pixel': - if (!animation.curAnim.name.startsWith('hair')) - { - danced = !danced; - - if (danced) - playAnim('danceRight'); - else - playAnim('danceLeft'); - } + case 'gf-hell': if (!animation.curAnim.name.startsWith('hair')) { @@ -892,13 +514,6 @@ class Character extends FlxSprite else playAnim('danceLeft'); } - case 'spooky': - danced = !danced; - - if (danced) - playAnim('danceRight'); - else - playAnim('danceLeft'); default: playAnim('idle'); } diff --git a/source/MenuCharacter.hx b/source/MenuCharacter.hx index cb38bfbd..5a0ca440 100644 --- a/source/MenuCharacter.hx +++ b/source/MenuCharacter.hx @@ -19,14 +19,7 @@ class MenuCharacter extends FlxSprite animation.addByPrefix('bf', "BF idle dance white", 24); animation.addByPrefix('bfConfirm', 'BF HEY!!', 24, false); animation.addByPrefix('gf', "GF Dancing Beat WHITE", 24); - animation.addByPrefix('dad', "Dad idle dance BLACK LINE", 24); - animation.addByPrefix('spooky', "spooky dance idle BLACK LINES", 24); - animation.addByPrefix('pico', "Pico Idle Dance", 24); - animation.addByPrefix('mom', "Mom Idle BLACK LINES", 24); - animation.addByPrefix('parents-christmas', "Parent Christmas Idle", 24); - animation.addByPrefix('senpai', "SENPAI idle Black Lines", 24); animation.addByPrefix('trickyMask', "tricky week", 24); - // Parent Christmas Idle animation.play(character); updateHitbox(); diff --git a/source/Note.hx b/source/Note.hx index 09daaf1a..2273d4e5 100644 --- a/source/Note.hx +++ b/source/Note.hx @@ -287,4 +287,4 @@ class Note extends FlxSprite alpha = 0.3; } } -} +} \ No newline at end of file diff --git a/source/PlayState.hx b/source/PlayState.hx index 892c005a..da9bb6b3 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -5,7 +5,6 @@ import lime.app.Application; import openfl.media.Video; import Section.SwagSection; import Song.SwagSong; -import WiggleEffect.WiggleEffectType; import flixel.FlxBasic; import flixel.FlxCamera; import flixel.FlxG; @@ -72,6 +71,9 @@ class PlayState extends MusicBeatState public var ExTrickyLinesSing:Array = ["YOU AREN'T HANK", "WHERE IS HANK", "HANK???", "WHO ARE YOU", "WHERE AM I", "THIS ISN'T RIGHT", "MIDGET", "SYSTEM UNRESPONSIVE", "WHY CAN'T I KILL?????"]; public var TrickyLinesMiss:Array = ["TERRIBLE", "WASTE", "MISS CALCULTED", "PREDICTED", "FAILURE", "DISGUSTING", "ABHORRENT", "FORESEEN", "CONTEMPTIBLE", "PROGNOSTICATE", "DISPICABLE", "REPREHENSIBLE"]; + //cutscene text unhardcoding + public var cutsceneText:Array = ["OMFG CLOWN!!!!", "YOU DO NOT KILL CLOWN", "CLOWN KILLS YOU!!!!!!"]; + public static var dad:Character; private var gf:Character; private var boyfriend:Boyfriend; @@ -120,28 +122,10 @@ class PlayState extends MusicBeatState var notesHitArray:Array = []; private var camGame:FlxCamera; - var dialogue:Array = ['blah blah blah', 'coolswag']; - - var halloweenBG:FlxSprite; - var isHalloween:Bool = false; - - var phillyCityLights:FlxTypedGroup; - var phillyTrain:FlxSprite; - var trainSound:FlxSound; - - var limo:FlxSprite; - var grpLimoDancers:FlxTypedGroup; - var fastCar:FlxSprite; - - var upperBoppers:FlxSprite; - var bottomBoppers:FlxSprite; - var santa:FlxSprite; + var dialogue:Array = ['dad:blah blah blah', 'bf:coolswag']; var fc:Bool = true; - var bgGirls:BackgroundGirls; - var wiggleShit:WiggleEffect = new WiggleEffect(); - var talking:Bool = true; var songScore:Int = 0; @@ -221,6 +205,15 @@ class PlayState extends MusicBeatState SONG = Song.loadFromJson('tutorial'); Conductor.mapBPMChanges(SONG); Conductor.changeBPM(SONG.bpm); + + //unhardcode tricky sing strings lmao + TrickyLinesSing = CoolUtil.coolTextFile(Paths.txt('trickySingStrings')); + TrickyLinesMiss = CoolUtil.coolTextFile(Paths.txt('trickyMissStrings')); + ExTrickyLinesSing = CoolUtil.coolTextFile(Paths.txt('trickyExSingStrings')); + + //load cutscene text + cutsceneText = CoolUtil.coolTextFile(Paths.txt('cutMyBalls')); + //yes i called it "cut my balls" fuck you i can name my txts whatever i want switch (SONG.song.toLowerCase()) { @@ -249,318 +242,7 @@ class PlayState extends MusicBeatState dialogue = CoolUtil.coolTextFile(Paths.txt('thorns/thornsDialogue')); } - if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south') - { - curStage = "spooky"; - halloweenLevel = true; - - var hallowTex = Paths.getSparrowAtlas('halloween_bg'); - - halloweenBG = new FlxSprite(-200, -100); - halloweenBG.frames = hallowTex; - halloweenBG.animation.addByPrefix('idle', 'halloweem bg0'); - halloweenBG.animation.addByPrefix('lightning', 'halloweem bg lightning strike', 24, false); - halloweenBG.animation.play('idle'); - halloweenBG.antialiasing = true; - add(halloweenBG); - - isHalloween = true; - } - else if (SONG.song.toLowerCase() == 'pico' || SONG.song.toLowerCase() == 'blammed' || SONG.song.toLowerCase() == 'philly') - { - curStage = 'philly'; - - var bg:FlxSprite = new FlxSprite(-100).loadGraphic(Paths.image('philly/sky')); - bg.scrollFactor.set(0.1, 0.1); - add(bg); - - var city:FlxSprite = new FlxSprite(-10).loadGraphic(Paths.image('philly/city')); - city.scrollFactor.set(0.3, 0.3); - city.setGraphicSize(Std.int(city.width * 0.85)); - city.updateHitbox(); - add(city); - - phillyCityLights = new FlxTypedGroup(); - add(phillyCityLights); - - for (i in 0...5) - { - var light:FlxSprite = new FlxSprite(city.x).loadGraphic(Paths.image('philly/win' + i)); - light.scrollFactor.set(0.3, 0.3); - light.visible = false; - light.setGraphicSize(Std.int(light.width * 0.85)); - light.updateHitbox(); - light.antialiasing = true; - phillyCityLights.add(light); - } - - var streetBehind:FlxSprite = new FlxSprite(-40, 50).loadGraphic(Paths.image('philly/behindTrain')); - add(streetBehind); - - phillyTrain = new FlxSprite(2000, 360).loadGraphic(Paths.image('philly/train')); - add(phillyTrain); - - trainSound = new FlxSound().loadEmbedded(Paths.sound('train_passes')); - FlxG.sound.list.add(trainSound); - - // var cityLights:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.win0.png); - - var street:FlxSprite = new FlxSprite(-40, streetBehind.y).loadGraphic(Paths.image('philly/street')); - add(street); - } - else if (SONG.song.toLowerCase() == 'milf' || SONG.song.toLowerCase() == 'satin-panties' || SONG.song.toLowerCase() == 'high') - { - curStage = 'limo'; - defaultCamZoom = 0.90; - - var skyBG:FlxSprite = new FlxSprite(-120, -50).loadGraphic(Paths.image('limo/limoSunset')); - skyBG.scrollFactor.set(0.1, 0.1); - add(skyBG); - - var bgLimo:FlxSprite = new FlxSprite(-200, 480); - bgLimo.frames = Paths.getSparrowAtlas('limo/bgLimo'); - bgLimo.animation.addByPrefix('drive', "background limo pink", 24); - bgLimo.animation.play('drive'); - bgLimo.scrollFactor.set(0.4, 0.4); - add(bgLimo); - - grpLimoDancers = new FlxTypedGroup(); - add(grpLimoDancers); - - for (i in 0...5) - { - var dancer:BackgroundDancer = new BackgroundDancer((370 * i) + 130, bgLimo.y - 400); - dancer.scrollFactor.set(0.4, 0.4); - grpLimoDancers.add(dancer); - } - - var overlayShit:FlxSprite = new FlxSprite(-500, -600).loadGraphic(Paths.image('limo/limoOverlay')); - overlayShit.alpha = 0.5; - // add(overlayShit); - - // var shaderBullshit = new BlendModeEffect(new OverlayShader(), FlxColor.RED); - - // FlxG.camera.setFilters([new ShaderFilter(cast shaderBullshit.shader)]); - - // overlayShit.shader = shaderBullshit; - - var limoTex = Paths.getSparrowAtlas('limo/limoDrive'); - - limo = new FlxSprite(-120, 550); - limo.frames = limoTex; - limo.animation.addByPrefix('drive', "Limo stage", 24); - limo.animation.play('drive'); - limo.antialiasing = true; - - fastCar = new FlxSprite(-300, 160).loadGraphic(Paths.image('limo/fastCarLol')); - // add(limo); - } - else if (SONG.song.toLowerCase() == 'cocoa' || SONG.song.toLowerCase() == 'eggnog') - { - curStage = 'mall'; - - defaultCamZoom = 0.80; - - var bg:FlxSprite = new FlxSprite(-1000, -500).loadGraphic(Paths.image('christmas/bgWalls')); - bg.antialiasing = true; - bg.scrollFactor.set(0.2, 0.2); - bg.active = false; - bg.setGraphicSize(Std.int(bg.width * 0.8)); - bg.updateHitbox(); - add(bg); - - upperBoppers = new FlxSprite(-240, -90); - upperBoppers.frames = Paths.getSparrowAtlas('christmas/upperBop'); - upperBoppers.animation.addByPrefix('bop', "Upper Crowd Bob", 24, false); - upperBoppers.antialiasing = true; - upperBoppers.scrollFactor.set(0.33, 0.33); - upperBoppers.setGraphicSize(Std.int(upperBoppers.width * 0.85)); - upperBoppers.updateHitbox(); - add(upperBoppers); - - var bgEscalator:FlxSprite = new FlxSprite(-1100, -600).loadGraphic(Paths.image('christmas/bgEscalator')); - bgEscalator.antialiasing = true; - bgEscalator.scrollFactor.set(0.3, 0.3); - bgEscalator.active = false; - bgEscalator.setGraphicSize(Std.int(bgEscalator.width * 0.9)); - bgEscalator.updateHitbox(); - add(bgEscalator); - - var tree:FlxSprite = new FlxSprite(370, -250).loadGraphic(Paths.image('christmas/christmasTree')); - tree.antialiasing = true; - tree.scrollFactor.set(0.40, 0.40); - add(tree); - - bottomBoppers = new FlxSprite(-300, 140); - bottomBoppers.frames = Paths.getSparrowAtlas('christmas/bottomBop'); - bottomBoppers.animation.addByPrefix('bop', 'Bottom Level Boppers', 24, false); - bottomBoppers.antialiasing = true; - bottomBoppers.scrollFactor.set(0.9, 0.9); - bottomBoppers.setGraphicSize(Std.int(bottomBoppers.width * 1)); - bottomBoppers.updateHitbox(); - add(bottomBoppers); - - var fgSnow:FlxSprite = new FlxSprite(-600, 700).loadGraphic(Paths.image('christmas/fgSnow')); - fgSnow.active = false; - fgSnow.antialiasing = true; - add(fgSnow); - - santa = new FlxSprite(-840, 150); - santa.frames = Paths.getSparrowAtlas('christmas/santa'); - santa.animation.addByPrefix('idle', 'santa idle in fear', 24, false); - santa.antialiasing = true; - add(santa); - } - else if (SONG.song.toLowerCase() == 'winter-horrorland') - { - curStage = 'mallEvil'; - var bg:FlxSprite = new FlxSprite(-400, -500).loadGraphic(Paths.image('christmas/evilBG')); - bg.antialiasing = true; - bg.scrollFactor.set(0.2, 0.2); - bg.active = false; - bg.setGraphicSize(Std.int(bg.width * 0.8)); - bg.updateHitbox(); - add(bg); - - var evilTree:FlxSprite = new FlxSprite(300, -300).loadGraphic(Paths.image('christmas/evilTree')); - evilTree.antialiasing = true; - evilTree.scrollFactor.set(0.2, 0.2); - add(evilTree); - - var evilSnow:FlxSprite = new FlxSprite(-200, 700).loadGraphic(Paths.image("christmas/evilSnow")); - evilSnow.antialiasing = true; - add(evilSnow); - } - else if (SONG.song.toLowerCase() == 'senpai' || SONG.song.toLowerCase() == 'roses') - { - curStage = 'school'; - - // defaultCamZoom = 0.9; - - var bgSky = new FlxSprite().loadGraphic(Paths.image('weeb/weebSky')); - bgSky.scrollFactor.set(0.1, 0.1); - add(bgSky); - - var repositionShit = -200; - - var bgSchool:FlxSprite = new FlxSprite(repositionShit, 0).loadGraphic(Paths.image('weeb/weebSchool')); - bgSchool.scrollFactor.set(0.6, 0.90); - add(bgSchool); - - var bgStreet:FlxSprite = new FlxSprite(repositionShit).loadGraphic(Paths.image('weeb/weebStreet')); - bgStreet.scrollFactor.set(0.95, 0.95); - add(bgStreet); - - var fgTrees:FlxSprite = new FlxSprite(repositionShit + 170, 130).loadGraphic(Paths.image('weeb/weebTreesBack')); - fgTrees.scrollFactor.set(0.9, 0.9); - add(fgTrees); - - var bgTrees:FlxSprite = new FlxSprite(repositionShit - 380, -800); - var treetex = Paths.getPackerAtlas('weeb/weebTrees'); - bgTrees.frames = treetex; - bgTrees.animation.add('treeLoop', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18], 12); - bgTrees.animation.play('treeLoop'); - bgTrees.scrollFactor.set(0.85, 0.85); - add(bgTrees); - - var treeLeaves:FlxSprite = new FlxSprite(repositionShit, -40); - treeLeaves.frames = Paths.getSparrowAtlas('weeb/petals'); - treeLeaves.animation.addByPrefix('leaves', 'PETALS ALL', 24, true); - treeLeaves.animation.play('leaves'); - treeLeaves.scrollFactor.set(0.85, 0.85); - add(treeLeaves); - - var widShit = Std.int(bgSky.width * 6); - - bgSky.setGraphicSize(widShit); - bgSchool.setGraphicSize(widShit); - bgStreet.setGraphicSize(widShit); - bgTrees.setGraphicSize(Std.int(widShit * 1.4)); - fgTrees.setGraphicSize(Std.int(widShit * 0.8)); - treeLeaves.setGraphicSize(widShit); - - fgTrees.updateHitbox(); - bgSky.updateHitbox(); - bgSchool.updateHitbox(); - bgStreet.updateHitbox(); - bgTrees.updateHitbox(); - treeLeaves.updateHitbox(); - - bgGirls = new BackgroundGirls(-100, 190); - bgGirls.scrollFactor.set(0.9, 0.9); - - if (SONG.song.toLowerCase() == 'roses') - { - bgGirls.getScared(); - } - - bgGirls.setGraphicSize(Std.int(bgGirls.width * daPixelZoom)); - bgGirls.updateHitbox(); - add(bgGirls); - } - else if (SONG.song.toLowerCase() == 'thorns') - { - curStage = 'schoolEvil'; - - var waveEffectBG = new FlxWaveEffect(FlxWaveMode.ALL, 2, -1, 3, 2); - var waveEffectFG = new FlxWaveEffect(FlxWaveMode.ALL, 2, -1, 5, 2); - - var posX = 400; - var posY = 200; - - var bg:FlxSprite = new FlxSprite(posX, posY); - bg.frames = Paths.getSparrowAtlas('weeb/animatedEvilSchool'); - bg.animation.addByPrefix('idle', 'background 2', 24); - bg.animation.play('idle'); - bg.scrollFactor.set(0.8, 0.9); - bg.scale.set(6, 6); - add(bg); - - /* - var bg:FlxSprite = new FlxSprite(posX, posY).loadGraphic(Paths.image('weeb/evilSchoolBG')); - bg.scale.set(6, 6); - // bg.setGraphicSize(Std.int(bg.width * 6)); - // bg.updateHitbox(); - add(bg); - - var fg:FlxSprite = new FlxSprite(posX, posY).loadGraphic(Paths.image('weeb/evilSchoolFG')); - fg.scale.set(6, 6); - // fg.setGraphicSize(Std.int(fg.width * 6)); - // fg.updateHitbox(); - add(fg); - - wiggleShit.effectType = WiggleEffectType.DREAMY; - wiggleShit.waveAmplitude = 0.01; - wiggleShit.waveFrequency = 60; - wiggleShit.waveSpeed = 0.8; - */ - - // bg.shader = wiggleShit.shader; - // fg.shader = wiggleShit.shader; - - /* - var waveSprite = new FlxEffectSprite(bg, [waveEffectBG]); - var waveSpriteFG = new FlxEffectSprite(fg, [waveEffectFG]); - - // Using scale since setGraphicSize() doesnt work??? - waveSprite.scale.set(6, 6); - waveSpriteFG.scale.set(6, 6); - waveSprite.setPosition(posX, posY); - waveSpriteFG.setPosition(posX, posY); - - waveSprite.scrollFactor.set(0.7, 0.8); - waveSpriteFG.scrollFactor.set(0.9, 0.8); - - // waveSprite.setGraphicSize(Std.int(waveSprite.width * 6)); - // waveSprite.updateHitbox(); - // waveSpriteFG.setGraphicSize(Std.int(fg.width * 6)); - // waveSpriteFG.updateHitbox(); - - add(waveSprite); - add(waveSpriteFG); - */ - } - else if (SONG.song.toLowerCase() == 'improbable-outset' || SONG.song.toLowerCase() == 'madness') + if (SONG.song.toLowerCase() == 'improbable-outset' || SONG.song.toLowerCase() == 'madness') { //trace("line 538"); defaultCamZoom = 0.75; @@ -720,14 +402,6 @@ class PlayState extends MusicBeatState switch (curStage) { - case 'limo': - gfVersion = 'gf-car'; - case 'mall' | 'mallEvil': - gfVersion = 'gf-christmas'; - case 'school': - gfVersion = 'gf-pixel'; - case 'schoolEvil': - gfVersion = 'gf-pixel'; case 'nevadaSpook': gfVersion = 'gf-hell'; case 'auditorHell': @@ -752,13 +426,6 @@ class PlayState extends MusicBeatState camPos.x += 600; tweenCamIn(); } - - case "spooky": - dad.y += 200; - case "monster": - dad.y += 100; - case 'monster-christmas': - dad.y += 130; case 'dad': camPos.x += 400; case 'tricky': @@ -777,23 +444,6 @@ class PlayState extends MusicBeatState gf.x += 345; gf.y -= 25; dad.visible = false; - case 'pico': - camPos.x += 600; - dad.y += 300; - case 'parents-christmas': - dad.x -= 500; - case 'senpai': - dad.x += 150; - dad.y += 360; - camPos.set(dad.getGraphicMidpoint().x + 300, dad.getGraphicMidpoint().y); - case 'senpai-angry': - dad.x += 150; - dad.y += 360; - camPos.set(dad.getGraphicMidpoint().x + 300, dad.getGraphicMidpoint().y); - case 'spirit': - dad.x -= 150; - dad.y += 100; - camPos.set(dad.getGraphicMidpoint().x + 300, dad.getGraphicMidpoint().y); } @@ -811,37 +461,6 @@ class PlayState extends MusicBeatState // REPOSITIONING PER STAGE switch (curStage) { - case 'limo': - boyfriend.y -= 220; - boyfriend.x += 260; - - resetFastCar(); - add(fastCar); - - case 'mall': - boyfriend.x += 200; - - case 'mallEvil': - boyfriend.x += 320; - dad.y -= 80; - case 'school': - boyfriend.x += 200; - boyfriend.y += 220; - gf.x += 180; - gf.y += 300; - case 'schoolEvil': - // trailArea.scrollFactor.set(); - - var evilTrail = new FlxTrail(dad, null, 4, 24, 0.3, 0.069); - // evilTrail.changeValuesEnabled(false, false, false, false); - // evilTrail.changeGraphic() - add(evilTrail); - // evilTrail.scrollFactor.set(1.1, 1.1); - - boyfriend.x += 200; - boyfriend.y += 220; - gf.x += 180; - gf.y += 300; case 'nevada': boyfriend.y -= 0; boyfriend.x += 260; @@ -852,10 +471,6 @@ class PlayState extends MusicBeatState add(gf); - // Shitty layering but whatev it works LOL - if (curStage == 'limo') - add(limo); - if (curStage == 'auditorHell') add(hole); @@ -973,7 +588,6 @@ class PlayState extends MusicBeatState // what's your fuckin' deal???????????? -roze // what roze bud??? -kade // no - // // ░░░░░▄▄▄▄▀▀▀▀▀▀▀▀▄▄▄▄▄▄░░░░░░░ // ░░░░░█░░░░▒▒▒▒▒▒▒▒▒▒▒▒░░▀▀▄░░░░ // ░░░░█░░░▒▒▒▒▒▒░░░░░░░░▒▒▒░░█░░░ @@ -989,6 +603,7 @@ class PlayState extends MusicBeatState // ░░░░░░░▀▄▄░▒▒▒▒░░░░░░░░░░▒░░░█░ // ░░░░░░░░░░▀▀▄▄░▒▒▒▒▒▒▒▒▒▒░░░░█░ // ░░░░░░░░░░░░░░▀▄▄▄▄▄░░░░░░░░█░░ + // trolling /*var kadeEngineWatermark = new FlxText(4,FlxG.height - 4,0,SONG.song + " " + (storyDifficulty == 2 ? "Hard" : storyDifficulty == 1 ? "Normal" : "Easy") + " - KE " + MainMenuState.kadeEngineVer, 16); kadeEngineWatermark.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); @@ -1054,41 +669,6 @@ class PlayState extends MusicBeatState { switch (curSong.toLowerCase()) { - case "winter-horrorland": - var blackScreen:FlxSprite = new FlxSprite(0, 0).makeGraphic(Std.int(FlxG.width * 2), Std.int(FlxG.height * 2), FlxColor.BLACK); - add(blackScreen); - blackScreen.scrollFactor.set(); - camHUD.visible = false; - - new FlxTimer().start(0.1, function(tmr:FlxTimer) - { - remove(blackScreen); - FlxG.sound.play(Paths.sound('Lights_Turn_On')); - camFollow.y = -2050; - camFollow.x += 200; - FlxG.camera.focusOn(camFollow.getPosition()); - FlxG.camera.zoom = 1.5; - - new FlxTimer().start(0.8, function(tmr:FlxTimer) - { - camHUD.visible = true; - remove(blackScreen); - FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, 2.5, { - ease: FlxEase.quadInOut, - onComplete: function(twn:FlxTween) - { - startCountdown(); - } - }); - }); - }); - case 'senpai': - schoolIntro(doof); - case 'roses': - FlxG.sound.play(Paths.sound('ANGRY')); - schoolIntro(doof); - case 'thorns': - schoolIntro(doof); case 'improbable-outset': camFollow.setPosition(boyfriend.getMidpoint().x + 70, boyfriend.getMidpoint().y - 50); if (playCutscene) @@ -1523,7 +1103,7 @@ class PlayState extends MusicBeatState trace('playin cut cuz its funny lol!!!'); animation.animation.play("cut1"); resetSpookyText = false; - createSpookyText('YOU DO NOT KILL CLOWN', 260, FlxG.height * 0.9); + createSpookyText(cutsceneText[1], 260, FlxG.height * 0.9); } if (!animation.animation.finished) @@ -1559,7 +1139,7 @@ class PlayState extends MusicBeatState case 'cut3': animation.animation.play('cut4'); resetSpookyText = false; - createSpookyText('CLOWN KILLS YOU!!!!!!', 260, FlxG.height * 0.9); + createSpookyText(cutsceneText[2], 260, FlxG.height * 0.9); animation.x -= 100; case 'cut4': resetSpookyTextManual(); @@ -1744,7 +1324,7 @@ class PlayState extends MusicBeatState if (!playonce) { resetSpookyText = false; - createSpookyText('OMFG CLOWN!!!!', 260, FlxG.height * 0.9); + createSpookyText(cutsceneText[0], 260, FlxG.height * 0.9); playonce = true; } cloth.play(); @@ -2310,22 +1890,6 @@ class PlayState extends MusicBeatState iconP1.animation.play('bf-old'); } - switch (curStage) - { - case 'philly': - if (trainMoving) - { - trainFrameTiming += elapsed; - - if (trainFrameTiming >= 1 / 24) - { - updateTrainPos(); - trainFrameTiming = 0; - } - } - // phillyCityLights.members[curLight].alpha -= (Conductor.crochet / 1000) * FlxG.elapsed; - } - super.update(elapsed); scoreTxt.text = Ratings.CalculateRanking(songScore,0,nps,accuracy); @@ -2461,20 +2025,6 @@ class PlayState extends MusicBeatState { camFollow.setPosition(boyfriend.getMidpoint().x - 100, boyfriend.getMidpoint().y - 300); - switch (curStage) - { - case 'limo': - camFollow.x = boyfriend.getMidpoint().x - 300; - case 'mall': - camFollow.y = boyfriend.getMidpoint().y - 200; - case 'school': - camFollow.x = boyfriend.getMidpoint().x - 200; - camFollow.y = boyfriend.getMidpoint().y - 200; - case 'schoolEvil': - camFollow.x = boyfriend.getMidpoint().x - 200; - camFollow.y = boyfriend.getMidpoint().y - 200; - } - if (SONG.song.toLowerCase() == 'tutorial') { FlxTween.tween(FlxG.camera, {zoom: 1}, (Conductor.stepCrochet * 4 / 1000), {ease: FlxEase.elasticInOut}); @@ -2497,36 +2047,6 @@ class PlayState extends MusicBeatState // FlxG.watch.addQuick('Queued',inputsQueued); } - if (curSong == 'Fresh') - { - switch (curBeat) - { - case 16: - camZooming = true; - gfSpeed = 2; - case 48: - gfSpeed = 1; - case 80: - gfSpeed = 2; - case 112: - gfSpeed = 1; - case 163: - // FlxG.sound.music.stop(); - // FlxG.switchState(new TitleState()); - } - } - - if (curSong == 'Bopeebo') - { - switch (curBeat) - { - case 128, 129, 130: - vocals.volume = 0; - // FlxG.sound.music.stop(); - // FlxG.switchState(new PlayState()); - } - } - if (health <= 0) { boyfriend.stunned = true; @@ -3456,95 +2976,6 @@ class PlayState extends MusicBeatState updateAccuracy(); } } - - - var fastCarCanDrive:Bool = true; - - function resetFastCar():Void - { - fastCar.x = -12600; - fastCar.y = FlxG.random.int(140, 250); - fastCar.velocity.x = 0; - fastCarCanDrive = true; - } - - function fastCarDrive() - { - FlxG.sound.play(Paths.soundRandom('carPass', 0, 1), 0.7); - - fastCar.velocity.x = (FlxG.random.int(170, 220) / FlxG.elapsed) * 3; - fastCarCanDrive = false; - new FlxTimer().start(2, function(tmr:FlxTimer) - { - resetFastCar(); - }); - } - - var trainMoving:Bool = false; - var trainFrameTiming:Float = 0; - - var trainCars:Int = 8; - var trainFinishing:Bool = false; - var trainCooldown:Int = 0; - - function trainStart():Void - { - trainMoving = true; - if (!trainSound.playing) - trainSound.play(true); - } - - var startedMoving:Bool = false; - - function updateTrainPos():Void - { - if (trainSound.time >= 4700) - { - startedMoving = true; - gf.playAnim('hairBlow'); - } - - if (startedMoving) - { - phillyTrain.x -= 400; - - if (phillyTrain.x < -2000 && !trainFinishing) - { - phillyTrain.x = -1150; - trainCars -= 1; - - if (trainCars <= 0) - trainFinishing = true; - } - - if (phillyTrain.x < -4000 && trainFinishing) - trainReset(); - } - } - - function trainReset():Void - { - gf.playAnim('hairFall'); - phillyTrain.x = FlxG.width + 200; - trainMoving = false; - // trainSound.stop(); - // trainSound.time = 0; - trainCars = 8; - trainFinishing = false; - startedMoving = false; - } - - function lightningStrikeShit():Void - { - FlxG.sound.play(Paths.soundRandom('thunder_', 1, 2)); - halloweenBG.animation.play('lightning'); - - lightningStrikeBeat = curBeat; - lightningOffset = FlxG.random.int(8, 24); - - boyfriend.playAnim('scared', true); - gf.playAnim('scared', true); - } var resetSpookyText:Bool = true; @@ -3740,22 +3171,6 @@ class PlayState extends MusicBeatState } } - // FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM); - wiggleShit.update(Conductor.crochet); - - // HARDCODING FOR MILF ZOOMS! - if (curSong.toLowerCase() == 'milf' && curBeat >= 168 && curBeat < 200 && camZooming && FlxG.camera.zoom < 1.35) - { - FlxG.camera.zoom += 0.015; - camHUD.zoom += 0.03; - } - - if (camZooming && FlxG.camera.zoom < 1.35 && curBeat % 4 == 0) - { - FlxG.camera.zoom += 0.015; - camHUD.zoom += 0.03; - } - iconP1.setGraphicSize(Std.int(iconP1.width + 30)); iconP2.setGraphicSize(Std.int(iconP2.width + 30)); @@ -3773,16 +3188,6 @@ class PlayState extends MusicBeatState boyfriend.playAnim('idle'); } - if (curBeat % 8 == 7 && curSong == 'Bopeebo') - { - boyfriend.playAnim('hey', true); - - if (SONG.song == 'Tutorial' && dad.curCharacter == 'gf') - { - dad.playAnim('cheer', true); - } - } - if (curBeat == 532 && curSong.toLowerCase() == "expurgation") { dad.playAnim('Hank', true); @@ -3793,52 +3198,6 @@ class PlayState extends MusicBeatState dad.playAnim('idle', true); } - switch (curStage) - { - case 'school': - bgGirls.dance(); - - case 'mall': - upperBoppers.animation.play('bop', true); - bottomBoppers.animation.play('bop', true); - santa.animation.play('idle', true); - - case 'limo': - grpLimoDancers.forEach(function(dancer:BackgroundDancer) - { - dancer.dance(); - }); - - if (FlxG.random.bool(10) && fastCarCanDrive) - fastCarDrive(); - case "philly": - if (!trainMoving) - trainCooldown += 1; - - if (curBeat % 4 == 0) - { - phillyCityLights.forEach(function(light:FlxSprite) - { - light.visible = false; - }); - - curLight = FlxG.random.int(0, phillyCityLights.length - 1); - - phillyCityLights.members[curLight].visible = true; - // phillyCityLights.members[curLight].alpha = 1; - } - - if (curBeat % 8 == 4 && FlxG.random.bool(30) && !trainMoving && trainCooldown > 8) - { - trainCooldown = FlxG.random.int(-4, 0); - trainStart(); - } - } - - if (isHalloween && FlxG.random.bool(10) && curBeat > lightningStrikeBeat + lightningOffset) - { - lightningStrikeShit(); - } } var curLight:Int = 0; diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index b1377be1..caf72932 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -22,39 +22,18 @@ class StoryMenuState extends MusicBeatState var scoreText:FlxText; var weekData:Array = [ - ['Tutorial'], - ['Bopeebo', 'Fresh', 'Dadbattle'], - ['Spookeez', 'South', "Monster"], - ['Pico', 'Philly', "Blammed"], - ['Satin-Panties', "High", "Milf"], - ['Cocoa', 'Eggnog', 'Winter-Horrorland'], - ['Senpai', 'Roses', 'Thorns'], ['Improbable-Outset', 'Madness', 'Hellclown'] ]; var curDifficulty:Int = 1; - public static var weekUnlocked:Array = [true, true, true, true, true, true, true, true]; + public static var weekUnlocked:Array = [true]; var weekCharacters:Array = [ - ['dad', 'bf', 'gf'], - ['dad', 'bf', 'gf'], - ['spooky', 'bf', 'gf'], - ['pico', 'bf', 'gf'], - ['mom', 'bf', 'gf'], - ['parents-christmas', 'bf', 'gf'], - ['senpai', 'bf', 'gf'], ['trickyMask', 'bf', 'gf'] ]; var weekNames:Array = [ - "", - "Daddy Dearest", - "Spooky Month", - "PICO", - "MOMMY MUST MURDER", - "RED SNOW", - "hating simulator ft. moawling", - "Circus Clown", + "Madness" ]; var txtWeekTitle:FlxText; diff --git a/source/WiggleEffect.hx b/source/WiggleEffect.hx deleted file mode 100644 index ac2bd3bb..00000000 --- a/source/WiggleEffect.hx +++ /dev/null @@ -1,133 +0,0 @@ -package; - -// STOLEN FROM HAXEFLIXEL DEMO LOL -import flixel.system.FlxAssets.FlxShader; - -enum WiggleEffectType -{ - DREAMY; - WAVY; - HEAT_WAVE_HORIZONTAL; - HEAT_WAVE_VERTICAL; - FLAG; -} - -class WiggleEffect -{ - public var shader(default, null):WiggleShader = new WiggleShader(); - public var effectType(default, set):WiggleEffectType = DREAMY; - public var waveSpeed(default, set):Float = 0; - public var waveFrequency(default, set):Float = 0; - public var waveAmplitude(default, set):Float = 0; - - public function new():Void - { - shader.uTime.value = [0]; - } - - public function update(elapsed:Float):Void - { - shader.uTime.value[0] += elapsed; - } - - function set_effectType(v:WiggleEffectType):WiggleEffectType - { - effectType = v; - shader.effectType.value = [WiggleEffectType.getConstructors().indexOf(Std.string(v))]; - return v; - } - - function set_waveSpeed(v:Float):Float - { - waveSpeed = v; - shader.uSpeed.value = [waveSpeed]; - return v; - } - - function set_waveFrequency(v:Float):Float - { - waveFrequency = v; - shader.uFrequency.value = [waveFrequency]; - return v; - } - - function set_waveAmplitude(v:Float):Float - { - waveAmplitude = v; - shader.uWaveAmplitude.value = [waveAmplitude]; - return v; - } -} - -class WiggleShader extends FlxShader -{ - @:glFragmentSource(' - #pragma header - //uniform float tx, ty; // x,y waves phase - uniform float uTime; - - const int EFFECT_TYPE_DREAMY = 0; - const int EFFECT_TYPE_WAVY = 1; - const int EFFECT_TYPE_HEAT_WAVE_HORIZONTAL = 2; - const int EFFECT_TYPE_HEAT_WAVE_VERTICAL = 3; - const int EFFECT_TYPE_FLAG = 4; - - uniform int effectType; - - /** - * How fast the waves move over time - */ - uniform float uSpeed; - - /** - * Number of waves over time - */ - uniform float uFrequency; - - /** - * How much the pixels are going to stretch over the waves - */ - uniform float uWaveAmplitude; - - vec2 sineWave(vec2 pt) - { - float x = 0.0; - float y = 0.0; - - if (effectType == EFFECT_TYPE_DREAMY) - { - float offsetX = sin(pt.y * uFrequency + uTime * uSpeed) * uWaveAmplitude; - pt.x += offsetX; // * (pt.y - 1.0); // <- Uncomment to stop bottom part of the screen from moving - } - else if (effectType == EFFECT_TYPE_WAVY) - { - float offsetY = sin(pt.x * uFrequency + uTime * uSpeed) * uWaveAmplitude; - pt.y += offsetY; // * (pt.y - 1.0); // <- Uncomment to stop bottom part of the screen from moving - } - else if (effectType == EFFECT_TYPE_HEAT_WAVE_HORIZONTAL) - { - x = sin(pt.x * uFrequency + uTime * uSpeed) * uWaveAmplitude; - } - else if (effectType == EFFECT_TYPE_HEAT_WAVE_VERTICAL) - { - y = sin(pt.y * uFrequency + uTime * uSpeed) * uWaveAmplitude; - } - else if (effectType == EFFECT_TYPE_FLAG) - { - y = sin(pt.y * uFrequency + 10.0 * pt.x + uTime * uSpeed) * uWaveAmplitude; - x = sin(pt.x * uFrequency + 5.0 * pt.y + uTime * uSpeed) * uWaveAmplitude; - } - - return vec2(pt.x + x, pt.y + y); - } - - void main() - { - vec2 uv = sineWave(openfl_TextureCoordv); - gl_FragColor = texture2D(bitmap, uv); - }') - public function new() - { - super(); - } -}