Skip to content

Commit

Permalink
Remove luashitacast shorthand aliasing entirely in favour of using sh…
Browse files Browse the repository at this point in the history
…orthand config out of box
  • Loading branch information
genshinteambuilds committed Apr 4, 2024
1 parent 08de743 commit 365bf3b
Show file tree
Hide file tree
Showing 6 changed files with 222 additions and 246 deletions.
6 changes: 5 additions & 1 deletion DO_NOT_DELETE.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,8 @@

## v1.1.6

- Defaulting to not using shorterhand as shorthand config can do 99% of the same thing
- Defaulting to not using shorterhand as shorthand config can do 99% of the same thing

### v1.2.0

- Stripped Shorterhand entirely in favour of using shorthand and aliases out of box
11 changes: 0 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,17 +165,6 @@ This will work 99% of the time unless you have added your own logic and therefor
/th - Forces you to equip TH gear when TP-ing in case you have a tinfoil hat.
```

## Additional Commands (Shorterhand) (Deprecated):

If you enable the Shorterhand setting in gcincluderag.lua, additional /commands will work.

**Note: Shorthand supports this out of the box so it is suggested you just use that instead of turning this on.**
**A shorthand xml config file is also provided at extra/shorthand/default.xml that will accomplish basically the same thing.**

- shorterhand.lua is effectively just a pass through to shorthand you can define your own /commands in
- using shorthand syntax like 'me' or partial names will work. e.g. "/i me" will cast invisible on yourself.
- You can check the file for the full list of commands however it is suggested you just use shorthand directly.

## Additional Notes

LuAshitacast provides functionality to automatically equip Level Sync gear.
Expand Down
3 changes: 1 addition & 2 deletions Rag_5040/MNK.lua
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ local sets = {
Neck = 'Peacock Amulet',
Ear1 = 'Brutal Earring',
Ear2 = 'Merman\'s Earring',
Body = 'Kirin\'s Osode',
-- Body = 'Shura Togi',
Body = 'Shura Togi',
Hands = 'Mel. Gloves +1',
Ring1 = 'Toreador\'s Ring',
Ring2 = 'Toreador\'s Ring',
Expand Down
20 changes: 0 additions & 20 deletions common/gcincluderag.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
local display_messages = true -- set to true if you want chat log messages to appear on any /gc command used such as DT, or KITE gear toggles
local use_shorterhand = false -- set to true if you want to use the commands available in shorterhand.lua

local kingdom_aketon = false
local republic_aketon = false
Expand Down Expand Up @@ -41,7 +40,6 @@ Everything below can be ignored.
]]

gcdisplay = gFunc.LoadFile('common\\gcdisplayrag.lua')
shorterhand = gFunc.LoadFile('common\\shorterhand.lua')

local gcinclude = {}

Expand Down Expand Up @@ -109,14 +107,6 @@ function gcinclude.Load()
gcdisplay.CreateToggle('LockTP', false)
end

local isMage = MageJobs:contains(player.MainJob)
local isBRD = player.MainJob == 'BRD'
local isRDM = player.MainJob == 'RDM'
local isBLM = player.MainJob == 'BLM'
if (use_shorterhand) then
shorterhand.Load(isMage, isBRD, isRDM, isBLM)
end

gcdisplay.Load()

if (load_stylist) then
Expand All @@ -131,10 +121,6 @@ function gcinclude.Unload()
gcinclude.ClearAlias(Overrides)
gcinclude.ClearAlias(Commands)
gcdisplay.Unload()

if (use_shorterhand) then
shorterhand.Unload()
end
end

function gcinclude.SetAlias(aliasList)
Expand Down Expand Up @@ -179,12 +165,6 @@ function gcinclude.UnlockNonWeapon()
end

function gcinclude.DoCommands(args)
local isShorterhandAlias = shorterhand.MageAliasList:contains(args[1]) or shorterhand.RegularAliasList:contains(args[1]) or shorterhand.BRDAliasList:contains(args[1]) or shorterhand.RDMAliasList:contains(args[1]) or shorterhand.BLMAliasList:contains(args[1])
if (use_shorterhand and isShorterhandAlias) then
shorterhand.DoCommands(args)
do return end
end

local isOverride = Overrides:contains(args[1])

if not (isOverride or Commands:contains(args[1])) then
Expand Down
6 changes: 5 additions & 1 deletion extra/scripts/default.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@
# Please be sure to review our approved list: https://horizonxi.com/addons
#
#########################################################################
/addon load ticker
/addon load hticks
/addon load chains
/addon load ttimers
/load sequencer

#########################################################################
#
Expand Down Expand Up @@ -152,3 +153,6 @@
/bind !F4 /lac fwd mdt
/bind F9 //stun
/bind F10 //dia
/alias add /i //invisible
/alias add /s //sneak
/alias add /c //cure
Loading

0 comments on commit 365bf3b

Please sign in to comment.