Merge pull request #6054 from WinterSolstice8/attack_modifier_audit

[lua] Audit WS attack bonus based on studio gobli info
LandSandBoat · Jul 29, 2024 · dd875c8 · dd875c8
2 parents 0e86ebc + 04c622c
commit dd875c8
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 30 deletions.
diff --git a/scripts/actions/weaponskills/ascetics_fury.lua b/scripts/actions/weaponskills/ascetics_fury.lua
@@ -14,16 +14,18 @@
 local weaponskillObject = {}
 
 weaponskillObject.onUseWeaponSkill = function(player, target, wsID, tp, primary, action, taChar)
-    local params = {}
-    params.numHits = 1
-    params.ftpMod = { 1, 1, 1 }
-    params.str_wsc = 0.5 params.vit_wsc = 0.5
+    local params      = {}
+    params.numHits    = 1
+    params.ftpMod     = { 1, 1, 1 }
+    params.atkVaries  = { 1.5, 1.5, 1.5 } -- https://w.atwiki.jp/studiogobli/pages/93.html
     params.critVaries = { 0.1, 0.2, 0.4 }
+    params.str_wsc    = 0.5
+    params.vit_wsc    = 0.5
 
     if xi.settings.main.USE_ADOULIN_WEAPON_SKILL_CHANGES then
         params.multiHitfTP = true -- http://wiki.ffo.jp/html/15880.html
-        params.critVaries = { 0.2, 0.3, 0.5 }
-        params.atkVaries  = { 2.5, 2.5, 2.5 }
+        params.critVaries  = { 0.2, 0.3, 0.5 }
+        params.atkVaries   = { 2.5, 2.5, 2.5 }
     end
 
     -- Apply aftermath

diff --git a/scripts/actions/weaponskills/detonator.lua b/scripts/actions/weaponskills/detonator.lua
@@ -15,13 +15,14 @@
 local weaponskillObject = {}
 
 weaponskillObject.onUseWeaponSkill = function(player, target, wsID, tp, primary, action, taChar)
-    local params = {}
-    params.numHits = 1
-    params.ftpMod = { 1.5, 2.0, 2.5 }
-    params.agi_wsc = 0.3
+    local params     = {}
+    params.numHits   = 1
+    params.ftpMod    = { 1.5, 2.0, 2.5 }
+    params.atkVaries = { 2.0, 2.0, 2.0 } -- https://w.atwiki.jp/studiogobli/pages/93.html
+    params.agi_wsc   = 0.3
 
     if xi.settings.main.USE_ADOULIN_WEAPON_SKILL_CHANGES then
-        params.ftpMod = { 1.5, 2.5, 5.0 }
+        params.ftpMod  = { 1.5, 2.5, 5.0 }
         params.agi_wsc = 0.7
     end
 

diff --git a/scripts/actions/weaponskills/empyreal_arrow.lua b/scripts/actions/weaponskills/empyreal_arrow.lua
@@ -14,15 +14,17 @@
 local weaponskillObject = {}
 
 weaponskillObject.onUseWeaponSkill = function(player, target, wsID, tp, primary, action, taChar)
-    local params = {}
-    params.numHits = 1
-    params.ftpMod = { 2.0, 2.75, 3.0 }
-    params.str_wsc = 0.16 params.agi_wsc = 0.25
+    local params     = {}
+    params.numHits   = 1
+    params.ftpMod    = { 2.0, 2.75, 3.0 }
+    params.atkVaries = { 2.0, 2.0, 2.0 } -- https://w.atwiki.jp/studiogobli/pages/93.html
+    params.str_wsc   = 0.16
+    params.agi_wsc   = 0.25
 
     if xi.settings.main.USE_ADOULIN_WEAPON_SKILL_CHANGES then
-        params.ftpMod = { 1.5, 2.5, 5.0 }
-        params.str_wsc = 0.20 params.agi_wsc = 0.50
-        params.atkVaries = { 2.0, 2.0, 2.0 }
+        params.ftpMod  = { 1.5, 2.5, 5.0 }
+        params.str_wsc = 0.20
+        params.agi_wsc = 0.50
     end
 
     local damage, criticalHit, tpHits, extraHits = xi.weaponskills.doRangedWeaponskill(player, target, wsID, params, tp, action, primary)

diff --git a/scripts/actions/weaponskills/howling_fist.lua b/scripts/actions/weaponskills/howling_fist.lua
@@ -15,10 +15,12 @@
 local weaponskillObject = {}
 
 weaponskillObject.onUseWeaponSkill = function(player, target, wsID, tp, primary, action, taChar)
-    local params = {}
-    params.numHits = 1
-    params.ftpMod = { 2.5, 2.75, 3.0 }
-    params.str_wsc = 0.2 params.vit_wsc = 0.5
+    local params     = {}
+    params.numHits   = 1
+    params.ftpMod    = { 2.5, 2.75, 3.0 }
+    params.atkVaries = { 1.5, 1.5, 1.5 } -- https://w.atwiki.jp/studiogobli/pages/93.html
+    params.str_wsc   = 0.2
+    params.vit_wsc   = 0.5
 
     if xi.settings.main.USE_ADOULIN_WEAPON_SKILL_CHANGES then
         params.multiHitfTP = true -- http://wiki.ffo.jp/html/2422.html

diff --git a/scripts/actions/weaponskills/retribution.lua b/scripts/actions/weaponskills/retribution.lua
@@ -17,14 +17,12 @@
 local weaponskillObject = {}
 
 weaponskillObject.onUseWeaponSkill = function(player, target, wsID, tp, primary, action, taChar)
-    local params = {}
-    params.numHits = 1
-    params.ftpMod = { 2.0, 2.5, 3.0 }
-    params.str_wsc = 0.3 params.mnd_wsc = 0.5
-
-    if xi.settings.main.USE_ADOULIN_WEAPON_SKILL_CHANGES then
-        params.atkVaries = { 1.5, 1.5, 1.5 }
-    end
+    local params     = {}
+    params.numHits   = 1
+    params.ftpMod    = { 2.0, 2.5, 3.0 }
+    params.atkVaries = { 1.5, 1.5, 1.5 } -- https://w.atwiki.jp/studiogobli/pages/93.html
+    params.str_wsc   = 0.3
+    params.mnd_wsc   = 0.5
 
     local damage, criticalHit, tpHits, extraHits = xi.weaponskills.doPhysicalWeaponskill(player, target, wsID, params, tp, action, primary, taChar)
     return tpHits, extraHits, criticalHit, damage