mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-09-11 20:57:20 +00:00
note color bullshit and also disabled 'stuns'??
This commit is contained in:
parent
75ed1d5231
commit
dd49ae7990
|
@ -1,5 +1,6 @@
|
||||||
package;
|
package;
|
||||||
|
|
||||||
|
import flixel.FlxG;
|
||||||
import flixel.group.FlxGroup.FlxTypedGroup;
|
import flixel.group.FlxGroup.FlxTypedGroup;
|
||||||
import shaderslmfao.ColorSwap;
|
import shaderslmfao.ColorSwap;
|
||||||
|
|
||||||
|
@ -29,6 +30,12 @@ class ColorpickSubstate extends MusicBeatSubstate
|
||||||
|
|
||||||
override function update(elapsed:Float)
|
override function update(elapsed:Float)
|
||||||
{
|
{
|
||||||
|
if (controls.BACK)
|
||||||
|
{
|
||||||
|
FlxG.state.closeSubState();
|
||||||
|
FlxG.state.openSubState(new OptionsSubState());
|
||||||
|
}
|
||||||
|
|
||||||
if (controls.RIGHT_P)
|
if (controls.RIGHT_P)
|
||||||
curSelected += 1;
|
curSelected += 1;
|
||||||
if (controls.LEFT_P)
|
if (controls.LEFT_P)
|
||||||
|
|
|
@ -118,6 +118,7 @@ class Note extends FlxSprite
|
||||||
|
|
||||||
colorSwap = new ColorSwap();
|
colorSwap = new ColorSwap();
|
||||||
shader = colorSwap.shader;
|
shader = colorSwap.shader;
|
||||||
|
updateColors();
|
||||||
|
|
||||||
switch (noteData)
|
switch (noteData)
|
||||||
{
|
{
|
||||||
|
@ -158,7 +159,6 @@ class Note extends FlxSprite
|
||||||
}
|
}
|
||||||
|
|
||||||
updateHitbox();
|
updateHitbox();
|
||||||
updateColors();
|
|
||||||
|
|
||||||
x -= width / 2;
|
x -= width / 2;
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ import flixel.util.FlxColor;
|
||||||
|
|
||||||
class OptionsSubState extends MusicBeatSubstate
|
class OptionsSubState extends MusicBeatSubstate
|
||||||
{
|
{
|
||||||
var textMenuItems:Array<String> = ['Master Volume', 'Sound Volume', 'Controls', 'Colors'];
|
var textMenuItems:Array<String> = ['Master Volume', 'Sound Volume', 'Controls', 'Colors', 'Back'];
|
||||||
|
|
||||||
var selector:FlxSprite;
|
var selector:FlxSprite;
|
||||||
var curSelected:Int = 0;
|
var curSelected:Int = 0;
|
||||||
|
@ -63,6 +63,9 @@ class OptionsSubState extends MusicBeatSubstate
|
||||||
txt.color = FlxColor.YELLOW;
|
txt.color = FlxColor.YELLOW;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (controls.BACK)
|
||||||
|
FlxG.switchState(new MainMenuState());
|
||||||
|
|
||||||
if (controls.ACCEPT)
|
if (controls.ACCEPT)
|
||||||
{
|
{
|
||||||
switch (textMenuItems[curSelected])
|
switch (textMenuItems[curSelected])
|
||||||
|
@ -76,6 +79,8 @@ class OptionsSubState extends MusicBeatSubstate
|
||||||
case "Mods":
|
case "Mods":
|
||||||
FlxG.state.closeSubState();
|
FlxG.state.closeSubState();
|
||||||
FlxG.state.openSubState(new ModdingSubstate());
|
FlxG.state.openSubState(new ModdingSubstate());
|
||||||
|
case "Back":
|
||||||
|
FlxG.switchState(new MainMenuState());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package;
|
package;
|
||||||
|
|
||||||
#if desktop
|
|
||||||
import Discord.DiscordClient;
|
|
||||||
#end
|
|
||||||
import Section.SwagSection;
|
import Section.SwagSection;
|
||||||
import Song.SwagSong;
|
import Song.SwagSong;
|
||||||
import WiggleEffect.WiggleEffectType;
|
import WiggleEffect.WiggleEffectType;
|
||||||
|
@ -41,9 +38,14 @@ import lime.utils.Assets;
|
||||||
import openfl.display.BlendMode;
|
import openfl.display.BlendMode;
|
||||||
import openfl.display.StageQuality;
|
import openfl.display.StageQuality;
|
||||||
import openfl.filters.ShaderFilter;
|
import openfl.filters.ShaderFilter;
|
||||||
|
import shaderslmfao.ColorSwap;
|
||||||
|
|
||||||
using StringTools;
|
using StringTools;
|
||||||
|
|
||||||
|
#if desktop
|
||||||
|
import Discord.DiscordClient;
|
||||||
|
#end
|
||||||
|
|
||||||
class PlayState extends MusicBeatState
|
class PlayState extends MusicBeatState
|
||||||
{
|
{
|
||||||
public static var curStage:String = '';
|
public static var curStage:String = '';
|
||||||
|
@ -1189,6 +1191,9 @@ class PlayState extends MusicBeatState
|
||||||
{
|
{
|
||||||
// FlxG.log.add(i);
|
// FlxG.log.add(i);
|
||||||
var babyArrow:FlxSprite = new FlxSprite(0, strumLine.y);
|
var babyArrow:FlxSprite = new FlxSprite(0, strumLine.y);
|
||||||
|
var colorswap:ColorSwap = new ColorSwap();
|
||||||
|
babyArrow.shader = colorswap.shader;
|
||||||
|
colorswap.update(Note.arrowColors[i]);
|
||||||
|
|
||||||
switch (curStage)
|
switch (curStage)
|
||||||
{
|
{
|
||||||
|
@ -2007,8 +2012,11 @@ class PlayState extends MusicBeatState
|
||||||
var controlArray:Array<Bool> = [leftP, downP, upP, rightP];
|
var controlArray:Array<Bool> = [leftP, downP, upP, rightP];
|
||||||
|
|
||||||
// FlxG.watch.addQuick('asdfa', upP);
|
// FlxG.watch.addQuick('asdfa', upP);
|
||||||
if ((upP || rightP || downP || leftP) && !boyfriend.stunned && generatedMusic)
|
if ((upP || rightP || downP || leftP) && generatedMusic)
|
||||||
{
|
{
|
||||||
|
// note to self, used to have stunned
|
||||||
|
// && !boyfriend.stunned
|
||||||
|
|
||||||
boyfriend.holdTimer = 0;
|
boyfriend.holdTimer = 0;
|
||||||
|
|
||||||
var possibleNotes:Array<Note> = [];
|
var possibleNotes:Array<Note> = [];
|
||||||
|
|
Loading…
Reference in a new issue