Skip to content

Commit

Permalink
Merge pull request #8 from FuckingAltLol/Stupid-SScript-Test-Shit
Browse files Browse the repository at this point in the history 
Erm, Silly SScript Buff lol
  • Loading branch information
@DEMOLITIONDON96
DEMOLITIONDON96 authored Apr 24, 2024
2 parents b53221f + c7848fe commit 510fa6b
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 18 deletions.
78 changes: 69 additions & 9 deletions source/base/dependency/FeatherDeps.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ class ScriptHandler extends SScript
// here we set up the built-in imports
// these should work on *any* script;

// ASSET SHIT FOR CUSTOM MENU SCRIPTS
set('Assets', openfl.utils.Assets);

// VARIABLES
set('globalElapsed', globals.Main.globalElapsed);

Expand All @@ -95,23 +98,80 @@ class ScriptHandler extends SScript
set('FlxBasic', flixel.FlxBasic);
set('FlxObject', flixel.FlxObject);
set('FlxSprite', flixel.FlxSprite);
set('FlxGraphic', flixel.graphics.FlxGraphic);
set('FlxCamera', flixel.FlxCamera);
set('FlxSound', #if (flixel <= "5.2.2") flixel.system.FlxSound #else flixel.sound.FlxSound #end);
set('FlxSort', flixel.util.FlxSort);
set('FlxStringUtil', flixel.util.FlxStringUtil);
set('FlxState', flixel.FlxState);
set('FlxSubState', flixel.FlxSubState);
set('FlxText', flixel.text.FlxText);
set('FlxTimer', flixel.util.FlxTimer);
set('FlxTween', flixel.tweens.FlxTween);
set('FlxEase', flixel.tweens.FlxEase);
set('FlxTrail', flixel.addons.effects.FlxTrail);
set('FlxEmitter', flixel.effects.particles.FlxEmitter);
set('FlxParticle', flixel.effects.particles.FlxParticle);
set('FlxTypedGroup', flixel.group.FlxGroup.FlxTypedGroup);
set('FlxGroup', flixel.group.FlxGroup);
set('FlxGradient', flixel.util.FlxGradient);
set('FlxSpriteGroup', flixel.group.FlxSpriteGroup);
set('FlxMath', flixel.math.FlxMath);

// EFFECTS
set('FlxStrip', flixel.FlxStrip);
set('ColorTransform', openfl.geom.ColorTransform);
set('FlxGradient', flixel.util.FlxGradient);
set('FlxBackdrop', flixel.addons.display.FlxBackdrop);
set('FlxTrail', flixel.addons.effects.FlxTrail);
set('FlxTrailArea', flixel.addons.effects.FlxTrailArea);
set('FlxEmitter', flixel.effects.particles.FlxEmitter);
set('FlxEmitterMode', flixel.effects.particles.FlxEmitterMode);
set('FlxParticle', flixel.effects.particles.FlxParticle);
set('BaseScaleMode', flixel.system.scaleModes.BaseScaleMode);

// FLXTEXT EXTENSIONS
set('FlxTypeText', flixel.addons.text.FlxTypeText);
set('FlxTextField', flixel.addons.text.FlxTextField);
set('TypeSound', flixel.addons.text.TypeSound);
set('FlxTextAlign', flixel.text.FlxText.FlxTextAlign);
set('FlxTextBorderStyle', flixel.text.FlxText.FlxTextBorderStyle);
set('FlxTextFormat', flixel.text.FlxText.FlxTextFormat);
set('FlxTextFormatMarkerPair', flixel.text.FlxText.FlxTextFormatMarkerPair);

// FLXSPRITE EXTENSIONS
set('FlxSliceSprite', flixel.addons.display.FlxSliceSprite);
set('FlxTiledSprite', flixel.addons.display.FlxTiledSprite);
set('FlxSkewedSprite', flixel.addons.effects.FlxSkewedSprite);
set('FlxSpriteAniRot', flixel.addons.display.FlxSpriteAniRot);

// SCALE MODE EXTENSIONS
set('FixedScaleAdjustSizeScaleMode', flixel.system.scaleModes.FixedScaleAdjustSizeScaleMode);
set('RatioScaleMode', flixel.system.scaleModes.RatioScaleMode);
set('RelativeScaleMode', flixel.system.scaleModes.RelativeScaleMode);
set('PixelPerfectScaleMode', flixel.system.scaleMode.PixelPerfectScaleMode);

// MATH UTILS
set('FlxPoint', flixel.math.FlxPoint);
set('FlxRect', flixel.math.FlxRect);
set('FlxVelocity', flixel.math.FlxVelocity);
set('FlxAngle', flixel.math.FlxAngle);
set('FlxSinCos', flixel.math.FlxAngle.FlxSinCos);

// FLIXEL UTILS
set('FlxCollision', flixel.util.FlxCollision);
set('FlxAxes', flixel.util.FlxAxes);
set('FlxEase', flixel.tweens.FlxEase);
set('FlxSort', flixel.util.FlxSort);
set('FlxCameraFollowStyle', flixel.FlxCamera.FlxCameraFollowStyle);
set('FlxArrayUtil', flixel.util.FlxArrayUtil);
set('FlxStringUtil', flixel.util.FlxStringUtil);
set('FlxSpriteUtil', flixel.util.FlxSpriteUtil);
set('FlxColorTransformUtil', flixel.util.FlxColorTransformUtil);

// MISC UTILS
set('BlendMode', flash.display.BlendMode);
set('StageQuality', flash.display.StageQuality);
set('StageScaleMode', flash.display.StageScaleMode);
set('StringTools', StringTools);

// WINDOW ICON TOOLS
set('Image', lime.graphics.Image);
set('BitmapData', flash.display.BitmapData);

// WINDOW MODCHARTS
set('Application', lime.app.Application);
set('System', flash.system.System);
Expand All @@ -126,11 +186,11 @@ class ScriptHandler extends SScript
set('HealthIcon', objects.ui.HealthIcon);
set('Receptor', objects.ui.notes.Strumline.Receptor);
set('Strumline', objects.ui.notes.Strumline);
set('game', states.PlayState.main);
set('Game', states.PlayState.main);
set('PlayState', states.PlayState);
set('Paths', globals.Paths);

// CLASSES (FOREVER);
// CLASSES (SPECTRA);
set('Init', globals.Init);
set('Main', globals.Main);
set('Stage', objects.Stage);
Expand Down
2 changes: 2 additions & 0 deletions source/globals/Main.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import openfl.events.UncaughtErrorEvent;
import openfl.system.System;
import openfl.utils.AssetCache;
import states.MusicBeatState;
import states.ScriptableState;
import states.ScriptableState.ScriptableSubstate;
import sys.FileSystem;
import sys.io.File;
import sys.io.Process;
Expand Down
21 changes: 12 additions & 9 deletions source/states/ScriptableState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import flixel.FlxSubState;
**/
class ScriptableState extends MusicBeatState
{
var stateScript:ScriptHandler;
public static var stateScript:ScriptHandler;
var errorCatch:String; // string containing error information;

override public function new(className:String):Void
Expand All @@ -21,7 +21,7 @@ class ScriptableState extends MusicBeatState
// here we actually create the main script
try
{
stateScript = new ScriptHandler(Paths.module('data/menus/states/$className'));
stateScript = new ScriptHandler(Paths.module(className, 'data/menus/states'));
}
catch (e)
{
Expand Down Expand Up @@ -106,6 +106,9 @@ class ScriptableState extends MusicBeatState

function variableCalls()
{
// can you shut the fuck up about the "Assets" error now?
scriptCall('Assets', openfl.utils.Assets);

scriptSet('this', this);
scriptSet('add', add);
scriptSet('remove', remove);
Expand Down Expand Up @@ -138,7 +141,7 @@ class ScriptableState extends MusicBeatState

class ScriptableSubstate extends MusicBeatSubstate
{
var stateScript:ScriptHandler;
public static var substateScript:ScriptHandler;
var errorCatch:String; // string containing error information;

override public function new(className:String):Void
Expand All @@ -148,7 +151,7 @@ class ScriptableSubstate extends MusicBeatSubstate
// here we actually create the main script
try
{
stateScript = new ScriptHandler(Paths.module('data/menus/substates/$className'));
substateScript = new ScriptHandler(Paths.module(className, 'data/menus/substates'));
}
catch (e)
{
Expand All @@ -168,7 +171,7 @@ class ScriptableSubstate extends MusicBeatSubstate

override public function update(elapsed:Float)
{
if (stateScript == null)
if (substateScript == null)
{
Main.switchState(this, new states.menus.MainMenu('[SCRIPTABLE SUBSTATE]: $errorCatch'));
return;
Expand Down Expand Up @@ -235,13 +238,13 @@ class ScriptableSubstate extends MusicBeatSubstate

function scriptCall(funcName:String, params:Array<Dynamic>)
{
if (stateScript != null)
stateScript.call(funcName, params);
if (suvstateScript != null)
substateScript.call(funcName, params);
}

function scriptSet(varName:String, value:Dynamic)
{
if (stateScript != null)
stateScript.set(varName, value);
if (substateScript != null)
substateScript.set(varName, value);
}
}

0 comments on commit 510fa6b

Please sign in to comment.