Added world items to save game

Source/NakedDesire/Clothing/ClothingManager.cpp

@@ -123,6 +123,12 @@ void UClothingManager::SpawnClothingPickup(UClothingItemInstance* ItemInstance)
 		UE_LOG(LogTemp, Warning, TEXT("UClothingManager::SpawnClothingPickup NewItemPickup == nullptr"));
 		return;
 	}
+	
+	USaveSubsystem* SaveSubsystem = UGameplayStatics::GetGameInstance(GetWorld())->GetSubsystem<USaveSubsystem>();
+	FItemSaveRecord ItemSaveRecord;
+	ItemSaveRecord.Init(ItemInstance);
+	ItemSaveRecord.WorldTransform = NewItemPickup->GetActorTransform();
+	SaveSubsystem->GetCurrentSave()->WorldItems.Push(ItemSaveRecord);
 
 	NewItemPickup->SetItem(ItemInstance);
 }
@@ -184,10 +190,6 @@ void UClothingManager::TakeClothing(UClothingItemInstance* ClothingItemInstance)
 	ItemSaveRecord.Init(ClothingItemInstance);
 	
 	SaveSubsystem->GetCurrentSave()->EquippedItems.Push(ItemSaveRecord);
-	SaveSubsystem->GetCurrentSave()->DroppedItems.RemoveAll([ClothingItemInstance](const FItemSaveRecord& Item)
-	{
-		return Item.InstanceId == ClothingItemInstance->GetInstanceId();
-	});
 	
 	PutOnClothing(ClothingItemInstance);
 }
@@ -235,11 +237,6 @@ void UClothingManager::DropClothing(const EClothingSlotType ClothingType)
 	if (!ClothingItemInstance)
 		return;
 	
-	USaveSubsystem* SaveSubsystem = UGameplayStatics::GetGameInstance(GetWorld())->GetSubsystem<USaveSubsystem>();
-	FItemSaveRecord ItemSaveRecord;
-	ItemSaveRecord.Init(ClothingItemInstance);
-	SaveSubsystem->GetCurrentSave()->DroppedItems.Push(ItemSaveRecord);
-	
 	SpawnClothingPickup(ClothingItemInstance);
 
 	OnClothingDropped.Broadcast(ClothingItemInstance);

Source/NakedDesire/Global/NakedDesireGameMode.cpp

@@ -4,12 +4,14 @@
 #include "Kismet/GameplayStatics.h"
 #include "NakedDesire/Clothing/ClothingItem.h"
 #include "NakedDesire/Clothing/ClothingItemInstance.h"
+#include "NakedDesire/Interactables/ItemPickup.h"
 #include "UObject/ConstructorHelpers.h"
 #include "NakedDesire/Interactables/Wardrobe.h"
 #include "NakedDesire/MissionBuilder/MissionsConfig.h"
 #include "NakedDesire/MissionBuilder/MissionsManager.h"
 #include "NakedDesire/Player/NakedDesireCharacter.h"
 #include "NakedDesire/SaveGame/GlobalSaveGameData.h"
+#include "NakedDesire/SaveGame/ItemSaveRecord.h"
 #include "NakedDesire/SaveGame/SaveSubsystem.h"
 
 void ANakedDesireGameMode::RestartGame()
@@ -67,6 +69,17 @@ void ANakedDesireGameMode::BeginPlay()
 			Wardrobe = WardrobeActor;
 		}
 	}
+	
+	USaveSubsystem* SaveSubsystem = UGameplayStatics::GetGameInstance(GetWorld())->GetSubsystem<USaveSubsystem>();
+	for (const auto& Item : SaveSubsystem->GetCurrentSave()->WorldItems)
+	{
+		UClothingItemInstance* NewItemInstance = NewObject<UClothingItemInstance>(this);
+		NewItemInstance->Init(Item.Definition.Get());
+		NewItemInstance->Condition = Item.Condition;
+		NewItemInstance->SetInstanceId(Item.InstanceId);
+		AItemPickup* NewItemPickup = GetWorld()->SpawnActor<AItemPickup>(ItemPickupClass, Item.WorldTransform);
+		NewItemPickup->SetItem(NewItemInstance);
+	}
 }
 
 void ANakedDesireGameMode::RefreshDailyMissions()

Source/NakedDesire/Global/NakedDesireGameMode.h

@@ -6,6 +6,7 @@
 #include "GameFramework/GameModeBase.h"
 #include "NakedDesireGameMode.generated.h"
 
+class AItemPickup;
 class UClothingItemInstance;
 class UMissionsConfig;
 class AWardrobe;
@@ -49,6 +50,9 @@ protected:
 	
 private:
 	void RefreshDailyMissions();
+	
+	UPROPERTY(EditDefaultsOnly, Category = "Items")
+	TSubclassOf<AItemPickup> ItemPickupClass;
 };
 
 

Source/NakedDesire/Interactables/ItemPickup.cpp

@@ -4,10 +4,14 @@
 #include "ItemPickup.h"
 #include "Components/BoxComponent.h"
 #include "Components/WidgetComponent.h"
+#include "Kismet/GameplayStatics.h"
 #include "NakedDesire/Clothing/ClothingItem.h"
 #include "NakedDesire/Clothing/ClothingItemInstance.h"
 #include "NakedDesire/Clothing/ClothingManager.h"
 #include "NakedDesire/Player/NakedDesireCharacter.h"
+#include "NakedDesire/SaveGame/GlobalSaveGameData.h"
+#include "NakedDesire/SaveGame/ItemSaveRecord.h"
+#include "NakedDesire/SaveGame/SaveSubsystem.h"
 
 AItemPickup::AItemPickup()
 {
@@ -27,7 +31,12 @@ void AItemPickup::Interact_Implementation(ANakedDesireCharacter* Player)
 {
 	if (ClothingItemInstance)
 	{
+		USaveSubsystem* SaveSubsystem = UGameplayStatics::GetGameInstance(GetWorld())->GetSubsystem<USaveSubsystem>();
 		Player->ClothingManager->TakeClothing(ClothingItemInstance);
+		SaveSubsystem->GetCurrentSave()->WorldItems.RemoveAll([this](const FItemSaveRecord& Item)
+		{
+			return ClothingItemInstance->GetInstanceId() == Item.InstanceId;
+		});
 		Destroy();
 	}
 }

Source/NakedDesire/Items/ItemInstance.cpp

@@ -15,3 +15,8 @@ void UItemInstance::PostDuplicate(EDuplicateMode::Type DuplicateMode)
 	Super::PostDuplicate(DuplicateMode);
 	InstanceId = FGuid::NewGuid();
 }
+
+void UItemInstance::SetInstanceId(FGuid InId)
+{
+	InstanceId = InId;
+}

Source/NakedDesire/Items/ItemInstance.h

@@ -13,8 +13,8 @@ public:
 	virtual void PostInitProperties() override;
 	virtual void PostDuplicate(EDuplicateMode::Type DuplicateMode) override;
 
-	UFUNCTION(BlueprintPure, Category = "Item")
 	FGuid GetInstanceId() const { return InstanceId; }
+	void SetInstanceId(FGuid InId);
 	
 protected:
 	UPROPERTY(VisibleAnywhere, SaveGame, BlueprintReadOnly, Category = "Item", meta = (AllowPrivateAccess = "true"))

Source/NakedDesire/SaveGame/GlobalSaveGameData.h

@@ -32,7 +32,7 @@ public:
 	TArray<FItemSaveRecord> EquippedItems;
 
 	UPROPERTY(SaveGame)
-	TArray<FItemSaveRecord> DroppedItems;
+	TArray<FItemSaveRecord> WorldItems;
 
 	UPROPERTY(SaveGame)
 	int32 DaysPassed = 0;