xTr1m/RpgRoller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ruleset-aware Rolemaster editors

Browse Source
This commit is contained in:
Frank Tovar
2026-04-03 01:11:10 +02:00
parent 960197354a
commit 61ea310179
11 changed files with 486 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RpgRoller/Components/Pages/Home.Models.cs
View File

@@ -42,20 +42,26 @@ public sealed class CharacterFormModel
public sealed class SkillFormModel
{
public string Name { get; set; } = string.Empty;
public string RulesetId { get; set; } = string.Empty;
public string DiceRollDefinition { get; set; } = string.Empty;
public string SkillGroupId { get; set; } = string.Empty;
public int WildDice { get; set; }
public bool AllowFumble { get; set; }
public int? FumbleRange { get; set; }
public string RolemasterRollType { get; set; } = HomeControls.RulesetFormHelpers.RolemasterRollTypes.Initiative;
public int RolemasterModifier { get; set; }
}
public sealed class SkillGroupFormModel
{
public string Name { get; set; } = string.Empty;
public string RulesetId { get; set; } = string.Empty;
public string DiceRollDefinition { get; set; } = string.Empty;
public int WildDice { get; set; }
public bool AllowFumble { get; set; }
public int? FumbleRange { get; set; }
public string RolemasterRollType { get; set; } = HomeControls.RulesetFormHelpers.RolemasterRollTypes.Initiative;
public int RolemasterModifier { get; set; }
}
public enum HomeViewMode

38
RpgRoller/Components/Pages/HomeControls/CharacterPanel.razor
View File

@@ -152,13 +152,14 @@
}
<label for="skill-group-expression">Prototype expression</label>
<input id="skill-group-expression" @bind="SkillGroupState.Model.DiceRollDefinition" @bind:event="oninput"/>
<input id="skill-group-expression" value="@SkillGroupState.Model.DiceRollDefinition" @oninput="OnSkillGroupExpressionChanged"/>
<p class="field-help">@SkillGroupExpressionHelpText</p>
@if (SkillGroupState.Errors.TryGetValue("diceRollDefinition", out var expressionError))
{
<p class="field-error">@expressionError</p>
}
@if (IsD6)
@if (IsD6Ruleset)
{
<label for="skill-group-wild-dice">Prototype wild dice</label>
<input id="skill-group-wild-dice" type="number" min="1" step="1" @bind="SkillGroupState.Model.WildDice"/>
@@ -170,6 +171,29 @@
<label for="skill-group-allow-fumble">Prototype allow fumble</label>
<input id="skill-group-allow-fumble" type="checkbox" @bind="SkillGroupState.Model.AllowFumble"/>
}
else if (IsRolemasterRuleset)
{
<label for="skill-group-rolemaster-roll-type">Prototype roll type</label>
<select id="skill-group-rolemaster-roll-type" value="@SkillGroupState.Model.RolemasterRollType" @onchange="OnSkillGroupRolemasterRollTypeChanged">
<option value="@RulesetFormHelpers.RolemasterRollTypes.Initiative">Initiative</option>
<option value="@RulesetFormHelpers.RolemasterRollTypes.Percentile">Percentile</option>
<option value="@RulesetFormHelpers.RolemasterRollTypes.OpenEndedPercentile">Open-ended percentile</option>
</select>
<label for="skill-group-rolemaster-modifier">Prototype modifier</label>
<input id="skill-group-rolemaster-modifier" type="number" step="1" value="@SkillGroupState.Model.RolemasterModifier" @oninput="OnSkillGroupRolemasterModifierChanged"/>
@if (IsSkillGroupRolemasterOpenEnded)
{
<label for="skill-group-fumble-range">Prototype fumble range</label>
<input id="skill-group-fumble-range" type="number" min="0" max="95" step="1" @bind="SkillGroupState.Model.FumbleRange"/>
<p class="field-help">Used only for open-ended percentile skills created from this group.</p>
@if (SkillGroupState.Errors.TryGetValue("fumbleRange", out var fumbleRangeError))
{
<p class="field-error">@fumbleRangeError</p>
}
}
}
@if (SkillGroupState.Errors.TryGetValue("character", out var characterError))
{
@@ -192,7 +216,7 @@
<SkillFormModal
Visible="ShowCreateSkillModal"
AutoFocusName="true"
IsD6="IsD6"
RulesetId="@SelectedCampaignRulesetId"
Title="Create Skill"
SubmitLabel="Create Skill"
NameInputId="skill-create-name"
@@ -200,6 +224,9 @@
SkillGroupInputId="skill-create-group"
WildDiceInputId="skill-create-wild-dice"
AllowFumbleInputId="skill-create-allow-fumble"
RolemasterRollTypeInputId="skill-create-rolemaster-roll-type"
RolemasterModifierInputId="skill-create-rolemaster-modifier"
FumbleRangeInputId="skill-create-fumble-range"
InitialModel="CreateSkillInitialModel"
FormVersion="CreateSkillFormVersion"
SelectedCharacterId="SelectedCharacterId"
@@ -211,7 +238,7 @@
<SkillFormModal
Visible="ShowEditSkillModal"
IsD6="IsD6"
RulesetId="@SelectedCampaignRulesetId"
Title="Edit Skill"
SubmitLabel="Save Skill"
NameInputId="skill-edit-name"
@@ -219,6 +246,9 @@
SkillGroupInputId="skill-edit-group"
WildDiceInputId="skill-edit-wild-dice"
AllowFumbleInputId="skill-edit-allow-fumble"
RolemasterRollTypeInputId="skill-edit-rolemaster-roll-type"
RolemasterModifierInputId="skill-edit-rolemaster-modifier"
FumbleRangeInputId="skill-edit-fumble-range"
InitialModel="EditSkillInitialModel"
FormVersion="EditSkillFormVersion"
SelectedCharacterId="SelectedCharacterId"

129
RpgRoller/Components/Pages/HomeControls/CharacterPanel.razor.cs
View File

@@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using Microsoft.AspNetCore.Components;
using RpgRoller.Contracts;
@@ -16,13 +17,19 @@ public partial class CharacterPanel
CreateSkillInitialModel = new()
{
Name = string.Empty,
RulesetId = SelectedCampaignRulesetId,
DiceRollDefinition = selectedGroup?.DiceRollDefinition ?? string.Empty,
SkillGroupId = selectedGroup?.Id.ToString() ?? string.Empty,
WildDice = selectedGroup?.WildDice ?? (IsD6 ? 1 : 0),
AllowFumble = selectedGroup?.AllowFumble ?? IsD6,
FumbleRange = selectedGroup?.FumbleRange
WildDice = selectedGroup?.WildDice ?? (IsD6Ruleset ? 1 : 0),
AllowFumble = selectedGroup?.AllowFumble ?? IsD6Ruleset,
FumbleRange = selectedGroup?.FumbleRange,
RolemasterRollType = RulesetFormHelpers.InferRolemasterRollType(selectedGroup?.DiceRollDefinition),
RolemasterModifier = RulesetFormHelpers.InferRolemasterModifier(selectedGroup?.DiceRollDefinition)
};
if (IsRolemasterRuleset && string.IsNullOrWhiteSpace(CreateSkillInitialModel.DiceRollDefinition))
CreateSkillInitialModel.DiceRollDefinition = RulesetFormHelpers.BuildRolemasterExpression(CreateSkillInitialModel.RolemasterRollType, CreateSkillInitialModel.RolemasterModifier);
CreateSkillFormVersion++;
ShowCreateSkillModal = true;
}
@@ -33,11 +40,14 @@ public partial class CharacterPanel
EditSkillInitialModel = new()
{
Name = skill.Name,
RulesetId = SelectedCampaignRulesetId,
DiceRollDefinition = skill.DiceRollDefinition,
SkillGroupId = skill.SkillGroupId?.ToString() ?? string.Empty,
WildDice = skill.WildDice,
AllowFumble = skill.AllowFumble,
FumbleRange = skill.FumbleRange
FumbleRange = skill.FumbleRange,
RolemasterRollType = RulesetFormHelpers.InferRolemasterRollType(skill.DiceRollDefinition),
RolemasterModifier = RulesetFormHelpers.InferRolemasterModifier(skill.DiceRollDefinition)
};
EditSkillFormVersion++;
@@ -98,10 +108,15 @@ public partial class CharacterPanel
private void OpenCreateSkillGroupModal()
{
SkillGroupState.Model.Name = string.Empty;
SkillGroupState.Model.RulesetId = SelectedCampaignRulesetId;
SkillGroupState.Model.DiceRollDefinition = string.Empty;
SkillGroupState.Model.WildDice = IsD6 ? 1 : 0;
SkillGroupState.Model.AllowFumble = IsD6;
SkillGroupState.Model.WildDice = IsD6Ruleset ? 1 : 0;
SkillGroupState.Model.AllowFumble = IsD6Ruleset;
SkillGroupState.Model.FumbleRange = null;
SkillGroupState.Model.RolemasterRollType = RulesetFormHelpers.RolemasterRollTypes.Initiative;
SkillGroupState.Model.RolemasterModifier = 0;
if (IsRolemasterRuleset)
SynchronizeSkillGroupExpression();
SkillGroupState.ResetValidation();
ShowCreateSkillGroupModal = true;
}
@@ -110,10 +125,14 @@ public partial class CharacterPanel
{
EditingSkillGroupId = skillGroup.Id;
SkillGroupState.Model.Name = skillGroup.Name;
SkillGroupState.Model.RulesetId = SelectedCampaignRulesetId;
SkillGroupState.Model.DiceRollDefinition = skillGroup.DiceRollDefinition;
SkillGroupState.Model.WildDice = skillGroup.WildDice;
SkillGroupState.Model.AllowFumble = skillGroup.AllowFumble;
SkillGroupState.Model.FumbleRange = skillGroup.FumbleRange;
SkillGroupState.Model.RolemasterRollType = RulesetFormHelpers.InferRolemasterRollType(skillGroup.DiceRollDefinition);
SkillGroupState.Model.RolemasterModifier = RulesetFormHelpers.InferRolemasterModifier(skillGroup.DiceRollDefinition);
NormalizeSkillGroupFumbleRange();
SkillGroupState.ResetValidation();
ShowEditSkillGroupModal = true;
}
@@ -136,9 +155,25 @@ public partial class CharacterPanel
if (string.IsNullOrWhiteSpace(SkillGroupState.Model.DiceRollDefinition))
SkillGroupState.Errors["diceRollDefinition"] = "Expression is required.";
if (IsD6 && SkillGroupState.Model.WildDice < 1)
if (IsD6Ruleset && SkillGroupState.Model.WildDice < 1)
SkillGroupState.Errors["wildDice"] = "D6 groups require at least one wild die.";
if (IsRolemasterRuleset)
{
if (IsSkillGroupRolemasterOpenEnded && !SkillGroupState.Model.FumbleRange.HasValue)
SkillGroupState.Errors["fumbleRange"] = "Open-ended Rolemaster groups require a fumble range.";
}
else
{
SkillGroupState.Model.FumbleRange = null;
}
if (!IsD6Ruleset)
{
SkillGroupState.Model.WildDice = 0;
SkillGroupState.Model.AllowFumble = false;
}
if (!SelectedCharacterId.HasValue)
SkillGroupState.Errors["character"] = "Select a character first.";
@@ -184,9 +219,25 @@ public partial class CharacterPanel
if (string.IsNullOrWhiteSpace(SkillGroupState.Model.DiceRollDefinition))
SkillGroupState.Errors["diceRollDefinition"] = "Expression is required.";
if (IsD6 && SkillGroupState.Model.WildDice < 1)
if (IsD6Ruleset && SkillGroupState.Model.WildDice < 1)
SkillGroupState.Errors["wildDice"] = "D6 groups require at least one wild die.";
if (IsRolemasterRuleset)
{
if (IsSkillGroupRolemasterOpenEnded && !SkillGroupState.Model.FumbleRange.HasValue)
SkillGroupState.Errors["fumbleRange"] = "Open-ended Rolemaster groups require a fumble range.";
}
else
{
SkillGroupState.Model.FumbleRange = null;
}
if (!IsD6Ruleset)
{
SkillGroupState.Model.WildDice = 0;
SkillGroupState.Model.AllowFumble = false;
}
if (!EditingSkillGroupId.HasValue)
SkillGroupState.Errors["group"] = "Select a skill group first.";
@@ -270,6 +321,66 @@ public partial class CharacterPanel
return string.Concat(words[0][0], words[1][0]).ToUpperInvariant();
}
private void OnSkillGroupExpressionChanged(ChangeEventArgs args)
{
SkillGroupState.Model.DiceRollDefinition = args.Value?.ToString() ?? string.Empty;
if (IsRolemasterRuleset)
{
SkillGroupState.Model.RolemasterRollType = RulesetFormHelpers.InferRolemasterRollType(SkillGroupState.Model.DiceRollDefinition);
SkillGroupState.Model.RolemasterModifier = RulesetFormHelpers.InferRolemasterModifier(SkillGroupState.Model.DiceRollDefinition);
NormalizeSkillGroupFumbleRange();
}
}
private void OnSkillGroupRolemasterRollTypeChanged(ChangeEventArgs args)
{
SkillGroupState.Model.RolemasterRollType = args.Value?.ToString() ?? RulesetFormHelpers.RolemasterRollTypes.Initiative;
NormalizeSkillGroupFumbleRange();
SynchronizeSkillGroupExpression();
}
private void OnSkillGroupRolemasterModifierChanged(ChangeEventArgs args)
{
var rawValue = args.Value?.ToString();
if (!int.TryParse(rawValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out var modifier))
modifier = 0;
SkillGroupState.Model.RolemasterModifier = modifier;
SynchronizeSkillGroupExpression();
}
private void SynchronizeSkillGroupExpression()
{
if (!IsRolemasterRuleset)
return;
SkillGroupState.Model.DiceRollDefinition = RulesetFormHelpers.BuildRolemasterExpression(SkillGroupState.Model.RolemasterRollType, SkillGroupState.Model.RolemasterModifier);
}
private void NormalizeSkillGroupFumbleRange()
{
if (!IsRolemasterRuleset)
{
SkillGroupState.Model.FumbleRange = null;
return;
}
if (IsSkillGroupRolemasterOpenEnded)
{
SkillGroupState.Model.FumbleRange ??= 5;
return;
}
SkillGroupState.Model.FumbleRange = null;
}
private bool IsD6Ruleset => RulesetFormHelpers.IsD6(SelectedCampaignRulesetId);
private bool IsRolemasterRuleset => RulesetFormHelpers.IsRolemaster(SelectedCampaignRulesetId);
private bool IsSkillGroupRolemasterOpenEnded => string.Equals(SkillGroupState.Model.RolemasterRollType, RulesetFormHelpers.RolemasterRollTypes.OpenEndedPercentile, StringComparison.OrdinalIgnoreCase);
private string SkillGroupExpressionHelpText => IsRolemasterRuleset
? $"{RulesetFormHelpers.RolemasterExampleText(SkillGroupState.Model.RolemasterRollType)}. Negative modifiers are allowed."
: "Enter the default expression for skills created in this group.";
private bool ShowCreateSkillModal { get; set; }
private bool ShowEditSkillModal { get; set; }
private bool ShowCreateSkillGroupModal { get; set; }
@@ -309,7 +420,7 @@ public partial class CharacterPanel
public IReadOnlyList<CharacterSheetSkillGroup> SelectedCharacterSkillGroups { get; set; } = [];
[Parameter]
public bool IsD6 { get; set; }
public string SelectedCampaignRulesetId { get; set; } = string.Empty;
[Parameter]
public string RollVisibility { get; set; } = "public";

103
RpgRoller/Components/Pages/HomeControls/RulesetFormHelpers.cs Normal file
View File

@@ -0,0 +1,103 @@
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using RpgRoller.Domain;
using RpgRoller.Services;
namespace RpgRoller.Components.Pages.HomeControls;
[ExcludeFromCodeCoverage]
internal static class RulesetFormHelpers
{
internal static class RulesetIds
{
public const string D6 = "d6";
public const string Dnd5e = "dnd5e";
public const string Rolemaster = "rolemaster";
}
internal static class RolemasterRollTypes
{
public const string Initiative = "initiative";
public const string Percentile = "percentile";
public const string OpenEndedPercentile = "open-ended-percentile";
}
public static bool IsD6(string? rulesetId)
{
return string.Equals(rulesetId, RulesetIds.D6, StringComparison.OrdinalIgnoreCase);
}
public static bool IsRolemaster(string? rulesetId)
{
return string.Equals(rulesetId, RulesetIds.Rolemaster, StringComparison.OrdinalIgnoreCase);
}
public static string InferRolemasterRollType(string? expression)
{
var parseResult = TryParseRolemasterExpression(expression);
if (!parseResult.Succeeded || parseResult.Value is null)
return RolemasterRollTypes.Initiative;
return parseResult.Value.Kind switch
{
DiceExpressionKind.RolemasterPercentile => RolemasterRollTypes.Percentile,
DiceExpressionKind.RolemasterOpenEndedPercentile => RolemasterRollTypes.OpenEndedPercentile,
_ => RolemasterRollTypes.Initiative
};
}
public static int InferRolemasterModifier(string? expression)
{
var parseResult = TryParseRolemasterExpression(expression);
return parseResult.Succeeded && parseResult.Value is not null ? parseResult.Value.Modifier : 0;
}
public static string BuildRolemasterExpression(string? rollType, int modifier)
{
return rollType switch
{
RolemasterRollTypes.Percentile => $"d100{FormatModifier(modifier)}",
RolemasterRollTypes.OpenEndedPercentile => $"d100!{FormatModifier(modifier)}",
_ => $"2d10{FormatModifier(modifier)}"
};
}
public static string DescribeRolemasterExpression(string expression, int? fumbleRange)
{
var parseResult = TryParseRolemasterExpression(expression);
if (!parseResult.Succeeded || parseResult.Value is null)
return expression;
return parseResult.Value.Kind switch
{
DiceExpressionKind.RolemasterPercentile => $"Percentile: {parseResult.Value.Canonical}",
DiceExpressionKind.RolemasterOpenEndedPercentile => fumbleRange.HasValue
? $"Open-ended percentile: {parseResult.Value.Canonical}, fumble <= {fumbleRange.Value}"
: $"Open-ended percentile: {parseResult.Value.Canonical}",
_ => $"Initiative: {parseResult.Value.Canonical}"
};
}
public static string RolemasterExampleText(string? rollType)
{
return rollType switch
{
RolemasterRollTypes.Percentile => "Example: d100+48",
RolemasterRollTypes.OpenEndedPercentile => "Example: d100!+85",
_ => "Example: 2d10+48"
};
}
private static ServiceResult<DiceExpression> TryParseRolemasterExpression(string? expression)
{
if (string.IsNullOrWhiteSpace(expression))
return ServiceResult<DiceExpression>.Failure("invalid_expression", "Expression is required.");
return DiceRules.ParseExpression(RulesetKind.Rolemaster, expression);
}
private static string FormatModifier(int modifier)
{
return modifier >= 0 ? $"+{modifier}" : modifier.ToString(CultureInfo.InvariantCulture);
}
}

28
RpgRoller/Components/Pages/HomeControls/SkillFormModal.razor
View File

@@ -15,7 +15,8 @@
<p class="field-error">@skillNameError</p>
}
<label for="@ExpressionInputId">Expression</label>
<input id="@ExpressionInputId" @bind="FormState.Model.DiceRollDefinition" @bind:event="oninput"/>
<input id="@ExpressionInputId" value="@FormState.Model.DiceRollDefinition" @oninput="OnExpressionChanged"/>
<p class="field-help">@ExpressionHelpText</p>
@if (FormState.Errors.TryGetValue("diceRollDefinition", out var expressionError))
{
<p class="field-error">@expressionError</p>
@@ -32,7 +33,7 @@
{
<p class="field-error">@skillGroupError</p>
}
@if (IsD6)
@if (IsD6Ruleset)
{
<label for="@WildDiceInputId">Wild dice</label>
<input id="@WildDiceInputId" type="number" min="1" step="1" @bind="FormState.Model.WildDice"/>
@@ -44,6 +45,29 @@
<label for="@AllowFumbleInputId">Allow fumble</label>
<input id="@AllowFumbleInputId" type="checkbox" @bind="FormState.Model.AllowFumble"/>
}
else if (IsRolemasterRuleset)
{
<label for="@RolemasterRollTypeInputId">Roll type</label>
<select id="@RolemasterRollTypeInputId" value="@FormState.Model.RolemasterRollType" @onchange="OnRolemasterRollTypeChanged">
<option value="@RulesetFormHelpers.RolemasterRollTypes.Initiative">Initiative</option>
<option value="@RulesetFormHelpers.RolemasterRollTypes.Percentile">Percentile</option>
<option value="@RulesetFormHelpers.RolemasterRollTypes.OpenEndedPercentile">Open-ended percentile</option>
</select>
<label for="@RolemasterModifierInputId">Modifier</label>
<input id="@RolemasterModifierInputId" type="number" step="1" value="@FormState.Model.RolemasterModifier" @oninput="OnRolemasterModifierChanged"/>
@if (IsRolemasterOpenEndedSelected)
{
<label for="@FumbleRangeInputId">Fumble range</label>
<input id="@FumbleRangeInputId" type="number" min="0" max="95" step="1" @bind="FormState.Model.FumbleRange"/>
<p class="field-help">Used only for low-end open-ended rolls. Allowed range: 0 to 95.</p>
@if (FormState.Errors.TryGetValue("fumbleRange", out var fumbleRangeError))
{
<p class="field-error">@fumbleRangeError</p>
}
}
}
<div class="inline-actions">
<button type="submit" disabled="@(IsMutating || IsSubmitting)">@SubmitLabel</button>
<button type="button" class="ghost" @onclick="CancelRequested">Cancel</button>

105
RpgRoller/Components/Pages/HomeControls/SkillFormModal.razor.cs
View File

@@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using RpgRoller.Contracts;
@@ -14,11 +15,15 @@ public partial class SkillFormModal
return;
FormState.Model.Name = InitialModel.Name;
FormState.Model.RulesetId = RulesetId;
FormState.Model.DiceRollDefinition = InitialModel.DiceRollDefinition;
FormState.Model.SkillGroupId = InitialModel.SkillGroupId;
FormState.Model.WildDice = InitialModel.WildDice;
FormState.Model.AllowFumble = InitialModel.AllowFumble;
FormState.Model.FumbleRange = InitialModel.FumbleRange;
FormState.Model.RolemasterRollType = InitialModel.RolemasterRollType;
FormState.Model.RolemasterModifier = InitialModel.RolemasterModifier;
SynchronizeRulesetSpecificFields();
FormState.ResetValidation();
AppliedFormVersion = FormVersion;
PendingNameFocus = AutoFocusName;
@@ -43,9 +48,25 @@ public partial class SkillFormModal
if (string.IsNullOrWhiteSpace(FormState.Model.DiceRollDefinition))
FormState.Errors["diceRollDefinition"] = "Expression is required.";
if (IsD6 && FormState.Model.WildDice < 1)
if (IsD6Ruleset && FormState.Model.WildDice < 1)
FormState.Errors["wildDice"] = "D6 skills require at least one wild die.";
if (IsRolemasterRuleset)
{
if (IsRolemasterOpenEndedSelected && !FormState.Model.FumbleRange.HasValue)
FormState.Errors["fumbleRange"] = "Open-ended Rolemaster skills require a fumble range.";
}
else
{
FormState.Model.FumbleRange = null;
}
if (!IsD6Ruleset)
{
FormState.Model.WildDice = 0;
FormState.Model.AllowFumble = false;
}
Guid? skillGroupId = null;
if (!string.IsNullOrWhiteSpace(FormState.Model.SkillGroupId))
{
@@ -92,6 +113,77 @@ public partial class SkillFormModal
}
}
private void OnExpressionChanged(ChangeEventArgs args)
{
FormState.Model.DiceRollDefinition = args.Value?.ToString() ?? string.Empty;
if (IsRolemasterRuleset)
SynchronizeRolemasterInputsFromExpression();
}
private void OnRolemasterRollTypeChanged(ChangeEventArgs args)
{
FormState.Model.RolemasterRollType = args.Value?.ToString() ?? RulesetFormHelpers.RolemasterRollTypes.Initiative;
NormalizeRolemasterFumbleRange();
SynchronizeRolemasterExpression();
}
private void OnRolemasterModifierChanged(ChangeEventArgs args)
{
var rawValue = args.Value?.ToString();
if (!int.TryParse(rawValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out var modifier))
modifier = 0;
FormState.Model.RolemasterModifier = modifier;
SynchronizeRolemasterExpression();
}
private bool IsD6Ruleset => RulesetFormHelpers.IsD6(RulesetId);
private bool IsRolemasterRuleset => RulesetFormHelpers.IsRolemaster(RulesetId);
private bool IsRolemasterOpenEndedSelected => string.Equals(FormState.Model.RolemasterRollType, RulesetFormHelpers.RolemasterRollTypes.OpenEndedPercentile, StringComparison.OrdinalIgnoreCase);
private string ExpressionHelpText => IsRolemasterRuleset
? $"{RulesetFormHelpers.RolemasterExampleText(FormState.Model.RolemasterRollType)}. Negative modifiers are allowed."
: "Enter the dice expression used for this skill.";
private void SynchronizeRulesetSpecificFields()
{
if (!IsRolemasterRuleset)
return;
SynchronizeRolemasterInputsFromExpression();
NormalizeRolemasterFumbleRange();
}
private void SynchronizeRolemasterInputsFromExpression()
{
FormState.Model.RolemasterRollType = RulesetFormHelpers.InferRolemasterRollType(FormState.Model.DiceRollDefinition);
FormState.Model.RolemasterModifier = RulesetFormHelpers.InferRolemasterModifier(FormState.Model.DiceRollDefinition);
}
private void SynchronizeRolemasterExpression()
{
if (!IsRolemasterRuleset)
return;
FormState.Model.DiceRollDefinition = RulesetFormHelpers.BuildRolemasterExpression(FormState.Model.RolemasterRollType, FormState.Model.RolemasterModifier);
}
private void NormalizeRolemasterFumbleRange()
{
if (!IsRolemasterRuleset)
{
FormState.Model.FumbleRange = null;
return;
}
if (IsRolemasterOpenEndedSelected)
{
FormState.Model.FumbleRange ??= 5;
return;
}
FormState.Model.FumbleRange = null;
}
[Inject]
private RpgRollerApiClient ApiClient { get; set; } = null!;
@@ -105,7 +197,7 @@ public partial class SkillFormModal
public bool Visible { get; set; }
[Parameter]
public bool IsD6 { get; set; }
public string RulesetId { get; set; } = string.Empty;
[Parameter]
public string Title { get; set; } = "Skill";
@@ -128,6 +220,15 @@ public partial class SkillFormModal
[Parameter]
public string AllowFumbleInputId { get; set; } = "skill-fumble";
[Parameter]
public string RolemasterRollTypeInputId { get; set; } = "skill-rolemaster-roll-type";
[Parameter]
public string RolemasterModifierInputId { get; set; } = "skill-rolemaster-modifier";
[Parameter]
public string FumbleRangeInputId { get; set; } = "skill-fumble-range";
[Parameter]
public SkillFormModel InitialModel { get; set; } = new();

2
RpgRoller/Components/Pages/Workspace.razor
View File

@@ -39,7 +39,7 @@
IsMutating="IsMutating"
SelectedCharacterSkills="PlaySelectedCharacterSkills"
SelectedCharacterSkillGroups="PlaySelectedCharacterSkillGroups"
IsD6="IsSelectedCampaignD6"
SelectedCampaignRulesetId="@(PlaySelectedCampaign?.RulesetId ?? string.Empty)"
RollVisibility="RollVisibility"
RollVisibilityChanged="OnRollVisibilityChanged"
OwnerLabel="OwnerLabel"

5
RpgRoller/Components/Pages/Workspace.razor.cs
View File

@@ -920,7 +920,12 @@ public partial class Workspace : IAsyncDisposable
private string SkillDefinitionLabel(CharacterSheetSkill skill)
{
if (!string.Equals(SelectedCampaign?.RulesetId, "d6", StringComparison.OrdinalIgnoreCase))
{
if (string.Equals(SelectedCampaign?.RulesetId, RulesetFormHelpers.RulesetIds.Rolemaster, StringComparison.OrdinalIgnoreCase))
return RulesetFormHelpers.DescribeRolemasterExpression(skill.DiceRollDefinition, skill.FumbleRange);
return skill.DiceRollDefinition;
}
var fumbleLabel = skill.AllowFumble ? "fumble on" : "fumble off";
return $"{skill.DiceRollDefinition}, wild {skill.WildDice}, {fumbleLabel}";

6
RpgRoller/wwwroot/styles.css
View File

@@ -222,6 +222,12 @@ select:focus-visible {
margin: 0;
}
.field-help {
margin: -0.1rem 0 0;
color: var(--muted);
font-size: 0.85rem;
}
.status-message {
font-weight: 700;
}