Use language gender instead of creature's gender definition for all grammar forms

Author: miki151

creature.cpp

@@ -1289,7 +1289,7 @@ void Creature::onKilledOrCaptured(Creature* victim) {
     if (victim->getStatus().contains(CreatureStatus::LEADER) && getBody().hasBrain(getGame()->getContentFactory())) {
       auto victimName = victim->getName();
       victimName.setKillTitle(none);
-      TString title = setSubjectGender(TSentence("KILL_TITLE", victimName.name), getAttributes().getGender());
+      TString title = setSubjectGender(TSentence("KILL_TITLE", victimName.name), getName().name);
       if (!killTitles.contains(title)) {
         attributes->getName().setKillTitle(title);
         killTitles.push_back(title);

creature_attributes.cpp

@@ -212,7 +212,7 @@ optional<SoundId> CreatureAttributes::getAttackSound(AttackType type, bool damag
 }
 
 TString CreatureAttributes::getDescription(const ContentFactory* factory) const {
-  return setSubjectGender(body->getDescription(factory), gender);
+  return setSubjectGender(body->getDescription(factory), name.name);
 }
 
 void CreatureAttributes::add(BodyPart p, int count, const ContentFactory* factory) {

data_free/game_config/translations/english.txt

@@ -4050,6 +4050,7 @@ ENEMY_AGGRESSION_EXTREME "extreme"
 EXP_INCREASE_MILD "mild"
 EXP_INCREASE_NORMAL "normal"
 EXP_INCREASE_EXTREME "extreme"
+SUBJECT_GENDER "{1}"
 NEW_LINE "{1}
 {2}"
 TEXT128 "Page not found. Please contact mod author."

data_free/game_config/translations/polish.txt

@@ -9936,6 +9936,7 @@ ENEMY_AGGRESSION_EXTREME "ekstremalna"
 EXP_INCREASE_MILD "łagodna"
 EXP_INCREASE_NORMAL "normalna"
 EXP_INCREASE_EXTREME "ekstremalna"
+SUBJECT_GENDER "{1:2}"
 NEW_LINE "{1}
 {2}"
 TEXT128 "Nie znaleziono strony. Skontaktuj się z autorem moda."

effect.cpp

@@ -2292,7 +2292,7 @@ static bool apply(const Effects::Audience& a, Position pos, Creature* attacker)
   if (wasTeleported) {
     if (attacker)
       attacker->privateMessage(PlayerMessage(setSubjectGender(TSentence("AUDIENCE_SUMMONED"),
-          attacker->getAttributes().getGender()), MessagePriority::HIGH));
+          attacker->getName().name), MessagePriority::HIGH));
     else
       pos.globalMessage(PlayerMessage(TStringId("AUDIENCE_SUMMONED2"), MessagePriority::HIGH));
     return true;

message_generator.cpp

@@ -133,7 +133,7 @@ static void addSecond(const Creature* c, MsgType type, vector<TString> param) {
     }
   }();
   if (msg)
-    c->message(PlayerMessage(setSubjectGender(*msg, c->getAttributes().getGender()), MessagePriority::HIGH));
+    c->message(PlayerMessage(setSubjectGender(*msg, c->getName().name), MessagePriority::HIGH));
 }
 
 static void addBoulder(const Creature* c, MsgType type, vector<TString> param) {
@@ -219,7 +219,7 @@ void MessageGenerator::addThirdPerson(const Creature* c, PlayerMessage msg) {
 
 void MessageGenerator::addSecondPerson(const Creature* c, PlayerMessage msg) {
   if (type == SECOND_PERSON) {
-    msg.text = setSubjectGender(msg.text, c->getAttributes().getGender());
+    msg.text = setSubjectGender(msg.text, c->getName().name);
     c->message(std::move(msg));
   }
 }

t_string.cpp

@@ -229,10 +229,8 @@ TString makePlural(TString s) {
   return TSentence("MAKE_PLURAL", std::move(s));
 }
 
-TString setSubjectGender(TString s, Gender gender) {
-  if (gender == Gender::FEMALE)
-    s = TSentence("FEMININE_SUBJECT", std::move(s));
-  return s;
+TString setSubjectGender(TString s, TString name) {
+  return TSentence("SUBJECT_GENDER", std::move(s), std::move(name));
 }
 
 TString combineWithAnd(vector<TString> v) {

t_string.h

@@ -83,6 +83,6 @@ TString combineSentences(vector<TString>);
 TString toText(int num);
 TString capitalFirst(TString);
 TString makePlural(TString);
-TString setSubjectGender(TString, Gender);
+TString setSubjectGender(TString sentence, TString subject);
 TString toPercentage(double);
 TString toStringWithSign(int);

translations.cpp

@@ -95,10 +95,6 @@ string Translations::get(const string& language, const TSentence& s, vector<stri
     form.push_back("plural");
     return get(language, s.params[0], std::move(form));
   }
-  if (s.id == TStringId("FEMININE_SUBJECT")) {
-    form.push_back("feminine");
-    return get(language, s.params[0], std::move(form));
-  }
   if (s.id == TStringId("MAKE_SENTENCE"))
     return makeSentence(get(language, s.params[0], std::move(form)));
   if (s.id == TStringId("A_ARTICLE")) {