added ability to remove equiped weapon

Author: iniside

Plugins/InventoryFramework/Source/InventoryFramework/Private/IFEquipmentComponent.cpp

@@ -83,4 +83,39 @@ void UIFEquipmentComponent::ClientAddItemFromInventory_Implementation(class UIFI
 	OnItemAdded(EquipmentItems[EquipmentIndex].Item, EquipmentIndex);
 	OnItemAddedEvent.Broadcast(EquipmentIndex, EquipmentIndex, EquipmentItems[EquipmentIndex].Item);
 	Source->RemoveItem(SourceIndex);
+}
+
+
+void UIFEquipmentComponent::RemoveFromEquipment(uint8 EquipmentIndex)
+{
+	if (GetOwnerRole() < ENetRole::ROLE_Authority)
+	{
+		ServerRemoveFromEquipment(EquipmentIndex);
+		return;
+	}
+}
+
+void UIFEquipmentComponent::ServerRemoveFromEquipment_Implementation(uint8 EquipmentIndex)
+{
+	if (EquipmentItems[EquipmentIndex].Item)
+	{
+		EquipmentItems[EquipmentIndex].Item->MarkPendingKill();
+	}
+	EquipmentItems[EquipmentIndex].Item = nullptr;
+	ClientRemoveFromEquipment(EquipmentIndex);
+	OnServerItemRemoved(EquipmentIndex);
+}
+bool UIFEquipmentComponent::ServerRemoveFromEquipment_Validate(uint8 EquipmentIndex)
+{
+	return true;
+}
+
+void UIFEquipmentComponent::ClientRemoveFromEquipment_Implementation(uint8 EquipmentIndex)
+{
+	if (EquipmentItems[EquipmentIndex].Item)
+	{
+		EquipmentItems[EquipmentIndex].Item->MarkPendingKill();
+	}
+	EquipmentItems[EquipmentIndex].Item = nullptr;
+	OnItemRemoved(EquipmentIndex);
 }

Plugins/InventoryFramework/Source/InventoryFramework/Private/IFInventoryComponent.cpp

@@ -8,6 +8,7 @@
 #include "IFItemBase.h"
 #include "IFItemActorBase.h"
 #include "IFInventoryInterface.h"
+#include "IFEquipmentComponent.h"
 #include "Net/UnrealNetwork.h"
 #include "Engine/ActorChannel.h"
 
@@ -264,6 +265,49 @@ void UIFInventoryComponent::ClientAddItemFromEquipment_Implementation(class UIFE
 
 }
 
+void UIFInventoryComponent::AddItemFromEquipmentAnySlot(class UIFEquipmentComponent* Source, uint8 SourceIndex)
+{
+	if (GetOwnerRole() < ENetRole::ROLE_Authority)
+	{
+		UIFItemBase* Item = Source->GetItem(SourceIndex);
+		if (!Item)
+			return;
+		ServerAddItemFromEquipmentAnySlot(Source, SourceIndex);
+		return;
+	}
+}
+void UIFInventoryComponent::ServerAddItemFromEquipmentAnySlot_Implementation(class UIFEquipmentComponent* Source, uint8 SourceIndex)
+{
+	UIFItemBase* Item = Source->GetItem(SourceIndex);
+	if (!Item)
+		return;
+
+	uint8 FreeSlot = 0;
+	for (uint8 Idx = 0; Idx < InventoryItems.Num(); Idx++)
+	{
+		if (InventoryItems[Idx].Item == nullptr)
+		{
+			FreeSlot = Idx;
+			break;
+		}
+	}
+
+	InventoryItems[FreeSlot].Item = DuplicateObject<UIFItemBase>(Item, this);
+	ClientAddItemFromEquipmentAnySlot(Source, SourceIndex, FreeSlot);
+}
+bool UIFInventoryComponent::ServerAddItemFromEquipmentAnySlot_Validate(class UIFEquipmentComponent* Source, uint8 SourceIndex)
+{
+	return true;
+}
+void UIFInventoryComponent::ClientAddItemFromEquipmentAnySlot_Implementation(class UIFEquipmentComponent* Source, uint8 SourceIndex, uint8 InventoryIndex)
+{
+	UIFItemBase* Item = Source->GetItem(SourceIndex);
+
+	InventoryItems[InventoryIndex].Item = DuplicateObject<UIFItemBase>(Item, this);
+	Source->RemoveFromEquipment(SourceIndex);
+}
+
+
 void UIFInventoryComponent::RemoveItem(uint8 InIndex)
 {
 	if(GetOwnerRole() < ENetRole::ROLE_Authority)
@@ -321,7 +365,7 @@ void UIFInventoryComponent::OnItemLoadedFreeSlot(TSoftClassPtr<class UIFItemBase
 
 
 	TSharedPtr<FJsonObject> Obj = MakeShareable(new FJsonObject());
-	FJsonObjectConverter::UStructToJsonObject(Item.StaticStruct(), &Item, Obj.ToSharedRef(), 0, 0);
+	FJsonObjectConverter::UStructToJsonObject(FIFItemData::StaticStruct(), &Item, Obj.ToSharedRef(), 0, 0);
 
 	FakeBackend.Add(Obj);
 

Plugins/InventoryFramework/Source/InventoryFramework/Public/IFEquipmentComponent.h

@@ -68,6 +68,16 @@ class INVENTORYFRAMEWORK_API UIFEquipmentComponent : public UActorComponent
 		void ClientAddItemFromInventory(class UIFInventoryComponent* Source, uint8 SourceIndex, uint8 EquipmentIndex);
 	void ClientAddItemFromInventory_Implementation(class UIFInventoryComponent* Source, uint8 SourceIndex, uint8 EquipmentIndex);
 
+	void RemoveFromEquipment(uint8 EquipmentIndex);
+	UFUNCTION(Server, Reliable, WithValidation)
+		void ServerRemoveFromEquipment(uint8 EquipmentIndex);
+	void ServerRemoveFromEquipment_Implementation(uint8 EquipmentIndex);
+	bool ServerRemoveFromEquipment_Validate(uint8 EquipmentIndex);
+	UFUNCTION(Client, Reliable)
+		void ClientRemoveFromEquipment(uint8 EquipmentIndex);
+	void ClientRemoveFromEquipment_Implementation(uint8 EquipmentIndex);
+
+
 	virtual void OnItemAdded(UIFItemBase* Item, uint8 Index) {};
 	virtual void OnItemChanged(UIFItemBase* Item, uint8 Index) {};
 	virtual void OnItemRemoved(uint8 Index) {};

Plugins/InventoryFramework/Source/InventoryFramework/Public/IFInventoryComponent.h

@@ -176,6 +176,20 @@ class INVENTORYFRAMEWORK_API UIFInventoryComponent : public UActorComponent
 		void ClientAddItemFromEquipment(class UIFEquipmentComponent* Source, uint8 SourceIndex, uint8 InventoryIndex);
 	void ClientAddItemFromEquipment_Implementation(class UIFEquipmentComponent* Source, uint8 SourceIndex, uint8 InventoryIndex);
 
+	void AddItemFromEquipmentAnySlot(class UIFEquipmentComponent* Source, uint8 SourceIndex);
+	UFUNCTION(Server, Reliable, WithValidation)
+		void ServerAddItemFromEquipmentAnySlot(class UIFEquipmentComponent* Source, uint8 SourceIndex);
+	void ServerAddItemFromEquipmentAnySlot_Implementation(class UIFEquipmentComponent* Source, uint8 SourceIndex);
+	bool ServerAddItemFromEquipmentAnySlot_Validate(class UIFEquipmentComponent* Source, uint8 SourceIndex);
+	/*
+	Confirm that change can be made and do the same change on client.
+	We do not predict inventory modifications. Clients MUST wait for server to make changes and send confirmation back.
+	*/
+	UFUNCTION(Client, Reliable)
+		void ClientAddItemFromEquipmentAnySlot(class UIFEquipmentComponent* Source, uint8 SourceIndex, uint8 InventoryIndex);
+	void ClientAddItemFromEquipmentAnySlot_Implementation(class UIFEquipmentComponent* Source, uint8 SourceIndex, uint8 InventoryIndex);
+
+
 	virtual void OnItemAdded(UIFItemBase* Item, uint8 LocalIndex) {};
 	virtual void OnItemChanged(UIFItemBase* Item, uint8 LocalIndex) {};
 	virtual void OnItemRemoved(uint8 LocalIndex) {};

Source/ActionRPGGame/Public/UI/Inventory/ARUIInventoryComponent.cpp

@@ -112,6 +112,25 @@ void UARUIInventoryComponent::ShowWeaponsForSlot(class UARItemView* ForSlot)
 	InventoryView->UpdateItemList<UARItemWeapon, UARListItemWeaponWidget>(Items, ListItemWeaponClass, PC, ForSlot);
 }
 
+void UARUIInventoryComponent::RemoveWeaponFromSlot(int8 Index)
+{
+	AARPlayerController* PC = nullptr;
+	AARCharacter* Character = nullptr;
+	if (AARHUD* HUD = Cast<AARHUD>(GetOwner()))
+	{
+		PC = Cast<AARPlayerController>(HUD->PlayerOwner);
+
+		if (!PC)
+			return;
+		Character = Cast<AARCharacter>(PC->GetPawn());
+		if (!Character)
+			return;
+
+		PC->MainInventory->AddItemFromEquipmentAnySlot(Character->WeaponInventory, Index);
+
+	}
+}
+
 void UARUIInventoryComponent::AddWeaponToSlot(uint8 TargetNetIndex
 	, uint8 TargetLocalIndex
 	, uint8 SourceNetIndex

Source/ActionRPGGame/Public/UI/Inventory/ARUIInventoryComponent.h

@@ -52,7 +52,7 @@ class ACTIONRPGGAME_API UARUIInventoryComponent : public UActorComponent
 
 public:
 	void ShowWeaponsForSlot(class UARItemView* ForSlot);
-
+	void RemoveWeaponFromSlot(int8 Index);
 	void AddWeaponToSlot(uint8 TargetNetIndex
 		, uint8 TargetLocalIndex
 		, uint8 SourceNetIndex

Source/ActionRPGGame/Public/UI/Inventory/Weapons/ARItemWeaponWidget.cpp

@@ -39,9 +39,17 @@ void UARItemWeaponWidget::NativeConstruct()
 
 FReply UARItemWeaponWidget::NativeOnMouseButtonDown(const FGeometry& InGeometry, const FPointerEvent& InMouseEvent)
 {
-	UObject* Out = GetOuter();
-	UARInventoryScreenWidget* MainView = Cast<UARInventoryScreenWidget>(Out);
-	InventoryComponent->ShowWeaponsForSlot(this);
+	if (InMouseEvent.GetEffectingButton() == EKeys::LeftMouseButton)
+	{
+		UObject* Out = GetOuter();
+		UARInventoryScreenWidget* MainView = Cast<UARInventoryScreenWidget>(Out);
+		InventoryComponent->ShowWeaponsForSlot(this);
+	}
+	else if (InMouseEvent.GetEffectingButton() == EKeys::RightMouseButton)
+	{
+		InventoryComponent->RemoveWeaponFromSlot(LocalIndex);
+	}
+	
 
 	return FReply::Handled();
 }