From ee814cfd0c8446a93195db139f25ab5335cd6980 Mon Sep 17 00:00:00 2001
From: Fro Zen <38363715+Frozenreflex@users.noreply.github.com>
Date: Sat, 12 Dec 2020 10:16:15 -0600
Subject: [PATCH] Update skylander_dialog.cpp (#9419)

---
 rpcs3/rpcs3qt/skylander_dialog.cpp | 129 +++++++++++++++++++++++++++--
 1 file changed, 121 insertions(+), 8 deletions(-)

diff --git a/rpcs3/rpcs3qt/skylander_dialog.cpp b/rpcs3/rpcs3qt/skylander_dialog.cpp
index 9635680325..1d1e3cc2ad 100644
--- a/rpcs3/rpcs3qt/skylander_dialog.cpp
+++ b/rpcs3/rpcs3qt/skylander_dialog.cpp
@@ -73,6 +73,17 @@ const std::map<const u16, const std::string> list_skylanders = {
     {207, "Sparx Dragonfly"},
     {208, "Dragonfire Cannon"},
     {209, "Scorpion Striker Catapult"},
+    {210, "Magic Traps"},
+    {211, "Water Traps"},
+    {212, "Air Traps"},
+    {213, "Undead Traps"},
+    {214, "Tech Traps"},
+    {215, "Fire Traps"},
+    {216, "Earth Traps"},
+    {217, "Life Traps"},
+    {218, "Dark Traps"},
+    {219, "Light Traps"},
+    {220, "Kaos Traps"},
     {230, "Hand Of Fate"},
     {231, "Piggy Bank"},
     {232, "Rocket Ram"},
@@ -86,10 +97,10 @@ const std::map<const u16, const std::string> list_skylanders = {
     {306, "Nightmare Express"},
     {307, "Sunscraper Spire"},
     {308, "Midnight Museum"},
-    {404, "Bash"},
-    {416, "Spyro"},
-    {419, "Trigger Happy"},
-    {430, "Chop Chop"},
+    {404, "Legendary Bash"},
+    {416, "Legendary Spyro"},
+    {419, "Legendary Trigger Happy"},
+    {430, "Legendary Chop Chop"},
     {450, "Gusto"},
     {451, "Thunderbolt"},
     {452, "Fling Kong"},
@@ -142,10 +153,69 @@ const std::map<const u16, const std::string> list_skylanders = {
     {541, "Thumpling"},
     {542, "Mini Jini"},
     {543, "Eye Small"},
-    {1004, "Blast Zone"},
-    {1015, "Wash Buckler"},
-    {2004, "Blast Zone (Head)"},
-    {2015, "Wash Buckler (Head)"},
+    {601, "King Pen"},
+    {602, "Tri-Tip"},
+    {603, "Chopscotch"},
+    {604, "Boom Bloom"},
+    {605, "Pit Boss"},
+    {606, "Barbella"},
+    {607, "Air Strike"},
+    {608, "Ember"},
+    {609, "Ambush"},
+    {610, "Dr. Krankcase"},
+    {611, "Hood Sickle"},
+    {612, "Tae Kwon Crow"},
+    {613, "Golden Queen"},
+    {614, "Wolfgang"},
+    {615, "Pain-Yatta"},
+    {616, "Mysticat"},
+    {617, "Starcast"},
+    {618, "Buckshot"},
+    {619, "Aurora"},
+    {620, "Flare Wolf"},
+    {621, "Chompy Mage"},
+    {622, "Bad Juju"},
+    {623, "Grave Clobber"},
+    {624, "Blaster-Tron"},
+    {625, "Ro-Bow"},
+    {626, "Chain Reaction"},
+    {627, "Kaos"},
+    {628, "Wild Storm"},
+    {629, "Tidepool"},
+    {630, "Crash Bandicoot"},
+    {631, "Dr. Neo Cortex"},
+    {1000, "Boom Jet (Bottom)"},
+    {1001, "Free Ranger (Bottom)"},
+    {1002, "Rubble Rouser (Bottom)"},
+    {1003, "Doom Stone (Bottom)"},
+    {1004, "Blast Zone (Bottom)"},
+    {1005, "Fire Kraken (Bottom)"},
+    {1006, "Stink Bomb (Bottom)"},
+    {1007, "Grilla Drilla (Bottom)"},
+    {1008, "Hoot Loop (Bottom)"},
+    {1009, "Trap Shadow (Bottom)"},
+    {1010, "Magna Charge (Bottom)"},
+    {1011, "Spy Rise (Bottom)"},
+    {1012, "Night Shift (Bottom)"},
+    {1013, "Rattle Shake (Bottom)"},
+    {1014, "Freeze Blade (Bottom)"},
+    {1015, "Wash Buckler (Bottom)"},
+    {2000, "Boom Jet (Top)"},
+    {2001, "Free Ranger (Top)"},
+    {2002, "Rubble Rouser (Top)"},
+    {2003, "Doom Stone (Top)"},
+    {2004, "Blast Zone (Top)"},
+    {2005, "Fire Kraken (Top)"},
+    {2006, "Stink Bomb (Top)"},
+    {2007, "Grilla Drilla (Top)"},
+    {2008, "Hoot Loop (Top)"},
+    {2009, "Trap Shadow (Top)"},
+    {2010, "Magna Charge (Top)"},
+    {2011, "Spy Rise (Top)"},
+    {2012, "Night Shift (Top)"},
+    {2013, "Rattle Shake (Top)"},
+    {2014, "Freeze Blade (Top)"},
+    {2015, "Wash Buckler (Top)"},
     {3000, "Scratch"},
     {3001, "Pop Thorn"},
     {3002, "Slobber Tooth"},
@@ -162,6 +232,49 @@ const std::map<const u16, const std::string> list_skylanders = {
     {3013, "Grim Creeper"},
     {3014, "Rip Tide"},
     {3015, "Punk Shock"},
+    {3220, "Jet Stream"},
+    {3221, "Tomb Buggy"},
+    {3222, "Reef Ripper"},
+    {3223, "Burn Cycle"},
+    {3224, "Hot Streak"},
+    {3225, "Shark Tank"},
+    {3226, "Thump Truck"},
+    {3227, "Crypt Crusher"},
+    {3228, "Stealth Stinger"},
+    {3231, "Dive Bomber"},
+    {3232, "Sky Slicer"},
+    //{3233, "Clown Cruiser"},
+    {3234, "Gold Rusher"},
+    {3235, "Shield Striker"},
+    {3236, "Sun Runner"},
+    {3237, "Sea Shadow"},
+    {3238, "Splatter Splasher"},
+    {3239, "Soda Skimmer"},
+    //{3240, "Barrel Blaster"},
+    {3241, "Buzz Wing"},
+    {3400, "Fiesta"},
+    {3401, "High Volt"},
+    {3406, "Splat"},
+    {3411, "Smash Hit"},
+    {3412, "Spitfire"},
+    {3413, "Hurricane Jet Vac"},
+    {3414, "Double Dare Trigger Happy"},
+    {3415, "Super Shot Stealth Elf"},
+    {3416, "Shark Shooter Terrafin"},
+    {3417, "Bone Bash Roller Brawl"},
+    {3420, "Big Bubble Pop Fizz"},
+    {3421, "Lava Lance Eruptor"},
+    {3422, "Deep Dive Gill Grunt"},
+    //{3423, "Turbo Charge Donkey Kong"},
+    //{3424, "Hammer Slam Bowser"},
+    {3425, "Dive-Clops"},
+    {3426, "Astroblast"},
+    {3427, "Nightfall"},
+    {3428, "Thrillipede"},
+    {3500, "Sky Trophy"},
+    {3501, "Land Trophy"},
+    {3502, "Sea Trophy"},
+    {3503, "Kaos Trophy"},
 };
 
 QString cur_sky_file_path;