From 82c65b3fc4b5fa3e2c7877976b561f794abcf1ee Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Tue, 17 Jan 2023 08:46:31 +0000 Subject: [PATCH] Fix for Version Conflict --- Config/DefaultEngine.ini | 4 ++-- Content/BlueprintAI/AI/AIBruh.uasset | 3 +++ Content/BlueprintAI/AI/AIC_Enemy.uasset | 3 --- Content/BlueprintAI/AI/AIControllerBruh.uasset | 3 +++ Content/BlueprintAI/AI/AI_Enemy.uasset | 3 --- Content/BlueprintAI/AI/BB_Bruh.uasset | 3 +++ Content/BlueprintAI/AI/BB_Enemy.uasset | 3 --- Content/BlueprintAI/AI/BTT_Chase.uasset | 3 --- Content/BlueprintAI/AI/BTT_ChaseBruh.uasset | 3 +++ Content/BlueprintAI/AI/BTT_FindRandomPatrol.uasset | 4 ++-- Content/BlueprintAI/AI/BT_Bruh.uasset | 3 +++ Content/BlueprintAI/AI/BT_Enemy.uasset | 3 --- Content/BlueprintAI/BruhAI/AIBruh.uasset | 3 --- Content/BlueprintAI/BruhAI/AIControllerBruh.uasset | 3 --- Content/BlueprintAI/BruhAI/BB_Bruh.uasset | 3 --- Content/BlueprintAI/BruhAI/BTT_ChaseBruh.uasset | 3 --- Content/BlueprintAI/BruhAI/BTT_FindRandomPatrol.uasset | 3 --- Content/BlueprintAI/BruhAI/BT_Bruh.uasset | 3 --- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Levels/Top_layer_level.umap | 4 ++-- Content/Levels/TurnBaseSystemV2Test.umap | 3 --- Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp | 1 - .../TurnBasedCombatV2/HoldToInitCombat.cpp | 7 +++++++ Source/the_twilight_abyss/the_twilight_abyss.Build.cs | 2 +- 24 files changed, 31 insertions(+), 46 deletions(-) create mode 100644 Content/BlueprintAI/AI/AIBruh.uasset delete mode 100644 Content/BlueprintAI/AI/AIC_Enemy.uasset create mode 100644 Content/BlueprintAI/AI/AIControllerBruh.uasset delete mode 100644 Content/BlueprintAI/AI/AI_Enemy.uasset create mode 100644 Content/BlueprintAI/AI/BB_Bruh.uasset delete mode 100644 Content/BlueprintAI/AI/BB_Enemy.uasset delete mode 100644 Content/BlueprintAI/AI/BTT_Chase.uasset create mode 100644 Content/BlueprintAI/AI/BTT_ChaseBruh.uasset create mode 100644 Content/BlueprintAI/AI/BT_Bruh.uasset delete mode 100644 Content/BlueprintAI/AI/BT_Enemy.uasset delete mode 100644 Content/BlueprintAI/BruhAI/AIBruh.uasset delete mode 100644 Content/BlueprintAI/BruhAI/AIControllerBruh.uasset delete mode 100644 Content/BlueprintAI/BruhAI/BB_Bruh.uasset delete mode 100644 Content/BlueprintAI/BruhAI/BTT_ChaseBruh.uasset delete mode 100644 Content/BlueprintAI/BruhAI/BTT_FindRandomPatrol.uasset delete mode 100644 Content/BlueprintAI/BruhAI/BT_Bruh.uasset delete mode 100644 Content/Levels/TurnBaseSystemV2Test.umap diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 1061ad3..b792816 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/MainMenu/MainMenu.MainMenu +EditorStartupMap=/Game/Levels/Top_layer_level.Top_layer_level LocalMapOptions= TransitionMap=None bUseSplitscreen=True @@ -26,7 +26,7 @@ ThreePlayerSplitscreenLayout=FavorTop FourPlayerSplitscreenLayout=Grid bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance -GameDefaultMap=/Game/MainMenu/MainMenu.MainMenu +GameDefaultMap=/Game/Levels/Top_layer_level.Top_layer_level ServerDefaultMap=/Engine/Maps/Entry.Entry GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C GlobalDefaultServerGameMode=None diff --git a/Content/BlueprintAI/AI/AIBruh.uasset b/Content/BlueprintAI/AI/AIBruh.uasset new file mode 100644 index 0000000..43e3a9b --- /dev/null +++ b/Content/BlueprintAI/AI/AIBruh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f991e2ffa722c07c9b215206e7e72e5f3405afb1da07d40d608f47419c25ecfd +size 79285 diff --git a/Content/BlueprintAI/AI/AIC_Enemy.uasset b/Content/BlueprintAI/AI/AIC_Enemy.uasset deleted file mode 100644 index e1b26b6..0000000 --- a/Content/BlueprintAI/AI/AIC_Enemy.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a24190ad860f80d21530b4f7e63ae0a00a13eb36dac10158dd76ef0d9efa4a42 -size 99767 diff --git a/Content/BlueprintAI/AI/AIControllerBruh.uasset b/Content/BlueprintAI/AI/AIControllerBruh.uasset new file mode 100644 index 0000000..80d88e1 --- /dev/null +++ b/Content/BlueprintAI/AI/AIControllerBruh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3bf037902c2aa1ed7ada853c5c16a27b948ee58bab4fec7dfc395a7003cd94c +size 97758 diff --git a/Content/BlueprintAI/AI/AI_Enemy.uasset b/Content/BlueprintAI/AI/AI_Enemy.uasset deleted file mode 100644 index 42513ee..0000000 --- a/Content/BlueprintAI/AI/AI_Enemy.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dcbb0b9a3b977cbc0b118d39d46872a58ea7a0a3aac47d54d8f71f360290b20d -size 41778 diff --git a/Content/BlueprintAI/AI/BB_Bruh.uasset b/Content/BlueprintAI/AI/BB_Bruh.uasset new file mode 100644 index 0000000..8d92d84 --- /dev/null +++ b/Content/BlueprintAI/AI/BB_Bruh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07573c5c3ab7305b58d431d53cbf77c93d6324eb82f8d59d50a6690bf357a5f3 +size 3491 diff --git a/Content/BlueprintAI/AI/BB_Enemy.uasset b/Content/BlueprintAI/AI/BB_Enemy.uasset deleted file mode 100644 index 9372087..0000000 --- a/Content/BlueprintAI/AI/BB_Enemy.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eda8581decd5cf9c01db2d9a8d8d31760ba8ea7ac2f00d676e193927642e4b22 -size 3535 diff --git a/Content/BlueprintAI/AI/BTT_Chase.uasset b/Content/BlueprintAI/AI/BTT_Chase.uasset deleted file mode 100644 index b65222e..0000000 --- a/Content/BlueprintAI/AI/BTT_Chase.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c19d2751b220ef82aaf4595d814cd9914c2a12374d75cb37738340d420d06cb3 -size 31269 diff --git a/Content/BlueprintAI/AI/BTT_ChaseBruh.uasset b/Content/BlueprintAI/AI/BTT_ChaseBruh.uasset new file mode 100644 index 0000000..cacd89d --- /dev/null +++ b/Content/BlueprintAI/AI/BTT_ChaseBruh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da96ad8696b48b09139d79173aea8aea87bfb325c8f817e7ccf413d95f3f034f +size 39894 diff --git a/Content/BlueprintAI/AI/BTT_FindRandomPatrol.uasset b/Content/BlueprintAI/AI/BTT_FindRandomPatrol.uasset index e7f789a..807d1e7 100644 --- a/Content/BlueprintAI/AI/BTT_FindRandomPatrol.uasset +++ b/Content/BlueprintAI/AI/BTT_FindRandomPatrol.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3e85a3027ee35a4063605141ed394bbdf8394836c922f7e39e94b38fce6dab7 -size 54851 +oid sha256:9e43806e218b2a418ac31effd7f2176abb4139bada4f1c1926ef88c8631f1e61 +size 54912 diff --git a/Content/BlueprintAI/AI/BT_Bruh.uasset b/Content/BlueprintAI/AI/BT_Bruh.uasset new file mode 100644 index 0000000..2d51dcb --- /dev/null +++ b/Content/BlueprintAI/AI/BT_Bruh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1d788b5da4588cdcc0f487c37f6fb0de042672d3e874cbfad39b12336ede9fc +size 22998 diff --git a/Content/BlueprintAI/AI/BT_Enemy.uasset b/Content/BlueprintAI/AI/BT_Enemy.uasset deleted file mode 100644 index 5b65835..0000000 --- a/Content/BlueprintAI/AI/BT_Enemy.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5828f8b52a3e5cadf43d606dcc7f42961fc1fff64053290f8c5fefcd355322d7 -size 32094 diff --git a/Content/BlueprintAI/BruhAI/AIBruh.uasset b/Content/BlueprintAI/BruhAI/AIBruh.uasset deleted file mode 100644 index 6ddf5c2..0000000 --- a/Content/BlueprintAI/BruhAI/AIBruh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d81fc1ff6729a5b19e530bec898db45bb0b5616be5188ed02885b7b4010024d3 -size 41728 diff --git a/Content/BlueprintAI/BruhAI/AIControllerBruh.uasset b/Content/BlueprintAI/BruhAI/AIControllerBruh.uasset deleted file mode 100644 index e0fd909..0000000 --- a/Content/BlueprintAI/BruhAI/AIControllerBruh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:110b66fd217b202f18c088b27d870c0e91db229301853c5df6112b82a11d306e -size 97304 diff --git a/Content/BlueprintAI/BruhAI/BB_Bruh.uasset b/Content/BlueprintAI/BruhAI/BB_Bruh.uasset deleted file mode 100644 index ea162ad..0000000 --- a/Content/BlueprintAI/BruhAI/BB_Bruh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5797940eaca9802f1dacf99e3f1a7ba0300206ad6f398f19dbf7999d893cd9f0 -size 3239 diff --git a/Content/BlueprintAI/BruhAI/BTT_ChaseBruh.uasset b/Content/BlueprintAI/BruhAI/BTT_ChaseBruh.uasset deleted file mode 100644 index 9379138..0000000 --- a/Content/BlueprintAI/BruhAI/BTT_ChaseBruh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25b365f89983007bd73c5e07125e6953d4271ee6e10045cf7da5bcbe6edef40a -size 38927 diff --git a/Content/BlueprintAI/BruhAI/BTT_FindRandomPatrol.uasset b/Content/BlueprintAI/BruhAI/BTT_FindRandomPatrol.uasset deleted file mode 100644 index 152bcf6..0000000 --- a/Content/BlueprintAI/BruhAI/BTT_FindRandomPatrol.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfa592f9f7b842cc11f9a9963cfd6345bba9ef837c32e4cf3282981ce5a0e074 -size 54887 diff --git a/Content/BlueprintAI/BruhAI/BT_Bruh.uasset b/Content/BlueprintAI/BruhAI/BT_Bruh.uasset deleted file mode 100644 index 2f6610f..0000000 --- a/Content/BlueprintAI/BruhAI/BT_Bruh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e3ccf2bfc00b7c389d880be5b815b892af869d7aa39b700dd9c11192d1de994 -size 17739 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 0ad7190..95ef963 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6623bdf9919b1b41c0499e229f4f70e410e946fd1da46ed119b30b701f69e035 -size 61312 +oid sha256:465dda65f6f573e5b213f73e85bf00219e3bbcc762d215532bb138add6695028 +size 82954 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index fa5081c..321e9f5 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:053aff2fbd61b94359d966d31c7925750031b09fa3a8fac37f6de665285c6768 -size 125873 +oid sha256:83073aff9c61cb72375b7aba9c4743cdaca9fd5a63170fb9f93912ea97f51018 +size 165338 diff --git a/Content/Levels/TurnBaseSystemV2Test.umap b/Content/Levels/TurnBaseSystemV2Test.umap deleted file mode 100644 index 9f468de..0000000 --- a/Content/Levels/TurnBaseSystemV2Test.umap +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b8d2c3d1419afabd83e7e4eb350a40fe9b21446610f711a9ff918be314fec9c -size 80018 diff --git a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp index 65d911d..cc2c535 100644 --- a/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp +++ b/Source/the_twilight_abyss/BaseItems/Items/EatableItems.cpp @@ -3,7 +3,6 @@ #include "EatableItems.h" -#include "BehaviorTree/BehaviorTreeTypes.h" #include "the_twilight_abyss/BaseItems/InventoryComponent.h" #include "the_twilight_abyss/PlayerTemp/TempCharacter.h" diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp index d06e87e..22fd2a7 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp @@ -46,6 +46,8 @@ void UHoldToInitCombat::TickComponent(float DeltaTime, ELevelTick TickType, FAct { //Enter Combat Mode Cast(GetWorld()->GetGameState())->StartCombat(TargetEnemy); + //UBlackboardComponent* TargetEnemyBlackboard = Cast(TargetEnemy->GetComponentByClass(UBlackboardComponent::StaticClass())); + //TargetEnemyBlackboard->SetValueAsBool("IsInCombat", true); OnRightClickUp(); } } @@ -83,6 +85,11 @@ AActor* UHoldToInitCombat::LookingAtEnemy() const { return HitResult.GetActor(); } + if (HitResult.GetActor()->Tags.Contains("Break")) + { + HitResult.GetActor()->Destroy(); + return nullptr; + } } DrawDebugLine(GetWorld(), Start, End, FColor::Red, false, 5.0f, 0, 10.0f); return nullptr; diff --git a/Source/the_twilight_abyss/the_twilight_abyss.Build.cs b/Source/the_twilight_abyss/the_twilight_abyss.Build.cs index 4656471..98ba233 100644 --- a/Source/the_twilight_abyss/the_twilight_abyss.Build.cs +++ b/Source/the_twilight_abyss/the_twilight_abyss.Build.cs @@ -10,7 +10,7 @@ public class the_twilight_abyss : ModuleRules PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "UMG", "Niagara" }); - PrivateDependencyModuleNames.AddRange(new string[] { }); + PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" }); // Uncomment if you are using Slate UI // PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });