From deebcd76c3fc9eacf92ef317f76d6e23263b9d7b Mon Sep 17 00:00:00 2001 From: collett Date: Tue, 4 Feb 2020 20:58:40 +0900 Subject: [PATCH] inner release, inner chaos, chaotic cyclone --- src/common/Common.h | 18 +- .../action/war/ActionChaoticCyclone16463.cpp | 35 + src/scripts/action/war/ActionInfuriate52.cpp | 2 +- .../action/war/ActionInnerChaos16465.cpp | 35 + .../action/war/ActionInnerRelease7389.cpp | 38 + src/scripts/action/war/ActionMaim37.cpp | 31 - src/scripts/action/war/ActionStormsEye45.cpp | 31 - src/scripts/action/war/ActionStormsPath42.cpp | 31 - src/world/Action/Action.cpp | 83 +- src/world/Action/Action.h | 2 + src/world/Action/ActionLut.cpp | 4 +- src/world/Action/ActionLut.h | 20 +- src/world/Action/ActionLutData.cpp | 1468 +++++++++-------- src/world/Math/CalcStats.cpp | 51 +- src/world/Math/CalcStats.h | 4 +- src/world/StatusEffect/StatusEffect.cpp | 22 - 16 files changed, 998 insertions(+), 877 deletions(-) create mode 100644 src/scripts/action/war/ActionChaoticCyclone16463.cpp create mode 100644 src/scripts/action/war/ActionInnerChaos16465.cpp create mode 100644 src/scripts/action/war/ActionInnerRelease7389.cpp delete mode 100644 src/scripts/action/war/ActionMaim37.cpp delete mode 100644 src/scripts/action/war/ActionStormsEye45.cpp delete mode 100644 src/scripts/action/war/ActionStormsPath42.cpp diff --git a/src/common/Common.h b/src/common/Common.h index 55f42543..a8f8b7af 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -1044,7 +1044,6 @@ namespace Sapphire::Common MPRestore = 11, Haste = 12, InstantCast = 13, - NoCostCast = 14, }; enum class ActionTypeFilter : int32_t @@ -1069,6 +1068,23 @@ namespace Sapphire::Common AbsorbHP = 2, }; + enum ActionBonusEffect : uint8_t + { + NoBonus = 0, + CritBonus = 1, + DHBonus = 2, + GainMPPercentage = 4, + GainJobResource = 8, + SelfHeal = 16, + }; + + enum ActionBonusEffectRequirement : uint8_t + { + NoRequirement = 0, + RequireCorrectCombo = 1, + RequireCorrectPositional = 2, + }; + using PlayerStateFlagList = std::vector< PlayerStateFlag >; } diff --git a/src/scripts/action/war/ActionChaoticCyclone16463.cpp b/src/scripts/action/war/ActionChaoticCyclone16463.cpp new file mode 100644 index 00000000..2cfed669 --- /dev/null +++ b/src/scripts/action/war/ActionChaoticCyclone16463.cpp @@ -0,0 +1,35 @@ +#include