Merge branch 'release' into feature/abilities_up_to_99

# Conflicts:
#	sql/abilities.sql

.github/workflows/build.yml

@@ -118,6 +118,7 @@ jobs:
       run: |
         sh travis_lua.sh
     - name: Clang Format (C++ files)
+      if: 'false' # Don't run until fixed
       run: |
         clang-format --version
         echo "Base Ref: ${{ github.event.pull_request.base.ref }}"

conf/default/map.conf

@@ -116,14 +116,15 @@ craft_chance_multiplier: 1.0
 skillup_amount_multiplier: 1
 craft_amount_multiplier: 1
 
+#Craft level limit from witch specialization points beging to count. (Retail: 700; Level 75 era:600)
+craft_common_cap: 700
+
+#Amount of points allowed in crafts over the level defined above. Points are shared across all crafting skills. (Retail: 400; All skills can go to max: 3200)
+craft_specialization_points: 400
+
 #Enable/disable skill-ups from bloodpacts
 skillup_bloodpact: 1
 
-#Crafting Factors. DO NOT change defaults without verifiable proof that your change IS how retail does it. Myths need to be optional.
-craft_day_matters: 0
-craft_moonphase_matters: 0
-craft_direction_matters: 0
-
 #Adjust rate of TP gain for mobs and players. Acts as a multiplier, so default is 1.
 mob_tp_multiplier:    1.0
 player_tp_multiplier: 1.0

scripts/globals/abilities/brazen_rush.lua

@@ -1,18 +1,18 @@
------------------------------------
--- Ability: Brazen Rush
--- Description: Increases double attack rate
--- Obtained: WAR Level 96
--- Recast Time: 1:00:00
--- Duration: 0:00:30
------------------------------------
-require("scripts/globals/settings")
-require("scripts/globals/status")
------------------------------------
-
-function onAbilityCheck(player, target, ability)
-    return 0, 0
-end
-
-function onUseAbility(player, target, ability)
-    player:addStatusEffect(tpz.effect.BRAZEN_STRENGTH, 1, 368, 30)
-end
+-----------------------------------
+-- Ability: Brazen Rush
+-- Description: Increases double attack rate
+-- Obtained: WAR Level 96
+-- Recast Time: 1:00:00
+-- Duration: 0:00:30
+-----------------------------------
+require("scripts/globals/settings")
+require("scripts/globals/status")
+-----------------------------------
+
+function onAbilityCheck(player, target, ability)
+    return 0, 0
+end
+
+function onUseAbility(player, target, ability)
+    player:addStatusEffect(tpz.effect.BRAZEN_STRENGTH, 1, 368, 30)
+end

scripts/globals/abilities/double-up.lua

@@ -46,15 +46,15 @@ function onUseAbility(caster, target, ability, action)
             caster:resetRecast(tpz.recast.ABILITY, 193)
         end
         caster:setLocalVar("corsairRollTotal", roll)
-        action:speceffect(caster:getID(), roll-prev_roll:getSubPower())
+        action:speceffect(caster:getID(), roll - prev_roll:getSubPower())
         checkForJobBonus(caster, job)
     end
     local total = caster:getLocalVar("corsairRollTotal")
     local prev_ability = getAbility(caster:getLocalVar("corsairActiveRoll"))
     if (prev_ability) then
         action:animation(target:getID(), prev_ability:getAnimation())
-        action:actionID(prev_ability:getID()+16)
-        dofile("scripts/globals/abilities/"..prev_ability:getName()..".lua")
+        action:actionID(prev_ability:getID())
+        dofile("scripts/globals/abilities/" .. prev_ability:getName() .. ".lua")
         local total = applyRoll(caster, target, ability, action, total)
         local msg = ability:getMsg()
         if msg == 420 then

scripts/globals/effects/brazen_strength.lua

@@ -1,13 +1,13 @@
------------------------------------
---
---    tpz.effect.BRAZEN_STRENGTH
---
------------------------------------
-function onEffectGain(target, effect)
-end
-
-function onEffectTick(target, effect)
-end
-
-function onEffectLose(target, effect)
-end
+-----------------------------------
+--
+--    tpz.effect.BRAZEN_STRENGTH
+--
+-----------------------------------
+function onEffectGain(target, effect)
+end
+
+function onEffectTick(target, effect)
+end
+
+function onEffectLose(target, effect)
+end

scripts/globals/items/acrobats_belt.lua

@@ -0,0 +1,28 @@
+-----------------------------------------
+-- ID: 15866
+-- Item: acrobats_belt
+-- Item Effect: AGI +3
+-- Duration: 60 seconds
+-----------------------------------------
+require("scripts/globals/status")
+-----------------------------------------
+
+function onItemCheck(target)
+    local effect = target:getStatusEffect(tpz.effect.ENCHANTMENT)
+    if effect ~= nil and effect:getSubType() == 15866 then
+        target:delStatusEffect(tpz.effect.ENCHANTMENT)
+    end
+    return 0
+end
+
+function onItemUse(target)
+    target:addStatusEffect(tpz.effect.ENCHANTMENT, 0, 0, 60, 15866)
+end
+
+function onEffectGain(target, effect)
+    target:addMod(tpz.mod.AGI, 3)
+end
+
+function onEffectLose(target, effect)
+    target:delMod(tpz.mod.AGI, 3)
+end

scripts/globals/items/anubiss_knife.lua

@@ -0,0 +1,20 @@
+-----------------------------------------
+-- ID: 17624
+-- Item: anubiss_knife
+-- Item Effect: Poison 1HP / Removes 60 HP over 180 seconds
+-----------------------------------------
+require("scripts/globals/status")
+require("scripts/globals/msg")
+-----------------------------------------
+
+function onItemCheck(target)
+    return 0
+end
+
+function onItemUse(target)
+    if not target:hasStatusEffect(tpz.effect.POISON) then
+        target:addStatusEffect(tpz.effect.POISON, 1, 3, 180)
+    else
+        target:messageBasic(tpz.msg.basic.NO_EFFECT)
+    end
+end

scripts/globals/items/armored_ring.lua

@@ -0,0 +1,28 @@
+-----------------------------------------
+-- ID: 15783
+-- Item: Armored Ring
+-- Item Effect: Defence +8
+-- Duration 30 Minutes
+-----------------------------------------
+require("scripts/globals/status")
+-----------------------------------------
+
+function onItemCheck(target)
+    local effect = target:getStatusEffect(tpz.effect.ENCHANTMENT)
+    if effect ~= nil and effect:getSubType() == 15783 then
+        target:delStatusEffect(tpz.effect.ENCHANTMENT)
+    end
+    return 0
+end
+
+function onItemUse(target)
+    target:addStatusEffect(tpz.effect.ENCHANTMENT, 0, 0, 1800, 15783)
+end
+
+function onEffectGain(target, effect)
+    target:addMod(tpz.mod.DEF, 8)
+end
+
+function onEffectLose(target, effect)
+    target:delMod(tpz.mod.DEF, 8)
+end

scripts/globals/items/assailants_axe.lua

@@ -0,0 +1,28 @@
+-----------------------------------------
+-- ID: 18488
+-- Item: assailants_axe
+-- Item Effect: Acc +3
+-- Duration: 30 Minutes
+-----------------------------------------
+require("scripts/globals/status")
+-----------------------------------------
+
+function onItemCheck(target)
+    local effect = target:getStatusEffect(tpz.effect.ENCHANTMENT)
+    if effect ~= nil and effect:getSubType() == 18488 then
+        target:delStatusEffect(tpz.effect.ENCHANTMENT)
+    end
+    return 0
+end
+
+function onItemUse(target)
+    target:addStatusEffect(tpz.effect.ENCHANTMENT, 0, 0, 1800, 18488)
+end
+
+function onEffectGain(target, effect)
+    target:addMod(tpz.mod.ACC, 3)
+end
+
+function onEffectLose(target, effect)
+    target:delMod(tpz.mod.ACC, 3)
+end

scripts/globals/items/augmenting_belt.lua

@@ -0,0 +1,28 @@
+-----------------------------------------
+-- ID: 15889
+-- Item: augmenting_belt
+-- Item Effect: HPHEAL +2
+-- Duration: 30 Minutes
+-----------------------------------------
+require("scripts/globals/status")
+-----------------------------------------
+
+function onItemCheck(target)
+    local effect = target:getStatusEffect(tpz.effect.ENCHANTMENT)
+    if effect ~= nil and effect:getSubType() == 15889 then
+        target:delStatusEffect(tpz.effect.ENCHANTMENT)
+    end
+    return 0
+end
+
+function onItemUse(target)
+    target:addStatusEffect(tpz.effect.ENCHANTMENT, 0, 0, 1800, 15889)
+end
+
+function onEffectGain(target, effect)
+    target:addMod(tpz.mod.HPHEAL, 2)
+end
+
+function onEffectLose(target, effect)
+    target:delMod(tpz.mod.HPHEAL, 2)
+end

scripts/globals/items/bannaret_mail.lua

@@ -0,0 +1,30 @@
+-----------------------------------------
+-- ID: 14531
+-- Item: bannaret_mail
+-- Item Effect: HP +15, Enmity +2
+-- Duration: 30 Minutes
+-----------------------------------------
+require("scripts/globals/status")
+-----------------------------------------
+
+function onItemCheck(target)
+    local effect = target:getStatusEffect(tpz.effect.ENCHANTMENT)
+    if effect ~= nil and effect:getSubType() == 14531 then
+        target:delStatusEffect(tpz.effect.ENCHANTMENT)
+    end
+    return 0
+end
+
+function onItemUse(target)
+    target:addStatusEffect(tpz.effect.ENCHANTMENT, 0, 0, 1800, 14531)
+end
+
+function onEffectGain(target, effect)
+    target:addMod(tpz.mod.HP, 15)
+    target:addMod(tpz.mod.ENMITY, 2)
+end
+
+function onEffectLose(target, effect)
+    target:delMod(tpz.mod.HP, 15)
+    target:delMod(tpz.mod.ENMITY, 2)
+end

scripts/globals/items/broach_lance.lua

@@ -0,0 +1,14 @@
+-----------------------------------------
+-- ID: 18122
+-- Item: Broach Lance
+-- Item Effect: TP +10
+-- Duration: Instant
+-----------------------------------------
+
+function onItemCheck(target)
+    return 0
+end
+
+function onItemUse(target)
+    target:addTP(100)
+end

scripts/globals/items/bunch_of_azouph_greens.lua

@@ -0,0 +1,33 @@
+-----------------------------------------
+-- ID: 5606
+-- Item: bunch_of_azouph_greens
+-- Food Effect: 5Min, All Races
+-----------------------------------------
+-- AGI +3
+-- VIT -5
+-----------------------------------------
+require("scripts/globals/status")
+require("scripts/globals/msg")
+-----------------------------------------
+
+function onItemCheck(target)
+    local result = 0
+    if target:hasStatusEffect(tpz.effect.FOOD) or target:hasStatusEffect(tpz.effect.FIELD_SUPPORT_FOOD) then
+        result = tpz.msg.basic.IS_FULL
+    end
+    return result
+end
+
+function onItemUse(target)
+    target:addStatusEffect(tpz.effect.FOOD, 0, 0, 300, 5606)
+end
+
+function onEffectGain(target, effect)
+    target:addMod(tpz.mod.AGI, 3)
+    target:addMod(tpz.mod.VIT, -5)
+end
+
+function onEffectLose(target, effect)
+    target:delMod(tpz.mod.AGI, 3)
+    target:delMod(tpz.mod.VIT, -5)
+end

scripts/globals/items/bunch_of_sharug_greens.lua

@@ -0,0 +1,33 @@
+-----------------------------------------
+-- ID: 5605
+-- Item: bunch_of_sharug_greens
+-- Food Effect: 5Min, All Races
+-----------------------------------------
+-- AGI +3
+-- VIT -5
+-----------------------------------------
+require("scripts/globals/status")
+require("scripts/globals/msg")
+-----------------------------------------
+
+function onItemCheck(target)
+    local result = 0
+    if target:hasStatusEffect(tpz.effect.FOOD) or target:hasStatusEffect(tpz.effect.FIELD_SUPPORT_FOOD) then
+        result = tpz.msg.basic.IS_FULL
+    end
+    return result
+end
+
+function onItemUse(target)
+    target:addStatusEffect(tpz.effect.FOOD, 0, 0, 300, 5605)
+end
+
+function onEffectGain(target, effect)
+    target:addMod(tpz.mod.AGI, 3)
+    target:addMod(tpz.mod.VIT, -5)
+end
+
+function onEffectLose(target, effect)
+    target:delMod(tpz.mod.AGI, 3)
+    target:delMod(tpz.mod.VIT, -5)
+end

scripts/globals/items/chocobo_pullus_torque.lua

@@ -0,0 +1,19 @@
+-----------------------------------------
+-- ID: 16273
+-- Chocobo Pullus Torque
+-- Enchantment: 60Min, Costume - Mandragora
+-----------------------------------------
+require("scripts/globals/status")
+require("scripts/globals/msg")
+-----------------------------------------
+
+function onItemCheck(target)
+    if not target:canUseMisc(tpz.zoneMisc.COSTUME) then
+        return tpz.msg.basic.CANT_BE_USED_IN_AREA
+    end
+    return 0
+end
+
+function onItemUse(target)
+    target:addStatusEffect(tpz.effect.COSTUME, 1997, 0, 3600)
+end