Skip to content

Commit

Permalink
Final changes for release 107.
Browse files Browse the repository at this point in the history
  • Loading branch information
@smaitch
smaitch committed Feb 5, 2020
1 parent a6b677b commit fab5c77
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 28 deletions.
12 changes: 8 additions & 4 deletions Grail-NPCs-_retail_/Grail-NPCs-_retail_.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1766,6 +1766,7 @@ G[-280634]={'634:74.17,88.98 N:0'}
G[-280630]={'630:65.69,48.40 N:0'}
G[-280062]={'62:39.15,61.71 N:0'}
G[-280014]={'14:47.62,77.99 N:0'}
G[-271527]={'1527:56.21,52.19 N:0'}
G[-271355]={'1355:61.15,28.78 N:0'}
G[-271161]={'1161:70.54,65.42 N:0'}
G[-270942]={'942:40.35,34.37 N:0'}
Expand Down Expand Up @@ -1889,6 +1890,7 @@ G[-220630]={'630:32.62,54.44 N:0'}
G[-220543]={'543:56.01,6.68 N:0'}
G[-220062]={'62:40.97,55.96 N:0'}
G[-220014]={'14:26.74,32.70 N:0'}
G[-211530]={'1530:38.43,75.18 N:0'}
G[-211527]={'1527:38.42,36.42 N:0'}
G[-211462]={'1462:51.07,45.39 N:0'}
G[-211355]={'1355:60.75,12.85 N:0'}
Expand Down Expand Up @@ -8782,7 +8784,7 @@ G[81128]={'542:61.45,72.96'}
G[81134]={'FA 550:56.09,43.79'}
G[81140]={'FA 539:61.86,29.14'}
G[81144]={'FA 550:84.06,76.84'}
G[81152]={'FA 539:40.64,54.88'}
G[81152]={'FA 539:40.64,54.88'} -- garrison level 1 location
G[81153]={'539:40.66,54.87 N:81152'}
G[81166]={'FH 587:45.41,50.63'}
G[81173]={'FA 539:35.38,36.95'}
Expand Down Expand Up @@ -9189,7 +9191,7 @@ G[85378]={'539:46.17,31.40 N:45109'} -- ? 947:61.47,63.29
G[85379]={'550:58.96,38.52 N:45110'} -- ? 947:46.22,31.40
G[85413]={'FA 581:51.21,47.04 N:45109'} -- entrance to plot 25
G[85414]={'FH 587:57.75,28.14 N:45110'} -- plot 25 location
G[85418]={'FA 581:28.49,38.64'}
G[85418]={'FA 582:28.49,38.64'}
G[85425]={'542:47.13,31.68'}
G[85426]={'FA 543:49.40,49.65 N:85436'}
G[85431]={'FA 543:50.88,51.39 N:85436'} -- Sparring Arena-based location
Expand Down Expand Up @@ -9456,7 +9458,7 @@ G[89749]={'534:61.12,75.76'}
G[89753]={'FH 587:40.16,56.67 N:25256'} -- garrison level 3 location ? 976:39.96,57.53
G[89754]={'534:50.59,44.29'}
G[89759]={'649:19.66,47.30'}
G[89763]={'FA 581:34.14,32.81 N:38607'}
G[89763]={'FA 582:34.14,32.81 N:38607'}
G[89777]={'534:43.14,35.97'}
G[89793]={'581:34.22,32.75 N:26814'}
G[89794]={'630:47.97,27.17'}
Expand Down Expand Up @@ -14770,6 +14772,7 @@ G[157266]={'1530:45.07,61.66'}
G[157267]={'1530:45.91,42.75'}
G[157287]={'1530:41.44,55.62'}
G[157808]={'1530:28.52,50.01'}
G[157997]={'1161:37.03,62.78 895:66.31,34.96'}
G[158397]={'1355:53.27,24.86'}
G[158501]={'FH'}
G[158515]={''}
Expand All @@ -14786,6 +14789,7 @@ G[159682]={'1527:24.50,55.29'}
G[159811]={''}
G[159820]={'1527:27.95,63.45'}
G[159920]={'1527:40.11,21.27'}
G[160101]={'1161:73.26,17.06 895:75.07,23.90'}
G[160252]={'1527:56.70,31.72'}
G[160452]={'85:64.66,46.52'}
G[160462]={'1527:50.48,40.03'}
Expand Down Expand Up @@ -15021,7 +15025,7 @@ G[500216]={'539:27.52,11.26 A:91242 N:91242'}
G[500217]={'581:51.19,63.58 A:84857 N:84857'} -- plot 20
G[500218]={'581:51.19,63.58 A:77363 N:77363'} -- plot 20
G[500219]={'581:51.19,63.58 A:77791 N:77791'} -- plot 20
G[500220]={'581:31.01,31.07 A:81152 N:81152'} -- garrison level 3 location
G[500220]={'582:31.01,31.07 A:81152 N:81152'} -- garrison level 3 location
G[500221]={'581:51.19,63.58 A:77359 N:77359'} -- plot 20
G[500222]={'581:51.19,63.58 A:77792 N:77792'} -- plot 20
G[500223]={'581:51.19,63.58 A:77382 N:77382'} -- plot 20
Expand Down
47 changes: 24 additions & 23 deletions Grail-Quests-_retail_/Grail-Quests-_retail_.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15756,7 +15756,7 @@ G[33800]='E18546'
G[33807]='FH K0000 L090 N100 A:79415 T:74651 P:33527 E18546' -- TODO: P:33527 is wrong
G[33808]='FA K0000 L090 N100 A:76204 T:76204 E18546'
G[33813]='FA K0000 L090 N100 A:71502 T:71502 P:B33070 E18546'
G[33814]='FA K0000 L090 N100 A:81152,581152 T:78564 P:33059 E18546' -- technically this can be P:33151 as long as 33059 has OTC:33151
G[33814]='FA K0000 L090 N100 A:81152,581152,500220 T:78564 P:33059 E18546' -- technically this can be P:33151 as long as 33059 has OTC:33151
G[33815]='FH K0000 L090 N100 A:576411 T:78272 P:33868 I:34582 E18546'
G[33816]='FH K0000 L090 N100 A:80456 T:80456,76616 P:E34379 E18546'
G[33817]='E18546'
Expand Down Expand Up @@ -30581,7 +30581,7 @@ G[53866]='K0000 L120 N120 A:151134 T:151134 E32028'
G[53867]='FA K000262144 L110 N120 A:-2120895,-1520896 T:-895,-896 P:a53867'
G[53868]='K0000 L120 N120 A:704001 T:704006 E32028'
G[53869]='K0000 L120 N120 A:704006 T:704006 E32028'
G[53870]='FH K0000 L120 N120 P:T86E83999+J12478+j13206 E32861' -- TODO: Yoshimo : verify
G[53870]='FH K0000 L120 N120 P:T86E83999+J12478+j13206 E32861' -- TODO: Yoshimo : verify
G[53874]='FH K000262144 L120 N120 A:-2490895,-1740896 T:-895,-896 P:a53874 E32028'
G[53875]='FH K000262144 L110 N120 A:-2540895 T:-895 P:a53875 E32305'
G[53877]='FA K000262144 L110 N120 A:-2410895,-301161 T:-895,-1161 P:a53877'
Expand All @@ -30603,12 +30603,12 @@ G[53893]='FH K0000 L120 N120 P:53892 E32861'
G[53894]='FH K0000 L120 N120 P:53892 E32861'
G[53895]='FH K0000 L120 N120 P:53892 E32861'
G[53896]='FA K0004096 L120 N120 A:702469 T:702469 P:53888'
G[53897]='FH K0000 L120 N120 P:53893 E32861' -- TODO: Yoshimo: probably needs the other 2 quests
G[53897]='FH K0000 L120 N120 P:53893 E32861' -- TODO: Yoshimo: probably needs the other 2 quests
G[53898]='FH K0000 L120 N120 P:53897 E32861'
G[53899]='FH K0000 L120 N120 P:54026 E32861'
G[53900]='FH K0000 L120 N120 P:53899 E32861'
G[53901]='FH K0000 L120 N120 P:53899 E32861'
G[53902]='FH K0000 L120 N120 P:53900+53901+58087 E32861' -- TODO: Yoshimo:verify 53901 58087, could also be 53900 only and the other 2 quests for 54027
G[53902]='FH K0000 L120 N120 P:53900+53901+58087 E32861' -- TODO: Yoshimo:verify 53901 58087, could also be 53900 only and the other 2 quests for 54027
G[53903]='FH K0000 L120 N120 P:54027 E32861'
G[53904]='FH K0000 L120 N120 P:53903 E32861'
G[53905]='FH K0000 L120 N120 P:53904 E32861'
Expand Down Expand Up @@ -30712,7 +30712,7 @@ G[54020]='FA K000262144 L110 N120 A:-1250863,-1580864 T:-863,-864 P:a54020'
G[54021]='FH K0000 L120 N120 A:150207 T:150196 P:54018 E30430'
G[54022]='FH K0000 L120 N120 T:146073 P:54007 I:54635' -- TODO: verify 54007
G[54026]='FH K0000 L120 N120 P:53898 E32861'
G[54027]='FH K0000 L120 N120 P:53902+0 E32861' -- TODO: yoshimo: figure out if P: 53901 58087 doesn't belong here
G[54027]='FH K0000 L120 N120 P:53902+0 E32861' -- TODO: yoshimo: figure out if P: 53901 58087 doesn't belong here
G[54028]='FH K0004096 L120 N120 A:146073 T:146623 P:54008+54009+54022' -- TODO: verify 54008 54009 54022
G[54031]='FH K0000 L120 N120 P:53828'
G[54032]='FH K0000 L120 N120 P:54033'
Expand Down Expand Up @@ -32611,7 +32611,7 @@ G[57151]='FH K0000 L120 N120 E32028'
G[57152]='FH K0000 L120 N120 E32028'
G[57153]='K0000 L120 N120 E32861'
G[57154]='K0000 L120 N120 E32861'
G[57157]='K0001048576 L120 N120 T:155099 P:b57157 E32861'
G[57157]='K0001048576 L120 N120 A:-271527 T:155099 P:b57157 E32861'
G[57165]='T:153315'
G[57166]='T:152676'
G[57167]='T:149141'
Expand Down Expand Up @@ -32719,17 +32719,17 @@ G[57462]='K0000 L120 N120 E32861'
G[57464]='FA K0000 L120 N120 E32861'
G[57476]='K0000 L120 N120 E32861'
G[57484]='K0000 L120 N120 E32861'
G[57486]='FA K0000 L120 N120 E32861'
G[57487]='FA K0000 L120 N120 E32861'
G[57488]='FA K0000 L120 N120 E32861'
G[57490]='FA K0000 L120 N120 E32861'
G[57491]='FA K0000 L120 N120 E32861'
G[57492]='FA K0000 L120 N120 E32861'
G[57493]='FA K0000 L120 N120 E32861'
G[57494]='FA K0000 L120 N120 E32861'
G[57495]='FA K0000 L120 N120 E32861'
G[57496]='FA K0000 L120 N120 E32861'
G[57497]='FA K0000 L120 N120 E32861'
G[57486]='FA K0000 L120 N120 A:160101 T:157997 P:58214 E32861'
G[57487]='FA K0000 L120 N120 A:157997 T:149816 P:57486 E32861'
G[57488]='FA K0000 L120 N120 A:150555 T:150555 P:57487 E32861'
G[57490]='FA K0000 L120 N120 A:158145 T:150555 P:57488 E32861'
G[57491]='FA K0000 L120 N120 A:160232 T:160232 P:57490 E32861'
G[57492]='FA K0000 L120 N120 A:158145 T:158145 P:57491 E32861'
G[57493]='FA K0000 L120 N120 A:160232 T:160232 P:57492 E32861'
G[57494]='FA K0000 L120 N120 A:160232 T:158145 P:57493 E32861'
G[57495]='FA K0000 L120 N120 A:162806 T:159587 P:57496 E32861'
G[57496]='FA K0000 L120 N120 A:159587 T:162806 P:57494 E32861'
G[57497]='FA K0000 L120 N120 A:157997 T:126332 P:57495 E32861'
G[57508]='K0000 L120 N120 E32861'
G[57517]='K0000 L120 N120 E32861'
G[57519]='K0000 L120 N120 E32861'
Expand Down Expand Up @@ -32837,7 +32837,7 @@ G[58155]='K0002 L120 N120 A:703998 T:703998 E32861'
G[58156]='K0002 L120 N120 A:160252 T:160252 E32861'
G[58167]='K0000 L120 N120 E32861'
G[58168]='K0002 L120 N120 A:160252 E32861'
G[58214]='FA K0000 L120 N120 E32861'
G[58214]='FA K0000 L120 N120 A:126332 T:160101 P:T95783999+J13700 E32861'
G[58216]='K0000 L120 N120 E32861'
G[58229]='K0002 L120 N120 A:155096 T:155096 P:a58229 E32861'
G[58230]='K0002 L120 N120 A:155099 T:155099 P:a58230 E32861'
Expand All @@ -32846,10 +32846,10 @@ G[58232]='K0000 L120 N120 A:155096 E32218'
G[58233]='K0000 L120 N120 A:155099 T:155099 E32861'
G[58234]='K0000 L120 N120 A:155099 T:155099 E32861'
G[58235]='K0000 L120 N120 A:155095 T:155095 P:a58235 E32218'
G[58236]='K0000 L120 N120 E32861'
G[58236]='K0002 L120 N120 A:-111527 T:-1527 P:a58236 E32861'
G[58237]='K0002 L120 N120 A:155099 T:155099 P:a58237 E32861'
G[58238]='K0000 L120 N120 A:155095 E32218'
G[58239]='K0000 L120 N120 A:160957 T:155096 P:a58239 E32861'
G[58239]='K0002 L120 N120 A:160957 T:155096 P:a58239 E32861'
G[58256]='K0000 L120 N120 E32861'
G[58271]='K0000 L120 N120 E32861'
G[58273]='FH K0000 L120 N120 E32861'
Expand Down Expand Up @@ -32931,7 +32931,7 @@ G[58634]='K0000 L120 N120 A:155496 T:155496 P:57373 E32861'
G[58636]='K0000 L120 N120 A:155102 E32218'
G[58638]='K0000 L120 N120 P:58636 E32861'
G[58639]='K0000 L120 N120 P:58638 E32861'
G[58640]='K0000 L120 N120 P:58646+58639 E32861' -- TODO: Yoshimo verify 58639
G[58640]='K0000 L120 N120 P:58646+58639 E32861' -- TODO: Yoshimo verify 58639
G[58641]='K0000 L120 N120 P:58640 E32861'
G[58642]='K0000 L120 N120 P:58641 E32861'
G[58643]='K0000 L120 N120 P:58642 E32861'
Expand Down Expand Up @@ -32959,7 +32959,7 @@ G[58747]='K0000 L120 N120 A:-121530 T:-1530 P:a58747 E32861'
G[58748]='K00032768 L120 N120 A:704030 E32861'
G[58749]='K0000 L120 N120 A:-201530 T:-1530 P:a58749 E32861'
G[58754]='K0002 L120 N120 A:154444 T:154444 P:a58754 E32861'
G[58755]='K0000 L120 N120 E32861'
G[58755]='K0002 L120 N120 A:-211530 T:-1530 P:a58755 E32861'
G[58756]='K0000 L120 N120 E32861'
G[58757]='K0000 L120 N120 E32861'
G[58758]='K0000 L120 N120 E32861'
Expand Down Expand Up @@ -33448,6 +33448,7 @@ end
-- 33084 8.3.0 2020-01-16 2020-01-xx
-- 33095 8.3.0 2020-01-17 2020-01-xx
-- 33115 8.3.0 2020-01-21 2020-01-22
-- 33169 8.3.0 2020-01-27 2020-01-28 current live
-- 33169 8.3.0 2020-01-27 2020-01-28
-- 33237 8.3.0 2020-02-03 2020-02-04 current live

end
3 changes: 2 additions & 1 deletion Grail/Grail.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8336,7 +8336,8 @@ end
-- currentPhase = C_MapBar.GetPhaseIndex() + 1 -- it starts with 0 for phase 1 (just like C)
-- end
-- else
if (not self.battleForAzeroth and (971 == phaseCode or 976 == phaseCode)) or (self.battleForAzeroth and (581 == phaseCode or 587 == phaseCode)) then
-- if (not self.battleForAzeroth and (971 == phaseCode or 976 == phaseCode)) or (self.battleForAzeroth and (581 == phaseCode or 587 == phaseCode)) then
if 971 == phaseCode or 976 == phaseCode or 581 == phaseCode or 587 == phaseCode then
currentPhase = C_Garrison.GetGarrisonInfo(LE_GARRISON_TYPE_6_0) or 0 -- the API returns nil when there is no garrison
end
if nil ~= currentPhase then
Expand Down

0 comments on commit fab5c77

Please sign in to comment.