Skip to content

Commit

Permalink
Fix Fenrir's Earring
Browse files Browse the repository at this point in the history
(cherry picked from commit f9a88f4)
  • Loading branch information
genshinteambuilds committed Apr 25, 2024
1 parent 807b362 commit 2a8d9fa
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions DO_NOT_DELETE.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,4 @@
### v1.2.7

- RNG - Add preshot set for RNG
- All DD - Fixed Fenrir's Earring
8 changes: 4 additions & 4 deletions Rag_5040/PLD.lua
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ local sets = {
Ammo = 'Tiphia Sting',
Head = 'Homam Zucchetto',
Neck = 'Fortitude Torque',
Ear1 = 'Merman\'s Earring',
Ear2 = 'Brutal Earring',
Ear1 = 'Brutal Earring',
Ear2 = 'Merman\'s Earring',
Body = 'Haubergeon',
-- Hands = 'Homam Manopolas',
Hands = 'Dusk Gloves',
Expand All @@ -394,8 +394,8 @@ local sets = {
WS = {
Head = 'Optical Hat',
Neck = 'Soil Gorget',
Ear1 = 'Merman\'s Earring',
Ear2 = 'Brutal Earring',
Ear1 = 'Brutal Earring',
Ear2 = 'Merman\'s Earring',
Body = 'Haubergeon',
Hands = 'Alkyoneus\'s Brc.',
Ring1 = 'Toreador\'s Ring',
Expand Down
8 changes: 5 additions & 3 deletions common/gcmelee.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local fenrirs_earring = false
local fenrirs_earring = false -- Not used for RNG at all
local fenrirs_earring_slot = 'Ear2'

--[[
Expand Down Expand Up @@ -85,8 +85,10 @@ function gcmelee.DoDefault()
gcinclude.ToggleIdleSet(TpVariantTable[tp_variant])
end

if (fenrirs_earring) then
gFunc.Equip(fenrirs_earring_slot, 'Fenrir\'s Earring')
if (player.MainJob ~= 'RNG') then
if (fenrirs_earring and (environment.Time >= 6 or environment.Time < 18)) then
gFunc.Equip(fenrirs_earring_slot, 'Fenrir\'s Earring')
end
end
end
if (player.Status == 'Idle' and lastIdleSetBeforeEngaged ~= '') then
Expand Down

0 comments on commit 2a8d9fa

Please sign in to comment.