Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement follow-up attacks and update virtue stone weapons to use follow-up attacks #6560

Merged
merged 1 commit into from
Dec 21, 2024
+171 −177
Merged

Implement follow-up attacks and update virtue stone weapons to use follow-up attacks #6560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions documentation/mods_by_id.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@
TRICK_ATK_AGI = 520, // % AGI boost to Trick Attack (if gear mod, needs to be equipped on hit)
AUGMENTS_ABSORB = 521, // Direct Absorb spell increase while Liberator is equipped (percentage based)
NIN_NUKE_BONUS = 522, // magic attack bonus for NIN nukes
AMMO_SWING = 523, // Extra swing rate w/ ammo (ie. Jailer weapons). Use gearsets, and does nothing for non-players.
AMMO_SWING = 523, // Follow-up swing rate w/ virtue stone ammo (Jailer weapons). Does nothing for non-players.
AOE_NA = 524, // Set to 1 to make -na spells/erase always AoE w/ Divine Veil
AUGMENTS_CONVERT = 525, // Convert HP to MP Ratio Multiplier. Value = MP multiplier rate.
AUGMENTS_SA = 526, // Adds Critical Attack Bonus to Sneak Attack, percentage based.
Expand Down Expand Up @@ -536,8 +536,8 @@
WEAPONSKILL_DAMAGE_BASE = 570,

// IDs from 571 to 825 are not listed but are used. More info below.

AMMO_SWING_TYPE = 826, // For the handedness of the weapon - 1h (1) vs. 2h/h2h (2). h2h can safely use the same function as 2h.
// SPARE ID 826

BARSPELL_MDEF_BONUS = 827, // Extra magic defense bonus granted to the bar- spell effect
FORCE_JUMP_CRIT = 828, // Critical hit rate bonus for jump and high jump
WYVERN_EFFECTIVE_BREATH = 829, // Increases the threshold for triggering healing breath/offensive breath more inclined to pick elemental weakness
Expand Down
3 changes: 1 addition & 2 deletions scripts/enum/mod.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,8 +762,7 @@ xi.mod =
NIN_NUKE_BONUS_INNIN = 223, -- Ninjutsu damage multiplier from Innin.
NIN_NUKE_BONUS_GEAR = 522, -- Ninjutsu damage multiplier from gear. Ex: Koga Hatsuburi.
DAKEN = 911, -- Chance to throw shuriken on attack
AMMO_SWING = 523, -- Extra swing rate w/ ammo (ie. Jailer weapons). Use gearsets, and does nothing for non-players.
AMMO_SWING_TYPE = 826, -- For the handedness of the weapon - 1h (1) vs. 2h/h2h (2). h2h can safely use the same function as 2h.
AMMO_SWING = 523, -- Follow-up swing rate w/ virtue stone ammo (Jailer weapons). Does nothing for non-players.
ROLL_RANGE = 528, -- Additional range for COR roll abilities.
PHANTOM_ROLL = 881, -- Phantom Roll+ Effect from SOA Rings.
PHANTOM_DURATION = 882, -- Phantom Roll Duration +.
Expand Down
98 changes: 0 additions & 98 deletions scripts/globals/gear_sets.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,104 +812,6 @@ local gearSets =
},
},

[47] = -- Begin Jailer weapons: Set is weapon + Virtue stone, bonus 50% extra melee swing.
{
items =
{
xi.item.VIRTUE_STONE,
xi.item.HOPE_STAFF,
},
minEquipped = 2,
mods =
{
{ xi.mod.AMMO_SWING, 50 },
},
},

[48] =
{
items =
{
xi.item.VIRTUE_STONE,
xi.item.JUSTICE_SWORD,
},
minEquipped = 2,
mods =
{
{ xi.mod.AMMO_SWING, 50 },
},
},

[49] =
{
items =
{
xi.item.VIRTUE_STONE,
xi.item.TEMPERANCE_AXE,
},
minEquipped = 2,
mods =
{
{ xi.mod.AMMO_SWING, 50 },
},
},

[50] =
{
items =
{
xi.item.VIRTUE_STONE,
xi.item.LOVE_HALBERD,
},
minEquipped = 2,
mods =
{
{ xi.mod.AMMO_SWING, 50 },
},
},

[51] =
{
items =
{
xi.item.VIRTUE_STONE,
xi.item.FORTITUDE_AXE,
},
minEquipped = 2,
mods =
{
{ xi.mod.AMMO_SWING, 50 },
},
},

[52] =
{
items =
{
xi.item.VIRTUE_STONE,
xi.item.FAITH_BAGHNAKHS,
},
minEquipped = 2,
mods =
{
{ xi.mod.AMMO_SWING, 50 },
},
},

[53] = -- End Jailer weapons
{
items =
{
xi.item.VIRTUE_STONE,
xi.item.PRUDENCE_ROD,
},
minEquipped = 2,
mods =
{
{ xi.mod.AMMO_SWING, 50 },
},
},

[54] = -- Bladeborn/Steelflash Earrings
{
items =
Expand Down
14 changes: 7 additions & 7 deletions sql/item_mods.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35016,7 +35016,7 @@ INSERT INTO `item_mods` VALUES (17594,72,4); -- HPHEAL: 4

-- Hope Staff
INSERT INTO `item_mods` VALUES (17595,11,7); -- AGI: 7
INSERT INTO `item_mods` VALUES (17595,826,2); -- AMMO_SWING_TYPE: 2
INSERT INTO `item_mods` VALUES (17595,523,50); -- AMMO_SWING

-- Steel-Splitter
INSERT INTO `item_mods` VALUES (17596,9,2); -- DEX: 2
Expand Down Expand Up @@ -35373,7 +35373,7 @@ INSERT INTO `item_mods` VALUES (17709,25,4); -- ACC: 4

-- Justice Sword
INSERT INTO `item_mods` VALUES (17710,8,7); -- STR: 7
INSERT INTO `item_mods` VALUES (17710,826,1); -- AMMO_SWING_TYPE: 1
INSERT INTO `item_mods` VALUES (17710,523,50); -- AMMO_SWING

-- Shivas Shotel
INSERT INTO `item_mods` VALUES (17711,12,4); -- INT: 4
Expand Down Expand Up @@ -35897,7 +35897,7 @@ INSERT INTO `item_mods` VALUES (17945,345,1000); -- TP_BONUS: 1000

-- Temperance Axe
INSERT INTO `item_mods` VALUES (17948,14,7); -- CHR: 7
INSERT INTO `item_mods` VALUES (17948,826,1); -- AMMO_SWING_TYPE: 1
INSERT INTO `item_mods` VALUES (17948,523,50); -- AMMO_SWING

-- Furnace Tabarzin
INSERT INTO `item_mods` VALUES (17949,2,10); -- HP: 10
Expand Down Expand Up @@ -36297,7 +36297,7 @@ INSERT INTO `item_mods` VALUES (18098,345,1000); -- TP_BONUS: 1000

-- Love Halberd
INSERT INTO `item_mods` VALUES (18100,9,7); -- DEX: 7
INSERT INTO `item_mods` VALUES (18100,826,2); -- AMMO_SWING_TYPE: 2
INSERT INTO `item_mods` VALUES (18100,523,50); -- AMMO_SWING

-- Fuscina
INSERT INTO `item_mods` VALUES (18104,431,1); -- ITEM_ADDEFFECT_TYPE: DAMAGE
Expand Down Expand Up @@ -36736,7 +36736,7 @@ INSERT INTO `item_mods` VALUES (18221,345,1000); -- TP_BONUS: 1000

-- Fortitude Axe
INSERT INTO `item_mods` VALUES (18222,10,7); -- VIT: 7
INSERT INTO `item_mods` VALUES (18222,826,2); -- AMMO_SWING_TYPE: 2
INSERT INTO `item_mods` VALUES (18222,523,50); -- AMMO_SWING

-- Toporok
INSERT INTO `item_mods` VALUES (18223,2,10); -- HP: 10
Expand Down Expand Up @@ -37196,7 +37196,7 @@ INSERT INTO `item_mods` VALUES (18359,950,3); -- ITEM_ADDEFFECT_ELEMENT: 3

-- Faith Baghnakhs
INSERT INTO `item_mods` VALUES (18360,13,7); -- MND: 7
INSERT INTO `item_mods` VALUES (18360,826,2); -- AMMO_SWING_TYPE: 1. - HtH are treated like 1H and can proc on both hands.
INSERT INTO `item_mods` VALUES (18360,523,50); -- AMMO_SWING

-- Ponderous Manoples
INSERT INTO `item_mods` VALUES (18361,10,2); -- VIT: 2
Expand Down Expand Up @@ -37294,7 +37294,7 @@ INSERT INTO `item_mods` VALUES (18396,25,-5); -- ACC: -5

-- Prudence Rod
INSERT INTO `item_mods` VALUES (18397,12,7); -- INT: 7
INSERT INTO `item_mods` VALUES (18397,826,1); -- AMMO_SWING_TYPE: 1
INSERT INTO `item_mods` VALUES (18397,523,50); -- AMMO_SWING

-- Mana Wand
INSERT INTO `item_mods` VALUES (18402,12,2); -- INT: 2
Expand Down
3 changes: 2 additions & 1 deletion src/map/attack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ enum class PHYSICAL_ATTACK_TYPE
RAPID_SHOT = 6,
SAMBA = 7,
QUAD = 8,
DAKEN = 9
DAKEN = 9,
FOLLOWUP = 10,
};

enum PHYSICAL_ATTACK_DIRECTION
Expand Down
Loading
Loading