fix: server name

opentibiabr · Dec 11, 2024 · 0634c45 · 0634c45
1 parent 6c5413f
commit 0634c45
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/data-otservbr-global/npc/testserver_assistant.lua b/data-otservbr-global/npc/testserver_assistant.lua
@@ -113,7 +113,7 @@ local function creatureSayCallback(npc, creature, type, message)
 end
 
 npcHandler:setCallback(CALLBACK_MESSAGE_DEFAULT, creatureSayCallback)
-npcHandler:setMessage(MESSAGE_GREET, "Hey |PLAYERNAME|. I'm Testserver Assistant and I can give {money}, {experience} and {blessing} which will be useful for testing on " .. configManager.getString(configKeys.SERVER_NAME) .. " server." .. " You can too to back to level 8 with {reset}.")
+npcHandler:setMessage(MESSAGE_GREET, "Hey |PLAYERNAME|. I'm Testserver Assistant and I can give {money}, {experience} and {blessing} which will be useful for testing on " .. SERVER_NAME .. " server." .. " You can too to back to level 8 with {reset}.")
 npcHandler:addModule(FocusModule:new(), npcConfig.name, true, true, true)
 
 -- npcType registering the npcConfig table

diff --git a/data/global.lua b/data/global.lua
@@ -47,11 +47,6 @@ DIRECTIONS_TABLE = {
 	DIRECTION_NORTHEAST,
 }
 
-SERVER_NAME = configManager.getString(configKeys.SERVER_NAME)
-SERVER_MOTD = configManager.getString(configKeys.SERVER_MOTD)
-
-AUTH_TYPE = configManager.getString(configKeys.AUTH_TYPE)
-
 -- Bestiary charm
 GLOBAL_CHARM_GUT = 120 -- 20% more chance to get creature products from looting
 GLOBAL_CHARM_SCAVENGE = 125 -- 25% more chance to get creature products from skinning

diff --git a/data/libs/functions/constants.lua b/data/libs/functions/constants.lua
@@ -8,3 +8,6 @@ BATHTUB_FILLED_NOTMOVABLE = 26100
 BAG_YOU_DESIRE = 34109
 PRIMAL_BAG = 39546
 BAG_YOU_COVET = 43895
+
+SERVER_NAME = configManager.getString(configKeys.SERVER_NAME)
+AUTH_TYPE = configManager.getString(configKeys.AUTH_TYPE)
diff --git a/data/scripts/eventcallbacks/player/on_report_bug.lua b/data/scripts/eventcallbacks/player/on_report_bug.lua
@@ -23,7 +23,7 @@ function callback.playerOnReportBug(player, message, position, category)
 	file:write("------------------------------\n")
 	file:close()
 
-	player:sendTextMessage(MESSAGE_EVENT_ADVANCE, string.format("Your report has been sent to %s.", configManager.getString(configKeys.SERVER_NAME)))
+	player:sendTextMessage(MESSAGE_EVENT_ADVANCE, string.format("Your report has been sent to %s.", SERVER_NAME))
 	return true
 end
 

diff --git a/data/scripts/eventcallbacks/player/on_report_rule_violation.lua b/data/scripts/eventcallbacks/player/on_report_rule_violation.lua
@@ -30,7 +30,7 @@ function callback.playerOnReportRuleViolation(player, targetName, reportType, re
 	file:write("------------------------------\n")
 	file:close()
 
-	player:sendTextMessage(MESSAGE_EVENT_ADVANCE, string.format("Thank you for reporting %s. Your report will be processed by %s team as soon as possible.", targetName, configManager.getString(configKeys.SERVER_NAME)))
+	player:sendTextMessage(MESSAGE_EVENT_ADVANCE, string.format("Thank you for reporting %s. Your report will be processed by %s team as soon as possible.", targetName, SERVER_NAME))
 end
 
 callback:register()
diff --git a/data/scripts/talkactions/player/reward.lua b/data/scripts/talkactions/player/reward.lua
@@ -31,7 +31,7 @@ local function sendExerciseRewardModal(player)
 					if item then
 						item:setActionId(IMMOVABLE_ACTION_ID)
 						item:setAttribute(ITEM_ATTRIBUTE_STORE, systemTime())
-						item:setAttribute(ITEM_ATTRIBUTE_DESCRIPTION, string.format("You won this exercise weapon as a reward to be a %s player. Use it in a dummy!\nHave a nice game..", configManager.getString(configKeys.SERVER_NAME)))
+						item:setAttribute(ITEM_ATTRIBUTE_DESCRIPTION, string.format("You won this exercise weapon as a reward to be a %s player. Use it in a dummy!\nHave a nice game..", SERVER_NAME))
 					else
 						player:sendTextMessage(MESSAGE_LOOK, "You need to have capacity and empty slots to receive.")
 						return