Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-30 03:25:47 -05:00
Code Issues Projects Releases Packages Wiki Activity

dumbass sound shit that dont work lol

Browse source
This commit is contained in:
Cameron Taylor 2022-01-25 23:11:43 -05:00
parent a0271a3e92
commit 6fd71599eb
1 changed files with 41 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
source/charting/ChartingState.hx
View file

@ -16,6 +16,7 @@ import flixel.addons.ui.FlxUINumericStepper;
import flixel.addons.ui.FlxUITabMenu; import flixel.addons.ui.FlxUITabMenu;
import flixel.group.FlxGroup; import flixel.group.FlxGroup;
import flixel.math.FlxMath; import flixel.math.FlxMath;
import flixel.system.FlxSound;
import flixel.text.FlxText; import flixel.text.FlxText;
import flixel.ui.FlxButton; import flixel.ui.FlxButton;
import flixel.util.FlxColor; import flixel.util.FlxColor;
@ -400,7 +401,7 @@ class ChartingState extends MusicBeatState
add(musSpec); add(musSpec);
// trace(audioBuf.data.length); // trace(audioBuf.data.length);
playheadTest = new FlxSprite(0, 0).makeGraphic(2, 60, FlxColor.RED); playheadTest = new FlxSprite(0, 0).makeGraphic(30, 2, FlxColor.RED);
playheadTest.scrollFactor.set(); playheadTest.scrollFactor.set();
add(playheadTest); add(playheadTest);
@ -572,12 +573,14 @@ class ChartingState extends MusicBeatState
{ {
// FlxG.camera.followLerp = CoolUtil.camLerpShit(0.05); // FlxG.camera.followLerp = CoolUtil.camLerpShit(0.05);
FlxG.sound.music.pan = FlxMath.remapToRange(FlxG.mouse.screenX, 0, FlxG.width, -1, 1) * 10;
curStep = recalculateSteps(); curStep = recalculateSteps();
Conductor.songPosition = FlxG.sound.music.time; Conductor.songPosition = FlxG.sound.music.time;
_song.song = typingShit.text; _song.song = typingShit.text;
playheadTest.x = FlxMath.remapToRange(Conductor.songPosition, 0, FlxG.sound.music.length, 0, FlxG.width); playheadTest.y = FlxMath.remapToRange(Conductor.songPosition, 0, FlxG.sound.music.length, 0, FlxG.height);
strumLine.y = getYfromStrum((Conductor.songPosition - sectionStartTime()) % (Conductor.stepCrochet * SongLoad.getSong()[curSection].lengthInSteps)); strumLine.y = getYfromStrum((Conductor.songPosition - sectionStartTime()) % (Conductor.stepCrochet * SongLoad.getSong()[curSection].lengthInSteps));
@ -608,7 +611,7 @@ class ChartingState extends MusicBeatState
FlxG.watch.addQuick('daBeat', curBeat); FlxG.watch.addQuick('daBeat', curBeat);
FlxG.watch.addQuick('daStep', curStep); FlxG.watch.addQuick('daStep', curStep);
if (FlxG.mouse.pressedMiddle) if (FlxG.mouse.pressedMiddle && FlxG.mouse.overlaps(gridBG))
{ {
if (FlxG.sound.music.playing) if (FlxG.sound.music.playing)
{ {
@ -622,7 +625,7 @@ class ChartingState extends MusicBeatState
if (FlxG.mouse.pressed) if (FlxG.mouse.pressed)
{ {
if (FlxG.keys.pressed.ALT) if (FlxG.keys.pressed.ALT && FlxG.mouse.overlaps(gridBG)) // same shit as middle click / hold on grid
{ {
if (FlxG.sound.music.playing) if (FlxG.sound.music.playing)
{ {
@ -635,6 +638,17 @@ class ChartingState extends MusicBeatState
} }
else else
{ {
if (FlxG.mouse.screenX <= 30 && FlxMath.inBounds(FlxG.mouse.screenY, 0, FlxG.height))
{
if (FlxG.sound.music.playing)
{
FlxG.sound.music.pause();
vocals.pause();
}
FlxG.sound.music.time = FlxMath.remapToRange(FlxG.mouse.screenY, 0, FlxG.height, 0, FlxG.sound.music.length);
vocals.time = FlxG.sound.music.time;
}
if (FlxG.mouse.justPressed) if (FlxG.mouse.justPressed)
{ {
if (FlxG.mouse.overlaps(leftIcon)) if (FlxG.mouse.overlaps(leftIcon))
@ -1189,7 +1203,6 @@ class ChartingState extends MusicBeatState
placeIDK = Std.int(Math.max(placeIDK, 1)); placeIDK = Std.int(Math.max(placeIDK, 1));
trace(placeIDK); trace(placeIDK);
FlxG.sound.play(Paths.sound('funnyNoise/funnyNoise-0' + placeIDK)); FlxG.sound.play(Paths.sound('funnyNoise/funnyNoise-0' + placeIDK));
FlxG.log.add('FOUND EVIL NUMBER'); FlxG.log.add('FOUND EVIL NUMBER');
@ -1226,29 +1239,37 @@ class ChartingState extends MusicBeatState
// FlxG.sound.play(Paths.sound('pianoStuff/piano-00' + FlxG.random.int(1, 9)), FlxG.random.float(0.01, 0.3)); // FlxG.sound.play(Paths.sound('pianoStuff/piano-00' + FlxG.random.int(1, 9)), FlxG.random.float(0.01, 0.3));
function makeAndPlayChord(soundsToPlay:Array<String>)
{
var bullshit:Int = Std.int((Math.floor(dummyArrow.y / GRID_SIZE) * GRID_SIZE) / 40);
soundsToPlay.push('00' + Std.string((bullshit % 8) + 1));
for (key in soundsToPlay)
{
var snd:FlxSound = FlxG.sound.list.recycle(FlxSound).loadEmbedded(FlxG.sound.cache(Paths.sound("pianoStuff/piano-" + key)));
snd.autoDestroy = true;
FlxG.sound.list.add(snd);
snd.volume = FlxG.random.float(0.05, 0.7);
snd.pan = noteData - 2; // .... idk why tf panning doesnt work? (as of 2022/01/25) busted ass bullshit. I only went thru this fuss of creating FlxSound just for the panning!
// snd.proximity(FlxG.mouse.x, FlxG.mouse.y, gridBG, gridBG.width / 2);
snd.play();
}
}
switch (noteData) switch (noteData)
{ {
case 0: case 0:
FlxG.sound.play(Paths.sound('pianoStuff/piano-015'), FlxG.random.float(0.1, 0.3)); makeAndPlayChord(["015", "013", "009"]);
FlxG.sound.play(Paths.sound('pianoStuff/piano-013'), FlxG.random.float(0.1, 0.3));
FlxG.sound.play(Paths.sound('pianoStuff/piano-009'), FlxG.random.float(0.1, 0.3));
case 1: case 1:
FlxG.sound.play(Paths.sound('pianoStuff/piano-015'), FlxG.random.float(0.1, 0.3)); makeAndPlayChord(["015", "012", "009"]);
FlxG.sound.play(Paths.sound('pianoStuff/piano-012'), FlxG.random.float(0.1, 0.3));
FlxG.sound.play(Paths.sound('pianoStuff/piano-009'), FlxG.random.float(0.1, 0.3));
case 2: case 2:
FlxG.sound.play(Paths.sound('pianoStuff/piano-015'), FlxG.random.float(0.1, 0.3)); makeAndPlayChord(["015", "011", "009"]);
FlxG.sound.play(Paths.sound('pianoStuff/piano-011'), FlxG.random.float(0.1, 0.3));
FlxG.sound.play(Paths.sound('pianoStuff/piano-009'), FlxG.random.float(0.1, 0.3));
case 3: case 3:
FlxG.sound.play(Paths.sound('pianoStuff/piano-014'), FlxG.random.float(0.1, 0.3)); makeAndPlayChord(["014", "011", "010"]);
FlxG.sound.play(Paths.sound('pianoStuff/piano-011'), FlxG.random.float(0.1, 0.3));
FlxG.sound.play(Paths.sound('pianoStuff/piano-010'), FlxG.random.float(0.1, 0.3));
} }
var bullshit:Int = Std.int((Math.floor(dummyArrow.y / GRID_SIZE) * GRID_SIZE) / 40);
FlxG.sound.play(Paths.sound('pianoStuff/piano-00' + Std.string((bullshit % 8) + 1)), FlxG.random.float(0.3, 0.6));
// trace('bullshit $bullshit'); // trace(Math.floor(dummyArrow.y / GRID_SIZE) * GRID_SIZE); // trace('bullshit $bullshit'); // trace(Math.floor(dummyArrow.y / GRID_SIZE) * GRID_SIZE);
var daNewNote:Note = new Note(noteStrum, noteData); var daNewNote:Note = new Note(noteStrum, noteData);