Merge pull request #82 from marshmellow42/master

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

diff --git a/client/lualibs/default_toys.lua b/client/lualibs/default_toys.lua
index cd839ca1ef7d13b405e847b2f5d6e5b6c98787b4..048a29c9684e63ef5af729ba6a0debaab5347531 100644 (file)
--- 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",
        ["D200"]="MAGIC TRAP",
        ["D300"]="WATER TRAP",
        ["D400"]="AIR TRAP",

+       ["D500"]="UNDEAD TRAP",

        ["D600"]="TECH TRAP",
        ["D700"]="FIRE TRAP",
        ["D800"]="EARTH TRAP",
        ["D600"]="TECH TRAP",
        ["D700"]="FIRE TRAP",
        ["D800"]="EARTH TRAP",


@@ -94,11 +95,11 @@ local _names = {
     --[[
        EXPANSION
     --]]
     --[[
        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",
        ["0131"]="MIRROR OF MYSTERY",
        ["0132"]="NIGHTMARE EXPRESS",
        ["0133"]="SUNSCRAPER SPIRE",


@@ -117,39 +118,39 @@ local _names = {
     --]]
        ["01C2"]="TRAPTEAM GUSTO",
        ["01C3"]="TRAPTEAM THUNDERBOLT",
     --]]
        ["01C2"]="TRAPTEAM GUSTO",
        ["01C3"]="TRAPTEAM THUNDERBOLT",

-       ["01C4"]="TRAPTEAM FLINGKONG",
+       ["01C4"]="TRAPTEAM FLING KONG",

        ["01C5"]="TRAPTEAM BLADES",
        ["01C6"]="TRAPTEAM WALLOP",
        ["01C5"]="TRAPTEAM BLADES",
        ["01C6"]="TRAPTEAM WALLOP",

-       ["01C7"]="TRAPTEAM HEADRUSH",
-       ["01C8"]="TRAPTEAM FISTBUMP",
-       ["01C9"]="TRAPTEAM ROCKYROLL",
+       ["01C7"]="TRAPTEAM HEAD RUSH",
+       ["01C8"]="TRAPTEAM FIST BUMP",
+       ["01C9"]="TRAPTEAM ROCKY ROLL",

        ["01CA"]="TRAPTEAM WILDFIRE",
        ["01CA"]="TRAPTEAM WILDFIRE",

-       ["01CB"]="TRAPTEAM KABOOM",
-       ["01CC"]="TRAPTEAM TRAILBLAZER",
+       ["01CB"]="TRAPTEAM KA BOOM",
+       ["01CC"]="TRAPTEAM TRAIL BLAZER",

        ["01CD"]="TRAPTEAM TORCH",
        ["01CD"]="TRAPTEAM TORCH",

-       ["01CE"]="TRAPTEAM SNAPSHOT",
-       ["01CF"]="TRAPTEAM LOBSTAR",
-       ["01D0"]="TRAPTEAM FLIPWRECK",
+       ["01CE"]="TRAPTEAM SNAP SHOT",
+       ["01CF"]="TRAPTEAM LOB STAR",
+       ["01D0"]="TRAPTEAM FLIP WRECK",

        ["01D1"]="TRAPTEAM ECHO",
        ["01D2"]="TRAPTEAM BLASTERMIND",
        ["01D3"]="TRAPTEAM ENIGMA",
        ["01D1"]="TRAPTEAM ECHO",
        ["01D2"]="TRAPTEAM BLASTERMIND",
        ["01D3"]="TRAPTEAM ENIGMA",

-       ["01D4"]="TRAPTEAM DEJAVU",
+       ["01D4"]="TRAPTEAM DEJA VU",

        ["01D5"]="TRAPTEAM COBRA CADABRA",
        ["01D6"]="TRAPTEAM JAWBREAKER", 
        ["01D7"]="TRAPTEAM GEARSHIFT",
        ["01D8"]="TRAPTEAM CHOPPER",
        ["01D5"]="TRAPTEAM COBRA CADABRA",
        ["01D6"]="TRAPTEAM JAWBREAKER", 
        ["01D7"]="TRAPTEAM GEARSHIFT",
        ["01D8"]="TRAPTEAM CHOPPER",

-       ["01D9"]="TRAPTEAM TREADHEAD",
+       ["01D9"]="TRAPTEAM TREAD HEAD",

        ["01DA"]="TRAPTEAM BUSHWHACK",
        ["01DB"]="TRAPTEAM TUFF LUCK",
        ["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",
+       ["01DC"]="TRAPTEAM FOOD FIGHT",
+       ["01DD"]="TRAPTEAM HIGH FIVE",
+       ["01DE"]="TRAPTEAM NITRO KRYPT KING",
+       ["01DF"]="TRAPTEAM SHORT CUT",
+       ["01E0"]="TRAPTEAM BAT SPIN",
+       ["01E1"]="TRAPTEAM FUNNY BONE",
+       ["01E2"]="TRAPTEAM KNIGHT LIGHT",

        ["01E3"]="TRAPTEAM SPOTLIGHT",
        ["01E3"]="TRAPTEAM SPOTLIGHT",

-       ["01E4"]="TRAPTEAM KNIGHTMARE",
+       ["01E4"]="TRAPTEAM KNIGHT MARE",

        ["01E5"]="TRAPTEAM BLACKOUT",
 
        --[[
        ["01E5"]="TRAPTEAM BLACKOUT",
 
        --[[


@@ -161,12 +162,12 @@ local _names = {
        ["01F9"]="PET TERRAFIN",
        ["01FA"]="PET BREEZE",
        ["01FB"]="PET WEERUPTOR",
        ["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",
        ["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",
        ["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",
        ["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",
        ["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",
        ["0BC4"]="SWAPFORCE ROLLER BRAWL",
        ["0BC5"]="SWAPFORCE GRIM CREEPER",

-       ["0BC6"]="SWAPFORCE RIPTIDE",
-       ["0BC7"]="SWAPFORCE PUNKSHOCK",
+       ["0BC6"]="SWAPFORCE RIP TIDE",
+       ["0BC7"]="SWAPFORCE PUNK SHOCK",

 }
 return _names
 }
 return _names