diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index 463e500..4a5afb5 100644 --- a/Content/Blueprints/Combat_UI/Combat_UI.uasset +++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:959505ce0cb20b62ce7062cc4c2ebb32ef9b9cc93277916da4c14983632dc962 -size 74134 +oid sha256:2a6bb861d2cf59083490093f17787023d879998208033bd39bb24650a6efae91 +size 81335 diff --git a/Content/Blueprints/Combat_UI/Resource_Fill.uasset b/Content/Blueprints/Combat_UI/Resource_Fill.uasset new file mode 100644 index 0000000..bdb5f27 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Resource_Fill.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed09a591d4626f5b48a6236e8a13e2feb6d982848fcfb0045ed4e69b32001920 +size 48164 diff --git a/Content/Blueprints/Combat_UI/Resource_Outline.uasset b/Content/Blueprints/Combat_UI/Resource_Outline.uasset new file mode 100644 index 0000000..487a213 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Resource_Outline.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4f1d280de5d9463cf2b5ef7753e6275dfcb33845765f8c36a8fe96b999e0861 +size 36426 diff --git a/Content/Fonts/ChildrenOnceWhere.uasset b/Content/Fonts/ChildrenOnceWhere.uasset new file mode 100644 index 0000000..0cf6869 --- /dev/null +++ b/Content/Fonts/ChildrenOnceWhere.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0eb9a70a6950b194ec0276062d86fcac54408f0f85213ffd6b5a66fcbd265660 +size 25467 diff --git a/Content/Fonts/ChildrenOnceWhere_Font.uasset b/Content/Fonts/ChildrenOnceWhere_Font.uasset new file mode 100644 index 0000000..f57f4fd --- /dev/null +++ b/Content/Fonts/ChildrenOnceWhere_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b31ad99fa44c867c370ee370a26d00ad39c832b337baedee8e2a84ecffb67b2b +size 7089 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 293f5d8..4edc589 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0aed0be60fd2c22426d1ff8991183f4b2464c3d10676d4a2e38ec3fa3642301 -size 3384639 +oid sha256:c38bf7bf4463dbc53e9c0211e4b90cf681b01ac7b04ca7106a927b97fe5f7e1b +size 3384638 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index c429ad4..29797ac 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -79,27 +79,11 @@ void ATempCharacter::Sneak() UnCrouch(); isInStealth = false; if (PostProcessVolume != nullptr) PostProcessVolume->Settings.VignetteIntensity = 0.0f; - //for (AActor* Actor : AIActors) - //{ - // USphereComponent* SphereComponent = Actor->FindComponentByClass(); - // if (IsValid(SphereComponent)) - // { - // SphereComponent->SetSphereRadius(40.0f); //default value - // } - //} } else { Crouch(); isInStealth = true; - /*for (AActor* Actor : AIActors) - { - USphereComponent* SphereComponent = Actor->FindComponentByClass(); - if (IsValid(SphereComponent)) - { - SphereComponent->SetSphereRadius(5.0f); - } - }*/ if (PostProcessVolume != nullptr) PostProcessVolume->Settings.VignetteIntensity = 0.8f; } } diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index c7804f6..973c210 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -233,13 +233,13 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo) case true: // Player Turn DamageEnemy(*ValidCombos.Find(Combo)); - GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Enemy Damaged %d"), *ValidCombos.Find(Combo))); + //GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Enemy Damaged %d"), *ValidCombos.Find(Combo))); OnPlayerTurn.Broadcast(PlayerActor, EnemyActor); break; case false: // Enemy Turn DamagePlayer(*ValidCombos.Find(Combo)); - GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo))); + //GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Green, FString::Printf(TEXT("Player Damaged %d"), *ValidCombos.Find(Combo))); OnEnemyTurn.Broadcast(EnemyActor, PlayerActor); break; } diff --git a/UI designs/Resource_Fill.png b/UI designs/Resource_Fill.png new file mode 100644 index 0000000..0a5ae4b --- /dev/null +++ b/UI designs/Resource_Fill.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af67e8e428ff51e5ad350fb17a2997ce937e103ef788e6cdd7a57c714c071ae5 +size 25449 diff --git a/UI designs/Resource_Outline.png b/UI designs/Resource_Outline.png new file mode 100644 index 0000000..c393b8a --- /dev/null +++ b/UI designs/Resource_Outline.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:326ab1c528425919114cac43c677cd1985357f584cfe19ad66753ad085f52bc8 +size 14149