Fix atlases moving to the wrong place on restart

Bundled with a ton of manual offset fixes and adjustments

Author: AbnormalPoof

source/funkin/play/character/AnimateAtlasCharacter.hx

@@ -5,7 +5,6 @@ import funkin.util.assets.FlxAnimationUtil;
 import funkin.modding.events.ScriptEvent;
 import funkin.data.animation.AnimationData;
 import funkin.data.character.CharacterData.CharacterRenderType;
-import flixel.math.FlxPoint;
 
 /**
  * An AnimateAtlasCharacter is a Character which is rendered by
@@ -16,8 +15,6 @@ import flixel.math.FlxPoint;
  */
 class AnimateAtlasCharacter extends BaseCharacter
 {
-  var originalSizes(default, never):FlxPoint = new FlxPoint(0, 0);
-
   public function new(id:String)
   {
     super(id, CharacterRenderType.AnimateAtlas);
@@ -43,8 +40,6 @@ class AnimateAtlasCharacter extends BaseCharacter
 
     trace('[ATLASCHAR] Successfully loaded texture atlas for ${characterId} with ${_data.animations.length} animations.');
     super.onCreate(event);
-
-    originalSizes.set(this.width, this.height);
   }
 
   function loadAtlas():Void
@@ -91,16 +86,6 @@ class AnimateAtlasCharacter extends BaseCharacter
     trace('[ATLASCHAR] Successfully loaded ${animNames.length} animations for ${characterId}');
   }
 
-  override function get_width():Float
-  {
-    return originalSizes.x;
-  }
-
-  override function get_height():Float
-  {
-    return originalSizes.y;
-  }
-
   /**
    * Get the configuration for the texture atlas.
    * @return The configuration for the texture atlas.

source/funkin/play/character/BaseCharacter.hx

@@ -318,11 +318,11 @@ class BaseCharacter extends Bopper
     }
   }
 
-  function resetCameraFocusPoint():Void
+  public function resetCameraFocusPoint():Void
   {
     // Calculate the camera focus point
-    var charCenterX = this.x + this.width / 2;
-    var charCenterY = this.y + this.height / 2;
+    var charCenterX = this.originalPosition.x + this.width / 2;
+    var charCenterY = this.originalPosition.y + this.height / 2;
     this.cameraFocusPoint = new FlxPoint(charCenterX + _data.cameraOffsets[0], charCenterY + _data.cameraOffsets[1]);
   }
 

source/funkin/play/character/MultiAnimateAtlasCharacter.hx

@@ -6,7 +6,6 @@ import animate.FlxAnimateFrames;
 import funkin.modding.events.ScriptEvent;
 import funkin.data.animation.AnimationData;
 import funkin.data.character.CharacterData.CharacterRenderType;
-import flixel.math.FlxPoint;
 
 /**
  * This render type is the most complex, and is used by characters which use
@@ -18,8 +17,6 @@ import flixel.math.FlxPoint;
  */
 class MultiAnimateAtlasCharacter extends BaseCharacter
 {
-  var originalSizes(default, never):FlxPoint = new FlxPoint(0, 0);
-
   public function new(id:String)
   {
     super(id, CharacterRenderType.MultiAnimateAtlas);
@@ -45,8 +42,6 @@ class MultiAnimateAtlasCharacter extends BaseCharacter
 
     trace('[MULTIATLASCHAR] Successfully loaded texture atlases for ${characterId} with ${_data.animations.length} animations.');
     super.onCreate(event);
-
-    originalSizes.set(this.width, this.height);
   }
 
   function loadAtlases():Void
@@ -117,16 +112,6 @@ class MultiAnimateAtlasCharacter extends BaseCharacter
     trace('[MULTIATLASCHAR] Successfully loaded ${animNames.length} animations for ${characterId}');
   }
 
-  override function get_width():Float
-  {
-    return originalSizes.x;
-  }
-
-  override function get_height():Float
-  {
-    return originalSizes.y;
-  }
-
   /**
    * Get the configuration for the texture atlas.
    * @return The configuration for the texture atlas.

source/funkin/play/stage/Stage.hx

@@ -98,11 +98,12 @@ class Stage extends FlxSpriteGroup implements IPlayStateScriptedClass implements
     // Reset positions of characters.
     if (getBoyfriend() != null)
     {
-      getBoyfriend().resetCharacter(true);
       // Reapply the camera offsets.
       var stageCharData:StageDataCharacter = _data.characters.bf;
       var finalScale:Float = getBoyfriend().getBaseScale() * stageCharData.scale;
       getBoyfriend().setScale(finalScale);
+      getBoyfriend().resetCharacter(true);
+
       getBoyfriend().cameraFocusPoint.x += stageCharData.cameraOffsets[0];
       getBoyfriend().cameraFocusPoint.y += stageCharData.cameraOffsets[1];
     }
@@ -112,21 +113,23 @@ class Stage extends FlxSpriteGroup implements IPlayStateScriptedClass implements
     }
     if (getGirlfriend() != null)
     {
-      getGirlfriend().resetCharacter(true);
       // Reapply the camera offsets.
       var stageCharData:StageDataCharacter = _data.characters.gf;
       var finalScale:Float = getGirlfriend().getBaseScale() * stageCharData.scale;
       getGirlfriend().setScale(finalScale);
+      getGirlfriend().resetCharacter(true);
+
       getGirlfriend().cameraFocusPoint.x += stageCharData.cameraOffsets[0];
       getGirlfriend().cameraFocusPoint.y += stageCharData.cameraOffsets[1];
     }
     if (getDad() != null)
     {
-      getDad().resetCharacter(true);
       // Reapply the camera offsets.
       var stageCharData:StageDataCharacter = _data.characters.dad;
       var finalScale:Float = getDad().getBaseScale() * stageCharData.scale;
       getDad().setScale(finalScale);
+      getDad().resetCharacter(true);
+
       getDad().cameraFocusPoint.x += stageCharData.cameraOffsets[0];
       getDad().cameraFocusPoint.y += stageCharData.cameraOffsets[1];
     }
@@ -446,10 +449,13 @@ class Stage extends FlxSpriteGroup implements IPlayStateScriptedClass implements
       character.x = stageCharData.position[0] - character.characterOrigin.x;
       character.y = stageCharData.position[1] - character.characterOrigin.y;
 
-      character.originalPosition.set(character.x, character.y);
-
       var finalScale = character.getBaseScale() * stageCharData.scale;
       character.setScale(finalScale); // Don't use scale.set for characters!
+      character.originalPosition.set(character.x, character.y);
+
+      // Reset the camera focus point to be based on the new original position.
+      character.resetCameraFocusPoint();
+
       character.cameraFocusPoint.x += stageCharData.cameraOffsets[0];
       character.cameraFocusPoint.y += stageCharData.cameraOffsets[1];