From e95d53335e225cbb432c1e894b4a1313cfb7d019 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Tue, 3 Dec 2024 00:42:07 -0500
Subject: [PATCH] untested fix for golden marshmallow medal

---
 assets/data/entries/sticker-sheets.json      |  41 +++++++++++++++++++
 assets/images/bonfire/golden-marshmallow.png | Bin 0 -> 732 bytes
 source/activities/bonfire/Marshmallow.hx     |   5 +++
 source/data/SaveManager.hx                   |  12 +++---
 source/ng/NewgroundsHandler.hx               |   3 +-
 5 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 assets/images/bonfire/golden-marshmallow.png

diff --git a/assets/data/entries/sticker-sheets.json b/assets/data/entries/sticker-sheets.json
index 06240322..0786e719 100644
--- a/assets/data/entries/sticker-sheets.json
+++ b/assets/data/entries/sticker-sheets.json
@@ -40,6 +40,47 @@
                     "name": "pico-sticker-swag"
                 }
             ]
+        },
+        {
+            "graphic": "emotes-back-blue",
+            "items": [
+                {
+                    "name": "common-tamago"
+                },
+                {
+                    "name": "toasty-warm"
+                },
+                {
+                    "name": "edd-sticker"
+                },
+                {
+                    "name": "mustard"
+                },
+                {
+                    "name": "pink-kight-mondo"
+                },
+                {
+                    "name": "tappy-sticker"
+                },
+                {
+                    "name": "son-christmas"
+                },
+                {
+                    "name": "sick-skull"
+                },
+                {
+                    "name": "slashe-wave"
+                },
+                {
+                    "name": "gimme-five"
+                },
+                {
+                    "name": "john-sticker"
+                },
+                {
+                    "name": "pico-sticker-swag"
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/assets/images/bonfire/golden-marshmallow.png b/assets/images/bonfire/golden-marshmallow.png
new file mode 100644
index 0000000000000000000000000000000000000000..b88bdb6722e902cf1ebbc7826951fc02927128bc
GIT binary patch
literal 732
zcmV<20wev2P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0&z)1K~#8N?V2%4
zLqQORqheztHcA>1EJQ(UtnEbb0)lt~JCEQA>^y?t1w^s46Krf03qfqeG{MG3B$B-O
zB@P+?+4nZ0zWE^RV3WB2w=>J*jdVJlMx7azwYL0P1D-GTzWlJ6wSy5Uvr>BlJ~yDd
z<NY7`^S>v00D3^xGdDfEn8ljb<89Wn&i=13pz0LJl{}-Y8DRh+*#K|i$J=94eb3g>
zyHsi9>J?!?ZUc1ka|_eG_2I77TfO|08DW6e04sSbaqx2XCe>FaH^!wZ@EYPZ!)rnq
zzzkr?>%@VTJkSPMFf*7D%!Dw&GJtja%l)QQ1uSvU++CGwFt7L5QWfOt4VDREK&k=W
z<XO@dPls2%l}!ojevxWI7~nNvSji)C3z*<F09Yo30g7Y;bn@QBS<(#a-oU1WHX#g9
zls14RUo~-!^?kTEczZz@pvb-f-Q;tm-%Y&#lZ&p|{dPwWD0>gEK#$N}+qyS^)RfuT
z2kbr&26zpyp7L7H12kpt55Vdx?YXv8g9!r&l??#Qgo*hTseG_WVi|OEaxPUt7(j3v
z0GJ5?M&!CVdV2;8u#yL1fRJneU?xmGOi5Ls6V%WC%1#M=<^enVAPle!0J%)Sytbx=
zw^xAF<Utsqpay`dCTL)S_kLg{uJN9I5C$*<^gA}oJEu|&hMBOmxh|EDs>y>ez#!QG
zyk%9kColuNiG#AqgD}851uSw;2QO8V2Vp=}0{}Atlr@4S4s`PIrYIqs0l;fQZmcsO
z1`x6vpc$4C-Y(Aw15yoOXX>v}djnzvWUVbjp8~&~I0CZPmYQ!sqwxXv=dH4VI=xH)
O0000<MNUMnLSTZ);yRE3

literal 0
HcmV?d00001

diff --git a/source/activities/bonfire/Marshmallow.hx b/source/activities/bonfire/Marshmallow.hx
index 156fe714..137ee480 100644
--- a/source/activities/bonfire/Marshmallow.hx
+++ b/source/activities/bonfire/Marshmallow.hx
@@ -122,12 +122,17 @@ class Marshmallow extends FlxSprite
 	}
 
 	public static function on_cooked_perfect():Void {
+		trace('Cooked a perfect marshmallow!');
+		#if newgrounds
+		trace('Awarding "Golden Marshmallow" medal...');
+
 		// Earn a medal, if applicable.
 		Main.ng_api.medal_popup(Main.ng_api.medals.get("golden-marshmallow"));
 
 		final GOLDEN_MARSHMALLOWS_SCOREBOARD:Int = 14324;
 
 		Main.ng_api.post_score(1, GOLDEN_MARSHMALLOWS_SCOREBOARD);
+		#end
 	}
 
 	override function update(elapsed:Float)
diff --git a/source/data/SaveManager.hx b/source/data/SaveManager.hx
index 73f8165e..611cf3f0 100644
--- a/source/data/SaveManager.hx
+++ b/source/data/SaveManager.hx
@@ -133,7 +133,7 @@ class SaveManager
 	{
 		if (FlxG.save.data.saved_costume_collection == null)
 		{
-			trace("Error loading saved costumes");
+			trace("Error loading saved costumes (might be empty)");
 			save_costume_collection(true);
 		}
 		saved_costume_collection = FlxG.save.data.costume_collection;
@@ -143,7 +143,7 @@ class SaveManager
 	{
 		if (FlxG.save.data.saved_sticker_collection == null)
 		{
-			trace("Error loading saved stickers");
+			trace("Error loading saved stickers (might be empty)");
 			save_sticker_collection(true);
 		}
 		saved_sticker_collection = FlxG.save.data.sticker_collection;
@@ -153,7 +153,7 @@ class SaveManager
 	{
 		if (FlxG.save.data.savedPresents == null)
 		{
-			trace("Error loading saved presents");
+			trace("Error loading saved presents (might be empty)");
 			save_presents(true);
 		}
 		savedPresents = FlxG.save.data.savedPresents;
@@ -163,7 +163,7 @@ class SaveManager
 	{
 		if (FlxG.save.data.savedCostumes == null)
 		{
-			trace("Error loading saved costumes");
+			trace("Error loading saved costumes (might be empty)");
 			save_costumes(true);
 		}
 		savedCostumes = FlxG.save.data.savedCostumes;
@@ -178,7 +178,7 @@ class SaveManager
 	{
 		if (FlxG.save.data.savedEmotes == null)
 		{
-			trace("Error loading saved emotes");
+			trace("Error loading saved emotes (might be empty)");
 			save_emotes(true);
 		}
 		savedEmotes = FlxG.save.data.savedEmotes;
@@ -191,7 +191,7 @@ class SaveManager
 	{
 		if (FlxG.save.data.savedRoom == null)
 		{
-			trace("Error loading saved room");
+			trace("Error loading saved room (might be empty)");
 			save_room(true);
 		}
 		savedRoom = FlxG.save.data.savedRoom;
diff --git a/source/ng/NewgroundsHandler.hx b/source/ng/NewgroundsHandler.hx
index fd09cff5..e5c09330 100644
--- a/source/ng/NewgroundsHandler.hx
+++ b/source/ng/NewgroundsHandler.hx
@@ -163,8 +163,7 @@ class NewgroundsHandler
 		trace('logged in! user:${NG_USERNAME} session: ${NG_SESSION_ID}');
 
 		load_api_medals_part_1();
-		// NG.core.scoreBoards.loadList();
-		// trace(NG.core.scoreBoards == null ? null : NG.core.scoreBoards.keys());
+		NG.core.scoreBoards.loadList();
 		NG.core.medals.loadList();
 
 		login_callback != null ? login_callback() : false;