Cleanup unnecessary includes, edit comments. Adjust logic for clarity.

LandSandBoat · Mar 2, 2022 · 8e4be64 · 8e4be64
1 parent 74bc7d4
commit 8e4be64
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 20 deletions.
diff --git a/scripts/globals/abilities/flabra.lua b/scripts/globals/abilities/flabra.lua
@@ -2,10 +2,9 @@
 -- Ability: Flabra
 -- Increases resistance against earth and deals wind damage.
 -- Obtained: Rune Fencer Level 5
--- Recast Time: 0:10
+-- Recast Time: 0:05
 -- Duration: 5:00
 -----------------------------------
-require("scripts/settings/main")
 require("scripts/globals/status")
 require("scripts/globals/job_utils/rune_fencer")
 -----------------------------------

diff --git a/scripts/globals/abilities/gelus.lua b/scripts/globals/abilities/gelus.lua
@@ -2,10 +2,9 @@
 -- Ability: Gelus
 -- Increases resistance against wind and deals ice damage.
 -- Obtained: Rune Fencer Level 5
--- Recast Time: 0:10
+-- Recast Time: 0:05
 -- Duration: 5:00
 -----------------------------------
-require("scripts/settings/main")
 require("scripts/globals/status")
 require("scripts/globals/job_utils/rune_fencer")
 -----------------------------------

diff --git a/scripts/globals/abilities/ignis.lua b/scripts/globals/abilities/ignis.lua
@@ -2,10 +2,9 @@
 -- Ability: Ignis
 -- Increases resistance against ice and deals fire damage.
 -- Obtained: Rune Fencer Level 5
--- Recast Time: 0:10
+-- Recast Time: 0:05
 -- Duration: 5:00
 -----------------------------------
-require("scripts/settings/main")
 require("scripts/globals/status")
 require("scripts/globals/job_utils/rune_fencer")
 -----------------------------------

diff --git a/scripts/globals/abilities/lux.lua b/scripts/globals/abilities/lux.lua
@@ -2,10 +2,9 @@
 -- Ability: Lux
 -- Increases resistance against dark and deals light damage.
 -- Obtained: Rune Fencer Level 5
--- Recast Time: 0:10
+-- Recast Time: 0:05
 -- Duration: 5:00
 -----------------------------------
-require("scripts/settings/main")
 require("scripts/globals/status")
 require("scripts/globals/job_utils/rune_fencer")
 -----------------------------------

diff --git a/scripts/globals/abilities/rune_enchantment.lua b/scripts/globals/abilities/rune_enchantment.lua
@@ -2,7 +2,7 @@
 -- Ability: Rune Enchantment
 -- Allows you to harbor runes
 -- Obtained: Rune Fencer Level 5
--- Recast Time: 0:10
+-- Recast Time: 0:05
 -- Duration: 5:00
 -----------------------------------
 require("scripts/globals/status")

diff --git a/scripts/globals/abilities/sulpor.lua b/scripts/globals/abilities/sulpor.lua
@@ -2,10 +2,9 @@
 -- Ability: Sulpor
 -- Increases resistance against earth and deals thunder damage.
 -- Obtained: Rune Fencer Level 5
--- Recast Time: 0:10
+-- Recast Time: 0:05
 -- Duration: 5:00
 -----------------------------------
-require("scripts/settings/main")
 require("scripts/globals/status")
 require("scripts/globals/job_utils/rune_fencer")
 -----------------------------------

diff --git a/scripts/globals/abilities/tellus.lua b/scripts/globals/abilities/tellus.lua
@@ -2,10 +2,9 @@
 -- Ability: Tellus
 -- Increases resistance against thunder and deals earth damage.
 -- Obtained: Rune Fencer Level 5
--- Recast Time: 0:10
+-- Recast Time: 0:05
 -- Duration: 5:00
 -----------------------------------
-require("scripts/settings/main")
 require("scripts/globals/status")
 require("scripts/globals/job_utils/rune_fencer")
 -----------------------------------

diff --git a/scripts/globals/abilities/tenebrae.lua b/scripts/globals/abilities/tenebrae.lua
@@ -2,10 +2,9 @@
 -- Ability: Tenebrae
 -- Increases resistance against light and deals dark damage.
 -- Obtained: Rune Fencer Level 5
--- Recast Time: 0:10
+-- Recast Time: 0:05
 -- Duration: 5:00
 -----------------------------------
-require("scripts/settings/main")
 require("scripts/globals/status")
 require("scripts/globals/job_utils/rune_fencer")
 -----------------------------------

diff --git a/scripts/globals/abilities/unda.lua b/scripts/globals/abilities/unda.lua
@@ -2,10 +2,9 @@
 -- Ability: Undra
 -- Increases resistance against fire and deals water damage.
 -- Obtained: Rune Fencer Level 5
--- Recast Time: 0:10
+-- Recast Time: 0:05
 -- Duration: 5:00
 -----------------------------------
-require("scripts/settings/main")
 require("scripts/globals/status")
 require("scripts/globals/job_utils/rune_fencer")
 -----------------------------------

diff --git a/scripts/globals/job_utils/rune_fencer.lua b/scripts/globals/job_utils/rune_fencer.lua
@@ -1,7 +1,6 @@
 -----------------------------------
 -- Rune Fencer Job Utilities
 -----------------------------------
-require("scripts/settings/main")
 require("scripts/globals/ability")
 require("scripts/globals/status")
 require("scripts/globals/msg")
@@ -14,12 +13,16 @@ xi.job_utils.rune_fencer = xi.job_utils.rune_fencer or {}
 -----------------------------------
 
 local function getRUNLevel(player)
-    return player:getMainJob() == xi.job.RUN and player:getMainLvl() or player:getSubLvl()
+    if player:getMainJob() == xi.job.RUN then
+        return player:getMainLvl()
+    else
+        return player:getSubLvl()
+    end
 end
 
 local function applyRuneEnhancement(effectType, player)
     local RUNLevel = getRUNLevel(player)
-    local meritBonus = (player:getMerit(xi.merit.MERIT_RUNE_ENHANCE) * 2) -- 2 more elemental resistance per merit for a maximum total of (2*5) = 10
+    local meritBonus =  player:getMerit(xi.merit.MERIT_RUNE_ENHANCE) -- 2 more elemental resistance per merit for a maximum total of (2*5) = 10 (power of merit is 2 per level)
     local jobPointBonus = player:getJobPointLevel(xi.jp.RUNE_ENCHANTMENT_EFFECT) -- 1 more elemental resistance per level for a maximum total of 20
 
     -- see https://www.bg-wiki.com/ffxi/Category:Rune