diff --git a/Content/Blueprints/BP_FireworkBase.uasset b/Content/Blueprints/BP_FireworkBase.uasset index d21c75e..09d2406 100644 Binary files a/Content/Blueprints/BP_FireworkBase.uasset and b/Content/Blueprints/BP_FireworkBase.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_Basic.uasset b/Content/Blueprints/Blocks/BP_Block_Basic.uasset index faf1a38..c5e2f04 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_Basic.uasset and b/Content/Blueprints/Blocks/BP_Block_Basic.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_Explosive.uasset b/Content/Blueprints/Blocks/BP_Block_Explosive.uasset index dafb4a2..2d50db9 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_Explosive.uasset and b/Content/Blueprints/Blocks/BP_Block_Explosive.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_Gummy.uasset b/Content/Blueprints/Blocks/BP_Block_Gummy.uasset index 3b01f1f..81cf740 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_Gummy.uasset and b/Content/Blueprints/Blocks/BP_Block_Gummy.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_Moving.uasset b/Content/Blueprints/Blocks/BP_Block_Moving.uasset index 1e235f4..d07de4e 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_Moving.uasset and b/Content/Blueprints/Blocks/BP_Block_Moving.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_Regenerative.uasset b/Content/Blueprints/Blocks/BP_Block_Regenerative.uasset index 7d46fec..f4e665a 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_Regenerative.uasset and b/Content/Blueprints/Blocks/BP_Block_Regenerative.uasset differ diff --git a/Content/Blueprints/Fireworks/BP_Impact.uasset b/Content/Blueprints/Fireworks/BP_Impact.uasset index e6f17dd..06daf6f 100644 Binary files a/Content/Blueprints/Fireworks/BP_Impact.uasset and b/Content/Blueprints/Fireworks/BP_Impact.uasset differ diff --git a/Content/Data/SV_SaveGame.uasset b/Content/Data/SV_SaveGame.uasset new file mode 100644 index 0000000..9e8ffb3 Binary files /dev/null and b/Content/Data/SV_SaveGame.uasset differ diff --git a/Source/FireworkDuels/BuildingBlock.h b/Source/FireworkDuels/BuildingBlock.h index 58607b0..eaea857 100644 --- a/Source/FireworkDuels/BuildingBlock.h +++ b/Source/FireworkDuels/BuildingBlock.h @@ -23,6 +23,9 @@ public: UPROPERTY(BlueprintReadWrite, EditAnywhere) int32 HitsRemaining = 1; + UPROPERTY(EditDefaultsOnly, BlueprintReadWrite) + bool CanChain = false; + UPROPERTY(BlueprintReadOnly) int32 Index = 0; diff --git a/Source/FireworkDuels/CustomDataTypes.h b/Source/FireworkDuels/CustomDataTypes.h index d0f2752..f1741bd 100644 --- a/Source/FireworkDuels/CustomDataTypes.h +++ b/Source/FireworkDuels/CustomDataTypes.h @@ -5,9 +5,11 @@ #include "CoreMinimal.h" #include "FireworkBase.h" #include "BuildingBlock.h" +#include "LevelTemplate.h" #include "Engine/Texture.h" #include "Engine/World.h" #include "Engine/DataTable.h" +#include "UObject/SoftObjectPtr.h" #include "CustomDataTypes.generated.h" UENUM(BlueprintType) @@ -35,6 +37,25 @@ enum Firework Lighter UMETA(DisplayName = "Lighter"), }; +// LevelData +USTRUCT(BlueprintType) +struct FIREWORKDUELS_API FLevelData +{ + GENERATED_BODY() + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + TSoftClassPtr LevelTemplateClass; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + bool IsUnlocked = false; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + int32 ObtainedStars = 0; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + float BestTime = 999.f; +}; + // Firework data USTRUCT(BlueprintType) struct FIREWORKDUELS_API FFireworkData : public FTableRowBase @@ -69,25 +90,4 @@ struct FIREWORKDUELS_API FInventory UPROPERTY(EditAnywhere, BlueprintReadWrite) TArray Items; -}; - - -// Level Data -USTRUCT(BlueprintType) -struct FIREWORKDUELS_API FLevelData : public FTableRowBase -{ - GENERATED_BODY() - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - TSoftObjectPtr Level; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - TSoftObjectPtr LevelThumbnail; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - FText LevelName; - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - FText Description; - }; \ No newline at end of file