cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 07:27:12 +00:00
Code Issues Releases Wiki Activity

south charted

Browse source
This commit is contained in:
Cameron Taylor 2020-10-28 19:47:10 -07:00
parent a51bb7179a
commit ed40720ca6
12 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assets/data/south/south.json Normal file
View file

File diff suppressed because one or more lines are too long

1
assets/data/specialThanks.txt
View file

@ -10,5 +10,6 @@ Squidly
Luis
GeoKureli
Will Blanton
SrPelo
BIT BOY - MIKE WELSH

BIN
assets/music/South.mp3 Normal file
View file

Binary file not shown.

BIN
assets/music/South.ogg Normal file
View file

Binary file not shown.

BIN
assets/music/South_Inst.mp3 Normal file
View file

Binary file not shown.

BIN
assets/music/South_Inst.ogg Normal file
View file

Binary file not shown.

BIN
assets/music/South_Voices.mp3 Normal file
View file

Binary file not shown.

BIN
assets/music/South_Voices.ogg Normal file
View file

Binary file not shown.

12
source/ChartingState.hx
View file

@ -218,7 +218,7 @@ class ChartingState extends MusicBeatState
stepperLength.value = _song.notes[curSection].lengthInSteps;
stepperLength.name = "section_length";
var stepperCopy:FlxUINumericStepper = new FlxUINumericStepper(110, 30, 1, 1, 1, 999, 0);
var stepperCopy:FlxUINumericStepper = new FlxUINumericStepper(110, 30, 1, 1, -999, 999, 0);
var copyButton:FlxButton = new FlxButton(110, 8, "Copy last section", function()
{
@ -611,6 +611,16 @@ class ChartingState extends MusicBeatState
updateGrid();
}
function clearSong():Void
{
for (daSection in 0..._song.notes.length)
{
_song.notes[daSection].sectionNotes = [];
}
updateGrid();
}
private function addNote():Void
{
var noteStrum = Math.round(getStrumTime(dummyArrow.y) + (curSection * (Conductor.stepCrochet * 16)));

3
source/FreeplayState.hx
View file

@ -7,7 +7,7 @@ import flixel.text.FlxText;
class FreeplayState extends MusicBeatState
{
var songs:Array<String> = ["Bopeebo", "Dadbattle", "Fresh", "Tutorial", "Spookeez"];
var songs:Array<String> = ["Bopeebo", "Dadbattle", "Fresh", "Tutorial", "Spookeez", "South"];
var selector:FlxText;
var curSelected:Int = 0;
@ -70,6 +70,7 @@ class FreeplayState extends MusicBeatState
{
PlayState.SONG = Song.loadFromJson(songs[curSelected].toLowerCase());
FlxG.switchState(new PlayState());
FlxG.sound.music.stop();
}
}
}

3
source/Note.hx
View file

@ -130,8 +130,9 @@ class Note extends FlxSprite
if (mustPress)
{
// The * 0.5 us so that its easier to hit them too late, instead of too early
if (strumTime > Conductor.songPosition - Conductor.safeZoneOffset
&& strumTime < Conductor.songPosition + Conductor.safeZoneOffset)
&& strumTime < Conductor.songPosition + (Conductor.safeZoneOffset * 0.5))
{
canBeHit = true;
}

9
source/PlayState.hx
View file

@ -187,6 +187,9 @@ class PlayState extends MusicBeatState
healthBar.cameras = [camHUD];
healthBarBG.cameras = [camHUD];
healthHeads.cameras = [camHUD];
if (SONG.song == 'South')
FlxG.camera.alpha = 0.7;
// UI_camera.zoom = 1;
// cameras = [FlxG.cameras.list[1]];
@ -710,7 +713,7 @@ class PlayState extends MusicBeatState
{
if (daNote.tooLate)
{
health -= 0.05;
health -= 0.03;
vocals.volume = 0;
}
@ -985,7 +988,7 @@ class PlayState extends MusicBeatState
{
if (!boyfriend.stunned)
{
health -= 0.08;
health -= 0.055;
if (combo > 5)
{
gf.playAnim('sad');
@ -999,7 +1002,7 @@ class PlayState extends MusicBeatState
boyfriend.stunned = true;
// get stunned for 5 seconds
new FlxTimer().start(15 / 60, function(tmr:FlxTimer)
new FlxTimer().start(5 / 60, function(tmr:FlxTimer)
{
boyfriend.stunned = false;
});