Pango update

Code update as recommended by Pango.

Author: Daneel53

Assets/Scripts/API/Save/CharacterRecord.cs

@@ -18,7 +18,6 @@
 using DaggerfallWorkshop.Game.Entity;
 using DaggerfallWorkshop.Game.Formulas;
 using DaggerfallWorkshop;
-using DaggerfallWorkshop.Localization;
 
 namespace DaggerfallConnect.Save
 {
@@ -175,7 +174,6 @@ void ReadCharacterData()
             parsedData.currentStats = ReadStats(reader);
             parsedData.baseStats = ReadStats(reader);
             parsedData.gender = ReadGender(reader);
-            GrammarManager.grammarProcessor.SetHeroGender(parsedData.gender);
             parsedData.transportationFlags = ReadTransportationFlags(reader);
             parsedData.minMetalToHit = reader.ReadByte();
             parsedData.race = ReadRace(reader);

Assets/Scripts/Game/Questing/Person.cs

@@ -230,7 +230,7 @@ public override void SetResource(string line)
                     if (careerAllianceGroup.Success)
                         careerAllianceName = careerAllianceGroup.Value;
 
-                    // Gender
+                    // GenderNums
                     Group genderGroup = option.Groups["gender"];
                     if (genderGroup.Success)
                         genderName = genderGroup.Value;
@@ -294,10 +294,8 @@ public override bool ExpandMacro(MacroTypes macro, out string textOut)
             // This will be used for subsequent pronoun macros, etc.
             ParentQuest.LastResourceReferenced = this;
 
-            // Send the person's genre to grammar processor
-            if (ParentQuest.LastResourceReferenced == null)
-                GrammarManager.grammarProcessor.SetNPCGender(Genders.Male);
-            else GrammarManager.grammarProcessor.SetNPCGender(ParentQuest.LastResourceReferenced.Gender);
+            // Send the person's gender to the grammar processor
+            GrammarManager.grammarProcessor.SetNPCGenderGetter(() => ParentQuest.LastResourceReferenced?.Gender ?? Genders.Male);
 
             Place dialogPlace = GetDialogPlace();
             if (dialogPlace != null)

Assets/Scripts/Game/Serialization/SerializablePlayer.cs

@@ -18,7 +18,6 @@
 using System.Linq;
 using DaggerfallWorkshop.Game.Items;
 using DaggerfallConnect.Arena2;
-using DaggerfallWorkshop.Localization;
 
 namespace DaggerfallWorkshop.Game.Serialization
 {
@@ -275,7 +274,6 @@ public void RestoreSaveData(object dataIn)
             PlayerEntity entity = playerEntityBehaviour.Entity as PlayerEntity;
 
             entity.Gender = data.playerEntity.gender;
-            GrammarManager.grammarProcessor.SetHeroGender(entity.Gender);
             entity.BirthRaceTemplate = data.playerEntity.raceTemplate;
             entity.FaceIndex = data.playerEntity.faceIndex;
             entity.Reflexes = data.playerEntity.reflexes;

Assets/Scripts/Game/TextManager.cs

@@ -357,11 +357,9 @@ private string GetDefaultCollectionName(TextCollections collection)
         public string GetLocalizedText(string key, TextCollections collection = TextCollections.Internal, bool exception = false)
         {
             string localizedText;
-            string processedLocalizedText;
             if (TryGetLocalizedText(GetRuntimeCollectionName(collection), key, out localizedText))
             {
-                processedLocalizedText = GrammarManager.grammarProcessor.ProcessGrammar(localizedText);
-                return processedLocalizedText;
+                return GrammarManager.grammarProcessor.ProcessGrammar(localizedText);
             }
             else if (TryGetLocalizedText(GetDefaultCollectionName(collection), key, out localizedText))
                 return localizedText;

Assets/Scripts/Game/UserInterfaceWindows/CreateCharGenderSelect.cs

@@ -60,14 +60,14 @@ protected override void Setup()
         void MaleButton_OnMouseClick(BaseScreenComponent sender, Vector2 position)
         {
             SelectedGender = Genders.Male;
-            GrammarManager.grammarProcessor.SetHeroGender(SelectedGender);
+            GrammarManager.grammarProcessor.SetHeroGenderGetter(() => Genders.Male);
             CloseWindow();
         }
 
         void FemaleButton_OnMouseClick(BaseScreenComponent sender, Vector2 position)
         {
             SelectedGender = Genders.Female;
-            GrammarManager.grammarProcessor.SetHeroGender(SelectedGender);
+            GrammarManager.grammarProcessor.SetHeroGenderGetter(() => Genders.Female);
             CloseWindow();
         }
 

Assets/Scripts/Game/UserInterfaceWindows/DaggerfallTalkWindow.cs

@@ -1265,7 +1265,7 @@ protected virtual void SetQuestionAnswerPairInConversationListbox(string questio
                 textLabelQuestion.textLabel.MaxWidth = (int)(textLabelQuestion.textLabel.MaxWidth * textBlockSizeModernConversationStyle);
                 textLabelQuestion.textLabel.BackgroundColor = textcolorQuestionBackgroundModernConversationStyle;
             }
-           listboxConversation.AddItem(GrammarManager.grammarProcessor.ProcessGrammar(answer), out textLabelAnswer);
+            listboxConversation.AddItem(GrammarManager.grammarProcessor.ProcessGrammar(answer), out textLabelAnswer);
             textLabelAnswer.selectedTextColor = textcolorHighlighted;            
             textLabelAnswer.textLabel.HorizontalAlignment = HorizontalAlignment.Left;
             textLabelAnswer.textLabel.HorizontalTextAlignment = TextLabel.HorizontalTextAlignmentSetting.Left;

Assets/Scripts/Game/Utility/StartGameBehaviour.cs

@@ -25,6 +25,7 @@
 using DaggerfallWorkshop.Game.Questing;
 using DaggerfallWorkshop.Game.MagicAndEffects;
 using DaggerfallWorkshop.Game.MagicAndEffects.MagicEffects;
+using DaggerfallWorkshop.Localization;
 
 namespace DaggerfallWorkshop.Game.Utility
 {
@@ -142,6 +143,9 @@ void InvokeStartMethod()
             // This mainly just prevents all SongPlayers from starting at once
             GameManager.Instance.PlayerEnterExit.DisableAllParents();
 
+            // Provide hero's gender to the grammar processor
+            GrammarManager.grammarProcessor.SetHeroGenderGetter(() => GameManager.Instance.PlayerEntity.Gender);
+
             switch (StartMethod)
             {
                 case StartMethods.Void:

Assets/Scripts/Localization/DefaultGrammarRules.cs

@@ -7,6 +7,7 @@
 // 
 
 using DaggerfallWorkshop.Game.Entity;
+using System;
 
 namespace DaggerfallWorkshop.Localization.LanguageRules
 {
@@ -17,20 +18,18 @@ public override string ProcessGrammar(string text)
 			// Process the grammar tokens
 			return text;
 		}
-
-		public override void SetHeroGender(Genders Gender)
-		{
-			// Locally store the genre of the hero so that it can be used
+        public override void SetHeroGenderGetter(Func<Genders> HeroGenderGetter)
+        {
+			// Provide access to the genre of the hero so that it can be used
             // by the grammar tokens
 
 		}
-
-		public override void SetNPCGender(Genders Gender)
-		{
-			// Locally store the genre of a NPC so that it can be used
+		public override void SetNPCGenderGetter(Func<Genders> NPCGenderGetter)
+        {
+            // Provide access to the genre of a NPC so that it can be used
             // by the grammar tokens
 
-		}
-	}
+        }
+    }
 }
 

Assets/Scripts/Localization/Grammar.cs

@@ -8,19 +8,20 @@
 
 using DaggerfallWorkshop.Game.Entity;
 using DaggerfallWorkshop.Localization.LanguageRules;
+using System;
 
 namespace DaggerfallWorkshop.Localization
 {
     public abstract class GrammarRules
     {
         public abstract string ProcessGrammar(string text);
-        public abstract void SetHeroGender(Genders Gender);
-        public abstract void SetNPCGender(Genders Gender);
+        public abstract void SetHeroGenderGetter(Func<Genders> HeroGenderGetter);
+        public abstract void SetNPCGenderGetter(Func<Genders> NPCGenderGetter);
     }
 
     public static class GrammarManager
     {
-        public static GrammarRules grammarProcessor = (GrammarRules) new DefaultGrammarRules();
+        public static GrammarRules grammarProcessor = new DefaultGrammarRules();
     }
 }