neroberovero/Illusion-UE5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: neroberovero:9b2088f621bea0bc09e12c953c4405741cc9220d
Branches Tags
neroberovero:main
neroberovero:Shiori
neroberovero:Fmod-Intergration-V2
neroberovero:fmod-co
neroberovero:angela-haesol-ability
neroberovero:parry
neroberovero:reaven
neroberovero:sharon_saving_loading_3
...
compare: neroberovero:38fcae16301527874891e40b2835a7d6d8d7f860
Branches Tags
neroberovero:Shiori
neroberovero:Fmod-Intergration-V2
neroberovero:main
neroberovero:fmod-co
neroberovero:angela-haesol-ability
neroberovero:parry
neroberovero:reaven
neroberovero:sharon_saving_loading_3

4 Commits
9b2088f621 ... 38fcae1630

Author SHA1 Message Date
Ji Yoon Rhee
38fcae1630 assets for new food/craftable items 2025-02-03 23:14:02 +09:00
Ji Yoon Rhee
cf0f8e4c25 editor module changes for FMOD studio 2025-02-03 23:13:19 +09:00
Ji Yoon Rhee
cdd5f7f67a debugging for inventory system 2025-02-03 23:12:46 +09:00
Ji Yoon Rhee
15f41865fa new items, but they are buggy 2025-02-03 00:40:12 +09:00
35 changed files with 97 additions and 59 deletions
Show Stats Expand all files Collapse all files

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/ABP_SaninSemiFinal.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Weapons/BP_HaesolHwando.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Icons/Meat.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Icons/Rice.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/Assets/Icons/Soup.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_ConsumableItemBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_ManualPickUpItemBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Tea.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Bibimbap1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Chili01a.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_FoxMarble.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Gochugaru.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Gourd.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Haejangguk.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Meat.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Medicine.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Mugwort.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Mung_Bean_Pancake.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Rice.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_RiceGrains.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Rice_Soup.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_SesameSeeds.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Tea.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_TeaCup.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_TeaLeaves.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_WaterBottle.uasset (Stored with Git LFS)
View File

Binary file not shown.

4
hwanyoung2/Plugins/FMODStudio/Binaries/Win64/UnrealEditor.modules
View File

@ -2,7 +2,7 @@
"BuildId": "27405482",
"Modules":
{
"FMODStudio": "UnrealEditor-FMODStudio.dll",
"FMODStudioEditor": "UnrealEditor-FMODStudioEditor.dll"
"FMODStudio": "UnrealEditor-FMODStudio-0001.dll",
"FMODStudioEditor": "UnrealEditor-FMODStudioEditor-0001.dll"
}
}

30
hwanyoung2/Plugins/FMODStudio/Intermediate/Build/Win64/UnrealEditor/Inc/FMODStudio/UHT/Timestamp
View File

@ -1,23 +1,23 @@
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAmbientSound.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBank.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAudioComponent.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODEvent.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODPort.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBlueprintStatics.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODVCA.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshotReverb.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAnimNotifyPlay.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAsset.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshot.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAudioComponent.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBlueprintStatics.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBus.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSettings.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLink\Public\FMODAudioLinkComponent.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAnimNotifyPlay.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODEvent.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODPort.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshot.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshotReverb.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODVCA.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBank.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLink\Public\FMODAudioLinkSettings.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLink\Public\FMODAudioLinkComponent.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODAssetLookup.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODBankLookup.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSection.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSectionTemplate.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODBankLookup.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODAssetLookup.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterTrack.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterSectionTemplate.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLinkEditor\Private\FMODAudioLinkSettingsFactory.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlTrack.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterSectionTemplate.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterTrack.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLinkEditor\Private\FMODAudioLinkSettingsFactory.h

2
hwanyoung2/Plugins/FMODStudio/Intermediate/Build/Win64/UnrealEditor/Inc/FMODStudioEditor/UHT/Timestamp
View File

@ -1,2 +1,2 @@
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudioEditor\Classes\FMODGenerateAssetsCommandlet.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudioEditor\Classes\FMODAmbientSoundActorFactory.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudioEditor\Classes\FMODGenerateAssetsCommandlet.h

3
hwanyoung2/Source/hwanyoung2/HYManualPickUp.cpp
View File

@ -12,7 +12,7 @@ AHYManualPickUp::AHYManualPickUp()
ItemID = FName("No ID");
Super::Name = "Item";
Super::Action = "Pick up";
Super::Action = "pick up";
}
void AHYManualPickUp::Interact_Implementation(APlayerController* Controller)
@ -22,5 +22,6 @@ void AHYManualPickUp::Interact_Implementation(APlayerController* Controller)
AHYPlayerCharacController* IController = Cast<AHYPlayerCharacController>(Controller);
if (IController->AddItemToInventoryByID(ItemID))
Destroy();
else UE_LOG(LogTemp, Warning, TEXT("Item not found."))
}

1
hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.cpp
View File

@ -3,6 +3,7 @@
#include "HYPlayerCharacController.h"
#include "HYGameStateBase.h"
#include "Engine/DataTable.h"
#include "hwanyoung2Character.h"
AHYPlayerCharacController::AHYPlayerCharacController()

12
hwanyoung2/Source/hwanyoung2/InventoryItem.h
View File

@ -49,6 +49,18 @@ public:
UPROPERTY(EditAnywhere, BlueprintReadWrite)
bool CanBeUsed;
//can this item be bought at the store?
UPROPERTY(EditAnywhere, BlueprintReadWrite)
bool CanBeBought;
//is this a crafting item?
UPROPERTY(EditAnywhere, BlueprintReadWrite)
bool IsCraftItem;
//is this a cooking item?
UPROPERTY(EditAnywhere, BlueprintReadWrite)
bool IsCookingItem;
UPROPERTY(EditAnywhere, BlueprintReadWrite)
UTexture2D* ItemIcon;