diff --git a/Content/Data/RecipesDataTable.uasset b/Content/Data/RecipesDataTable.uasset deleted file mode 100644 index ab7eef5..0000000 Binary files a/Content/Data/RecipesDataTable.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/Levels/Main/1/S5/E7J1KTI13E52AW8CJ2ABKU.uasset b/Content/__ExternalActors__/Levels/Main/1/S5/E7J1KTI13E52AW8CJ2ABKU.uasset index 548aeb0..7d78619 100644 Binary files a/Content/__ExternalActors__/Levels/Main/1/S5/E7J1KTI13E52AW8CJ2ABKU.uasset and b/Content/__ExternalActors__/Levels/Main/1/S5/E7J1KTI13E52AW8CJ2ABKU.uasset differ diff --git a/RawAssets/meals_table.json b/RawAssets/meals_table.json deleted file mode 100644 index c873644..0000000 --- a/RawAssets/meals_table.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "Name": "1", - "ID": 0, - "MealName": "", - "TargetHeat": 0.5, - "HeatHalfRange": 0.1, - "TotalCookingTimeMS": 5000.0 - }, - { - "Name": "2", - "ID": 1, - "MealName": "Lasagna", - "TargetHeat": 0.5, - "HeatHalfRange": 0.1, - "TotalCookingTimeMS": 5000.0 - }, - { - "Name": "3", - "ID": 2, - "MealName": "Alfredo", - "TargetHeat": 0.5, - "HeatHalfRange": 0.1, - "TotalCookingTimeMS": 5000.0 - } -] \ No newline at end of file diff --git a/Source/minicook/OvenPawn.h b/Source/minicook/OvenPawn.h index bf0c106..2337145 100644 --- a/Source/minicook/OvenPawn.h +++ b/Source/minicook/OvenPawn.h @@ -10,31 +10,17 @@ #include "OvenPawn.generated.h" -// todo(stefan): Revisit this meal struct, not all fields are needed/make sense. Good enough for now. USTRUCT() struct FMeal : public FTableRowBase { GENERATED_BODY() public: - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Meal", meta=(Tooltip = "The ID of the meal recipe")) int32 ID{-1}; - - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Meal", meta=(Tooltip = "The name of the meal recipe")) - FText MealName = FText::FromString("DefaultMealName"); - - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Meal", - meta=(Tooltip = "The target value of 'heat' for the perfect cooking temperature")) - double TargetHeat{0.5}; - - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Meal", - meta=(Tooltip = - "The half-range of the target value of the cooking temperature, e.g. if @param TargetHeat is 0.5 and @param HalfHeatRange is 0.1, anything between 0.4 and 0.6 is perfect heat" - )) - double HeatHalfRange{0.1}; - - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Meal", meta=(Tooltip = "The total cooking time for this meal recipe, in milliseconds")) - double TotalCookingTimeMS{5000.0}; + FString MealName; + double TargetHeat{0.0}; + double HeatHalfRange{0.0}; + double TotalCookingTimeMS{0.0}; }; struct FCookingStats @@ -143,8 +129,6 @@ private: TArray> CookstoveObjects; TArray Cookstoves; -public: // ReSharper disable once CppUE4ProbableMemoryIssuesWithUObject - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Oven Settings") TObjectPtr RecipesDataTable; }; \ No newline at end of file