Skip to content

Commit 198ca32

Browse files
sabarjpsabarjp
authored
Merge pull request #34 from sabarjp/item-icons-and-st-overide
- feat: item icons - feat: sub target override feature (toggleable setting) - fix: mouseover on empty slots showing those slots - chore: brd adjustments for stpc - chore: added item slots to general bar
2 parents 4e5e95d + 168cd8a commit 198ca32

File tree

2,583 files changed

+280
-178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,583 files changed

+280
-178
lines changed

‎README.md‎

Lines changed: 4 additions & 0 deletions

‎data/Examples/General.lua‎

Lines changed: 83 additions & 68 deletions
Large diffs are not rendered by default.

‎data/Examples/brd.lua‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
-- Load and initialize the include file.
22
xivhotbar_keybinds_job["Base"] = {
33
-- Hotbar #1 Buffs
4-
{ "battle 1 1", "ma", "Advancing March", "me", "March1" }, -- haste
5-
{ "battle 1 2", "ma", "Victory March", "me", "March2" }, -- haste
6-
{ "battle 1 3", "ma", "Valor Minuet", "me", "Minuet1" }, -- attack up
7-
{ "battle 1 4", "ma", "Valor Minuet II", "me", "Minuet2" }, -- attack up
8-
{ "battle 1 3", "ma", "Valor Minuet III", "me", "Minuet3" }, -- attack up
9-
{ "battle 1 4", "ma", "Valor Minuet IV", "me", "Minuet4" }, -- attack up
10-
{ "battle 1 3", "ma", "Valor Minuet V", "me", "Minuet5" }, -- attack up
11-
{ "battle 1 5", "ma", "Sword Madrigal", "me", "Madrgl1" }, -- acc up
12-
{ "battle 1 6", "ma", "Blade Madrigal", "me", "Madrgl2" }, -- acc up
13-
{ "battle 1 7", "ma", "Hunter's Prelude", "me", "Preld1" }, -- racc up
14-
{ "battle 1 8", "ma", "Archer's Prelude", "me", "Preld2" }, -- racc up
15-
{ "battle 1 9", "ma", "Mage's Ballad", "me", "Ballad1" }, -- refresh
16-
{ "battle 1 10", "ma", "Mage's Ballad II", "me", "Ballad2" }, -- refresh
17-
{ "battle 1 9", "ma", "Mage's Ballad III", "me", "Ballad3" }, -- refresh
4+
{ "battle 1 1", "ma", "Advancing March", "stpc", "March1" }, -- haste
5+
{ "battle 1 2", "ma", "Victory March", "stpc", "March2" }, -- haste
6+
{ "battle 1 3", "ma", "Valor Minuet", "stpc", "Minuet1" }, -- attack up
7+
{ "battle 1 4", "ma", "Valor Minuet II", "stpc", "Minuet2" }, -- attack up
8+
{ "battle 1 3", "ma", "Valor Minuet III", "stpc", "Minuet3" }, -- attack up
9+
{ "battle 1 4", "ma", "Valor Minuet IV", "stpc", "Minuet4" }, -- attack up
10+
{ "battle 1 3", "ma", "Valor Minuet V", "stpc", "Minuet5" }, -- attack up
11+
{ "battle 1 5", "ma", "Sword Madrigal", "stpc", "Madrgl1" }, -- acc up
12+
{ "battle 1 6", "ma", "Blade Madrigal", "stpc", "Madrgl2" }, -- acc up
13+
{ "battle 1 7", "ma", "Hunter's Prelude", "stpc", "Preld1" }, -- racc up
14+
{ "battle 1 8", "ma", "Archer's Prelude", "stpc", "Preld2" }, -- racc up
15+
{ "battle 1 9", "ma", "Mage's Ballad", "stpc", "Ballad1" }, -- refresh
16+
{ "battle 1 10", "ma", "Mage's Ballad II", "stpc", "Ballad2" }, -- refresh
17+
{ "battle 1 9", "ma", "Mage's Ballad III", "stpc", "Ballad3" }, -- refresh
1818
-- 11
1919
{ "battle 1 12", "ja", "Clarion Call", "me", "Clarion" },
2020

@@ -47,26 +47,26 @@ xivhotbar_keybinds_job["Base"] = {
4747
{ "battle 4 1", "ma", "Magic Finale", "t", "Finale" }, -- dispel
4848
{ "battle 4 2", "ma", "Pining Nocturne", "t", "Noctrn" }, -- addle
4949

50-
{ "battle 4 3", "ma", "Honor March", "me", "March3" }, -- only with Marsyas equipped
51-
{ "battle 4 3", "ma", "Aria of Passion", "me", "Aria P." }, -- only with Loughnashade equipped
50+
{ "battle 4 3", "ma", "Honor March", "stpc", "March3" }, -- only with Marsyas equipped
51+
{ "battle 4 3", "ma", "Aria of Passion", "stpc", "Aria P." }, -- only with Loughnashade equipped
5252

53-
{ "battle 4 4", "ma", "Raptor Mazurka", "me", "Mzrka1" }, -- run speed
54-
{ "battle 4 4", "ma", "Chocobo Mazurka", "me", "Mzrka2" }, -- run speed
53+
{ "battle 4 4", "ma", "Raptor Mazurka", "stpc", "Mzrka1" }, -- run speed
54+
{ "battle 4 4", "ma", "Chocobo Mazurka", "stpc", "Mzrka2" }, -- run speed
5555

5656
-- Hotbar #5 Other Buffs
57-
{ "battle 5 1", "ma", "Herb Pastoral", "me", "Herb P." }, -- poison resist
58-
{ "battle 5 2", "ma", "Scop's Operetta", "me", "Scop Op" }, -- silence resist
59-
{ "battle 5 3", "ma", "Fowl Aubade", "me", "Fowl A." }, -- sleep resist
60-
{ "battle 5 4", "ma", "Goblin Gavotte", "me", "GobGav" }, -- bind resist
61-
{ "battle 5 5", "ma", "Puppet's Operetta", "me", "PupOpp" }, -- silence resist
62-
{ "battle 5 6", "ma", "Gold Capriccio", "me", "GldCap" }, -- petrify resist
63-
{ "battle 5 7", "ma", "Shining Fantasia", "me", "ShnFan" }, -- blind resist
64-
{ "battle 5 8", "ma", "Warding Round", "me", "WrdRnd" }, -- curse resist
65-
66-
{ "battle 5 10", "ma", "Sentinel's Scherzo", "ne", "Schrzo" }, -- protect against hp loss
57+
{ "battle 5 1", "ma", "Herb Pastoral", "stpc", "Herb P." }, -- poison resist
58+
{ "battle 5 2", "ma", "Scop's Operetta", "stpc", "Scop Op" }, -- silence resist
59+
{ "battle 5 3", "ma", "Fowl Aubade", "stpc", "Fowl A." }, -- sleep resist
60+
{ "battle 5 4", "ma", "Goblin Gavotte", "stpc", "GobGav" }, -- bind resist
61+
{ "battle 5 5", "ma", "Puppet's Operetta", "stpc", "PupOpp" }, -- silence resist
62+
{ "battle 5 6", "ma", "Gold Capriccio", "stpc", "GldCap" }, -- petrify resist
63+
{ "battle 5 7", "ma", "Shining Fantasia", "stpc", "ShnFan" }, -- blind resist
64+
{ "battle 5 8", "ma", "Warding Round", "stpc", "WrdRnd" }, -- curse resist
65+
66+
{ "battle 5 10", "ma", "Sentinel's Scherzo", "stpc", "Schrzo" }, -- protect against hp loss
6767
{ "battle 5 11", "ma", "Foe Sirvente", "stpc", "Srvnte" }, -- emnity up
6868
{ "battle 5 11", "ma", "Adventurer's Dirge", "stpc", "Dirge" }, -- emnity down
69-
{ "battle 5 12", "ma", "Goddess's Hymnus", "me", "Hymnus" }, -- reraise
69+
{ "battle 5 12", "ma", "Goddess's Hymnus", "stpc", "Hymnus" }, -- reraise
7070

7171
-- { "battle 5 1", "ma", "Enchanting Etude", "me", "Chr Et1" }, -- chr
7272
-- { "battle 5 2", "ma", "Bewitching Etude", "me", "Chr Et2" }, -- chr
@@ -100,21 +100,21 @@ xivhotbar_keybinds_job["Base"] = {
100100
{ "battle 6 6", "ma", "Fire Threnody", "t", "FireTr." },
101101
{ "battle 6 7", "ma", "Ice Threnody", "t", "IceTr." },
102102
{ "battle 6 8", "ma", "Ltng. Threnody", "t", "LitTr." },
103-
{ "battle 6 1", "ma", "Light Carol", "t", "LightCr." },
104-
{ "battle 6 2", "ma", "Dark Carol", "t", "DarkCr." },
105-
{ "battle 6 3", "ma", "Earth Carol", "t", "EartCr." },
106-
{ "battle 6 4", "ma", "Water Carol", "t", "WatCr." },
107-
{ "battle 6 5", "ma", "Wind Carol", "t", "WindCr." },
108-
{ "battle 6 6", "ma", "Fire Carol", "t", "FireCr." },
109-
{ "battle 6 7", "ma", "Ice Carol", "t", "IceCr." },
110-
{ "battle 6 8", "ma", "Lightning Carol", "t", "LitCr." },
111-
{ "battle 6 9", "ma", "Sheepfoe Mambo", "me", "Mmbo1" },
112-
{ "battle 6 10", "ma", "Dragonfoe Mambo", "me", "Mmbo2" },
113-
{ "battle 6 11", "ma", "Knight's Minne", "me", "Minne1" }, -- defense up
114-
{ "battle 6 12", "ma", "Knight's Minne II", "me", "Minne2" }, -- defense up
115-
{ "battle 6 11", "ma", "Knight's Minne III", "me", "Minne3" }, -- defense up
116-
{ "battle 6 12", "ma", "Knight's Minne IV", "me", "Minne4" }, -- defense up
117-
{ "battle 6 11", "ma", "Knight's Minne V", "me", "Minne5" }, -- defense up
103+
{ "battle 6 1", "ma", "Light Carol", "stpc", "LightCr." },
104+
{ "battle 6 2", "ma", "Dark Carol", "stpc", "DarkCr." },
105+
{ "battle 6 3", "ma", "Earth Carol", "stpc", "EartCr." },
106+
{ "battle 6 4", "ma", "Water Carol", "stpc", "WatCr." },
107+
{ "battle 6 5", "ma", "Wind Carol", "stpc", "WindCr." },
108+
{ "battle 6 6", "ma", "Fire Carol", "stpc", "FireCr." },
109+
{ "battle 6 7", "ma", "Ice Carol", "stpc", "IceCr." },
110+
{ "battle 6 8", "ma", "Lightning Carol", "stpc", "LitCr." },
111+
{ "battle 6 9", "ma", "Sheepfoe Mambo", "stpc", "Mmbo1" },
112+
{ "battle 6 10", "ma", "Dragonfoe Mambo", "stpc", "Mmbo2" },
113+
{ "battle 6 11", "ma", "Knight's Minne", "stpc", "Minne1" }, -- defense up
114+
{ "battle 6 12", "ma", "Knight's Minne II", "stpc", "Minne2" }, -- defense up
115+
{ "battle 6 11", "ma", "Knight's Minne III", "stpc", "Minne3" }, -- defense up
116+
{ "battle 6 12", "ma", "Knight's Minne IV", "stpc", "Minne4" }, -- defense up
117+
{ "battle 6 11", "ma", "Knight's Minne V", "stpc", "Minne5" }, -- defense up
118118
}
119119

120120

‎defaults.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ defaults.Hotbar.HideActionCost = false
4444
defaults.Hotbar.HighlightMagicBurst = true
4545
defaults.Hotbar.HighlightSkillchain = true
4646
defaults.Hotbar.UseAnimatedHighlights = true
47+
defaults.Hotbar.ConfirmSubtargetIfNecessary = true
4748

4849
defaults.Hotbar.Offsets = {}
4950
defaults.Hotbar.Offsets.First = { Vertical = false, OffsetX = 675, OffsetY = 1010 }

‎images/icons/custom/elixir.png‎

1.57 KB

‎images/icons/custom/ether.png‎

1.57 KB

‎images/icons/custom/oil.png‎

1.69 KB

‎images/icons/custom/potion.png‎

1.57 KB

‎images/icons/custom/powder.png‎

2.28 KB

‎images/icons/items/28736.bmp‎

4.13 KB
Binary file not shown.

0 commit comments

Comments
 (0)