X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/73a1c1bb97e20be998ee2efd72bedcbd3b23bb8f..02d352fea75385d80b49a7ab8703692ae307f073:/client/lualibs/default_toys.lua

diff --git a/client/lualibs/default_toys.lua b/client/lualibs/default_toys.lua
index cd839ca1..749686c7 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,11 +95,11 @@ local _names = {
     --[[
 	EXPANSION
     --]]
-	["012C"]="DRAGON",
-	["012D"]="ICE",
-	["012E"]="PIRATE",
-	["012F"]="UNDEAD",
-	["0130"]="PVPUNLOCK",
+	["012C"]="DRAGONS PEAK",
+	["012D"]="EMPIRE OF ICE",
+	["012E"]="PIRATE SEAS",
+	["012F"]="DARKLIGHT CRYPT",
+	["0130"]="VOLCANIC VAULT",
 	["0131"]="MIRROR OF MYSTERY",
 	["0132"]="NIGHTMARE EXPRESS",
 	["0133"]="SUNSCRAPER SPIRE",
@@ -115,42 +116,42 @@ local _names = {
 	--[[
 	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
@@ -161,12 +162,12 @@ local _names = {
 	["01F9"]="PET TERRAFIN",
 	["01FA"]="PET BREEZE",
 	["01FB"]="PET WEERUPTOR",
-	["01FC"]="PET PETVAC",
-	["01FD"]="PET SMALLFRY",
+	["01FC"]="PET PET VAC",
+	["01FD"]="PET SMALL FRY",
 	["01FE"]="PET DROBIT",
 	["0202"]="PET GILL GRUNT",
-	["0207"]="PET TRIGGER HAPPY",
-	["020E"]="PET STEALTH ELF",
+	["0207"]="PET TRIGGER SNAPPY",
+	["020E"]="PET WHISPER ELF",
 	["021C"]="PET BARKLEY",
 	["021D"]="PET THUMPLING",
 	["021E"]="PET MINI JINI",
@@ -182,14 +183,14 @@ local _names = {
 	["0BBC"]="SWAPFORCE HOG WILD FRYNO",
 	["0BBD"]="SWAPFORCE SMOLDER DASH",
 	["0BBE"]="SWAPFORCE BUMBLE BLAST",
-	["0BBF"]="SWAPFORCE ZOOLOU",
+	["0BBF"]="SWAPFORCE ZOO LOU",
 	["0BC0"]="SWAPFORCE DUNE BUG",
 	["0BC1"]="SWAPFORCE STAR STRIKE",
 	["0BC2"]="SWAPFORCE COUNTDOWN",
-	["0BC3"]="SWAPFORCE WINDUP",
+	["0BC3"]="SWAPFORCE WIND UP",
 	["0BC4"]="SWAPFORCE ROLLER BRAWL",
 	["0BC5"]="SWAPFORCE GRIM CREEPER",
-	["0BC6"]="SWAPFORCE RIPTIDE",
-	["0BC7"]="SWAPFORCE PUNKSHOCK",
+	["0BC6"]="SWAPFORCE RIP TIDE",
+	["0BC7"]="SWAPFORCE PUNK SHOCK",
 }
 return _names