From cff17e78f50c9d7dc4eb8919bf7f13c5352c29bf Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Tue, 7 Apr 2015 18:02:29 +0200 Subject: [PATCH] FIX: a wrong comment inside default_toys.lua FIX: a wrong linking to default_toys.lua in tnp3 scripts. --- client/lualibs/default_toys.lua | 32 ++++++++++++++++---------------- client/scripts/tnp3clone.lua | 2 +- client/scripts/tnp3dump.lua | 2 +- client/scripts/tnp3sim.lua | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/client/lualibs/default_toys.lua b/client/lualibs/default_toys.lua index 771f51cd..64eed9b3 100644 --- a/client/lualibs/default_toys.lua +++ b/client/lualibs/default_toys.lua @@ -199,13 +199,13 @@ local _names = { --{"", "", "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", "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"}, -{"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"}, @@ -214,7 +214,7 @@ local _names = { {"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"}, @@ -226,24 +226,24 @@ local _names = { {"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", "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"}, -{"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"}, -{"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"}, -{"474", "da01", "0234", "life", "trapmaster", "Special Bushwhack"}, +--{"474", "da01", "0234", "life", "trapmaster", "Special Bushwhack"}, {"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", "Dark Food Fight"}, --{"476", "dc01", "0030", "life", "regular", "Frosted Food Fight"}, @@ -252,18 +252,18 @@ local _names = { {"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"}, --{"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", "0234", "light", "regular", "Special Spotlight"}, +--{"483", "e301", "0234", "light", "regular", "Special Spotlight"}, {"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", "0234", "dark", "regular", "Special Blackout"}, +--{"485", "e501", "0234", "dark", "regular", "Special Blackout"}, {"502", "f601", "0030", "earth", "mini", "Bop"}, {"503", "f701", "0030", "magic", "mini", "Spry"}, @@ -300,7 +300,7 @@ local _names = { {"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"}, diff --git a/client/scripts/tnp3clone.lua b/client/scripts/tnp3clone.lua index d54b7d1f..cad1ab70 100644 --- a/client/scripts/tnp3clone.lua +++ b/client/scripts/tnp3clone.lua @@ -3,7 +3,7 @@ local getopt = require('getopt') local lib14a = require('read14a') local utils = require('utils') local pre = require('precalc') -local toys = require('default_toys2') +local toys = require('default_toys') local lsh = bit32.lshift local rsh = bit32.rshift diff --git a/client/scripts/tnp3dump.lua b/client/scripts/tnp3dump.lua index 43910145..f93f9728 100644 --- a/client/scripts/tnp3dump.lua +++ b/client/scripts/tnp3dump.lua @@ -5,7 +5,7 @@ local lib14a = require('read14a') local utils = require('utils') local md5 = require('md5') local dumplib = require('html_dumplib') -local toys = require('default_toys2') +local toys = require('default_toys') example =[[ script run tnp3dump diff --git a/client/scripts/tnp3sim.lua b/client/scripts/tnp3sim.lua index 92b1cb30..af3d2d4c 100644 --- a/client/scripts/tnp3sim.lua +++ b/client/scripts/tnp3sim.lua @@ -4,7 +4,7 @@ local bin = require('bin') local lib14a = require('read14a') local utils = require('utils') local md5 = require('md5') -local toys = require('default_toys2') +local toys = require('default_toys') example =[[ 1. script run tnp3sim -- 2.39.5