IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-06 21:25:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve code for handling user pronouns,. (remove copy paste hell)

Browse source
This commit is contained in:
Li 2022-05-07 13:24:09 +12:00
parent 55c0f29914
commit 3c2b14ecec
4 changed files with 28 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
HorseIsleServer/LibHISP/Game/Messages.cs
View file

@ -495,8 +495,10 @@ namespace HISP.Game
public static string PronounFemaleShe; public static string PronounFemaleShe;
public static string PronounFemaleHer; public static string PronounFemaleHer;
public static string PronounYouYour; public static string PronounNeutralYour;
public static string PronounNeutralThey;
public static string PronounNeutralTheir;
// Stats Page // Stats Page
public static string StatsBarFormat; public static string StatsBarFormat;
public static string StatsAreaFormat; public static string StatsAreaFormat;

55
HorseIsleServer/LibHISP/Game/Meta.cs
View file

@ -253,23 +253,10 @@ namespace HISP.Game
private static string buildWornJewelery(User user, bool other) private static string buildWornJewelery(User user, bool other)
{ {
string message = ""; string message = "";
// Insert LGBT Patch here
string pronoun = ""; string pronoun = "";
if (other) if (other)
{ pronoun = user.GetPronouns(false);
if (user.Gender == "FEMALE")
{
pronoun = Messages.PronounFemaleShe;
}
if (user.Gender == "MALE")
{
pronoun = Messages.PronounMaleHe;
}
}
if (!other) if (!other)
message += Messages.JewelrySelected; message += Messages.JewelrySelected;
@ -364,22 +351,12 @@ namespace HISP.Game
if (!other) if (!other)
message = Messages.CompetitionGearSelected; message = Messages.CompetitionGearSelected;
// Insert LGBT Patch Here string pronoun = Messages.PronounNeutralYour;
string possessivePronoun = Messages.PronounNeutralYour;
string pronoun = Messages.PronounYouYour;
string pronoun2 = Messages.PronounYouYour;
if (other) if (other)
{ {
if (user.Gender == "FEMALE") pronoun = user.GetPronouns(false);
{ possessivePronoun = user.GetPronouns(true);
pronoun = Messages.PronounFemaleShe;
pronoun2 = Messages.PronounFemaleHer;
}
else if (user.Gender == "MALE")
{
pronoun = Messages.PronounMaleHe;
pronoun2 = Messages.PronounMaleHis;
}
message = Messages.FormatOtherCompetitionGear(pronoun); message = Messages.FormatOtherCompetitionGear(pronoun);
} }
@ -388,22 +365,22 @@ namespace HISP.Game
if (user.EquipedCompetitionGear.Head != null) if (user.EquipedCompetitionGear.Head != null)
{ {
message += Messages.FormatCompetitionGearHead(user.EquipedCompetitionGear.Head.Name, pronoun2, user.EquipedCompetitionGear.Head.IconId, other); message += Messages.FormatCompetitionGearHead(user.EquipedCompetitionGear.Head.Name, possessivePronoun, user.EquipedCompetitionGear.Head.IconId, other);
hasMsg = true; hasMsg = true;
} }
if (user.EquipedCompetitionGear.Body != null) if (user.EquipedCompetitionGear.Body != null)
{ {
message += Messages.FormatCompetitionGearBody(user.EquipedCompetitionGear.Body.Name, pronoun2, user.EquipedCompetitionGear.Body.IconId, other); message += Messages.FormatCompetitionGearBody(user.EquipedCompetitionGear.Body.Name, possessivePronoun, user.EquipedCompetitionGear.Body.IconId, other);
hasMsg = true; hasMsg = true;
} }
if (user.EquipedCompetitionGear.Legs != null) if (user.EquipedCompetitionGear.Legs != null)
{ {
message += Messages.FormatCompetitionGearLegs(user.EquipedCompetitionGear.Legs.Name, pronoun2, user.EquipedCompetitionGear.Legs.IconId, other); message += Messages.FormatCompetitionGearLegs(user.EquipedCompetitionGear.Legs.Name, possessivePronoun, user.EquipedCompetitionGear.Legs.IconId, other);
hasMsg = true; hasMsg = true;
} }
if (user.EquipedCompetitionGear.Feet != null) if (user.EquipedCompetitionGear.Feet != null)
{ {
message += Messages.FormatCompetitionGearFeet(user.EquipedCompetitionGear.Feet.Name, pronoun2, user.EquipedCompetitionGear.Feet.IconId, other); message += Messages.FormatCompetitionGearFeet(user.EquipedCompetitionGear.Feet.Name, possessivePronoun, user.EquipedCompetitionGear.Feet.IconId, other);
hasMsg = true; hasMsg = true;
} }
@ -1054,20 +1031,8 @@ namespace HISP.Game
} }
else else
{ {
// Insert LGBT Patch here string pronoun = user.GetPronouns(true);
string pronoun = "";
if (other)
{
if (user.Gender == "FEMALE")
pronoun = Messages.PronounFemaleHer;
if (user.Gender == "MALE")
pronoun = Messages.PronounMaleHis;
}
message += Messages.FormatOtherHorsesMeta(pronoun); message += Messages.FormatOtherHorsesMeta(pronoun);
message += buildHorseList(user, false); message += buildHorseList(user, false);
message += Messages.FormatAwardHeaderOthers(user.Username); message += Messages.FormatAwardHeaderOthers(user.Username);

11
HorseIsleServer/LibHISP/Player/User.cs
View file

@ -582,6 +582,17 @@ namespace HISP.Player
GameServer.Update(LoggedinClient); GameServer.Update(LoggedinClient);
}
// Insert LGBT Patch here
public string GetPronouns(bool possessive)
{
if (Gender == "FEMALE")
return possessive ? Messages.PronounFemaleHer : Messages.PronounFemaleShe;
else if (Gender == "MALE")
return possessive ? Messages.PronounMaleHis : Messages.PronounMaleHe;
else
return possessive ? Messages.PronounNeutralTheir : Messages.PronounNeutralThey;
} }
public byte[] GenerateSecCode() public byte[] GenerateSecCode()

5
HorseIsleServer/LibHISP/Server/GameDataJson.cs
View file

@ -1431,7 +1431,10 @@ namespace HISP.Server
Messages.PronounMaleHe = gameData.messages.meta.stats_page.pronouns.male_he; Messages.PronounMaleHe = gameData.messages.meta.stats_page.pronouns.male_he;
Messages.PronounMaleHis = gameData.messages.meta.stats_page.pronouns.male_his; Messages.PronounMaleHis = gameData.messages.meta.stats_page.pronouns.male_his;
Messages.PronounYouYour = gameData.messages.meta.stats_page.pronouns.you_your; Messages.PronounNeutralYour = gameData.messages.meta.stats_page.pronouns.neutral_your;
Messages.PronounNeutralThey = gameData.messages.meta.stats_page.pronouns.neutral_they;
Messages.PronounNeutralTheir = gameData.messages.meta.stats_page.pronouns.neutral_their;
// Stats // Stats
Messages.StatsBarFormat = gameData.messages.meta.stats_page.stats_bar_format; Messages.StatsBarFormat = gameData.messages.meta.stats_page.stats_bar_format;