From c085aae1308315a6dbfd509ff18b1966877088d7 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Sun, 13 Nov 2022 21:31:25 +0000 Subject: [PATCH] Refactored Variable Naming Conventions to Unreal --- Config/DefaultEngine.ini | 13 ++++++++--- Content/Levels/CombatTest.umap | 4 ++-- .../TurnBasedCombat/TurnBaseCombat.h | 23 ++++++++++--------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index d91fe57..a4873a5 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -17,7 +17,7 @@ ManualIPAddress= +ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/Levels/Main.Main +EditorStartupMap=/Game/Levels/CombatTest.CombatTest LocalMapOptions= TransitionMap=None bUseSplitscreen=True @@ -26,9 +26,9 @@ ThreePlayerSplitscreenLayout=FavorTop FourPlayerSplitscreenLayout=Grid bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance -GameDefaultMap=/Game/Levels/Main.Main +GameDefaultMap=/Game/Levels/CombatTest.CombatTest ServerDefaultMap=/Engine/Maps/Entry.Entry -GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C +GlobalDefaultGameMode=/Game/Blueprints/Combat_UI/Combat_Test.Combat_Test_C GlobalDefaultServerGameMode=None [/Script/Engine.CollisionProfile] @@ -88,3 +88,10 @@ GlobalDefaultServerGameMode=None +CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") + +[CoreRedirects] ++PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.isPlayerTurn",NewName="/Script/the_twilight_abyss.TurnBaseCombat.bIsPlayerTurn") ++PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.playerHealth",NewName="/Script/the_twilight_abyss.TurnBaseCombat.PlayerHealth") ++PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.enemyHealth",NewName="/Script/the_twilight_abyss.TurnBaseCombat.EnemyHealth") ++PropertyRedirects=(OldName="/Script/the_twilight_abyss.TurnBaseCombat.defaultActionPoints",NewName="/Script/the_twilight_abyss.TurnBaseCombat.DefaultActionPoints") + diff --git a/Content/Levels/CombatTest.umap b/Content/Levels/CombatTest.umap index 2b576e9..e06c4fc 100644 --- a/Content/Levels/CombatTest.umap +++ b/Content/Levels/CombatTest.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ce698071b4801de7fbf6a8a3d7df65db4d248e828ed681b3c8a281e09394fe0 -size 32037 +oid sha256:7a45176293213fb3ae41647e726fe97e62aa824cc05a55def9fae7bd2c79bf59 +size 35199 diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index 68a6284..798c76c 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -15,15 +15,15 @@ class THE_TWILIGHT_ABYSS_API ATurnBaseCombat : public AGameStateBase GENERATED_BODY() public: - ATurnBaseCombat() = default; + ATurnBaseCombat(); UPROPERTY(EditDefaultsOnly) - int playerHealth = 100; + int PlayerHealth = 100; UPROPERTY(EditDefaultsOnly) - int enemyHealth = 100; + int EnemyHealth = 100; UPROPERTY(EditDefaultsOnly) - int defaultActionPoints = 3; - int activeActionPoints = 0; + int DefaultActionPoints = 3; + int ActiveActionPoints = 0; AActor* playerActor; AActor* enemyActor; @@ -31,20 +31,21 @@ public: /* TODO: - Reference Blueprint HUD Reference Action Library Reference Player Inventory Reference Combat Logging System */ + UPROPERTY(EditAnywhere) + TSubclassOf HUDWidget; protected: virtual void BeginPlay() override; - void useActionPoint(); - void reuseActionPoint(); - void revertActionPoints(); + void UseActionPoint(); + void ReuseActionPoint(); + void RevertActionPoints(); private: UPROPERTY(EditDefaultsOnly) - bool isPlayerTurn = true; - void switchTurn(); + bool bIsPlayerTurn = true; + void SwitchTurn(); };