X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/be2cf126bf74c3e0c60706dd2620c8a6d742e396..6c81ae5574e2f2b9e0b62f9dafe602d35f23739a:/client/lualibs/default_toys.lua

diff --git a/client/lualibs/default_toys.lua b/client/lualibs/default_toys.lua
index cd839ca1..c985a542 100644
--- a/client/lualibs/default_toys.lua
+++ b/client/lualibs/default_toys.lua
@@ -74,6 +74,7 @@ local _names = {
 	["D200"]="MAGIC TRAP",
 	["D300"]="WATER TRAP",
 	["D400"]="AIR TRAP",
+	["D500"]="UNDEAD TRAP",
 	["D600"]="TECH TRAP",
 	["D700"]="FIRE TRAP",
 	["D800"]="EARTH TRAP",
@@ -94,102 +95,118 @@ local _names = {
     --[[
 	EXPANSION
     --]]
-	["012C"]="DRAGON",
-	["012D"]="ICE",
-	["012E"]="PIRATE",
-	["012F"]="UNDEAD",
-	["0130"]="PVPUNLOCK",
-	["0131"]="MIRROR OF MYSTERY",
-	["0132"]="NIGHTMARE EXPRESS",
-	["0133"]="SUNSCRAPER SPIRE",
-	["0134"]="MIDNIGHT MUSEUM",
+	["2C01"]="DRAGONS PEAK",
+	["2D01"]="EMPIRE OF ICE",
+	["2E01"]="PIRATE SEAS",
+	["2F01"]="DARKLIGHT CRYPT",
+	["3001"]="VOLCANIC VAULT",
+	["3101"]="MIRROR OF MYSTERY",
+	["3201"]="NIGHTMARE EXPRESS",
+	["3301"]="SUNSCRAPER SPIRE",
+	["3401"]="MIDNIGHT MUSEUM",
 	
 	--[[
 	LEGENDARY
     --]]	
-	["0194"]="LEGENDARY BASH",
-	["01A0"]="LEGENDARY SPYRO",
-	["01A3"]="LEGENDARY TRIGGER HAPPY",
-	["01AE"]="LEGENDARY CHOPCHOP",
+	["9401"]="LEGENDARY BASH",
+	["A001"]="LEGENDARY SPYRO",
+	["A301"]="LEGENDARY TRIGGER HAPPY",
+	["AE01"]="LEGENDARY CHOPCHOP",
+	--legendary blades
+	--legendary bouncer
+	--legendary zoo lou
+	--legendary stealth elf
+	--legendary slam bam
+	--legendary night shift
+	--legendary jet-vac
+	--legendary ignitor
+	--legendary jawbreaker
+	--legendary lightcore grim creeper
+	--legendary lightcore chill
+	--legendary free ranger
+	
+	--[[
+	COLOR
+	--]]
 	
 	--[[
 	TRAPTEAM
     --]]
-	["01C2"]="TRAPTEAM GUSTO",
-	["01C3"]="TRAPTEAM THUNDERBOLT",
-	["01C4"]="TRAPTEAM FLINGKONG",
-	["01C5"]="TRAPTEAM BLADES",
-	["01C6"]="TRAPTEAM WALLOP",
-	["01C7"]="TRAPTEAM HEADRUSH",
-	["01C8"]="TRAPTEAM FISTBUMP",
-	["01C9"]="TRAPTEAM ROCKYROLL",
-	["01CA"]="TRAPTEAM WILDFIRE",
-	["01CB"]="TRAPTEAM KABOOM",
-	["01CC"]="TRAPTEAM TRAILBLAZER",
-	["01CD"]="TRAPTEAM TORCH",
-	["01CE"]="TRAPTEAM SNAPSHOT",
-	["01CF"]="TRAPTEAM LOBSTAR",
-	["01D0"]="TRAPTEAM FLIPWRECK",
-	["01D1"]="TRAPTEAM ECHO",
-	["01D2"]="TRAPTEAM BLASTERMIND",
-	["01D3"]="TRAPTEAM ENIGMA",
-	["01D4"]="TRAPTEAM DEJAVU",
-	["01D5"]="TRAPTEAM COBRA CADABRA",
-	["01D6"]="TRAPTEAM JAWBREAKER",	
-	["01D7"]="TRAPTEAM GEARSHIFT",
-	["01D8"]="TRAPTEAM CHOPPER",
-	["01D9"]="TRAPTEAM TREADHEAD",
-	["01DA"]="TRAPTEAM BUSHWHACK",
-	["01DB"]="TRAPTEAM TUFF LUCK",
-	["01DC"]="TRAPTEAM FOODFIGHT",
-	["01DD"]="TRAPTEAM HIGHFIVE",
-	["01DE"]="TRAPTEAM KRYPTKING",
-	["01DF"]="TRAPTEAM SHORTCUT",
-	["01E0"]="TRAPTEAM BATSPIN",
-	["01E1"]="TRAPTEAM FUNNYBONE",
-	["01E2"]="TRAPTEAM KNIGHTLIGHT",
-	["01E3"]="TRAPTEAM SPOTLIGHT",
-	["01E4"]="TRAPTEAM KNIGHTMARE",
-	["01E5"]="TRAPTEAM BLACKOUT",
+	["C201"]="TRAPTEAM GUSTO",
+	["C301"]="TRAPTEAM THUNDERBOLT",
+	["C401"]="TRAPTEAM FLING KONG",
+	["C501"]="TRAPTEAM BLADES",
+	["C601"]="TRAPTEAM WALLOP",
+	["C701"]="TRAPTEAM HEAD RUSH",
+	["C801"]="TRAPTEAM FIST BUMP",
+	["C901"]="TRAPTEAM ROCKY ROLL",
+	["CA01"]="TRAPTEAM WILDFIRE",
+	["CB01"]="TRAPTEAM KA BOOM",
+	["CC01"]="TRAPTEAM TRAIL BLAZER",
+	["CD01"]="TRAPTEAM TORCH",
+	["CE01"]="TRAPTEAM SNAP SHOT",
+	["CF01"]="TRAPTEAM LOB STAR",
+	["D001"]="TRAPTEAM FLIP WRECK",
+	["D101"]="TRAPTEAM ECHO",
+	["D201"]="TRAPTEAM BLASTERMIND",
+	["D301"]="TRAPTEAM ENIGMA",
+	["D401"]="TRAPTEAM DEJA VU",
+	["D501"]="TRAPTEAM COBRA CADABRA",
+	["D601"]="TRAPTEAM JAWBREAKER",	
+	["D701"]="TRAPTEAM GEARSHIFT",
+	["D801"]="TRAPTEAM CHOPPER",
+	["D901"]="TRAPTEAM TREAD HEAD",
+	["DA01"]="TRAPTEAM BUSHWHACK",
+	["DB01"]="TRAPTEAM TUFF LUCK",
+	["DC01"]="TRAPTEAM FOOD FIGHT",
+	["DD01"]="TRAPTEAM HIGH FIVE",
+	["DE01"]="TRAPTEAM NITRO KRYPT KING",
+	["DF01"]="TRAPTEAM SHORT CUT",
+	["E001"]="TRAPTEAM BAT SPIN",
+	["E101"]="TRAPTEAM FUNNY BONE",
+	["E201"]="TRAPTEAM KNIGHT LIGHT",
+	["E301"]="TRAPTEAM SPOTLIGHT",
+	["E401"]="TRAPTEAM KNIGHT MARE",
+	["E501"]="TRAPTEAM BLACKOUT",
 
 	--[[
-	PET
+	PET / MINI
 	--]]
-	["01F6"]="PET BOP",
-	["01F7"]="PET SPRY",
-	["01F8"]="PET HIJINX",
-	["01F9"]="PET TERRAFIN",
-	["01FA"]="PET BREEZE",
-	["01FB"]="PET WEERUPTOR",
-	["01FC"]="PET PETVAC",
-	["01FD"]="PET SMALLFRY",
-	["01FE"]="PET DROBIT",
+	["F601"]="PET BOP",
+	["F701"]="PET SPRY",
+	["F801"]="PET HIJINX",
+	["F901"]="PET TERRAFIN",
+	["FA01"]="PET BREEZE",
+	["FB01"]="PET WEERUPTOR",
+	["FC01"]="PET PET VAC",
+	["FD01"]="PET SMALL FRY",
+	["FE01"]="PET DROBIT",
 	["0202"]="PET GILL GRUNT",
-	["0207"]="PET TRIGGER HAPPY",
-	["020E"]="PET STEALTH ELF",
-	["021C"]="PET BARKLEY",
-	["021D"]="PET THUMPLING",
-	["021E"]="PET MINI JINI",
-	["021F"]="PET EYE SMALL",
+	["0702"]="PET TRIGGER SNAPPY",
+	["0E02"]="PET WHISPER ELF",
+	["1C02"]="PET BARKLEY",
+	["1D02"]="PET THUMPLING",
+	["1E02"]="PET MINI JINI",
+	["1F02"]="PET EYE SMALL",
 
 	--[[
 	SWAP FORCE
 	--]]
-	["0BB8"]="SWAPFORCE SCRATCH",
-	["0BB9"]="SWAPFORCE POPTHORN",
-	["0BBA"]="SWAPFORCE SLOBBER TOOTH",
-	["0BBB"]="SWAPFORCE SCORP",
-	["0BBC"]="SWAPFORCE HOG WILD FRYNO",
-	["0BBD"]="SWAPFORCE SMOLDER DASH",
-	["0BBE"]="SWAPFORCE BUMBLE BLAST",
-	["0BBF"]="SWAPFORCE ZOOLOU",
-	["0BC0"]="SWAPFORCE DUNE BUG",
-	["0BC1"]="SWAPFORCE STAR STRIKE",
-	["0BC2"]="SWAPFORCE COUNTDOWN",
-	["0BC3"]="SWAPFORCE WINDUP",
-	["0BC4"]="SWAPFORCE ROLLER BRAWL",
-	["0BC5"]="SWAPFORCE GRIM CREEPER",
-	["0BC6"]="SWAPFORCE RIPTIDE",
-	["0BC7"]="SWAPFORCE PUNKSHOCK",
+	["B80B"]="SWAPFORCE SCRATCH",
+	["B90B"]="SWAPFORCE POPTHORN",
+	["BA0B"]="SWAPFORCE SLOBBER TOOTH",
+	["BB0B"]="SWAPFORCE SCORP",
+	["BC0B"]="SWAPFORCE HOG WILD FRYNO",
+	["BD0B"]="SWAPFORCE SMOLDER DASH",
+	["BE0B"]="SWAPFORCE BUMBLE BLAST",
+	["BF0B"]="SWAPFORCE ZOO LOU",
+	["C00B"]="SWAPFORCE DUNE BUG",
+	["C10B"]="SWAPFORCE STAR STRIKE",
+	["C20B"]="SWAPFORCE COUNTDOWN",
+	["C30B"]="SWAPFORCE WIND UP",
+	["C40B"]="SWAPFORCE ROLLER BRAWL",
+	["C50B"]="SWAPFORCE GRIM CREEPER",
+	["C60B"]="SWAPFORCE RIP TIDE",
+	["C70B"]="SWAPFORCE PUNK SHOCK",
 }
 return _names