From b38a4b1ec35aec2c9ecc84692c78dd68f5697197 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 26 Jun 2022 12:30:52 +0500 Subject: [PATCH] Refactor RJW_Patch_Aftersex.AfterSexHuman --- .../Ideology/Patches/RJW_Patch_Ideo.cs | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs b/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs index 9a8f9d2..b5af75f 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs @@ -119,33 +119,26 @@ namespace RJWSexperience.Ideology.Patches if (partner.IsAnimal()) { + string tag = HETag.Gender(human); if (isHumanReceiving && rape) { + tag += HETag.BeenRaped; + if (human.IsSlave) RapeEffectSlave(human); - - if (human.Ideo?.IsVeneratedAnimal(partner) ?? false) - Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithVeneratedAnimal.CreateTaggedEvent(human, HETag.BeenRaped + HETag.Gender(human), partner)); - else - Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithAnimal.CreateTaggedEvent(human, HETag.BeenRaped + HETag.Gender(human), partner)); - - if (human.Ideo != null && human.relations?.DirectRelationExists(PawnRelationDefOf.Bond, partner) == true) - Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithBondedAnimal.CreateTaggedEvent(human, HETag.BeenRaped + HETag.Gender(human), partner)); - else - Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithNonBondAnimal.CreateTaggedEvent(human, HETag.BeenRaped + HETag.Gender(human), partner)); } + + if (human.Ideo?.IsVeneratedAnimal(partner) ?? false) + Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithVeneratedAnimal.CreateTaggedEvent(human, tag, partner)); else - { - if (human.Ideo?.IsVeneratedAnimal(partner) ?? false) - Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithVeneratedAnimal.CreateTaggedEvent(human, HETag.Gender(human), partner)); - else - Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithAnimal.CreateTaggedEvent(human, HETag.Gender(human), partner)); + Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithNonVeneratedAnimal.CreateTaggedEvent(human, tag, partner)); - if (human.Ideo != null && human.relations?.DirectRelationExists(PawnRelationDefOf.Bond, partner) == true) - Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithBondedAnimal.CreateTaggedEvent(human, HETag.Gender(human), partner)); - else - Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithNonBondAnimal.CreateTaggedEvent(human, HETag.Gender(human), partner)); - } + if (human.Ideo != null && human.relations?.DirectRelationExists(PawnRelationDefOf.Bond, partner) == true) + Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithBondedAnimal.CreateTaggedEvent(human, tag, partner)); + else + Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithNonBondAnimal.CreateTaggedEvent(human, tag, partner)); + + Find.HistoryEventsManager.RecordEvent(VariousDefOf.SexWithAnimal.CreateTaggedEvent(human, tag, partner)); } else if (xxx.is_human(partner)) {