Converted tfs 1.0 scripts to meta, removed some spaces from config and fixed a typo

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 player = Player(cid)
-	
+	if player:getLastLoginSaved() <= 0 then
-	local sorcItems = {
+		for i = 1, #firstItems do
-			2460, -- Brass helmet
+			player:addItem(firstItems[i], 1)
-			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
-		
+		player:addItem(player:getSex() == 0 and 2651 or 2650, 1)
-		elseif getPlayerVocation(cid) == 2 then
+		player:addItem(1987, 1)
-			-- Druid
+		player:addItem(2674, 1)
-			for i = 1, table.getn(druidItems), 1 do
+	end
-				doPlayerAddItem(cid, druidItems[i], 1, FALSE)
+	return true
-			end
+end
-		
+]]--
-		elseif getPlayerVocation(cid) == 3 then
+
-			-- Paladin
+-- Without Rookgaard
-			for i = 1, table.getn(pallyItems), 1 do
+local config = {
-				doPlayerAddItem(cid, pallyItems[i], 1, FALSE)
+		[1] = {
-			end
+				--equipment spellbook, wand of vortex, magician's robe, mage hat, studded legs, leather boots, scarf
-			-- 8 arrows
+				items = {{2175, 1}, {2190, 1}, {8819, 1}, {8820, 1}, {2468, 1}, {2643, 1}, {2661, 1}},
-			doPlayerAddItem(cid, 2544, 8, FALSE)
+				--container rope, shovel, mana potion
-		
+				container = {{2120, 1}, {2554, 1}, {7620, 1}}
-		elseif getPlayerVocation(cid) == 4 then
+		},
-			-- Knight
+		[2] = {
-			for i = 1, table.getn(kinaItems), 1 do
+				--equipment spellbook, snakebite rod, magician's robe, mage hat, studded legs, leather boots scarf
-				doPlayerAddItem(cid, kinaItems[i], 1, FALSE)
+				items = {{2175, 1}, {2182, 1}, {8819, 1}, {8820, 1}, {2468, 1}, {2643, 1}, {2661, 1}},
-			end
+				--container rope, shovel, mana potion
-		end
+				container = {{2120, 1}, {2554, 1}, {7620, 1}}
-		
+		},
-		-- Common for all
+		[3] = {
-		doPlayerAddItem(cid, 2674, 5, FALSE) -- 5 apples
+				--equipment dwrven shield, 5 spear, ranger's cloak, ranger legs scarf, legion helmet
-		doPlayerAddItem(cid, 2120, 1, FALSE) -- 1 rope
+				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

LUA/TFS_10/creaturescript playerdeath/playerdeath.lua

@@ -86,7 +86,7 @@ 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

LUA/TFS_10/other.md/powergamers.lua

@@ -1,6 +1,7 @@
+
 function onThink(interval, lastExecution, thinkInterval)
-	if (tonumber(os.date("%d")) ~= getGlobalStorageValue(23856)) then
+	if tonumber(os.date("%d")) ~= Game.getStorageValue(23856) then
-		setGlobalStorageValue(23856, (tonumber(os.date("%d"))))
+		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

LUA/TFS_10/talkaction report system/adminreport.lua

@@ -1,21 +1,19 @@
 -- <talkaction words="!report" separator=" " script="adminreport.lua"/>
 -- 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 player = Player(cid)
-	local delaytime = 30 -- (Exhaust In Seconds.)
+	local storage = 6708 -- You can change the storage if its already in use
-	local x = getPlayerPosition(cid).x -- (Do not edit this.)
+	local delaytime = 30 -- Exhaust In Seconds.
-	local y = getPlayerPosition(cid).y -- (Do not edit this.)
+	if param == '' then
-	local z =  getPlayerPosition(cid).z -- (Do not edit this.)
+		player:sendTextMessage(MESSAGE_STATUS_CONSOLE_ORANGE, "Command param required.")
-	if(param == '') then
-		doPlayerSendTextMessage(cid, MESSAGE_STATUS_CONSOLE_ORANGE, "Command param required.")
 		return true
 	end
-	if (getPlayerStorageValue(cid, storage) <= os.time()) then
+	if player:getStorageValue(storage) <= os.time() then
-		doPlayerSendTextMessage(cid, MESSAGE_INFO_DESCR, "Your report has been received successfully!")
+		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 ,  '" .. getPlayerName(cid) .. "',  '" .. x .. "',  '" .. y .. "',  '" .. z .. "',  " .. db.escapeString(param) .. ",  '" .. os.time() .. "')")
+		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() .. "')")
-		setPlayerStorageValue(cid,storage,os.time()+delaytime)
+		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
+	return true
 end

LUA/TFS_10/talkaction shopsystem/znoteshop.lua

@@ -2,13 +2,13 @@
 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.
+	local player = Player(cid)
 
-	if getPlayerStorageValue(cid, storage) <= os.time() then
+	if player:getStorageValue(storage) <= os.time() then
-		setPlayerStorageValue(cid, storage, os.time() + cooldown)
+		player:setStorageValue(storage, os.time() + cooldown)
-		local accid = getAccountNumberByPlayerName(getCreatureName(cid))
 
 		-- 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
@@ -22,14 +22,12 @@ function onSay(cid, words, param)
 			-- ORDER TYPE 1 (Regular item shop products)
 			if q_type == 1 then
 				-- Get wheight
-				local playerCap = getPlayerFreeCap(cid)
+				if player:getFreeCapacity() >= ItemType(q_itemid):getWeight(q_count) then
-				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)
+					player:addItem(q_itemid, q_count)
-						doPlayerSendTextMessage(cid, MESSAGE_INFO_DESCR, "Congratulations! You have recieved ".. q_count .." "..getItemName(q_itemid).."(s)!")
+					player:sendTextMessage(MESSAGE_INFO_DESCR, "Congratulations! You have received " .. q_count .. " x " .. ItemType(q_itemid):getName() .. "!")
 				else
-						doPlayerSendTextMessage(cid, MESSAGE_STATUS_WARNING, "Need more CAP!")
+					player:sendTextMessage(MESSAGE_STATUS_WARNING, "Need more CAP!")
 				end
 			end
 			-- Add custom order types 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

config.php

@@ -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,7 +130,6 @@
 	'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(
 	'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.', 
@@ -255,8 +253,6 @@
 		'limit' => 20, //Number of players that it will show.
 	);
 
-
-
 	// Vocation ids and names.
 	$config['vocations'] = array(
 		0 => 'No vocation',
@@ -346,7 +342,7 @@
 	);
 
 	$config['war_status'] = array(
-		0 => 'Pending..',
+		0 => 'Pending',
 		1 => 'Accepted',
 		2 => 'Rejected',
 		3 => 'Cancelled',
@@ -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.
@@ -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,
 		),
 	);

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 ;

gallery.php

@@ -9,7 +9,7 @@ if ($logged_in === true) {
 		<form action="" method="post">
 			Image URL:<br /><input type="text" name="image" size="70"><br />
 			Image Title:<br /><input type="text" name="title" size="70"><br />
-			Image Describtion:<br /><textarea name="desc" cols="55" rows="15"></textarea><br />
+			Image Description:<br /><textarea name="desc" cols="55" rows="15"></textarea><br />
 			<input type="submit" name="Submit" value="Post Image Article">
 		</form>
 		<?php
@@ -101,5 +101,5 @@ echo $url;
 $url = explode("!", $url);
 <a href="<?php echo 'http://'. $url[0] .'.imgland.net/'. $url[1] .'.'. $url[2]; ?>"><img src="<?php echo 'http://'. $url[0] .'.imgland.net/'. $url[1] .'.'. $url[2]; ?>" width="650"/></a>
 echo time();
-//insertImage(2, "Yaay!", "Super describtion!", "1!pxpmul!jpg");
+//insertImage(2, "Yaay!", "Super description!", "1!pxpmul!jpg");
 */?>

shop.php

@@ -95,7 +95,7 @@ if ($config['shop_auction']['characterAuction']) {
 		<?php
 		foreach ($shop_list as $key => $offers) {
 		echo '<tr class="special">';
-		echo '<td>'. $offers['describtion'] .'</td>';
+		echo '<td>'. $offers['description'] .'</td>';
 		if ($config['shop']['showImage']) echo '<td><img src="http://'. $config['shop']['imageServer'] .'/'. $offers['itemid'] .'.'. $config['shop']['imageType'] .'" alt="img"></td>';
 		if ($offers['type'] == 2) echo '<td>'. $offers['count'] .' Days</td>';
 		else if ($offers['type'] == 3 && $offers['count'] == 0) echo '<td>Unlimited</td>';
@@ -105,7 +105,7 @@ if ($config['shop_auction']['characterAuction']) {
 		?>
 		<form action="" method="POST">
 			<input type="hidden" name="buy" value="<?php echo (int)$key; ?>">
-			<input type="submit" value="  PURCHASE  "  class="needconfirmation" data-item-name="<?php echo $offers['describtion']; ?>" data-item-cost="<?php echo $offers['points']; ?>">
+			<input type="submit" value="  PURCHASE  "  class="needconfirmation" data-item-name="<?php echo $offers['description']; ?>" data-item-cost="<?php echo $offers['points']; ?>">
 		</form>
 		<?php
 		echo '</td>';