cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-02-03 02:08:13 +00:00
Code Issues Releases Wiki Activity

polish polish polish polish

Browse source
This commit is contained in:
Cameron Taylor 2020-10-31 03:07:22 -07:00
parent 4997cfddaf
commit 74054b5ece
5 changed files with 50 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/Controls.hx
View file

@ -425,9 +425,9 @@ class Controls extends FlxActionSet
inline bindKeys(Control.DOWN, [S, FlxKey.DOWN]);
inline bindKeys(Control.LEFT, [A, FlxKey.LEFT]);
inline bindKeys(Control.RIGHT, [D, FlxKey.RIGHT]);
inline bindKeys(Control.ACCEPT, [Z, SPACE]);
inline bindKeys(Control.BACK, [X]);
inline bindKeys(Control.PAUSE, [P, ENTER]);
inline bindKeys(Control.ACCEPT, [Z, SPACE, ENTER]);
inline bindKeys(Control.BACK, [BACKSPACE, ESCAPE]);
inline bindKeys(Control.PAUSE, [P, ENTER, ESCAPE]);
inline bindKeys(Control.RESET, [R]);
case Duo(true):
inline bindKeys(Control.UP, [W]);

12
source/MainMenuState.hx
View file

@ -36,10 +36,16 @@ class MainMenuState extends MusicBeatState
camFollow = new FlxObject(0, 0, 1, 1);
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.antialiasing = true;
add(magenta);
magenta.scrollFactor.set();
// magenta.scrollFactor.set();
menuItems = new FlxTypedGroup<FlxSprite>();
add(menuItems);
@ -84,7 +90,7 @@ class MainMenuState extends MusicBeatState
}
else
{
FlxFlicker.flicker(magenta, 0, 0.30);
FlxFlicker.flicker(magenta, 1.1, 0.15, false);
menuItems.forEach(function(spr:FlxSprite)
{

8
source/PlayState.hx
View file

@ -111,6 +111,14 @@ class PlayState extends MusicBeatState
"If you want to date her...",
"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')

24
source/StoryMenuState.hx
View file

@ -156,20 +156,30 @@ class StoryMenuState extends MusicBeatState
lock.y = grpWeekText.members[lock.ID].y;
});
if (!selectedWeek)
if (!movedBack)
{
if (controls.UP_P)
changeWeek(-1);
if (controls.DOWN_P)
changeWeek(1);
if (!selectedWeek)
{
if (controls.UP_P)
changeWeek(-1);
if (controls.DOWN_P)
changeWeek(1);
}
if (controls.ACCEPT)
selectWeek();
}
if (controls.ACCEPT)
selectWeek();
if (controls.BACK && !movedBack && !selectedWeek)
{
movedBack = true;
FlxG.switchState(new MainMenuState());
}
super.update(elapsed);
}
var movedBack:Bool = false;
var selectedWeek:Bool = false;
function selectWeek()

15
source/TitleState.hx
View file

@ -27,13 +27,15 @@ class TitleState extends MusicBeatState
var credGroup:FlxGroup;
var credTextShit:Alphabet;
var textGroup:FlxGroup;
var ngSpr:FlxSprite;
var wackyIntros:Array<Array<String>> = [
['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'],
['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'],
['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> = [];
@ -115,6 +117,13 @@ class TitleState extends MusicBeatState
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});
// credGroup.add(credTextShit);
@ -216,9 +225,11 @@ class TitleState extends MusicBeatState
createCoolText(['In association', 'with']);
case 7:
addMoreText('newgrounds');
ngSpr.visible = true;
// credTextShit.text += '\nNewgrounds';
case 8:
deleteCoolText();
ngSpr.visible = false;
// credTextShit.visible = false;
// credTextShit.text = 'Shoutouts Tom Fulp';