From f288cb607f679256b93019ca4f9ab236d7c18ac3 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 11 May 2015 19:38:53 +0200
Subject: [PATCH] ADD: added a List parameter to tnp3clone.lua script.
---
client/lualibs/default_toys.lua | 8 ++++++++
client/scripts/tnp3clone.lua | 14 +++++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/client/lualibs/default_toys.lua b/client/lualibs/default_toys.lua
index 5a680a20..cb603ec0 100644
--- a/client/lualibs/default_toys.lua
+++ b/client/lualibs/default_toys.lua
@@ -363,7 +363,15 @@ local function find( main, sub)
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,
}
diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua
index 80748691..e87c338e 100644
--- a/client/scripts/tnp3clone.lua
+++ b/client/scripts/tnp3clone.lua
@@ -13,6 +13,7 @@ local band = bit32.band
example =[[
script run tnp3clone
script run tnp3clone -h
+ script run tnp3clone -l
script run tnp3clone -t aa00 -s 0030
]]
@@ -23,7 +24,8 @@ This script will try making a barebone clone of a tnp3 tag on to a magic generat
Arguments:
-h : this help
- -t <data> : toytype id, 4hex symbols.
+ -l : list all known toy tokens
+ -t <data> : toytype id, 4hex symbols
-s <data> : subtype id, 4hex symbols
For fun, try the following subtype id:
@@ -74,7 +76,7 @@ local function readmagicblock( blocknum )
-- Read block 0
local CSETBLOCK_SINGLE_OPERATION = 0x1F
cmd = Command:new{cmd = cmds.CMD_MIFARE_CGETBLOCK, arg1 = CSETBLOCK_SINGLE_OPERATION, arg2 = 0, arg3 = blocknum}
- err = core.SendCommand(cmd:getBytes())
+ err = core.SendCommand(cmd:getBytes())
if err then return nil, err end
local block0, err = waitCmd()
if err then return nil, err end
@@ -98,12 +100,13 @@ local function main(args)
local DEBUG = true
-- Arguments for the script
- for o, a in getopt.getopt(args, 'ht:s:') do
+ for o, a in getopt.getopt(args, 'ht:s:l') do
if o == "h" then return help() end
if o == "t" then toytype = a end
if o == "s" then subtype = a end
+ if o == "l" then return toys.List() end
end
-
+
if #toytype ~= 4 then return oops('Wrong size - toytype. (4hex symbols)') end
if #subtype ~= 4 then return oops('Wrong size - subtype. (4hex symbols)') end
@@ -139,8 +142,9 @@ local function main(args)
-- wipe card.
local cmd = (csetuid..'%s 0004 08 w'):format(result.uid)
core.console(cmd)
+
+ local b1 = toytype..string.rep('00',10)..subtype
- local b1 = toytype..'00000000000000000000'..subtype
local calc = utils.Crc16(b0..b1)
local calcEndian = bor(rsh(calc,8), lsh(band(calc, 0xff), 8))
--
2.39.5