diff --git a/Grail-NPCs-_classic_-enUS/Grail-NPCs-_classic_-enUS.lua b/Grail-NPCs-_classic_-enUS/Grail-NPCs-_classic_-enUS.lua index bc173922..ca58a067 100644 --- a/Grail-NPCs-_classic_-enUS/Grail-NPCs-_classic_-enUS.lua +++ b/Grail-NPCs-_classic_-enUS/Grail-NPCs-_classic_-enUS.lua @@ -64,7 +64,9 @@ G[1002713]='Wanted Board' G[1002734]='Waterlogged Chest' G[1002908]='Sealed Supply Crate' G[1003080]='Candle of Beckoning' +G[1003238]="Chen's Empty Keg" G[1003643]='Old Footlocker' +G[1003972]='WANTED' G[1004141]='Control Console' G[1006751]='Strange Fruited Plant' G[1006752]='Strange Fronded Plant' diff --git a/Grail-NPCs-_classic_/Grail-NPCs-_classic_.lua b/Grail-NPCs-_classic_/Grail-NPCs-_classic_.lua index 9fccb815..849346d9 100644 --- a/Grail-NPCs-_classic_/Grail-NPCs-_classic_.lua +++ b/Grail-NPCs-_classic_/Grail-NPCs-_classic_.lua @@ -481,7 +481,7 @@ G[3033]={'FH 1456:76.48,27.25'} G[3052]={'FH 1412:46.76,60.23'} G[3054]={'FH 1412:47.75,57.54'} G[3055]={'FH 1412:46.99,57.07'} -G[3057]={'FH 1456:60.32,51.69'} +G[3057]={'FH 1456:60.27,51.66'} G[3060]={'FH 1412:45.08,75.94'} G[3064]={'FH 1412:48.48,59.64'} G[3085]={'FA 1433:26.62,46.56'} @@ -504,18 +504,25 @@ G[3209]={'FH 1412:44.41,76.32'} G[3216]={'FH 1454:49.50,50.58'} G[3233]={'FH 1412:59.86,25.62'} G[3287]={'FH 1411:40.60,62.59'} +G[3292]={'FH 1413:62.26,38.39'} G[3293]={'FH 1411:46.37,22.94'} G[3304]={'FH 1411:55.94,74.39'} G[3336]={'FH 1411:50.84,43.59'} G[3338]={'FH 1413:52.23,31.01'} +G[3339]={'1413:62.28,39.03'} +G[3389]={'FH 1413:45.34,28.41'} G[3390]={'FH 1413:51.44,30.15'} -G[3391]={'1413:62.67,36.27'} +G[3391]={'1413:62.68,36.24'} G[3418]={'FH 1413:44.88,58.62'} +G[3419]={'FH 1456:22.81,20.90','In cave'} G[3429]={'FH 1413:51.50,30.87'} -G[3442]={'1413:62.97,37.17'} -G[3446]={'1413:62.40,37.64'} +G[3432]={'FH 1413:51.95,31.58'} +G[3441]={'FH 1456:61.53,80.90'} +G[3442]={'1413:62.98,37.22'} +G[3446]={'1413:62.37,37.62'} G[3448]={'FH 1413:52.26,31.93'} -G[3453]={'1413:63.33,38.42'} +G[3449]={'FH 1413:51.62,30.90','Top of tower'} +G[3453]={'1413:63.35,38.45'} G[3464]={'FH 1413:51.93,30.32'} G[3483]={'FH 1413:51.21,29.05'} G[3514]={'FA 1438:59.07,39.44'} @@ -614,7 +621,7 @@ G[5469]={'1446:37.60,81.40'} -- Dune Smasher G[5475]={'1446:40.40,54.60 1446:46.80,67.00 1446:41.80,72.40'} -- Dunemaul Warlock G[5480]={'FA 1453:78.49,45.72'} G[5497]={'FA 1453:38.64,79.29'} -G[5543]={'FH 1456:28.60,25.70 1456:27.09,24.27'} -- Clarice Foster +G[5543]={'FH 1456:28.01,25.21', 'Pacing in a cave'} -- Clarice Foster G[5591]={'FH 1435:44.69,57.21'} -- Dar G[5592]={'FH (5592) 1435:81.32,80.97'} -- Tok'Kar G[5594]={'1446:50.89,26.97'} @@ -723,6 +730,7 @@ G[14305]={'FA 1453:47.30,38.32'} -- Human Orphan G[14444]={'FH 1454:70.35,25.70'} -- Orcish Orphan G[14450]={'FA 1453:47.34,38.20'} -- Orphan Matron Nightingale G[14451]={'FH 1454:70.71,25.21'} -- Orphan Matron Battlewail +G[14728]={'FH 1456:43.04,42.74'} G[15197]={'FH 1420:55.56,69.88'} -- Darkcaller Yanka G[15199]={'FA 1424:50.00,57.32'} -- Sergeant Hartman G[15309]={'FH 1454:71.42,22.80'} -- Spoops @@ -839,7 +847,9 @@ G[1002713]={'FA 1417:46.05,47.75'} -- Wanted Board G[1002734]={'1437:12.07,64.08'} G[1002908]={'1412:53.73,48.17'} G[1003080]={''} -- Candle of Beckoning +G[1003238]={'1413:54.70,37.20'} G[1003643]={'1436:41.50,66.82'} +G[1003972]={'1413:62.59,37.47'} G[1004141]={'1413:52.43,11.64'} G[1006751]={'1438:42.62,76.07'} G[1006752]={'1438:34.70,28.69'} @@ -886,6 +896,7 @@ G[100004098]={'D:1002560 Q:594'} -- Carefully Folded Note G[100004433]={'FA 1417:44.30,92.92','Underwater, held by a dead dwarf'} -- Sully Balloo's Letter G[100004613]={'FA ','No longer dropped'} -- Corroded Black Box G[100004614]={'','World drop from level 34 to 40 NPCs.'} -- Pendant of Myzrael +G[100004926]={'D:1003238 Q:819'} G[100008524]={'FH Preowned Q:654'} -- Model 4711-FTZ Power Source G[100008623]={'D:5469,7797,7606,7269,7608,7605,5459,5475,5647,7858 Q:351',"Can drop off most NPCs in Tanaris and Zul'Farrak"} -- OOX-17/TN Distress Beacon G[100008704]={'D:8216 2693 2643 4465 2640 2645 2694 2648 Q:485','Can drop off most NPCs in The Hinterlands'} -- OOX-09/HL Distress Beacon diff --git a/Grail-Quests-_classic_/Grail-Quests-_classic_.lua b/Grail-Quests-_classic_/Grail-Quests-_classic_.lua index 677133bd..cb504ba9 100644 --- a/Grail-Quests-_classic_/Grail-Quests-_classic_.lua +++ b/Grail-Quests-_classic_/Grail-Quests-_classic_.lua @@ -899,7 +899,7 @@ G[892]='K0140 L009 N255 A:3453 T:3391 P:890 E31727' G[893]='K0240 L017 N255 A:3433 T:3433 E31727' G[894]='K0140 L010 N255 A:3442 T:1004141 E31727' G[895]='K0160 L011 N255 A:1003972 T:3391 E31727' -G[896]='K0180 L013 N255 A:3453 T:3453 E31727' +G[896]='K0180 L013 N255 A:3453 T:3453 O:1492 E31727' G[897]='FH K0240 L010 N255 A:100005138 T:3387 E31727' G[898]='FH K0200 L013 N255 A:3465 T:3339 E31727' G[899]='K0200 L014 N255 A:3432 T:3432 E31727' @@ -3163,20 +3163,20 @@ G[7815]='K0500 L044 N255 A:14740 T:14740 E31727' G[7816]='K0480 L044 N255 A:14740 T:14740 P:7815 E31727' G[7817]='K0600 L040 N255 A:14729 T:14729 E31727' G[7818]='K0600 L050 N255 A:14729 T:14729 E31727' -G[7819]='K0600 L050 N255 A:14729 T:14729 P:7818 E31727' +G[7819]='K0601 L050 N255 A:14729 T:14729 P:7818 E31727' G[7820]='K0600 L012 N255 A:14728 T:14728 E31727' G[7821]='K0600 L026 N255 A:14728 T:14728 E31727' G[7822]='K0600 L040 N255 A:14728 T:14728 E31727' G[7823]='K0600 L050 N255 A:14728 T:14728 E31727' G[7824]='K0600 L050 N255 A:14726 T:14726 E31727' -G[7825]='K0600 L050 N255 A:14728 T:14728 P:7823 E31727' +G[7825]='K0601 L050 N255 A:14728 T:14728 P:7823 E31727' G[7826]='K0600 L012 N255 A:14726 T:14726 E31727' G[7827]='K0600 L026 N255 A:14726 T:14726 E31727' G[7828]='K0480 L044 N255 A:14741 T:14741 E31727' G[7829]='K0480 L044 N255 A:14741 T:14741 E31727' G[7830]='K0480 L044 N255 A:14741 T:14741 E31727' G[7831]='K0600 L040 N255 A:14726 T:14726 E31727' -G[7832]='K0600 L050 N255 A:14726 T:14726 P:7824 E31830' +G[7832]='K0601 L050 N255 A:14726 T:14726 P:7824 E31830' G[7833]='K0600 L012 N255 A:14727 T:14727 E31727' G[7834]='K0600 L026 N255 A:14727 T:14727 E31727' G[7835]='K0600 L040 N255 A:14727 T:14727 E31727' diff --git a/Grail/Grail.lua b/Grail/Grail.lua index d5ecdb5d..228dbb18 100644 --- a/Grail/Grail.lua +++ b/Grail/Grail.lua @@ -474,6 +474,8 @@ -- Sets faction obtainers to account for quest giver faction. -- Corrects IsNPCAvailable() to properly use holiday markers for NPCs. -- Augments QuestsInMap() to allow quests in the log whose turn in is in the map to be included. +-- 105 Fixes problem where AQ quests cause Lua error in non-English locales. +-- Updates some quest/NPC information. -- -- Known Issues -- @@ -10382,7 +10384,7 @@ if locale == "deDE" then me.bodyGuardLevel = { 'Leibwächter', 'Treuer Leibwächter', 'Persönlicher Flügelmann' } me.friendshipLevel = { 'Fremder', 'Bekannter', 'Kumpel', 'Freund', 'guter Freund', 'bester Freund' } - me.holidayMapping = { ['A'] = 'Liebe liegt in der Luft', ['B'] = 'Braufest', ['C'] = "Kinderwoche", ['D'] = 'Tag der Toten', ['E'] = 'WoW Anniversary', ['F'] = 'Dunkelmond-Jahrmarkt', ['H'] = 'Erntedankfest', ['K'] = "Angelwettstreit der Kalu'ak", ['L'] = 'Mondfest', ['M'] = 'Sonnenwendfest', ['N'] = 'Nobelgarten', ['P'] = "Piratentag", ['U'] = 'Neujahr', ['V'] = 'Winterhauch', ['W'] = "Schlotternächte", ['X'] = 'Anglerwettbewerb im Schlingendorntal', ['Y'] = "Die Pilgerfreuden", ['Z'] = "Weihnachtswoche", ['a'] = 'Bonusereignis: Apexis', ['b'] = 'Bonusereignis: Arenascharmützel', ['c'] = 'Bonusereignis: Schlachtfelder', ['d'] = 'Bonusereignis: Draenordungeons', ['e'] = 'Bonusereignis: Haustierkämpfe', ['f'] = 'Bonusereignis: Zeitwanderungsdungeons', } + me.holidayMapping = { ['A'] = 'Liebe liegt in der Luft', ['B'] = 'Braufest', ['C'] = "Kinderwoche", ['D'] = 'Tag der Toten', ['E'] = 'WoW Anniversary', ['F'] = 'Dunkelmond-Jahrmarkt', ['H'] = 'Erntedankfest', ['K'] = "Angelwettstreit der Kalu'ak", ['L'] = 'Mondfest', ['M'] = 'Sonnenwendfest', ['N'] = 'Nobelgarten', ['P'] = "Piratentag", ['U'] = 'Neujahr', ['V'] = 'Winterhauch', ['W'] = "Schlotternächte", ['X'] = 'Anglerwettbewerb im Schlingendorntal', ['Y'] = "Die Pilgerfreuden", ['Z'] = "Weihnachtswoche", ['a'] = 'Bonusereignis: Apexis', ['b'] = 'Bonusereignis: Arenascharmützel', ['c'] = 'Bonusereignis: Schlachtfelder', ['d'] = 'Bonusereignis: Draenordungeons', ['e'] = 'Bonusereignis: Haustierkämpfe', ['f'] = 'Bonusereignis: Zeitwanderungsdungeons', ['Q'] = "AQ", } me.professionMapping = { ['A'] = 'Alchemie', ['B'] = 'Schmiedekunst', ['C'] = 'Kochkunst', ['E'] = 'Verzauberkunst', ['F'] = 'Angeln', ['H'] = 'Kräuterkunde', ['I'] = 'Inschriftenkunde', ['J'] = 'Juwelenschleifen', ['L'] = 'Lederverarbeitung', ['M'] = 'Bergbau', ['N'] = 'Ingenieurskunst', ['R'] = 'Reiten', ['S'] = 'Kürschnerei', ['T'] = 'Schneiderei', ['X'] = 'Archäologie', ['Z'] = 'Erste Hilfe', } @@ -10437,7 +10439,7 @@ elseif locale == "esES" then me.bodyGuardLevel = { 'Guardaespaldas', 'Escolta leal', 'Compañero del alma' } me.friendshipLevel = { 'Extraño', 'Conocido', 'Colega', 'Amigo', 'Buen amigo', 'Mejor amigo' } - me.holidayMapping = { ['A'] = 'Amor en el aire', ['B'] = 'Fiesta de la cerveza', ['C'] = "Semana de los Niños", ['D'] = 'Festividad de los Muertos', ['E'] = 'WoW Anniversary', ['F'] = 'Feria de la Luna Negra', ['H'] = 'Festival de la Cosecha', ['K'] = "Competición de pesca Kalu'ak", ['L'] = 'Festival Lunar', ['M'] = 'Festival de Fuego del Solsticio de Verano', ['N'] = 'Jardín Noble', ['P'] = "Día de los Piratas", ['U'] = 'Nochevieja', ['V'] = 'El festín del Festival del Invierno', ['W'] = "Halloween", ['X'] = 'Concurso de Pesca', ['Y'] = "Generosidad del Peregrino", ['Z'] = "Semana navideña", ['a'] = 'Evento de bonificación apexis', ['b'] ='Evento de bonificación de escaramuza de arena', ['c'] = 'Evento de bonificación de campo de batalla', ['d'] = 'Evento de mazmorra de Draenor', ['e'] = 'Evento de bonificación de duelo de mascotas', ['f'] = 'Evento de mazmorra de Paseo en el tiempo', } + me.holidayMapping = { ['A'] = 'Amor en el aire', ['B'] = 'Fiesta de la cerveza', ['C'] = "Semana de los Niños", ['D'] = 'Festividad de los Muertos', ['E'] = 'WoW Anniversary', ['F'] = 'Feria de la Luna Negra', ['H'] = 'Festival de la Cosecha', ['K'] = "Competición de pesca Kalu'ak", ['L'] = 'Festival Lunar', ['M'] = 'Festival de Fuego del Solsticio de Verano', ['N'] = 'Jardín Noble', ['P'] = "Día de los Piratas", ['U'] = 'Nochevieja', ['V'] = 'El festín del Festival del Invierno', ['W'] = "Halloween", ['X'] = 'Concurso de Pesca', ['Y'] = "Generosidad del Peregrino", ['Z'] = "Semana navideña", ['a'] = 'Evento de bonificación apexis', ['b'] ='Evento de bonificación de escaramuza de arena', ['c'] = 'Evento de bonificación de campo de batalla', ['d'] = 'Evento de mazmorra de Draenor', ['e'] = 'Evento de bonificación de duelo de mascotas', ['f'] = 'Evento de mazmorra de Paseo en el tiempo', ['Q'] = "AQ", } me.professionMapping = { ['A'] = 'Alquimia', ['B'] = 'Herrería', ['C'] = 'Cocina', ['E'] = 'Encantamiento', ['F'] = 'Pesca', ['H'] = 'Hebalismo', ['I'] = 'Inscripción', ['J'] = 'Joyería', ['L'] = 'Peletería', ['M'] = 'Minería', ['N'] = 'Ingeniería', ['R'] = 'Equitación', ['S'] = 'Desuello', ['T'] = 'Sastrería', ['X'] = 'Arqueología', ['Z'] = 'Primeros auxilios', } @@ -10464,7 +10466,7 @@ elseif locale == "esMX" then me.bodyGuardLevel = { 'Guardaespaldas', 'De confianza', 'Copiloto personal' } me.friendshipLevel = { 'Extraño', 'Conocido', 'Colega', 'Amigo', 'Buen amigo', 'Mejor amigo' } - me.holidayMapping = { ['A'] = 'Amor en el Aire', ['B'] = 'Fiesta de la Cerveza', ['C'] = "Semana de los Niños", ['D'] = 'Día de los Muertos', ['E'] = 'WoW Anniversary', ['F'] = 'Feria de la Luna Negra', ['H'] = 'Festival de la Cosecha', ['K'] = "Competición de pesca Kalu'ak", ['L'] = 'Festival Lunar', ['M'] = 'Festival de Fuego del Solsticio de Verano', ['N'] = 'Jardín Noble', ['P'] = "Día de los Piratas", ['U'] = 'Nochevieja', ['V'] = 'Festival del Invierno', ['W'] = "Halloween", ['X'] = 'Concurso de Pesca', ['Y'] = "Generosidad del Peregrino", ['Z'] = "Semana navideña", ['a'] = 'Evento de ápices con bonificación', ['b'] ='Evento de refriegas de arena con bonificación', ['c'] = 'Evento de campos de batalla con bonificación', ['d'] = 'Evento de calabozo de Draenor', ['e'] = 'Evento de duelo de mascotas con bonificación', ['f'] = 'Evento de calabozo de cronoviaje', } + me.holidayMapping = { ['A'] = 'Amor en el Aire', ['B'] = 'Fiesta de la Cerveza', ['C'] = "Semana de los Niños", ['D'] = 'Día de los Muertos', ['E'] = 'WoW Anniversary', ['F'] = 'Feria de la Luna Negra', ['H'] = 'Festival de la Cosecha', ['K'] = "Competición de pesca Kalu'ak", ['L'] = 'Festival Lunar', ['M'] = 'Festival de Fuego del Solsticio de Verano', ['N'] = 'Jardín Noble', ['P'] = "Día de los Piratas", ['U'] = 'Nochevieja', ['V'] = 'Festival del Invierno', ['W'] = "Halloween", ['X'] = 'Concurso de Pesca', ['Y'] = "Generosidad del Peregrino", ['Z'] = "Semana navideña", ['a'] = 'Evento de ápices con bonificación', ['b'] ='Evento de refriegas de arena con bonificación', ['c'] = 'Evento de campos de batalla con bonificación', ['d'] = 'Evento de calabozo de Draenor', ['e'] = 'Evento de duelo de mascotas con bonificación', ['f'] = 'Evento de calabozo de cronoviaje', ['Q'] = "AQ", } me.professionMapping = { ['A'] = 'Alquimia', ['B'] = 'Herrería', ['C'] = 'Cocina', ['E'] = 'Encantamiento', ['F'] = 'Pesca', ['H'] = 'Hebalismo', ['I'] = 'Inscripción', ['J'] = 'Joyería', ['L'] = 'Peletería', ['M'] = 'Minería', ['N'] = 'Ingeniería', ['R'] = 'Equitación', ['S'] = 'Desuello', ['T'] = 'Sastrería', ['X'] = 'Arqueología', ['Z'] = 'Primeros auxilios', } @@ -10491,7 +10493,7 @@ elseif locale == "frFR" then me.bodyGuardLevel = { 'Garde du corps', 'Garde personnel', 'Bras droit' } me.friendshipLevel = { 'Étranger', 'Connaissance', 'Camarade', 'Ami', 'Bon ami', 'Meilleur ami' } - me.holidayMapping = { ['A'] = "De l'amour dans l'air", ['B'] = 'Fête des Brasseurs', ['C'] = "Semaine des enfants", ['D'] = 'Jour des morts', ['E'] = 'WoW Anniversary', ['F'] = 'Foire de Sombrelune', ['H'] = 'Fête des moissons', ['K'] = "Tournoi de pêche kalu'ak", ['L'] = 'Fête lunaire', ['M'] = "Fête du Feu du solstice d'été", ['N'] = 'Le Jardin des nobles', ['P'] = "Jour des pirates", ['U'] = 'Nouvel an', ['V'] = "Voile d'hiver", ['W'] = "Sanssaint", ['X'] = 'Concours de pêche de Strangleronce', ['Y'] = "Bienfaits du pèlerin", ['Z'] = "Vacances de Noël", ['a'] = 'Évènement bonus Apogides', ['b'] ='Évènement bonus Escarmouches en arène', ['c'] = 'Évènement bonus Champs de bataille', ['d'] = 'Évènement Donjon de Draenor', ['e'] = 'Évènement bonus Combats de mascottes', ['f'] = 'Évènement Donjon des Marcheurs du temps', } + me.holidayMapping = { ['A'] = "De l'amour dans l'air", ['B'] = 'Fête des Brasseurs', ['C'] = "Semaine des enfants", ['D'] = 'Jour des morts', ['E'] = 'WoW Anniversary', ['F'] = 'Foire de Sombrelune', ['H'] = 'Fête des moissons', ['K'] = "Tournoi de pêche kalu'ak", ['L'] = 'Fête lunaire', ['M'] = "Fête du Feu du solstice d'été", ['N'] = 'Le Jardin des nobles', ['P'] = "Jour des pirates", ['U'] = 'Nouvel an', ['V'] = "Voile d'hiver", ['W'] = "Sanssaint", ['X'] = 'Concours de pêche de Strangleronce', ['Y'] = "Bienfaits du pèlerin", ['Z'] = "Vacances de Noël", ['a'] = 'Évènement bonus Apogides', ['b'] ='Évènement bonus Escarmouches en arène', ['c'] = 'Évènement bonus Champs de bataille', ['d'] = 'Évènement Donjon de Draenor', ['e'] = 'Évènement bonus Combats de mascottes', ['f'] = 'Évènement Donjon des Marcheurs du temps', ['Q'] = "AQ", } me.professionMapping = { ['A'] = 'Alchimie', ['B'] = 'Forge', ['C'] = 'Cuisine', ['E'] = 'Enchantement', ['F'] = 'Pêche', ['H'] = 'Herboristerie', ['I'] = 'Calligraphie', ['J'] = 'Joaillerie', ['L'] = 'Travail du cuir', ['M'] = 'Minage', ['N'] = 'Ingénierie', ['R'] = 'Monte', ['S'] = 'Dépeçage', ['T'] = 'Couture', ['X'] = 'Archéologie', ['Z'] = 'Secourisme', } @@ -10537,7 +10539,7 @@ me.holidayMapping = { ['X'] = 'Gara di Pesca a Rovotorto', ['Y'] = "Ringraziamento del Pellegrino", ['Z'] = "Settimana di Natale", -['a'] = 'Evento bonus: Cristalli Apexis', ['b'] ='Evento bonus: schermaglie in arena', ['c'] = 'Evento bonus: campi di battaglia', ['d'] = 'Evento bonus: spedizioni di Draenor', ['e'] = 'Evento bonus: scontri tra mascotte', ['f'] = 'Evento bonus: Viaggi nel Tempo', } +['a'] = 'Evento bonus: Cristalli Apexis', ['b'] ='Evento bonus: schermaglie in arena', ['c'] = 'Evento bonus: campi di battaglia', ['d'] = 'Evento bonus: spedizioni di Draenor', ['e'] = 'Evento bonus: scontri tra mascotte', ['f'] = 'Evento bonus: Viaggi nel Tempo', ['Q'] = "AQ", } me.professionMapping = { ['A'] = 'Alchimia', @@ -10578,7 +10580,7 @@ elseif locale == "koKR" then me.bodyGuardLevel = { '경호원', '믿음직스러운 경호원', '개인 호위무사' } me.friendshipLevel = { '이방인', '지인', '동료', '친구', '좋은 친구', '가장 친한 친구' } - me.holidayMapping = { ['A'] = '온누리에 사랑을', ['B'] = '가을 축제', ['C'] = "어린이 주간", ['D'] = '망자의 날', ['E'] = 'WoW Anniversary', ['F'] = '다크문 축제', ['H'] = '추수절', ['K'] = '칼루아크 낚시 대회', ['L'] = '달의 축제', ['M'] = '한여름 불꽃축제', ['N'] = '귀족의 정원', ['P'] = "해적의 날", ['U'] = '새해맞이 전야제', ['V'] = '겨울맞이 축제', ['W'] = "할로윈 축제", ['X'] = '가시덤불 골짜기 낚시왕 선발대회', ['Y'] = "순례자의 감사절", ['Z'] = "한겨울 축제 주간", ['a'] = '에펙시스 보너스 이벤트', ['b'] ='투기장 연습 전투 보너스 이벤트', ['c'] = '전장 보너스 이벤트', ['d'] = '드레노어 던전 이벤트', ['e'] = '애완동물 대전 보너스 이벤트', ['f'] = '시간여행 던전 이벤트', } + me.holidayMapping = { ['A'] = '온누리에 사랑을', ['B'] = '가을 축제', ['C'] = "어린이 주간", ['D'] = '망자의 날', ['E'] = 'WoW Anniversary', ['F'] = '다크문 축제', ['H'] = '추수절', ['K'] = '칼루아크 낚시 대회', ['L'] = '달의 축제', ['M'] = '한여름 불꽃축제', ['N'] = '귀족의 정원', ['P'] = "해적의 날", ['U'] = '새해맞이 전야제', ['V'] = '겨울맞이 축제', ['W'] = "할로윈 축제", ['X'] = '가시덤불 골짜기 낚시왕 선발대회', ['Y'] = "순례자의 감사절", ['Z'] = "한겨울 축제 주간", ['a'] = '에펙시스 보너스 이벤트', ['b'] ='투기장 연습 전투 보너스 이벤트', ['c'] = '전장 보너스 이벤트', ['d'] = '드레노어 던전 이벤트', ['e'] = '애완동물 대전 보너스 이벤트', ['f'] = '시간여행 던전 이벤트', ['Q'] = "AQ", } me.professionMapping = { ['A'] = '연금술', ['B'] = '대장기술', ['C'] = '요리', ['E'] = '마법부여', ['F'] = '낚시', ['H'] = '약초채집', ['I'] = '주문각인', ['J'] = '보석세공', ['L'] = '가죽세공', ['M'] = '채광', ['N'] = '기계공학', ['R'] = '탈것 숙련', ['S'] = '무두질', ['T'] = '재봉술', ['X'] = '고고학', ['Z'] = '응급치료', } @@ -10614,7 +10616,7 @@ elseif locale == "ptBR" then me.bodyGuardLevel = { 'Guarda-costas', 'Guarda-costas de Confiança', 'Copiloto Pessoal' } me.friendshipLevel = { 'Estranho', 'Conhecido', 'Camarada', 'Amigo', 'Bom Amigo', 'Grande Amigo' } -me.holidayMapping = { ['A'] = "O Amor Está No Ar", ['B'] = 'CervaFest', ['C'] = "Semana das Crianças", ['D'] = 'Dia dos Mortos', ['E'] = 'WoW Anniversary', ['F'] = 'Feira de Negraluna', ['H'] = 'Festival da Colheita', ['K'] = "Campeonato de Pesca dos Kalu'ak", ['L'] = 'Festival da Lua', ['M'] = "Festival do Fogo do Solsticio", ['N'] = 'Jardinova', ['P'] = "Dia dos Piratas", ['U'] = 'New Year', ['V'] = "Festa do Véu de Inverno", ['W'] = "Noturnália", ['X'] = 'Stranglethorn Fishing Extravaganza', ['Y'] = "Festa da Fartura", ['Z'] = "Semana Natalina", ['a'] = 'Evento Bônus de Apexis', ['b'] ='Evento Bônus de Escaramuças da Arena', ['c'] = 'Evento Bônus de Campos de Batalha', ['d'] = 'Evento das Masmorras de Draenor', ['e'] = 'Evento Bônus de Batalha de Mascotes', ['f'] = 'Evento das Masmorras de Caminhada Temporal', } +me.holidayMapping = { ['A'] = "O Amor Está No Ar", ['B'] = 'CervaFest', ['C'] = "Semana das Crianças", ['D'] = 'Dia dos Mortos', ['E'] = 'WoW Anniversary', ['F'] = 'Feira de Negraluna', ['H'] = 'Festival da Colheita', ['K'] = "Campeonato de Pesca dos Kalu'ak", ['L'] = 'Festival da Lua', ['M'] = "Festival do Fogo do Solsticio", ['N'] = 'Jardinova', ['P'] = "Dia dos Piratas", ['U'] = 'New Year', ['V'] = "Festa do Véu de Inverno", ['W'] = "Noturnália", ['X'] = 'Stranglethorn Fishing Extravaganza', ['Y'] = "Festa da Fartura", ['Z'] = "Semana Natalina", ['a'] = 'Evento Bônus de Apexis', ['b'] ='Evento Bônus de Escaramuças da Arena', ['c'] = 'Evento Bônus de Campos de Batalha', ['d'] = 'Evento das Masmorras de Draenor', ['e'] = 'Evento Bônus de Batalha de Mascotes', ['f'] = 'Evento das Masmorras de Caminhada Temporal', ['Q'] = "AQ", } me.professionMapping = { ['A'] = 'Alquimia', @@ -10659,7 +10661,7 @@ elseif locale == "ruRU" then me.bodyGuardLevel = { 'Телохранитель', 'Доверенный боец', 'Боевой товарищ' } me.friendshipLevel = { 'Незнакомец', 'Знакомый', 'Приятель', 'Друг', 'Хороший друг', 'Лучший друг' } - me.holidayMapping = { ['A'] = 'Любовная лихорадка', ['B'] = 'Хмельной фестиваль', ['C'] = "Детская неделя", ['D'] = 'День мертвых', ['E'] = 'WoW Anniversary', ['F'] = 'Ярмарка Новолуния', ['H'] = 'Неделя урожая', ['K'] = "Калуакское рыбоборье", ['L'] = 'Лунный фестиваль', ['M'] = 'Огненный солнцеворот', ['N'] = 'Сад чудес', ['P'] = "День пирата", ['U'] = 'Канун Нового Года', ['V'] = 'Зимний Покров', ['W'] = "Тыквовин", ['X'] = 'Рыбная феерия Тернистой долины', ['Y'] = "Пиршество странников", ['Z'] = "Рождественская неделя", ['a'] = 'Событие: бонус к апекситовым кристаллам', ['b'] ='Событие: бонус за стычки на арене', ['c'] = 'Событие: бонус на полях боя', ['d'] = 'Событие: подземелья Дренора', ['e'] = 'Событие: бонус за битвы питомцев', ['f'] = 'Событие: путешествие во времени по подземельям', } + me.holidayMapping = { ['A'] = 'Любовная лихорадка', ['B'] = 'Хмельной фестиваль', ['C'] = "Детская неделя", ['D'] = 'День мертвых', ['E'] = 'WoW Anniversary', ['F'] = 'Ярмарка Новолуния', ['H'] = 'Неделя урожая', ['K'] = "Калуакское рыбоборье", ['L'] = 'Лунный фестиваль', ['M'] = 'Огненный солнцеворот', ['N'] = 'Сад чудес', ['P'] = "День пирата", ['U'] = 'Канун Нового Года', ['V'] = 'Зимний Покров', ['W'] = "Тыквовин", ['X'] = 'Рыбная феерия Тернистой долины', ['Y'] = "Пиршество странников", ['Z'] = "Рождественская неделя", ['a'] = 'Событие: бонус к апекситовым кристаллам', ['b'] ='Событие: бонус за стычки на арене', ['c'] = 'Событие: бонус на полях боя', ['d'] = 'Событие: подземелья Дренора', ['e'] = 'Событие: бонус за битвы питомцев', ['f'] = 'Событие: путешествие во времени по подземельям', ['Q'] = "AQ", } me.professionMapping = { ['A'] = 'Алхимия', ['B'] = 'Кузнечное дело', ['C'] = 'Кулинария', ['E'] = 'Наложение чар', ['F'] = 'Рыбная ловля', ['H'] = 'Травничество', ['I'] = 'Начертание', ['J'] = 'Ювелирное дело', ['L'] = 'Кожевничество', ['M'] = 'Горное дело', ['N'] = 'Механика', ['R'] = 'Верховая езда', ['S'] = 'Снятие шкур', ['T'] = 'Портняжное дело', ['X'] = 'Археология', ['Z'] = 'Первая помощь', } @@ -10694,7 +10696,7 @@ elseif locale == "ruRU" then elseif locale == "zhCN" then me.bodyGuardLevel = { '保镖', '贴身保镖', '亲密搭档' } me.friendshipLevel = { 'Stranger', 'Acquaintance', 'Buddy', 'Friend', 'Good Friend', '挚友' } - me.holidayMapping = { ['A'] = '情人节', ['B'] = '美酒节', ['C'] = "儿童周", ['D'] = '死人节', ['E'] = 'WoW Anniversary', ['F'] = '暗月马戏团', ['H'] = '收获节', ['K'] = "Tournoi de pêche kalu'ak", ['L'] = '春节', ['M'] = '仲夏火焰节', ['N'] = '复活节', ['P'] = "海盗日", ['U'] = '除夕夜', ['V'] = '冬幕节', ['W'] = "万圣节", ['X'] = '荆棘谷钓鱼大赛', ['Y'] = "感恩节", ['Z'] = "圣诞周", ['a'] = '埃匹希斯假日活动', ['b'] ='竞技场练习赛假日活动', ['c'] = '战场假日活动', ['d'] = '德拉诺地下城活动', ['e'] = '宠物对战假日活动', ['f'] = '时空漫游地下城活动', } + me.holidayMapping = { ['A'] = '情人节', ['B'] = '美酒节', ['C'] = "儿童周", ['D'] = '死人节', ['E'] = 'WoW Anniversary', ['F'] = '暗月马戏团', ['H'] = '收获节', ['K'] = "Tournoi de pêche kalu'ak", ['L'] = '春节', ['M'] = '仲夏火焰节', ['N'] = '复活节', ['P'] = "海盗日", ['U'] = '除夕夜', ['V'] = '冬幕节', ['W'] = "万圣节", ['X'] = '荆棘谷钓鱼大赛', ['Y'] = "感恩节", ['Z'] = "圣诞周", ['a'] = '埃匹希斯假日活动', ['b'] ='竞技场练习赛假日活动', ['c'] = '战场假日活动', ['d'] = '德拉诺地下城活动', ['e'] = '宠物对战假日活动', ['f'] = '时空漫游地下城活动', ['Q'] = "AQ", } me.professionMapping = { ['A'] = '炼金术', ['B'] = '锻造', ['C'] = '烹饪', ['E'] = '附魔', ['F'] = '钓鱼', ['H'] = '草药学', ['I'] = '铭文', ['J'] = '珠宝加工', ['L'] = '制皮', ['M'] = '采矿', ['N'] = '工程学', ['R'] = '骑术', ['S'] = '剥皮', ['T'] = '裁缝', ['X'] = '考古学', ['Z'] = '急救', } @@ -10730,7 +10732,7 @@ elseif locale == "zhTW" then me.bodyGuardLevel = { '保鏢', '信任的保鑣', '個人的搭檔' } me.friendshipLevel = { '陌生人', '熟識', '夥伴', '朋友', '好朋友', '最好的朋友' } - me.holidayMapping = { ['A'] = '愛就在身邊', ['B'] = '啤酒節', ['C'] = "兒童週", ['D'] = '亡者節', ['E'] = 'WoW Anniversary', ['F'] = '暗月馬戲團', ['H'] = '收穫節', ['K'] = "卡魯耶克釣魚大賽", ['L'] = '新年慶典', ['M'] = '仲夏火焰節慶', ['N'] = '貴族花園', ['P'] = "海賊日", ['U'] = '除夕夜', ['V'] = '冬幕節', ['W'] = "萬鬼節", ['X'] = '荊棘谷釣魚大賽', ['Y'] = "旅人豐年祭", ['Z'] = "聖誕週", ['a'] = '頂尖獎勵事件', ['b'] ='競技場練習戰獎勵事件', ['c'] = '戰場獎勵事件', ['d'] = '德拉諾地城事件', ['e'] = '寵物對戰獎勵事件', ['f'] = '時光漫遊地城事件', } + me.holidayMapping = { ['A'] = '愛就在身邊', ['B'] = '啤酒節', ['C'] = "兒童週", ['D'] = '亡者節', ['E'] = 'WoW Anniversary', ['F'] = '暗月馬戲團', ['H'] = '收穫節', ['K'] = "卡魯耶克釣魚大賽", ['L'] = '新年慶典', ['M'] = '仲夏火焰節慶', ['N'] = '貴族花園', ['P'] = "海賊日", ['U'] = '除夕夜', ['V'] = '冬幕節', ['W'] = "萬鬼節", ['X'] = '荊棘谷釣魚大賽', ['Y'] = "旅人豐年祭", ['Z'] = "聖誕週", ['a'] = '頂尖獎勵事件', ['b'] ='競技場練習戰獎勵事件', ['c'] = '戰場獎勵事件', ['d'] = '德拉諾地城事件', ['e'] = '寵物對戰獎勵事件', ['f'] = '時光漫遊地城事件', ['Q'] = "AQ", } me.professionMapping = { ['A'] = '鍊金術', ['B'] = '鍛造', ['C'] = '烹飪', ['E'] = '附魔', ['F'] = '釣魚', ['H'] = '草藥學', ['I'] = '銘文學', ['J'] = '珠寶設計', ['L'] = '製皮', ['M'] = '採礦', ['N'] = '工程學', ['R'] = '騎術', ['S'] = '剝皮', ['T'] = '裁縫', ['X'] = '考古學', ['Z'] = '急救', } diff --git a/Grail/Grail.toc b/Grail/Grail.toc index 8d8c07fb..ebee988c 100644 --- a/Grail/Grail.toc +++ b/Grail/Grail.toc @@ -2,7 +2,7 @@ ## Title: Grail ## Author: Scott M Harrison ## Notes: Knows about quests -## Version: 104 +## Version: 105 ## SavedVariables: GrailDatabase ## SavedVariablesPerCharacter: GrailDatabasePlayer