diff --git a/Server.lua b/Server.lua index 1f46ef1..9b05837 100644 --- a/Server.lua +++ b/Server.lua @@ -657,10 +657,10 @@ function LootReserve.Server:Load() if versionSave < "2022-10-30" then if self.CurrentSession and self.CurrentSession.Members then for member, memberData in pairs(self.CurrentSession.Members) do - if not memberData.RollBonuses then - memberData.RollBonuses = { }; + if not memberData.RollBonus then + memberData.RollBonus = { }; for _, id in ipairs(memberData.ReservedItems) do - memberData.RollBonuses[id] = 0; + memberData.RollBonus[id] = 0; end end end @@ -1682,7 +1682,7 @@ function LootReserve.Server:StartSession() ReservesLeft = self.CurrentSession.Settings.MaxReservesPerPlayer, ReservesDelta = 0, ReservedItems = { ItemID, ItemID, ... }, - RollBonuses = { [ItemID] = 0, [ItemID] = 10, ... }, + RollBonus = { [ItemID] = 0, [ItemID] = 10, ... }, Locked = nil, OptedOut = nil, }, @@ -1733,7 +1733,7 @@ function LootReserve.Server:StartSession() ReservesLeft = self.CurrentSession.Settings.MaxReservesPerPlayer, ReservesDelta = 0, ReservedItems = { }, - RollBonuses = { }, + RollBonus = { }, Locked = nil, OptedOut = nil, }; @@ -1749,11 +1749,11 @@ function LootReserve.Server:StartSession() ReservesLeft = self.CurrentSession.Settings.MaxReservesPerPlayer, ReservesDelta = 0, ReservedItems = { }, - RollBonuses = { }, + RollBonus = { }, Locked = nil, OptedOut = nil, }; - member.RollBonuses = importedMember.RollBonuses; + member.RollBonus = importedMember.RollBonus; self.CurrentSession.Members[player] = member; for _, itemID in ipairs(importedMember.ReservedItems) do itemID = LootReserve.Data:GetToken(itemID) or itemID; @@ -3084,7 +3084,7 @@ function LootReserve.Server:PrepareRequestRoll() if not rollSubmitted then self.RequestedRoll.Players[player][i] = tonumber(roll); if not self.RequestedRoll.Custom and self.CurrentSession and self.CurrentSession.Members and self.CurrentSession.Members[player] then - self.RequestedRoll.Players[player][i] = self.RequestedRoll.Players[player][i] + self.CurrentSession.Members[player].RollBonuses[self.RequestedRoll.Item:GetID()]; + self.RequestedRoll.Players[player][i] = self.RequestedRoll.Players[player][i] + self.CurrentSession.Members[player].RollBonus[self.RequestedRoll.Item:GetID()]; end rollSubmitted = true; else diff --git a/Windows/ServerImportWindow.lua b/Windows/ServerImportWindow.lua index 1c793fe..83f76e7 100644 --- a/Windows/ServerImportWindow.lua +++ b/Windows/ServerImportWindow.lua @@ -248,12 +248,12 @@ function LootReserve.Server.Import:InputOptionsUpdated() break; end end - elseif header:find("delta") or header:find("reservebonus") then - self.Columns[i] = "Delta" + elseif header:find("delta") or header:find("reserves?%s*bonus") or header:find("bonus%s*reserves?") or header:find("extra%s*reserves?") then + self.Columns[i] = "Extra Reserves" elseif header:find("class") then self.Columns[i] = "Class"; - elseif header:find("rollbonus") then - self.Columns[i] = "RollBonus"; + elseif header:find("roll%s*bonus") then + self.Columns[i] = "Roll Bonus"; end end end @@ -335,11 +335,11 @@ function LootReserve.Server.Import:SessionSettingsUpdated() return "Only one column can be marked as \"Count\""; end end - if column == "Delta" and row[i] then + if column == "Extra Reserves" and row[i] then if not row.Delta then row.Delta = ParseNumber(row[i]); else - return "Only one column can be marked as \"Delta\""; + return "Only one column can be marked as \"Extra Reserves\""; end end if column == "Class" and row[i] then @@ -349,11 +349,11 @@ function LootReserve.Server.Import:SessionSettingsUpdated() return "Only one column can be marked as \"Class\""; end end - if column == "RollBonus" and row[i] then + if column == "Roll Bonus" and row[i] then if not row.Bonus then row.Bonus = ParseNumber(row[i]); else - return "Only one column can be marked as \"RollBonus\""; + return "Only one column can be marked as \"Roll Bonus\""; end end end @@ -426,7 +426,7 @@ function LootReserve.Server.Import:SessionSettingsUpdated() { NameMatchResult = nameMatchResult, ReservedItems = { }, - RollBonuses = { }, + RollBonus = { }, InvalidReasons = { }, ReservesDelta = nil, Class = nil, @@ -438,7 +438,7 @@ function LootReserve.Server.Import:SessionSettingsUpdated() end for i = 1, (row.Count or 1) * itemCount * playerCount do table.insert(member.ReservedItems, itemID); - member.RollBonuses[itemID] = row.Bonus or 0; + member.RollBonus[itemID] = row.Bonus or 0; itemReserveCount[itemID] = (itemReserveCount[itemID] or 0) + 1; itemReserveCountByPlayer[player] = itemReserveCountByPlayer[player] or { }; itemReserveCountByPlayer[player][itemID] = (itemReserveCountByPlayer[player][itemID] or 0) + 1; @@ -580,7 +580,7 @@ function LootReserve.Server.Import:Import() ReservesLeft = nil, ReservesDelta = 0, ReservedItems = { }, - RollBonuses = member.RollBonuses, + RollBonus = member.RollBonus, Locked = nil, OptedOut = nil, }; @@ -593,7 +593,7 @@ function LootReserve.Server.Import:Import() ReservesLeft = nil, ReservesDelta = 0, ReservedItems = { }, - RollBonuses = member.RollBonuses, + RollBonus = member.RollBonus, Locked = nil, OptedOut = nil, }; diff --git a/Windows/ServerImportWindow.xml b/Windows/ServerImportWindow.xml index a942858..bd01a9f 100644 --- a/Windows/ServerImportWindow.xml +++ b/Windows/ServerImportWindow.xml @@ -170,8 +170,8 @@ - - + +