Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
547 changes: 264 additions & 283 deletions src/REG.Angular/ClientApp/package-lock.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions src/REG.Angular/ClientApp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "reg.angular",
"version": "0.4.12",
"version": "0.4.13",
"scripts": {
"ng": "ng",
"lint": "eslint . --ext .ts",
Expand All @@ -17,17 +17,17 @@
},
"private": true,
"dependencies": {
"@angular/animations": "21.1.4",
"@angular/animations": "21.1.5",
"@angular/cdk": "21.1.5",
"@angular/common": "21.1.4",
"@angular/compiler": "21.1.4",
"@angular/core": "21.1.4",
"@angular/forms": "21.1.4",
"@angular/common": "21.1.5",
"@angular/compiler": "21.1.5",
"@angular/core": "21.1.5",
"@angular/forms": "21.1.5",
"@angular/material": "21.1.5",
"@angular/platform-browser": "21.1.4",
"@angular/platform-browser-dynamic": "21.1.4",
"@angular/platform-server": "21.1.4",
"@angular/router": "21.1.4",
"@angular/platform-browser": "21.1.5",
"@angular/platform-browser-dynamic": "21.1.5",
"@angular/platform-server": "21.1.5",
"@angular/router": "21.1.5",
"@fortawesome/angular-fontawesome": "4.0.0",
"@fortawesome/fontawesome-svg-core": "7.2.0",
"@fortawesome/free-solid-svg-icons": "7.2.0",
Expand All @@ -49,15 +49,15 @@
"devDependencies": {
"@angular-devkit/build-angular": "21.1.4",
"@angular/cli": "21.1.4",
"@angular/compiler-cli": "21.1.4",
"@angular/language-service": "21.1.4",
"@angular/compiler-cli": "21.1.5",
"@angular/language-service": "21.1.5",
"@shopify/eslint-plugin": "50.0.0",
"@types/jasmine": "6.0.0",
"@types/jasminewd2": "2.0.13",
"@types/node": "25.2.3",
"@types/node": "25.3.0",
"@typescript-eslint/eslint-plugin": "8.56.0",
"@typescript-eslint/parser": "8.56.0",
"eslint": "9.39.2",
"eslint": "9.39.3",
"eslint-config-prettier": "10.1.8",
"eslint-plugin-prettier": "5.5.5",
"jasmine-core": "6.0.1",
Expand Down
6 changes: 3 additions & 3 deletions src/REG.Angular/Controllers/EncounterController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ public async Task<EncounterModel> Generate([FromBody] EncounterOption option)
}

[HttpGet("monstertypes")]
public async Task<ICollection<KeyValuePair<string, int>>> GetMonsterTypes()
public async Task<KeyValuePair<string, int>[]> GetMonsterTypes()
{
return await _encounterService.GetEnumListAsync<MonsterType>();
}

[HttpGet("difficulties")]
public async Task<ICollection<KeyValuePair<string, int>>> GetDifficulties()
public async Task<KeyValuePair<string, int>[]> GetDifficulties()
{
return await _encounterService.GetEnumListAsync<Difficulty>();
}

[HttpGet("sizes")]
public async Task<ICollection<KeyValuePair<string, int>>> GetSizes()
public async Task<KeyValuePair<string, int>[]> GetSizes()
{
return await _encounterService.GetEnumListAsync<Size>();
}
Expand Down
4 changes: 2 additions & 2 deletions src/REG.Core/Abstractions/Services/IEncounterService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ namespace REG.Core.Abstractions.Services;
public interface IEncounterService
{
Task<EncounterModel> GenerateAsync(EncounterOption option);
Task<ICollection<KeyValuePair<string, int>>> GetEnumListAsync<T>() where T : struct;
ICollection<T> DeserializeJson<T>(string? jsonFilePath = null);
Task<KeyValuePair<string, int>[]> GetEnumListAsync<T>() where T : struct;
List<T> DeserializeJson<T>(string? jsonFilePath = null);
}
77 changes: 38 additions & 39 deletions src/REG.Core/Abstractions/Services/Models/EncounterDetail.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,41 @@

namespace REG.Core.Abstractions.Services.Models;

public class EncounterDetail
{
public int Xp { get; set; }
public int Count { get; set; }
public required string Name { get; set; }
public required string Type { get; set; }
public required string Difficulty { get; set; }
public required string ChallengeRating { get; set; }
public required string Size { get; set; }
public required string Alignment { get; set; }
public int Hp { get; set; }
public int Ac { get; set; }
public required string HitDice { get; set; }
public required string Speed { get; set; }
public required string Senses { get; set; }
public required string Languages { get; set; }
public int Strength { get; set; }
public int Dexterity { get; set; }
public int Constitution { get; set; }
public int Intelligence { get; set; }
public int Wisdom { get; set; }
public int Charisma { get; set; }
public int StrengthSave { get; set; }
public int DexteritySave { get; set; }
public int ConstitutionSave { get; set; }
public int IntelligenceSave { get; set; }
public int WisdomSave { get; set; }
public int CharismaSave { get; set; }
public int History { get; set; }
public int Perception { get; set; }
public string? DamageVulnerabilities { get; set; }
public string? DamageResistances { get; set; }
public string? DamageImmunities { get; set; }
public string? ConditionImmunities { get; set; }
public List<SpecialAbility> SpecialAbilities { get; set; } = [];
public List<Action> Actions { get; set; } = [];
public List<LegendaryAction> LegendaryActions { get; set; } = [];
public List<Reaction> Reactions { get; set; } = [];
}
public record EncounterDetail(
int Xp,
int Count,
string Name,
string Type,
string Difficulty,
string ChallengeRating,
string Size,
string Alignment,
int Hp,
int Ac,
string HitDice,
string Speed,
string Senses,
string Languages,
int Strength,
int Dexterity,
int Constitution,
int Intelligence,
int Wisdom,
int Charisma,
int StrengthSave,
int DexteritySave,
int ConstitutionSave,
int IntelligenceSave,
int WisdomSave,
int CharismaSave,
int History,
int Perception,
string? DamageVulnerabilities,
string? DamageResistances,
string? DamageImmunities,
string? ConditionImmunities,
SpecialAbility[] SpecialAbilities,
Action[] Actions,
LegendaryAction[] LegendaryActions,
Reaction[] Reactions
);
10 changes: 5 additions & 5 deletions src/REG.Core/Abstractions/Services/Models/EncounterModel.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace REG.Core.Abstractions.Services.Models;

public class EncounterModel
{
public int SumXp { get; set; }
public List<EncounterDetail> Encounters { get; set; } = [];
}
public record EncounterModel
(
EncounterDetail[] Encounters,
int SumXp
);
17 changes: 8 additions & 9 deletions src/REG.Core/Abstractions/Services/Models/EncounterOption.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@

namespace REG.Core.Abstractions.Services.Models;

public class EncounterOption
{
public int PartyLevel { get; set; }
public int PartySize { get; set; }
public Difficulty? Difficulty { get; set; }
public IEnumerable<MonsterType> MonsterTypes { get; set; } = [];
public IEnumerable<Size> Sizes { get; set; } = [];
public int Count { get; set; } = 10;
}
public record EncounterOption(
int PartyLevel,
int PartySize,
Difficulty? Difficulty,
MonsterType[] MonsterTypes,
Size[] Sizes,
int Count = 10
);
22 changes: 10 additions & 12 deletions src/REG.Core/Abstractions/Services/Models/Json/Action.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@

namespace REG.Core.Abstractions.Services.Models.Json;

public class Action
{
[JsonPropertyName("name")] public required string Name { get; set; }

[JsonPropertyName("desc")] public string? Desc { get; set; }

[JsonPropertyName("attack_bonus")] public int? AttackBonus { get; set; }

[JsonPropertyName("damage_dice")] public string? DamageDice { get; set; }

[JsonPropertyName("damage_bonus")] public int? DamageBonus { get; set; }
}
public record Action(
[property: JsonPropertyName("name")] string Name,
[property: JsonPropertyName("desc")] string? Desc,
[property: JsonPropertyName("attack_bonus")]
int? AttackBonus,
[property: JsonPropertyName("damage_dice")]
string? DamageDice,
[property: JsonPropertyName("damage_bonus")]
int? DamageBonus
);
16 changes: 6 additions & 10 deletions src/REG.Core/Abstractions/Services/Models/Json/LegendaryAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@

namespace REG.Core.Abstractions.Services.Models.Json;

public class LegendaryAction
{
[JsonPropertyName("name")] public required string Name { get; set; }

[JsonPropertyName("desc")] public string? Desc { get; set; }

[JsonPropertyName("attack_bonus")] public int? AttackBonus { get; set; }

[JsonPropertyName("damage_dice")] public string? DamageDice { get; set; }
}
public record LegendaryAction(
[property: JsonPropertyName("name")] string Name,
[property: JsonPropertyName("desc")] string? Desc,
[property: JsonPropertyName("attack_bonus")] int? AttackBonus,
[property: JsonPropertyName("damage_dice")] string? DamageDice
);
Loading