Organize some structures and enum
This commit is contained in:
parent
6cd091136d
commit
45f1889eaf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/GameBP/Datatable/DT_HoldItem.uasset
Normal file
BIN
Content/GameBP/Datatable/DT_HoldItem.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -119,6 +119,7 @@ enum class ELogItemType : uint8
|
|||||||
UENUM(BlueprintType)
|
UENUM(BlueprintType)
|
||||||
enum class EFurniture : uint8
|
enum class EFurniture : uint8
|
||||||
{
|
{
|
||||||
|
None UMETA(DisplayName = "None"),
|
||||||
Sofas UMETA(DisplayName = "Sofas"),
|
Sofas UMETA(DisplayName = "Sofas"),
|
||||||
Chairs UMETA(DisplayName = "Chairs"),
|
Chairs UMETA(DisplayName = "Chairs"),
|
||||||
Tables UMETA(DisplayName = "Tables"),
|
Tables UMETA(DisplayName = "Tables"),
|
||||||
@ -133,6 +134,7 @@ enum class EFurniture : uint8
|
|||||||
UENUM(BlueprintType)
|
UENUM(BlueprintType)
|
||||||
enum class EDecoration : uint8
|
enum class EDecoration : uint8
|
||||||
{
|
{
|
||||||
|
None UMETA(DisplayName = "None"),
|
||||||
Carpets UMETA(DisplayName = "Carpets"),
|
Carpets UMETA(DisplayName = "Carpets"),
|
||||||
Paintings UMETA(DisplayName = "Paintings"),
|
Paintings UMETA(DisplayName = "Paintings"),
|
||||||
Vases UMETA(DisplayName = "Vases"),
|
Vases UMETA(DisplayName = "Vases"),
|
||||||
@ -153,6 +155,7 @@ enum class EDecoration : uint8
|
|||||||
UENUM(BlueprintType)
|
UENUM(BlueprintType)
|
||||||
enum class EKitchenware : uint8
|
enum class EKitchenware : uint8
|
||||||
{
|
{
|
||||||
|
None UMETA(DisplayName = "None"),
|
||||||
Plates UMETA(DisplayName = "Plates"),
|
Plates UMETA(DisplayName = "Plates"),
|
||||||
Glasses UMETA(DisplayName = "Glasses"),
|
Glasses UMETA(DisplayName = "Glasses"),
|
||||||
Cutlery UMETA(DisplayName = "Cutlery"),
|
Cutlery UMETA(DisplayName = "Cutlery"),
|
||||||
@ -165,6 +168,7 @@ enum class EKitchenware : uint8
|
|||||||
UENUM(BlueprintType)
|
UENUM(BlueprintType)
|
||||||
enum class EElectronics : uint8
|
enum class EElectronics : uint8
|
||||||
{
|
{
|
||||||
|
None UMETA(DisplayName = "None"),
|
||||||
Television UMETA(DisplayName = "Television"),
|
Television UMETA(DisplayName = "Television"),
|
||||||
LargeAppliances UMETA(DisplayName = "Large Appliances"),
|
LargeAppliances UMETA(DisplayName = "Large Appliances"),
|
||||||
Oven UMETA(DisplayName = "Oven"),
|
Oven UMETA(DisplayName = "Oven"),
|
||||||
@ -177,6 +181,7 @@ enum class EElectronics : uint8
|
|||||||
UENUM(BlueprintType)
|
UENUM(BlueprintType)
|
||||||
enum class EBathroom : uint8
|
enum class EBathroom : uint8
|
||||||
{
|
{
|
||||||
|
None UMETA(DisplayName = "None"),
|
||||||
Towels UMETA(DisplayName = "Towels"),
|
Towels UMETA(DisplayName = "Towels"),
|
||||||
SoapDispenser UMETA(DisplayName = "Soap Dispenser"),
|
SoapDispenser UMETA(DisplayName = "Soap Dispenser"),
|
||||||
ShowerCurtains UMETA(DisplayName = "Shower Curtains"),
|
ShowerCurtains UMETA(DisplayName = "Shower Curtains"),
|
||||||
@ -194,6 +199,23 @@ enum class EItemCategory : uint8
|
|||||||
Bathroom UMETA(DisplayName = "Bathroom")
|
Bathroom UMETA(DisplayName = "Bathroom")
|
||||||
};
|
};
|
||||||
|
|
||||||
|
UENUM(BlueprintType)
|
||||||
|
enum class EHoldItemType : uint8
|
||||||
|
{
|
||||||
|
None UMETA(DisplayName = "None"),
|
||||||
|
HoldObject UMETA(DisplayName = "Hold Object"),
|
||||||
|
DontTouch UMETA(DisplayName = "Don't Touch")
|
||||||
|
};
|
||||||
|
|
||||||
|
UENUM(BlueprintType)
|
||||||
|
enum class EScenarioEnum : uint8
|
||||||
|
{
|
||||||
|
None UMETA(DisplayName = "None"),
|
||||||
|
TidyUp UMETA(DisplayName = "Tidy Up"),
|
||||||
|
Draw UMETA(DisplayName = "Draw"),
|
||||||
|
StoveOff UMETA(DisplayName = "Stove Off")
|
||||||
|
};
|
||||||
|
|
||||||
USTRUCT(BlueprintType)
|
USTRUCT(BlueprintType)
|
||||||
struct FRobotData : public FTableRowBase
|
struct FRobotData : public FTableRowBase
|
||||||
{
|
{
|
||||||
@ -525,11 +547,11 @@ public:
|
|||||||
FSelectableItemData()
|
FSelectableItemData()
|
||||||
: ID(0)
|
: ID(0)
|
||||||
, Category(EItemCategory::Furniture)
|
, Category(EItemCategory::Furniture)
|
||||||
, FurnitureType(EFurniture::Sofas)
|
, FurnitureType(EFurniture::None)
|
||||||
, DecorationType(EDecoration::Carpets)
|
, DecorationType(EDecoration::None)
|
||||||
, KitchenwareType(EKitchenware::Plates)
|
, KitchenwareType(EKitchenware::None)
|
||||||
, ElectronicsType(EElectronics::Television)
|
, ElectronicsType(EElectronics::None)
|
||||||
, BathroomType(EBathroom::Towels)
|
, BathroomType(EBathroom::None)
|
||||||
, Name(TEXT(""))
|
, Name(TEXT(""))
|
||||||
, Icon(nullptr)
|
, Icon(nullptr)
|
||||||
, Mesh(nullptr)
|
, Mesh(nullptr)
|
||||||
@ -538,4 +560,47 @@ public:
|
|||||||
, Transform(FTransform::Identity)
|
, Transform(FTransform::Identity)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
USTRUCT(BlueprintType)
|
||||||
|
struct FHoldItemStruct : public FTableRowBase
|
||||||
|
{
|
||||||
|
GENERATED_BODY()
|
||||||
|
|
||||||
|
public:
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item")
|
||||||
|
int32 ID;
|
||||||
|
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item")
|
||||||
|
FString Name;
|
||||||
|
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item")
|
||||||
|
TSoftObjectPtr<UTexture2D> Icon;
|
||||||
|
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item")
|
||||||
|
TSoftObjectPtr<UStaticMesh> Mesh;
|
||||||
|
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item")
|
||||||
|
FString Description;
|
||||||
|
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item")
|
||||||
|
EHoldItemType Type;
|
||||||
|
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item")
|
||||||
|
EScenarioEnum ScenarioEnum;
|
||||||
|
|
||||||
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Item")
|
||||||
|
FTransform Transform;
|
||||||
|
|
||||||
|
FHoldItemStruct()
|
||||||
|
: ID(0)
|
||||||
|
, Name(TEXT(""))
|
||||||
|
, Icon(nullptr)
|
||||||
|
, Mesh(nullptr)
|
||||||
|
, Description(TEXT(""))
|
||||||
|
, Type(EHoldItemType::None)
|
||||||
|
, ScenarioEnum(EScenarioEnum::None)
|
||||||
|
, Transform(FTransform::Identity)
|
||||||
|
{
|
||||||
|
}
|
||||||
};
|
};
|
Loading…
x
Reference in New Issue
Block a user