Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Refactored Variable Naming Conventions to Unreal

Browse Source
This commit is contained in:
Philip W 2022-11-13 21:31:25 +00:00
parent bf3b2e3837
commit c085aae130
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Config/DefaultEngine.ini
View File

@ -17,7 +17,7 @@ ManualIPAddress=
+ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") +ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss")
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/Levels/Main.Main EditorStartupMap=/Game/Levels/CombatTest.CombatTest
LocalMapOptions= LocalMapOptions=
TransitionMap=None TransitionMap=None
bUseSplitscreen=True bUseSplitscreen=True
@ -26,9 +26,9 @@ ThreePlayerSplitscreenLayout=FavorTop
FourPlayerSplitscreenLayout=Grid FourPlayerSplitscreenLayout=Grid
bOffsetPlayerGamepadIds=False bOffsetPlayerGamepadIds=False
GameInstanceClass=/Script/Engine.GameInstance GameInstanceClass=/Script/Engine.GameInstance
GameDefaultMap=/Game/Levels/Main.Main GameDefaultMap=/Game/Levels/CombatTest.CombatTest
ServerDefaultMap=/Engine/Maps/Entry.Entry 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 GlobalDefaultServerGameMode=None
[/Script/Engine.CollisionProfile] [/Script/Engine.CollisionProfile]
@ -88,3 +88,10 @@ GlobalDefaultServerGameMode=None
+CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") +CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle")
+CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") +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")

BIN
Content/Levels/CombatTest.umap (Stored with Git LFS)
View File

Binary file not shown.

23
Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h
View File

@ -15,15 +15,15 @@ class THE_TWILIGHT_ABYSS_API ATurnBaseCombat : public AGameStateBase
GENERATED_BODY() GENERATED_BODY()
public: public:
ATurnBaseCombat() = default; ATurnBaseCombat();
UPROPERTY(EditDefaultsOnly) UPROPERTY(EditDefaultsOnly)
int playerHealth = 100; int PlayerHealth = 100;
UPROPERTY(EditDefaultsOnly) UPROPERTY(EditDefaultsOnly)
int enemyHealth = 100; int EnemyHealth = 100;
UPROPERTY(EditDefaultsOnly) UPROPERTY(EditDefaultsOnly)
int defaultActionPoints = 3; int DefaultActionPoints = 3;
int activeActionPoints = 0; int ActiveActionPoints = 0;
AActor* playerActor; AActor* playerActor;
AActor* enemyActor; AActor* enemyActor;
@ -31,20 +31,21 @@ public:
/* /*
TODO: TODO:
Reference Blueprint HUD
Reference Action Library Reference Action Library
Reference Player Inventory Reference Player Inventory
Reference Combat Logging System Reference Combat Logging System
*/ */
UPROPERTY(EditAnywhere)
TSubclassOf<UUserWidget> HUDWidget;
protected: protected:
virtual void BeginPlay() override; virtual void BeginPlay() override;
void useActionPoint(); void UseActionPoint();
void reuseActionPoint(); void ReuseActionPoint();
void revertActionPoints(); void RevertActionPoints();
private: private:
UPROPERTY(EditDefaultsOnly) UPROPERTY(EditDefaultsOnly)
bool isPlayerTurn = true; bool bIsPlayerTurn = true;
void switchTurn(); void SwitchTurn();
}; };