From 98bd51436bcba1a9136b6286ad488f6dadc7c9ed Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Thu, 7 Jan 2021 11:47:57 +0100
Subject: [PATCH] Unified naming

---
 config.php                 | 8 ++++----
 system/functions.php       | 4 ++--
 system/pages/creatures.php | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config.php b/config.php
index 1e8f99e0..64611dff 100644
--- a/config.php
+++ b/config.php
@@ -91,11 +91,11 @@ $config = array(
 	'item_images_extension' => '.gif',
 
 	// creatures
-	'creature_images_url' => 'images/monsters/', // set to images/monsters if you host your own creatures in images folder
-	'creature_images_extension' => '.gif',
-	'creature_images_preview' => false,  // set to true to allow picture previews for creatures
+	'creatures_images_url' => 'images/monsters/', // set to images/monsters if you host your own creatures in images folder
+	'creatures_images_extension' => '.gif',
+	'creatures_images_preview' => false,  // set to true to allow picture previews for creatures
 	'creatures_items_url' => 'https://tibia.fandom.com/wiki/', // set to website which shows details about items.
-	'creature_loot_percentage' => true, // set to true to show the loot tooltip percent
+	'creatures_loot_percentage' => true, // set to true to show the loot tooltip percent
 
 	// account
 	'account_management' => true, // disable if you're using other method to manage users (fe. tfs account manager)
diff --git a/system/functions.php b/system/functions.php
index 39c9381d..b715c818 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -1425,8 +1425,8 @@ function right($str, $length) {
 }
 
 function getCreatureImgPath($creature){
-	$creature_path = config('creature_images_url');
-	$creature_gfx_name = trim(strtolower($creature)) . config('creature_images_extension');
+	$creature_path = config('creatures_images_url');
+	$creature_gfx_name = trim(strtolower($creature)) . config('creatures_images_extension');
 	if (!file_exists($creature_path . $creature_gfx_name)) {
 		$creature_gfx_name = str_replace(" ", "", $creature_gfx_name);
 		if (file_exists($creature_path . $creature_gfx_name)) {
diff --git a/system/pages/creatures.php b/system/pages/creatures.php
index 9269be79..3c69c4ad 100644
--- a/system/pages/creatures.php
+++ b/system/pages/creatures.php
@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = "Creatures";
 
 if (empty($_REQUEST['creature'])) {
-	$preview = config('creature_images_preview');
+	$preview = config('creatures_images_preview');
 	$creatures = $db->query('SELECT * FROM `' . TABLE_PREFIX . 'monsters` WHERE `hidden` != 1 '.(empty($_REQUEST['boss']) ? '': 'AND `rewardboss` = 1').' ORDER BY name asc')->fetchAll();
 
 	if ($preview) {
@@ -59,7 +59,7 @@ if (empty($_REQUEST['creature'])) {
 			$item['name'] = getItemNameById($item['id']);
 			$item['rarity_chance'] = round($item['chance'] / 1000, 2);
 			$item['rarity'] = getItemRarity($item['chance']);
-			$item['tooltip'] = ucfirst($item['name']) . '<br/>Chance: ' . $item['rarity'] . (config('creature_loot_percentage') ? ' ('. $item['rarity_chance'] .'%)' : '') . '<br/>Max count: ' . $item['count'];
+			$item['tooltip'] = ucfirst($item['name']) . '<br/>Chance: ' . $item['rarity'] . (config('creatures_loot_percentage') ? ' ('. $item['rarity_chance'] .'%)' : '') . '<br/>Max count: ' . $item['count'];
 			$loot_list[] =  $item;
 		}