diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index ae699e5..48fc123 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -208,14 +208,14 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo) if (IsSpecialCombo(Combo)) { UStatusSystem* StatusSystem = Cast(PlayerActor->GetComponentByClass(UStatusSystem::StaticClass())); - if (Combo == "AAE") + if (Combo == "PA") { UStatusEffect* TempThornsStatusEffect = NewObject(PlayerActor, ThornsStatusEffect); StatusSystem->AddStatusEffect(TempThornsStatusEffect, 1, false); StatusEffects.Add(TempThornsStatusEffect); AddBattleLogMessage("Player Casted Thorns"); } - else if (Combo == "PPI") + else if (Combo == "PI") { UStatusEffect* TempDOTStatusEffect = NewObject(PlayerActor, DOTStatusEffect); StatusSystem->AddStatusEffect(TempDOTStatusEffect, 1, false); diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h index cc3446e..830859d 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h @@ -72,34 +72,22 @@ public: UPROPERTY(EditAnywhere) TMap ValidCombos = { - {"P", 5}, - {"PP", 15}, - {"PPP", 20}, - {"E", 5}, - {"EE", 15}, - {"EEE", 20}, - {"A", 5}, - {"AA", 15}, - {"AAA", 20}, - {"I", 5}, - {"II", 15}, - {"III", 20}, - {"IA", 15}, - {"IIA", 20}, - {"EP", 15}, - {"EEP", 20}, - {"AE", 15}, - {"AAE", 20}, + {"PE", 15}, + {"PA", 15}, {"PI", 15}, - {"PPI", 20} + {"EA", 15}, + {"EI", 15}, + {"AI", 15}, + {"PP", 20}, + {"EE", 20}, + {"AA", 20}, + {"II", 20} }; UPROPERTY(EditAnywhere) TMap SpecialCombos = { - //{"IIA", "ReduceActSpeed"}, - //{"EEP", "AreaOfEffect"}, - {"AAE", "Thorns"}, - {"PPI", "DamageOverTime"} + {"PA", "Thorns"}, + {"PI", "DamageOverTime"} }; FString BattleLog;