Skip to content
This repository was archived by the owner on Dec 4, 2020. It is now read-only.

Commit 6f3f94d

Browse files
zach2goodzach2good
committed
Merge branch 'release' into canary
# Conflicts: # sql/zone_settings.sql
2 parents fc2ce13 + 5fde2aa commit 6f3f94d

File tree

18 files changed

+568
-551
lines changed

18 files changed

+568
-551
lines changed

‎scripts/globals/porter_moogle_util.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ local slipItems = {
2727
[slipIds[16]] = { 27684, 27828, 27964, 28111, 28244, 27685, 27829, 27965, 28112, 28245, 27686, 27830, 27966, 28113, 28246, 28246, 27831, 27967, 28114, 28247, 27688, 27832, 27968, 28115, 28248, 27689, 27833, 27969, 28116, 28249, 27690, 27834, 27970, 28117, 28250, 27691, 27835, 27971, 28118, 28251, 27692, 27836, 27972, 28119, 28252, 27693, 27837, 27973, 28120, 28253, 27694, 27838, 27974, 28121, 28254, 27695, 27839, 27975, 28122, 28255, 27696, 27840, 27976, 28123, 28256, 27697, 27841, 27977, 28124, 28257, 27698, 27842, 27978, 28125, 28258, 27699, 27843, 27979, 28126, 28259, 27700, 27844, 27980, 28127, 28260, 27701, 27845, 27981, 28128, 28261, 27702, 27846, 27982, 28129, 28262, 27703, 27847, 27983, 28130, 28263, 27704, 27848, 27984, 28131, 28264, 27705, 27849, 27985, 28132, 28265, 27706, 27850, 27986, 28133, 28266 },
2828
[slipIds[17]] = { 26624, 26800, 26976, 27152, 27328, 26626, 26802, 26978, 27154, 27330, 26628, 26804, 26980, 27156, 27332, 26630, 26806, 26982, 27158, 27334, 26632, 26808, 26984, 27160, 27336, 26634, 26810, 26986, 27162, 27338, 26636, 26812, 26988, 27164, 27340, 26638, 26814, 26990, 27166, 27342, 26640, 26816, 26992, 27168, 27344, 26642, 26818, 26994, 27170, 27346, 26644, 26820, 26996, 27172, 27348, 26646, 26822, 26998, 27174, 27350, 26648, 26824, 27000, 27176, 27352, 26650, 26826, 27002, 27178, 27354, 26652, 26828, 27004, 27180, 27356, 26654, 26830, 27006, 27182, 27358, 26656, 26832, 27008, 27184, 27360, 26658, 26834, 27010, 27186, 27362, 26660, 26836, 27012, 27188, 27364, 26662, 26838, 27014, 27190, 27366, 26664, 26840, 27016, 27192, 27368, 26666, 26842, 27018, 27194, 27370 },
2929
[slipIds[18]] = { 26625, 26801, 26977, 27153, 27329, 26627, 26803, 26979, 27155, 27331, 26629, 26805, 26981, 27157, 27333, 26631, 26807, 26983, 27159, 27335, 26633, 26809, 26985, 27161, 27337, 26635, 26811, 26987, 27163, 27339, 26637, 26813, 26989, 27165, 27341, 26639, 26815, 26991, 27167, 27343, 26641, 26817, 26993, 27169, 27345, 26643, 26819, 26995, 27171, 27347, 26645, 26821, 26997, 27173, 27349, 26647, 26823, 26999, 27175, 27351, 26649, 26825, 27001, 27177, 27353, 26651, 26827, 27003, 27179, 27355, 26653, 26829, 27005, 27181, 27357, 26655, 26831, 27007, 27183, 27359, 26657, 26833, 27009, 27185, 27361, 26659, 26835, 27011, 27187, 27363, 26661, 26837, 27013, 27189, 27365, 26663, 26839, 27015, 27191, 27367, 26665, 26841, 27017, 27193, 27369, 26667, 26843, 27019, 27195, 27371 },
30-
[slipIds[19]] = { 27715, 27866, 27716, 27867, 278, 281, 284, 3680, 3681, 27859, 28149, 27860, 28150, 21107, 21108, 27625, 27626, 26693, 26694, 26707, 26708, 27631, 27632, 26705, 26706, 27854, 27855, 26703, 26704, 3682, 3683, 3684, 3685, 3686, 3687, 3688, 3689, 3690, 3691, 3692, 3693, 3694, 3695, 21097, 21098, 26717, 26718, 26728, 26719, 26720, 26889, 26890, 21095, 21096, 26738, 26739, 26729, 26730, 26788, 26946, 27281, 27455, 26789 },
30+
[slipIds[19]] = { 27715, 27866, 27716, 27867, 278, 281, 284, 3680, 3681, 27859, 28149, 27860, 28150, 21107, 21108, 27625, 27626, 26693, 26694, 26707, 26708, 27631, 27632, 26705, 26706, 27854, 27855, 26703, 26704, 3682, 3683, 3684, 3685, 3686, 3687, 3688, 3689, 3690, 3691, 3692, 3693, 3694, 3695, 21097, 21098, 26717, 26718, 26728, 26719, 26720, 26889, 26890, 21095, 21096, 26738, 26739, 26729, 26730, 26788, 26946, 27281, 27455, 26789, 3698, 20713, 20714, 26798, 26954, 26799, 26955, 3706, 26956, 26957, 3705, 26964, 26965, 27291, 26967, 27293, 26966, 27292, 26968, 27294, 21153, 21154, 21086, 21087, 25606, 26974, 27111, 27296, 27467, 25607, 26975, 27112, 27297, 27468, 14195, 14830, 14831, 13945, 13946, 14832, 13947, 17058, 13948, 14400, 14392, 14393, 14394, 14395, 14396, 14397, 14398, 14399, 11337, 11329, 11330, 11331, 11332, 11333, 11334, 11335, 11336, 15819, 15820, 15821, 15822, 15823, 15824, 15825, 15826, 3670, 3672, 3661, 3595, 3665, 3668, 3663, 3674, 3667, 191, 28, 153, 151, 198, 202, 142, 134, 137, 340, 341, 334, 335, 337, 339, 336, 342, 338, 3631, 3632, 3625, 3626, 3628, 3630, 3627, 3633, 3629, 25632, 25633, 25604, 25713, 27325, 25714, 27326, 3651, 25711, 25712, 10925, 10948, 10949, 10950, 10951, 10952, 10953, 10954, 10955, 25657, 25756, 25658, 25757, 25909 },
3131
[slipIds[20]] = { 26740, 26898, 27052, 27237, 27411, 26742, 26900, 27054, 27239, 27413, 26744, 26902, 27056, 27241, 27415, 26746, 26904, 27058, 27243, 27417, 26748, 26906, 27060, 27245, 27419, 26750, 26908, 27062, 27247, 27421, 26752, 26910, 27064, 27249, 27423, 26754, 26912, 27066, 27251, 27425, 26756, 26914, 27068, 27253, 27427, 26758, 26916, 27070, 27255, 27429, 26760, 26918, 27072, 27257, 27431, 26762, 26920, 27074, 27259, 27433, 26764, 26922, 27076, 27261, 27435, 26766, 26924, 27078, 27263, 27437, 26768, 26926, 27080, 27265, 27439, 26770, 26928, 27082, 27267, 27441, 26772, 26930, 27084, 27269, 27443, 26774, 26932, 27086, 27271, 27445, 26776, 26934, 27088, 27273, 27447, 26778, 26936, 27090, 27275, 27449, 26780, 26938, 27092, 27277, 27451, 26782, 26940, 27094, 27279, 27453 },
3232
[slipIds[21]] = { 26741, 26899, 27053, 27238, 27412, 26743, 26901, 27055, 27240, 27414, 26745, 26903, 27057, 27242, 27416, 26747, 26905, 27059, 27244, 27418, 26749, 26907, 27061, 27246, 27420, 26751, 26909, 27063, 27248, 27422, 26753, 26911, 27065, 27250, 27424, 26755, 26913, 27067, 27252, 27426, 26757, 26915, 27069, 27254, 27428, 26759, 26917, 27071, 27256, 27430, 26761, 26919, 27073, 27258, 27432, 26763, 26921, 27075, 27260, 27434, 26765, 26923, 27077, 27262, 27436, 26767, 26925, 27079, 27264, 27438, 26769, 26927, 27081, 27266, 27440, 26771, 26929, 27083, 27268, 27442, 26773, 26931, 27085, 27270, 27444, 26775, 26933, 27087, 27272, 27446, 26777, 26935, 27089, 27274, 27448, 26779, 26937, 27091, 27276, 27450, 26781, 26939, 27093, 27278, 27452, 26783, 26941, 27095, 27280, 27454 },
3333
[slipIds[22]] = { 25639, 25715, 25638, 3707, 3708, 21074, 26406, 25645, 25726, 25648, 25649, 25650, 25758, 25759, 25672, 25673, 282, 279, 280, 268, 25670, 25671, 26520, 25652, 25653, 22017, 22018, 25586, 25587, 10384, 10385, 22019, 22020, 25722, 25585, 25776, 25677, 25677, 25675, 25676, 20668, 20669, 22069, 25755, 37222, 21608, 3713, 3714, 3715, 3717, 3727, 3728, 20577, 3726, 20666, 20667, 21741, 21609, 3723, 26410, 26411, 25850, 21509, 3725, 3720, 21658, 26524, 20665, 26412, 21965, 21966, 21967, 25774, 25838, 25775, 25839, 3724, 3721, 21682, 22072, 21820, 21821, 23731, 26517, 23730, 20573, 20674, 21742, 21860, 22065, 22039, 22124, 22132, 3719, 3738, 26518, 27623, 21867, 21868, 22283, 26516, 20933, 20578, 20568, 3739 },

‎scripts/globals/status.lua‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,10 @@ tpz.latent =
16281628
ZONE_HOME_NATION = 54, -- in zone and citizen of nation (aketons)
16291629
MP_OVER = 55, -- mp greater than # - PARAM: MP #
16301630
WEAPON_DRAWN_MP_OVER = 56, -- while weapon is drawn and mp greater than # - PARAM: MP #
1631-
ELEVEN_ROLL_ACTIVE = 57 -- corsair roll of 11 active
1631+
ELEVEN_ROLL_ACTIVE = 57, -- corsair roll of 11 active
1632+
IN_ASSAULT = 58, -- is in an Instance battle in a TOAU zone
1633+
VS_ECOSYSTEM = 59, -- Vs. Specific Ecosystem ID (e.g. Vs. Birds: Accuracy+3)
1634+
VS_FAMILY = 60, -- Vs. Specific Family ID (e.g. Vs. Apkallu: Accuracy+3)
16321635
}
16331636

16341637
------------------------------------

‎scripts/zones/Crawlers_Nest/IDs.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ zones[tpz.zone.CRAWLERS_NEST] =
2323
GEOMAGNETRON_ATTUNED = 7200, -- Your <keyitem> has been attuned to a geomagnetic fount in the corresponding locale.
2424
CHEST_UNLOCKED = 7252, -- You unlock the chest!
2525
SOMEONE_HAS_BEEN_DIGGING_HERE = 7260, -- Someone has been digging here.
26-
EQUIPMENT_COMPLETELY_PURIFIED = 7261, -- Your equipment has not been completely purified.
26+
EQUIPMENT_NOT_PURIFIED = 7261, -- Your equipment has not been completely purified.
2727
YOU_BURY_THE = 7263, -- You bury the <item> and <item>.
2828
NOTHING_WILL_HAPPEN_YET = 7266, -- It seems that nothing will happen yet.
2929
NOTHING_SEEMS_TO_HAPPEN = 7267, -- Nothing seems to happen.

‎scripts/zones/Crawlers_Nest/npcs/qm8.lua‎

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,52 @@
11
-----------------------------------
22
-- Area: Crawlers Nest
3-
-- NPC: ???
4-
-- Involved in Quest: The Crimson Trial
3+
-- NPC: ???
4+
-- Finishes Quest: Enveloped in Darkness
55
-- !pos 59 0.1 66 197
66
-----------------------------------
77
require("scripts/globals/settings")
88
require("scripts/globals/keyitems")
99
require("scripts/globals/quests")
10+
require("scripts/globals/npc_util")
1011
local ID = require("scripts/zones/Crawlers_Nest/IDs")
1112
-----------------------------------
1213

1314
function onTrade(player, npc, trade)
1415
end
1516

1617
function onTrigger(player, npc)
17-
18-
local cprog = player:getCharVar("theCrimsonTrial_prog")
19-
local cdate = player:getCharVar("theCrimsonTrial_date")
20-
local realday = tonumber(os.date("%j")) -- %M for next minute, %j for next day
21-
22-
if (player:hasKeyItem(tpz.ki.CRAWLER_BLOOD) == true and player:hasKeyItem(tpz.ki.OLD_BOOTS) == true) then
23-
player:startEvent(4)
24-
elseif (cprog == 1 and cdate == realday) then
25-
player:messageSpecial(ID.text.EQUIPMENT_COMPLETELY_PURIFIED)
26-
elseif (cprog == 1 and cdate ~= realday) then
27-
player:startEvent(5)
18+
-- Enveloped in Darkness
19+
if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.ENVELOPED_IN_DARKNESS) == QUEST_ACCEPTED then
20+
local timeout = player:getCharVar("envelopedInDarkness_timer")
21+
if player:hasKeyItem(tpz.ki.CRAWLER_BLOOD) and player:hasKeyItem(tpz.ki.OLD_BOOTS) then
22+
player:startEvent(4) -- Ask to take key items
23+
elseif timeout ~= 0 and timeout > os.time() then
24+
player:messageSpecial(ID.text.EQUIPMENT_NOT_PURIFIED) -- Stagger quest retrieval
25+
elseif timeout ~= 0 and timeout <= os.time() then
26+
player:startEvent(5) -- Finish quest
27+
else
28+
player:messageSpecial(ID.text.SOMEONE_HAS_BEEN_DIGGING_HERE) -- Player misses key item(s)
29+
end
30+
-- Default
2831
else
2932
player:messageSpecial(ID.text.SOMEONE_HAS_BEEN_DIGGING_HERE)
3033
end
31-
3234
end
3335

3436
function onEventUpdate(player, csid, option)
3537
end
3638

3739
function onEventFinish(player, csid, option)
38-
39-
if (csid == 4 and option == 1) then
40+
if csid == 4 and option == 1 then
4041
player:delKeyItem(tpz.ki.CRAWLER_BLOOD)
4142
player:delKeyItem(tpz.ki.OLD_BOOTS)
42-
player:setCharVar("theCrimsonTrial_date", os.date("%j")) -- %M for next minute, %j for next day
43-
player:setCharVar("theCrimsonTrial_prog", 1)
43+
player:setCharVar("envelopedInDarkness_timer", os.time() + 30) -- Set timer
4444
player:messageSpecial(ID.text.YOU_BURY_THE, tpz.ki.OLD_BOOTS, tpz.ki.CRAWLER_BLOOD)
45-
elseif (csid == 5) then
46-
if (player:getFreeSlotsCount() == 0) then
47-
player:messageSpecial(ID.text.ITEM_CANNOT_BE_OBTAINED, 14093) -- Warlock's Boots
48-
else
49-
player:addItem(14093)
50-
player:messageSpecial(ID.text.ITEM_OBTAINED, 14093) -- Warlock's Boots
51-
player:setCharVar("theCrimsonTrial_date", 0)
52-
player:setCharVar("theCrimsonTrial_prog", 0)
53-
player:setCharVar("needs_crawler_blood", 2) -- Fixed being unable start next quest
54-
player:addFame(SANDORIA, 40)
55-
player:completeQuest(SANDORIA, tpz.quest.id.sandoria.ENVELOPED_IN_DARKNESS)
56-
end
45+
elseif csid == 5 then
46+
npcUtil.completeQuest(player, SANDORIA, tpz.quest.id.sandoria.ENVELOPED_IN_DARKNESS, {
47+
item = 14093, -- Warlock's Boots
48+
fame = 40,
49+
var = {"envelopedInDarkness_timer", "needs_crawler_blood"}
50+
})
5751
end
58-
5952
end

‎scripts/zones/Davoi/npcs/_45d.lua‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ function onTrigger(player, npc)
2121
else
2222
player:messageSpecial(ID.text.CAVE_HAS_BEEN_SEALED_OFF)
2323
player:messageSpecial(ID.text.MAY_BE_SOME_WAY_TO_BREAK)
24-
player:setCharVar("miniQuestForORB_CS", 99)
24+
if player:getCharVar("miniQuestForORB_CS") == 0 then -- Only set when not already active
25+
player:setCharVar("miniQuestForORB_CS", 99)
26+
end
2527
end
2628
end
2729
end

‎scripts/zones/Southern_San_dOria/npcs/Glenne.lua‎

Lines changed: 18 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
local ID = require("scripts/zones/Southern_San_dOria/IDs")
88
require("scripts/globals/quests")
99
require("scripts/globals/titles")
10+
require("scripts/globals/npc_util")
1011
-------------------------------------
1112

1213
require("scripts/globals/pathfind")
@@ -38,69 +39,37 @@ function onPath(npc)
3839
end
3940

4041
function onTrade(player, npc, trade)
41-
if (player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.A_SENTRY_S_PERIL) == QUEST_ACCEPTED and
42-
trade:hasItemQty(601, 1) and count == 1) then
43-
player:startEvent(513)
44-
npc:wait()
42+
if npcUtil.tradeHas(trade, 601) then -- Ointment Case
43+
player:startEvent(513) -- Complete "A Sentry's Peril"
44+
npc:wait()
4545
end
46-
4746
end
4847

4948
function onTrigger(player, npc)
50-
51-
local aSentrysPeril = player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.A_SENTRY_S_PERIL)
49+
local sentrysPerilStatus = player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.A_SENTRY_S_PERIL)
5250

5351
npc:wait()
54-
55-
if (aSentrysPeril == QUEST_AVAILABLE) then
56-
player:startEvent(510)
57-
elseif (aSentrysPeril == QUEST_ACCEPTED) then
58-
if (player:hasItem(600) == true or player:hasItem(601) == true) then
59-
player:startEvent(520)
60-
else
61-
player:startEvent(644)
62-
end
63-
elseif (aSentrysPeril == QUEST_COMPLETED) then
64-
player:startEvent(521)
52+
if sentrysPerilStatus == QUEST_AVAILABLE then
53+
player:startEvent(510) -- Starts "A Sentry's Peril"
54+
elseif sentrysPerilStatus == QUEST_ACCEPTED and (player:hasItem(600) or player:getCharVar("SentrysPerilTraded") == 1) then
55+
player:startEvent(520) -- Reminder to deliver the ointment to her husband.
56+
elseif sentrysPerilStatus == QUEST_ACCEPTED then
57+
player:startEvent(644) -- "So you lost the ointment! I suppose I can give you another."
6558
else
66-
npc:wait(0)
59+
player:startEvent(521) -- "Thank you again for your help!"
6760
end
68-
6961
end
7062

7163
function onEventUpdate(player, csid, option)
7264
end
7365

7466
function onEventFinish(player, csid, option, npc)
75-
7667
npc:wait(5000)
77-
78-
if (csid == 510 and option == 0) then
79-
if (player:getFreeSlotsCount() > 0) then
80-
player:addQuest(SANDORIA, tpz.quest.id.sandoria.A_SENTRY_S_PERIL)
81-
player:addItem(600)
82-
player:messageSpecial(ID.text.ITEM_OBTAINED, 600)
83-
else
84-
player:messageSpecial(ID.text.ITEM_CANNOT_BE_OBTAINED, 600) -- Dose of ointment
85-
end
86-
elseif (csid == 644) then
87-
if (player:getFreeSlotsCount() > 0) then
88-
player:addItem(600)
89-
player:messageSpecial(ID.text.ITEM_OBTAINED, 600)
90-
else
91-
player:messageSpecial(ID.text.ITEM_CANNOT_BE_OBTAINED, 600) -- Dose of ointment
92-
end
93-
elseif (csid == 513) then
94-
if (player:getFreeSlotsCount() == 0) then
95-
player:messageSpecial(ID.text.ITEM_CANNOT_BE_OBTAINED, 12832) -- Bronze Subligar
96-
else
97-
player:tradeComplete()
98-
player:addTitle(tpz.title.RONFAURIAN_RESCUER)
99-
player:addItem(12832)
100-
player:messageSpecial(ID.text.ITEM_OBTAINED, 12832) -- Bronze Subligar
101-
player:addFame(SANDORIA, 30)
102-
player:completeQuest(SANDORIA, tpz.quest.id.sandoria.A_SENTRY_S_PERIL)
103-
end
68+
if csid == 510 and option == 0 and npcUtil.giveItem(player, 600) then
69+
player:addQuest(SANDORIA, tpz.quest.id.sandoria.A_SENTRY_S_PERIL)
70+
elseif csid == 644 then
71+
npcUtil.giveItem(player, 600)
72+
elseif csid == 513 and npcUtil.completeQuest(player, SANDORIA, tpz.quest.id.sandoria.A_SENTRY_S_PERIL, {item = 12832, fame = 30, title = tpz.title.RONFAURIAN_RESCUER, var = "SentrysPerilTraded"}) then
73+
player:confirmTrade()
10474
end
105-
10675
end

‎scripts/zones/West_Ronfaure/IDs.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ zones[tpz.zone.WEST_RONFAURE] =
2626
LAILLERA_DIALOG = 7333, -- I mustn't chat while on duty. Sorry.
2727
PICKPOCKET_GACHEMAGE = 7334, -- A pickpocket? Now that you mention it, I did see a woman flee the city. She ran west.
2828
PICKPOCKET_ADALEFONT = 7335, -- What, someone picked your pocket? And you call yourself an adventurer!
29+
AAVELEON_HEALED = 7339, -- My wounds are healed, thanks to you!
2930
PALCOMONDAU_REPORT = 7377, -- Scout reporting! All is quiet on the road to Ghelsba!
3031
PALCOMONDAU_DIALOG = 7378, -- Let me be! I must patrol the road to Ghelsba.
3132
ZOVRIACE_REPORT = 7380, -- Scout reporting! All is quiet on the roads to La Theine!

‎scripts/zones/West_Ronfaure/npcs/Aaveleon.lua‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,30 @@
44
-- Involved in Quest: A Sentry's Peril
55
-- !pos -431 -45 343 100
66
-----------------------------------
7+
local ID = require("scripts/zones/West_Ronfaure/IDs")
78
require("scripts/globals/npc_util")
89
require("scripts/globals/quests")
910
-----------------------------------
1011

1112
function onTrade(player, npc, trade)
12-
if player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.A_SENTRY_S_PERIL) == QUEST_ACCEPTED then
13-
if npcUtil.tradeHas(trade, 600) then
14-
player:startEvent(100)
15-
else
16-
player:startEvent(118)
17-
end
13+
if npcUtil.tradeHas(trade, 600) then -- Ointment
14+
player:startEvent(100) -- He accepts the ointment and gives the player the empty case to return to his wife.
15+
elseif player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.A_SENTRY_S_PERIL) < QUEST_COMPLETED then
16+
player:startEvent(106) -- "What's this? I can't accept gifts from strangers." He stops saying this after quest complete.
1817
end
1918
end
2019

2120
function onTrigger(player, npc)
22-
player:startEvent(101)
21+
local sentrysPerilStatus = player:getQuestStatus(SANDORIA, tpz.quest.id.sandoria.A_SENTRY_S_PERIL)
22+
local tradeFinished = player:getCharVar("SentrysPerilTraded")
23+
24+
if sentrysPerilStatus < QUEST_COMPLETED and tradeFinished ~= 1 then
25+
player:startEvent(101) -- "Ow! Ouch! Gah... If only I'd remembered that ointment!"
26+
elseif tradeFinished == 1 and not player:hasItem(601) then
27+
player:startEvent(126, 601) -- "Did you lose it?"
28+
else
29+
player:messageSpecial(ID.text.AAVELEON_HEALED) -- "My wounds are healed, thanks to you!"
30+
end
2331
end
2432

2533
function onEventUpdate(player, csid, option)
@@ -28,5 +36,8 @@ end
2836
function onEventFinish(player, csid, option)
2937
if csid == 100 and npcUtil.giveItem(player, 601) then
3038
player:confirmTrade()
39+
player:setCharVar("SentrysPerilTraded", 1)
40+
elseif csid == 126 and option == 1 then
41+
npcUtil.giveItem(player, 601)
3142
end
3243
end

‎sql/abilities.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ INSERT INTO `abilities` VALUES (232,'elemental_siphon',15,50,1,300,175,451,0,201
255255
INSERT INTO `abilities` VALUES (233,'sublimation',20,35,1,30,234,0,0,189,2000,0,6,20.0,0,1,80,0,0,'WOTG');
256256
INSERT INTO `abilities` VALUES (234,'addendum_white',20,10,1,1,231,0,0,191,2000,0,6,20.0,0,1,80,0,16,'WOTG');
257257
INSERT INTO `abilities` VALUES (235,'addendum_black',20,30,1,1,231,0,0,192,2000,0,6,20.0,0,1,80,0,32,'WOTG');
258-
INSERT INTO `abilities` VALUES (236,'collaborator',6,65,2,60,69,526,0,185,2000,0,6,20.0,0,0,0,0,0,'WOTG');
258+
INSERT INTO `abilities` VALUES (236,'collaborator',6,65,2,60,69,526,0,185,2000,0,6,12.6,0,0,0,0,0,'WOTG');
259259
INSERT INTO `abilities` VALUES (237,'saber_dance',19,75,1,180,219,0,0,207,2000,0,6,20.0,0,1,80,3200,1,'WOTG');
260260
INSERT INTO `abilities` VALUES (238,'fan_dance',19,75,1,180,224,0,0,208,2000,0,6,20.0,0,1,80,3202,1,'WOTG');
261261
INSERT INTO `abilities` VALUES (239,'no_foot_rise',19,75,1,180,223,560,560,209,2000,0,6,20.0,0,1,80,3204,1,'WOTG');

0 commit comments

Comments
 (0)