GameJolt Integration (co-authored by GamerPablito)

.gitignore

@@ -15,3 +15,4 @@ addons/*
 dev-libs/
 *.sum
 .vs/
+.env

assets/data/config/menuItems.txt

@@ -1,4 +1,5 @@
 story mode
 freeplay
 options
-credits
+credits
+gamejolt

assets/data/editors/layouts/stage/characterEditScreen.xml

@@ -8,19 +8,10 @@
 			return 20 + (150 + XOFFSET) * c;
 		}
 		previewSprite = null;
-		if(!char.isAnimate) {
+		if(char.animateAtlas == null) {
 			previewSprite = new FunkinSprite(0, 0);
 			previewSprite.frame = char.frame;
 
-			self.add(previewSprite);
-		} else {
-			previewSprite = new FunkinSprite(0, 0);
-			previewSprite.frames = char.frames;
-			previewSprite.applyStageMatrix = false;
-			// quite a bit of hacking to it buuuuuut
-			previewSprite.animation._curAnim = char.animation._curAnim;
-			previewSprite.animation.frameIndex = char.animation.frameIndex;
-
 			self.add(previewSprite);
 		}
 	</exec>
@@ -62,10 +53,8 @@
 
 		<stepper name="zoomFactorStepper" label="${translate('zoomFactor')}" value="char.zoomFactor" x="col(1)" y="curY" precision="2" step="0.01" width="100" />
 
-		<set name="charTypeY" value="curY" />
 		<section if="!StringTools.startsWith(char.name, 'NO_DELETE_')">
-			<textbox name="charName" label="${translate('positionName')}" value="char.name" x="col(2)" y="curY" width="145"/>
-			<set name="charTypeY" value="self.winHeight - 200" />
+			<textbox name="charName" label="${translate('positionName')}" value="char.name" x="col(2)" y="curY" width="100"/>
 		</section>
 	</section>
 
@@ -89,7 +78,7 @@
 	</section>
 
 	<section>
-		<label name="curCharLabel" text="Character (XML)" x="col(2)" y="charTypeY" size="15" />
+		<label name="curCharLabel" text="Character (XML)" x="col(2)" y="curY - 52" size="15" />
 		 <exec>
 			import funkin.editors.ui.UIAutoCompleteTextBox;
 			import funkin.game.Character;
@@ -121,6 +110,9 @@
 			setEx("highMemory", highMemoryRadio.checked);
 			setEx("lowMemory", lowMemoryRadio.checked);
 
+			if (!StringTools.startsWith(char.name, 'NO_DELETE_'))
+				char.name = charName.field.text;
+
 			char.x = xStepper.value;
 			char.y = yStepper.value;
 			char.scrollFactor.set(scrollXStepper.value, scrollYStepper.value);
@@ -143,49 +135,19 @@
 			char.zoomFactor = zoomFactorStepper.value;
 			char.angle = angleStepper.value;
 
-			var posName = StringTools.startsWith(char.name, 'NO_DELETE_') ? char.name : charName.label.text;
 			var newCharName = curCharBox.label.text;
 			if (newCharName != char.curCharacter) {
 				char.curCharacter = newCharName;
 				char.xml = Character.getXMLFromCharName(newCharName);
 				char.applyXML(char.xml);
 
 				var anim = char.getAnimOrder()[0];
-				char.playAnim(anim, true, 0, true, 0);
-				char.stopAnim();
-			}
-			char.name = posName;
-
-			function saveXY(name:String, x:UINumericStepper, y:UINumericStepper) {
-				button.xml.remove(name + "");
-				button.xml.remove(name + "x");
-				button.xml.remove(name + "y");
-
-				if(x.value == y.value)
-					button.xml.set(name, x.value);
-				else {
-					button.xml.set(name + "x", x.value);
-					button.xml.set(name + "y", y.value);
-				}
+				char.playAnim(anim, true);
+				var lastIndx = char.animation.curAnim.numFrames - 1;
+				char.playAnim(anim, true, null, false, lastIndx);
+				char.stopAnimation();
 			}
 
-			if (!StringTools.startsWith(char.name, "NO_DELETE_"))
-				button.xml.set("name", char.name);
-			saveXY("", xStepper, yStepper);
-			button.xml.set("camxoffset", camxStepper.value);
-			button.xml.set("camyoffset", camyStepper.value);
-
-			saveXY("scale", scaleXStepper, scaleYStepper);
-			saveXY("scroll", scrollXStepper, scrollYStepper);
-			button.xml.set("zoomfactor", zoomFactorStepper.value);
-			button.xml.set("alpha", alphaStepper.value);
-			button.xml.set("angle", angleStepper.value);
-			button.xml.set("skewx", skewXStepper.value);
-			button.xml.set("skewy", skewYStepper.value);
-
-			button.xml.remove("flip");
-			button.xml.remove("flipX");
-			button.xml.set("flip", flipXCheckbox.checked);
 		}
 	</exec>
 </window>

assets/data/editors/layouts/stage/spriteEditScreen.xml

@@ -182,7 +182,6 @@
 
 			if(previewSprite == null) return;
 			previewSprite.color = 0xFFFFFFFF; // TODO: Color Wheel
-			previewSprite.blend = BlendMode.fromString(blendMode.value);
 			previewSprite.skew.x = skewXStepper.value;
 			previewSprite.skew.y = skewYStepper.value;
 			previewSprite.angle = angleStepper.value;
@@ -207,7 +206,6 @@
 			sprite.spriteAnimType = animTypeToString(animType.value);
 			sprite.angle = angleStepper.value;
 			sprite.alpha = alphaStepper.value;
-			sprite.blend = BlendMode.fromString(blendMode.value);
 
 			function saveXY(obj:Dynamic, name:String, x:UINumericStepper, y:UINumericStepper) {
 				button.xml.remove(name + "");
@@ -229,18 +227,18 @@
 				button.xml.set(name, value);
 			}
 
+			// TODO: remove old attributes to prevent possible errors
+			// button.xml.remove();
+
 			button.xml.set("name", nameTextBox.label.text);
 			button.xml.set("sprite", spriteTextBox.label.text);
 			button.xml.set("x", xStepper.value);
 			button.xml.set("y", yStepper.value);
-			button.xml.set("zoomfactor", zoomFactorStepper.value);
+			button.xml.set("zoom", zoomFactorStepper.value);
 			button.xml.set("type", animTypeToString(animType.value));
 			button.xml.set("antialiasing", antialiasingCheckbox.checked);
 			button.xml.set("angle", angleStepper.value);
 			button.xml.set("alpha", alphaStepper.value);
-			button.xml.remove("blend");
-			if (sprite.blend != null)
-				button.xml.set("blend", blendMode.value);
 
 			getEx('anims').clear();
 			var allowedAnims:Array<String> = [for (b in animations.buttons.members) b.animData.name];

assets/data/stages/test.xml

@@ -0,0 +1,12 @@
+<!-- praying to god we remove this file later on -->
+
+<stage zoom="0.9" name="stage" folder="stages/default/" startCamPosY="600" startCamPosX="1000" example="value">
+	<sprite name="normBG" 			sprite="stagefront" x="-500" y="100" scale="0.75" updateHitbox="true" />
+	<sprite name="noUpdateHitbox" 	sprite="stagefront" x="-500" y="300" scale="0.75" />
+	<sprite name="ro-tat-ay" 		sprite="stagefront" x="-500" y="700" scale="0.75" updateHitbox="true" angle="37" />
+	<box name="box" 				x="0" y="0" width="200" height="200" color="0xFF0000" />
+	<solid name="box2" 				x="0" y="300" width="200" height="200" color="0x00FF00" />
+	<unknown-sprite />
+
+	<unknown-sprite-1-attr name="test" />
+</stage>