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

11/24/2020

This commit is contained in:
Brandon 2020-11-24 22:53:48 -05:00
parent bfaccf0dc9
commit 89134e1243
14 changed files with 317 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CHANGELOG.md
View File

@ -4,13 +4,23 @@ All notable changes will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [0.2.2] - 2020-11-20
### Added
- Music playing on the freeplay menu.
- UI sounds on freeplay menu
- Score now shows mid-song.
- Menu on pause screen! Can resume, and restart song, or go back to main menu.
- New music made for pause menu!
### Changed ### Changed
- Moved all the intro texts to its own txt file instead of being hardcoded, this allows for much easier customization. File is in the data folder, called "introText.txt", follow the format in there and you're probably good to go! - Moved all the intro texts to its own txt file instead of being hardcoded, this allows for much easier customization. File is in the data folder, called "introText.txt", follow the format in there and you're probably good to go!
### Fixed ### Fixed
- Fixed soft lock when pausing on song finish ([shoutouts gedehari](https://github.com/ninjamuffin99/Funkin/issues/15))
- Think I fixed issue that led to in-game scores being off by 2 ([shoutouts Mike](https://github.com/ninjamuffin99/Funkin/issues/4))
- Should have fixed the 1 frame note appearance thing. ([shoutouts Mike](https://github.com/ninjamuffin99/Funkin/issues/6))
- Cleaned up some charting on South on hard mode - Cleaned up some charting on South on hard mode
- Fixed some animation timings, should feel both better to play, and watch. - Fixed some animation timings, should feel both better to play, and watch. (shoutouts Dave/Ivan lol)
- Maaaybe fixed notes popping up randomly at the top of the screen for a frame or two? If this isn't fixed, uhh yall shout at me lolol - Animation issue where GF would freak out on the title screen if you returned to it([shoutouts MultiXIII](https://github.com/ninjamuffin99/Funkin/issues/12)).
## [0.2.1.2] - 2020-11-06 ## [0.2.1.2] - 2020-11-06
### Fixed ### Fixed

2
Project.xml
View File

@ -2,7 +2,7 @@
<project> <project>
<!-- _________________________ Application Settings _________________________ --> <!-- _________________________ Application Settings _________________________ -->
<app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.1.2" company="ninjamuffin99" /> <app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.2" company="ninjamuffin99" />
<!--Switch Export with Unique ApplicationID and Icon--> <!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" /> <set name="APP_ID" value="0x0100f6c013bbc000" />

1
assets/data/introText.txt
View File

@ -21,4 +21,5 @@ kiddbrute for president--vote now
play dead estate--on newgrounds play dead estate--on newgrounds
this is a god damn prototype--we workin on it okay this is a god damn prototype--we workin on it okay
women are real--this is official women are real--this is official
too over exposed--newgrounds cant handle us
Nintendo Switch--pre-orders now available Nintendo Switch--pre-orders now available

BIN
assets/music/breakfast.mp3 Normal file
View File

Binary file not shown.

BIN
assets/music/breakfast.ogg Normal file
View File

Binary file not shown.

BIN
docs/img/skin-funkin-cardbordtoast.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 232 KiB

36
docs/index.html
View File

@ -13,8 +13,9 @@
<title>Friday Night Funkin'</title> <title>Friday Night Funkin'</title>
<meta name="description" content="A dope ass rhythm game"> <meta name="description" content="A dope ass rhythm game">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- <link href="website/styles.css" rel="stylesheet" type="text/css"> --> <link href="styles.css" rel="stylesheet" type="text/css">
<!-- <link href="website/mm.ico" rel="icon" type="image/x-icon"> --> <!-- <link href="website/mm.ico" rel="icon" type="image/x-icon"> -->
<link rel="shortcut icon" type="image/png" href="../art/icon.png" />
</head> </head>
<body> <body>
@ -22,13 +23,38 @@
<header> <header>
</header> </header>
<marquee width="600" style="width: 800px;">Friday Night Funkin</marquee>
<marquee width="1920" scrollamount="2" scrolldelay="10" truespeed="truespeed">Friday Night Funkin</marquee>
<!--Hot tortilla wrap--> <!--Hot tortilla wrap-->
<div id="wrapper"> <div id="wrapper">
<!--Itch Widget--> <h1>Friday Night Funkin' - Rhythm game extraordinaire</h1>
<h1>Friday Night Funkin the video game</h1>
<iframe src="https://itch.io/embed/775903?linkback=true&amp;bg_color=000000&amp;fg_color=ffffff&amp;link_color=6454f8&amp;border_color=333333" width="552" height="167" frameborder="0"><a href="https://ninja-muffin24.itch.io/friday-night-funkin">Friday Night Funkin' (Ludum Dare Prototype) by ninjamuffin99</a></iframe>
<div id="coolervidwrapper">
<div class='videoWrapper'>
<iframe width="560" height="349" src="https://www.youtube.com/embed/HMNKUo3CCpU" frameborder="0"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen></iframe>
</div>
</div>
<div class="coolBox hovertext" id="twitter">
<p class="description">Friday Night Funkin' is a dope ass rhythm game.</p>
<p class='description'>It is made by <a href="https://twitter.com/ninja_muffin99">ninjamuffin99 (programmer)</a>, <a
href="https://twitter.com/PhantomArcade3K">PhantomArcade (animator)</a>, <a
href="https://twitter.com/evilsk8r">evilsk8r (artist)</a>,
and <a href="https://twitter.com/kawaisprite">Kawaisprite (musician)</a> originally for Ludum Dare 47.</p>
</div>
<div class="linktext hovertext" id="ng">
<a href="https://www.newgrounds.com/portal/view/770371">Play demo on Newgrounds</a>
</div>
<div class='linktext hovertext' id="itch">
<a href="https://ninja-muffin24.itch.io/funkin">Support the game on Itch.io</a>
</div>
</div> </div>
</body> </body>
</html> </html>

97
docs/styles.css Normal file
View File

@ -0,0 +1,97 @@
.coolBox {
background: #1a1a1aCC;
margin: 40px 4vw;
padding: 25px;
font-size: 120%;
border-radius: 10px;
}
#wrapper
{
padding: 20px;
margin: auto;
}
marquee {
margin: auto;
text-align: center;
display: inline-block;
}
h1 {
text-align: center;
}
body {
background-image: url('img/skin-funkin-cardbordtoast.jpg');
background-repeat: no-repeat;
background-attachment: fixed;
background-size: cover;
color:white;
background-color: #000;
font-family: Arial, Helvetica, sans-serif;
}
a { color:inherit;
text-decoration: none;}
.hovertext a{
color:white;
text-shadow: 0px 0px #00000077;
transition: color 1s, text-shadow 1s;
}
.hovertext a:hover
{
text-shadow: 2px 2px #00000077;
color: #ffb50e;
}
.linktext {
text-align: center;
display:block;
font-size: 130%;
padding-bottom: 10px;
}
.linktext a {
font-weight: bold;
}
.linktext a:hover {
border-radius: 5px;
}
#itch a:hover
{
color: #fa5c5c;
}
#twitter a:hover
{
color: #00acee;
}
#coolervidwrapper {
padding-left: min(12em, 75%);
padding-right: min(12em, 75%);
min-width: 30%;
}
.videoWrapper {
position: relative;
padding-bottom: 56.25%; /* 16:9 */
height: 0;
max-block-size: 1400px;
}
.videoWrapper iframe {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}

31
source/ChartingState.hx
View File

@ -384,6 +384,8 @@ class ChartingState extends MusicBeatState
override function update(elapsed:Float) override function update(elapsed:Float)
{ {
curStep = recalculateSteps();
Conductor.songPosition = FlxG.sound.music.time; Conductor.songPosition = FlxG.sound.music.time;
_song.song = typingShit.text; _song.song = typingShit.text;
@ -391,7 +393,7 @@ class ChartingState extends MusicBeatState
if (curBeat % 4 == 0) if (curBeat % 4 == 0)
{ {
if (curStep > lengthBpmBullshit() * (curSection + 1)) if (curStep > 16 * (curSection + 1))
{ {
trace(curStep); trace(curStep);
trace((_song.notes[curSection].lengthInSteps) * (curSection + 1)); trace((_song.notes[curSection].lengthInSteps) * (curSection + 1));
@ -406,6 +408,9 @@ class ChartingState extends MusicBeatState
} }
} }
FlxG.watch.addQuick('daBeat', curBeat);
FlxG.watch.addQuick('daStep', curStep);
if (FlxG.mouse.justPressed) if (FlxG.mouse.justPressed)
{ {
if (FlxG.mouse.overlaps(curRenderedNotes)) if (FlxG.mouse.overlaps(curRenderedNotes))
@ -517,6 +522,28 @@ class ChartingState extends MusicBeatState
super.update(elapsed); super.update(elapsed);
} }
function recalculateSteps():Int
{
var steps:Int = 0;
var timeShit:Float = 0;
for (i in 0...curSection)
{
steps += 16;
if (_song.notes[i].changeBPM)
timeShit += (((60 / _song.notes[i].bpm) * 1000) / 4) * 16;
else
timeShit += (((60 / _song.bpm) * 1000) / 4) * 16;
}
steps += Math.floor((FlxG.sound.music.time - timeShit) / Conductor.stepCrochet);
curStep = steps;
updateBeat();
return curStep;
}
function changeSection(sec:Int = 0, ?updateMusic:Bool = true):Void function changeSection(sec:Int = 0, ?updateMusic:Bool = true):Void
{ {
trace('changing section' + sec); trace('changing section' + sec);
@ -699,7 +726,7 @@ class ChartingState extends MusicBeatState
private function addNote():Void private function addNote():Void
{ {
var noteStrum = getStrumTime(dummyArrow.y) + (curSection * (Conductor.stepCrochet * lengthBpmBullshit())); var noteStrum = getStrumTime(dummyArrow.y) + (curSection * (Conductor.stepCrochet * 16));
var noteData = Math.floor(FlxG.mouse.x / GRID_SIZE); var noteData = Math.floor(FlxG.mouse.x / GRID_SIZE);
var noteSus = 0; var noteSus = 0;

24
source/FreeplayState.hx
View File

@ -24,14 +24,17 @@ class FreeplayState extends MusicBeatState
var intendedScore:Int = 0; var intendedScore:Int = 0;
private var grpSongs:FlxTypedGroup<Alphabet>; private var grpSongs:FlxTypedGroup<Alphabet>;
private var curPlaying:Bool = false;
override function create() override function create()
{ {
if (FlxG.sound.music != null) /*
{ if (FlxG.sound.music != null)
if (!FlxG.sound.music.playing) {
FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt); if (!FlxG.sound.music.playing)
} FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt);
}
*/
var isDebug:Bool = false; var isDebug:Bool = false;
@ -118,6 +121,11 @@ class FreeplayState extends MusicBeatState
{ {
super.update(elapsed); super.update(elapsed);
if (FlxG.sound.music.volume < 0.7)
{
FlxG.sound.music.volume += 0.5 * FlxG.elapsed;
}
lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.4)); lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.4));
if (Math.abs(lerpScore - intendedScore) <= 10) if (Math.abs(lerpScore - intendedScore) <= 10)
@ -151,6 +159,7 @@ class FreeplayState extends MusicBeatState
if (accepted) if (accepted)
{ {
var poop:String = Highscore.formatSong(songs[curSelected].toLowerCase(), curDifficulty); var poop:String = Highscore.formatSong(songs[curSelected].toLowerCase(), curDifficulty);
trace(poop); trace(poop);
PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].toLowerCase()); PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].toLowerCase());
@ -192,6 +201,9 @@ class FreeplayState extends MusicBeatState
NGio.logEvent('Fresh'); NGio.logEvent('Fresh');
#end #end
// NGio.logEvent('Fresh');
FlxG.sound.play('assets/sounds/scrollMenu' + TitleState.soundExt, 0.4);
curSelected += change; curSelected += change;
if (curSelected < 0) if (curSelected < 0)
@ -206,6 +218,8 @@ class FreeplayState extends MusicBeatState
// lerpScore = 0; // lerpScore = 0;
#end #end
FlxG.sound.playMusic('assets/music/' + songs[curSelected] + "_Inst" + TitleState.soundExt, 0);
var bullShit:Int = 0; var bullShit:Int = 0;
for (item in grpSongs.members) for (item in grpSongs.members)

4
source/MainMenuState.hx
View File

@ -113,7 +113,11 @@ class MainMenuState extends MusicBeatState
{ {
if (optionShit[curSelected] == 'donate') if (optionShit[curSelected] == 'donate')
{ {
#if linux
Sys.command('/usr/bin/xdg-open', ["https://ninja-muffin24.itch.io/funkin", "&"]);
#else
FlxG.openURL('https://ninja-muffin24.itch.io/funkin'); FlxG.openURL('https://ninja-muffin24.itch.io/funkin');
#end
} }
else else
{ {

15
source/MusicBeatState.hx
View File

@ -34,11 +34,17 @@ class MusicBeatState extends FlxUIState
everyStep(); everyStep();
updateCurStep(); updateCurStep();
curBeat = Math.floor(curStep / 4); // Needs to be ROUNED, rather than ceil or floor
updateBeat();
super.update(elapsed); super.update(elapsed);
} }
private function updateBeat():Void
{
curBeat = Math.round(curStep / 4);
}
/** /**
* CHECKS EVERY FRAME * CHECKS EVERY FRAME
*/ */
@ -64,6 +70,13 @@ class MusicBeatState extends FlxUIState
totalSteps += 1; totalSteps += 1;
lastStep += Conductor.stepCrochet; lastStep += Conductor.stepCrochet;
// If the song is at least 3 steps behind
if (Conductor.songPosition > lastStep + (Conductor.stepCrochet * 3))
{
lastStep = Conductor.songPosition;
totalSteps = Math.ceil(lastStep / Conductor.stepCrochet);
}
if (totalSteps % 4 == 0) if (totalSteps % 4 == 0)
beatHit(); beatHit();
} }

104
source/PauseSubState.hx
View File

@ -4,38 +4,124 @@ import Controls.Control;
import flixel.FlxG; import flixel.FlxG;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.FlxSubState; import flixel.FlxSubState;
import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.input.keyboard.FlxKey; import flixel.input.keyboard.FlxKey;
import flixel.system.FlxSound;
import flixel.util.FlxColor; import flixel.util.FlxColor;
class PauseSubState extends FlxSubState class PauseSubState extends MusicBeatSubstate
{ {
var grpMenuShit:FlxTypedGroup<Alphabet>;
var menuItems:Array<String> = ['Resume', 'Restart Song', 'Exit to menu'];
var curSelected:Int = 0;
var pauseMusic:FlxSound;
public function new(x:Float, y:Float) public function new(x:Float, y:Float)
{ {
super(); super();
pauseMusic = new FlxSound().loadEmbedded('assets/music/breakfast' + TitleState.soundExt, true, true);
pauseMusic.volume = 0;
pauseMusic.play(false, FlxG.random.int(0, Std.int(pauseMusic.length / 2)));
FlxG.sound.list.add(pauseMusic);
var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK); var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
bg.alpha = 0.6; bg.alpha = 0.6;
bg.scrollFactor.set(); bg.scrollFactor.set();
add(bg); add(bg);
var bf:Boyfriend = new Boyfriend(x, y); grpMenuShit = new FlxTypedGroup<Alphabet>();
bf.scrollFactor.set(); add(grpMenuShit);
// add(bf);
bf.playAnim('firstDeath'); for (i in 0...menuItems.length)
{
var songText:Alphabet = new Alphabet(0, (70 * i) + 30, menuItems[i], true, false);
songText.isMenuItem = true;
songText.targetY = i;
grpMenuShit.add(songText);
}
bg.cameras = [FlxG.cameras.list[1]]; changeSelection();
cameras = [FlxG.cameras.list[1]];
} }
override function update(elapsed:Float) override function update(elapsed:Float)
{ {
if (pauseMusic.volume < 0.5)
pauseMusic.volume += 0.01 * elapsed;
super.update(elapsed); super.update(elapsed);
var upP = controls.UP_P;
var downP = controls.DOWN_P;
var accepted = controls.ACCEPT;
if (upP)
{
changeSelection(-1);
}
if (downP)
{
changeSelection(1);
}
if (accepted)
{
var daSelected:String = menuItems[curSelected];
switch (daSelected)
{
case "Resume":
close();
case "Restart Song":
FlxG.resetState();
case "Exit to menu":
FlxG.switchState(new MainMenuState());
}
}
if (FlxG.keys.justPressed.J) if (FlxG.keys.justPressed.J)
{ {
PlayerSettings.player1.controls.replaceBinding(Control.LEFT, Keys, FlxKey.J, null); // for reference later!
// PlayerSettings.player1.controls.replaceBinding(Control.LEFT, Keys, FlxKey.J, null);
} }
}
if (FlxG.keys.justPressed.ENTER) override function destroy()
close(); {
pauseMusic.destroy();
super.destroy();
}
function changeSelection(change:Int = 0):Void
{
curSelected += change;
if (curSelected < 0)
curSelected = menuItems.length - 1;
if (curSelected >= menuItems.length)
curSelected = 0;
var bullShit:Int = 0;
for (item in grpMenuShit.members)
{
item.targetY = bullShit - curSelected;
bullShit++;
item.alpha = 0.6;
// item.setGraphicSize(Std.int(item.width * 0.8));
if (item.targetY == 0)
{
item.alpha = 1;
// item.setGraphicSize(Std.int(item.width));
}
}
} }
} }

18
source/PlayState.hx
View File

@ -83,6 +83,7 @@ class PlayState extends MusicBeatState
var talking:Bool = true; var talking:Bool = true;
var songScore:Int = 0; var songScore:Int = 0;
var scoreTxt:FlxText;
public static var campaignScore:Int = 0; public static var campaignScore:Int = 0;
@ -252,6 +253,11 @@ class PlayState extends MusicBeatState
// healthBar // healthBar
add(healthBar); add(healthBar);
scoreTxt = new FlxText(healthBarBG.x + healthBarBG.width - 190, healthBarBG.y + 30, 0, "", 20);
scoreTxt.setFormat("assets/fonts/vcr.ttf", 16, FlxColor.WHITE, RIGHT);
scoreTxt.scrollFactor.set();
add(scoreTxt);
healthHeads = new FlxSprite(); healthHeads = new FlxSprite();
var headTex = FlxAtlasFrames.fromSparrow(AssetPaths.healthHeads__png, AssetPaths.healthHeads__xml); var headTex = FlxAtlasFrames.fromSparrow(AssetPaths.healthHeads__png, AssetPaths.healthHeads__xml);
healthHeads.frames = headTex; healthHeads.frames = headTex;
@ -277,6 +283,7 @@ class PlayState extends MusicBeatState
healthBar.cameras = [camHUD]; healthBar.cameras = [camHUD];
healthBarBG.cameras = [camHUD]; healthBarBG.cameras = [camHUD];
healthHeads.cameras = [camHUD]; healthHeads.cameras = [camHUD];
scoreTxt.cameras = [camHUD];
doof.cameras = [camHUD]; doof.cameras = [camHUD];
// if (SONG.song == 'South') // if (SONG.song == 'South')
@ -585,19 +592,18 @@ class PlayState extends MusicBeatState
private var paused:Bool = false; private var paused:Bool = false;
var startedCountdown:Bool = false; var startedCountdown:Bool = false;
var canPause:Bool = true;
override public function update(elapsed:Float) override public function update(elapsed:Float)
{ {
super.update(elapsed); super.update(elapsed);
//trace("FlxG.elapsed: " + FlxG.elapsed);
trace("FlxG.sound.music.time: " + FlxG.sound.music.time); trace("FlxG.sound.music.time: " + FlxG.sound.music.time);
trace("Conductor.songPosition: " + Conductor.songPosition); trace("Conductor.songPosition: " + Conductor.songPosition);
//trace("FlxG.sound.music.playing: " + FlxG.sound.music.playing);
//trace("SONG POS: " + Conductor.songPosition);
// FlxG.sound.music.pitch = 2;
if (FlxG.keys.justPressed.ENTER && startedCountdown) scoreTxt.text = "Score:" + songScore;
if (FlxG.keys.justPressed.ENTER && startedCountdown && canPause)
{ {
persistentUpdate = false; persistentUpdate = false;
persistentDraw = true; persistentDraw = true;
@ -846,6 +852,8 @@ class PlayState extends MusicBeatState
function endSong():Void function endSong():Void
{ {
canPause = false;
#if !switch #if !switch
Highscore.saveScore(SONG.song, songScore, storyDifficulty); Highscore.saveScore(SONG.song, songScore, storyDifficulty);
#end #end