polish polish polish polish
This commit is contained in:
parent
11b1017753
commit
fcdfbd8f73
BIN
art/funkinpause.fla
Normal file
BIN
art/funkinpause.fla
Normal file
Binary file not shown.
BIN
art/funkinpauseyellow.fla
Normal file
BIN
art/funkinpauseyellow.fla
Normal file
Binary file not shown.
BIN
assets/images/menuBGMagenta.png
Normal file
BIN
assets/images/menuBGMagenta.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 540 KiB |
BIN
assets/images/newgrounds_logo.png
Normal file
BIN
assets/images/newgrounds_logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 56 KiB |
@ -425,9 +425,9 @@ class Controls extends FlxActionSet
|
|||||||
inline bindKeys(Control.DOWN, [S, FlxKey.DOWN]);
|
inline bindKeys(Control.DOWN, [S, FlxKey.DOWN]);
|
||||||
inline bindKeys(Control.LEFT, [A, FlxKey.LEFT]);
|
inline bindKeys(Control.LEFT, [A, FlxKey.LEFT]);
|
||||||
inline bindKeys(Control.RIGHT, [D, FlxKey.RIGHT]);
|
inline bindKeys(Control.RIGHT, [D, FlxKey.RIGHT]);
|
||||||
inline bindKeys(Control.ACCEPT, [Z, SPACE]);
|
inline bindKeys(Control.ACCEPT, [Z, SPACE, ENTER]);
|
||||||
inline bindKeys(Control.BACK, [X]);
|
inline bindKeys(Control.BACK, [BACKSPACE, ESCAPE]);
|
||||||
inline bindKeys(Control.PAUSE, [P, ENTER]);
|
inline bindKeys(Control.PAUSE, [P, ENTER, ESCAPE]);
|
||||||
inline bindKeys(Control.RESET, [R]);
|
inline bindKeys(Control.RESET, [R]);
|
||||||
case Duo(true):
|
case Duo(true):
|
||||||
inline bindKeys(Control.UP, [W]);
|
inline bindKeys(Control.UP, [W]);
|
||||||
|
@ -36,10 +36,16 @@ class MainMenuState extends MusicBeatState
|
|||||||
camFollow = new FlxObject(0, 0, 1, 1);
|
camFollow = new FlxObject(0, 0, 1, 1);
|
||||||
add(camFollow);
|
add(camFollow);
|
||||||
|
|
||||||
magenta = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, 0xFFF44688);
|
magenta = new FlxSprite(-80).loadGraphic(AssetPaths.menuBGMagenta__png);
|
||||||
|
magenta.scrollFactor.x = 0;
|
||||||
|
magenta.scrollFactor.y = 0.18;
|
||||||
|
magenta.setGraphicSize(Std.int(magenta.width * 1.1));
|
||||||
|
magenta.updateHitbox();
|
||||||
|
magenta.screenCenter();
|
||||||
magenta.visible = false;
|
magenta.visible = false;
|
||||||
|
magenta.antialiasing = true;
|
||||||
add(magenta);
|
add(magenta);
|
||||||
magenta.scrollFactor.set();
|
// magenta.scrollFactor.set();
|
||||||
|
|
||||||
menuItems = new FlxTypedGroup<FlxSprite>();
|
menuItems = new FlxTypedGroup<FlxSprite>();
|
||||||
add(menuItems);
|
add(menuItems);
|
||||||
@ -84,7 +90,7 @@ class MainMenuState extends MusicBeatState
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FlxFlicker.flicker(magenta, 0, 0.30);
|
FlxFlicker.flicker(magenta, 1.1, 0.15, false);
|
||||||
|
|
||||||
menuItems.forEach(function(spr:FlxSprite)
|
menuItems.forEach(function(spr:FlxSprite)
|
||||||
{
|
{
|
||||||
|
@ -111,6 +111,14 @@ class PlayState extends MusicBeatState
|
|||||||
"If you want to date her...",
|
"If you want to date her...",
|
||||||
"You're going to have to go \nthrough ME first!"
|
"You're going to have to go \nthrough ME first!"
|
||||||
];
|
];
|
||||||
|
case 'fresh':
|
||||||
|
dialogue = ["Not too shabby boy.", ""];
|
||||||
|
case 'dadbattle':
|
||||||
|
dialogue = [
|
||||||
|
"gah you think you're hot stuff?",
|
||||||
|
"If you can beat me here...",
|
||||||
|
"Only then I will even CONSIDER letting you\ndate my daughter!"
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south')
|
if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south')
|
||||||
|
@ -156,6 +156,8 @@ class StoryMenuState extends MusicBeatState
|
|||||||
lock.y = grpWeekText.members[lock.ID].y;
|
lock.y = grpWeekText.members[lock.ID].y;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (!movedBack)
|
||||||
|
{
|
||||||
if (!selectedWeek)
|
if (!selectedWeek)
|
||||||
{
|
{
|
||||||
if (controls.UP_P)
|
if (controls.UP_P)
|
||||||
@ -166,10 +168,18 @@ class StoryMenuState extends MusicBeatState
|
|||||||
|
|
||||||
if (controls.ACCEPT)
|
if (controls.ACCEPT)
|
||||||
selectWeek();
|
selectWeek();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (controls.BACK && !movedBack && !selectedWeek)
|
||||||
|
{
|
||||||
|
movedBack = true;
|
||||||
|
FlxG.switchState(new MainMenuState());
|
||||||
|
}
|
||||||
|
|
||||||
super.update(elapsed);
|
super.update(elapsed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var movedBack:Bool = false;
|
||||||
var selectedWeek:Bool = false;
|
var selectedWeek:Bool = false;
|
||||||
|
|
||||||
function selectWeek()
|
function selectWeek()
|
||||||
|
@ -27,13 +27,15 @@ class TitleState extends MusicBeatState
|
|||||||
var credGroup:FlxGroup;
|
var credGroup:FlxGroup;
|
||||||
var credTextShit:Alphabet;
|
var credTextShit:Alphabet;
|
||||||
var textGroup:FlxGroup;
|
var textGroup:FlxGroup;
|
||||||
|
var ngSpr:FlxSprite;
|
||||||
|
|
||||||
var wackyIntros:Array<Array<String>> = [
|
var wackyIntros:Array<Array<String>> = [
|
||||||
['Shoutouts to tom fulp', 'lmao'], ["Ludum dare", "extraordinaire"], ['Cyberzone', 'coming soon'], ['love to thriftman', 'swag'],
|
['Shoutouts to tom fulp', 'lmao'], ["Ludum dare", "extraordinaire"], ['Cyberzone', 'coming soon'], ['love to thriftman', 'swag'],
|
||||||
['ULTIMATE RHYTHM GAMING', 'probably'], ['DOPE ASS GAME', 'playstation magazine'], ['in loving memory of', 'henryeyes'], ['dancin', 'forever'],
|
['ULTIMATE RHYTHM GAMING', 'probably'], ['DOPE ASS GAME', 'playstation magazine'], ['in loving memory of', 'henryeyes'], ['dancin', 'forever'],
|
||||||
['Ritz dx', 'rest in peace'], ['rate five', 'do not blam'], ['rhythm gaming', 'ultimate'], ['game of the year', 'forever'],
|
['Ritz dx', 'rest in peace'], ['rate five', 'pls no blam'], ['rhythm gaming', 'ultimate'], ['game of the year', 'forever'],
|
||||||
['you already know', 'we really out here'], ['rise and grind', 'love to luis'], ['like parappa', 'but cooler'],
|
['you already know', 'we really out here'], ['rise and grind', 'love to luis'], ['like parappa', 'but cooler'],
|
||||||
['album of the year', 'chuckie finster']];
|
['album of the year', 'chuckie finster'], ["free gitaroo man", "with love to wandaboy"], ['better than geometry dash', 'fight me robtop'],
|
||||||
|
['kiddbrute for president', 'vote now']];
|
||||||
|
|
||||||
var curWacky:Array<String> = [];
|
var curWacky:Array<String> = [];
|
||||||
|
|
||||||
@ -115,6 +117,13 @@ class TitleState extends MusicBeatState
|
|||||||
|
|
||||||
credTextShit.visible = false;
|
credTextShit.visible = false;
|
||||||
|
|
||||||
|
ngSpr = new FlxSprite(0, FlxG.height * 0.52).loadGraphic(AssetPaths.newgrounds_logo__png);
|
||||||
|
add(ngSpr);
|
||||||
|
ngSpr.visible = false;
|
||||||
|
ngSpr.setGraphicSize(Std.int(ngSpr.width * 0.8));
|
||||||
|
ngSpr.updateHitbox();
|
||||||
|
ngSpr.screenCenter(X);
|
||||||
|
|
||||||
FlxTween.tween(credTextShit, {y: credTextShit.y + 20}, 2.9, {ease: FlxEase.quadInOut, type: PINGPONG});
|
FlxTween.tween(credTextShit, {y: credTextShit.y + 20}, 2.9, {ease: FlxEase.quadInOut, type: PINGPONG});
|
||||||
|
|
||||||
// credGroup.add(credTextShit);
|
// credGroup.add(credTextShit);
|
||||||
@ -216,9 +225,11 @@ class TitleState extends MusicBeatState
|
|||||||
createCoolText(['In association', 'with']);
|
createCoolText(['In association', 'with']);
|
||||||
case 7:
|
case 7:
|
||||||
addMoreText('newgrounds');
|
addMoreText('newgrounds');
|
||||||
|
ngSpr.visible = true;
|
||||||
// credTextShit.text += '\nNewgrounds';
|
// credTextShit.text += '\nNewgrounds';
|
||||||
case 8:
|
case 8:
|
||||||
deleteCoolText();
|
deleteCoolText();
|
||||||
|
ngSpr.visible = false;
|
||||||
// credTextShit.visible = false;
|
// credTextShit.visible = false;
|
||||||
|
|
||||||
// credTextShit.text = 'Shoutouts Tom Fulp';
|
// credTextShit.text = 'Shoutouts Tom Fulp';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user