From 4f029309d50f319b1c99c00a7e0d6f1218545897 Mon Sep 17 00:00:00 2001 From: "adnan.mujkic" Date: Sun, 13 Sep 2026 16:42:22 +0200 Subject: [PATCH] More fixes for removal mode and cleanup of some stuff --- Config/DefaultGame.ini | 2 + .../02/SM_LevelStructure02.uasset | 4 +- .../Structures/SM_ShadowBox_1MPanel.uasset | 4 +- .../Structures/SM_ShadowBox_RoundEdge.uasset | 4 +- .../SM_TrimFeature_MetalTrim_Bend.uasset | 4 +- .../SM_TrimFeature_MetalTrim_Straight.uasset | 4 +- .../Decorations/Bushes/DA_D_Bush1.uasset | 4 +- .../Decorations/Bushes/DA_D_Bush4.uasset | 4 +- .../Decorations/Bushes/DA_D_Bush4Red.uasset | 4 +- .../Decorations/Bushes/DA_D_Bush4White.uasset | 4 +- .../Bushes/DA_D_Bush4Yellow.uasset | 4 +- .../Items/Decorations/DA_D_Tree1.uasset | 3 - .../Items/Decorations/DA_D_Tree2.uasset | 3 - .../Items/Decorations/DA_D_WoodenFence.uasset | 4 +- .../Items/Decorations/Rocks/DA_D_Rock1.uasset | 4 +- .../Items/Decorations/Rocks/DA_D_Rock2.uasset | 4 +- .../Items/Decorations/Rocks/DA_D_Rock3.uasset | 4 +- .../Items/Decorations/Rocks/DA_D_Rock4.uasset | 4 +- .../Items/Potions/DA_Po_HealingTonic.uasset | 4 +- Content/Maps/Persistent_GameWorld.umap | 4 +- Content/Models/Props/SM_TableSmall.uasset | 4 +- Content/Models/Props/SM_TableWide.uasset | 4 +- .../Props/SM_Treasure_Chest_Base.uasset | 4 +- .../Models/Props/SM_Treasure_Chest_Lid.uasset | 4 +- Content/Models/Props/SM_WoodChair.uasset | 4 +- .../Models/Props/SM_WoodChairPlating.uasset | 4 +- Content/Models/Wood/WoodenFence.uasset | 4 +- .../BP_RemovableStaticMeshActor.uasset | 4 +- Content/Prefabs/Bush1.uasset | 3 - Content/Prefabs/Bush1_FlowerRed.uasset | 3 - Content/Prefabs/Bush1_FlowerWhite.uasset | 3 - Content/Prefabs/Bush1_FlowerYellow.uasset | 3 - Content/Prefabs/Bush2.uasset | 3 - Content/Prefabs/Bush2_FlowerRed.uasset | 3 - Content/Prefabs/Bush2_FlowerWhite.uasset | 3 - Content/Prefabs/Bush2_FlowerYellow.uasset | 3 - Content/Prefabs/Bush3.uasset | 3 - Content/Prefabs/Bush3_FlowerRed.uasset | 3 - Content/Prefabs/Bush3_FlowerWhite.uasset | 3 - Content/Prefabs/Bush3_FlowerYellow.uasset | 3 - Content/Prefabs/Bush4.uasset | 3 - Content/Prefabs/Bush4_FlowerRed.uasset | 3 - Content/Prefabs/Bush4_FlowerWhite.uasset | 3 - Content/Prefabs/Bush4_FlowerYellow.uasset | 3 - Content/Prefabs/Bush_Blueprint.uasset | 3 - Content/Prefabs/Bush_Tree1.uasset | 3 - Content/Prefabs/FencePlaceable.uasset | 3 - .../Prefabs/Rocks/BP_RemovableRock1.uasset | 3 - .../Prefabs/Rocks/BP_RemovableRock2.uasset | 3 - .../Prefabs/Rocks/BP_RemovableRock3.uasset | 3 - .../Prefabs/Rocks/BP_RemovableRock4.uasset | 3 - Content/Prefabs/SM_branch_01.uasset | 3 - Content/Prefabs/Tree1.uasset | 3 - Content/Prefabs/Tree2.uasset | 4 +- Content/Prefabs/Tree3.uasset | 4 +- Content/Prefabs/Tree4.uasset | 4 +- Content/Prefabs/Tree_Blueprint.uasset | 3 - Content/Scripts/BP_TimeOfDay.uasset | 4 +- .../DialogueSystem/UI/DialogueScreen.uasset | 4 +- .../InventorySystem/BP_TreasureChest.uasset | 2 +- .../InventorySystem/ItemManagerBP.uasset | 4 +- .../Seed/BP_PlantableArea.uasset | 4 +- .../Seed/BP_SeedCarousel.uasset | 4 +- .../UI/InventoryScreenWrapper.uasset | 4 +- .../Potions/T_Prop_TinyRevitalizingElixir.png | 3 - .../T_Prop_TinyRevitalizingElixir.uasset | 3 - .../0/7G/P7GRHHZCBWGR0T5XS36UZ3.uasset | 2 +- .../1/CX/URT3XRUH2L6J1PJ8NU768M.uasset | 2 +- .../1/VB/3IHR8O42TH07HLII6L8LIL.uasset | 2 +- .../2/QG/Q45J2Z77VJH4HK4NDECUIH.uasset | 2 +- .../3/LG/ASNIA8K43GGE8XGTUSH31C.uasset | 4 +- .../5/FE/Y8YXRC8Y6WF9RA9DFVR8UU.uasset | 2 +- .../9/OV/3C2KUIOHQA8MROL6NKQQRA.uasset | 2 +- .../C/F2/1ZA13MX9Z1WVH7H9ZVGOD4.uasset | 2 +- .../E/R0/MK29CPTDXD540OZ9G722Q6.uasset | 3 - .../E/XN/4VXPK4RYZHM8HZESMIR8K0.uasset | 4 +- .../Components/MoveActorsComponent.cpp | 59 ++++--------------- .../Components/MoveActorsComponent.h | 12 ++-- .../GameObjects/RemovableStaticMeshActor.cpp | 23 ++++---- .../GameObjects/RemovableStaticMeshActor.h | 17 ++---- .../Items/DataAssets/ItemDataAsset.h | 15 +++-- Source/ProjectEleri/Items/ItemDatabase.cpp | 53 +++++++++++++++++ Source/ProjectEleri/Items/ItemDatabase.h | 49 ++++++++------- Source/ProjectEleri/Items/SeedBedActor.cpp | 26 ++++++++ Source/ProjectEleri/Items/SeedBedActor.h | 25 ++++++++ .../Private/EleriPlayerController.cpp | 42 +++---------- .../ProjectEleri/Settings/EleriGameSettings.h | 6 +- .../Subsystem/ObjectPersistenceSubsystem.cpp | 3 - 88 files changed, 273 insertions(+), 312 deletions(-) delete mode 100644 Content/GameData/Items/Decorations/DA_D_Tree1.uasset delete mode 100644 Content/GameData/Items/Decorations/DA_D_Tree2.uasset delete mode 100644 Content/Prefabs/Bush1.uasset delete mode 100644 Content/Prefabs/Bush1_FlowerRed.uasset delete mode 100644 Content/Prefabs/Bush1_FlowerWhite.uasset delete mode 100644 Content/Prefabs/Bush1_FlowerYellow.uasset delete mode 100644 Content/Prefabs/Bush2.uasset delete mode 100644 Content/Prefabs/Bush2_FlowerRed.uasset delete mode 100644 Content/Prefabs/Bush2_FlowerWhite.uasset delete mode 100644 Content/Prefabs/Bush2_FlowerYellow.uasset delete mode 100644 Content/Prefabs/Bush3.uasset delete mode 100644 Content/Prefabs/Bush3_FlowerRed.uasset delete mode 100644 Content/Prefabs/Bush3_FlowerWhite.uasset delete mode 100644 Content/Prefabs/Bush3_FlowerYellow.uasset delete mode 100644 Content/Prefabs/Bush4.uasset delete mode 100644 Content/Prefabs/Bush4_FlowerRed.uasset delete mode 100644 Content/Prefabs/Bush4_FlowerWhite.uasset delete mode 100644 Content/Prefabs/Bush4_FlowerYellow.uasset delete mode 100644 Content/Prefabs/Bush_Blueprint.uasset delete mode 100644 Content/Prefabs/Bush_Tree1.uasset delete mode 100644 Content/Prefabs/FencePlaceable.uasset delete mode 100644 Content/Prefabs/Rocks/BP_RemovableRock1.uasset delete mode 100644 Content/Prefabs/Rocks/BP_RemovableRock2.uasset delete mode 100644 Content/Prefabs/Rocks/BP_RemovableRock3.uasset delete mode 100644 Content/Prefabs/Rocks/BP_RemovableRock4.uasset delete mode 100644 Content/Prefabs/SM_branch_01.uasset delete mode 100644 Content/Prefabs/Tree1.uasset delete mode 100644 Content/Prefabs/Tree_Blueprint.uasset delete mode 100644 Content/Textures/UI/ChemicalProperties/Potions/T_Prop_TinyRevitalizingElixir.png delete mode 100644 Content/Textures/UI/ChemicalProperties/Potions/T_Prop_TinyRevitalizingElixir.uasset delete mode 100644 Content/__ExternalActors__/Maps/Persistent_GameWorld/E/R0/MK29CPTDXD540OZ9G722Q6.uasset create mode 100644 Source/ProjectEleri/Items/SeedBedActor.cpp create mode 100644 Source/ProjectEleri/Items/SeedBedActor.h diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 68d8f899..064b154c 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -193,6 +193,8 @@ CameraZoomLevels=(((TagName="Camera.BoomOffset.Default"), (X=-1200.000000,Y=0.00 +ProfessionExpArray=240000.000000 ExpIncreaseEffectClass=/Script/Engine.BlueprintGeneratedClass'/Game/Blueprints/GameEffects/GSE_AddExp_Template.GSE_AddExp_Template_C' GlobalSettingsDataSheet=/Game/GameData/CSV/GlobalKeyValueSettings.GlobalKeyValueSettings +ItemSeedCarouselClass=None +RemovableStaticMeshClass=/Script/Engine.BlueprintGeneratedClass'/Game/Prefabs/BP_RemovableStaticMeshActor.BP_RemovableStaticMeshActor_C' [/Script/InteractionSystem.InteractionSettings] DefaultInteractionWidgetClass=/Script/UMG.WidgetBlueprintGeneratedClass'/Game/UI/InteractionUI/WBP_Eleri_Interaction.WBP_Eleri_Interaction_C' diff --git a/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/LevelStructure/02/SM_LevelStructure02.uasset b/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/LevelStructure/02/SM_LevelStructure02.uasset index e4d5ae19..d5fd7f0b 100644 --- a/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/LevelStructure/02/SM_LevelStructure02.uasset +++ b/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/LevelStructure/02/SM_LevelStructure02.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa84e4668d40650372e7be3694514b8fc9803ea84741985e8ea3da79af9600c4 -size 34572 +oid sha256:bb80aeac43b65be8b3b54b02203754f2c77a131d791c5fb8e9b0746b08f7236f +size 34917 diff --git a/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_ShadowBox_1MPanel.uasset b/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_ShadowBox_1MPanel.uasset index 002ac54d..d30a7203 100644 --- a/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_ShadowBox_1MPanel.uasset +++ b/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_ShadowBox_1MPanel.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b5c4ac1b5571f4c40a6809fe609cc670e99067dada3424169ba063d24fda390 -size 51635 +oid sha256:adae251c52de1e7538e601681901e2b16218997ec12262f2d8e5393c76f96e06 +size 51346 diff --git a/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_ShadowBox_RoundEdge.uasset b/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_ShadowBox_RoundEdge.uasset index ce6b59da..13b7e4ad 100644 --- a/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_ShadowBox_RoundEdge.uasset +++ b/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_ShadowBox_RoundEdge.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62ec5e365696d1b50be764c5209cae63a26632e73e91a4c0c1ac0b806d40419c -size 64036 +oid sha256:a4823ffcbced6345dac535c5c1c08eba0f80161a4956fdde95483787440404a9 +size 63891 diff --git a/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_TrimFeature_MetalTrim_Bend.uasset b/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_TrimFeature_MetalTrim_Bend.uasset index 5bcc756a..98c1c1d7 100644 --- a/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_TrimFeature_MetalTrim_Bend.uasset +++ b/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_TrimFeature_MetalTrim_Bend.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8b12950bb84296b6ac1f1084585e57e84666991cbeb38ea1f93717ac898298e -size 40930 +oid sha256:d60873c5297789b26b8b5049d8353869aa25b57b3cf5255441f03ff58e23ff5c +size 41090 diff --git a/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_TrimFeature_MetalTrim_Straight.uasset b/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_TrimFeature_MetalTrim_Straight.uasset index 3bb5e26c..9b37ca24 100644 --- a/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_TrimFeature_MetalTrim_Straight.uasset +++ b/Content/EasyOptionsMenu/DemoContent/Meshes/Structures/SM_TrimFeature_MetalTrim_Straight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c91bda13861d43c723725b6a911eee47de1d4361488e4043e2490744a5de70f7 -size 36897 +oid sha256:284c281f87f2c821140defafd6e65600dc4980a7ab3150202e46c7f88bdaaf65 +size 37221 diff --git a/Content/GameData/Items/Decorations/Bushes/DA_D_Bush1.uasset b/Content/GameData/Items/Decorations/Bushes/DA_D_Bush1.uasset index 531a9674..af77f2be 100644 --- a/Content/GameData/Items/Decorations/Bushes/DA_D_Bush1.uasset +++ b/Content/GameData/Items/Decorations/Bushes/DA_D_Bush1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b8c14ffd282ee8f1fd7debf8640efead69e8a4e7008fdb800f528d74a3cbac8 -size 5302 +oid sha256:2536c670959483b0a5d34366671937710fdb9344c9975d2e684120a457da507f +size 5081 diff --git a/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4.uasset b/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4.uasset index 64e003b8..7a5b08e9 100644 --- a/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4.uasset +++ b/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46210e86f63e28c5fe43523af9d71e007d578ecd6c8f02bf49bbd26c7a439c3d -size 5302 +oid sha256:5306c40efe0e54d70bcbf48d2408392df6e1c61dcc2b98b9cc1af6374a83acca +size 5105 diff --git a/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4Red.uasset b/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4Red.uasset index ed53b85f..8c386da2 100644 --- a/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4Red.uasset +++ b/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4Red.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7acfc80ed9fa4e7f766326f4d85f4bc195bdbc388c81130079355143adda158f -size 5424 +oid sha256:b777bbe086baf452c83b07f4b3846f74715332cd4f36cbb7f6d3de41ec948ae6 +size 5207 diff --git a/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4White.uasset b/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4White.uasset index 0190b125..11315058 100644 --- a/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4White.uasset +++ b/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4White.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef7141b672c8c4dcb0a7741352650915c92e3879177f014603489bf8766e49ec -size 5480 +oid sha256:49a909d7d9d8fc4cb4a1e79cc7a50a178e921782303133484f7011d7dec3f068 +size 5259 diff --git a/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4Yellow.uasset b/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4Yellow.uasset index e33129a4..e3d8df9d 100644 --- a/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4Yellow.uasset +++ b/Content/GameData/Items/Decorations/Bushes/DA_D_Bush4Yellow.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63b27833cc5e3e9dd1bee238b57881ccba73c4bc88398a19c7967ccc1eadbedd -size 5508 +oid sha256:a2f7fafb321ed7c1e3429fa97d9fc958deeb814a251c02b2c316bf395d2d9bf9 +size 5285 diff --git a/Content/GameData/Items/Decorations/DA_D_Tree1.uasset b/Content/GameData/Items/Decorations/DA_D_Tree1.uasset deleted file mode 100644 index dfcfa791..00000000 --- a/Content/GameData/Items/Decorations/DA_D_Tree1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c9999b4d4a74c8cf90e309066c59753d83605205fe1c22f9fe9f79e55f37ac1 -size 5393 diff --git a/Content/GameData/Items/Decorations/DA_D_Tree2.uasset b/Content/GameData/Items/Decorations/DA_D_Tree2.uasset deleted file mode 100644 index 3f732cdc..00000000 --- a/Content/GameData/Items/Decorations/DA_D_Tree2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f9a7ed991fa468c004bb4ad7b9db7ec8db0b2a6c0d67ca736d18714dcd746ea -size 5393 diff --git a/Content/GameData/Items/Decorations/DA_D_WoodenFence.uasset b/Content/GameData/Items/Decorations/DA_D_WoodenFence.uasset index 61fbcbaf..0dd125a5 100644 --- a/Content/GameData/Items/Decorations/DA_D_WoodenFence.uasset +++ b/Content/GameData/Items/Decorations/DA_D_WoodenFence.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cb465fd2981ecc120c2363a95fe8254bd7cf8355828bd28bf517ad535e10202 -size 5472 +oid sha256:b456d744ab736ef1ba1fd72933bb3ae0d94d12669ab65bc9a9463439138633d5 +size 5191 diff --git a/Content/GameData/Items/Decorations/Rocks/DA_D_Rock1.uasset b/Content/GameData/Items/Decorations/Rocks/DA_D_Rock1.uasset index 076aec0b..b90254d2 100644 --- a/Content/GameData/Items/Decorations/Rocks/DA_D_Rock1.uasset +++ b/Content/GameData/Items/Decorations/Rocks/DA_D_Rock1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29576ae7c23b39744757afed37a1f6475a70a84850f9452e8673416b6b052944 -size 5367 +oid sha256:e26d9c18f8c00c3912903690e225b7dcc5cb32bd0e373065544969a6b63191a9 +size 5063 diff --git a/Content/GameData/Items/Decorations/Rocks/DA_D_Rock2.uasset b/Content/GameData/Items/Decorations/Rocks/DA_D_Rock2.uasset index f868cb50..91746ad0 100644 --- a/Content/GameData/Items/Decorations/Rocks/DA_D_Rock2.uasset +++ b/Content/GameData/Items/Decorations/Rocks/DA_D_Rock2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55ef50cf81bc0acfedcf17c0d8f6de191467a0d340ffdc8507ad38ec2d3d36d2 -size 5368 +oid sha256:4694f7da580a67957d67f74bd5e209561f169c5eef249206ec0c6623e9a890ed +size 5064 diff --git a/Content/GameData/Items/Decorations/Rocks/DA_D_Rock3.uasset b/Content/GameData/Items/Decorations/Rocks/DA_D_Rock3.uasset index 978dcb06..e7c5373b 100644 --- a/Content/GameData/Items/Decorations/Rocks/DA_D_Rock3.uasset +++ b/Content/GameData/Items/Decorations/Rocks/DA_D_Rock3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90b6e633abb14061c8bf4d1199a447abafcdec5da972f2e13121d06f403f055e -size 5368 +oid sha256:3f3a395b21cc83b269464cec60cc56418265f9c0daaa7c9b155c5c43ac5ba600 +size 5064 diff --git a/Content/GameData/Items/Decorations/Rocks/DA_D_Rock4.uasset b/Content/GameData/Items/Decorations/Rocks/DA_D_Rock4.uasset index a1c832d8..e904f67d 100644 --- a/Content/GameData/Items/Decorations/Rocks/DA_D_Rock4.uasset +++ b/Content/GameData/Items/Decorations/Rocks/DA_D_Rock4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2d98536c6b9b7b24a2f07faeff6397d59bea882345cc3d259c9ef871c95e0b9 -size 5368 +oid sha256:01093d9ff1228bca6b6ec709ccebeac5b441c8055dd3d3fbfabfb63f17fd0777 +size 5064 diff --git a/Content/GameData/Items/Potions/DA_Po_HealingTonic.uasset b/Content/GameData/Items/Potions/DA_Po_HealingTonic.uasset index fc856983..384439b4 100644 --- a/Content/GameData/Items/Potions/DA_Po_HealingTonic.uasset +++ b/Content/GameData/Items/Potions/DA_Po_HealingTonic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc47e8e2394ae99eb5e980d34e1e699160ae11212e2afad73906a4b601c89089 -size 7018 +oid sha256:c79246358c9002d1dc0bbdd5b8935daba7133d42b0f323c7a115a4ee8bbeef9d +size 7215 diff --git a/Content/Maps/Persistent_GameWorld.umap b/Content/Maps/Persistent_GameWorld.umap index f1edda61..5e20033a 100644 --- a/Content/Maps/Persistent_GameWorld.umap +++ b/Content/Maps/Persistent_GameWorld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2fe9cba2f15d1a0c6631df41621d370c250ea269f9e1b21f07df054db077c85 -size 51528 +oid sha256:8e3a7febc8e6c3c1b7ae68feaa60eadaa70200acd1df3897d1e515e126c17d2f +size 41695 diff --git a/Content/Models/Props/SM_TableSmall.uasset b/Content/Models/Props/SM_TableSmall.uasset index 50ea8ca6..94cd7849 100644 --- a/Content/Models/Props/SM_TableSmall.uasset +++ b/Content/Models/Props/SM_TableSmall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07c53abb95bb93ef737a603b5fdfa5c6ff5268b7884030a00f079eb988d3e2ba -size 78726 +oid sha256:8547ea534f7d9491e3e0bafb0c8ac50a36de7d7edff4db5beeea6923b082fb38 +size 78566 diff --git a/Content/Models/Props/SM_TableWide.uasset b/Content/Models/Props/SM_TableWide.uasset index 02c2f9f3..8d97f2ef 100644 --- a/Content/Models/Props/SM_TableWide.uasset +++ b/Content/Models/Props/SM_TableWide.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42204d4334b7914718ab7715e2984388f405280c7a30f8d9e83bab7c15cca649 -size 77446 +oid sha256:38b025a3b65ffe9f926610ac476382670c2197a3f7440ec43f14731b59aa59c7 +size 77285 diff --git a/Content/Models/Props/SM_Treasure_Chest_Base.uasset b/Content/Models/Props/SM_Treasure_Chest_Base.uasset index 8cd8120b..c571e09e 100644 --- a/Content/Models/Props/SM_Treasure_Chest_Base.uasset +++ b/Content/Models/Props/SM_Treasure_Chest_Base.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e995621a24af146756f56443147fe13eceb16735c68f48f4081648e591697eae -size 88164 +oid sha256:a31a7f8a050548d9597bc01f4cde659ddfa751f19a8cf7c4365992c82314a79f +size 89415 diff --git a/Content/Models/Props/SM_Treasure_Chest_Lid.uasset b/Content/Models/Props/SM_Treasure_Chest_Lid.uasset index 7f2075f5..f00f21fb 100644 --- a/Content/Models/Props/SM_Treasure_Chest_Lid.uasset +++ b/Content/Models/Props/SM_Treasure_Chest_Lid.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c42591c98e11a8ca86391b383f9af2f046368294d6ec5550dc1290f0fd5db462 -size 103198 +oid sha256:5eb1d972ac2ef8554a9bdf54da0b79e64fc4eb2e3f6647649d8f8d5d6088fe68 +size 103575 diff --git a/Content/Models/Props/SM_WoodChair.uasset b/Content/Models/Props/SM_WoodChair.uasset index c84c507d..aebbb849 100644 --- a/Content/Models/Props/SM_WoodChair.uasset +++ b/Content/Models/Props/SM_WoodChair.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d056f460730ce0a71c89d4d1719401e2808ae66dd08d6bca311cfba349b2c3c6 -size 82714 +oid sha256:fc9fc7dec69c129017b47c2f80531213e57069b93b291dffa0f31e1a63e1ddb3 +size 82934 diff --git a/Content/Models/Props/SM_WoodChairPlating.uasset b/Content/Models/Props/SM_WoodChairPlating.uasset index 3137fbcd..1505172e 100644 --- a/Content/Models/Props/SM_WoodChairPlating.uasset +++ b/Content/Models/Props/SM_WoodChairPlating.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48278932cfe087f85c8683fe0ed2daf2fb2d9f4ef660ee102a127a6aead3771a -size 85345 +oid sha256:96341a8d9c6041a400cc9e884a6450dc83d60bf9e585b01f1c208ee341053bfd +size 85762 diff --git a/Content/Models/Wood/WoodenFence.uasset b/Content/Models/Wood/WoodenFence.uasset index 042307e6..706e883f 100644 --- a/Content/Models/Wood/WoodenFence.uasset +++ b/Content/Models/Wood/WoodenFence.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e17f0b9381e5d245350ce4a92b4ee79123510f8e6d43c5133c7ee62ac529fb7d -size 585886 +oid sha256:960972fc030724f2d999dded423347f22bf9fc9337a2342f381c81dcb9a820ab +size 592415 diff --git a/Content/Prefabs/BP_RemovableStaticMeshActor.uasset b/Content/Prefabs/BP_RemovableStaticMeshActor.uasset index e477b2cb..2bb5d499 100644 --- a/Content/Prefabs/BP_RemovableStaticMeshActor.uasset +++ b/Content/Prefabs/BP_RemovableStaticMeshActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:520560df21c96f8c2e6463864431bb1dbe6b60bad31e28abd0fb77214bb6fc1d -size 145617 +oid sha256:797fea99b691757c32d260c0207a3e160c959b628569acf6678dee48a2b85979 +size 148295 diff --git a/Content/Prefabs/Bush1.uasset b/Content/Prefabs/Bush1.uasset deleted file mode 100644 index a27a1ab2..00000000 --- a/Content/Prefabs/Bush1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d52e7144e50f9fd413c2125e2a3c691eddace2e872a051f14bf81d41286a699 -size 33609 diff --git a/Content/Prefabs/Bush1_FlowerRed.uasset b/Content/Prefabs/Bush1_FlowerRed.uasset deleted file mode 100644 index 8ae6d981..00000000 --- a/Content/Prefabs/Bush1_FlowerRed.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83016f362f2c2e43ec1b115d7e91a16a5d5accc9f9f14390d85e897dc113beee -size 37057 diff --git a/Content/Prefabs/Bush1_FlowerWhite.uasset b/Content/Prefabs/Bush1_FlowerWhite.uasset deleted file mode 100644 index 77ab6ce6..00000000 --- a/Content/Prefabs/Bush1_FlowerWhite.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c45ad76500b4996f04ffd4575843ab294287b521996df9f78254913e58b36bae -size 37544 diff --git a/Content/Prefabs/Bush1_FlowerYellow.uasset b/Content/Prefabs/Bush1_FlowerYellow.uasset deleted file mode 100644 index be0e1858..00000000 --- a/Content/Prefabs/Bush1_FlowerYellow.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11b2d55a4e7bc19899f8ea6fe113385810f0aa1a5c0b7bd4a3263814d42d2ad7 -size 37459 diff --git a/Content/Prefabs/Bush2.uasset b/Content/Prefabs/Bush2.uasset deleted file mode 100644 index 3b994ace..00000000 --- a/Content/Prefabs/Bush2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:145457e63bb81f1ec93ca45e51dec9e83ca4fe359b3420b583d6d22f31b783fd -size 37994 diff --git a/Content/Prefabs/Bush2_FlowerRed.uasset b/Content/Prefabs/Bush2_FlowerRed.uasset deleted file mode 100644 index 682d13a1..00000000 --- a/Content/Prefabs/Bush2_FlowerRed.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2c098fe9d67c2543ea4302e074d737c8d904c78ff265a097deecd5a4135862b -size 40499 diff --git a/Content/Prefabs/Bush2_FlowerWhite.uasset b/Content/Prefabs/Bush2_FlowerWhite.uasset deleted file mode 100644 index 8d223a15..00000000 --- a/Content/Prefabs/Bush2_FlowerWhite.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c62c508ea96af6a9f65a8fab5b926b884563722332fd9b35e931d0095acaeae -size 41004 diff --git a/Content/Prefabs/Bush2_FlowerYellow.uasset b/Content/Prefabs/Bush2_FlowerYellow.uasset deleted file mode 100644 index 6b78e9f6..00000000 --- a/Content/Prefabs/Bush2_FlowerYellow.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b26a67f6f6f174816a1661fc91baddcccde3b4340a9fe958199e92bf5c50f5ba -size 40961 diff --git a/Content/Prefabs/Bush3.uasset b/Content/Prefabs/Bush3.uasset deleted file mode 100644 index 59202e0b..00000000 --- a/Content/Prefabs/Bush3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de81fb850bb3fe4710161a2de9dc7ccbff6129debc444da91042b3d7eac552e1 -size 32249 diff --git a/Content/Prefabs/Bush3_FlowerRed.uasset b/Content/Prefabs/Bush3_FlowerRed.uasset deleted file mode 100644 index 5c310d6e..00000000 --- a/Content/Prefabs/Bush3_FlowerRed.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80e6bd68e4f5c1faf2d387fee47ac0cc8f478c219e5da3f17d647856c65c9502 -size 34535 diff --git a/Content/Prefabs/Bush3_FlowerWhite.uasset b/Content/Prefabs/Bush3_FlowerWhite.uasset deleted file mode 100644 index 8c15e42f..00000000 --- a/Content/Prefabs/Bush3_FlowerWhite.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d8ce627d252b61977f537605938d8386bb4652917ef56a5c6a658ffb95f1ab7 -size 34780 diff --git a/Content/Prefabs/Bush3_FlowerYellow.uasset b/Content/Prefabs/Bush3_FlowerYellow.uasset deleted file mode 100644 index dfaec920..00000000 --- a/Content/Prefabs/Bush3_FlowerYellow.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d0022855c7f905b78af1f5e1d859f54c4cf61c08fb07ec0104773f02d8843dc -size 34961 diff --git a/Content/Prefabs/Bush4.uasset b/Content/Prefabs/Bush4.uasset deleted file mode 100644 index 6176f660..00000000 --- a/Content/Prefabs/Bush4.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b05ad9d43df619a1847d45d7fb6924e1dfaaccb9f6dfcf647f63073867948af4 -size 37204 diff --git a/Content/Prefabs/Bush4_FlowerRed.uasset b/Content/Prefabs/Bush4_FlowerRed.uasset deleted file mode 100644 index 23ec60ef..00000000 --- a/Content/Prefabs/Bush4_FlowerRed.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2fd4d178fa7c71230ecd9dea97aece48c4863a8c6b51349cb6003373a7f36fe6 -size 38371 diff --git a/Content/Prefabs/Bush4_FlowerWhite.uasset b/Content/Prefabs/Bush4_FlowerWhite.uasset deleted file mode 100644 index 1d201243..00000000 --- a/Content/Prefabs/Bush4_FlowerWhite.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c915628763ee97838d13d472e6234d4059a134a4c8683a49be64ebd07af40421 -size 38953 diff --git a/Content/Prefabs/Bush4_FlowerYellow.uasset b/Content/Prefabs/Bush4_FlowerYellow.uasset deleted file mode 100644 index dc7582dd..00000000 --- a/Content/Prefabs/Bush4_FlowerYellow.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac2dd309e7044cb1300c077aaac3abd3f572ce62e3c6a2206bb201b9ede518e3 -size 38421 diff --git a/Content/Prefabs/Bush_Blueprint.uasset b/Content/Prefabs/Bush_Blueprint.uasset deleted file mode 100644 index 61975b5c..00000000 --- a/Content/Prefabs/Bush_Blueprint.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:abbdeb28643048fea61298e4f707d2a728c053c95f6e3ec4652159d8e8a51a42 -size 123806 diff --git a/Content/Prefabs/Bush_Tree1.uasset b/Content/Prefabs/Bush_Tree1.uasset deleted file mode 100644 index e2ca1cd0..00000000 --- a/Content/Prefabs/Bush_Tree1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97b1e330afdc81d724b085103892503284907e5205fbddc435865fe5c6ab981e -size 240810 diff --git a/Content/Prefabs/FencePlaceable.uasset b/Content/Prefabs/FencePlaceable.uasset deleted file mode 100644 index fe1399c6..00000000 --- a/Content/Prefabs/FencePlaceable.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e0c93e343f7e45f12797ba50e7085ddc2494d69258fcb61b509ff8d924d4662 -size 27882 diff --git a/Content/Prefabs/Rocks/BP_RemovableRock1.uasset b/Content/Prefabs/Rocks/BP_RemovableRock1.uasset deleted file mode 100644 index f04f7d3a..00000000 --- a/Content/Prefabs/Rocks/BP_RemovableRock1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea45382c4b22ec7b8a4b64139165dfe79e47d1d460e9ed82e1b1e60ae1fe8d75 -size 37480 diff --git a/Content/Prefabs/Rocks/BP_RemovableRock2.uasset b/Content/Prefabs/Rocks/BP_RemovableRock2.uasset deleted file mode 100644 index 43b866cb..00000000 --- a/Content/Prefabs/Rocks/BP_RemovableRock2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c83e19e7012c0687d0eb1288c28dc8b7e25326c863f27550f9cc6e2abfa61609 -size 37757 diff --git a/Content/Prefabs/Rocks/BP_RemovableRock3.uasset b/Content/Prefabs/Rocks/BP_RemovableRock3.uasset deleted file mode 100644 index 71e7a760..00000000 --- a/Content/Prefabs/Rocks/BP_RemovableRock3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3409c05191048d749f35157d2962a4fc64677fc48816272fd3eec70b2914925f -size 37851 diff --git a/Content/Prefabs/Rocks/BP_RemovableRock4.uasset b/Content/Prefabs/Rocks/BP_RemovableRock4.uasset deleted file mode 100644 index 616d8376..00000000 --- a/Content/Prefabs/Rocks/BP_RemovableRock4.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6ec4f4ce06894bc61e0085f2da9f053ed4fc30bb8b061b0b496a988565fd57e -size 40271 diff --git a/Content/Prefabs/SM_branch_01.uasset b/Content/Prefabs/SM_branch_01.uasset deleted file mode 100644 index aeda6037..00000000 --- a/Content/Prefabs/SM_branch_01.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:400964c1fe935f6f1b922c7cbe09614187e24b7cab75f7371e310b8b77f2740c -size 116911 diff --git a/Content/Prefabs/Tree1.uasset b/Content/Prefabs/Tree1.uasset deleted file mode 100644 index dd0f601c..00000000 --- a/Content/Prefabs/Tree1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f646a5c8a1beba83229f0c92856aad507be4163689c3434769a71bd0f9a874cc -size 121379 diff --git a/Content/Prefabs/Tree2.uasset b/Content/Prefabs/Tree2.uasset index d02db181..23bbc052 100644 --- a/Content/Prefabs/Tree2.uasset +++ b/Content/Prefabs/Tree2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fd06752fa9f82ccbc911e5a0652c22d9e7de385bca2acecce8974b8cbbc10b0 -size 98042 +oid sha256:ba25555f7516880c14a0762f0c7df95078b2190e4a7f2c0863a87482f55098fe +size 95126 diff --git a/Content/Prefabs/Tree3.uasset b/Content/Prefabs/Tree3.uasset index ea7eb342..b8bd6301 100644 --- a/Content/Prefabs/Tree3.uasset +++ b/Content/Prefabs/Tree3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14d6028b383a405d72325b8c4dac3bdb1f0cd231e98e1809f560f9815deb45dc -size 89530 +oid sha256:28509d45f52ea892aa6a36a3f8eab972421539ce74ef3bae8d3107f9d6d2a6fb +size 87520 diff --git a/Content/Prefabs/Tree4.uasset b/Content/Prefabs/Tree4.uasset index 698351b0..f2928170 100644 --- a/Content/Prefabs/Tree4.uasset +++ b/Content/Prefabs/Tree4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee28d85e2219a928ca089757e236bf895d6e7ba18ec821b0c4de08903a94db34 -size 41902 +oid sha256:92254eac3b3366ba8dd4c3f629ec35c511a791479a4c6e0ace228557e25d481e +size 40379 diff --git a/Content/Prefabs/Tree_Blueprint.uasset b/Content/Prefabs/Tree_Blueprint.uasset deleted file mode 100644 index 67135106..00000000 --- a/Content/Prefabs/Tree_Blueprint.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad8b7f9a0ca31c19ac197124673b9aa68b1547bf946c4ae2f52245fb55dce56b -size 130596 diff --git a/Content/Scripts/BP_TimeOfDay.uasset b/Content/Scripts/BP_TimeOfDay.uasset index ea965e68..f9d0a7fd 100644 --- a/Content/Scripts/BP_TimeOfDay.uasset +++ b/Content/Scripts/BP_TimeOfDay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:662e527532e97277fe30be6f68934576a94a930bf56d218363ad1e592db7cf3d -size 485537 +oid sha256:4fd5931a7f6b038b29e9c368357922bcd921771c4beae00c336623d17b71babb +size 463599 diff --git a/Content/Scripts/DialogueSystem/UI/DialogueScreen.uasset b/Content/Scripts/DialogueSystem/UI/DialogueScreen.uasset index 7114789b..c7314b4c 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:6879079aefddebc2a05536711f496ff808dbf57ca3fa8305fa4cf9329c8085f1 -size 660476 +oid sha256:7e93e494f50e4d2d4737db4d481325c3b7a1d03aa56f8257c00d3fd6f2d16816 +size 661431 diff --git a/Content/Scripts/InventorySystem/BP_TreasureChest.uasset b/Content/Scripts/InventorySystem/BP_TreasureChest.uasset index c34fed4d..09082432 100644 --- a/Content/Scripts/InventorySystem/BP_TreasureChest.uasset +++ b/Content/Scripts/InventorySystem/BP_TreasureChest.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29042d34c5a090c298a2776ccfc58ef526732099b4e3a30edfdc34e90fe9ca61 +oid sha256:a48fd9e7d8f350ea025f20964c280781d45d0ccc1058f7d44dea59965cdfa501 size 278010 diff --git a/Content/Scripts/InventorySystem/ItemManagerBP.uasset b/Content/Scripts/InventorySystem/ItemManagerBP.uasset index 3c2c247e..76a936d6 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:c8555183e58c18c8f02e6f121ef75332e74943a68f4c05355c2583fd22ce4da6 -size 618066 +oid sha256:a4571ff43bdb0c5620057a156d1ecf4cce5357abdb6a20623fa2f1fd4916d510 +size 616718 diff --git a/Content/Scripts/InventorySystem/Seed/BP_PlantableArea.uasset b/Content/Scripts/InventorySystem/Seed/BP_PlantableArea.uasset index 02b54b01..d4083626 100644 --- a/Content/Scripts/InventorySystem/Seed/BP_PlantableArea.uasset +++ b/Content/Scripts/InventorySystem/Seed/BP_PlantableArea.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89207ece55c24492c52e4594b0687f965b901ad7f00e2a0c1c8a2a09206f6b46 -size 195495 +oid sha256:585731d444e9f0cc3f51e7f1db481f9078df329c475d84ccfddacc79b810ef62 +size 195531 diff --git a/Content/Scripts/InventorySystem/Seed/BP_SeedCarousel.uasset b/Content/Scripts/InventorySystem/Seed/BP_SeedCarousel.uasset index ec8efba3..7c9503a6 100644 --- a/Content/Scripts/InventorySystem/Seed/BP_SeedCarousel.uasset +++ b/Content/Scripts/InventorySystem/Seed/BP_SeedCarousel.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:885e189627dee635013dd9f071e231e3bf8fed2049e829c3d31258630682fc92 -size 1043997 +oid sha256:509f78a16e2916720726f46bc4c8d98f22a66fed2fb319504d2b7770796875e6 +size 1036753 diff --git a/Content/Scripts/InventorySystem/UI/InventoryScreenWrapper.uasset b/Content/Scripts/InventorySystem/UI/InventoryScreenWrapper.uasset index 59f830b7..54016638 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:33967d391183ece4d0e3c8813f1d2ff16b434ce1ebba270ff25b847ef6645352 -size 1385104 +oid sha256:5370c3122f7cec749235da6b6e74d5556035f9b769169ba25f377d5ca1c0d0d8 +size 1329204 diff --git a/Content/Textures/UI/ChemicalProperties/Potions/T_Prop_TinyRevitalizingElixir.png b/Content/Textures/UI/ChemicalProperties/Potions/T_Prop_TinyRevitalizingElixir.png deleted file mode 100644 index 5e1682f2..00000000 --- a/Content/Textures/UI/ChemicalProperties/Potions/T_Prop_TinyRevitalizingElixir.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c335ff5e80377af5f744fec6f119eb8fb823bdd1e63db5ab9fd82216091a0e2 -size 457 diff --git a/Content/Textures/UI/ChemicalProperties/Potions/T_Prop_TinyRevitalizingElixir.uasset b/Content/Textures/UI/ChemicalProperties/Potions/T_Prop_TinyRevitalizingElixir.uasset deleted file mode 100644 index 842ff3de..00000000 --- a/Content/Textures/UI/ChemicalProperties/Potions/T_Prop_TinyRevitalizingElixir.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38942044aa65b1725c60e9d5a218eae81fe910057c64b690910a85a2b47b2ebb -size 14689 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/0/7G/P7GRHHZCBWGR0T5XS36UZ3.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/0/7G/P7GRHHZCBWGR0T5XS36UZ3.uasset index df1f2b7a..b0110fac 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/0/7G/P7GRHHZCBWGR0T5XS36UZ3.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/0/7G/P7GRHHZCBWGR0T5XS36UZ3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f157ba5aa5b492f52edf96603551489e8009c156815c100feed66d6c610b3c88 +oid sha256:47d89c4c6c4231c0dc56bad8eaaf9eb3c08bf49cf115ef2ec50f342167f9edf2 size 4214 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/CX/URT3XRUH2L6J1PJ8NU768M.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/CX/URT3XRUH2L6J1PJ8NU768M.uasset index be961d7e..00841e82 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/CX/URT3XRUH2L6J1PJ8NU768M.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/CX/URT3XRUH2L6J1PJ8NU768M.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4529e77ab81cd22f89df72b2c3ba544908a84d7e7676eed17c0aac71ea9c2f50 +oid sha256:c4e9114e43129f4cb4bc245928ed4b7bc2ab9836ccb74fe7cde9ca3ac65f7d3e size 10579 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/VB/3IHR8O42TH07HLII6L8LIL.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/VB/3IHR8O42TH07HLII6L8LIL.uasset index 91254ba5..429745a5 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/VB/3IHR8O42TH07HLII6L8LIL.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/VB/3IHR8O42TH07HLII6L8LIL.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ec074ea476cdb83ced61f35be3546d855e3726226f732b58f4312c6ef6c2bef +oid sha256:17d1fd0590b778cbb93460188bc908690d19c6869662630054ff275e447a137d size 11131 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/2/QG/Q45J2Z77VJH4HK4NDECUIH.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/2/QG/Q45J2Z77VJH4HK4NDECUIH.uasset index e6fe7d1f..b1f11cba 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/2/QG/Q45J2Z77VJH4HK4NDECUIH.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/2/QG/Q45J2Z77VJH4HK4NDECUIH.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f4fad20905aed321031e6b3ba32c18f480915f57b17531cc5a581cd8b3444c2 +oid sha256:92d47b52045c0b21bf03664085361f9f48a1f6e122d1342419061e13387464ff size 4326 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/3/LG/ASNIA8K43GGE8XGTUSH31C.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/3/LG/ASNIA8K43GGE8XGTUSH31C.uasset index a1c26413..a8b0ac65 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/3/LG/ASNIA8K43GGE8XGTUSH31C.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/3/LG/ASNIA8K43GGE8XGTUSH31C.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41df82b632ab85e7e3350bdd1037682d64e33cd7ef6b6a2a77d258ab6e0af632 -size 10554 +oid sha256:cdb0f0795f10a7494a24d8ba03260910f1bc3e0f2038acd2a7d0622f3cd0c4ed +size 10658 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/5/FE/Y8YXRC8Y6WF9RA9DFVR8UU.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/5/FE/Y8YXRC8Y6WF9RA9DFVR8UU.uasset index 40371164..38148074 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/5/FE/Y8YXRC8Y6WF9RA9DFVR8UU.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/5/FE/Y8YXRC8Y6WF9RA9DFVR8UU.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1acac5bcd885f13ce2818d2ce8afcaab764a0ed25f539b8d3d5d01e895279248 +oid sha256:7d65800dda9ea7fa7f3fb4c77ef521307181a133a4ff0165e049672fe2b8dcd0 size 4320 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/9/OV/3C2KUIOHQA8MROL6NKQQRA.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/9/OV/3C2KUIOHQA8MROL6NKQQRA.uasset index afa190d2..88fec5fa 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/9/OV/3C2KUIOHQA8MROL6NKQQRA.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/9/OV/3C2KUIOHQA8MROL6NKQQRA.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bdae46d7ea65270d3f531a3e64560bc990b1b75998b9369af508a2a8e4cab70 +oid sha256:7a7e34d958fb7fd315d3a4e07495015615185894bb43523d3f125d953f029711 size 4206 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/C/F2/1ZA13MX9Z1WVH7H9ZVGOD4.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/C/F2/1ZA13MX9Z1WVH7H9ZVGOD4.uasset index 5528f39a..95520cbb 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/C/F2/1ZA13MX9Z1WVH7H9ZVGOD4.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/C/F2/1ZA13MX9Z1WVH7H9ZVGOD4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92c04b8ab10576e5cd39390baa83f5cb116fb2f1d9e519ffb488d7c22f496de8 +oid sha256:35e18ce321c41deca9822e4d0f1990e275e9044deea409411dadbfa45f496c2d size 11166 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/E/R0/MK29CPTDXD540OZ9G722Q6.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/E/R0/MK29CPTDXD540OZ9G722Q6.uasset deleted file mode 100644 index 2610d463..00000000 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/E/R0/MK29CPTDXD540OZ9G722Q6.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:445711b856940c57ceca9c98b8daa61f82014a74e5e35780f82b2adc24788500 -size 6578 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/E/XN/4VXPK4RYZHM8HZESMIR8K0.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/E/XN/4VXPK4RYZHM8HZESMIR8K0.uasset index 30484a34..0fa397de 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/E/XN/4VXPK4RYZHM8HZESMIR8K0.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/E/XN/4VXPK4RYZHM8HZESMIR8K0.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d5292e8002720abb919db78fe8fe351d6ad1cad4cd6eafee814a1cd48884c50 -size 14514 +oid sha256:3d30ad7130a7aaa2f3574ba1ca5132a261dff9b2aea4352c02df1a48424b2cc2 +size 13670 diff --git a/Source/ProjectEleri/Components/MoveActorsComponent.cpp b/Source/ProjectEleri/Components/MoveActorsComponent.cpp index efcd9455..17c37aff 100644 --- a/Source/ProjectEleri/Components/MoveActorsComponent.cpp +++ b/Source/ProjectEleri/Components/MoveActorsComponent.cpp @@ -426,18 +426,6 @@ bool UMoveActorsComponent::PlaceableActionUsed(ERemovalAction ActionUsed) case ERemovalAction::PLACE: if (PlayerController && MovingActor->IsPlaceable()) { - FPrimaryAssetId ItemId = MovingActor->ItemStack.ItemId; - if (!ItemId.IsValid()) - { - ItemId = MovingActor->DataAssetId; - } - if (ItemId.IsValid()) - { - if (UInventoryComponent* Inventory = UMainBlueprintFunctionLibrary::GetPlayerInventory(GetWorld())) - { - Inventory->RemoveItemFromInventory(ItemId, 1, false, false); - } - } PlaceObjectForPlacing(); return true; } @@ -445,26 +433,16 @@ bool UMoveActorsComponent::PlaceableActionUsed(ERemovalAction ActionUsed) case ERemovalAction::REMOVE: { - // A world object is returned to the player's inventory before it is removed. - if (MovingActor->DataAssetId.IsValid() && !MovingActor->bFromInventory) + if (UObjectPersistenceSubsystem* ObjectPersistenceSubsystem = UGameplayStatics::GetGameInstance(GetWorld())->GetSubsystem()) { - if (UInventoryComponent* Inventory = UMainBlueprintFunctionLibrary::GetPlayerInventory(GetWorld())) - { - Inventory->AddItemToInventory(MovingActor->DataAssetId, 1, false, false); - } + ObjectPersistenceSubsystem->RemoveActorFromLevel(MovingActor); } - - if (UGameInstance* GameInstance = UGameplayStatics::GetGameInstance(GetWorld())) + + if (UItemDatabase* ItemDatabase = UGameplayStatics::GetGameInstance(GetWorld())->GetSubsystem()) { - if (UObjectPersistenceSubsystem* ObjectPersistenceSubsystem = GameInstance->GetSubsystem()) - { - ObjectPersistenceSubsystem->RemoveActorFromLevel(MovingActor); - return true; - } + ItemDatabase->RemoveDecorationItem(MovingActor); } - - // Fallback if the persistence subsystem is unavailable. - MovingActor->Destroy(); + return true; } @@ -473,9 +451,10 @@ bool UMoveActorsComponent::PlaceableActionUsed(ERemovalAction ActionUsed) // Cancel the current placement/move without committing it. if (MovingActor->bFromInventory) { - // A preview spawned from the inventory: return the item and destroy the preview. - MovingActor->ReturnToInventory(); - MovingActor->Destroy(); + if (UItemDatabase* ItemDatabase = UGameplayStatics::GetGameInstance(GetWorld())->GetSubsystem()) + { + ItemDatabase->RemoveDecorationItem(MovingActor); + } } else { @@ -519,7 +498,6 @@ bool UMoveActorsComponent::PlaceObjectForPlacing() } MovingActor->Place(); - RemovalModePlacingStack--; return RemoveObjectForPlacing(); } @@ -527,22 +505,15 @@ bool UMoveActorsComponent::RemoveObjectForPlacing() { if (!PlayerController) return false; - // Get the Enhanced Input Local Player Subsystem from the Local Player related to our Player Controller. - if (UEnhancedInputLocalPlayerSubsystem* Subsystem = ULocalPlayer::GetSubsystem(PlayerController->GetLocalPlayer())) - { - if (RemovalModePlacingStack <= 0) - { - Subsystem->RemoveMappingContext(PlayerController->RemoveModeContext); - } - } - MovingActor = nullptr; return true; } -void UMoveActorsComponent::StartObjectRemoval(bool bStart, int32 Stack) +void UMoveActorsComponent::StartObjectRemoval(bool bStart) { + if (bStart && bRemovalMode) return; + if (!PlayerCharacter) return; if (!bStart) @@ -551,7 +522,6 @@ void UMoveActorsComponent::StartObjectRemoval(bool bStart, int32 Stack) } PlayerCharacter->CurrentlyDoing = bStart ? ECurrentlyDoing::OBJECT_PLACING : ECurrentlyDoing::NOTHING; - RemovalModePlacingStack = Stack; if (bStart && !bRemovalModePossible) return; if (!bStart) @@ -566,9 +536,6 @@ void UMoveActorsComponent::StartObjectRemoval(bool bStart, int32 Stack) bRemovalMode = bStart; OnRemovalModeToggled.Broadcast(bRemovalMode); - PlayerCharacter->SetNewCameraPitches( - bStart ? PlayerCharacter->CameraPitchMin - 50 : PlayerCharacter->CameraPitchMin, - bStart ? PlayerCharacter->CameraPitchMax + 5 : PlayerCharacter->CameraPitchMax); if (PlayerController && PlayerController->GetMainGameWidget()) { diff --git a/Source/ProjectEleri/Components/MoveActorsComponent.h b/Source/ProjectEleri/Components/MoveActorsComponent.h index 827a161a..92b5e1b8 100644 --- a/Source/ProjectEleri/Components/MoveActorsComponent.h +++ b/Source/ProjectEleri/Components/MoveActorsComponent.h @@ -4,6 +4,7 @@ #include "CoreMinimal.h" #include "Components/ActorComponent.h" +#include "ProjectEleri/GameObjects/RemovableStaticMeshActor.h" #include "MoveActorsComponent.generated.h" @@ -53,9 +54,6 @@ public: UPROPERTY(BlueprintReadWrite) ARemovableStaticMeshActor* MovingActor; - UPROPERTY() - int32 RemovalModePlacingStack; - UPROPERTY(EditAnywhere, BlueprintReadWrite) TArray> ActorsToIgnore; @@ -135,9 +133,9 @@ protected: ARemovableStaticMeshActor* HighligtedMovingActor; - UPROPERTY(EditAnywhere, BlueprintReadWrite) + UPROPERTY(EditAnywhere, BlueprintReadOnly) bool bRemovalModePossible; - UPROPERTY(EditAnywhere, BlueprintReadWrite) + UPROPERTY(EditAnywhere, BlueprintReadOnly) bool bRemovalMode; UPROPERTY() bool bGridMovementActive; @@ -188,6 +186,8 @@ public: bool IsRemovingModePossible() const { return bRemovalModePossible; } UFUNCTION(BlueprintCallable, BlueprintPure) bool IsRemovingMode() const { return bRemovalMode; } + UFUNCTION(BlueprintCallable, BlueprintPure) + bool IsPlacingObject() const { return IsValid(MovingActor); } UFUNCTION(BlueprintCallable) @@ -199,7 +199,7 @@ public: UFUNCTION(BlueprintCallable) bool RemoveObjectForPlacing(); UFUNCTION(BlueprintCallable) - void StartObjectRemoval(bool bStart = true, int32 Stack = 9999); + void StartObjectRemoval(bool bStart = true); UFUNCTION(BlueprintCallable) bool HighlightRemovableObject(ARemovableStaticMeshActor* Placable); UFUNCTION(BlueprintCallable) diff --git a/Source/ProjectEleri/GameObjects/RemovableStaticMeshActor.cpp b/Source/ProjectEleri/GameObjects/RemovableStaticMeshActor.cpp index f4383d1d..d4ad6fcf 100644 --- a/Source/ProjectEleri/GameObjects/RemovableStaticMeshActor.cpp +++ b/Source/ProjectEleri/GameObjects/RemovableStaticMeshActor.cpp @@ -98,10 +98,17 @@ bool ARemovableStaticMeshActor::IsInteractable_Implementation() const return true; } -void ARemovableStaticMeshActor::BindToItem(UInventoryComponent* InInventory, FItemStack InItemStack) +void ARemovableStaticMeshActor::Initialize(UStaticMesh* StaticMesh, UItemDataAsset* InItemDataAsset) +{ + GetStaticMeshComponent()->SetStaticMesh(StaticMesh); + GetStaticMeshComponent()->SetCollisionEnabled(ECollisionEnabled::NoCollision); + MeshMaterials = GetStaticMeshComponent()->GetMaterials(); + ItemDataAsset = InItemDataAsset; + DataAssetId = ItemDataAsset->GetPrimaryAssetId(); +} + +void ARemovableStaticMeshActor::BindToItem(UInventoryComponent* InInventory) { - InventoryRef = InInventory; - ItemStack = InItemStack; bFromInventory = true; } @@ -126,8 +133,6 @@ void ARemovableStaticMeshActor::Place(bool ReturnToOldLocation, bool bForce) if (bPlaced) { //Reset this because we've placed the item in the world - InventoryRef = nullptr; - ItemStack = FItemStack(); bFromInventory = false; if (ReturnToOldLocation) @@ -147,6 +152,7 @@ void ARemovableStaticMeshActor::Place(bool ReturnToOldLocation, bool bForce) } } CurrentMemorizedTransform = GetActorTransform(); + GetStaticMeshComponent()->SetCollisionEnabled(ECollisionEnabled::QueryAndPhysics); OnPlaced.Broadcast(); } } @@ -192,10 +198,3 @@ void ARemovableStaticMeshActor::ReportGridFootprint() CellsX * Pitch - Size.X, CellsY * Pitch - Size.Y, FillScale); } -void ARemovableStaticMeshActor::ReturnToInventory() -{ - if (InventoryRef) - { - InventoryRef->AddItemToInventory(ItemStack.ItemId, 1, false, ItemStack.HQ); - } -} diff --git a/Source/ProjectEleri/GameObjects/RemovableStaticMeshActor.h b/Source/ProjectEleri/GameObjects/RemovableStaticMeshActor.h index 707688ff..086077e1 100644 --- a/Source/ProjectEleri/GameObjects/RemovableStaticMeshActor.h +++ b/Source/ProjectEleri/GameObjects/RemovableStaticMeshActor.h @@ -52,14 +52,12 @@ public: UPROPERTY() FTransform CurrentMemorizedTransform; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - UInventoryComponent* InventoryRef; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - FItemStack ItemStack; + UPROPERTY(EditAnywhere, BlueprintReadWrite) AActor* PlayerRef; UPROPERTY(EditAnywhere, BlueprintReadWrite) + UItemDataAsset* ItemDataAsset; + UPROPERTY(EditAnywhere, BlueprintReadWrite) bool bPlaced; UPROPERTY(EditAnywhere, BlueprintReadWrite) @@ -115,8 +113,6 @@ public: UFUNCTION(BlueprintCallable, BlueprintPure) FORCEINLINE bool IsPlaceable() const { return bPlaceable; } - UFUNCTION(BlueprintCallable, BLueprintPure) - FORCEINLINE bool FromInventory() const { return InventoryRef != nullptr; } UPROPERTY(BlueprintAssignable, EditAnywhere, BLueprintReadWrite) FOnPlaced OnPlaced; @@ -125,11 +121,13 @@ public: UPROPERTY(VisibleAnywhere, BlueprintReadOnly) UInteractionWidgetComponent* WidgetComponent; + + void Initialize(UStaticMesh* StaticMesh, UItemDataAsset* InItemDataAsset); //Used when placing stuff from inventory so we can return it to inventory //if we cancel placing item UFUNCTION(BlueprintCallable) - void BindToItem(UInventoryComponent* InInventory, FItemStack InItemStack); + void BindToItem(UInventoryComponent* InInventory); UFUNCTION(BlueprintCallable) void PickUp(); @@ -140,9 +138,6 @@ public: UFUNCTION(BlueprintCallable) void Rotate(bool bPositive); - UFUNCTION(BlueprintCallable) - void ReturnToInventory(); - virtual bool CanPlace() { return true; } UFUNCTION(BlueprintImplementableEvent, BlueprintCallable) diff --git a/Source/ProjectEleri/Items/DataAssets/ItemDataAsset.h b/Source/ProjectEleri/Items/DataAssets/ItemDataAsset.h index d20ff923..da85ef8c 100644 --- a/Source/ProjectEleri/Items/DataAssets/ItemDataAsset.h +++ b/Source/ProjectEleri/Items/DataAssets/ItemDataAsset.h @@ -65,7 +65,7 @@ class ARemovableStaticMeshActor; /** * */ -UCLASS(BlueprintType) +UCLASS(BlueprintType, PrioritizeCategories = ("Default", "Info", "Placeable", "Craftable", "Property Map", "Seed")) class PROJECTELERI_API UItemDataAsset : public UPrimaryDataAsset { GENERATED_BODY() @@ -120,10 +120,16 @@ public: bool Stackable = true; /** Mesh that the item / potion have, ignored for seeds */ - UPROPERTY() + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Placeable", meta=(EditCondition="ItemCategory==Category::Decoration", EditConditionHides)) TSoftObjectPtr ItemMesh; - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Info", meta=(EditCondition="ItemCategory==Category::Decoration", EditConditionHides, MetaClass="/Script/ProjectEleri.RemovableStaticMeshActor")) + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Placeable", meta=(EditCondition="ItemCategory==Category::Decoration", EditConditionHides)) + int32 GridScale = 1; + + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Placeable", meta=(EditCondition="ItemCategory==Category::Decoration", EditConditionHides)) + FVector BoxExtentOverride; + + UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Placeable", meta=(EditCondition="ItemCategory==Category::Decoration", EditConditionHides, MetaClass="/Script/ProjectEleri.RemovableStaticMeshActor")) FSoftClassPath DecorationActorClassPath; @@ -132,9 +138,6 @@ public: UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Info", AssetRegistrySearchable, meta = (AssetBundles = "Inventory, Book")) int32 BaseCost; - UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Info", AssetRegistrySearchable, meta = (AssetBundles = "Inventory, Book")) - TSoftObjectPtr PropertyMapTexture; - /*--------------------------------------------------------------------------------------------------------------------------*/ /** What part of the world grants faster growth and higher chance to harvest an HQ ingredient */ diff --git a/Source/ProjectEleri/Items/ItemDatabase.cpp b/Source/ProjectEleri/Items/ItemDatabase.cpp index 97aa1253..e6a15240 100644 --- a/Source/ProjectEleri/Items/ItemDatabase.cpp +++ b/Source/ProjectEleri/Items/ItemDatabase.cpp @@ -8,6 +8,9 @@ #include "Engine/AssetManager.h" #include "BookOfAlchemyManager.h" #include "Kismet/GameplayStatics.h" +#include "ProjectEleri/Components/MoveActorsComponent.h" +#include "ProjectEleri/Settings/EleriGameSettings.h" +#include "ProjectEleri/System/MainBlueprintFunctionLibrary.h" UWorld* UItemDatabase::GetWorld() const { if (const UGameInstance* GameInstance = GetGameInstance()) { @@ -52,6 +55,9 @@ void UItemDatabase::Initialize(FSubsystemCollectionBase& Collection) { else { UAssetManager::CallOrRegister_OnCompletedInitialScan(FStopRenderingThreadDelegate::CreateLambda(LoadDataLambda)); } + + RemovableStaticMeshClass = GetDefault()->RemovableStaticMeshClass; + ItemSeedCarouselClass = GetDefault()->ItemSeedCarouselClass; } @@ -427,6 +433,53 @@ Element UItemDatabase::GetStrongestElement(const TArray& Potion return (Element)StrongestIndex; } +void UItemDatabase::SpawnDecorationItem(UItemDataAsset* ItemAsset) +{ + if (!ItemAsset || ItemAsset->ItemMesh.IsNull()) + { + return; + } + + ItemAsset->ItemMesh.LoadAsync(FLoadSoftObjectPathAsyncDelegate::CreateUObject(this, &UItemDatabase::OnDecorationItemLoaded, ItemAsset)); +} + +void UItemDatabase::RemoveDecorationItem(ARemovableStaticMeshActor* DecorationItem) +{ + if (DecorationItem->ItemDataAsset && DecorationItem->bFromInventory) + { + UInventoryComponent* InventoryComponent = UMainBlueprintFunctionLibrary::GetPlayerInventory(GetWorld()); + InventoryComponent->AddItemToInventory(DecorationItem->ItemDataAsset->GetPrimaryAssetId(), 1); + } + + DecorationItem->Destroy(); +} + +void UItemDatabase::OnDecorationItemLoaded(const FSoftObjectPath& Path, UObject* Object, UItemDataAsset* ItemAsset) +{ + UStaticMesh* StaticMesh = Cast(Object); + if (!StaticMesh || !ItemAsset) return; + + ACharacter* PlayerCharacter = UGameplayStatics::GetPlayerCharacter(GetWorld(), 0); + const FVector Location = PlayerCharacter->GetActorLocation() + (PlayerCharacter->GetActorForwardVector() * 1000.f); + FActorSpawnParameters SpawnParams; + SpawnParams.Instigator = PlayerCharacter; + SpawnParams.Owner = PlayerCharacter; + ARemovableStaticMeshActor* SpawnedActor = GetWorld()->SpawnActor(RemovableStaticMeshClass, Location, FRotator::ZeroRotator, SpawnParams); + if (!SpawnedActor) return; + SpawnedActor->SetMobility(EComponentMobility::Movable); + SpawnedActor->Initialize(StaticMesh, ItemAsset); + + UInventoryComponent* InventoryComponent = UMainBlueprintFunctionLibrary::GetPlayerInventory(GetWorld()); + SpawnedActor->BindToItem(InventoryComponent); + InventoryComponent->RemoveItemFromInventory(ItemAsset->GetPrimaryAssetId(), 1); + + UMoveActorsComponent* MoveActorsComponent = PlayerCharacter->GetComponentByClass(); + if (!MoveActorsComponent) return; + + MoveActorsComponent->StartObjectRemoval(true); + MoveActorsComponent->PickUpObjectForPlacing(SpawnedActor); +} + void FArrayOfItemRefs::SortByName() { ItemArray.Sort(); diff --git a/Source/ProjectEleri/Items/ItemDatabase.h b/Source/ProjectEleri/Items/ItemDatabase.h index 342fccde..5413736c 100644 --- a/Source/ProjectEleri/Items/ItemDatabase.h +++ b/Source/ProjectEleri/Items/ItemDatabase.h @@ -58,67 +58,76 @@ protected: public: - UPROPERTY(EditDefaultsOnly) + UPROPERTY(EditDefaultsOnly, Category = "Item Database") TSubclassOf ItemSeedCarouselClass; + UPROPERTY(EditDefaultsOnly, Category = "Item Database") + TSubclassOf RemovableStaticMeshClass; - UPROPERTY(EditAnywhere, BlueprintReadOnly) + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Item Database") TArray AllAssetIds; - UPROPERTY(EditAnywhere, BlueprintReadOnly) + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Item Database") TArray LoadedItems; - UPROPERTY(EditAnywhere, BlueprintReadOnly) + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Item Database") TMap LoadedItemsByCategory; - UPROPERTY(VisibleAnywhere, BlueprintReadWrite) + UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Item Database") TArray SeedsPlanted; public: - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "Item Database") void WaterAllSeeds(); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "Item Database") bool DoChemicalAlignmentsMatch(TArray Alignments, TArray PotionAlignments); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "Item Database") UItemDataAsset* GetPotionFromItems(TArray Items, bool& Found); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "Item Database") UItemDataAsset* GetPotionDataFromItems(TArray Items); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "Item Database") TArray GetPotionsMatchingChemicalAlignment(UItemDataAsset* Ingredient); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "Item Database") TArray GetPotionsMatchingProperties(const TArray &PotionList, TMap PropertyList); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "Item Database") UItemDataAsset* GetDataAssetFromId(FPrimaryAssetId AssetId); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "Item Database") TArray GetDataAssetsFromIds(TArray AssetIds); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "Item Database") float CalculatePotionPurity(TMap PropertyList, TArray MainProperties); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "Item Database") int32 GetCrystalCostForPotion(UItemDataAsset* Potion); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "Item Database") int32 GetCrystalCostForItems(TArray Items); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "Item Database") Element GetStrongestElement(const TArray& PotionList); + + UFUNCTION(BlueprintCallable, Category = "Item Database") + void SpawnDecorationItem(UItemDataAsset* ItemAsset); + void RemoveDecorationItem(ARemovableStaticMeshActor* DecorationItem); protected: - UPROPERTY(VisibleAnywhere, BlueprintReadOnly) + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Item Database") TArray ItemPriceDataList; protected: void PrepareItemPriceData(); + + UFUNCTION() + void OnDecorationItemLoaded(const FSoftObjectPath& Path, UObject* Object, UItemDataAsset* ItemAsset); - UFUNCTION(BlueprintCallable, BlueprintPure) + UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Item Database") int32 GetCurrentPriceForItem(FPrimaryAssetId ItemId); - UFUNCTION(BlueprintCallable, BlueprintPure) + UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Item Database") TArray GetPriceHistoryForItem(FPrimaryAssetId ItemId); }; diff --git a/Source/ProjectEleri/Items/SeedBedActor.cpp b/Source/ProjectEleri/Items/SeedBedActor.cpp new file mode 100644 index 00000000..a2c77a19 --- /dev/null +++ b/Source/ProjectEleri/Items/SeedBedActor.cpp @@ -0,0 +1,26 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "SeedBedActor.h" + + +// Sets default values +ASeedBedActor::ASeedBedActor() +{ + // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. + PrimaryActorTick.bCanEverTick = true; +} + +// Called when the game starts or when spawned +void ASeedBedActor::BeginPlay() +{ + Super::BeginPlay(); + +} + +// Called every frame +void ASeedBedActor::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); +} + diff --git a/Source/ProjectEleri/Items/SeedBedActor.h b/Source/ProjectEleri/Items/SeedBedActor.h new file mode 100644 index 00000000..b1f00f7e --- /dev/null +++ b/Source/ProjectEleri/Items/SeedBedActor.h @@ -0,0 +1,25 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/Actor.h" +#include "SeedBedActor.generated.h" + +UCLASS() +class PROJECTELERI_API ASeedBedActor : public AActor +{ + GENERATED_BODY() + +public: + // Sets default values for this actor's properties + ASeedBedActor(); + +protected: + // Called when the game starts or when spawned + virtual void BeginPlay() override; + +public: + // Called every frame + virtual void Tick(float DeltaTime) override; +}; diff --git a/Source/ProjectEleri/Private/EleriPlayerController.cpp b/Source/ProjectEleri/Private/EleriPlayerController.cpp index 5d27c9cb..89f798b6 100644 --- a/Source/ProjectEleri/Private/EleriPlayerController.cpp +++ b/Source/ProjectEleri/Private/EleriPlayerController.cpp @@ -570,7 +570,6 @@ void AEleriPlayerController::OnRemoveAction(const FInputActionValue &Value) { MoveActorsComp->PlaceableActionUsed(ERemovalAction::REMOVE); MoveActorsComp->MovingActor = nullptr; - MoveActorsComp->RemovalModePlacingStack = 0; } } @@ -617,43 +616,18 @@ void AEleriPlayerController::OnPlaceObjectAction(const FInputActionValue &Value) if (MoveActorsComp->MovingActor) { - UClass *ClassToLoad = MoveActorsComp->MovingActor->GetClass(); - FVector Location = MoveActorsComp->MovingActor->GetActorLocation(); - UInventoryComponent *Inventory = MoveActorsComp->MovingActor->InventoryRef; - FItemStack Stack = MoveActorsComp->MovingActor->ItemStack; + UItemDatabase* ItemDatabase = UGameplayStatics::GetGameInstance(GetWorld())->GetSubsystem(); + UInventoryComponent *Inventory = UMainBlueprintFunctionLibrary::GetPlayerInventory(this); + UItemDataAsset* DataAsset = MoveActorsComp->MovingActor->ItemDataAsset; if (!MoveActorsComp->PlaceableActionUsed(ERemovalAction::PLACE)) return; - if (Inventory) + + int32 StackCount = Inventory->GetStackForItem(DataAsset->GetPrimaryAssetId(), false, false); + if (StackCount > 0) { - Stack.Stack = Inventory->GetStackForItem(Stack.ItemId, Stack.Seed, Stack.HQ); - } - else - { - Stack.Stack = 0; - } - - if (ClassToLoad && Stack.Stack > 0) - { - FTransform PlaceableTransform; - PlaceableTransform.SetLocation(Location); - if (ARemovableStaticMeshActor *SpawnedActor = UMainBlueprintFunctionLibrary::SpawnPlaceable(GetWorld(), ClassToLoad, PlaceableTransform, FVector::OneVector)) - { - if (!MoveActorsComp || !MoveActorsComp->IsRemovingMode()) - { - SpawnedActor->Destroy(); - MoveActorsComp->MovingActor = nullptr; - return; - } - SpawnedActor->BindToItem(Inventory, Stack); - SpawnedActor->PickUp(); - MoveActorsComp->MovingActor = SpawnedActor; - } - } - - if (MoveActorsComp->RemovalModePlacingStack <= 0) - { - MoveActorsComp->StartObjectRemoval(false); + ensure(ItemDatabase); + ItemDatabase->SpawnDecorationItem(DataAsset); } } else diff --git a/Source/ProjectEleri/Settings/EleriGameSettings.h b/Source/ProjectEleri/Settings/EleriGameSettings.h index aede363c..f176d7ba 100644 --- a/Source/ProjectEleri/Settings/EleriGameSettings.h +++ b/Source/ProjectEleri/Settings/EleriGameSettings.h @@ -11,6 +11,7 @@ #include "EleriGameSettings.generated.h" +class ARemovableStaticMeshActor; class UDataTable; class UNpcDataAsset; class UNpcScheduleAsset; @@ -28,6 +29,10 @@ public: UPROPERTY(Config, EditAnywhere, BlueprintReadOnly, Category = "Items", meta = (ForceInlineRow, Categories = "Items")) TMap SpecialItemsMap; + UPROPERTY(Config, EditAnywhere, BlueprintReadOnly, Category = "Items") + TSubclassOf RemovableStaticMeshClass; + UPROPERTY(Config, EditAnywhere, BlueprintReadOnly, Category = "Items") + TSubclassOf ItemSeedCarouselClass; UPROPERTY(Config, EditAnywhere, BlueprintReadOnly, Category = "Camera") TMap CameraZoomLevels; @@ -59,7 +64,6 @@ public: UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Items") static UItemDataAsset* GetSpecialItem(UObject* WorldContext, FGameplayTag Tag); - UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Ability System|Professions") static int32 GetProfessionLevelForExp(float Exp); diff --git a/Source/ProjectEleri/System/Subsystem/ObjectPersistenceSubsystem.cpp b/Source/ProjectEleri/System/Subsystem/ObjectPersistenceSubsystem.cpp index af8d7ac8..efde970b 100644 --- a/Source/ProjectEleri/System/Subsystem/ObjectPersistenceSubsystem.cpp +++ b/Source/ProjectEleri/System/Subsystem/ObjectPersistenceSubsystem.cpp @@ -29,10 +29,7 @@ void UObjectPersistenceSubsystem::RemoveActorFromLevel(AActor* ActorToRemove) if (ActorIndex != INDEX_NONE) { PlacedActors.RemoveAt(ActorIndex); - } - - ActorToRemove->Destroy(); } void UObjectPersistenceSubsystem::PlacebleActorMoved(AActor* ActorMoved, bool bNewVisiblity)