Skip to content

Commit

Permalink
Use ArtifactVisualsMapper in ImportArtifact
Browse files Browse the repository at this point in the history
  • Loading branch information
IhateTrains committed Jan 24, 2025
1 parent 0a49785 commit eee2bcd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
7 changes: 6 additions & 1 deletion ImperatorToCK3/CK3/Characters/CharacterCollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,8 @@ Date date
// mesh: ep1_western_pouch_basic_01_a_mesh
}

var visualsMapper = new ArtifactVisualsMapper("configurables/artifact_visuals_map.txt");

var charactersFromImperator = this.Where(c => c.FromImperator).ToList();
foreach (var character in charactersFromImperator) {
if (!ck3CharacterIdToTreasureIdsListDict.TryGetValue(character.Id, out var irArtifactIds)) {
Expand Down Expand Up @@ -780,6 +782,9 @@ Date date

private void ImportArtifact(Character character, Treasure irArtifact, ModifierMapper modifierMapper, ModifierCollection ck3Modifiers, ArtifactVisualsMapper visualsMapper, LocDB irLocDB, CK3LocDB ck3LocDB, Date date) {
var ck3Visual = visualsMapper.GetVisual(irArtifact.Key, irArtifact.IconName);
if (ck3Visual is null) {
Logger.Warn($"Can't find visual for artifact key {irArtifact.Key} and icon {irArtifact.IconName}!");
}

var ck3ArtifactName = $"IRToCK3_artifact_{irArtifact.Key}_{irArtifact.Id}";
var irNameLoc = irLocDB.GetLocBlockForKey(irArtifact.Key);
Expand Down Expand Up @@ -828,7 +833,7 @@ private void ImportArtifact(Character character, Treasure irArtifact, ModifierMa
description = {{ ck3DescKey }}
type = sculpture {{ TODO }}

Check failure on line 834 in ImperatorToCK3/CK3/Characters/CharacterCollection.cs

View workflow job for this annotation

GitHub Actions / Upload development build (linux-x64)

The name 'TODO' does not exist in the current context
# template = babr_template # TODO: check if needed
visuals = sculpture_babr_e_bayan {{ TODO }}
visuals = {{ ck3Visual }}
wealth = scope:wealth
quality = scope:quality
history = {
Expand Down
6 changes: 3 additions & 3 deletions ImperatorToCK3/Imperator/Religions/Treasure.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ public sealed class Treasure : IIdentifiable<ulong> {
public ulong Id { get; }
public string Key { get; private set; }
public string IconName { get; private set; }
private Dictionary<string, double> stateModifiers = new();

private readonly Dictionary<string, double> stateModifiers = [];
public IReadOnlyDictionary<string, double> StateModifiers => stateModifiers;
private Dictionary<string, double> characterModifiers = new();
private readonly Dictionary<string, double> characterModifiers = [];
public IReadOnlyDictionary<string, double> CharacterModifiers => characterModifiers;

public Treasure(ulong id, BufferedReader treasureReader) {
Expand Down

0 comments on commit eee2bcd

Please sign in to comment.