Merge branch 'regine' into release

scripts/globals/npc_util.lua

@@ -221,9 +221,13 @@ function npcUtil.giveItem(player, items)
     end
 
     -- give items to player
+    local messagedItems = {}
     for _, v in pairs(givenItems) do
         if player:addItem(v[1], v[2], true) then
-            player:messageSpecial(ID.text.ITEM_OBTAINED, v[1])
+            if not messagedItems[v[1]] then
+                player:messageSpecial(ID.text.ITEM_OBTAINED, v[1])
+            end
+            messagedItems[v[1]] = true
         elseif #givenItems == 1 then
             player:messageSpecial(ID.text.ITEM_CANNOT_BE_OBTAINED, givenItems[1][1])
             return false

scripts/zones/Northern_San_dOria/IDs.lua

@@ -28,13 +28,14 @@ zones[tpz.zone.NORTHERN_SAN_DORIA] =
         NOT_HAVE_ENOUGH_GP       = 6988, -- You do not have enough guild points.
         CONQUEST_BASE            = 7258, -- Tallying conquest results...
         FISHING_MESSAGE_OFFSET   = 7417, -- You can't fish here.
-        GUILBERDRIER_DIALOG      = 11145, -- A magic shop, you say? A bit of magic would come in handy... I know! I'll have my daughter study it for me!
+        FFR_GUILBERDRIER         = 11145, -- A magic shop, you say? A bit of magic would come in handy... I know! I'll have my daughter study it for me!
         ABIOLEGET_DIALOG         = 11221, -- All of Altana's children are welcome here.
         PELLIMIE_DIALOG          = 11222, -- Is this your first time here? Join us in prayer!
         FITTESEGAT_DIALOG        = 11223, -- Paradise is a place without fear, without death!
         MAURINE_DIALOG           = 11224, -- Papsque Shamonde sometimes addresses the city from the balcony, you know. I long for his blessing, if but once!
         PRERIVON_DIALOG          = 11225, -- With each sermon, I take another step closer to Paradise.
         MALFINE_DIALOG           = 11226, -- Truly fortunate are we that words of sacrament are read every day!
+        COULLENE_DIALOG          = 11227, -- Goddess above, deliver us to Paradise!
         OLBERGIEUT_DIALOG        = 11269, -- Friar Faurbellant is on retreat at the Crag of Holla. Please give <item> to him.
         GUILERME_DIALOG          = 11341, -- Behold Chateau d'Oraguille, the greatest fortress in the realm!
         PHAVIANE_DIALOG          = 11345, -- This is Victory Arch. Beyond lies Southern San d'Oria.
@@ -55,6 +56,7 @@ zones[tpz.zone.NORTHERN_SAN_DORIA] =
         PICKPOCKET_MAURINNE      = 11470, -- A pickpocket?
         PICKPOCKET_RODAILLECE    = 11472, -- A pickpocket? Maybe it was that foul-mouthed woman just now. She called me a spoony bard! Unthinkable!
         AIVEDOIR_DIALOG          = 11503, -- That's funny. I could have sworn she asked me to meet her here...
+        CAPIRIA_DIALOG           = 11504, -- He's late! I do hope he hasn't forgotten.
         BERTENONT_DIALOG         = 11505, -- Stars are more beautiful up close. Don't you agree?
         FLYER_REFUSED            = 11517, -- Your flyer is refused.
         GILIPESE_DIALOG          = 11526, -- Nothing to report!
@@ -77,10 +79,10 @@ zones[tpz.zone.NORTHERN_SAN_DORIA] =
         EUGBALLION_OPEN_DIALOG   = 11637, -- Have a look at these goods imported direct from Qufim Island!
         CHAUPIRE_SHOP_DIALOG     = 11638, -- San d'Orian woodcraft is the finest in the land!
         CONQUEST                 = 11704, -- You've earned conquest points!
-        BONCORT_DIALOG           = 12051, -- Hmm... With magic, I could get hold of materials a mite easier. I'll have to check this mart out.
-        CAPIRIA_DIALOG           = 12052, -- A flyer? For me? Some reading material would be a welcome change of pace, indeed!
-        VILLION_DIALOG           = 12053, -- Opening a shop of magic, without consulting me first? I must pay this Regine a visit!
-        COULLENE_DIALOG          = 12054, -- Magic could be of use on my journey to Paradise. Thank you so much!
+        FFR_BONCORT              = 12051, -- Hmm... With magic, I could get hold of materials a mite easier. I'll have to check this mart out.
+        FFR_CAPIRIA              = 12052, -- A flyer? For me? Some reading material would be a welcome change of pace, indeed!
+        FFR_VILLION              = 12053, -- Opening a shop of magic, without consulting me first? I must pay this Regine a visit!
+        FFR_COULLENE             = 12054, -- Magic could be of use on my journey to Paradise. Thank you so much!
         FLYER_ACCEPTED           = 12055, -- Your flyer is accepted!
         FLYER_ALREADY            = 12056, -- This person already has a flyer.
         MOGHOUSE_EXIT            = 12355, -- You have learned your way through the back alleys of San d'Oria! Now you can exit to any area from your residence.

scripts/zones/Northern_San_dOria/npcs/Boncort.lua

@@ -10,13 +10,14 @@ require("scripts/globals/quests")
 require("scripts/globals/shop")
 
 function onTrade(player,npc,trade)
-    if player:getQuestStatus(SANDORIA,tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED and npcUtil.tradeHas(trade, 532) then
+    -- FLYERS FOR REGINE
+    if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED and npcUtil.tradeHas(trade, 532) then
         if player:getCharVar("tradeBoncort") == 0 then
-            player:confirmTrade()
-            player:messageSpecial(ID.text.BONCORT_DIALOG)
             player:messageSpecial(ID.text.FLYER_ACCEPTED)
+            player:messageSpecial(ID.text.FFR_BONCORT)
             player:addCharVar("FFR", -1)
             player:setCharVar("tradeBoncort", 1)
+            player:confirmTrade()
         else
             player:messageSpecial(ID.text.FLYER_ALREADY)
         end

scripts/zones/Northern_San_dOria/npcs/Capiria.lua

@@ -3,22 +3,22 @@
 --  NPC: Capiria
 -- Type: Involved in Quest (Flyers for Regine)
 -- !pos -127.355 0.000 130.461 231
---
 -----------------------------------
 local ID = require("scripts/zones/Northern_San_dOria/IDs");
 require("scripts/globals/quests");
 -----------------------------------
 
 function onTrade(player,npc,trade)
-    if (player:getQuestStatus(SANDORIA,tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED) then
-        if (trade:hasItemQty(532,1) and trade:getItemCount() == 1 and player:getCharVar("tradeCapiria") == 0) then
-            player:messageSpecial(ID.text.CAPIRIA_DIALOG);
-            player:addCharVar("FFR", -1);
-            player:setCharVar("tradeCapiria",1);
-            player:messageSpecial(ID.text.FLYER_ACCEPTED);
-            player:tradeComplete();
-        elseif (player:getCharVar("tradeCapiria") ==1) then
-            player:messageSpecial(ID.text.FLYER_ALREADY);
+    -- FLYERS FOR REGINE
+    if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED and npcUtil.tradeHas(trade, 532) then
+        if player:getCharVar("tradeCapiria") == 0 then
+            player:messageSpecial(ID.text.FLYER_ACCEPTED)
+            player:messageSpecial(ID.text.FFR_CAPIRIA)
+            player:addCharVar("FFR", -1)
+            player:setCharVar("tradeCapiria", 1)
+            player:confirmTrade()
+        else
+            player:messageSpecial(ID.text.FLYER_ALREADY)
         end
     end
 end;

scripts/zones/Northern_San_dOria/npcs/Coullene.lua

@@ -3,22 +3,22 @@
 --  NPC: Coullene
 -- Type: Involved in Quest (Flyers for Regine)
 -- !pos 146.420 0.000 127.601 231
---
 -----------------------------------
 local ID = require("scripts/zones/Northern_San_dOria/IDs");
 require("scripts/globals/quests");
 -----------------------------------
 
 function onTrade(player,npc,trade)
-    if (player:getQuestStatus(SANDORIA,tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED) then
-        if (trade:hasItemQty(532,1) and trade:getItemCount() == 1 and player:getCharVar("tradeCoulene") == 0) then
-            player:messageSpecial(ID.text.COULLENE_DIALOG);
-            player:addCharVar("FFR", -1);
-            player:setCharVar("tradeCoulene",1);
-            player:messageSpecial(ID.text.FLYER_ACCEPTED);
-            player:tradeComplete();
-        elseif (player:getCharVar("tradeCoulene") ==1) then
-            player:messageSpecial(ID.text.FLYER_ALREADY);
+    -- FLYERS FOR REGINE
+    if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED and npcUtil.tradeHas(trade, 532) then
+        if player:getCharVar("tradeCoullene") == 0 then
+            player:messageSpecial(ID.text.FLYER_ACCEPTED)
+            player:messageSpecial(ID.text.FFR_COULLENE)
+            player:addCharVar("FFR", -1)
+            player:setCharVar("tradeCoullene", 1)
+            player:confirmTrade()
+        else
+            player:messageSpecial(ID.text.FLYER_ALREADY)
         end
     end
 end;

scripts/zones/Northern_San_dOria/npcs/Guilberdrier.lua

@@ -11,15 +11,15 @@ require("scripts/globals/quests")
 -----------------------------------
 
 function onTrade(player, npc, trade)
+    -- FLYERS FOR REGINE
     if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED and npcUtil.tradeHas(trade, 532) then
         if player:getCharVar("tradeGuilberdrier") == 0 then
-            player:messageSpecial(ID.text.CAPIRIA_DIALOG) -- gave this NPC a generic response to flyer. I don't see a unique one in the extract. need retail capture.
             player:messageSpecial(ID.text.FLYER_ACCEPTED)
-            player:messageSpecial(ID.text.FLYERS_HANDED, 17 - player:getCharVar("FFR"))
-            player:addCharVar("FFR", -1);
+            player:messageSpecial(ID.text.FFR_GUILBERDRIER)
+            player:addCharVar("FFR", -1)
             player:setCharVar("tradeGuilberdrier", 1)
             player:confirmTrade()
-        elseif player:getCharVar("tradeGuilberdrier") == 1 then
+        else
             player:messageSpecial(ID.text.FLYER_ALREADY)
         end
     end

scripts/zones/Northern_San_dOria/npcs/Villion.lua

@@ -4,22 +4,22 @@
 -- Type: Adventurer's Assistant NPC
 --  Involved in Quest: Flyers for Regine
 -- !pos -157.524 4.000 263.818 231
---
 -----------------------------------
 local ID = require("scripts/zones/Northern_San_dOria/IDs");
 require("scripts/globals/quests");
 -----------------------------------
 
 function onTrade(player,npc,trade)
-    if (player:getQuestStatus(SANDORIA,tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED) then
-        if (trade:hasItemQty(532,1) and trade:getItemCount() == 1 and player:getCharVar("tradeVilion") == 0) then
-            player:messageSpecial(ID.text.VILLION_DIALOG);
-            player:addCharVar("FFR", -1);
-            player:setCharVar("tradeVilion",1);
-            player:messageSpecial(ID.text.FLYER_ACCEPTED);
-            player:tradeComplete();
-        elseif (player:getCharVar("tradeVilion") ==1) then
-            player:messageSpecial(ID.text.FLYER_ALREADY);
+    -- FLYERS FOR REGINE
+    if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED and npcUtil.tradeHas(trade, 532) then
+        if player:getCharVar("tradeVilion") == 0 then
+            player:messageSpecial(ID.text.FLYER_ACCEPTED)
+            player:messageSpecial(ID.text.FFR_VILLION)
+            player:addCharVar("FFR", -1)
+            player:setCharVar("tradeVilion", 1)
+            player:confirmTrade()
+        else
+            player:messageSpecial(ID.text.FLYER_ALREADY)
         end
     end
 end;

scripts/zones/Port_San_dOria/IDs.lua

@@ -24,7 +24,6 @@ zones[tpz.zone.PORT_SAN_DORIA] =
         FLYER_REFUSED                  = 7557, -- This person isn't interested.
         FLYER_ALREADY                  = 7558, -- This person already has a flyer.
         FLYER_ACCEPTED                 = 7559, -- Your flyer is accepted!
-        FLYERS_HANDED                  = 7560, -- You've handed out <number> flyer(s).
         PICKPOCKET_COMITTIE            = 7597, -- A pickpocket? No one like that around here.
         PICKPOCKET_MEINEMELLE          = 7601, -- Have I seen anyone suspicious? No, not around here. Sorry!
         PICKPOCKET_LAUCIMERCEN         = 7608, -- A pickpocket? No, not round here.
@@ -37,17 +36,17 @@ zones[tpz.zone.PORT_SAN_DORIA] =
         PICKPOCKET_CORIBALGEANT        = 7631, -- I'd like to just to take a moogle and-- Ah, pardon me, I was lost in thought. No, I haven't seen anyone suspicious.
         PICKPOCKET_PARCARIN            = 7794, -- Long live King Destin! Huh? Pickpockets? Can't you see I'm in the middle of something here?
         PICKPOCKET_SOLGIERTE           = 7797, -- Confound them! Give me a sword and... Eh? A pickpocket? Do I look like I hang out with that sort?
-        PORTAURE_DIALOG                = 7824, -- What's this? A magic shop? Hmm...I could use a new line of work, and magic just might be the ticket!
+        FFR_PORTAURE                   = 7824, -- What's this? A magic shop? Hmm...I could use a new line of work, and magic just might be the ticket!
         PICKPOCKET_SHERIDAN            = 7828, -- What? A pickpocket? Hey! I may be a loafer, but I'm no thief!
-        ANSWALD_DIALOG                 = 7844, -- A magic shop? Oh, it's right near here. I'll go check it out sometime.
+        FFR_ANSWALD                    = 7844, -- A magic shop? Oh, it's right near here. I'll go check it out sometime.
         PICKPOCKET_ANSWALD             = 7845, -- A pickpocket!? Whew, my wallet's safe. It takes money to be an adventurer!
         PICKPOCKET_ARTINIEN            = 7854, -- My grandpa always said that only a thief would take other people's things! If I find that pickpocket... Wham! Wham!
         PICKPOCKET_BRIFALIEN           = 7855, -- My grandpa always said that the only stuff thieves take are other people's things! If I find that pickpocket, he's chocobo-feed!
-        PRIETTA_DIALOG                 = 7868, -- This is the first I've heard of a magic shop here in San d'Oria. Such arts have never been popular in the Kingdom.
+        FFR_PRIETTA                    = 7868, -- This is the first I've heard of a magic shop here in San d'Oria. Such arts have never been popular in the Kingdom.
         PICKPOCKET_MAUNADOLACE         = 7872, -- A pickpocket? I would have detained anyone suspicious coming this way.
-        AUVARE_DIALOG                  = 7875, -- What have I got here? Look, I can't read, but I takes what I gets, and you ain't getting it back!
+        FFR_AUVARE                     = 7875, -- What have I got here? Look, I can't read, but I takes what I gets, and you ain't getting it back!
         ALBINIE_SHOP_DIALOG            = 7888, -- Welcome to my simple shop.
-        MIENE_DIALOG                   = 7928, -- Oh, a magic shop... Here in San d'Oria? I'd take a look if I got more allowance.
+        FFR_MIENE                      = 7928, -- Oh, a magic shop... Here in San d'Oria? I'd take a look if I got more allowance.
         COULLAVE_SHOP_DIALOG           = 7934, -- Can I help you?
         CROUMANGUE_SHOP_DIALOG         = 7935, -- Can't fight on an empty stomach. How about some nourishment?
         FIVA_OPEN_DIALOG               = 7936, -- I've got imports from Kolshushu!

scripts/zones/Port_San_dOria/npcs/Answald.lua

@@ -11,13 +11,12 @@ function onTrade(player, npc, trade)
     -- FLYERS FOR REGINE
     if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED and npcUtil.tradeHas(trade, 532) then
         if player:getCharVar("tradeAnswald") == 0 then
-            player:messageSpecial(ID.text.ANSWALD_DIALOG)
             player:messageSpecial(ID.text.FLYER_ACCEPTED)
-            player:messageSpecial(ID.text.FLYERS_HANDED, 17 - player:getCharVar("FFR"))
+            player:messageSpecial(ID.text.FFR_ANSWALD)
             player:addCharVar("FFR", -1)
             player:setCharVar("tradeAnswald", 1)
             player:confirmTrade()
-        elseif (player:getCharVar("tradeAnswald") ==1) then
+        else
             player:messageSpecial(ID.text.FLYER_ALREADY)
         end
     end

scripts/zones/Port_San_dOria/npcs/Auvare.lua

@@ -8,16 +8,16 @@ require("scripts/globals/quests");
 -----------------------------------
 
 function onTrade(player,npc,trade)
-    if (player:getQuestStatus(SANDORIA,tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED) then
-        if (trade:hasItemQty(532,1) and trade:getItemCount() == 1 and player:getCharVar("tradeAuvare") == 0) then
-            player:messageSpecial(ID.text.AUVARE_DIALOG);
+    -- FLYERS FOR REGINE
+    if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED and npcUtil.tradeHas(trade, 532) then
+        if player:getCharVar("tradeAuvare") == 0 then
+            player:messageSpecial(ID.text.FLYER_ACCEPTED)
+            player:messageSpecial(ID.text.FFR_AUVARE)
             player:addCharVar("FFR", -1)
-            player:setCharVar("tradeAuvare",1);
-            player:messageSpecial(ID.text.FLYER_ACCEPTED);
-            player:messageSpecial(ID.text.FLYERS_HANDED,17 - player:getCharVar("FFR"));
-            player:tradeComplete();
-        elseif (player:getCharVar("tradeAuvare") ==1) then
-            player:messageSpecial(ID.text.FLYER_ALREADY);
+            player:setCharVar("tradeAuvare", 1)
+            player:confirmTrade()
+        else
+            player:messageSpecial(ID.text.FLYER_ALREADY)
         end
     end
 end;

scripts/zones/Port_San_dOria/npcs/Miene.lua

@@ -15,13 +15,12 @@ function onTrade(player, npc, trade)
     -- FLYERS FOR REGINE
     if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED and npcUtil.tradeHas(trade, 532) then
         if player:getCharVar("tradeMiene") == 0 then
-            player:messageSpecial(ID.text.MIENE_DIALOG)
             player:messageSpecial(ID.text.FLYER_ACCEPTED)
-            player:messageSpecial(ID.text.FLYERS_HANDED, 17 - player:getCharVar("FFR"))
+            player:messageSpecial(ID.text.FFR_MIENE)
             player:addCharVar("FFR", -1)
             player:setCharVar("tradeMiene", 1)
             player:confirmTrade()
-        elseif player:getCharVar("tradeMiene") == 1 then
+        else
             player:messageSpecial(ID.text.FLYER_ALREADY)
         end
     end

scripts/zones/Port_San_dOria/npcs/Portaure.lua

@@ -8,16 +8,16 @@ require("scripts/globals/quests");
 -----------------------------------
 
 function onTrade(player,npc,trade)
-    if (player:getQuestStatus(SANDORIA,tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED) then
-        if (trade:hasItemQty(532,1) and trade:getItemCount() == 1 and player:getCharVar("tradePortaure") == 0) then
-            player:messageSpecial(ID.text.PORTAURE_DIALOG);
+    -- FLYERS FOR REGINE
+    if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED and npcUtil.tradeHas(trade, 532) then
+        if player:getCharVar("tradePortaure") == 0 then
+            player:messageSpecial(ID.text.FLYER_ACCEPTED)
+            player:messageSpecial(ID.text.FFR_PORTAURE)
             player:addCharVar("FFR", -1)
-            player:setCharVar("tradePortaure",1);
-            player:messageSpecial(ID.text.FLYER_ACCEPTED);
-            player:messageSpecial(ID.text.FLYERS_HANDED,17 - player:getCharVar("FFR"));
-            player:tradeComplete();
-        elseif (player:getCharVar("tradePortaure") ==1) then
-            player:messageSpecial(ID.text.FLYER_ALREADY);
+            player:setCharVar("tradePortaure", 1)
+            player:confirmTrade()
+        else
+            player:messageSpecial(ID.text.FLYER_ALREADY)
         end
     end
 end;

scripts/zones/Port_San_dOria/npcs/Prietta.lua

@@ -8,18 +8,18 @@ require("scripts/globals/quests");
 -----------------------------------
 
 function onTrade(player,npc,trade)
-    if (player:getQuestStatus(SANDORIA,tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED) then
-        if (trade:hasItemQty(532,1) and trade:getItemCount() == 1 and player:getCharVar("tradePrietta") == 0) then
-            player:messageSpecial(ID.text.PRIETTA_DIALOG);
+    -- FLYERS FOR REGINE
+    if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.FLYERS_FOR_REGINE) == QUEST_ACCEPTED and npcUtil.tradeHas(trade, 532) then
+        if player:getCharVar("tradePrietta") == 0 then
+            player:messageSpecial(ID.text.FLYER_ACCEPTED)
+            player:messageSpecial(ID.text.FFR_PRIETTA)
             player:addCharVar("FFR", -1)
-            player:setCharVar("tradePrietta",1);
-            player:messageSpecial(ID.text.FLYER_ACCEPTED);
-            player:messageSpecial(ID.text.FLYERS_HANDED,17 - player:getCharVar("FFR"));
-            player:tradeComplete();
-            elseif (player:getCharVar("tradePrietta") ==1) then
-                player:messageSpecial(ID.text.FLYER_ALREADY);
-            end
+            player:setCharVar("tradePrietta", 1)
+            player:confirmTrade()
+        else
+            player:messageSpecial(ID.text.FLYER_ALREADY)
         end
+    end
 end;
 
 function onTrigger(player,npc)