diff --git a/Config/DefaultEditor.ini b/Config/DefaultEditor.ini index 8a83989..f83f024 100644 --- a/Config/DefaultEditor.ini +++ b/Config/DefaultEditor.ini @@ -5,4 +5,7 @@ SimpleMapName=/Game/TopDown/Maps/TopDownExampleMap bAllowClassAndBlueprintPinMatching=true bReplaceBlueprintWithClass= true bDontLoadBlueprintOutsideEditor= true -bBlueprintIsNotBlueprintType= true \ No newline at end of file +bBlueprintIsNotBlueprintType= true + +[/Script/AdvancedPreviewScene.SharedProfiles] + diff --git a/Content/Assets/Kronos/M_Kronos.uasset b/Content/Assets/Kronos/M_Kronos.uasset new file mode 100644 index 0000000..a58ff17 Binary files /dev/null and b/Content/Assets/Kronos/M_Kronos.uasset differ diff --git a/Content/Assets/Kronos/SM_KronosShip.uasset b/Content/Assets/Kronos/SM_KronosShip.uasset new file mode 100644 index 0000000..64f1f7a Binary files /dev/null and b/Content/Assets/Kronos/SM_KronosShip.uasset differ diff --git a/Content/Assets/Landscape/M_LandscapeAnubis.uasset b/Content/Assets/Landscape/M_LandscapeAnubis.uasset new file mode 100644 index 0000000..cc23532 Binary files /dev/null and b/Content/Assets/Landscape/M_LandscapeAnubis.uasset differ diff --git a/Content/Assets/SolarPlantSmall/M_SolarPlant_Small.uasset b/Content/Assets/SolarPlantSmall/M_SolarPlant_Small.uasset new file mode 100644 index 0000000..26d2699 Binary files /dev/null and b/Content/Assets/SolarPlantSmall/M_SolarPlant_Small.uasset differ diff --git a/Content/Assets/SolarPlantSmall/SM_SolarPlant_Small.uasset b/Content/Assets/SolarPlantSmall/SM_SolarPlant_Small.uasset new file mode 100644 index 0000000..ca0c08d Binary files /dev/null and b/Content/Assets/SolarPlantSmall/SM_SolarPlant_Small.uasset differ diff --git a/Content/Assets/SolarPlantSmall/SM_SolarPlant_Small_DefaultMaterial_BaseColor.uasset b/Content/Assets/SolarPlantSmall/SM_SolarPlant_Small_DefaultMaterial_BaseColor.uasset new file mode 100644 index 0000000..77d223a Binary files /dev/null and b/Content/Assets/SolarPlantSmall/SM_SolarPlant_Small_DefaultMaterial_BaseColor.uasset differ diff --git a/Content/Assets/SolarPlantSmall/SM_SolarPlant_Small_DefaultMaterial_Normal.uasset b/Content/Assets/SolarPlantSmall/SM_SolarPlant_Small_DefaultMaterial_Normal.uasset new file mode 100644 index 0000000..2436829 Binary files /dev/null and b/Content/Assets/SolarPlantSmall/SM_SolarPlant_Small_DefaultMaterial_Normal.uasset differ diff --git a/Content/Assets/SolarPlantSmall/SM_SolarPlant_Small_DefaultMaterial_OcclusionRoughnessMetallic.uasset b/Content/Assets/SolarPlantSmall/SM_SolarPlant_Small_DefaultMaterial_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..a574645 Binary files /dev/null and b/Content/Assets/SolarPlantSmall/SM_SolarPlant_Small_DefaultMaterial_OcclusionRoughnessMetallic.uasset differ diff --git a/Content/Blueprints/Actors/BP_SolarPanel_Small.uasset b/Content/Blueprints/Actors/BP_SolarPanel_Small.uasset index 8fa17a0..8c7a3b4 100644 Binary files a/Content/Blueprints/Actors/BP_SolarPanel_Small.uasset and b/Content/Blueprints/Actors/BP_SolarPanel_Small.uasset differ diff --git a/Content/Blueprints/BP_InteractiveObjectBase.uasset b/Content/Blueprints/BP_InteractiveObjectBase.uasset index 7c522c6..1476843 100644 Binary files a/Content/Blueprints/BP_InteractiveObjectBase.uasset and b/Content/Blueprints/BP_InteractiveObjectBase.uasset differ diff --git a/Content/Blueprints/BP_TAPawn.uasset b/Content/Blueprints/BP_TAPawn.uasset new file mode 100644 index 0000000..4bb3db8 Binary files /dev/null and b/Content/Blueprints/BP_TAPawn.uasset differ diff --git a/Content/Blueprints/BP_TAPlayerController.uasset b/Content/Blueprints/BP_TAPlayerController.uasset index 0d593ba..ebead50 100644 Binary files a/Content/Blueprints/BP_TAPlayerController.uasset and b/Content/Blueprints/BP_TAPlayerController.uasset differ diff --git a/Content/Blueprints/BP_TopDownCharacter.uasset b/Content/Blueprints/BP_TopDownCharacter.uasset deleted file mode 100644 index 74b6b94..0000000 Binary files a/Content/Blueprints/BP_TopDownCharacter.uasset and /dev/null differ diff --git a/Content/Blueprints/GM_GameModeBase.uasset b/Content/Blueprints/GM_GameModeBase.uasset index 7a8eecb..867c087 100644 Binary files a/Content/Blueprints/GM_GameModeBase.uasset and b/Content/Blueprints/GM_GameModeBase.uasset differ diff --git a/Content/Blueprints/Helpers/BP_TacticalCamera.uasset b/Content/Blueprints/Helpers/BP_TacticalCamera.uasset new file mode 100644 index 0000000..ea1d13f Binary files /dev/null and b/Content/Blueprints/Helpers/BP_TacticalCamera.uasset differ diff --git a/Content/Data/Input/Actions/IA_CameraRotation.uasset b/Content/Data/Input/Actions/IA_CameraRotation.uasset new file mode 100644 index 0000000..f4c4198 Binary files /dev/null and b/Content/Data/Input/Actions/IA_CameraRotation.uasset differ diff --git a/Content/Data/Input/Actions/IA_Crouch.uasset b/Content/Data/Input/Actions/IA_Crouch.uasset new file mode 100644 index 0000000..3006de6 Binary files /dev/null and b/Content/Data/Input/Actions/IA_Crouch.uasset differ diff --git a/Content/Data/Input/Actions/IA_Interact.uasset b/Content/Data/Input/Actions/IA_Interact.uasset new file mode 100644 index 0000000..54b3258 Binary files /dev/null and b/Content/Data/Input/Actions/IA_Interact.uasset differ diff --git a/Content/Data/Input/Actions/IA_InvokeBuildMenu.uasset b/Content/Data/Input/Actions/IA_InvokeBuildMenu.uasset deleted file mode 100644 index 2343a48..0000000 Binary files a/Content/Data/Input/Actions/IA_InvokeBuildMenu.uasset and /dev/null differ diff --git a/Content/Data/Input/Actions/IA_MoveBackward.uasset b/Content/Data/Input/Actions/IA_MoveBackward.uasset new file mode 100644 index 0000000..90392ca Binary files /dev/null and b/Content/Data/Input/Actions/IA_MoveBackward.uasset differ diff --git a/Content/Data/Input/Actions/IA_MoveForward.uasset b/Content/Data/Input/Actions/IA_MoveForward.uasset new file mode 100644 index 0000000..5cdbad7 Binary files /dev/null and b/Content/Data/Input/Actions/IA_MoveForward.uasset differ diff --git a/Content/Data/Input/Actions/IA_MoveLeft.uasset b/Content/Data/Input/Actions/IA_MoveLeft.uasset new file mode 100644 index 0000000..86d92a9 Binary files /dev/null and b/Content/Data/Input/Actions/IA_MoveLeft.uasset differ diff --git a/Content/Data/Input/Actions/IA_MoveRight.uasset b/Content/Data/Input/Actions/IA_MoveRight.uasset new file mode 100644 index 0000000..907ee2f Binary files /dev/null and b/Content/Data/Input/Actions/IA_MoveRight.uasset differ diff --git a/Content/Data/Input/Actions/IA_Pause.uasset b/Content/Data/Input/Actions/IA_Pause.uasset new file mode 100644 index 0000000..15c43fc Binary files /dev/null and b/Content/Data/Input/Actions/IA_Pause.uasset differ diff --git a/Content/Data/Input/Actions/IA_PointAndClick.uasset b/Content/Data/Input/Actions/IA_PointAndClick.uasset new file mode 100644 index 0000000..50d2930 Binary files /dev/null and b/Content/Data/Input/Actions/IA_PointAndClick.uasset differ diff --git a/Content/Data/Input/Actions/IA_PointAndClickAlternative.uasset b/Content/Data/Input/Actions/IA_PointAndClickAlternative.uasset new file mode 100644 index 0000000..9b75ea3 Binary files /dev/null and b/Content/Data/Input/Actions/IA_PointAndClickAlternative.uasset differ diff --git a/Content/Data/Input/Actions/IA_SetDestination_Click.uasset b/Content/Data/Input/Actions/IA_SetDestination_Click.uasset deleted file mode 100644 index f913a6d..0000000 Binary files a/Content/Data/Input/Actions/IA_SetDestination_Click.uasset and /dev/null differ diff --git a/Content/Data/Input/Actions/IA_SetDestination_Touch.uasset b/Content/Data/Input/Actions/IA_SetDestination_Touch.uasset deleted file mode 100644 index af7b838..0000000 Binary files a/Content/Data/Input/Actions/IA_SetDestination_Touch.uasset and /dev/null differ diff --git a/Content/Data/Input/Actions/IA_SwitchMode.uasset b/Content/Data/Input/Actions/IA_SwitchMode.uasset new file mode 100644 index 0000000..34555e9 Binary files /dev/null and b/Content/Data/Input/Actions/IA_SwitchMode.uasset differ diff --git a/Content/Data/Input/IMC_Default.uasset b/Content/Data/Input/IMC_Default.uasset index ca75d97..1917f28 100644 Binary files a/Content/Data/Input/IMC_Default.uasset and b/Content/Data/Input/IMC_Default.uasset differ diff --git a/Content/Maps/L_TestingGrounds.umap b/Content/Maps/L_TestingGrounds.umap index 8dd3dea..a4ee546 100644 Binary files a/Content/Maps/L_TestingGrounds.umap and b/Content/Maps/L_TestingGrounds.umap differ diff --git a/Content/Materials/M_PlaceableTranslucent.uasset b/Content/Materials/M_PlaceableTranslucent.uasset new file mode 100644 index 0000000..5d27c4d Binary files /dev/null and b/Content/Materials/M_PlaceableTranslucent.uasset differ diff --git a/Content/Materials/PostProcess/PP_Outliner_M.uasset b/Content/Materials/PostProcess/PP_Outliner_M.uasset index 3ccdbc6..6e29f6b 100644 Binary files a/Content/Materials/PostProcess/PP_Outliner_M.uasset and b/Content/Materials/PostProcess/PP_Outliner_M.uasset differ diff --git a/Content/Materials/WidgetMaterial_Emissive.uasset b/Content/Materials/WidgetMaterial_Emissive.uasset new file mode 100644 index 0000000..b640152 Binary files /dev/null and b/Content/Materials/WidgetMaterial_Emissive.uasset differ diff --git a/Content/Megascans/Surfaces/Jagged_Rock_vlzkba1fw/T_Jagged_Rock_vlzkba1fw_2K_D.uasset b/Content/Megascans/Surfaces/Jagged_Rock_vlzkba1fw/T_Jagged_Rock_vlzkba1fw_2K_D.uasset index 657826f..b5d17be 100644 Binary files a/Content/Megascans/Surfaces/Jagged_Rock_vlzkba1fw/T_Jagged_Rock_vlzkba1fw_2K_D.uasset and b/Content/Megascans/Surfaces/Jagged_Rock_vlzkba1fw/T_Jagged_Rock_vlzkba1fw_2K_D.uasset differ diff --git a/Content/UI/Textures/T_Carbon.uasset b/Content/UI/Textures/T_Carbon.uasset new file mode 100644 index 0000000..6c71431 Binary files /dev/null and b/Content/UI/Textures/T_Carbon.uasset differ diff --git a/Content/UI/Textures/T_Electricity.uasset b/Content/UI/Textures/T_Electricity.uasset new file mode 100644 index 0000000..c6a30f0 Binary files /dev/null and b/Content/UI/Textures/T_Electricity.uasset differ diff --git a/Content/UI/Textures/T_Rectangle.uasset b/Content/UI/Textures/T_Rectangle.uasset new file mode 100644 index 0000000..1cac711 Binary files /dev/null and b/Content/UI/Textures/T_Rectangle.uasset differ diff --git a/Content/UI/Textures/T_Rectangle_Empty.uasset b/Content/UI/Textures/T_Rectangle_Empty.uasset new file mode 100644 index 0000000..e15111b Binary files /dev/null and b/Content/UI/Textures/T_Rectangle_Empty.uasset differ diff --git a/Content/UI/Textures/T_Titanium.uasset b/Content/UI/Textures/T_Titanium.uasset new file mode 100644 index 0000000..cdb429d Binary files /dev/null and b/Content/UI/Textures/T_Titanium.uasset differ diff --git a/Content/UI/Textures/T_Water.uasset b/Content/UI/Textures/T_Water.uasset new file mode 100644 index 0000000..6d2ca73 Binary files /dev/null and b/Content/UI/Textures/T_Water.uasset differ diff --git a/Content/UI/W_Master.uasset b/Content/UI/W_Master.uasset index 24a686d..1f7073a 100644 Binary files a/Content/UI/W_Master.uasset and b/Content/UI/W_Master.uasset differ diff --git a/Content/UI/Widgets/W_CrossMenu.uasset b/Content/UI/Widgets/W_CrossMenu.uasset new file mode 100644 index 0000000..b229ba8 Binary files /dev/null and b/Content/UI/Widgets/W_CrossMenu.uasset differ diff --git a/Content/UI/Widgets/W_Crosshair.uasset b/Content/UI/Widgets/W_Crosshair.uasset new file mode 100644 index 0000000..33f60bc Binary files /dev/null and b/Content/UI/Widgets/W_Crosshair.uasset differ diff --git a/Content/UI/Widgets/W_ObjectLabel.uasset b/Content/UI/Widgets/W_ObjectLabel.uasset index d027c8c..f0f9a87 100644 Binary files a/Content/UI/Widgets/W_ObjectLabel.uasset and b/Content/UI/Widgets/W_ObjectLabel.uasset differ diff --git a/Content/UI/Widgets/W_ResourcesPanel.uasset b/Content/UI/Widgets/W_ResourcesPanel.uasset index fc3a415..35ae5ed 100644 Binary files a/Content/UI/Widgets/W_ResourcesPanel.uasset and b/Content/UI/Widgets/W_ResourcesPanel.uasset differ diff --git a/Source/TerraformingAnubis/InteractiveObject.h b/Source/TerraformingAnubis/InteractiveObject.h index 3ddd0dc..eca42d3 100644 --- a/Source/TerraformingAnubis/InteractiveObject.h +++ b/Source/TerraformingAnubis/InteractiveObject.h @@ -30,6 +30,9 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) FText Name; + UPROPERTY(EditAnywhere, BlueprintReadWrite) + bool Enabled = true; + UPROPERTY(EditAnywhere, BlueprintReadWrite) TEnumAsByte ObjectType = Building; diff --git a/Source/TerraformingAnubis/TerraformingAnubisPlayerController.cpp b/Source/TerraformingAnubis/TerraformingAnubisPlayerController.cpp index 7efdc87..7a39604 100644 --- a/Source/TerraformingAnubis/TerraformingAnubisPlayerController.cpp +++ b/Source/TerraformingAnubis/TerraformingAnubisPlayerController.cpp @@ -12,8 +12,6 @@ #include "EnhancedInputSubsystems.h" #include "Engine/LocalPlayer.h" -DEFINE_LOG_CATEGORY(LogTemplateCharacter); - ATerraformingAnubisPlayerController::ATerraformingAnubisPlayerController() { bShowMouseCursor = true; @@ -42,10 +40,6 @@ void ATerraformingAnubisPlayerController::SetupInputComponent() // Setup mouse input events EnhancedInputComponent->BindAction(ClickAction, ETriggerEvent::Started, this, &ATerraformingAnubisPlayerController::OnClick); } - else - { - UE_LOG(LogTemplateCharacter, Error, TEXT("'%s' Failed to find an Enhanced Input Component! This template is built to use the Enhanced Input system. If you intend to use the legacy system, then you will need to update this C++ file."), *GetNameSafe(this)); - } } void ATerraformingAnubisPlayerController::OnClick() diff --git a/Source/TerraformingAnubis/TerraformingAnubisPlayerController.h b/Source/TerraformingAnubis/TerraformingAnubisPlayerController.h index cdde367..c85f40b 100644 --- a/Source/TerraformingAnubis/TerraformingAnubisPlayerController.h +++ b/Source/TerraformingAnubis/TerraformingAnubisPlayerController.h @@ -12,7 +12,33 @@ class UNiagaraSystem; class UInputMappingContext; class UInputAction; -DECLARE_LOG_CATEGORY_EXTERN(LogTemplateCharacter, Log, All); +UENUM(BlueprintType) +enum EInteractionMode +{ + TPP UMETA(DisplayName = "TPP"), + Tactical UMETA(DisplayName = "Tactical") +}; + +USTRUCT(BlueprintType) +struct FResources +{ + GENERATED_BODY() + + UPROPERTY(BlueprintReadWrite) + int32 ElectricEnergy; + + UPROPERTY(BlueprintReadWrite) + int32 Nanites; + + UPROPERTY(BlueprintReadWrite) + int32 Carbon; + + UPROPERTY(BlueprintReadWrite) + int32 Titanium; + + UPROPERTY(BlueprintReadWrite) + int32 Water; +}; UCLASS() class ATerraformingAnubisPlayerController : public APlayerController