[BUGFIX / ENHANCEMENT] Health Bar Layering Fix + Smoother Health Bar

.vscode/settings.json

@@ -1,39 +1,30 @@
 {
   "[haxe]": {
-    // Automatically keep Haxe files formatted.
     "editor.formatOnSave": true,
     "editor.formatOnPaste": true,
-    "editor.codeActionsOnSave": {
-      "source.organizeImports": "never"
-    },
+    "editor.codeActionsOnSave": { "source.organizeImports": "never" },
     "editor.defaultFormatter": "nadako.vshaxe",
     "editor.tabSize": 2
   },
-
   "[json]": {
-    // Automatically keep JSON files formatted.
     "editor.formatOnSave": true,
     "editor.formatOnPaste": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-
   "[jsonc]": {
-    // Automatically keep JSONC files formatted.
     "editor.formatOnSave": true,
     "editor.formatOnPaste": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "prettier.tabWidth": 2,
-
-  // XML formatting style configuration
+  // XML Formatting
   "xml.format.enabled": true,
   "xml.format.legacy": false,
   "xml.format.emptyElements": "collapse",
   "xml.preferences.quoteStyle": "double",
   "xml.format.enforceQuoteStyle": "preferred",
   "xml.format.preserveAttributeLineBreaks": false,
   "xml.format.preservedNewlines": 0,
-  "xml.format.splitAttributes": false,
+  "xml.format.splitAttributes": "preserve",
   "xml.format.joinCDATALines": true,
   "xml.format.preserveEmptyContent": false,
   "xml.format.joinCommentLines": false,
@@ -56,26 +47,19 @@
   "xml.format.maxLineWidth": 0,
   "xml.format.grammarAwareFormatting": true,
 
-  // Generic file formatting style configuration
+  // General formatting
   "files.insertFinalNewline": true,
   "files.trimFinalNewlines": false,
   "files.trimTrailingWhitespace": true,
-
-  // Automatically detect indentation.
   "editor.detectIndentation": true,
   "editor.insertSpaces": true,
   "editor.tabSize": 2,
-
-  // Automatically enforce Linux style line endings.
+  "prettier.tabWidth": 2,
   "files.eol": "\n",
-
   "haxe.displayPort": "auto",
   "haxe.enableCompilationServer": true,
   "haxe.enableServerView": true,
-  "haxe.displayServer": {
-    "arguments": ["-v"]
-  },
-  // Fix file associations for HScript.
+  "haxe.displayServer": { "arguments": ["-v"] },
   "files.associations": {
     "*.hxp": "haxe",
     "*.hscript": "haxe",
@@ -84,14 +68,27 @@
     "*.hxc": "haxe"
   },
   "projectManager.git.baseFolders": ["./"],
-
   "haxecheckstyle.sourceFolders": ["src", "source"],
   "haxecheckstyle.externalSourceRoots": [],
   "haxecheckstyle.configurationFile": "checkstyle.json",
   "haxecheckstyle.codeSimilarityBufferSize": 100,
-
   "lime.projectFile": "project.hxp",
-
+  "lime.targets": [
+    { "name": "windows", "enabled": true, "label": "Windows" },
+    { "name": "mac", "enabled": true, "label": "macOS" },
+    { "name": "linux", "enabled": true, "label": "Linux" },
+    { "name": "html5", "enabled": true, "label": "HTML5" },
+    { "name": "android", "enabled": true, "label": "Android" },
+    { "name": "ios", "enabled": true, "label": "iOS" },
+    // Disabled targets
+    { "name": "hl", "enabled": false, "label": "HashLink" },
+    { "name": "air", "enabled": false },
+    { "name": "electron", "enabled": false },
+    { "name": "flash", "enabled": false },
+    { "name": "neko", "enabled": false },
+    { "name": "tvos", "enabled": false }
+  ],
+  "lime.defaultTargetConfiguration": "Windows / Debug",
   "lime.targetConfigurations": [
     {
       "label": "Windows / Debug (Discord)",
@@ -103,21 +100,11 @@
       "target": "windows",
       "args": ["-debug", "-DANIMATE", "-DFEATURE_DEBUG_FUNCTIONS"]
     },
-    {
-      "label": "HashLink / Debug (FlxAnimate Test)",
-      "target": "hl",
-      "args": ["-debug", "-DANIMATE"]
-    },
     {
       "label": "Windows / Debug (Straight to Freeplay)",
       "target": "windows",
       "args": ["-debug", "-DFREEPLAY", "-DFEATURE_DEBUG_FUNCTIONS"]
     },
-    {
-      "label": "HashLink / Debug (Straight to Freeplay)",
-      "target": "hl",
-      "args": ["-debug", "-DFREEPLAY"]
-    },
     {
       "label": "Windows / Debug (Straight to Play - Bopeebo Normal)",
       "target": "windows",
@@ -132,26 +119,6 @@
       "target": "windows",
       "args": ["-debug", "-DSONG=2hot", "-DFEATURE_DEBUG_FUNCTIONS"]
     },
-    {
-      "label": "HashLink / Debug (Straight to Play - Bopeebo Normal)",
-      "target": "hl",
-      "args": ["-debug", "-DSONG=bopeebo -DDIFFICULTY=normal"]
-    },
-    {
-      "label": "Windows / Debug (Conversation Test)",
-      "target": "windows",
-      "args": ["-debug", "-DDIALOGUE", "-DFEATURE_DEBUG_FUNCTIONS"]
-    },
-    {
-      "label": "HashLink / Debug (Conversation Test)",
-      "target": "hl",
-      "args": ["-debug", "-DDIALOGUE"]
-    },
-    {
-      "label": "Windows / Debug (Results Screen Test)",
-      "target": "windows",
-      "args": ["-debug", "-DRESULTS"]
-    },
     {
       "label": "Windows / Debug (Straight to Stage Editor)",
       "target": "windows",
@@ -172,47 +139,24 @@
       "target": "windows",
       "args": ["-debug", "-DHXVLC_LOGGING", "-DFEATURE_DEBUG_FUNCTIONS"]
     },
-    {
-      "label": "HashLink / Debug (Straight to Animation Editor)",
-      "target": "hl",
-      "args": ["-debug", "-DANIMDEBUG"]
-    },
     {
       "label": "Windows / Debug (Latency Test)",
       "target": "windows",
       "args": ["-debug", "-DLATENCY", "-DFEATURE_DEBUG_FUNCTIONS"]
     },
-    {
-      "label": "HashLink / Debug (Latency Test)",
-      "target": "hl",
-      "args": ["-debug", "-DLATENCY"]
-    },
     {
       "label": "Windows / Debug (Waveform Test)",
       "target": "windows",
       "args": ["-debug", "-DWAVEFORM", "-DFEATURE_DEBUG_FUNCTIONS"]
     },
-    {
-      "label": "Windows / Release (GitHub Actions)",
-      "target": "windows",
-      "args": ["-release", "-DGITHUB_BUILD"]
-    },
-    {
-      "label": "HashLink / Debug (Waveform Test)",
-      "target": "hl",
-      "args": ["-debug", "-DWAVEFORM"]
-    },
     {
       "label": "HTML5 / Debug (Watch)",
       "target": "html5",
       "args": ["-debug", "-watch", "-DFEATURE_DEBUG_FUNCTIONS"]
     }
   ],
   "lime.buildTypes": [
-    {
-      "label": "Debug",
-      "args": ["-debug", "-DFEATURE_DEBUG_FUNCTIONS"]
-    },
+    { "label": "Debug", "args": ["-debug", "-DFEATURE_DEBUG_FUNCTIONS"] },
     {
       "label": "Debug (Unlock Everything)",
       "args": ["-debug", "-DUNLOCK_EVERYTHING"]
@@ -225,10 +169,7 @@
       "label": "Debug (Straight to Chart Editor)",
       "args": ["-debug", "-DCHARTING", "-DFEATURE_DEBUG_FUNCTIONS"]
     },
-    {
-      "label": "Release",
-      "args": ["-release"]
-    },
+    { "label": "Release", "args": ["-release"] },
     {
       "label": "Release (GitHub Actions)",
       "args": ["-release", "-DGITHUB_BUILD"]
@@ -244,9 +185,6 @@
   ],
   "vscord.app.privacyMode.enable": true,
   "json.schemas": [
-    {
-      "fileMatch": ["/hmm.json"],
-      "url": "./.vscode/schema/hmm.json"
-    }
+    { "fileMatch": ["/hmm.json"], "url": "./.vscode/schema/hmm.json" }
   ]
 }

astc-compression-data.json

@@ -5,26 +5,6 @@
   "blocksize": "10x10",
   "colorprofile": "cl",
   "custom": [
-    {
-      "asset": "asset/shared/images/resultScreen/results-pico/resultsPERFECT/spritemap1.png",
-      "blocksize": "4x4"
-    },
-    {
-      "asset": "asset/shared/images/resultScreen/results-pico/resultsGREAT/spritemap1.png",
-      "blocksize": "4x4"
-    },
-    {
-      "asset": "asset/shared/images/resultScreen/results-pico/resultsGOOD/spritemap1.png",
-      "blocksize": "4x4"
-    },
-    {
-      "asset": "assets/shared/images/resultScreen/results-bf/resultsEXCELLENT/spritemap1.png",
-      "blocksize": "4x4"
-    },
-    {
-      "asset": "asset/shared/images/resultScreen/results-pico/resultsSHIT/spritemap1.png",
-      "blocksize": "4x4"
-    },
     {
       "asset": "assets/preload/images/NOTE_assets.png",
       "blocksize": "4x4"
@@ -41,6 +21,10 @@
       "asset": "assets/preload/images/alphabet.png",
       "blocksize": "4x4"
     },
+    {
+      "asset": "assets/preload/images/charSelect/gfChill/spritemap1.png",
+      "blocksize": "6x6"
+    },
     {
       "asset": "assets/shared/images/NOTE_hold_assets.png",
       "blocksize": "4x4"
@@ -81,6 +65,22 @@
       "asset": "assets/shared/images/notes.png",
       "blocksize": "4x4"
     },
+    {
+      "asset": "assets/shared/images/resultScreen/results-pico/resultsGOOD/spritemap1.png",
+      "blocksize": "4x4"
+    },
+    {
+      "asset": "assets/shared/images/resultScreen/results-pico/resultsGREAT/spritemap1.png",
+      "blocksize": "4x4"
+    },
+    {
+      "asset": "assets/shared/images/resultScreen/results-pico/resultsPERFECT/spritemap1.png",
+      "blocksize": "4x4"
+    },
+    {
+      "asset": "assets/shared/images/resultScreen/results-pico/resultsSHIT/spritemap1.png",
+      "blocksize": "4x4"
+    },
     {
       "asset": "assets/week1/image/erect/bg.png",
       "blocksize": "8x8"
@@ -96,6 +96,14 @@
     {
       "asset": "assets/week1/images/erect/server.png",
       "blocksize": "8x8"
+    },
+    {
+      "asset": "assets/week7/images/erect/rando/spritemap1.png",
+      "blocksize": "6x6"
+    },
+    {
+      "asset": "assets/week7/images/erect/sniper/spritemap1.png",
+      "blocksize": "6x6"
     }
   ],
   "excludes": [
@@ -111,15 +119,24 @@
     "assets/shared/images/characters/abotPixel/*",
     "assets/shared/images/characters/bfPixel.png",
     "assets/shared/images/characters/bfPixelsDEAD.png",
+    "assets/shared/images/characters/gf-christmas/spritemap1.png",
+    "assets/shared/images/characters/gf-dark/spritemap1.png",
+    "assets/shared/images/characters/gf/spritemap1.png",
+    "assets/shared/images/characters/gfCar/spritemap1.png",
     "assets/shared/images/characters/gfPixel.png",
     "assets/shared/images/characters/nenePixel/*",
+    "assets/shared/images/characters/pico-holding-nene/spritemap1.png",
     "assets/shared/images/characters/picoPixel/*",
     "assets/shared/images/characters/senpai.png",
     "assets/shared/images/characters/spirit.png",
     "assets/shared/images/healthBar.png",
     "assets/shared/images/resultScreen/*",
     "assets/shared/images/resultScreen/clearPercent/",
     "assets/shared/images/resultScreen/rankText/",
+    "assets/shared/images/resultScreen/results-bf/resultsEXCELLENT/spritemap1.png",
+    "assets/shared/images/resultScreen/results-bf/resultsGOOD/resultGirlfriendGOOD.png",
+    "assets/shared/images/resultScreen/results-bf/resultsGREAT/gf/spritemap1.png",
+    "assets/shared/images/resultScreen/results-bf/resultsSHIT/gf/spritemap1.png",
     "assets/shared/images/ui/chart-editor/",
     "assets/shared/images/ui/countdown/pixel/*",
     "assets/week1/*",

hmm.json

@@ -59,7 +59,7 @@
       "name": "flixel-animate",
       "type": "git",
       "dir": null,
-      "ref": "220463c8089444d6c9957b68919fe88e6cba495f",
+      "ref": "84cd1915161eb49fba33b3f81a8c7ea3f05ae053",
       "url": "https://github.com/MaybeMaru/flixel-animate"
     },
     {
@@ -111,7 +111,7 @@
       "name": "hxcpp",
       "type": "git",
       "dir": null,
-      "ref": "6546fa5c3ad1bac065f144745122ab5a6d4195ff",
+      "ref": "5932340d095a7eea8635fe4d1355f1c0efd0b3c2",
       "url": "https://github.com/FunkinCrew/hxcpp"
     },
     {
@@ -146,7 +146,7 @@
     {
       "name": "hxvlc",
       "type": "haxelib",
-      "version": "2.2.4"
+      "version": "2.2.5"
     },
     {
       "name": "json2object",
@@ -173,7 +173,7 @@
       "name": "lime",
       "type": "git",
       "dir": null,
-      "ref": "27092822abf7b8c2ec2905053cf5435be4de838e",
+      "ref": "318253ea3a28a3299a167748912c40444f403777",
       "url": "https://github.com/FunkinCrew/lime"
     },
     {