Skip to content

Commit 90bc840

Browse files
0ceal0t0ceal0t
committed
fix bug with custom cooldowns with same name
1 parent b908860 commit 90bc840

File tree

4 files changed

+189
-104
lines changed

4 files changed

+189
-104
lines changed

‎.editorconfig

+66-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,67 @@
1-
[*.cs]
21

3-
# CA1822: Mark members as static
4-
dotnet_diagnostic.CA1822.severity = silent
2+
[*]
3+
charset=utf-8
4+
end_of_line=crlf
5+
trim_trailing_whitespace=false
6+
insert_final_newline=false
7+
indent_style=space
8+
indent_size=4
9+
10+
# Microsoft .NET properties
11+
csharp_new_line_before_members_in_object_initializers=false
12+
csharp_preferred_modifier_order=public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion
13+
csharp_space_after_cast=false
14+
csharp_space_after_keywords_in_control_flow_statements=false
15+
csharp_space_between_method_call_parameter_list_parentheses=true
16+
csharp_space_between_method_declaration_parameter_list_parentheses=true
17+
csharp_space_between_parentheses=control_flow_statements,expressions,type_casts
18+
csharp_style_var_elsewhere=true:suggestion
19+
csharp_style_var_for_built_in_types=true:suggestion
20+
csharp_style_var_when_type_is_apparent=true:suggestion
21+
dotnet_style_parentheses_in_arithmetic_binary_operators=never_if_unnecessary:none
22+
dotnet_style_parentheses_in_other_binary_operators=never_if_unnecessary:none
23+
dotnet_style_parentheses_in_relational_binary_operators=never_if_unnecessary:none
24+
dotnet_style_predefined_type_for_locals_parameters_members=true:suggestion
25+
dotnet_style_predefined_type_for_member_access=true:suggestion
26+
dotnet_style_qualification_for_event=false:suggestion
27+
dotnet_style_qualification_for_field=false:suggestion
28+
dotnet_style_qualification_for_method=false:suggestion
29+
dotnet_style_qualification_for_property=false:suggestion
30+
dotnet_style_require_accessibility_modifiers=for_non_interface_members:suggestion
31+
32+
# ReSharper properties
33+
resharper_autodetect_indent_settings=true
34+
resharper_csharp_space_within_array_access_brackets=true
35+
resharper_enforce_line_ending_style=true
36+
resharper_place_attribute_on_same_line=false
37+
resharper_space_after_cast=false
38+
resharper_space_within_checked_parentheses=true
39+
resharper_space_within_default_parentheses=true
40+
resharper_space_within_nameof_parentheses=true
41+
resharper_space_within_single_line_array_initializer_braces=true
42+
resharper_space_within_sizeof_parentheses=true
43+
resharper_space_within_typeof_parentheses=true
44+
resharper_space_within_type_argument_angles=true
45+
resharper_space_within_type_parameter_angles=true
46+
resharper_use_indent_from_vs=false
47+
resharper_wrap_lines=true
48+
49+
# ReSharper inspection severities
50+
resharper_arrange_redundant_parentheses_highlighting=hint
51+
resharper_arrange_this_qualifier_highlighting=hint
52+
resharper_arrange_type_member_modifiers_highlighting=hint
53+
resharper_arrange_type_modifiers_highlighting=hint
54+
resharper_built_in_type_reference_style_for_member_access_highlighting=hint
55+
resharper_built_in_type_reference_style_highlighting=hint
56+
resharper_redundant_base_qualifier_highlighting=warning
57+
resharper_suggest_var_or_type_built_in_types_highlighting=hint
58+
resharper_suggest_var_or_type_elsewhere_highlighting=hint
59+
resharper_suggest_var_or_type_simple_types_highlighting=hint
60+
resharper_web_config_module_not_resolved_highlighting=warning
61+
resharper_web_config_type_not_resolved_highlighting=warning
62+
resharper_web_config_wrong_module_highlighting=warning
63+
64+
[*.{appxmanifest,asax,ascx,aspx,build,cg,cginc,compute,cs,cshtml,dtd,hlsl,hlsli,hlslinc,master,nuspec,razor,resw,resx,shader,skin,usf,ush,vb,xaml,xamlx,xoml,xsd}]
65+
indent_style=space
66+
indent_size=4
67+
tab_width=4

‎JobBars/Cooldowns/CooldownConfig.cs

+23-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using ImGuiNET;
1+
using Dalamud.Interface.Utility.Raii;
2+
using ImGuiNET;
23
using JobBars.Data;
34
using System.Numerics;
45

@@ -12,6 +13,7 @@ public struct CooldownProps {
1213

1314
public class CooldownConfig {
1415
public readonly string Name;
16+
public readonly string NameId;
1517
public readonly ActionIds Icon;
1618
public readonly Item[] Triggers;
1719
public readonly float Duration;
@@ -22,46 +24,51 @@ public class CooldownConfig {
2224
public bool ShowBorderWhenActive { get; private set; }
2325
public bool ShowBorderWhenOffCD { get; private set; }
2426

25-
public CooldownConfig(string name, CooldownProps props) {
27+
public CooldownConfig( string name, CooldownProps props ) : this( name, name, props ) { }
28+
29+
public CooldownConfig( string name, string id, CooldownProps props ) {
2630
Name = name;
31+
NameId = id;
2732
Icon = props.Icon;
2833
Triggers = props.Triggers;
2934
Duration = props.Duration;
3035
CD = props.CD;
31-
Enabled = JobBars.Configuration.CooldownEnabled.Get(Name);
32-
Order = JobBars.Configuration.CooldownOrder.Get(Name);
33-
ShowBorderWhenActive = JobBars.Configuration.CooldownShowBorderWhenActive.Get(Name);
34-
ShowBorderWhenOffCD = JobBars.Configuration.CooldownShowBorderWhenOffCD.Get(Name);
36+
Enabled = JobBars.Configuration.CooldownEnabled.Get( NameId );
37+
Order = JobBars.Configuration.CooldownOrder.Get( NameId );
38+
ShowBorderWhenActive = JobBars.Configuration.CooldownShowBorderWhenActive.Get( NameId );
39+
ShowBorderWhenOffCD = JobBars.Configuration.CooldownShowBorderWhenOffCD.Get( NameId );
3540
}
3641

37-
public bool Draw(string _id, bool isCustom, ref bool reset) {
42+
public bool Draw( string _id, bool isCustom, ref bool reset ) {
3843
var deleteCustom = false;
39-
var color = Enabled ? new Vector4(0, 1, 0, 1) : new Vector4(1, 0, 0, 1);
44+
var color = Enabled ? new Vector4( 0, 1, 0, 1 ) : new Vector4( 1, 0, 0, 1 );
45+
46+
using var _ = ImRaii.PushId( $"{_id}{NameId}" );
4047

41-
ImGui.PushStyleColor(ImGuiCol.Text, color);
42-
if (ImGui.CollapsingHeader($"{Name}{_id}")) {
48+
ImGui.PushStyleColor( ImGuiCol.Text, color );
49+
if( ImGui.CollapsingHeader( Name ) ) {
4350
ImGui.PopStyleColor();
4451
ImGui.Indent();
4552

46-
if (isCustom) {
47-
if (JobBars.RemoveButton($"Delete{_id}", true)) deleteCustom = true;
53+
if( isCustom ) {
54+
if( JobBars.RemoveButton( $"Delete", true ) ) deleteCustom = true;
4855
}
4956

50-
if (JobBars.Configuration.CooldownEnabled.Draw($"Enabled{_id}{Name}", Name, Enabled, out var newEnabled)) {
57+
if( JobBars.Configuration.CooldownEnabled.Draw( "Enabled", NameId, Enabled, out var newEnabled ) ) {
5158
Enabled = newEnabled;
5259
reset = true;
5360
}
5461

55-
if (JobBars.Configuration.CooldownOrder.Draw($"Order{_id}{Name}", Name, Order, out var newOrder)) {
62+
if( JobBars.Configuration.CooldownOrder.Draw( "Order", NameId, Order, out var newOrder ) ) {
5663
Order = newOrder;
5764
reset = true;
5865
}
5966

60-
if (JobBars.Configuration.CooldownShowBorderWhenActive.Draw($"Show border when active{_id}{Name}", Name, ShowBorderWhenActive, out var newShowBorderWhenActive)) {
67+
if( JobBars.Configuration.CooldownShowBorderWhenActive.Draw( "Show border when active", NameId, ShowBorderWhenActive, out var newShowBorderWhenActive ) ) {
6168
ShowBorderWhenActive = newShowBorderWhenActive;
6269
}
6370

64-
if (JobBars.Configuration.CooldownShowBorderWhenOffCD.Draw($"Show border when off CD{_id}{Name}", Name, ShowBorderWhenOffCD, out var newShowBorderWhenOffCD)) {
71+
if( JobBars.Configuration.CooldownShowBorderWhenOffCD.Draw( "Show border when off CD", NameId, ShowBorderWhenOffCD, out var newShowBorderWhenOffCD ) ) {
6572
ShowBorderWhenOffCD = newShowBorderWhenOffCD;
6673
}
6774

‎JobBars/Cooldowns/Manager/CooldownManager.cs

+39-38
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
using JobBars.Data;
1+
using JobBars.Data;
22
using JobBars.Helper;
33
using System;
44
using System.Collections.Generic;
5+
using System.Linq;
56
using System.Numerics;
67

78
namespace JobBars.Cooldowns.Manager {
@@ -15,33 +16,33 @@ public unsafe partial class CooldownManager : PerJobManager<CooldownConfig[]> {
1516
private Dictionary<uint, CooldownPartyMember> ObjectIdToMember = new();
1617
private readonly Dictionary<JobIds, List<CooldownConfig>> CustomCooldowns = new();
1718

18-
public CooldownManager() : base("##JobBars_Cooldowns") {
19-
JobBars.Builder.SetCooldownPosition(JobBars.Configuration.CooldownPosition);
19+
public CooldownManager() : base( "##JobBars_Cooldowns" ) {
20+
JobBars.Builder.SetCooldownPosition( JobBars.Configuration.CooldownPosition );
2021

21-
// initialize custom cooldowns
22-
foreach (var custom in JobBars.Configuration.CustomCooldown) {
23-
if (!CustomCooldowns.ContainsKey(custom.Job)) CustomCooldowns[custom.Job] = new();
24-
CustomCooldowns[custom.Job].Add(new CooldownConfig(custom.Name, custom.Props));
22+
// Initialize custom cooldowns, remove duplicates
23+
foreach( var custom in JobBars.Configuration.CustomCooldown.GroupBy( x => x.GetNameId() ).Select( x => x.First() ).ToList() ) {
24+
if( !CustomCooldowns.ContainsKey( custom.Job ) ) CustomCooldowns[custom.Job] = new();
25+
CustomCooldowns[custom.Job].Add( new CooldownConfig( custom.Name, custom.GetNameId(), custom.Props ) );
2526
}
2627
}
2728

28-
public CooldownConfig[] GetCooldownConfigs(JobIds job) {
29+
public CooldownConfig[] GetCooldownConfigs( JobIds job ) {
2930
List<CooldownConfig> configs = new();
30-
if (JobToValue.TryGetValue(job, out var props)) configs.AddRange(props);
31-
if (CustomCooldowns.TryGetValue(job, out var customProps)) configs.AddRange(customProps);
31+
if( JobToValue.TryGetValue( job, out var props ) ) configs.AddRange( props );
32+
if( CustomCooldowns.TryGetValue( job, out var customProps ) ) configs.AddRange( customProps );
3233
return configs.ToArray();
3334
}
3435

35-
public void PerformAction(Item action, uint objectId) {
36-
if (!JobBars.Configuration.CooldownsEnabled) return;
36+
public void PerformAction( Item action, uint objectId ) {
37+
if( !JobBars.Configuration.CooldownsEnabled ) return;
3738

38-
foreach (var member in ObjectIdToMember.Values) {
39-
member.ProcessAction(action, objectId);
39+
foreach( var member in ObjectIdToMember.Values ) {
40+
member.ProcessAction( action, objectId );
4041
}
4142
}
4243

4344
public void Tick() {
44-
if (AtkHelper.CalcDoHide(JobBars.Configuration.CooldownsEnabled, JobBars.Configuration.CooldownsHideOutOfCombat, JobBars.Configuration.CooldownsHideWeaponSheathed)) {
45+
if( AtkHelper.CalcDoHide( JobBars.Configuration.CooldownsEnabled, JobBars.Configuration.CooldownsHideOutOfCombat, JobBars.Configuration.CooldownsHideWeaponSheathed ) ) {
4546
JobBars.Builder.HideCooldowns();
4647
return;
4748
}
@@ -52,61 +53,61 @@ public void Tick() {
5253
// ============================
5354

5455
var time = DateTime.Now;
55-
int millis = time.Second * 1000 + time.Millisecond;
56-
float percent = (float)(millis % MILLIS_LOOP) / MILLIS_LOOP;
56+
var millis = time.Second * 1000 + time.Millisecond;
57+
var percent = ( float )( millis % MILLIS_LOOP ) / MILLIS_LOOP;
5758

5859
Dictionary<uint, CooldownPartyMember> newObjectIdToMember = new();
5960

60-
if (JobBars.PartyMembers == null) Dalamud.Error("PartyMembers is null");
61+
if( JobBars.PartyMembers == null ) Dalamud.Error( "PartyMembers is null" );
6162

62-
for (int idx = 0; idx < JobBars.PartyMembers.Count; idx++) {
63+
for( var idx = 0; idx < JobBars.PartyMembers.Count; idx++ ) {
6364
var partyMember = JobBars.PartyMembers[idx];
6465

65-
if (partyMember == null || partyMember?.ObjectId == 0 || partyMember?.Job == JobIds.OTHER) {
66-
JobBars.Builder.SetCooldownRowVisible(idx, false);
66+
if( partyMember == null || partyMember?.ObjectId == 0 || partyMember?.Job == JobIds.OTHER ) {
67+
JobBars.Builder.SetCooldownRowVisible( idx, false );
6768
continue;
6869
}
6970

70-
if (!JobBars.Configuration.CooldownsShowPartyMembers && partyMember.ObjectId != Dalamud.ClientState.LocalPlayer.ObjectId) {
71-
JobBars.Builder.SetCooldownRowVisible(idx, false);
71+
if( !JobBars.Configuration.CooldownsShowPartyMembers && partyMember.ObjectId != Dalamud.ClientState.LocalPlayer.ObjectId ) {
72+
JobBars.Builder.SetCooldownRowVisible( idx, false );
7273
continue;
7374
}
7475

75-
var member = ObjectIdToMember.TryGetValue(partyMember.ObjectId, out var _member) ? _member : new CooldownPartyMember(partyMember.ObjectId);
76-
member.Tick(JobBars.Builder.Cooldowns[idx], partyMember, percent);
76+
var member = ObjectIdToMember.TryGetValue( partyMember.ObjectId, out var _member ) ? _member : new CooldownPartyMember( partyMember.ObjectId );
77+
member.Tick( JobBars.Builder.Cooldowns[idx], partyMember, percent );
7778
newObjectIdToMember[partyMember.ObjectId] = member;
7879

79-
JobBars.Builder.SetCooldownRowVisible(idx, true);
80+
JobBars.Builder.SetCooldownRowVisible( idx, true );
8081
}
8182

82-
for (int idx = JobBars.PartyMembers.Count; idx < 8; idx++) { // hide remaining slots
83-
JobBars.Builder.SetCooldownRowVisible(idx, false);
83+
for( var idx = JobBars.PartyMembers.Count; idx < 8; idx++ ) { // hide remaining slots
84+
JobBars.Builder.SetCooldownRowVisible( idx, false );
8485
}
8586

8687
ObjectIdToMember = newObjectIdToMember;
8788
}
8889

8990
public void UpdatePositionScale() {
90-
JobBars.Builder.SetCooldownPosition(JobBars.Configuration.CooldownPosition + new Vector2(0, AtkHelper.PartyListOffset()));
91-
JobBars.Builder.SetCooldownScale(JobBars.Configuration.CooldownScale);
91+
JobBars.Builder.SetCooldownPosition( JobBars.Configuration.CooldownPosition + new Vector2( 0, AtkHelper.PartyListOffset() ) );
92+
JobBars.Builder.SetCooldownScale( JobBars.Configuration.CooldownScale );
9293
JobBars.Builder.RefreshCooldownsLayout();
9394
}
9495

9596
public void ResetUi() => ObjectIdToMember.Clear();
9697

9798
public void ResetTrackers() {
98-
foreach (var item in ObjectIdToMember.Values) item.Reset();
99+
foreach( var item in ObjectIdToMember.Values ) item.Reset();
99100
}
100101

101-
public void AddCustomCooldown(JobIds job, string name, CooldownProps props) {
102-
if (!CustomCooldowns.ContainsKey(job)) CustomCooldowns[job] = new();
103-
CustomCooldowns[job].Add(new CooldownConfig(name, props));
104-
JobBars.Configuration.AddCustomCooldown(name, job, props);
102+
public void AddCustomCooldown( JobIds job, string name, CooldownProps props ) {
103+
if( !CustomCooldowns.ContainsKey( job ) ) CustomCooldowns[job] = new();
104+
var newCustom = JobBars.Configuration.AddCustomCooldown( name, job, props );
105+
CustomCooldowns[job].Add( new CooldownConfig( name, newCustom.GetNameId(), props ) );
105106
}
106107

107-
public void DeleteCustomCooldown(JobIds job, CooldownConfig custom) {
108-
CustomCooldowns[job].Remove(custom);
109-
JobBars.Configuration.RemoveCustomCooldown(custom.Name);
108+
public void DeleteCustomCooldown( JobIds job, CooldownConfig custom ) {
109+
CustomCooldowns[job].Remove( custom );
110+
JobBars.Configuration.RemoveCustomCooldown( custom.NameId );
110111
}
111112
}
112113
}

0 commit comments

Comments
 (0)