From 0af47d7bc3b8e46ae22a74c5302102e488198bcf Mon Sep 17 00:00:00 2001 From: "adnan.mujkic" Date: Thu, 17 Sep 2026 21:43:02 +0200 Subject: [PATCH] Cleanup of old seed stuff --- Content/Blueprints/BP_BlueFlower.uasset | 3 - Content/Blueprints/BP_RedFlower.uasset | 3 - Content/Blueprints/BP_WhiteFlower.uasset | 3 - Content/Blueprints/GrassVariation.uasset | 3 - .../GameSpecific/DA_Speech_SeedGrowing.uasset | 3 - Content/ItemsDiscoverabilityStruct.uasset | 3 - Content/SaveGameData.uasset | 3 - .../AlchemySystem/BP_AlchemyManager.uasset | 4 +- .../DialogueSystem/UI/DialogueScreen.uasset | 4 +- .../InventorySystem/ItemManagerBP.uasset | 4 +- .../Seed/BP_SeedCarousel.uasset | 3 - .../InventorySystem/UI/FPlantNeeds.uasset | 3 - .../UI/InventoryScreenWrapper.uasset | 4 +- .../UI/ItemSlotWidgetBP.uasset | 4 +- .../UI/ItemWindowWidgetBP.uasset | 4 +- .../InventorySystem/UI/PlantNeedsUI.uasset | 3 - .../UI/W_CurrentlySelectedItemWidget.uasset | 3 - .../ShopAndTradeSystem/WBP_TradeWidget.uasset | 4 +- Content/SeedsInWorldStruct.uasset | 3 - .../Blueprints/BP_ThirdPersonCharacter.uasset | 4 +- .../Vegetation/AF_BlueFlowerFoliage.uasset | 3 - .../Vegetation/AF_GrassVariationShrub.uasset | 3 - Content/Vegetation/AF_RedFlowerFoliage.uasset | 3 - .../Vegetation/AF_WhiteFlowerFoliage.uasset | 3 - .../A/6L/NS8525RF0ZA2JKPOKX5PM1.uasset | 2 +- .../D/FR/P3GK359CLJH40T3VDWEQ1D.uasset | 2 +- Source/ProjectEleri/Items/ItemDatabase.cpp | 12 -- Source/ProjectEleri/Items/ItemDatabase.h | 8 - Source/ProjectEleri/Items/SeedCarousel.cpp | 92 ------------ Source/ProjectEleri/Items/SeedCarousel.h | 137 ------------------ .../ProjectEleri/Private/AlchemyManager.cpp | 1 - .../Private/EleriPlayerController.cpp | 8 +- .../Private/InventoryComponent.cpp | 30 ++-- .../ProjectEleri/Private/TimeOfDayManager.cpp | 1 - Source/ProjectEleri/Public/EleriGameState.h | 5 +- .../ProjectEleri/Public/InventoryComponent.h | 19 +-- 36 files changed, 39 insertions(+), 358 deletions(-) delete mode 100644 Content/Blueprints/BP_BlueFlower.uasset delete mode 100644 Content/Blueprints/BP_RedFlower.uasset delete mode 100644 Content/Blueprints/BP_WhiteFlower.uasset delete mode 100644 Content/Blueprints/GrassVariation.uasset delete mode 100644 Content/GameData/Dialogue/GameSpecific/DA_Speech_SeedGrowing.uasset delete mode 100644 Content/ItemsDiscoverabilityStruct.uasset delete mode 100644 Content/SaveGameData.uasset delete mode 100644 Content/Scripts/InventorySystem/Seed/BP_SeedCarousel.uasset delete mode 100644 Content/Scripts/InventorySystem/UI/FPlantNeeds.uasset delete mode 100644 Content/Scripts/InventorySystem/UI/PlantNeedsUI.uasset delete mode 100644 Content/Scripts/InventorySystem/UI/W_CurrentlySelectedItemWidget.uasset delete mode 100644 Content/SeedsInWorldStruct.uasset delete mode 100644 Content/Vegetation/AF_BlueFlowerFoliage.uasset delete mode 100644 Content/Vegetation/AF_GrassVariationShrub.uasset delete mode 100644 Content/Vegetation/AF_RedFlowerFoliage.uasset delete mode 100644 Content/Vegetation/AF_WhiteFlowerFoliage.uasset delete mode 100644 Source/ProjectEleri/Items/SeedCarousel.cpp delete mode 100644 Source/ProjectEleri/Items/SeedCarousel.h diff --git a/Content/Blueprints/BP_BlueFlower.uasset b/Content/Blueprints/BP_BlueFlower.uasset deleted file mode 100644 index 7993281e..00000000 --- a/Content/Blueprints/BP_BlueFlower.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:115faff76d7ea772315d49386c3b3063853e31fb4e02827649d89c30bed155e4 -size 139101 diff --git a/Content/Blueprints/BP_RedFlower.uasset b/Content/Blueprints/BP_RedFlower.uasset deleted file mode 100644 index 3fdc6b4d..00000000 --- a/Content/Blueprints/BP_RedFlower.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff5d6c235277fc1f4279c92930bafdf44fa23aa21855a99ebc3c17da3e971fdc -size 138637 diff --git a/Content/Blueprints/BP_WhiteFlower.uasset b/Content/Blueprints/BP_WhiteFlower.uasset deleted file mode 100644 index 87d5b2f2..00000000 --- a/Content/Blueprints/BP_WhiteFlower.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55a84178f00f0ff9290b1635759f359e214a722a5294907be9a3c0279b838ff3 -size 69055 diff --git a/Content/Blueprints/GrassVariation.uasset b/Content/Blueprints/GrassVariation.uasset deleted file mode 100644 index 77c468dc..00000000 --- a/Content/Blueprints/GrassVariation.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10f4c2900bd4fdac0caec979eb0bd6babbfcc17a4007d8fc9799c004c137b9f1 -size 133743 diff --git a/Content/GameData/Dialogue/GameSpecific/DA_Speech_SeedGrowing.uasset b/Content/GameData/Dialogue/GameSpecific/DA_Speech_SeedGrowing.uasset deleted file mode 100644 index 721cde64..00000000 --- a/Content/GameData/Dialogue/GameSpecific/DA_Speech_SeedGrowing.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0794e45e9c75a127f5615ea87e592374b66822859981272c9e31bd3fd46601a0 -size 2775 diff --git a/Content/ItemsDiscoverabilityStruct.uasset b/Content/ItemsDiscoverabilityStruct.uasset deleted file mode 100644 index a29aa7e7..00000000 --- a/Content/ItemsDiscoverabilityStruct.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ec3ccfdf99a3ed8b75d33bd00a3694e986270ac2b01958f31a46feb86a6ee48 -size 4520 diff --git a/Content/SaveGameData.uasset b/Content/SaveGameData.uasset deleted file mode 100644 index 99a3ac1e..00000000 --- a/Content/SaveGameData.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6065c75e482bddbfcf924434d82a0a753b4a31a972fd76ec586561a1f799f7f9 -size 84806 diff --git a/Content/Scripts/AlchemySystem/BP_AlchemyManager.uasset b/Content/Scripts/AlchemySystem/BP_AlchemyManager.uasset index 67f8d2c7..581ce3d4 100644 --- a/Content/Scripts/AlchemySystem/BP_AlchemyManager.uasset +++ b/Content/Scripts/AlchemySystem/BP_AlchemyManager.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11d2ad2316efc7a8e88bb034221d5b23c6da1691f11632ea99d2b67425fc3e94 -size 2835909 +oid sha256:7d039dffe61747624b5ea9f18cde607965c1511d6eb4198f54c2783b0406b5a3 +size 2823170 diff --git a/Content/Scripts/DialogueSystem/UI/DialogueScreen.uasset b/Content/Scripts/DialogueSystem/UI/DialogueScreen.uasset index dcd5d605..a0857ce3 100644 --- a/Content/Scripts/DialogueSystem/UI/DialogueScreen.uasset +++ b/Content/Scripts/DialogueSystem/UI/DialogueScreen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f5c8826b7e8578596b39fa081d650ce1c1318ef83af55e04251c7e4c36dbb3d -size 655926 +oid sha256:bb9930001d01905e1f6644be20d8ce5d7c421cf77f010a54443fdb2722b857b0 +size 538095 diff --git a/Content/Scripts/InventorySystem/ItemManagerBP.uasset b/Content/Scripts/InventorySystem/ItemManagerBP.uasset index ed41e3d9..6cfe00c1 100644 --- a/Content/Scripts/InventorySystem/ItemManagerBP.uasset +++ b/Content/Scripts/InventorySystem/ItemManagerBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3ce125286b18768f30789a4a951a7db3ccfe41fefcdb91830e7c38a87485087 -size 616277 +oid sha256:c5583f88f57041c8ba0c1559fd81a59500922267dc05b36969a8ac5ea3fb30e5 +size 329486 diff --git a/Content/Scripts/InventorySystem/Seed/BP_SeedCarousel.uasset b/Content/Scripts/InventorySystem/Seed/BP_SeedCarousel.uasset deleted file mode 100644 index 2aadcfbf..00000000 --- a/Content/Scripts/InventorySystem/Seed/BP_SeedCarousel.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e79196bc25eb0820ae5b58b5a00e4c94d2798c42645e8cba560bf65e235a279 -size 1010017 diff --git a/Content/Scripts/InventorySystem/UI/FPlantNeeds.uasset b/Content/Scripts/InventorySystem/UI/FPlantNeeds.uasset deleted file mode 100644 index f717db40..00000000 --- a/Content/Scripts/InventorySystem/UI/FPlantNeeds.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1854fed831a966882c6b451db1ff3c12c46633e34bf0a79965b7ac2498115d67 -size 2925 diff --git a/Content/Scripts/InventorySystem/UI/InventoryScreenWrapper.uasset b/Content/Scripts/InventorySystem/UI/InventoryScreenWrapper.uasset index 7fdbcf32..eb670bdd 100644 --- a/Content/Scripts/InventorySystem/UI/InventoryScreenWrapper.uasset +++ b/Content/Scripts/InventorySystem/UI/InventoryScreenWrapper.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f49a68e33bd205e97946a9c4732053cdec1014d72099ef40341a96f1a37f443 -size 1325254 +oid sha256:666c3e913038a3fb0e253478f6f261f3384a48562d67515a42a6f30a284a5026 +size 1320948 diff --git a/Content/Scripts/InventorySystem/UI/ItemSlotWidgetBP.uasset b/Content/Scripts/InventorySystem/UI/ItemSlotWidgetBP.uasset index d3255952..801344d1 100644 --- a/Content/Scripts/InventorySystem/UI/ItemSlotWidgetBP.uasset +++ b/Content/Scripts/InventorySystem/UI/ItemSlotWidgetBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c32c80d5f382e688d9cab029a031f4d3255574f1f5fc52acb56450824e6fe0a -size 534085 +oid sha256:28e07b6e7f2eebe935900b0e720ddbdc5a2942f315920636b47af561b9b4ec05 +size 475744 diff --git a/Content/Scripts/InventorySystem/UI/ItemWindowWidgetBP.uasset b/Content/Scripts/InventorySystem/UI/ItemWindowWidgetBP.uasset index 6b7c885c..2d970943 100644 --- a/Content/Scripts/InventorySystem/UI/ItemWindowWidgetBP.uasset +++ b/Content/Scripts/InventorySystem/UI/ItemWindowWidgetBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55ae3b70de05084e3d8d8b3b47286f31eb0279f1b8ae805cb2e97140dd270848 -size 322787 +oid sha256:f0d4ee9c97bc0fe9b6afedb725f2369cc36a5814fc6f32fd37d99bc3658e9c81 +size 321243 diff --git a/Content/Scripts/InventorySystem/UI/PlantNeedsUI.uasset b/Content/Scripts/InventorySystem/UI/PlantNeedsUI.uasset deleted file mode 100644 index 4301d9c5..00000000 --- a/Content/Scripts/InventorySystem/UI/PlantNeedsUI.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ab58717695b2440cbb4de96f22416c696c3e956e6de1c6c5c52f191530d13d8 -size 46315 diff --git a/Content/Scripts/InventorySystem/UI/W_CurrentlySelectedItemWidget.uasset b/Content/Scripts/InventorySystem/UI/W_CurrentlySelectedItemWidget.uasset deleted file mode 100644 index 7a5513c7..00000000 --- a/Content/Scripts/InventorySystem/UI/W_CurrentlySelectedItemWidget.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94e752c60f07d10e9c3ca8b0b27e24b564c247f38bdf6e619606560b3d49b4d0 -size 51383 diff --git a/Content/Scripts/ShopAndTradeSystem/WBP_TradeWidget.uasset b/Content/Scripts/ShopAndTradeSystem/WBP_TradeWidget.uasset index 80f2d243..8e976802 100644 --- a/Content/Scripts/ShopAndTradeSystem/WBP_TradeWidget.uasset +++ b/Content/Scripts/ShopAndTradeSystem/WBP_TradeWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17fa5aeee4c88ab581901f8ad8be181abe61d4bb32e78c5f60098ef86493c8fc -size 826977 +oid sha256:20a039879b40439379afade274601589291d1b47fad237642782fa35a1924e7f +size 823292 diff --git a/Content/SeedsInWorldStruct.uasset b/Content/SeedsInWorldStruct.uasset deleted file mode 100644 index 73fc1f15..00000000 --- a/Content/SeedsInWorldStruct.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f59aa5f86cb3c761bc15c8aebf431a6c71ca825568e1af9eb6f02f1c73dcfa66 -size 8491 diff --git a/Content/ThirdPersonBP/Blueprints/BP_ThirdPersonCharacter.uasset b/Content/ThirdPersonBP/Blueprints/BP_ThirdPersonCharacter.uasset index a1ff3d64..bda62878 100644 --- a/Content/ThirdPersonBP/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Content/ThirdPersonBP/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa78e2fc440f78aec3afa45d10b6c234439582241de7b4a3e993c4041cdb2e26 -size 1266578 +oid sha256:82ea51056008589c45388f7031ec00f1aff22efc41d026cd8f0437143b65e679 +size 1138869 diff --git a/Content/Vegetation/AF_BlueFlowerFoliage.uasset b/Content/Vegetation/AF_BlueFlowerFoliage.uasset deleted file mode 100644 index e86e677e..00000000 --- a/Content/Vegetation/AF_BlueFlowerFoliage.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f234f45f44c80dcfa62748752f05fa7db34dd99c6fc91b126b284259f14ff2f -size 92440 diff --git a/Content/Vegetation/AF_GrassVariationShrub.uasset b/Content/Vegetation/AF_GrassVariationShrub.uasset deleted file mode 100644 index 27a747b4..00000000 --- a/Content/Vegetation/AF_GrassVariationShrub.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46990f2ef9c69bbe3e2fd66c581fa593dc797e3545ae22e195adb66fbba5c008 -size 82269 diff --git a/Content/Vegetation/AF_RedFlowerFoliage.uasset b/Content/Vegetation/AF_RedFlowerFoliage.uasset deleted file mode 100644 index 471d3696..00000000 --- a/Content/Vegetation/AF_RedFlowerFoliage.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0849af73ff77b9c10edb96a7ea7d5b0dfbb300fac5bd56f1e13eb1bdcfc6452 -size 83381 diff --git a/Content/Vegetation/AF_WhiteFlowerFoliage.uasset b/Content/Vegetation/AF_WhiteFlowerFoliage.uasset deleted file mode 100644 index bd260708..00000000 --- a/Content/Vegetation/AF_WhiteFlowerFoliage.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a95bf886e9799a51d992c4f69d9a61801525369ee523e43ada5e11377332718 -size 80864 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/A/6L/NS8525RF0ZA2JKPOKX5PM1.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/A/6L/NS8525RF0ZA2JKPOKX5PM1.uasset index b6234fbc..febe8fa1 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/A/6L/NS8525RF0ZA2JKPOKX5PM1.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/A/6L/NS8525RF0ZA2JKPOKX5PM1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3d5a543fea24c049316af1def50a8a39bfde5f5e1b1196c1547dd631b1a5616 +oid sha256:3936e4c68875d348638ccb3bb5cb2a2023099a6bf7ec5f77b491582666c86a18 size 7583 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/D/FR/P3GK359CLJH40T3VDWEQ1D.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/D/FR/P3GK359CLJH40T3VDWEQ1D.uasset index 565cf386..39de0ea2 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/D/FR/P3GK359CLJH40T3VDWEQ1D.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/D/FR/P3GK359CLJH40T3VDWEQ1D.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:256cdac515c0f540caf6cac2d07a4f78678b60e56c84f6d7b0843e3f28004b48 +oid sha256:7d9e7c865ddadf05fffc809e99d3891657c76836b2aecc9c67f645f210c5fe34 size 31704 diff --git a/Source/ProjectEleri/Items/ItemDatabase.cpp b/Source/ProjectEleri/Items/ItemDatabase.cpp index e6a15240..1fa28073 100644 --- a/Source/ProjectEleri/Items/ItemDatabase.cpp +++ b/Source/ProjectEleri/Items/ItemDatabase.cpp @@ -74,18 +74,6 @@ TArray UItemDatabase::GetItemsOfElement(Element InElement, Cate return ItemList; } - -void UItemDatabase::WaterAllSeeds() -{ - for (ASeedCarousel* Seed : SeedsPlanted) - { - if (IsValid(Seed)) - { - Seed->Water(); - } - } -} - bool UItemDatabase::DoChemicalAlignmentsMatch(TArray Alignments, TArray PotionAlignments) { for (int32 i = 0; i < PotionAlignments.Num(); i++) diff --git a/Source/ProjectEleri/Items/ItemDatabase.h b/Source/ProjectEleri/Items/ItemDatabase.h index 5413736c..3e2ff4f6 100644 --- a/Source/ProjectEleri/Items/ItemDatabase.h +++ b/Source/ProjectEleri/Items/ItemDatabase.h @@ -4,8 +4,6 @@ #include "CoreMinimal.h" #include "GameFramework/Actor.h" -#include "PotionItem.h" -#include "SeedCarousel.h" #include "ItemContainer.h" #include "DataAssets/ItemDataAsset.h" @@ -72,13 +70,7 @@ public: UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Item Database") TMap LoadedItemsByCategory; - UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Item Database") - TArray SeedsPlanted; - public: - UFUNCTION(BlueprintCallable, Category = "Item Database") - void WaterAllSeeds(); - UFUNCTION(BlueprintCallable, Category = "Item Database") bool DoChemicalAlignmentsMatch(TArray Alignments, TArray PotionAlignments); diff --git a/Source/ProjectEleri/Items/SeedCarousel.cpp b/Source/ProjectEleri/Items/SeedCarousel.cpp deleted file mode 100644 index 9f739305..00000000 --- a/Source/ProjectEleri/Items/SeedCarousel.cpp +++ /dev/null @@ -1,92 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "SeedCarousel.h" -#include "ItemDatabase.h" -#include "Kismet/GameplayStatics.h" -#include "MyCharacter.h" -#include "ProjectEleri/System/MainBlueprintFunctionLibrary.h" -#include "ProjectEleri/System/EleriGameplayTags.h" - - -FSeedSaveData::FSeedSaveData(): SeedGrowTime(0), ProduceGrowTime(0), SeedAge(0), ProduceDaysSinceLastBloom(0), - SeedWateredTimes(0), - bBloomed(false), - bWatered(false), - bPlanted(false), bDied(false), - bPlayerInside(false), - bInfoDialogueOpen(false) -{ -} - -FSeedSaveData::FSeedSaveData(const ASeedCarousel* SeedActorRef) -{ - if(!SeedActorRef) return; - - ObjectTransform = SeedActorRef->GetTransform(); - SeedGrowTime = SeedActorRef->SeedGrowTime; - ProduceGrowTime = SeedActorRef->ProduceGrowTime; - SeedAge = SeedActorRef->SeedAge; - ProduceDaysSinceLastBloom = SeedActorRef->ProduceDaysSinceLastBloom; - SeedWateredTimes = SeedActorRef->SeedWateredTimes; - bBloomed = SeedActorRef->bBloomed; - bWatered = SeedActorRef->bWatered; - bPlanted = SeedActorRef->bPlanted; - bDied = SeedActorRef->bDied; - bPlayerInside = SeedActorRef->bPlayerInside; - bInfoDialogueOpen = SeedActorRef->bInfoDialogueOpen; - bHighQuality = SeedActorRef->bHighQuality; - SeedAssetId = SeedActorRef->SeedAssetData->GetPrimaryAssetId(); -} - -void ASeedCarousel::BeginPlay() -{ - Super::BeginPlay(); -} - -// Called every frame -void ASeedCarousel::Tick(float DeltaTime) -{ - Super::Tick(DeltaTime); - -} - -void ASeedCarousel::Water() -{ - OnWatered.Broadcast(); -} - -void ASeedCarousel::LoadDataFromSaveStruct(FSeedSaveData& SaveStruct, UItemDatabase* ItemDatabase) -{ - SeedGrowTime = SaveStruct.SeedGrowTime; - ProduceGrowTime = SaveStruct.ProduceGrowTime; - SeedAge = SaveStruct.SeedAge; - ProduceDaysSinceLastBloom = SaveStruct.ProduceDaysSinceLastBloom; - SeedWateredTimes = SaveStruct.SeedWateredTimes; - bBloomed = SaveStruct.bBloomed; - bWatered = SaveStruct.bWatered; - bPlanted = SaveStruct.bPlanted; - bDied = SaveStruct.bDied; - bHighQuality = SaveStruct.bHighQuality; - bPlayerInside = false; - bInfoDialogueOpen = false; - SeedAssetData = ItemDatabase->GetDataAssetFromId(SaveStruct.SeedAssetId); -} - -void ASeedCarousel::SetSeedData(UItemDataAsset* InSeedAssetData) -{ - if (!InSeedAssetData) return; - - SeedAssetData = InSeedAssetData; - DataAssetId = InSeedAssetData->GetPrimaryAssetId(); -} - -bool ASeedCarousel::CanPlace() -{ - /*if (UGameplayStatsComponent* GSC = UMainBlueprintFunctionLibrary::GetGameplayStatsComponentFromPlayer(this)) - { - return GSC->GetGameplayStatValue(Stats::Energy) > 0; - }*/ - return false; -} - diff --git a/Source/ProjectEleri/Items/SeedCarousel.h b/Source/ProjectEleri/Items/SeedCarousel.h deleted file mode 100644 index 82e4383b..00000000 --- a/Source/ProjectEleri/Items/SeedCarousel.h +++ /dev/null @@ -1,137 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "DataAssets/ItemDataAsset.h" -#include "GameFramework/Actor.h" -#include "../GameObjects/RemovableStaticMeshActor.h" - -#include "SeedCarousel.generated.h" - -class UItemDatabase; -DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnWatered); - -USTRUCT(BlueprintType) -struct FSeedSaveData { - GENERATED_BODY() - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - FTransform ObjectTransform; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 SeedGrowTime; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 ProduceGrowTime; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 SeedAge; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 ProduceDaysSinceLastBloom; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 SeedWateredTimes; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bBloomed; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bWatered; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bPlanted; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bDied; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bPlayerInside; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bInfoDialogueOpen; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - FPrimaryAssetId SeedAssetId; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bHighQuality; - - FSeedSaveData(); - FSeedSaveData(const ASeedCarousel* SeedActorRef); -}; - -UCLASS() -class PROJECTELERI_API ASeedCarousel : public ARemovableStaticMeshActor -{ - GENERATED_BODY() - - - virtual void BeginPlay() override; - -public: - - UPROPERTY(BlueprintAssignable) - FOnWatered OnWatered; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 SeedGrowTime; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 ProduceGrowTime; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 SeedAge; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 ProduceDaysSinceLastBloom; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 SeedWateredTimes; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bBloomed; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bWatered; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bPlanted; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bDied; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bPlayerInside; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bInfoDialogueOpen; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - UItemDataAsset* SeedAssetData; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool bHighQuality; - -protected: - - -public: - // Called every frame - virtual void Tick(float DeltaTime) override; - - UFUNCTION(BlueprintImplementableEvent, BlueprintCallable) - void OnUpdatePlantEvent(); - - UFUNCTION(BlueprintCallable) - void Water(); - - void LoadDataFromSaveStruct(FSeedSaveData& SaveStruct, UItemDatabase* ItemDatabase); - - UFUNCTION(BlueprintCallable) - void SetSeedData(UItemDataAsset* InSeedAssetData); - - virtual bool CanPlace() override; - -}; diff --git a/Source/ProjectEleri/Private/AlchemyManager.cpp b/Source/ProjectEleri/Private/AlchemyManager.cpp index 3ae295f8..3064e05e 100644 --- a/Source/ProjectEleri/Private/AlchemyManager.cpp +++ b/Source/ProjectEleri/Private/AlchemyManager.cpp @@ -30,7 +30,6 @@ void AAlchemyManager::CalculateRewardStack() { if (!PotionOutput) return; FinalRewardStack.ItemId = PotionOutput->GetPrimaryAssetId(); - FinalRewardStack.Seed = false; FinalRewardStack.HQ = PotionMinigameHqScore >= 99.f; FinalRewardStack.Stack = PotionMinigameStackNum; } diff --git a/Source/ProjectEleri/Private/EleriPlayerController.cpp b/Source/ProjectEleri/Private/EleriPlayerController.cpp index 0a3c3aa4..63b87a8c 100644 --- a/Source/ProjectEleri/Private/EleriPlayerController.cpp +++ b/Source/ProjectEleri/Private/EleriPlayerController.cpp @@ -660,7 +660,7 @@ void AEleriPlayerController::OnPlaceObjectAction(const FInputActionValue &Value) if (!MoveActorsComp->PlaceableActionUsed(ERemovalAction::PLACE)) return; - int32 StackCount = Inventory->GetStackForItem(DataAsset->GetPrimaryAssetId(), false, false); + int32 StackCount = Inventory->GetStackForItem(DataAsset->GetPrimaryAssetId(), false); if (StackCount > 0) { ensure(ItemDatabase); @@ -1267,15 +1267,15 @@ void AEleriPlayerController::TryPlantSelectedSeed() // The seed is paid for before it is planted, so a slot can never hold a seed the inventory never had const FPrimaryAssetId SeedAssetId = SeedToPlant->GetPrimaryAssetId(); - if (Inventory->HasItem(SeedAssetId, true, bSeedToPlantHighQuality) <= 0) + if (Inventory->HasItem(SeedAssetId, true) <= 0) return; if (!SeedBed->PlantSeedInSlot(SlotCoordinate, SeedToPlant, bSeedToPlantHighQuality)) return; - Inventory->RemoveItemFromInventory(SeedAssetId, 1, true, bSeedToPlantHighQuality); + Inventory->RemoveItemFromInventory(SeedAssetId, 1, true); - if (Inventory->HasItem(SeedAssetId, true, bSeedToPlantHighQuality) == INDEX_NONE) + if (Inventory->HasItem(SeedAssetId, true) == INDEX_NONE) { ClearSeedToPlant(); } diff --git a/Source/ProjectEleri/Private/InventoryComponent.cpp b/Source/ProjectEleri/Private/InventoryComponent.cpp index 5066cf2d..bebcbb64 100644 --- a/Source/ProjectEleri/Private/InventoryComponent.cpp +++ b/Source/ProjectEleri/Private/InventoryComponent.cpp @@ -36,12 +36,11 @@ void UInventoryComponent::BeginPlay() InitializeInventory(); } -int32 UInventoryComponent::HasItem(FPrimaryAssetId ItemId, bool Seed, bool HQ) +int32 UInventoryComponent::HasItem(FPrimaryAssetId ItemId, bool HQ) { for (int32 i = 0; i < ItemList.Num(); i++) { if (ItemId == ItemList[i].ItemId && - Seed == ItemList[i].Seed && HQ == ItemList[i].HQ) { return i; @@ -50,11 +49,11 @@ int32 UInventoryComponent::HasItem(FPrimaryAssetId ItemId, bool Seed, bool HQ) return -1; } -int32 UInventoryComponent::ItemExists(FPrimaryAssetId ItemToCheck, bool IsSeed, bool IsHq) +int32 UInventoryComponent::ItemExists(FPrimaryAssetId ItemToCheck, bool IsHq) { for (int32 i = 0; i < ItemList.Num(); i++) { - if (ItemList[i].ItemId == ItemToCheck && ItemList[i].Seed == IsSeed && ItemList[i].HQ == IsHq) + if (ItemList[i].ItemId == ItemToCheck && ItemList[i].HQ == IsHq) { return i; } @@ -62,16 +61,15 @@ int32 UInventoryComponent::ItemExists(FPrimaryAssetId ItemToCheck, bool IsSeed, return -1; } -bool UInventoryComponent::AddItemToInventory(FPrimaryAssetId ItemToAdd, int32 StackSize, bool Seed, bool HighQuality) +bool UInventoryComponent::AddItemToInventory(FPrimaryAssetId ItemToAdd, int32 StackSize, bool HighQuality) { if (!ItemToAdd.IsValid()) return false; - int32 itemIndex = ItemExists(ItemToAdd, Seed, HighQuality); + int32 itemIndex = ItemExists(ItemToAdd, HighQuality); if (itemIndex == -1) { FItemStack ItemStack; ItemStack.ItemId = ItemToAdd; - ItemStack.Seed = Seed; ItemStack.Stack = StackSize; ItemStack.HQ = HighQuality; ItemList.Add(ItemStack); @@ -85,11 +83,11 @@ bool UInventoryComponent::AddItemToInventory(FPrimaryAssetId ItemToAdd, int32 St return true; } -bool UInventoryComponent::RemoveItemFromInventory(FPrimaryAssetId ItemId, int32 Amount, bool Seed, bool HighQuality) +bool UInventoryComponent::RemoveItemFromInventory(FPrimaryAssetId ItemId, int32 Amount, bool HighQuality) { if (ItemId.IsValid()) { - int32 ItemIndex = ItemExists(ItemId, Seed, HighQuality); + int32 ItemIndex = ItemExists(ItemId, HighQuality); if (ItemIndex == -1) { return false; @@ -120,7 +118,7 @@ void UInventoryComponent::InitializeInventory() { if (IsValid(ItemData.Item)) { - AddItemToInventory(ItemData.Item->GetPrimaryAssetId(), ItemData.StackSize, ItemData.Seed, ItemData.HQ); + AddItemToInventory(ItemData.Item->GetPrimaryAssetId(), ItemData.StackSize, ItemData.HQ); } } } @@ -133,17 +131,11 @@ void UInventoryComponent::EmptyInventory() OnInventoryUpdated.Broadcast(); } - -int UInventoryComponent::CheckItemCost(FPrimaryAssetId ItemId, bool Seed, bool HQ) -{ - return 0; -} - -int32 UInventoryComponent::GetStackForItem(FPrimaryAssetId ItemId, bool Seed, bool HQ) +int32 UInventoryComponent::GetStackForItem(FPrimaryAssetId ItemId, bool HQ) { for (int32 i = 0; i < ItemList.Num(); i++) { - if (ItemList[i].ItemId == ItemId && ItemList[i].HQ == HQ && ItemList[i].Seed == Seed) + if (ItemList[i].ItemId == ItemId && ItemList[i].HQ == HQ) return ItemList[i].Stack; } return 0; @@ -175,7 +167,7 @@ void UInventoryComponent::LoadFromSave(const FInventorySaveData& LoadData) EmptyInventory(); for (const FItemStack& SaveDataEntry : LoadData.ItemStacks) { - AddItemToInventory(SaveDataEntry.ItemId, SaveDataEntry.Stack, SaveDataEntry.Seed, SaveDataEntry.HQ); + AddItemToInventory(SaveDataEntry.ItemId, SaveDataEntry.Stack, SaveDataEntry.HQ); } } diff --git a/Source/ProjectEleri/Private/TimeOfDayManager.cpp b/Source/ProjectEleri/Private/TimeOfDayManager.cpp index df258a4a..a95233e0 100644 --- a/Source/ProjectEleri/Private/TimeOfDayManager.cpp +++ b/Source/ProjectEleri/Private/TimeOfDayManager.cpp @@ -1,7 +1,6 @@ // Fill out your copyright notice in the Description page of Project Settings. #include "TimeOfDayManager.h" -#include "../Items/SeedCarousel.h" #include "Components/DirectionalLightComponent.h" #include "Components/ExponentialHeightFogComponent.h" #include "Components/SkyAtmosphereComponent.h" diff --git a/Source/ProjectEleri/Public/EleriGameState.h b/Source/ProjectEleri/Public/EleriGameState.h index 88d6fb2d..85b03977 100644 --- a/Source/ProjectEleri/Public/EleriGameState.h +++ b/Source/ProjectEleri/Public/EleriGameState.h @@ -23,10 +23,7 @@ class PROJECTELERI_API AEleriGameState : public AGameStateBase public: static AEleriGameState* Get(const UObject* WorldContext); - - UPROPERTY(EditDefaultsOnly, BlueprintReadWrite) - TSubclassOf SeedCarouselBpClass; - + UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Game State", meta=(WorldContext="WorldContext", GameplayTagFilter = "Characters")) static int32 GetFriendshipAmount(const UObject* WorldContext, FGameplayTag NpcTag); UFUNCTION(BlueprintCallable, Category = "Game State", meta = (WorldContext = "WorldContext", GameplayTagFilter = "Characters")) diff --git a/Source/ProjectEleri/Public/InventoryComponent.h b/Source/ProjectEleri/Public/InventoryComponent.h index 7e5d0040..83d1863d 100644 --- a/Source/ProjectEleri/Public/InventoryComponent.h +++ b/Source/ProjectEleri/Public/InventoryComponent.h @@ -29,9 +29,6 @@ struct FDefaultItemStack { UPROPERTY(EditAnywhere) int32 StackSize = 1; - UPROPERTY(EditAnywhere) - bool Seed; - UPROPERTY(EditAnywhere, BlueprintReadWrite) bool HQ = false; }; @@ -46,9 +43,6 @@ struct FItemStack { UPROPERTY(EditAnywhere, BlueprintReadWrite) int32 Stack = 1; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - bool Seed = false; - UPROPERTY(EditAnywhere, BlueprintReadWrite) bool HQ = false; }; @@ -81,7 +75,7 @@ class PROJECTELERI_API UInventoryComponent : public UActorComponent private: int32 CheckIfItemExists(class UItem* item); - int32 ItemExists(FPrimaryAssetId ItemToCheck, bool IsSeed, bool IsHq); + int32 ItemExists(FPrimaryAssetId ItemToCheck, bool IsHq); UPROPERTY() UItemDatabase* ItemDatabase; @@ -123,25 +117,22 @@ public: public: UFUNCTION(BlueprintCallable) - bool AddItemToInventory(FPrimaryAssetId ItemToAdd, int32 StackSize = 1, bool Seed = false, bool HighQuality = false); + bool AddItemToInventory(FPrimaryAssetId ItemToAdd, int32 StackSize = 1, bool HighQuality = false); UFUNCTION(BlueprintCallable) - bool RemoveItemFromInventory(FPrimaryAssetId ItemId, int32 Amount = 1, bool Seed = false, bool HighQuality = false); + bool RemoveItemFromInventory(FPrimaryAssetId ItemId, int32 Amount = 1, bool HighQuality = false); UFUNCTION(BlueprintCallable) void InitializeInventory(); UFUNCTION(BlueprintCallable) void EmptyInventory(); - - UFUNCTION(BlueprintCallable, meta = (DeprecatedFunction)) - int CheckItemCost(FPrimaryAssetId ItemId, bool Seed = false, bool HQ = false); UFUNCTION(BlueprintCallable) - int32 GetStackForItem(FPrimaryAssetId ItemId, bool Seed = false, bool HQ = false); + int32 GetStackForItem(FPrimaryAssetId ItemId, bool HQ = false); UFUNCTION(BlueprintCallable) - int32 HasItem(FPrimaryAssetId ItemToCheck, bool Seed = false, bool HQ = false); + int32 HasItem(FPrimaryAssetId ItemToCheck, bool HQ = false); UFUNCTION(BlueprintCallable) TArray GetItemAssetIds();