Skip to content

Commit 80a7ad2

Browse files
committed
Move scripts from using init to new to work around issue with arguments
1 parent ab7d8f7 commit 80a7ad2

File tree

13 files changed

+29
-17
lines changed

13 files changed

+29
-17
lines changed

preload/scripts/characters/nene-christmas.hxc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import funkin.modding.base.ScriptedFlxSprite;
99
import funkin.modding.base.ScriptedFlxSpriteGroup;
1010
import funkin.graphics.FunkinSprite;
1111
import funkin.audio.visualize.ABotVis;
12+
import ABotVisualizer;
1213

1314
class NeneChristmasCharacter extends SparrowCharacter
1415
{
@@ -48,7 +49,7 @@ class NeneChristmasCharacter extends SparrowCharacter
4849
}
4950
});
5051

51-
abot = ScriptedFunkinSprite.init('ABotAtlasSprite', 0, 0);
52+
abot = new ABotAtlasSprite(0, 0);
5253
abot.x = this.x;
5354
abot.y = this.y;
5455
abot.zIndex = this.zIndex - 1;

preload/scripts/characters/nene.hxc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import flixel.FlxG;
66
import funkin.graphics.FunkinSprite;
77
import funkin.modding.base.ScriptedFunkinSprite;
88
import funkin.audio.visualize.ABotVis;
9+
import ABotAtlasSprite;
910

1011
/**
1112
* One of two states that the A-Bot's pupils can be in.
@@ -203,7 +204,7 @@ class NeneBaseCharacter extends AnimateAtlasCharacter
203204
}
204205
});
205206

206-
abot = ScriptedFunkinSprite.init('ABotAtlasSprite', 0, 0);
207+
abot = new ABotAtlasSprite(0, 0);
207208
abot.x = this.x;
208209
abot.y = this.y;
209210
abot.zIndex = this.zIndex - 1;

preload/scripts/characters/otis-speaker.hxc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import funkin.graphics.FunkinSprite;
88
import funkin.modding.base.ScriptedFunkinSprite;
99
import funkin.audio.visualize.ABotVis;
1010
import funkin.graphics.shaders.AdjustColorShader;
11+
import ABotAtlasSprite;
1112

1213
class OtisSpeakerCharacter extends AnimateAtlasCharacter
1314
{
@@ -74,7 +75,7 @@ class OtisSpeakerCharacter extends AnimateAtlasCharacter
7475
}
7576
});
7677

77-
abot = ScriptedFunkinSprite.init('ABotAtlasSprite', 0, 0);
78+
abot = new ABotAtlasSprite(0, 0);
7879
abot.x = this.x;
7980
abot.y = this.y;
8081
abot.zIndex = this.zIndex - 1;

preload/scripts/characters/pico-playable.hxc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import funkin.util.Constants;
1717
import funkin.util.HapticUtil;
1818
import funkin.Preferences;
1919
import funkin.FunkinMemory;
20+
import CasingSprite;
2021

2122
class PicoPlayerCharacter extends MultiAnimateAtlasCharacter
2223
{
@@ -335,7 +336,7 @@ class PicoPlayerCharacter extends MultiAnimateAtlasCharacter
335336
addToStage(casingGroup);
336337
}
337338

338-
var casing = ScriptedFunkinSprite.init('CasingSprite', 0, 0);
339+
var casing = new CasingSprite(0, 0);
339340
if (casing != null) casingGroup.add(casing);
340341
}
341342

preload/scripts/songs/2hot.hxc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import funkin.play.stage.StageProp;
2020
import funkin.save.Save;
2121
import funkin.ui.FullScreenScaleMode;
2222
import funkin.FunkinMemory;
23+
import SpraycanAtlasSprite;
2324

2425
// We have to use FlxBasePoint in scripts because FlxPoint is inlined and not available in scripts
2526
class TwoHOTSong extends Song
@@ -223,7 +224,7 @@ class TwoHOTSong extends Song
223224
// This creates the can and starts the animation.
224225
// We define the behavior of the can in a separate scripted class,
225226
// which allows the can to track and manage its own properties.
226-
var newCan:ScriptedFunkinSprite = ScriptedFunkinSprite.init('SpraycanAtlasSprite', 0, 0);
227+
var newCan:SpraycanAtlasSprite = new SpraycanAtlasSprite(0, 0);
227228
var spraycanPile = PlayState.instance.currentStage.getNamedProp('spraycanPile');
228229

229230
newCan.x = spraycanPile.x - 10;

preload/scripts/songs/darnell.hxc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import funkin.audio.FunkinSound;
1818
import funkin.play.cutscene.VideoCutscene;
1919
import funkin.play.cutscene.CutsceneType;
2020
import funkin.play.PlayStatePlaylist;
21+
import SpraycanAtlasSprite;
2122

2223
class DarnellSong extends Song
2324
{
@@ -150,7 +151,7 @@ class DarnellSong extends Song
150151
cutsceneCan.zIndex = spraycanPile.zIndex - 1;
151152
PlayState.instance.currentStage.refresh();
152153

153-
var newCan:ScriptedFunkinSprite = ScriptedFunkinSprite.init('SpraycanAtlasSprite', 0, 0);
154+
var newCan:SpraycanAtlasSprite = new SpraycanAtlasSprite(0, 0);
154155
var spraycanPile = PlayState.instance.currentStage.getNamedProp('spraycanPile');
155156
newCan.x = spraycanPile.x - 10;
156157
newCan.y = spraycanPile.y - 550;

preload/scripts/songs/eggnog-erect.hxc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import flixel.text.FlxTextBorderStyle;
2020
import funkin.util.TouchUtil;
2121
import funkin.ui.FullScreenScaleMode;
2222
import funkin.Preferences;
23+
import SantaDiesSprite;
24+
import DadShootsSprite;
2325

2426
// We have to use FlxBasePoint in scripts because FlxPoint is inlined and not available in scripts
2527
class EggnogErectSong extends Song
@@ -99,7 +101,7 @@ class EggnogErectSong extends Song
99101
var normalSanta = PlayState.instance.currentStage.getNamedProp('santa');
100102
normalSanta.visible = false;
101103

102-
var santaDead:ScriptedFunkinSprite = ScriptedFunkinSprite.init('SantaDiesSprite', 0, 0);
104+
var santaDead:ScriptedFunkinSprite = new SantaDiesSprite(0, 0);
103105
santaDead.x = -1300;
104106
santaDead.y = 100;
105107
santaDead.zIndex = normalSanta.zIndex - 1;
@@ -111,7 +113,7 @@ class EggnogErectSong extends Song
111113
santaDead.scriptCall('playCutscene');
112114

113115
PlayState.instance.currentStage.getDad().visible = false;
114-
var parentsShoot:ScriptedFunkinSprite = ScriptedFunkinSprite.init('DadShootsSprite', 0, 0);
116+
var parentsShoot:ScriptedFunkinSprite = new DadShootsSprite(0, 0);
115117

116118
parentsShoot.x = -602;
117119
parentsShoot.y = -3.5;

preload/scripts/songs/stress-pico.hxc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class StressPicoMixSong extends Song
6363
{
6464
// Initialize the tankman group if it's not available.
6565
trace('Initializing tankman group... ' + PlayState.instance.currentVariation);
66-
tankmanGroup = ScriptedFlxSpriteGroup.init('TankmanSpriteGroup', true);
66+
tankmanGroup = new TankmanSpriteGroup(true);
6767
}
6868

6969
if (tankmanGroup != null)

preload/scripts/songs/stress.hxc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class StressSong extends Song
6262
{
6363
// Initialize the tankman group if it's not available.
6464
trace('Initializing tankman group... ' + PlayState.instance.currentVariation);
65-
tankmanGroup = ScriptedFlxSpriteGroup.init('TankmanSpriteGroup');
65+
tankmanGroup = new TankmanSpriteGroup();
6666
}
6767

6868
if (tankmanGroup != null)

preload/scripts/stages/phillyTrain.hxc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import funkin.modding.base.ScriptedFlxRuntimeShader;
77
import funkin.play.PlayState;
88
import funkin.play.stage.Stage;
99
import funkin.util.HapticUtil;
10+
import BuildingEffectShader;
1011

1112
class PhillyTrainStage extends Stage
1213
{
@@ -35,7 +36,7 @@ class PhillyTrainStage extends Stage
3536
trainEnabled = true;
3637

3738
// NOTE: You pass the constructor variables directly, not as an array.
38-
lightShader = ScriptedFlxRuntimeShader.init('BuildingEffectShader', 1.0);
39+
lightShader = new BuildingEffectShader(1.0);
3940
trainSound = FunkinSound.load(Paths.sound('train_passes'), 1.0, false, false, false);
4041
PlayState.instance.add(trainSound); // Sounds need to be added to the scene for update() to work
4142

0 commit comments

Comments
 (0)