cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-17 12:23:36 +00:00
Code Issues Releases Wiki Activity

First test of Week 4 Gameplay, plus fixes for MultiSparrow

Browse source
This commit is contained in:
Eric Myllyoja 2022-05-29 21:40:13 -04:00
parent 64b40ce7b8
commit 9dfbfad926
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.vscode/launch.json vendored
View file

@ -28,5 +28,6 @@
"request": "launch", "request": "launch",
"program": "${workspaceRoot}/export/debug/macos/bin/Funkin.app/Contents/MacOS/Funkin", "program": "${workspaceRoot}/export/debug/macos/bin/Funkin.app/Contents/MacOS/Funkin",
"preLaunchTask": "debug: mac" "preLaunchTask": "debug: mac"
}
] ]
} }

8
source/funkin/modding/base/ScriptedFlxState.hx Normal file
View file

@ -0,0 +1,8 @@
package funkin.modding.base;
import flixel.FlxState;
import funkin.modding.IHook;
// This doesn't work and is still a WIP
// @:hscriptClass
// class ScriptedFlxState extends FlxState implements IHook {}

13
source/funkin/play/PlayState.hx
View file

@ -6,10 +6,8 @@ import flixel.FlxSprite;
import flixel.FlxState; import flixel.FlxState;
import flixel.FlxSubState; import flixel.FlxSubState;
import flixel.addons.transition.FlxTransitionableState; import flixel.addons.transition.FlxTransitionableState;
import flixel.addons.transition.FlxTransitionableState;
import flixel.group.FlxGroup; import flixel.group.FlxGroup;
import flixel.math.FlxMath; import flixel.math.FlxMath;
import flixel.math.FlxPoint;
import flixel.math.FlxRect; import flixel.math.FlxRect;
import flixel.text.FlxText; import flixel.text.FlxText;
import flixel.tweens.FlxEase; import flixel.tweens.FlxEase;
@ -19,21 +17,14 @@ import flixel.util.FlxColor;
import flixel.util.FlxSort; import flixel.util.FlxSort;
import flixel.util.FlxTimer; import flixel.util.FlxTimer;
import funkin.Note; import funkin.Note;
import funkin.Note;
import funkin.Section.SwagSection; import funkin.Section.SwagSection;
import funkin.Section.SwagSection;
import funkin.SongLoad.SwagSong;
import funkin.SongLoad.SwagSong; import funkin.SongLoad.SwagSong;
import funkin.charting.ChartingState; import funkin.charting.ChartingState;
import funkin.modding.IHook; import funkin.modding.IHook;
import funkin.modding.IHook;
import funkin.modding.events.ScriptEvent; import funkin.modding.events.ScriptEvent;
import funkin.modding.events.ScriptEventDispatcher; import funkin.modding.events.ScriptEventDispatcher;
import funkin.modding.module.ModuleHandler;
import funkin.play.HealthIcon; import funkin.play.HealthIcon;
import funkin.play.Strumline.StrumlineArrow; import funkin.play.Strumline.StrumlineArrow;
import funkin.play.Strumline.StrumlineArrow;
import funkin.play.Strumline.StrumlineStyle;
import funkin.play.Strumline.StrumlineStyle; import funkin.play.Strumline.StrumlineStyle;
import funkin.play.character.BaseCharacter; import funkin.play.character.BaseCharacter;
import funkin.play.character.CharacterData; import funkin.play.character.CharacterData;
@ -1106,6 +1097,10 @@ class PlayState extends MusicBeatState implements IHook
FlxG.watch.addQuick("beatShit", curBeat); FlxG.watch.addQuick("beatShit", curBeat);
FlxG.watch.addQuick("stepShit", curStep); FlxG.watch.addQuick("stepShit", curStep);
if (currentStage != null)
{
FlxG.watch.addQuick("bfAnim", currentStage.getBoyfriend().getCurrentAnimation());
}
FlxG.watch.addQuick("songPos", Conductor.songPosition); FlxG.watch.addQuick("songPos", Conductor.songPosition);
if (currentSong.song == 'Fresh') if (currentSong.song == 'Fresh')

3
source/funkin/play/character/MultiSparrowCharacter.hx
View file

@ -176,6 +176,9 @@ class MultiSparrowCharacter extends BaseCharacter
public override function playAnimation(name:String, restart:Bool = false, ?ignoreOther:Bool = false):Void public override function playAnimation(name:String, restart:Bool = false, ?ignoreOther:Bool = false):Void
{ {
if (!this.canPlayOtherAnims)
return;
loadFramesByAnimName(name); loadFramesByAnimName(name);
super.playAnimation(name, restart, ignoreOther); super.playAnimation(name, restart, ignoreOther);
} }

4
source/funkin/play/stage/Bopper.hx
View file

@ -1,6 +1,5 @@
package funkin.play.stage; package funkin.play.stage;
import flixel.FlxG;
import flixel.FlxSprite; import flixel.FlxSprite;
import funkin.modding.IScriptedClass.IPlayStateScriptedClass; import funkin.modding.IScriptedClass.IPlayStateScriptedClass;
import funkin.modding.events.ScriptEvent; import funkin.modding.events.ScriptEvent;
@ -196,9 +195,6 @@ class Bopper extends FlxSprite implements IPlayStateScriptedClass
*/ */
public function playAnimation(name:String, restart:Bool = false, ?ignoreOther:Bool = false):Void public function playAnimation(name:String, restart:Bool = false, ?ignoreOther:Bool = false):Void
{ {
if (ignoreOther == null)
ignoreOther = false;
if (!canPlayOtherAnims) if (!canPlayOtherAnims)
return; return;