X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/411105e03629542fad02902e18248288812a6f87..3e750be37cd8e3231ae02260be6899391d206cb4:/client/lualibs/default_toys.lua?ds=sidebyside diff --git a/client/lualibs/default_toys.lua b/client/lualibs/default_toys.lua index 64eed9b3..23e66356 100644 --- a/client/lualibs/default_toys.lua +++ b/client/lualibs/default_toys.lua @@ -24,6 +24,7 @@ local _names = { {"13", "0d00", "0030", "water", "regular", "Wham Shell"}, {"14", "0e00", "0030", "water", "regular", "Gill Grunt"}, --{"14", "0e00", "0030", "water", "regular", "Elite Gill Grunt"}, +--{"14", "0e00", "0030", "water", "regular", "Tidal Wave Gill Grunt"}, {"15", "0f00", "0030", "water", "regular", "Slam Bam"}, --{"15", "0f00", "0030", "water", "regular", "Surfer Slam Bam"}, {"16", "1000", "0030", "magic", "regular", "Spyro"}, @@ -43,8 +44,10 @@ local _names = { {"25", "1900", "0030", "life", "regular", "Zook"}, {"26", "1a00", "0030", "life", "regular", "Stealth Elf"}, --{"26", "1a00", "0030", "life", "regular", "Elite Stealth Elf"}, ---{"26", "1a00", "0030", "life", "regular", "Dark Stealth Elf"}, +--{"26", "1a00", "0528", "life", "regular", "Dark Stealth Elf"}, +{"26", "1a00", "0528", "life", "swapforce", "Ninja Stealth Elf"}, {"27", "1b00", "0030", "life", "regular", "Stump Smash"}, +{"27", "1b00", "0118", "life", "regular", "Stump Smash"}, --{"27", "1b00", "0030", "life", "regular", "Autumn Stump Smash"}, {"28", "1c00", "0030", "magic", "regular", "Dark Spyro"}, --{"28", "1c00", "0030", "magic", "regular", "Elite Spyro"}, @@ -58,6 +61,7 @@ local _names = { --{"32", "2000", "0030", "undead", "regular", "Skeletal Cynder"}, {"100", "6400", "0030", "air", "giant", "Jet Vac"}, +--{"100", "6400", "0030", "air", "giant", "Full blast Jet Vac"}, {"101", "6500", "0030", "air", "giant", "Swarm"}, {"102", "6600", "0030", "earth", "giant", "Crusher"}, {"103", "6700", "0030", "earth", "giant", "Flashwing"}, @@ -70,14 +74,16 @@ local _names = { --{"107", "6b00", "0030", "water", "giant", "Admiral Thumpback"}, {"108", "6c00", "0030", "magic", "giant", "Pop Fizz"}, --{"108", "6c00", "0030", "magic", "giant", "Hoppity Pop Fizz"}, ---{"108", "6c00", "0030", "magic", "giant", "Love Potion Pop Fizz"}, +{"108", "6c00", "023c", "magic", "giant", "Love Potion Pop Fizz"}, --{"108", "6c00", "0030", "magic", "giant", "Punch Pop Fizz"}, +--{"108", "6c00", "0030", "magic", "giant", "Fizzy Frenzy Pop Fizz"}, {"109", "6d00", "0030", "magic", "giant", "Nin Jini"}, {"110", "6e00", "0030", "tech", "giant", "Bouncer"}, {"111", "6f00", "0030", "tech", "giant", "Sprocket"}, {"112", "7000", "0030", "life", "giant", "Tree Rex"}, --{"112", "7000", "0030", "life", "giant", "Gnarly Tree Rex"}, -{"113", "7100", "0030", "life", "giant", "Shroomboom"}, --lightcore +{"113", "7100", "0030", "life", "giant", "Shroomboom"}, +--{"113", "7100", "0030", "life", "giant", "Sure shot Shroomboom"}, {"114", "7200", "0030", "undead", "giant", "Eye Broawl"}, {"115", "7300", "0030", "undead", "giant", "Fright Rider"}, @@ -174,8 +180,8 @@ local _names = { {"304", "3001", "0030", "none", "location", "Volcanic Vault"}, {"305", "3101", "0030", "none", "location", "Mirror Of Mystery"}, {"306", "3201", "0030", "none", "location", "Nightmare Express"}, -{"307", "3301", "0030", "none", "location", "Sunscraper Spire"}, -{"308", "3401", "0030", "none", "location", "Midnight Museum"}, +{"307", "3301", "0030", "light", "location", "Sunscraper Spire"}, +{"308", "3401", "0030", "dark", "location", "Midnight Museum"}, {"404", "9401", "0030", "earth", "legendary","Bash"}, {"416", "a001", "0030", "magic", "legendary", "Spyro"}, @@ -219,7 +225,7 @@ local _names = { {"461", "cd01", "0030", "fire", "regular", "Torch"}, {"462", "ce01", "0030", "water", "trapmaster", "Snap Shot"}, {"462", "ce01", "0234", "water", "trapmaster", "Dark Snap Shot"}, ---, "water", "trapmaster", "Instant Snap Shot"}, +{"462", "6c00", "023c", "water", "trapmaster", "Instant Snap Shot"}, --, "water", "trapmaster", "Merry Snap Shot"}, {"463", "cf01", "0030", "water", "trapmaster", "Lob Star"}, {"463", "cf01", "0234", "water", "trapmaster", "Winterfest Lob Star"}, @@ -245,6 +251,7 @@ local _names = { {"475", "db01", "0030", "life", "trapmaster", "Tuff Luck"}, --{"475", "db01", "0234", "life", "trapmaster", "Special Tuff Luck"}, {"476", "dc01", "0030", "life", "regular", "Food Fight"}, +{"476", "dc01", "0612", "life", "regular", "LightCore Food Fight"}, --{"476", "dc01", "0030", "life", "regular", "Dark Food Fight"}, --{"476", "dc01", "0030", "life", "regular", "Frosted Food Fight"}, --{"476", "dc01", "0030", "life", "regular", "Instant Food Fight"}, @@ -255,6 +262,7 @@ local _names = { --{"479", "df01", "0234", "undead", "trapmaster", "Special Short Cut"}, {"480", "e001", "0030", "undead", "regular", "Bat Spin"}, {"481", "e101", "0030", "undead", "regular", "Funny Bone"}, +{"481", "e101", "0612", "undead", "regular", "LightCore Funny Bone"}, --{"481", "e101", "0030", "undead", "regular", "Fortune Funny Bone"}, {"482", "e201", "0030", "light", "trapmaster", "Knight light"}, --{"482", "e201", "0234", "light", "trapmaster", "Special Knight light"}, @@ -265,33 +273,42 @@ local _names = { {"485", "e501", "0030", "dark", "regular", "Blackout"}, --{"485", "e501", "0234", "dark", "regular", "Special Blackout"}, +-- MINI's {"502", "f601", "0030", "earth", "mini", "Bop"}, -{"503", "f701", "0030", "magic", "mini", "Spry"}, -{"504", "f801", "0030", "undead", "mini", "Hijinx"}, {"505", "f901", "0030", "earth", "mini", "Terrabite"}, + {"506", "fa01", "0030", "air", "mini", "Breeze"}, -{"507", "fb01", "0030", "fire", "mini", "Weeruptor"}, ---{"507", "fb01", "0030", "fire", "mini", "Eggsellent Weeruptor"}, {"508", "fc01", "0030", "air", "mini", "Pet Vac"}, --{"508", "fc01", "0030", "air", "mini", "Power Punch Pet Vac"}, + +{"507", "fb01", "0030", "fire", "mini", "Weeruptor"}, +--{"507", "fb01", "0030", "fire", "mini", "Eggsellent Weeruptor"}, {"509", "fd01", "0030", "fire", "mini", "Small Fry"}, + {"510", "fe01", "0030", "tech", "mini", "Drobit"}, -{"514", "0202", "0030", "water", "mini", "Gill Runt"}, {"519", "0702", "0030", "tech", "mini", "Trigger Snappy"}, + {"526", "0e02", "0030", "life", "mini", "Whisper Elf"}, {"540", "1c02", "0030", "life", "mini", "Barkley"}, --{"540", "1c02", "0030", "life", "mini", "Gnarly Barkley"}, + {"541", "1d02", "0030", "water", "mini", "Thumpling"}, +{"514", "0202", "0030", "water", "mini", "Gill Runt"}, + {"542", "1e02", "0030", "magic", "mini", "mini Jini"}, +{"503", "f701", "0030", "magic", "mini", "Spry"}, + +{"504", "f801", "0030", "undead", "mini", "Hijinx"}, {"543", "1f02", "0030", "undead", "mini", "Eye Small"}, -{"3000", "b80b", "0030", "air", "SWAPFORCE", "Scratch"}, +{"3000", "b80b", "0030", "air", "mini", "Scratch", "SWAPFORCE"}, {"3001", "b90b", "0030", "air", "SWAPFORCE", "Pop Thorn"}, --{"3001", "b90b", "0030", "air", "SWAPFORCE", "Buttered Pop Thorn"}, {"3002", "ba0b", "0030", "earth", "SWAPFORCE", "Slobber Tooth"}, --{"3002", "ba0b", "0030", "earth", "SWAPFORCE", "Dark Slobber Tooth"}, --{"3002", "ba0b", "0030", "earth", "SWAPFORCE", "Sundae Slobber Tooth"}, {"3003", "bb0b", "0030", "earth", "SWAPFORCE", "Scorp"}, +{"3004", "bc0b", "0030", "fire", "SWAPFORCE", "Fryno"}, {"3004", "bc0b", "0138", "fire", "SWAPFORCE", "Hog Wild Fryno"}, --{"3004", "bc0b", "0138", "fire", "SWAPFORCE", "Flip flop Fryno"}, {"3005", "bd0b", "0030", "fire", "SWAPFORCE", "Smolderdash"}, @@ -311,18 +328,148 @@ local _names = { {"3013", "c50b", "0030", "undead", "SWAPFORCE", "Grim Creeper"}, {"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", "Freeze Blade"}, +--{"", "", "0030", "fire", "SWAPFORCE", "Magna Charge"}, +--{"", "", "0030", "fire", "SWAPFORCE", "Spy Rise"}, + +--{"", "", "0030", "fire", "SWAPFORCE", "Doom Stone"}, +--{"", "", "0030", "fire", "SWAPFORCE", "Rubble Rouser"}, + +--{"", "", "0030", "fire", "SWAPFORCE", "Blast Zone"} +--{"", "", "0030", "fire", "SWAPFORCE", "Fire Kraken"}, + +--{"", "", "0030", "fire", "SWAPFORCE", "Rattle Shake"}, +--{"", "", "0030", "fire", "SWAPFORCE", "Night Shift"}, + +--{"", "", "0030", "life", "SWAPFORCE", "Stink Bomb"}, +--{"", "", "0030", "life", "SWAPFORCE", "Grilla Drilla"}, + +--{"", "", "0030", "air", "SWAPFORCE", "Free Ranger"}, +--{"", "", "0030", "air", "SWAPFORCE", "Boom Jet"}, + } local function find( main, sub) - + main = main:lower() + sub = sub:lower() for k, v in pairs(_names) do - if ( v[2] == main and v[3] == sub) then + if ( v[2]:lower() == main and v[3]:lower() == sub) then return v 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, + List = list, }