Release: Version 1.6

FossilOrigin-Name: 87fe3a88b0b6fafd734fe2868e0b599fbcf02369f2a6dde542ba1dca69a2469f

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.6 — 2024-06-10
+Tested to work on game version 207.67
+
+* Fix off-by-one error in pronoun selection
+
 ## v1.5 — 2023-08-15
 Tested to work on game versions 204.100 / 205.54 (beta)
 

README.md

@@ -4,9 +4,9 @@ A mod that works in conjunction with the [Gender and Pronoun Sets](https://steam
 
 Specifically, this mod allows you to pick from all personal genders and pronouns defined in game (including pseudo-plural ones), with a number of additions.
 
-Additionally, all gender and pronoun prompts have been redesigned with inspirations from kernelmethod's [Better Pet Selector](https://steamcommunity.com/sharedfiles/filedetails/?id=3006503292) mod.
+Additionally, all gender and pronoun prompts have been redesigned with inspiration from kernelmethod's [Better Pet Selector](https://steamcommunity.com/sharedfiles/filedetails/?id=3006503292).
 
-Tested to work on game versions 204.100 / 205.54 (beta).
+Tested to work on game version 207.67.
 
 [Source Code (GitHub)](https://github.com/librarianmage/QudGendersUnleashed) \| [Workshop Page](https://steamcommunity.com/sharedfiles/filedetails/?id=2815078000) \| [My Caves of Qud Mods (Steam Workshop)](https://steamcommunity.com/profiles/76561198836298826/myworkshopfiles/?appid=333640)
 

Scripts/Formatting.cs

@@ -0,0 +1,56 @@
+using System.Linq;
+using ConsoleLib.Console;
+using XRL.World;
+
+namespace QudGendersUnleashed
+{
+    public static class Formatting
+    {
+        public static readonly string FromGenderText = Markup.Color("W", "<from gender>");
+        public static readonly string CreateNewText = Markup.Color("W", "<create new>");
+
+        public static string FormatGender(Gender G)
+        {
+            var name = Markup.Color("M", G.Name);
+            var summary = Markup.Color("c", G.GetBasicSummary());
+
+            return $"{name}\n{summary}";
+        }
+
+        public static string FormatPronounSet(PronounSet P)
+        {
+            var name = Markup.Color("M", P.GetShortName());
+            var summary = Markup.Color("c", P.GetBasicSummary());
+
+            if (P.FromGender)
+            {
+                var suspects = Gender
+                    .Find(G => !G.DoNotReplicateAsPronounSet)
+                    .Where(G => new PronounSet(G).Name == P.Name)
+                    .Select(G => Markup.Color("m", G.Name));
+
+                var from = suspects.Any() ? string.Join(" / ", suspects) : "unknown";
+                var extra = Markup.Color("m", $"(from {from})");
+
+                return $"{name} {extra}\n{summary}";
+            }
+
+            return $"{name}\n{summary}";
+        }
+
+        public static string FormatFromGenderPronounOption(Gender G)
+        {
+            var g1 = G ?? Gender.Get("nonspecific");
+            if (g1 is null)
+            {
+                return FromGenderText;
+            }
+
+            var name = Markup.Color("m", g1.Name);
+            var extra = Markup.Color("m", $"({name})");
+            var summary = Markup.Color("c", g1.GetBasicSummary());
+
+            return $"{FromGenderText} {extra}\n{summary}";
+        }
+    }
+}