diff --git a/Config/DefaultGameplayTags.ini b/Config/DefaultGameplayTags.ini index ab0d74b..d181392 100644 --- a/Config/DefaultGameplayTags.ini +++ b/Config/DefaultGameplayTags.ini @@ -9,6 +9,7 @@ InvalidTagCharacters="\"\'," NumBitsForContainerSize=6 NetIndexFirstBitSegment=16 +GameplayTagList=(Tag="Character.Action.Attack.ChargedAttack",DevComment="") ++GameplayTagList=(Tag="Character.Action.Attack.CloseRange",DevComment="") +GameplayTagList=(Tag="Character.Action.Attack.FallingAttack",DevComment="") +GameplayTagList=(Tag="Character.Action.Attack.HeavyAttack",DevComment="") +GameplayTagList=(Tag="Character.Action.Attack.LightAttack",DevComment="") diff --git a/Content/CombatSystem/Blueprints/AI/BB_Base.uasset b/Content/CombatSystem/Blueprints/AI/BB_Base.uasset new file mode 100644 index 0000000..9569ec8 Binary files /dev/null and b/Content/CombatSystem/Blueprints/AI/BB_Base.uasset differ diff --git a/Content/CombatSystem/Blueprints/AI/BP_AIController.uasset b/Content/CombatSystem/Blueprints/AI/BP_AIController.uasset new file mode 100644 index 0000000..5046b3b Binary files /dev/null and b/Content/CombatSystem/Blueprints/AI/BP_AIController.uasset differ diff --git a/Content/CombatSystem/Blueprints/AI/BP_ExampleEnemy.uasset b/Content/CombatSystem/Blueprints/AI/BP_ExampleEnemy.uasset new file mode 100644 index 0000000..9f5a585 Binary files /dev/null and b/Content/CombatSystem/Blueprints/AI/BP_ExampleEnemy.uasset differ diff --git a/Content/CombatSystem/Blueprints/AI/BP_HumanoidEnemy.uasset b/Content/CombatSystem/Blueprints/AI/BP_HumanoidEnemy.uasset new file mode 100644 index 0000000..8f8f317 Binary files /dev/null and b/Content/CombatSystem/Blueprints/AI/BP_HumanoidEnemy.uasset differ diff --git a/Content/CombatSystem/Blueprints/AI/BP_MasterAI.uasset b/Content/CombatSystem/Blueprints/AI/BP_MasterAI.uasset new file mode 100644 index 0000000..867e45c Binary files /dev/null and b/Content/CombatSystem/Blueprints/AI/BP_MasterAI.uasset differ diff --git a/Content/CombatSystem/Blueprints/BP_TestDummyCharacters.uasset b/Content/CombatSystem/Blueprints/BP_TestDummyCharacters.uasset deleted file mode 100644 index 4eb8573..0000000 Binary files a/Content/CombatSystem/Blueprints/BP_TestDummyCharacters.uasset and /dev/null differ diff --git a/Content/CombatSystem/UI/WB_HealthBar.uasset b/Content/CombatSystem/UI/WB_HealthBar.uasset new file mode 100644 index 0000000..ccb7fbf Binary files /dev/null and b/Content/CombatSystem/UI/WB_HealthBar.uasset differ diff --git a/Content/CombatSystem/UI/WB_LockOn.uasset b/Content/CombatSystem/UI/WB_LockOn.uasset index 42173cd..672314b 100644 Binary files a/Content/CombatSystem/UI/WB_LockOn.uasset and b/Content/CombatSystem/UI/WB_LockOn.uasset differ diff --git a/Content/CombatSystem/UI/WB_MainHUD.uasset b/Content/CombatSystem/UI/WB_MainHUD.uasset index b4ce276..5842394 100644 Binary files a/Content/CombatSystem/UI/WB_MainHUD.uasset and b/Content/CombatSystem/UI/WB_MainHUD.uasset differ diff --git a/Content/CombatSystem/UI/WB_StatBar.uasset b/Content/CombatSystem/UI/WB_StatBar.uasset index f978a41..b139f9d 100644 Binary files a/Content/CombatSystem/UI/WB_StatBar.uasset and b/Content/CombatSystem/UI/WB_StatBar.uasset differ diff --git a/Content/Maps/ThirdPersonMap.umap b/Content/Maps/ThirdPersonMap.umap index 9369da2..6498e91 100644 Binary files a/Content/Maps/ThirdPersonMap.umap and b/Content/Maps/ThirdPersonMap.umap differ diff --git a/Content/__ExternalActors__/Maps/ThirdPersonMap/7/WK/ZO5KCJOBJ60AQZIVVZILXZ.uasset b/Content/__ExternalActors__/Maps/ThirdPersonMap/7/WK/ZO5KCJOBJ60AQZIVVZILXZ.uasset deleted file mode 100644 index 3e8404e..0000000 Binary files a/Content/__ExternalActors__/Maps/ThirdPersonMap/7/WK/ZO5KCJOBJ60AQZIVVZILXZ.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/Maps/ThirdPersonMap/D/ZJ/J9G0LA6E4V24WWG3NZ0VRY.uasset b/Content/__ExternalActors__/Maps/ThirdPersonMap/D/ZJ/J9G0LA6E4V24WWG3NZ0VRY.uasset new file mode 100644 index 0000000..94299d9 Binary files /dev/null and b/Content/__ExternalActors__/Maps/ThirdPersonMap/D/ZJ/J9G0LA6E4V24WWG3NZ0VRY.uasset differ