From 4406677be74d2a7482134c173e5aa745969801f3 Mon Sep 17 00:00:00 2001
From: Eric <ericmyllyoja@gmail.com>
Date: Mon, 20 Nov 2023 10:46:09 -0500
Subject: [PATCH] Fix character camera offsets embedded in stage data (#218)

* Make StageDataCharacter attributes mandatory, and remove defaults.

* Update character files

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
---
 assets                                |  2 +-
 source/funkin/play/stage/StageData.hx | 21 ---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/assets b/assets
index 3b05b0fdd..62ae1154b 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 3b05b0fdd8e3b2cd09b9e4e415c186bae8e3b7d3
+Subproject commit 62ae1154ba7d751c96cea208c8f2e2d841a4f1c6
diff --git a/source/funkin/play/stage/StageData.hx b/source/funkin/play/stage/StageData.hx
index 29ca03b84..d89995ef3 100644
--- a/source/funkin/play/stage/StageData.hx
+++ b/source/funkin/play/stage/StageData.hx
@@ -364,12 +364,10 @@ class StageDataParser
     if (input.characters.bf == null)
     {
       input.characters.bf = DEFAULT_CHARACTER_DATA;
-      input.characters.bf.cameraOffsets = DEFAULT_CAMERA_OFFSETS_BF;
     }
     if (input.characters.dad == null)
     {
       input.characters.dad = DEFAULT_CHARACTER_DATA;
-      input.characters.dad.cameraOffsets = DEFAULT_CAMERA_OFFSETS_DAD;
     }
     if (input.characters.gf == null)
     {
@@ -378,23 +376,10 @@ class StageDataParser
 
     for (inputCharacter in [input.characters.bf, input.characters.dad, input.characters.gf])
     {
-      if (inputCharacter.zIndex == null)
-      {
-        inputCharacter.zIndex = 0;
-      }
       if (inputCharacter.position == null || inputCharacter.position.length != 2)
       {
         inputCharacter.position = [0, 0];
       }
-      if (inputCharacter.cameraOffsets == null || inputCharacter.cameraOffsets.length != 2)
-      {
-        if (inputCharacter == input.characters.bf) inputCharacter.cameraOffsets = DEFAULT_CAMERA_OFFSETS_BF;
-        else if (inputCharacter == input.characters.dad) inputCharacter.cameraOffsets = DEFAULT_CAMERA_OFFSETS_DAD;
-        else
-        {
-          inputCharacter.cameraOffsets = [0, 0];
-        }
-      }
     }
 
     // All good!
@@ -547,22 +532,16 @@ typedef StageDataCharacter =
    * Again, just like CSS.
    * @default 0
    */
-  @:optional
-  @:default(0)
   var zIndex:Int;
 
   /**
    * The position to render the character at.
    */
-  @:optional
-  @:default([0, 0])
   var position:Array<Float>;
 
   /**
    * The camera offsets to apply when focusing on the character on this stage.
    * @default [-100, -100] for BF, [100, -100] for DAD/OPPONENT, [0, 0] for GF
    */
-  @:optional
-  @:default([0, 0])
   var cameraOffsets:Array<Float>;
 };