diff --git a/src/client/UI/Inventories/PetInventory.lua b/src/client/UI/Inventories/PetInventory.lua index e1c911f..fd3968a 100644 --- a/src/client/UI/Inventories/PetInventory.lua +++ b/src/client/UI/Inventories/PetInventory.lua @@ -371,9 +371,13 @@ function PetInventory:_setFocusedDisplay() self._ui.RightBackground.Evolve.ImageColor3 = evolvedColor self._ui.RightBackground.Evolve.EvolveText.Text = "Evolved" else - self._ui.RightBackground.Evolve.EvolveText.Text = "Evolve (" .. details.Quantity .. "/5)" + local amountToEvolve = 5 + if selectors.getRebirthUpgradeLevel(store:getState(), player.Name, "Evolver") then + amountToEvolve = 4 + end + self._ui.RightBackground.Evolve.EvolveText.Text = `Evolve ({details.Quantity}/{amountToEvolve})` self._ui.RightBackground.PetName.TextColor3 = unableToEvolveColor - if details.Quantity > 4 then + if details.Quantity >= amountToEvolve then self._ui.RightBackground.Evolve.ImageColor3 = ableToEvolveColor else self._ui.RightBackground.Evolve.ImageColor3 = unableToEvolveColor @@ -441,7 +445,11 @@ function PetInventory:_setFocusedDisplay() self._focusedDestructor:Add(self._ui.RightBackground.Evolve.Activated:Connect(function() playSoundEffect "UIButton" - if details.Quantity > 4 then + local amountToEvolve = 5 + if selectors.getRebirthUpgradeLevel(store:getState(), player.Name, "Evolver") then + amountToEvolve = 4 + end + if details.Quantity >= amountToEvolve then Remotes.Client:Get("EvolvePet"):SendToServer(details.PetName) self:_clearFocusedDisplay() self._focusedTemplate = nil diff --git a/src/client/UI/RebirthUI.lua b/src/client/UI/RebirthUI.lua index 6ee885e..89f5126 100644 --- a/src/client/UI/RebirthUI.lua +++ b/src/client/UI/RebirthUI.lua @@ -85,7 +85,7 @@ function RebirthUI:Refresh() self._ui.Background.Passes["2xTokens"].Visible = true end self._ui.Background.Tokens.Text = `{formatter.formatNumberWithSuffix(rebirths * tokenMultiplier)} Rebirth Tokens` - self._ui.Background.Strength.Text = `{formatter.formatNumberWithCommas(1 + 0.1 * rebirths)}x Strength` + self._ui.Background.Strength.Text = `{formatter.formatNumberWithCommas(1 + 0.01 * rebirths)}x Strength` end task.spawn(RebirthUI._initialize, RebirthUI) diff --git a/src/server/Combat/Perks/Pets.lua b/src/server/Combat/Perks/Pets.lua index 4ad92b4..596b4b8 100644 --- a/src/server/Combat/Perks/Pets.lua +++ b/src/server/Combat/Perks/Pets.lua @@ -37,7 +37,7 @@ local function evolvePet(player, petName) end end - store:dispatch(actions.deletePlayerPets(player.Name, { [petName] = 5 }, true)) + store:dispatch(actions.deletePlayerPets(player.Name, { [petName] = amountToDeduct }, true)) store:dispatch(actions.givePlayerPets(player.Name, { ["Evolved " .. petName] = 1 })) if petUtils.getPet(petName):FindFirstChild "PermaLock" then diff --git a/src/server/Commands/Players/GiveAllGamepasses.lua b/src/server/Commands/Players/AwardAllGamepasses.lua similarity index 80% rename from src/server/Commands/Players/GiveAllGamepasses.lua rename to src/server/Commands/Players/AwardAllGamepasses.lua index 1219cfe..be4dcc6 100644 --- a/src/server/Commands/Players/GiveAllGamepasses.lua +++ b/src/server/Commands/Players/AwardAllGamepasses.lua @@ -1,6 +1,6 @@ return { - Name = "giveallgamepasses", - Aliases = { "gag" }, + Name = "awardallgamepasses", + Aliases = { "aag" }, Description = "Gives a player all the gamepasses.", Group = "DefaultAdmin", Args = { diff --git a/src/server/Commands/Players/GiveAllGamepassesServer.lua b/src/server/Commands/Players/AwardAllGamepassesServer.lua similarity index 100% rename from src/server/Commands/Players/GiveAllGamepassesServer.lua rename to src/server/Commands/Players/AwardAllGamepassesServer.lua diff --git a/src/server/PlayerManager/GlobalLeaderboards.lua b/src/server/PlayerManager/GlobalLeaderboards.lua index 93abbf4..5d4ef63 100644 --- a/src/server/PlayerManager/GlobalLeaderboards.lua +++ b/src/server/PlayerManager/GlobalLeaderboards.lua @@ -63,7 +63,7 @@ local function updateGlobalLeaderboardStores(): () globalLeaderboard.SetAsync, globalLeaderboard, tostring(player.UserId), - selectors.getStat(store:getState(), player.Name, statName) + math.floor(selectors.getStat(store:getState(), player.Name, statName)) ) if not selectors.isPlayerLoaded(store:getState(), player.Name) then continue diff --git a/src/server/State/Middleware/ApplyMultipliersMiddleware.lua b/src/server/State/Middleware/ApplyMultipliersMiddleware.lua index f223e92..b05e380 100644 --- a/src/server/State/Middleware/ApplyMultipliersMiddleware.lua +++ b/src/server/State/Middleware/ApplyMultipliersMiddleware.lua @@ -66,7 +66,7 @@ return function(nextDispatch, store) end if action.statName == "Strength" then - action.incrementAmount *= (1 + 0.1 * selectors.getStat( + action.incrementAmount *= (1 + 0.01 * selectors.getStat( store:getState(), action.playerName, "Rebirths"