Merge remote-tracking branch 'origin/eric/leaderboards'

chosencharacters · Dec 3, 2024 · 36e9482 · 36e9482
2 parents a40bac7 + e95d533
commit 36e9482
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 13 deletions.
diff --git 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"
+                }
+            ]
         }
     ]
 }
diff --git a/assets/images/bonfire/golden-marshmallow.png b/assets/images/bonfire/golden-marshmallow.png
diff --git a/source/activities/bonfire/Marshmallow.hx b/source/activities/bonfire/Marshmallow.hx
@@ -121,16 +121,18 @@ class Marshmallow extends FlxSprite
 		set_level(current_level + 1);
 	}
 
-	public static function on_cooked_perfect():Void
-	{
-		// Earn a medal, if applicable.
+	public static function on_cooked_perfect():Void {
+		trace('Cooked a perfect marshmallow!');
+		#if newgrounds
+		trace('Awarding "Golden Marshmallow" medal...');
 
-		trace("YA DID IT MAN! YA DID IT!");
+		// 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)
@@ -171,4 +173,4 @@ class Marshmallow extends FlxSprite
 			destroy();
 		}
 	}
-}
+}
diff --git 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
@@ -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;