Merge pull request #44 from micolous/master

[proxmark3-svn] / client / lualibs / default_toys.lua

diff --git a/client/lualibs/default_toys.lua b/client/lualibs/default_toys.lua
index 5a680a200be5d5757ef440368917498d0d698c87..23e663568d15d2fcb4e7fd885833239adb945a6a 100644 (file)
--- a/client/lualibs/default_toys.lua
+++ b/client/lualibs/default_toys.lua
@@ -329,6 +329,104 @@ local _names = {
 {"3014", "c60b", "0030", "water", "SWAPFORCE", "Rip Tide"},
 {"3015", "c70b", "0030", "water", "SWAPFORCE", "Punk Shock"},
 
 {"3014", "c60b", "0030", "water", "SWAPFORCE", "Rip Tide"},
 {"3015", "c70b", "0030", "water", "SWAPFORCE", "Punk Shock"},
 

+-- superchargers, from @rmaisonneuve, thanks!
+{"3000", "630d", "0041", "DARK", "NIGHTFALL"},
+{"3001", "990c", "0040", "EARTH", "LAND~SHARK~TANK"},
+{"3002", "9a0c", "0040", "EARTH", "LAND~THUMP~TRUCK"},
+{"3003", "580d", "0041", "EARTH", "SHARK~SHOOTER~TERRAFIN"},
+{"3004", "530d", "0041", "EARTH", "SMASH~HIT"},
+{"3005", "530d", "0245", "EARTH", "STEEL~PLATED~SMASH~HIT"},
+{"3006", "970c", "0040", "FIRE", "BURN~CYCLE"},
+{"3007", "600d", "0245", "FIRE", "DARK~HAMMER~SLAM~BOWSER"},
+{"3008", "980c", "0244", "FIRE", "DARK~HOT~STREAK"},
+{"3009", "540d", "0245", "FIRE", "DARK~SPITFIRE"},
+{"3010", "600d", "0041", "FIRE", "HAMMER~SLAM~BOWSER"},
+{"3011", "980c", "0040", "FIRE", "HOT~STREAK"},
+{"3012", "980c", "0440", "FIRE", "HOT~STREAK(E3)"},
+{"3013", "980c", "1e44", "FIRE", "GOLDEN~HOT~STREAK"},
+{"3014", "5d0d", "0041", "FIRE", "LAVA~LANCE~ERUPTOR"},
+{"3015", "540d", "0041", "FIRE", "SPITFIRE"},
+{"3016", "5c0d", "0041", "MAGIC", "BIG~BUBBLE~POP~FIZZ"},
+{"3017", "5c0d", "0e45", "MAGIC", "BIRTHDAY~BASH~BIG~BUBBLE~POP~FIZZ"},
+{"3018", "4a0d", "0245", "MAGIC", "POWER~BLUE~SPLAT"},
+{"3019", "a70c", "0244", "MAGIC", "VARIANT~NITRO~SODA~SKIMMER"},
+{"3020", "a70c", "0040", "MAGIC", "SEA~SODA~SKIMMER"},
+{"3021", "4a0d", "0041", "MAGIC", "SPLAT"},
+{"3022", "af0d", "0040", "KAOS", "TROPHY"},
+{"3023", "ad0d", "0040", "LAND", "TROPHY"},
+{"3024", "570d", "0245", "LIFE", "DARK~SUPER~SHOT~STEALTH~ELF"},
+{"3025", "5f0d", "0245", "LIFE", "DARK~TURBO~CHARGE~DONKEY~KONG"},
+{"3026", "640d", "0d45", "LIFE", "EGGCITED~THRILLIPEDE"},
+{"3027", "9c0c", "0244", "LIFE", "SKY~NITRO~STEALTH~STINGER"},
+{"3028", "9c0c", "0040", "LIFE", "STEALTH~STINGER"},
+{"3029", "570d", "0041", "LIFE", "SUPER~SHOT~STEALTH~ELF"},
+{"3030", "640d", "0041", "LIFE", "THRILLIPEDE"},
+{"3031", "5f0d", "0041", "LIFE", "TURBO~CHARGE~DONKEY~KONG"},
+{"3032", "a40c", "0344", "LIGHT", "AIR~LEGENDARY~SUN~RUNNER"},
+{"3033", "620d", "0041", "LIGHT", "ASTROBLAST"},
+{"3034", "620d", "0345", "LIGHT", "LEGENDARY~ASTROBLAST"},
+{"3035", "a40c", "0040", "LIGHT", "SUN~RUNNER"},
+{"3036", "ae0d", "0040", "SEA", "TROPHY"},
+{"3037", "ac0d", "0040", "SKY", "TROPHY"},
+{"3038", "a80c", "0040", "TECH", "BARREL~BLASTER"},
+{"3039", "a80c", "0244", "TECH", "DARK~BARREL~BLASTER"},
+{"3040", "560d", "0041", "TECH", "DOUBLE~DARE~TRIGGER~HAPPY"},
+{"3041", "a20c", "0040", "TECH", "GOLD~RUSHER"},
+{"3042", "a20c", "0244", "TECH", "POWER~BLUE~GOLD~RUSHER"},
+{"3043", "490d", "0041", "TECH", "HIGH VOLT"},
+{"3044", "a20c", "0244", "TECH", "LAND~POWER~BLUE~GOLD~RUSHER"},
+{"3045", "a30c", "0040", "TECH", "LAND~SHIELD~STRIKER"},
+{"3046", "560d", "0245", "TECH", "POWER~BLUE~TRIGGER~HAPPY"},
+{"3047", "9b0c", "0040", "UNDEAD", "CRYPT~CRUSHER"},
+{"3048", "480d", "0041", "UNDEAD", "FIESTA"},
+{"3049", "480d", "1545", "UNDEAD", "FRIGHTFUL~FIESTA(Halloween Special)"},
+{"3050", "590d", "0041", "UNDEAD", "ROLLER~BRAWL"},
+{"3051", "590d", "0345", "UNDEAD", "VARIANT~LEGENDARY~ROLLER~BRAWL"},
+{"3052", "950c", "0000", "UNDEAD", "VEHICLE~TOMB~BUGGY"},
+{"3053", "a50c", "0244", "WATER", "DARK~SEA~SHADOW"},
+{"3054", "5e0d", "0041", "WATER", "DEEP~DIVE~GILL~GRUNT"},
+{"3055", "9f0c", "0040", "WATER", "DIVE~BOMBER"},
+{"3056", "610d", "0041", "WATER", "DIVE~CLOPS"},
+{"3057", "610d", "0e45", "WATER", "MISSILE~TOW~DIVE~CLOPS"},
+{"3058", "960c", "0040", "WATER", "SEA~REEF~RIPPER"},
+{"3059", "a50c", "0040", "WATER", "SEA~SHADOW"},
+{"3060", "9f0c", "0244", "WATER", "SPECIAL~VEHICLE~DIVE~BOMBER"},
+{"3061", "a60c", "0040", "WATER", "SPLATTER~SPLASHER"},
+{"3062", "a60c", "0244", "WATER", "POWER~BLUE~SPLATTER~SPLASHER"},
+
+--All 16 Swap Force Characters
+{"2000", "d007", "0020", "air", "SWAPFORCE", "Boom"},
+{"1000", "e803", "0020", "air", "SWAPFORCE", "Jet (Rocket)"},
+{"2001", "d107", "0020", "air", "SWAPFORCE", "Free"},
+{"1001", "e903", "0020", "air", "SWAPFORCE", "Ranger (Spin)"},
+{"2002", "d207", "0020", "earth", "SWAPFORCE", "Rubble"},
+{"1002", "ea03", "0020", "earth", "SWAPFORCE", "Rouser (Dig)"},
+{"2003", "d307", "0020", "earth", "SWAPFORCE", "Doom"},
+{"1003", "eb03", "0020", "earth", "SWAPFORCE", "Stone (Spin)"},
+{"2004", "d407", "0020", "fire", "SWAPFORCE", "Blast"},
+{"1004", "ec03", "0020", "fire", "SWAPFORCE", "Zone (Rocket)"},
+{"2005", "d507", "0020", "fire", "SWAPFORCE", "Fire"},
+{"1005", "ed03", "0020", "fire", "SWAPFORCE", "Kraken (Bounce)"},
+{"2006", "d607", "0020", "life", "SWAPFORCE", "Stink"},
+{"1006", "ee03", "0020", "life", "SWAPFORCE", "Bomb (Sneak)"},
+{"2007", "d707", "0020", "life", "SWAPFORCE", "Grilla"},
+{"1007", "ef03", "0020", "life", "SWAPFORCE", "Drilla (Dig)"},
+{"2008", "d807", "0020", "magic", "SWAPFORCE", "Hoot"},
+{"1008", "f003", "0020", "magic", "SWAPFORCE", "Loop (Teleport)"},
+{"2009", "d907", "0020", "magic", "SWAPFORCE", "Trap"},
+{"1009", "f103", "0020", "magic", "SWAPFORCE", "Shadow (Sneak)"},
+{"2010", "da07", "0020", "tech", "SWAPFORCE", "Magna"},
+{"1010", "f203", "0020", "tech", "SWAPFORCE", "Charge (Speed)"},
+{"2011", "db07", "0020", "tech", "SWAPFORCE", "Spy"},
+{"1011", "f303", "0020", "tech", "SWAPFORCE", "Rise (Climb)"},
+{"2012", "dc07", "0020", "undead", "SWAPFORCE", "Night"},
+{"1012", "f403", "0020", "undead", "SWAPFORCE", "Shift (Teleport)"},
+{"2013", "dd07", "0020", "undead", "SWAPFORCE", "Rattle"},
+{"1013", "f503", "0020", "undead", "SWAPFORCE", "Shake (Bounce)"},
+{"2014", "de07", "0020", "water", "SWAPFORCE", "Freeze"},
+{"1014", "f603", "0020", "water", "SWAPFORCE", "Blade (Speed)"},
+{"2015", "df07", "0020", "water", "SWAPFORCE", "Wash"},
+{"1015", "f703", "0020", "water", "SWAPFORCE", "Buckler (Climb)"},

 --{"", "", "0030", "water", "SWAPFORCE", "Hoot Loop"},
 --{"", "", "0030", "water", "SWAPFORCE", "Trap Shadow"},
 --{"", "", "0030", "water", "SWAPFORCE", "Wash Buckler"},
 --{"", "", "0030", "water", "SWAPFORCE", "Hoot Loop"},
 --{"", "", "0030", "water", "SWAPFORCE", "Trap Shadow"},
 --{"", "", "0030", "water", "SWAPFORCE", "Wash Buckler"},


@@ -363,7 +461,15 @@ local function find( main, sub)
        end
        return nil
 end
        end
        return nil
 end

+local function list()
+       print ("Type\tSub\tElement\tGame            Name")
+       print (string.rep('=', 54))
+    for k, v in pairs(_names) do
+               print(("%s\t%s\t%s\t%-9s\t%s"):format(v[2],v[3],v[4], v[5], v[6] ))
+       end 
+end

 
 return {
        Find = find,
 
 return {
        Find = find,

+       List = list,

 }
 }