Skip to content

Commit

Permalink
1.0.4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@paissaheavyindustries
paissaheavyindustries committed Aug 6, 2024
1 parent ea7abd3 commit 65a83c2
Show file tree
Hide file tree
Showing 9 changed files with 221 additions and 51 deletions.
62 changes: 24 additions & 38 deletions Lemegeton/Content/DtRaidLightHeavy.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@ public CondenserAM(State state) : base(state)
Signs.SetRole("Support2", AutomarkerSigns.SignEnum.Bind2, false);
Signs.SetRole("Support3", AutomarkerSigns.SignEnum.Bind3, false);
Signs2 = new AutomarkerSigns();
Signs2.SetRole("Pair1DPS", AutomarkerSigns.SignEnum.Attack1, false);
Signs2.SetRole("Pair1Support", AutomarkerSigns.SignEnum.Attack2, false);
Signs2.SetRole("Pair2DPS", AutomarkerSigns.SignEnum.Bind1, false);
Signs2.SetRole("Pair2Support", AutomarkerSigns.SignEnum.Bind2, false);
Signs2.SetRole("Pair3DPS", AutomarkerSigns.SignEnum.Ignore1, false);
Signs2.SetRole("Pair3Support", AutomarkerSigns.SignEnum.Ignore2, false);
Signs2.SetRole("Pair4DPS", AutomarkerSigns.SignEnum.Square, false);
Signs2.SetRole("Pair4Support", AutomarkerSigns.SignEnum.Circle, false);
Signs2.SetRole("Pair1_S", AutomarkerSigns.SignEnum.Attack1, false);
Signs2.SetRole("Pair1_L", AutomarkerSigns.SignEnum.Attack2, false);
Signs2.SetRole("Pair2_S", AutomarkerSigns.SignEnum.Bind1, false);
Signs2.SetRole("Pair2_L", AutomarkerSigns.SignEnum.Bind2, false);
Signs2.SetRole("Pair3_S", AutomarkerSigns.SignEnum.Ignore1, false);
Signs2.SetRole("Pair3_L", AutomarkerSigns.SignEnum.Ignore2, false);
Signs2.SetRole("Pair4_S", AutomarkerSigns.SignEnum.Square, false);
Signs2.SetRole("Pair4_L", AutomarkerSigns.SignEnum.Circle, false);
Test = new System.Action(() => Signs.TestFunctionality(state, null, Timing, SelfMarkOnly, AsSoftmarker));
}

Expand Down Expand Up @@ -171,7 +171,11 @@ internal void FeedAction(uint actionId)
case AbilitySidewiseSpark2:
if (_step == AutomarkerStepEnum.Spreads || _step == AutomarkerStepEnum.Pairs)
{
_step = AutomarkerStepEnum.Longs;
if (_step == AutomarkerStepEnum.Pairs)
{
_state.ClearAutoMarkers();
}
_step = AutomarkerStepEnum.Longs;
_state.ExecuteAutomarkers(_apLongs, Timing);
}
break;
Expand Down Expand Up @@ -227,30 +231,12 @@ private void ReadyForAutoMarkers()
_apShorts.Assign(Signs.Roles["Support2"], (from px in hits2.Intersect(allshorts) where AutomarkerPrio.JobToTrinity(px.Job) != AutomarkerPrio.PrioTrinityEnum.DPS select px).First());
_apShorts.Assign(Signs.Roles["Support3"], (from px in hits3.Intersect(allshorts) where AutomarkerPrio.JobToTrinity(px.Job) != AutomarkerPrio.PrioTrinityEnum.DPS select px).First());
_apPairs = new AutomarkerPayload(_state, SelfMarkOnly, AsSoftmarker);
List<Party.PartyMember> alldps = (from px in pty.Members where AutomarkerPrio.JobToTrinity(px.Job) == AutomarkerPrio.PrioTrinityEnum.DPS select px).ToList();
Prio.SortByPriority(alldps);
Party.PartyMember[] dps = [ alldps.ElementAt(0), alldps.ElementAt(1), alldps.ElementAt(2), alldps.ElementAt(3) ];
_apPairs.Assign(Signs2.Roles["Pair1DPS"], dps[0]);
_apPairs.Assign(Signs2.Roles["Pair2DPS"], dps[1]);
_apPairs.Assign(Signs2.Roles["Pair3DPS"], dps[2]);
_apPairs.Assign(Signs2.Roles["Pair4DPS"], dps[3]);
List<Party.PartyMember> allsupp = (from px in pty.Members where AutomarkerPrio.JobToTrinity(px.Job) != AutomarkerPrio.PrioTrinityEnum.DPS select px).ToList();
Prio.SortByPriority(allsupp);
Prio.SortByPriority(allshorts);
Prio.SortByPriority(alllongs);
for (int i = 0; i < 4; i++)
{
Party.PartyMember sup = null;
if (allshorts.Contains(dps[i]) == true)
{
// short dps
sup = (from ax in allsupp where alllongs.Contains(ax) == true select ax).First();
}
else
{
// long dps
sup = (from ax in allsupp where allshorts.Contains(ax) == true select ax).First();
}
allsupp.Remove(sup);
_apPairs.Assign(Signs2.Roles["Pair" + (i + 1) + "Support"], sup);
_apPairs.Assign(Signs2.Roles[string.Format("Pair{0}_S", i + 1)], allshorts[i]);
_apPairs.Assign(Signs2.Roles[string.Format("Pair{0}_L", i + 1)], alllongs[i]);
}
_apLongs = new AutomarkerPayload(_state, SelfMarkOnly, AsSoftmarker);
_apLongs.Assign(Signs.Roles["DPS2"], (from px in hits2.Intersect(alllongs) where AutomarkerPrio.JobToTrinity(px.Job) == AutomarkerPrio.PrioTrinityEnum.DPS select px).First());
Expand Down Expand Up @@ -306,6 +292,13 @@ private void _state_OnAction(uint src, uint dest, ushort actionId)
_condenserAM.FeedHit(dest);
}
break;
case AbilitySidewiseSpark1:
case AbilitySidewiseSpark2:
if (CurrentZone == ZoneEnum.M4s && _condenserAM.Active == true)
{
_condenserAM.FeedAction(actionId);
}
break;
}
}

Expand Down Expand Up @@ -341,13 +334,6 @@ private void _state_OnCastBegin(uint src, uint dest, ushort actionId, float cast
_condenserAM.FeedAction(actionId);
}
break;
case AbilitySidewiseSpark1:
case AbilitySidewiseSpark2:
if (CurrentZone == ZoneEnum.M4s && _condenserAM.Active == true)
{
_condenserAM.FeedAction(actionId);
}
break;
}
}

Expand Down
30 changes: 30 additions & 0 deletions Lemegeton/Language/Chinese.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,36 @@ internal class Chinese : Core.Language

public Chinese(State st) : base(st)
{
#region 1.0.4.4
//AddEntry("Changelog/1.0.4.4", " fixes and better uptime strategy for M4s Electrical Condenser AM");
#endregion
#region 1.0.4.3
//AddEntry("Changelog/1.0.4.3", " added AM for M4s Electrical Condenser");
//AddEntry("Content/DawntrailRaids", "Dawntrail (7.x)");
//AddEntry("Content/DawntrailRaids/Enabled", "Enabled");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy", "AAC Light-heavyweight (7.0)");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Enabled", "Enabled");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM", "(M4s) Electrical Condenser automarker");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Enabled", "Enabled");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/SelfMarkOnly", "Self-marking only");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/AsSoftmarker", "Show as client-side soft markers");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs", "Electrical Condenser spreads");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2", "Four Star pairs");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Prio", "Priority configuration");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Test", "Test random assignment");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs/DPS2", "DPS 2 charge");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs/DPS3", "DPS 3 charge");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs/Support2", "Support 2 charge");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs/Support3", "Support 3 charge");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair1_S", "Short #1");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair2_S", "Short #2");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair3_S", "Short #3");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair4_S", "Short #4");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair1_L", "Long #1");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair2_L", "Long #2");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair3_L", "Long #3");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair4_L", "Long #4");
#endregion
#region 1.0.4.2
//AddEntry("Changelog/1.0.4.2", " added all the missing A/B ranks for Dawntrail");
#endregion
Expand Down
30 changes: 30 additions & 0 deletions Lemegeton/Language/Danish.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,36 @@ internal class Danish : Core.Language

public Danish(State st) : base(st)
{
#region 1.0.4.4
//AddEntry("Changelog/1.0.4.4", " fixes and better uptime strategy for M4s Electrical Condenser AM");
#endregion
#region 1.0.4.3
//AddEntry("Changelog/1.0.4.3", " added AM for M4s Electrical Condenser");
//AddEntry("Content/DawntrailRaids", "Dawntrail (7.x)");
//AddEntry("Content/DawntrailRaids/Enabled", "Enabled");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy", "AAC Light-heavyweight (7.0)");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/Enabled", "Enabled");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM", "(M4s) Electrical Condenser automarker");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Enabled", "Enabled");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/SelfMarkOnly", "Self-marking only");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/AsSoftmarker", "Show as client-side soft markers");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs", "Electrical Condenser spreads");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2", "Four Star pairs");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Prio", "Priority configuration");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Test", "Test random assignment");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs/DPS2", "DPS 2 charge");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs/DPS3", "DPS 3 charge");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs/Support2", "Support 2 charge");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs/Support3", "Support 3 charge");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair1_S", "Short #1");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair2_S", "Short #2");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair3_S", "Short #3");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair4_S", "Short #4");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair1_L", "Long #1");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair2_L", "Long #2");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair3_L", "Long #3");
//AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair4_L", "Long #4");
#endregion
#region 1.0.4.2
//AddEntry("Changelog/1.0.4.2", " added all the missing A/B ranks for Dawntrail");
#endregion
Expand Down
21 changes: 12 additions & 9 deletions Lemegeton/Language/English.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ internal class English : Core.Language

public English(State st) : base(st)
{
#region 1.0.4.4
AddEntry("Changelog/1.0.4.4", " fixes and better uptime strategy for M4s Electrical Condenser AM");
#endregion
#region 1.0.4.3
AddEntry("Changelog/1.0.4.3", " added AM for M4s Electrical Condenser");
AddEntry("Content/DawntrailRaids", "Dawntrail (7.x)");
Expand All @@ -25,21 +28,21 @@ public English(State st) : base(st)
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/SelfMarkOnly", "Self-marking only");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/AsSoftmarker", "Show as client-side soft markers");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs", "Electrical Condenser spreads");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2", "DPS/support pairs");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2", "Four Star pairs");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Prio", "Priority configuration");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Test", "Test random assignment");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs/DPS2", "DPS 2 charge");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs/DPS3", "DPS 3 charge");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs/Support2", "Support 2 charge");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs/Support3", "Support 3 charge");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair1DPS", "Pair 1 DPS");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair2DPS", "Pair 2 DPS");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair3DPS", "Pair 3 DPS");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair4DPS", "Pair 4 DPS");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair1Support", "Pair 1 Support");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair2Support", "Pair 2 Support");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair3Support", "Pair 3 Support");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair4Support", "Pair 4 Support");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair1_S", "Short #1");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair2_S", "Short #2");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair3_S", "Short #3");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair4_S", "Short #4");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair1_L", "Long #1");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair2_L", "Long #2");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair3_L", "Long #3");
AddEntry("Content/DawntrailRaids/DTRaidLightHeavy/CondenserAM/Signs2/Pair4_L", "Long #4");
#endregion
#region 1.0.4.2
AddEntry("Changelog/1.0.4.2", " added all the missing A/B ranks for Dawntrail");
Expand Down
Loading

0 comments on commit 65a83c2

Please sign in to comment.