Merge branch 'feature/trust' into canary

# Conflicts:
#	src/map/navmesh.cpp

Author: zach2good

CONTRIBUTING.md

@@ -618,6 +618,30 @@ local quests = tpz.quest.id.sandoria
   ```
   insert into table_name
   ```
+#### Commenting in SQL
+Our SQL tables are big and confusing, and they are also modified by hand. It can be very helpful to leave _short_ comments on your additions and modifications to highlight what they are.
+
+**Example**
+
+Without a comment, this entry is not easily human-readable:
+
+```sql
+INSERT INTO `mob_droplist` VALUES (504,0,0,1000,888,340);
+```
+
+So we instead store it as:
+
+```sql
+INSERT INTO `mob_droplist` VALUES (504,0,0,1000,888,340); -- (Colossal Calamari) seashell
+```
+
+Conversely, `Combo` weaponskill doesn't need any additional comments because it has a name field:
+
+```sql
+INSERT INTO `weapon_skills` VALUES (1,'combo',0x02020000000200000000000002000000000202000000,1,5,0,16,2000,5,1,8,0,0,0,0);
+```
+
+The format of the comment isn't massively important, but it is preferred not to use ';' as a seperator in the middle of your comment. This is a little confusing, as it's the statement-terminator in SQL.
 
 ## SQL Migrations for Schema changes
 

scripts/globals/abilities/assassins_charge.lua

@@ -14,5 +14,10 @@ end
 
 function onUseAbility(player, target, ability)
     local merits = player:getMerit(tpz.merit.ASSASSINS_CHARGE)
-    player:addStatusEffect(tpz.effect.ASSASSINS_CHARGE, merits - 5, 0, 60, player:getMod(tpz.mod.AUGMENTS_ASSASSINS_CHARGE), merits / 5)
+    local crit = 0
+    if player:getMod(tpz.mod.AUGMENTS_ASSASSINS_CHARGE) > 0 then
+        crit = merits / 5
+    end
+
+    player:addStatusEffect(tpz.effect.ASSASSINS_CHARGE, merits - 5, 0, 60, 0, crit)
 end

scripts/globals/abilities/devotion.lua

@@ -41,7 +41,7 @@ function onUseAbility(player, target, ability)
     -- printf("Devotion MP Healed: %d", healMP)
 
     damageHP = utils.stoneskin(player, damageHP)
-    player:takeDamage(damageHP)
+    player:delHP(damageHP)
     target:addMP(healMP)
 
     return healMP

scripts/globals/abilities/martyr.lua

@@ -44,7 +44,7 @@ function onUseAbility(player, target, ability)
     -- printf("Martyr Healed HP: %d", healHP)
 
     damageHP = utils.stoneskin(player, damageHP)
-    player:takeDamage(damageHP)
+    player:delHP(damageHP)
     target:addHP(healHP)
 
     return healHP

scripts/globals/effects/assassins_charge.lua

@@ -9,7 +9,7 @@ require("scripts/globals/status")
 function onEffectGain(target, effect)
     target:addMod(tpz.mod.QUAD_ATTACK, effect:getPower())
     target:addMod(tpz.mod.TRIPLE_ATTACK, 100)
-    if (effect:getSubType() > 0) then
+    if (effect:getSubPower() > 0) then
         target:addMod(tpz.mod.CRITHITRATE, effect:getSubPower())
     end
 end

scripts/globals/keyitems.lua

@@ -701,7 +701,7 @@ tpz.keyItem =
     MARBLE_BRIDGE_COASTER                    = 705,
     LAMP_LIGHTERS_MEMBERSHIP_CARD            = 706,
     SHAFT_GATE_OPERATING_DIAL                = 707,
-    MYSTERIOUS_AMULET                        = 708,
+    MYSTERIOUS_AMULET_PRISHE                 = 708,
     MIRE_INCENSE                             = 709,
     BRAND_OF_DAWN                            = 710,
     BRAND_OF_TWILIGHT                        = 711,

scripts/globals/weaponskills.lua

@@ -497,7 +497,7 @@ function souleaterBonus(attacker, numhits)
             end
             hitscounted = hitscounted + 1
         end
-        attacker:takeDamage(numhits*0.10*attacker:getHP())
+        attacker:delHP(numhits*0.10*attacker:getHP())
         return damage
     else
         return 0

scripts/zones/AlTaieu/IDs.lua

@@ -19,6 +19,9 @@ zones[tpz.zone.ALTAIEU] =
         QUASILUMIN_01           = 7365, -- This is Al'Taieu. The celestial capital overflowing with the blessings of Altana.
         NOTHING_OF_INTEREST     = 7475, -- There is nothing of interest here.
         OMINOUS_SHADOW          = 7476, -- An ominous shadow falls over you...
+        AMULET_SHATTERED        = 7497, -- The mysterious amulet held by <player> has shattered...
+        LIGHT_STOLEN            = 7498, -- The light of <mea/holla/dem> was stolen by Nag'molada...
+        RETURN_AMULET_TO_PRISHE = 7523, -- You return the mysterious amulet to Prishe.
         HOMEPOINT_SET           = 7564, -- Home point set!
     },
     mob =

scripts/zones/AlTaieu/Zone.lua

@@ -38,11 +38,21 @@ end
 
 function onEventFinish(player, csid, option)
     if (csid == 1) then
+        local copCraigLights = -- Nag'molada steals one random light
+        {
+            tpz.ki.LIGHT_OF_HOLLA,
+            tpz.ki.LIGHT_OF_DEM,
+            tpz.ki.LIGHT_OF_MEA
+        }
         player:setCharVar("PromathiaStatus", 1)
         player:addKeyItem(tpz.ki.LIGHT_OF_ALTAIEU)
+        player:messageSpecial(ID.text.AMULET_SHATTERED, tpz.ki.MYSTERIOUS_AMULET)
+        player:messageSpecial(ID.text.LIGHT_STOLEN, copCraigLights[math.random(#copCraigLights)])
         player:messageSpecial(ID.text.KEYITEM_OBTAINED, tpz.ki.LIGHT_OF_ALTAIEU)
         player:addTitle(tpz.title.SEEKER_OF_THE_LIGHT)
     elseif (csid == 167) then
         player:setCharVar("PromathiaStatus", 1)
+        player:delKeyItem(tpz.ki.MYSTERIOUS_AMULET_PRISHE)
+        player:messageSpecial(ID.text.RETURN_AMULET_TO_PRISHE, tpz.ki.MYSTERIOUS_AMULET)
     end
 end

scripts/zones/Carpenters_Landing/npcs/Anguenet.lua

@@ -4,16 +4,45 @@
 -- Type: Adventurer's Assistant
 -- !pos 214.672 -3.013 -527.561 2
 -----------------------------------
+local ID = require("scripts/zones/Carpenters_Landing/IDs")
+require("scripts/globals/npc_util")
 
 function onTrade(player, npc, trade)
+    if 
+        player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.TEA_WITH_A_TONBERRY) == QUEST_ACCEPTED and
+        player:getCharVar('TEA_WITH_A_TONBERRY_PROG') == 1 and
+        npcUtil.tradeHas(trade, 1683)
+    then
+        player:startEvent(29)
+    end
 end
 
 function onTrigger(player, npc)
-    player:startEvent(21)
+    local teaGinseng = player:getCharVar('TEA_WITH_A_TONBERRY_PROG')
+
+    if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.TEA_WITH_A_TONBERRY) == QUEST_ACCEPTED then
+        if teaGinseng == 0 then
+            player:startEvent(27, 0, 1683)
+        elseif teaGinseng == 1 then
+            player:startEvent(28, 0, 1683)
+        else
+            player:startEvent(21)
+        end
+    else
+        player:startEvent(21)
+    end
 end
 
 function onEventUpdate(player, csid, option)
 end
 
 function onEventFinish(player, csid, option)
+    if csid == 27 then
+        player:setCharVar('TEA_WITH_A_TONBERRY_PROG', 1)
+    elseif csid == 29 then
+        player:tradeComplete()
+        player:addKeyItem(tpz.keyItem.TONBERRY_BLACKBOARD)
+        player:messageSpecial(ID.text.KEYITEM_OBTAINED, tpz.keyItem.TONBERRY_BLACKBOARD)
+        player:setCharVar('TEA_WITH_A_TONBERRY_PROG', 2)
+    end
 end