Implement item: Potion of regeneration (#259)

* Implement item effect on server side * Implement Potion of Regeneration on client side * simplify * Add a few more methods * add initialization * Initialize in module * Fix typing errors * update * update * Update AnchorPoint * Include inventory = {} * Finalize item framework * just a little bit more * Use random item
EveryoneDestroysTheWorld · Sep 12, 2024 · 5e7ccce · 5e7ccce
1 parent e262ed8
commit 5e7ccce
Show file tree

Hide file tree

Showing 33 changed files with 453 additions and 141 deletions.
diff --git a/src/ReplicatedStorage/Client/Classes/Actions/DKFlightClientAction.lua b/src/ReplicatedStorage/Client/Classes/Actions/DKFlightClientAction.lua
@@ -8,7 +8,7 @@ local Players = game:GetService("Players");
 local ContextActionService = game:GetService("ContextActionService");
 local ClientAction = require(script.Parent.Parent.ClientAction);
 local React = require(ReplicatedStorage.Shared.Packages.react);
-local ActionButton = require(script.Parent.Parent.Parent.ReactComponents.ActionButton);
+local HUDButton = require(script.Parent.Parent.Parent.ReactComponents.HUDButton);
 type ClientAction = ClientAction.ClientAction;
 
 local TakeFlightAction = {
@@ -95,7 +95,9 @@ function TakeFlightAction.new(): ClientAction
 
 		end
 
-		ReplicatedStorage.Client.Functions.AddActionButton:Invoke(React.createElement(ActionButton, {
+		ReplicatedStorage.Client.Functions.AddHUDButton:Invoke("Action", React.createElement(HUDButton, {
+			type = "Action";
+			key = self.ID;
 			onActivate = function()
 
 				self:activate();

diff --git a/src/ReplicatedStorage/Client/Classes/Actions/DetachLimbClientAction.lua b/src/ReplicatedStorage/Client/Classes/Actions/DetachLimbClientAction.lua
@@ -7,7 +7,7 @@ local ContextActionService = game:GetService("ContextActionService");
 local React = require(ReplicatedStorage.Shared.Packages.react);
 local ReactRoblox = require(ReplicatedStorage.Shared.Packages["react-roblox"]);
 local ClientAction = require(script.Parent.Parent.ClientAction);
-local ActionButton = require(script.Parent.Parent.Parent.ReactComponents.ActionButton);
+local HUDButton = require(script.Parent.Parent.Parent.ReactComponents.HUDButton);
 local LimbSelectionWindow = require(script.Parent.Parent.Parent.ReactComponents.LimbSelectionWindow);
 type ClientAction = ClientAction.ClientAction;
 
@@ -73,7 +73,9 @@ function DetachLimbAction.new(): ClientAction
 
     end;
 
-    ReplicatedStorage.Client.Functions.AddActionButton:Invoke(React.createElement(ActionButton, {
+    ReplicatedStorage.Client.Functions.AddHUDButton:Invoke("Action", React.createElement(HUDButton, {
+      type = "Action";
+      key = self.ID;
       onActivate = function() activateGUI() end;
       shortcutCharacter = "L";
       iconImage = "rbxassetid://17551046771";

diff --git a/src/ReplicatedStorage/Client/Classes/Actions/DetonateDetachedLimbsClientAction.lua b/src/ReplicatedStorage/Client/Classes/Actions/DetonateDetachedLimbsClientAction.lua
@@ -6,7 +6,7 @@ local Players = game:GetService("Players");
 -- local ContextActionService = game:GetService("ContextActionService");
 local ClientAction = require(script.Parent.Parent.ClientAction);
 local React = require(ReplicatedStorage.Shared.Packages.react);
-local ActionButton = require(script.Parent.Parent.Parent.ReactComponents.ActionButton);
+local HUDButton = require(script.Parent.Parent.Parent.ReactComponents.HUDButton);
 type ClientAction = ClientAction.ClientAction;
 
 local DetonateDetachedLimbsClientAction = {
@@ -34,10 +34,12 @@ function DetonateDetachedLimbsClientAction.new(): ClientAction
 
   local function initialize(self: ClientAction)
 
-    ReplicatedStorage.Client.Functions.AddActionButton:Invoke(React.createElement(ActionButton, {
+    ReplicatedStorage.Client.Functions.AddHUDButton:Invoke("Action", React.createElement(HUDButton, {
+      type = "Action";
+      key = self.ID;
       onActivate = function() 
 
-        self:activate() 
+        self:activate();
 
       end;
       shortcutCharacter = "L";

diff --git a/src/ReplicatedStorage/Client/Classes/Actions/ExplosivePunchClientAction.lua b/src/ReplicatedStorage/Client/Classes/Actions/ExplosivePunchClientAction.lua
@@ -6,7 +6,7 @@ local Players = game:GetService("Players");
 local ContextActionService = game:GetService("ContextActionService");
 local ClientAction = require(script.Parent.Parent.ClientAction);
 local React = require(ReplicatedStorage.Shared.Packages.react);
-local ActionButton = require(script.Parent.Parent.Parent.ReactComponents.ActionButton);
+local HUDButton = require(script.Parent.Parent.Parent.ReactComponents.HUDButton);
 type ClientAction = ClientAction.ClientAction;
 
 local ExplosivePunchAction = {
@@ -19,7 +19,6 @@ local ExplosivePunchAction = {
 function ExplosivePunchAction.new(): ClientAction
 
   local player = Players.LocalPlayer;
-  local remoteName: string;
 
   local function breakdown(self: ClientAction)
 
@@ -29,13 +28,15 @@ function ExplosivePunchAction.new(): ClientAction
 
   local function activate(self: ClientAction)
 
-    ReplicatedStorage.Shared.Functions.ActionFunctions:FindFirstChild(remoteName):InvokeServer();
+    ReplicatedStorage.Shared.Functions.ActionFunctions:FindFirstChild(`{player.UserId}_{self.ID}`):InvokeServer();
 
   end;
 
   local function initialize(self: ClientAction)
 
-    ReplicatedStorage.Client.Functions.AddActionButton:Invoke(React.createElement(ActionButton, {
+    ReplicatedStorage.Client.Functions.AddHUDButton:Invoke("Action", React.createElement(HUDButton, {
+      type = "Action";
+      key = self.ID;
       onActivate = function()
 
         self:activate();
@@ -44,8 +45,6 @@ function ExplosivePunchAction.new(): ClientAction
       shortcutCharacter = "L";
       iconImage = "rbxassetid://17771917538";
     }));
-
-    remoteName = `{player.UserId}_{self.ID}`;
 
     local function checkJump(_, inputState: Enum.UserInputState)
 

diff --git a/src/ReplicatedStorage/Client/Classes/ClientItem.lua b/src/ReplicatedStorage/Client/Classes/ClientItem.lua
@@ -8,8 +8,9 @@ export type ClientItemProperties = {
   name: string;
   iconImage: string;
   description: string;
-  activate: (self: ClientItem, ...any) -> ();
+  activate: (self: ClientItem) -> ();
   breakdown: (self: ClientItem) -> ();
+  initialize: (self: ClientItem, ...any) -> ()
 };
 
 export type ClientItemEvents = {

diff --git a/src/ReplicatedStorage/Client/Classes/Items/PotionOfRegenerationClientItem.lua b/src/ReplicatedStorage/Client/Classes/Items/PotionOfRegenerationClientItem.lua
@@ -4,8 +4,12 @@
 -- Designer: InkyTheBlue (InkyTheBlue)
 -- © 2024 Beastslash
 
+local ReplicatedStorage = game:GetService("ReplicatedStorage");
+local Players = game:GetService("Players");
 local ClientItem = require(script.Parent.Parent.ClientItem);
 type ClientItem = ClientItem.ClientItem;
+local React = require(ReplicatedStorage.Shared.Packages.react);
+local HUDButton = require(ReplicatedStorage.Client.ReactComponents.HUDButton);
 
 local PotionOfRegenerationClientItem = {
   ID = 1;
@@ -16,12 +20,33 @@ local PotionOfRegenerationClientItem = {
 
 function PotionOfRegenerationClientItem.new(): ClientItem
 
+  local _itemNumber: number?;
+
   local function breakdown(self: ClientItem)
 
+    ReplicatedStorage.Client.Functions.DestroyHUDButton:Invoke("Item", `{self.ID}_{_itemNumber}`);
+
   end;
 
   local function activate(self: ClientItem)
 
+    assert(_itemNumber);
+    local player = Players.LocalPlayer;
+    ReplicatedStorage.Shared.Functions.ItemFunctions:FindFirstChild(`{player.UserId}_{self.ID}_{_itemNumber}`):InvokeServer();
+
+  end;
+
+  local function initialize(self: ClientItem, itemNumber: number)
+
+    local hudButton = React.createElement(HUDButton, {
+      type = "Item";
+      key = `{self.ID}_{itemNumber}`;
+      onActivate = function() self:activate() end;
+      iconImage = "rbxassetid://17551046771";
+    });
+    _itemNumber = itemNumber;
+    ReplicatedStorage.Client.Functions.AddHUDButton:Invoke("Item", hudButton);
+
   end;
 
   return ClientItem.new({
@@ -31,6 +56,7 @@ function PotionOfRegenerationClientItem.new(): ClientItem
     description = PotionOfRegenerationClientItem.description;
     breakdown = breakdown;
     activate = activate;
+    initialize = initialize;
   });
 
 end;

diff --git a/src/ReplicatedStorage/Client/Classes/Items/RocketLauncherClientItem.lua b/src/ReplicatedStorage/Client/Classes/Items/RocketLauncherClientItem.lua
@@ -24,13 +24,18 @@ function RocketLauncherClientItem.new(): ClientItem
 
   end;
 
+  local function initialize(self: ClientItem)
+
+  end;
+
   return ClientItem.new({
     ID = RocketLauncherClientItem.ID;
     iconImage = RocketLauncherClientItem.iconImage;
     name = RocketLauncherClientItem.name;
     description = RocketLauncherClientItem.description;
     breakdown = breakdown;
     activate = activate;
+    initialize = initialize;
   });
 
 end;

diff --git a/src/ReplicatedStorage/Client/Classes/Items/SuperHammerClientItem.lua b/src/ReplicatedStorage/Client/Classes/Items/SuperHammerClientItem.lua
@@ -24,13 +24,18 @@ function SuperHammerClientItem.new(): ClientItem
 
   end;
 
+  local function initialize(self: ClientItem)
+
+  end;
+
   return ClientItem.new({
     ID = SuperHammerClientItem.ID;
     iconImage = SuperHammerClientItem.iconImage;
     name = SuperHammerClientItem.name;
     description = SuperHammerClientItem.description;
     breakdown = breakdown;
     activate = activate;
+    initialize = initialize;
   });
 
 end;

diff --git a/...ient/Functions/AddActionButton.model.json → .../Client/Functions/AddHUDButton.model.json b/...ient/Functions/AddActionButton.model.json → .../Client/Functions/AddHUDButton.model.json
diff --git a/src/ReplicatedStorage/Client/Functions/DestroyHUDButton.model.json b/src/ReplicatedStorage/Client/Functions/DestroyHUDButton.model.json
@@ -0,0 +1,3 @@
+{
+  "className": "BindableFunction"
+}
diff --git a/src/ReplicatedStorage/Client/ReactComponents/ActionButtonContainer.lua b/src/ReplicatedStorage/Client/ReactComponents/ActionButtonContainer.lua
diff --git a/...e/Client/ReactComponents/ActionButton.lua → ...rage/Client/ReactComponents/HUDButton.lua b/...e/Client/ReactComponents/ActionButton.lua → ...rage/Client/ReactComponents/HUDButton.lua
@@ -5,13 +5,14 @@ local UserInputService = game:GetService("UserInputService");
 local useResponsiveDesign = require(ReplicatedStorage.Client.ReactHooks.useResponsiveDesign);
 local CircleUICorner = require(script.Parent.CircleUICorner);
 
-type LimbSelectionButtonProps = {
+type HUDButtonProps = {
+  type: "Action" | "Item";
   onActivate: () -> ();
   shortcutCharacter: string;
   iconImage: string?;
 }
 
-local function ActionButton(props: LimbSelectionButtonProps)
+local function HUDButton(props: HUDButtonProps)
 
   local isKeyboardEnabled, setIsKeyboardEnabled = React.useState(false);
 
@@ -47,7 +48,6 @@ local function ActionButton(props: LimbSelectionButtonProps)
     });
     IconContainerButton = React.createElement("TextButton", {
       [React.Event.Activated] = onActivate;
-      Rotation = 45;
       AnchorPoint = Vector2.new(0.5, 0.5);
       BackgroundTransparency = 0.4;
       BackgroundColor3 = Color3.new(0, 0, 0);
@@ -62,7 +62,7 @@ local function ActionButton(props: LimbSelectionButtonProps)
         ApplyStrokeMode = Enum.ApplyStrokeMode.Border;
         Transparency = 0.4;
       });
-      UICorner = React.createElement(CircleUICorner);
+      UICorner = if props.type == "Action" then React.createElement(CircleUICorner) else nil;
       IconImageLabel = if props.iconImage then React.createElement("ImageLabel", {
         AnchorPoint = Vector2.new(0.5, 0.5);
         Position = UDim2.new(0.5, 0, 0.5, 0);
@@ -84,4 +84,4 @@ local function ActionButton(props: LimbSelectionButtonProps)
 
 end;
 
-return ActionButton;
+return HUDButton;
diff --git a/src/ReplicatedStorage/Client/ReactComponents/HUDButtonContainer.lua b/src/ReplicatedStorage/Client/ReactComponents/HUDButtonContainer.lua
@@ -0,0 +1,25 @@
+--!strict
+local ReplicatedStorage = game:GetService("ReplicatedStorage");
+local React = require(ReplicatedStorage.Shared.Packages.react);
+
+local function HUDButtonContainer(props)
+
+  local isActionList = props.type == "Action";
+
+  return React.createElement("Frame", {
+    AnchorPoint = Vector2.new(if isActionList then 1 else 0, 1);
+    Position = UDim2.new(if isActionList then 1 else 0, if isActionList then -15 else 15, 1, -15);
+    Size = UDim2.new();
+    AutomaticSize = Enum.AutomaticSize.XY;
+    BackgroundTransparency = 1;
+  }, {
+    UIListLayout = React.createElement("UIListLayout", {
+      Padding = UDim.new(0, 5);
+      FillDirection = Enum.FillDirection.Horizontal;
+    });
+    HUDButtonList = React.createElement(React.Fragment, {}, props.children);
+  });
+
+end;
+
+return HUDButtonContainer;
diff --git a/...ared/Functions/ActionFunctions.model.json → ...Functions/ActionFunctions/init.model.json b/...ared/Functions/ActionFunctions.model.json → ...Functions/ActionFunctions/init.model.json
diff --git a/.../Functions/InitializeInventory.model.json → ...Shared/Functions/BreakdownItem.model.json b/.../Functions/InitializeInventory.model.json → ...Shared/Functions/BreakdownItem.model.json
diff --git a/src/ReplicatedStorage/Shared/Functions/InitializeArchetype.model.json b/src/ReplicatedStorage/Shared/Functions/InitializeArchetype.model.json
@@ -0,0 +1,3 @@
+{
+  "className": "RemoteFunction"
+}
diff --git a/src/ReplicatedStorage/Shared/Functions/InitializeItem.model.json b/src/ReplicatedStorage/Shared/Functions/InitializeItem.model.json
@@ -0,0 +1,3 @@
+{
+  "className": "RemoteFunction"
+}
diff --git a/src/ReplicatedStorage/Shared/Functions/ItemFunctions/init.model.json b/src/ReplicatedStorage/Shared/Functions/ItemFunctions/init.model.json
@@ -0,0 +1,3 @@
+{
+  "className": "Folder"
+}
diff --git a/src/ServerScriptService/MatchManagementScript.server.lua b/src/ServerScriptService/MatchManagementScript.server.lua
@@ -14,7 +14,6 @@ type ServerContestant = ServerContestant.ServerContestant;
 local ServerArchetype = require(ServerStorage.Classes.ServerArchetype);
 type ServerArchetype = ServerArchetype.ServerArchetype;
 local Profile = require(ServerStorage.Classes.Profile);
-local RunService = game:GetService("RunService");
 
 -- Initialize the round.
 local round;
@@ -105,6 +104,7 @@ local function startRound()
         ID = i * 0.01;
         character = character;
         name = `NPC {i * 0.01}`;
+        inventory = {};
         isBot = true;
         isDisqualified = false;
         teamID = if i > team1BotCount then 2 else 1;
@@ -399,6 +399,7 @@ local function checkPlayerList(player: Player)
         player = player;
         character = player.Character;
         name = player.Name;
+        inventory = {};
         profile = profile;
         isBot = false;
         isDisqualified = false;

diff --git a/src/ServerStorage/Classes/Actions/DetachLimbServerAction/init.lua b/src/ServerStorage/Classes/Actions/DetachLimbServerAction/init.lua
@@ -313,7 +313,7 @@ function DetachLimbServerAction.new(): ServerAction
 
         if player == contestant.player then
 
-          action:activate(limbName);
+          self:activate(limbName);
 
         else
 

diff --git a/src/ServerStorage/Classes/Archetypes/BatterUpDemonServerArchetype.lua b/src/ServerStorage/Classes/Archetypes/BatterUpDemonServerArchetype.lua
@@ -46,6 +46,12 @@ function BatterUpDemonServerArchetype.new(): ServerArchetype
     contestant = newContestant;
     round = newRound;
 
+    if contestant.player then
+
+      ReplicatedStorage.Shared.Functions.InitializeArchetype:InvokeClient(contestant.player, self.ID);
+
+    end;
+
   end;
 
   return ServerArchetype.new({