From 78eec2e5120ceec112ec1541a36305f5ef520382 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Thu, 12 Nov 2026 10:22:51 +0000 Subject: [PATCH] Maintenance: native-fixes-7 (resubmit of 18122). Adds GLOBAL IDs on the 336 registrar statics (1-byte .data objects at the original r Batch #18150 by ragnarok-clanker: forced by an admin (0 lower score(s), 69 changed function(s)); checked with 334 compiled unit(s), including every includer of Source/Contents/Actors/GameActor.h, Source/Contents/Skills/SkillInfo.h, Source/UI/Edit/UIEditBoxEx.h, Source/UI/GameSettings/GameSettingsUI.h, Source/UI/Items/UIEquipmentPropertiesWnd.h, Source/UI/Items/UIGameItem.h. --- Source/Contents/Actors/GameActor.h | 1 - Source/Contents/Actors/RenderObject.cpp | 6 - Source/Contents/Skills/SkillActionAlitea.cpp | 98 ++++- Source/Contents/Skills/SkillActionDruid.cpp | 73 ++++ .../Skills/SkillActionImperialGuard.cpp | 108 ++++++ Source/Contents/Skills/SkillActionKarnos.cpp | 115 +++++- Source/Contents/Skills/SkillActionMeister.cpp | 57 +++ .../Contents/Skills/SkillActionNightWatch.cpp | 164 +++++++++ .../Contents/Skills/SkillActionRegistrar.cpp | 8 - .../Skills/SkillActionShinkiroShiranui.cpp | 67 ++++ .../Contents/Skills/SkillActionSkyEmperor.cpp | 63 ++++ .../Skills/SkillActionSoulAscetic.cpp | 52 +++ .../Skills/SkillActionSpiritHandler.cpp | 46 +++ .../Contents/Skills/SkillActionTroubadour.cpp | 50 ++- .../Contents/Skills/SkillActionWindHawk.cpp | 31 ++ Source/Contents/Skills/SkillInfo.cpp | 344 +++++++++++++++++- Source/Contents/Skills/SkillInfo.h | 19 + Source/UI/Edit/UIEditBoxEx.cpp | 8 +- Source/UI/Edit/UIEditBoxEx.h | 3 +- Source/UI/GameSettings/GameSettingsUI.cpp | 2 +- Source/UI/GameSettings/GameSettingsUI.h | 11 +- Source/UI/Items/UIEquipmentPropertiesWnd.cpp | 6 +- Source/UI/Items/UIEquipmentPropertiesWnd.h | 6 +- Source/UI/Items/UIGameItem.cpp | 2 +- Source/UI/Items/UIGameItem.h | 2 +- 25 files changed, 1287 insertions(+), 55 deletions(-) diff --git a/Source/Contents/Actors/GameActor.h b/Source/Contents/Actors/GameActor.h index 2f9359d81..3c0c6f7db 100644 --- a/Source/Contents/Actors/GameActor.h +++ b/Source/Contents/Actors/GameActor.h @@ -232,7 +232,6 @@ public: void SetActorJob(int job); void RenderMercenary(const float* matrix, int job); void ProcessBodyState(); - int GetShield(); int GetEffectiveJob(int job); void LaunchAttackProjectile(int target, float scale); void SetStatusStates(int bodyState, std::uint32_t stateFlags, int effectState, bool notify); diff --git a/Source/Contents/Actors/RenderObject.cpp b/Source/Contents/Actors/RenderObject.cpp index a01b0ad8e..f3c6c1d30 100644 --- a/Source/Contents/Actors/RenderObject.cpp +++ b/Source/Contents/Actors/RenderObject.cpp @@ -2042,12 +2042,6 @@ void CGameActor::ProcessBodyState() { } } -// OFFSET: 0x0077E3A0 -// FUNCTION: fn_08455 -int CGameActor::GetShield() { - return -1; -} - // OFFSET: 0x005A1280 // FUNCTION: fn_03042 void CGameActor::SetSex(int value) { diff --git a/Source/Contents/Skills/SkillActionAlitea.cpp b/Source/Contents/Skills/SkillActionAlitea.cpp index 039b2e211..9adb7327d 100644 --- a/Source/Contents/Skills/SkillActionAlitea.cpp +++ b/Source/Contents/Skills/SkillActionAlitea.cpp @@ -245,7 +245,7 @@ public: void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; -class CSkillAction_AT_ROARING_PIERCEER_S : public CSkillAction_ThunderingExpand { +class CSkillAction_AT_ROARING_PIERCER_S : public CSkillAction_ThunderingExpand { public: void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; @@ -1255,7 +1255,7 @@ void CSkillAction_AT_ROARING_PIERCER::OnSkillEffect(int level, CGameActor* sourc // OFFSET: 0x005AA180 // FUNCTION: fn_03235 -void CSkillAction_AT_ROARING_PIERCEER_S::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_AT_ROARING_PIERCER_S::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source) { return; } @@ -2134,3 +2134,97 @@ void CSkillAction_DamageWereRaptorForm::SpawnAttack02Effect(int sourceActor, CGa ++row; } } + +// GLOBAL: gl_25618 +static EfstActionRegistrar s_efstAction1705(1705, NewAction); +// GLOBAL: gl_25619 +static EfstActionRegistrar s_efstAction1708(1708, NewAction); +// GLOBAL: gl_25620 +static EfstActionRegistrar s_efstAction1706(1706, NewAction); +// GLOBAL: gl_25621 +static EfstActionRegistrar s_efstAction1707(1707, NewAction); +// GLOBAL: gl_25622 +static EfstActionRegistrar s_efstAction1722(1722, NewAction); +// GLOBAL: gl_25623 +static EfstActionRegistrar s_efstAction1703(1703, NewAction); +// GLOBAL: gl_25624 +static EfstActionRegistrar s_efstAction1704(1704, NewAction); +// GLOBAL: gl_25625 +static EfstActionRegistrar s_efstAction1702(1702, NewAction); +// GLOBAL: gl_25626 +static EfstActionRegistrar s_efstAction1713(1713, NewAction); +// GLOBAL: gl_25627 +static EfstActionRegistrar s_efstAction1715(1715, NewAction); +// GLOBAL: gl_25628 +static EfstActionRegistrar s_efstAction1712(1712, NewAction); +// GLOBAL: gl_25629 +static EfstActionRegistrar s_efstAction1710(1710, NewAction); + +// OFFSET: 0x0040D1D0 +// FUNCTION: fn_45560 +static bool s_skillObjectActionRegistered314 = [] { + std::function factory = NewAction; + CSkillActionMgr::GetInstance()->RegisterSkillObjectAction(314, factory); + return true; +}(); + +// GLOBAL: gl_25630 +static SkillActionRegistrar s_skillAction6591(6591, NewAction); +// GLOBAL: gl_25631 +static SkillActionRegistrar s_skillAction6580(6580, NewAction); +// GLOBAL: gl_25632 +static SkillActionRegistrar s_skillAction6577(6577, NewAction); +// GLOBAL: gl_25633 +static SkillActionRegistrar s_skillAction6585(6585, NewAction); +// GLOBAL: gl_25634 +static SkillActionRegistrar s_skillAction6596(6596, NewAction); +// GLOBAL: gl_25635 +static SkillActionRegistrar s_skillAction6579(6579, NewAction); +// GLOBAL: gl_25636 +static SkillActionRegistrar s_skillAction6583(6583, NewAction); +// GLOBAL: gl_25637 +static SkillActionRegistrar s_skillAction6582(6582, NewAction); +// GLOBAL: gl_25638 +static SkillActionRegistrar s_skillAction6601(6601, NewAction); +// GLOBAL: gl_25639 +static SkillActionRegistrar s_skillAction6592(6592, NewAction); +// GLOBAL: gl_25640 +static SkillActionRegistrar s_skillAction6593(6593, NewAction); +// GLOBAL: gl_25641 +static SkillActionRegistrar s_skillAction6594(6594, NewAction); +// GLOBAL: gl_25642 +static SkillActionRegistrar s_skillAction6595(6595, NewAction); +// GLOBAL: gl_25643 +static SkillActionRegistrar s_skillAction6605(6605, NewAction); +// GLOBAL: gl_25644 +static SkillActionRegistrar s_skillAction6607(6607, NewAction); +// GLOBAL: gl_25645 +static SkillActionRegistrar s_skillAction6586(6586, NewAction); +// GLOBAL: gl_25646 +static SkillActionRegistrar s_skillAction6578(6578, NewAction); +// GLOBAL: gl_25647 +static SkillActionRegistrar s_skillAction6576(6576, NewAction); +// GLOBAL: gl_25648 +static SkillActionRegistrar s_skillAction6588(6588, NewAction); +// GLOBAL: gl_25649 +static SkillActionRegistrar s_skillAction6589(6589, NewAction); +// GLOBAL: gl_25650 +static SkillActionRegistrar s_skillAction6599(6599, NewAction); +// GLOBAL: gl_25651 +static SkillActionRegistrar s_skillAction6600(6600, NewAction); +// GLOBAL: gl_25652 +static SkillActionRegistrar s_skillAction6597(6597, NewAction); +// GLOBAL: gl_25653 +static SkillActionRegistrar s_skillAction6598(6598, NewAction); +// GLOBAL: gl_25654 +static SkillActionRegistrar s_skillAction6581(6581, NewAction); +// GLOBAL: gl_25655 +static SkillActionRegistrar s_skillAction6604(6604, NewAction); +// GLOBAL: gl_25656 +static SkillActionRegistrar s_skillAction6590(6590, NewAction); +// GLOBAL: gl_25657 +static SkillActionRegistrar s_skillAction6603(6603, NewAction); +// GLOBAL: gl_25658 +static SkillActionRegistrar s_skillAction6602(6602, NewAction); +// GLOBAL: gl_25659 +static SkillActionRegistrar s_skillAction6587(6587, NewAction); diff --git a/Source/Contents/Skills/SkillActionDruid.cpp b/Source/Contents/Skills/SkillActionDruid.cpp index fc286a397..3391b4c58 100644 --- a/Source/Contents/Skills/SkillActionDruid.cpp +++ b/Source/Contents/Skills/SkillActionDruid.cpp @@ -1320,3 +1320,76 @@ void CEfstAction_WERERAPTOR::OnEfstBegin(int efstId, int value, int argument3, i static_cast(actor)->SetBodyPaletteName(); } } + +// GLOBAL: gl_25684 +static EfstActionRegistrar s_efstAction1678(1678, NewAction); +// GLOBAL: gl_25685 +static EfstActionRegistrar s_efstAction1681(1681, NewAction); +// GLOBAL: gl_25686 +static EfstActionRegistrar s_efstAction1676(1676, NewAction); +// GLOBAL: gl_25687 +static EfstActionRegistrar s_efstAction1697(1697, NewAction); +// GLOBAL: gl_25688 +static EfstActionRegistrar s_efstAction1698(1698, NewAction); +// GLOBAL: gl_25689 +static EfstActionRegistrar s_efstAction1687(1687, NewAction); +// GLOBAL: gl_25690 +static EfstActionRegistrar s_efstAction1682(1682, NewAction); +// GLOBAL: gl_25691 +static EfstActionRegistrar s_efstAction1695(1695, NewAction); +// GLOBAL: gl_25692 +static EfstActionRegistrar s_efstAction1696(1696, NewAction); +// GLOBAL: gl_25693 +static EfstActionRegistrar s_efstAction1686(1686, NewAction); +// GLOBAL: gl_25694 +static EfstActionRegistrar s_efstAction1684(1684, NewAction); +// GLOBAL: gl_25695 +static EfstActionRegistrar s_efstAction1685(1685, NewAction); +// GLOBAL: gl_25696 +static EfstActionRegistrar s_efstAction1680(1680, NewAction); +// GLOBAL: gl_25697 +static EfstActionRegistrar s_efstAction1675(1675, NewAction); +// GLOBAL: gl_25698 +static SkillActionRegistrar s_skillAction6546(6546, NewAction); +// GLOBAL: gl_25699 +static SkillActionRegistrar s_skillAction6529(6529, NewAction); +// GLOBAL: gl_25700 +static SkillActionRegistrar s_skillAction6527(6527, NewAction); +// GLOBAL: gl_25701 +static SkillActionRegistrar s_skillAction6542(6542, NewAction); +// GLOBAL: gl_25702 +static SkillActionRegistrar s_skillAction6545(6545, NewAction); +// GLOBAL: gl_25703 +static SkillActionRegistrar s_skillAction6532(6532, NewAction); +// GLOBAL: gl_25704 +static SkillActionRegistrar s_skillAction6525(6525, NewAction); +// GLOBAL: gl_25705 +static SkillActionRegistrar s_skillAction6534(6534, NewAction); +// GLOBAL: gl_25706 +static SkillActionRegistrar s_skillAction6528(6528, NewAction); +// GLOBAL: gl_25707 +static SkillActionRegistrar s_skillAction6540(6540, NewAction); +// GLOBAL: gl_25708 +static SkillActionRegistrar s_skillAction6539(6539, NewAction); +// GLOBAL: gl_25709 +static SkillActionRegistrar s_skillAction6535(6535, NewAction); +// GLOBAL: gl_25710 +static SkillActionRegistrar s_skillAction6547(6547, NewAction); +// GLOBAL: gl_25711 +static SkillActionRegistrar s_skillAction6526(6526, NewAction); +// GLOBAL: gl_25712 +static SkillActionRegistrar s_skillAction6536(6536, NewAction); +// GLOBAL: gl_25713 +static SkillActionRegistrar s_skillAction6533(6533, NewAction); +// GLOBAL: gl_25714 +static SkillActionRegistrar s_skillAction6544(6544, NewAction); +// GLOBAL: gl_25715 +static SkillActionRegistrar s_skillAction6538(6538, NewAction); +// GLOBAL: gl_25716 +static SkillActionRegistrar s_skillAction6541(6541, NewAction); +// GLOBAL: gl_25717 +static SkillActionRegistrar s_skillAction6531(6531, NewAction); +// GLOBAL: gl_25718 +static SkillActionRegistrar s_skillAction6524(6524, NewAction); +// GLOBAL: gl_25719 +static SkillActionRegistrar s_skillAction6543(6543, NewAction); diff --git a/Source/Contents/Skills/SkillActionImperialGuard.cpp b/Source/Contents/Skills/SkillActionImperialGuard.cpp index 26d942a29..0972627e4 100644 --- a/Source/Contents/Skills/SkillActionImperialGuard.cpp +++ b/Source/Contents/Skills/SkillActionImperialGuard.cpp @@ -22,6 +22,7 @@ class CSkillAction_IG_GUARDIAN_SHIELD : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; @@ -52,6 +53,7 @@ public: class CSkillAction_IG_JUDGEMENT_CROSS : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; @@ -60,6 +62,7 @@ public: class CSkillAction_IG_OVERSLASH : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -92,12 +95,14 @@ public: class CSkillAction_IG_IMPERIAL_CROSS : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_IG_RADIANT_SPEAR : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -112,6 +117,7 @@ public: class CSkillAction_IG_SHIELD_SHOOTING : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -149,6 +155,12 @@ public: EfstActionMessage GetEfstEndMessage() override; }; +// OFFSET: 0x007879C0 +// FUNCTION: fn_08588 +int CSkillAction_IG_GUARDIAN_SHIELD::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00787A30 // FUNCTION: fn_08590 void CSkillAction_IG_GUARDIAN_SHIELD::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { @@ -267,6 +279,12 @@ EfstActionMessage CEfstAction_IG_HOLY_SHIELD::GetEfstEndMessage() { return {LookupMessage(MSI_AG_CLIMAX_ON), 0xFF}; } +// OFFSET: 0x00788B80 +// FUNCTION: fn_08603 +int CSkillAction_IG_JUDGEMENT_CROSS::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00788B90 // FUNCTION: fn_08604 void CSkillAction_IG_JUDGEMENT_CROSS::OnSkillCast(int level, CGameActor* source) { @@ -320,6 +338,12 @@ void CSkillAction_IG_JUDGEMENT_CROSS::OnSkillDamage(int level, CGameActor* sourc } } +// OFFSET: 0x007893F0 +// FUNCTION: fn_08608 +int CSkillAction_IG_OVERSLASH::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00789400 // FUNCTION: fn_08609 void CSkillAction_IG_OVERSLASH::OnSkillCast(int level, CGameActor* source) { @@ -444,6 +468,12 @@ void CEfstAction_IG_ULTIMATE_SACRIFICE::OnEfstUpdate(int efstId, int value, int this->OnEfstBegin(efstId, value, 0, 0, actor, false); } +// OFFSET: 0x0078A520 +// FUNCTION: fn_08621 +int CSkillAction_IG_IMPERIAL_CROSS::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078A530 // FUNCTION: fn_08622 void CSkillAction_IG_IMPERIAL_CROSS::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { @@ -462,6 +492,12 @@ void CSkillAction_IG_IMPERIAL_CROSS::OnSkillDamage(int level, CGameActor* source } } +// OFFSET: 0x0078A820 +// FUNCTION: fn_08624 +int CSkillAction_IG_RADIANT_SPEAR::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078A830 // FUNCTION: fn_08625 void CSkillAction_IG_RADIANT_SPEAR::OnSkillCast(int level, CGameActor* source) { @@ -541,6 +577,12 @@ void CSkillAction_IG_IMPERIAL_PRESSURE::OnSkillDamage(int level, CGameActor* sou } } +// OFFSET: 0x0078B390 +// FUNCTION: fn_08631 +int CSkillAction_IG_SHIELD_SHOOTING::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078B3A0 // FUNCTION: fn_08632 void CSkillAction_IG_SHIELD_SHOOTING::OnSkillCast(int level, CGameActor* source) { @@ -703,6 +745,7 @@ void CEfstAction_IG_GUARD_STANCE::OnEfstBegin(int efstId, int value, int argumen class CSkillAction_IG_CROSS_RAIN : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; int GetSkillScopeType() override; }; @@ -714,6 +757,7 @@ public: class CSkillAction_IG_GRAND_JUDGEMENT : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; @@ -725,6 +769,18 @@ public: void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; +// OFFSET: 0x00786F20 +// FUNCTION: fn_08582 +int CSkillAction_IG_GRAND_JUDGEMENT::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00786A90 +// FUNCTION: fn_08578 +int CSkillAction_IG_CROSS_RAIN::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00786AA0 // FUNCTION: fn_08579 void CSkillAction_IG_CROSS_RAIN::OnSkillCast(int level, CGameActor* source) { @@ -877,3 +933,55 @@ EfstActionMessage CEfstAction_IG_GUARD_STANCE::GetEfstBeginMessage() { EfstActionMessage CEfstAction_IG_GUARD_STANCE::GetEfstEndMessage() { return {LookupMessage(MSI_IG_REBOUND_SHIELD_ON), 0xFF}; } + +// GLOBAL: gl_25794 +static EfstActionRegistrar s_efstAction1203(1203, NewAction); +// GLOBAL: gl_25795 +static EfstActionRegistrar s_efstAction1222(1222, NewAction); +// GLOBAL: gl_25796 +static EfstActionRegistrar s_efstAction1204(1204, NewAction); +// GLOBAL: gl_25797 +static EfstActionRegistrar s_efstAction1202(1202, NewAction); +// GLOBAL: gl_25798 +static EfstActionRegistrar s_efstAction1220(1220, NewAction); +// GLOBAL: gl_25799 +static EfstActionRegistrar s_efstAction1221(1221, NewAction); +// GLOBAL: gl_25800 +static EfstActionRegistrar s_efstAction1217(1217, NewAction); + +// OFFSET: 0x0045A7E0 +// FUNCTION: fn_45565 +static bool s_skillObjectActionRegistered275 = [] { + std::function factory = NewAction; + CSkillActionMgr::GetInstance()->RegisterSkillObjectAction(275, factory); + return true; +}(); + +// GLOBAL: gl_25801 +static SkillActionRegistrar s_skillAction5260(5260, NewAction); +// GLOBAL: gl_25802 +static SkillActionRegistrar s_skillAction5267(5267, NewAction); +// GLOBAL: gl_25803 +static SkillActionRegistrar s_skillAction5263(5263, NewAction); +// GLOBAL: gl_25804 +static SkillActionRegistrar s_skillAction5256(5256, NewAction); +// GLOBAL: gl_25805 +static SkillActionRegistrar s_skillAction5255(5255, NewAction); +// GLOBAL: gl_25806 +static SkillActionRegistrar s_skillAction5262(5262, NewAction); +// GLOBAL: gl_25807 +static SkillActionRegistrar s_skillAction6504(6504, NewAction); +// GLOBAL: gl_25808 +static SkillActionRegistrar s_skillAction6505(6505, NewAction); +// GLOBAL: gl_25809 +static SkillActionRegistrar s_skillAction5264(5264, NewAction); +// GLOBAL: gl_25810 +static SkillActionRegistrar s_skillAction5266(5266, NewAction); +// GLOBAL: gl_25811 +static SkillActionRegistrar s_skillAction6503(6503, NewAction); +// GLOBAL: gl_25812 +static SkillActionRegistrar s_skillAction5257(5257, NewAction); +// GLOBAL: gl_25813 +static SkillActionRegistrar s_skillAction5265(5265, NewAction); +// GLOBAL: gl_25814 +static SkillActionRegistrar s_skillAction5261(5261, NewAction); diff --git a/Source/Contents/Skills/SkillActionKarnos.cpp b/Source/Contents/Skills/SkillActionKarnos.cpp index b1e81684a..421d17cb8 100644 --- a/Source/Contents/Skills/SkillActionKarnos.cpp +++ b/Source/Contents/Skills/SkillActionKarnos.cpp @@ -30,33 +30,68 @@ class CSkillAction_AnimalForm : public CSkillAction { public: bool CanUse(CGameActor* actor); + virtual bool IsInForm(CGameActor* actor) = 0; + virtual void PlayFormAttackEffect(CGameActor* actor) = 0; }; class CSkillAction_Direction { +public: + int GetDirection(float angle); + bool IsValidDirection(unsigned int direction); }; class CSkillAction_DamageWereRaptorForm : public CSkillAction_AnimalForm, public CSkillAction_Direction { public: - void SpawnAttack01Effect(int level, CGameActor* source); - void SpawnAttack02Effect(int level, CGameActor* source); + void SpawnAttack00Effect(int sourceActor, CGameActor* target); + __declspec(noinline) void SpawnAttack01Effect(int level, CGameActor* source); + __declspec(noinline) void SpawnAttack02Effect(int level, CGameActor* source); + void SpawnDirectionalEffect(CGameActor* source, CGameActor* target, std::string_view name); + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; + bool IsInForm(CGameActor* actor) override; + void PlayFormAttackEffect(CGameActor* actor) override; }; class CSkillAction_DamageWereWolfForm : public CSkillAction_AnimalForm { +public: + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; + bool IsInForm(CGameActor* actor) override; + void PlayFormAttackEffect(CGameActor* actor) override; }; class CSkillAction_Earthing : public CSkillAction { -}; - -class CSkillAction_Thundering : public CSkillAction { -}; - -class CSkillAction_ThunderingBasic : public CSkillAction_Thundering { -}; - -class CSkillAction_ThunderingExpand : public CSkillAction_Thundering { +public: + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_Icing : public CSkillAction { +public: + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; + void SpawnIcing(CGameActor* target); +}; + +class CSkillAction_Thundering : public CSkillAction { +public: + int GetSkillCastMotion() override; + int GetSkillAttackMotion() override; + void OnSkillCast(int level, CGameActor* source) override; + void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; + virtual void PlayThunderEffect(CGameActor* source) = 0; +}; + +class CSkillAction_ThunderingBasic : public CSkillAction_Thundering { +public: + void PlayThunderEffect(CGameActor* source) override; +}; + +class CSkillAction_ThunderingExpand : public CSkillAction_Thundering { +public: + void PlayThunderEffect(CGameActor* source) override; }; class CSkillAction_KR_DOUBLE_SLASH : public CSkillAction_DamageWereWolfForm { @@ -1168,3 +1203,61 @@ void CSkillAction_SKID_KR_CHOP_CHOP::OnSkillEffect(int level, CGameActor* source static_cast(effect)->SetDuration(500); } } + +// GLOBAL: gl_25660 +static EfstActionRegistrar s_efstAction1721(1721, NewAction); +// GLOBAL: gl_25661 +static EfstActionRegistrar s_efstAction1692(1692, NewAction); +// GLOBAL: gl_25662 +static EfstActionRegistrar s_efstAction1693(1693, NewAction); + +// OFFSET: 0x0040E870 +// FUNCTION: fn_45561 +static bool s_skillObjectActionRegistered313 = [] { + std::function factory = NewAction; + CSkillActionMgr::GetInstance()->RegisterSkillObjectAction(313, factory); + return true; +}(); + +// GLOBAL: gl_25663 +static SkillActionRegistrar s_skillAction6551(6551, NewAction); +// GLOBAL: gl_25664 +static SkillActionRegistrar s_skillAction6550(6550, NewAction); +// GLOBAL: gl_25665 +static SkillActionRegistrar s_skillAction6569(6569, NewAction); +// GLOBAL: gl_25666 +static SkillActionRegistrar s_skillAction6570(6570, NewAction); +// GLOBAL: gl_25667 +static SkillActionRegistrar s_skillAction6558(6558, NewAction); +// GLOBAL: gl_25668 +static SkillActionRegistrar s_skillAction6574(6574, NewAction); +// GLOBAL: gl_25669 +static SkillActionRegistrar s_skillAction6561(6561, NewAction); +// GLOBAL: gl_25670 +static SkillActionRegistrar s_skillAction6562(6562, NewAction); +// GLOBAL: gl_25671 +static SkillActionRegistrar s_skillAction6553(6553, NewAction); +// GLOBAL: gl_25672 +static SkillActionRegistrar s_skillAction6549(6549, NewAction); +// GLOBAL: gl_25673 +static SkillActionRegistrar s_skillAction6555(6555, NewAction); +// GLOBAL: gl_25674 +static SkillActionRegistrar s_skillAction6556(6556, NewAction); +// GLOBAL: gl_25675 +static SkillActionRegistrar s_skillAction6567(6567, NewAction); +// GLOBAL: gl_25676 +static SkillActionRegistrar s_skillAction6568(6568, NewAction); +// GLOBAL: gl_25677 +static SkillActionRegistrar s_skillAction6563(6563, NewAction); +// GLOBAL: gl_25678 +static SkillActionRegistrar s_skillAction6564(6564, NewAction); +// GLOBAL: gl_25679 +static SkillActionRegistrar s_skillAction6565(6565, NewAction); +// GLOBAL: gl_25680 +static SkillActionRegistrar s_skillAction6566(6566, NewAction); +// GLOBAL: gl_25681 +static SkillActionRegistrar s_skillAction6557(6557, NewAction); +// GLOBAL: gl_25682 +static SkillActionRegistrar s_skillAction6559(6559, NewAction); +// GLOBAL: gl_25683 +static SkillActionRegistrar s_skillAction6552(6552, NewAction); diff --git a/Source/Contents/Skills/SkillActionMeister.cpp b/Source/Contents/Skills/SkillActionMeister.cpp index 743318fc6..429bf5667 100644 --- a/Source/Contents/Skills/SkillActionMeister.cpp +++ b/Source/Contents/Skills/SkillActionMeister.cpp @@ -16,12 +16,14 @@ class CSkillAction_MT_SPARK_BLASTER : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_MT_TRIPLE_LASER : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; @@ -29,12 +31,14 @@ public: class CSkillAction_MT_MIGHTY_SMASH : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; bool KeepSkillAttackSpeed() override; }; class CSkillAction_MT_ENERGY_CANNONADE : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; @@ -43,12 +47,14 @@ public: class CSkillAction_MT_RUSH_STRIKE : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_MT_POWERFUL_SWING : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; @@ -60,6 +66,12 @@ public: void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; +// OFFSET: 0x0078CC40 +// FUNCTION: fn_08651 +int CSkillAction_MT_SPARK_BLASTER::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078CC50 // FUNCTION: fn_08652 void CSkillAction_MT_SPARK_BLASTER::OnSkillCast(int level, CGameActor* source) { @@ -79,6 +91,12 @@ void CSkillAction_MT_SPARK_BLASTER::OnSkillEffect(int level, CGameActor* source, } } +// OFFSET: 0x0078CEF0 +// FUNCTION: fn_08654 +int CSkillAction_MT_TRIPLE_LASER::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078CF00 // FUNCTION: fn_08655 void CSkillAction_MT_TRIPLE_LASER::OnSkillCast(int level, CGameActor* source) { @@ -101,6 +119,12 @@ void CSkillAction_MT_TRIPLE_LASER::OnSkillHit(int level, CGameActor* source, CGa } } +// OFFSET: 0x0078D0A0 +// FUNCTION: fn_08658 +int CSkillAction_MT_MIGHTY_SMASH::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078D0B0 // FUNCTION: fn_08659 void CSkillAction_MT_MIGHTY_SMASH::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { @@ -116,6 +140,12 @@ bool CSkillAction_MT_MIGHTY_SMASH::KeepSkillAttackSpeed() { return true; } +// OFFSET: 0x0078D220 +// FUNCTION: fn_08661 +int CSkillAction_MT_ENERGY_CANNONADE::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078D230 // FUNCTION: fn_08662 void CSkillAction_MT_ENERGY_CANNONADE::OnSkillCast(int level, CGameActor* source) { @@ -168,6 +198,12 @@ void CSkillAction_MT_ENERGY_CANNONADE::OnSkillDamage(int level, CGameActor* sour } } +// OFFSET: 0x0078D990 +// FUNCTION: fn_08666 +int CSkillAction_MT_RUSH_STRIKE::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078D9A0 // FUNCTION: fn_08667 void CSkillAction_MT_RUSH_STRIKE::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { @@ -196,6 +232,12 @@ void CSkillAction_MT_RUSH_STRIKE::OnSkillDamage(int level, CGameActor* source, C } } +// OFFSET: 0x0078DE10 +// FUNCTION: fn_08669 +int CSkillAction_MT_POWERFUL_SWING::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078DE20 // FUNCTION: fn_08670 void CSkillAction_MT_POWERFUL_SWING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { @@ -249,3 +291,18 @@ void CEfstAction_GRADUAL_GRAVITY::OnEfstEnd(int efstId, int argument2, int argum void CEfstAction_GRADUAL_GRAVITY::OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) { this->OnEfstBegin(efstId, value, 0, 0, actor, false); } + +// GLOBAL: gl_25815 +static SkillActionRegistrar s_skillAction6508(6508, NewAction); +// GLOBAL: gl_25816 +static SkillActionRegistrar s_skillAction6004(6004, NewAction); +// GLOBAL: gl_25817 +static SkillActionRegistrar s_skillAction6507(6507, NewAction); +// GLOBAL: gl_25818 +static SkillActionRegistrar s_skillAction6506(6506, NewAction); +// GLOBAL: gl_25819 +static SkillActionRegistrar s_skillAction6002(6002, NewAction); +// GLOBAL: gl_25820 +static SkillActionRegistrar s_skillAction6003(6003, NewAction); +// GLOBAL: gl_25821 +static EfstActionRegistrar s_efstAction1014(1014, NewAction); diff --git a/Source/Contents/Skills/SkillActionNightWatch.cpp b/Source/Contents/Skills/SkillActionNightWatch.cpp index f8fe5c6cc..6d70855e2 100644 --- a/Source/Contents/Skills/SkillActionNightWatch.cpp +++ b/Source/Contents/Skills/SkillActionNightWatch.cpp @@ -21,6 +21,7 @@ class CSkillAction_NW_INTENSIVE_AIM : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; @@ -47,16 +48,19 @@ public: class CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_SHOTGUN : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_ONLY_ONE_BULLET : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnTargetSkillCast(int argument1, int argument2, int argument3) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -64,24 +68,29 @@ public: class CSkillAction_NW_SPIRAL_SHOOTING : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_MAGAZINE_FOR_ONE : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_WILD_FIRE : public CSkillAction { public: + int GetSkillScopeType() override; + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; }; class CSkillAction_NW_BASIC_GRENADE : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; int GetSkillScopeType() override; @@ -89,6 +98,8 @@ public: class CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE : public CSkillAction { public: + int GetSkillScopeType() override; + int GetSkillAttackMotion() override; bool KeepSkillAttackMotion(int argument) override; void OnSkillCast(int level, CGameActor* source) override; void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; @@ -96,6 +107,7 @@ public: class CSkillAction_NW_GRENADES_DROPPING : public CSkillAction { public: + int GetSkillAttackMotion() override; bool KeepSkillAttackMotion(int argument) override; void OnSkillCast(int level, CGameActor* source) override; int GetSkillScopeType() override; @@ -108,12 +120,14 @@ public: class CSkillAction_NW_AUTO_FIRING_LAUNCHER : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_NW_HIDDEN_CARD : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; @@ -127,6 +141,7 @@ public: class CSkillAction_NW_MISSION_BOMBARD : public CSkillAction { public: + int GetSkillAttackMotion() override; bool KeepSkillAttackMotion(int argument) override; void OnSkillCast(int level, CGameActor* source) override; int GetSkillScopeType() override; @@ -139,6 +154,7 @@ public: class CSkillAction_NW_WILD_SHOT : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -146,6 +162,7 @@ public: class CSkillAction_NW_MIDNIGHT_FALLEN : public CSkillAction { public: + int GetSkillAttackMotion() override; bool KeepSkillAttackMotion(int argument) override; void OnSkillCast(int level, CGameActor* source) override; void OnGroundSkillEffect(vector3d position, int argument2, int argument3) override; @@ -153,6 +170,12 @@ public: int GetSkillScopeType() override; }; +// OFFSET: 0x0078E460 +// FUNCTION: fn_08675 +int CSkillAction_NW_INTENSIVE_AIM::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078E470 // FUNCTION: fn_08676 void CSkillAction_NW_INTENSIVE_AIM::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { @@ -248,6 +271,12 @@ void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT::OnSkillCast(int level, CGameActor* } } +// OFFSET: 0x0078F100 +// FUNCTION: fn_08682 +int CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078F110 // FUNCTION: fn_08683 void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { @@ -276,6 +305,12 @@ void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_GATLING::OnSkillEffect(int level } } +// OFFSET: 0x0078F530 +// FUNCTION: fn_08684 +int CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_SHOTGUN::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078F540 // FUNCTION: fn_08685 void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_SHOTGUN::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { @@ -304,6 +339,12 @@ void CSkillAction_NW_THE_VIGILANTE_AT_NIGHT_GUN_SHOTGUN::OnSkillEffect(int level } } +// OFFSET: 0x0078F950 +// FUNCTION: fn_08686 +int CSkillAction_NW_ONLY_ONE_BULLET::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078F960 // FUNCTION: fn_08687 void CSkillAction_NW_ONLY_ONE_BULLET::OnSkillCast(int level, CGameActor* source) { @@ -337,6 +378,12 @@ void CSkillAction_NW_ONLY_ONE_BULLET::OnSkillDamage(int level, CGameActor* sourc } } +// OFFSET: 0x0078FCD0 +// FUNCTION: fn_08690 +int CSkillAction_NW_SPIRAL_SHOOTING::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078FCE0 // FUNCTION: fn_08691 void CSkillAction_NW_SPIRAL_SHOOTING::OnSkillCast(int level, CGameActor* source) { @@ -354,6 +401,12 @@ void CSkillAction_NW_SPIRAL_SHOOTING::OnSkillEffect(int level, CGameActor* sourc } } +// OFFSET: 0x0078FE80 +// FUNCTION: fn_08693 +int CSkillAction_NW_MAGAZINE_FOR_ONE::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0078FE90 // FUNCTION: fn_08694 void CSkillAction_NW_MAGAZINE_FOR_ONE::OnSkillCast(int level, CGameActor* source) { @@ -371,6 +424,12 @@ void CSkillAction_NW_MAGAZINE_FOR_ONE::OnSkillEffect(int level, CGameActor* sour } } +// OFFSET: 0x00790030 +// FUNCTION: fn_08696 +int CSkillAction_NW_WILD_FIRE::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00790040 // FUNCTION: fn_08697 void CSkillAction_NW_WILD_FIRE::OnSkillCast(int level, CGameActor* source) { @@ -388,6 +447,18 @@ void CSkillAction_NW_WILD_FIRE::OnGroundSkillEffect(vector3d position, int argum effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("wild_fire_bottom"), position.x, position.y, position.z, 0, -1, 0, 0); } +// OFFSET: 0x00790280 +// FUNCTION: fn_08699 +int CSkillAction_NW_WILD_FIRE::GetSkillScopeType() { + return 5; +} + +// OFFSET: 0x00790290 +// FUNCTION: fn_08700 +int CSkillAction_NW_BASIC_GRENADE::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x007902A0 // FUNCTION: fn_08701 void CSkillAction_NW_BASIC_GRENADE::OnSkillCast(int level, CGameActor* source) { @@ -411,6 +482,12 @@ int CSkillAction_NW_BASIC_GRENADE::GetSkillScopeType() { return 3; } +// OFFSET: 0x00790500 +// FUNCTION: fn_08704 +int CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00790510 // FUNCTION: fn_08705 bool CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE::KeepSkillAttackMotion(int argument) { @@ -445,6 +522,18 @@ void CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE::OnGroundSkillEffect(vector3d positi } } +// OFFSET: 0x007908C0 +// FUNCTION: fn_08708 +int CSkillAction_NW_HASTY_FIRE_IN_THE_HOLE::GetSkillScopeType() { + return 5; +} + +// OFFSET: 0x007908D0 +// FUNCTION: fn_08709 +int CSkillAction_NW_GRENADES_DROPPING::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x007908E0 // FUNCTION: fn_08710 bool CSkillAction_NW_GRENADES_DROPPING::KeepSkillAttackMotion(int argument) { @@ -473,6 +562,12 @@ void CSkillObjectAction_NW_GRENADES_DROPPING::OnSkillObjectCreate(int argument, } } +// OFFSET: 0x00790980 +// FUNCTION: fn_08714 +int CSkillAction_NW_AUTO_FIRING_LAUNCHER::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00790990 // FUNCTION: fn_08715 void CSkillAction_NW_AUTO_FIRING_LAUNCHER::OnSkillCast(int level, CGameActor* source) { @@ -492,6 +587,12 @@ void CSkillAction_NW_AUTO_FIRING_LAUNCHER::OnSkillEffect(int level, CGameActor* } } +// OFFSET: 0x00790C50 +// FUNCTION: fn_08717 +int CSkillAction_NW_HIDDEN_CARD::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00790C60 // FUNCTION: fn_08718 void CSkillAction_NW_HIDDEN_CARD::OnSkillCast(int level, CGameActor* source) { @@ -533,6 +634,12 @@ void CEfstAction_HIDDEN_CARD::OnEfstUpdate(int efstId, int value, int argument3, this->OnEfstBegin(efstId, value, 0, 0, actor, false); } +// OFFSET: 0x007910C0 +// FUNCTION: fn_08723 +int CSkillAction_NW_MISSION_BOMBARD::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x007910D0 // FUNCTION: fn_08724 bool CSkillAction_NW_MISSION_BOMBARD::KeepSkillAttackMotion(int argument) { @@ -567,6 +674,12 @@ void CSkillObjectAction_NW_MISSION_BOMBARD::OnSkillObjectCreate(int argument, CR } } +// OFFSET: 0x007914E0 +// FUNCTION: fn_08728 +int CSkillAction_NW_WILD_SHOT::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x007914F0 // FUNCTION: fn_08729 void CSkillAction_NW_WILD_SHOT::OnSkillCast(int level, CGameActor* source) { @@ -630,6 +743,12 @@ void CSkillAction_NW_WILD_SHOT::OnSkillDamage(int level, CGameActor* source, CGa } } +// OFFSET: 0x00791BA0 +// FUNCTION: fn_08732 +int CSkillAction_NW_MIDNIGHT_FALLEN::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00791BB0 // FUNCTION: fn_08733 bool CSkillAction_NW_MIDNIGHT_FALLEN::KeepSkillAttackMotion(int argument) { @@ -686,3 +805,48 @@ void CSkillAction_NW_MIDNIGHT_FALLEN::OnSkillDamage(int level, CGameActor* sourc int CSkillAction_NW_MIDNIGHT_FALLEN::GetSkillScopeType() { return 7; } + +// GLOBAL: gl_25822 +static EfstActionRegistrar s_efstAction1354(1354, NewAction); +// GLOBAL: gl_25823 +static EfstActionRegistrar s_efstAction1345(1345, NewAction); +// GLOBAL: gl_25824 +static EfstActionRegistrar s_efstAction1346(1346, NewAction); +// GLOBAL: gl_25825 +static CSkillObjectActionRegistration s_skillObjectAction288(288, NewAction); +// GLOBAL: gl_25826 +static CSkillObjectActionRegistration s_skillObjectAction291(291, NewAction); +// GLOBAL: gl_25827 +static SkillActionRegistrar s_skillAction5413(5413, NewAction); +// GLOBAL: gl_25828 +static SkillActionRegistrar s_skillAction5410(5410, NewAction); +// GLOBAL: gl_25829 +static SkillActionRegistrar s_skillAction5412(5412, NewAction); +// GLOBAL: gl_25830 +static SkillActionRegistrar s_skillAction5404(5404, NewAction); +// GLOBAL: gl_25831 +static SkillActionRegistrar s_skillAction5411(5411, NewAction); +// GLOBAL: gl_25832 +static SkillActionRegistrar s_skillAction5414(5414, NewAction); +// GLOBAL: gl_25833 +static SkillActionRegistrar s_skillAction5403(5403, NewAction); +// GLOBAL: gl_25834 +static SkillActionRegistrar s_skillAction5408(5408, NewAction); +// GLOBAL: gl_25835 +static SkillActionRegistrar s_skillAction5501(5501, NewAction); +// GLOBAL: gl_25836 +static SkillActionRegistrar s_skillAction5415(5415, NewAction); +// GLOBAL: gl_25837 +static SkillActionRegistrar s_skillAction5406(5406, NewAction); +// GLOBAL: gl_25838 +static SkillActionRegistrar s_skillAction5407(5407, NewAction); +// GLOBAL: gl_25839 +static SkillActionRegistrar s_skillAction5405(5405, NewAction); +// GLOBAL: gl_25840 +static SkillActionRegistrar s_skillAction5496(5496, NewAction); +// GLOBAL: gl_25841 +static SkillActionRegistrar s_skillAction5497(5497, NewAction); +// GLOBAL: gl_25842 +static SkillActionRegistrar s_skillAction5409(5409, NewAction); +// GLOBAL: gl_25843 +static SkillActionRegistrar s_skillAction5500(5500, NewAction); diff --git a/Source/Contents/Skills/SkillActionRegistrar.cpp b/Source/Contents/Skills/SkillActionRegistrar.cpp index 1224bced9..38b6217d4 100644 --- a/Source/Contents/Skills/SkillActionRegistrar.cpp +++ b/Source/Contents/Skills/SkillActionRegistrar.cpp @@ -2,14 +2,6 @@ #include -struct EfstActionRegistrar { - EfstActionRegistrar(int efstId, std::function factory); -}; - -struct SkillActionRegistrar { - SkillActionRegistrar(int skillId, std::function factory); -}; - // OFFSET: 0x005AFB60 // FUNCTION: fn_03336 EfstActionRegistrar::EfstActionRegistrar(int efstId, std::function factory) { diff --git a/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp b/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp index cb5539e7a..1cb0cd3ed 100644 --- a/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp +++ b/Source/Contents/Skills/SkillActionShinkiroShiranui.cpp @@ -444,12 +444,14 @@ public: class CSkillAction_SS_KAGENOMAI : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SS_KAGEGISSEN : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; @@ -505,6 +507,18 @@ public: void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; +// OFFSET: 0x00793A40 +// FUNCTION: fn_08757 +int CSkillAction_SS_KAGENOMAI::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00793BE0 +// FUNCTION: fn_08760 +int CSkillAction_SS_KAGEGISSEN::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00792500 // FUNCTION: fn_08738 void CEfstAction_NIGHTMARE::OnEfstBegin(int efstId, int value, int argument3, int argument4, CRenderObject* actor, bool argument6) { @@ -904,3 +918,56 @@ void CSkillAction_SS_REIKETSUHOU::OnSkillCast(int level, CGameActor* source) { static_cast(source)->LaunchEffect(54, level / 16); } } + +// GLOBAL: gl_25844 +static EfstActionRegistrar s_efstAction1395(1395, NewAction); +// GLOBAL: gl_25845 +static EfstActionRegistrar s_efstAction1393(1393, NewAction); +// GLOBAL: gl_25846 +static CSkillObjectActionRegistration s_skillObjectAction290(290, NewAction); +// GLOBAL: gl_25847 +static CSkillObjectActionRegistration s_skillObjectAction298(298, NewAction); +// GLOBAL: gl_25848 +static CSkillObjectActionRegistration s_skillObjectAction294(294, NewAction); +// GLOBAL: gl_25849 +static SkillActionRegistrar s_skillAction5478(5478, NewAction); +// GLOBAL: gl_25850 +static SkillActionRegistrar s_skillAction5495(5495, NewAction); +// GLOBAL: gl_25851 +static SkillActionRegistrar s_skillAction5492(5492, NewAction); +// GLOBAL: gl_25852 +static SkillActionRegistrar s_skillAction5499(5499, NewAction); +// GLOBAL: gl_25853 +static SkillActionRegistrar s_skillAction5484(5484, NewAction); +// GLOBAL: gl_25854 +static SkillActionRegistrar s_skillAction5483(5483, NewAction); +// GLOBAL: gl_25855 +static SkillActionRegistrar s_skillAction5498(5498, NewAction); +// GLOBAL: gl_25856 +static SkillActionRegistrar s_skillAction5494(5494, NewAction); +// GLOBAL: gl_25857 +static SkillActionRegistrar s_skillAction5493(5493, NewAction); +// GLOBAL: gl_25858 +static SkillActionRegistrar s_skillAction5480(5480, NewAction); +// GLOBAL: gl_25859 +static SkillActionRegistrar s_skillAction5482(5482, NewAction); +// GLOBAL: gl_25860 +static SkillActionRegistrar s_skillAction5481(5481, NewAction); +// GLOBAL: gl_25861 +static SkillActionRegistrar s_skillAction5491(5491, NewAction); +// GLOBAL: gl_25862 +static SkillActionRegistrar s_skillAction5486(5486, NewAction); +// GLOBAL: gl_25863 +static SkillActionRegistrar s_skillAction5487(5487, NewAction); +// GLOBAL: gl_25864 +static SkillActionRegistrar s_skillAction5485(5485, NewAction); +// GLOBAL: gl_25865 +static SkillActionRegistrar s_skillAction5490(5490, NewAction); +// GLOBAL: gl_25866 +static SkillActionRegistrar s_skillAction5489(5489, NewAction); +// GLOBAL: gl_25867 +static SkillActionRegistrar s_skillAction5488(5488, NewAction); +// GLOBAL: gl_25868 +static SkillActionRegistrar s_skillAction5479(5479, NewAction); +// GLOBAL: gl_25869 +static SkillActionRegistrar s_skillAction5476(5476, NewAction); diff --git a/Source/Contents/Skills/SkillActionSkyEmperor.cpp b/Source/Contents/Skills/SkillActionSkyEmperor.cpp index efa477404..a18a7da42 100644 --- a/Source/Contents/Skills/SkillActionSkyEmperor.cpp +++ b/Source/Contents/Skills/SkillActionSkyEmperor.cpp @@ -35,12 +35,14 @@ public: class CSkillAction_SKE_SKY_SUN : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SKE_SKY_MOON : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -230,6 +232,12 @@ void CEfstAction_SKY_ENCHANT::OnEfstUpdate(int efstId, int value, int argument3, } } +// OFFSET: 0x00797D30 +// FUNCTION: fn_08823 +int CSkillAction_SKE_SKY_SUN::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00797D40 // FUNCTION: fn_08824 void CSkillAction_SKE_SKY_SUN::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { @@ -265,6 +273,12 @@ void CSkillAction_SKE_SKY_SUN::OnSkillDamage(int level, CGameActor* source, CGam } } +// OFFSET: 0x00798230 +// FUNCTION: fn_08826 +int CSkillAction_SKE_SKY_MOON::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00798240 // FUNCTION: fn_08827 void CSkillAction_SKE_SKY_MOON::OnSkillCast(int level, CGameActor* source) { @@ -695,3 +709,52 @@ void CSkillAction_SKE_STAR_CANNON::OnSkillCast(int level, CGameActor* source) { static_cast(source)->LaunchEffect(441, level / 16); } } + +// GLOBAL: gl_25870 +static EfstActionRegistrar s_efstAction1390(1390, NewAction); +// GLOBAL: gl_25871 +static EfstActionRegistrar s_efstAction1389(1389, NewAction); +// GLOBAL: gl_25872 +static EfstActionRegistrar s_efstAction1386(1386, NewAction); +// GLOBAL: gl_25873 +static EfstActionRegistrar s_efstAction1388(1388, NewAction); +// GLOBAL: gl_25874 +static EfstActionRegistrar s_efstAction1385(1385, NewAction); +// GLOBAL: gl_25875 +static EfstActionRegistrar s_efstAction1392(1392, NewAction); +// GLOBAL: gl_25876 +static EfstActionRegistrar s_efstAction1391(1391, NewAction); +// GLOBAL: gl_25877 +static EfstActionRegistrar s_efstAction1387(1387, NewAction); +// GLOBAL: gl_25878 +static CSkillObjectActionRegistration s_skillObjectAction287(287, NewAction); +// GLOBAL: gl_25879 +static CSkillObjectActionRegistration s_skillObjectAction286(286, NewAction); +// GLOBAL: gl_25880 +static SkillActionRegistrar s_skillAction5474(5474, NewAction); +// GLOBAL: gl_25881 +static SkillActionRegistrar s_skillAction5470(5470, NewAction); +// GLOBAL: gl_25882 +static SkillActionRegistrar s_skillAction5475(5475, NewAction); +// GLOBAL: gl_25883 +static SkillActionRegistrar s_skillAction5469(5469, NewAction); +// GLOBAL: gl_25884 +static SkillActionRegistrar s_skillAction5466(5466, NewAction); +// GLOBAL: gl_25885 +static SkillActionRegistrar s_skillAction5468(5468, NewAction); +// GLOBAL: gl_25886 +static SkillActionRegistrar s_skillAction5465(5465, NewAction); +// GLOBAL: gl_25887 +static SkillActionRegistrar s_skillAction5503(5503, NewAction); +// GLOBAL: gl_25888 +static SkillActionRegistrar s_skillAction5502(5502, NewAction); +// GLOBAL: gl_25889 +static SkillActionRegistrar s_skillAction5472(5472, NewAction); +// GLOBAL: gl_25890 +static SkillActionRegistrar s_skillAction5473(5473, NewAction); +// GLOBAL: gl_25891 +static SkillActionRegistrar s_skillAction5504(5504, NewAction); +// GLOBAL: gl_25892 +static SkillActionRegistrar s_skillAction5467(5467, NewAction); +// GLOBAL: gl_25893 +static SkillActionRegistrar s_skillAction5471(5471, NewAction); diff --git a/Source/Contents/Skills/SkillActionSoulAscetic.cpp b/Source/Contents/Skills/SkillActionSoulAscetic.cpp index 9438a4796..3436c5ded 100644 --- a/Source/Contents/Skills/SkillActionSoulAscetic.cpp +++ b/Source/Contents/Skills/SkillActionSoulAscetic.cpp @@ -637,3 +637,55 @@ void CSkillObjectAction_SOA_TOTEM_OF_TUTELARY::OnSkillObjectRemove(CRenderObject effects->Spawn(0, CEZ2STREffectMgr::GetInstance()->EffectId("totem_of_tutelary_end"), object->render.position, 0, -1, 0, 0); } } + +// GLOBAL: gl_25894 +static EfstActionRegistrar s_efstAction1365(1365, NewAction); +// GLOBAL: gl_25895 +static EfstActionRegistrar s_efstAction1360(1360, NewAction); +// GLOBAL: gl_25896 +static EfstActionRegistrar s_efstAction1364(1364, NewAction); +// GLOBAL: gl_25897 +static EfstActionRegistrar s_efstAction1363(1363, NewAction); +// GLOBAL: gl_25898 +static EfstActionRegistrar s_efstAction1361(1361, NewAction); +// GLOBAL: gl_25899 +static EfstActionRegistrar s_efstAction1362(1362, NewAction); + +// OFFSET: 0x00460720 +// FUNCTION: fn_45566 +static bool s_skillObjectActionRegistered292 = [] { + std::function factory = NewAction; + CSkillActionMgr::GetInstance()->RegisterSkillObjectAction(292, factory); + return true; +}(); + +// GLOBAL: gl_25900 +static SkillActionRegistrar s_skillAction5431(5431, NewAction); +// GLOBAL: gl_25901 +static SkillActionRegistrar s_skillAction5425(5425, NewAction); +// GLOBAL: gl_25902 +static SkillActionRegistrar s_skillAction5421(5421, NewAction); +// GLOBAL: gl_25903 +static SkillActionRegistrar s_skillAction5432(5432, NewAction); +// GLOBAL: gl_25904 +static SkillActionRegistrar s_skillAction5429(5429, NewAction); +// GLOBAL: gl_25905 +static SkillActionRegistrar s_skillAction5426(5426, NewAction); +// GLOBAL: gl_25906 +static SkillActionRegistrar s_skillAction5423(5423, NewAction); +// GLOBAL: gl_25907 +static SkillActionRegistrar s_skillAction5430(5430, NewAction); +// GLOBAL: gl_25908 +static SkillActionRegistrar s_skillAction5420(5420, NewAction); +// GLOBAL: gl_25909 +static SkillActionRegistrar s_skillAction5418(5418, NewAction); +// GLOBAL: gl_25910 +static SkillActionRegistrar s_skillAction5428(5428, NewAction); +// GLOBAL: gl_25911 +static SkillActionRegistrar s_skillAction5424(5424, NewAction); +// GLOBAL: gl_25912 +static SkillActionRegistrar s_skillAction5419(5419, NewAction); +// GLOBAL: gl_25913 +static SkillActionRegistrar s_skillAction5427(5427, NewAction); +// GLOBAL: gl_25914 +static SkillActionRegistrar s_skillAction5422(5422, NewAction); diff --git a/Source/Contents/Skills/SkillActionSpiritHandler.cpp b/Source/Contents/Skills/SkillActionSpiritHandler.cpp index 26ad03ecf..6ef3c01f6 100644 --- a/Source/Contents/Skills/SkillActionSpiritHandler.cpp +++ b/Source/Contents/Skills/SkillActionSpiritHandler.cpp @@ -583,3 +583,49 @@ void CSkillAction_SH_HYUN_ROK_SPIRIT_POWER::OnSkillDamage(int level, CGameActor* effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("hyun_rok_spirit_power_hit"), vector3d{0.0f, 0.0f, 0.0f}, 0, -1, 0, 0); } } + +// GLOBAL: gl_25915 +static EfstActionRegistrar s_efstAction1366(1366, NewAction); +// GLOBAL: gl_25916 +static EfstActionRegistrar s_efstAction1367(1367, NewAction); +// GLOBAL: gl_25917 +static EfstActionRegistrar s_efstAction1368(1368, NewAction); +// GLOBAL: gl_25918 +static EfstActionRegistrar s_efstAction1377(1377, NewAction); + +// OFFSET: 0x004616C0 +// FUNCTION: fn_45567 +static bool s_skillObjectActionRegistered293 = [] { + std::function factory = NewAction; + CSkillActionMgr::GetInstance()->RegisterSkillObjectAction(293, factory); + return true; +}(); + +// GLOBAL: gl_25919 +static SkillActionRegistrar s_skillAction5448(5448, NewAction); +// GLOBAL: gl_25920 +static SkillActionRegistrar s_skillAction5506(5506, NewAction); +// GLOBAL: gl_25921 +static SkillActionRegistrar s_skillAction5435(5435, NewAction); +// GLOBAL: gl_25922 +static SkillActionRegistrar s_skillAction5444(5444, NewAction); +// GLOBAL: gl_25923 +static SkillActionRegistrar s_skillAction5437(5437, NewAction); +// GLOBAL: gl_25924 +static SkillActionRegistrar s_skillAction5436(5436, NewAction); +// GLOBAL: gl_25925 +static SkillActionRegistrar s_skillAction5445(5445, NewAction); +// GLOBAL: gl_25926 +static SkillActionRegistrar s_skillAction5446(5446, NewAction); +// GLOBAL: gl_25927 +static SkillActionRegistrar s_skillAction5507(5507, NewAction); +// GLOBAL: gl_25928 +static SkillActionRegistrar s_skillAction5442(5442, NewAction); +// GLOBAL: gl_25929 +static SkillActionRegistrar s_skillAction5439(5439, NewAction); +// GLOBAL: gl_25930 +static SkillActionRegistrar s_skillAction5440(5440, NewAction); +// GLOBAL: gl_25931 +static SkillActionRegistrar s_skillAction5441(5441, NewAction); +// GLOBAL: gl_25932 +static SkillActionRegistrar s_skillAction5447(5447, NewAction); diff --git a/Source/Contents/Skills/SkillActionTroubadour.cpp b/Source/Contents/Skills/SkillActionTroubadour.cpp index de577b085..c4a388a37 100644 --- a/Source/Contents/Skills/SkillActionTroubadour.cpp +++ b/Source/Contents/Skills/SkillActionTroubadour.cpp @@ -98,6 +98,7 @@ public: class CSkillAction_TR_METALIC_FURY : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; @@ -120,8 +121,8 @@ class CSkillAction_TR_RHYTHMSHOOTING : public CSkillAction { public: int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; + void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; - void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_TR_ROKI_CAPRICCIO : public CSkillAction { @@ -426,6 +427,12 @@ void CSkillAction_TR_RHYTHMICAL_WAVE::OnSkillDamage(int level, CGameActor* sourc } } +// OFFSET: 0x007A4190 +// FUNCTION: fn_09005 +int CSkillAction_TR_METALIC_FURY::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x007A41A0 // FUNCTION: fn_09006 void CSkillAction_TR_METALIC_FURY::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { @@ -521,7 +528,7 @@ void CSkillAction_TR_RHYTHMSHOOTING::OnSkillCast(int level, CGameActor* source) // OFFSET: 0x007A4C20 // FUNCTION: fn_09016 -void CSkillAction_TR_RHYTHMSHOOTING::OnSkillHit(int level, CGameActor* source, CGameActor* target) { +void CSkillAction_TR_RHYTHMSHOOTING::OnSkillEffect(int level, CGameActor* source, CGameActor* target) { if (!source || !target) { return; } @@ -536,7 +543,7 @@ void CSkillAction_TR_RHYTHMSHOOTING::OnSkillHit(int level, CGameActor* source, C // OFFSET: 0x007A4E00 // FUNCTION: fn_09017 -void CSkillAction_TR_RHYTHMSHOOTING::OnSkillDamage(int, CGameActor* source, CGameActor*) { +void CSkillAction_TR_RHYTHMSHOOTING::OnSkillHit(int, CGameActor* source, CGameActor*) { if (source) { EffectLists* effects = g_effectMgr; effects->Spawn(source->render.accountId, CEZ2STREffectMgr::GetInstance()->EffectId("rhythmshooting_hit"), vector3d{0.0f, 0.0f, 0.0f}, 0, -1, 0, 0); @@ -606,3 +613,40 @@ void CSkillAction_TR_ROSEBLOSSOM::OnSkillEffect(int level, CGameActor* source, C } } } + +// GLOBAL: gl_25933 +static EfstActionRegistrar s_efstAction1260(1260, NewAction); +// GLOBAL: gl_25934 +static EfstActionRegistrar s_efstAction1259(1259, NewAction); +// GLOBAL: gl_25935 +static EfstActionRegistrar s_efstAction1262(1262, NewAction); +// GLOBAL: gl_25936 +static EfstActionRegistrar s_efstAction1257(1257, NewAction); +// GLOBAL: gl_25937 +static EfstActionRegistrar s_efstAction1256(1256, NewAction); +// GLOBAL: gl_25938 +static EfstActionRegistrar s_efstAction1263(1263, NewAction); +// GLOBAL: gl_25939 +static SkillActionRegistrar s_skillAction5360(5360, NewAction); +// GLOBAL: gl_25940 +static SkillActionRegistrar s_skillAction5358(5358, NewAction); +// GLOBAL: gl_25941 +static SkillActionRegistrar s_skillAction5362(5362, NewAction); +// GLOBAL: gl_25942 +static SkillActionRegistrar s_skillAction5352(5352, NewAction); +// GLOBAL: gl_25943 +static SkillActionRegistrar s_skillAction5356(5356, NewAction); +// GLOBAL: gl_25944 +static SkillActionRegistrar s_skillAction5351(5351, NewAction); +// GLOBAL: gl_25945 +static SkillActionRegistrar s_skillAction5364(5364, NewAction); +// GLOBAL: gl_25946 +static SkillActionRegistrar s_skillAction6521(6521, NewAction); +// GLOBAL: gl_25947 +static SkillActionRegistrar s_skillAction5355(5355, NewAction); +// GLOBAL: gl_25948 +static SkillActionRegistrar s_skillAction5359(5359, NewAction); +// GLOBAL: gl_25949 +static SkillActionRegistrar s_skillAction5353(5353, NewAction); +// GLOBAL: gl_25950 +static SkillActionRegistrar s_skillAction5354(5354, NewAction); diff --git a/Source/Contents/Skills/SkillActionWindHawk.cpp b/Source/Contents/Skills/SkillActionWindHawk.cpp index 26a79e8f9..35701e554 100644 --- a/Source/Contents/Skills/SkillActionWindHawk.cpp +++ b/Source/Contents/Skills/SkillActionWindHawk.cpp @@ -12,6 +12,7 @@ #include "Resource/MSGSTRINGID.h" class CSkillAction_WH_GALESTORM : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -34,6 +35,7 @@ public: class CSkillAction_WH_CRESCIVE_BOLT : public CSkillAction { public: + int GetSkillAttackMotion() override; int GetSkillCastMotion() override; bool SuppressSupportSkillArrow() override; bool SuppressAttackSkillArrow() override; @@ -49,6 +51,12 @@ public: void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; +// OFFSET: 0x007A5A70 +// FUNCTION: fn_09022 +int CSkillAction_WH_GALESTORM::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x007A5A80 // FUNCTION: fn_09023 void CSkillAction_WH_GALESTORM::OnSkillCast(int level, CGameActor* source) { @@ -141,6 +149,12 @@ int CSkillAction_WH_CRESCIVE_BOLT::GetSkillCastMotion() { return 18; } +// OFFSET: 0x007A63E0 +// FUNCTION: fn_09034 +int CSkillAction_WH_CRESCIVE_BOLT::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x007A63F0 // FUNCTION: fn_09035 bool CSkillAction_WH_CRESCIVE_BOLT::SuppressSupportSkillArrow() { @@ -225,3 +239,20 @@ void CSkillAction_WH_WILD_WALK::OnSkillDamage(int sourceActor, CGameActor* targe } } } + +// OFFSET: 0x00463230 +// FUNCTION: fn_45568 +static bool s_efstActionRegistered1252 = [] { + std::function factory = NewAction; + CSkillActionMgr::GetInstance()->RegisterEfstAction(1252, factory); + return true; +}(); + +// GLOBAL: gl_25951 +static SkillActionRegistrar s_skillAction5328(5328, NewAction); +// GLOBAL: gl_25952 +static SkillActionRegistrar s_skillAction5334(5334, NewAction); +// GLOBAL: gl_25953 +static SkillActionRegistrar s_skillAction5330(5330, NewAction); +// GLOBAL: gl_25954 +static SkillActionRegistrar s_skillAction6520(6520, NewAction); diff --git a/Source/Contents/Skills/SkillInfo.cpp b/Source/Contents/Skills/SkillInfo.cpp index 2897bb092..1d1bdb24a 100644 --- a/Source/Contents/Skills/SkillInfo.cpp +++ b/Source/Contents/Skills/SkillInfo.cpp @@ -42,6 +42,12 @@ public: void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; +class CEfstAction_ChangeSizeMonster : public CEfstAction_ChangeSize { +}; + +class CEfstAction_ChangeSizeNPC : public CEfstAction_ChangeSize { +}; + class CSkillAction_CD_DIVINUS_FLOS : public CSkillAction { public: void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -63,6 +69,15 @@ public: void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; +class CEfstAction_ShowEffect1 : public CEfstAction_ShowEffect { +}; + +class CEfstAction_ShowEffect2 : public CEfstAction_ShowEffect { +}; + +class CEfstAction_ShowEffect3 : public CEfstAction_ShowEffect { +}; + class CSkillAction_RA_UNLIMIT : public CSkillAction { public: void OnSkillCast(int level, CGameActor* source) override; @@ -91,6 +106,7 @@ public: class CSkillAction_SHC_SHADOW_STAB : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; @@ -112,6 +128,7 @@ public: class CSkillAction_ABC_CHASING_BREAK : public CSkillAction { public: + int GetSkillAttackMotion() override; bool SuppressAttackSkillArrow() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -119,6 +136,7 @@ public: class CSkillAction_ABC_CHASING_SHOT : public CSkillAction { public: + int GetSkillAttackMotion() override; bool SuppressAttackSkillArrow() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; @@ -146,24 +164,28 @@ public: class CSkillAction_SHC_IMPACT_CRATER : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SHC_CROSS_SLASH : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_SHC_DANCING_KNIFE : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_ABC_HIT_AND_SLIDING : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; @@ -183,6 +205,7 @@ public: class CSkillAction_IQ_BLAZING_FLAME_BLAST : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -190,12 +213,14 @@ public: class CSkillAction_BO_MAYHEMIC_THORNS : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_BO_EXPLOSIVE_POWDER : public CSkillAction { public: + int GetSkillAttackMotion() override; bool KeepSkillAttackSpeed() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; @@ -234,6 +259,7 @@ public: class CSkillAction_DK_SERVANTWEAPON_ATK : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; @@ -251,12 +277,18 @@ public: void OnEfstUpdate(int efstId, int value, int argument3, int argument4, CRenderObject* actor) override; }; +class CSkillAction_DK_SERVANT_W_SIGN : public CSkillAction { +public: + int GetSkillAttackMotion() override; + void OnTargetSkillCast(int argument1, int argument2, int argument3) override; +}; + class CSkillAction_DK_SERVANT_W_PHANTOM : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillHit(int caster, CGameActor* target, CGameActor* argument3) override; - void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DK_SERVANT_W_DEMOL : public CSkillAction { @@ -268,11 +300,13 @@ public: class CSkillAction_DK_STORMSLASH : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; class CSkillAction_DK_MADNESS_CRUSHER : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; bool IsSkillWithoutMotion() override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -280,6 +314,7 @@ public: class CSkillAction_DK_DRAGONIC_PIERCE : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -287,6 +322,7 @@ public: class CSkillAction_DK_DRAGONIC_BREATH : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillHit(int level, CGameActor* source, CGameActor* target) override; @@ -294,6 +330,7 @@ public: class CSkillAction_DK_CHARGINGPIERCE : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; @@ -311,6 +348,7 @@ public: class CSkillAction_DK_HACKANDSLASHER : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; }; @@ -397,6 +435,108 @@ bool CSkillInfo::IsValid() const { return this->available != 0 && this->level != 0; } +// OFFSET: 0x00776540 +// FUNCTION: fn_08348 +int CSkillAction_SHC_IMPACT_CRATER::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00776940 +// FUNCTION: fn_08351 +int CSkillAction_SHC_CROSS_SLASH::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00776C30 +// FUNCTION: fn_08354 +int CSkillAction_SHC_DANCING_KNIFE::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00777930 +// FUNCTION: fn_08360 +int CSkillAction_SHC_SHADOW_STAB::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00778130 +// FUNCTION: fn_08370 +int CSkillAction_ABC_CHASING_BREAK::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00778570 +// FUNCTION: fn_08374 +int CSkillAction_ABC_CHASING_SHOT::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00778DC0 +// FUNCTION: fn_08380 +int CSkillAction_ABC_HIT_AND_SLIDING::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00779E20 +// FUNCTION: fn_08391 +int CSkillAction_IQ_BLAZING_FLAME_BLAST::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x0077CCB0 +// FUNCTION: fn_08436 +int CSkillAction_BO_MAYHEMIC_THORNS::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x0077D010 +// FUNCTION: fn_08439 +int CSkillAction_BO_EXPLOSIVE_POWDER::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x0077E3A0 +// FUNCTION: fn_08455 +int CSkillAction_DK_SERVANTWEAPON_ATK::GetSkillAttackMotion() { + return -1; +} + +// OFFSET: 0x0077FB30 +// FUNCTION: fn_08472 +int CSkillAction_DK_STORMSLASH::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x0077FD40 +// FUNCTION: fn_08474 +int CSkillAction_DK_MADNESS_CRUSHER::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00780010 +// FUNCTION: fn_08478 +int CSkillAction_DK_DRAGONIC_PIERCE::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00780830 +// FUNCTION: fn_08482 +int CSkillAction_DK_DRAGONIC_BREATH::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00780DA0 +// FUNCTION: fn_08486 +int CSkillAction_DK_CHARGINGPIERCE::GetSkillAttackMotion() { + return 2; +} + +// OFFSET: 0x00781320 +// FUNCTION: fn_08492 +int CSkillAction_DK_HACKANDSLASHER::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x008AC440 // FUNCTION: fn_11732 bool CSkillInfo::MatchesShortcut(const NormalItemSlot* slot) const { @@ -1949,10 +2089,17 @@ EfstActionMessage CEfstAction_SERVANTWEAPON::GetEfstEndMessage() { return {LookupMessage(MSI_IG_ATTACK_STANCE_ON), 0xFF}; } +// OFFSET: 0x0077E810 +// FUNCTION: fn_08460 +int CSkillAction_DK_SERVANT_W_SIGN::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0077E820 // FUNCTION: fn_08461 -void CSkillAction_DK_SERVANT_W_PHANTOM::OnSkillDamage(int actor, CGameActor* targetActor, CGameActor*) { - CGameActor* source = reinterpret_cast(actor); +void CSkillAction_DK_SERVANT_W_SIGN::OnTargetSkillCast(int argument1, int argument2, int) { + CGameActor* source = reinterpret_cast(argument1); + CGameActor* targetActor = reinterpret_cast(argument2); if (source) { if (CServantWeaponNewEffect* effect = static_cast(g_effectMgr->Find(source->render.accountId, 0x99C))) { effect->Shoot(0x1453); @@ -1995,6 +2142,12 @@ void CEfstAction_SERVANT_SIGN::OnEfstUpdate(int efstId, int value, int argument3 this->OnEfstBegin(efstId, value, 0, 0, actor, false); } +// OFFSET: 0x0077EF60 +// FUNCTION: fn_08465 +int CSkillAction_DK_SERVANT_W_PHANTOM::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x0077EF70 // FUNCTION: fn_08466 void CSkillAction_DK_SERVANT_W_PHANTOM::OnSkillCast(int level, CGameActor* source) { @@ -2436,6 +2589,7 @@ public: class CSkillAction_NPC_AIMED_SHOWER : public CSkillAction { public: + int GetSkillAttackMotion() override; void OnSkillCast(int level, CGameActor* source) override; void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; void OnSkillDamage(int level, CGameActor* source, CGameActor* target) override; @@ -2578,6 +2732,12 @@ public: void OnSkillEffect(int level, CGameActor* source, CGameActor* target) override; }; +// OFFSET: 0x00782850 +// FUNCTION: fn_08515 +int CSkillAction_NPC_AIMED_SHOWER::GetSkillAttackMotion() { + return 2; +} + // OFFSET: 0x00781EA0 // FUNCTION: fn_08505 void CSkillAction_NPC_LIGHTNING_JUDGEMENT::OnSkillCast(int level, CGameActor* source) { @@ -3237,13 +3397,181 @@ void CSkillAction_HN_OVERCOMING_CRISIS::OnSkillEffect(int level, CGameActor* sou } -class CSkillObjectActionRegistration { -public: - CSkillObjectActionRegistration(int skillId, std::function factory); -}; - // OFFSET: 0x00786450 // FUNCTION: fn_08576 CSkillObjectActionRegistration::CSkillObjectActionRegistration(int skillId, std::function factory) { CSkillActionMgr::GetInstance()->RegisterSkillObjectAction(skillId, factory); } + +// GLOBAL: gl_25720 +static EfstActionRegistrar s_efstAction1421(1421, NewAction); +// GLOBAL: gl_25721 +static EfstActionRegistrar s_efstAction1420(1420, NewAction); +// GLOBAL: gl_25722 +static EfstActionRegistrar s_efstAction1559(1559, NewAction); +// GLOBAL: gl_25723 +static EfstActionRegistrar s_efstAction1422(1422, NewAction); +// GLOBAL: gl_25724 +static EfstActionRegistrar s_efstAction1423(1423, NewAction); +// GLOBAL: gl_25725 +static EfstActionRegistrar s_efstAction1424(1424, NewAction); + +// OFFSET: 0x00453F10 +// FUNCTION: fn_45562 +static bool s_efstActionRegistered722 = [] { + std::function factory = NewAction; + CSkillActionMgr::GetInstance()->RegisterEfstAction(722, factory); + return true; +}(); + +// OFFSET: 0x00453FE0 +// FUNCTION: fn_45563 +static bool s_skillActionRegistered5002 = [] { + std::function factory = NewAction; + CSkillActionMgr::GetInstance()->RegisterSkillAction(5002, factory); + return true; +}(); + +// GLOBAL: gl_25726 +static SkillActionRegistrar s_skillAction6516(6516, NewAction); +// GLOBAL: gl_25727 +static SkillActionRegistrar s_skillAction6518(6518, NewAction); +// GLOBAL: gl_25728 +static EfstActionRegistrar s_efstAction1193(1193, NewAction); +// GLOBAL: gl_25729 +static EfstActionRegistrar s_efstAction1192(1192, NewAction); +// GLOBAL: gl_25730 +static EfstActionRegistrar s_efstAction1226(1226, NewAction); +// GLOBAL: gl_25731 +static SkillActionRegistrar s_skillAction6511(6511, NewAction); +// GLOBAL: gl_25732 +static SkillActionRegistrar s_skillAction5286(5286, NewAction); +// GLOBAL: gl_25733 +static SkillActionRegistrar s_skillAction5293(5293, NewAction); +// GLOBAL: gl_25734 +static SkillActionRegistrar s_skillAction5292(5292, NewAction); +// GLOBAL: gl_25735 +static SkillActionRegistrar s_skillAction5285(5285, NewAction); +// GLOBAL: gl_25736 +static SkillActionRegistrar s_skillAction5291(5291, NewAction); +// GLOBAL: gl_25738 +static SkillActionRegistrar s_skillAction6515(6515, NewAction); +// GLOBAL: gl_25739 +static SkillActionRegistrar s_skillAction6522(6522, NewAction); +// GLOBAL: gl_25740 +static SkillActionRegistrar s_skillAction6513(6513, NewAction); +// GLOBAL: gl_25741 +static SkillActionRegistrar s_skillAction6514(6514, NewAction); +// GLOBAL: gl_25742 +static SkillActionRegistrar s_skillAction6512(6512, NewAction); +// GLOBAL: gl_25743 +static SkillActionRegistrar s_skillAction6517(6517, NewAction); +// GLOBAL: gl_25744 +static SkillActionRegistrar s_skillAction6519(6519, NewAction); + +// OFFSET: 0x00457500 +// FUNCTION: fn_45564 +static bool s_efstActionRegistered1665 = [] { + std::function factory = NewAction; + CSkillActionMgr::GetInstance()->RegisterEfstAction(1665, factory); + return true; +}(); + +// GLOBAL: gl_25745 +static SkillActionRegistrar s_skillAction6510(6510, NewAction); +// GLOBAL: gl_25746 +static SkillActionRegistrar s_skillAction6005(6005, NewAction); +// GLOBAL: gl_25747 +static SkillActionRegistrar s_skillAction6006(6006, NewAction); +// GLOBAL: gl_25748 +static SkillActionRegistrar s_skillAction6509(6509, NewAction); +// GLOBAL: gl_25749 +static EfstActionRegistrar s_efstAction1174(1174, NewAction); +// GLOBAL: gl_25750 +static EfstActionRegistrar s_efstAction1175(1175, NewAction); +// GLOBAL: gl_25751 +static EfstActionRegistrar s_efstAction1172(1172, NewAction); +// GLOBAL: gl_25752 +static EfstActionRegistrar s_efstAction1173(1173, NewAction); +// GLOBAL: gl_25753 +static EfstActionRegistrar s_efstAction1178(1178, NewAction); +// GLOBAL: gl_25754 +static SkillActionRegistrar s_skillAction5206(5206, NewAction); +// GLOBAL: gl_25755 +static SkillActionRegistrar s_skillAction6001(6001, NewAction); +// GLOBAL: gl_25756 +static SkillActionRegistrar s_skillAction6502(6502, NewAction); +// GLOBAL: gl_25757 +static SkillActionRegistrar s_skillAction5208(5208, NewAction); +// GLOBAL: gl_25758 +static SkillActionRegistrar s_skillAction5209(5209, NewAction); +// GLOBAL: gl_25759 +static SkillActionRegistrar s_skillAction5211(5211, NewAction); +// GLOBAL: gl_25760 +static SkillActionRegistrar s_skillAction5202(5202, NewAction); +// GLOBAL: gl_25761 +static SkillActionRegistrar s_skillAction5205(5205, NewAction); +// GLOBAL: gl_25762 +static SkillActionRegistrar s_skillAction5204(5204, NewAction); +// GLOBAL: gl_25763 +static SkillActionRegistrar s_skillAction5203(5203, NewAction); +// GLOBAL: gl_25764 +static SkillActionRegistrar s_skillAction5213(5213, NewAction); +// GLOBAL: gl_25765 +static SkillActionRegistrar s_skillAction5212(5212, NewAction); +// GLOBAL: gl_25766 +static EfstActionRegistrar s_efstAction1454(1454, NewAction); +// GLOBAL: gl_25767 +static EfstActionRegistrar s_efstAction1455(1455, NewAction); +// GLOBAL: gl_25768 +static EfstActionRegistrar s_efstAction1456(1456, NewAction); +// GLOBAL: gl_25769 +static EfstActionRegistrar s_efstAction1453(1453, NewAction); +// GLOBAL: gl_25770 +static SkillActionRegistrar s_skillAction786(786, NewAction); +// GLOBAL: gl_25771 +static SkillActionRegistrar s_skillAction787(787, NewAction); +// GLOBAL: gl_25772 +static SkillActionRegistrar s_skillAction789(789, NewAction); +// GLOBAL: gl_25773 +static SkillActionRegistrar s_skillAction788(788, NewAction); +// GLOBAL: gl_25774 +static SkillActionRegistrar s_skillAction790(790, NewAction); +// GLOBAL: gl_25775 +static SkillActionRegistrar s_skillAction791(791, NewAction); +// GLOBAL: gl_25776 +static SkillActionRegistrar s_skillAction793(793, NewAction); +// GLOBAL: gl_25777 +static EfstActionRegistrar s_efstAction1383(1383, NewAction); +// GLOBAL: gl_25778 +static EfstActionRegistrar s_efstAction1384(1384, NewAction); +// GLOBAL: gl_25779 +static CSkillObjectActionRegistration s_skillObjectAction296(296, NewAction); +// GLOBAL: gl_25780 +static CSkillObjectActionRegistration s_skillObjectAction295(295, NewAction); +// GLOBAL: gl_25781 +static SkillActionRegistrar s_skillAction5461(5461, NewAction); +// GLOBAL: gl_25782 +static SkillActionRegistrar s_skillAction5451(5451, NewAction); +// GLOBAL: gl_25783 +static SkillActionRegistrar s_skillAction5459(5459, NewAction); +// GLOBAL: gl_25784 +static SkillActionRegistrar s_skillAction5458(5458, NewAction); +// GLOBAL: gl_25785 +static SkillActionRegistrar s_skillAction5457(5457, NewAction); +// GLOBAL: gl_25786 +static SkillActionRegistrar s_skillAction5456(5456, NewAction); +// GLOBAL: gl_25787 +static SkillActionRegistrar s_skillAction5452(5452, NewAction); +// GLOBAL: gl_25788 +static SkillActionRegistrar s_skillAction5455(5455, NewAction); +// GLOBAL: gl_25789 +static SkillActionRegistrar s_skillAction5460(5460, NewAction); +// GLOBAL: gl_25790 +static SkillActionRegistrar s_skillAction5505(5505, NewAction); +// GLOBAL: gl_25791 +static SkillActionRegistrar s_skillAction5462(5462, NewAction); +// GLOBAL: gl_25792 +static SkillActionRegistrar s_skillAction5453(5453, NewAction); +// GLOBAL: gl_25793 +static SkillActionRegistrar s_skillAction5454(5454, NewAction); diff --git a/Source/Contents/Skills/SkillInfo.h b/Source/Contents/Skills/SkillInfo.h index cabdd961f..cd753a81c 100644 --- a/Source/Contents/Skills/SkillInfo.h +++ b/Source/Contents/Skills/SkillInfo.h @@ -93,6 +93,25 @@ public: } }; +struct EfstActionRegistrar { + EfstActionRegistrar(int efstId, std::function factory); +}; + +struct SkillActionRegistrar { + SkillActionRegistrar(int skillId, std::function factory); +}; + +class CSkillObjectActionRegistration { +public: + CSkillObjectActionRegistration(int skillId, std::function factory); +}; + +// INLINED +template +Base* NewAction() { + return new Action; +} + struct SkillInfoEntry { // INLINED SkillInfoEntry& operator=(const SkillInfoEntry& other) { diff --git a/Source/UI/Edit/UIEditBoxEx.cpp b/Source/UI/Edit/UIEditBoxEx.cpp index c140ab0c5..ea7eb4ed3 100644 --- a/Source/UI/Edit/UIEditBoxEx.cpp +++ b/Source/UI/Edit/UIEditBoxEx.cpp @@ -49,6 +49,12 @@ void CUIEditBoxEx::SetCursor(std::size_t position) { this->edit->SetCursor(position); } +// OFFSET: 0x009E4960 +// FUNCTION: fn_14436 +UIWindow* CUIEditBoxEx::GetEditWindow() { + return this->edit; +} + // OFFSET: 0x009E4970 // FUNCTION: fn_14437 int CUIEditCtrlEx::LeadingBytesFitting(const std::string& text, int width) { @@ -635,7 +641,7 @@ void CUIEditBoxEx::Create(int width, int height, bool withScrollBar) { // OFFSET: 0x009E4660 // FUNCTION: fn_14435 -void CUIEditCtrlEx::PaintTextLines() { +void CUIEditCtrlEx::PaintText() { if (this->selectedAll) { this->Synchronize(); this->selectedAll = 0; diff --git a/Source/UI/Edit/UIEditBoxEx.h b/Source/UI/Edit/UIEditBoxEx.h index fcfc2d858..def2c8306 100644 --- a/Source/UI/Edit/UIEditBoxEx.h +++ b/Source/UI/Edit/UIEditBoxEx.h @@ -34,7 +34,7 @@ public: void HandleKeyDown(int key, std::intptr_t lparam); void ResetDragState(); void DrawCaret(int x, int y); - void PaintTextLines(); + void PaintText() override; int LeadingBytesFitting(const std::string& text, int width); int TrailingOffsetFitting(const std::string& text, int width); @@ -66,6 +66,7 @@ public: CUIEditBoxEx(); void Resize(int width, int height) override; bool IsEditable() override; + UIWindow* GetEditWindow() override; void Paint() override; int SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) override; diff --git a/Source/UI/GameSettings/GameSettingsUI.cpp b/Source/UI/GameSettings/GameSettingsUI.cpp index dbd00cdeb..de2507b0c 100644 --- a/Source/UI/GameSettings/GameSettingsUI.cpp +++ b/Source/UI/GameSettings/GameSettingsUI.cpp @@ -1908,7 +1908,7 @@ void GameSettingsUI::CUIGroupGraphicsAPI::Apply() { // OFFSET: 0x00A404D0 // FUNCTION: fn_15973 -void SetNormalProcessPriority() { +void GameSettingsUI::CUIGroupProcessPriority::Apply() { g_session.m_priorityClass = NORMAL_PRIORITY_CLASS; HANDLE process = GetCurrentProcess(); SetPriorityClass(process, NORMAL_PRIORITY_CLASS); diff --git a/Source/UI/GameSettings/GameSettingsUI.h b/Source/UI/GameSettings/GameSettingsUI.h index 87d64ffa4..bb114cbfb 100644 --- a/Source/UI/GameSettings/GameSettingsUI.h +++ b/Source/UI/GameSettings/GameSettingsUI.h @@ -171,6 +171,7 @@ public: __declspec(noinline) CUIGroupProcessPriority(); void OnCreate(int width, int height) override; void OnInit() override; + void Apply() override; void Refresh() override; void OnSelect(CUIRadioButton* button); @@ -313,17 +314,17 @@ public: /* 0094 */ CUIGroupTrilinear* m_trilinear; }; -class CUIListPage : public CUIControl { +class CUIListPage final : public CUIControl { public: __declspec(noinline) CUIListPage(); void OnCreate(int width, int height) override; void OnInit() override; void Paint() override; virtual void OnSelectOption(CUIOptionItem* item, const TALKTYPE& type); - bool SetOptionChecked(int id); - void BindOption(CUIOptionItem* item, const TALKTYPE& id); - void LoadOptions(int tab); - __declspec(noinline) void RefreshOptions(); + virtual void BindOption(CUIOptionItem* item, const TALKTYPE& id); + virtual void LoadOptions(int tab); + virtual void RefreshOptions(); + virtual bool SetOptionChecked(int id); __declspec(noinline) void RefreshHotkeyLabels(); std::string GetHotkeyText(int tab, int index); diff --git a/Source/UI/Items/UIEquipmentPropertiesWnd.cpp b/Source/UI/Items/UIEquipmentPropertiesWnd.cpp index fcdf9cd40..4070fd43b 100644 --- a/Source/UI/Items/UIEquipmentPropertiesWnd.cpp +++ b/Source/UI/Items/UIEquipmentPropertiesWnd.cpp @@ -215,19 +215,19 @@ void CUIListBoxExallowItemInfo == 0 || std::atoi(this->itemInfo.itemId.c_str()) <= 0) { return; } diff --git a/Source/UI/Items/UIGameItem.h b/Source/UI/Items/UIGameItem.h index 77f448271..b166b33f4 100644 --- a/Source/UI/Items/UIGameItem.h +++ b/Source/UI/Items/UIGameItem.h @@ -25,7 +25,7 @@ public: void Paint() override; void OnLBtnDown(int x, int y) override; - void OnLBtnDblClk(int x, int y) override; + void OnRBtnDown(int x, int y) override; void OnMouseHover(int x, int y) override; virtual void SetMode(int mode);