From 235936a32ce0e1f624ba5f28ac2a59b7d816a96a Mon Sep 17 00:00:00 2001 From: regneq Date: Wed, 20 Dec 2023 11:58:48 -0800 Subject: [PATCH] Elroz- partial hand in dialogue additions and a couple quest reward dialogue additions Robregen - removed adjustments for zone_time{"hour"] since it's fixed in the code. Elroz - north karana fangbreakers following their leader --- butcher/SirensBane.lua | 8 ++++---- butcher/Stormbreaker.lua | 8 ++++---- butcher/player.lua | 8 ++++---- erudnext/Golden_Maiden.lua | 8 ++++---- erudnext/Sea_King.lua | 8 ++++---- erudnext/player.lua | 8 ++++---- erudsxing/Golden_Maiden.lua | 8 ++++---- erudsxing/Sea_King.lua | 8 ++++---- erudsxing/player.lua | 8 ++++---- firiona/Maidens_Voyage.lua | 8 ++++---- firiona/player.lua | 8 ++++---- freporte/SirensBane.lua | 8 ++++---- freporte/Stormbreaker.lua | 8 ++++---- freporte/player.lua | 8 ++++---- highpass/Cordelia_Minster.lua | 2 +- highpass/Cytodl_Krish.lua | 2 +- highpass/Sir_Edwin_Motte.lua | 2 +- hohonora/Guard_Change_Shouter.lua | 4 ++-- iceclad/pirate_runners_skiff.lua | 8 ++++---- iceclad/player.lua | 8 ++++---- katta/Avir_Sterbla.lua | 4 +++- katta/Drenic_Garrison.lua | 4 +++- katta/Incantator_Jak_Masric.lua | 3 ++- katta/Kroldar_Strongarm.lua | 3 ++- katta/Lathin_Firetree.lua | 3 ++- northkarana/Bunu_Stoutheart.lua | 16 ++++++++++++++++ northkarana/Cory_Bumbleye.lua | 17 +++++++++++++++++ northkarana/Fixxin_Followig.lua | 16 ++++++++++++++++ nro/pirate_runners_skiff.lua | 8 ++++---- nro/player.lua | 8 ++++---- oasis/Barrel_Barge.lua | 8 ++++---- oasis/Muckskimmer.lua | 8 ++++---- oasis/player.lua | 8 ++++---- oot/SirensBane.lua | 8 ++++---- oot/Stormbreaker.lua | 8 ++++---- oot/player.lua | 8 ++++---- overthere/Bloated_Belly.lua | 8 ++++---- ponightmare/EinoInvisDay.lua | 2 +- ponightmare/EinoInvisNight.lua | 2 +- qeynos/Chesgard_Sydwen.lua | 2 +- qeynos/Golden_Maiden.lua | 8 ++++---- qeynos/Sea_King.lua | 8 ++++---- qeynos/player.lua | 8 ++++---- qeytoqrg/Pyzjn.lua | 2 +- qeytoqrg/Scruffy.lua | 2 +- qeytoqrg/Tovax_Vmar.lua | 2 +- qeytoqrg/Varsoon.lua | 2 +- qeytoqrg/a_brown_bear.lua | 2 +- qeytoqrg/a_decaying_skeleton.lua | 2 +- qeytoqrg/a_dread_corpse.lua | 2 +- qeytoqrg/a_fire_beetle.lua | 2 +- qeytoqrg/a_giant_rat.lua | 2 +- qeytoqrg/a_gray_wolf.lua | 2 +- qeytoqrg/a_grizzly_bear.lua | 2 +- qeytoqrg/a_large_field_rat.lua | 2 +- qeytoqrg/a_mangy_rat.lua | 2 +- qeytoqrg/a_putrid_skeleton.lua | 2 +- qeytoqrg/a_restless_skeleton.lua | 2 +- qeytoqrg/a_skeleton.lua | 2 +- soltemple/an_undead_knight.lua | 12 +++++++----- soltemple/an_undead_knight_.lua | 23 +++++++++++++---------- timorous/Barrel_Barge.lua | 8 ++++---- timorous/Bloated_Belly.lua | 8 ++++---- timorous/Captains_Skiff.lua | 4 ++-- timorous/Maidens_Voyage.lua | 8 ++++---- timorous/Muckskimmer.lua | 8 ++++---- timorous/player.lua | 8 ++++---- 67 files changed, 239 insertions(+), 178 deletions(-) diff --git a/butcher/SirensBane.lua b/butcher/SirensBane.lua index bea2ceb..6f75e8e 100644 --- a/butcher/SirensBane.lua +++ b/butcher/SirensBane.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 7) then eq.debug("Boat to OOT has reached its destination! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/butcher/Stormbreaker.lua b/butcher/Stormbreaker.lua index 48261dc..cb07387 100644 --- a/butcher/Stormbreaker.lua +++ b/butcher/Stormbreaker.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 7) then eq.debug("Boat to OOT has reached its destination! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/butcher/player.lua b/butcher/player.lua index a986ed8..7a63c6d 100644 --- a/butcher/player.lua +++ b/butcher/player.lua @@ -7,15 +7,15 @@ function event_enter_zone(e) end function event_board_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " BoatID: " .. e.boat_id .. " was boarded. Its name is: " .. e.self:GetBoatName() .. ".", 1); end function event_leave_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " I left BoatID: " .. e.boat_id .. ".", 1); end \ No newline at end of file diff --git a/erudnext/Golden_Maiden.lua b/erudnext/Golden_Maiden.lua index 8fefe4e..680cafa 100644 --- a/erudnext/Golden_Maiden.lua +++ b/erudnext/Golden_Maiden.lua @@ -1,14 +1,14 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 7) then eq.signal(24056,1); -- NPC: Sabrina diff --git a/erudnext/Sea_King.lua b/erudnext/Sea_King.lua index 8a52d0b..6ebfb45 100644 --- a/erudnext/Sea_King.lua +++ b/erudnext/Sea_King.lua @@ -1,14 +1,14 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 7) then eq.signal(24056,1); -- NPC: Sabrina diff --git a/erudnext/player.lua b/erudnext/player.lua index b725e35..000ae25 100644 --- a/erudnext/player.lua +++ b/erudnext/player.lua @@ -20,14 +20,14 @@ function event_signal(e) end function event_board_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " BoatID: " .. e.boat_id .. " was boarded. Its name is: " .. e.self:GetBoatName() .. ".", 1); end function event_leave_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; eq.debug(" At: " .. hour .. ":00 I left BoatID: " .. e.boat_id .. ".", 1); end \ No newline at end of file diff --git a/erudsxing/Golden_Maiden.lua b/erudsxing/Golden_Maiden.lua index e2ea4bd..69ce357 100644 --- a/erudsxing/Golden_Maiden.lua +++ b/erudsxing/Golden_Maiden.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; -- Qeynos if(e.self:GetGrid() == 5 and e.wp == 3) then diff --git a/erudsxing/Sea_King.lua b/erudsxing/Sea_King.lua index 4849676..beb0d98 100644 --- a/erudsxing/Sea_King.lua +++ b/erudsxing/Sea_King.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; -- Qeynos if(e.self:GetGrid() == 5 and e.wp == 3) then diff --git a/erudsxing/player.lua b/erudsxing/player.lua index 20f3149..ebfaaad 100644 --- a/erudsxing/player.lua +++ b/erudsxing/player.lua @@ -7,14 +7,14 @@ function event_enter_zone(e) end function event_board_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " BoatID: " .. e.boat_id .. " was boarded. Its name is: " .. e.self:GetBoatName() .. ".", 1); end function event_leave_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; eq.debug(" At: " .. hour .. ":00 I left BoatID: " .. e.boat_id .. ".", 1); end \ No newline at end of file diff --git a/firiona/Maidens_Voyage.lua b/firiona/Maidens_Voyage.lua index 9ef09de..900975c 100644 --- a/firiona/Maidens_Voyage.lua +++ b/firiona/Maidens_Voyage.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 12) then eq.debug("Boat to timorous (18) has reached the docks. Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/firiona/player.lua b/firiona/player.lua index f8390a8..ae774de 100644 --- a/firiona/player.lua +++ b/firiona/player.lua @@ -1,12 +1,12 @@ function event_board_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " BoatID: " .. e.boat_id .. " was boarded. Its name is: " .. e.self:GetBoatName() .. ".", 1); end function event_leave_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; eq.debug(" At: " .. hour .. ":00 I left BoatID: " .. e.boat_id .. ".", 1); end \ No newline at end of file diff --git a/freporte/SirensBane.lua b/freporte/SirensBane.lua index fb0cd29..ee184cb 100644 --- a/freporte/SirensBane.lua +++ b/freporte/SirensBane.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 9) then eq.debug("Boat to OOT has reached its destination! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/freporte/Stormbreaker.lua b/freporte/Stormbreaker.lua index bc3ae29..4b62054 100644 --- a/freporte/Stormbreaker.lua +++ b/freporte/Stormbreaker.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 9) then eq.debug("Boat to OOT has reached its destination! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/freporte/player.lua b/freporte/player.lua index 68af415..bc0e99b 100644 --- a/freporte/player.lua +++ b/freporte/player.lua @@ -7,15 +7,15 @@ function event_enter_zone(e) end function event_board_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " BoatID: " .. e.boat_id .. " was boarded. Its name is: " .. e.self:GetBoatName() .. ".", 1); end function event_leave_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " I left BoatID: " .. e.boat_id .. ".", 1); end \ No newline at end of file diff --git a/highpass/Cordelia_Minster.lua b/highpass/Cordelia_Minster.lua index 1c82878..490455d 100644 --- a/highpass/Cordelia_Minster.lua +++ b/highpass/Cordelia_Minster.lua @@ -30,7 +30,7 @@ end function event_timer(e) if ( e.timer == "timecheck" and not e.self:IsEngaged() ) then - local zoneTime = eq.get_zone_time()["zone_hour"] + 1; + local zoneTime = eq.get_zone_time()["zone_hour"]; if ( zoneTime < 19 and zoneTime > 6 ) then eq.depop_with_timer(); diff --git a/highpass/Cytodl_Krish.lua b/highpass/Cytodl_Krish.lua index ae1455b..b80c454 100644 --- a/highpass/Cytodl_Krish.lua +++ b/highpass/Cytodl_Krish.lua @@ -22,7 +22,7 @@ end function event_timer(e) if ( e.timer == "timecheck" and not e.self:IsEngaged() ) then - local zoneTime = eq.get_zone_time()["zone_hour"] + 1; + local zoneTime = eq.get_zone_time()["zone_hour"]; if ( zoneTime > 18 or zoneTime < 8 ) then eq.depop_with_timer(); diff --git a/highpass/Sir_Edwin_Motte.lua b/highpass/Sir_Edwin_Motte.lua index 9e874d2..b85fdcf 100644 --- a/highpass/Sir_Edwin_Motte.lua +++ b/highpass/Sir_Edwin_Motte.lua @@ -12,7 +12,7 @@ end function event_timer(e) if ( e.timer == "timecheck" and not e.self:IsEngaged() ) then - local zoneTime = eq.get_zone_time()["zone_hour"] + 1; + local zoneTime = eq.get_zone_time()["zone_hour"]; if ( zoneTime < 19 and zoneTime > 6 ) then eq.depop_with_timer(); diff --git a/hohonora/Guard_Change_Shouter.lua b/hohonora/Guard_Change_Shouter.lua index 9129423..0f7cbc4 100644 --- a/hohonora/Guard_Change_Shouter.lua +++ b/hohonora/Guard_Change_Shouter.lua @@ -60,7 +60,7 @@ function event_timer(e) if ( e.timer == "timecheck" ) then - local zoneTime = eq.get_zone_time()["zone_hour"] + 1; + local zoneTime = eq.get_zone_time()["zone_hour"]; local npc, pause; if ( zoneTime == 7 or zoneTime == 19 ) then @@ -101,7 +101,7 @@ function event_signal(e) if ( newnpc and newnpc.valid ) then - local zoneTime = eq.get_zone_time()["zone_hour"] + 1; + local zoneTime = eq.get_zone_time()["zone_hour"]; for i, id in ipairs(newIDs) do if ( id == newnpc:GetID() and oldIDs[i] ) then diff --git a/iceclad/pirate_runners_skiff.lua b/iceclad/pirate_runners_skiff.lua index b5cc4a6..b8031ad 100644 --- a/iceclad/pirate_runners_skiff.lua +++ b/iceclad/pirate_runners_skiff.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Shuttle spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 4) then eq.debug("Shuttle to nro (2) has reached the docks. Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/iceclad/player.lua b/iceclad/player.lua index f8390a8..ae774de 100644 --- a/iceclad/player.lua +++ b/iceclad/player.lua @@ -1,12 +1,12 @@ function event_board_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " BoatID: " .. e.boat_id .. " was boarded. Its name is: " .. e.self:GetBoatName() .. ".", 1); end function event_leave_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; eq.debug(" At: " .. hour .. ":00 I left BoatID: " .. e.boat_id .. ".", 1); end \ No newline at end of file diff --git a/katta/Avir_Sterbla.lua b/katta/Avir_Sterbla.lua index 1a39ca3..1811e3f 100644 --- a/katta/Avir_Sterbla.lua +++ b/katta/Avir_Sterbla.lua @@ -9,9 +9,11 @@ end function event_trade(e) local item_lib = require("items"); + local text = "I require four samples of vampyre blood."; + local text1 = "I require four such samples for my research. Please see if you can gather more."; -- Handin: 4x Vampyre Ashes (2692) or 4x Vampyre Blood (2693) - if(item_lib.check_turn_in(e.self, e.trade, {item1 = 2692,item2 = 2692,item3 = 2692,item4 = 2692}, 0) or item_lib.check_turn_in(e.self, e.trade, {item1 = 2693,item2 = 2693,item3 = 2693,item4 = 2693}, 0)) then + if(item_lib.check_turn_in(e.self, e.trade, {item1 = 2692,item2 = 2692,item3 = 2692,item4 = 2692},1,text1) or item_lib.check_turn_in(e.self, e.trade, {item1 = 2693,item2 = 2693,item3 = 2693,item4 = 2693},1,text)) then e.self:Say("Thank you " .. e.other:GetCleanName() .. "! These samples will be put to good use I assure you. The Coterie will not stand much longer against the forces of Katta Castellum."); e.other:Faction(e.self,1504,3); -- +Magus Conlegium e.other:Faction(e.self,1502,1); -- +Katta Castellum Citizens diff --git a/katta/Drenic_Garrison.lua b/katta/Drenic_Garrison.lua index 7b0c974..7b5bbb2 100644 --- a/katta/Drenic_Garrison.lua +++ b/katta/Drenic_Garrison.lua @@ -20,6 +20,8 @@ end function event_trade(e) local item_lib = require("items"); + local text = "I require three organs from the snake people."; +"; -- Handin: 1x Muck Beetle Mandible (10412), 1x Black Fungal Fiend Spores (10413), 1x Green Fungal Fiend Spores (10414), 1x Grimfang Poison Sac (10415) if(item_lib.check_turn_in(e.self, e.trade, {item1 = 10412,item2 = 10413,item3 = 10414,item4 = 10415})) then @@ -34,7 +36,7 @@ function event_trade(e) e.other:Faction(e.self,1541,-1); -- -Hand Legionnaries e.other:QuestReward(e.self,0,0,0,0,31743,5000); -- Mug of Purifying Tonic -- Handin: 3x Shissar Organs (10416) - elseif(item_lib.check_turn_in(e.self, e.trade, {item1 = 10416,item2 = 10416,item3 = 10416})) then + elseif(item_lib.check_turn_in(e.self, e.trade, {item1 = 10416,item2 = 10416,item3 = 10416},1,text)) then -- End of Undead Snake Organs e.self:Say("Excellent work " .. e.other:GetCleanName() .. "! The acquisition of these organs is a fantastic accomplishment!"); e.other:Faction(e.self,1504,10); -- +Magus Conlegium diff --git a/katta/Incantator_Jak_Masric.lua b/katta/Incantator_Jak_Masric.lua index 6e73e70..941a175 100644 --- a/katta/Incantator_Jak_Masric.lua +++ b/katta/Incantator_Jak_Masric.lua @@ -6,8 +6,9 @@ end function event_trade(e) local item_lib = require("items"); + local text = "I require the three autarkic shade robes and the robe of the autarkic shade lord."; - if(item_lib.check_turn_in(e.self, e.trade, {item1 = 7373,item2 = 7374,item3 = 7374,item4 = 7374})) then + if(item_lib.check_turn_in(e.self, e.trade, {item1 = 7373,item2 = 7374,item3 = 7374,item4 = 7374},1,text)) then e.self:Say("Hopefully these robes still contain enough of a magical imprint from the shades to be useful in successfully warding the Magus Conlegium from their kind. Thank you for you assistance. Keep this token as a symbol of your allegiance to the Magus Conlegium."); e.other:Faction(e.self,1504,10); -- Magus Conlegium e.other:Faction(e.self,1502,1); -- Katta Castellum Citizens diff --git a/katta/Kroldar_Strongarm.lua b/katta/Kroldar_Strongarm.lua index 7ad0ac8..343d51d 100644 --- a/katta/Kroldar_Strongarm.lua +++ b/katta/Kroldar_Strongarm.lua @@ -9,9 +9,10 @@ end function event_trade(e) local item_lib = require("items"); + local text = "I require the fangs of four Vampyres!"; -- Handin: 4x Vampyre Fang (2691) - if(item_lib.check_turn_in(e.self, e.trade, {item1 = 2691,item2 = 2691,item3 = 2691,item4 = 2691}, 0)) then + if(item_lib.check_turn_in(e.self, e.trade, {item1 = 2691,item2 = 2691,item3 = 2691,item4 = 2691},1,text)) then -- End of Vamprye Fang e.self:Say("You have dedicated yourself to the war with the Coterie of the Eternal Night. I will continue to reward you for the fangs of every four vampyres that you slay. Should you be ambitious and skilled enough to confront the coterie leaders and live I will respectfully grant you honor that you deserve."); e.other:Faction(e.self,1503,5); -- +Validus Custodus diff --git a/katta/Lathin_Firetree.lua b/katta/Lathin_Firetree.lua index ea15b5a..2d37728 100644 --- a/katta/Lathin_Firetree.lua +++ b/katta/Lathin_Firetree.lua @@ -6,8 +6,9 @@ end function event_trade(e) local item_lib = require("items"); + local text = "I require the instructions from Phenic and the Autarkic Shade Lord Belt."; - if(item_lib.check_turn_in(e.self, e.trade, {item1 = 7270,item2 = 7169})) then + if(item_lib.check_turn_in(e.self, e.trade, {item1 = 7270,item2 = 7169},1,text)) then e.self:Say("Phenic wishes me to summon the Shade that is the owner of this belt for questioning. That is quite a dangerous request but it is not uncommon of Phenic to be a risk taker when it comes to his plots against the Coterie of the Eternal Night. Take this sketch and find a skilled potter to craft you a likeness of a shade from a large block of clay as a focus item for the ritual. When you have the unfired figurine fire it in a kiln with this special glaze on a High Quality Firing Sheet and return to me."); e.other:Faction(e.self,1504,2); -- Magus Conlegium e.other:Faction(e.self,1502,1); -- Katta Castellum Citizens diff --git a/northkarana/Bunu_Stoutheart.lua b/northkarana/Bunu_Stoutheart.lua index df7f190..7583e55 100644 --- a/northkarana/Bunu_Stoutheart.lua +++ b/northkarana/Bunu_Stoutheart.lua @@ -1,3 +1,19 @@ +function event_spawn(e) + eq.set_timer("follow",1000); +end + +function event_timer(e) + if(e.timer == "follow") then + local mobtypeID = eq.get_entity_list():GetMobByNpcTypeID(13065); + + if(mobtypeID) then + local follow_mob = mobtypeID:GetID(); + eq.follow(follow_mob,15); + eq.stop_timer("follow"); + end + end +end + function event_say(e) if(e.message:findi("hail")) then e.self:Say("Hail, " .. e.other:GetCleanName() .. "! I am Bunu Stoutheart of the [Fangbreakers]. I am a loyal shaman who serves the will of the Tribunal."); diff --git a/northkarana/Cory_Bumbleye.lua b/northkarana/Cory_Bumbleye.lua index afda76d..537d166 100644 --- a/northkarana/Cory_Bumbleye.lua +++ b/northkarana/Cory_Bumbleye.lua @@ -1,3 +1,20 @@ +function event_spawn(e) + eq.set_timer("follow",1000); +end + +function event_timer(e) + if(e.timer == "follow") then + local mobtypeID = eq.get_entity_list():GetMobByNpcTypeID(13065); + + if(mobtypeID) then + local follow_mob = mobtypeID:GetID(); + eq.follow(follow_mob,25); + eq.stop_timer("follow"); + end + end +end + + function event_say(e) if(e.message:findi("hail")) then e.self:Say("Hey, " .. e.other:GetCleanName() .. "! I am Cory Bumbleye, expert [lycanthrope] tracker. You had better be careful out here. There are [werewolves] in these hills. Heck, if it weren't for us [Fangbreakers], this whole area would be overrun with the flea-bitten beasts."); diff --git a/northkarana/Fixxin_Followig.lua b/northkarana/Fixxin_Followig.lua index 13990de..a179773 100644 --- a/northkarana/Fixxin_Followig.lua +++ b/northkarana/Fixxin_Followig.lua @@ -1,4 +1,20 @@ -- Fixxin Followigs Silvery Blades +function event_spawn(e) + eq.set_timer("follow",1000); +end + +function event_timer(e) + if(e.timer == "follow") then + local mobtypeID = eq.get_entity_list():GetMobByNpcTypeID(13065); + + if(mobtypeID) then + local follow_mob = mobtypeID:GetID(); + eq.follow(follow_mob,35); + eq.stop_timer("follow"); + end + end +end + function event_say(e) if(e.message:findi("hail")) then diff --git a/nro/pirate_runners_skiff.lua b/nro/pirate_runners_skiff.lua index 0c7577d..f33f5fc 100644 --- a/nro/pirate_runners_skiff.lua +++ b/nro/pirate_runners_skiff.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Shuttle spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 6) then eq.debug("Shuttle to iceclad (3) has reached the docks. Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/nro/player.lua b/nro/player.lua index f8390a8..ae774de 100644 --- a/nro/player.lua +++ b/nro/player.lua @@ -1,12 +1,12 @@ function event_board_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " BoatID: " .. e.boat_id .. " was boarded. Its name is: " .. e.self:GetBoatName() .. ".", 1); end function event_leave_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; eq.debug(" At: " .. hour .. ":00 I left BoatID: " .. e.boat_id .. ".", 1); end \ No newline at end of file diff --git a/oasis/Barrel_Barge.lua b/oasis/Barrel_Barge.lua index ae2c405..59a26ca 100644 --- a/oasis/Barrel_Barge.lua +++ b/oasis/Barrel_Barge.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Shuttle spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 5) then eq.debug("Shuttle to timorous (1) has reached the docks. Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/oasis/Muckskimmer.lua b/oasis/Muckskimmer.lua index 329b556..28015f9 100644 --- a/oasis/Muckskimmer.lua +++ b/oasis/Muckskimmer.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Shuttle spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 5) then eq.debug("Shuttle to timorous (1) has reached the docks. Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/oasis/player.lua b/oasis/player.lua index f8390a8..ae774de 100644 --- a/oasis/player.lua +++ b/oasis/player.lua @@ -1,12 +1,12 @@ function event_board_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " BoatID: " .. e.boat_id .. " was boarded. Its name is: " .. e.self:GetBoatName() .. ".", 1); end function event_leave_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; eq.debug(" At: " .. hour .. ":00 I left BoatID: " .. e.boat_id .. ".", 1); end \ No newline at end of file diff --git a/oot/SirensBane.lua b/oot/SirensBane.lua index f773482..69e029e 100644 --- a/oot/SirensBane.lua +++ b/oot/SirensBane.lua @@ -1,14 +1,14 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; -- Freeport if(e.self:GetGrid() == 60 and e.wp == 18) then diff --git a/oot/Stormbreaker.lua b/oot/Stormbreaker.lua index ea9f650..50672d8 100644 --- a/oot/Stormbreaker.lua +++ b/oot/Stormbreaker.lua @@ -1,14 +1,14 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; -- Freeport if(e.self:GetGrid() == 60 and e.wp == 18) then diff --git a/oot/player.lua b/oot/player.lua index 1d25ac3..eab87a0 100644 --- a/oot/player.lua +++ b/oot/player.lua @@ -14,14 +14,14 @@ function event_enter_zone(e) end function event_board_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " BoatID: " .. e.boat_id .. " was boarded. Its name is: " .. e.self:GetBoatName() .. ".", 1); end function event_leave_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; eq.debug(" At: " .. hour .. ":00 I left BoatID: " .. e.boat_id .. ".", 1); end \ No newline at end of file diff --git a/overthere/Bloated_Belly.lua b/overthere/Bloated_Belly.lua index 60aa6e0..d33d5df 100644 --- a/overthere/Bloated_Belly.lua +++ b/overthere/Bloated_Belly.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 13) then eq.debug("Boat to timorous (15) has reached the docks. Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/ponightmare/EinoInvisDay.lua b/ponightmare/EinoInvisDay.lua index 56d7d9c..da070e0 100644 --- a/ponightmare/EinoInvisDay.lua +++ b/ponightmare/EinoInvisDay.lua @@ -34,7 +34,7 @@ end function event_timer(e) if ( e.timer == "timecheck" ) then - local zoneTime = eq.get_zone_time()["zone_hour"] + 1; + local zoneTime = eq.get_zone_time()["zone_hour"]; if ( zoneTime > 19 or zoneTime < 7 ) then eq.debug("EinoInvisDay despawn", 2); eq.depop_with_timer(); diff --git a/ponightmare/EinoInvisNight.lua b/ponightmare/EinoInvisNight.lua index 3f058f0..59885f5 100644 --- a/ponightmare/EinoInvisNight.lua +++ b/ponightmare/EinoInvisNight.lua @@ -13,7 +13,7 @@ end function event_timer(e) if ( e.timer == "timecheck" ) then - local zoneTime = eq.get_zone_time()["zone_hour"] + 1; + local zoneTime = eq.get_zone_time()["zone_hour"]; if ( zoneTime > 6 and zoneTime < 20 ) then eq.depop_with_timer(); eq.debug("EinoInvisNight despawn", 2); diff --git a/qeynos/Chesgard_Sydwen.lua b/qeynos/Chesgard_Sydwen.lua index 50074d0..ebb8b7b 100644 --- a/qeynos/Chesgard_Sydwen.lua +++ b/qeynos/Chesgard_Sydwen.lua @@ -56,7 +56,7 @@ function event_trade(e) if(sash > 0) then repeat - e.self:Say("Good work " .. e.other:Class() .. ". The Karana Bandits have been plaguing the Rainkeepers flock for some time. Take this as a small reward for your devotion. Continue the fight against the Karana Bandits. Ahh... I wish [Cheslin] was equally as skilled."); + e.self:Say("Good work, knight! The Karana Bandits have been plaguing the Rainkeepers flock for some time. Take this as a small reward for your devotion. Continue the fight against the Karana Bandits. Ahh... I wish [Cheslin] was equally as skilled."); -- random bronze item reward -- Confirmed Live Factions and exp data e.other:Faction(e.self,280,20,0); -- Knights of Thunder diff --git a/qeynos/Golden_Maiden.lua b/qeynos/Golden_Maiden.lua index dd44ea7..28f7825 100644 --- a/qeynos/Golden_Maiden.lua +++ b/qeynos/Golden_Maiden.lua @@ -1,14 +1,14 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 12) then eq.debug("Boat to Erudsxing has reached its destination! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/qeynos/Sea_King.lua b/qeynos/Sea_King.lua index 09a9232..5e8dd16 100644 --- a/qeynos/Sea_King.lua +++ b/qeynos/Sea_King.lua @@ -1,14 +1,14 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 12) then eq.debug("Boat to Erudsxing has reached its destination! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/qeynos/player.lua b/qeynos/player.lua index 2482245..7b8af80 100644 --- a/qeynos/player.lua +++ b/qeynos/player.lua @@ -7,14 +7,14 @@ function event_enter_zone(e) end function event_board_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " BoatID: " .. e.boat_id .. " was boarded. Its name is: " .. e.self:GetBoatName() .. ".", 1); end function event_leave_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; eq.debug(" At: " .. hour .. ":00 I left BoatID: " .. e.boat_id .. ".", 1); end \ No newline at end of file diff --git a/qeytoqrg/Pyzjn.lua b/qeytoqrg/Pyzjn.lua index 0945221..1c948be 100644 --- a/qeytoqrg/Pyzjn.lua +++ b/qeytoqrg/Pyzjn.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 7 and ZoneTime < 20) then despawntime = 0; diff --git a/qeytoqrg/Scruffy.lua b/qeytoqrg/Scruffy.lua index c98a655..f794127 100644 --- a/qeytoqrg/Scruffy.lua +++ b/qeytoqrg/Scruffy.lua @@ -3,7 +3,7 @@ function event_spawn(e) end function event_waypoint_arrive(e) - local zoneTime = eq.get_zone_time()["zone_hour"] + 1; + local zoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 13 and e.wp > 0 and e.wp < 3) then e.self:SetRunning(false); elseif(e.self:GetGrid() == 13 and e.wp == 3) then diff --git a/qeytoqrg/Tovax_Vmar.lua b/qeytoqrg/Tovax_Vmar.lua index bbf4b29..57204ec 100644 --- a/qeytoqrg/Tovax_Vmar.lua +++ b/qeytoqrg/Tovax_Vmar.lua @@ -13,7 +13,7 @@ function event_spawn(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 13) then if(e.wp > 0 and e.wp < 3) then e.self:SetRunning(false); diff --git a/qeytoqrg/Varsoon.lua b/qeytoqrg/Varsoon.lua index 8de7d7a..e3ff945 100644 --- a/qeytoqrg/Varsoon.lua +++ b/qeytoqrg/Varsoon.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 7 and ZoneTime < 20) then despawntime = 0; diff --git a/qeytoqrg/a_brown_bear.lua b/qeytoqrg/a_brown_bear.lua index 3ef793e..b501d79 100644 --- a/qeytoqrg/a_brown_bear.lua +++ b/qeytoqrg/a_brown_bear.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 19 and ZoneTime < 8) then despawntime = 0; diff --git a/qeytoqrg/a_decaying_skeleton.lua b/qeytoqrg/a_decaying_skeleton.lua index 525441b..1ef9e2a 100644 --- a/qeytoqrg/a_decaying_skeleton.lua +++ b/qeytoqrg/a_decaying_skeleton.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 7 and ZoneTime < 20) then despawntime = 0; diff --git a/qeytoqrg/a_dread_corpse.lua b/qeytoqrg/a_dread_corpse.lua index 525441b..1ef9e2a 100644 --- a/qeytoqrg/a_dread_corpse.lua +++ b/qeytoqrg/a_dread_corpse.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 7 and ZoneTime < 20) then despawntime = 0; diff --git a/qeytoqrg/a_fire_beetle.lua b/qeytoqrg/a_fire_beetle.lua index 3ef793e..b501d79 100644 --- a/qeytoqrg/a_fire_beetle.lua +++ b/qeytoqrg/a_fire_beetle.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 19 and ZoneTime < 8) then despawntime = 0; diff --git a/qeytoqrg/a_giant_rat.lua b/qeytoqrg/a_giant_rat.lua index 3ef793e..b501d79 100644 --- a/qeytoqrg/a_giant_rat.lua +++ b/qeytoqrg/a_giant_rat.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 19 and ZoneTime < 8) then despawntime = 0; diff --git a/qeytoqrg/a_gray_wolf.lua b/qeytoqrg/a_gray_wolf.lua index 3ef793e..b501d79 100644 --- a/qeytoqrg/a_gray_wolf.lua +++ b/qeytoqrg/a_gray_wolf.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 19 and ZoneTime < 8) then despawntime = 0; diff --git a/qeytoqrg/a_grizzly_bear.lua b/qeytoqrg/a_grizzly_bear.lua index 3ef793e..b501d79 100644 --- a/qeytoqrg/a_grizzly_bear.lua +++ b/qeytoqrg/a_grizzly_bear.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 19 and ZoneTime < 8) then despawntime = 0; diff --git a/qeytoqrg/a_large_field_rat.lua b/qeytoqrg/a_large_field_rat.lua index 3ef793e..b501d79 100644 --- a/qeytoqrg/a_large_field_rat.lua +++ b/qeytoqrg/a_large_field_rat.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 19 and ZoneTime < 8) then despawntime = 0; diff --git a/qeytoqrg/a_mangy_rat.lua b/qeytoqrg/a_mangy_rat.lua index 3ef793e..b501d79 100644 --- a/qeytoqrg/a_mangy_rat.lua +++ b/qeytoqrg/a_mangy_rat.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 19 and ZoneTime < 8) then despawntime = 0; diff --git a/qeytoqrg/a_putrid_skeleton.lua b/qeytoqrg/a_putrid_skeleton.lua index 525441b..1ef9e2a 100644 --- a/qeytoqrg/a_putrid_skeleton.lua +++ b/qeytoqrg/a_putrid_skeleton.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 7 and ZoneTime < 20) then despawntime = 0; diff --git a/qeytoqrg/a_restless_skeleton.lua b/qeytoqrg/a_restless_skeleton.lua index 525441b..1ef9e2a 100644 --- a/qeytoqrg/a_restless_skeleton.lua +++ b/qeytoqrg/a_restless_skeleton.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 7 and ZoneTime < 20) then despawntime = 0; diff --git a/qeytoqrg/a_skeleton.lua b/qeytoqrg/a_skeleton.lua index 525441b..1ef9e2a 100644 --- a/qeytoqrg/a_skeleton.lua +++ b/qeytoqrg/a_skeleton.lua @@ -15,7 +15,7 @@ function event_timer(e) end function event_waypoint_arrive(e) - local ZoneTime = eq.get_zone_time()["zone_hour"] + 1; + local ZoneTime = eq.get_zone_time()["zone_hour"]; if(e.self:GetGrid() == 26 and despawntime == 1) then if(e.wp == 0 and ZoneTime > 7 and ZoneTime < 20) then despawntime = 0; diff --git a/soltemple/an_undead_knight.lua b/soltemple/an_undead_knight.lua index 11e828e..1b5f42e 100644 --- a/soltemple/an_undead_knight.lua +++ b/soltemple/an_undead_knight.lua @@ -16,17 +16,19 @@ end function event_trade(e) local item_lib = require("items"); + local text1 = "Two portions of fairy dust and the right and left decayed boots!!"; + if(item_lib.check_turn_in(e.self, e.trade, {item1 = 12292, item2 = 12291, item3 = 16507})) then e.self:Say("Well done, " .. e.other:GetCleanName() .. ", here is your reward."); - e.other:QuestReward(e.self,0,0,0,0,3144); + e.other:QuestReward(e.self,0,0,0,0,3144,5000); end if(item_lib.check_turn_in(e.self, e.trade, {item1 = 12294, item2 = 12293, item3 = 12297, item4 = 12297})) then e.self:Say("You have been granted the darkforge greaves!!"); - e.other:QuestReward(e.self,0,0,0,0,3145); + e.other:QuestReward(e.self,0,0,0,0,3145,5000); end - if(item_lib.check_turn_in(e.self, e.trade, {item1 = 12296, item2 = 12295, item3 = 12106, item4 = 12106})) then - e.self:Say("Well done, " .. e.other:GetCleanName() .. ", here is your reward."); - e.other:QuestReward(e.self,0,0,0,0,3146); + if(item_lib.check_turn_in(e.self, e.trade, {item1 = 12296, item2 = 12295, item3 = 12106, item4 = 12106},1,text1)) then + e.self:Say("You may now wear the darkforge boots!!"); + e.other:QuestReward(e.self,0,0,0,0,3146,5000); end item_lib.return_items(e.self, e.other, e.trade) end diff --git a/soltemple/an_undead_knight_.lua b/soltemple/an_undead_knight_.lua index f568b5b..8eecf5b 100644 --- a/soltemple/an_undead_knight_.lua +++ b/soltemple/an_undead_knight_.lua @@ -16,23 +16,26 @@ end function event_trade(e) local item_lib = require("items"); - local text1 = "Two damaged Freeport Militia helms, the decayed helm and the decayed visor."; + local text1 = "Two damaged Freeport Militia helms, the decayed helm and the decayed visor."; + local text2 = "The decayed breastplate, decayed mail and two enchanted platinum bars."; + local text3 = "The minotaur hero shackles and both right and left decayed bracers."; + local text4 = "A Qeynos kite shield and the right and left decayed vambraces."; if(item_lib.check_turn_in(e.self, e.trade, {item1 = 12283, item2 = 12284, item3 = 13921, item4 = 13921},1,text1)) then e.self:Say("You now own the darkforge helm."); - e.other:QuestReward(e.self,0,0,0,0,3140); + e.other:QuestReward(e.self,0,0,0,0,3140,5000); end - if(item_lib.check_turn_in(e.self, e.trade, {item1 = 12285, item2 = 12286, item3 = 16507, item4 = 16507})) then + if(item_lib.check_turn_in(e.self, e.trade, {item1 = 12285, item2 = 12286, item3 = 16507, item4 = 16507},1,text2)) then e.self:Say("I grant you the darkforge breastplate!!"); - e.other:QuestReward(e.self,0,0,0,0,3141); + e.other:QuestReward(e.self,0,0,0,0,3141,5000); end - if(item_lib.check_turn_in(e.self, e.trade, {item1 = 12288, item2 = 12287, item3 = 9023})) then - e.self:Say("Well done, " .. e.other:GetCleanName() .. ", here is your reward."); - e.other:QuestReward(e.self,0,0,0,0,3142); + if(item_lib.check_turn_in(e.self, e.trade, {item1 = 12288, item2 = 12287, item3 = 9023},1,text4)) then + e.self:Say("You now have the darkforge vambraces."); + e.other:QuestReward(e.self,0,0,0,0,3142,5000); end - if(item_lib.check_turn_in(e.self, e.trade, {item1 = 12290, item2 = 12289, item3 = 19075})) then - e.self:Say("Well done, " .. e.other:GetCleanName() .. ", here is your reward."); - e.other:QuestReward(e.self,0,0,0,0,3143); + if(item_lib.check_turn_in(e.self, e.trade, {item1 = 12290, item2 = 12289, item3 = 19075},1,text3)) then + e.self:Say("You now own a darkforge bracer."); + e.other:QuestReward(e.self,0,0,0,0,3143,5000); end item_lib.return_items(e.self, e.other, e.trade) end diff --git a/timorous/Barrel_Barge.lua b/timorous/Barrel_Barge.lua index 53fe7fb..e0e1a1d 100644 --- a/timorous/Barrel_Barge.lua +++ b/timorous/Barrel_Barge.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Shuttle spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 22) then eq.debug("Shuttle to oasis (5) has reached the island. Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/timorous/Bloated_Belly.lua b/timorous/Bloated_Belly.lua index 3098a67..ebc1b11 100644 --- a/timorous/Bloated_Belly.lua +++ b/timorous/Bloated_Belly.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 40) then eq.debug("Boat to overthere (15) has reached the docks. Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/timorous/Captains_Skiff.lua b/timorous/Captains_Skiff.lua index 6a0e422..bf60ec7 100644 --- a/timorous/Captains_Skiff.lua +++ b/timorous/Captains_Skiff.lua @@ -5,8 +5,8 @@ function event_signal(e) end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 2) then eq.stop(); diff --git a/timorous/Maidens_Voyage.lua b/timorous/Maidens_Voyage.lua index aa13990..7cdacd2 100644 --- a/timorous/Maidens_Voyage.lua +++ b/timorous/Maidens_Voyage.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Boat spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 4) then eq.signal(96075,1); -- NPC: Island_Shuttle diff --git a/timorous/Muckskimmer.lua b/timorous/Muckskimmer.lua index 93f0cc8..42cb110 100644 --- a/timorous/Muckskimmer.lua +++ b/timorous/Muckskimmer.lua @@ -1,13 +1,13 @@ function event_spawn(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug("Shuttle spawned! Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); end function event_waypoint_arrive(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; if(e.wp == 22) then eq.debug("Shuttle to oasis (5) has reached the island. Name is: " .. e.self:GetName() .. " Time is: " .. hour ..":" .. minute .. "", 1); diff --git a/timorous/player.lua b/timorous/player.lua index 9a2d3e3..6ac27c8 100644 --- a/timorous/player.lua +++ b/timorous/player.lua @@ -1,6 +1,6 @@ function event_board_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; local minute = zone_time["zone_minute"]; eq.debug(" At: " .. hour .. ":" .. minute .. " BoatID: " .. e.boat_id .. " was boarded. Its name is: " .. e.self:GetBoatName() .. ".", 1); end @@ -16,7 +16,7 @@ function event_signal(e) end function event_leave_boat(e) - local zone_time = eq.get_zone_time(); -- Time here is off by 1, so 6AM = 5. - local hour = zone_time["zone_hour"] + 1; + local zone_time = eq.get_zone_time(); + local hour = zone_time["zone_hour"]; eq.debug(" At: " .. hour .. ":00 I left BoatID: " .. e.boat_id .. ".", 1); end \ No newline at end of file