diff --git a/LUA/TFS_10/creaturescript firstitems/firstitems.lua b/LUA/TFS_10/creaturescript firstitems/firstitems.lua index c0043be..feb18c3 100644 --- a/LUA/TFS_10/creaturescript firstitems/firstitems.lua +++ b/LUA/TFS_10/creaturescript firstitems/firstitems.lua @@ -1,77 +1,72 @@ +-- With Rookgaard + +--[[ +local firstItems = {2050, 2382} + function onLogin(cid) - local storage = 30055 -- storage value - - local sorcItems = { - 2460, -- Brass helmet - 2465, -- Brass armor - 2190, -- Wand of vortex - 2511, -- Brass shield - 2478, -- Brass legs - 2643, -- Leather boots - 1988, -- Brown backpack - 2050 -- torch - } - local druidItems = { - 2460, -- Brass helmet - 2465, -- Brass armor - 2511, -- Brass shield - 2182, -- Snakebite rod - 2478, -- Brass legs - 2643, -- Leather boots - 1988, -- Brown backpack - 2050 -- torch - } - local pallyItems = { - 2460, -- Brass helmet - 2465, -- Brass armor - 2456, -- Bow - 2478, -- Brass legs - 2643, -- Leather boots - 1988, -- Brown backpack - } - local kinaItems = { - 2460, -- Brass helmet - 2465, -- Brass armor - 2511, -- Brass shield - 2412, -- Katana - 2478, -- Brass legs - 2643, -- Leather boots - 1988, -- Brown backpack - 2050 -- torch - } - - if getPlayerStorageValue(cid, storage) == -1 then - setPlayerStorageValue(cid, storage, 1) - if getPlayerVocation(cid) == 1 then - -- Sorcerer - for i = 1, table.getn(sorcItems), 1 do - doPlayerAddItem(cid, sorcItems[i], 1, FALSE) - end - - elseif getPlayerVocation(cid) == 2 then - -- Druid - for i = 1, table.getn(druidItems), 1 do - doPlayerAddItem(cid, druidItems[i], 1, FALSE) - end - - elseif getPlayerVocation(cid) == 3 then - -- Paladin - for i = 1, table.getn(pallyItems), 1 do - doPlayerAddItem(cid, pallyItems[i], 1, FALSE) - end - -- 8 arrows - doPlayerAddItem(cid, 2544, 8, FALSE) - - elseif getPlayerVocation(cid) == 4 then - -- Knight - for i = 1, table.getn(kinaItems), 1 do - doPlayerAddItem(cid, kinaItems[i], 1, FALSE) - end + local player = Player(cid) + if player:getLastLoginSaved() <= 0 then + for i = 1, #firstItems do + player:addItem(firstItems[i], 1) end - - -- Common for all - doPlayerAddItem(cid, 2674, 5, FALSE) -- 5 apples - doPlayerAddItem(cid, 2120, 1, FALSE) -- 1 rope + player:addItem(player:getSex() == 0 and 2651 or 2650, 1) + player:addItem(1987, 1) + player:addItem(2674, 1) + end + return true +end +]]-- + +-- Without Rookgaard +local config = { + [1] = { + --equipment spellbook, wand of vortex, magician's robe, mage hat, studded legs, leather boots, scarf + items = {{2175, 1}, {2190, 1}, {8819, 1}, {8820, 1}, {2468, 1}, {2643, 1}, {2661, 1}}, + --container rope, shovel, mana potion + container = {{2120, 1}, {2554, 1}, {7620, 1}} + }, + [2] = { + --equipment spellbook, snakebite rod, magician's robe, mage hat, studded legs, leather boots scarf + items = {{2175, 1}, {2182, 1}, {8819, 1}, {8820, 1}, {2468, 1}, {2643, 1}, {2661, 1}}, + --container rope, shovel, mana potion + container = {{2120, 1}, {2554, 1}, {7620, 1}} + }, + [3] = { + --equipment dwrven shield, 5 spear, ranger's cloak, ranger legs scarf, legion helmet + items = {{2525, 1}, {2389, 5}, {2660, 1}, {8923, 1}, {2643, 1}, {2661, 1}, {2480, 1}}, + --container rope, shovel, health potion, bow, 50 arrow + container = {{2120, 1}, {2554, 1}, {7618, 1}, {2456, 1}, {2544, 50}} + }, + [4] = { + --equipment dwarven shield, steel axe, brass armor, brass helmet, brass legs scarf + items = {{2525, 1}, {8601, 1}, {2465, 1}, {2460, 1}, {2478, 1}, {2643, 1}, {2661, 1}}, + --container jagged sword, daramian mace, rope, shovel, health potion + container = {{8602, 1}, {2439, 1}, {2120, 1}, {2554, 1}, {7618, 1}} + } +} + +function onLogin(cid) + local player = Player(cid) + local targetVocation = config[player:getVocation():getId()] + if not targetVocation then + return true + end + + if player:getLastLoginSaved() ~= 0 then + return true + end + + for i = 1, #targetVocation.items do + player:addItem(targetVocation.items[i][1], targetVocation.items[i][2]) + end + + local backpack = player:addItem(1988) + if not backpack then + return true + end + + for i = 1, #targetVocation.container do + backpack:addItem(targetVocation.container[i][1], targetVocation.container[i][2]) end return true end diff --git a/LUA/TFS_10/creaturescript playerdeath/playerdeath.lua b/LUA/TFS_10/creaturescript playerdeath/playerdeath.lua index afb2d26..f4fda49 100644 --- a/LUA/TFS_10/creaturescript playerdeath/playerdeath.lua +++ b/LUA/TFS_10/creaturescript playerdeath/playerdeath.lua @@ -86,11 +86,11 @@ function onDeath(cid, corpse, killer, mostDamage, unjustified, mostDamage_unjust end if guildKills1 >= fragLimit or guildKills2 >= fragLimit then - broadcastMessage(string.format("%s has just won the war against %s.", killerGuild:getName(), playerGuild:getName()), MESSAGE_EVENT_ADVANCE) + Game.broadcastMessage(string.format("%s has just won the war against %s.", killerGuild:getName(), playerGuild:getName()), MESSAGE_EVENT_ADVANCE) db.query("UPDATE `guild_wars` SET `status` = 4, `ended` = " .. os.time() .. " WHERE `status` = 1 AND `id` = " .. warId) end end end end end -end \ No newline at end of file +end diff --git a/LUA/TFS_10/other.md/powergamers.lua b/LUA/TFS_10/other.md/powergamers.lua index fefe591..06af3b0 100644 --- a/LUA/TFS_10/other.md/powergamers.lua +++ b/LUA/TFS_10/other.md/powergamers.lua @@ -1,6 +1,7 @@ + function onThink(interval, lastExecution, thinkInterval) - if (tonumber(os.date("%d")) ~= getGlobalStorageValue(23856)) then - setGlobalStorageValue(23856, (tonumber(os.date("%d")))) + if tonumber(os.date("%d")) ~= Game.getStorageValue(23856) then + Game.setStorageValue(23856, (tonumber(os.date("%d")))) db.query("UPDATE `znote_players` SET `onlinetime7`=`onlinetime6`, `onlinetime6`=`onlinetime5`, `onlinetime5`=`onlinetime4`, `onlinetime4`=`onlinetime3`, `onlinetime3`=`onlinetime2`, `onlinetime2`=`onlinetime1`, `onlinetime1`=`onlinetimetoday`, `onlinetimetoday`=0;") db.query("UPDATE `znote_players` `z` INNER JOIN `players` `p` ON `p`.`id`=`z`.`player_id` SET `z`.`exphist7`=`z`.`exphist6`, `z`.`exphist6`=`z`.`exphist5`, `z`.`exphist5`=`z`.`exphist4`, `z`.`exphist4`=`z`.`exphist3`, `z`.`exphist3`=`z`.`exphist2`, `z`.`exphist2`=`z`.`exphist1`, `z`.`exphist1`=`p`.`experience`-`z`.`exphist_lastexp`, `z`.`exphist_lastexp`=`p`.`experience`;") end diff --git a/LUA/TFS_10/talkaction report system/adminreport.lua b/LUA/TFS_10/talkaction report system/adminreport.lua index ce45712..43c9b16 100644 --- a/LUA/TFS_10/talkaction report system/adminreport.lua +++ b/LUA/TFS_10/talkaction report system/adminreport.lua @@ -1,21 +1,19 @@ -- -- Coded by Dark ShaoOz, modified by Znote function onSay(cid, words, param, channel) - local storage = 6708 -- (You can change the storage if its already in use) - local delaytime = 30 -- (Exhaust In Seconds.) - local x = getPlayerPosition(cid).x -- (Do not edit this.) - local y = getPlayerPosition(cid).y -- (Do not edit this.) - local z = getPlayerPosition(cid).z -- (Do not edit this.) - if(param == '') then - doPlayerSendTextMessage(cid, MESSAGE_STATUS_CONSOLE_ORANGE, "Command param required.") + local player = Player(cid) + local storage = 6708 -- You can change the storage if its already in use + local delaytime = 30 -- Exhaust In Seconds. + if param == '' then + player:sendTextMessage(MESSAGE_STATUS_CONSOLE_ORANGE, "Command param required.") return true end - if (getPlayerStorageValue(cid, storage) <= os.time()) then - doPlayerSendTextMessage(cid, MESSAGE_INFO_DESCR, "Your report has been received successfully!") - db.query("INSERT INTO `znote_player_reports` (`id` ,`name` ,`posx` ,`posy` ,`posz` ,`report_description` ,`date`)VALUES (NULL , '" .. getPlayerName(cid) .. "', '" .. x .. "', '" .. y .. "', '" .. z .. "', " .. db.escapeString(param) .. ", '" .. os.time() .. "')") - setPlayerStorageValue(cid,storage,os.time()+delaytime) + if player:getStorageValue(storage) <= os.time() then + player:sendTextMessage(MESSAGE_INFO_DESCR, "Your report has been received successfully!") + db.query("INSERT INTO `znote_player_reports` (`id` ,`name` ,`posx` ,`posy` ,`posz` ,`report_description` ,`date`)VALUES (NULL , '" .. player:getName() .. "', '" .. player:getPosition().x .. "', '" .. player:getPosition().y .. "', '" .. player:getPosition().z .. "', " .. db.escapeString(param) .. ", '" .. os.time() .. "')") + player:setStorageValue(storage, os.time() + delaytime) else - doPlayerSendTextMessage(cid, MESSAGE_STATUS_WARNING, "You have to wait "..getPlayerStorageValue(cid, storage) - os.time().." seconds to report again.") + player:sendTextMessage(MESSAGE_STATUS_WARNING, "You have to wait " .. player:getStorageValue(storage) - os.time() .. " seconds to report again.") end - return TRUE -end \ No newline at end of file + return true +end diff --git a/LUA/TFS_10/talkaction shopsystem/znoteshop.lua b/LUA/TFS_10/talkaction shopsystem/znoteshop.lua index 518fc03..ef0342a 100644 --- a/LUA/TFS_10/talkaction shopsystem/znoteshop.lua +++ b/LUA/TFS_10/talkaction shopsystem/znoteshop.lua @@ -2,14 +2,14 @@ function onSay(cid, words, param) local storage = 54073 -- Make sure to select non-used storage. This is used to prevent SQL load attacks. local cooldown = 15 -- in seconds. - - if getPlayerStorageValue(cid, storage) <= os.time() then - setPlayerStorageValue(cid, storage, os.time() + cooldown) - local accid = getAccountNumberByPlayerName(getCreatureName(cid)) - + local player = Player(cid) + + if player:getStorageValue(storage) <= os.time() then + player:setStorageValue(storage, os.time() + cooldown) + -- Create the query - local orderQuery = db.storeQuery("SELECT `id`, `type`, `itemid`, `count` FROM `znote_shop_orders` WHERE `account_id` = " .. accid .. " LIMIT 1;") - + local orderQuery = db.storeQuery("SELECT `id`, `type`, `itemid`, `count` FROM `znote_shop_orders` WHERE `account_id` = " .. player:getAccountId() .. " LIMIT 1;") + -- Detect if we got any results if orderQuery ~= false then -- Fetch order values @@ -18,19 +18,17 @@ function onSay(cid, words, param) local q_itemid = result.getDataInt(orderQuery, "itemid") local q_count = result.getDataInt(orderQuery, "count") result.free(orderQuery) - + -- ORDER TYPE 1 (Regular item shop products) if q_type == 1 then -- Get wheight - local playerCap = getPlayerFreeCap(cid) - local itemweight = getItemWeight(q_itemid, q_count) - if playerCap >= itemweight then - db.query("DELETE FROM `znote_shop_orders` WHERE `id` = " .. q_id .. ";") - doPlayerAddItem(cid, q_itemid, q_count) - doPlayerSendTextMessage(cid, MESSAGE_INFO_DESCR, "Congratulations! You have recieved ".. q_count .." "..getItemName(q_itemid).."(s)!") - else - doPlayerSendTextMessage(cid, MESSAGE_STATUS_WARNING, "Need more CAP!") - end + if player:getFreeCapacity() >= ItemType(q_itemid):getWeight(q_count) then + db.query("DELETE FROM `znote_shop_orders` WHERE `id` = " .. q_id .. ";") + player:addItem(q_itemid, q_count) + player:sendTextMessage(MESSAGE_INFO_DESCR, "Congratulations! You have received " .. q_count .. " x " .. ItemType(q_itemid):getName() .. "!") + else + player:sendTextMessage(MESSAGE_STATUS_WARNING, "Need more CAP!") + end end -- Add custom order types here -- Type 2 is reserved for premium days and is handled on website, not needed here. @@ -39,11 +37,10 @@ function onSay(cid, words, param) -- if q_type == 4 then -- end else - doPlayerSendTextMessage(cid, MESSAGE_STATUS_WARNING, "You have no orders.") + player:sendTextMessage(MESSAGE_STATUS_WARNING, "You have no orders.") end - else - doPlayerSendTextMessage(cid, MESSAGE_STATUS_CONSOLE_BLUE, "Can only be executed once every "..cooldown.." seconds. Remaining cooldown: ".. getPlayerStorageValue(cid, storage) - os.time()) + player:sendTextMessage(MESSAGE_STATUS_CONSOLE_BLUE, "Can only be executed once every " .. cooldown .. " seconds. Remaining cooldown: " .. player:getStorageValue(storage) - os.time()) end return false -end \ No newline at end of file +end diff --git a/config.php b/config.php index 5fb92f7..6daf883 100644 --- a/config.php +++ b/config.php @@ -52,7 +52,7 @@ // CUSTOM SERVER STUFF \\ // ------------------- \\ // Enable / disable Questlog function (true / false) - $config['EnableQuests'] = false; + $config['EnableQuests'] = false; // array for filling questlog (Questid, max value, name, end of the quest fill 1 for the last part 0 for all others) $config['quests'] = array( @@ -113,7 +113,7 @@ array(12035,2,"The Ice Islands Quest",0), array(12036,6,"The Ice Islands Quest",1), ); - + //Achivements based on "https://github.com/PrinterLUA/FORGOTTENSERVER-ORTS/blob/master/data/lib/achievements_lib.lua" (TFS 1.0) $config['Ach'] = false; $config['achievements'] = array( @@ -123,7 +123,6 @@ 'points' => '1', //points 'img' => 'http://www.tibia-wiki.net/images/Dragon.gif', //img link or folder (example)> 'images/dragon.png' ), - 35001 => array( 'Uniwheel', 'You\'re probably one of the very few people with this classic and unique ride, hope it doesn\'t break anytime soon.', //comment @@ -131,132 +130,129 @@ 'img' => 'http://img1.wikia.nocookie.net/__cb20140214234600/tibia/en/images/e/e5/Uniwheel.gif', //img link or folder (example)> 'images/dragon.png' 'secret' => true ), - - 30001 => array( + 30001 => array( 'Allow Cookies?', 'With a perfectly harmless smile you fooled all of those wicecrackers into eating your exploding cookies. Consider a boy or girl scout outfit next time to make the trick even better.', 'points' => '10', // 1-3 points (1star), 4-6 points(2 stars), 7-9 points(3 stars), 10 points => (4 stars) 'secret' => true // show "secret" image ), - 30002 => array( + 30002 => array( 'Backpack Tourist', 'If someone lost a random thing in a random place, you\'re probably a good person to ask and go find it, even if you don\'t know what and where.', 'points' => '7' ), - 30003 => array( + 30003 => array( 'Bearhugger', 'Warm, furry and cuddly - though that same bear you just hugged would probably rip you into pieces if he had been conscious, he reminded you of that old teddy bear which always slept in your bed when you were still small.', 'points' => '4' ), - 30004 => array( + 30004 => array( 'Bone Brother', 'You\'ve joined the undead bone brothers - making death your enemy and your weapon as well. Devouring what\'s weak and leaving space for what\'s strong is your primary goal.', 'points' => '1' ), - 30005 => array( + 30005 => array( 'Chorister', 'Lalalala... you now know the cult\'s hymn sung in Liberty Bay by heart. Not that hard, considering that it mainly consists of two notes and repetitive lyrics.', 'points' => '1' ), - 30006 => array( + 30006 => array( 'Fountain of Life', 'You found and took a sip from the Fountain of Life. Thought it didn\'t grant you eternal life, you feel changed and somehow at peace.', 'points' => '1', 'secret' => true ), - 30007 => array( + 30007 => array( 'Here, Fishy Fishy!', 'Ah, the smell of the sea! Standing at the shore and casting a line is one of your favourite activities. For you, fishing is relaxing - and at the same time, providing easy food. Perfect!', 'points' => '1' ), - 30008 => array( + 30008 => array( 'Honorary Barbarian', 'You\'ve hugged bears, pushed mammoths and proved your drinking skills. And even though you have a slight hangover, a partially fractured rib and some greasy hair on your tongue, you\'re quite proud to call yourself a honorary barbarian from now on.', 'points' => '1' ), - 30009 => array( + 30009 => array( 'Huntsman', 'You\'re familiar with hunting tasks and have carried out quite a few already. A bright career as hunter for the Paw & Fur society lies ahead!', 'points' => '2' ), - 300010 => array( + 300010 => array( 'Just in Time', 'You\'re a fast runner and are good at delivering wares which are bound to decay just in the nick of time, even if you can\'t use any means of transportation or if your hands get cold or smelly in the process.', 'points' => '1' ), - 30011 => array( + 30011 => array( 'Matchmaker', 'You don\'t believe in romance to be a coincidence or in love at first sight. In fact - love potions, bouquets of flowers and cheesy poems do the trick much better than ever could. Keep those hormones flowing!', 'points' => '1', 'secret' => true ), - 30012 => array( + 30012 => array( 'Nightmare Knight', 'You follow the path of dreams and that of responsibility without self-centered power. Free from greed and selfishness, you help others without expecting a reward.', 'points' => '1', 'secret' => true ), - 30013 => array( + 30013 => array( 'Party Animal', 'Oh my god, it\'s a paaaaaaaaaaaarty! You\'re always in for fun, friends and booze and love being the center of attention. There\'s endless reasons to celebrate! Woohoo!', 'points' => '1', 'secret' => true ), - 30014 => array( + 30014 => array( 'Secret Agent', 'Pack your spy gear and get ready for some dangerous missions in service of a secret agency. You\'ve shown you want to - but can you really do it? Time will tell.', 'points' => '1', 'secret' => true ), - 30015 => array( + 30015 => array( 'Talented Dancer', 'You\'re a lord or lady of the dance - and not afraid to use your skills to impress tribal gods. One step to the left, one jump to the right, twist and shout!', 'points' => '1' ), - 30016 => array( + 30016 => array( 'Territorial', 'Your map is your friend - always in your back pocket and covered with countless marks of interesting and useful locations. One could say that you might be lost without it - but luckily there\'s no way to take it from you.', 'points' => '1' ), - 30017 => array( + 30017 => array( 'Worm Whacker', 'Weehee! Whack those worms! You sure know how to handle a big hammer.', 'points' => '1', 'secret' => true ), - 30018 => array( + 30018 => array( 'Allowance Collector', 'You certainly have your ways when it comes to acquiring money. Many of them are pink and paved with broken fragments of porcelain.', 'points' => '1' ), - 30019 => array( + 30019 => array( 'Amateur Actor', 'You helped bringing Princess Buttercup, Doctor Dumbness and Lucky the Wonder Dog to life - and will probably dream of them tonight, since you memorised your lines perfectly. What a .. special piece of.. screenplay.', 'points' => '2' ), - 30020 => array( + 30020 => array( 'Animal Activist', 'Phasellus lacinia odio dolor, in elementum mauris dapibus a. Vivamus nec gravida libero, ac pretium eros. Nam in dictum ealesuada sodales. Nullam eget ex sit amet urna fringilla molestie. Aliquam lobortis urna eros, vel elementum metus accumsan eu. Nulla porttitor in lacus vel ullamcorper.', 'points' => '2', 'secret' => true), - ); - + ); + // TFS 1.0 powergamers and top online - //Before enabling powergamers, make sure that you have added LUA files and possible cloums to your server. - //files can be found at Lua folder. - + //Before enabling powergamers, make sure that you have added LUA files and possible cloums to your server. + //files can be found at Lua folder. + $config['powergamers'] = array( 'enabled' => true, // Enable or disable page 'limit' => 20, //Number of players that it will show. ); - + $config['toponline'] = array( 'enabled' => true, // Enable or disable page 'limit' => 20, //Number of players that it will show. ); - - // Vocation ids and names. $config['vocations'] = array( 0 => 'No vocation', @@ -320,7 +316,7 @@ 'cap' => 25 ), ); - // Town ids and names: (In RME map editor, open map, click CTRL + T to view towns, their names and their IDs. + // Town ids and names: (In RME map editor, open map, click CTRL + T to view towns, their names and their IDs. // townID => 'townName' etc: ['3'=>'Thais'] $config['towns'] = array( 2 => 'Thyrfing', @@ -346,7 +342,7 @@ ); $config['war_status'] = array( - 0 => 'Pending..', + 0 => 'Pending', 1 => 'Accepted', 2 => 'Rejected', 3 => 'Cancelled', @@ -439,8 +435,8 @@ $config['salt'] = false; // Some noob 0.3.6 servers don't support salt. // Restricted names - $config['invalidNameTags'] = array("owner", "gamemaster", "hoster", "admin", "staff", "tibia", "account", "god","anal","ass","fuck","sex","hitler", "pussy","dick","rape","cm","gm","amazon","valkyrie","carrion worm","rotworm","rotworm queen","cockroach","kongra","merlkin","sibang","crystal spider","giant spider","poison spider","scorpion","spider","tarantula","achad","axeitus headbanger","bloodpaw","bovinus","colerian the barbarian","cursed gladiator","frostfur","orcus the cruel","rocky","the hairy one","avalanche","drasilla","grimgor guteater","kreebosh the exile","slim","spirit of earth","spirit of fire","spirit of water","the dark dancer","the hag","darakan the executioner","deathbringer","fallen mooh'tah master ghar","gnorre chyllson","norgle glacierbeard","svoren the mad","the masked marauder","the obliverator","the pit lord","webster","barbarian bloodwalker","barbarian brutetamer","barbarian headsplitter","barbarian skullhunter","bear","panda","polar bear","braindeath","beholder","elder beholder","gazer","chicken","dire penguin","flamingo","parrot","penguin","seagull","terror bird","bazir","infernatil","thul","munster","son of verminor","xenia","zoralurk","big boss trolliver","foreman kneebiter","mad technomancer","man in the cave","lord of the elements","the count","the plasmother","dracola","the abomination","the handmaiden","mr. punish","the countess sorrow","the imperor","massacre","apocalypse","brutus bloodbeard","deadeye devious","demodras","dharalion","fernfang","ferumbras","general murius","ghazbaran","grorlam","lethal lissy","morgaroth","necropharus","orshabaal","ron the ripper","the evil eye","the horned fox","the old widow","tiquandas revenge","apprentice sheng","dog","hellhound","war wolf","winter wolf","wolf","chakoya toolshaper","chakoya tribewarden","chakoya windcaller","blood crab","crab","frost giant","frost giantess","ice golem","yeti","acolyte of the cult","adept of the cult","enlightened of the cult","novice of the cult","ungreez","dark torturer","demon","destroyer","diabolic imp","fire devil","fury","hand of cursed fate","juggernaut","nightmare","plaguesmith","blue djinn","efreet","admin","green djinn","marid","frost dragon","wyrm","sea serpent","dragon lord","dragon","hydra","dragon hatchling","dragon lord hatchling","frost dragon hatchling","dwarf geomancer","dwarf guard","dwarf soldier","dwarf","dworc fleshhunter","dworc venomsniper","dworc voodoomaster","elephant","mammoth","elf arcanist","elf scout","elf","charged energy elemental","energy elemental","massive energy elemental","overcharged energy elemental","energy overlord","cat","lion","tiger","azure frog","coral frog","crimson frog","green frog","orchid frog","toad","jagged earth elemental","muddy earth elemental","earth elemental","massive earth elemental","earth overlord","gargoyle","stone golem","ghost","phantasm","phantasm","pirate ghost","spectre","cyclops smith","cyclops drone","behemoth","cyclops","slick water elemental","roaring water elemental","ice overlord","water elemental","massive water elemental","ancient scarab","butterfly","bug","centipede","exp bug","larva","scarab","wasp","lizard sentinel","lizard snakecharmer","lizard templar","minotaur archer","minotaur guard","minotaur mage","minotaur","squirrel","goblin demon","badger","bat","deer","the halloween hare","hyaena","pig","rabbit","silver rabbit","skunk","wisp","dark monk","monk","tha exp carrier","necromancer","priestess","orc berserker","orc leader","orc rider","orc shaman","orc spearman","orc warlord","orc warrior","orc","goblin leader","goblin scavenger","goblin","goblin assassin","assasin","bandit","black knight","hero","hunter","nomad","smuggler","stalker","poacher","wild warrior","ashmunrah","dipthrah","mahrdis","morguthis","omruc","rahemos","thalas","vashresamun","pirate buccaneer","pirate corsair","pirate cutthroat","pirate marauder","carniphila","spit nettle","fire overlord","massive fire elemental","blistering fire elemental","blazing fire elemental","fire elemental","hellfire fighter","quara constrictor scout","quara hydromancer scout","quara mantassin scout","quara pincher scout","quara predator scout","quara constrictor","quara hydromancer","quara mantassin","quara pincher","quara predator","cave rat","rat","cobra","crocodile","serpent spawn","snake","wyvern","black sheep","sheep","mimic","betrayed wraith","bonebeast","demon skeleton","lost soul","pirate skeleton","skeleton","skeleton warrior","undead dragon","defiler","slime2","slime","bog raider","ice witch","warlock","witch","bones","fluffy","grynch clan goblin","hacker","minishabaal","primitive","tibia bug","undead minion","annihilon","hellgorak","latrivan","madareth","zugurosh","ushuriel","golgordan","thornback tortoise","tortoise","eye of the seven","deathslicer","flamethrower","magicthrower","plaguethrower","poisonthrower","shredderthrower","troll champion","frost troll","island troll","swamp troll","troll","banshee","blightwalker","crypt shambler","ghoul","lich","mummy","vampire","grim reaper","frost dragon","mercenary","zathroth","goshnar","durin","demora","orc champion","dracula","alezzo","prince almirith","elf warlord","magebomb","nightmare scion"); - + $config['invalidNameTags'] = array("owner", "gamemaster", "hoster", "admin", "staff", "tibia", "account", "god", "anal", "ass", "fuck", "sex", "hitler", "pussy", "dick", "rape", "cm", "gm", "amazon", "valkyrie", "carrion worm", "rotworm", "rotworm queen", "cockroach", "kongra", "merlkin", "sibang", "crystal spider", "giant spider", "poison spider", "scorpion", "spider", "tarantula", "achad", "axeitus headbanger", "bloodpaw", "bovinus", "colerian the barbarian", "cursed gladiator", "frostfur", "orcus the cruel", "rocky", "the hairy one", "avalanche", "drasilla", "grimgor guteater", "kreebosh the exile", "slim", "spirit of earth", "spirit of fire", "spirit of water", "the dark dancer", "the hag", "darakan the executioner", "deathbringer", "fallen mooh'tah master ghar", "gnorre chyllson", "norgle glacierbeard", "svoren the mad", "the masked marauder", "the obliverator", "the pit lord", "webster", "barbarian bloodwalker", "barbarian brutetamer", "barbarian headsplitter", "barbarian skullhunter", "bear", "panda", "polar bear", "braindeath", "beholder", "elder beholder", "gazer", "chicken", "dire penguin", "flamingo", "parrot", "penguin", "seagull", "terror bird", "bazir", "infernatil", "thul", "munster", "son of verminor", "xenia", "zoralurk", "big boss trolliver", "foreman kneebiter", "mad technomancer", "man in the cave", "lord of the elements", "the count", "the plasmother", "dracola", "the abomination", "the handmaiden", "mr. punish", "the countess sorrow", "the imperor", "massacre", "apocalypse", "brutus bloodbeard", "deadeye devious", "demodras", "dharalion", "fernfang", "ferumbras", "general murius", "ghazbaran", "grorlam", "lethal lissy", "morgaroth", "necropharus", "orshabaal", "ron the ripper", "the evil eye", "the horned fox", "the old widow", "tiquandas revenge", "apprentice sheng", "dog", "hellhound", "war wolf", "winter wolf", "wolf", "chakoya toolshaper", "chakoya tribewarden", "chakoya windcaller", "blood crab", "crab", "frost giant", "frost giantess", "ice golem", "yeti", "acolyte of the cult", "adept of the cult", "enlightened of the cult", "novice of the cult", "ungreez", "dark torturer", "demon", "destroyer", "diabolic imp", "fire devil", "fury", "hand of cursed fate", "juggernaut", "nightmare", "plaguesmith", "blue djinn", "efreet", "admin", "green djinn", "marid", "frost dragon", "wyrm", "sea serpent", "dragon lord", "dragon", "hydra", "dragon hatchling", "dragon lord hatchling", "frost dragon hatchling", "dwarf geomancer", "dwarf guard", "dwarf soldier", "dwarf", "dworc fleshhunter", "dworc venomsniper", "dworc voodoomaster", "elephant", "mammoth", "elf arcanist", "elf scout", "elf", "charged energy elemental", "energy elemental", "massive energy elemental", "overcharged energy elemental", "energy overlord", "cat", "lion", "tiger", "azure frog", "coral frog", "crimson frog", "green frog", "orchid frog", "toad", "jagged earth elemental", "muddy earth elemental", "earth elemental", "massive earth elemental", "earth overlord", "gargoyle", "stone golem", "ghost", "phantasm", "phantasm", "pirate ghost", "spectre", "cyclops smith", "cyclops drone", "behemoth", "cyclops", "slick water elemental", "roaring water elemental", "ice overlord", "water elemental", "massive water elemental", "ancient scarab", "butterfly", "bug", "centipede", "exp bug", "larva", "scarab", "wasp", "lizard sentinel", "lizard snakecharmer", "lizard templar", "minotaur archer", "minotaur guard", "minotaur mage", "minotaur", "squirrel", "goblin demon", "badger", "bat", "deer", "the halloween hare", "hyaena", "pig", "rabbit", "silver rabbit", "skunk", "wisp", "dark monk", "monk", "tha exp carrier", "necromancer", "priestess", "orc berserker", "orc leader", "orc rider", "orc shaman", "orc spearman", "orc warlord", "orc warrior", "orc", "goblin leader", "goblin scavenger", "goblin", "goblin assassin", "assasin", "bandit", "black knight", "hero", "hunter", "nomad", "smuggler", "stalker", "poacher", "wild warrior", "ashmunrah", "dipthrah", "mahrdis", "morguthis", "omruc", "rahemos", "thalas", "vashresamun", "pirate buccaneer", "pirate corsair", "pirate cutthroat", "pirate marauder", "carniphila", "spit nettle", "fire overlord", "massive fire elemental", "blistering fire elemental", "blazing fire elemental", "fire elemental", "hellfire fighter", "quara constrictor scout", "quara hydromancer scout", "quara mantassin scout", "quara pincher scout", "quara predator scout", "quara constrictor", "quara hydromancer", "quara mantassin", "quara pincher", "quara predator", "cave rat", "rat", "cobra", "crocodile", "serpent spawn", "snake", "wyvern", "black sheep", "sheep", "mimic", "betrayed wraith", "bonebeast", "demon skeleton", "lost soul", "pirate skeleton", "skeleton", "skeleton warrior", "undead dragon", "defiler", "slime2", "slime", "bog raider", "ice witch", "warlock", "witch", "bones", "fluffy", "grynch clan goblin", "hacker", "minishabaal", "primitive", "tibia bug", "undead minion", "annihilon", "hellgorak", "latrivan", "madareth", "zugurosh", "ushuriel", "golgordan", "thornback tortoise", "tortoise", "eye of the seven", "deathslicer", "flamethrower", "magicthrower", "plaguethrower", "poisonthrower", "shredderthrower", "troll champion", "frost troll", "island troll", "swamp troll", "troll", "banshee", "blightwalker", "crypt shambler", "ghoul", "lich", "mummy", "vampire", "grim reaper", "frost dragon", "mercenary", "zathroth", "goshnar", "durin", "demora", "orc champion", "dracula", "alezzo", "prince almirith", "elf warlord", "magebomb", "nightmare scion"); + // Use guild logo system $config['use_guild_logos'] = true; @@ -461,7 +457,7 @@ // What client version and server port are you using on this OT? // Used for the Downloads page. - $config['client'] = 1037; // 954 = tibia 9.54 + $config['client'] = 1041; // 954 = tibia 9.54 // Download link to client. Recommended: // Select download link from remere map editor website! @@ -566,7 +562,7 @@ // BAN STUFF - Don't touch this unless you know what you are doing. // You can order the lines the way you want, from top to bot, in which order you - // wish for them to be displayed in admin panel. Just make sure key[#] represent your describtion. + // wish for them to be displayed in admin panel. Just make sure key[#] represent your description. $config['ban_type'] = array( 4 => 'NOTATION_ACCOUNT', 2 => 'NAMELOCK_PLAYER', @@ -577,7 +573,7 @@ // BAN STUFF - Don't touch this unless you know what you are doing. // You can order the lines the way you want, from top to bot, in which order you - // wish for them to be displayed in admin panel. Just make sure key[#] represent your describtion. + // wish for them to be displayed in admin panel. Just make sure key[#] represent your description. $config['ban_action'] = array( 0 => 'Notation', 1 => 'Name Report', @@ -617,7 +613,7 @@ // BAN STUFF // Ban time duration selection in admin panel - // seconds => describtion + // seconds => description $config['ban_time'] = array( 3600 => '1 hour', 21600 => '6 hours', @@ -629,7 +625,6 @@ 2592000 => '1 month', ); - // --------------- \\ // SECURITY STUFF \\ // --------------- \\ @@ -651,7 +646,6 @@ if table never gets flushed once in a while. So I highly recommend you to configure flush_ip_logs if IPs are logged. */ - $config['log_ip'] = false; // Flush IP logs each configured seconds, 60 * 15 = 15 minutes. @@ -707,7 +701,7 @@ /// PAYGOL SMS /// ////////////////// // !!! Paygol takes 60%~ of the money, and send aprox 40% to your paypal. - // You can configure paygol to send each month, then they will send money + // You can configure paygol to send each month, then they will send money // to you 1 month after recieving 50+ eur. $config['paygol'] = array( 'enabled' => true, @@ -741,7 +735,7 @@ 'requiredLevel' => 50, // Minimum level of sold character 'leastValue' => 10, // Lowest donation points a char can be sold for. 'leastTime' => 24, // In hours. False to disable. - // leastTime = Lowest duration of time an auctioned player has to be + // leastTime = Lowest duration of time an auctioned player has to be // sellable before auctioneer can claim character back. ); @@ -752,7 +746,7 @@ 'type' => 1, // 1 = item id offers, 2 = premium days [itemid ignored], 3 = sex change[itemid & count ignored], 4+ = custom. 'itemid' => 2160, // item to get in-game 'count' => 5, //if type is 2, this represents premium days - 'describtion' => "Crystal coin.", // Describtion shown on website + 'description' => "Crystal coin.", // Description shown on website 'points' => 100, // How many points this offer costs ), @@ -761,7 +755,7 @@ 'type' => 1, 'itemid' => 2392, 'count' => 1, - 'describtion' => "Fire sword.", + 'description' => "Fire sword.", 'points' => 10, ), @@ -770,7 +764,7 @@ 'type' => 2, 'itemid' => 12466, // Item to display on page 'count' => 7, - 'describtion' => "Premium membership.", + 'description' => "Premium membership.", 'points' => 25, ), @@ -779,21 +773,21 @@ 'type' => 3, 'itemid' => 12666, 'count' => 3, - 'describtion' => "Change character gender.", + 'description' => "Change character gender.", 'points' => 10, ), 5 => array( 'type' => 3, 'itemid' => 12666, 'count' => 0, - 'describtion' => "Change character gender.", + 'description' => "Change character gender.", 'points' => 20, ), 5 => array( 'type' => 4, 'itemid' => 12666, 'count' => 1, - 'describtion' => "Change character name.", + 'description' => "Change character name.", 'points' => 20, ), ); diff --git a/engine/database/connect.php b/engine/database/connect.php index 8094a68..783d1f2 100644 --- a/engine/database/connect.php +++ b/engine/database/connect.php @@ -123,7 +123,7 @@ CREATE TABLE IF NOT EXISTS `znote_shop` ( `type` int(11) NOT NULL, `itemid` int(11) DEFAULT NULL, `count` int(11) NOT NULL DEFAULT '1', - `describtion` varchar(255) NOT NULL, + `description` varchar(255) NOT NULL, `points` int(11) NOT NULL DEFAULT '10', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; diff --git a/gallery.php b/gallery.php index d439cbb..480dd1f 100644 --- a/gallery.php +++ b/gallery.php @@ -9,7 +9,7 @@ if ($logged_in === true) {
Image URL:

Image Title:

- Image Describtion:

+ Image Description:

"> echo time(); -//insertImage(2, "Yaay!", "Super describtion!", "1!pxpmul!jpg"); +//insertImage(2, "Yaay!", "Super description!", "1!pxpmul!jpg"); */?> \ No newline at end of file diff --git a/shop.php b/shop.php index 6285c59..e002428 100644 --- a/shop.php +++ b/shop.php @@ -95,7 +95,7 @@ if ($config['shop_auction']['characterAuction']) { $offers) { echo ''; - echo ''. $offers['describtion'] .''; + echo ''. $offers['description'] .''; if ($config['shop']['showImage']) echo 'img'; if ($offers['type'] == 2) echo ''. $offers['count'] .' Days'; else if ($offers['type'] == 3 && $offers['count'] == 0) echo 'Unlimited'; @@ -105,7 +105,7 @@ if ($config['shop_auction']['characterAuction']) { ?>
- +
';