diff options
| author | Mandar1jn <marijnkneppers@gmail.com> | 2023-08-09 21:23:17 +0200 |
|---|---|---|
| committer | Mandar1jn <marijnkneppers@gmail.com> | 2023-08-13 19:55:10 +0200 |
| commit | 31d6aa51170bf44cc39a2ec655887bcf0acf249a (patch) | |
| tree | 3f96f0370f1ecfed9acded1e6329d24e4a77c93f /Source/Core | |
| parent | bc47a286535527f46569b8a0ec0a0b402c83ec3c (diff) | |
Skylanders: expand and improve character list
The previous list had some issues. A lot of variant id's were set to 0x0000. Althought this works for some figures, on a technicallity implemented into the games, they are technically wrong and don't result in exactly the same experience as the real figures. For example, the previous small fry got a "series 1" text in the summon screen. The real small fry does not have this. I also added figure types so I can add seperate generation logic later.
The Kaos element only applies to 3 items. So, I decided to throw it under others since it's not listed as an element in the manual and you can easily search for Kaos
Diffstat (limited to 'Source/Core')
4 files changed, 710 insertions, 614 deletions
diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp index 97c2b36c7f..d42eb70eba 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp @@ -19,465 +19,536 @@ namespace IOS::HLE::USB { const std::map<const std::pair<const u16, const u16>, SkyData> list_skylanders = { - {{0, 0x0000}, {"Whirlwind", Game::SpyrosAdv, Element::Air}}, - {{0, 0x1801}, {"Series 2 Whirlwind", Game::Giants, Element::Air}}, - {{0, 0x1C02}, {"Polar Whirlwind", Game::Giants, Element::Air}}, - {{0, 0x2805}, {"Horn Blast Whirlwind", Game::SwapForce, Element::Air}}, - {{0, 0x3810}, {"Eon's Elite Whirlwind", Game::TrapTeam, Element::Air}}, - {{1, 0x0000}, {"Sonic Boom", Game::SpyrosAdv, Element::Air}}, - {{1, 0x1801}, {"Series 2 Sonic Boom", Game::Giants, Element::Air}}, - {{2, 0x0000}, {"Warnado", Game::SpyrosAdv, Element::Air}}, - {{2, 0x2206}, {"LightCore Warnado", Game::SwapForce, Element::Air}}, - {{3, 0x0000}, {"Lightning Rod", Game::SpyrosAdv, Element::Air}}, - {{3, 0x1801}, {"Series 2 Lightning Rod", Game::Giants, Element::Air}}, - {{4, 0x0000}, {"Bash", Game::SpyrosAdv, Element::Earth}}, - {{4, 0x1801}, {"Series 2 Bash", Game::Giants, Element::Earth}}, - {{5, 0x0000}, {"Terrafin", Game::SpyrosAdv, Element::Earth}}, - {{5, 0x1801}, {"Series 2 Terrafin", Game::Giants, Element::Earth}}, - {{5, 0x2805}, {"Knockout Terrafin", Game::SwapForce, Element::Earth}}, - {{5, 0x3810}, {"Eon's Elite Terrafin", Game::TrapTeam, Element::Earth}}, - {{6, 0x0000}, {"Dino Rang", Game::SpyrosAdv, Element::Earth}}, - {{6, 0x4810}, {"Eon's Elite Dino Rang", Game::Superchargers, Element::Earth}}, - {{7, 0x0000}, {"Prism Break", Game::SpyrosAdv, Element::Earth}}, - {{7, 0x1206}, {"LightCore Prism Break", Game::Giants, Element::Earth}}, - {{7, 0x1801}, {"Series 2 Prism Break", Game::Giants, Element::Earth}}, - {{7, 0x2805}, {"Hyper Beam Prism Break", Game::SwapForce, Element::Earth}}, - {{8, 0x0000}, {"Sunburn", Game::SpyrosAdv, Element::Fire}}, - {{9, 0x0000}, {"Eruptor", Game::SpyrosAdv, Element::Fire}}, - {{9, 0x1206}, {"LightCore Eruptor", Game::Giants, Element::Fire}}, - {{9, 0x1801}, {"Series 2 Eruptor", Game::Giants, Element::Fire}}, - {{9, 0x2C02}, {"Volcanic Eruptor", Game::SwapForce, Element::Fire}}, - {{9, 0x2805}, {"Lava Barf Eruptor", Game::SwapForce, Element::Fire}}, - {{9, 0x3810}, {"Eon's Elite Eruptor", Game::TrapTeam, Element::Fire}}, - {{10, 0x0000}, {"Ignitor", Game::SpyrosAdv, Element::Fire}}, - {{10, 0x1801}, {"Series 2 Ignitor", Game::Giants, Element::Fire}}, - {{10, 0x1C03}, {"Legendary Ignitor", Game::Giants, Element::Fire}}, - {{11, 0x0000}, {"Flameslinger", Game::SpyrosAdv, Element::Fire}}, - {{11, 0x1801}, {"Series 2 Flameslinger", Game::Giants, Element::Fire}}, - {{12, 0x0000}, {"Zap", Game::SpyrosAdv, Element::Water}}, - {{12, 0x1801}, {"Series 2 Zap", Game::Giants, Element::Water}}, - {{13, 0x0000}, {"Wham Shell", Game::SpyrosAdv, Element::Water}}, - {{13, 0x2206}, {"LightCore Wham Shell", Game::SwapForce, Element::Water}}, - {{14, 0x0000}, {"Gill Grunt", Game::SpyrosAdv, Element::Water}}, - {{14, 0x1801}, {"Series 2 Gill Grunt", Game::Giants, Element::Water}}, - {{14, 0x2805}, {"Anchors Away Gill Grunt", Game::SwapForce, Element::Water}}, - {{14, 0x3805}, {"Tidal Wave Gill Grunt", Game::TrapTeam, Element::Water}}, - {{14, 0x3810}, {"Eon's Elite Gill Grunt", Game::TrapTeam, Element::Water}}, - {{15, 0x0000}, {"Slam Bam", Game::SpyrosAdv, Element::Water}}, - {{15, 0x1801}, {"Series 2 Slam Bam", Game::Giants, Element::Water}}, - {{15, 0x1C03}, {"Legendary Slam Bam", Game::Giants, Element::Water}}, - {{15, 0x4810}, {"Eon's Elite Slam Bam", Game::Superchargers, Element::Water}}, - {{16, 0x0000}, {"Spyro", Game::SpyrosAdv, Element::Magic}}, - {{16, 0x1801}, {"Series 2 Spyro", Game::Giants, Element::Magic}}, - {{16, 0x2805}, {"Mega Ram Spyro", Game::SwapForce, Element::Magic}}, - {{16, 0x2C02}, {"Dark Mega Ram Spyro", Game::SwapForce, Element::Magic}}, - {{16, 0x3810}, {"Eon's Elite Spyro", Game::TrapTeam, Element::Magic}}, - {{17, 0x0000}, {"Voodood", Game::SpyrosAdv, Element::Magic}}, - {{17, 0x4810}, {"Eon's Elite Voodood", Game::Superchargers, Element::Magic}}, - {{18, 0x0000}, {"Double Trouble", Game::SpyrosAdv, Element::Magic}}, - {{18, 0x1801}, {"Series 2 Double Trouble", Game::Giants, Element::Magic}}, - {{18, 0x1C02}, {"Royal Double Trouble", Game::Giants, Element::Magic}}, - {{19, 0x0000}, {"Trigger Happy", Game::SpyrosAdv, Element::Tech}}, - {{19, 0x1801}, {"Series 2 Trigger Happy", Game::Giants, Element::Tech}}, - {{19, 0x2805}, {"Big Bang Trigger Happy", Game::SwapForce, Element::Tech}}, - {{19, 0x2C02}, {"Springtime Trigger Happy", Game::SwapForce, Element::Tech}}, - {{19, 0x3810}, {"Eon's Elite Trigger Happy", Game::TrapTeam, Element::Tech}}, - {{20, 0x0000}, {"Drobot", Game::SpyrosAdv, Element::Tech}}, - {{20, 0x1206}, {"LightCore Drobot", Game::Giants, Element::Tech}}, - {{20, 0x1801}, {"Series 2 Drobot", Game::Giants, Element::Tech}}, - {{21, 0x0000}, {"Drill Seargeant", Game::SpyrosAdv, Element::Tech}}, - {{21, 0x1801}, {"Series 2 Drill Seargeant", Game::Giants, Element::Tech}}, - {{22, 0x0000}, {"Boomer", Game::SpyrosAdv, Element::Tech}}, - {{22, 0x4810}, {"Eon's Elite Boomer", Game::Superchargers, Element::Tech}}, - {{23, 0x0000}, {"Wrecking Ball", Game::SpyrosAdv, Element::Magic}}, - {{23, 0x1801}, {"Series 2 Wrecking Ball", Game::Giants, Element::Magic}}, - {{24, 0x0000}, {"Camo", Game::SpyrosAdv, Element::Life}}, - {{24, 0x2805}, {"Thorn Horn Camo", Game::SwapForce, Element::Life}}, - {{25, 0x0000}, {"Zook", Game::SpyrosAdv, Element::Life}}, - {{25, 0x1801}, {"Series 2 Zook", Game::Giants, Element::Life}}, - {{25, 0x4810}, {"Eon's Elite Zook", Game::Superchargers, Element::Life}}, - {{26, 0x0000}, {"Stealth Elf", Game::SpyrosAdv, Element::Life}}, - {{26, 0x1801}, {"Series 2 Stealth Elf", Game::Giants, Element::Life}}, - {{26, 0x1C03}, {"Legendary Stealth Elf", Game::Giants, Element::Life}}, - {{26, 0x2C02}, {"Dark Stealth Elf", Game::SwapForce, Element::Life}}, - {{26, 0x2805}, {"Ninja Stealth Elf", Game::SwapForce, Element::Life}}, - {{26, 0x3810}, {"Eon's Elite Stealth Elf", Game::TrapTeam, Element::Life}}, - {{27, 0x0000}, {"Stump Smash", Game::SpyrosAdv, Element::Life}}, - {{27, 0x1801}, {"Series 2 Stump Smash", Game::Giants, Element::Life}}, - {{28, 0x0000}, {"Dark Spyro", Game::SpyrosAdv, Element::Magic}}, - {{29, 0x0000}, {"Hex", Game::SpyrosAdv, Element::Undead}}, - {{29, 0x1206}, {"LightCore Hex", Game::Giants, Element::Undead}}, - {{29, 0x1801}, {"Series 2 Hex", Game::Giants, Element::Undead}}, - {{30, 0x0000}, {"Chop Chop", Game::SpyrosAdv, Element::Undead}}, - {{30, 0x1801}, {"Series 2 Chop Chop", Game::Giants, Element::Undead}}, - {{30, 0x2805}, {"Twin Blade Chop Chop", Game::SwapForce, Element::Undead}}, - {{30, 0x3810}, {"Eon's Elite Chop Chop", Game::TrapTeam, Element::Undead}}, - {{31, 0x0000}, {"Ghost Roaster", Game::SpyrosAdv, Element::Undead}}, - {{31, 0x4810}, {"Eon's Elite Ghost Roaster", Game::Superchargers, Element::Undead}}, - {{32, 0x0000}, {"Cynder", Game::SpyrosAdv, Element::Undead}}, - {{32, 0x1801}, {"Series 2 Cynder", Game::Giants, Element::Undead}}, - {{32, 0x2805}, {"Phantom Cynder", Game::SwapForce, Element::Undead}}, - {{100, 0x0000}, {"Jet Vac", Game::Giants, Element::Air}}, - {{100, 0x1206}, {"LightCore Jet Vac", Game::Giants, Element::Air}}, - {{100, 0x1403}, {"Legendary Jet Vac", Game::Giants, Element::Air}}, - {{100, 0x2805}, {"Turbo Jet Vac", Game::SwapForce, Element::Air}}, - {{100, 0x3805}, {"Full Blast Jet Vac", Game::TrapTeam, Element::Air}}, - {{101, 0x0000}, {"Swarm", Game::Giants, Element::Air}}, - {{102, 0x0000}, {"Crusher", Game::Giants, Element::Earth}}, - {{102, 0x1602}, {"Granite Crusher", Game::Giants, Element::Earth}}, - {{103, 0x0000}, {"Flashwing", Game::Giants, Element::Earth}}, - {{103, 0x1402}, {"Jade Flash Wing", Game::Giants, Element::Earth}}, - {{103, 0x2206}, {"LightCore Flashwing", Game::SwapForce, Element::Earth}}, - {{104, 0x0000}, {"Hot Head", Game::Giants, Element::Fire}}, - {{105, 0x0000}, {"Hot Dog", Game::Giants, Element::Fire}}, - {{105, 0x1402}, {"Molten Hot Dog", Game::Giants, Element::Fire}}, - {{105, 0x2805}, {"Fire Bone Hot Dog", Game::SwapForce, Element::Fire}}, - {{106, 0x0000}, {"Chill", Game::Giants, Element::Water}}, - {{106, 0x1206}, {"LightCore Chill", Game::Giants, Element::Water}}, - {{106, 0x1603}, {"Legendary LightCore Chill", Game::Giants, Element::Water}}, - {{106, 0x2805}, {"Blizzard Chill", Game::SwapForce, Element::Water}}, - {{107, 0x0000}, {"Thumpback", Game::Giants, Element::Water}}, - {{108, 0x0000}, {"Pop Fizz", Game::Giants, Element::Magic}}, - {{108, 0x1206}, {"LightCore Pop Fizz", Game::Giants, Element::Magic}}, - {{108, 0x1402}, {"Punch Pop Fizz", Game::Giants, Element::Magic}}, - {{108, 0x2805}, {"Super Gulp Pop Fizz", Game::SwapForce, Element::Magic}}, - {{108, 0x3805}, {"Fizzy Frenzy Pop Fizz", Game::TrapTeam, Element::Magic}}, - {{108, 0x3C02}, {"Love Potion Pop Fizz", Game::TrapTeam, Element::Magic}}, - {{109, 0x0000}, {"Ninjini", Game::Giants, Element::Magic}}, - {{109, 0x1602}, {"Scarlet Ninjini", Game::Giants, Element::Magic}}, - {{110, 0x0000}, {"Bouncer", Game::Giants, Element::Tech}}, - {{110, 0x1603}, {"Legendary Bouncer", Game::Giants, Element::Tech}}, - {{111, 0x0000}, {"Sprocket", Game::Giants, Element::Tech}}, - {{111, 0x2805}, {"Heavy Duty Sprocket", Game::SwapForce, Element::Tech}}, - {{112, 0x0000}, {"Tree Rex", Game::Giants, Element::Life}}, - {{112, 0x1602}, {"Gnarly Tree Rex", Game::Giants, Element::Life}}, - {{113, 0x0000}, {"Shroomboom", Game::Giants, Element::Life}}, - {{113, 0x1206}, {"LightCore Shroomboom", Game::Giants, Element::Life}}, - {{113, 0x3805}, {"Sure Shot Shroomboom", Game::TrapTeam, Element::Life}}, - {{114, 0x0000}, {"Eye Brawl", Game::Giants, Element::Undead}}, - {{115, 0x0000}, {"Fright Rider", Game::Giants, Element::Undead}}, - {{200, 0x0000}, {"Anvil Rain", Game::SpyrosAdv}}, - {{201, 0x0000}, {"Hidden Treasure", Game::SpyrosAdv}}, - {{201, 0x2000}, {"Platinum Hidden Treasure", Game::Giants}}, - {{202, 0x0000}, {"Healing Elixir", Game::SpyrosAdv}}, - {{203, 0x0000}, {"Ghost Pirate Swords", Game::SpyrosAdv}}, - {{204, 0x0000}, {"Time Twist Hourglass", Game::SpyrosAdv}}, - {{205, 0x0000}, {"Sky Iron Shield", Game::SpyrosAdv}}, - {{206, 0x0000}, {"Winged Boots", Game::SpyrosAdv}}, - {{207, 0x0000}, {"Sparx the Dragonfly", Game::SpyrosAdv}}, - {{208, 0x0000}, {"Dragonfire Cannon", Game::Giants}}, - {{208, 0x1602}, {"Golden Dragonfire Cannon", Game::Giants}}, - {{209, 0x0000}, {"Scorpion Striker Catapult", Game::Giants}}, - {{210, 0x3002}, {"Biter's Bane", Game::TrapTeam, Element::Magic}}, - {{210, 0x3008}, {"Sorcerous Skull", Game::TrapTeam, Element::Magic}}, - {{210, 0x300B}, {"Axe of Illusion", Game::TrapTeam, Element::Magic}}, - {{210, 0x300E}, {"Arcane Hourglass", Game::TrapTeam, Element::Magic}}, - {{210, 0x3012}, {"Spell Slapper", Game::TrapTeam, Element::Magic}}, - {{210, 0x3014}, {"Rune Rocket", Game::TrapTeam, Element::Magic}}, - {{211, 0x3001}, {"Tidal Tiki", Game::TrapTeam, Element::Water}}, - {{211, 0x3002}, {"Wet Walter", Game::TrapTeam, Element::Water}}, - {{211, 0x3006}, {"Flood Flask", Game::TrapTeam, Element::Water}}, - {{211, 0x3406}, {"Legendary Flood Flask", Game::TrapTeam, Element::Water}}, - {{211, 0x3007}, {"Soaking Staff", Game::TrapTeam, Element::Water}}, - {{211, 0x300B}, {"Aqua Axe", Game::TrapTeam, Element::Water}}, - {{211, 0x3016}, {"Frost Helm", Game::TrapTeam, Element::Water}}, - {{212, 0x3003}, {"Breezy Bird", Game::TrapTeam, Element::Air}}, - {{212, 0x3006}, {"Drafty Decanter", Game::TrapTeam, Element::Air}}, - {{212, 0x300D}, {"Tempest Timer", Game::TrapTeam, Element::Air}}, - {{212, 0x3010}, {"Cloudy Cobra", Game::TrapTeam, Element::Air}}, - {{212, 0x3011}, {"Storm Warning", Game::TrapTeam, Element::Air}}, - {{212, 0x3018}, {"Cyclone Saber", Game::TrapTeam, Element::Air}}, - {{213, 0x3004}, {"Spirit Sphere", Game::TrapTeam, Element::Undead}}, - {{213, 0x3404}, {"Legendary Spirit Sphere", Game::TrapTeam, Element::Undead}}, - {{213, 0x3008}, {"Spectral Skull", Game::TrapTeam, Element::Undead}}, - {{213, 0x3408}, {"Legendary Spectral Skull", Game::TrapTeam, Element::Undead}}, - {{213, 0x300B}, {"Haunted Hatchet", Game::TrapTeam, Element::Undead}}, - {{213, 0x300C}, {"Grim Gripper", Game::TrapTeam, Element::Undead}}, - {{213, 0x3010}, {"Spooky Snake", Game::TrapTeam, Element::Undead}}, - {{213, 0x3017}, {"Dream Piercer", Game::TrapTeam, Element::Undead}}, - {{214, 0x3000}, {"Tech Totem", Game::TrapTeam, Element::Tech}}, - {{214, 0x3007}, {"Automatic Angel", Game::TrapTeam, Element::Tech}}, - {{214, 0x3009}, {"Factory Flower", Game::TrapTeam, Element::Tech}}, - {{214, 0x300C}, {"Grabbing Gadget", Game::TrapTeam, Element::Tech}}, - {{214, 0x3016}, {"Makers Mana", Game::TrapTeam, Element::Tech}}, - {{214, 0x301A}, {"Topsy Techy", Game::TrapTeam, Element::Tech}}, - {{215, 0x3005}, {"Eternal Flame", Game::TrapTeam, Element::Fire}}, - {{215, 0x3009}, {"Fire Flower", Game::TrapTeam, Element::Fire}}, - {{215, 0x3011}, {"Scorching Stopper", Game::TrapTeam, Element::Fire}}, - {{215, 0x3012}, {"Searing Spinner", Game::TrapTeam, Element::Fire}}, - {{215, 0x3017}, {"Spark Spear", Game::TrapTeam, Element::Fire}}, - {{215, 0x301B}, {"Blazing Belch", Game::TrapTeam, Element::Fire}}, - {{216, 0x3000}, {"Banded Boulder", Game::TrapTeam, Element::Earth}}, - {{216, 0x3003}, {"Rock Hawk", Game::TrapTeam, Element::Earth}}, - {{216, 0x300A}, {"Slag Hammer", Game::TrapTeam, Element::Earth}}, - {{216, 0x300E}, {"Dust Of Time", Game::TrapTeam, Element::Earth}}, - {{216, 0x3013}, {"Spinning Sandstorm", Game::TrapTeam, Element::Earth}}, - {{216, 0x301A}, {"Rubble Trouble", Game::TrapTeam, Element::Earth}}, - {{217, 0x3003}, {"Oak Eagle", Game::TrapTeam, Element::Life}}, - {{217, 0x3005}, {"Emerald Energy", Game::TrapTeam, Element::Life}}, - {{217, 0x300A}, {"Weed Whacker", Game::TrapTeam, Element::Life}}, - {{217, 0x3010}, {"Seed Serpent", Game::TrapTeam, Element::Life}}, - {{217, 0x3018}, {"Jade Blade", Game::TrapTeam, Element::Life}}, - {{217, 0x301B}, {"Shrub Shrieker", Game::TrapTeam, Element::Life}}, - {{218, 0x3000}, {"Dark Dagger", Game::TrapTeam}}, - {{218, 0x3014}, {"Shadow Spider", Game::TrapTeam}}, - {{218, 0x301A}, {"Ghastly Grimace", Game::TrapTeam}}, - {{219, 0x3000}, {"Shining Ship", Game::TrapTeam}}, - {{219, 0x300F}, {"Heavenly Hawk", Game::TrapTeam}}, - {{219, 0x301B}, {"Beam Scream", Game::TrapTeam}}, - {{220, 0x301E}, {"Kaos Trap", Game::TrapTeam}}, - {{220, 0x351F}, {"Ultimate Kaos Trap", Game::TrapTeam}}, - {{230, 0x0000}, {"Hand of Fate", Game::TrapTeam}}, - {{230, 0x3403}, {"Legendary Hand of Fate", Game::TrapTeam}}, - {{231, 0x0000}, {"Piggy Bank", Game::TrapTeam}}, - {{232, 0x0000}, {"Rocket Ram", Game::TrapTeam}}, - {{233, 0x0000}, {"Tiki Speaky", Game::TrapTeam}}, - {{300, 0x0000}, {"Dragon's Peak", Game::SpyrosAdv}}, - {{301, 0x0000}, {"Empire of Ice", Game::SpyrosAdv}}, - {{302, 0x0000}, {"Pirate Seas", Game::SpyrosAdv}}, - {{303, 0x0000}, {"Darklight Crypt", Game::SpyrosAdv}}, - {{304, 0x0000}, {"Volcanic Vault", Game::SpyrosAdv}}, - {{305, 0x0000}, {"Mirror of Mystery", Game::TrapTeam}}, - {{306, 0x0000}, {"Nightmare Express", Game::TrapTeam}}, - {{307, 0x0000}, {"Sunscraper Spire", Game::TrapTeam}}, - {{308, 0x0000}, {"Midnight Museum", Game::TrapTeam}}, - {{404, 0x0000}, {"Legendary Bash", Game::SpyrosAdv, Element::Earth}}, - {{416, 0x0000}, {"Legendary Spyro", Game::SpyrosAdv, Element::Magic}}, - {{419, 0x0000}, {"Legendary Trigger Happy", Game::SpyrosAdv, Element::Tech}}, - {{430, 0x0000}, {"Legendary Chop Chop", Game::SpyrosAdv, Element::Undead}}, - {{450, 0x0000}, {"Gusto", Game::TrapTeam, Element::Air}}, - {{451, 0x0000}, {"Thunderbolt", Game::TrapTeam, Element::Air}}, - {{452, 0x0000}, {"Fling Kong", Game::TrapTeam, Element::Air}}, - {{453, 0x0000}, {"Blades", Game::TrapTeam, Element::Air}}, - {{453, 0x3403}, {"Legendary Blades", Game::TrapTeam, Element::Air}}, - {{454, 0x0000}, {"Wallop", Game::TrapTeam, Element::Earth}}, - {{455, 0x0000}, {"Head Rush", Game::TrapTeam, Element::Earth}}, - {{455, 0x3402}, {"Nitro Head Rush", Game::TrapTeam, Element::Earth}}, - {{456, 0x0000}, {"Fist Bump", Game::TrapTeam, Element::Earth}}, - {{457, 0x0000}, {"Rocky Roll", Game::TrapTeam, Element::Earth}}, - {{458, 0x0000}, {"Wildfire", Game::TrapTeam, Element::Fire}}, - {{458, 0x3402}, {"Dark Wildfire", Game::TrapTeam, Element::Fire}}, - {{459, 0x0000}, {"Ka Boom", Game::TrapTeam, Element::Fire}}, - {{460, 0x0000}, {"Trail Blazer", Game::TrapTeam, Element::Fire}}, - {{461, 0x0000}, {"Torch", Game::TrapTeam, Element::Fire}}, - {{462, 0x0000}, {"Snap Shot", Game::TrapTeam, Element::Water}}, - {{462, 0x3402}, {"Dark Snap Shot", Game::TrapTeam, Element::Water}}, - {{463, 0x0000}, {"Lob Star", Game::TrapTeam, Element::Water}}, - {{463, 0x3402}, {"Winterfest Lob-Star", Game::TrapTeam, Element::Water}}, - {{464, 0x0000}, {"Flip Wreck", Game::TrapTeam, Element::Water}}, - {{465, 0x0000}, {"Echo", Game::TrapTeam, Element::Water}}, - {{466, 0x0000}, {"Blastermind", Game::TrapTeam, Element::Magic}}, - {{467, 0x0000}, {"Enigma", Game::TrapTeam, Element::Magic}}, - {{468, 0x0000}, {"Deja Vu", Game::TrapTeam, Element::Magic}}, - {{468, 0x3403}, {"Legendary Deja Vu", Game::TrapTeam, Element::Magic}}, - {{469, 0x0000}, {"Cobra Cadabra", Game::TrapTeam, Element::Magic}}, - {{469, 0x3402}, {"King Cobra Cadabra", Game::TrapTeam, Element::Magic}}, - {{470, 0x0000}, {"Jawbreaker", Game::TrapTeam, Element::Tech}}, - {{470, 0x3403}, {"Legendary Jawbreaker", Game::TrapTeam, Element::Tech}}, - {{471, 0x0000}, {"Gearshift", Game::TrapTeam, Element::Tech}}, - {{472, 0x0000}, {"Chopper", Game::TrapTeam, Element::Tech}}, - {{473, 0x0000}, {"Tread Head", Game::TrapTeam, Element::Tech}}, - {{474, 0x0000}, {"Bushwack", Game::TrapTeam, Element::Life}}, - {{474, 0x3403}, {"Legendary Bushwack", Game::TrapTeam, Element::Life}}, - {{475, 0x0000}, {"Tuff Luck", Game::TrapTeam, Element::Life}}, - {{476, 0x0000}, {"Food Fight", Game::TrapTeam, Element::Life}}, - {{476, 0x3402}, {"Dark Food Fight", Game::TrapTeam, Element::Life}}, - {{477, 0x0000}, {"High Five", Game::TrapTeam, Element::Life}}, - {{478, 0x0000}, {"Krypt King", Game::TrapTeam, Element::Undead}}, - {{478, 0x3402}, {"Nitro Krypt King", Game::TrapTeam, Element::Undead}}, - {{479, 0x0000}, {"Short Cut", Game::TrapTeam, Element::Undead}}, - {{480, 0x0000}, {"Bat Spin", Game::TrapTeam, Element::Undead}}, - {{481, 0x0000}, {"Funny Bone", Game::TrapTeam, Element::Undead}}, - {{482, 0x0000}, {"Knight Light", Game::TrapTeam}}, - {{483, 0x0000}, {"Spotlight", Game::TrapTeam}}, - {{484, 0x0000}, {"Knight Mare", Game::TrapTeam}}, - {{485, 0x0000}, {"Blackout", Game::TrapTeam}}, - {{502, 0x0000}, {"Bop (Mini)", Game::TrapTeam, Element::Earth}}, - {{503, 0x0000}, {"Spry (Mini)", Game::TrapTeam, Element::Magic}}, - {{504, 0x0000}, {"Hijinx (Mini)", Game::TrapTeam, Element::Undead}}, - {{505, 0x0000}, {"Terrabite (Sidekick)", Game::SpyrosAdv, Element::Earth}}, - {{505, 0x3000}, {"Terrabite (Mini)", Game::TrapTeam, Element::Earth}}, - {{506, 0x0000}, {"Breeze (Mini)", Game::TrapTeam, Element::Air}}, - {{507, 0x0000}, {"Weeruptor (Mini)", Game::TrapTeam, Element::Fire}}, - {{507, 0x3402}, {"Eggcellent Weeruptor (Mini)", Game::TrapTeam, Element::Fire}}, - {{508, 0x0000}, {"Pet Vac (Mini)", Game::TrapTeam, Element::Air}}, - {{508, 0x3402}, {"Power Punch Pet Vac (Mini)", Game::TrapTeam, Element::Air}}, - {{509, 0x0000}, {"Small Fry (Mini)", Game::TrapTeam, Element::Fire}}, - {{510, 0x0000}, {"Drobit (Mini)", Game::TrapTeam, Element::Tech}}, - {{514, 0x0000}, {"Gill Runt (Sidekick)", Game::SpyrosAdv, Element::Water}}, - {{514, 0x3000}, {"Gill Runt (Mini)", Game::TrapTeam, Element::Water}}, - {{519, 0x0000}, {"Trigger Snappy (Sidekick)", Game::SpyrosAdv, Element::Tech}}, - {{519, 0x3000}, {"Trigger Snappy (Mini)", Game::TrapTeam, Element::Tech}}, - {{526, 0x0000}, {"Whisper Elf (Sidekick)", Game::SpyrosAdv, Element::Life}}, - {{526, 0x3000}, {"Whisper Elf (Mini)", Game::TrapTeam, Element::Life}}, - {{540, 0x0000}, {"Barkley (Sidekick)", Game::Giants, Element::Life}}, - {{540, 0x3000}, {"Barkley (Mini)", Game::TrapTeam, Element::Life}}, - {{540, 0x3402}, {"Gnarly Barkley (Mini)", Game::TrapTeam, Element::Life}}, - {{541, 0x0000}, {"Thumpling (Sidekick)", Game::Giants, Element::Water}}, - {{541, 0x3000}, {"Thumpling (Mini)", Game::TrapTeam, Element::Water}}, - {{542, 0x0000}, {"Mini-Jini (Sidekick)", Game::Giants, Element::Magic}}, - {{542, 0x3000}, {"Mini-Jini (Mini)", Game::TrapTeam, Element::Magic}}, - {{543, 0x0000}, {"Eye Small (Sidekick)", Game::Giants, Element::Undead}}, - {{543, 0x3000}, {"Eye Small (Mini)", Game::TrapTeam, Element::Undead}}, - {{1000, 0x0000}, {"Boom Jet (Bottom)", Game::SwapForce, Element::Air}}, - {{1001, 0x0000}, {"Free Ranger (Bottom)", Game::SwapForce, Element::Air}}, - {{1001, 0x2403}, {"Legendary Free Ranger (Bottom)", Game::SwapForce, Element::Air}}, - {{1002, 0x0000}, {"Rubble Rouser (Bottom)", Game::SwapForce, Element::Earth}}, - {{1003, 0x0000}, {"Doom Stone (Bottom)", Game::SwapForce, Element::Earth}}, - {{1004, 0x0000}, {"Blast Zone (Bottom)", Game::SwapForce, Element::Fire}}, - {{1004, 0x2402}, {"Dark Blast Zone (Bottom)", Game::SwapForce, Element::Fire}}, - {{1005, 0x0000}, {"Fire Kraken (Bottom)", Game::SwapForce, Element::Fire}}, - {{1005, 0x2402}, {"Jade Fire Kraken (Bottom)", Game::SwapForce, Element::Fire}}, - {{1006, 0x0000}, {"Stink Bomb (Bottom)", Game::SwapForce, Element::Life}}, - {{1007, 0x0000}, {"Grilla Drilla (Bottom)", Game::SwapForce, Element::Life}}, - {{1008, 0x0000}, {"Hoot Loop (Bottom)", Game::SwapForce, Element::Magic}}, - {{1008, 0x2402}, {"Enchanted Hoot Loop (Bottom)", Game::SwapForce, Element::Magic}}, - {{1009, 0x0000}, {"Trap Shadow (Bottom)", Game::SwapForce, Element::Magic}}, - {{1010, 0x0000}, {"Magna Charge (Bottom)", Game::SwapForce, Element::Tech}}, - {{1010, 0x2402}, {"Nitro Magna Charge (Bottom)", Game::SwapForce, Element::Tech}}, - {{1011, 0x0000}, {"Spy Rise (Bottom)", Game::SwapForce, Element::Tech}}, - {{1012, 0x0000}, {"Night Shift (Bottom)", Game::SwapForce, Element::Undead}}, - {{1012, 0x2403}, {"Legendary Night Shift (Bottom)", Game::SwapForce, Element::Undead}}, - {{1013, 0x0000}, {"Rattle Shake (Bottom)", Game::SwapForce, Element::Undead}}, - {{1013, 0x2402}, {"Quick Draw Rattle Shake (Bottom)", Game::SwapForce, Element::Undead}}, - {{1014, 0x0000}, {"Freeze Blade (Bottom)", Game::SwapForce, Element::Water}}, - {{1014, 0x2402}, {"Nitro Freeze Blade (Bottom)", Game::SwapForce, Element::Water}}, - {{1015, 0x0000}, {"Wash Buckler (Bottom)", Game::SwapForce, Element::Water}}, - {{1015, 0x2402}, {"Dark Wash Buckler (Bottom)", Game::SwapForce, Element::Water}}, - {{2000, 0x0000}, {"Boom Jet (Top)", Game::SwapForce, Element::Air}}, - {{2001, 0x0000}, {"Free Ranger (Top)", Game::SwapForce, Element::Air}}, - {{2001, 0x2403}, {"Legendary Free Ranger (Top)", Game::SwapForce, Element::Air}}, - {{2002, 0x0000}, {"Rubble Rouser (Top)", Game::SwapForce, Element::Earth}}, - {{2003, 0x0000}, {"Doom Stone (Top)", Game::SwapForce, Element::Earth}}, - {{2004, 0x0000}, {"Blast Zone (Top)", Game::SwapForce, Element::Fire}}, - {{2004, 0x2402}, {"Dark Blast Zone (Top)", Game::SwapForce, Element::Fire}}, - {{2005, 0x0000}, {"Fire Kraken (Top)", Game::SwapForce, Element::Fire}}, - {{2005, 0x2402}, {"Jade Fire Kraken (Top)", Game::SwapForce, Element::Fire}}, - {{2006, 0x0000}, {"Stink Bomb (Top)", Game::SwapForce, Element::Life}}, - {{2007, 0x0000}, {"Grilla Drilla (Top)", Game::SwapForce, Element::Life}}, - {{2008, 0x0000}, {"Hoot Loop (Top)", Game::SwapForce, Element::Magic}}, - {{2008, 0x2402}, {"Enchanted Hoot Loop (Top)", Game::SwapForce, Element::Magic}}, - {{2009, 0x0000}, {"Trap Shadow (Top)", Game::SwapForce, Element::Magic}}, - {{2010, 0x0000}, {"Magna Charge (Top)", Game::SwapForce, Element::Tech}}, - {{2010, 0x2402}, {"Nitro Magna Charge (Top)", Game::SwapForce, Element::Tech}}, - {{2011, 0x0000}, {"Spy Rise (Top)", Game::SwapForce, Element::Tech}}, - {{2012, 0x0000}, {"Night Shift (Top)", Game::SwapForce, Element::Undead}}, - {{2012, 0x2403}, {"Legendary Night Shift (Top)", Game::SwapForce, Element::Undead}}, - {{2013, 0x0000}, {"Rattle Shake (Top)", Game::SwapForce, Element::Undead}}, - {{2013, 0x2402}, {"Quick Draw Rattle Shake (Top)", Game::SwapForce, Element::Undead}}, - {{2014, 0x0000}, {"Freeze Blade (Top)", Game::SwapForce, Element::Water}}, - {{2014, 0x2402}, {"Nitro Freeze Blade (Top)", Game::SwapForce, Element::Water}}, - {{2015, 0x0000}, {"Wash Buckler (Top)", Game::SwapForce, Element::Water}}, - {{2015, 0x2402}, {"Dark Wash Buckler (Top)", Game::SwapForce, Element::Water}}, - {{3000, 0x0000}, {"Scratch", Game::SwapForce, Element::Air}}, - {{3001, 0x0000}, {"Pop Thorn", Game::SwapForce, Element::Air}}, - {{3002, 0x0000}, {"Slobber Tooth", Game::SwapForce, Element::Earth}}, - {{3002, 0x2402}, {"Dark Slobber Tooth", Game::SwapForce, Element::Earth}}, - {{3003, 0x0000}, {"Scorp", Game::SwapForce, Element::Earth}}, - {{3004, 0x0000}, {"Fryno", Game::SwapForce, Element::Fire}}, - {{3004, 0x3805}, {"Hog Wild Fryno", Game::SwapForce, Element::Fire}}, - {{3005, 0x0000}, {"Smolderdash", Game::SwapForce, Element::Fire}}, - {{3005, 0x2206}, {"LightCore Smolderdash", Game::SwapForce, Element::Fire}}, - {{3006, 0x0000}, {"Bumble Blast", Game::SwapForce, Element::Life}}, - {{3006, 0x2206}, {"LightCore Bumble Blast", Game::SwapForce, Element::Life}}, - {{3006, 0x2402}, {"Jolly Bumble Blast", Game::SwapForce, Element::Life}}, - {{3007, 0x0000}, {"Zoo Lou", Game::SwapForce, Element::Life}}, - {{3007, 0x2403}, {"Legendary Zoo Lou", Game::SwapForce, Element::Life}}, - {{3008, 0x0000}, {"Dune Bug", Game::SwapForce, Element::Magic}}, - {{3009, 0x0000}, {"Star Strike", Game::SwapForce, Element::Magic}}, - {{3009, 0x2206}, {"LightCore Star Strike", Game::SwapForce, Element::Magic}}, - {{3009, 0x2602}, {"Enchanted Star Strike", Game::SwapForce, Element::Magic}}, - {{3010, 0x0000}, {"Countdown", Game::SwapForce, Element::Tech}}, - {{3010, 0x2206}, {"LightCore Countdown", Game::SwapForce, Element::Tech}}, - {{3010, 0x2402}, {"Kickoff Countdown", Game::SwapForce, Element::Tech}}, - {{3011, 0x0000}, {"Wind Up", Game::SwapForce, Element::Tech}}, - {{3011, 0x2404}, {"Gear Head VVind Up", Game::SwapForce, Element::Tech}}, - {{3012, 0x0000}, {"Roller Brawl", Game::SwapForce, Element::Undead}}, - {{3013, 0x0000}, {"Grim Creeper", Game::SwapForce, Element::Undead}}, - {{3013, 0x2206}, {"LightCore Grim Creeper", Game::SwapForce, Element::Undead}}, - {{3013, 0x2603}, {"Legendary Grim Creeper", Game::SwapForce, Element::Undead}}, - {{3014, 0x0000}, {"Rip Tide", Game::SwapForce, Element::Water}}, - {{3015, 0x0000}, {"Punk Shock", Game::SwapForce, Element::Water}}, - {{3200, 0x0000}, {"Battle Hammer", Game::SwapForce}}, - {{3201, 0x0000}, {"Sky Diamond", Game::SwapForce}}, - {{3202, 0x0000}, {"Platinum Sheep", Game::SwapForce}}, - {{3203, 0x0000}, {"Groove Machine", Game::SwapForce}}, - {{3204, 0x0000}, {"UFO Hat", Game::SwapForce}}, - {{3220, 0x0000}, {"Jet Stream", Game::Superchargers, Element::Air}}, - {{3221, 0x0000}, {"Tomb Buggy", Game::Superchargers, Element::Undead}}, - {{3222, 0x0000}, {"Reef Ripper", Game::Superchargers, Element::Water}}, - {{3223, 0x0000}, {"Burn Cycle", Game::Superchargers, Element::Fire}}, - {{3224, 0x0000}, {"Hot Streak", Game::Superchargers, Element::Fire}}, - {{3224, 0x4004}, {"E3 Hot Streak", Game::Superchargers, Element::Fire}}, - {{3224, 0x4402}, {"Dark Hot Streak", Game::Superchargers, Element::Fire}}, - {{3224, 0x441E}, {"Golden Hot Streak", Game::Superchargers, Element::Fire}}, - {{3225, 0x0000}, {"Shark Tank", Game::Superchargers, Element::Earth}}, - {{3226, 0x0000}, {"Thump Truck", Game::Superchargers, Element::Earth}}, - {{3227, 0x0000}, {"Crypt Crusher", Game::Superchargers, Element::Undead}}, - {{3228, 0x0000}, {"Stealth Stinger", Game::Superchargers, Element::Life}}, - {{3228, 0x4402}, {"Nitro Stealth Stinger", Game::Superchargers, Element::Life}}, - {{3231, 0x0000}, {"Dive Bomber", Game::Superchargers, Element::Water}}, - {{3231, 0x4402}, {"Spring Ahead Dive Bomber", Game::Superchargers, Element::Water}}, - {{3232, 0x0000}, {"Sky Slicer", Game::Superchargers, Element::Air}}, - {{3233, 0x0000}, {"Clown Cruiser", Game::Superchargers, Element::Air}}, - {{3233, 0x4402}, {"Dark Clown Cruiser", Game::Superchargers, Element::Air}}, - {{3234, 0x0000}, {"Gold Rusher", Game::Superchargers, Element::Tech}}, - {{3234, 0x4402}, {"Power Blue Gold Rusher", Game::Superchargers, Element::Tech}}, - {{3235, 0x0000}, {"Shield Striker", Game::Superchargers, Element::Tech}}, - {{3236, 0x0000}, {"Sun Runner", Game::Superchargers}}, - {{3236, 0x4403}, {"Legendary Sun Runner", Game::Superchargers}}, - {{3237, 0x0000}, {"Sea Shadow", Game::Superchargers}}, - {{3237, 0x4402}, {"Dark Sea Shadow", Game::Superchargers}}, - {{3238, 0x0000}, {"Splatter Splasher", Game::Superchargers, Element::Magic}}, - {{3238, 0x4402}, {"Power Blue Splatter Splasher", Game::Superchargers, Element::Magic}}, - {{3239, 0x0000}, {"Soda Skimmer", Game::Superchargers, Element::Magic}}, - {{3239, 0x4402}, {"Nitro Soda Skimmer", Game::Superchargers, Element::Magic}}, - {{3240, 0x0000}, {"Barrel Blaster", Game::Superchargers, Element::Tech}}, - {{3240, 0x4402}, {"Dark Barrel Blaster", Game::Superchargers, Element::Tech}}, - {{3241, 0x0000}, {"Buzz Wing", Game::Superchargers, Element::Life}}, - {{3300, 0x0000}, {"Sheep Wreck Island", Game::SwapForce}}, - {{3301, 0x0000}, {"Tower of Time", Game::SwapForce}}, - {{3302, 0x0000}, {"Fiery Forge", Game::SwapForce}}, - {{3303, 0x0000}, {"Arkeyan Crossbow", Game::SwapForce}}, - {{3400, 0x0000}, {"Fiesta", Game::Superchargers, Element::Undead}}, - {{3400, 0x4515}, {"Frightful Fiesta", Game::Superchargers, Element::Undead}}, - {{3401, 0x0000}, {"High Volt", Game::Superchargers, Element::Tech}}, - {{3402, 0x0000}, {"Splat", Game::Superchargers, Element::Magic}}, - {{3402, 0x4502}, {"Power Blue Splat", Game::Superchargers, Element::Magic}}, - {{3406, 0x0000}, {"Stormblade", Game::Superchargers, Element::Air}}, - {{3406, 0x4502}, {"Dark Stormblade", Game::Superchargers, Element::Air}}, - {{3411, 0x0000}, {"Smash Hit", Game::Superchargers, Element::Earth}}, - {{3411, 0x4502}, {"Steel Plated Smash Hit", Game::Superchargers, Element::Earth}}, - {{3412, 0x0000}, {"Spitfire", Game::Superchargers, Element::Fire}}, - {{3412, 0x4502}, {"Dark Spitfire", Game::Superchargers, Element::Fire}}, - {{3413, 0x0000}, {"Hurricane Jet Vac", Game::Superchargers, Element::Air}}, - {{3413, 0x4503}, {"Legendary Hurricane Jet Vac", Game::Superchargers, Element::Air}}, - {{3414, 0x0000}, {"Double Dare Trigger Happy", Game::Superchargers, Element::Tech}}, - {{3414, 0x4502}, {"Power Blue Double Dare Trigger Happy", Game::Superchargers, Element::Tech}}, - {{3415, 0x0000}, {"Super Shot Stealth Elf", Game::Superchargers, Element::Life}}, - {{3415, 0x4502}, {"Dark Super Shot Stealth Elf", Game::Superchargers, Element::Life}}, - {{3416, 0x0000}, {"Shark Shooter Terrafin", Game::Superchargers, Element::Earth}}, - {{3417, 0x0000}, {"Bone Bash Roller Brawl", Game::Superchargers, Element::Undead}}, - {{3417, 0x4503}, {"Legendary Bone Bash Roller Brawl", Game::Superchargers, Element::Undead}}, - {{3420, 0x0000}, {"Big Bubble Pop Fizz", Game::Superchargers, Element::Magic}}, - {{3420, 0x450E}, {"Birthday Bash Big Bubble Pop Fizz", Game::Superchargers, Element::Magic}}, - {{3421, 0x0000}, {"Lava Lance Eruptor", Game::Superchargers, Element::Fire}}, - {{3422, 0x0000}, {"Deep Dive Gill Grunt", Game::Superchargers, Element::Water}}, - {{3423, 0x0000}, {"Turbo Charge Donkey Kong", Game::Superchargers, Element::Life}}, - {{3423, 0x4502}, {"Dark Turbo Charge Donkey Kong", Game::Superchargers, Element::Life}}, - {{3424, 0x0000}, {"Hammer Slam Bowser", Game::Superchargers, Element::Fire}}, - {{3424, 0x4502}, {"Dark Hammer Slam Bowser", Game::Superchargers, Element::Fire}}, - {{3425, 0x0000}, {"Dive-Clops", Game::Superchargers, Element::Water}}, - {{3425, 0x450E}, {"Missile-Tow Dive-Clops", Game::Superchargers, Element::Water}}, - {{3426, 0x0000}, {"Astroblast", Game::Superchargers}}, - {{3426, 0x4503}, {"Legendary Astroblast", Game::Superchargers}}, - {{3427, 0x0000}, {"Nightfall", Game::Superchargers}}, - {{3428, 0x0000}, {"Thrillipede", Game::Superchargers, Element::Life}}, - {{3428, 0x450D}, {"Eggcited Thrillipede", Game::Superchargers, Element::Life}}, - {{3500, 0x0000}, {"Sky Trophy", Game::Superchargers}}, - {{3501, 0x0000}, {"Land Trophy", Game::Superchargers}}, - {{3502, 0x0000}, {"Sea Trophy", Game::Superchargers}}, - {{3503, 0x0000}, {"Kaos Trophy", Game::Superchargers}}}; + {{0, 0x0000}, {"Whirlwind", Game::SpyrosAdv, Element::Air, Type::Skylander}}, + {{0, 0x1801}, {"Whirlwind (S2)", Game::Giants, Element::Air, Type::Skylander}}, + {{0, 0x1C02}, {"Whirlwind (Polar)", Game::Giants, Element::Air, Type::Skylander}}, + {{0, 0x2805}, {"Whirlwind (Horn Blast)", Game::SwapForce, Element::Air, Type::Skylander}}, + {{0, 0x3810}, {"Whirlwind (Eon's Elite)", Game::TrapTeam, Element::Air, Type::Skylander}}, + {{1, 0x0000}, {"Sonic Boom", Game::SpyrosAdv, Element::Air, Type::Skylander}}, + {{1, 0x1801}, {"Sonic Boom (S2)", Game::Giants, Element::Air, Type::Skylander}}, + {{1, 0x1811}, {"Sonic Boom (Glow In The Dark)", Game::Giants, Element::Air, Type::Skylander}}, + {{1, 0x1813}, {"Sonic Boom (Sparkle)", Game::Giants, Element::Air, Type::Skylander}}, + {{2, 0x0000}, {"Warnado", Game::SpyrosAdv, Element::Air, Type::Skylander}}, + {{2, 0x2206}, {"Warnado (Lightcore)", Game::SwapForce, Element::Air, Type::Skylander}}, + {{3, 0x0000}, {"Lightning Rod", Game::SpyrosAdv, Element::Air, Type::Skylander}}, + {{3, 0x1801}, {"Lightning Rod (S2)", Game::Giants, Element::Air, Type::Skylander}}, + {{4, 0x0000}, {"Bash", Game::SpyrosAdv, Element::Earth, Type::Skylander}}, + {{4, 0x1801}, {"Bash (S2)", Game::Giants, Element::Earth, Type::Skylander}}, + {{5, 0x0000}, {"Terrafin", Game::SpyrosAdv, Element::Earth, Type::Skylander}}, + {{5, 0x1801}, {"Terrafin (S2)", Game::Giants, Element::Earth, Type::Skylander}}, + {{5, 0x2805}, {"Terrafin (Knockout)", Game::SwapForce, Element::Earth, Type::Skylander}}, + {{5, 0x3810}, {"Terrafin (Eon's Elite)", Game::TrapTeam, Element::Earth, Type::Skylander}}, + {{6, 0x0000}, {"Dino-Rang", Game::SpyrosAdv, Element::Earth, Type::Skylander}}, + {{6, 0x4810}, + {"Dino-Rang (Eon's Elite)", Game::Superchargers, Element::Earth, Type::Skylander}}, + {{7, 0x0000}, {"Prism Break", Game::SpyrosAdv, Element::Earth, Type::Skylander}}, + {{7, 0x1206}, {"Prism Break (Lightcore)", Game::Giants, Element::Earth, Type::Skylander}}, + {{7, 0x1801}, {"Prism Break (S2)", Game::Giants, Element::Earth, Type::Skylander}}, + {{7, 0x2805}, {"Prism Break (Hyper Beam)", Game::SwapForce, Element::Earth, Type::Skylander}}, + {{8, 0x0000}, {"Sunburn", Game::SpyrosAdv, Element::Fire, Type::Skylander}}, + {{9, 0x0000}, {"Eruptor", Game::SpyrosAdv, Element::Fire, Type::Skylander}}, + {{9, 0x1206}, {"Eruptor (Lightcore)", Game::Giants, Element::Fire, Type::Skylander}}, + {{9, 0x1801}, {"Eruptor (S2)", Game::Giants, Element::Fire, Type::Skylander}}, + {{9, 0x2805}, {"Eruptor (Lava Barf)", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{9, 0x2C02}, {"Eruptor (Volcanic)", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{9, 0x3810}, {"Eruptor (Eon's Elite)", Game::TrapTeam, Element::Fire, Type::Skylander}}, + {{10, 0x0000}, {"Ignitor", Game::SpyrosAdv, Element::Fire, Type::Skylander}}, + {{10, 0x1801}, {"Ignitor (S2)", Game::Giants, Element::Fire, Type::Skylander}}, + {{10, 0x1C03}, {"Ignitor (Legendary)", Game::Giants, Element::Fire, Type::Skylander}}, + {{11, 0x0000}, {"Flameslinger", Game::SpyrosAdv, Element::Fire, Type::Skylander}}, + {{11, 0x1801}, {"Flameslinger (S2)", Game::Giants, Element::Fire, Type::Skylander}}, + {{11, 0x1802}, {"Flameslinger (Golden)", Game::Giants, Element::Fire, Type::Skylander}}, + {{12, 0x0000}, {"Zap", Game::SpyrosAdv, Element::Water, Type::Skylander}}, + {{12, 0x1801}, {"Zap (S2)", Game::Giants, Element::Water, Type::Skylander}}, + {{13, 0x0000}, {"Wham-Shell", Game::SpyrosAdv, Element::Water, Type::Skylander}}, + {{13, 0x2206}, {"Wham-Shell (Lightcore)", Game::SwapForce, Element::Water, Type::Skylander}}, + {{14, 0x0000}, {"Gill Grunt", Game::SpyrosAdv, Element::Water, Type::Skylander}}, + {{14, 0x1801}, {"Gill Grunt (S2)", Game::Giants, Element::Water, Type::Skylander}}, + {{14, 0x1817}, {"Gill Grunt (Metallic)", Game::Giants, Element::Water, Type::Skylander}}, + {{14, 0x2805}, {"Gill Grunt (Anchors Away)", Game::SwapForce, Element::Water, Type::Skylander}}, + {{14, 0x3809}, {"Gill Grunt (Tidal Wave)", Game::TrapTeam, Element::Water, Type::Skylander}}, + {{14, 0x3810}, {"Gill Grunt (Eon's Elite)", Game::TrapTeam, Element::Water, Type::Skylander}}, + {{15, 0x0000}, {"Slam Bam", Game::SpyrosAdv, Element::Water, Type::Skylander}}, + {{15, 0x1801}, {"Slam Bam (S2)", Game::Giants, Element::Water, Type::Skylander}}, + {{15, 0x1C03}, {"Slam Bam (Legendary)", Game::Giants, Element::Water, Type::Skylander}}, + {{15, 0x3810}, + {"Slam Bam (Eon's Elite)", Game::Superchargers, Element::Water, Type::Skylander}}, + {{16, 0x0000}, {"Spyro", Game::SpyrosAdv, Element::Magic, Type::Skylander}}, + {{16, 0x1801}, {"Spyro (S2)", Game::Giants, Element::Magic, Type::Skylander}}, + {{16, 0x2805}, {"Spyro (Mega Ram)", Game::SwapForce, Element::Magic, Type::Skylander}}, + {{16, 0x2C02}, {"Spyro (Dark Mega Ram)", Game::SwapForce, Element::Magic, Type::Skylander}}, + {{16, 0x3810}, {"Spyro (Eon's Elite)", Game::TrapTeam, Element::Magic, Type::Skylander}}, + {{17, 0x0000}, {"Voodood", Game::SpyrosAdv, Element::Magic, Type::Skylander}}, + {{17, 0x3810}, {"Voodood (Eon's Elite)", Game::Superchargers, Element::Magic, Type::Skylander}}, + {{18, 0x0000}, {"Double Trouble", Game::SpyrosAdv, Element::Magic, Type::Skylander}}, + {{18, 0x1801}, {"Double Trouble (S2)", Game::Giants, Element::Magic, Type::Skylander}}, + {{18, 0x1C02}, {"Double Trouble (Royal)", Game::Giants, Element::Magic, Type::Skylander}}, + {{19, 0x0000}, {"Trigger Happy", Game::SpyrosAdv, Element::Tech, Type::Skylander}}, + {{19, 0x1801}, {"Trigger Happy (S2)", Game::Giants, Element::Tech, Type::Skylander}}, + {{19, 0x2805}, {"Trigger Happy (Big Bang)", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{19, 0x2C02}, {"Trigger Happy (Springtime)", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{19, 0x3810}, {"Trigger Happy (Eon's Elite)", Game::TrapTeam, Element::Tech, Type::Skylander}}, + {{20, 0x0000}, {"Drobot", Game::SpyrosAdv, Element::Tech, Type::Skylander}}, + {{20, 0x1206}, {"Drobot (Lightcore)", Game::Giants, Element::Tech, Type::Skylander}}, + {{20, 0x1801}, {"Drobot (S2)", Game::Giants, Element::Tech, Type::Skylander}}, + {{21, 0x0000}, {"Drill Sergeant", Game::SpyrosAdv, Element::Tech, Type::Skylander}}, + {{21, 0x1801}, {"Drill Sergeant (S2)", Game::Giants, Element::Tech, Type::Skylander}}, + {{22, 0x0000}, {"Boomer", Game::SpyrosAdv, Element::Tech, Type::Skylander}}, + {{22, 0x4810}, {"Boomer (Eon's Elite)", Game::Superchargers, Element::Tech, Type::Skylander}}, + {{23, 0x0000}, {"Wrecking Ball", Game::SpyrosAdv, Element::Magic, Type::Skylander}}, + {{23, 0x1801}, {"Wrecking Ball (S2)", Game::Giants, Element::Magic, Type::Skylander}}, + {{24, 0x0000}, {"Camo", Game::SpyrosAdv, Element::Life, Type::Skylander}}, + {{24, 0x2805}, {"Camo (Thorn Horn)", Game::SwapForce, Element::Life, Type::Skylander}}, + {{25, 0x0000}, {"Zook", Game::SpyrosAdv, Element::Life, Type::Skylander}}, + {{25, 0x1801}, {"Zook (S2)", Game::Giants, Element::Life, Type::Skylander}}, + {{25, 0x3810}, {"Zook (Eon's Elite)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{26, 0x0000}, {"Stealth Elf", Game::SpyrosAdv, Element::Life, Type::Skylander}}, + {{26, 0x1801}, {"Stealth Elf (S2)", Game::Giants, Element::Life, Type::Skylander}}, + {{26, 0x1C03}, {"Stealth Elf (Legendary)", Game::Giants, Element::Life, Type::Skylander}}, + {{26, 0x2805}, {"Stealth Elf (Ninja)", Game::SwapForce, Element::Life, Type::Skylander}}, + {{26, 0x2C02}, {"Stealth Elf (Dark)", Game::SwapForce, Element::Life, Type::Skylander}}, + {{26, 0x3810}, {"Stealth Elf (Eon's Elite)", Game::TrapTeam, Element::Life, Type::Skylander}}, + {{27, 0x0000}, {"Stump Smash", Game::SpyrosAdv, Element::Life, Type::Skylander}}, + {{27, 0x1801}, {"Stump Smash (S2)", Game::Giants, Element::Life, Type::Skylander}}, + {{28, 0x0000}, {"Spyro (Dark)", Game::SpyrosAdv, Element::Magic, Type::Skylander}}, + {{29, 0x0000}, {"Hex", Game::SpyrosAdv, Element::Undead, Type::Skylander}}, + {{29, 0x1206}, {"Hex (Lightcore)", Game::Giants, Element::Undead, Type::Skylander}}, + {{29, 0x1801}, {"Hex (S2)", Game::Giants, Element::Undead, Type::Skylander}}, + {{30, 0x0000}, {"Chop Chop", Game::SpyrosAdv, Element::Undead, Type::Skylander}}, + {{30, 0x1801}, {"Chop Chop (S2)", Game::Giants, Element::Undead, Type::Skylander}}, + {{30, 0x2805}, {"Chop Chop (Twin Blade)", Game::SwapForce, Element::Undead, Type::Skylander}}, + {{30, 0x2816}, + {"Chop Chop (Green Twin Blade)", Game::SwapForce, Element::Undead, Type::Skylander}}, + {{30, 0x3810}, {"Chop Chop (Eon's Elite)", Game::TrapTeam, Element::Undead, Type::Skylander}}, + {{31, 0x0000}, {"Ghost Roaster", Game::SpyrosAdv, Element::Undead, Type::Skylander}}, + {{31, 0x4810}, + {"Ghost Roaster (Eon's Elite)", Game::Superchargers, Element::Undead, Type::Skylander}}, + {{32, 0x0000}, {"Cynder", Game::SpyrosAdv, Element::Undead, Type::Skylander}}, + {{32, 0x1801}, {"Cynder (S2)", Game::Giants, Element::Undead, Type::Skylander}}, + {{32, 0x1811}, {"Cynder (Glow In The Dark)", Game::Giants, Element::Undead, Type::Skylander}}, + {{32, 0x2805}, {"Cynder (Phantom)", Game::SwapForce, Element::Undead, Type::Skylander}}, + {{32, 0x301D}, {"Cynder (Clear)", Game::SpyrosAdv, Element::Undead, Type::Skylander}}, + {{100, 0x1000}, {"Jet-Vac", Game::Giants, Element::Air, Type::Skylander}}, + {{100, 0x1206}, {"Jet-Vac (Lightcore)", Game::Giants, Element::Air, Type::Skylander}}, + {{100, 0x1403}, {"Jet-Vac (Legendary)", Game::Giants, Element::Air, Type::Skylander}}, + {{100, 0x2805}, {"Jet Vac (Turbo)", Game::SwapForce, Element::Air, Type::Skylander}}, + {{100, 0x3805}, {"Jet-Vac (Full Blast)", Game::TrapTeam, Element::Air, Type::Skylander}}, + {{101, 0x1206}, {"Swarm", Game::Giants, Element::Air, Type::Giant}}, + {{102, 0x1206}, {"Crusher", Game::Giants, Element::Earth, Type::Giant}}, + {{102, 0x1602}, {"Crusher (Granite)", Game::Giants, Element::Earth, Type::Giant}}, + {{103, 0x1000}, {"Flashwing", Game::Giants, Element::Earth, Type::Skylander}}, + {{103, 0x1402}, {"Flashwing (Jade)", Game::Giants, Element::Earth, Type::Skylander}}, + {{103, 0x2206}, {"Flashwing (Lightcore)", Game::SwapForce, Element::Earth, Type::Skylander}}, + {{104, 0x1206}, {"Hot Head", Game::Giants, Element::Fire, Type::Giant}}, + {{104, 0x1213}, {"Hot Head (Sparkle)", Game::Giants, Element::Fire, Type::Skylander}}, + {{105, 0x1000}, {"Hot Dog", Game::Giants, Element::Fire, Type::Skylander}}, + {{105, 0x1402}, {"Hot Dog (Molten)", Game::Giants, Element::Fire, Type::Skylander}}, + {{105, 0x2805}, {"Hot Dog (Fire Bone)", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{106, 0x1000}, {"Chill", Game::Giants, Element::Water, Type::Skylander}}, + {{106, 0x1206}, {"Chill (Lightcore)", Game::Giants, Element::Water, Type::Skylander}}, + {{106, 0x1603}, {"Chill (Legendary)", Game::Giants, Element::Water, Type::Skylander}}, + {{106, 0x2805}, {"Chill (Blizzard)", Game::SwapForce, Element::Water, Type::Skylander}}, + {{107, 0x1206}, {"Thumpback", Game::Giants, Element::Water, Type::Giant}}, + {{108, 0x1000}, {"Pop Fizz", Game::Giants, Element::Magic, Type::Skylander}}, + {{108, 0x1206}, {"Pop Fizz (Lightcore)", Game::Giants, Element::Magic, Type::Skylander}}, + {{108, 0x1402}, {"Pop Fizz (Punch)", Game::Giants, Element::Magic, Type::Skylander}}, + {{108, 0x2805}, {"Pop Fizz (Super Gulp)", Game::SwapForce, Element::Magic, Type::Skylander}}, + {{108, 0x3805}, {"Pop Fizz (Fizzy Frenzy)", Game::TrapTeam, Element::Magic, Type::Skylander}}, + {{108, 0x3C02}, {"Pop Fizz (Love Potion)", Game::TrapTeam, Element::Magic, Type::Skylander}}, + {{109, 0x1206}, {"Ninjini", Game::Giants, Element::Magic, Type::Giant}}, + {{109, 0x1602}, {"Ninjini (Scarlet)", Game::Giants, Element::Magic, Type::Giant}}, + {{110, 0x1206}, {"Bouncer", Game::Giants, Element::Tech, Type::Giant}}, + {{110, 0x1603}, {"Bouncer (Legendary)", Game::Giants, Element::Tech, Type::Giant}}, + {{111, 0x1000}, {"Sprocket", Game::Giants, Element::Tech, Type::Skylander}}, + {{111, 0x2805}, {"Sprocket (Heavy Duty)", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{111, 0x2819}, {"Sprocket (Heavy Metal)", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{112, 0x1206}, {"Tree Rex", Game::Giants, Element::Life, Type::Giant}}, + {{112, 0x1602}, {"Tree Rex (Gnarly)", Game::Giants, Element::Life, Type::Giant}}, + {{113, 0x1000}, {"Shroomboom", Game::Giants, Element::Life, Type::Skylander}}, + {{113, 0x1206}, {"Shroomboom (Lightcore)", Game::Giants, Element::Life, Type::Skylander}}, + {{113, 0x3801}, {"Shroomboom (Sure Shot)", Game::TrapTeam, Element::Life, Type::Skylander}}, + {{114, 0x1206}, {"Eye-Brawl", Game::Giants, Element::Undead, Type::Giant}}, + {{114, 0x1215}, {"Eye-Brawl (Pumpkin)", Game::Giants, Element::Undead, Type::Giant}}, + {{115, 0x1000}, {"Fright Rider", Game::Giants, Element::Undead, Type::Skylander}}, + {{115, 0x1011}, {"Fright Rider (Halloween)", Game::Giants, Element::Undead, Type::Skylander}}, + {{115, 0x1811}, + {"Fright Rider (Glow In The Dark)", Game::Giants, Element::Undead, Type::Skylander}}, + {{404, 0x0000}, {"Bash (Legendary)", Game::SpyrosAdv, Element::Earth, Type::Skylander}}, + {{416, 0x0000}, {"Spyro (Legendary)", Game::SpyrosAdv, Element::Magic, Type::Skylander}}, + {{419, 0x0000}, {"Trigger Happy (Legendary)", Game::SpyrosAdv, Element::Tech, Type::Skylander}}, + {{430, 0x0000}, {"Chop Chop (Legendary)", Game::SpyrosAdv, Element::Undead, Type::Skylander}}, + {{450, 0x3000}, {"Gusto", Game::TrapTeam, Element::Air, Type::TrapMaster}}, + {{451, 0x3000}, {"Thunderbolt", Game::TrapTeam, Element::Air, Type::TrapMaster}}, + {{451, 0x301D}, {"Thunderbolt (Clear)", Game::TrapTeam, Element::Air, Type::TrapMaster}}, + {{452, 0x3000}, {"Fling Kong", Game::TrapTeam, Element::Air, Type::Skylander}}, + {{453, 0x3000}, {"Blades", Game::TrapTeam, Element::Air, Type::Skylander}}, + {{453, 0x3403}, {"Blades (Legendary)", Game::TrapTeam, Element::Air, Type::Skylander}}, + {{454, 0x3000}, {"Wallop", Game::TrapTeam, Element::Earth, Type::TrapMaster}}, + {{455, 0x3000}, {"Head Rush", Game::TrapTeam, Element::Earth, Type::TrapMaster}}, + {{455, 0x3402}, {"Head Rush (Nitro)", Game::TrapTeam, Element::Earth, Type::Skylander}}, + {{456, 0x3000}, {"Fist Bump", Game::TrapTeam, Element::Earth, Type::Skylander}}, + {{457, 0x3000}, {"Rocky Roll", Game::TrapTeam, Element::Earth, Type::Skylander}}, + {{458, 0x3000}, {"Wildfire", Game::TrapTeam, Element::Fire, Type::TrapMaster}}, + {{458, 0x3402}, {"Wildfire (Dark)", Game::TrapTeam, Element::Fire, Type::TrapMaster}}, + {{459, 0x3000}, {"Kaboom", Game::TrapTeam, Element::Fire, Type::TrapMaster}}, + {{460, 0x3000}, {"Trail Blazer", Game::TrapTeam, Element::Fire, Type::Skylander}}, + {{461, 0x3000}, {"Torch", Game::TrapTeam, Element::Fire, Type::Skylander}}, + {{462, 0x3000}, {"Snap Shot", Game::TrapTeam, Element::Water, Type::TrapMaster}}, + {{462, 0x450F}, {"Snap Shot (Virtual)", Game::TrapTeam, Element::Water, Type::TrapMaster}}, + {{462, 0x3402}, {"Snap Shot (Dark)", Game::TrapTeam, Element::Water, Type::TrapMaster}}, + {{463, 0x3000}, {"Lob Star", Game::TrapTeam, Element::Water, Type::TrapMaster}}, + {{463, 0x3402}, {"Lob Star (Winterfest)", Game::TrapTeam, Element::Water, Type::TrapMaster}}, + {{464, 0x3000}, {"Flip Wreck", Game::TrapTeam, Element::Water, Type::Skylander}}, + {{465, 0x3000}, {"Echo", Game::TrapTeam, Element::Water, Type::Skylander}}, + {{466, 0x3000}, {"Blastermind", Game::TrapTeam, Element::Magic, Type::TrapMaster}}, + {{467, 0x3000}, {"Enigma", Game::TrapTeam, Element::Magic, Type::TrapMaster}}, + {{468, 0x3000}, {"Deja Vu", Game::TrapTeam, Element::Magic, Type::Skylander}}, + {{468, 0x3403}, {"Deja Vu (Legendary)", Game::TrapTeam, Element::Magic, Type::Skylander}}, + {{469, 0x3000}, {"Cobra Cadabra", Game::TrapTeam, Element::Magic, Type::Skylander}}, + {{469, 0x3402}, {"Cobra Cadabra (King)", Game::TrapTeam, Element::Magic, Type::Skylander}}, + {{470, 0x3000}, {"Jawbreaker", Game::TrapTeam, Element::Tech, Type::TrapMaster}}, + {{470, 0x3403}, {"Jawbreaker (Legendary)", Game::TrapTeam, Element::Tech, Type::TrapMaster}}, + {{471, 0x3000}, {"Gearshift", Game::TrapTeam, Element::Tech, Type::TrapMaster}}, + {{472, 0x3000}, {"Chopper", Game::TrapTeam, Element::Tech, Type::Skylander}}, + {{473, 0x3000}, {"Tread Head", Game::TrapTeam, Element::Tech, Type::Skylander}}, + {{474, 0x3000}, {"Bushwhack", Game::TrapTeam, Element::Life, Type::TrapMaster}}, + {{474, 0x3403}, {"Bushwhack (Legendary)", Game::TrapTeam, Element::Life, Type::TrapMaster}}, + {{475, 0x3000}, {"Tuff Luck", Game::TrapTeam, Element::Life, Type::TrapMaster}}, + {{475, 0x301D}, {"Tuff Luck (Clear)", Game::TrapTeam, Element::Life, Type::TrapMaster}}, + {{476, 0x3000}, {"Food Fight", Game::TrapTeam, Element::Life, Type::Skylander}}, + {{476, 0x3402}, {"Food Fight (Dark)", Game::TrapTeam, Element::Life, Type::Skylander}}, + {{476, 0x450F}, {"Food Fight (Virtual)", Game::TrapTeam, Element::Life, Type::Skylander}}, + {{477, 0x3000}, {"High Five", Game::TrapTeam, Element::Life, Type::Skylander}}, + {{478, 0x3000}, {"Krypt King", Game::TrapTeam, Element::Undead, Type::TrapMaster}}, + {{478, 0x3402}, {"Krypt King (Nitro)", Game::TrapTeam, Element::Undead, Type::TrapMaster}}, + {{479, 0x3000}, {"Short Cut", Game::TrapTeam, Element::Undead, Type::TrapMaster}}, + {{480, 0x3000}, {"Bat Spin", Game::TrapTeam, Element::Undead, Type::Skylander}}, + {{481, 0x3000}, {"Funny Bone", Game::TrapTeam, Element::Undead, Type::Skylander}}, + {{482, 0x3000}, {"Knight Light", Game::TrapTeam, Element::Light, Type::TrapMaster}}, + {{483, 0x3000}, {"Spot Light", Game::TrapTeam, Element::Light, Type::Skylander}}, + {{484, 0x3000}, {"Knight Mare", Game::TrapTeam, Element::Dark, Type::TrapMaster}}, + {{485, 0x3000}, {"Blackout", Game::TrapTeam, Element::Dark, Type::Skylander}}, + {{502, 0x3000}, {"Bop", Game::TrapTeam, Element::Earth, Type::Mini}}, + {{503, 0x3000}, {"Spry", Game::TrapTeam, Element::Magic, Type::Mini}}, + {{504, 0x3000}, {"Hijinx", Game::TrapTeam, Element::Undead, Type::Mini}}, + {{505, 0x3000}, {"Terrabite", Game::TrapTeam, Element::Earth, Type::Mini}}, + {{506, 0x3000}, {"Breeze", Game::TrapTeam, Element::Air, Type::Mini}}, + {{507, 0x3000}, {"Weeruptor", Game::TrapTeam, Element::Fire, Type::Mini}}, + {{507, 0x3402}, {"Weeruptor (Eggsellent)", Game::TrapTeam, Element::Fire, Type::Mini}}, + {{508, 0x3000}, {"Pet Vac", Game::TrapTeam, Element::Air, Type::Mini}}, + {{508, 0x3402}, {"Pet Vac (Power Punch)", Game::TrapTeam, Element::Air, Type::Mini}}, + {{509, 0x3000}, {"Small Fry", Game::TrapTeam, Element::Fire, Type::Mini}}, + {{510, 0x3000}, {"Drobit", Game::TrapTeam, Element::Tech, Type::Mini}}, + {{514, 0x3000}, {"Gill Runt", Game::TrapTeam, Element::Water, Type::Mini}}, + {{519, 0x3000}, {"Trigger Snappy", Game::TrapTeam, Element::Tech, Type::Mini}}, + {{526, 0x3000}, {"Whisper Elf", Game::TrapTeam, Element::Life, Type::Mini}}, + {{540, 0x1000}, {"Barkley (Sidekick)", Game::Giants, Element::Life, Type::Mini}}, + {{540, 0x3000}, {"Barkley", Game::TrapTeam, Element::Life, Type::Mini}}, + {{540, 0x3402}, {"Barkley (Gnarly)", Game::TrapTeam, Element::Life, Type::Mini}}, + {{541, 0x1000}, {"Thumpling (Sidekick)", Game::Giants, Element::Water, Type::Mini}}, + {{541, 0x3000}, {"Thumpling", Game::TrapTeam, Element::Water, Type::Mini}}, + {{542, 0x1000}, {"Mini Jini (Sidekick)", Game::Giants, Element::Magic, Type::Mini}}, + {{542, 0x3000}, {"Mini Jini", Game::TrapTeam, Element::Magic, Type::Mini}}, + {{543, 0x1000}, {"Eye-Small (Sidekick)", Game::Giants, Element::Undead, Type::Mini}}, + {{543, 0x3000}, {"Eye-Small", Game::TrapTeam, Element::Undead, Type::Mini}}, + {{1000, 0x2000}, {"Boom Jet (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}}, + {{1001, 0x2000}, {"Free Ranger (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}}, + {{1001, 0x2403}, + {"Free Ranger (Legendary) (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}}, + {{1002, 0x2000}, {"Rubble Rouser (Bottom)", Game::SwapForce, Element::Earth, Type::Swapper}}, + {{1003, 0x2000}, {"Doom Stone (Bottom)", Game::SwapForce, Element::Earth, Type::Swapper}}, + {{1004, 0x2000}, {"Blast Zone (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{1004, 0x2402}, {"Blast Zone (Dark) (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{1005, 0x2000}, {"Fire Kraken (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{1005, 0x2402}, + {"Fire Kraken (Jade) (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{1006, 0x2000}, {"Stink Bomb (Bottom)", Game::SwapForce, Element::Life, Type::Swapper}}, + {{1007, 0x2000}, {"Grilla Drilla (Bottom)", Game::SwapForce, Element::Life, Type::Swapper}}, + {{1008, 0x2000}, {"Hoot Loop (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{1008, 0x2402}, + {"Hoot Loop (Enchanted) (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{1009, 0x2000}, {"Trap Shadow (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{1010, 0x2000}, {"Magna Charge (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}}, + {{1010, 0x2402}, + {"Magna Charge (Nitro) (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}}, + {{1011, 0x2000}, {"Spy Rise (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}}, + {{1012, 0x2000}, {"Night Shift (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{1012, 0x2403}, + {"Night Shift (Legendary) (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{1013, 0x2000}, {"Rattle Shake (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{1013, 0x2402}, + {"Rattle Shake (Quickdraw) (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{1014, 0x2000}, {"Freeze Blade (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{1014, 0x2402}, + {"Freeze Blade (Nitro) (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{1015, 0x2000}, {"Wash Buckler (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{1015, 0x2402}, + {"Wash Buckler (Dark) (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{2000, 0x2000}, {"Boom Jet (Top)", Game::SwapForce, Element::Air, Type::Swapper}}, + {{2001, 0x2000}, {"Free Ranger (Top)", Game::SwapForce, Element::Air, Type::Swapper}}, + {{2001, 0x2403}, + {"Free Ranger (Legendary) (Top)", Game::SwapForce, Element::Air, Type::Swapper}}, + {{2002, 0x2000}, {"Rubble Rouser (Top)", Game::SwapForce, Element::Earth, Type::Swapper}}, + {{2003, 0x2000}, {"Doom Stone (Top)", Game::SwapForce, Element::Earth, Type::Swapper}}, + {{2004, 0x2000}, {"Blast Zone (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{2004, 0x2402}, {"Blast Zone (Dark) (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{2005, 0x2000}, {"Fire Kraken (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{2005, 0x2402}, {"Fire Kraken (Jade) (Top)", Game::SwapForce, Element::Fire, Type::Swapper}}, + {{2006, 0x2000}, {"Stink Bomb (Top)", Game::SwapForce, Element::Life, Type::Swapper}}, + {{2007, 0x2000}, {"Grilla Drilla (Top)", Game::SwapForce, Element::Life, Type::Swapper}}, + {{2008, 0x2000}, {"Hoot Loop (Top)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{2008, 0x2402}, + {"Hoot Loop (Enchanted) (Top)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{2009, 0x2000}, {"Trap Shadow (Top)", Game::SwapForce, Element::Magic, Type::Swapper}}, + {{2010, 0x2000}, {"Magna Charge (Top)", Game::SwapForce, Element::Tech, Type::Swapper}}, + {{2010, 0x2402}, {"Magna Charge (Nitro) (Top)", Game::SwapForce, Element::Tech, Type::Swapper}}, + {{2011, 0x2000}, {"Spy Rise (Top)", Game::SwapForce, Element::Tech, Type::Swapper}}, + {{2012, 0x2000}, {"Night Shift (Top)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{2012, 0x2403}, + {"Night Shift (Legendary) (Top)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{2013, 0x2000}, {"Rattle Shake (Top)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{2013, 0x2402}, + {"Rattle Shake (Quickdraw) (Top)", Game::SwapForce, Element::Undead, Type::Swapper}}, + {{2014, 0x2000}, {"Freeze Blade (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{2014, 0x2402}, + {"Freeze Blade (Nitro) (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{2015, 0x2000}, {"Wash Buckler (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{2015, 0x2402}, {"Wash Buckler (Dark) (Top)", Game::SwapForce, Element::Water, Type::Swapper}}, + {{3000, 0x2000}, {"Scratch", Game::SwapForce, Element::Air, Type::Skylander}}, + {{3001, 0x2000}, {"Pop Thorn", Game::SwapForce, Element::Air, Type::Skylander}}, + {{3002, 0x2000}, {"Slobber Tooth", Game::SwapForce, Element::Earth, Type::Skylander}}, + {{3002, 0x2402}, {"Slobber Tooth (Dark)", Game::SwapForce, Element::Earth, Type::Skylander}}, + {{3003, 0x2000}, {"Scorp", Game::SwapForce, Element::Earth, Type::Skylander}}, + {{3004, 0x2000}, {"Fryno", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{3004, 0x3801}, {"Fryno (Hog Wild)", Game::TrapTeam, Element::Fire, Type::Skylander}}, + {{3005, 0x2000}, {"Smolderdash", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{3005, 0x2206}, {"Smolderdash (Lightcore)", Game::SwapForce, Element::Fire, Type::Skylander}}, + {{3006, 0x2000}, {"Bumble Blast", Game::SwapForce, Element::Life, Type::Skylander}}, + {{3006, 0x2206}, {"Bumble Blast (Lightcore)", Game::SwapForce, Element::Life, Type::Skylander}}, + {{3006, 0x2402}, {"Bumble Blast (Jolly)", Game::SwapForce, Element::Life, Type::Skylander}}, + {{3007, 0x2000}, {"Zoo Lou", Game::SwapForce, Element::Life, Type::Skylander}}, + {{3007, 0x2403}, {"Zoo Lou (Legendary)", Game::SwapForce, Element::Life, Type::Skylander}}, + {{3008, 0x2000}, {"Dune Bug", Game::SwapForce, Element::Magic, Type::Skylander}}, + {{3009, 0x2000}, {"Star Strike", Game::SwapForce, Element::Magic, Type::Skylander}}, + {{3009, 0x2206}, {"Star Strike (Lightcore)", Game::SwapForce, Element::Magic, Type::Skylander}}, + {{3009, 0x2602}, + {"Star Strike (Lightcore Enchanted)", Game::SwapForce, Element::Magic, Type::Skylander}}, + {{3010, 0x2000}, {"Countdown", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{3010, 0x2206}, {"Countdown (Lightcore)", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{3010, 0x2402}, {"Countdown (Kickoff)", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{3011, 0x2000}, {"Wind Up", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{3011, 0x2404}, + {"Wind Up (Gear Head Vicarious Visions)", Game::SwapForce, Element::Tech, Type::Skylander}}, + {{3012, 0x2000}, {"Roller Brawl", Game::SwapForce, Element::Undead, Type::Skylander}}, + {{3013, 0x2000}, {"Grim Creeper", Game::SwapForce, Element::Undead, Type::Skylander}}, + {{3013, 0x2206}, + {"Grim Creeper (Lightcore)", Game::SwapForce, Element::Undead, Type::Skylander}}, + {{3013, 0x2603}, + {"Grim Creeper (Legendary) (Lightcore)", Game::SwapForce, Element::Undead, Type::Skylander}}, + {{3014, 0x2000}, {"Rip Tide", Game::SwapForce, Element::Water, Type::Skylander}}, + {{3015, 0x2000}, {"Punk Shock", Game::SwapForce, Element::Water, Type::Skylander}}, + {{3400, 0x4100}, {"Fiesta", Game::Superchargers, Element::Undead, Type::Skylander}}, + {{3400, 0x4515}, {"Fiesta (Frightful)", Game::Superchargers, Element::Undead, Type::Skylander}}, + {{3401, 0x4100}, {"High Volt", Game::Superchargers, Element::Tech, Type::Skylander}}, + {{3402, 0x4100}, {"Splat", Game::Superchargers, Element::Magic, Type::Skylander}}, + {{3402, 0x4502}, {"Splat (Power Blue)", Game::Superchargers, Element::Magic, Type::Skylander}}, + {{3406, 0x4100}, {"Stormblade", Game::Superchargers, Element::Air, Type::Skylander}}, + {{3406, 0x4502}, {"Stormblade (Dark)", Game::Superchargers, Element::Air, Type::Skylander}}, + {{3406, 0x4503}, {"Stormblade (Dark)", Game::Superchargers, Element::Air, Type::Skylander}}, + {{3411, 0x4100}, {"Smash Hit", Game::Superchargers, Element::Earth, Type::Skylander}}, + {{3411, 0x4502}, + {"Smash Hit (Steel Plated)", Game::Superchargers, Element::Earth, Type::Skylander}}, + {{3412, 0x4100}, {"Spitfire", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3412, 0x4502}, {"Spitfire (Dark)", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3412, 0x450F}, {"Spitfire (Instant)", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3413, 0x4100}, {"Jet-Vac (Hurricane)", Game::Superchargers, Element::Air, Type::Skylander}}, + {{3413, 0x4503}, + {"Jet-Vac (Legendary Hurricane)", Game::Superchargers, Element::Air, Type::Skylander}}, + {{3414, 0x4100}, + {"Trigger Happy (Double Dare)", Game::Superchargers, Element::Tech, Type::Skylander}}, + {{3414, 0x4502}, + {"Trigger Happy (Power Blue)", Game::Superchargers, Element::Tech, Type::Skylander}}, + {{3415, 0x4100}, + {"Stealth Elf (Super Shot)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3415, 0x4502}, + {"Stealth Elf (Dark Super Shot)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3415, 0x450F}, + {"Stealth Elf (Instant)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3416, 0x4100}, + {"Terrafin (Shark Shooter)", Game::Superchargers, Element::Earth, Type::Skylander}}, + {{3417, 0x4100}, + {"Roller Brawl (Bone Bash)", Game::Superchargers, Element::Undead, Type::Skylander}}, + {{3417, 0x4503}, + {"Roller Brawl (Legendary Bone Bash)", Game::Superchargers, Element::Undead, Type::Skylander}}, + {{3420, 0x4100}, + {"Pop Fizz (Big Bubble)", Game::Superchargers, Element::Magic, Type::Skylander}}, + {{3420, 0x450E}, + {"Pop Fizz (Birthday Bash Big Bubble)", Game::Superchargers, Element::Magic, Type::Skylander}}, + {{3421, 0x4100}, {"Eruptor (Lava Lance)", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3422, 0x4100}, + {"Gill Grunt (Deep Dive)", Game::Superchargers, Element::Water, Type::Skylander}}, + {{3423, 0x4100}, + {"Donkey Kong (Turbo Charge)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3423, 0x4502}, + {"Donkey Kong (Dark Turbo Charge)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3424, 0x4100}, {"Bowser (Hammer Slam)", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3424, 0x4502}, + {"Bowser (Dark Hammer Slam)", Game::Superchargers, Element::Fire, Type::Skylander}}, + {{3425, 0x4100}, {"Dive-Clops", Game::Superchargers, Element::Water, Type::Skylander}}, + {{3425, 0x450E}, + {"Dive-Clops (Missile-Tow)", Game::Superchargers, Element::Water, Type::Skylander}}, + {{3425, 0x450F}, + {"Dive-Clops (Instant)", Game::Superchargers, Element::Water, Type::Skylander}}, + {{3426, 0x4100}, {"Astroblast", Game::Superchargers, Element::Tech, Type::Skylander}}, + {{3426, 0x4503}, + {"Astroblast (Legendary)", Game::Superchargers, Element::Light, Type::Skylander}}, + {{3427, 0x4100}, {"Nightfall", Game::Superchargers, Element::Dark, Type::Skylander}}, + {{3428, 0x4100}, {"Thrillipede", Game::Superchargers, Element::Life, Type::Skylander}}, + {{3428, 0x450D}, + {"Thrillipede (Eggcited)", Game::Superchargers, Element::Life, Type::Skylander}}, + {{200, 0x2000}, {"Anvil Rain", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{201, 0x2000}, {"Hidden Treasure", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{202, 0x2000}, {"Healing Elixer", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{203, 0x2000}, {"Ghost Pirate Swords", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{204, 0x2000}, {"Time Twister Hourglass", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{205, 0x2000}, {"Sky-Iron Shield", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{206, 0x2000}, {"Winged Boots", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{207, 0x2000}, {"Sparx Dragonfly", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{208, 0x1206}, {"Dragonfire Cannon", Game::Giants, Element::Other, Type::Item}}, + {{208, 0x1602}, {"Golden Dragonfire Cannon", Game::Giants, Element::Other, Type::Item}}, + {{209, 0x1206}, {"Scorpion Striker Catapult", Game::Giants, Element::Other, Type::Item}}, + {{230, 0x0000}, {"Hand Of Fate", Game::TrapTeam, Element::Other, Type::Item}}, + {{230, 0x3403}, {"Hand Of Fate (Legendary)", Game::TrapTeam, Element::Other, Type::Item}}, + {{231, 0x0000}, {"Piggy Bank", Game::TrapTeam, Element::Other, Type::Item}}, + {{232, 0x0000}, {"Rocket Ram", Game::TrapTeam, Element::Other, Type::Item}}, + {{233, 0x0000}, {"Tiki Speaky", Game::TrapTeam, Element::Other, Type::Item}}, + {{300, 0x0000}, {"Dragon's Peak", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{301, 0x2000}, {"Empire Of Ice", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{302, 0x2000}, {"Pirate Ship", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{303, 0x2000}, {"Darklight Crypt", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{304, 0x2000}, {"Volcanic Vault", Game::SpyrosAdv, Element::Other, Type::Item}}, + {{305, 0x3000}, {"Mirror Of Mystery", Game::TrapTeam, Element::Other, Type::Item}}, + {{306, 0x3000}, {"Nightmare Express", Game::TrapTeam, Element::Other, Type::Item}}, + {{307, 0x3206}, {"Sunscraper Spire", Game::TrapTeam, Element::Other, Type::Item}}, + {{308, 0x3206}, {"Midnight Museum", Game::TrapTeam, Element::Other, Type::Item}}, + {{3200, 0x2000}, {"Battle Hammer", Game::SwapForce, Element::Other, Type::Item}}, + {{3201, 0x2000}, {"Sky Diamond", Game::SwapForce, Element::Other, Type::Item}}, + {{3202, 0x2000}, {"Platinum Sheep", Game::SwapForce, Element::Other, Type::Item}}, + {{3203, 0x2000}, {"Groove Machine", Game::SwapForce, Element::Other, Type::Item}}, + {{3204, 0x2000}, {"Ufo Hat", Game::SwapForce, Element::Other, Type::Item}}, + {{3300, 0x2000}, {"Sheep Wreck Island", Game::SwapForce, Element::Other, Type::Item}}, + {{3301, 0x2000}, {"Tower Of Time", Game::SwapForce, Element::Other, Type::Item}}, + {{3302, 0x2206}, {"Fiery Forge", Game::SwapForce, Element::Other, Type::Item}}, + {{3303, 0x2206}, {"Arkeyan Crossbow", Game::SwapForce, Element::Other, Type::Item}}, + {{210, 0x3001}, {"Magic Log Holder", Game::TrapTeam, Element::Magic, Type::Trap}}, + {{210, 0x3008}, {"Magic Skull", Game::TrapTeam, Element::Magic, Type::Trap}}, + {{210, 0x300B}, {"Magic Axe", Game::TrapTeam, Element::Magic, Type::Trap}}, + {{210, 0x300E}, {"Magic Hourglass", Game::TrapTeam, Element::Magic, Type::Trap}}, + {{210, 0x3012}, {"Magic Totem", Game::TrapTeam, Element::Magic, Type::Trap}}, + {{210, 0x3015}, {"Magic Rocket", Game::TrapTeam, Element::Magic, Type::Trap}}, + {{211, 0x3001}, {"Water Tiki", Game::TrapTeam, Element::Water, Type::Trap}}, + {{211, 0x3002}, {"Water Log Holder", Game::TrapTeam, Element::Water, Type::Trap}}, + {{211, 0x3006}, {"Water Jughead", Game::TrapTeam, Element::Water, Type::Trap}}, + {{211, 0x3007}, {"Water Angel", Game::TrapTeam, Element::Water, Type::Trap}}, + {{211, 0x300B}, {"Water Axe", Game::TrapTeam, Element::Water, Type::Trap}}, + {{211, 0x3016}, {"Water Flying Helmet", Game::TrapTeam, Element::Water, Type::Trap}}, + {{211, 0x3406}, {"Water Jughead (Legendary)", Game::TrapTeam, Element::Water, Type::Trap}}, + {{212, 0x3003}, {"Air Toucan", Game::TrapTeam, Element::Air, Type::Trap}}, + {{212, 0x3006}, {"Air Jughead", Game::TrapTeam, Element::Air, Type::Trap}}, + {{212, 0x300E}, {"Air Hourglass", Game::TrapTeam, Element::Air, Type::Trap}}, + {{212, 0x3010}, {"Air Snake", Game::TrapTeam, Element::Air, Type::Trap}}, + {{212, 0x3011}, {"Air Screamer", Game::TrapTeam, Element::Air, Type::Trap}}, + {{212, 0x3018}, {"Air Sword", Game::TrapTeam, Element::Air, Type::Trap}}, + {{213, 0x3004}, {"Undead Orb", Game::TrapTeam, Element::Undead, Type::Trap}}, + {{213, 0x3008}, {"Undead Skull", Game::TrapTeam, Element::Undead, Type::Trap}}, + {{213, 0x300B}, {"Undead Axe", Game::TrapTeam, Element::Undead, Type::Trap}}, + {{213, 0x300C}, {"Undead Hand", Game::TrapTeam, Element::Undead, Type::Trap}}, + {{213, 0x3010}, {"Undead Snake", Game::TrapTeam, Element::Undead, Type::Trap}}, + {{213, 0x3017}, {"Undead Captain's Hat", Game::TrapTeam, Element::Undead, Type::Trap}}, + {{213, 0x3404}, {"Undead Orb (Legendary)", Game::TrapTeam, Element::Undead, Type::Trap}}, + {{213, 0x3408}, {"Undead Skull (Legendary)", Game::TrapTeam, Element::Undead, Type::Trap}}, + {{214, 0x3001}, {"Tech Tiki", Game::TrapTeam, Element::Tech, Type::Trap}}, + {{214, 0x3007}, {"Tech Angel", Game::TrapTeam, Element::Tech, Type::Trap}}, + {{214, 0x3009}, {"Tech Scepter", Game::TrapTeam, Element::Tech, Type::Trap}}, + {{214, 0x300C}, {"Tech Hand", Game::TrapTeam, Element::Tech, Type::Trap}}, + {{214, 0x3016}, {"Tech Flying Helmet", Game::TrapTeam, Element::Tech, Type::Trap}}, + {{214, 0x301A}, {"Tech Handstand", Game::TrapTeam, Element::Tech, Type::Trap}}, + {{215, 0x3001}, {"Fire Flower", Game::TrapTeam, Element::Fire, Type::Trap}}, + {{215, 0x3005}, {"Fire Torch", Game::TrapTeam, Element::Fire, Type::Trap}}, + {{215, 0x3009}, {"Fire Flower (NEW)", Game::TrapTeam, Element::Fire, Type::Trap}}, + {{215, 0x3011}, {"Fire Screamer", Game::TrapTeam, Element::Fire, Type::Trap}}, + {{215, 0x3012}, {"Fire Totem", Game::TrapTeam, Element::Fire, Type::Trap}}, + {{215, 0x3017}, {"Fire Captain's Hat", Game::TrapTeam, Element::Fire, Type::Trap}}, + {{215, 0x301B}, {"Fire Yawn", Game::TrapTeam, Element::Fire, Type::Trap}}, + {{216, 0x3003}, {"Earth Toucan", Game::TrapTeam, Element::Earth, Type::Trap}}, + {{216, 0x3004}, {"Earth Orb", Game::TrapTeam, Element::Earth, Type::Trap}}, + {{216, 0x300A}, {"Earth Hammer", Game::TrapTeam, Element::Earth, Type::Trap}}, + {{216, 0x300E}, {"Earth Hourglass", Game::TrapTeam, Element::Earth, Type::Trap}}, + {{216, 0x3012}, {"Earth Totem", Game::TrapTeam, Element::Earth, Type::Trap}}, + {{216, 0x301A}, {"Earth Handstand", Game::TrapTeam, Element::Earth, Type::Trap}}, + {{217, 0x3001}, {"Life Toucan", Game::TrapTeam, Element::Life, Type::Trap}}, + {{217, 0x3003}, {"Life Toucan (NEW)", Game::TrapTeam, Element::Life, Type::Trap}}, + {{217, 0x3005}, {"Life Torch", Game::TrapTeam, Element::Life, Type::Trap}}, + {{217, 0x300A}, {"Life Hammer", Game::TrapTeam, Element::Life, Type::Trap}}, + {{217, 0x3010}, {"Life Snake", Game::TrapTeam, Element::Life, Type::Trap}}, + {{217, 0x3018}, {"Life Sword", Game::TrapTeam, Element::Life, Type::Trap}}, + {{217, 0x301B}, {"Life Yawn", Game::TrapTeam, Element::Life, Type::Trap}}, + {{218, 0x3014}, {"Dark Spider", Game::TrapTeam, Element::Dark, Type::Trap}}, + {{218, 0x3018}, {"Dark Sword", Game::TrapTeam, Element::Dark, Type::Trap}}, + {{218, 0x301A}, {"Dark Handstand", Game::TrapTeam, Element::Dark, Type::Trap}}, + {{219, 0x300F}, {"Light Owl", Game::TrapTeam, Element::Light, Type::Trap}}, + {{219, 0x3015}, {"Light Rocket", Game::TrapTeam, Element::Light, Type::Trap}}, + {{219, 0x301B}, {"Light Yawn", Game::TrapTeam, Element::Light, Type::Trap}}, + {{220, 0x301E}, {"Kaos", Game::TrapTeam, Element::Other, Type::Trap}}, + {{220, 0x351F}, {"Kaos (Ultimate)", Game::TrapTeam, Element::Other, Type::Trap}}, + {{3500, 0x4000}, {"Sky Trophy", Game::Superchargers, Element::Air, Type::Trophy}}, + {{3500, 0x4403}, {"Sky Trophy (Legendary)", Game::Superchargers, Element::Air, Type::Trophy}}, + {{3501, 0x4000}, {"Land Trophy", Game::Superchargers, Element::Earth, Type::Trophy}}, + {{3502, 0x4000}, {"Sea Trophy", Game::Superchargers, Element::Water, Type::Trophy}}, + {{3503, 0x4000}, {"Kaos Trophy", Game::Superchargers, Element::Other, Type::Trophy}}, + {{3220, 0x4000}, {"Jet Stream", Game::Superchargers, Element::Air, Type::Vehicle}}, + {{3221, 0x4000}, {"Tomb Buggy", Game::Superchargers, Element::Undead, Type::Vehicle}}, + {{3222, 0x4000}, {"Reef Ripper", Game::Superchargers, Element::Water, Type::Vehicle}}, + {{3223, 0x4000}, {"Burn-Cycle", Game::Superchargers, Element::Fire, Type::Vehicle}}, + {{3224, 0x4000}, {"Hot Streak", Game::Superchargers, Element::Fire, Type::Vehicle}}, + {{3224, 0x4004}, {"Hot Streak (Mobile)", Game::Superchargers, Element::Fire, Type::Vehicle}}, + {{3224, 0x4402}, {"Hot Streak (Dark)", Game::Superchargers, Element::Fire, Type::Vehicle}}, + {{3224, 0x441E}, + {"Hot Streak (Golden) (E3)", Game::Superchargers, Element::Fire, Type::Vehicle}}, + {{3224, 0x450F}, {"Hot Streak (Instant)", Game::Superchargers, Element::Fire, Type::Vehicle}}, + {{3225, 0x4000}, {"Shark Tank", Game::Superchargers, Element::Earth, Type::Vehicle}}, + {{3226, 0x4000}, {"Thump Truck", Game::Superchargers, Element::Earth, Type::Vehicle}}, + {{3227, 0x4000}, {"Crypt Crusher", Game::Superchargers, Element::Undead, Type::Vehicle}}, + {{3228, 0x4000}, {"Stealth Stinger", Game::Superchargers, Element::Life, Type::Vehicle}}, + {{3228, 0x4402}, + {"Stealth Stinger (Nitro)", Game::Superchargers, Element::Life, Type::Vehicle}}, + {{3228, 0x450F}, + {"Stealth Stinger (Instant)", Game::Superchargers, Element::Life, Type::Vehicle}}, + {{3231, 0x4000}, {"Dive Bomber", Game::Superchargers, Element::Water, Type::Vehicle}}, + {{3231, 0x4402}, + {"Dive Bomber (Spring Ahead)", Game::Superchargers, Element::Water, Type::Vehicle}}, + {{3231, 0x450F}, {"Dive Bomber (Instant)", Game::Superchargers, Element::Water, Type::Vehicle}}, + {{3232, 0x4000}, {"Sky Slicer", Game::Superchargers, Element::Air, Type::Vehicle}}, + {{3233, 0x4000}, {"Clown Cruiser", Game::Superchargers, Element::Air, Type::Vehicle}}, + {{3233, 0x4402}, {"Clown Cruiser (Dark)", Game::Superchargers, Element::Air, Type::Vehicle}}, + {{3234, 0x4000}, {"Gold Rusher", Game::Superchargers, Element::Tech, Type::Vehicle}}, + {{3234, 0x4402}, + {"Gold Rusher (Power Blue)", Game::Superchargers, Element::Tech, Type::Vehicle}}, + {{3235, 0x4000}, {"Shield Striker", Game::Superchargers, Element::Tech, Type::Vehicle}}, + {{3236, 0x4000}, {"Sun Runner", Game::Superchargers, Element::Light, Type::Vehicle}}, + {{3236, 0x4403}, + {"Sun Runner (Legendary)", Game::Superchargers, Element::Light, Type::Vehicle}}, + {{3237, 0x4000}, {"Sea Shadow", Game::Superchargers, Element::Dark, Type::Vehicle}}, + {{3237, 0x4402}, {"Sea Shadow (Dark)", Game::Superchargers, Element::Dark, Type::Vehicle}}, + {{3238, 0x4000}, {"Splatter Splasher", Game::Superchargers, Element::Magic, Type::Vehicle}}, + {{3238, 0x4402}, + {"Splatter Splasher (Power Blue)", Game::Superchargers, Element::Magic, Type::Vehicle}}, + {{3239, 0x4000}, {"Soda Skimmer", Game::Superchargers, Element::Magic, Type::Vehicle}}, + {{3239, 0x4402}, {"Soda Skimmer (Nitro)", Game::Superchargers, Element::Magic, Type::Vehicle}}, + {{3240, 0x4000}, {"Barrel Blaster", Game::Superchargers, Element::Tech, Type::Vehicle}}, + {{3240, 0x4402}, {"Barrel Blaster (Dark)", Game::Superchargers, Element::Tech, Type::Vehicle}}, + {{3241, 0x4000}, {"Buzz Wing", Game::Superchargers, Element::Life, Type::Vehicle}}, +}; SkylanderUSB::SkylanderUSB(EmulationKernel& ios, const std::string& device_name) : m_ios(ios) { diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylander.h b/Source/Core/Core/IOS/USB/Emulated/Skylander.h index a66116cc32..d21f30d478 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylander.h +++ b/Source/Core/Core/IOS/USB/Emulated/Skylander.h @@ -16,6 +16,9 @@ // The status array is 32 bits and every character takes 2 bits. // 32/2 = 16 constexpr u8 MAX_SKYLANDERS = 16; +constexpr u8 NUM_SKYLANDER_GAMES = 5; +constexpr u8 NUM_SKYLANDER_TYPES = 10; +constexpr u8 NUM_SKYLANDER_ELEMENTS = 11; namespace IOS::HLE::USB { @@ -25,12 +28,24 @@ enum class Game Giants, SwapForce, TrapTeam, - Superchargers, - Other, + Superchargers +}; +enum class Type +{ + Skylander = 1, + Giant, + Swapper, + TrapMaster, + Mini, + Item, + Trophy, + Vehicle, + Trap, + Unknown }; enum class Element { - Magic, + Magic = 1, Fire, Air, Life, @@ -38,14 +53,17 @@ enum class Element Earth, Water, Tech, + Dark, + Light, Other }; struct SkyData { const char* name = ""; - Game game = Game::Other; + Game game = Game::SpyrosAdv; Element element = Element::Other; + Type type = Type::Unknown; }; extern const std::map<const std::pair<const u16, const u16>, SkyData> list_skylanders; diff --git a/Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.cpp b/Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.cpp index 2ef2d43edb..654be376d4 100644 --- a/Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.cpp +++ b/Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.cpp @@ -103,6 +103,11 @@ void SkylanderPortalWindow::CreateMainWindow() auto* select_layout = new QHBoxLayout; + setMinimumWidth(770); + + // yes, that +1 on 755 is needed to avoid scroll bars on the element selection + setMinimumHeight(756); + // left and right widgets within window separated into own functions for readability select_layout->addLayout(CreateSlotLayout()); select_layout->addLayout(CreateFinderLayout()); @@ -262,25 +267,25 @@ QVBoxLayout* SkylanderPortalWindow::CreateFinderLayout() } // i18n: Figures for the game Skylanders: Spyro's Adventure. The game has the same title in all // countries it was released in, except Japan, where it's named スカイランダーズ スパイロの大冒険. - m_game_filters[GetGameID(IOS::HLE::USB::Game::SpyrosAdv)]->setText(tr("Spyro's Adventure")); + m_game_filters[GetGameID(Game::SpyrosAdv)]->setText(tr("Spyro's Adventure")); // i18n: Figures for the game Skylanders: Giants. The game has the same title in all countries // it was released in. It was not released in Japan. - m_game_filters[GetGameID(IOS::HLE::USB::Game::Giants)]->setText(tr("Giants")); + m_game_filters[GetGameID(Game::Giants)]->setText(tr("Giants")); // i18n: Figures for the game Skylanders: Swap Force. The game has the same title in all countries // it was released in. It was not released in Japan. - m_game_filters[GetGameID(IOS::HLE::USB::Game::SwapForce)]->setText(tr("Swap Force")); + m_game_filters[GetGameID(Game::SwapForce)]->setText(tr("Swap Force")); // i18n: Figures for the game Skylanders: Trap Team. The game has the same title in all countries // it was released in. It was not released in Japan. - m_game_filters[GetGameID(IOS::HLE::USB::Game::TrapTeam)]->setText(tr("Trap Team")); + m_game_filters[GetGameID(Game::TrapTeam)]->setText(tr("Trap Team")); // i18n: Figures for the games Skylanders: SuperChargers (not available for the Wii) and // Skylanders: SuperChargers Racing (available for the Wii). The games have the same titles in // all countries they were released in. They were not released in Japan. - m_game_filters[GetGameID(IOS::HLE::USB::Game::Superchargers)]->setText(tr("SuperChargers")); + m_game_filters[GetGameID(Game::Superchargers)]->setText(tr("SuperChargers")); search_checkbox_group->setLayout(search_checkbox_layout); search_checkbox_scroll_area->setWidget(search_checkbox_group); search_game_layout->addWidget(search_checkbox_scroll_area); search_game_group->setLayout(search_game_layout); - search_game_group->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); + search_game_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); search_filters_layout->addWidget(search_game_group); // WIDGET: Filter by Element @@ -297,63 +302,139 @@ QVBoxLayout* SkylanderPortalWindow::CreateFinderLayout() auto* search_radio_layout = new QHBoxLayout(); auto* radio_layout_left = new QVBoxLayout(); - for (int i = 0; i < 10; i += 2) - { - QRadioButton* radio = new QRadioButton(this); - radio->setProperty("id", i); - connect(radio, &QRadioButton::toggled, this, &SkylanderPortalWindow::RefreshList); - m_element_filter[i] = radio; - radio_layout_left->addWidget(radio); - } - search_radio_layout->addLayout(radio_layout_left); - auto* radio_layout_right = new QVBoxLayout(); - for (int i = 1; i < 10; i += 2) + for (int i = 0; i < NUM_SKYLANDER_ELEMENTS_RADIO; i++) { QRadioButton* radio = new QRadioButton(this); radio->setProperty("id", i); + if (i == 0) + { + radio->setChecked(true); + } connect(radio, &QRadioButton::toggled, this, &SkylanderPortalWindow::RefreshList); m_element_filter[i] = radio; - radio_layout_right->addWidget(radio); + + if (i % 2 == 0) + { + radio_layout_left->addWidget(radio); + } + else + { + radio_layout_right->addWidget(radio); + } } + search_radio_layout->addLayout(radio_layout_left); + search_radio_layout->setDirection(QBoxLayout::Direction::LeftToRight); + search_radio_layout->addSpacing(35); search_radio_layout->addLayout(radio_layout_right); m_element_filter[0]->setText(tr("All")); m_element_filter[0]->setChecked(true); // i18n: One of the elements in the Skylanders games. Japanese: まほう. For official translations // in other languages, check the SuperChargers manual at https://support.activision.com/manuals - m_element_filter[1]->setText(tr("Magic")); + m_element_filter[GetElementID(Element::Magic)]->setText(tr("Magic")); // i18n: One of the elements in the Skylanders games. Japanese: 水. For official translations // in other languages, check the SuperChargers manual at https://support.activision.com/manuals - m_element_filter[2]->setText(tr("Water")); + m_element_filter[GetElementID(Element::Water)]->setText(tr("Water")); // i18n: One of the elements in the Skylanders games. Japanese: マシン. For official translations // in other languages, check the SuperChargers manual at https://support.activision.com/manuals - m_element_filter[3]->setText(tr("Tech")); + m_element_filter[GetElementID(Element::Tech)]->setText(tr("Tech")); // i18n: One of the elements in the Skylanders games. Japanese: 火. For official translations // in other languages, check the SuperChargers manual at https://support.activision.com/manuals - m_element_filter[4]->setText(tr("Fire")); + m_element_filter[GetElementID(Element::Fire)]->setText(tr("Fire")); // i18n: One of the elements in the Skylanders games. Japanese: 土. For official translations // in other languages, check the SuperChargers manual at https://support.activision.com/manuals - m_element_filter[5]->setText(tr("Earth")); + m_element_filter[GetElementID(Element::Earth)]->setText(tr("Earth")); // i18n: One of the elements in the Skylanders games. Japanese: ライフ. For official translations // in other languages, check the SuperChargers manual at https://support.activision.com/manuals - m_element_filter[6]->setText(tr("Life")); + m_element_filter[GetElementID(Element::Life)]->setText(tr("Life")); // i18n: One of the elements in the Skylanders games. Japanese: 風. For official translations // in other languages, check the SuperChargers manual at https://support.activision.com/manuals - m_element_filter[7]->setText(tr("Air")); + m_element_filter[GetElementID(Element::Air)]->setText(tr("Air")); // i18n: One of the elements in the Skylanders games. Japanese: アンデッド. For official // translations in other languages, check the SuperChargers manual at // https://support.activision.com/manuals - m_element_filter[8]->setText(tr("Undead")); - m_element_filter[9]->setText(tr("Other")); + m_element_filter[GetElementID(Element::Undead)]->setText(tr("Undead")); + // i18n: One of the elements in the Skylanders games. For official translations + // in other languages, check the SuperChargers manual at https://support.activision.com/manuals + m_element_filter[GetElementID(Element::Dark)]->setText(tr("Dark")); + // i18n: One of the elements in the Skylanders games. For official translations + // in other languages, check the SuperChargers manual at https://support.activision.com/manuals + m_element_filter[GetElementID(Element::Light)]->setText(tr("Light")); + m_element_filter[GetElementID(Element::Other)]->setText(tr("Other")); search_radio_group->setLayout(search_radio_layout); search_radio_scroll_area->setWidget(search_radio_group); search_element_layout->addWidget(search_radio_scroll_area); + search_radio_scroll_area->setAlignment(Qt::AlignHCenter); search_element_group->setLayout(search_element_layout); - search_element_group->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); + search_element_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); search_filters_layout->addWidget(search_element_group); + // Widget: Filter by Type + auto* search_type_group = new QGroupBox(tr("Figure type")); + auto* search_type_layout = new QVBoxLayout(); + auto* search_type_radio_scroll_area = new QScrollArea(); + search_type_radio_scroll_area->setContentsMargins(0, 0, 0, 0); + search_type_radio_scroll_area->setFrameStyle(QFrame::NoFrame); + auto* search_type_radio_group = new QFrame(); + search_type_radio_group->setContentsMargins(0, 0, 0, 0); + auto* search_type_radio_layout = new QHBoxLayout(); + + auto* radio_type_layout_left = new QVBoxLayout(); + auto* radio_type_layout_right = new QVBoxLayout(); + for (int i = 0; i < NUM_SKYLANDER_TYPES; i++) + { + QRadioButton* radio = new QRadioButton(this); + radio->setProperty("id", i); + if (i == 0) + { + radio->setChecked(true); + } + connect(radio, &QRadioButton::toggled, this, &SkylanderPortalWindow::RefreshList); + m_type_filter[i] = radio; + + if (i % 2 == 0) + { + radio_type_layout_left->addWidget(radio); + } + else + { + radio_type_layout_right->addWidget(radio); + } + } + search_type_radio_layout->addLayout(radio_type_layout_left); + search_type_radio_layout->addLayout(radio_type_layout_right); + + m_type_filter[0]->setText(tr("All")); + // i18n: One of the figure types in the Skylanders games. + m_type_filter[GetTypeID(Type::Skylander)]->setText(tr("Skylander")); + // i18n: One of the figure types in the Skylanders games. + m_type_filter[GetTypeID(Type::Giant)]->setText(tr("Giant")); + // i18n: One of the figure types in the Skylanders games. + m_type_filter[GetTypeID(Type::Swapper)]->setText(tr("Swapper")); + // i18n: One of the figure types in the Skylanders games. + m_type_filter[GetTypeID(Type::TrapMaster)]->setText(tr("Trap Master")); + // i18n: One of the figure types in the Skylanders games. + m_type_filter[GetTypeID(Type::Mini)]->setText(tr("Mini")); + // i18n: One of the figure types in the Skylanders games. + m_type_filter[GetTypeID(Type::Item)]->setText(tr("Item")); + // i18n: One of the figure types in the Skylanders games. + m_type_filter[GetTypeID(Type::Trophy)]->setText(tr("Trophy")); + // i18n: One of the figure types in the Skylanders games. For official translations + // in other languages, check the SuperChargers manual at https://support.activision.com/manuals + m_type_filter[GetTypeID(Type::Vehicle)]->setText(tr("Vehicle")); + // i18n: One of the figure types in the Skylanders games. + m_type_filter[GetTypeID(Type::Trap)]->setText(tr("Trap")); + + search_type_radio_group->setLayout(search_type_radio_layout); + search_type_radio_scroll_area->setWidget(search_type_radio_group); + search_type_radio_scroll_area->setAlignment(Qt::AlignHCenter); + search_type_layout->addWidget(search_type_radio_scroll_area); + search_type_group->setLayout(search_type_layout); + search_type_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + search_filters_layout->addWidget(search_type_group); + // Widget: Other Filters auto* other_box = new QGroupBox(tr("Other")); auto* other_layout = new QVBoxLayout; @@ -790,30 +871,12 @@ bool SkylanderPortalWindow::PassesFilter(QString name, u16 id, u16 var) bool pass = false; // Check against active game filters - if (m_game_filters[GetGameID(IOS::HLE::USB::Game::SpyrosAdv)]->isChecked()) - { - if (character.game == IOS::HLE::USB::Game::SpyrosAdv) - pass = true; - } - if (m_game_filters[GetGameID(IOS::HLE::USB::Game::Giants)]->isChecked()) - { - if (character.game == IOS::HLE::USB::Game::Giants) - pass = true; - } - if (m_game_filters[GetGameID(IOS::HLE::USB::Game::SwapForce)]->isChecked()) + for (size_t i = 0; i < NUM_SKYLANDER_GAMES; i++) { - if (character.game == IOS::HLE::USB::Game::SwapForce) - pass = true; - } - if (m_game_filters[GetGameID(IOS::HLE::USB::Game::TrapTeam)]->isChecked()) - { - if (character.game == IOS::HLE::USB::Game::TrapTeam) - pass = true; - } - if (m_game_filters[GetGameID(IOS::HLE::USB::Game::Superchargers)]->isChecked()) - { - if (character.game == IOS::HLE::USB::Game::Superchargers) + if (m_game_filters[i]->isChecked() && character.game == (Game)i) + { pass = true; + } } if (!pass) return false; @@ -823,45 +886,12 @@ bool SkylanderPortalWindow::PassesFilter(QString name, u16 id, u16 var) return false; // Check against active element filter - switch (GetElementRadio()) - { - case 1: - if (character.element != IOS::HLE::USB::Element::Magic) - return false; - break; - case 2: - if (character.element != IOS::HLE::USB::Element::Water) - return false; - break; - case 3: - if (character.element != IOS::HLE::USB::Element::Tech) - return false; - break; - case 4: - if (character.element != IOS::HLE::USB::Element::Fire) - return false; - break; - case 5: - if (character.element != IOS::HLE::USB::Element::Earth) - return false; - break; - case 6: - if (character.element != IOS::HLE::USB::Element::Life) - return false; - break; - case 7: - if (character.element != IOS::HLE::USB::Element::Air) - return false; - break; - case 8: - if (character.element != IOS::HLE::USB::Element::Undead) - return false; - break; - case 9: - if (character.element != IOS::HLE::USB::Element::Other) - return false; - break; - } + if ((Element)GetElementRadio() != character.element && GetElementRadio() != 0) + return false; + + // Check against active type filter + if ((Type)GetTypeRadio() != character.type && GetTypeRadio() != 0) + return false; return true; } @@ -915,6 +945,18 @@ int SkylanderPortalWindow::GetElementRadio() return -1; } +int SkylanderPortalWindow::GetTypeRadio() +{ + for (auto radio : m_type_filter) + { + if (radio->isChecked()) + { + return radio->property("id").toInt(); + } + } + return -1; +} + QBrush SkylanderPortalWindow::GetBaseColor(std::pair<const u16, const u16> ids, bool dark_theme) { auto skylander = IOS::HLE::USB::list_skylanders.find(ids); @@ -924,76 +966,32 @@ QBrush SkylanderPortalWindow::GetBaseColor(std::pair<const u16, const u16> ids, switch ((*skylander).second.game) { - case IOS::HLE::USB::Game::SpyrosAdv: + case Game::SpyrosAdv: return QBrush(dark_theme ? QColor(10, 42, 90) : QColor(240, 255, 240)); - case IOS::HLE::USB::Game::Giants: + case Game::Giants: return QBrush(dark_theme ? QColor(120, 16, 12) : QColor(255, 240, 215)); - case IOS::HLE::USB::Game::SwapForce: + case Game::SwapForce: return QBrush(dark_theme ? QColor(28, 45, 12) : QColor(240, 245, 255)); - case IOS::HLE::USB::Game::TrapTeam: + case Game::TrapTeam: return QBrush(dark_theme ? QColor(0, 56, 76) : QColor(255, 240, 240)); - case IOS::HLE::USB::Game::Superchargers: + case Game::Superchargers: return QBrush(dark_theme ? QColor(90, 12, 12) : QColor(247, 228, 215)); default: return QBrush(dark_theme ? QColor(32, 32, 32) : QColor(255, 255, 255)); } } -int SkylanderPortalWindow::GetGameID(IOS::HLE::USB::Game game) +int SkylanderPortalWindow::GetGameID(Game game) { - switch (game) - { - case IOS::HLE::USB::Game::SpyrosAdv: - return 0; - - case IOS::HLE::USB::Game::Giants: - return 1; - - case IOS::HLE::USB::Game::SwapForce: - return 2; - - case IOS::HLE::USB::Game::TrapTeam: - return 3; - - case IOS::HLE::USB::Game::Superchargers: - return 4; - - case IOS::HLE::USB::Game::Other: - return 5; - } - return -1; + return (int)game; } -int SkylanderPortalWindow::GetElementID(IOS::HLE::USB::Element elem) +int SkylanderPortalWindow::GetElementID(Element elem) { - switch (elem) - { - case IOS::HLE::USB::Element::Magic: - return 0; - - case IOS::HLE::USB::Element::Fire: - return 1; - - case IOS::HLE::USB::Element::Air: - return 2; - - case IOS::HLE::USB::Element::Life: - return 3; - - case IOS::HLE::USB::Element::Undead: - return 4; - - case IOS::HLE::USB::Element::Earth: - return 5; - - case IOS::HLE::USB::Element::Water: - return 6; - - case IOS::HLE::USB::Element::Tech: - return 7; + return (int)elem; +} - case IOS::HLE::USB::Element::Other: - return 8; - } - return -1; +int SkylanderPortalWindow::GetTypeID(Type type) +{ + return (int)type; } diff --git a/Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.h b/Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.h index 293b056199..ce67dbff7e 100644 --- a/Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.h +++ b/Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.h @@ -23,6 +23,12 @@ class QPushButton; class QRadioButton; class QListWidget; +using Element = IOS::HLE::USB::Element; +using Game = IOS::HLE::USB::Game; +using Type = IOS::HLE::USB::Type; + +constexpr u8 NUM_SKYLANDER_ELEMENTS_RADIO = NUM_SKYLANDER_ELEMENTS + 1; + struct Skylander { u8 portal_slot; @@ -72,15 +78,17 @@ private: QString GetFilePath(u16 id, u16 var); u8 GetCurrentSlot(); int GetElementRadio(); + int GetTypeRadio(); QBrush GetBaseColor(std::pair<const u16, const u16> ids, bool dark_theme); - int GetGameID(IOS::HLE::USB::Game game); - int GetElementID(IOS::HLE::USB::Element elem); + int GetGameID(Game game); + int GetElementID(Element elem); + int GetTypeID(Type type); bool m_emulating; QCheckBox* m_enabled_checkbox; QFrame* m_group_skylanders; QFrame* m_command_buttons; - std::array<QRadioButton*, 16> m_slot_radios; + std::array<QRadioButton*, MAX_SKYLANDERS> m_slot_radios; // Qt is not guaranteed to keep track of file paths using native file pickers, so we use this // variable to ensure we open at the most recent Skylander file location @@ -90,8 +98,9 @@ private: QLineEdit* m_path_edit; QPushButton* m_path_select; - std::array<QCheckBox*, 5> m_game_filters; - std::array<QRadioButton*, 10> m_element_filter; + std::array<QCheckBox*, NUM_SKYLANDER_GAMES> m_game_filters; + std::array<QRadioButton*, NUM_SKYLANDER_ELEMENTS_RADIO> m_element_filter; + std::array<QRadioButton*, NUM_SKYLANDER_TYPES> m_type_filter; QCheckBox* m_only_show_collection; QLineEdit* m_sky_search; QListWidget* m_skylander_list; |