diff --git a/COMP250_1_2101327_AI/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/COMP250_1_2101327_AI/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 018fba7..fdc8638 100644 --- a/COMP250_1_2101327_AI/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/COMP250_1_2101327_AI/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6054a106552cfe46f8c4e83fa9879b7ffd1f425b8e76ea7567b71524d6fd513 +oid sha256:8624c92c03233da219b800d37b8a098f3ab632e5fe68eb71501451e8b12bf2df size 66790690 diff --git a/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 8404303..ab116ed 100644 --- a/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/COMP250_1_2101327_AI/Source/COMP250_1_2101327_AI/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -470,10 +470,7 @@ void ATurnBaseCombatV2::EnemyTurn() EnemyActionPlan = EnemyGOAPAgent->Plan(GetWorldState(), EnemyGOAPAgent->Goals); ClearActionPlanWidget(); UpdateActionPlanWidget(); - OnEnemyTurn.Broadcast(EnemyActor, PlayerActor); - TurnIndicatorTextBlock->SetText(FText::FromString("Player Turn")); - ToggleButtons(); - return; + ActionEffects = EnemyActionPlan[0]->Effects; } if (ActionEffects.Contains("PlayerHealth")) @@ -507,6 +504,8 @@ void ATurnBaseCombatV2::EnemyTurn() EnemyActionPlan.RemoveAt(0); UpdateResourceBars(); + ClearActionPlanWidget(); + UpdateActionPlanWidget(); } else {