diff --git a/LegendsViewer/Controls/HTML/SiteConqueredPrinter.cs b/LegendsViewer/Controls/HTML/SiteConqueredPrinter.cs index 9c6d47d..d777c37 100644 --- a/LegendsViewer/Controls/HTML/SiteConqueredPrinter.cs +++ b/LegendsViewer/Controls/HTML/SiteConqueredPrinter.cs @@ -36,7 +36,9 @@ public override string Print() + "img {border:none;}" + ""); - HTML.AppendLine(Conquering.GetYearTime() + "The " + Conquering.GetOrdinal(Conquering.Ordinal) + Conquering.ConquerType + " of " + Conquering.Site.ToLink() + " ocurred as a result of " + Conquering.Battle.ToLink() + " in " + Conquering.ParentCollection.ToLink() + " waged by " + (Conquering.ParentCollection as War).Attacker.PrintEntity() + " on " + (Conquering.ParentCollection as War).Defender.PrintEntity() + ".

"); + HTML.AppendLine(Conquering.GetYearTime() + "The " + Conquering.GetOrdinal(Conquering.Ordinal) + Conquering.ConquerType + " of " + Conquering.Site.ToLink() + " ocurred as a result of " + Conquering.Battle.ToLink() + + (Conquering.ParentCollection == null ? "" : " in " + Conquering.ParentCollection.ToLink() + " waged by " + (Conquering.ParentCollection as War).Attacker.PrintEntity() + " on " + (Conquering.ParentCollection as War).Defender.PrintEntity() ) + + ".

"); List maps = MapPanel.CreateBitmaps(World, Conquering); HTML.AppendLine(""); diff --git a/LegendsViewer/Controls/HTML/SitePrinter.cs b/LegendsViewer/Controls/HTML/SitePrinter.cs index 660ba77..9768696 100644 --- a/LegendsViewer/Controls/HTML/SitePrinter.cs +++ b/LegendsViewer/Controls/HTML/SitePrinter.cs @@ -53,7 +53,7 @@ public override string Print() warfareString = warfareString.Insert(warfareString.IndexOf(" as a result of"), "
"); HTML.AppendLine(""); HTML.AppendLine(""); - HTML.AppendLine(""); + HTML.AppendLine(""); HTML.AppendLine("
" + warfareString + "as part of" + warfare.ParentCollection.ToLink() + "" + ((warfare.ParentCollection == null) ? "UNKNOWN" :warfare.ParentCollection.ToLink()) + "by "); if (warfare.GetType() == typeof(Battle)) { diff --git a/LegendsViewer/Legends/Events.cs b/LegendsViewer/Legends/Events.cs index fe66dc9..49ade5f 100644 --- a/LegendsViewer/Legends/Events.cs +++ b/LegendsViewer/Legends/Events.cs @@ -59,7 +59,12 @@ public virtual string GetYearTime() else if (season < 302400) yearTime += "autumn, "; else if (season < 403200) yearTime += "winter, "; - return yearTime; + int monthIndex = this.Seconds72 / (28 * 1200); + string[] monthNames = { "Granite", "Slate", "Felsite", "Hematite", "Malachite", "Galena", "Limestone", "Sandstone", "Timber", "Moonstone", "Opal", "Obsidian" }; + string monthName = monthNames[monthIndex]; + int dayIndex = 1 + (this.Seconds72 % (28 * 1200)) / 1200; + + return yearTime + " (" + monthName + ", " + dayIndex.ToString() + ") "; } public string PrintParentCollection(bool link = true, DwarfObject pov = null) { @@ -2531,7 +2536,12 @@ public override string Print(bool link = true, DwarfObject pov = null) { string eventString = this.GetYearTime() + Attacker.ToLink(link, pov) + " defeated "; if (SiteEntity != null && SiteEntity != Defender) eventString += SiteEntity.ToLink(link, pov) + " of "; - eventString += Defender.ToLink(link, pov) + " and took over " + Site.ToLink(link, pov) + + if (Defender == null) { + eventString += "UNKNOWN"; + } else { + eventString += Defender.ToLink(link, pov); + } + eventString += " and took over " + Site.ToLink(link, pov) + ". The new government was called " + NewSiteEntity.ToLink(link, pov) + ". "; eventString += PrintParentCollection(link, pov); return eventString;