Skip to content

Commit 98dc59c

Browse files
committed
Color-coordinate characters and cadence equipment UI
1 parent ba66818 commit 98dc59c

4 files changed

Lines changed: 28 additions & 10 deletions

File tree

Mythril.Blazor/Components/CadenceDragExpander.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
@inject DragDropService DragDropService
55
@inject ResourceManager ResourceManager
66

7-
<div class="expander shadow-theme @(IsHighlighted ? "highlighted" : "") @(isEquipped ? "equipped" : "")">
7+
<div class="expander shadow-theme @(IsHighlighted ? "highlighted" : "") @(isEquipped ? "equipped" : "")" style="@(assignedCharacter.HasValue ? $"border-left-color: {assignedCharacter.Value.Color};" : "")">
88
<div class="expander-header d-flex align-items-center" @onclick="Toggle">
99
@if (assignedCharacter.HasValue)
1010
{
11-
<div class="equipped-portrait me-2" title="Equipped by @assignedCharacter.Value.Name">
12-
<span class="material-icons" style="font-size: 20px;">account_circle</span>
11+
<div class="equipped-portrait me-2" title="Equipped by @assignedCharacter.Value.Name" style="color: @assignedCharacter.Value.Color;">
12+
<span class="material-icons" style="font-size: 20px;">@assignedCharacter.Value.Icon</span>
1313
<span class="character-initial">@assignedCharacter.Value.Name[0]</span>
1414
</div>
1515
}

Mythril.Blazor/Components/CharacterDisplay.razor

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@
4444
<div class="flex-grow-1 min-width-0">
4545
<div class="character-header">
4646
<div class="d-flex flex-column flex-grow-1 min-width-0">
47-
<h4 class="character-name text-truncate m-0">@Character.Name</h4>
48-
<div class="cadence-info small text-muted">
49-
@if (assignedCadences.Any())
47+
<div class="d-flex align-items-center gap-2">
48+
<span class="material-icons" style="color: @Character.Color; font-size: 1.5rem;">@Character.Icon</span>
49+
<h4 class="character-name text-truncate m-0">@Character.Name</h4>
50+
</div>
51+
<div class="cadence-info small text-muted"> @if (assignedCadences.Any())
5052
{
5153
<div class="d-flex flex-wrap gap-1 mt-1">
5254
@foreach (var cadence in assignedCadences)
@@ -99,14 +101,13 @@
99101

100102
@if (resourceManager.ShowMiniLogs && resourceManager.CharacterMiniLogs.TryGetValue(Character.Name, out var log) && log.Any())
101103
{
102-
<div class="mini-log mt-1">
104+
<div class="mini-log mt-1" style="border-left-color: @Character.Color;">
103105
@foreach (var entry in log.Reverse())
104106
{
105107
<div class="log-entry text-truncate">@entry</div>
106108
}
107109
</div>
108110
}
109-
110111
<div class="task-slots-container mt-2 d-flex flex-column gap-2">
111112
@for (int i = 0; i < taskLimit; i++)
112113
{

Mythril.Blazor/Components/CharacterDisplay.razor.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
background: rgba(0, 0, 0, 0.05);
8181
padding: 2px 6px;
8282
border-radius: 4px;
83-
border-left: 2px solid var(--accent-color);
83+
border-left: 2px solid transparent;
8484
}
8585

8686
.log-entry {

Mythril.Data/Models.cs

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,24 @@ public partial record struct Cadence(string Name, string Description, CadenceUnl
108108
public partial record struct Location(string Name, IEnumerable<Quest> Quests, string? RequiredQuest = null, string? Type = null) : INamed;
109109

110110
// Character
111-
public partial record struct Character(string Name);
111+
public partial record struct Character(string Name)
112+
{
113+
public string Color => Name switch
114+
{
115+
"Protagonist" => "#ff4444",
116+
"Wifu" => "#4444ff",
117+
"Himbo" => "#44ff44",
118+
_ => "#00adb5"
119+
};
120+
121+
public string Icon => Name switch
122+
{
123+
"Protagonist" => "person",
124+
"Wifu" => "face",
125+
"Himbo" => "sentiment_satisfied_alt",
126+
_ => "account_circle"
127+
};
128+
}
112129

113130
// Stats
114131
public partial record struct Stat(string Name, string Description) : INamed;

0 commit comments

Comments
 (0)