From 3f5df4eff969a59fbabdbcba0e8b1051f8161e7f Mon Sep 17 00:00:00 2001 From: funkworkz Date: Fri, 10 Nov 2017 13:32:46 -0600 Subject: [PATCH 1/2] Update setbgm.lua Updated name for #84, added #86, #87, #88 and #89 --- addons/setbgm/setbgm.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/setbgm/setbgm.lua b/addons/setbgm/setbgm.lua index 1a246e921..6e94b9ebb 100644 --- a/addons/setbgm/setbgm.lua +++ b/addons/setbgm/setbgm.lua @@ -54,7 +54,7 @@ songs = { [50]='Feast of the Ladies', [51]='Abyssea - Scarlet Skies, Shadowed Plains', [52]='Melodies Errant', [53]='Shinryu', [54]='Everlasting Bonds', [55]='Provenance Watcher', [56]='Where it All Begins', [57]='Steel Sings, Blades Dance', [58]='A New Direction', [59]='The Pioneers', [60]='Into Lands Primeval - Ulbuka', [61]="Water's Umbral Knell", [62]='Keepers of the Wild', [63]='The Sacred City of Adoulin', [64]='Breaking Ground', [65]='Hades', [66]='Arciela', [67]='Mog Resort', [68]='Worlds Away', [69]="Distant Worlds (Nanaa Mihgo's version)", [70]='Monstrosity', [71]="The Pioneers (Nanaa Mihgo's version)", [72]='The Serpentine Labyrinth', [73]='The Divine', [74]='Clouds Over Ulbuka', [75]='The Price', [76]='Forever Today', [77]='Distant Worlds (Instrumental)', [78]='Forever Today (Instrumental)', [79]='Iroha', - [80]='The Boundless Black', [81]='Isle of the Gods', [82]='Wail of the Void', [83]="Rhapsodies of Vana'diel", [84]="Unknown", [85]="Ambuscade", + [80]='The Boundless Black', [81]='Isle of the Gods', [82]='Wail of the Void', [83]="Rhapsodies of Vana'diel", [84]="Mount", [85]="Ambuscade", [86]="FFRK Shadow Lord", [87]="Omen", [88]="Dynamis Divergence", [89]="Unknown", [101]='Battle Theme', [102]='Battle in the Dungeon #2', [103]='Battle Theme #2', [104]='A Road Once Traveled', [105]='Mhaura', [106]='Voyager', [107]="The Kingdom of San d'Oria", [108]="Vana'diel March", [109]='Ronfaure', [110]='The Grand Duchy of Jeuno', [111]='Blackout', [112]='Selbina', [113]='Sarutabaruta', [114]='Batallia Downs', [115]='Battle in the Dungeon', [116]='Gustaberg', [117]="Ru'Lude Gardens", [118]='Rolanberry Fields', [119]='Awakening', [120]="Vana'diel March #2", [121]='Shadow Lord', [122]='One Last Time', [123]='Hopelessness', [124]='Recollection', [125]='Tough Battle', [126]='Mog House', [127]='Anxiety', [128]='Airship', [129]='Hook, Line and Sinker', From 99637803405cded0090b34ac52aecb18b743532b Mon Sep 17 00:00:00 2001 From: Mark Date: Fri, 10 Nov 2017 18:29:15 -0500 Subject: [PATCH 2/2] Fix runtime error building outgoing packet 0x4e --- addons/libs/packets/fields.lua | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/addons/libs/packets/fields.lua b/addons/libs/packets/fields.lua index ee0d18f51..51272fc18 100644 --- a/addons/libs/packets/fields.lua +++ b/addons/libs/packets/fields.lua @@ -577,14 +577,10 @@ func.outgoing[0x04E][0x10] = L{ } -- Auction Interaction -fields.outgoing[0x04E] = function() - local self = func.outgoing[0x04E] - local fields = self.base - - return function(data, type) - return self.base + (self[type or data:byte(5)] or L{}) - end -end() +fields.outgoing[0x04E] = function(data, type) + type = type or data and data:byte(5) + return func.outgoing[0x04E].base + (func.outgoing[0x04E][type] or L{}) +end -- Equip fields.outgoing[0x050] = L{