Skip to content

Commit 57a92fd

Browse files
committed
0.22
-Add enhancing duration from AF/Relic+4 -Add composure effect to enhancing/enfeebling -Add lethargy earring and check for right ear only
1 parent 71fc598 commit 57a92fd

File tree

4 files changed

+60
-4
lines changed

4 files changed

+60
-4
lines changed

durations/data.lua

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,14 +339,22 @@ function exports:GetBuffCount(id)
339339
return count;
340340
end
341341

342+
--Used for items that only count in a specific slot
343+
local forceSlot = T{
344+
[25444] = 12,
345+
[25445] = 12,
346+
[25446] = 12,
347+
};
342348
function exports:EquipSum(values)
343349
UpdateEquippedSet();
344350
local total = 0;
345351
for _,equipPiece in ipairs(equippedSet) do
346352
if (equipPiece ~= nil) and (player.Job.MainLevel >= equipPiece.Resource.Level) then
347353
local value = values[equipPiece.Id];
348354
if value ~= nil then
349-
total = total + value;
355+
if (forceSlot[equipPiece.Id] == nil) or (forceSlot[equipPiece.Id] == equipPiece.Slot) then
356+
total = total + value;
357+
end
350358
end
351359
end
352360
end

durations/enfeebling.lua

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,15 @@ local saboteurModifiers = {
3737
[23558] = 0.14, --Leth. Ganth. +3
3838
};
3939

40+
local rdmEmpyrean = T{ 11068, 11088, 11108, 11128, 11148, 23089, 23156, 23223, 23290, 23357, 23424, 23491, 23558, 23625, 23692, 26748, 26749, 26906, 26907, 27060, 27061, 27245, 27246, 27419, 27420 };
41+
do
42+
local buffer = {};
43+
for _,id in ipairs(rdmEmpyrean) do
44+
buffer[id] = 1;
45+
end
46+
rdmEmpyrean = buffer;
47+
end
48+
4049
local function ApplyEnfeeblingAdditions(duration, augments)
4150
local job = dataTracker:GetJobData();
4251
if job.Main ~= 5 then
@@ -89,12 +98,28 @@ local function ApplySaboteurMultipliers(duration, targetId)
8998
return duration * saboteur;
9099
end
91100

101+
local composureValues = T{ [0]=1, [1]=1, [2]=1.1, [3]=1.2, [4]=1.35, [5]=1.5 };
102+
local function GetComposureMod()
103+
local equipCount = dataTracker:EquipSum(rdmEmpyrean);
104+
return composureValues[equipCount];
105+
end
106+
107+
local function ApplyComposureModifiers(duration, targetId)
108+
--Not verified whether durations over 1800 sec are truncated the same way as buffs.. can any debuff even reach 30 min?
109+
if not dataTracker:GetBuffActive(419) or (duration >= 1800) then
110+
return duration;
111+
end
112+
113+
return duration * GetComposureMod();
114+
end
115+
92116
local function CalculateEnfeeblingDuration(base, targetId)
93117
local duration = base;
94118
local augments = dataTracker:ParseAugments();
95119
duration = ApplySaboteurMultipliers(duration, targetId);
96120
duration = ApplyEnfeeblingAdditions(duration, augments);
97121
duration = ApplyEnfeeblingMultipliers(duration, augments);
122+
duration = ApplyComposureModifiers(duration);
98123
return duration;
99124
end
100125

durations/enhancing.lua

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,23 @@ local enhancingDuration = {
2828
[22099] = 0.20, --Musa
2929
[23134] = 0.10, --Viti. Tabard +2
3030
[23469] = 0.15, --Viti. Tabard +3
31+
[23967] = 0.15, --Viti. Tabard +4
3132
[23149] = 0.08, --Peda. Gown +2
3233
[23484] = 0.12, --Peda. Gown +3
34+
[23982] = 0.12, --Peda. Gown +4
3335
[27947] = 0.15, --Atrophy Gloves
3436
[27968] = 0.16, --Atrophy Gloves +1
3537
[23178] = 0.18, --Atrophy Gloves +2
3638
[23513] = 0.20, --Atrophy Gloves +3
39+
[23989] = 0.20, --Atrophy Gloves +4
3740
[27194] = 0.10, --Futhark Trousers
3841
[27195] = 0.20, --Futhark Trousers +1
3942
[23285] = 0.25, --Futhark Trousers +2
4043
[23620] = 0.30, --Futhark Trousers +3
44+
[24074] = 0.30, --Futhark Trousers +4
4145
[23310] = 0.05, --Theo. Duckbills +2
4246
[23645] = 0.10, --Theo. Duckbills +3
47+
[24077] = 0.10, --Theo. Duckbills +4
4348
[11248] = 0.10, --Estq. Houseaux +1
4449
[11148] = 0.20, --Estq. Houseaux +2
4550
[27419] = 0.25, --Leth. Houseaux
@@ -58,8 +63,21 @@ local enhancingDuration = {
5863
[27892] = 0.10, --Shab. Cuirass +1
5964
[28034] = 0.05, --Dynasty Mitts
6065
[16204] = 0.10, --Estoqueur's Cape
66+
[25444] = 0.07, --Lethargy Earring
67+
[25445] = 0.08, --Lethargy Earring +1
68+
[25446] = 0.09, --Lethargy Earring +2
69+
[26041] = -0.5, --Sroda Necklace
6170
};
6271

72+
local rdmEmpyrean = T{ 11068, 11088, 11108, 11128, 11148, 23089, 23156, 23223, 23290, 23357, 23424, 23491, 23558, 23625, 23692, 26748, 26749, 26906, 26907, 27060, 27061, 27245, 27246, 27419, 27420 };
73+
do
74+
local buffer = {};
75+
for _,id in ipairs(rdmEmpyrean) do
76+
buffer[id] = 1;
77+
end
78+
rdmEmpyrean = buffer;
79+
end
80+
6381
local perpetuanceDuration = {
6482
[11223] = 0.25, --Svnt. Bracers +1
6583
[11123] = 0.50, --Svnt. Bracers +2
@@ -129,6 +147,12 @@ local function ApplyEnhancingMultipliers(duration, augments)
129147
return duration * enhancingGear * enhancingAugments;
130148
end
131149

150+
local composureValues = T{ [0]=1, [1]=1, [2]=1.1, [3]=1.2, [4]=1.35, [5]=1.5 };
151+
local function GetComposureMod()
152+
local equipCount = dataTracker:EquipSum(rdmEmpyrean);
153+
return composureValues[equipCount];
154+
end
155+
132156
local function ApplyComposureModifiers(duration, targetId)
133157
if not dataTracker:GetBuffActive(419) or (duration >= 1800) then
134158
return duration;
@@ -137,8 +161,7 @@ local function ApplyComposureModifiers(duration, targetId)
137161
if (targetId == dataTracker:GetPlayerId()) then
138162
return duration * 3;
139163
else
140-
--return duration * GetComposureMod();
141-
return duration;
164+
return duration * GetComposureMod();
142165
end
143166
end
144167

ttimers.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SOFTWARE.
2222

2323
addon.name = 'tTimers';
2424
addon.author = 'Thorny';
25-
addon.version = '0.21';
25+
addon.version = '0.22';
2626
addon.desc = 'Displays time remaining on buffs and debuffs you\'ve cast, as well as the recast timers for your spells and abilities.';
2727
addon.link = 'https://ashitaxi.com/';
2828

0 commit comments

Comments
 (0)