Updates for the 123 release.

smaitch · Sep 6, 2024 · cbb4720 · cbb4720
1 parent cdf2029
commit cbb4720
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/Grail/Grail.lua b/Grail/Grail.lua
@@ -571,6 +571,9 @@
 --			Adds better support for The Ruby Feast quests.
 --			Adds better support for quest 70779.
 --			Changed retail interface to 100007.
+--		123 Adds initial support for The War Within.
+--			Switches TOC to have a single Interface that lists all supported versions.
+--			Changes the use of localized names to no longer be addons but to be included in the base Grail addon.
 --
 --	Known Issues
 --

diff --git a/Grail/NPCs/Grail-NPCs-_retail_.lua b/Grail/NPCs/Grail-NPCs-_retail_.lua
@@ -17663,6 +17663,7 @@ G[221733]={'2215:55.13,40.22'}
 G[221839]={'2322:89.48,48.03 2248:22.52,64.94'}
 G[221842]={'2255:59.93,54.18'}
 G[221887]={'2322:62.69,49.64 2248:19.74,65.10'}
+G[221888]={'2322:47.76,54.78 2248:18.20,65.64'}
 G[221891]={'2322:62.68,49.29 2248:19.74,65.07'}
 G[221948]={'2255:51.39,63.94'}
 G[221961]={'2255:63.75,17.83'}
@@ -20417,6 +20418,7 @@ G[701869]={'885:57.07,51.02 A:127114'}
 G[701870]={'830:66.68,37.91 A:208836'}
 G[701871]={'2248:75.97,39.88 A:214995'}
 G[701872]={'2248:76.56,35.67 A:214995'}
+G[701873]={'2322:90.95,49.03 2248:22.67,65.04 A:209681'}
 G[701874]={'2214:58.66,34.28 A:230643'}
 G[701916]={'641:38.03,78.06 A:104290'}
 G[701933]={'630:30.43,25.71 A:103784'}

diff --git a/Grail/NPCs/Names/Grail-NPCs-_retail_-enUS.lua b/Grail/NPCs/Names/Grail-NPCs-_retail_-enUS.lua
@@ -2077,7 +2077,7 @@ G[1445587]='Arathi Crate Stacked'
 G[1446135]='Niffen Stash'
 G[1446299]='Silk-spun Supplies'
 G[1446362]='Crimson Charmer'
-G[1446363]='Highland Bear'
+G[1446363]='Amber Bloom'
 G[1446365]='Arathi Chest'
 G[1446404]='Corrupted Memory'
 G[1446423]='Nest Egg'

diff --git a/Grail/Quests/Grail-Quests-_retail_.lua b/Grail/Quests/Grail-Quests-_retail_.lua
@@ -37746,7 +37746,7 @@ G[65463]='L60 A:181084 T:182146'
 G[65466]='L60 A:177958 T:177958 P:65461'
 G[65467]='L0 E43114'
 G[65471]=''
-G[65475]='L0 A:100189361 T:183912,701607,701623,701624 P:0 E46479'	-- 701607 is after they move, and 183912 is before they move.  T:701623 is when she moves because 65778 is ready for turn in. T:701624 is when quest 66299 is ready for turnin.
+G[65475]='L0 A:100189361 T:183912,701607,701623,701624 P:E65313 E46479'	-- 701607 is after they move, and 183912 is before they move.  T:701623 is when she moves because 65778 is ready for turn in. T:701624 is when quest 66299 is ready for turnin.
 G[65480]=''
 G[65486]='L70 A:185651 T:185651 P:69870 E46479'	-- completes "Ready, Aim, Catalog"
 G[65487]=''
@@ -41028,7 +41028,7 @@ G[76112]='E56110'
 G[76113]='N70 A:-2112 T:185468 E56110'
 G[76114]='E56110'
 G[76122]='K262144 L0 A:-132112 T:-2112 P:a76122 E49407'
-G[76140]='N70 A:187669 T:205706 P:0' -- TODO: Not available for Yoshimo
+G[76140]='N70 A:187669 T:205706 P:0'	-- TODO: Not available for Yoshimo
 G[76141]='N70 A:205706 T:205707 P:76140 E56110'
 G[76142]='N70 A:-2025 T:205707 P:76140 E56110'
 G[76143]='N70 A:205707 T:205707 P:76141+76142 E56110'	-- verify requires 76141
@@ -41173,7 +41173,7 @@ G[76419]='N70 A:207634 T:207634 P:76407 E56110'
 G[76420]='N70 A:207634 T:207634 P:76419 E56110'
 G[76421]='N70 A:207634 T:207634 P:76420 E56110'
 G[76422]='E56110'
-G[76423]='N70 A:208035 T:207106 P:0' -- TODO: not available for Yoshimo
+G[76423]='N70 A:208035 T:207106 P:0'	-- TODO: not available for Yoshimo
 G[76425]='E56110'
 G[76426]='E56263'
 G[76427]='FH E56110'
@@ -41385,7 +41385,7 @@ G[77318]='N70 A:208669 T:208669 P:77317 E56110'
 G[77322]='E56110'
 G[77323]='E56110'
 G[77324]='E56110'
-G[77325]='N70 A:1405593 T:206107 E56110 P:0' -- TODO: not available for Yoshimo
+G[77325]='L70 A:1405593 T:206107 E56110'
 G[77327]='E56110'
 G[77328]='E56110'
 G[77329]='K4096 L70 A:206397 T:208537 P:76276 E56110'
@@ -42094,9 +42094,9 @@ G[79194]='N75 A:217474 T:223000 P:79193'
 G[79196]='E56110'
 G[79197]='K4096 L78 A:219252 T:216149 P:84022 E56110'	-- turnin unlocks world quests and adventure mode in Khaz Algar, also Earthen race
 G[79199]='E56110'
-G[79200]='N10 A:221839 T:221887 E56110'
-G[79201]='N10 A:221891 P:79200 E56110'
-G[79202]='E56110'
+G[79200]='N10 RX A:221839 T:221887 E56110'
+G[79201]='N10 A:221891 T:221888 P:79200 E56110'
+G[79202]='N10 A:221888 P:79201 E56110'
 G[79203]='E56110'
 G[79204]='E56110'
 G[79205]='K4096 N75 A:212991 T:212991 P:78640 E56110'
@@ -42214,7 +42214,7 @@ G[79437]='P:79433 E56110'
 G[79438]='P:80380 E56110'
 G[79439]='E56110'
 G[79440]='P:79438 E56110'
-G[79448]='N70 A:216449 T:216449 P:0' -- TODO: not available for Yoshimo
+G[79448]='N70 A:216449 T:216449 P:0'	-- TODO: not available for Yoshimo
 G[79453]='N70 A:216449 P:79448 E56110'
 G[79462]='E56110'
 G[79463]='E56110'
@@ -42235,7 +42235,7 @@ G[79505]='N75 A:216438 T:216438 P:79504 E56110'
 G[79507]='N75 A:216438 T:216438 P:79505 E56110'
 G[79508]='N75 A:216438 T:216438 P:79507 E56110'
 G[79510]='N75 A:216438 T:216438 P:79508 E56110'
-G[79511]='N70 A:216946 T:216945 P:0' -- TODO: not here for Yoshimo
+G[79511]='N70 A:216946 T:216945 P:0'	-- TODO: not here for Yoshimo
 G[79512]='N70 A:216945 T:216945 P:79511'
 G[79513]='E56110'
 G[79514]='N70 A:216967 P:79512'
@@ -43045,7 +43045,7 @@ G[82798]='N71 A:224708 T:701934 P:82797'
 G[82799]='N71 A:224708 T:701934 P:82797'
 G[82800]='N71 A:701934 T:701934 P:82798+82799'
 G[82801]='N71 A:701934 T:218535 P:82800'
-G[82809]='N10 A:82809 E56110'
+G[82809]='N10 RX A:82809 E56110'
 G[82810]='E56110'
 G[82813]='E56110'
 G[82814]='N80 A:224618 T:701855 P:82786+82969 E56110'	-- verify requires 82786