Merge branch 'new-editors' into zoro-charterstuffs

assets/data/scripts/pixel.hx

@@ -1,3 +1,4 @@
+//
 import funkin.game.HudCamera;
 import funkin.backend.scripting.events.NoteHitEvent;
 

assets/data/stages/limo.hx

@@ -1,39 +1,43 @@
 var fastCarCanDrive:Bool = true;
 
-function create() {
+function create()
 	resetFastCar();
-}
-function update(elapsed:Float) {
+
+function update(elapsed:Float)
+{
 	if (!fastCarCanDrive && fastCar.x > 2000) {
 		resetFastCar();
 		fastCarCanDrive = true;
 	}
 
+	var offset = Math.sin(curBeatFloat / 4) * Math.cos(curBeatFloat / 16) * 85;
+
 	// back limo drive
 	if (Options.lowMemoryMode) {
-		bgLimo.frameOffset.x = Math.sin(curBeatFloat / 4) * Math.cos(curBeatFloat / 16) * 85;
+		bgLimo.frameOffset.x = offset;
 	} else {
 		for(e in [bgLimo, dancer1, dancer2, dancer3, dancer4, dancer5]) {
-			e.frameOffset.x = Math.sin(curBeatFloat / 4) * Math.cos(curBeatFloat / 16) * 85;
+			e.frameOffset.x = offset;
 		}
 	}
 }
-function beatHit(curBeat:Int) {
+function beatHit(curBeat:Int)
 	if (FlxG.random.bool(10) && fastCarCanDrive)
 		fastCarDrive();
-}
 
-
-function resetFastCar() {
+function resetFastCar()
+{
 	fastCar.x = -12600;
 	fastCar.y = FlxG.random.int(140, 250);
 	fastCar.velocity.x = 0;
+	fastCar.moves = false;
 	fastCarCanDrive = true;
 }
 function fastCarDrive()
 {
 	FlxG.sound.play(Paths.soundRandom('carPass', 0, 1), 0.7);
 
-	fastCar.velocity.x = (FlxG.random.int(170, 220) / FlxG.elapsed) * 3;
+	fastCar.velocity.x = FlxG.random.int(170, 220) * 60 * 3;
+	fastCar.moves = true;
 	fastCarCanDrive = false;
 }

assets/data/stages/philly.hx

@@ -1,3 +1,4 @@
+//
 import funkin.game.PlayState;
 
 // phillyTrain is automatically added by Stage.hx

assets/data/stages/school-evil.hx

@@ -1,5 +1,4 @@
 function create() {
-	importScript("data/scripts/pixel");
 	isSpooky = true;
 
 	// Make transition work between school types

assets/data/stages/school-evil.xml

@@ -1,5 +1,6 @@
 <!DOCTYPE codename-engine-stage>
 <stage zoom="1" name="school-evil" folder="stages/school/" startCamPosY="550" startCamPosX="600">
+	<use-extension script="pixel"/>
 	<sprite name="bg" x="400" y="200" sprite="animatedEvilSchool"
 		antialiasing="false" scale="6" scrollx="0.8" scrolly="0.9" type="loop"/>
 </stage>

assets/data/stages/school.hx

@@ -1,5 +1,5 @@
+//
 function create() {
-	importScript("data/scripts/pixel");
 	if (PlayState.SONG.meta.name.toLowerCase() == "roses") {
 		bgGirls.animation.remove("danceLeft");
 		bgGirls.animation.remove("danceRight");

assets/data/stages/school.xml

@@ -1,5 +1,7 @@
 <!DOCTYPE codename-engine-stage>
 <stage zoom="1" folder="stages/school/" startCamPosY="550" startCamPosX="600">
+	<use-extension script="pixel"/>
+
 	<sprite name="bgSky" x="-12" y="0" sprite="weebSky"
 		antialiasing="false" scale="6" scroll="0.1" updateHitbox="true"/>
 

assets/shaders/engine/editorBlur.frag

@@ -18,17 +18,17 @@ void main() {
 		return;
 
 	vec4 color = getColor(camPos);
-	float fsteps = steps;
-	for(float inside = 1.0; inside < stepsInside+1.0; inside++) {
+	float fsteps = float(steps);
+	for(float inside = 1.0; inside < float(stepsInside)+1.0; inside++) {
 		for(int i = 0; i < steps; i++) {
-			float fi = i;
+			float fi = float(i);
 			color += getColor(camPos + vec2(
-				strength * (inside / stepsInside) * cos(fi / fsteps * (PI * 2.0)),
-				strength * (inside / stepsInside) * sin(fi / fsteps * (PI * 2.0))
+				strength * (inside / float(stepsInside)) * cos(fi / fsteps * (PI * 2.0)),
+				strength * (inside / float(stepsInside)) * sin(fi / fsteps * (PI * 2.0))
 			));
 		}
 	}
 
-	color /= steps * stepsInside;
+	color /= vec4(steps * stepsInside);
 	gl_FragColor = color;
-}
+}