Reward Exercise: Adjusted validation to ignore players in Dawnport or…

… rookgard.
elsongabriel · Oct 5, 2023 · f0160ed · f0160ed
1 parent a060c21
commit f0160ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/data-otservbr-global/scripts/creaturescripts/customs/reward_exercise.lua b/data-otservbr-global/scripts/creaturescripts/customs/reward_exercise.lua
@@ -1,12 +1,10 @@
 local winReward = CreatureEvent("WinReward")
 
 function winReward.onLogin(player)
-	if configManager.getBoolean(configKeys.TOGGLE_RECEIVE_REWARD) then
+	if (configManager.getBoolean(configKeys.TOGGLE_RECEIVE_REWARD) and player:getTown():getId() >= TOWNS_LIST.AB_DENDRIEL) then
 		-- check user won exercise weapon and send message
-		if not table.contains({ TOWNS_LIST.DAWNPORT, TOWNS_LIST.DAWNPORT_TUTORIAL }, player:getTown():getId()) then
-			if player:getStorageValue(tonumber(Storage.PlayerWeaponReward)) ~= 1 then
-				player:sendTextMessage(MESSAGE_LOGIN, "You can receive an exercise weapon using command !reward")
-			end
+		if player:getStorageValue(tonumber(Storage.PlayerWeaponReward)) ~= 1 then
+			player:sendTextMessage(MESSAGE_LOGIN, "You can receive an exercise weapon using command !reward")
 		end
 	end
 	return true

diff --git a/data/scripts/talkactions/player/reward.lua b/data/scripts/talkactions/player/reward.lua
@@ -49,7 +49,7 @@ end
 
 local exerciseRewardModal = TalkAction("!reward")
 function exerciseRewardModal.onSay(player, words, param)
-	if not configManager.getBoolean(configKeys.TOGGLE_RECEIVE_REWARD) then
+	if (not configManager.getBoolean(configKeys.TOGGLE_RECEIVE_REWARD) or player:getTown():getId() < TOWNS_LIST.AB_DENDRIEL) then
 		return true
 	end
 	if player:getStorageValue(config.storage) > 0 then