Skip to content

Handle inverted requirements correctly and update UI #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
portfiend merged 1 commit into from
Aug 4, 2026
Merged

Handle inverted requirements correctly and update UI #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions Content.Client/_DEN/Lobby/UI/Traits/EntityTraitSelector.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,18 @@ private static string ConstructTooltipDescription(EntityTraitPrototype trait,
return tooltipString;
}

public void SetInvalid(bool invalid)
public void UpdateAppearance(bool invalid)
{
SelectorCheckbox.Label.FontColorOverride = invalid ? Color.Red : null;
if (_trait is null)
return;
var valid = SharedPlayerRequirementManager.CheckRequirements(GetContext(), _trait.Requirements);
SelectorCheckbox.Disabled = !valid && !Preference;
Color? fontColor = null;
if (invalid)
fontColor = Color.Red;
else if (!valid)
fontColor = Color.Gray;

SelectorCheckbox.Label.FontColorOverride = fontColor;
}
}
2 changes: 1 addition & 1 deletion Content.Client/_DEN/Lobby/UI/Traits/TraitCategoryBox.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void SetCategory(TraitCategoryPrototype category)

var tooManySelected = TotalCost > category.MaxTraitPoints;
foreach (var selector in _selectors)
selector.SetInvalid(tooManySelected);
selector.UpdateAppearance(tooManySelected);
}
else
CategoryMaxTraitLabel.Visible = false;
Expand Down
4 changes: 2 additions & 2 deletions Content.Shared/_DEN/Requirements/Managers/SharedPlayerRequirementManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ public static bool CheckRequirement(PlayerRequirementContext context, IPlayerReq

// Check the actual requirement, now.
if (!requirement.CheckRequirement(context))
return false;
return requirement.Inverted;

return true;
return !requirement.Inverted;
}

/// <summary>
Expand Down
Loading