Skip to content

Commit 11b653b

Browse files
LTS-FFXIVLTS-FFXIV
authored
Merge pull request #632 from FFXIV-CombatReborn/ActionCategoryPolishes
Action category polishes
2 parents 6f08d9f + d88dec7 commit 11b653b

19 files changed

+141
-25
lines changed

Diff for: ‎RotationSolver.Basic/Rotations/Basic/BardRotation.cs

+2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ static partial void ModifyStraightShotPvE(ref ActionSetting setting)
9595

9696
static partial void ModifyRagingStrikesPvE(ref ActionSetting setting)
9797
{
98+
setting.IsFriendly = true;
9899
setting.StatusProvide = [StatusID.RagingStrikes];
99100
setting.CreateConfig = () => new()
100101
{
@@ -168,6 +169,7 @@ static partial void ModifyTheWardensPaeanPvE(ref ActionSetting setting)
168169

169170
static partial void ModifyBarragePvE(ref ActionSetting setting)
170171
{
172+
setting.IsFriendly = true;
171173
setting.StatusProvide = [StatusID.Barrage, StatusID.ResonantArrowReady];
172174
}
173175

Diff for: ‎RotationSolver.Basic/Rotations/Basic/BlackMageRotation.cs

+6
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ static partial void ModifyFirePvE(ref ActionSetting setting)
192192
static partial void ModifyTransposePvE(ref ActionSetting setting)
193193
{
194194
//setting.ActionCheck = () => DataCenter.DefaultGCDRemain <= ElementTimeRaw;
195+
setting.IsFriendly = true;
195196
}
196197

197198
static partial void ModifyThunderPvE(ref ActionSetting setting)
@@ -231,12 +232,14 @@ static partial void ModifyManawardPvE(ref ActionSetting setting)
231232
{
232233
setting.StatusProvide = [StatusID.Manaward];
233234
setting.UnlockedByQuestID = 65889;
235+
setting.IsFriendly = true;
234236
}
235237

236238
static partial void ModifyManafontPvE(ref ActionSetting setting)
237239
{
238240
setting.StatusProvide = [StatusID.Thunderhead];
239241
setting.UnlockedByQuestID = 66609;
242+
setting.IsFriendly = true;
240243
}
241244

242245
static partial void ModifyFireIiiPvE(ref ActionSetting setting)
@@ -317,6 +320,7 @@ static partial void ModifyFireIvPvE(ref ActionSetting setting)
317320
static partial void ModifyBetweenTheLinesPvE(ref ActionSetting setting)
318321
{
319322
setting.SpecialType = SpecialActionType.MovingBackward;
323+
setting.IsFriendly = true;
320324
setting.CreateConfig = () => new ActionConfig()
321325
{
322326
AoeCount = 1,
@@ -336,6 +340,7 @@ static partial void ModifyThunderIvPvE(ref ActionSetting setting)
336340
static partial void ModifyTriplecastPvE(ref ActionSetting setting)
337341
{
338342
setting.StatusProvide = StatusHelper.SwiftcastStatus;
343+
setting.IsFriendly = true;
339344
}
340345

341346
static partial void ModifyFoulPvE(ref ActionSetting setting)
@@ -377,6 +382,7 @@ static partial void ModifyHighBlizzardIiPvE(ref ActionSetting setting)
377382
static partial void ModifyAmplifierPvE(ref ActionSetting setting)
378383
{
379384
setting.ActionCheck = () => (InAstralFire || InUmbralIce) && !EnochianEndAfter(10) && !IsPolyglotStacksMaxed;
385+
setting.IsFriendly = true;
380386
}
381387

382388
static partial void ModifyParadoxPvE(ref ActionSetting setting)

Diff for: ‎RotationSolver.Basic/Rotations/Basic/DancerRotation.cs

+12
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ static partial void ModifyCuringWaltzPvE(ref ActionSetting setting)
9595
{
9696
AoeCount = 1,
9797
};
98+
setting.IsFriendly = true;
9899
}
99100

100101
static partial void ModifyShieldSambaPvE(ref ActionSetting setting)
@@ -249,19 +250,26 @@ static partial void ModifyClosedPositionPvE(ref ActionSetting setting)
249250
setting.ActionCheck = () => !IsDancing && !AllianceMembers.Any(b => b.HasStatus(true, StatusID.ClosedPosition_2026));
250251
}
251252

253+
static partial void ModifyEndingPvE(ref ActionSetting setting)
254+
{
255+
setting.IsFriendly = true;
256+
}
257+
252258
static partial void ModifyDevilmentPvE(ref ActionSetting setting)
253259
{
254260
setting.CreateConfig = () => new ActionConfig()
255261
{
256262
TimeToKill = 10,
257263
};
264+
setting.IsFriendly = true;
258265
}
259266

260267
static partial void ModifyFlourishPvE(ref ActionSetting setting)
261268
{
262269
setting.StatusNeed = [StatusID.StandardFinish];
263270
setting.StatusProvide = [StatusID.ThreefoldFanDance, StatusID.FourfoldFanDance, StatusID.FinishingMoveReady];
264271
setting.ActionCheck = () => InCombat;
272+
setting.IsFriendly = true;
265273
}
266274

267275
static partial void ModifyTechnicalStepPvE(ref ActionSetting setting)
@@ -305,21 +313,25 @@ static partial void ModifyQuadrupleTechnicalFinishPvE(ref ActionSetting setting)
305313
static partial void ModifyEmboitePvE(ref ActionSetting setting)
306314
{
307315
setting.ActionCheck = () => (ActionID)JobGauge.NextStep == ActionID.EmboitePvE;
316+
setting.IsFriendly = true;
308317
}
309318

310319
static partial void ModifyEntrechatPvE(ref ActionSetting setting)
311320
{
312321
setting.ActionCheck = () => (ActionID)JobGauge.NextStep == ActionID.EntrechatPvE;
322+
setting.IsFriendly = true;
313323
}
314324

315325
static partial void ModifyJetePvE(ref ActionSetting setting)
316326
{
317327
setting.ActionCheck = () => (ActionID)JobGauge.NextStep == ActionID.JetePvE;
328+
setting.IsFriendly = true;
318329
}
319330

320331
static partial void ModifyPirouettePvE(ref ActionSetting setting)
321332
{
322333
setting.ActionCheck = () => (ActionID)JobGauge.NextStep == ActionID.PirouettePvE;
334+
setting.IsFriendly = true;
323335
}
324336

325337
static partial void ModifyLastDancePvE(ref ActionSetting setting)

Diff for: ‎RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs

+11-2
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,12 @@ static partial void ModifyUnleashPvE(ref ActionSetting setting)
172172

173173
static partial void ModifyGritPvE(ref ActionSetting setting)
174174
{
175-
175+
setting.IsFriendly = true;
176176
}
177177

178178
static partial void ModifyReleaseGritPvE(ref ActionSetting setting)
179179
{
180-
180+
setting.IsFriendly = true;
181181
}
182182

183183
static partial void ModifyUnmendPvE(ref ActionSetting setting)
@@ -209,12 +209,14 @@ static partial void ModifyBloodWeaponPvE(ref ActionSetting setting)
209209
TimeToKill = 10,
210210
};
211211
setting.UnlockedByQuestID = 67591;
212+
setting.IsFriendly = true;
212213
}
213214

214215
static partial void ModifyShadowWallPvE(ref ActionSetting setting)
215216
{
216217
setting.StatusProvide = StatusHelper.RampartStatus;
217218
setting.ActionCheck = Player.IsTargetOnSelf;
219+
setting.IsFriendly = true;
218220
}
219221

220222
static partial void ModifyStalwartSoulPvE(ref ActionSetting setting)
@@ -236,6 +238,7 @@ static partial void ModifyEdgeOfDarknessPvE(ref ActionSetting setting)
236238
static partial void ModifyDarkMindPvE(ref ActionSetting setting)
237239
{
238240
setting.StatusProvide = [StatusID.DarkMind];
241+
setting.IsFriendly = true;
239242
}
240243

241244
static partial void ModifyLivingDeadPvE(ref ActionSetting setting)
@@ -244,6 +247,7 @@ static partial void ModifyLivingDeadPvE(ref ActionSetting setting)
244247
setting.ActionCheck = () => InCombat;
245248
setting.TargetType = TargetType.Self;
246249
setting.UnlockedByQuestID = 67594;
250+
setting.IsFriendly = true;
247251
}
248252

249253
static partial void ModifySaltedEarthPvE(ref ActionSetting setting)
@@ -296,13 +300,15 @@ static partial void ModifyDeliriumPvE(ref ActionSetting setting)
296300
{
297301
TimeToKill = 10,
298302
};
303+
setting.IsFriendly = true;
299304
}
300305

301306
static partial void ModifyTheBlackestNightPvE(ref ActionSetting setting)
302307
{
303308
setting.StatusProvide = [StatusID.BlackestNight];
304309
setting.ActionCheck = Player.IsTargetOnSelf;
305310
setting.UnlockedByQuestID = 68455;
311+
setting.IsFriendly = true;
306312
}
307313

308314
static partial void ModifyFloodOfShadowPvE(ref ActionSetting setting)
@@ -329,6 +335,7 @@ static partial void ModifyDarkMissionaryPvE(ref ActionSetting setting)
329335
{
330336
AoeCount = 1,
331337
};
338+
setting.IsFriendly = true;
332339
}
333340

334341
static partial void ModifyLivingShadowPvE(ref ActionSetting setting)
@@ -344,6 +351,7 @@ static partial void ModifyOblationPvE(ref ActionSetting setting)
344351
{
345352
AoeCount = 1,
346353
};
354+
setting.IsFriendly = true;
347355
}
348356

349357
static partial void ModifySaltAndDarknessPvE(ref ActionSetting setting)
@@ -368,6 +376,7 @@ static partial void ModifyShadowbringerPvE(ref ActionSetting setting)
368376
static partial void ModifyShadowedVigilPvE(ref ActionSetting setting)
369377
{
370378
setting.StatusProvide = StatusHelper.RampartStatus;
379+
setting.IsFriendly = true;
371380
}
372381

373382
static partial void ModifyScarletDeliriumPvE(ref ActionSetting setting)

Diff for: ‎RotationSolver.Basic/Rotations/Basic/DragoonRotation.cs

+3
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ static partial void ModifyLifeSurgePvE(ref ActionSetting setting)
101101
{
102102
setting.StatusProvide = [StatusID.LifeSurge];
103103
setting.ActionCheck = () => !IsLastAbility(ActionID.LifeSurgePvE);
104+
setting.IsFriendly = true;
104105
}
105106

106107
static partial void ModifyPiercingTalonPvE(ref ActionSetting setting)
@@ -132,6 +133,7 @@ static partial void ModifyLanceChargePvE(ref ActionSetting setting)
132133
};
133134
setting.StatusProvide = [StatusID.LanceCharge];
134135
setting.UnlockedByQuestID = 65975;
136+
setting.IsFriendly = true;
135137
}
136138

137139
static partial void ModifyJumpPvE(ref ActionSetting setting)
@@ -144,6 +146,7 @@ static partial void ModifyElusiveJumpPvE(ref ActionSetting setting)
144146
{
145147
setting.UnlockedByQuestID = 66604;
146148
setting.StatusProvide = [StatusID.EnhancedPiercingTalon];
149+
setting.IsFriendly = true;
147150
}
148151

149152
static partial void ModifyDoomSpikePvE(ref ActionSetting setting)

Diff for: ‎RotationSolver.Basic/Rotations/Basic/GunbreakerRotation.cs

+15-3
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ static partial void ModifyNoMercyPvE(ref ActionSetting setting)
158158
{
159159
TimeToKill = 5,
160160
};
161+
setting.IsFriendly = true;
161162
}
162163

163164
static partial void ModifyBrutalShellPvE(ref ActionSetting setting)
@@ -181,6 +182,16 @@ static partial void ModifyDemonSlicePvE(ref ActionSetting setting)
181182

182183
private protected sealed override IBaseAction TankStance => RoyalGuardPvE;
183184

185+
static partial void ModifyRoyalGuardPvE(ref ActionSetting setting)
186+
{
187+
setting.IsFriendly = true;
188+
}
189+
190+
static partial void ModifyReleaseRoyalGuardPvE(ref ActionSetting setting)
191+
{
192+
setting.IsFriendly = true;
193+
}
194+
184195
static partial void ModifyLightningShotPvE(ref ActionSetting setting)
185196
{
186197
setting.SpecialType = SpecialActionType.MeleeRange;
@@ -220,13 +231,15 @@ static partial void ModifyDemonSlaughterPvE(ref ActionSetting setting)
220231
static partial void ModifyAuroraPvE(ref ActionSetting setting)
221232
{
222233
setting.TargetStatusProvide = [StatusID.Aurora];
234+
setting.IsFriendly = true;
223235
}
224236

225237
static partial void ModifySuperbolidePvE(ref ActionSetting setting)
226238
{
227239
setting.StatusProvide = [StatusID.Superbolide];
228240
setting.ActionCheck = () => InCombat;
229241
setting.TargetType = TargetType.Self;
242+
setting.IsFriendly = true;
230243
}
231244

232245
static partial void ModifySonicBreakPvE(ref ActionSetting setting)
@@ -270,6 +283,7 @@ static partial void ModifyHeartOfLightPvE(ref ActionSetting setting)
270283
{
271284
AoeCount = 1,
272285
};
286+
setting.IsFriendly = true;
273287
}
274288

275289
static partial void ModifyHeartOfStonePvE(ref ActionSetting setting)
@@ -326,6 +340,7 @@ static partial void ModifyHeartOfCorundumPvE(ref ActionSetting setting)
326340
{
327341
setting.StatusProvide = [StatusID.CatharsisOfCorundum, StatusID.ClarityOfCorundum];
328342
setting.ActionCheck = () => Player.IsParty() || Player.IsTargetOnSelf();
343+
setting.IsFriendly = true;
329344
}
330345

331346
static partial void ModifyHypervelocityPvE(ref ActionSetting setting)
@@ -375,8 +390,6 @@ static partial void ModifyNobleBloodPvE(ref ActionSetting setting)
375390
{
376391
AoeCount = 1
377392
};
378-
//setting.ComboIds = [ActionID.ReignOfBeastsPvE];
379-
// TODO: Having configs here breaks the rotation, investigate why
380393
}
381394

382395
static partial void ModifyLionHeartPvE(ref ActionSetting setting)
@@ -386,7 +399,6 @@ static partial void ModifyLionHeartPvE(ref ActionSetting setting)
386399
{
387400
AoeCount = 1
388401
};
389-
//setting.ComboIds = [ActionID.NobleBloodPvE];
390402
}
391403

392404
#endregion

Diff for: ‎RotationSolver.Basic/Rotations/Basic/MachinistRotation.cs

+2
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ static partial void ModifyHyperchargePvE(ref ActionSetting setting)
164164
{
165165
TimeToKill = 10,
166166
};
167+
setting.IsFriendly = true;
167168
}
168169

169170
static partial void ModifyHeatBlastPvE(ref ActionSetting setting)
@@ -285,6 +286,7 @@ static partial void ModifyBarrelStabilizerPvE(ref ActionSetting setting)
285286
{
286287
setting.StatusProvide = [StatusID.Hypercharged, StatusID.FullMetalMachinist];
287288
setting.ActionCheck = () => InCombat;
289+
setting.IsFriendly = true;
288290
}
289291

290292
static partial void ModifyBlazingShotPvE(ref ActionSetting setting)

Diff for: ‎RotationSolver.Basic/Rotations/Basic/MonkRotation.cs

+10
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ static partial void ModifySnapPunchPvE(ref ActionSetting setting)
136136
static partial void ModifySteeledMeditationPvE(ref ActionSetting setting)
137137
{
138138
setting.ActionCheck = () => (!InBrotherhood && Chakra < 5 || InBrotherhood && Chakra < 10);
139+
setting.IsFriendly = true;
139140
}
140141

141142
static partial void ModifySteelPeakPvE(ref ActionSetting setting)
@@ -182,11 +183,13 @@ static partial void ModifyThunderclapPvE(ref ActionSetting setting)
182183
{
183184
setting.SpecialType = SpecialActionType.MovingForward;
184185
setting.UnlockedByQuestID = 66598;
186+
setting.IsFriendly = false;
185187
}
186188

187189
static partial void ModifyInspiritedMeditationPvE(ref ActionSetting setting)
188190
{
189191
setting.ActionCheck = () => (!InBrotherhood && Chakra < 5 || InBrotherhood && Chakra < 10);
192+
setting.IsFriendly = true;
190193
}
191194

192195
static partial void ModifyHowlingFistPvE(ref ActionSetting setting)
@@ -207,6 +210,7 @@ static partial void ModifyMantraPvE(ref ActionSetting setting)
207210
TimeToKill = 10,
208211
AoeCount = 1,
209212
};
213+
setting.IsFriendly = true;
210214
}
211215

212216
static partial void ModifyFourpointFuryPvE(ref ActionSetting setting)
@@ -231,17 +235,20 @@ static partial void ModifyPerfectBalancePvE(ref ActionSetting setting)
231235
setting.ActionCheck = () => BeastChakras.Distinct().Count() == 1 && BeastChakras.Any(chakra => chakra == BeastChakra.None);
232236
setting.UnlockedByQuestID = 66602;
233237
setting.StatusProvide = [StatusID.PerfectBalance];
238+
setting.IsFriendly = true;
234239
}
235240

236241
static partial void ModifyFormShiftPvE(ref ActionSetting setting)
237242
{
238243
setting.StatusProvide = [StatusID.FormlessFist];
239244
setting.UnlockedByQuestID = 67563;
245+
setting.IsFriendly = true;
240246
}
241247

242248
static partial void ModifyForbiddenMeditationPvE(ref ActionSetting setting)
243249
{
244250
setting.ActionCheck = () => (!InBrotherhood && Chakra < 5 || InBrotherhood && Chakra < 10);
251+
setting.IsFriendly = true;
245252
}
246253

247254
static partial void ModifyTheForbiddenChakraPvE(ref ActionSetting setting)
@@ -322,6 +329,7 @@ static partial void ModifyRiddleOfFirePvE(ref ActionSetting setting)
322329
{
323330
TimeToKill = 10,
324331
};
332+
setting.IsFriendly = true;
325333
}
326334

327335
static partial void ModifyBrotherhoodPvE(ref ActionSetting setting)
@@ -342,11 +350,13 @@ static partial void ModifyRiddleOfWindPvE(ref ActionSetting setting)
342350
{
343351
TimeToKill = 10,
344352
};
353+
setting.IsFriendly = true;
345354
}
346355

347356
static partial void ModifyEnlightenedMeditationPvE(ref ActionSetting setting)
348357
{
349358
setting.ActionCheck = () => (!InBrotherhood && Chakra < 5 || InBrotherhood && Chakra < 10);
359+
setting.IsFriendly = true;
350360
}
351361

352362
static partial void ModifyEnlightenmentPvE(ref ActionSetting setting)

0 commit comments

Comments
 (0)