a lot more detail whom worships whom, deities, forces, creatures

Author: Kromtec

LegendsViewer.Backend/Extensions/HistoricalFigureExtensions.cs

@@ -1,5 +1,6 @@
 using LegendsViewer.Backend.Legends.Cytoscape;
 using LegendsViewer.Backend.Legends.Enums;
+using LegendsViewer.Backend.Legends.WorldLinks;
 using LegendsViewer.Backend.Legends.WorldObjects;
 using LegendsViewer.Backend.Utilities;
 using System.Net;
@@ -198,4 +199,33 @@ private static CytoscapeNodeElement CreateFamilyTreeNodeData(HistoricalFigure or
             Classes = classes
         };
     }
+
+    public static void AddWorshipper(this HistoricalFigure? worshipped, HistoricalFigure? worshipper, int strength)
+    {
+        if (worshipped == null || worshipper == null)
+        {
+            return;
+        }
+        worshipped.WorshippingFigures ??= [];
+        var entry = (worshipper, strength);
+        if (worshipped.WorshippingFigures.Contains(entry))
+        {
+            return;
+        }
+        worshipped.WorshippingFigures.Add(entry);
+    }
+
+    public static void AddWorshipper(this HistoricalFigure? worshipped, Entity? worshipper)
+    {
+        if (worshipped == null || worshipper == null)
+        {
+            return;
+        }
+        worshipped.WorshippingEntities ??= [];
+        if (worshipped.WorshippingEntities.Contains(worshipper))
+        {
+            return;
+        }
+        worshipped.WorshippingEntities.Add(worshipper);
+    }
 }

LegendsViewer.Backend/Legends/World.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.Text;
+using LegendsViewer.Backend.Extensions;
 using LegendsViewer.Backend.Legends.Enums;
 using LegendsViewer.Backend.Legends.EventCollections;
 using LegendsViewer.Backend.Legends.Events;
@@ -432,6 +433,10 @@ public void ProcessHFtoHfLinks()
                 HistoricalFigure hf = _hFtoHfLinkHFs[i];
                 HistoricalFigureLink relation = new(link.SubProperties, this);
                 hf.RelatedHistoricalFigures.Add(relation);
+                if (relation.Type == HistoricalFigureLinkType.Deity)
+                {
+                    relation.HistoricalFigure.AddWorshipper(hf, relation.Strength);
+                }
             }
         }
 

LegendsViewer.Backend/Legends/WorldObjects/Entity.cs

@@ -40,6 +40,28 @@ public List<ListItemDto> WorshippedLinks
                     Subtitle = associatedSpheres
                 });
             }
+            if (Worshipped.Count == 0 && EntityEntityLinks.Count > 0)
+            {
+                foreach (EntityEntityLink link in EntityEntityLinks)
+                {
+                    var deity = link.Target?.Worshipped?.FirstOrDefault();
+                    if (deity == null)
+                    {
+                        continue;
+                    }
+                    string associatedSpheres = string.Join(", ", deity.Spheres);
+                    var newItem = new ListItemDto
+                    {
+                        Title = $"{deity.ToLink(true, this)}",
+                        Subtitle = associatedSpheres
+                    };
+                    if (list.Exists(existingItem => existingItem.Title == newItem.Title))
+                    {
+                        continue;
+                    }
+                    list.Add(newItem);
+                }
+            }
             return list;
         }
     }
@@ -375,7 +397,7 @@ public CytoscapeData? WarGraphData
                             Href = $"/war/{item.Id}",
                             BackgroundColor = item.Attacker.LineColor.ToRgbaString(0.6f),
                             ForegroundColor = Formatting.GetReadableForegroundColor(item.Attacker.LineColor),
-                            Width = edgeWidth > 15 ? 15 : edgeWidth == 0 ? 1: edgeWidth,
+                            Width = edgeWidth > 15 ? 15 : edgeWidth == 0 ? 1 : edgeWidth,
                             Label = $"{item.DeathCount} ✝",
                             Tooltip = $"{item.ToLink(true, item)}<br/>{item.Subtype}"
                         }));
@@ -554,6 +576,7 @@ public Entity(List<Property> properties, World world)
                     if (worshippedDeity != null)
                     {
                         Worshipped.Add(worshippedDeity);
+                        worshippedDeity.AddWorshipper(this);
                     }
                     break;
                 //case "claims":

LegendsViewer.Backend/Legends/WorldObjects/HistoricalFigure.cs

@@ -16,6 +16,8 @@ namespace LegendsViewer.Backend.Legends.WorldObjects;
 
 public class HistoricalFigure : WorldObject
 {
+    private const int MaxListItemCount = 100;
+
     private static readonly List<string> KnownEntitySubProperties = ["entity_id", "link_strength", "link_type", "position_profile_id", "start_year", "end_year"];
     private static readonly List<string> KnownSiteLinkSubProperties = ["link_type", "site_id", "sub_id", "entity_id", "occupation_id"];
     private static readonly List<string> KnownEntitySquadLinkProperties = ["squad_id", "squad_position", "entity_id", "start_year", "end_year"];
@@ -140,19 +142,72 @@ public List<ListItemDto> WorshippedDeities
                 {
                     continue;
                 }
-
-                string raceString = link.HistoricalFigure.GetRaceString();
-                string typeString = Formatting.InitCaps(raceString ?? link.Type.GetDescription());
+                string associatedSpheres = string.Join(", ", link.HistoricalFigure.Spheres);
                 list.Add(new ListItemDto
                 {
-                    Title = $"{typeString} for {string.Join(", ", link.HistoricalFigure.Spheres)}",
-                    Subtitle = $"{link.HistoricalFigure?.ToLink(true, this)}",
+                    Title = link.HistoricalFigure.ToLink(true, this),
+                    Subtitle = associatedSpheres,
                     Append = HtmlStyleUtil.GetChipString(link.Strength.ToString())
                 });
             }
             return list;
         }
     }
+
+    [JsonIgnore]
+    public List<(HistoricalFigure Worshipper, int Strength)>? WorshippingFigures { get; set; }
+    public List<ListItemDto> WorshippingFiguresList
+    {
+        get
+        {
+            var list = new List<ListItemDto>();
+            if (WorshippingFigures != null)
+            {
+                foreach (var (worshipper, strength) in WorshippingFigures.OrderByDescending(w => w.Strength).Take(MaxListItemCount))
+                {
+                    list.Add(new ListItemDto
+                    {
+                        Title = worshipper?.ToLink(true, this),
+                        Subtitle = worshipper?.GetLastAssignmentString(),
+                        Append = HtmlStyleUtil.GetChipString(strength.ToString())
+                    });
+                }
+                if (WorshippingFigures.Count > MaxListItemCount)
+                {
+                    list.Add(new ListItemDto
+                    {
+                        Subtitle = $"... and {WorshippingFigures.Count - MaxListItemCount} more!",
+                    });
+                }
+            }
+
+            return list;
+        }
+    }
+
+    [JsonIgnore]
+    public List<Entity>? WorshippingEntities { get; set; }
+    public List<ListItemDto> WorshippingEntitiesList
+    {
+        get
+        {
+            var list = new List<ListItemDto>();
+            if (WorshippingEntities != null)
+            {
+                foreach (var worshipper in WorshippingEntities)
+                {
+                    list.Add(new ListItemDto
+                    {
+                        Title = worshipper?.ToLink(true, this),
+                        Subtitle = worshipper?.EntityType.GetDescription()
+                    });
+                }
+            }
+
+            return list;
+        }
+    }
+
     public List<SiteProperty> SiteProperties { get; set; } = [];
     public List<EntityReputation> Reputations { get; set; } = [];
     public List<RelationshipProfileHf> RelationshipProfiles { get; set; } = [];
@@ -343,12 +398,12 @@ public List<ListItemDto> MiscList
                     Subtitle = string.Join(", ", RelatedRegions.ConvertAll(region => region.ToLink()))
                 });
             }
-            if (WorshippedBy != null)
+            if (WorshippingFigures != null)
             {
                 list.Add(new ListItemDto
                 {
                     Title = "Worshipped By",
-                    Subtitle = WorshippedBy.ToLink(true, this)
+                    Subtitle = $"{WorshippingFigures.Count} historical figures"
                 });
             }
             if (LineageCurseParent != null)
@@ -918,7 +973,7 @@ public string GetLastAssignmentString()
         {
             return lastAssignmentString;
         }
-        if(_jobs == null)
+        if (_jobs == null)
         {
             _jobs = [];
             foreach (var relevantEvent in Events.OfType<ChangeHfJob>())

LegendsViewer.Frontend/legends-viewer-frontend/src/generated/api-schema.d.ts

@@ -13448,6 +13448,8 @@ export interface components {
             creatureTypes?: components["schemas"]["CreatureType"][] | null;
             readonly relatedHistoricalFigureList?: components["schemas"]["ListItemDto"][] | null;
             readonly worshippedDeities?: components["schemas"]["ListItemDto"][] | null;
+            readonly worshippingFiguresList?: components["schemas"]["ListItemDto"][] | null;
+            readonly worshippingEntitiesList?: components["schemas"]["ListItemDto"][] | null;
             siteProperties?: components["schemas"]["SiteProperty"][] | null;
             reputations?: components["schemas"]["EntityReputation"][] | null;
             relationshipProfiles?: components["schemas"]["RelationshipProfileHf"][] | null;

LegendsViewer.Frontend/legends-viewer-frontend/src/views/Entity.vue

@@ -17,11 +17,11 @@ const beforeLists: ComputedRef<LegendLinkListData[]> = computed(() => [
     { title: 'Related Factions and Groups', items: store.object?.entityEntityLinkList ?? [], icon: "mdi-account-group", subtitle: "The organizations and groups connected to this entity" },
     { title: 'Current Sites', items: store.object?.currentSiteList ?? [], icon: "mdi-home-outline", subtitle: "The sites held by this entity, from settlements to strongholds of power" },
     { title: 'Lost Sites', items: store.object?.lostSiteList ?? [], icon: "mdi-home-off-outline", subtitle: "Former strongholds and settlements once under the control of this entity" },
+    { title: 'Worshipped Deities', items: store.object?.worshippedLinks ?? [], icon: "mdi-weather-sunset", subtitle: "The divine beings revered across the lands" },
 ]);
 
 const afterLists: ComputedRef<LegendLinkListData[]> = computed(() => [
     { title: 'Related Sites', items: store.object?.entitySiteLinkList ?? [], icon: "mdi-home-switch-outline", subtitle: "The locations tied to this entity, from settlements to strongholds of power" },
-    { title: 'Worshipped Deities', items: store.object?.worshippedLinks ?? [], icon: "mdi-weather-sunset", subtitle: "The divine beings revered across the lands" },
 ]);
 
 </script>

LegendsViewer.Frontend/legends-viewer-frontend/src/views/HistoricalFigure.vue

@@ -56,6 +56,8 @@ const beforeLists: ComputedRef<LegendLinkListData[]> = computed(() => [
     { title: 'Worshipped Deities', items: store.object?.worshippedDeities ?? [], icon: "mdi-hand-heart-outline", subtitle: "The divine beings revered by the historical figure, shaping their beliefs and actions" },
     { title: 'Journey Pets', items: store.object?.journeyPets ?? [], icon: "mdi-paw", subtitle: "Trusted animal companions that accompanied this figure on their travels" },
     { title: 'Noble Positions', items: store.object?.positionList ?? [], icon: "mdi-seal", subtitle: "The ruling elite, guiding the fate of realms and people" },
+    { title: 'Worshipping Figures', items: store.object?.worshippingFiguresList ?? [], icon: "mdi-meditation", subtitle: "Historical figures who revere this creature, deity or force of nature" },
+    { title: 'Worshipping Entities', items: store.object?.worshippingEntitiesList ?? [], icon: "mdi-crowd", subtitle: "Groups or organizations that hold this deity in reverence" },
 ]);
 
 const afterLists: ComputedRef<LegendLinkListData[]> = computed(() => [