From 85b31e7e1d35337f39e1b43c94aa2ed23c877d7a Mon Sep 17 00:00:00 2001
From: Jim Shield <gothicjim@gmail.com>
Date: Mon, 29 Jan 2024 13:23:02 +0000
Subject: [PATCH] getRandomReward added for reward item support

---
 crafting.lua  | 36 ++++++++++++++++++++++++++++++++++++
 functions.lua |  4 ++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/crafting.lua b/crafting.lua
index 1d4756f..fc12490 100644
--- a/crafting.lua
+++ b/crafting.lua
@@ -518,4 +518,40 @@ function canCarry(itemTable, src)
         end
     end
     return resultTable
+end
+
+function getRandomReward(itemName) -- intended for job scripts
+    if Config.Rewards.RewardPool then
+        local reward = false
+        if type(Config.Rewards.RewardItem) == "string" then Config.Rewards.RewardItem = { Config.Rewards.RewardItem } end
+        for k, v in pairs(Config.Rewards.RewardItem) do
+            if v == itemName then reward = true break end
+        end
+        if reward then
+            removeItem(itemName, 1)
+            local totalRarity = 0
+            for i=1, #Config.Rewards.RewardPool do
+                totalRarity += Config.Rewards.RewardPool[i].rarity
+            end
+            if Config.System.Debug then
+                print("^6Bridge^7: ^3getRandomReward^7: ^2Total Rarity ^7'^6"..totalRarity.."^7'")
+            end
+
+            local randomNum = math.random(1, totalRarity)
+            if Config.System.Debug then
+                print("^6Bridge^7: ^3getRandomReward^7: ^2Random Number ^7'^6"..randomNum.."^7'")
+            end
+            local currentRarity = 0
+            for i=1, #Config.Rewards.RewardPool do
+                currentRarity += Config.Rewards.RewardPool[i].rarity
+                if randomNum <= currentRarity then
+                    if Config.System.Debug then
+                        print("^6Bridge^7: ^3getRandomReward^7: ^2Selected toy ^7'^6"..Config.Rewards.RewardPool[i].item.."^7'")
+                    end
+                    addItem(Config.Rewards.RewardPool[i].item, 1)
+                    return
+                end
+            end
+        end
+    end
 end
\ No newline at end of file
diff --git a/functions.lua b/functions.lua
index acc25c0..44ab2f2 100644
--- a/functions.lua
+++ b/functions.lua
@@ -8,7 +8,7 @@ function jobCheck(job)
 	return canDo
 end
 
-local time = 100
+local time = 1000
 function loadModel(model)
 	if not IsModelValid(model) then print("^6Bridge^7: ^1ERROR^7: ^2Model^7 - '^6"..model.."^7' ^2does not exist in server") return
 	else
@@ -588,7 +588,7 @@ function ConsumeSuccess(itemName, type)
 			AlienEffect()
 		end
 	end
-	if Config.RewardItem == itemName then addItem(Config.RewardPool[math.random(1, #Config.RewardPool)], 1) end
+	getRandomReward(itemName) -- check if a reward item should be given
 end
 
 function addItem(item, amount, info)