Merge branch 'release' into feature/gardening

# Conflicts:
#	conf/default/map.conf
#	src/map/map.cpp
#	src/map/map.h
#	src/map/modifier.h

Author: zach2good

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
       with:
-        fetch-depth: 1
+        fetch-depth: 0
     - name: Install Dependencies
       run: |
         sudo apt-get update
@@ -35,7 +35,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
       with:
-        fetch-depth: 1
+        fetch-depth: 0
     - name: Install Dependencies
       run: |
         sudo apt-get update
@@ -51,7 +51,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
       with:
-        fetch-depth: 1
+        fetch-depth: 0
     - name: Install Dependencies
       run: |
         sudo apt-get update
@@ -70,7 +70,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
         with:
-          fetch-depth: 1
+          fetch-depth: 0
       - name: Build Solution
         shell: cmd
         run: |
@@ -83,7 +83,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
         with:
-          fetch-depth: 1
+          fetch-depth: 0
       - name: Build Solution
         shell: cmd
         run: |
@@ -97,7 +97,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
         with:
-          fetch-depth: 1
+          fetch-depth: 0
       - name: Build Solution
         shell: cmd
         run: |
@@ -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 }}"
@@ -144,7 +145,7 @@ jobs:
     runs-on: ubuntu-18.04
     services:
       mysql:
-        image: mysql:5.6
+        image: mariadb:10.1
         env:
           MYSQL_DATABASE: tpzdb
           MYSQL_ROOT_PASSWORD: root
@@ -154,7 +155,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
       with:
-        fetch-depth: 1
+        fetch-depth: 0
     - name: Install Dependencies
       run: |
         sudo apt-get update

conf/default/login.conf

@@ -29,6 +29,7 @@ stdout_with_ansisequence: no
 #Lua          = 512
 #Navmesh      = 1024
 #Action       = 2048
+#Exploit      = 4096
 #Example: "console_silent: 7" Hides standard, status and information messages (1+2+4)
 console_silent: 0
 

conf/default/map.conf

@@ -32,6 +32,7 @@ stdout_with_ansisequence: no
 #Lua          = 512
 #Navmesh      = 1024
 #Action       = 2048
+#Exploit      = 4096
 #Example: "console_silent: 7" Hides standard, status and information messages (1+2+4)
 console_silent: 0
 
@@ -122,14 +123,15 @@ garden_moonphase_matters: 0
 garden_pot_matters: 0
 garden_mh_aura_matters: 0
 
+#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/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/abilities/familiar.lua

@@ -16,7 +16,10 @@ function onAbilityCheck(player, target, ability)
         return tpz.msg.basic.REQUIRES_A_PET, 0
     elseif not player:isJugPet() and pet:getObjType() ~= tpz.objType.MOB then
         return tpz.msg.basic.NO_EFFECT_ON_PET, 0
+    elseif pet:getLocalVar("ReceivedFamiliar") == 1 then
+        return tpz.msg.basic.NO_EFFECT_ON_PET, 0
     else
+        pet:setLocalVar("ReceivedFamiliar", 1)
         return 0, 0
     end
 end