From: iceman1001 <iceman@iuse.se>
Date: Wed, 4 Feb 2015 10:40:49 +0000 (+0100)
Subject: add: lots of new toytypes  in default_toys.lua
X-Git-Tag: v2.0.0-rc1~32^2
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/a6cfa75035727fd0572b4cf0ba1ca9c731f91782?ds=sidebyside;hp=1f78a4d305cf7cab4682973bc00c6d391de777d6

add: lots of new toytypes  in default_toys.lua
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
---

diff --git a/client/lualibs/default_toys.lua b/client/lualibs/default_toys.lua
index abb56515..cd839ca1 100644
--- a/client/lualibs/default_toys.lua
+++ b/client/lualibs/default_toys.lua
@@ -1,63 +1,195 @@
 local _names = {
     --[[
     --]]
+	["0000"]="WHIRLWIND",
+	["0100"]="SONIC BOOM",
+	["0200"]="WARNADO",
+	["0300"]="LIGHTNINGROD",
 	["0400"]="BASH",
-	["1600"]="BOOMER" ,
-	["1800"]="CAMO",
-	["3000"]="CHOPCHOP" ,
-	["2000"]="CYNDER",
-	["6400"]="JET-VAC",
-	["6700"]="FLASHWING",
-	["7000"]="TREE REX",
-	["7100"]="LIGHTCORE SHROOMBOOM",
-	["1C00"]="DARK SPYRO",
+	["0500"]="TERRAFIN",
 	["0600"]="DINORANG" ,
-	["1200"]="DOUBLE TROUBLE" ,
-	["1500"]="DRILLSERGEANT" ,
-	["1400"]="DROBOT",
-	["0900"]="LIGHTCORE ERUPTOR" ,
-	["0B00"]="FLAMESLINGER" ,
-	["1F00"]="GHOST ROASTER",
-	["0E00"]="GILL GRUNT" ,
-	["1D00"]="HEX",
-	["0A00"]="IGNITOR",
-	["0300"]="LIGHTNINGROD",
 	["0700"]="LIGHTCORE PRISM BREAK",
-	["1500"]="SLAMBAM",
-	["0100"]="SONIC BOOM",
-	["1000"]="SPYRO",
-	["1A00"]="STEALTH ELF",
-	["1B00"]="STUMP SMASH",
 	["0800"]="SUNBURN",
-	["0500"]="TERRAFIN",
-	["1300"]="TRIGGER HAPPY",
-	["1100"]="VOODOOD",
-	["0200"]="WARNADO",
+	["0900"]="LIGHTCORE ERUPTOR",
+	["0A00"]="IGNITOR",
+	["0B00"]="FLAMESLINGER",
+	["0C00"]="ZAP",
 	["0D00"]="WHAM SHELL",
-	["0000"]="WHIRLWIND",
+	["0E00"]="GILL GRUNT",
+	["0F00"]="SLAMBAM",
+	["1000"]="SPYRO",
+	["1100"]="VOODOOD",
+	["1200"]="DOUBLE TROUBLE",
+	["1300"]="TRIGGER HAPPY",
+	["1400"]="DROBOT",
+	["1500"]="DRILLSERGEANT",
+	["1600"]="BOOMER",
 	["1700"]="WRECKING BALL",
-	["0C00"]="ZAP",
+	["1800"]="CAMO",
 	["1900"]="ZOOK",
-	["0300"]="DRAGON",
-	["012D"]="ICE",
-	["012E"]="PIRATE",
-	["0130"]="PVPUNLOCK",
-	["012F"]="UNDEAD",
-	["0200"]="ANVIL" ,
-	["CB00"]="CROSSED SWORDS",
-	["CC00"]="HOURGLASS",
-	["CA00"]="REGENERATION",
+	["1A00"]="STEALTH ELF",
+	["1B00"]="STUMP SMASH",
+	["1D00"]="HEX",
+	["1C00"]="DARK SPYRO",
+	["1E00"]="CHOPCHOP",
+	["1F00"]="GHOST ROASTER",
+	["2000"]="CYNDER",	
+	--[[
+	GIANTS
+    --]]
+	["6400"]="GIANT JET-VAC",
+	["6500"]="GIANT SWARM",
+	["6600"]="GIANT CRUSHER",
+	["6700"]="GIANT FLASHWING",
+	["6800"]="GIANT HOTHEAD",
+	["6900"]="GIANT HOTDOG",
+	["6A00"]="GIANT CHILL",
+	["6B00"]="GIANT THUMPBACK",
+	["6C00"]="GIANT POPFIZZ",
+	["6D00"]="GIANT NINJINI",
+	["6E00"]="GIANT BOUNCER",
+	["6F00"]="GIANT SPROCKET",
+	["7000"]="GIANT TREE REX",
+	["7100"]="LIGHTCORE SHROOMBOOM",
+	["7200"]="GIANT EYEBROAWL",
+	["7300"]="GIANT FRIGHTRIDER",
+
+    --[[
+	ITEM
+    --]]	
+	["C800"]="ANVIL",
 	["C900"]="SECRET STASH",
+	["CA00"]="REGENERATION",
 	["CD00"]="SHIELD",
-	["CF00"]="SPARX",
+	["CB00"]="CROSSED SWORDS",
+	["CC00"]="HOURGLASS",
 	["CE00"]="SPEED BOOTS",
+	["CF00"]="SPARX",
+	["D000"]="CANNON",
+	["D100"]="SCORPIONSTRIKER",
+
+	--[[
+	ITEM TRAPS
+    --]]
+	["D200"]="MAGIC TRAP",
+	["D300"]="WATER TRAP",
+	["D400"]="AIR TRAP",
+	["D600"]="TECH TRAP",
+	["D700"]="FIRE TRAP",
+	["D800"]="EARTH TRAP",
+	["D900"]="LIFE TRAP",
+	["DA00"]="DARK TRAP",
+	["DB00"]="LIGHT TRAP",
+	["DC00"]="KAOS TRAP",	
+
+    --[[
+	ITEM 
+    --]]	
+	["E600"]="HAND OF FATE",	
+	["E700"]="PIGGYBANK",	
+	["E800"]="ROCKET RAM",	
+	["E900"]="TIKI SPEAKY",	
+
+
+    --[[
+	EXPANSION
+    --]]
+	["012C"]="DRAGON",
+	["012D"]="ICE",
+	["012E"]="PIRATE",
+	["012F"]="UNDEAD",
+	["0130"]="PVPUNLOCK",
+	["0131"]="MIRROR OF MYSTERY",
+	["0132"]="NIGHTMARE EXPRESS",
+	["0133"]="SUNSCRAPER SPIRE",
+	["0134"]="MIDNIGHT MUSEUM",
+	
+	--[[
+	LEGENDARY
+    --]]	
 	["0194"]="LEGENDARY BASH",
-	["0430"]="LEGENDARY CHOPCHOP",
 	["01A0"]="LEGENDARY SPYRO",
 	["01A3"]="LEGENDARY TRIGGER HAPPY",
-	["0202"]="PET GILL GRUNT",
-	["020E"]="PET STEALTH ELF",
+	["01AE"]="LEGENDARY CHOPCHOP",
+	
+	--[[
+	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",
+
+	--[[
+	PET
+	--]]
+	["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",
+	["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",
+
+	--[[
+	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",
 }
 return _names
diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua
index f41fe8ab..dedd3df1 100644
--- a/client/scripts/tnp3dump.lua
+++ b/client/scripts/tnp3dump.lua
@@ -253,6 +253,7 @@ local function main(args)
 	local uid = block0:sub(1,8)
 	local itemtype = block1:sub(1,4)
 	local cardid = block1:sub(9,24)
+	local traptype = block1:sub(25,28)
 	
 	-- Write dump to files
 	if not DEBUG then
@@ -264,9 +265,11 @@ local function main(args)
 
 	-- Show info 
 	print( string.rep('--',20) )
-	print( (' ITEM TYPE : 0x%s - %s'):format(itemtype, toyNames[itemtype]) )
-	print( ('       UID : 0x%s'):format(uid) )
-	print( ('    CARDID : 0x%s'):format(cardid ) )	
+	print( ('            ITEM TYPE : 0x%s - %s'):format(itemtype, toyNames[itemtype]) )
+	print( (' Alter ego / traptype : 0x%s'):format(traptype) )
+	print( ('                  UID : 0x%s'):format(uid) )
+	print( ('               CARDID : 0x%s'):format(cardid ) )
+	
 	print( string.rep('--',20) )
 
 end