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

idk campaign menu shit

This commit is contained in:
Cameron Taylor 2021-02-02 02:20:14 -05:00
parent 6162deabd3
commit 12913828d6
11 changed files with 90 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
art/flashFiles/Week_6_BG_2.fla Normal file
View File

Binary file not shown.

BIN
art/flashFiles/campaign_menu_UI_assets.fla
View File

Binary file not shown.

3
assets/data/introText.txt
View File

@ -35,4 +35,5 @@ good bye--my penis
dababy--biggest inspiration
fashionably late--but here it is
yooooooooooo--yooooooooo
pico funny--pico funny
pico funny--pico funny
updates each friday--on time every time

BIN
assets/images/campaign_menu_UI_assets.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 125 KiB

24
assets/images/campaign_menu_UI_assets.xml
View File

@ -11,15 +11,17 @@
<SubTexture name="Week 3 press0001" x="368" y="176" width="358" height="89"/>
<SubTexture name="Week 4 press0000" x="0" y="275" width="355" height="89"/>
<SubTexture name="Week 4 press0001" x="365" y="275" width="355" height="89"/>
<SubTexture name="arrow left0000" x="730" y="275" width="48" height="85"/>
<SubTexture name="arrow push left0000" x="788" y="275" width="42" height="75"/>
<SubTexture name="arrow push right0000" x="840" y="275" width="41" height="74"/>
<SubTexture name="arrow right0000" x="891" y="275" width="47" height="85"/>
<SubTexture name="lock0000" x="948" y="275" width="67" height="93"/>
<SubTexture name="tutorial selected0000" x="0" y="378" width="443" height="82"/>
<SubTexture name="tutorial selected0001" x="453" y="378" width="443" height="82"/>
<SubTexture name="week 50000" x="0" y="470" width="364" height="91"/>
<SubTexture name="week 50001" x="374" y="470" width="364" height="91"/>
<SubTexture name="week2 select0000" x="0" y="571" width="361" height="87"/>
<SubTexture name="week2 select0001" x="371" y="571" width="361" height="87"/>
<SubTexture name="Week 60000" x="0" y="374" width="359" height="92"/>
<SubTexture name="Week 60001" x="369" y="374" width="359" height="92"/>
<SubTexture name="arrow left0000" x="738" y="374" width="48" height="85"/>
<SubTexture name="arrow push left0000" x="796" y="374" width="42" height="75"/>
<SubTexture name="arrow push right0000" x="848" y="374" width="41" height="74"/>
<SubTexture name="arrow right0000" x="899" y="374" width="47" height="85"/>
<SubTexture name="lock0000" x="956" y="374" width="67" height="93"/>
<SubTexture name="tutorial selected0000" x="0" y="477" width="443" height="82"/>
<SubTexture name="tutorial selected0001" x="453" y="477" width="443" height="82"/>
<SubTexture name="week 50000" x="0" y="569" width="364" height="91"/>
<SubTexture name="week 50001" x="374" y="569" width="364" height="91"/>
<SubTexture name="week2 select0000" x="0" y="670" width="361" height="87"/>
<SubTexture name="week2 select0001" x="371" y="670" width="361" height="87"/>
</TextureAtlas>

BIN
assets/images/campaign_menu_UI_characters.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 MiB

After

Width:  |  Height:  |  Size: 2.2 MiB

46
assets/images/campaign_menu_UI_characters.xml
View File

@ -128,20 +128,34 @@
<SubTexture name="Pico Idle Dance0011" x="7114" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0012" x="7114" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0013" x="7114" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="spooky dance idle BLACK LINES0000" x="7567" y="2274" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0001" x="7567" y="2274" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0002" x="0" y="3066" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0003" x="0" y="3066" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0004" x="389" y="3066" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0005" x="389" y="3066" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0006" x="756" y="3066" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0007" x="756" y="3066" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0008" x="1120" y="3066" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0009" x="1120" y="3066" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0010" x="1622" y="3066" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0011" x="1622" y="3066" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0012" x="389" y="3066" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0013" x="389" y="3066" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0014" x="756" y="3066" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0015" x="756" y="3066" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="SENPAI idle Black Lines0000" x="7567" y="2274" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0001" x="7567" y="2274" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0002" x="0" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0003" x="0" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0004" x="346" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0005" x="346" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0006" x="692" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0007" x="692" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0008" x="1038" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0009" x="1038" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0010" x="1038" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0011" x="1038" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0012" x="1038" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0013" x="1038" y="3066" width="336" height="288"/>
<SubTexture name="spooky dance idle BLACK LINES0000" x="1384" y="3066" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0001" x="1384" y="3066" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0002" x="1775" y="3066" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0003" x="1775" y="3066" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0004" x="2164" y="3066" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0005" x="2164" y="3066" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0006" x="2531" y="3066" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0007" x="2531" y="3066" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0008" x="2895" y="3066" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0009" x="2895" y="3066" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0010" x="3397" y="3066" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0011" x="3397" y="3066" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0012" x="2164" y="3066" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0013" x="2164" y="3066" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0014" x="2531" y="3066" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0015" x="2531" y="3066" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
</TextureAtlas>

2
source/MainMenuState.hx
View File

@ -22,7 +22,7 @@ class MainMenuState extends MusicBeatState
var menuItems:FlxTypedGroup<FlxSprite>;
#if !switch
var optionShit:Array<String> = ['story mode', 'freeplay', 'donate', 'options'];
var optionShit:Array<String> = ['story mode', 'freeplay', 'donate'];
#else
var optionShit:Array<String> = ['story mode', 'freeplay'];
#end

1
source/MenuCharacter.hx
View File

@ -24,6 +24,7 @@ class MenuCharacter extends FlxSprite
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);
// Parent Christmas Idle
animation.play(character);

1
source/MenuItem.hx
View File

@ -25,6 +25,7 @@ class MenuItem extends FlxSpriteGroup
week.animation.addByPrefix('week3', "Week 3 press", 24);
week.animation.addByPrefix('week4', "Week 4 press", 24);
week.animation.addByPrefix('week5', "week 5", 24);
week.animation.addByPrefix('week6', "Week 6", 24);
add(week);
week.animation.play('week' + weekNum);

51
source/StoryMenuState.hx
View File

@ -24,11 +24,12 @@ class StoryMenuState extends MusicBeatState
['Spookeez', 'South'],
['Pico', 'Philly', "Blammed"],
['Satin-Panties', "High", "Milf"],
['Cocoa', 'Eggnog', 'Winter-Horrorland']
['Cocoa', 'Eggnog', 'Winter-Horrorland'],
['Senpai', 'Roses', 'Thorns']
];
var curDifficulty:Int = 1;
public static var weekUnlocked:Array<Bool> = [true, true, true, true, true, true];
public static var weekUnlocked:Array<Bool> = [true, true, true, true, true, true, true];
var weekCharacters:Array<Dynamic> = [
['dad', 'bf', 'gf'],
@ -36,8 +37,22 @@ class StoryMenuState extends MusicBeatState
['spooky', 'bf', 'gf'],
['pico', 'bf', 'gf'],
['mom', 'bf', 'gf'],
['parents-christmas', 'bf', 'gf']
['parents-christmas', 'bf', 'gf'],
['senpai', 'bf', 'gf']
];
var weekNames:Array<String> = [
"",
"Daddy Dearest",
"Spooky Month",
"PICO",
"MOMMY MUST MURDER",
"RED SNOW",
"hating simulator ft. moawling"
];
var txtWeekTitle:FlxText;
var curWeek:Int = 0;
var txtTracklist:FlxText;
@ -65,6 +80,10 @@ class StoryMenuState extends MusicBeatState
scoreText = new FlxText(10, 10, 0, "SCORE: 49324858", 36);
scoreText.setFormat("VCR OSD Mono", 32);
txtWeekTitle = new FlxText(FlxG.width * 0.7, 10, 0, "", 32);
txtWeekTitle.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, RIGHT);
txtWeekTitle.alpha = 0.7;
var rankText:FlxText = new FlxText(0, 10);
rankText.text = 'RANK: GREAT';
rankText.setFormat("assets/fonts/vcr.ttf", 32);
@ -132,11 +151,8 @@ class StoryMenuState extends MusicBeatState
weekCharacterThing.setGraphicSize(Std.int(weekCharacterThing.width * 0.5));
weekCharacterThing.updateHitbox();
case 'pico':
weekCharacterThing.y += 170;
weekCharacterThing.flipX = true;
weekCharacterThing.x -= 40;
case 'parents-christmas':
weekCharacterThing.x -= 600;
weekCharacterThing.setGraphicSize(Std.int(weekCharacterThing.width * 0.9));
weekCharacterThing.updateHitbox();
}
@ -185,6 +201,7 @@ class StoryMenuState extends MusicBeatState
add(txtTracklist);
// add(rankText);
add(scoreText);
add(txtWeekTitle);
updateText();
@ -199,6 +216,10 @@ class StoryMenuState extends MusicBeatState
lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.5));
scoreText.text = "WEEK SCORE:" + lerpScore;
txtWeekTitle.text = weekNames[curWeek].toUpperCase();
txtWeekTitle.x = FlxG.width - (txtWeekTitle.width + 10);
// FlxG.watch.addQuick('font', scoreText.font);
difficultySelectors.visible = weekUnlocked[curWeek];
@ -375,11 +396,23 @@ class StoryMenuState extends MusicBeatState
switch (grpWeekCharacters.members[0].animation.curAnim.name)
{
case 'parents-christmas':
grpWeekCharacters.members[0].offset.x = 250;
grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 0.97));
grpWeekCharacters.members[0].offset.set(200, 200);
grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 0.99));
case 'senpai':
grpWeekCharacters.members[0].offset.set(130, 0);
grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 1.4));
case 'mom':
grpWeekCharacters.members[0].offset.set(100, 200);
grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 1));
case 'dad':
grpWeekCharacters.members[0].offset.set(120, 200);
grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 1));
default:
grpWeekCharacters.members[0].offset.x = 100;
grpWeekCharacters.members[0].offset.set(100, 100);
grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 1));
// grpWeekCharacters.members[0].updateHitbox();
}