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

Commit d7f1a1a

Browse files
ibm2431ibm2431
authored
Merge pull request #1 from wrenffxi/mission-prefix-fixes
prefixed some mission references that were missed
2 parents c590b11 + 87b9eb7 commit d7f1a1a

25 files changed

Lines changed: 76 additions & 76 deletions

File tree

‎scripts/zones/Aht_Urhgan_Whitegate/Zone.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function onRegionEnter(player,region)
6464
end
6565
end,
6666
[3] = function (x) -- TOAU Mission 1
67-
if (player:getCurrentMission(TOAU)== LAND_OF_SACRED_SERPENTS) then
67+
if (player:getCurrentMission(TOAU)== dsp.mission.id.toau.LAND_OF_SACRED_SERPENTS) then
6868
player:startEvent(3000,0,0,0,0,0,0,0,0,0);
6969
elseif (player:getCurrentMission(TOAU) == dsp.mission.id.toau.A_MERCENARY_LIFE and player:needToZone() == false) then
7070
if (prevZone ~= dsp.zone.AHT_URHGAN_WHITEGATE) then
@@ -83,14 +83,14 @@ function onRegionEnter(player,region)
8383
end
8484
end,
8585
[4] = function (x) -- AH mission
86-
if (player:getCurrentMission(TOAU)== KNIGHT_OF_GOLD and player:getVar("AhtUrganStatus") == 2) then
86+
if (player:getCurrentMission(TOAU)== dsp.mission.id.toau.KNIGHT_OF_GOLD and player:getVar("AhtUrganStatus") == 2) then
8787
player:startEvent(3024,0,0,0,0,0,0,0,0,0);
88-
elseif (player:getCurrentMission(TOAU)== BASTION_OF_KNOWLEDGE) then
88+
elseif (player:getCurrentMission(TOAU)== dsp.mission.id.toau.BASTION_OF_KNOWLEDGE) then
8989
player:startEvent(3112);
9090
end
9191
end,
9292
[5] = function (x) -- AH mission
93-
if (player:getCurrentMission(TOAU)== KNIGHT_OF_GOLD and player:getVar("AhtUrganStatus") == 3) then
93+
if (player:getCurrentMission(TOAU)== dsp.mission.id.toau.KNIGHT_OF_GOLD and player:getVar("AhtUrganStatus") == 3) then
9494
player:startEvent(3026,0,0,0,0,0,0,0,0,0);
9595
elseif (player:getCurrentMission(TOAU) == dsp.mission.id.toau.WESTERLY_WINDS and player:getVar("AhtUrganStatus") == 0) then
9696
player:startEvent(3027,0,0,0,0,0,0,0,0,0);

‎scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20m.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ function onEventUpdate(player,csid,option,target)
8484
if party ~= nil then
8585
for i,v in ipairs(party) do
8686
if v:getID() ~= player:getID() then
87-
if v:getCurrentMission(TOAU) < PATH_OF_DARKNESS then
87+
if v:getCurrentMission(TOAU) < dsp.mission.id.toau.PATH_OF_DARKNESS then
8888
player:messageText(target,ID.text.MEMBER_NO_REQS, false)
8989
player:instanceEntry(target,1)
9090
return
@@ -103,7 +103,7 @@ function onEventUpdate(player,csid,option,target)
103103
if party ~= nil then
104104
for i,v in ipairs(party) do
105105
if v:getID() ~= player:getID() then
106-
if v:getCurrentMission(TOAU) < NASHMEIRAS_PLEA then
106+
if v:getCurrentMission(TOAU) < dsp.mission.id.toau.NASHMEIRAS_PLEA then
107107
player:messageText(target,ID.text.MEMBER_NO_REQS, false)
108108
player:instanceEntry(target,1)
109109
return

‎scripts/zones/Bastok_Markets/npcs/Lamepaue.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ function onTrigger(player,npc)
1414

1515
-- Bastok Missions.
1616
local BastokMissions = 0xFFFFFFFE;
17-
if (player:hasCompletedMission (BASTOK,FETICHISM)) then
17+
if (player:hasCompletedMission (BASTOK,dsp.mission.id.bastok.FETICHISM)) then
1818
BastokMissions = BastokMissions - 2; -- Fetichism.
1919
end
20-
if (player:hasCompletedMission (BASTOK,TO_THE_FORSAKEN_MINES)) then
20+
if (player:hasCompletedMission (BASTOK,dsp.mission.id.bastok.TO_THE_FORSAKEN_MINES)) then
2121
BastokMissions = BastokMissions - 4; -- To the Forsaken Mines.
2222
end
2323

@@ -115,7 +115,7 @@ function onTrigger(player,npc)
115115
-- Seekers of Adoulin
116116
local SeekersOfAdoulin = 0xFFFFFFFE;
117117
-- *Need the correct csid
118-
-- if (player:hasCompletedMission (SOA,RUMORS_FROM_THE_WEST)) then
118+
-- if (player:hasCompletedMission (SOA,dsp.mission.id.soa.RUMORS_FROM_THE_WEST)) then
119119
-- SeekersOfAdoulin = SeekersOfAdoulin - 2; -- Rumors from the West
120120
-- end
121121

‎scripts/zones/Beaucedine_Glacier/Zone.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function onZoneIn( player, prevZone)
2828
player:setPos( -247.911, -82.165, 260.207, 248)
2929
end
3030

31-
if player:getCurrentMission( COP) == DESIRES_OF_EMPTINESS and player:getVar( "PromathiaStatus") == 9 then
31+
if player:getCurrentMission( COP) == dsp.mission.id.cop.DESIRES_OF_EMPTINESS and player:getVar( "PromathiaStatus") == 9 then
3232
cs = 206
3333
elseif triggerLightCutscene(player) then -- Quest: I Can Hear A Rainbow
3434
cs = 114

‎scripts/zones/Caedarva_Mire/npcs/_273.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function onEventUpdate(player,csid,option,target)
5151
if player:getVar("ShadesOfVengeance") == 1 then
5252
if (party ~= nil) then
5353
for i,v in ipairs(party) do
54-
if v:getCurrentMission(TOAU) < SHADES_OF_VENGEANCE then
54+
if v:getCurrentMission(TOAU) < dsp.mission.id.toau.SHADES_OF_VENGEANCE then
5555
player:messageText(target,ID.text.MEMBER_NO_REQS, false)
5656
player:instanceEntry(target,1)
5757
elseif v:getZoneID() == player:getZoneID() and v:checkDistance(player) > 50 then

‎scripts/zones/Chateau_dOraguille/npcs/Halver.lua‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -48,64 +48,64 @@ function onTrigger(player,npc)
4848
-- Mission San D'Oria 9-2 The Heir to the Light
4949
if (player:hasCompletedMission(SANDORIA,dsp.mission.id.sandoria.THE_HEIR_TO_THE_LIGHT)) then
5050
player:startEvent(31)
51-
elseif (currentMission == THE_HEIR_TO_THE_LIGHT and MissionStatus == 7) then
51+
elseif (currentMission == dsp.mission.id.sandoria.THE_HEIR_TO_THE_LIGHT and MissionStatus == 7) then
5252
player:startEvent(9)
53-
elseif (currentMission == THE_HEIR_TO_THE_LIGHT and MissionStatus == 6) then
53+
elseif (currentMission == dsp.mission.id.sandoria.THE_HEIR_TO_THE_LIGHT and MissionStatus == 6) then
5454
player:startEvent(30)
55-
elseif (currentMission == THE_HEIR_TO_THE_LIGHT and MissionStatus >= 2 and MissionStatus <=5) then
55+
elseif (currentMission == dsp.mission.id.sandoria.THE_HEIR_TO_THE_LIGHT and MissionStatus >= 2 and MissionStatus <=5) then
5656
player:startEvent(29)
5757
-- Mission San d'Oria 8-1 Coming of Age --
58-
elseif (currentMission == COMING_OF_AGE and MissionStatus == 3 and player:hasKeyItem(dsp.ki.DROPS_OF_AMNIO)) then
58+
elseif (currentMission == dsp.mission.id.sandoria.COMING_OF_AGE and MissionStatus == 3 and player:hasKeyItem(dsp.ki.DROPS_OF_AMNIO)) then
5959
player:startEvent(102)
60-
elseif (currentMission == COMING_OF_AGE and MissionStatus == 1) then
60+
elseif (currentMission == dsp.mission.id.sandoria.COMING_OF_AGE and MissionStatus == 1) then
6161
player:startEvent(58)
6262
-- Mission San D'Oria 6-1 Leaute's last wishes
63-
elseif (currentMission == LEAUTE_S_LAST_WISHES and MissionStatus == 3) then
63+
elseif (currentMission == dsp.mission.id.sandoria.LEAUTE_S_LAST_WISHES and MissionStatus == 3) then
6464
player:startEvent(22)
65-
elseif (currentMission == LEAUTE_S_LAST_WISHES and MissionStatus == 2) then
65+
elseif (currentMission == dsp.mission.id.sandoria.LEAUTE_S_LAST_WISHES and MissionStatus == 2) then
6666
player:startEvent(24)
67-
elseif (currentMission == LEAUTE_S_LAST_WISHES and MissionStatus == 1) then
67+
elseif (currentMission == dsp.mission.id.sandoria.LEAUTE_S_LAST_WISHES and MissionStatus == 1) then
6868
player:startEvent(23)
69-
elseif (currentMission == LEAUTE_S_LAST_WISHES and MissionStatus == 0) then
69+
elseif (currentMission == dsp.mission.id.sandoria.LEAUTE_S_LAST_WISHES and MissionStatus == 0) then
7070
player:startEvent(25)
7171
-- Mission San D'Oria 5-2 The Shadow Lord
7272
elseif (player:hasCompletedMission(SANDORIA,dsp.mission.id.sandoria.THE_SHADOW_LORD) and currentMission == 255) then
7373
player:showText(npc,ID.text.HALVER_OFFSET+500)
74-
elseif (currentMission == THE_SHADOW_LORD and MissionStatus == 5) then
74+
elseif (currentMission == dsp.mission.id.sandoria.THE_SHADOW_LORD and MissionStatus == 5) then
7575
player:showText(npc,ID.text.HALVER_OFFSET+471)
76-
elseif (currentMission == THE_SHADOW_LORD and MissionStatus == 4 and player:hasKeyItem(dsp.ki.SHADOW_FRAGMENT)) then
76+
elseif (currentMission == dsp.mission.id.sandoria.THE_SHADOW_LORD and MissionStatus == 4 and player:hasKeyItem(dsp.ki.SHADOW_FRAGMENT)) then
7777
player:startEvent(548)
78-
elseif (currentMission == THE_SHADOW_LORD and MissionStatus == 0) then
78+
elseif (currentMission == dsp.mission.id.sandoria.THE_SHADOW_LORD and MissionStatus == 0) then
7979
player:startEvent(546)
8080
-- Mission San D'Oria 5-1 The Ruins of Fei'Yin
81-
elseif (currentMission == THE_RUINS_OF_FEI_YIN and MissionStatus == 12 and player:hasKeyItem(dsp.ki.BURNT_SEAL)) then
81+
elseif (currentMission == dsp.mission.id.sandoria.THE_RUINS_OF_FEI_YIN and MissionStatus == 12 and player:hasKeyItem(dsp.ki.BURNT_SEAL)) then
8282
player:startEvent(534)
83-
elseif (currentMission == THE_RUINS_OF_FEI_YIN and MissionStatus == 10) then
83+
elseif (currentMission == dsp.mission.id.sandoria.THE_RUINS_OF_FEI_YIN and MissionStatus == 10) then
8484
player:showText(npc,ID.text.HALVER_OFFSET+334)
85-
elseif (currentMission == THE_RUINS_OF_FEI_YIN and MissionStatus == 9) then
85+
elseif (currentMission == dsp.mission.id.sandoria.THE_RUINS_OF_FEI_YIN and MissionStatus == 9) then
8686
player:startEvent(533)
8787
-- Mission San D'Oria 3-3 Appointment to Jeuno
88-
elseif (currentMission == APPOINTMENT_TO_JEUNO and MissionStatus == 0) then
88+
elseif (currentMission == dsp.mission.id.sandoria.APPOINTMENT_TO_JEUNO and MissionStatus == 0) then
8989
player:startEvent(508)
9090
-- Mission San D'Oria 2-3 Journey Abroad
91-
elseif (currentMission == JOURNEY_ABROAD and MissionStatus == 11) then
91+
elseif (currentMission == dsp.mission.id.sandoria.JOURNEY_ABROAD and MissionStatus == 11) then
9292
player:startEvent(507)
93-
elseif (currentMission == JOURNEY_ABROAD and MissionStatus == 0) then
93+
elseif (currentMission == dsp.mission.id.sandoria.JOURNEY_ABROAD and MissionStatus == 0) then
9494
player:startEvent(505)
95-
elseif (currentMission == JOURNEY_ABROAD) then
95+
elseif (currentMission == dsp.mission.id.sandoria.JOURNEY_ABROAD) then
9696
player:startEvent(532)
9797
end
9898
elseif (pNation == dsp.nation.BASTOK) then
9999
-- Bastok 2-3 San -> Win
100-
if (currentMission == THE_EMISSARY) then
100+
if (currentMission == dsp.mission.id.bastok.THE_EMISSARY) then
101101
if (MissionStatus == 3) then
102102
player:startEvent(501)
103103
end
104104
-- Bastok 2-3 San -> Win, report to consulate
105-
elseif (currentMission == THE_EMISSARY_SANDORIA) then
105+
elseif (currentMission == dsp.mission.id.bastok.THE_EMISSARY_SANDORIA) then
106106
player:showText(npc,ID.text.HALVER_OFFSET+279)
107107
-- Bastok 2-3 Win -> San
108-
elseif (currentMission == THE_EMISSARY_SANDORIA2) then
108+
elseif (currentMission == dsp.mission.id.bastok.THE_EMISSARY_SANDORIA2) then
109109
if (MissionStatus == 8) then
110110
player:startEvent(503)
111111
elseif (MissionStatus <= 10) then
@@ -116,9 +116,9 @@ function onTrigger(player,npc)
116116
end
117117
elseif (pNation == dsp.nation.WINDURST) then
118118
-- Windurst 2-3
119-
if (currentMission == THE_THREE_KINGDOMS and MissionStatus < 3) then
119+
if (currentMission == dsp.mission.id.windurst.THE_THREE_KINGDOMS and MissionStatus < 3) then
120120
player:startEvent(532)
121-
elseif (currentMission == THE_THREE_KINGDOMS_SANDORIA or currentMission == THE_THREE_KINGDOMS_SANDORIA2) then
121+
elseif (currentMission == dsp.mission.id.windurst.THE_THREE_KINGDOMS_SANDORIA or currentMission == dsp.mission.id.windurst.THE_THREE_KINGDOMS_SANDORIA2) then
122122
if (MissionStatus == 3) then
123123
player:startEvent(502)
124124
elseif (MissionStatus == 8) then

‎scripts/zones/FeiYin/Zone.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function onZoneIn(player,prevZone)
3434

3535
if (prevZone == dsp.zone.BEAUCEDINE_GLACIER and currentMission == 14 and MissionStatus == 10) then
3636
cs = 1; -- MISSION 5-1
37-
elseif (currentMission == THE_HEIR_TO_THE_LIGHT and MissionStatus == 2) then
37+
elseif (currentMission == dsp.mission.id.sandoria.THE_HEIR_TO_THE_LIGHT and MissionStatus == 2) then
3838
cs = 23; -- San d'Oria 9-2
3939
elseif (player:getCurrentMission(ACP) == dsp.mission.id.acp.THOSE_WHO_LURK_IN_SHADOWS_I) then
4040
cs = 29;

‎scripts/zones/Heavens_Tower/npcs/Kupipi.lua‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function onTrigger(player,npc)
3838

3939
if (pNation == dsp.nation.SANDORIA) then
4040
-- San d'Oria Mission 2-3 Part I - Windurst > Bastok
41-
if (currentMission == JOURNEY_TO_WINDURST) then
41+
if (currentMission == dsp.mission.id.sandoria.JOURNEY_TO_WINDURST) then
4242
if (MissionStatus == 4) then
4343
player:startEvent(238,1,1,1,1,pNation);
4444
elseif (MissionStatus == 5) then
@@ -47,7 +47,7 @@ function onTrigger(player,npc)
4747
player:startEvent(241);
4848
end
4949
-- San d'Oria Mission 2-3 Part II - Bastok > Windurst
50-
elseif (currentMission == JOURNEY_TO_WINDURST2) then
50+
elseif (currentMission == dsp.mission.id.sandoria.JOURNEY_TO_WINDURST2) then
5151
if (MissionStatus == 7) then
5252
player:startEvent(242,1,1,1,1,0);
5353
elseif (MissionStatus == 8) then
@@ -62,7 +62,7 @@ function onTrigger(player,npc)
6262
end
6363
elseif (pNation == dsp.nation.BASTOK) then
6464
-- Bastok Mission 2-3 Part I - Windurst > San d'Oria
65-
if (currentMission == THE_EMISSARY_WINDURST) then
65+
if (currentMission == dsp.mission.id.bastok.THE_EMISSARY_WINDURST) then
6666
if (MissionStatus == 3) then
6767
player:startEvent(238,1,1,1,1,pNation);
6868
elseif (MissionStatus <= 5) then
@@ -71,7 +71,7 @@ function onTrigger(player,npc)
7171
player:startEvent(241);
7272
end
7373
-- Bastok Mission 2-3 Part II - San d'Oria > Windurst
74-
elseif (currentMission == THE_EMISSARY_WINDURST2) then
74+
elseif (currentMission == dsp.mission.id.bastok.THE_EMISSARY_WINDURST2) then
7575
if (MissionStatus == 7) then
7676
player:startEvent(242,1,1,1,1,pNation);
7777
elseif (MissionStatus == 8) then
@@ -85,15 +85,15 @@ function onTrigger(player,npc)
8585
player:startEvent(251);
8686
end
8787
elseif (pNation == dsp.nation.WINDURST) then
88-
if (currentMission == THE_THREE_KINGDOMS and MissionStatus == 0) then
88+
if (currentMission == dsp.mission.id.windurst.THE_THREE_KINGDOMS and MissionStatus == 0) then
8989
player:startEvent(95,0,0,0,dsp.ki.LETTER_TO_THE_CONSULS_WINDURST);
90-
elseif (currentMission == THE_THREE_KINGDOMS and MissionStatus == 11) then
90+
elseif (currentMission == dsp.mission.id.windurst.THE_THREE_KINGDOMS and MissionStatus == 11) then
9191
player:startEvent(101,0,0,dsp.ki.ADVENTURERS_CERTIFICATE);
92-
elseif (currentMission == THE_THREE_KINGDOMS) then
92+
elseif (currentMission == dsp.mission.id.windurst.THE_THREE_KINGDOMS) then
9393
player:startEvent(97);
94-
elseif (currentMission == TO_EACH_HIS_OWN_RIGHT and MissionStatus == 0) then
94+
elseif (currentMission == dsp.mission.id.windurst.TO_EACH_HIS_OWN_RIGHT and MissionStatus == 0) then
9595
player:startEvent(103,0,0,dsp.ki.STARWAY_STAIRWAY_BAUBLE);
96-
elseif (currentMission == TO_EACH_HIS_OWN_RIGHT and MissionStatus == 1) then
96+
elseif (currentMission == dsp.mission.id.windurst.TO_EACH_HIS_OWN_RIGHT and MissionStatus == 1) then
9797
player:startEvent(104);
9898
elseif (player:getCurrentMission(WINDURST) == dsp.mission.id.windurst.THE_JESTER_WHO_D_BE_KING and MissionStatus == 3) then
9999
player:startEvent(326);

‎scripts/zones/Metalworks/npcs/Pius.lua‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ function onTrigger(player,npc)
1515
Mission = player:getCurrentMission(player:getNation());
1616
MissionStatus = player:getVar("MissionStatus");
1717

18-
if (Mission == JOURNEY_TO_BASTOK and MissionStatus == 3 or
19-
Mission == JOURNEY_TO_BASTOK2 and MissionStatus == 8) then
18+
if (Mission == dsp.mission.id.sandoria.JOURNEY_TO_BASTOK and MissionStatus == 3 or
19+
Mission == dsp.mission.id.sandoria.JOURNEY_TO_BASTOK2 and MissionStatus == 8) then
2020
player:startEvent(355);
21-
elseif (Mission == THE_THREE_KINGDOMS_BASTOK and MissionStatus == 3 or
22-
Mission == THE_THREE_KINGDOMS_BASTOK2 and MissionStatus == 8) then
21+
elseif (Mission == dsp.mission.id.windurst.THE_THREE_KINGDOMS_BASTOK and MissionStatus == 3 or
22+
Mission == dsp.mission.id.windurst.THE_THREE_KINGDOMS_BASTOK2 and MissionStatus == 8) then
2323
player:startEvent(355,1);
24-
elseif (Mission == JOURNEY_TO_BASTOK or
25-
Mission == JOURNEY_TO_BASTOK2 or
26-
Mission == THE_THREE_KINGDOMS_BASTOK2 and MissionStatus < 11) then
24+
elseif (Mission == dsp.mission.id.sandoria.JOURNEY_TO_BASTOK or
25+
Mission == dsp.mission.id.sandoria.JOURNEY_TO_BASTOK2 or
26+
Mission == dsp.mission.id.windurst.THE_THREE_KINGDOMS_BASTOK2 and MissionStatus < 11) then
2727
player:startEvent(356);
2828
else
2929
player:startEvent(350);

‎scripts/zones/Misareaux_Coast/npcs/_0p8.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function onTrigger(player,npc)
1717

1818
if (currentCoP == dsp.mission.id.cop.THE_SECRETS_OF_WORSHIP and PromathiaStatus == 1) then
1919
player:startEvent(9);
20-
elseif (player:hasCompletedMission(COP,dsp.mission.id.cop.THE_LAST_VERSE) or (currentCoP == THE_SECRETS_OF_WORSHIP and PromathiaStatus >= 2)or(currentCoP > THE_SECRETS_OF_WORSHIP)) then
20+
elseif (player:hasCompletedMission(COP,dsp.mission.id.cop.THE_LAST_VERSE) or (currentCoP == dsp.mission.id.cop.THE_SECRETS_OF_WORSHIP and PromathiaStatus >= 2)or(currentCoP > dsp.mission.id.cop.THE_SECRETS_OF_WORSHIP)) then
2121
player:startEvent(502);
2222
else
2323
player:messageSpecial(ID.text.DOOR_CLOSED);

0 commit comments

Comments
 (0)