Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 01:55:52 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'feature/scripted-stages' of github.com:ninjamuffin99/Funkin-secret into feature/scripted-stages

Browse source
This commit is contained in:
Eric Myllyoja 2022-03-09 10:36:39 -05:00
commit 19cda4ed15
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,13 +1,12 @@
package funkin.play; package funkin.play;
import funkin.charting.ChartingState;
import flixel.addons.effects.FlxTrail;
import flixel.addons.transition.FlxTransitionableState;
import flixel.FlxCamera; import flixel.FlxCamera;
import flixel.FlxObject; import flixel.FlxObject;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.FlxState; import flixel.FlxState;
import flixel.FlxSubState; import flixel.FlxSubState;
import flixel.addons.effects.FlxTrail;
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.FlxPoint;
@ -19,17 +18,18 @@ import flixel.ui.FlxBar;
import flixel.util.FlxColor; 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.Section.SwagSection;
import funkin.SongLoad.SwagSong;
import funkin.charting.ChartingState;
import funkin.play.stage.Stage;
import funkin.play.stage.StageData;
import funkin.shaderslmfao.ColorSwap;
import funkin.ui.PopUpStuff;
import funkin.ui.PreferencesMenu;
import haxe.Json; import haxe.Json;
import lime.ui.Haptic; import lime.ui.Haptic;
import lime.utils.Assets; import lime.utils.Assets;
import funkin.Note;
import funkin.play.stage.Stage;
import funkin.play.stage.StageData;
import funkin.Section.SwagSection;
import funkin.shaderslmfao.ColorSwap;
import funkin.SongLoad.SwagSong;
import funkin.ui.PopUpStuff;
import funkin.ui.PreferencesMenu;
using StringTools; using StringTools;
@ -1574,6 +1574,8 @@ class PlayState extends MusicBeatState
FlxG.sound.music.pause(); FlxG.sound.music.pause();
vocals.pause(); vocals.pause();
curStage.resetStage();
FlxG.sound.music.time = 0; FlxG.sound.music.time = 0;
regenNoteData(); // loads the note data from start regenNoteData(); // loads the note data from start
health = 1; health = 1;

11
source/funkin/play/stage/Stage.hx
View file

@ -1,8 +1,8 @@
package funkin.play.stage; package funkin.play.stage;
import flixel.math.FlxPoint;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.group.FlxSpriteGroup; import flixel.group.FlxSpriteGroup;
import flixel.math.FlxPoint;
import flixel.util.FlxSort; import flixel.util.FlxSort;
import funkin.modding.IHook; import funkin.modding.IHook;
import funkin.play.character.Character.CharacterType; import funkin.play.character.Character.CharacterType;
@ -200,6 +200,15 @@ class Stage extends FlxSpriteGroup implements IHook
trace('Stage sorted by z-index'); trace('Stage sorted by z-index');
} }
/**
* Resets the stage and it's props (needs to be overridden with your own logic!)
*/
public function resetStage()
{
// Override me in your script to reset stage shit however you please!
// also note: maybe add some default behaviour to reset stage stuff?
}
/** /**
* A function that should get called every frame. * A function that should get called every frame.
*/ */