cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-10-05 17:00:39 +00:00
Code Issues Releases Wiki Activity

combo stuf in progress, lil cleanups

Browse source
This commit is contained in:
Cameron Taylor 2021-07-14 19:00:22 -04:00
parent 85bff686a4
commit 9cb1c6b0ea
7 changed files with 52 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Project.xml
View file

@ -124,6 +124,8 @@
<!--haxelib name="newgrounds" unless="switch"/> -->
<haxelib name="faxe" if='switch'/>
<haxelib name="polymod"/>
<!-- <haxelib name="colyseus"/> -->
<!-- <haxelib name="colyseus-websocket" /> -->
<!-- <haxelib name="newgrounds"/> -->
<haxelib name="hxcpp-debug-server" if="desktop debug"/>

12
source/ControlsSubState.hx
View file

@ -1,12 +0,0 @@
package;
import flixel.FlxSprite;
import flixel.FlxSubState;
class ControlsSubState extends FlxSubState
{
public function new()
{
super();
}
}

12
source/TitleState.hx
View file

@ -41,6 +41,10 @@ import ui.stageBuildShit.StageBuilderState;
using StringTools;
#if colyseus
import io.colyseus.Client;
import io.colyseus.Room;
#end
#if discord_rpc
import Discord.DiscordClient;
#end
@ -160,6 +164,8 @@ class TitleState extends MusicBeatState
FlxG.switchState(new StageBuilderState());
#elseif ANIMDEBUG
FlxG.switchState(new ui.animDebugShit.DebugBoundingState());
#elseif NETTEST
FlxG.switchState(new netTest.NetTest());
#else
new FlxTimer().start(1, function(tmr:FlxTimer)
{
@ -375,6 +381,12 @@ class TitleState extends MusicBeatState
override function update(elapsed:Float)
{
if (FlxG.keys.justPressed.Y)
{
FlxTween.tween(FlxG.stage.window, {x: FlxG.stage.window.x + 300}, 1.4, {ease: FlxEase.quadInOut, type: PINGPONG, startDelay: 0.35});
FlxTween.tween(FlxG.stage.window, {y: FlxG.stage.window.y + 100}, 0.7, {ease: FlxEase.quadInOut, type: PINGPONG});
}
/*
FlxG.watch.addQuick('cur display', FlxG.stage.window.display.id);
if (FlxG.keys.justPressed.Y)

7
source/ui/animDebugShit/DebugBoundingState.hx
View file

@ -15,7 +15,6 @@ import flixel.text.FlxText;
import flixel.util.FlxColor;
import flixel.util.FlxSpriteUtil;
import flixel.util.FlxTimer;
import js.html.FileList;
import lime.utils.Assets as LimeAssets;
import openfl.Assets;
import openfl.events.Event;
@ -29,6 +28,9 @@ import openfl.utils.ByteArray;
using StringTools;
using flixel.util.FlxSpriteUtil;
#if web
import js.html.FileList;
#end
#if sys
import sys.io.File;
#end
@ -67,7 +69,8 @@ class DebugBoundingState extends FlxState
FlxG.cameras.add(hudCam, false);
bg = FlxGridOverlay.create(10, 10);
// bg = FlxGridOverlay.create(10, 10);
bg = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.GREEN);
bg.scrollFactor.set();
add(bg);

9
source/ui/stageBuildShit/CharStage.hx Normal file
View file

@ -0,0 +1,9 @@
package ui.stageBuildShit;
class CharStage extends SprStage
{
public function new(x:Float, y:Float, dragShitFunc:SprStage->Void)
{
super(x, y, dragShitFunc);
}
}

2
source/ui/stageBuildShit/StageBuilderState.hx
View file

@ -437,6 +437,7 @@ enum FOCUS
{
ATTRIBUTES;
MOVEMENTS;
TOOLBAR;
}
enum TOOLS
@ -445,4 +446,5 @@ enum TOOLS
MOVE;
GRAB;
GRABBING;
BOYFRIEND;
}

22
source/ui/stageBuildShit/StagetoolBar.hx Normal file
View file

@ -0,0 +1,22 @@
package ui.stageBuildShit;
import flixel.group.FlxGroup;
class StagetoolBar extends FlxGroup
{
var icons:Array<StageBuilderState.TOOLS> = [SELECT, MOVE, GRAB, BOYFRIEND];
var iconSprs:Array<String> = ['cursorSelect', 'cursorGrab', 'cursorMove', 'toolbarBF'];
public function new()
{
super();
for (icon in icons)
{
// switch (icon)
// {
// case SELECT:
// }
}
}
}