Fix IdleDT, Add Shadow Mantle for PLD. Update gear

yzyii · Oct 20, 2024 · 5ec8dbc · 5ec8dbc
1 parent 6bc4719
commit 5ec8dbc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/DO_NOT_DELETE.md b/DO_NOT_DELETE.md
@@ -227,3 +227,7 @@
 ### v1.3.24
 - Add Handling for Nil player.MainJob() on initial load
 - Mages - Add ConserveMP set usage to MaxMP sets when below 95% MP
+
+### v1.3.25
+- Fix Faulty Logic for IdleDT set for NIN that was causing spam on DD jobs
+- PLD - Add Shadow Mantle for Rampart
diff --git a/Rag_5040/BLM.lua b/Rag_5040/BLM.lua
@@ -272,7 +272,7 @@ local sets = {
         Back = 'Merciful Cape',
         Waist = 'Penitent\'s Rope',
         Legs = 'Mahatma Slops',
-        Feet = 'Mahatma Pigaches',
+        Feet = 'Igqira Huaraches',
     },
     Stoneskin = {
         Main = 'Kirin\'s Pole',

diff --git a/Rag_5040/DRK.lua b/Rag_5040/DRK.lua
@@ -84,17 +84,9 @@ local sets = {
     },
     Town = {
         Main = 'Tredecim Scythe',
-        Ammo = 'Bomb Core',
         Head = 'Homam Zucchetto',
-        Neck = 'Peacock Amulet',
-        Ear1 = 'Brutal Earring',
-        Ear2 = 'Abyssal Earring',
         Body = 'Haubergeon',
         Hands = 'Homam Manopolas',
-        Ring2 = 'Toreador\'s Ring',
-        Ring2 = 'Toreador\'s Ring',
-        Back = 'Forager\'s Mantle',
-        Waist = 'Sonic Belt',
         Legs = 'Blood Cuisses',
         Feet = 'Homam Gambieras',
     },
@@ -305,7 +297,7 @@ local sets = {
         Ear2 = 'Abyssal Earring',
         Body = 'Haubergeon',
         Hands = 'Dusk Gloves +1',
-        Ring2 = 'Toreador\'s Ring',
+        Ring1 = 'Toreador\'s Ring',
         Ring2 = 'Toreador\'s Ring',
         Back = 'Forager\'s Mantle',
         Waist = 'Sonic Belt',
@@ -338,7 +330,7 @@ local sets = {
         Ring2 = 'Toreador\'s Ring',
         Back = 'Forager\'s Mantle',
         Waist = 'Warwolf Belt',
-        Legs = 'Black Cuisses',
+        Legs = 'Onyx Cuisses',
         Feet = 'Chs. Sollerets +1',
     },
     WS_Guillotine = {},

diff --git a/Rag_5040/PLD.lua b/Rag_5040/PLD.lua
@@ -15,6 +15,8 @@ local arco_de_velocidad = true
 
 local warlocks_mantle = true -- Don't add 2% to fastCastValue to this as it is SJ dependant
 
+local shadow_mantle = true
+
 local sets = {
     Idle = {
         Main = 'Durandal',
@@ -478,13 +480,13 @@ local sets = {
         Neck = 'Fortitude Torque',
         Ear1 = 'Robust Earring',
         Ear2 = 'Robust Earring',
-        Body = 'Gaia Doublet',
+        Body = 'Gallant Surcoat',
         Hands = 'Kng. Handschuhs',
         Ring1 = 'Robust Ring',
         Ring2 = { Name = 'Sattva Ring', Priority = 100 },
         Back = { Name = 'Valor Cape', Priority = 100 },
         Waist = 'Warwolf Belt',
-        Legs = 'Beak Trousers +1',
+        Legs = 'Adaman Cuisses',
         Feet = 'Power Sandals',
     },
     ShieldBash = {
@@ -513,6 +515,7 @@ gcmelee = gFunc.LoadFile('common\\gcmelee.lua')
 
 profile.HandleAbility = function()
     local action = gData.GetAction()
+
     if (action.Name == 'Chivalry') then
         return
     end
@@ -523,6 +526,10 @@ profile.HandleAbility = function()
         gFunc.Equip('Legs', gallant_leggings)
     elseif (action.Name == 'Rampart') then
         gFunc.EquipSet(sets.Rampart)
+        local environment = gData.GetEnvironment()
+        if (shadow_mantle and environment.DayElement == 'Dark') then
+            gFunc.Equip('Back', 'Shadow Mantle')
+        end
     elseif (action.Name == 'Shield Bash' and valor_gauntlets ~= '') then
         gFunc.EquipSet(sets.ShieldBash)
     elseif (action.Name == 'Sentinel' and valor_leggings ~= '') then

diff --git a/Rag_5040/RDM.lua b/Rag_5040/RDM.lua
@@ -390,7 +390,7 @@ local sets = {
         Neck = 'Enhancing Torque',
         Ear1 = 'Loquac. Earring',
         Ear2 = 'Magnetic Earring',
-        Body = 'Mahatma Hpl.',
+        Body = 'Glamor Jupon',
         Hands = 'Dls. Gloves +1',
         Ring1 = 'Aqua Ring',
         Ring2 = 'Communion Ring',
@@ -401,6 +401,7 @@ local sets = {
     },
     Stoneskin = {
         Neck = 'Stone Gorget',
+        Body = 'Mahatma Hpl.',
         Hands = 'Dusk Gloves +1',
         Back = 'Prism Cape',
         Ear1 = 'Cmn. Earring',

diff --git a/common/gcmelee.lua b/common/gcmelee.lua
@@ -106,7 +106,7 @@ function gcmelee.DoDefault()
         end
     end
 
-	if (player.MainJob == 'PLD' or player.MainJob ~= 'NIN' or gcdisplay.GetToggle('Hate')) then
+	if (player.MainJob == 'PLD' or player.MainJob == 'NIN' or gcdisplay.GetToggle('Hate')) then
 		if (player.SubJob == 'NIN') then
 			local function GetShadowCount()
 				for buffId, shadowCount in pairs(utsuBuffs) do