cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

assets, and switch statement so i dont get roasted

This commit is contained in:
Cameron Taylor 2021-03-07 01:59:22 -05:00
parent 1c06b62fd5
commit 847ec80f07
13 changed files with 332 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/preload/data/introText.txt
View File

@ -39,3 +39,4 @@ pico funny--pico funny
updates each friday--on time every time
shoutouts to mason--for da homies
bonk--get in the discord call
youtube search--DAnMLkteUHk

BIN
assets/week7/images/smokeLeft.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 MiB

53
assets/week7/images/smokeLeft.xml Normal file
View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="smokeLeft.png">
<!-- Created with Adobe Animate version 21.0.0.35450 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="SmokeBlurLeft instance 10000" x="1005" y="812" width="446" height="617" frameX="-43" frameY="-204" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10001" x="1005" y="812" width="446" height="617" frameX="-43" frameY="-204" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10002" x="1005" y="812" width="446" height="617" frameX="-43" frameY="-204" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10003" x="0" y="801" width="467" height="655" frameX="-28" frameY="-177" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10004" x="0" y="801" width="467" height="655" frameX="-28" frameY="-177" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10005" x="0" y="801" width="467" height="655" frameX="-28" frameY="-177" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10006" x="1505" y="786" width="481" height="673" frameX="-15" frameY="-151" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10007" x="1505" y="786" width="481" height="673" frameX="-15" frameY="-151" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10008" x="1505" y="786" width="481" height="673" frameX="-15" frameY="-151" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10009" x="2981" y="752" width="487" height="724" frameX="0" frameY="-119" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10010" x="2981" y="752" width="487" height="724" frameX="0" frameY="-119" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10011" x="2981" y="752" width="487" height="724" frameX="0" frameY="-119" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10012" x="2011" y="779" width="472" height="736" frameX="-11" frameY="-83" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10013" x="2011" y="779" width="472" height="736" frameX="-11" frameY="-83" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10014" x="2011" y="779" width="472" height="736" frameX="-11" frameY="-83" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10015" x="2981" y="0" width="477" height="741" frameX="-7" frameY="-68" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10016" x="2981" y="0" width="477" height="741" frameX="-7" frameY="-68" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10017" x="2981" y="0" width="477" height="741" frameX="-7" frameY="-68" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10018" x="3478" y="752" width="472" height="741" frameX="-19" frameY="-56" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10019" x="3478" y="752" width="472" height="741" frameX="-19" frameY="-56" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10020" x="3478" y="752" width="472" height="741" frameX="-19" frameY="-56" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10021" x="3468" y="0" width="476" height="742" frameX="-22" frameY="-58" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10022" x="3468" y="0" width="476" height="742" frameX="-22" frameY="-58" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10023" x="3468" y="0" width="476" height="742" frameX="-22" frameY="-58" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10024" x="2011" y="0" width="479" height="769" frameX="-21" frameY="-33" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10025" x="2011" y="0" width="479" height="769" frameX="-21" frameY="-33" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10026" x="2011" y="0" width="479" height="769" frameX="-21" frameY="-33" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10027" x="1505" y="0" width="496" height="776" frameX="-9" frameY="-23" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10028" x="1505" y="0" width="496" height="776" frameX="-9" frameY="-23" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10029" x="1505" y="0" width="496" height="776" frameX="-9" frameY="-23" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10030" x="0" y="0" width="498" height="791" frameX="-13" frameY="-11" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10031" x="0" y="0" width="498" height="791" frameX="-13" frameY="-11" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10032" x="0" y="0" width="498" height="791" frameX="-13" frameY="-11" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10033" x="1005" y="0" width="490" height="802" frameX="-17" frameY="-5" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10034" x="1005" y="0" width="490" height="802" frameX="-17" frameY="-5" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10035" x="1005" y="0" width="490" height="802" frameX="-17" frameY="-5" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10036" x="508" y="0" width="487" height="808" frameX="-21" frameY="0" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10037" x="508" y="0" width="487" height="808" frameX="-21" frameY="0" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10038" x="508" y="0" width="487" height="808" frameX="-21" frameY="0" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10039" x="2500" y="0" width="471" height="770" frameX="-25" frameY="-39" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10040" x="2500" y="0" width="471" height="770" frameX="-25" frameY="-39" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10041" x="2500" y="0" width="471" height="770" frameX="-25" frameY="-39" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10042" x="2493" y="780" width="447" height="775" frameX="-30" frameY="-37" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10043" x="2493" y="780" width="447" height="775" frameX="-30" frameY="-37" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10044" x="2493" y="780" width="447" height="775" frameX="-30" frameY="-37" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10045" x="477" y="818" width="452" height="602" frameX="-29" frameY="-217" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10046" x="477" y="818" width="452" height="602" frameX="-29" frameY="-217" frameWidth="511" frameHeight="843"/>
<SubTexture name="SmokeBlurLeft instance 10047" x="477" y="818" width="452" height="602" frameX="-29" frameY="-217" frameWidth="511" frameHeight="843"/>
</TextureAtlas>

BIN
assets/week7/images/smokeRight.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 MiB

53
assets/week7/images/smokeRight.xml Normal file
View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="smokeRight.png">
<!-- Created with Adobe Animate version 21.0.0.35450 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="SmokeRight instance 10000" x="0" y="897" width="533" height="885" frameX="-35" frameY="-47" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10001" x="1619" y="0" width="510" height="871" frameX="-38" frameY="-40" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10002" x="1619" y="0" width="510" height="871" frameX="-38" frameY="-40" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10003" x="1619" y="0" width="510" height="871" frameX="-38" frameY="-40" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10004" x="0" y="1792" width="501" height="871" frameX="-35" frameY="-32" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10005" x="0" y="1792" width="501" height="871" frameX="-35" frameY="-32" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10006" x="0" y="1792" width="501" height="871" frameX="-35" frameY="-32" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10007" x="1087" y="899" width="524" height="876" frameX="-24" frameY="-22" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10008" x="1087" y="899" width="524" height="876" frameX="-24" frameY="-22" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10009" x="1087" y="899" width="524" height="876" frameX="-24" frameY="-22" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10010" x="543" y="899" width="534" height="882" frameX="-16" frameY="-12" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10011" x="543" y="899" width="534" height="882" frameX="-16" frameY="-12" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10012" x="543" y="899" width="534" height="882" frameX="-16" frameY="-12" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10013" x="0" y="0" width="542" height="887" frameX="-2" frameY="-6" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10014" x="0" y="0" width="542" height="887" frameX="-2" frameY="-6" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10015" x="0" y="0" width="542" height="887" frameX="-2" frameY="-6" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10016" x="552" y="0" width="538" height="889" frameX="0" frameY="0" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10017" x="552" y="0" width="538" height="889" frameX="0" frameY="0" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10018" x="552" y="0" width="538" height="889" frameX="0" frameY="0" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10019" x="1621" y="881" width="535" height="830" frameX="0" frameY="-57" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10020" x="1621" y="881" width="535" height="830" frameX="0" frameY="-57" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10021" x="1621" y="881" width="535" height="830" frameX="0" frameY="-57" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10022" x="1621" y="1721" width="526" height="834" frameX="-5" frameY="-52" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10023" x="1621" y="1721" width="526" height="834" frameX="-5" frameY="-52" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10024" x="1621" y="1721" width="526" height="834" frameX="-5" frameY="-52" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10025" x="511" y="1792" width="525" height="815" frameX="-14" frameY="-68" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10026" x="511" y="1792" width="525" height="815" frameX="-14" frameY="-68" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10027" x="511" y="1792" width="525" height="815" frameX="-14" frameY="-68" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10028" x="2157" y="1721" width="515" height="738" frameX="-17" frameY="-146" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10029" x="2157" y="1721" width="515" height="738" frameX="-17" frameY="-146" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10030" x="2157" y="1721" width="515" height="738" frameX="-17" frameY="-146" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10031" x="2668" y="765" width="443" height="676" frameX="-32" frameY="-196" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10032" x="2668" y="765" width="443" height="676" frameX="-32" frameY="-196" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10033" x="2668" y="765" width="443" height="676" frameX="-32" frameY="-196" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10034" x="2668" y="0" width="481" height="755" frameX="-47" frameY="-149" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10035" x="2668" y="0" width="481" height="755" frameX="-47" frameY="-149" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10036" x="2668" y="0" width="481" height="755" frameX="-47" frameY="-149" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10037" x="1046" y="1791" width="508" height="802" frameX="-50" frameY="-121" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10038" x="1046" y="1791" width="508" height="802" frameX="-50" frameY="-121" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10039" x="1046" y="1791" width="508" height="802" frameX="-50" frameY="-121" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10040" x="2139" y="0" width="519" height="851" frameX="-37" frameY="-80" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10041" x="2139" y="0" width="519" height="851" frameX="-37" frameY="-80" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10042" x="2139" y="0" width="519" height="851" frameX="-37" frameY="-80" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10043" x="1100" y="0" width="509" height="878" frameX="-36" frameY="-60" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10044" x="1100" y="0" width="509" height="878" frameX="-36" frameY="-60" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10045" x="1100" y="0" width="509" height="878" frameX="-36" frameY="-60" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10046" x="0" y="897" width="533" height="885" frameX="-35" frameY="-47" frameWidth="568" frameHeight="938"/>
<SubTexture name="SmokeRight instance 10047" x="0" y="897" width="533" height="885" frameX="-35" frameY="-47" frameWidth="568" frameHeight="938"/>
</TextureAtlas>

BIN
assets/week7/images/tankBuildings.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 40 KiB

BIN
assets/week7/images/tankClouds.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
assets/week7/images/tankGround.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 162 KiB

BIN
assets/week7/images/tankMountains.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 92 KiB

BIN
assets/week7/images/tankRuins.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 552 KiB

BIN
assets/week7/images/tankSky.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
assets/week7/images/tankWatchtower.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 75 KiB

39
source/PlayState.hx
View File

@ -174,8 +174,9 @@ class PlayState extends MusicBeatState
dialogue = CoolUtil.coolTextFile(Paths.txt('thorns/thornsDialogue'));
}
if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south')
switch (Song.song.toLowerCase())
{
case 'spookeez' | 'monster' | 'south':
curStage = "spooky";
halloweenLevel = true;
@ -190,9 +191,7 @@ class PlayState extends MusicBeatState
add(halloweenBG);
isHalloween = true;
}
else if (SONG.song.toLowerCase() == 'pico' || SONG.song.toLowerCase() == 'blammed' || SONG.song.toLowerCase() == 'philly')
{
case 'pico' | 'blammed' | 'philly':
curStage = 'philly';
var bg:FlxSprite = new FlxSprite(-100).loadGraphic(Paths.image('philly/sky'));
@ -232,9 +231,7 @@ class PlayState extends MusicBeatState
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')
{
case "milf" | 'satin-panties' | 'high':
curStage = 'limo';
defaultCamZoom = 0.90;
@ -262,26 +259,19 @@ class PlayState extends MusicBeatState
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.frames = Paths.getSparrowAtlas('limo/limoDrive');
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')
{
case "cocoa" | 'eggnog':
curStage = 'mall';
defaultCamZoom = 0.80;
@ -335,9 +325,7 @@ class PlayState extends MusicBeatState
santa.animation.addByPrefix('idle', 'santa idle in fear', 24, false);
santa.antialiasing = true;
add(santa);
}
else if (SONG.song.toLowerCase() == 'winter-horrorland')
{
case 'winter-horrorland':
curStage = 'mallEvil';
var bg:FlxSprite = new FlxSprite(-400, -500).loadGraphic(Paths.image('christmas/evilBG'));
bg.antialiasing = true;
@ -355,9 +343,7 @@ class PlayState extends MusicBeatState
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')
{
case 'senpai' | 'roses':
curStage = 'school';
// defaultCamZoom = 0.9;
@ -422,9 +408,7 @@ class PlayState extends MusicBeatState
bgGirls.setGraphicSize(Std.int(bgGirls.width * daPixelZoom));
bgGirls.updateHitbox();
add(bgGirls);
}
else if (SONG.song.toLowerCase() == 'thorns')
{
case 'thorns':
curStage = 'schoolEvil';
var waveEffectBG = new FlxWaveEffect(FlxWaveMode.ALL, 2, -1, 3, 2);
@ -484,9 +468,8 @@ class PlayState extends MusicBeatState
add(waveSprite);
add(waveSpriteFG);
*/
}
else
{
default:
defaultCamZoom = 0.9;
curStage = 'stage';
var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(Paths.image('stageback'));