Merge branch 'feature/crafting_expert_lb' into release

# Conflicts:
#	scripts/zones/Windurst_Woods/npcs/Ponono.lua

Author: zach2good

scripts/globals/crafting.lua

@@ -26,16 +26,16 @@ guild =
 -- Table for Test Item
 -----------------------------------
 
-local TI_Alchemy = {937, 4157, 4163, 947, 16543, 4116, 16479, 4120, 16609, 10792}
-local TI_Bonecraft = {13442, 13441, 13323, 13459, 13091, 17299, 16420, 12508, 13987, 11058} --  Way of The Boneworker + Hajduk Ring
-local TI_Clothcraft = {13583, 13584, 13204, 13075, 12723, 13586, 13752, 12612, 14253, 11000}
-local TI_Cooking = {4355, 4416, 4489, 4381, 4413, 4558, 4546, 4440, 4561, } -- Sprightly Soup + Way of the Culinarian
-local TI_Fishing = {4401, 4379, 4469, 4480, 4462, 4479, 4471, 4478, 4474, 5817, } -- Tiger shark
-local TI_Goldsmithing = {12496, 12497, 12495, 13082, 13446, 13084, 12545, 13125, 16515, } --  Evader Earring**Guild item must be made with an Inferno Crystal
-local TI_Leathercraft = {13594, 16386, 13588, 13195, 12571, 12572, 12980, 12702, 12447, } --  Urja Trousers(Signed with Terra Crystal)
-local TI_Smithing = {16530, 12299, 16512, 16650, 16651, 16559, 12427, 16577, 12428, } -- Gorkhali Kukri
-local TI_Woodworking = {22, 23, 17354, 17348, 17053, 17156, 17054, 56, 17101, } -- Vejovis wand signed
-local TI_Synergy = {}
+local TI_Alchemy =      {  937,  4157,  4163,   947, 16543,  4116, 16479,  4120, 16609, 10792}
+local TI_Bonecraft =    {13442, 13441, 13323, 13459, 13091, 17299, 16420, 12508, 13987, 11058}
+local TI_Clothcraft =   {13583, 13584, 13204, 13075, 12723, 13586, 13752, 12612, 14253, 11000}
+local TI_Cooking =      { 4355,  4416,  4489,  4381,  4413,  4558,  4546,  4440,  4561,  5930}
+local TI_Fishing =      { 4401,  4379,  4469,  4480,  4462,  4479,  4471,  4478,  4474,  5817}
+local TI_Goldsmithing = {12496, 12497, 12495, 13082, 13446, 13084, 12545, 13125, 16515, 11060}
+local TI_Leathercraft = {13594, 16386, 13588, 13195, 12571, 12572, 12980, 12702, 12447, 10577}
+local TI_Smithing =     {16530, 12299, 16512, 16650, 16651, 16559, 12427, 16577, 12428, 19788}
+local TI_Woodworking =  {   22,    23, 17354, 17348, 17053, 17156, 17054,    56, 17101, 18884}
+local TI_Synergy =      {}
 
 local HQCrystals = {
     [1] = {
@@ -89,7 +89,6 @@ function isGuildMember(player, guild)
         else
             bit[i]=0
         end
-        --printf("bit %u: %u", i, bit[i])
     end
 
     return bit[guild]
@@ -115,16 +114,16 @@ function getTestItem(player, npc, craftID)
 
     switch (npc:getName()): caseof
     {
-        ["Abd-al-Raziq"] = function (x)     TItemList = TI_Alchemy end,
-        ["Peshi_Yohnts"] = function (x)     TItemList = TI_Bonecraft end,
-        ["Ponono"] = function (x)             TItemList = TI_Clothcraft end,
-        ["Piketo-Puketo"] = function (x)     TItemList = TI_Cooking end,
-        ["Thubu_Parohren"] = function (x)     TItemList = TI_Fishing end,
-        ["Reinberta"] = function (x)         TItemList = TI_Goldsmithing end,
-        ["Faulpie"] = function (x)             TItemList = TI_Leathercraft end,
-        ["Mevreauche"] = function (x)         TItemList = TI_Smithing end,
-        ["Ghemp"] = function (x)             TItemList = TI_Smithing end,
-        ["Cheupirudaux"] = function (x)     TItemList = TI_Woodworking end,
+        ["Abd-al-Raziq"] =      function (x)    TItemList = TI_Alchemy end,
+        ["Peshi_Yohnts"] =      function (x)    TItemList = TI_Bonecraft end,
+        ["Ponono"] =            function (x)    TItemList = TI_Clothcraft end,
+        ["Piketo-Puketo"] =     function (x)    TItemList = TI_Cooking end,
+        ["Thubu_Parohren"] =    function (x)    TItemList = TI_Fishing end,
+        ["Reinberta"] =         function (x)    TItemList = TI_Goldsmithing end,
+        ["Faulpie"] =           function (x)    TItemList = TI_Leathercraft end,
+        ["Mevreauche"] =        function (x)    TItemList = TI_Smithing end,
+        ["Ghemp"] =             function (x)    TItemList = TI_Smithing end,
+        ["Cheupirudaux"] =      function (x)    TItemList = TI_Woodworking end,
     }
 
     return TItemList[NextRank]
@@ -139,24 +138,24 @@ function canGetNewRank(player, skillLvL, craftID)
     local Rank = player:getSkillRank(craftID) + 1
     local canGet = 0
 
-    -- 0 fonctionne pas en lua donc rank + 1
     if (Rank == 1 and skillLvL >= 256 or
-       Rank == 2 and skillLvL >= 577 or
-       Rank == 3 and skillLvL >= 898 or
-       Rank == 4 and skillLvL >= 1219 or
-       Rank == 5 and skillLvL >= 1540 or
-       Rank == 6 and skillLvL >= 1861 or
-       Rank == 7 and skillLvL >= 2182 or
-       Rank == 8 and skillLvL >= 2503 or
-       Rank == 9 and skillLvL >= 2824) then
---       Rank == 10 and skillLvL >= 3145) then
+       Rank ==  2 and skillLvL >= 577 or
+       Rank ==  3 and skillLvL >= 898 or
+       Rank ==  4 and skillLvL >= 1219 or
+       Rank ==  5 and skillLvL >= 1540 or
+       Rank ==  6 and skillLvL >= 1861 or
+       Rank ==  7 and skillLvL >= 2182 or
+       Rank ==  8 and skillLvL >= 2503 or
+       Rank ==  9 and skillLvL >= 2824 or
+       Rank == 10 and skillLvL >= 3145) then
             canGet = 1
     end
 
     return canGet
 
 end
 
+
 -----------------------------------
 -- tradeTestItem Action
 -----------------------------------
@@ -167,12 +166,12 @@ function tradeTestItem(player, npc, trade, craftID)
     local skillLvL = player:getSkillLevel(craftID)
     local myTI = getTestItem(player, npc, craftID)
     local newRank = 0
+    local signed = trade:getItem():getSignature() == player:getName() and 1 or 0
 
     if (canGetNewRank(player, skillLvL, craftID) == 1 and
         trade:hasItemQty(myTI, 1) and
         trade:getItemCount() == 1) then
         newRank = player:getSkillRank(craftID) + 1
-        player:tradeComplete()
         if player:getCharVar('[GUILD]currentGuild') == guildID + 1 then
             player:setCharVar('[GUILD]daily_points', -1)
         end

scripts/zones/Bastok_Markets/npcs/Reinberta.lua

@@ -10,39 +10,83 @@ require("scripts/globals/status")
 -----------------------------------
 
 function onTrade(player, npc, trade)
+    local signed = trade:getItem():getSignature() == player:getName() and 1 or 0
     local newRank = tradeTestItem(player, npc, trade, tpz.skill.GOLDSMITHING)
 
-    if (newRank ~= 0) then
+    if
+        newRank > 9 and
+        player:getCharVar("GoldsmithingExpertQuest") == 1 and
+        player:hasKeyItem(tpz.keyItem.WAY_OF_THE_GOLDSMITH)
+    then
+        if signed ~=0 then
+            player:setSkillRank(tpz.skill.GOLDSMITHING, newRank)
+            player:startEvent(301, 0, 0, 0, 0, newRank, 1)
+            player:setCharVar("GoldsmithingExpertQuest",0)
+            player:setLocalVar("GoldsmithingTraded",1)
+        else
+            player:startEvent(301, 0, 0, 0, 0, newRank, 0)
+        end
+    elseif newRank ~= 0 and newRank <=9 then
         player:setSkillRank(tpz.skill.GOLDSMITHING, newRank)
         player:startEvent(301, 0, 0, 0, 0, newRank)
+        player:setLocalVar("GoldsmithingTraded",1)
     end
 end
 
 function onTrigger(player, npc)
-    local getNewRank = 0
     local craftSkill = player:getSkillLevel(tpz.skill.GOLDSMITHING)
     local testItem = getTestItem(player, npc, tpz.skill.GOLDSMITHING)
     local guildMember = isGuildMember(player, 6)
+        local rankCap = getCraftSkillCap(player, tpz.skill.GOLDSMITHING)
+    local expertQuestStatus = 0
+    local Rank = player:getSkillRank(tpz.skill.GOLDSMITHING)
+    local realSkill = (craftSkill - Rank) / 32
     if (guildMember == 1) then guildMember = 150995375; end
-    if (canGetNewRank(player, craftSkill, tpz.skill.GOLDSMITHING) == 1) then getNewRank = 100; end
+    if player:getCharVar("GoldsmithingExpertQuest") == 1 then
+        if player:hasKeyItem(tpz.keyItem.WAY_OF_THE_GOLDSMITH) then
+            expertQuestStatus = 600
+        else
+            expertQuestStatus = 550
+        end
+    end
 
-    player:startEvent(300, testItem, getNewRank, 30, guildMember, 44, 0, 0, 0)
+    if expertQuestStatus == 600 then
+        --[[  Feeding the proper parameter currently hangs the client in cutscene. This may
+              possibly be due to an unimplemented packet or function (display recipe?) Work
+              around to present dialog to player to let them know the trade is ready to be
+              received by triggering with lower rank up parameters.  ]]--
+        player:showText(npc, 7188)
+        player:showText(npc, 7190)
+        player:startEvent(300, testItem, realSkill, 44, guildMember, 0, 0, 0, 0)
+    else
+        player:startEvent(300, testItem, realSkill, rankCap, guildMember, expertQuestStatus, 0, 0, 0)
+    end
 end
 
 -- 300  301  402
 function onEventUpdate(player, csid, option)
 end
 
 function onEventFinish(player, csid, option)
-    if (csid == 300 and option == 1) then
-        local crystal = 4096 -- fire crystal
+    local guildMember = isGuildMember(player, 6)
 
+    if (csid == 300 and option == 2) then
+        if guildMember == 1 then
+            player:setCharVar("GoldsmithingExpertQuest",1)
+        end
+    elseif (csid == 300 and option == 1) then
+        local crystal = 4096 -- fire crystal
         if (player:getFreeSlotsCount() == 0) then
             player:messageSpecial(ID.text.ITEM_CANNOT_BE_OBTAINED, crystal)
         else
             player:addItem(crystal)
             player:messageSpecial(ID.text.ITEM_OBTAINED, crystal)
             signupGuild(player, guild.goldsmithing)
         end
+    else
+        if player:getLocalVar("GoldsmithingTraded") == 1 then
+            player:tradeComplete()
+            player:setLocalVar("GoldsmithingTraded",0)
+        end
     end
 end

scripts/zones/Bastok_Mines/npcs/Abd-al-Raziq.lua

@@ -11,25 +11,48 @@ require("scripts/globals/status")
 -----------------------------------
 
 function onTrade(player, npc, trade)
+    local signed = trade:getItem():getSignature() == player:getName() and 1 or 0
     local newRank = tradeTestItem(player, npc, trade, tpz.skill.ALCHEMY)
 
-    if (newRank ~= 0) then
+    if
+        newRank > 9 and
+        player:getCharVar("AlchemyExpertQuest") == 1 and
+        player:hasKeyItem(tpz.keyItem.WAY_OF_THE_ALCHEMIST)
+    then
+        if signed ~=0 then
+            player:setSkillRank(tpz.skill.ALCHEMY, newRank)
+            player:startEvent(121, 0, 0, 0, 0, newRank, 1)
+            player:setCharVar("AlchemyExpertQuest",0)
+            player:setLocalVar("AlchemyTraded",1)
+        else
+            player:startEvent(121, 0, 0, 0, 0, newRank, 0)
+        end
+    elseif newRank ~= 0 and newRank <=9 then
         player:setSkillRank(tpz.skill.ALCHEMY, newRank)
         player:startEvent(121, 0, 0, 0, 0, newRank)
+        player:setLocalVar("AlchemyTraded",1)
     end
 end
 
 function onTrigger(player, npc)
-    local getNewRank = 0
     local craftSkill = player:getSkillLevel(tpz.skill.ALCHEMY)
     local testItem = getTestItem(player, npc, tpz.skill.ALCHEMY)
     local guildMember = isGuildMember(player, 1)
-
+    local rankCap = getCraftSkillCap(player, tpz.skill.ALCHEMY)
+    local expertQuestStatus = 0
+    local Rank = player:getSkillRank(tpz.skill.ALCHEMY)
+    local realSkill = (craftSkill - Rank) / 32
+    local canRankUp = rankCap - realSkill -- used to make sure rank up isn't overridden by ASA mission
     if (guildMember == 1) then guildMember = 150995375; end
+    if player:getCharVar("AlchemyExpertQuest") == 1 then
+        if player:hasKeyItem(tpz.keyItem.WAY_OF_THE_ALCHEMIST) then
+            expertQuestStatus = 550
+        else
+            expertQuestStatus = 600
+        end
+    end
 
-    if (canGetNewRank(player, craftSkill, tpz.skill.ALCHEMY) == 1) then getNewRank = 100; end
-
-    if (player:getCurrentMission(ASA) == tpz.mission.id.asa.THAT_WHICH_CURDLES_BLOOD and guildMember == 150995375 and getNewRank ~= 100) then
+    if (player:getCurrentMission(ASA) == tpz.mission.id.asa.THAT_WHICH_CURDLES_BLOOD and guildMember == 150995375 and canRankUp >= 3) then
         local item = 0
         local asaStatus = player:getCharVar("ASA_Status")
 
@@ -42,16 +65,30 @@ function onTrigger(player, npc)
 
         -- The Parameters are Item IDs for the Recipe
         player:startEvent(590, item, 2774, 929, 4103, 2777, 4103)
+    elseif expertQuestStatus == 550 then
+        --[[  Feeding the proper parameter currently hangs the client in cutscene. This may
+              possibly be due to an unimplemented packet or function (display recipe?) Work
+              around to present dialog to player to let them know the trade is ready to be
+              received by triggering with lower rank up parameters.  ]]--
+        player:showText(npc, 7237)
+        player:showText(npc, 7239)
+        player:startEvent(120, testItem, realSkill, 44, guildMember, 0, 0, 0, 0)
     else
-        player:startEvent(120, testItem, getNewRank, 30, guildMember, 44, 0, 0, 0)
+        player:startEvent(120, testItem, realSkill, rankCap, guildMember, expertQuestStatus, 0, 0, 0)
     end
 end
 
 function onEventUpdate(player, csid, option)
 end
 
 function onEventFinish(player, csid, option)
-    if (csid == 120 and option == 1) then
+    local guildMember = isGuildMember(player, 1)
+
+    if (csid == 120 and option == 2) then
+        if guildMember == 1 then
+            player:setCharVar("AlchemyExpertQuest",1)
+        end
+    elseif (csid == 120 and option == 1) then
         local crystal = 4101 -- water crystal
 
         if (player:getFreeSlotsCount() == 0) then
@@ -61,5 +98,10 @@ function onEventFinish(player, csid, option)
             player:messageSpecial(ID.text.ITEM_OBTAINED, crystal)
             signupGuild(player, guild.alchemy)
         end
+    else
+        if player:getLocalVar("AlchemyTraded") == 1 then
+            player:tradeComplete()
+            player:setLocalVar("AlchemyTraded",0)
+        end
     end
 end

scripts/zones/Metalworks/npcs/Ghemp.lua

@@ -10,37 +10,83 @@ require("scripts/globals/status")
 -----------------------------------
 
 function onTrade(player, npc, trade)
+    local signed = trade:getItem():getSignature() == player:getName() and 1 or 0
     local newRank = tradeTestItem(player, npc, trade, tpz.skill.SMITHING)
 
-    if (newRank ~= 0) then
+    if
+        newRank > 9 and
+        player:getCharVar("SmithingExpertQuest") == 1 and
+        player:hasKeyItem(tpz.keyItem.WAY_OF_THE_BLACKSMITH)
+    then
+        if signed ~=0 then
+            player:setSkillRank(tpz.skill.SMITHING, newRank)
+            player:startEvent(102, 0, 0, 0, 0, newRank, 1)
+            player:setCharVar("SmithingExpertQuest",0)
+            player:setLocalVar("SmithingTraded",1)
+        else
+            player:startEvent(102, 0, 0, 0, 0, newRank, 0)
+        end
+    elseif newRank ~= 0 and newRank <=9 then
         player:setSkillRank(tpz.skill.SMITHING, newRank)
         player:startEvent(102, 0, 0, 0, 0, newRank)
+        player:setLocalVar("SmithingTraded",1)
     end
 end
 
 function onTrigger(player, npc)
-    local getNewRank = 0
     local craftSkill = player:getSkillLevel(tpz.skill.SMITHING)
     local testItem = getTestItem(player, npc, tpz.skill.SMITHING)
     local guildMember = isGuildMember(player, 8)
+    local rankCap = getCraftSkillCap(player, tpz.skill.SMITHING)
+    local expertQuestStatus = 0
+    local Rank = player:getSkillRank(tpz.skill.SMITHING)
+    local realSkill = (craftSkill - Rank) / 32
     if (guildMember == 1) then guildMember = 150995375; end
-    if (canGetNewRank(player, craftSkill, tpz.skill.SMITHING) == 1) then getNewRank = 100; end
 
-    player:startEvent(101, testItem, getNewRank, 30, guildMember, 44, 0, 0, 0)
+    if player:getCharVar("SmithingExpertQuest") == 1 then
+        if player:hasKeyItem(tpz.keyItem.WAY_OF_THE_BLACKSMITH) then
+            expertQuestStatus = 550
+        else
+            expertQuestStatus = 600
+        end
+    end
+
+    if expertQuestStatus == 550 then
+        --[[  Feeding the proper parameter currently hangs the client in cutscene. This may
+              possibly be due to an unimplemented packet or function (display recipe?) Work
+              around to present dialog to player to let them know the trade is ready to be
+              received by triggering with lower rank up parameters.  ]]--
+        player:showText(npc, 6838)
+        player:showText(npc, 6840)
+        player:startEvent(101, testItem, realSkill, 44, guildMember, 0, 0, 0, 0)
+    else
+        player:startEvent(101, testItem, realSkill, rankCap, guildMember, expertQuestStatus, 0, 0, 0)
+    end
 end
 
 -- 908  909  910  920  927  101  102
 function onEventUpdate(player, csid, option)
 end
 
 function onEventFinish(player, csid, option)
-    if (csid == 101 and option == 1) then
+    local guildMember = isGuildMember(player, 8)
+
+    if (csid == 101 and option == 2) then
+        if guildMember == 1 then
+            player:setCharVar("SmithingExpertQuest",1)
+        end
+    elseif (csid == 101 and option == 1) then
         if (player:getFreeSlotsCount() == 0) then
             player:messageSpecial(ID.text.ITEM_CANNOT_BE_OBTAINED, 4096)
         else
             player:addItem(4096)
             player:messageSpecial(ID.text.ITEM_OBTAINED, 4096) -- Fire Crystal
             signupGuild(player, guild.smithing)
         end
+    else
+        if player:getLocalVar("SmithingTraded") == 1 then
+            player:tradeComplete()
+            player:setLocalVar("SmithingTraded",0)
+        end
     end
 end