save/load souls, inventory items

hwanyoung2/Source/hwanyoung2/CraftingInfo.h

@@ -18,7 +18,18 @@ public:
 
 	//unique ID of item that is being used to create the item
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
-	FName ComponentID;
+	FName ItemAID;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	FName ItemBID;
+
+	//unique ID of item that is being used to create the item
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	FName ItemCID;
+
+	//unique ID of item that is being used to create the item
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	FName ItemDID;
 
 	//unique ID of the item that gets created
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
@@ -28,12 +39,20 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	bool bDestroyItemA;
 
-	//
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	bool bDestroyItemB;
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	bool bDestroyItemC;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	bool bDestroyItemD;
+
 	bool operator==(const FCraftingInfo& OtherItem) const {
-		return ComponentID == OtherItem.ComponentID;
+		return ItemAID == OtherItem.ItemAID
+			&& ItemBID == OtherItem.ItemBID
+			&& ItemCID == OtherItem.ItemCID
+			&& ItemDID == OtherItem.ItemDID;
 	}
 
 

hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.cpp

@@ -39,13 +39,18 @@ bool AHYPlayerCharacController::AddItemToInventoryByID(FName ID)
 	return false;
 }
 
-void AHYPlayerCharacController::CraftItem(FInventoryItem ItemA, FInventoryItem ItemB)
+void AHYPlayerCharacController::CraftItem(FInventoryItem ItemA, FInventoryItem ItemB, FInventoryItem ItemC, FInventoryItem ItemD)
 {
-	for (auto Pair : ItemB.CraftCombinations) {
+	for (auto Combination : ItemB.CraftCombinations) {
-		if (Pair.ComponentID == ItemA.ItemID) {
+		if (Combination.ItemAID == ItemA.ItemID 
-			if (Pair.bDestroyItemA) Inventory.RemoveSingle(ItemA);
+			&& Combination.ItemBID == ItemB.ItemID
-			if (Pair.bDestroyItemB) Inventory.RemoveSingle(ItemB);
+			&& Combination.ItemCID == ItemC.ItemID 
-			AddItemToInventoryByID(Pair.ProductID);
+			&& Combination.ItemDID == ItemD.ItemID) {
+			if (Combination.bDestroyItemA) Inventory.RemoveSingle(ItemA);
+			if (Combination.bDestroyItemB) Inventory.RemoveSingle(ItemB);
+			if (Combination.bDestroyItemC) Inventory.RemoveSingle(ItemC);
+			if (Combination.bDestroyItemD) Inventory.RemoveSingle(ItemD);
+			AddItemToInventoryByID(Combination.ProductID);
 			ReloadCraftUI();
 		}
 	}

hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.h

@@ -38,7 +38,7 @@ public:
 	bool AddItemToInventoryByID(FName ID);
 
 	UFUNCTION(BlueprintCallable, Category = "Utils")
-	void CraftItem(FInventoryItem ItemA, FInventoryItem ItemB);
+	void CraftItem(FInventoryItem ItemA, FInventoryItem ItemB, FInventoryItem ItemC, FInventoryItem ItemD);
 
 	UPROPERTY(BlueprintReadWrite, VisibleAnywhere)
 	class AHYInteractableActor* CurrentInteractable;