ADD: @pwpiwi 's fixes for 14b. Including a rename from iso14443.c -> iso14443b.c

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

diff --git a/client/lualibs/default_toys.lua b/client/lualibs/default_toys.lua
index 771f51cd8c6710e4d69ae2740264deee4cf088b2..cb603ec0c6d41812edc80fe0e918dcbe695860dc 100644 (file)
--- a/client/lualibs/default_toys.lua
+++ b/client/lualibs/default_toys.lua
@@ -24,6 +24,7 @@ local _names = {
 {"13", "0d00", "0030", "water", "regular", "Wham Shell"},
 {"14", "0e00", "0030", "water", "regular", "Gill Grunt"},
 --{"14", "0e00", "0030", "water", "regular", "Elite Gill Grunt"},
 {"13", "0d00", "0030", "water", "regular", "Wham Shell"},
 {"14", "0e00", "0030", "water", "regular", "Gill Grunt"},
 --{"14", "0e00", "0030", "water", "regular", "Elite Gill Grunt"},

+--{"14", "0e00", "0030", "water", "regular", "Tidal Wave Gill Grunt"},

 {"15", "0f00", "0030", "water", "regular", "Slam Bam"},
 --{"15", "0f00", "0030", "water", "regular", "Surfer Slam Bam"},
 {"16", "1000", "0030", "magic", "regular", "Spyro"},
 {"15", "0f00", "0030", "water", "regular", "Slam Bam"},
 --{"15", "0f00", "0030", "water", "regular", "Surfer Slam Bam"},
 {"16", "1000", "0030", "magic", "regular", "Spyro"},


@@ -43,8 +44,10 @@ local _names = {
 {"25", "1900", "0030", "life", "regular", "Zook"},
 {"26", "1a00", "0030", "life", "regular", "Stealth Elf"},
 --{"26", "1a00", "0030", "life", "regular", "Elite Stealth Elf"},
 {"25", "1900", "0030", "life", "regular", "Zook"},
 {"26", "1a00", "0030", "life", "regular", "Stealth Elf"},
 --{"26", "1a00", "0030", "life", "regular", "Elite Stealth Elf"},

---{"26", "1a00", "0030", "life", "regular", "Dark Stealth Elf"},
+--{"26", "1a00", "0528", "life", "regular", "Dark Stealth Elf"},
+{"26", "1a00", "0528", "life", "swapforce", "Ninja Stealth Elf"},

 {"27", "1b00", "0030", "life", "regular", "Stump Smash"},
 {"27", "1b00", "0030", "life", "regular", "Stump Smash"},

+{"27", "1b00", "0118", "life", "regular", "Stump Smash"},

 --{"27", "1b00", "0030", "life", "regular", "Autumn Stump Smash"},
 {"28", "1c00", "0030", "magic", "regular", "Dark Spyro"},
 --{"28", "1c00", "0030", "magic", "regular", "Elite Spyro"},
 --{"27", "1b00", "0030", "life", "regular", "Autumn Stump Smash"},
 {"28", "1c00", "0030", "magic", "regular", "Dark Spyro"},
 --{"28", "1c00", "0030", "magic", "regular", "Elite Spyro"},


@@ -58,6 +61,7 @@ local _names = {
 --{"32", "2000", "0030", "undead", "regular", "Skeletal Cynder"},
 
 {"100", "6400", "0030", "air", "giant", "Jet Vac"},
 --{"32", "2000", "0030", "undead", "regular", "Skeletal Cynder"},
 
 {"100", "6400", "0030", "air", "giant", "Jet Vac"},

+--{"100", "6400", "0030", "air", "giant", "Full blast Jet Vac"},

 {"101", "6500", "0030", "air", "giant", "Swarm"},
 {"102", "6600", "0030", "earth", "giant", "Crusher"},
 {"103", "6700", "0030", "earth", "giant", "Flashwing"},
 {"101", "6500", "0030", "air", "giant", "Swarm"},
 {"102", "6600", "0030", "earth", "giant", "Crusher"},
 {"103", "6700", "0030", "earth", "giant", "Flashwing"},


@@ -70,14 +74,16 @@ local _names = {
 --{"107", "6b00", "0030", "water", "giant", "Admiral Thumpback"},
 {"108", "6c00", "0030", "magic", "giant", "Pop Fizz"},
 --{"108", "6c00", "0030", "magic", "giant", "Hoppity Pop Fizz"},
 --{"107", "6b00", "0030", "water", "giant", "Admiral Thumpback"},
 {"108", "6c00", "0030", "magic", "giant", "Pop Fizz"},
 --{"108", "6c00", "0030", "magic", "giant", "Hoppity Pop Fizz"},

---{"108", "6c00", "0030", "magic", "giant", "Love Potion Pop Fizz"},
+{"108", "6c00", "023c", "magic", "giant", "Love Potion Pop Fizz"},

 --{"108", "6c00", "0030", "magic", "giant", "Punch Pop Fizz"},
 --{"108", "6c00", "0030", "magic", "giant", "Punch Pop Fizz"},

+--{"108", "6c00", "0030", "magic", "giant", "Fizzy Frenzy Pop Fizz"},

 {"109", "6d00", "0030", "magic", "giant", "Nin Jini"},
 {"110", "6e00", "0030", "tech", "giant", "Bouncer"},
 {"111", "6f00", "0030", "tech", "giant", "Sprocket"},
 {"112", "7000", "0030", "life", "giant", "Tree Rex"},
 --{"112", "7000", "0030", "life", "giant", "Gnarly Tree Rex"},
 {"109", "6d00", "0030", "magic", "giant", "Nin Jini"},
 {"110", "6e00", "0030", "tech", "giant", "Bouncer"},
 {"111", "6f00", "0030", "tech", "giant", "Sprocket"},
 {"112", "7000", "0030", "life", "giant", "Tree Rex"},
 --{"112", "7000", "0030", "life", "giant", "Gnarly Tree Rex"},

-{"113", "7100", "0030", "life", "giant", "Shroomboom"}, --lightcore
+{"113", "7100", "0030", "life", "giant", "Shroomboom"},
+--{"113", "7100", "0030", "life", "giant", "Sure shot Shroomboom"},

 {"114", "7200", "0030", "undead", "giant", "Eye Broawl"},
 {"115", "7300", "0030", "undead", "giant", "Fright Rider"},
 
 {"114", "7200", "0030", "undead", "giant", "Eye Broawl"},
 {"115", "7300", "0030", "undead", "giant", "Fright Rider"},
 


@@ -174,8 +180,8 @@ local _names = {
 {"304", "3001", "0030", "none", "location", "Volcanic Vault"},
 {"305", "3101", "0030", "none", "location", "Mirror Of Mystery"},
 {"306", "3201", "0030", "none", "location", "Nightmare Express"},
 {"304", "3001", "0030", "none", "location", "Volcanic Vault"},
 {"305", "3101", "0030", "none", "location", "Mirror Of Mystery"},
 {"306", "3201", "0030", "none", "location", "Nightmare Express"},

-{"307", "3301", "0030", "none", "location", "Sunscraper Spire"},
-{"308", "3401", "0030", "none", "location", "Midnight Museum"},
+{"307", "3301", "0030", "light", "location", "Sunscraper Spire"},
+{"308", "3401", "0030", "dark", "location", "Midnight Museum"},

 
 {"404", "9401", "0030", "earth", "legendary","Bash"},
 {"416", "a001", "0030", "magic", "legendary", "Spyro"},
 
 {"404", "9401", "0030", "earth", "legendary","Bash"},
 {"416", "a001", "0030", "magic", "legendary", "Spyro"},


@@ -199,13 +205,13 @@ local _names = {
        --{"", "", "0030", "", "legendary", "zoo lou"}, 
        
 {"450", "c201", "0030", "air", "trapmaster", "Gusto"},
        --{"", "", "0030", "", "legendary", "zoo lou"}, 
        
 {"450", "c201", "0030", "air", "trapmaster", "Gusto"},

-{"450", "c201", "0234", "air", "trapmaster", "Special Gusto"},
+--{"450", "c201", "0234", "air", "trapmaster", "Special Gusto"},

 {"451", "c301", "0030", "air", "trapmaster", "Thunderbolt"},
 {"451", "c301", "0030", "air", "trapmaster", "Thunderbolt"},

-{"451", "c301", "0234", "air", "trapmaster", "Special Thunderbolt"},
+--{"451", "c301", "0234", "air", "trapmaster", "Special Thunderbolt"},

 {"452", "c401", "0030", "air", "regular", "Fling Kong"},
 {"453", "c501", "0030", "air", "regular", "Blades"},
 {"454", "c601", "0030", "earth", "trapmaster", "Wallop"},
 {"452", "c401", "0030", "air", "regular", "Fling Kong"},
 {"453", "c501", "0030", "air", "regular", "Blades"},
 {"454", "c601", "0030", "earth", "trapmaster", "Wallop"},

-{"454", "c601", "0234", "earth", "trapmaster", "Special Wallop"},
+--{"454", "c601", "0234", "earth", "trapmaster", "Special Wallop"},

 {"455", "c701", "0030", "earth", "trapmaster", "Head Rush"},
 {"455", "c701", "0234", "earth", "trapmaster", "Nitro Head Rush"},
 {"456", "c801", "0030", "earth", "regular", "Fist Bump"},
 {"455", "c701", "0030", "earth", "trapmaster", "Head Rush"},
 {"455", "c701", "0234", "earth", "trapmaster", "Nitro Head Rush"},
 {"456", "c801", "0030", "earth", "regular", "Fist Bump"},


@@ -214,37 +220,38 @@ local _names = {
 {"458", "ca01", "0030", "fire", "trapmaster", "Wildfire"},
 {"458", "ca01", "0234", "fire", "trapmaster", "Dark Wildfire"},
 {"459", "cb01", "0030", "fire", "trapmaster", "Ka Boom"},
 {"458", "ca01", "0030", "fire", "trapmaster", "Wildfire"},
 {"458", "ca01", "0234", "fire", "trapmaster", "Dark Wildfire"},
 {"459", "cb01", "0030", "fire", "trapmaster", "Ka Boom"},

-{"459", "cb01", "0234", "fire", "trapmaster", "Special Ka Boom"},
+--{"459", "cb01", "0234", "fire", "trapmaster", "Special Ka Boom"},

 {"460", "cc01", "0030", "fire", "regular", "Trail Blazer"},
 {"461", "cd01", "0030", "fire", "regular", "Torch"},
 {"462", "ce01", "0030", "water", "trapmaster", "Snap Shot"},
 {"462", "ce01", "0234", "water", "trapmaster", "Dark Snap Shot"},
 {"460", "cc01", "0030", "fire", "regular", "Trail Blazer"},
 {"461", "cd01", "0030", "fire", "regular", "Torch"},
 {"462", "ce01", "0030", "water", "trapmaster", "Snap Shot"},
 {"462", "ce01", "0234", "water", "trapmaster", "Dark Snap Shot"},

---, "water", "trapmaster", "Instant Snap Shot"},
+{"462", "6c00", "023c", "water", "trapmaster", "Instant Snap Shot"},

 --, "water", "trapmaster", "Merry Snap Shot"},
 {"463", "cf01", "0030", "water", "trapmaster", "Lob Star"},
 {"463", "cf01", "0234", "water", "trapmaster", "Winterfest Lob Star"},
 {"464", "d001", "0030", "water", "regular", "Flip Wreck"},
 {"465", "d101", "0030", "water", "regular", "Echo"},
 {"466", "d201", "0030", "magic", "trapmaster", "Blastermind"},
 --, "water", "trapmaster", "Merry Snap Shot"},
 {"463", "cf01", "0030", "water", "trapmaster", "Lob Star"},
 {"463", "cf01", "0234", "water", "trapmaster", "Winterfest Lob Star"},
 {"464", "d001", "0030", "water", "regular", "Flip Wreck"},
 {"465", "d101", "0030", "water", "regular", "Echo"},
 {"466", "d201", "0030", "magic", "trapmaster", "Blastermind"},

-{"466", "d201", "0234", "magic", "trapmaster", "Special Blastermind"},
+--{"466", "d201", "0234", "magic", "trapmaster", "Special Blastermind"},

 {"467", "d301", "0030", "magic", "trapmaster", "Enigma"},
 {"467", "d301", "0030", "magic", "trapmaster", "Enigma"},

-{"467", "d301", "0234", "magic", "trapmaster", "Special Enigma"},
+--{"467", "d301", "0234", "magic", "trapmaster", "Special Enigma"},

 {"468", "d401", "0030", "magic", "regular", "Deja Vu"},
 {"469", "d501", "0030", "magic", "regular", "Cobra Cadabra"},
 --{"469", "d501", "0030", "magic", "regular", "Charming Cobra Cadabra"},
 --{"469", "d501", "0030", "magic", "regular", "King Cobra Cadabra"},
 {"470", "d601", "0030", "tech", "trapmaster", "Jawbreaker"},
 {"468", "d401", "0030", "magic", "regular", "Deja Vu"},
 {"469", "d501", "0030", "magic", "regular", "Cobra Cadabra"},
 --{"469", "d501", "0030", "magic", "regular", "Charming Cobra Cadabra"},
 --{"469", "d501", "0030", "magic", "regular", "King Cobra Cadabra"},
 {"470", "d601", "0030", "tech", "trapmaster", "Jawbreaker"},

-{"470", "d601", "0234", "tech", "trapmaster", "Special Jawbreaker"},
+--{"470", "d601", "0234", "tech", "trapmaster", "Special Jawbreaker"},

 --{"470", "d601", "0234", "tech", "trapmaster", "Knockout Jawbreaker"},
 {"471", "d701", "0030", "tech", "trapmaster", "Gearshift"},
 --{"470", "d601", "0234", "tech", "trapmaster", "Knockout Jawbreaker"},
 {"471", "d701", "0030", "tech", "trapmaster", "Gearshift"},

-{"471", "d701", "0234", "tech", "trapmaster", "Special Gearshift"},
+--{"471", "d701", "0234", "tech", "trapmaster", "Special Gearshift"},

 {"472", "d801", "0030", "tech", "regular", "Chopper"},
 {"473", "d901", "0030", "tech", "regular", "Tread Head"},
 {"474", "da01", "0030", "life", "trapmaster", "Bushwhack"},
 {"472", "d801", "0030", "tech", "regular", "Chopper"},
 {"473", "d901", "0030", "tech", "regular", "Tread Head"},
 {"474", "da01", "0030", "life", "trapmaster", "Bushwhack"},

-{"474", "da01", "0234", "life", "trapmaster", "Special Bushwhack"},
+--{"474", "da01", "0234", "life", "trapmaster", "Special Bushwhack"},

 {"475", "db01", "0030", "life", "trapmaster", "Tuff Luck"},
 {"475", "db01", "0030", "life", "trapmaster", "Tuff Luck"},

-{"475", "db01", "0234", "life", "trapmaster", "Special Tuff Luck"},
+--{"475", "db01", "0234", "life", "trapmaster", "Special Tuff Luck"},

 {"476", "dc01", "0030", "life", "regular", "Food Fight"},
 {"476", "dc01", "0030", "life", "regular", "Food Fight"},

+{"476", "dc01", "0612", "life", "regular", "LightCore Food Fight"},

 --{"476", "dc01", "0030", "life", "regular", "Dark Food Fight"},
 --{"476", "dc01", "0030", "life", "regular", "Frosted Food Fight"},
 --{"476", "dc01", "0030", "life", "regular", "Instant Food Fight"},
 --{"476", "dc01", "0030", "life", "regular", "Dark Food Fight"},
 --{"476", "dc01", "0030", "life", "regular", "Frosted Food Fight"},
 --{"476", "dc01", "0030", "life", "regular", "Instant Food Fight"},


@@ -252,46 +259,56 @@ local _names = {
 {"478", "de01", "0030", "undead", "trapmaster", "Krypt King"},
 {"478", "de01", "0234", "undead", "trapmaster", "Nitro Krypt King"},
 {"479", "df01", "0030", "undead", "trapmaster", "Short Cut"},
 {"478", "de01", "0030", "undead", "trapmaster", "Krypt King"},
 {"478", "de01", "0234", "undead", "trapmaster", "Nitro Krypt King"},
 {"479", "df01", "0030", "undead", "trapmaster", "Short Cut"},

-{"479", "df01", "0234", "undead", "trapmaster", "Special Short Cut"},
+--{"479", "df01", "0234", "undead", "trapmaster", "Special Short Cut"},

 {"480", "e001", "0030", "undead", "regular", "Bat Spin"},
 {"481", "e101", "0030", "undead", "regular", "Funny Bone"},
 {"480", "e001", "0030", "undead", "regular", "Bat Spin"},
 {"481", "e101", "0030", "undead", "regular", "Funny Bone"},

+{"481", "e101", "0612", "undead", "regular", "LightCore Funny Bone"},

 --{"481", "e101", "0030", "undead", "regular", "Fortune Funny Bone"},
 {"482", "e201", "0030", "light", "trapmaster", "Knight light"},
 --{"481", "e101", "0030", "undead", "regular", "Fortune Funny Bone"},
 {"482", "e201", "0030", "light", "trapmaster", "Knight light"},

-{"482", "e201", "0234", "light", "trapmaster", "Special Knight light"},
+--{"482", "e201", "0234", "light", "trapmaster", "Special Knight light"},

 {"483", "e301", "0030", "light", "regular", "Spotlight"},
 {"483", "e301", "0030", "light", "regular", "Spotlight"},

-{"483", "e301", "0234", "light", "regular", "Special Spotlight"},
+--{"483", "e301", "0234", "light", "regular", "Special Spotlight"},

 {"484", "e401", "0030", "dark", "trapmaster", "Knight Mare"},
 {"484", "e401", "0030", "dark", "trapmaster", "Knight Mare"},

-{"484", "e401", "0234", "dark", "trapmaster", "Special Knight Mare"},
+--{"484", "e401", "0234", "dark", "trapmaster", "Special Knight Mare"},

 {"485", "e501", "0030", "dark", "regular", "Blackout"},
 {"485", "e501", "0030", "dark", "regular", "Blackout"},

-{"485", "e501", "0234", "dark", "regular", "Special Blackout"},
+--{"485", "e501", "0234", "dark", "regular", "Special Blackout"},

 
 

+-- MINI's

 {"502", "f601", "0030", "earth", "mini", "Bop"},
 {"502", "f601", "0030", "earth", "mini", "Bop"},

-{"503", "f701", "0030", "magic", "mini", "Spry"},
-{"504", "f801", "0030", "undead", "mini", "Hijinx"},

 {"505", "f901", "0030", "earth", "mini", "Terrabite"},
 {"505", "f901", "0030", "earth", "mini", "Terrabite"},

+

 {"506", "fa01", "0030", "air", "mini", "Breeze"},
 {"506", "fa01", "0030", "air", "mini", "Breeze"},

-{"507", "fb01", "0030", "fire", "mini", "Weeruptor"},
---{"507", "fb01", "0030", "fire", "mini", "Eggsellent Weeruptor"},

 {"508", "fc01", "0030", "air", "mini", "Pet Vac"},
 --{"508", "fc01", "0030", "air", "mini", "Power Punch Pet Vac"},
 {"508", "fc01", "0030", "air", "mini", "Pet Vac"},
 --{"508", "fc01", "0030", "air", "mini", "Power Punch Pet Vac"},

+
+{"507", "fb01", "0030", "fire", "mini", "Weeruptor"},
+--{"507", "fb01", "0030", "fire", "mini", "Eggsellent Weeruptor"},

 {"509", "fd01", "0030", "fire", "mini", "Small Fry"},
 {"509", "fd01", "0030", "fire", "mini", "Small Fry"},

+

 {"510", "fe01", "0030", "tech", "mini", "Drobit"},
 {"510", "fe01", "0030", "tech", "mini", "Drobit"},

-{"514", "0202", "0030", "water", "mini", "Gill Runt"},

 {"519", "0702", "0030", "tech", "mini", "Trigger Snappy"},
 {"519", "0702", "0030", "tech", "mini", "Trigger Snappy"},

+

 {"526", "0e02", "0030", "life", "mini", "Whisper Elf"},
 {"540", "1c02", "0030", "life", "mini", "Barkley"},
 --{"540", "1c02", "0030", "life", "mini", "Gnarly Barkley"},
 {"526", "0e02", "0030", "life", "mini", "Whisper Elf"},
 {"540", "1c02", "0030", "life", "mini", "Barkley"},
 --{"540", "1c02", "0030", "life", "mini", "Gnarly Barkley"},

+

 {"541", "1d02", "0030", "water", "mini", "Thumpling"},
 {"541", "1d02", "0030", "water", "mini", "Thumpling"},

+{"514", "0202", "0030", "water", "mini", "Gill Runt"},
+

 {"542", "1e02", "0030", "magic", "mini", "mini Jini"},
 {"542", "1e02", "0030", "magic", "mini", "mini Jini"},

+{"503", "f701", "0030", "magic", "mini", "Spry"},
+
+{"504", "f801", "0030", "undead", "mini", "Hijinx"},

 {"543", "1f02", "0030", "undead", "mini", "Eye Small"},
 
 {"543", "1f02", "0030", "undead", "mini", "Eye Small"},
 

-{"3000", "b80b", "0030", "air", "SWAPFORCE", "Scratch"},
+{"3000", "b80b", "0030", "air", "mini", "Scratch", "SWAPFORCE"},

 {"3001", "b90b", "0030", "air", "SWAPFORCE", "Pop Thorn"},
 --{"3001", "b90b", "0030", "air", "SWAPFORCE", "Buttered Pop Thorn"},
 {"3002", "ba0b", "0030", "earth", "SWAPFORCE", "Slobber Tooth"},
 --{"3002", "ba0b", "0030", "earth", "SWAPFORCE", "Dark Slobber Tooth"},
 --{"3002", "ba0b", "0030", "earth", "SWAPFORCE", "Sundae Slobber Tooth"},
 {"3003", "bb0b", "0030", "earth", "SWAPFORCE", "Scorp"},
 {"3001", "b90b", "0030", "air", "SWAPFORCE", "Pop Thorn"},
 --{"3001", "b90b", "0030", "air", "SWAPFORCE", "Buttered Pop Thorn"},
 {"3002", "ba0b", "0030", "earth", "SWAPFORCE", "Slobber Tooth"},
 --{"3002", "ba0b", "0030", "earth", "SWAPFORCE", "Dark Slobber Tooth"},
 --{"3002", "ba0b", "0030", "earth", "SWAPFORCE", "Sundae Slobber Tooth"},
 {"3003", "bb0b", "0030", "earth", "SWAPFORCE", "Scorp"},

+{"3004", "bc0b", "0030", "fire", "SWAPFORCE", "Fryno"},

 {"3004", "bc0b", "0138", "fire", "SWAPFORCE", "Hog Wild Fryno"},
 --{"3004", "bc0b", "0138", "fire", "SWAPFORCE", "Flip flop Fryno"},
 {"3005", "bd0b", "0030", "fire", "SWAPFORCE", "Smolderdash"},
 {"3004", "bc0b", "0138", "fire", "SWAPFORCE", "Hog Wild Fryno"},
 --{"3004", "bc0b", "0138", "fire", "SWAPFORCE", "Flip flop Fryno"},
 {"3005", "bd0b", "0030", "fire", "SWAPFORCE", "Smolderdash"},


@@ -300,7 +317,7 @@ local _names = {
 {"3007", "bf0b", "0030", "life", "SWAPFORCE", "Zoo Lou"},
 {"3008", "c00b", "0030", "magic", "SWAPFORCE", "Dune Bug"},
 {"3009", "c10b", "0030", "magic", "SWAPFORCE", "Star Strike"},
 {"3007", "bf0b", "0030", "life", "SWAPFORCE", "Zoo Lou"},
 {"3008", "c00b", "0030", "magic", "SWAPFORCE", "Dune Bug"},
 {"3009", "c10b", "0030", "magic", "SWAPFORCE", "Star Strike"},

-{--"3009", "c10b", "0030", "magic", "SWAPFORCE", "Enchanted Star Strike"},
+--{"3009", "c10b", "0030", "magic", "SWAPFORCE", "Enchanted Star Strike"},

 --{"3009", "c10b", "0030", "magic", "SWAPFORCE", "Mystic Star Strike"},
 {"3010", "c20b", "0030", "tech", "SWAPFORCE", "Countdown"},
 --{"3010", "c20b", "0030", "tech", "SWAPFORCE", "Kickoff Countdown"},
 --{"3009", "c10b", "0030", "magic", "SWAPFORCE", "Mystic Star Strike"},
 {"3010", "c20b", "0030", "tech", "SWAPFORCE", "Countdown"},
 --{"3010", "c20b", "0030", "tech", "SWAPFORCE", "Kickoff Countdown"},


@@ -311,18 +328,50 @@ local _names = {
 {"3013", "c50b", "0030", "undead", "SWAPFORCE", "Grim Creeper"},
 {"3014", "c60b", "0030", "water", "SWAPFORCE", "Rip Tide"},
 {"3015", "c70b", "0030", "water", "SWAPFORCE", "Punk Shock"},
 {"3013", "c50b", "0030", "undead", "SWAPFORCE", "Grim Creeper"},
 {"3014", "c60b", "0030", "water", "SWAPFORCE", "Rip Tide"},
 {"3015", "c70b", "0030", "water", "SWAPFORCE", "Punk Shock"},

+
+--{"", "", "0030", "water", "SWAPFORCE", "Hoot Loop"},
+--{"", "", "0030", "water", "SWAPFORCE", "Trap Shadow"},
+--{"", "", "0030", "water", "SWAPFORCE", "Wash Buckler"},
+--{"", "", "0030", "water", "SWAPFORCE", "Freeze Blade"},
+--{"", "", "0030", "fire", "SWAPFORCE", "Magna Charge"},
+--{"", "", "0030", "fire", "SWAPFORCE", "Spy Rise"},
+
+--{"", "", "0030", "fire", "SWAPFORCE", "Doom Stone"},
+--{"", "", "0030", "fire", "SWAPFORCE", "Rubble Rouser"},
+
+--{"", "", "0030", "fire", "SWAPFORCE", "Blast Zone"}
+--{"", "", "0030", "fire", "SWAPFORCE", "Fire Kraken"},
+
+--{"", "", "0030", "fire", "SWAPFORCE", "Rattle Shake"},
+--{"", "", "0030", "fire", "SWAPFORCE", "Night Shift"},
+
+--{"", "", "0030", "life", "SWAPFORCE", "Stink Bomb"},
+--{"", "", "0030", "life", "SWAPFORCE", "Grilla Drilla"},
+
+--{"", "", "0030", "air", "SWAPFORCE", "Free Ranger"},
+--{"", "", "0030", "air", "SWAPFORCE", "Boom Jet"},
+

 }
 
 local function find( main, sub)
 }
 
 local function find( main, sub)

-    
+    main = main:lower()
+       sub = sub:lower()

     for k, v in pairs(_names) do
     for k, v in pairs(_names) do

-               if ( v[2] == main  and v[3] == sub) then
+               if ( v[2]:lower()  == main  and v[3]:lower() == sub) then

                        return v
                end
        end
        return nil
 end
                        return v
                end
        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,
 
 return {
        Find = find,

+       List = list,

 }
 }