From 6227b4952cebc1bad3f31804bcf704ecf9cfbaff Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Tue, 28 Feb 2023 16:48:30 +0000 Subject: [PATCH 01/32] Updated StatusSystem to Bind Player/Enemy Turn Events --- .../TurnBasedCombatV2/StatusEffect.cpp | 12 ++++++++++-- .../TurnBasedCombatV2/StatusEffect.h | 7 ++++--- .../TurnBasedCombatV2/StatusSystem.cpp | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.cpp index 036547b..38c2399 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.cpp @@ -5,6 +5,7 @@ #include "StatusSystem.h" #include "Kismet/GameplayStatics.h" +#include "TurnBaseCombatV2.h" #include "Components/TextBlock.h" void UStatusEffect::Invoke(AActor* Character, float TimeOfInit) @@ -21,16 +22,23 @@ void UStatusEffect::OnExpiry(AActor* Character) StatusSystem->RemoveStatusEffect(this); } -void UStatusEffect::OnPlayerTurn(AActor* Character) +void UStatusEffect::OnPlayerTurn(AActor* Character, AActor* Enemy) { return; } -void UStatusEffect::OnEnemyTurn(AActor* Character) +void UStatusEffect::OnEnemyTurn(AActor* Enemy, AActor* Character) { return; } +void UStatusEffect::OnStatusEffectAdd() +{ + ATurnBaseCombatV2* CombatSystem = Cast(GetWorld()->GetGameState()); + CombatSystem->OnPlayerTurn.AddUObject(this, &UStatusEffect::OnPlayerTurn); + CombatSystem->OnEnemyTurn.AddUObject(this, &UStatusEffect::OnEnemyTurn); +} + void UStatusEffect::CheckForExpiry(const float TimeOfExpiry, AActor* Character) { if (TimeOfExpiry <= UGameplayStatics::GetRealTimeSeconds(GetWorld())) OnExpiry(Character); diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h index 317bc56..4d57501 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h @@ -26,15 +26,16 @@ public: UFUNCTION() virtual void Invoke(AActor* Character, float TimeOfExpiry); - UFUNCTION() virtual void OnExpiry(AActor* Character); UFUNCTION() - virtual void OnPlayerTurn(AActor* Character); + virtual void OnPlayerTurn(AActor* Character, AActor* Enemy); + UFUNCTION() + virtual void OnEnemyTurn(AActor* Enemy, AActor* Character); UFUNCTION() - virtual void OnEnemyTurn(AActor* Character); + virtual void OnStatusEffectAdd(); protected: UPROPERTY() diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp index d3138dc..499df9d 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp @@ -48,6 +48,7 @@ void UStatusSystem::AddStatusEffect(UStatusEffect* StatusEffect, const float Dur UImage* StatusIconImage = Cast(NewStatusEffect.StatusIcon->GetWidgetFromName(TEXT("StatusIconImage"))); StatusIconImage->SetBrushFromTexture(StatusEffect->Icon); StatusIconsBox->AddChild(NewStatusEffect.StatusIcon); + NewStatusEffect.StatusEffect->OnStatusEffectAdd(); if (Invoke) NewStatusEffect.StatusEffect->Invoke(GetOwner(), NewStatusEffect.TimeTillExpiry); ActiveStatusEffects.Add(NewStatusEffect); From 0be235f6b16310732fa0026eca6c96990903fa93 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Thu, 2 Mar 2023 03:25:00 +0000 Subject: [PATCH 02/32] Updated Thorns Status Effect to Trigger OnPlayerDamage --- .../Blueprints/StatusEffects/BP_Thorns.uasset | 4 +-- .../TurnBasedCombatV2/StatusEffect.cpp | 7 +++-- .../TurnBasedCombatV2/StatusEffect.h | 5 ++++ .../StatusEffects/Thorns.cpp | 14 +++++++++ .../TurnBasedCombatV2/StatusEffects/Thorns.h | 4 +++ .../TurnBasedCombatV2/StatusSystem.cpp | 9 +++++- .../TurnBasedCombatV2/TurnBaseCombatV2.cpp | 29 ++++++++++--------- .../TurnBasedCombatV2/TurnBaseCombatV2.h | 13 +++++---- the_twilight_abyss.uproject.DotSettings | 3 +- 9 files changed, 63 insertions(+), 25 deletions(-) diff --git a/Content/Blueprints/StatusEffects/BP_Thorns.uasset b/Content/Blueprints/StatusEffects/BP_Thorns.uasset index bf52405..e8fe436 100644 --- a/Content/Blueprints/StatusEffects/BP_Thorns.uasset +++ b/Content/Blueprints/StatusEffects/BP_Thorns.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48a4ca28df9c381f5b0f29fd9a0a4a5ab3baad4524263a0cfac9be21675ad0eb -size 6382 +oid sha256:851cdfb16956e96b0965fe275332897cb64b3a78df1b00925db70e581b20bc6a +size 6482 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.cpp index 38c2399..2aefba5 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.cpp @@ -20,6 +20,9 @@ void UStatusEffect::OnExpiry(AActor* Character) if (StatusSystem->GetActiveStatusEffect(this).StatusIcon == nullptr) return; StatusSystem->GetActiveStatusEffect(this).StatusIcon->RemoveFromParent(); StatusSystem->RemoveStatusEffect(this); + ATurnBaseCombatV2* CombatSystem = Cast(GetWorld()->GetGameState()); + CombatSystem->OnPlayerTurn.Remove(OnPlayerTurnDelegateHandle); + CombatSystem->OnEnemyTurn.Remove(OnEnemyTurnDelegateHandle); } void UStatusEffect::OnPlayerTurn(AActor* Character, AActor* Enemy) @@ -35,8 +38,8 @@ void UStatusEffect::OnEnemyTurn(AActor* Enemy, AActor* Character) void UStatusEffect::OnStatusEffectAdd() { ATurnBaseCombatV2* CombatSystem = Cast(GetWorld()->GetGameState()); - CombatSystem->OnPlayerTurn.AddUObject(this, &UStatusEffect::OnPlayerTurn); - CombatSystem->OnEnemyTurn.AddUObject(this, &UStatusEffect::OnEnemyTurn); + OnPlayerTurnDelegateHandle = CombatSystem->OnPlayerTurn.AddUObject(this, &UStatusEffect::OnPlayerTurn); + OnEnemyTurnDelegateHandle = CombatSystem->OnEnemyTurn.AddUObject(this, &UStatusEffect::OnEnemyTurn); } void UStatusEffect::CheckForExpiry(const float TimeOfExpiry, AActor* Character) diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h index 4d57501..f8cd426 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h @@ -20,6 +20,8 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) FString Description; UPROPERTY(EditAnywhere, BlueprintReadWrite) + bool IsForCombatOnly = false; + UPROPERTY(EditAnywhere, BlueprintReadWrite) float BaseDuration; UPROPERTY(EditAnywhere, BlueprintReadWrite) UTexture2D* Icon; @@ -42,4 +44,7 @@ protected: FTimerHandle ExpiryTimerHandle; UFUNCTION() void CheckForExpiry(float TimeOfExpiry, AActor* Character); + + FDelegateHandle OnPlayerTurnDelegateHandle; + FDelegateHandle OnEnemyTurnDelegateHandle; }; diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/Thorns.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/Thorns.cpp index ae9f142..4d27d0d 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/Thorns.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/Thorns.cpp @@ -3,6 +3,8 @@ #include "Thorns.h" +#include "the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h" + void UThorns::Invoke(AActor* Character, float TimeOfExpiry) { Super::Invoke(Character, TimeOfExpiry); @@ -12,3 +14,15 @@ void UThorns::OnExpiry(AActor* Character) { Super::OnExpiry(Character); } + +void UThorns::OnEnemyTurn(AActor* Enemy, AActor* Character) +{ + Super::OnEnemyTurn(Enemy, Character); + ATurnBaseCombatV2* CombatSystem = Cast(GetWorld()->GetGameState()); + CombatSystem->DamageEnemy(DamagePerTurn, "thorns"); + BaseDuration -= 1.0f; + if (BaseDuration <= 0.0f) + { + OnExpiry(Character); + } +} diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/Thorns.h b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/Thorns.h index 9abc89c..09862ae 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/Thorns.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/Thorns.h @@ -15,6 +15,10 @@ class THE_TWILIGHT_ABYSS_API UThorns : public UStatusEffect GENERATED_BODY() public: + UPROPERTY(EditAnywhere, BlueprintReadWrite) + float DamagePerTurn = 3.0f; + virtual void Invoke(AActor* Character, float TimeOfExpiry) override; virtual void OnExpiry(AActor* Character) override; + virtual void OnEnemyTurn(AActor* Enemy, AActor* Character) override; }; diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp index 499df9d..46b1b43 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp @@ -43,7 +43,14 @@ void UStatusSystem::AddStatusEffect(UStatusEffect* StatusEffect, const float Dur FActiveStatusEffect NewStatusEffect; NewStatusEffect.StatusEffect = StatusEffect; NewStatusEffect.TimeInitiated = UGameplayStatics::GetRealTimeSeconds(GetWorld()); - NewStatusEffect.TimeTillExpiry = UGameplayStatics::GetRealTimeSeconds(GetWorld()) + StatusEffect->BaseDuration * DurationMultiplier; + if (StatusEffect->IsForCombatOnly) + { + NewStatusEffect.TimeTillExpiry = StatusEffect->BaseDuration * DurationMultiplier; + } + else + { + NewStatusEffect.TimeTillExpiry = UGameplayStatics::GetRealTimeSeconds(GetWorld()) + StatusEffect->BaseDuration * DurationMultiplier; + } NewStatusEffect.StatusIcon = CreateWidget(GetWorld(), HUDStatusIconWidget); UImage* StatusIconImage = Cast(NewStatusEffect.StatusIcon->GetWidgetFromName(TEXT("StatusIconImage"))); StatusIconImage->SetBrushFromTexture(StatusEffect->Icon); diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index fa527c2..eb2eb90 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -86,15 +86,15 @@ void ATurnBaseCombatV2::EndCombat() PlayerController->bShowMouseCursor = false; } -void ATurnBaseCombatV2::FKeyPressed() -{ - PButtonOnClick(); -} - -void ATurnBaseCombatV2::WKeyPressed() -{ - EButtonOnClick(); -} +// void ATurnBaseCombatV2::FKeyPressed() +// { +// PButtonOnClick(); +// } +// +// void ATurnBaseCombatV2::WKeyPressed() +// { +// EButtonOnClick(); +// } void ATurnBaseCombatV2::BeginPlay() { @@ -176,6 +176,7 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo) UStatusEffect* TempThornsStatusEffect = NewObject(PlayerActor, ThornsStatusEffect); StatusSystem->AddStatusEffect(TempThornsStatusEffect, 1, false); StatusEffects.Add(TempThornsStatusEffect); + AddBattleLogMessage("Player Casted Thorns"); } } @@ -191,6 +192,7 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo) RevertActionPoints(); UpdateActionPoints(); + //Damage Calculation switch (bIsPlayerTurn) { case true: @@ -241,18 +243,18 @@ void ATurnBaseCombatV2::RevertActionPoints() UpdateActionPoints(); } -void ATurnBaseCombatV2::DamagePlayer(int Damage) +void ATurnBaseCombatV2::DamagePlayer(int Damage, FString DamageType) { *PlayerHealth -= FMath::Clamp(Damage, 0, 100); UpdateProgressBars(); - AddBattleLogMessage("Player was damaged for " + FString::FromInt(Damage) + " damage."); + AddBattleLogMessage("Player was damaged for " + FString::FromInt(Damage) + " HP by " + DamageType + "."); } -void ATurnBaseCombatV2::DamageEnemy(int Damage) +void ATurnBaseCombatV2::DamageEnemy(int Damage, FString DamageType) { *EnemyHealth -= FMath::Clamp(Damage, 0, 100); UpdateProgressBars(); - AddBattleLogMessage("Enemy was damaged for " + FString::FromInt(Damage) + " damage."); + AddBattleLogMessage("Enemy was damaged for " + FString::FromInt(Damage) + " HP by " + DamageType + "."); } void ATurnBaseCombatV2::UpdateProgressBars() const @@ -455,6 +457,7 @@ void ATurnBaseCombatV2::ToggleButtons() const void ATurnBaseCombatV2::EnemyTurn() { DamagePlayer(10); + OnEnemyTurn.Broadcast(EnemyActor, PlayerActor); TurnIndicatorTextBlock->SetText(FText::FromString("Player Turn")); ToggleButtons(); } diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h index 4a339a2..db67b13 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h @@ -94,15 +94,18 @@ public: void StartCombat(AActor* Enemy); UFUNCTION(BlueprintCallable) void EndCombat(); - UFUNCTION(BlueprintCallable) - void FKeyPressed(); - UFUNCTION(BlueprintCallable) - void WKeyPressed(); + // UFUNCTION(BlueprintCallable) + // void FKeyPressed(); + // UFUNCTION(BlueprintCallable) + // void WKeyPressed(); DECLARE_EVENT_TwoParams(ATurnBaseCombatV2, FOnPlayerTurn, AActor*, AActor*); DECLARE_EVENT_TwoParams(ATurnBaseCombatV2, FOnEnemyTurn, AActor*, AActor*); FOnPlayerTurn OnPlayerTurn; FOnEnemyTurn OnEnemyTurn; + + void DamagePlayer(int Damage, FString DamageType = "unknown"); + void DamageEnemy(int Damage, FString DamageType = "unknown"); protected: virtual void BeginPlay() override; @@ -110,8 +113,6 @@ protected: void UseActionPoint(); void ReuseActionPoint(); void RevertActionPoints(); - void DamagePlayer(int Damage); - void DamageEnemy(int Damage); void UpdateProgressBars() const; private: diff --git a/the_twilight_abyss.uproject.DotSettings b/the_twilight_abyss.uproject.DotSettings index 2323d1b..81ddebe 100644 --- a/the_twilight_abyss.uproject.DotSettings +++ b/the_twilight_abyss.uproject.DotSettings @@ -1,4 +1,5 @@  True True - True \ No newline at end of file + True + True \ No newline at end of file From c742abfce4ab9c4c91b09bd4153e84b845f08b6a Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Thu, 2 Mar 2023 15:06:31 +0000 Subject: [PATCH 03/32] Added DamageOverTime Status Effect for Combat --- .vsconfig | 5 ++++ .../StatusEffects/BP_DamageOverTime.uasset | 3 +++ .../StatusEffects/DamageOverTime.cpp | 17 ++++++++++++++ .../StatusEffects/DamageOverTime.h | 23 +++++++++++++++++++ .../TurnBasedCombatV2/TurnBaseCombatV2.cpp | 9 ++++++++ .../TurnBasedCombatV2/TurnBaseCombatV2.h | 2 ++ 6 files changed, 59 insertions(+) create mode 100644 Content/Blueprints/StatusEffects/BP_DamageOverTime.uasset create mode 100644 Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/DamageOverTime.cpp create mode 100644 Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/DamageOverTime.h diff --git a/.vsconfig b/.vsconfig index cf3175a..b9be525 100644 --- a/.vsconfig +++ b/.vsconfig @@ -1,10 +1,15 @@ { "version": "1.0", "components": [ + "Microsoft.Net.Component.4.6.2.TargetingPack", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64", + "Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.Windows10SDK", "Microsoft.VisualStudio.Workload.CoreEditor", + "Microsoft.VisualStudio.Workload.ManagedDesktop", + "Microsoft.VisualStudio.Workload.NativeCrossPlat", "Microsoft.VisualStudio.Workload.NativeDesktop", "Microsoft.VisualStudio.Workload.NativeGame", "Microsoft.VisualStudio.Workload.Universal" diff --git a/Content/Blueprints/StatusEffects/BP_DamageOverTime.uasset b/Content/Blueprints/StatusEffects/BP_DamageOverTime.uasset new file mode 100644 index 0000000..c69a24b --- /dev/null +++ b/Content/Blueprints/StatusEffects/BP_DamageOverTime.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08f2fffcd5fe0379220954960108a4ee1346bc64bd456fee30919e5f60725878 +size 6592 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/DamageOverTime.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/DamageOverTime.cpp new file mode 100644 index 0000000..c6692b1 --- /dev/null +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/DamageOverTime.cpp @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "DamageOverTime.h" +#include + +void UDamageOverTime::OnEnemyTurn(AActor* Enemy, AActor* Character) +{ + Super::OnEnemyTurn(Enemy, Character); + ATurnBaseCombatV2* CombatSystem = Cast(GetWorld()->GetGameState()); + CombatSystem->DamageEnemy(DamagePerTurn, "DOT"); + BaseDuration -= 1.0f; + if (BaseDuration <= 0.0f) + { + OnExpiry(Character); + } +} diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/DamageOverTime.h b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/DamageOverTime.h new file mode 100644 index 0000000..c50db18 --- /dev/null +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/DamageOverTime.h @@ -0,0 +1,23 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "../StatusEffect.h" +#include "DamageOverTime.generated.h" + +/** + * + */ +UCLASS() +class THE_TWILIGHT_ABYSS_API UDamageOverTime : public UStatusEffect +{ + GENERATED_BODY() +public: + UPROPERTY(EditAnywhere, BlueprintReadWrite) + float DamagePerTurn = 6.0f; + + //virtual void Invoke(AActor* Character, float TimeOfExpiry) override; + //virtual void OnExpiry(AActor* Character) override; + virtual void OnEnemyTurn(AActor* Enemy, AActor* Character) override; +}; diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index eb2eb90..3bbffa9 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -22,6 +22,8 @@ ATurnBaseCombatV2::ATurnBaseCombatV2() HUDWidget = HUDWidgetClass.Class; static ConstructorHelpers::FClassFinder StatusEffectThornsClassFinder(TEXT("/Game/Blueprints/StatusEffects/BP_Thorns")); ThornsStatusEffect = StatusEffectThornsClassFinder.Class; + static ConstructorHelpers::FClassFinder StatusEffectDOTClassFinder(TEXT("/Game/Blueprints/StatusEffects/BP_DamageOverTime")); + DOTStatusEffect = StatusEffectDOTClassFinder.Class; } } @@ -178,6 +180,13 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo) StatusEffects.Add(TempThornsStatusEffect); AddBattleLogMessage("Player Casted Thorns"); } + else if (Combo == "PPI") + { + UStatusEffect* TempDOTStatusEffect = NewObject(PlayerActor, DOTStatusEffect); + StatusSystem->AddStatusEffect(TempDOTStatusEffect, 1, false); + StatusEffects.Add(TempDOTStatusEffect); + AddBattleLogMessage("Player Casted DOT"); + } } if (GunEffect) diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h index db67b13..db70d83 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h @@ -121,6 +121,8 @@ private: UPROPERTY() TSubclassOf ThornsStatusEffect; + UPROPERTY() + TSubclassOf DOTStatusEffect; UPROPERTY() TArray StatusEffects; From 0bf0b5a220c52db761df92a9ffb32f4748ca67f0 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Thu, 2 Mar 2023 15:37:36 +0000 Subject: [PATCH 04/32] Updated StatusSystem to Display Active Turns --- .../TurnBasedCombatV2/StatusEffect.cpp | 11 +++++++++-- .../TurnBasedCombatV2/StatusEffect.h | 5 ++++- .../StatusEffects/DamageOverTime.cpp | 2 +- .../TurnBasedCombatV2/StatusEffects/Thorns.cpp | 2 +- .../TurnBasedCombatV2/StatusSystem.cpp | 4 +++- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.cpp index 2aefba5..931ac87 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.cpp @@ -32,16 +32,23 @@ void UStatusEffect::OnPlayerTurn(AActor* Character, AActor* Enemy) void UStatusEffect::OnEnemyTurn(AActor* Enemy, AActor* Character) { - return; + TickDown(Character); } -void UStatusEffect::OnStatusEffectAdd() +void UStatusEffect::OnStatusEffectAdd(AActor* Character) { ATurnBaseCombatV2* CombatSystem = Cast(GetWorld()->GetGameState()); OnPlayerTurnDelegateHandle = CombatSystem->OnPlayerTurn.AddUObject(this, &UStatusEffect::OnPlayerTurn); OnEnemyTurnDelegateHandle = CombatSystem->OnEnemyTurn.AddUObject(this, &UStatusEffect::OnEnemyTurn); } +void UStatusEffect::TickDown(AActor* Character) +{ + UStatusSystem* StatusSystem = Cast(Character->GetComponentByClass(UStatusSystem::StaticClass())); + UTextBlock* StatusText = Cast(StatusSystem->GetActiveStatusEffect(this).StatusIcon->GetWidgetFromName(TEXT("DurationText"))); + StatusText->SetText(FText::FromString(FString::FromInt(BaseDuration))); +} + void UStatusEffect::CheckForExpiry(const float TimeOfExpiry, AActor* Character) { if (TimeOfExpiry <= UGameplayStatics::GetRealTimeSeconds(GetWorld())) OnExpiry(Character); diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h index f8cd426..3073647 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h @@ -37,7 +37,10 @@ public: virtual void OnEnemyTurn(AActor* Enemy, AActor* Character); UFUNCTION() - virtual void OnStatusEffectAdd(); + virtual void OnStatusEffectAdd(AActor* Character); + + UFUNCTION() + virtual void TickDown(AActor* Character); protected: UPROPERTY() diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/DamageOverTime.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/DamageOverTime.cpp index c6692b1..6bf8032 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/DamageOverTime.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/DamageOverTime.cpp @@ -6,10 +6,10 @@ void UDamageOverTime::OnEnemyTurn(AActor* Enemy, AActor* Character) { - Super::OnEnemyTurn(Enemy, Character); ATurnBaseCombatV2* CombatSystem = Cast(GetWorld()->GetGameState()); CombatSystem->DamageEnemy(DamagePerTurn, "DOT"); BaseDuration -= 1.0f; + Super::OnEnemyTurn(Enemy, Character); if (BaseDuration <= 0.0f) { OnExpiry(Character); diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/Thorns.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/Thorns.cpp index 4d27d0d..b3277af 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/Thorns.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffects/Thorns.cpp @@ -17,10 +17,10 @@ void UThorns::OnExpiry(AActor* Character) void UThorns::OnEnemyTurn(AActor* Enemy, AActor* Character) { - Super::OnEnemyTurn(Enemy, Character); ATurnBaseCombatV2* CombatSystem = Cast(GetWorld()->GetGameState()); CombatSystem->DamageEnemy(DamagePerTurn, "thorns"); BaseDuration -= 1.0f; + Super::OnEnemyTurn(Enemy, Character); if (BaseDuration <= 0.0f) { OnExpiry(Character); diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp index 46b1b43..046bc5e 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp @@ -55,7 +55,9 @@ void UStatusSystem::AddStatusEffect(UStatusEffect* StatusEffect, const float Dur UImage* StatusIconImage = Cast(NewStatusEffect.StatusIcon->GetWidgetFromName(TEXT("StatusIconImage"))); StatusIconImage->SetBrushFromTexture(StatusEffect->Icon); StatusIconsBox->AddChild(NewStatusEffect.StatusIcon); - NewStatusEffect.StatusEffect->OnStatusEffectAdd(); + NewStatusEffect.StatusEffect->OnStatusEffectAdd(GetOwner()); + UTextBlock* StatusText = Cast(NewStatusEffect.StatusIcon->GetWidgetFromName(TEXT("DurationText"))); + StatusText->SetText(FText::FromString(FString::FromInt(NewStatusEffect.TimeTillExpiry))); if (Invoke) NewStatusEffect.StatusEffect->Invoke(GetOwner(), NewStatusEffect.TimeTillExpiry); ActiveStatusEffects.Add(NewStatusEffect); From fdfd244a29840f227869c2690075b716490077dd Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Thu, 2 Mar 2023 16:14:12 +0000 Subject: [PATCH 05/32] Updated Link to Resources to Markdown for Readability --- ... Additional Resources.txt => Links To Additional Resources.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Misc/Additional Resources/{Links To Additional Resources.txt => Links To Additional Resources.md} (100%) diff --git a/Misc/Additional Resources/Links To Additional Resources.txt b/Misc/Additional Resources/Links To Additional Resources.md similarity index 100% rename from Misc/Additional Resources/Links To Additional Resources.txt rename to Misc/Additional Resources/Links To Additional Resources.md From 7491a47cc003ce601e1605aaace7f96266585af9 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 2 Mar 2023 16:15:43 +0000 Subject: [PATCH 06/32] Update Links To Additional Resources.md --- .../Additional Resources/Links To Additional Resources.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Misc/Additional Resources/Links To Additional Resources.md b/Misc/Additional Resources/Links To Additional Resources.md index 26066be..1883f45 100644 --- a/Misc/Additional Resources/Links To Additional Resources.md +++ b/Misc/Additional Resources/Links To Additional Resources.md @@ -1,4 +1,4 @@ - +## Combat Combat Spread Sheet: https://docs.google.com/spreadsheets/d/1s_uxjS8ir1pbt4-ofdOVpSPaQZVC8x9gQzS78bzE3KI/edit?usp=sharing @@ -9,8 +9,10 @@ Enemy Spread Sheet: https://docs.google.com/spreadsheets/d/1NsmF43HhB2W9_BrQazy- Level Blueprints - https://docs.google.com/presentation/d/1ckx8IpO-BIxTFy19MJoUy7EuAMYOYoWQE6x1E2egr1o/edit?usp=sharing -Art: +## Art Final Boss Moodboard - https://docs.google.com/presentation/d/1gX9ULwwuVboH_wPwBXa9AMLEhPbUqvfy5N3zeBOL89I/edit?usp=sharing + Art examples (Pre-Production) - https://docs.google.com/presentation/d/1Tc7nAdgg7ENsuV-6jGyYGHbYBLcY65losUjOYYhMHWs/edit?usp=sharing -Art Examples (Post-Production) - https://docs.google.com/presentation/d/1AEB9NNNOdRZfw2UrT9vZEwUF5QP9rvr0lqPNxoMJWCE/edit?usp=sharing \ No newline at end of file + +Art Examples (Post-Production) - https://docs.google.com/presentation/d/1AEB9NNNOdRZfw2UrT9vZEwUF5QP9rvr0lqPNxoMJWCE/edit?usp=sharing From 9acc10350658a342c164daf9740542f9d7ab0998 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 2 Mar 2023 16:18:31 +0000 Subject: [PATCH 07/32] Updated readme.md to Move Links to Root Folder --- readme.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/readme.md b/readme.md index a31cf1b..4d3effd 100644 --- a/readme.md +++ b/readme.md @@ -9,3 +9,22 @@ https://docs.google.com/spreadsheets/d/13iVCQuveBiaihpREnY145OZi5QT-1sseNoI0A5v8 ### Bestiary lore book https://docs.google.com/document/d/1jvDYRwQlCNFKgY6uCOwbyIQsDW3oOkqERXwN_QHcjD8/edit?usp=sharing + +### Combat + +Combat Spread Sheet: https://docs.google.com/spreadsheets/d/1s_uxjS8ir1pbt4-ofdOVpSPaQZVC8x9gQzS78bzE3KI/edit?usp=sharing + +Combat Word Doc: https://docs.google.com/document/d/1Y6eYoKQPw9n8gl7p030fmtPjfJcE132YHAvwL7Gk4jk/edit?usp=sharing + +Enemy Spread Sheet: https://docs.google.com/spreadsheets/d/1NsmF43HhB2W9_BrQazy-rpT-GDlIZIQlLdvG18DWlkA/edit?usp=sharing + + +Level Blueprints - https://docs.google.com/presentation/d/1ckx8IpO-BIxTFy19MJoUy7EuAMYOYoWQE6x1E2egr1o/edit?usp=sharing + +### Art + +Final Boss Moodboard - https://docs.google.com/presentation/d/1gX9ULwwuVboH_wPwBXa9AMLEhPbUqvfy5N3zeBOL89I/edit?usp=sharing + +Art examples (Pre-Production) - https://docs.google.com/presentation/d/1Tc7nAdgg7ENsuV-6jGyYGHbYBLcY65losUjOYYhMHWs/edit?usp=sharing + +Art Examples (Post-Production) - https://docs.google.com/presentation/d/1AEB9NNNOdRZfw2UrT9vZEwUF5QP9rvr0lqPNxoMJWCE/edit?usp=sharing From e2bab074c60b6141ee540f5191d5b7ff033272df Mon Sep 17 00:00:00 2001 From: PHOEBE HARRIS-WILSON Date: Fri, 3 Mar 2023 13:39:30 +0000 Subject: [PATCH 08/32] gun elements first colour the original colouring for the gun element before i alter them --- UI designs/Gun elements in circles with colour.psd | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 UI designs/Gun elements in circles with colour.psd diff --git a/UI designs/Gun elements in circles with colour.psd b/UI designs/Gun elements in circles with colour.psd new file mode 100644 index 0000000..a4aeefb --- /dev/null +++ b/UI designs/Gun elements in circles with colour.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0eee74c31cc288d35eb98e64e3f834d2ebca6fd16c0f029ca75da416c6f504ab +size 2491119 From b0505fa293bde84c0225f115a2128862958013d5 Mon Sep 17 00:00:00 2001 From: PHOEBE HARRIS-WILSON Date: Fri, 3 Mar 2023 15:25:29 +0000 Subject: [PATCH 09/32] gun elements colour edited some new colours for the gun elements --- UI designs/Gun elements in circles with colour edited.psd | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 UI designs/Gun elements in circles with colour edited.psd diff --git a/UI designs/Gun elements in circles with colour edited.psd b/UI designs/Gun elements in circles with colour edited.psd new file mode 100644 index 0000000..d19d1bb --- /dev/null +++ b/UI designs/Gun elements in circles with colour edited.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e3d5a5bbca5ac55c023b5bdbcc36a8aa64ad136b4658b87c886ba4e94d961a2 +size 3746134 From 2b0567ab6ec21d3713063e9b728567f7ac256ab9 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Fri, 3 Mar 2023 15:47:45 +0000 Subject: [PATCH 10/32] Added collisions to blockout level I added collisions to all assets in the blockout level to be used in testing --- .../Objects/Level_1_map/Level_1_Blockout_Cube_004.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cube_012.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cube_013.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cube_014.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cube_015.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cube_016.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cube_017.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder_001.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder_002.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder_003.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder_004.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder_005.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder_006.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder_007.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder_008.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder_009.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder_010.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder_011.uasset | 4 ++-- .../Objects/Level_1_map/Level_1_Blockout_Cylinder_012.uasset | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_004.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_004.uasset index 1537265..459a91c 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_004.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_004.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20a16d5d0bc9d37e73882e26d0dae584acb5eaa74246450c0d45847f9448c3bd -size 17950 +oid sha256:23d8493d2a6ae599a74a4241479719de40f89bb59b550cfacef0e5e3a4f95f34 +size 16069 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_012.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_012.uasset index 30809c5..979d5f1 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_012.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_012.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23684996f04fe79951abfc0a5f58e629cee04195caa5f0689f3469bc92ea7f4a -size 17929 +oid sha256:218b017049f3586f324247687d9c790cdca6a64043ffebb4a5bec9f133ac254a +size 19150 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_013.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_013.uasset index 44e5947..5a34047 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_013.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_013.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:522fe46835892c46b16af47dc7def4a0a6f5118ab138ca0c72f30f0d58b5c4ec -size 17855 +oid sha256:ecc167eb0fb44344eebf58613484c148071d02742ac94d50c936a47b5280ed54 +size 17188 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_014.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_014.uasset index e702f0c..603c7c9 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_014.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_014.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a59ce6952a7402239f87ab528632958f444d793f871c847296c8f80d9741789a -size 17782 +oid sha256:af16e4c696675568d81b7289200d9b21b9e548fcfe895f7842d1e2aa6fac206f +size 17162 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_015.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_015.uasset index e5dabd5..b7ca18d 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_015.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_015.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:213656211e7581df746b95506799e6552a137c060ee015e6ef4c7f41761ba9a8 -size 18015 +oid sha256:5b7ceb31803fd2afe6b481560270b420c260ad35e76c1500b605ea9a582aa81d +size 18827 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_016.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_016.uasset index 06d81f9..40f7241 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_016.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_016.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88dfe8a0823e46da02fdd2eb2416dca43c8240573f681ad82931444958634494 -size 18003 +oid sha256:8c4ef9224e54df76a50d4c7c992234af0603cb4b6a2a342667ce0d973a6e693e +size 17280 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_017.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_017.uasset index 0a1dd8a..290b405 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_017.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_017.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a26e514cfc96789af8d17045d9516997fdf086b5f2dcb201558c38d6403f370f -size 17737 +oid sha256:f3582ac3366618835346781799d817b69f4cc9d3cb7b991d4d666eb50b517bf5 +size 18500 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset index e2f1002..9ea4d87 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:176484469060dc39cc2fea494005d8fa339b26a8994a6307bb68c1ecf3b0d67d -size 50195 +oid sha256:0cf68692b421e226fdae33ad28634a36bdd17bc6f290855282fc7f07d20ac96e +size 48234 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_001.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_001.uasset index e4b8048..d69dcd9 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_001.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffebeb122c3dca9693784077235519f068d63f2c77f63c5d339da6861a037fc8 -size 29000 +oid sha256:dbe035aaafa15da55a0ccc5bd0ae01957e020685d8eb5d47eb381029449772b2 +size 26941 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_002.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_002.uasset index 7770d8e..fd0b367 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_002.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_002.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c68569effbad32832803338b4e5350f16f0f972e0d7e5c0161c9ca12c3e0ece -size 21376 +oid sha256:9817a9b5fb3e2c5c0c22290a61d56976447de008fff84d3cbb0213a0114f9d92 +size 19351 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_003.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_003.uasset index 692dde8..b80f79b 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_003.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_003.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5944f85bcf6d7293dc81f1b5848700259e424af9759e38e6891d03e7fe8963c5 -size 21654 +oid sha256:a3325477443658f313b06e9cf6138aff2c75e55fd258489603d46b2498135b43 +size 19700 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_004.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_004.uasset index 1aa1334..2beafe2 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_004.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_004.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34165c8230dbff470aec6fd22a429b7b535067b17a8d225fdd11fdbea8ca625e -size 24389 +oid sha256:5b2ef8ab14e553d5e039a7331336e277d75d537c17eef7a2e811e22f8002a3bb +size 22148 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_005.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_005.uasset index c94018d..88c5aab 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_005.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_005.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e0caeca66276cf19a8db4adc8369c109c0ee69bde920c6112f6eb43cc111a75 -size 30501 +oid sha256:8378a68e7be7b7cf9dde75be18790af02e392232d7d9ce7da1ae426588557889 +size 28543 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_006.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_006.uasset index 87eaa05..12123f9 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_006.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_006.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45c909fde1b3f54c1308fc5fd18b786747b71b0e4fc4f98cdc5513069c5979b5 -size 40886 +oid sha256:ac0187a3b76cb3c587b6c43d73a4c3e8872ca5c8c69ade300dbb4853002fa4fd +size 39199 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_007.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_007.uasset index ccac7f5..2eaed7f 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_007.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_007.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67e42403d5c1aa4554ce6459d1b8a02924f380dd9747ab192aa052c8f60f306f -size 40798 +oid sha256:96ec600acdc4c5efc559f72b52e3981c52473d279ed184263b6ebf69d02d5d1d +size 38642 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_008.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_008.uasset index f187917..c4f0b4a 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_008.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_008.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:540af10c95a5e64b010a1779411ec2dd05b719191a67459f7bb063731b3f0e7c -size 40762 +oid sha256:dd82ab9d699fbf9920c66e774f360904e863f01705ea2cc0a8b9f162a49c33d4 +size 38606 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_009.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_009.uasset index 7dc4c9f..fce0a08 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_009.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_009.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b0938c45e73e7250c48852337df96d991b92116ffb49fb87bc38ad7f3f41cf2 -size 40755 +oid sha256:5fcbfbc128eea0eaa30dbf669ab8b53c600b5d7dc2fc7a338440ff7a23783281 +size 38599 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_010.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_010.uasset index dd52007..11b9468 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_010.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_010.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58ce742eec39558ca421a55282c5adb12e45734b2bb328913a53c98a7b814810 -size 40782 +oid sha256:d9d46a410abcf57bcc23b95d56ed15f5b12e72f8dd6244aea4ef4e993df95e67 +size 38633 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_011.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_011.uasset index 601dcd0..d379e23 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_011.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_011.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ba7abc708fd690effce74f13d5b4170d26013130fbc47dbd60cdfba6e6708dc -size 40760 +oid sha256:f7b95da0629ece5c28708c11695e5be1a050440d6734e638ba4c9de5f8efe946 +size 38562 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_012.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_012.uasset index 8f94ab7..88c66ca 100644 --- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_012.uasset +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_012.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1d83b37fc5f73294fecb3f9d26e5d367629fb976cb6649c9ab3118a3fb6059b -size 40729 +oid sha256:9326a4c94c6ec46a70a3283d2d1b0ff2c479b44f422bd6504a6d7f061e78fffb +size 38576 From f0e13d9522fe7d5ddfd831bc526909bb040612ac Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Fri, 3 Mar 2023 16:02:34 +0000 Subject: [PATCH 11/32] Added a new level titled build I added a new level called build so that we can make our new build level in for showcase and testing --- Content/Levels/Build.umap | 3 +++ Content/Levels/Level_1.umap | 4 ++-- Content/Levels/Tutorial.umap | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 Content/Levels/Build.umap diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap new file mode 100644 index 0000000..d84c770 --- /dev/null +++ b/Content/Levels/Build.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5801eb164dc0ed10237587742c29d0e4419a53e4a46fea593d89a5ffc2bbc534 +size 158227 diff --git a/Content/Levels/Level_1.umap b/Content/Levels/Level_1.umap index 6c1264d..d8c0651 100644 --- a/Content/Levels/Level_1.umap +++ b/Content/Levels/Level_1.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54e9e04e1be101f10e16c86b4118edb28493f0a035ba04833141245596ed5939 -size 75703 +oid sha256:6ba3e8faf6f7a085dde45ce8e91f038b41b425f6bb2edd6df0b4aa6e742079a7 +size 76721 diff --git a/Content/Levels/Tutorial.umap b/Content/Levels/Tutorial.umap index 65886bd..39c57fc 100644 --- a/Content/Levels/Tutorial.umap +++ b/Content/Levels/Tutorial.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43dc47aa1d087a7838f2f66ba03dbbd9ff8b82579c43989fe1843b225c14d0f9 -size 269010 +oid sha256:994bb21c989e8eecdb514f9b0685f6ce0c1bc9fc8f8dcbf715c7bf9eaebf64ac +size 270120 From e335e039fdabba01daf9491f1fa47f9386ac9bc1 Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Fri, 3 Mar 2023 16:23:20 +0000 Subject: [PATCH 12/32] Updated Build Scene Ordered levels for build --- Content/Levels/Build.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index d84c770..4a703ee 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:5801eb164dc0ed10237587742c29d0e4419a53e4a46fea593d89a5ffc2bbc534 -size 158227 +oid sha256:578eb39812323cb22d136285e251015c5acc2167d7a18dde848db2ba4f9d80b4 +size 162245 From 26235757f5a11fcda5135b180e6f75811d7ee29d Mon Sep 17 00:00:00 2001 From: Emily Taylor Date: Fri, 3 Mar 2023 17:32:18 +0000 Subject: [PATCH 13/32] Added Merchant Store Assets Merchant FBX assets ready to be textured --- Environment/MerchantShopBlockout.fbx | 3 +++ Environment/MerchantStore.mb | 3 +++ Environment/Merchant_high.fbx | 3 +++ Environment/Merchant_low.fbx | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 Environment/MerchantShopBlockout.fbx create mode 100644 Environment/MerchantStore.mb create mode 100644 Environment/Merchant_high.fbx create mode 100644 Environment/Merchant_low.fbx diff --git a/Environment/MerchantShopBlockout.fbx b/Environment/MerchantShopBlockout.fbx new file mode 100644 index 0000000..1ae843a --- /dev/null +++ b/Environment/MerchantShopBlockout.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b5f7048a382aa7e271eceb5e9b133e5b2068dcf3f99fe3c047afe2c06c1aa14 +size 1280320 diff --git a/Environment/MerchantStore.mb b/Environment/MerchantStore.mb new file mode 100644 index 0000000..73906d6 --- /dev/null +++ b/Environment/MerchantStore.mb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbde9f326eb28341453a9c30e5277d014fac91d0443edf317f19d820c0e5dc8b +size 14518180 diff --git a/Environment/Merchant_high.fbx b/Environment/Merchant_high.fbx new file mode 100644 index 0000000..8f5fbc6 --- /dev/null +++ b/Environment/Merchant_high.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:999232144f63a5c4d2970c2f3f5f17a362738be144acb51c084bb0cd7aed18c3 +size 881376 diff --git a/Environment/Merchant_low.fbx b/Environment/Merchant_low.fbx new file mode 100644 index 0000000..d14ec6f --- /dev/null +++ b/Environment/Merchant_low.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a53cd7ddd374df3d67f4df36d80e2d8d981382e1b94d8b7124c318eab448cee8 +size 431184 From 26c93284d0f7f8b225e15c4852c7c6646fb3c7c3 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Fri, 3 Mar 2023 18:13:30 +0000 Subject: [PATCH 14/32] Updated build level Added a few dressing assets and dressed the level --- Content/Assets/Objects/Stalegtite/Material.uasset | 4 ++-- .../Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset | 4 ++-- Content/Blueprints/NotSkySphere.uasset | 3 +++ Content/Levels/Build.umap | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 Content/Blueprints/NotSkySphere.uasset diff --git a/Content/Assets/Objects/Stalegtite/Material.uasset b/Content/Assets/Objects/Stalegtite/Material.uasset index 512ce04..df61142 100644 --- a/Content/Assets/Objects/Stalegtite/Material.uasset +++ b/Content/Assets/Objects/Stalegtite/Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed9a13b2cc1e2cf3fa38078bf5fd363345db85eef115eabf1d2eae0cb1edd310 -size 17864 +oid sha256:3644389598163a3e7109338711a5d4a6a489588a23d931f4602058dc6ea6e658 +size 18555 diff --git a/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset b/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset index a617292..3d41321 100644 --- a/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset +++ b/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:504f26d741fa993fe75ec4eebbc21f70e68594710a89d630c468c8f0d95f392e -size 14063 +oid sha256:19ba4c0d236ad7441865a9d2d5a472e083b03ace962fbb27f7c5f30a9da582b4 +size 15047 diff --git a/Content/Blueprints/NotSkySphere.uasset b/Content/Blueprints/NotSkySphere.uasset new file mode 100644 index 0000000..b607584 --- /dev/null +++ b/Content/Blueprints/NotSkySphere.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc182c489c2ec1de5d9f8be20f918379028d66be406b1411ae3eb542713ef79b +size 159392 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 4a703ee..af69dc5 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:578eb39812323cb22d136285e251015c5acc2167d7a18dde848db2ba4f9d80b4 -size 162245 +oid sha256:9bf4a613f4c575f192df6302bf990ec7cbd33db85cde8cb5dab983cb0396cb52 +size 193224 From 87c2833381dda38a75748abaaab6cefc9501d1a3 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Fri, 3 Mar 2023 18:25:52 +0000 Subject: [PATCH 15/32] Added a crystal asset Added a crystal asset to use for level dressing --- Content/Assets/Objects/Caves/Blue_rocks.uasset | 4 ++-- Content/Assets/Objects/Crystal/Crystal.uasset | 3 +++ Content/Assets/Objects/Crystal/Crystal_texture.uasset | 3 +++ Content/Assets/Objects/Stalegtite/Material.uasset | 4 ++-- Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset | 4 ++-- .../Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- Content/Music/Wind_and_Rope_Cue.uasset | 4 ++-- 8 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 Content/Assets/Objects/Crystal/Crystal.uasset create mode 100644 Content/Assets/Objects/Crystal/Crystal_texture.uasset diff --git a/Content/Assets/Objects/Caves/Blue_rocks.uasset b/Content/Assets/Objects/Caves/Blue_rocks.uasset index 51dd0d5..340e7b3 100644 --- a/Content/Assets/Objects/Caves/Blue_rocks.uasset +++ b/Content/Assets/Objects/Caves/Blue_rocks.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c023592a8525e65e2d03cbc1d31c22989f9c3c987d13ca4a1368cf288ded748f -size 14309 +oid sha256:c69e7552053bd132b6c43cfa2645127bf2fabb33a7918da3d9d71e5ff9480660 +size 14330 diff --git a/Content/Assets/Objects/Crystal/Crystal.uasset b/Content/Assets/Objects/Crystal/Crystal.uasset new file mode 100644 index 0000000..4e104f7 --- /dev/null +++ b/Content/Assets/Objects/Crystal/Crystal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:093650f378e4fab301594aab264cee1ad6f499c6cf3bbe985a00564e1bb55e05 +size 22867 diff --git a/Content/Assets/Objects/Crystal/Crystal_texture.uasset b/Content/Assets/Objects/Crystal/Crystal_texture.uasset new file mode 100644 index 0000000..349569b --- /dev/null +++ b/Content/Assets/Objects/Crystal/Crystal_texture.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ea8a675a772bdb23dc8e4e3befa7ec0df83220d7646482cd9ea9f307b16a8dd +size 6940 diff --git a/Content/Assets/Objects/Stalegtite/Material.uasset b/Content/Assets/Objects/Stalegtite/Material.uasset index df61142..86450c1 100644 --- a/Content/Assets/Objects/Stalegtite/Material.uasset +++ b/Content/Assets/Objects/Stalegtite/Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3644389598163a3e7109338711a5d4a6a489588a23d931f4602058dc6ea6e658 -size 18555 +oid sha256:ff09b3180da00f9ad58aefe1a876b16580645ce6c339a6554b7e95ce861a6b9e +size 18500 diff --git a/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset b/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset index e86e78d..74ee19e 100644 --- a/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset +++ b/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29889c0b1d2b59e6b330b3bbe1d5273d0a2a1a643a3a027599ea5b851dc741a5 -size 22060 +oid sha256:a5510058dd3bcd407cc9bce8dab0d5784cebd4398582e870edda7340b57b0295 +size 23763 diff --git a/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset b/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset index 3d41321..25eab3b 100644 --- a/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset +++ b/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19ba4c0d236ad7441865a9d2d5a472e083b03ace962fbb27f7c5f30a9da582b4 -size 15047 +oid sha256:d52c98b0fb8550caa04d2a1e0e66b2a9d81e095d6d68a940014197c0d7e187de +size 15206 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index af69dc5..528345d 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:9bf4a613f4c575f192df6302bf990ec7cbd33db85cde8cb5dab983cb0396cb52 -size 193224 +oid sha256:43561b5c9497e716571aacc31fb6caab58c3c895ce255b7f6c74f5b0df4a7755 +size 211680 diff --git a/Content/Music/Wind_and_Rope_Cue.uasset b/Content/Music/Wind_and_Rope_Cue.uasset index 573df61..2ea4ba6 100644 --- a/Content/Music/Wind_and_Rope_Cue.uasset +++ b/Content/Music/Wind_and_Rope_Cue.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53a3ec0e8f6ea55ce24d046331a68370592ef574529ea770642f5b5455f46ffa -size 6183 +oid sha256:54107a99ec77e1e7c2198dab03c96614aa6336417da21cadad6494338bdde6d9 +size 6205 From f1e775dfa1f5b8c0d70ac749542bc27006fa5299 Mon Sep 17 00:00:00 2001 From: Kacper Szelest Date: Fri, 3 Mar 2023 18:32:42 +0000 Subject: [PATCH 16/32] Updated build level Fixed up the tutorial level so it looks a bit better --- Content/Assets/Objects/Crystal/Crystal_texture.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Assets/Objects/Crystal/Crystal_texture.uasset b/Content/Assets/Objects/Crystal/Crystal_texture.uasset index 349569b..c48436b 100644 --- a/Content/Assets/Objects/Crystal/Crystal_texture.uasset +++ b/Content/Assets/Objects/Crystal/Crystal_texture.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ea8a675a772bdb23dc8e4e3befa7ec0df83220d7646482cd9ea9f307b16a8dd -size 6940 +oid sha256:f907311301f33af5e826d7527af5fe824ca31af652973e92194e731817bb641c +size 9450 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 528345d..aabfd0f 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:43561b5c9497e716571aacc31fb6caab58c3c895ce255b7f6c74f5b0df4a7755 -size 211680 +oid sha256:742f1870f70e2fbff5892a51badb0dcd45299b14382fa37af094fdf53bd2d756 +size 211396 From 69b235030abfee9290db6ac527b94bf408e808d5 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Fri, 3 Mar 2023 18:39:59 +0000 Subject: [PATCH 17/32] Updated Combat Character to Add a Flashlight --- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index b19748d..96d1f8e 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:64720f00ad671bcc7f35bcd686f276bb22050ef02657b39eb677d6dea4ca0940 -size 73128 +oid sha256:4ca5e7a4e7b0463db24d49d43c20c15d132b746c936426f4fdb89ba38d1a8e45 +size 74236 From 74a6e239e825fd9581847f87c70bc5e1fd97614f Mon Sep 17 00:00:00 2001 From: Rowland Rowland Date: Fri, 3 Mar 2023 18:51:29 +0000 Subject: [PATCH 18/32] Added enemies and fixed asset collision --- Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset b/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset index 74ee19e..beb6b9c 100644 --- a/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset +++ b/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5510058dd3bcd407cc9bce8dab0d5784cebd4398582e870edda7340b57b0295 -size 23763 +oid sha256:17f9c168bdfd7d55bf4929d6fe7a116f82d75cedee045059081ee779b4c2cc0b +size 21265 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index aabfd0f..0c1ae68 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:742f1870f70e2fbff5892a51badb0dcd45299b14382fa37af094fdf53bd2d756 -size 211396 +oid sha256:47a9bc3af44ec7b6170fdd38becb0874daab79c1c719d418c8365c94d2328df0 +size 298873 From be7af7e6a5c8596ebcfac9972b2efdad61b2341a Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Fri, 3 Mar 2023 20:18:15 +0000 Subject: [PATCH 19/32] Updated Build Map for Merchant --- Content/Levels/Build.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 0c1ae68..140bcbd 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:47a9bc3af44ec7b6170fdd38becb0874daab79c1c719d418c8365c94d2328df0 -size 298873 +oid sha256:ce419f1e2792456a794908553ed4824873afe07cb98243a35ef6cba478e6042f +size 321057 From ffac8b483f45502c6966fd2a8e28714eb8df2516 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Fri, 3 Mar 2023 21:10:47 +0000 Subject: [PATCH 20/32] Updated build level with outline material and wall I added the big wall in to the build level and added some outlines into the level --- Content/Assets/Characters/Goat_Enemy/Goat_Body_low.uasset | 3 +++ Content/Assets/Characters/Goat_Enemy/Goat_Ears_low.uasset | 3 +++ Content/Assets/Characters/Goat_Enemy/Goat_Eyes_low.uasset | 3 +++ Content/Assets/Characters/Goat_Enemy/Goat_Horns_low.uasset | 3 +++ Content/Assets/Characters/Goat_Enemy/Goat_Tail_low.uasset | 3 +++ .../Characters/Goat_Enemy/goat_low_GoatMat_BaseColor.uasset | 3 +++ .../Characters/Goat_Enemy/goat_low_GoatMat_Normal.uasset | 3 +++ .../goat_low_GoatMat_OcclusionRoughnessMetallic.uasset | 3 +++ .../Assets/Objects/Rope_Bridge/RopeBridgeModular_plank.uasset | 3 +++ .../Objects/Rope_Bridge/RopeBridgeModular_plank1.uasset | 3 +++ .../Objects/Rope_Bridge/RopeBridgeModular_plank2.uasset | 3 +++ .../Objects/Rope_Bridge/RopeBridgeModular_plank3.uasset | 3 +++ Content/Assets/Objects/Rope_Bridge/lambert1.uasset | 3 +++ Content/BlueprintAI/AI/AIBruh.uasset | 4 ++-- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- Content/Materials/Outline_rendering.uasset | 4 ++-- 17 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 Content/Assets/Characters/Goat_Enemy/Goat_Body_low.uasset create mode 100644 Content/Assets/Characters/Goat_Enemy/Goat_Ears_low.uasset create mode 100644 Content/Assets/Characters/Goat_Enemy/Goat_Eyes_low.uasset create mode 100644 Content/Assets/Characters/Goat_Enemy/Goat_Horns_low.uasset create mode 100644 Content/Assets/Characters/Goat_Enemy/Goat_Tail_low.uasset create mode 100644 Content/Assets/Characters/Goat_Enemy/goat_low_GoatMat_BaseColor.uasset create mode 100644 Content/Assets/Characters/Goat_Enemy/goat_low_GoatMat_Normal.uasset create mode 100644 Content/Assets/Characters/Goat_Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank1.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank2.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank3.uasset create mode 100644 Content/Assets/Objects/Rope_Bridge/lambert1.uasset diff --git a/Content/Assets/Characters/Goat_Enemy/Goat_Body_low.uasset b/Content/Assets/Characters/Goat_Enemy/Goat_Body_low.uasset new file mode 100644 index 0000000..0f30adb --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/Goat_Body_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5232c0859be3f2899d5b9430da2a6dcd0b985be017222b74e299f0fcf9244798 +size 145214 diff --git a/Content/Assets/Characters/Goat_Enemy/Goat_Ears_low.uasset b/Content/Assets/Characters/Goat_Enemy/Goat_Ears_low.uasset new file mode 100644 index 0000000..da49039 --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/Goat_Ears_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc462af83a665ee77f70897baf77dc03c09a8aa90faba2a6ec82859c036accfb +size 24563 diff --git a/Content/Assets/Characters/Goat_Enemy/Goat_Eyes_low.uasset b/Content/Assets/Characters/Goat_Enemy/Goat_Eyes_low.uasset new file mode 100644 index 0000000..0bb2a16 --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/Goat_Eyes_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b901d0b55b2e9020141efba97f9c9c39b0ce24d4c229b48fd0fb4f719ad404cc +size 52682 diff --git a/Content/Assets/Characters/Goat_Enemy/Goat_Horns_low.uasset b/Content/Assets/Characters/Goat_Enemy/Goat_Horns_low.uasset new file mode 100644 index 0000000..6b276ab --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/Goat_Horns_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2494e8d0beedac8dba39fc7660afeecbd1b2a0470a1698987428f0b4fc2da38 +size 44044 diff --git a/Content/Assets/Characters/Goat_Enemy/Goat_Tail_low.uasset b/Content/Assets/Characters/Goat_Enemy/Goat_Tail_low.uasset new file mode 100644 index 0000000..3379092 --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/Goat_Tail_low.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c6c08e0562665335dc61a0e1d5b9890d1218385669e0502f966d062c1b29080 +size 26464 diff --git a/Content/Assets/Characters/Goat_Enemy/goat_low_GoatMat_BaseColor.uasset b/Content/Assets/Characters/Goat_Enemy/goat_low_GoatMat_BaseColor.uasset new file mode 100644 index 0000000..100e353 --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/goat_low_GoatMat_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1db8c6485f903ecef9ca7405f590433470e821d1487cc8d1fff3f0d6031f6bb7 +size 574889 diff --git a/Content/Assets/Characters/Goat_Enemy/goat_low_GoatMat_Normal.uasset b/Content/Assets/Characters/Goat_Enemy/goat_low_GoatMat_Normal.uasset new file mode 100644 index 0000000..62cb362 --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/goat_low_GoatMat_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa4cfba6c0c96dce582d903660d73571059d708d18615619e80f90faf78a0a92 +size 2646265 diff --git a/Content/Assets/Characters/Goat_Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.uasset b/Content/Assets/Characters/Goat_Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..317507a --- /dev/null +++ b/Content/Assets/Characters/Goat_Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:733dfc5f28a6cb261cb72a4a6efcd5febb331e35084d4969894a313bd4cf0593 +size 1932903 diff --git a/Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank.uasset b/Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank.uasset new file mode 100644 index 0000000..12c9bf0 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:945c4fe5d7111ae309466b2f208034e1773404302e944d0c4929b2144f59e2c8 +size 19500 diff --git a/Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank1.uasset b/Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank1.uasset new file mode 100644 index 0000000..e53fa9d --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce99340ac449603da23629c8d3e3f7e13a00fdd773401c4185efa9871dd09dd0 +size 19470 diff --git a/Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank2.uasset b/Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank2.uasset new file mode 100644 index 0000000..f30d935 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adb28c4b978354d22bd9aeb57650d8bbf9ab93d6575c479be121f207298037e1 +size 19471 diff --git a/Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank3.uasset b/Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank3.uasset new file mode 100644 index 0000000..8c8f543 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/RopeBridgeModular_plank3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:070a3815eeddc255b7e788a5c0a23bf789cfad793f25527d242dd42cdd95add9 +size 19531 diff --git a/Content/Assets/Objects/Rope_Bridge/lambert1.uasset b/Content/Assets/Objects/Rope_Bridge/lambert1.uasset new file mode 100644 index 0000000..a988877 --- /dev/null +++ b/Content/Assets/Objects/Rope_Bridge/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1de95e2021cb1b76c4dc9d1fcef8c4de7a72906aebc24cfd4fc8d325824ab3aa +size 7724 diff --git a/Content/BlueprintAI/AI/AIBruh.uasset b/Content/BlueprintAI/AI/AIBruh.uasset index bd28064..a1d3bbf 100644 --- a/Content/BlueprintAI/AI/AIBruh.uasset +++ b/Content/BlueprintAI/AI/AIBruh.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cf3192a69ceecc6e6552c89a0093b9b2add8e0561001f82362d6485877d64d3 -size 82913 +oid sha256:2a815378a5966a1dc2c90b4ea05efd6e1dc4cf6e70c345ffaf4ee95476279102 +size 83102 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 96d1f8e..29324b2 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:4ca5e7a4e7b0463db24d49d43c20c15d132b746c936426f4fdb89ba38d1a8e45 -size 74236 +oid sha256:7d2673298eed6343bc147c6d75e8a64337b739c0d8865aa9647a61087a7957ea +size 74988 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 140bcbd..02420fb 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:ce419f1e2792456a794908553ed4824873afe07cb98243a35ef6cba478e6042f -size 321057 +oid sha256:944e089b454cd820bbac22c5c0d9d00cd5c235710c65199b72c6231d8f985ae2 +size 333506 diff --git a/Content/Materials/Outline_rendering.uasset b/Content/Materials/Outline_rendering.uasset index 7f71f82..34f0744 100644 --- a/Content/Materials/Outline_rendering.uasset +++ b/Content/Materials/Outline_rendering.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7436c7dc0b4683ffc32ecc9981c36fa7137aee7a3a741b36a4a0fe8f16bbfdb1 -size 22466 +oid sha256:aa22feeaa3f3221c33b33854e686a0028be53dac041316debad91f64fdb9fbfd +size 22587 From c67bdf6c9cfc4cbc2ef1e3f40dd9748b526f516e Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Sat, 4 Mar 2023 19:10:12 +0000 Subject: [PATCH 21/32] Updated build level with extra meshes I added a few meshes to create tunnels and a cavern in one of our levels to create a better feeling of being in a cavey abyss --- Content/Assets/Objects/Caves/Blue_rocks.uasset | 4 ++-- .../Level_1_assets/Level_1_Blockout_with_tunnels_Cube.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_001.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_002.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_003.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_004.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_005.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_006.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_007.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_008.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_009.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_010.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_011.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_012.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_013.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_014.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_015.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_016.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_017.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_018.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_019.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_020.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_021.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_022.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_023.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cube_026.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_002.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_003.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_004.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_005.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_006.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_007.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_008.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_009.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_010.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_011.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_012.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_013.uasset | 3 +++ .../Level_1_Blockout_with_tunnels_Cylinder_014.uasset | 3 +++ Content/Levels/Build.umap | 4 ++-- 41 files changed, 121 insertions(+), 4 deletions(-) create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_001.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_002.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_003.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_004.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_005.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_006.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_007.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_008.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_009.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_010.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_011.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_012.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_013.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_014.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_015.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_016.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_017.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_018.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_019.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_020.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_021.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_022.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_023.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_026.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_002.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_003.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_004.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_005.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_006.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_007.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_008.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_009.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_010.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_011.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_012.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_013.uasset create mode 100644 Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_014.uasset diff --git a/Content/Assets/Objects/Caves/Blue_rocks.uasset b/Content/Assets/Objects/Caves/Blue_rocks.uasset index 340e7b3..a4740d1 100644 --- a/Content/Assets/Objects/Caves/Blue_rocks.uasset +++ b/Content/Assets/Objects/Caves/Blue_rocks.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c69e7552053bd132b6c43cfa2645127bf2fabb33a7918da3d9d71e5ff9480660 -size 14330 +oid sha256:cbf9b8afb1d8aa664ffb96fd19b14d7ece28dd50552c24834434f75a328f0955 +size 14195 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube.uasset new file mode 100644 index 0000000..35e8bc0 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ae35ee2c2864dda2f32baa0fd7d7431a1735f695f3bb70c8bb7f76fcfc2679f +size 17598 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_001.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_001.uasset new file mode 100644 index 0000000..f743d09 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db7f0e007f84ac25dc2f9a945af21825e6980ce6bc7003a57db2df7420b5980c +size 17382 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_002.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_002.uasset new file mode 100644 index 0000000..eec1ffb --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b542d1ed850c5048e8066de217095a62d9cfd29c4502b49c9a6af119ef054279 +size 17472 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_003.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_003.uasset new file mode 100644 index 0000000..1c5f028 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51afee8990047ef9ca9be8a1aa16f59a45935686dec32542215313cebfabb9bd +size 17597 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_004.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_004.uasset new file mode 100644 index 0000000..c033984 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f21dc9d471379bd1c63d1b21bd7ab363eacb849bcdc2310323564baf2125f2ed +size 18226 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_005.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_005.uasset new file mode 100644 index 0000000..752d975 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede3df3a10d570e721a9a0f16d83495c57279ff281cb0ca8dd27288aaf0863e9 +size 17143 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_006.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_006.uasset new file mode 100644 index 0000000..c50e57a --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fc00c63336a391b954599a8b4fcc8eec43271f3d3f29dee15485854564948dd +size 17138 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_007.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_007.uasset new file mode 100644 index 0000000..01cc09b --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_007.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:529c455bc40d1e13a4a15f7ecbaa9b154b34e3521da484f589289adb83b9bc48 +size 17141 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_008.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_008.uasset new file mode 100644 index 0000000..a83c79a --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_008.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e167341aa0d5ff0e9f110b96d817148c4ede1752171c1fa182e0c4425118aa55 +size 17138 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_009.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_009.uasset new file mode 100644 index 0000000..54c5bc4 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f819f41fa8772ff9d324ce9c08fc4c0f9c507a7f30999d247aeff33cfe5d2d2e +size 17669 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_010.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_010.uasset new file mode 100644 index 0000000..92ee7f3 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73b4e4d3eac418868d4e4ff07efa4e2d6edc05928cdf9850fd9b84430a288ad3 +size 17671 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_011.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_011.uasset new file mode 100644 index 0000000..37ef9f5 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_011.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77156b74008c0becdf1cde8e0301e5db12cc5c960a1db0a7219c08aa0a351d13 +size 17671 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_012.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_012.uasset new file mode 100644 index 0000000..a3ccf4c --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_012.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bf72acb520e6529df6971706f942ab89e4afd88843364954c460db7bac60cac +size 18208 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_013.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_013.uasset new file mode 100644 index 0000000..1117589 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_013.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84b73e087ee4abed384abfc753860b1a2b307a852859d53159c306a41c8217a3 +size 18146 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_014.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_014.uasset new file mode 100644 index 0000000..ef96e44 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_014.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c0cda74e25e59f61b0dc382ff6b607a2a2d4ca109a629117e58142daee2d759 +size 18059 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_015.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_015.uasset new file mode 100644 index 0000000..a60e329 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_015.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53d3e31451fac5f8fb994a80b88eec2a29f481bfbeb0b061514d540202c6e4ef +size 18283 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_016.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_016.uasset new file mode 100644 index 0000000..a16a83f --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_016.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df1f6e332bfd427d2cdc01b6f038c73d3cc0b4a191dc1140ecf45e39cdca7f23 +size 18288 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_017.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_017.uasset new file mode 100644 index 0000000..12b615e --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_017.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1df660058db3d78626a2a7243564a3dfc0f4cf8035f29d11c76a14ae9e76234a +size 18481 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_018.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_018.uasset new file mode 100644 index 0000000..46f7497 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_018.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9515a4d1c22d5dbbe1a22dcbd399d8cdccf8177b238012326d7252b80f75efb7 +size 64447 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_019.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_019.uasset new file mode 100644 index 0000000..0acbfdd --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_019.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbbbe46cbf6f7aaa8bf3a6872af343faffbe8a461542aa29b92642748a903eda +size 17753 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_020.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_020.uasset new file mode 100644 index 0000000..3d74541 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_020.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8b570e6b7fc318c1b268dc0294ed78acb4fac993d9acb9d1e87462cceba7aa5 +size 52050 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_021.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_021.uasset new file mode 100644 index 0000000..80f680b --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_021.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76f0df406773fb825a18e5d74f1c2d0aabbcb1c2ec3fbe72c1ebf1f798174138 +size 43893 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_022.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_022.uasset new file mode 100644 index 0000000..47ef3f7 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_022.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c027de8a7be2f575005c2e84db5aefdb598f93b509ff60e2612ae5019a0a9518 +size 40423 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_023.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_023.uasset new file mode 100644 index 0000000..9e0e5df --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_023.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a8050c9f578196ca82b731b3e43ddb67dc51a0c744ec849ebb47692394c0f8b +size 102081 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_026.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_026.uasset new file mode 100644 index 0000000..ad9f3cb --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_026.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52512f85d09e181626dbdf91056cda410ef26dc858bca9944504ea3ee481b6ab +size 18318 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder.uasset new file mode 100644 index 0000000..8d5eae2 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:348687235a6ab4333ce5d29ee165c2c1addf3832153e73c480a0fcdbbcd19d08 +size 57766 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_002.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_002.uasset new file mode 100644 index 0000000..3365eb2 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bde604564e7e57b7ffe4b0bc12ded4862383cab3af359d9ea2294d29e216951b +size 20180 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_003.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_003.uasset new file mode 100644 index 0000000..c18dd0d --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6bfc4e7e293aecd690fb16d9fee045f394402ce3e90711d6b82eaf5bdf8b7e64 +size 20347 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_004.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_004.uasset new file mode 100644 index 0000000..4252739 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:588fd160e186c31f7201e61848f6feede6cab9dd9f67b72eacf844da79933d67 +size 27401 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_005.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_005.uasset new file mode 100644 index 0000000..34a06cd --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0588bba1ae9ee9481c5dc951c8470a1d479e2bc158bd7d69dcb6df6967e61f22 +size 36895 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_006.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_006.uasset new file mode 100644 index 0000000..27ef4f3 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:515ce757968c4fadbb8296f469ca57e738a6d6d08af47659effe4d822e2b16d8 +size 41160 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_007.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_007.uasset new file mode 100644 index 0000000..30bbaa0 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_007.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7a8dd9f64896a122a9e02da8e90d7a7aee3e58c54b6e0d8dd4fae5d235e8d69 +size 41072 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_008.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_008.uasset new file mode 100644 index 0000000..1f12292 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_008.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7198b21e0eb2782de3208ac3cbdf5a9c8b33349306e25aac753fdeecb62537f1 +size 41036 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_009.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_009.uasset new file mode 100644 index 0000000..88e6135 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b8788322cfbb3d3aaa6649c255c7d423c6bd6e5693ea397a90e1f8f64ff0804 +size 41029 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_010.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_010.uasset new file mode 100644 index 0000000..318c40b --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ba5c564d002991faa4899b075b0967a5a13ebb95da606b880c6f99c994a6602 +size 41059 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_011.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_011.uasset new file mode 100644 index 0000000..ce5ed4a --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_011.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7b128f8158f0113774617db0b174f1213c2f11fbb88e4044a21e896debb3ab8 +size 41037 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_012.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_012.uasset new file mode 100644 index 0000000..8f518d9 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_012.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1a296fff5a12e05718df5d1d6f7f27fc270eb09f31bc4d2aee98c359bb6ca50 +size 41005 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_013.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_013.uasset new file mode 100644 index 0000000..9579d28 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_013.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f90527c1cdcf52cd91a738a8e4ede15fb071a67bfb9622c4d7c109956c96afb +size 97645 diff --git a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_014.uasset b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_014.uasset new file mode 100644 index 0000000..4eff320 --- /dev/null +++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cylinder_014.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f42d439f0b22e549ed127ad58c0531149ba3b3a5d026609bc081d97c96d2ae93 +size 34160 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 02420fb..2bbc898 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:944e089b454cd820bbac22c5c0d9d00cd5c235710c65199b72c6231d8f985ae2 -size 333506 +oid sha256:b900d04f4646aee5d06940e319718a054edb7089ed58e289c5c6decdcc71f0fe +size 339581 From 71c6e641c171b96d2f784fa9bfe11b5853fcfdf8 Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Sat, 4 Mar 2023 20:41:46 +0000 Subject: [PATCH 22/32] Updated build level I added some walls around things to avoid having the game look bad and empty. and more like an actual abyss and cave system --- Content/Levels/Build.umap | 4 ++-- Content/Levels/_GENERATED/kacpe/Box_191EAD20.uasset | 3 +++ Content/Levels/_GENERATED/kacpe/Box_296A6B44.uasset | 3 +++ Content/Levels/_GENERATED/kacpe/Box_67D70E40.uasset | 3 +++ Content/Levels/_GENERATED/kacpe/Box_93BF3D62.uasset | 3 +++ 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 Content/Levels/_GENERATED/kacpe/Box_191EAD20.uasset create mode 100644 Content/Levels/_GENERATED/kacpe/Box_296A6B44.uasset create mode 100644 Content/Levels/_GENERATED/kacpe/Box_67D70E40.uasset create mode 100644 Content/Levels/_GENERATED/kacpe/Box_93BF3D62.uasset diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 2bbc898..6ab03d8 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:b900d04f4646aee5d06940e319718a054edb7089ed58e289c5c6decdcc71f0fe -size 339581 +oid sha256:09e08e81290f355ea6aefeb9ae4be04cc78675fad59742ce0f67e2b44d050dbf +size 352830 diff --git a/Content/Levels/_GENERATED/kacpe/Box_191EAD20.uasset b/Content/Levels/_GENERATED/kacpe/Box_191EAD20.uasset new file mode 100644 index 0000000..65ac43b --- /dev/null +++ b/Content/Levels/_GENERATED/kacpe/Box_191EAD20.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:188db4b3177d171dcc6b39d7391406a57f2450c24c79aad5919d1776f324a6d2 +size 12807 diff --git a/Content/Levels/_GENERATED/kacpe/Box_296A6B44.uasset b/Content/Levels/_GENERATED/kacpe/Box_296A6B44.uasset new file mode 100644 index 0000000..0980082 --- /dev/null +++ b/Content/Levels/_GENERATED/kacpe/Box_296A6B44.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78670da3f7e636974723b4451d716a2e974dc2a34ba0fb735a72bd875b1b3fd0 +size 12833 diff --git a/Content/Levels/_GENERATED/kacpe/Box_67D70E40.uasset b/Content/Levels/_GENERATED/kacpe/Box_67D70E40.uasset new file mode 100644 index 0000000..7335b49 --- /dev/null +++ b/Content/Levels/_GENERATED/kacpe/Box_67D70E40.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abd5f084b3338899d6ea3036c8ecf83921511dbc96db02abfa421b34d6d1241e +size 12729 diff --git a/Content/Levels/_GENERATED/kacpe/Box_93BF3D62.uasset b/Content/Levels/_GENERATED/kacpe/Box_93BF3D62.uasset new file mode 100644 index 0000000..420c821 --- /dev/null +++ b/Content/Levels/_GENERATED/kacpe/Box_93BF3D62.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:214b414aecea7b2c1753cb8b5d78e948fb8dd7949721fb625f0437f688db1c2f +size 29805 From a0d3a1a34b462cfee7df32e087aaca2b2d9c6d6a Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Sat, 4 Mar 2023 20:43:00 +0000 Subject: [PATCH 23/32] Updated build level I just added textures to a few untextured objects with temp rock textures --- Content/Levels/Build.umap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 6ab03d8..4940ac6 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:09e08e81290f355ea6aefeb9ae4be04cc78675fad59742ce0f67e2b44d050dbf -size 352830 +oid sha256:ea7b66e46143d7a512c72232e46335a01c27317d268a991d03bb471ee9964729 +size 352887 From 435753700920e73c5a1f365db393e0c0174f7005 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sun, 5 Mar 2023 17:41:39 +0000 Subject: [PATCH 24/32] Updated TempCharacter to create NoiseEmitter Got the NoiseEmitter component and then used the makenoise function to make it create noise everytime the player walks --- .../Blueprints/Display_UI/WBP_Health.uasset | 3 --- .../Player/BP_MyTempCharacter.uasset | 4 ++-- Content/Levels/Top_layer_level.umap | 4 ++-- .../PlayerTemp/TempCharacter.cpp | 18 ++++++++++++------ .../PlayerTemp/TempCharacter.h | 5 ++++- 5 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 Content/Blueprints/Display_UI/WBP_Health.uasset diff --git a/Content/Blueprints/Display_UI/WBP_Health.uasset b/Content/Blueprints/Display_UI/WBP_Health.uasset deleted file mode 100644 index 6d8ecc5..0000000 --- a/Content/Blueprints/Display_UI/WBP_Health.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91f6f6a94de73f379df0167a9b2eaa6ff85dcefc020cd565f965d2003f31b389 -size 28963 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index 3667ddf..450ac00 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2a39b15f6e64703046d9cb9b437b04838acc10eb1f1465c94bd6d8b2c4395ed -size 55131 +oid sha256:a4556a6513b22a1171ff6da3cafd1c299282ca69777c492a5e263986a2f6fa89 +size 67253 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index aa9063c..d032626 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:b669fa5c78fb0e7924a4d8bd4e64f6764e093f9ac5a0a8575342fadb5d45fa47 -size 245297 +oid sha256:78fd1f0edde927e0417a321f0793839eb5532a2ef0e1111c3249caf7060c2b84 +size 245091 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 4cd5c2c..db50ee0 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -8,6 +8,8 @@ #include "GameFramework/CharacterMovementComponent.h" #include "the_twilight_abyss/MerchantInteraction/Interaction.h" #include + +#include "Components/PawnNoiseEmitterComponent.h" #include "Components/SphereComponent.h" #include "Kismet/KismetMathLibrary.h" @@ -19,8 +21,6 @@ ATempCharacter::ATempCharacter() PrimaryActorTick.bCanEverTick = true; Inventory = CreateDefaultSubobject("Inventory"); Inventory->MaxItemSlots = 10; - GoldBalance = GoldBalance; - Health = Health; this->GetCharacterMovement()->GetNavAgentPropertiesRef().bCanCrouch = true; } @@ -32,30 +32,34 @@ void ATempCharacter::BeginPlay() ThisCamera = Cast(this->FindComponentByClass()); PlayerCapsule = GetCapsuleComponent(); TArray AllActorsInScene; - //MAKE SURE POST PROCESSING IS IN THE SCENE OR GAME WILL CRASH UGameplayStatics::GetAllActorsOfClass(GetWorld(), APostProcessVolume::StaticClass(), AllActorsInScene); if (ensureMsgf(AllActorsInScene.Num() > 0, TEXT("No Post Processing Volume in scene"))) { PostProcessVolume = Cast(AllActorsInScene[0]); } - Enemy = TEXT("Enemy"); UGameplayStatics::GetAllActorsWithTag(GetWorld(), Enemy, AIActors); - Ammo = TEXT("Ammo"); + NoiseEmitter = Cast(this->FindComponentByClass(UPawnNoiseEmitterComponent::StaticClass())); + if (NoiseEmitter) + { + UE_LOG(LogTemp, Display, TEXT("Noise Emitter found")); + } } //Binds the input we made in the setup player component to the forward vector void ATempCharacter::ForwardInput(float Axis) { AddMovementInput(UKismetMathLibrary::GetForwardVector(FRotator(0, GetControlRotation().Yaw, 0)) * Axis); + if (isInStealth == false) MakeNoise(1.0f, this, GetActorLocation(), 1200.0f); } //Binds the input we made in the setup player component to the right vector void ATempCharacter::RightMoveInput(float Axis) { AddMovementInput(UKismetMathLibrary::GetRightVector(FRotator(0, GetControlRotation().Yaw, 0)) * Axis); + if (isInStealth == false) MakeNoise(1.0f, this, GetActorLocation(), 1200.0f); } void ATempCharacter::Sneak() @@ -64,6 +68,7 @@ void ATempCharacter::Sneak() if (bIsCrouched) { UnCrouch(); + isInStealth = false; if (PostProcessVolume != nullptr) PostProcessVolume->Settings.VignetteIntensity = 0.0f; for (AActor* Actor : AIActors) { @@ -77,12 +82,13 @@ void ATempCharacter::Sneak() else { Crouch(); + isInStealth = true; for (AActor* Actor : AIActors) { USphereComponent* SphereComponent = Actor->FindComponentByClass(); if (SphereComponent != nullptr) { - SphereComponent->SetSphereRadius(15.0f); + SphereComponent->SetSphereRadius(5.0f); } } if (PostProcessVolume != nullptr) PostProcessVolume->Settings.VignetteIntensity = 0.8f; diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index f9d57fb..961cb21 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -52,8 +52,9 @@ public: void InputDisabler(); void LineTraceLogic(); + UPROPERTY() + class UPawnNoiseEmitterComponent* NoiseEmitter; - UPROPERTY(BlueprintReadWrite, EditAnywhere, Category= "Health") float Health; @@ -97,4 +98,6 @@ public: UPROPERTY(BlueprintReadWrite) float ReactionSpeed = 100.0f; + + bool isInStealth = false; }; From 34f6d6451be3b06a43cf624139c47cc2b4fc24cf Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sun, 5 Mar 2023 17:42:21 +0000 Subject: [PATCH 25/32] Updated AIController adding Hearing sense + config Added hearing sense to the aicontroller and added it to the BTTask. --- Content/BlueprintAI/AI/AIControllerBruh.uasset | 4 ++-- Content/BlueprintAI/AI/BB_Bruh.uasset | 4 ++-- Content/BlueprintAI/AI/BT_Bruh.uasset | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content/BlueprintAI/AI/AIControllerBruh.uasset b/Content/BlueprintAI/AI/AIControllerBruh.uasset index 9737754..47492a5 100644 --- a/Content/BlueprintAI/AI/AIControllerBruh.uasset +++ b/Content/BlueprintAI/AI/AIControllerBruh.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5fd648c575abc38b53e4d6f99f64a879b19c0672c2fa6a97e77cea008fad1dd -size 98856 +oid sha256:f25277555471692ca5760f2ad50cd9fec965a01fbec12971b19ebf160da1ae27 +size 108841 diff --git a/Content/BlueprintAI/AI/BB_Bruh.uasset b/Content/BlueprintAI/AI/BB_Bruh.uasset index 8d92d84..249a4ca 100644 --- a/Content/BlueprintAI/AI/BB_Bruh.uasset +++ b/Content/BlueprintAI/AI/BB_Bruh.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07573c5c3ab7305b58d431d53cbf77c93d6324eb82f8d59d50a6690bf357a5f3 -size 3491 +oid sha256:3302bf7820a78f96077c4355056e80159f31853b5fdb196fff82b9ef7c6185df +size 3814 diff --git a/Content/BlueprintAI/AI/BT_Bruh.uasset b/Content/BlueprintAI/AI/BT_Bruh.uasset index 8c9e379..37d0aa7 100644 --- a/Content/BlueprintAI/AI/BT_Bruh.uasset +++ b/Content/BlueprintAI/AI/BT_Bruh.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3808112aa42d25a44b52ffafe6703131ffa192d567f3b563aad1f433f066ff23 -size 22630 +oid sha256:1ff685ffd223e76bc5e7df7a169b8c7a357921449df90359b136edc4e27111a4 +size 27115 From fd16d32de7fff8cefd820c7ac6187fabf300678d Mon Sep 17 00:00:00 2001 From: MH261677 Date: Sun, 5 Mar 2023 17:44:58 +0000 Subject: [PATCH 26/32] Updated TempCharacter to cleanup Cleaned up unused code/logs --- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index db50ee0..3bca74b 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -42,10 +42,6 @@ void ATempCharacter::BeginPlay() UGameplayStatics::GetAllActorsWithTag(GetWorld(), Enemy, AIActors); Ammo = TEXT("Ammo"); NoiseEmitter = Cast(this->FindComponentByClass(UPawnNoiseEmitterComponent::StaticClass())); - if (NoiseEmitter) - { - UE_LOG(LogTemp, Display, TEXT("Noise Emitter found")); - } } //Binds the input we made in the setup player component to the forward vector From b5048e4be3e4eca1345974ba155285096d561d01 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 6 Mar 2023 00:22:09 +0000 Subject: [PATCH 27/32] Updated Project Settings for Build --- Config/DefaultEngine.ini | 4 ++-- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index f3f6b2f..87a68f8 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/Levels/Top_layer_level.Top_layer_level +EditorStartupMap=/Game/Levels/Build.Build LocalMapOptions= TransitionMap=None bUseSplitscreen=True @@ -26,7 +26,7 @@ ThreePlayerSplitscreenLayout=FavorTop FourPlayerSplitscreenLayout=Grid bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance -GameDefaultMap=/Game/Levels/Top_layer_level.Top_layer_level +GameDefaultMap=/Game/Levels/Build.Build ServerDefaultMap=/Engine/Maps/Entry.Entry GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C GlobalDefaultServerGameMode=None diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 29324b2..55b464e 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:7d2673298eed6343bc147c6d75e8a64337b739c0d8865aa9647a61087a7957ea -size 74988 +oid sha256:59e49f5ac21ef2b66e0d6eba22bb309b9a177d9c454e8a78eedc9b40788fe3b7 +size 74399 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 4940ac6..db52709 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:ea7b66e46143d7a512c72232e46335a01c27317d268a991d03bb471ee9964729 -size 352887 +oid sha256:ba653b8f9bd4c144ad6b77c4fae077fc8b3e88deb2e982787a647399d2e554e3 +size 354425 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 3bca74b..2adb426 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -82,7 +82,7 @@ void ATempCharacter::Sneak() for (AActor* Actor : AIActors) { USphereComponent* SphereComponent = Actor->FindComponentByClass(); - if (SphereComponent != nullptr) + if (IsValid(SphereComponent)) { SphereComponent->SetSphereRadius(5.0f); } From d100a85a0d11c0662c4676f79c8b8b0b84021a13 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 6 Mar 2023 04:28:13 +0000 Subject: [PATCH 28/32] Updated Combat to Set Camera to Face Enemy --- .../Tutorial_Wood_Texture.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- Content/Levels/C2Plane.uasset | 4 ++-- .../PlayerTemp/TempCharacter.cpp | 2 +- .../PlayerTemp/TempCharacter.h | 17 ++++++++--------- .../TurnBasedCombatV2/TurnBaseCombatV2.cpp | 15 +++++++++++---- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset b/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset index 25eab3b..457459a 100644 --- a/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset +++ b/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d52c98b0fb8550caa04d2a1e0e66b2a9d81e095d6d68a940014197c0d7e187de -size 15206 +oid sha256:2647badca7908e08eeead0a12ce0e83cf6851694aab3d48e687fd503bd32b97a +size 14829 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index db52709..ddc5b00 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:ba653b8f9bd4c144ad6b77c4fae077fc8b3e88deb2e982787a647399d2e554e3 -size 354425 +oid sha256:efe6873fdfa3179afbd11ac1d6f5d8b101610fa924f6b72c8e9212f730ac0c9f +size 413107 diff --git a/Content/Levels/C2Plane.uasset b/Content/Levels/C2Plane.uasset index 1ce3908..2071a8c 100644 --- a/Content/Levels/C2Plane.uasset +++ b/Content/Levels/C2Plane.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baee4795cfc5a4580a544bf20e49098d8cd11082dc60ddd2f9b962d836435e92 -size 42608 +oid sha256:e2bd6c119bc7c4cab2cac2b19a010824930db6f78daeff4872d8819ba6513139 +size 42550 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 2adb426..30376e3 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -122,7 +122,7 @@ void ATempCharacter::KeyPressed() // Line trace logic void ATempCharacter::LineTraceLogic() { - UE_LOG(LogTemp, Display, TEXT("LineTraceLogic activated")); + //UE_LOG(LogTemp, Display, TEXT("LineTraceLogic activated")); float GlobalTrace = TraceDistance; FHitResult OutHit; ThisCamera = Cast(this->FindComponentByClass()); diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 961cb21..f56a83c 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -28,7 +28,6 @@ protected: UFUNCTION() void Sneak(); - UCapsuleComponent* PlayerCapsule; public: @@ -37,15 +36,15 @@ public: UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Inventory, meta = (AllowPrivateAccess = "true")) class UInventoryComponent* Inventory; //Using the InventoryComponent class - + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets") UUserWidget* ItemSelectorWidget; - + // Called to bind functionality to input virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; - + void KeyPressed(); - + UPROPERTY(EditAnyWhere) float TraceDistance = 300; @@ -54,7 +53,7 @@ public: UPROPERTY() class UPawnNoiseEmitterComponent* NoiseEmitter; - + UPROPERTY(BlueprintReadWrite, EditAnywhere, Category= "Health") float Health; @@ -63,7 +62,7 @@ public: UPROPERTY(VisibleDefaultsOnly, Category = "LineTrace") bool bHit; - + //Using the item in the inventory UFUNCTION(BlueprintCallable, Category= "Items") void UseItem(class UBaseItem* Item); // Overriding the BaseItem Class @@ -75,7 +74,7 @@ public: UCameraComponent* ThisCamera; FVector OriginalCameraLocation; - + FRotator OriginalCameraRotation; int OriginalCameraFOV; @@ -90,7 +89,7 @@ public: APostProcessVolume* PostProcessVolume; - TArray AIActors; + TArray AIActors; FName Enemy; diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 3bbffa9..8361f5c 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -36,7 +36,6 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy) EnemyBlackboard->SetValueAsBool("IsInCombat", true); FProperty* HealthProperty = Enemy->GetClass()->FindPropertyByName(FName("Health")); int32* EnemyHealthPtr = HealthProperty->ContainerPtrToValuePtr(Enemy); - EnemyHealth = EnemyHealthPtr; if (HUD->IsInViewport()) return; @@ -58,6 +57,14 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy) PlayerController->SetInputMode(FInputModeUIOnly()); PlayerController->bShowMouseCursor = true; + FVector Direction = Enemy->GetActorLocation() - PlayerActor->GetActorLocation(); + Direction.Normalize(); + FRotator LookAtRotation = FRotationMatrix::MakeFromX(Direction).Rotator(); + LookAtRotation.Pitch = -9.0f; + PlayerController->SetControlRotation(LookAtRotation); + + //DrawDebugPoint(GetWorld(), Enemy->GetActorLocation(), 10, FColor::Red, false, 10); + CurrentComboString = ""; UpdateComboString(CurrentComboString); RevertActionPoints(); @@ -72,7 +79,7 @@ void ATurnBaseCombatV2::EndCombat() { StatusEffect->OnExpiry(PlayerActor); } - + HUD->RemoveFromParent(); APawn* PlayerPawn = Cast(GetWorld()->GetFirstPlayerController()->GetPawn()); PlayerPawn->bUseControllerRotationYaw = true; @@ -217,7 +224,7 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo) OnEnemyTurn.Broadcast(EnemyActor, PlayerActor); break; } - + //Ends Combat if either the player or enemy is dead if (*EnemyHealth <= 0) { @@ -288,7 +295,7 @@ void ATurnBaseCombatV2::SwitchTurn() //bIsPlayerTurn = !bIsPlayerTurn; TurnIndicatorTextBlock->SetText(FText::FromString("Enemy Turn")); ToggleButtons(); - + FTimerHandle UnusedHandle; GetWorldTimerManager().SetTimer(UnusedHandle, this, &ATurnBaseCombatV2::EnemyTurn, 2.0f, false); From 0a0c5ed017fec3b00d1200715ba4e6452ec60426 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 6 Mar 2023 04:56:05 +0000 Subject: [PATCH 29/32] Bugfix Combat Initiation Not Checking AI Blackboard --- .../TurnBasedCombatV2/TurnBaseCombatV2.cpp | 19 ++++++++++++++++++- .../TurnBasedCombatV2/TurnBaseCombatV2.h | 3 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 8361f5c..dcc2547 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -12,6 +12,7 @@ #include "GameFramework/Character.h" #include "Kismet/GameplayStatics.h" #include "the_twilight_abyss/PlayerTemp/TempCharacter.h" +#include "UObject/UnrealTypePrivate.h" // Sets default values ATurnBaseCombatV2::ATurnBaseCombatV2() @@ -37,6 +38,16 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy) FProperty* HealthProperty = Enemy->GetClass()->FindPropertyByName(FName("Health")); int32* EnemyHealthPtr = HealthProperty->ContainerPtrToValuePtr(Enemy); EnemyHealth = EnemyHealthPtr; + + if (EnemyBlackboard->GetValueAsBool("Sight")) + { + //bEnemyHasExtraTurn = true; + SwitchTurn(); + } + else + { + bPlayerHasExtraTurn = true; + } if (HUD->IsInViewport()) return; HUD->AddToViewport(); @@ -75,6 +86,8 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy) void ATurnBaseCombatV2::EndCombat() { + bEnemyHasExtraTurn = false; + bPlayerHasExtraTurn = false; for (UStatusEffect* StatusEffect : StatusEffects) { StatusEffect->OnExpiry(PlayerActor); @@ -238,7 +251,11 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo) return; } - SwitchTurn(); + if (!bPlayerHasExtraTurn) + { + SwitchTurn(); + } + bPlayerHasExtraTurn = false; } void ATurnBaseCombatV2::UseActionPoint() diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h index db70d83..37b9bdd 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h @@ -115,6 +115,9 @@ protected: void RevertActionPoints(); void UpdateProgressBars() const; + bool bPlayerHasExtraTurn = false; + bool bEnemyHasExtraTurn = false; + private: bool IsValidCombo(FString Combo) const; bool IsSpecialCombo(FString Combo) const; From b16f632537c0f37575dd81177eff6d55eb0aef75 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 6 Mar 2023 05:25:36 +0000 Subject: [PATCH 30/32] Updated Combat to Hide Gold & Health Text --- Content/Blueprints/Player/BP_MyTempCharacter.uasset | 4 ++-- Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 3 +++ .../the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index 450ac00..9abfef9 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4556a6513b22a1171ff6da3cafd1c299282ca69777c492a5e263986a2f6fa89 -size 67253 +oid sha256:2b8a423de163cd30386d8cecc8e73e6b05c03841f93bd7048d0b52f5339bbfb6 +size 70385 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index f56a83c..b27002d 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -99,4 +99,7 @@ public: float ReactionSpeed = 100.0f; bool isInStealth = false; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets") + UUserWidget* ImportantStats; }; diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index dcc2547..d2b3fda 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -53,6 +53,8 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy) HUD->AddToViewport(); EnemyActor = Enemy; + Cast(PlayerActor)->ImportantStats->SetVisibility(ESlateVisibility::Hidden); + ProbertiumResource = 10; EisResource = 10; AzosResource = 10; @@ -92,6 +94,7 @@ void ATurnBaseCombatV2::EndCombat() { StatusEffect->OnExpiry(PlayerActor); } + Cast(PlayerActor)->ImportantStats->SetVisibility(ESlateVisibility::Visible); HUD->RemoveFromParent(); APawn* PlayerPawn = Cast(GetWorld()->GetFirstPlayerController()->GetPawn()); From 6db07705820e580ae28d0c9875ffa8054785aef8 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 6 Mar 2023 15:00:08 +0000 Subject: [PATCH 31/32] Bugfix Crouch Crashing Game --- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 30376e3..f7c14ed 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -69,7 +69,7 @@ void ATempCharacter::Sneak() for (AActor* Actor : AIActors) { USphereComponent* SphereComponent = Actor->FindComponentByClass(); - if (SphereComponent != nullptr) + if (IsValid(SphereComponent)) { SphereComponent->SetSphereRadius(40.0f); //default value } From f4f8edb6eb2a5949d4bd4eb6ef4cd16a8bd08787 Mon Sep 17 00:00:00 2001 From: GEORGE TAYLOR Date: Mon, 6 Mar 2023 15:42:52 +0000 Subject: [PATCH 32/32] Imported the crystal assets to Unreal --- Content/Assets/Objects/Crystal/Small_Crystal_1.uasset | 3 +++ Content/Assets/Objects/Crystal/Small_Crystal_2.uasset | 3 +++ Content/Assets/Objects/Crystal/Small_Crystal_3.uasset | 3 +++ Content/Assets/Objects/Crystal/crystal_1.uasset | 3 +++ Content/Assets/Objects/Crystal/crystal_2.uasset | 3 +++ Content/Assets/Objects/Crystal/crystal_3.uasset | 3 +++ Content/Assets/Objects/Crystal/lambert1.uasset | 3 +++ 7 files changed, 21 insertions(+) create mode 100644 Content/Assets/Objects/Crystal/Small_Crystal_1.uasset create mode 100644 Content/Assets/Objects/Crystal/Small_Crystal_2.uasset create mode 100644 Content/Assets/Objects/Crystal/Small_Crystal_3.uasset create mode 100644 Content/Assets/Objects/Crystal/crystal_1.uasset create mode 100644 Content/Assets/Objects/Crystal/crystal_2.uasset create mode 100644 Content/Assets/Objects/Crystal/crystal_3.uasset create mode 100644 Content/Assets/Objects/Crystal/lambert1.uasset diff --git a/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset b/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset new file mode 100644 index 0000000..a40aafc --- /dev/null +++ b/Content/Assets/Objects/Crystal/Small_Crystal_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c22683c0a9090c4f46a4af63517aa33121bbd8f6c19826c1c34b9010b4b56e33 +size 19060 diff --git a/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset b/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset new file mode 100644 index 0000000..5314c6a --- /dev/null +++ b/Content/Assets/Objects/Crystal/Small_Crystal_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfae55588ece2718fd4e5802cc96856bfba3c8e29943cf097cf5f92b4db93ae2 +size 18964 diff --git a/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset b/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset new file mode 100644 index 0000000..09e945b --- /dev/null +++ b/Content/Assets/Objects/Crystal/Small_Crystal_3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:615f69e1946e1ab4908a8195b50291b9a76ef1e63b9772b3301f417819abbc32 +size 18880 diff --git a/Content/Assets/Objects/Crystal/crystal_1.uasset b/Content/Assets/Objects/Crystal/crystal_1.uasset new file mode 100644 index 0000000..ff0615e --- /dev/null +++ b/Content/Assets/Objects/Crystal/crystal_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf661a064b0aaae8aedaff8f3796a3d5776e06b773ef46df0b4b8df67bdaf5dc +size 20180 diff --git a/Content/Assets/Objects/Crystal/crystal_2.uasset b/Content/Assets/Objects/Crystal/crystal_2.uasset new file mode 100644 index 0000000..d86e13e --- /dev/null +++ b/Content/Assets/Objects/Crystal/crystal_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:993b648860e93b0fe89badfbe3af18e6438cbfe76947a5ae5baa115801209cd5 +size 19207 diff --git a/Content/Assets/Objects/Crystal/crystal_3.uasset b/Content/Assets/Objects/Crystal/crystal_3.uasset new file mode 100644 index 0000000..ce12e25 --- /dev/null +++ b/Content/Assets/Objects/Crystal/crystal_3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbaadb79dd58f30e2bae5d3a06f871d7016535e3c05160e710e4633da3b50b37 +size 19397 diff --git a/Content/Assets/Objects/Crystal/lambert1.uasset b/Content/Assets/Objects/Crystal/lambert1.uasset new file mode 100644 index 0000000..29a1ca2 --- /dev/null +++ b/Content/Assets/Objects/Crystal/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ff0470f6c54509751322e1e9e737238037becd5f918f5640cc743e19276f744 +size 8048