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

Merge pull request #73 from FunkinCrew/inputspitter-rfc

Browse source 
make game use rfc format for spitting inputs
This commit is contained in:
Cameron Taylor 2023-03-28 12:21:43 -04:00 committed by GitHub
parent 43f70eda53 c68ed233f9
commit 5a0ce60b36
2 changed files with 78 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
source/funkin/play/PlayState.hx
View file

@ -43,6 +43,7 @@ import funkin.ui.PopUpStuff;
import funkin.ui.PreferencesMenu;
import funkin.ui.stageBuildShit.StageOffsetSubstate;
import funkin.util.Constants;
import funkin.util.SerializerUtil;
import funkin.util.SortUtil;
import lime.ui.Haptic;
#if discord_rpc
@ -1855,7 +1856,8 @@ class PlayState extends MusicBeatState
#if sys
// spitter for ravy, teehee!!
sys.io.File.saveContent("./scores.txt", inputSpitter.join("\n"));
var output = SerializerUtil.toJSON(inputSpitter);
sys.io.File.saveContent("./scores.json", output);
#end
seenCutscene = false;
@ -1948,6 +1950,7 @@ class PlayState extends MusicBeatState
else
{
trace('WENT TO RESULTS SCREEN!');
trace(songScore);
// unloadAssets();
camZoomRate = 0;
@ -2035,8 +2038,32 @@ class PlayState extends MusicBeatState
controls.NOTE_UP_P,
controls.NOTE_RIGHT_P
];
var lol:Array<Int> = cast pressArray;
inputSpitter.push(Std.int(Conductor.songPosition) + " " + lol.join(" ") + " " + Std.string(score) + " " + songScore);
var indices:Array<Int> = [];
for (i in 0...pressArray.length)
{
if (pressArray[i]) indices.push(i);
}
if (indices.length > 0)
{
for (i in 0...indices.length)
{
inputSpitter.push(
{
t: Std.int(Conductor.songPosition),
d: indices[i],
l: 20
});
}
}
else
{
inputSpitter.push(
{
t: Std.int(Conductor.songPosition),
d: -1,
l: 20
});
}
}
comboPopUps.displayRating(daRating);
if (Highscore.tallies.combo >= 10 || Highscore.tallies.combo == 0) comboPopUps.displayCombo(Highscore.tallies.combo);
@ -2103,7 +2130,7 @@ class PlayState extends MusicBeatState
/**
* Spitting out the input for ravy 🙇‍♂️!!
*/
var inputSpitter:Array<String> = [];
var inputSpitter:Array<ScoreInput> = [];
public function keyShit(test:Bool):Void
{
@ -2261,8 +2288,20 @@ class PlayState extends MusicBeatState
controls.NOTE_UP_P,
controls.NOTE_RIGHT_P
];
var lol:Array<Int> = cast pressArray;
inputSpitter.push(Std.int(Conductor.songPosition) + " " + lol.join(" ") + " " + Std.string(event.scoreChange) + " " + songScore);
var indices:Array<Int> = [];
for (i in 0...pressArray.length)
{
if (pressArray[i]) indices.push(i);
}
for (i in 0...indices.length)
{
inputSpitter.push(
{
t: Std.int(Conductor.songPosition),
d: indices[i],
l: 20
});
}
}
if (event.playSound)
@ -2295,8 +2334,32 @@ class PlayState extends MusicBeatState
controls.NOTE_UP_P,
controls.NOTE_RIGHT_P
];
var lol:Array<Int> = cast pressArray;
inputSpitter.push(Std.int(Conductor.songPosition) + " " + lol.join(" ") + " " + Std.string(-10) + " " + songScore);
var indices:Array<Int> = [];
for (i in 0...pressArray.length)
{
if (pressArray[i]) indices.push(i);
}
if (indices.length > 0)
{
for (i in 0...indices.length)
{
inputSpitter.push(
{
t: Std.int(Conductor.songPosition),
d: indices[i],
l: 20
});
}
}
else
{
inputSpitter.push(
{
t: Std.int(Conductor.songPosition),
d: -1,
l: 20
});
}
}
vocals.volume = 0;

7
source/funkin/util/SerializerUtil.hx
View file

@ -3,6 +3,13 @@ package funkin.util;
import haxe.Json;
import thx.semver.Version;
typedef ScoreInput =
{
var d:Int; // Key pressed
var l:Int; // Duration
var t:Int; // Start timestamp
}
class SerializerUtil
{
static final INDENT_CHAR = "\t";