diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 7ac7ae9..04b3989 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -112,6 +112,8 @@ ManualIPAddress= +Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.") +Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility"),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="Interactable") ++EditProfiles=(Name="Pawn",CustomResponses=((Channel="Camera",Response=ECR_Ignore))) ++EditProfiles=(Name="CharacterMesh",CustomResponses=((Channel="Camera",Response=ECR_Ignore))) -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") -ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") -ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") diff --git a/Config/DefaultGameplayTags.ini b/Config/DefaultGameplayTags.ini index 1c64d7b..f4a9f29 100644 --- a/Config/DefaultGameplayTags.ini +++ b/Config/DefaultGameplayTags.ini @@ -20,6 +20,7 @@ NetIndexFirstBitSegment=16 +GameplayTagList=(Tag="Character.Action.EnterCombat",DevComment="") +GameplayTagList=(Tag="Character.Action.ExitCombat",DevComment="") +GameplayTagList=(Tag="Character.Action.GeneralAction",DevComment="") ++GameplayTagList=(Tag="Character.Enemy",DevComment="") +GameplayTagList=(Tag="Character.Player",DevComment="") +GameplayTagList=(Tag="Character.State.Attacking",DevComment="") +GameplayTagList=(Tag="Character.State.Dead",DevComment="") diff --git a/Content/CombatSystem/Blueprints/AI/BP_BossEnemy.uasset b/Content/CombatSystem/Blueprints/AI/BP_BossEnemy.uasset index ee52e25..0f4f9ec 100644 Binary files a/Content/CombatSystem/Blueprints/AI/BP_BossEnemy.uasset and b/Content/CombatSystem/Blueprints/AI/BP_BossEnemy.uasset differ diff --git a/Content/CombatSystem/Blueprints/AI/BP_MasterAI.uasset b/Content/CombatSystem/Blueprints/AI/BP_MasterAI.uasset index 9eed77b..fba6147 100644 Binary files a/Content/CombatSystem/Blueprints/AI/BP_MasterAI.uasset and b/Content/CombatSystem/Blueprints/AI/BP_MasterAI.uasset differ diff --git a/Content/CombatSystem/Blueprints/AI/BP_MobEnemy.uasset b/Content/CombatSystem/Blueprints/AI/BP_MobEnemy.uasset index 64f1ac5..8735062 100644 Binary files a/Content/CombatSystem/Blueprints/AI/BP_MobEnemy.uasset and b/Content/CombatSystem/Blueprints/AI/BP_MobEnemy.uasset differ diff --git a/Content/CombatSystem/Blueprints/AI/BT_BossEnemy.uasset b/Content/CombatSystem/Blueprints/AI/BT_BossEnemy.uasset index f935f5c..95b7321 100644 Binary files a/Content/CombatSystem/Blueprints/AI/BT_BossEnemy.uasset and b/Content/CombatSystem/Blueprints/AI/BT_BossEnemy.uasset differ diff --git a/Content/CombatSystem/Blueprints/AI/BT_MobEnemy.uasset b/Content/CombatSystem/Blueprints/AI/BT_MobEnemy.uasset index 347ad73..8b82ab1 100644 Binary files a/Content/CombatSystem/Blueprints/AI/BT_MobEnemy.uasset and b/Content/CombatSystem/Blueprints/AI/BT_MobEnemy.uasset differ diff --git a/Content/CombatSystem/Blueprints/AI/BehaviorTreeNodes/T_PerformAction.uasset b/Content/CombatSystem/Blueprints/AI/BehaviorTreeNodes/T_PerformAction.uasset index 64c0e52..6693dd6 100644 Binary files a/Content/CombatSystem/Blueprints/AI/BehaviorTreeNodes/T_PerformAction.uasset and b/Content/CombatSystem/Blueprints/AI/BehaviorTreeNodes/T_PerformAction.uasset differ diff --git a/Content/CombatSystem/Blueprints/Actor/BP_BaseEquippable.uasset b/Content/CombatSystem/Blueprints/Actor/BP_BaseEquippable.uasset index 59f462f..90b69f5 100644 Binary files a/Content/CombatSystem/Blueprints/Actor/BP_BaseEquippable.uasset and b/Content/CombatSystem/Blueprints/Actor/BP_BaseEquippable.uasset differ diff --git a/Content/CombatSystem/Blueprints/Actor/BP_BaseWeapon.uasset b/Content/CombatSystem/Blueprints/Actor/BP_BaseWeapon.uasset index 43a326f..bbc9b39 100644 Binary files a/Content/CombatSystem/Blueprints/Actor/BP_BaseWeapon.uasset and b/Content/CombatSystem/Blueprints/Actor/BP_BaseWeapon.uasset differ diff --git a/Content/CombatSystem/Blueprints/Animnotifes/ToggleCombat_AN.uasset b/Content/CombatSystem/Blueprints/Animnotifes/ToggleCombat_AN.uasset index acc9c2d..078f9cc 100644 Binary files a/Content/CombatSystem/Blueprints/Animnotifes/ToggleCombat_AN.uasset and b/Content/CombatSystem/Blueprints/Animnotifes/ToggleCombat_AN.uasset differ diff --git a/Content/CombatSystem/Blueprints/Animnotifes/iFrameANS.uasset b/Content/CombatSystem/Blueprints/Animnotifes/iFrameANS.uasset new file mode 100644 index 0000000..b514a4e Binary files /dev/null and b/Content/CombatSystem/Blueprints/Animnotifes/iFrameANS.uasset differ diff --git a/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset b/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset index 3b82dc4..ac0bd34 100644 Binary files a/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset and b/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset differ diff --git a/Content/CombatSystem/Blueprints/Components/BP_CollisionComponent.uasset b/Content/CombatSystem/Blueprints/Components/BP_CollisionComponent.uasset index 3044205..b8a5b5d 100644 Binary files a/Content/CombatSystem/Blueprints/Components/BP_CollisionComponent.uasset and b/Content/CombatSystem/Blueprints/Components/BP_CollisionComponent.uasset differ diff --git a/Content/CombatSystem/Blueprints/Components/BP_StateManagerComponent.uasset b/Content/CombatSystem/Blueprints/Components/BP_StateManagerComponent.uasset index 5a22363..1f666aa 100644 Binary files a/Content/CombatSystem/Blueprints/Components/BP_StateManagerComponent.uasset and b/Content/CombatSystem/Blueprints/Components/BP_StateManagerComponent.uasset differ diff --git a/Content/CombatSystem/Blueprints/Interface/Combat_BPI.uasset b/Content/CombatSystem/Blueprints/Interface/Combat_BPI.uasset index 9aedb70..1458d69 100644 Binary files a/Content/CombatSystem/Blueprints/Interface/Combat_BPI.uasset and b/Content/CombatSystem/Blueprints/Interface/Combat_BPI.uasset differ diff --git a/Content/CombatSystem/CourseFiles/Animations/Dodge/Rolling_Montage.uasset b/Content/CombatSystem/CourseFiles/Animations/Dodge/Rolling_Montage.uasset index 9c9c020..8260d7b 100644 Binary files a/Content/CombatSystem/CourseFiles/Animations/Dodge/Rolling_Montage.uasset and b/Content/CombatSystem/CourseFiles/Animations/Dodge/Rolling_Montage.uasset differ diff --git a/Content/CombatSystem/UI/WB_HealthBar.uasset b/Content/CombatSystem/UI/WB_HealthBar.uasset index 5494bd0..2f761e8 100644 Binary files a/Content/CombatSystem/UI/WB_HealthBar.uasset and b/Content/CombatSystem/UI/WB_HealthBar.uasset differ diff --git a/Content/CombatSystem/UI/WB_StatBar.uasset b/Content/CombatSystem/UI/WB_StatBar.uasset index 2f98f4d..bc5d787 100644 Binary files a/Content/CombatSystem/UI/WB_StatBar.uasset and b/Content/CombatSystem/UI/WB_StatBar.uasset differ diff --git a/Content/__ExternalActors__/Maps/ThirdPersonMap/B/FK/5J935N4O02E4FA7ALPU3EW.uasset b/Content/__ExternalActors__/Maps/ThirdPersonMap/B/FK/5J935N4O02E4FA7ALPU3EW.uasset index 77b78e2..ecc0a15 100644 Binary files a/Content/__ExternalActors__/Maps/ThirdPersonMap/B/FK/5J935N4O02E4FA7ALPU3EW.uasset and b/Content/__ExternalActors__/Maps/ThirdPersonMap/B/FK/5J935N4O02E4FA7ALPU3EW.uasset differ diff --git a/Content/__ExternalActors__/Maps/ThirdPersonMap/D/ZJ/J9G0LA6E4V24WWG3NZ0VRY.uasset b/Content/__ExternalActors__/Maps/ThirdPersonMap/D/ZJ/J9G0LA6E4V24WWG3NZ0VRY.uasset index fd7b5b9..f0f6aab 100644 Binary files a/Content/__ExternalActors__/Maps/ThirdPersonMap/D/ZJ/J9G0LA6E4V24WWG3NZ0VRY.uasset and b/Content/__ExternalActors__/Maps/ThirdPersonMap/D/ZJ/J9G0LA6E4V24WWG3NZ0VRY.uasset differ