From c22c8a025805119dcb2b1029adc7a3cd5591facc Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Thu, 19 Jan 2023 15:16:28 +0100 Subject: [PATCH] cool stress stuff that im going to remove soon --- assets/data/characters/pico-speakers.hx | 2 +- assets/songs/stress/scripts/chart.hx | 27 +++++++++++++++++-------- buildnumber.txt | 2 +- source/funkin/scripting/Script.hx | 1 + 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/assets/data/characters/pico-speakers.hx b/assets/data/characters/pico-speakers.hx index 53c386cc..e31d49a3 100644 --- a/assets/data/characters/pico-speakers.hx +++ b/assets/data/characters/pico-speakers.hx @@ -7,7 +7,7 @@ function onDance(event) { } function onPlaySingAnim(event) { - dir = FlxG.random.int(0, 1) + (event.direction == 0 ? 1 : 3); + dir = FlxG.random.int(0, 1) + (event.direction == 0 ? 3 : 1); event.cancel(); playAnim("shoot" + Std.string(dir), true); diff --git a/assets/songs/stress/scripts/chart.hx b/assets/songs/stress/scripts/chart.hx index eb843526..bd4157a9 100644 --- a/assets/songs/stress/scripts/chart.hx +++ b/assets/songs/stress/scripts/chart.hx @@ -2,18 +2,29 @@ import openfl.utils.Assets; function onNoteCreation(event) { if (event.noteType != null || event.note.noteTypeID > 0) { - event.note.visible = false; - event.note.mustPress = false; + // event.note.visible = false; + event.note.playerID = 2; } } -function onDadHit(event) { - if (event.noteType == "Pico Speaker Note") { - event.character = gf; - event.cancelStrumGlow(); - } -} + +var strumLine:StrumLine; function postCreate() { + strumLine = new StrumLine([gf], 0.5, true, controls); + players.push(strumLine); + strumLine.generateStrums(); generateNotes(CoolUtil.parseJson(Paths.chart('stress', 'picospeaker')).song); + + for(s in cpuStrums) + s.x -= FlxG.width * 0.125; + for(s in playerStrums) + s.x += FlxG.width * 0.125; +} + +function update(elapsed) { + camHUD.zoom /= 0.75; +} +function postUpdate(elapsed) { + camHUD.zoom *= 0.75; } \ No newline at end of file diff --git a/buildnumber.txt b/buildnumber.txt index 4a90f671..8a162a54 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -2078 \ No newline at end of file +2079 \ No newline at end of file diff --git a/source/funkin/scripting/Script.hx b/source/funkin/scripting/Script.hx index 843b2dc4..4b86a769 100644 --- a/source/funkin/scripting/Script.hx +++ b/source/funkin/scripting/Script.hx @@ -64,6 +64,7 @@ class Script extends FlxBasic implements IFlxDestroyable { "HudCamera" => funkin.game.HudCamera, "Note" => funkin.game.Note, "Strum" => funkin.game.Strum, + "StrumLine" => funkin.game.StrumLine, "Character" => funkin.game.Character, "Boyfriend" => funkin.game.Character, // for compatibility "PauseSubstate" => funkin.menus.PauseSubState,