Merge pull request #1558 from WinterSolstice8/base

[RUN] Update incorrect durations of Foil/Vallation/Valiance, fix cast time of foil
LandSandBoat · Apr 14, 2022 · d7e04f5 · d7e04f5
2 parents 458b278 + bdff0ad
commit d7e04f5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/scripts/globals/job_utils/rune_fencer.lua b/scripts/globals/job_utils/rune_fencer.lua
@@ -396,7 +396,7 @@ xi.job_utils.rune_fencer.useVallationValiance = function(player, target, ability
 
     if abilityID == xi.jobAbility.VALIANCE then -- apply effects to entire party (including target) (Valiance)
         local party = player:getParty()
-        local duration = 120 + jobPointBonusDuration
+        local duration = 180 + jobPointBonusDuration
 
         for _, member in pairs(party) do
             if not member:hasStatusEffect(xi.effect.VALLATION) then -- Valiance has no effect if Vallation is up
@@ -413,7 +413,7 @@ xi.job_utils.rune_fencer.useVallationValiance = function(player, target, ability
 
         end
     else -- apply effects to target (Vallation)
-        local duration = 180 + jobPointBonusDuration
+        local duration = 120 + jobPointBonusDuration
 
         target:delStatusEffectSilent(xi.effect.VALIANCE) -- Vallation overwrites Valiance
         applyVallationValianceSDTMods(target, SDTTypes, SDTPower, xi.effect.VALLATION, duration)

diff --git a/scripts/globals/spells/white/foil.lua b/scripts/globals/spells/white/foil.lua
@@ -16,7 +16,7 @@ end
 -- More testing is required (such as determining accuracy of the target used for testing)
 spell_object.onSpellCast = function(caster, target, spell)
 
-    if target:addStatusEffect(xi.effect.FOIL, 0, 0, 300) then -- power set to 0 because true mechanics are unknown as of now. The primary use of Foil is for enmity anyway.
+    if target:addStatusEffect(xi.effect.FOIL, 0, 0, 30) then -- power set to 0 because true mechanics are unknown as of now. The primary use of Foil is for enmity anyway.
         spell:setMsg(xi.msg.basic.MAGIC_GAIN_EFFECT)
     else
         spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT)

diff --git a/sql/spell_list.sql b/sql/spell_list.sql
@@ -810,7 +810,7 @@ INSERT INTO `spell_list` VALUES (836,'thundara',0x000000000000000000000000000000
 INSERT INTO `spell_list` VALUES (837,'thundara_ii',0x00000000000000000000000000000000000000005F00,2,152,5,0,4,36,253,3000,15000,2,0,900,2000,1,0,1.00,0,0,0,120,'SOA');
 INSERT INTO `spell_list` VALUES (838,'watera',0x00000000000000000000000000000000000000001E00,2,153,6,0,4,36,66,1500,5000,2,0,901,2000,1,0,1.00,0,0,0,120,'SOA');
 INSERT INTO `spell_list` VALUES (839,'watera_ii',0x00000000000000000000000000000000000000004B00,2,153,6,0,4,36,163,3000,15000,2,0,902,2000,1,0,1.00,0,0,0,120,'SOA');
-INSERT INTO `spell_list` VALUES (840,'foil',0x0000000000000000000000000000000000000000003A,6,4,3,0,1,34,48,3000,45000,230,0,903,2000,0,0,1.00,880,320,0,204,'SOA');
+INSERT INTO `spell_list` VALUES (840,'foil',0x0000000000000000000000000000000000000000003A,6,4,3,0,1,34,48,1000,45000,230,0,903,2000,0,0,1.00,880,320,0,204,'SOA');
 INSERT INTO `spell_list` VALUES (841,'distract',0x00000000230000000000000000000000000000000000,2,154,2,0,4,35,32,3000,10000,0,0,933,2000,0,0,1.00,1,320,0,204,'SOA');
 INSERT INTO `spell_list` VALUES (842,'distract_ii',0x00000000550000000000000000000000000000000000,2,154,2,0,4,35,58,3000,10000,0,0,934,4000,0,0,1.00,1,320,0,204,'SOA');
 INSERT INTO `spell_list` VALUES (843,'frazzle',0x000000002A0000000000000000000000000000000000,2,155,8,0,4,35,38,3000,10000,0,0,935,4000,0,0,1.00,1,320,0,204,'SOA');