diff --git a/erudnext/Nolusia_Finharn.lua b/erudnext/Nolusia_Finharn.lua index db93958..f37416e 100644 --- a/erudnext/Nolusia_Finharn.lua +++ b/erudnext/Nolusia_Finharn.lua @@ -54,7 +54,7 @@ function event_trade(e) e.other:Faction(e.self,266,2); -- High Council of Erudin e.other:Faction(e.self,265,-3); -- Heretics e.other:Faction(e.self,267,3); -- High Guard of Erudin - e.other:QuestReward(e.self,0,0,0,0,13122,300); -- Item: Eruds Tonic + e.other:QuestReward(e.self,0,0,0,0,13122,300); -- Item: Eruds Tonic -- verified exp on live elseif(item_lib.check_turn_in(e.self, e.trade, {item1 = 13123})) then e.self:Say("Fantastic. Now I can rest assured that my brother stands a better chance of finding the right path without that manipulating little man around. Master Lanken can rest assured that the waters are safe from abuse."); -- Confirmed Live Faction diff --git a/erudnext/Sinnkin_Highbrow.lua b/erudnext/Sinnkin_Highbrow.lua index 70b91c7..2009dd1 100644 --- a/erudnext/Sinnkin_Highbrow.lua +++ b/erudnext/Sinnkin_Highbrow.lua @@ -18,7 +18,7 @@ function event_trade(e) e.self:Say("It's about time you figured it out, genius! Maybe you should spend more time in the library. Here, take this tonic and get out of here before they see me giving it to you and turn us both inside out."); -- confirmed live faction e.other:Faction(e.self,694,5,0); -- Faction: Erudite Citizen - e.other:QuestReward(e.self,0,0,0,0,13118,50); -- Item: Eruds Tonic + e.other:QuestReward(e.self,0,0,0,0,13118,50); -- Item: Eruds Tonic -- verified xp on live end item_lib.return_items(e.self, e.other, e.trade); end diff --git a/freporte/Raltur_Caliskon.lua b/freporte/Raltur_Caliskon.lua index 9dba249..403b74d 100644 --- a/freporte/Raltur_Caliskon.lua +++ b/freporte/Raltur_Caliskon.lua @@ -4,7 +4,9 @@ function event_say(e) elseif(e.message:findi("serve innoruuk")) then e.self:Say("Wise choice. We of the Dismal Rage have learned of the value of incompetence. As the Teir'Dal use the ogres and the trolls so to shall the Dismal Rage have A pawn in this game. Ours is the Freeport Militia. They trust us. How unfortunate for them. I want you to go speak with Sir Lucan D'lere, the so called ruler of this city and leader of this mob of ruffians called the Freeport Militia. Tell him you are [ from the Shrine of Innoruuk ]. Do as he asks. Little favors lead to large debts. And if you should find something of importance, bring it to me not that inept warrior."); elseif(e.message:findi("mission")) then - e.self:Say("Antonius Bayle has created a strong alliance with certain groups from four other cities. He and his allies are clearly up to no good, or rather, all good. We require more information. Visiting our fair city is a woman called Lady Shae. We have learned that she is heading to Qeynos soon, returning something called the [Bayle List]. Find her before she leaves. Bring me her Bayle List III."); + if(not eq.is_content_flag_enabled("Classic_OldWorldDrops")) then + e.self:Say("Antonius Bayle has created a strong alliance with certain groups from four other cities. He and his allies are clearly up to no good, or rather, all good. We require more information. Visiting our fair city is a woman called Lady Shae. We have learned that she is heading to Qeynos soon, returning something called the [Bayle List]. Find her before she leaves. Bring me her Bayle List III."); + end end end diff --git a/freporte/Venox_Tarkog.lua b/freporte/Venox_Tarkog.lua index a0963c6..84dd4f8 100644 --- a/freporte/Venox_Tarkog.lua +++ b/freporte/Venox_Tarkog.lua @@ -4,7 +4,9 @@ function event_say(e) elseif(e.message:findi("innoruuk")) then e.self:Say("You do not even know the name of the Prince of Hate! That is a crime in here. Our god Innoruuk speaks with Pietro Zarn himself. It was Innoruuk who told him to create the Dismal Rage. You should speak with our family. Perhaps someone will help you better understand our beliefs."); elseif(e.message:findi("bayle list")) then - e.self:Say("Oh. You must be the shadowknight who is to return the list to [Pietro Zarn]. The Bayle List is actually three scrolls with coded words. Alone they are nonsense. Together they can be decoded and tell something of value. Antonius Bayle had them created and gave them to three of his most trusted friends. Of these, I know Lady Shae, his old love. Then there is Captain Linarius Grafe, captain of the outer Qeynos Guards. Lastly, there is Frenway Marthank, Antonius Bayle's oldest friend. He is a resident of the Jaggedpine. When you recover the scrolls, you must take them to Rathmana Allin. He is a master scribe. He will decode the scrolls for us. He can be found in the deserts of South Ro. Now you'd best be off, before some other finds the scrolls. You must get there first and return the decoded list to Pietro Zarn."); + if(not eq.is_content_flag_enabled("Classic_OldWorldDrops")) then + e.self:Say("Oh. You must be the shadowknight who is to return the list to [Pietro Zarn]. The Bayle List is actually three scrolls with coded words. Alone they are nonsense. Together they can be decoded and tell something of value. Antonius Bayle had them created and gave them to three of his most trusted friends. Of these, I know Lady Shae, his old love. Then there is Captain Linarius Grafe, captain of the outer Qeynos Guards. Lastly, there is Frenway Marthank, Antonius Bayle's oldest friend. He is a resident of the Jaggedpine. When you recover the scrolls, you must take them to Rathmana Allin. He is a master scribe. He will decode the scrolls for us. He can be found in the deserts of South Ro. Now you'd best be off, before some other finds the scrolls. You must get there first and return the decoded list to Pietro Zarn."); + end end end diff --git a/freportw/Lady_Shae.lua b/freportw/Lady_Shae.lua index 2e6ddc0..59516f0 100644 --- a/freportw/Lady_Shae.lua +++ b/freportw/Lady_Shae.lua @@ -16,7 +16,9 @@ function event_say(e) elseif(e.message:findi("house of pain")) then e.self:Say("How droll. I have no interest in warriors or bad jesters."); elseif(e.message:findi("dyllin")) then - e.self:Say("Dyllin was the name of a Qeynos guard who was sent to pick up the list I was holding for dear, sweet Antonius. He left just yesterday. If you wish to meet up with him, I heard him say he was going to stop at Highpass Hold."); + if(not eq.is_content_flag_enabled("Classic_OldWorldDrops")) then + e.self:Say("Dyllin was the name of a Qeynos guard who was sent to pick up the list I was holding for dear, sweet Antonius. He left just yesterday. If you wish to meet up with him, I heard him say he was going to stop at Highpass Hold."); + end end end @@ -28,7 +30,7 @@ function event_trade(e) e.self:Say("Thank you. Pandos has been telling me to try white wine forever. I mostly only drink red wine. Pardon me for getting off track. Anyway, it is a good thing you showed up. The lady in room 2 has been receiving mail from a Dark Elf. You [need the mail for room two]. The Innkeeper usually holds it for the guests."); e.other:Faction(e.self,156,2,0); -- Faction: FelGuard e.other:QuestReward(e.self,0,0,0,0,0,5); - elseif(item_lib.check_turn_in(e.self, e.trade, {item1 = 13030,item2 = 13030,item3 = 13030,item4 = 13030}, 1, text)) then + elseif(not eq.is_content_flag_enabled("Classic_OldWorldDrops") and item_lib.check_turn_in(e.self, e.trade, {item1 = 13030,item2 = 13030,item3 = 13030,item4 = 13030}, 1, text)) then e.self:Say("Oh my.. You are so kind. I can not tell you the last time I had so much fine wine. Well, there was the time Antonius Bayle told me he no longer had the time for a committed relationship. Mister big ruler of the world. Make it to the top and find someone younger. I know his plan. I hate him. I will never trust another human again. After all that, he goes and asks me to hold on to this list for him. Well I am glad it was taken from me by that [Dyllin]. Antonius Bayle has no ties to me any more!! Good riddance! Oooooh! I love him."); e.other:Faction(e.self,156,2,0); -- Faction: FelGuard e.other:QuestReward(e.self,0,0,0,0,0,240); diff --git a/freportw/Sir_Lucan_D-Lere.lua b/freportw/Sir_Lucan_D-Lere.lua index c595e07..0a5e527 100644 --- a/freportw/Sir_Lucan_D-Lere.lua +++ b/freportw/Sir_Lucan_D-Lere.lua @@ -1,6 +1,6 @@ function event_say(e) if(e.message:findi("hail")) then - e.self:Say("Hail. citizen! I am very busy. I do not have time to speak with you. If you have any complaints. please direct them to City Hall. Unless. of course. you have some personal business in which I might be interested."); + e.self:Say("Hail, citizen! I am very busy, I do not have time to speak with you. If you have any complaints, please direct them to City Hall. Unless, of course, you have some personal business in which I might be interested."); elseif(e.message:findi("shrine of innoruuk")) then e.self:Say("It is about time Pietro sent someone. You people should be lucky I allow you to conduct your business in this city. I will have you all locked up if you cannot be more prompt. Now, listen up! I want you to go out to the Commonlands. My guards have reported that a messenger from Qeynos is staying at an inn near the western edge of the Commonlands. I suspect he is carrying vital information to the Hall of Truth. I want him stopped. Bring me the message if you know what's good for you and the Dismal Rage. Now, get out of here!"); end diff --git a/global/a_boat.lua b/global/a_boat.lua index 5d34a1d..d56b93e 100644 --- a/global/a_boat.lua +++ b/global/a_boat.lua @@ -3,18 +3,19 @@ -- The boat receives a signal (id 0) whenever the server gets a ControlBoat opcode function event_signal(e) - eq.stop_timer("respawn"); -- stop any respawn countdown in progress - eq.set_timer("checkuse", 60); -- begin checking for use every minute + eq.stop_timer("respawn"); -- stop any respawn countdown in progress + eq.set_timer("checkuse", 60); -- begin checking for use every minute end function event_timer(e) - if(e.timer == "checkuse") then - if(not e.self:GetTarget()) then -- if the boat has a target, it's in use. If not, begin the respawn timer - eq.stop_timer("checkuse"); -- stop checking for use - eq.set_timer("respawn",3600); -- start the respawn timer at 1 hour - end - end - if(e.timer == "respawn") then - eq.depop(); -- it hasn't been used for an hour, so respawn the boat - end + if(e.timer == "checkuse") then + if(not e.self:GetTarget()) then -- if the boat has a target, it's in use. If not, begin the respawn timer + eq.stop_timer("checkuse"); -- stop checking for use + eq.set_timer("respawn",3600000); -- start the respawn timer at 1 hour + end + end + + if(e.timer == "respawn") then + eq.depop_with_timer(); -- it hasn't been used for an hour, so respawn the boat + end end \ No newline at end of file diff --git a/global/encounters/guardresist.lua b/global/encounters/guardresist.lua new file mode 100644 index 0000000..68210f0 --- /dev/null +++ b/global/encounters/guardresist.lua @@ -0,0 +1,37 @@ +local GUARDS = { + 8058,8057,8055,8056,8054,8053,8052,8045,8005,8074,8011,8010,8009,8083,8080,8082,8004,8081,8079,8006,8071,8063,8062,8061,8059,8060,8007,8008,8046, + 9140,9134,9025,9030,9023,9032,9107, + 9021,9031,9019,9017,9016,9037,9033,9014,9029,9106,9015,9022, + 10174,10110,10148,10084,10024,10015,10085,10151,10142,10168,10143,10103,10057,10056,10055,10054,10020,10022,10018,10027, + 19010,19008,19004,19073,19014,19108,19013,19003,19006,19111,19107,19012,19005,19002,19009,19007,19011,19109,19110, + 29034,29031,29032,29033,29064,29073,29065,29072, + 40081,40085,40047,40051,40046,40063,40116, + 41103,41080,41101,41074,41116,41077,41033,41075,41073,41076,41111,41110,41078, + 42100,42114,42095,42110,42094, + 47076,47077, + 49122,49124,49000,49119,49050,49012,49105,49014,49003,49110,49123,49120,49099,49116,49094, + 52002,52003,52004,52005,52006,52123,52007,52008,52112,52009,52114,52010,52011,52012,52013,52014,52015,52115,52016,52017,52116,52018,52019,52020,52091, + 54115,54241,54244,54268,54259,54119,54249,54247,54265,54245,54242,54248,54240,54269,54220,54260,54246,54263,54243, + 55196,55076,55206,55212,55077,55203,55209,55192,55222,55046,55041,55213,55055,55211,55186,55040,55198,55201,55193,55185,55207, + 60017,60054,60063,60010,60058,60068,60059,60053,60064,60066,60028,60065,60061,60052,60013,60056,60009,60060,60067,60003, + 61005,61077,61078,61074,61087,61072,61079,61081,61084,61083,61086,61082,61075, + 62035,62023,62032,62025,62034,62033,62024, + 67034,67072,67038,67074,67036,67047, + 68028,68107,68074,68088,68110,68217,68031,68069,68025,68209,68165,68067,68101,68182,68068,68047,68256 +}; + +function GuardResistSpawn(e) + if(eq.is_content_flag_enabled("Classic_OldWorldDrops")) then + e.self:SetFR(75); + e.self:SetMR(75); + e.self:SetCR(75); + e.self:SetPR(60); + e.self:SetDR(60); + end +end + +function event_encounter_load(e) + for _, GuardSpawn in ipairs(GUARDS) do + eq.register_npc_event("guardresist", Event.spawn, GuardSpawn, GuardResistSpawn); + end +end \ No newline at end of file diff --git a/global/script_init.lua b/global/script_init.lua index 46c5c95..64d7774 100644 --- a/global/script_init.lua +++ b/global/script_init.lua @@ -5,4 +5,5 @@ require("npc_ext"); require("entity_list_ext"); require("general_ext"); require("bit"); -require("directional"); \ No newline at end of file +require("directional"); +eq.load_encounter("guardresist"); \ No newline at end of file diff --git a/lakerathe/Cyanelle.lua b/lakerathe/Cyanelle.lua index 156293c..d1c6c40 100644 --- a/lakerathe/Cyanelle.lua +++ b/lakerathe/Cyanelle.lua @@ -1,6 +1,6 @@ function event_say(e) if(e.message:findi("Hail")) then - e.self:Say("Hello. " .. e.other:GetCleanName() .. "."); + e.self:Say("Hello, " .. e.other:GetCleanName() .. "."); end end diff --git a/lakerathe/Derg.lua b/lakerathe/Derg.lua index de1883d..eaf7756 100644 --- a/lakerathe/Derg.lua +++ b/lakerathe/Derg.lua @@ -1,6 +1,6 @@ function event_say(e) if(e.message:findi("Hail")) then - e.self:Say("Yesterday. I took my yearly bath in the big lake. Can you tell? I swam out to the aviak dive and jumped in! Jumping in the lake from their platform is always such fun! Down at the bottom. I saw something red and shiny. I wish I could hold my breath long enough to go find out what it was."); + e.self:Say("Yesterday, I took my yearly bath in the big lake. Can you tell? I swam out to the aviak dive and jumped in! Jumping in the lake from their platform is always such fun! Down at the bottom, I saw something red and shiny. I wish I could hold my breath long enough to go find out what it was."); end end diff --git a/lakerathe/Rondel.lua b/lakerathe/Rondel.lua index 65e9702..5d311ff 100644 --- a/lakerathe/Rondel.lua +++ b/lakerathe/Rondel.lua @@ -1,8 +1,8 @@ function event_say(e) if(e.message:findi("Hail")) then - e.self:Say("Hello. stranger. Are you an adventurer?"); + e.self:Say("Hello, stranger. Are you an adventurer?"); elseif(e.message:findi("adventurer")) then - e.self:Say("I wish I could go off and explore the world like you. I will spend my days as a fisherman here. I am sure. Nothing ever happens around here though. Well. except for the other day.."); + e.self:Say("I wish I could go off and explore the world like you. I will spend my days as a fisherman here, I am sure. Nothing ever happens around here though. Well, except for the other day.."); elseif(e.message:findi("what.* other day")) then e.self:Say("I was spearfishing near the aviak construction and something amazing happened. I was in the middle of spearing a fish when something at the bottom of the lake began to glow red. I could swear I heard the sounds of a dragon. I did not stick around to find out what it was."); end diff --git a/lakerathe/Taia_Lyfol.lua b/lakerathe/Taia_Lyfol.lua index a7c3fef..4cd02b5 100644 --- a/lakerathe/Taia_Lyfol.lua +++ b/lakerathe/Taia_Lyfol.lua @@ -1,6 +1,10 @@ function event_say(e) if(e.message:findi("Hail")) then - e.self:Say("Hello. " .. e.other:GetCleanName() .. ". What brings you to the watery lands of Rathtear? Do you seek [enlightenment]?'"); + e.self:Say("Hello, " .. e.other:GetCleanName() .. ". What brings you to the watery lands of Rathetear? Do you seek [enlightenment]?"); + elseif(e.message:findi("enlightenment")) then + e.self:Emote("in a hushed voice, almost inaudible...'I was once told that there was a noble man who held a sword of immense power. He was known all throughout Norrath as being a powerful, yet gentle man. During one of his crusades something awful [happened]."); + elseif(e.message:findi("happened")) then + e.self:Emote("leans forward, brushes her hand lightly against your cheek and says 'Death.'"); end end diff --git a/misty/Deputy_Eigon.lua b/misty/Deputy_Eigon.lua index 5a0c774..8ca9639 100644 --- a/misty/Deputy_Eigon.lua +++ b/misty/Deputy_Eigon.lua @@ -13,7 +13,7 @@ function event_trade(e) e.other:Faction(e.self,355, 1); -- Faction: Storm Reapers e.other:Faction(e.self,292, 1); -- Faction: Merchants of Rivervale e.other:Faction(e.self,334, -1); -- Faction: Dreadguard Outer - e.other:QuestReward(e.self,math.random(20),0,0,0,0,500); + e.other:QuestReward(e.self,math.random(20),0,0,0,0,50); --verified exp end end diff --git a/qcat/Commander_Kane.lua b/qcat/Commander_Kane.lua index 369c590..39e8a65 100644 --- a/qcat/Commander_Kane.lua +++ b/qcat/Commander_Kane.lua @@ -14,12 +14,16 @@ function event_say(e) elseif(e.message:findi("nerissa")) then e.self:Say("You keep your eyes off that sweet, innocent girl! She is under my care."); elseif(e.message:findi("the disease is spreading")) then - e.self:Say("Good to see you, my friend. S'ragg said he would be sending his finest. I pray he is right. Do you feel like [going to Highpass] or [going home]?"); + if(not eq.is_content_flag_enabled("Classic_OldWorldDrops")) then + e.self:Say("Good to see you, my friend. S'ragg said he would be sending his finest. I pray he is right. Do you feel like [going to Highpass] or [going home]?"); + end elseif(e.message:findi("going home")) then e.self:Say("Just as well. Get the shrine to send me someone of strength. No more cowards!"); elseif(e.message:findi("going to Highpass")) then - e.self:Say("You will be taking this with you. Give this marked bottle to a man called Barn Bloodstone. He is known to hang around a place called the Golden Rooster. He has a package for me. He will then give you instructions to your next destination. Now, be off! Time is of the essence!"); - e.other:SummonCursorItem(13130); -- Item: Blackburrow Stout + if(not eq.is_content_flag_enabled("Classic_OldWorldDrops")) then + e.self:Say("You will be taking this with you. Give this marked bottle to a man called Barn Bloodstone. He is known to hang around a place called the Golden Rooster. He has a package for me. He will then give you instructions to your next destination. Now, be off! Time is of the essence!"); + e.other:SummonCursorItem(13130); -- Item: Blackburrow Stout + end end end diff --git a/qeynos/Runethar_Hamest.lua b/qeynos/Runethar_Hamest.lua index 7387a96..9dab4b2 100644 --- a/qeynos/Runethar_Hamest.lua +++ b/qeynos/Runethar_Hamest.lua @@ -4,7 +4,11 @@ end function event_say(e) if(e.message:findi("hail")) then - e.self:Say("Welcome to the Temple of Thunder. We are home to paladins and clerics who follow the ways of Karana. Do you [need guidance] or are you [already a follower of Karana]?"); + if(not eq.is_content_flag_enabled("Classic_OldWorldDrops")) then + e.self:Say("Welcome to the Temple of Thunder. We are home to paladins and clerics who follow the ways of Karana. Do you [need guidance] or are you [already a follower of Karana]?"); + else + e.self:Say("Welcome to the Temple of Thunder. We are home to paladins and clerics who follow the ways of Karana. Do you [need guidance]?"); --made up text + end elseif(e.message:findi("need guidance")) then e.self:Say("Then go forth into the church and speak with Gehna Solbenya. She will assist you."); elseif(e.message:findi("follower of karana") or e.message:findi("wish to assist")) then @@ -20,13 +24,15 @@ function event_say(e) e.self:Say("You have proven yourself not only an enemy of the Knights of Thunder, but an enemy of Karana himself. Now leave, sewer rat!"); end elseif(e.message:findi("retrieve the Bayle list")) then - if(e.other:GetFactionValue(e.self) >= 900) then - e.self:Say("The Temple of Thunder was asked by Antonius Bayle to retrieve a list. He does not trust his own militia of late. He asked me to send a knight to the Jaggedpine to find a man named Frenway Marthank. When you find him, you are to tell him that [Toe needs the Bayle List]. Return the Bayle List and your Thunder Staff to me and I shall provide a fine reward. Be aware that the shadowknights of Bertoxxulous are also after the list. Be careful!"); - elseif(e.other:GetFactionValue(e.self) >= 0) then - e.self:Say("Well, friend, the Temple of Thunder has recognized and appreciates your past deeds for us. But this matter is of vital importance to us and we need more proof of your devotion to our cause."); - else - e.self:Say("You have proven yourself not only an enemy of the Knights of Thunder, but an enemy of Karana himself. Now leave, sewer rat!"); - end + if(not eq.is_content_flag_enabled("Classic_OldWorldDrops")) then + if(e.other:GetFactionValue(e.self) >= 900) then + e.self:Say("The Temple of Thunder was asked by Antonius Bayle to retrieve a list. He does not trust his own militia of late. He asked me to send a knight to the Jaggedpine to find a man named Frenway Marthank. When you find him, you are to tell him that [Toe needs the Bayle List]. Return the Bayle List and your Thunder Staff to me and I shall provide a fine reward. Be aware that the shadowknights of Bertoxxulous are also after the list. Be careful!"); + elseif(e.other:GetFactionValue(e.self) >= 0) then + e.self:Say("Well, friend, the Temple of Thunder has recognized and appreciates your past deeds for us. But this matter is of vital importance to us and we need more proof of your devotion to our cause."); + else + e.self:Say("You have proven yourself not only an enemy of the Knights of Thunder, but an enemy of Karana himself. Now leave, sewer rat!"); + end + end elseif(e.message:findi("honored member")) then if(e.other:GetFactionValue(e.self) >= 50) then e.self:Say("Yes. The light of righteousness shines from within you."); diff --git a/qeynos2/Flynn_Merrington.lua b/qeynos2/Flynn_Merrington.lua index ba94315..b4d0bbd 100644 --- a/qeynos2/Flynn_Merrington.lua +++ b/qeynos2/Flynn_Merrington.lua @@ -28,7 +28,7 @@ function event_trade(e) e.other:Faction(e.self,230,-3,0); -- Faction: Corrupt Qeynos Guards e.other:Faction(e.self,262,3,0); -- Faction: Guards of Qeynos e.other:Faction(e.self,273,-2,0); -- Faction: Kane Bayle - e.other:QuestReward(e.self,0,0,0,0,13123,1000); -- Item: Label of Erud's Tonic + e.other:QuestReward(e.self,0,0,0,0,13123,1000); -- Item: Label of Erud's Tonic -- confirmed xp reward end item_lib.return_items(e.self, e.other, e.trade) end diff --git a/qeynos2/Moodoro_Finharn.lua b/qeynos2/Moodoro_Finharn.lua index 9ba52d1..ca3d6f3 100644 --- a/qeynos2/Moodoro_Finharn.lua +++ b/qeynos2/Moodoro_Finharn.lua @@ -43,8 +43,8 @@ function event_trade(e) e.other:Faction(e.self,233,20,0); -- Faction: Crimson Hands e.other:Faction(e.self,266,2,0); -- Faction: High Council of Erudin e.other:Faction(e.self,265,-3,0); -- Faction: Heretics - e.other:Faction(e.self,267,2,0); -- Faction: High Guard of Erudin - e.other:QuestReward(e.self,math.random(10),0,0,0,0,100); + e.other:Faction(e.self,267,3,0); -- Faction: High Guard of Erudin + e.other:QuestReward(e.self,math.random(10),0,0,0,0,100); --verified xp and faction elseif(item_lib.check_turn_in(e.self, e.trade, {item1 = 13994})) then e.self:Say("Lucky you. We were hoping to really clean you out. Here you go. Take the page. Even together, the book is nothing more than fiction."); e.other:QuestReward(e.self,0,0,0,0,13836); -- Item: Page 34 of a Book diff --git a/qrg/Frenway_Marthank.lua b/qrg/Frenway_Marthank.lua index 4557c58..45b9b28 100644 --- a/qrg/Frenway_Marthank.lua +++ b/qrg/Frenway_Marthank.lua @@ -1,6 +1,6 @@ function event_say(e) if(e.message:findi("hail")) then - e.self:Say("Greetings. stranger. Please excuse my melancholy state. I have had some [bad news] that has brought me great sorrow."); + e.self:Say("Greetings, stranger. Please excuse my melancholy state. I have had some [bad news] that has brought me great sorrow."); elseif(e.message:findi("bayle list")) then e.self:Say("The Bayle List is my property. Return it to me if you have it. There is no more I can say of the list, but if you have the note and refuse to return it, then I shall let it be known that you betray [Antonius Bayle] himself!"); elseif(e.message:findi("toe.* bayle list")) then diff --git a/qrg/Mammoth.lua b/qrg/Mammoth.lua index 173257a..7770e27 100644 --- a/qrg/Mammoth.lua +++ b/qrg/Mammoth.lua @@ -1,7 +1,7 @@ function event_trade(e) local item_lib = require("items"); - if(item_lib.check_turn_in(e.self, e.trade, {item1 = 12139})) then + if(not eq.is_content_flag_enabled("Classic_OldWorldDrops") and item_lib.check_turn_in(e.self, e.trade, {item1 = 12139})) then e.other:Faction(e.self,343, 1,0); -- Faction: QRG Protected Animals e.other:Faction(e.self,302, 1,0); -- Faction: Protectors of Pine e.other:Faction(e.self,272, 1,0); -- Faction: Jaggedpine Treefolk