Skip to content

Dev #1594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cairthenn merged 3 commits into from
Nov 11, 2017
Merged

Dev #1594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f5df4e
Update setbgm.lua
funkworkz Nov 10, 2017
1359d82
Merge pull request #1592 from funkworkz/patch-1
z16 Nov 10, 2017
9963780
Fix runtime error building outgoing packet 0x4e
cairthenn Nov 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions addons/libs/packets/fields.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion addons/setbgm/setbgm.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down