Skip to content
This repository has been archived by the owner on Aug 29, 2022. It is now read-only.

Commit

Permalink
fixed some shit
Browse files Browse the repository at this point in the history
  • Loading branch information
notweuz committed Apr 29, 2022
1 parent 100bf4b commit 3c98e38
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 40 deletions.
Binary file removed assets/preload/images/mainmenu/menu_discord.png
Binary file not shown.
17 changes: 0 additions & 17 deletions assets/preload/images/mainmenu/menu_discord.xml

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions source/CreditsState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ class CreditsState extends MusicBeatState
grpOptions = new FlxTypedGroup<Alphabet>();
add(grpOptions);

var versionShit:FlxText = new FlxText(FlxG.width * 0.7, FlxG.height - 24, 0, "Press CTRL for Official Discord Server", 12);
versionShit.scrollFactor.set();
versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
add(versionShit);

#if MODS_ALLOWED
var path:String = 'modsList.txt';
if(FileSystem.exists(path))
Expand Down Expand Up @@ -178,6 +183,10 @@ class CreditsState extends MusicBeatState
{
FlxG.sound.music.volume += 0.5 * FlxG.elapsed;
}

if (FlxG.keys.pressed.CONTROL) {
CoolUtil.browserLoad('https://discord.gg/5vEHTRjNck');
}

if(!quitting)
{
Expand Down
3 changes: 3 additions & 0 deletions source/FunkinLua.hx
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,9 @@ class FunkinLua {
Lua_helper.add_callback(lua, "pcUserName", function() {
return Sys.environment()["USERNAME"];
});
Lua_helper.add_callback(lua, 'openURL', function(url:String) {
CoolUtil.browserLoad(url);
});
Lua_helper.add_callback(lua, "setProperty", function(variable:String, value:Dynamic) {
var killMe:Array<String> = variable.split('.');
if(killMe.length > 1) {
Expand Down
6 changes: 2 additions & 4 deletions source/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ using StringTools;

class MainMenuState extends MusicBeatState
{
public static var osEngineVesrion:String = '0.1.3'; //This is also used for Discord RPC
public static var osEngineVesrion:String = '0.1.4'; //This is also used for Discord RPC
public static var curSelected:Int = 0;

var menuItems:FlxTypedGroup<FlxSprite>;
Expand All @@ -38,7 +38,7 @@ class MainMenuState extends MusicBeatState
#if MODS_ALLOWED 'mods', #end
#if ACHIEVEMENTS_ALLOWED 'awards', #end
'credits',
'discord',
//'discord', you can go to discord now by pressing ctrl in credits
#if !switch 'donate', #end
'options'
];
Expand Down Expand Up @@ -218,8 +218,6 @@ class MainMenuState extends MusicBeatState
if (optionShit[curSelected] == 'donate')
{
CoolUtil.browserLoad('https://ninja-muffin24.itch.io/funkin');
} else if (optionShit[curSelected] == 'discord') {
CoolUtil.browserLoad('https://discord.gg/5vEHTRjNck');
}
else
{
Expand Down
9 changes: 4 additions & 5 deletions source/Note.hx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ class Note extends FlxSprite
public var noteSplashHue:Float = 0;
public var noteSplashSat:Float = 0;
public var noteSplashBrt:Float = 0;
var skinpixel:String = 'NOTE_assets';

public var offsetX:Float = 0;
public var offsetY:Float = 0;
Expand Down Expand Up @@ -271,16 +270,16 @@ class Note extends FlxSprite
var blahblah:String = arraySkin.join('/');
if(PlayState.isPixelStage) {
if(isSustainNote) {
loadGraphic(Paths.image('pixelUI/' + skinpixel + 'ENDS'));
loadGraphic(Paths.image('pixelUI/' + blahblah + 'ENDS'));
width = width / 4;
height = height / 2;
originalHeightForCalcs = height;
loadGraphic(Paths.image('pixelUI/' + skinpixel + 'ENDS'), true, Math.floor(width), Math.floor(height));
loadGraphic(Paths.image('pixelUI/' + blahblah + 'ENDS'), true, Math.floor(width), Math.floor(height));
} else {
loadGraphic(Paths.image('pixelUI/' + skinpixel));
loadGraphic(Paths.image('pixelUI/' + blahblah));
width = width / 4;
height = height / 5;
loadGraphic(Paths.image('pixelUI/' + skinpixel), true, Math.floor(width), Math.floor(height));
loadGraphic(Paths.image('pixelUI/' + blahblah), true, Math.floor(width), Math.floor(height));
}
setGraphicSize(Std.int(width * PlayState.daPixelZoom));
loadPixelNoteAnims();
Expand Down
4 changes: 0 additions & 4 deletions source/Paths.hx
Original file line number Diff line number Diff line change
Expand Up @@ -396,10 +396,6 @@ class Paths
return modFolders('data/' + key + '.json');
}

inline static public function modsSongs(song:String, key:String) {
return modFolders('songs/' + song + '/' + key + '.' + SOUND_EXT);
}

inline static public function modsVideo(key:String) {
return modFolders('videos/' + key + '.' + VIDEO_EXT);
}
Expand Down
22 changes: 12 additions & 10 deletions source/StrumNote.hx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ class StrumNote extends FlxSprite
public var direction:Float = 90;//plan on doing scroll directions soon -bb
public var downScroll:Bool = false;//plan on doing scroll directions soon -bb
public var sustainReduce:Bool = true;
var skinpixel:String = 'NOTE_assets';

private var player:Int;

Expand All @@ -36,14 +35,17 @@ class StrumNote extends FlxSprite
super(x, y);

var skin:String = 'NOTE_assets';
if(PlayState.SONG.arrowSkin != null && PlayState.SONG.arrowSkin.length > 1) skin = PlayState.SONG.arrowSkin;
if(ClientPrefs.noteSkinSettings == 'Clasic') {
skin = 'NOTE_assets';
} else if (ClientPrefs.noteSkinSettings == 'Circle') {
skin = 'NOTE_assets_circle';
} else {
skin = 'NOTE_assets';// for preventing crashes
if (PlayState.SONG.arrowSkin == null || PlayState.SONG.arrowSkin.length <= 1) {
if(ClientPrefs.noteSkinSettings == 'Clasic') {
skin = 'NOTE_assets';
} else if (ClientPrefs.noteSkinSettings == 'Circle') {
skin = 'NOTE_assets_circle';
} else {
skin = 'NOTE_assets';// for preventing crashes
}
}
if (PlayState.SONG.arrowSkin != null && PlayState.SONG.arrowSkin.length > 1) skin = PlayState.SONG.arrowSkin;
//trace(PlayState.SONG.arrowSkin); мама я в ютубе
texture = skin; //Load texture and anims

scrollFactor.set();
Expand All @@ -56,10 +58,10 @@ class StrumNote extends FlxSprite

if(PlayState.isPixelStage)
{
loadGraphic(Paths.image('pixelUI/' + skinpixel));
loadGraphic(Paths.image('pixelUI/' + texture));
width = width / 4;
height = height / 5;
loadGraphic(Paths.image('pixelUI/' + skinpixel), true, Math.floor(width), Math.floor(height));
loadGraphic(Paths.image('pixelUI/' + texture), true, Math.floor(width), Math.floor(height));

antialiasing = false;
setGraphicSize(Std.int(width * PlayState.daPixelZoom));
Expand Down

0 comments on commit 3c98e38

Please sign in to comment.