Compare commits
No commits in common. "6846c027f1aaad466af8bcc54b01ee6debb8b6cb" and "7c5833f0337d1cf7560c70ba583cf4891cdec004" have entirely different histories.
6846c027f1
...
7c5833f033
BIN
hwanyoung2/Content/Characters/Mannequins/Animations/ABP_Manny.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Characters/Mannequins/Animations/ABP_Manny.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/NewBlendSpace.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/NewBlendSpace.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemToolTip.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemToolTip.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Walk_Soldier.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Walk_Soldier.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset
(Stored with Git LFS)
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
|
||||
#include "CraftingInfo.h"
|
||||
|
@ -1,40 +0,0 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "Engine/DataTable.h"
|
||||
#include "CraftingInfo.generated.h"
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
USTRUCT(BlueprintType)
|
||||
struct FCraftingInfo : public FTableRowBase
|
||||
{
|
||||
GENERATED_BODY();
|
||||
|
||||
public:
|
||||
|
||||
//unique ID of item that is being used to create the item
|
||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
||||
FName ComponentID;
|
||||
|
||||
//unique ID of the item that gets created
|
||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
||||
FName ProductID;
|
||||
|
||||
//do we want to destroy the component?
|
||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
||||
bool bDestroyItemA;
|
||||
|
||||
//
|
||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
||||
bool bDestroyItemB;
|
||||
|
||||
bool operator==(const FCraftingInfo& OtherItem) const {
|
||||
return ComponentID == OtherItem.ComponentID;
|
||||
}
|
||||
|
||||
|
||||
};
|
@ -6,11 +6,10 @@
|
||||
#include "GameFramework/Actor.h"
|
||||
#include "Engine/DataTable.h"
|
||||
#include "HYManualPickUp.h"
|
||||
#include "CraftingInfo.h"
|
||||
#include "InventoryItem.generated.h"
|
||||
|
||||
/**
|
||||
* Represents an item that can be added to player's inventory
|
||||
*
|
||||
*/
|
||||
USTRUCT(BlueprintType)
|
||||
struct FInventoryItem : public FTableRowBase
|
||||
@ -24,7 +23,6 @@ public:
|
||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
||||
FName ItemID;
|
||||
|
||||
//queue of items that are dropped and spawned back into the world
|
||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
||||
TSubclassOf<class AHYManualPickUp> ItemPickup;
|
||||
|
||||
@ -41,21 +39,13 @@ public:
|
||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
||||
bool OnlyDropped;
|
||||
|
||||
//can this item be consumed/used?
|
||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
||||
bool CanBeUsed;
|
||||
|
||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
||||
UTexture2D* ItemIcon;
|
||||
|
||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
||||
FText ItemDescription;
|
||||
|
||||
////all the possible crafting combinations for this particular item
|
||||
UPROPERTY(EditAnywhere, BlueprintReadWrite)
|
||||
TArray<FCraftingInfo> CraftCombinations;
|
||||
|
||||
bool operator==(const FInventoryItem& OtherItem) const {
|
||||
return ItemID == OtherItem.ItemID;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user