Merge pull request #6207 from Xaver-DaRed/speedy-gonzalez

[Speed] Adjustments to calculations and modifiers
LandSandBoat · Sep 13, 2024 · 8527243 · 8527243
2 parents 27d2498 + 328cb9b
commit 8527243
Show file tree

Hide file tree

Showing 23 changed files with 175 additions and 157 deletions.
diff --git a/scripts/actions/abilities/chocobo_jig.lua b/scripts/actions/abilities/chocobo_jig.lua
@@ -23,7 +23,7 @@ abilityObject.onUseAbility = function(player, target, ability)
         player:delStatusEffect(xi.effect.WEIGHT)
     end
 
-    player:addStatusEffect(xi.effect.QUICKENING, 20, 0, finalDuration)
+    player:addStatusEffect(xi.effect.QUICKENING, 10, 0, finalDuration)
 end
 
 return abilityObject
diff --git a/scripts/actions/abilities/chocobo_jig_ii.lua b/scripts/actions/abilities/chocobo_jig_ii.lua
@@ -23,7 +23,7 @@ abilityObject.onUseAbility = function(player, target, ability)
         target:delStatusEffect(xi.effect.WEIGHT)
     end
 
-    target:addStatusEffect(xi.effect.QUICKENING, 20, 0, finalDuration)
+    target:addStatusEffect(xi.effect.QUICKENING, 10, 0, finalDuration)
 end
 
 return abilityObject
diff --git a/scripts/commands/speed.lua b/scripts/commands/speed.lua
@@ -47,7 +47,7 @@ commandObj.onTrigger = function(player, speed)
         player:printToPlayer(string.format('New speed: %u', speed))
     end
 
-    player:setMod(xi.mod.MOVE_SPEED_OVERIDE, speed)
+    player:setMod(xi.mod.MOVE_SPEED_OVERRIDE, speed)
     player:setSpeed(baseSpeed)
 end
 

diff --git a/scripts/effects/bolters_roll.lua b/scripts/effects/bolters_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.MOVE_SPEED_STACKABLE, effect:getPower())
+    effect:addMod(xi.mod.MOVE_SPEED_BOLTERS_ROLL, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.MOVE_SPEED_STACKABLE, effect:getPower())
 end
 
 return effectObject
diff --git a/scripts/effects/flee.lua b/scripts/effects/flee.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.MOVE_SPEED_STACKABLE, effect:getPower())
+    effect:addMod(xi.mod.MOVE_SPEED_FLEE, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.MOVE_SPEED_STACKABLE, effect:getPower())
 end
 
 return effectObject
diff --git a/scripts/effects/gestation.lua b/scripts/effects/gestation.lua
@@ -22,14 +22,13 @@ local effectObject = {}
 local boostAmount = 50 -- +50% movement speed
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.MOVE_SPEED_STACKABLE, boostAmount)
+    effect:addMod(xi.mod.MOVE_SPEED_STACKABLE, boostAmount)
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.MOVE_SPEED_STACKABLE, boostAmount)
 end
 
 return effectObject
diff --git a/scripts/effects/mazurka.lua b/scripts/effects/mazurka.lua
@@ -5,16 +5,14 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.MOVE_SPEED_MAZURKA, effect:getPower())
-    target:addMod(xi.mod.AGI, effect:getSubPower()) -- Apply Stat Buff from AUGMENT_SONG_STAT
+    effect:addMod(xi.mod.MOVE_SPEED_MAZURKA, effect:getPower())
+    effect:addMod(xi.mod.AGI, effect:getSubPower()) -- Apply Stat Buff from AUGMENT_SONG_STAT
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.MOVE_SPEED_MAZURKA, effect:getPower())
-    target:delMod(xi.mod.AGI, effect:getSubPower()) -- Remove Stat Buff from AUGMENT_SONG_STAT
 end
 
 return effectObject
diff --git a/scripts/enum/mod.lua b/scripts/enum/mod.lua
@@ -233,13 +233,19 @@ xi.mod =
     MAGIC_CRIT_DMG_INCREASE         = 563,
     HASTE_MAGIC                     = 167,
     SPELLINTERRUPT                  = 168,
-    MOVE_SPEED_OVERIDE              = 169, -- Modifier used to overide regular speed caps. (GM speed and Feast of Swords)
-    MOVE_SPEED_STACKABLE            =  75, -- Gear movement speed penalties, flee bonus, etc.
-    MOVE_SPEED_GEAR_BONUS           =  76, -- Gear movement speed bonuses. DOES NOT STACK with each other, only highest applies.
-    MOVE_SPEED_WEIGHT_PENALTY       =  77, -- For Gravity and curse.
-    MOVE_SPEED_QUICKENING           =  78, -- Jig, spreinter shoes, etc. Only highest of Mazurka OR quickening will take effect.
-    MOVE_SPEED_MAZURKA              =  79, -- Song movement speed. Only highest of Mazurka OR quickening will take effect.
-    MOUNT_MOVE                      = 972, -- % Mount Movement Speed
+
+    -- Movement speed modifiers in use order.
+    MOUNT_MOVE                      =  972, -- % Mount Movement Speed
+    MOVE_SPEED_STACKABLE            =   75, -- Additive modifier. Applied before multipliers. Gear movement speed penalties.
+    MOVE_SPEED_WEIGHT_PENALTY       =   77, -- Multiplicative modifier. For Gravity and curse.
+    MOVE_SPEED_FLEE                 = 1085, -- Multiplicative modifier.
+    MOVE_SPEED_CHEER                = 1087, -- Multiplicative modifier from "cheer" type KI's.
+    MOVE_SPEED_GEAR_BONUS           =   76, -- Multiplicative modifier. Gear movement speed bonuses. DOES NOT STACK with each other, only highest applies.
+    MOVE_SPEED_QUICKENING           =   78, -- Additive modifier. Applied after multipliers. Jig, spreinter shoes, etc. Shares cap with Mazurka.
+    MOVE_SPEED_MAZURKA              =   79, -- Additive modifier. Applied after multipliers. Song movement speed. Shares cap with Quickening,
+    MOVE_SPEED_BOLTERS_ROLL         = 1086, -- Additive modifier. Applied after multipliers.
+    MOVE_SPEED_OVERRIDE             =  169, -- Modifier used to overide regular speed caps. (GM speed and Feast of Swords)
+
     FASTCAST                        = 170,
     UFASTCAST                       = 407,
     CURE_CAST_TIME                  = 519,

diff --git a/scripts/globals/abyssea/atma.lua b/scripts/globals/abyssea/atma.lua
@@ -124,7 +124,7 @@ xi.atma.atmaMods =
     [xi.ki.ATMA_OF_THE_AZURE_SKY]              = { },
     [xi.ki.ATMA_OF_ECHOES]                     = { },
     [xi.ki.ATMA_OF_DREAD]                      = { },
-    [xi.ki.ATMA_OF_AMBITION]                   = { },
+    [xi.ki.ATMA_OF_AMBITION]                   = { }, -- Note: Speed modifier is the same as positive gear. Meaning, it doesnt stack.
     [xi.ki.ATMA_OF_THE_BEAST_KING]             = { },
     [xi.ki.ATMA_OF_THE_KIRIN]                  = { },
     [xi.ki.ATMA_OF_HELLS_GUARDIAN]             = { },
@@ -143,7 +143,7 @@ xi.atma.atmaMods =
     [xi.ki.ATMA_OF_THE_ILLUMINATOR]            = { },
     [xi.ki.ATMA_OF_THE_BUSHIN]                 = { },
     [xi.ki.ATMA_OF_THE_ACE_ANGLER]             = { },
-    [xi.ki.ATMA_OF_THE_MASTER_CRAFTER]         = { },
+    [xi.ki.ATMA_OF_THE_MASTER_CRAFTER]         = { }, -- Note: Speed modifier is the same as positive gear. Meaning, it doesnt stack
     [xi.ki.ATMA_OF_INGENUITY]                  = { },
     [xi.ki.ATMA_OF_THE_GRIFFONS_CLAW]          = { },
     [xi.ki.ATMA_OF_THE_FETCHING_FOOTPAD]       = { },

diff --git a/scripts/globals/job_utils/corsair.lua b/scripts/globals/job_utils/corsair.lua
@@ -17,37 +17,37 @@ xi.job_utils.corsair = xi.job_utils.corsair or {}
 -- TODO: verify Corsair's Roll for subjob: see http://wiki.ffo.jp/html/6052.html
 local corsairRollMods =
 {
-    [xi.jobAbility.CORSAIRS_ROLL   ] = { {  10,  11,   11,  12,   20,   13,  15,   16,    8,   17,   24,   6 },   2,   0, xi.effect.CORSAIRS_ROLL,    xi.mod.EXP_BONUS,            xi.job.COR  },
-    [xi.jobAbility.NINJA_ROLL      ] = { {   4,   5,    5,  14,    6,    7,   9,    2,   10,   11,   18,   6 },   2,   6, xi.effect.NINJA_ROLL,       xi.mod.EVA,                  xi.job.NIN  },
-    [xi.jobAbility.HUNTERS_ROLL    ] = { {  10,  13,   15,  40,   18,   20,  25,    5,   27,   30,   50,   5 },   5,  15, xi.effect.HUNTERS_ROLL,     xi.mod.ACC,                  xi.job.RNG  },
-    [xi.jobAbility.CHAOS_ROLL      ] = { {   6,   8,    9,  25,   11,   13,  16,    3,   17,   19,   31,  10 },   3,  10, xi.effect.CHAOS_ROLL,       xi.mod.ATTP,                 xi.job.DRK  },
-    [xi.jobAbility.MAGUSS_ROLL     ] = { {   5,  20,    6,   8,    9,    3,  10,   13,   14,   15,   25,   5 },   2,   8, xi.effect.MAGUSS_ROLL,      xi.mod.MDEF,                 xi.job.BLU  },
-    [xi.jobAbility.HEALERS_ROLL    ] = { {   3,   4,   12,   5,    6,    7,   1,    8,    9,   10,   16,   4 },   3,   4, xi.effect.HEALERS_ROLL,     xi.mod.CURE_POTENCY_RCVD,    xi.job.WHM  },
-    [xi.jobAbility.DRACHEN_ROLL    ] = { {  10,  13,   15,  40,   18,   20,  25,    5,   28,   30,   50,  15 },   5,  15, xi.effect.DRACHEN_ROLL,     nil,                         xi.job.DRG  },
-    [xi.jobAbility.CHORAL_ROLL     ] = { {  13,  55,   17,  20,   25,    8,  30,   35,   40,   45,   65,  25 },   4,  25, xi.effect.CHORAL_ROLL,      xi.mod.SPELLINTERRUPT,       xi.job.BRD  },
-    [xi.jobAbility.MONKS_ROLL      ] = { {   8,  10,   32,  12,   14,   16,   4,   20,   22,   24,   40,  11 },   4,  10, xi.effect.MONKS_ROLL,       xi.mod.SUBTLE_BLOW,          xi.job.MNK  },
-    [xi.jobAbility.BEAST_ROLL      ] = { {   4,   5,    7,  19,    8,    9,  11,    2,   13,   14,   23,   7 },   3,  10, xi.effect.BEAST_ROLL,       nil,                         xi.job.BST  },
-    [xi.jobAbility.SAMURAI_ROLL    ] = { {   8,  32,   10,  12,   14,    4,  16,   20,   22,   24,   40,   5 },   4,  10, xi.effect.SAMURAI_ROLL,     xi.mod.STORETP,              xi.job.SAM  },
-    [xi.jobAbility.EVOKERS_ROLL    ] = { {   1,   1,    1,   1,    3,    2,   2,    2,    1,    3,    4,   1 },   1,   1, xi.effect.EVOKERS_ROLL,     xi.mod.REFRESH,              xi.job.SMN  },
-    [xi.jobAbility.ROGUES_ROLL     ] = { {   2,   2,    3,   4,   12,    5,   6,    6,    1,    8,   19,   6 },   1,   6, xi.effect.ROGUES_ROLL,      xi.mod.CRITHITRATE,          xi.job.THF  },
-    [xi.jobAbility.WARLOCKS_ROLL   ] = { {   2,   3,    4,  12,    5,    6,   7,    1,    8,    9,   15,   5 },   1,   5, xi.effect.WARLOCKS_ROLL,    xi.mod.MACC,                 xi.job.RDM  },
-    [xi.jobAbility.FIGHTERS_ROLL   ] = { {   2,   2,    3,   4,   12,    5,   6,    7,    1,    9,   18,   6 },   1,   6, xi.effect.FIGHTERS_ROLL,    xi.mod.DOUBLE_ATTACK,        xi.job.WAR  },
-    [xi.jobAbility.PUPPET_ROLL     ] = { {   4,   5,   18,   7,    9,   10,   2,   11,   13,   15,   22,   8 },   3,   8, xi.effect.PUPPET_ROLL,      nil,                         xi.job.PUP  },
-    [xi.jobAbility.GALLANTS_ROLL   ] = { { 600, 800, 2400, 900, 1100, 1200, 300, 1500, 1700, 1800, 3000, 500 }, 234, 500, xi.effect.GALLANTS_ROLL,    xi.mod.DMG,                  xi.job.PLD  },
-    [xi.jobAbility.WIZARDS_ROLL    ] = { {   4,   6,    8,  10,   25,   12,  14,   17,    2,   20,   30,  10 },   2,  10, xi.effect.WIZARDS_ROLL,     xi.mod.MATT,                 xi.job.BLM  },
-    [xi.jobAbility.DANCERS_ROLL    ] = { {   3,   4,   12,   5,    6,    7,   1,    8,    9,   10,   16,   4 },   2,   4, xi.effect.DANCERS_ROLL,     xi.mod.REGEN,                xi.job.DNC  },
-    [xi.jobAbility.SCHOLARS_ROLL   ] = { {   2,   9,    3,   4,    5,    2,   6,    6,    7,    9,   14,   4 },   1,   4, xi.effect.SCHOLARS_ROLL,    xi.mod.CONSERVE_MP,          xi.job.SCH  },
-    [xi.jobAbility.NATURALISTS_ROLL] = { {   6,   7,   15,   8,    9,   10,   5,   11,   12,   13,   20,  -5 },   1,   5, xi.effect.NATURALISTS_ROLL, xi.mod.ENH_MAGIC_DURATION,   xi.job.GEO  },
-    [xi.jobAbility.RUNEISTS_ROLL   ] = { {   4,   6,    8,  25,   10,   12,  14,    2,   17,   20,   30, -10 },   2,   7, xi.effect.RUNEISTS_ROLL,    xi.mod.MEVA,                 xi.job.RUN  },
-    [xi.jobAbility.BOLTERS_ROLL    ] = { {   6,   6,   16,   8,    8,   10,  10,   12,    4,   14,   20,   0 },   4,   0, xi.effect.BOLTERS_ROLL,     xi.mod.MOVE_SPEED_STACKABLE, xi.job.NONE },
-    [xi.jobAbility.CASTERS_ROLL    ] = { {   6,  15,    7,   8,    9,   10,   5,   11,   12,   13,   20, -10 },   3,  10, xi.effect.CASTERS_ROLL,     xi.mod.FASTCAST,             xi.job.NONE },
-    [xi.jobAbility.COURSERS_ROLL   ] = { {   2,   3,   11,   4,    5,    6,   7,    8,    1,   10,   12,  -5 },   1,   3, xi.effect.COURSERS_ROLL,    nil,                         xi.job.NONE },
-    [xi.jobAbility.BLITZERS_ROLL   ] = { {  -2,  -3,   -4, -11,   -5,   -6,  -7,   -8,   -1,  -10,  -12,   3 },  -1,  -3, xi.effect.BLITZERS_ROLL,    xi.mod.DELAYP,               xi.job.NONE },
-    [xi.jobAbility.TACTICIANS_ROLL ] = { {  10,  10,   10,  10,   30,   10,  10,    0,   20,   20,   40, -10 },   2,  10, xi.effect.TACTICIANS_ROLL,  xi.mod.REGAIN,               xi.job.NONE },
-    [xi.jobAbility.ALLIES_ROLL     ] = { {   2,   3,   20,   5,    7,    9,  11,   13,   15,    1,   25,  -5 },   1,   5, xi.effect.ALLIES_ROLL,      xi.mod.SKILLCHAINBONUS,      xi.job.NONE },
-    [xi.jobAbility.MISERS_ROLL     ] = { {  30,  50,   70,  90,  200,  110,  20,  130,  150,  170,  250,   0 },  15,   0, xi.effect.MISERS_ROLL,      xi.mod.SAVETP,               xi.job.NONE },
-    [xi.jobAbility.COMPANIONS_ROLL ] = { {   1,   2,    3,   4,    5,    6,   7,    8,    9,   10,   11,   0 },  10,   0, xi.effect.COMPANIONS_ROLL,  nil,                         xi.job.NONE },
-    [xi.jobAbility.AVENGERS_ROLL   ] = { {   2,   2,    3,  12,    4,    5,   6,    1,    7,    9,   18,   6 },   1,   0, xi.effect.AVENGERS_ROLL,    xi.mod.COUNTER,              xi.job.NONE },
+    [xi.jobAbility.CORSAIRS_ROLL   ] = { {  10,  11,   11,  12,   20,   13,  15,   16,    8,   17,   24,   6 },   2,   0, xi.effect.CORSAIRS_ROLL,    xi.mod.EXP_BONUS,               xi.job.COR  },
+    [xi.jobAbility.NINJA_ROLL      ] = { {   4,   5,    5,  14,    6,    7,   9,    2,   10,   11,   18,   6 },   2,   6, xi.effect.NINJA_ROLL,       xi.mod.EVA,                     xi.job.NIN  },
+    [xi.jobAbility.HUNTERS_ROLL    ] = { {  10,  13,   15,  40,   18,   20,  25,    5,   27,   30,   50,   5 },   5,  15, xi.effect.HUNTERS_ROLL,     xi.mod.ACC,                     xi.job.RNG  },
+    [xi.jobAbility.CHAOS_ROLL      ] = { {   6,   8,    9,  25,   11,   13,  16,    3,   17,   19,   31,  10 },   3,  10, xi.effect.CHAOS_ROLL,       xi.mod.ATTP,                    xi.job.DRK  },
+    [xi.jobAbility.MAGUSS_ROLL     ] = { {   5,  20,    6,   8,    9,    3,  10,   13,   14,   15,   25,   5 },   2,   8, xi.effect.MAGUSS_ROLL,      xi.mod.MDEF,                    xi.job.BLU  },
+    [xi.jobAbility.HEALERS_ROLL    ] = { {   3,   4,   12,   5,    6,    7,   1,    8,    9,   10,   16,   4 },   3,   4, xi.effect.HEALERS_ROLL,     xi.mod.CURE_POTENCY_RCVD,       xi.job.WHM  },
+    [xi.jobAbility.DRACHEN_ROLL    ] = { {  10,  13,   15,  40,   18,   20,  25,    5,   28,   30,   50,  15 },   5,  15, xi.effect.DRACHEN_ROLL,     nil,                            xi.job.DRG  },
+    [xi.jobAbility.CHORAL_ROLL     ] = { {  13,  55,   17,  20,   25,    8,  30,   35,   40,   45,   65,  25 },   4,  25, xi.effect.CHORAL_ROLL,      xi.mod.SPELLINTERRUPT,          xi.job.BRD  },
+    [xi.jobAbility.MONKS_ROLL      ] = { {   8,  10,   32,  12,   14,   16,   4,   20,   22,   24,   40,  11 },   4,  10, xi.effect.MONKS_ROLL,       xi.mod.SUBTLE_BLOW,             xi.job.MNK  },
+    [xi.jobAbility.BEAST_ROLL      ] = { {   4,   5,    7,  19,    8,    9,  11,    2,   13,   14,   23,   7 },   3,  10, xi.effect.BEAST_ROLL,       nil,                            xi.job.BST  },
+    [xi.jobAbility.SAMURAI_ROLL    ] = { {   8,  32,   10,  12,   14,    4,  16,   20,   22,   24,   40,   5 },   4,  10, xi.effect.SAMURAI_ROLL,     xi.mod.STORETP,                 xi.job.SAM  },
+    [xi.jobAbility.EVOKERS_ROLL    ] = { {   1,   1,    1,   1,    3,    2,   2,    2,    1,    3,    4,   1 },   1,   1, xi.effect.EVOKERS_ROLL,     xi.mod.REFRESH,                 xi.job.SMN  },
+    [xi.jobAbility.ROGUES_ROLL     ] = { {   2,   2,    3,   4,   12,    5,   6,    6,    1,    8,   19,   6 },   1,   6, xi.effect.ROGUES_ROLL,      xi.mod.CRITHITRATE,             xi.job.THF  },
+    [xi.jobAbility.WARLOCKS_ROLL   ] = { {   2,   3,    4,  12,    5,    6,   7,    1,    8,    9,   15,   5 },   1,   5, xi.effect.WARLOCKS_ROLL,    xi.mod.MACC,                    xi.job.RDM  },
+    [xi.jobAbility.FIGHTERS_ROLL   ] = { {   2,   2,    3,   4,   12,    5,   6,    7,    1,    9,   18,   6 },   1,   6, xi.effect.FIGHTERS_ROLL,    xi.mod.DOUBLE_ATTACK,           xi.job.WAR  },
+    [xi.jobAbility.PUPPET_ROLL     ] = { {   4,   5,   18,   7,    9,   10,   2,   11,   13,   15,   22,   8 },   3,   8, xi.effect.PUPPET_ROLL,      nil,                            xi.job.PUP  },
+    [xi.jobAbility.GALLANTS_ROLL   ] = { { 600, 800, 2400, 900, 1100, 1200, 300, 1500, 1700, 1800, 3000, 500 }, 234, 500, xi.effect.GALLANTS_ROLL,    xi.mod.DMG,                     xi.job.PLD  },
+    [xi.jobAbility.WIZARDS_ROLL    ] = { {   4,   6,    8,  10,   25,   12,  14,   17,    2,   20,   30,  10 },   2,  10, xi.effect.WIZARDS_ROLL,     xi.mod.MATT,                    xi.job.BLM  },
+    [xi.jobAbility.DANCERS_ROLL    ] = { {   3,   4,   12,   5,    6,    7,   1,    8,    9,   10,   16,   4 },   2,   4, xi.effect.DANCERS_ROLL,     xi.mod.REGEN,                   xi.job.DNC  },
+    [xi.jobAbility.SCHOLARS_ROLL   ] = { {   2,   9,    3,   4,    5,    2,   6,    6,    7,    9,   14,   4 },   1,   4, xi.effect.SCHOLARS_ROLL,    xi.mod.CONSERVE_MP,             xi.job.SCH  },
+    [xi.jobAbility.NATURALISTS_ROLL] = { {   6,   7,   15,   8,    9,   10,   5,   11,   12,   13,   20,  -5 },   1,   5, xi.effect.NATURALISTS_ROLL, xi.mod.ENH_MAGIC_DURATION,      xi.job.GEO  },
+    [xi.jobAbility.RUNEISTS_ROLL   ] = { {   4,   6,    8,  25,   10,   12,  14,    2,   17,   20,   30, -10 },   2,   7, xi.effect.RUNEISTS_ROLL,    xi.mod.MEVA,                    xi.job.RUN  },
+    [xi.jobAbility.BOLTERS_ROLL    ] = { {   6,   6,   16,   8,    8,   10,  10,   12,    4,   14,   20,   0 },   4,   0, xi.effect.BOLTERS_ROLL,     xi.mod.MOVE_SPEED_BOLTERS_ROLL, xi.job.NONE },
+    [xi.jobAbility.CASTERS_ROLL    ] = { {   6,  15,    7,   8,    9,   10,   5,   11,   12,   13,   20, -10 },   3,  10, xi.effect.CASTERS_ROLL,     xi.mod.FASTCAST,                xi.job.NONE },
+    [xi.jobAbility.COURSERS_ROLL   ] = { {   2,   3,   11,   4,    5,    6,   7,    8,    1,   10,   12,  -5 },   1,   3, xi.effect.COURSERS_ROLL,    nil,                            xi.job.NONE },
+    [xi.jobAbility.BLITZERS_ROLL   ] = { {  -2,  -3,   -4, -11,   -5,   -6,  -7,   -8,   -1,  -10,  -12,   3 },  -1,  -3, xi.effect.BLITZERS_ROLL,    xi.mod.DELAYP,                  xi.job.NONE },
+    [xi.jobAbility.TACTICIANS_ROLL ] = { {  10,  10,   10,  10,   30,   10,  10,    0,   20,   20,   40, -10 },   2,  10, xi.effect.TACTICIANS_ROLL,  xi.mod.REGAIN,                  xi.job.NONE },
+    [xi.jobAbility.ALLIES_ROLL     ] = { {   2,   3,   20,   5,    7,    9,  11,   13,   15,    1,   25,  -5 },   1,   5, xi.effect.ALLIES_ROLL,      xi.mod.SKILLCHAINBONUS,         xi.job.NONE },
+    [xi.jobAbility.MISERS_ROLL     ] = { {  30,  50,   70,  90,  200,  110,  20,  130,  150,  170,  250,   0 },  15,   0, xi.effect.MISERS_ROLL,      xi.mod.SAVETP,                  xi.job.NONE },
+    [xi.jobAbility.COMPANIONS_ROLL ] = { {   1,   2,    3,   4,    5,    6,   7,    8,    9,   10,   11,   0 },  10,   0, xi.effect.COMPANIONS_ROLL,  nil,                            xi.job.NONE },
+    [xi.jobAbility.AVENGERS_ROLL   ] = { {   2,   2,    3,  12,    4,    5,   6,    1,    7,    9,   18,   6 },   1,   0, xi.effect.AVENGERS_ROLL,    xi.mod.COUNTER,                 xi.job.NONE },
 }
 
 -- Check for xi.mod.PHANTOM_ROLL Value and apply non-stack logic.

diff --git a/scripts/globals/spells/enhancing_song.lua b/scripts/globals/spells/enhancing_song.lua
@@ -96,8 +96,8 @@ local pTable =
     -- Misc.
     [xi.magic.spell.GODDESSS_HYMNUS   ] = { 1, xi.effect.HYMNUS,    xi.mod.AUGMENT_SONG_STAT, 0,                      0,                        0,                    1,   0,   1,   0,  0, false },
     [xi.magic.spell.SENTINELS_SCHERZO ] = { 1, xi.effect.SCHERZO,   xi.mod.AUGMENT_SONG_STAT, 0,                      0,                        0,                    1, 350,  45,   1, 10, false },
-    [xi.magic.spell.RAPTOR_MAZURKA    ] = { 1, xi.effect.MAZURKA,   xi.mod.AUGMENT_SONG_STAT, 0,                      0,                        0,                   12,   0,  12,   0,  0, false },
-    [xi.magic.spell.CHOCOBO_MAZURKA   ] = { 1, xi.effect.MAZURKA,   xi.mod.AUGMENT_SONG_STAT, 0,                      0,                        0,                   24,   0,  24,   0,  0, false },
+    [xi.magic.spell.RAPTOR_MAZURKA    ] = { 1, xi.effect.MAZURKA,   xi.mod.AUGMENT_SONG_STAT, 0,                      0,                        0,                    5,   0,  12,   0,  0, false },
+    [xi.magic.spell.CHOCOBO_MAZURKA   ] = { 1, xi.effect.MAZURKA,   xi.mod.AUGMENT_SONG_STAT, 0,                      0,                        0,                   10,   0,  24,   0,  0, false },
 
     -- Emnity Songs
     [xi.magic.spell.FOE_SIRVENTE      ] = { 1, xi.effect.SIRVENTE,  xi.mod.AUGMENT_SONG_STAT, 0,                      0,                        0,                   35,   0,  35,   1,  0, true  },