diff --git a/Languages/ChineseSimplified/DefInjected/HistoryEventDef/HistoryEventDef.xml b/Languages/ChineseSimplified/DefInjected/HistoryEventDef/HistoryEventDef.xml
new file mode 100644
index 0000000..a454093
--- /dev/null
+++ b/Languages/ChineseSimplified/DefInjected/HistoryEventDef/HistoryEventDef.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ 和动物做爱
+ 和圣兽做爱
+ 族内通婚
+ 被强奸
+ 强奸了奴隶
+ 强奸了囚犯
+ 被强奸
+ 奴隶被强奸
+ 囚犯被强奸
+ 阴道容纳性交
+ 肛门容纳性交
+ 口腔容纳性交
+ 做爱
+ 乱交
+
+
\ No newline at end of file
diff --git a/Languages/ChineseSimplified/DefInjected/HistoryEventDef/Precepts_Bestiality.xml b/Languages/ChineseSimplified/DefInjected/HistoryEventDef/Precepts_Bestiality.xml
deleted file mode 100644
index 81afd86..0000000
--- a/Languages/ChineseSimplified/DefInjected/HistoryEventDef/Precepts_Bestiality.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
- 和动物做爱
- 和圣兽做爱
-
-
-
\ No newline at end of file
diff --git a/Languages/ChineseSimplified/DefInjected/HistoryEventDef/Precepts_Incest.xml b/Languages/ChineseSimplified/DefInjected/HistoryEventDef/Precepts_Incest.xml
deleted file mode 100644
index 6481cf7..0000000
--- a/Languages/ChineseSimplified/DefInjected/HistoryEventDef/Precepts_Incest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- 族内通婚
-
-
-
\ No newline at end of file
diff --git a/Languages/ChineseSimplified/DefInjected/HistoryEventDef/Precepts_Rape.xml b/Languages/ChineseSimplified/DefInjected/HistoryEventDef/Precepts_Rape.xml
deleted file mode 100644
index 951031d..0000000
--- a/Languages/ChineseSimplified/DefInjected/HistoryEventDef/Precepts_Rape.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
- 被强奸
- 强奸了奴隶
- 强奸了囚犯
- 被强奸
- 奴隶被强奸
- 囚犯被强奸
-
-
-
\ No newline at end of file
diff --git a/Languages/ChineseSimplified/DefInjected/HistoryEventDef/Precepts_Sex.xml b/Languages/ChineseSimplified/DefInjected/HistoryEventDef/Precepts_Sex.xml
deleted file mode 100644
index fe8428d..0000000
--- a/Languages/ChineseSimplified/DefInjected/HistoryEventDef/Precepts_Sex.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
- 阴道容纳性交
- 肛门容纳性交
- 口腔容纳性交
- 做爱
- 乱交
-
-
-
\ No newline at end of file
diff --git a/Languages/Korean/DefInjected/HistoryEventDefs/Translations_HistoryEventDef.xml b/Languages/Korean/DefInjected/HistoryEventDefs/Translations_HistoryEventDef.xml
index 77719cf..14dec42 100644
--- a/Languages/Korean/DefInjected/HistoryEventDefs/Translations_HistoryEventDef.xml
+++ b/Languages/Korean/DefInjected/HistoryEventDefs/Translations_HistoryEventDef.xml
@@ -1,19 +1,17 @@
- 동물과 교미
- 숭배받는 동물과 교미
- 강간
- 노예 강간
- 죄수 강간
- 보지 섹스
- 항문 성교
- 구강 성교
- 섹스
- 문란한 섹스
- 근친혼
- 시체에 박음
- 아다를 따임
- 아다를 따임
- 아다를 뗌
- 아다를 뗌
+ 동물과 교미
+ 숭배받는 동물과 교미
+ 강간
+ 노예 강간
+ 죄수 강간
+ 보지 섹스
+ 항문 성교
+ 구강 성교
+ 섹스
+ 문란한 섹스
+ 근친혼
+ 시체에 박음
+ 아다를 따임
+ 아다를 뗌
\ No newline at end of file
diff --git a/Languages/Russian/DefInjected/HistoryEventDef/HistoryEventDef.xml b/Languages/Russian/DefInjected/HistoryEventDef/HistoryEventDef.xml
new file mode 100644
index 0000000..a000274
--- /dev/null
+++ b/Languages/Russian/DefInjected/HistoryEventDef/HistoryEventDef.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ секс с животным
+ секс с почитаемым животным
+ изнасилован
+ изнасилован раб
+ изнасилован заключеный
+ был изнасилован
+ был изнасилован
+ был изнасилован
+ трахнутый труп
+ Кровосмесительный брак
+ вагинальный секс
+ анальный секс
+ оральный секс
+ секс
+ беспорядочный секс
+ забрана девственность
+ забрал девственность
+
+
\ No newline at end of file
diff --git a/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Bestiality.xml b/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Bestiality.xml
deleted file mode 100644
index 9287dd4..0000000
--- a/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Bestiality.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
- секс с животным
- секс с почитаемым животным
-
-
-
\ No newline at end of file
diff --git a/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Incest.xml b/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Incest.xml
deleted file mode 100644
index cc86d90..0000000
--- a/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Incest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- Кровосмесительный брак
-
-
-
\ No newline at end of file
diff --git a/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Necrophilia.xml b/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Necrophilia.xml
deleted file mode 100644
index 327f12b..0000000
--- a/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Necrophilia.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- трахнутый труп
-
-
-
\ No newline at end of file
diff --git a/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Rape.xml b/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Rape.xml
deleted file mode 100644
index 0813e7f..0000000
--- a/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Rape.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
- изнасилован
- изнасилован раб
- изнасилован заключеный
- был изнасилован
- был изнасилован
- был изнасилован
-
-
-
\ No newline at end of file
diff --git a/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Sex.xml b/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Sex.xml
deleted file mode 100644
index 97d1db4..0000000
--- a/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Sex.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
- вагинальный секс
- анальный секс
- оральный секс
- секс
- беспорядочный секс
-
-
-
\ No newline at end of file
diff --git a/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Virginity.xml b/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Virginity.xml
deleted file mode 100644
index 424f511..0000000
--- a/Languages/Russian/DefInjected/HistoryEventDef/Precepts_Virginity.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
- забрана девственность
- забрана девственность
- забрала девственность
- забрал девственность
-
-
-
\ No newline at end of file
diff --git a/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_ChancePerHour.cs b/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_ChancePerHour.cs
index ade39d5..676a69f 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_ChancePerHour.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_ChancePerHour.cs
@@ -47,7 +47,7 @@ namespace RJWSexperience.Ideology.Patches
if (__result < 0f || pawn.Ideo == null) // ideo is null if don't have dlc
return;
- if (!VariousDefOf.SexWithCorpse.CreateEvent(pawn).DoerWillingToDo())
+ if (!VariousDefOf.RSI_SexWithCorpse.CreateEvent(pawn).DoerWillingToDo())
{
__result = -2f;
return;
diff --git a/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs b/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs
index e0140c2..408958d 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs
@@ -49,7 +49,7 @@ namespace RJWSexperience.Ideology.Patches
}
}
- [HarmonyPatch(typeof(SexUtility), "Aftersex", new Type[] { typeof(SexProps) })]
+ [HarmonyPatch(typeof(SexUtility), nameof(SexUtility.Aftersex), new Type[] { typeof(SexProps) })]
public static class RJW_Patch_Aftersex
{
public static void Postfix(SexProps props)
@@ -99,19 +99,16 @@ namespace RJWSexperience.Ideology.Patches
{
VariousDefOf.RSI_SexWithAnimal.RecordEventWithPartner(human, partner);
}
- else if (xxx.is_human(partner))
+ else if (xxx.is_human(partner) && rape)
{
- if (rape)
- {
- VariousDefOf.RSI_Raped.RecordEventWithPartner(human, partner);
+ VariousDefOf.RSI_Raped.RecordEventWithPartner(human, partner);
- if (partner.IsSlave)
- VariousDefOf.WasRapedSlave.RecordEventWithPartner(partner, human);
- else if (partner.IsPrisoner)
- VariousDefOf.WasRapedPrisoner.RecordEventWithPartner(partner, human);
- else
- VariousDefOf.WasRaped.RecordEventWithPartner(partner, human);
- }
+ if (partner.IsSlave)
+ VariousDefOf.RSI_WasRapedSlave.RecordEventWithPartner(partner, human);
+ else if (partner.IsPrisoner)
+ VariousDefOf.RSI_WasRapedPrisoner.RecordEventWithPartner(partner, human);
+ else
+ VariousDefOf.RSI_WasRaped.RecordEventWithPartner(partner, human);
}
}
diff --git a/RJWSexperience/IdeologyAddon/VariousDefOf.cs b/RJWSexperience/IdeologyAddon/VariousDefOf.cs
index fc1dfa7..307b05e 100644
--- a/RJWSexperience/IdeologyAddon/VariousDefOf.cs
+++ b/RJWSexperience/IdeologyAddon/VariousDefOf.cs
@@ -18,12 +18,12 @@ namespace RJWSexperience.Ideology
[MayRequireIdeology] public static readonly MemeDef Necrophile;
[MayRequireIdeology] public static readonly HistoryEventDef RSI_SexWithAnimal;
[MayRequireIdeology] public static readonly HistoryEventDef RSI_Raped;
- [MayRequireIdeology] public static readonly HistoryEventDef WasRaped;
- [MayRequireIdeology] public static readonly HistoryEventDef WasRapedSlave;
- [MayRequireIdeology] public static readonly HistoryEventDef WasRapedPrisoner;
+ [MayRequireIdeology] public static readonly HistoryEventDef RSI_WasRaped;
+ [MayRequireIdeology] public static readonly HistoryEventDef RSI_WasRapedSlave;
+ [MayRequireIdeology] public static readonly HistoryEventDef RSI_WasRapedPrisoner;
[MayRequireIdeology] public static readonly HistoryEventDef RSI_NonIncestuosMarriage;
[MayRequireIdeology] public static readonly HistoryEventDef RSI_NonIncestuosSex;
- [MayRequireIdeology] public static readonly HistoryEventDef SexWithCorpse;
+ [MayRequireIdeology] public static readonly HistoryEventDef RSI_SexWithCorpse;
[MayRequireIdeology] public static readonly HistoryEventDef RSI_VirginTaken;
[MayRequireIdeology] public static readonly HistoryEventDef RSI_VirginStolen;
[MayRequireIdeology] public static readonly HistoryEventDef RSI_TookVirgin;
diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Necrophilia.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Necrophilia.xml
index 6daf99d..1a65c24 100644
--- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Necrophilia.xml
+++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Necrophilia.xml
@@ -9,7 +9,7 @@
- SexWithCorpse
+ RSI_SexWithCorpse
@@ -29,14 +29,14 @@
- SexWithCorpse
+ RSI_SexWithCorpse
- SexWithCorpse
+ RSI_SexWithCorpse
Necrophilia_Abhorrent
- SexWithCorpse
+ RSI_SexWithCorpse
Necrophilia_Know_Abhorrent
@@ -56,11 +56,11 @@
- SexWithCorpse
+ RSI_SexWithCorpse
Necrophilia_Horrible
- SexWithCorpse
+ RSI_SexWithCorpse
Necrophilia_Know_Horrible
@@ -85,11 +85,11 @@
- SexWithCorpse
+ RSI_SexWithCorpse
Necrophilia_Disapproved
- SexWithCorpse
+ RSI_SexWithCorpse
Necrophilia_Know_Disapproved
@@ -128,11 +128,11 @@
- SexWithCorpse
+ RSI_SexWithCorpse
Necrophilia_Approved
- SexWithCorpse
+ RSI_SexWithCorpse
Necrophilia_Know_Approved
diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml
index 3dfaa59..0573c70 100644
--- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml
+++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml
@@ -42,17 +42,17 @@
- WasRaped
+ RSI_WasRaped
- WasRapedSlave
+ RSI_WasRapedSlave
- WasRapedPrisoner
+ RSI_WasRapedPrisoner
diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Sex.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Sex.xml
index 19c8a52..656f2f3 100644
--- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Sex.xml
+++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Sex.xml
@@ -9,27 +9,27 @@
- VaginalSex
+ RSI_VaginalSex
- AnalSex
+ RSI_AnalSex
- OralSex
+ RSI_OralSex
- PromiscuousSex
+ RSI_PromiscuousSex
- MiscSex
+ RSI_MiscSex
@@ -56,47 +56,47 @@
100
- AnalSex
+ RSI_AnalSex
- AnalSex
+ RSI_AnalSex
Sex_Promiscuous
- AnalSex
+ RSI_AnalSex
Sex_Know_Promiscuous
- OralSex
+ RSI_OralSex
- OralSex
+ RSI_OralSex
Sex_Promiscuous
- OralSex
+ RSI_OralSex
Sex_Know_Promiscuous
- MiscSex
+ RSI_MiscSex
- MiscSex
+ RSI_MiscSex
Sex_Promiscuous
- MiscSex
+ RSI_MiscSex
Sex_Know_Promiscuous
- PromiscuousSex
+ RSI_PromiscuousSex
- PromiscuousSex
+ RSI_PromiscuousSex
Sex_Promiscuous
- PromiscuousSex
+ RSI_PromiscuousSex
Sex_Know_Promiscuous
@@ -113,47 +113,47 @@
10
- VaginalSex
+ RSI_VaginalSex
- VaginalSex
+ RSI_VaginalSex
Sex_Promiscuous
- VaginalSex
+ RSI_VaginalSex
Sex_Know_Promiscuous
- OralSex
+ RSI_OralSex
- OralSex
+ RSI_OralSex
Sex_Promiscuous
- OralSex
+ RSI_OralSex
Sex_Know_Promiscuous
- MiscSex
+ RSI_MiscSex
- MiscSex
+ RSI_MiscSex
Sex_Promiscuous
- MiscSex
+ RSI_MiscSex
Sex_Know_Promiscuous
- PromiscuousSex
+ RSI_PromiscuousSex
- PromiscuousSex
+ RSI_PromiscuousSex
Sex_Promiscuous
- PromiscuousSex
+ RSI_PromiscuousSex
Sex_Know_Promiscuous
@@ -170,47 +170,47 @@
5
- VaginalSex
+ RSI_VaginalSex
- VaginalSex
+ RSI_VaginalSex
Sex_Promiscuous
- VaginalSex
+ RSI_VaginalSex
Sex_Know_Promiscuous
- AnalSex
+ RSI_AnalSex
- AnalSex
+ RSI_AnalSex
Sex_Promiscuous
- AnalSex
+ RSI_AnalSex
Sex_Know_Promiscuous
- MiscSex
+ RSI_MiscSex
- MiscSex
+ RSI_MiscSex
Sex_Promiscuous
- MiscSex
+ RSI_MiscSex
Sex_Know_Promiscuous
- PromiscuousSex
+ RSI_PromiscuousSex
- PromiscuousSex
+ RSI_PromiscuousSex
Sex_Promiscuous
- PromiscuousSex
+ RSI_PromiscuousSex
Sex_Know_Promiscuous
@@ -230,51 +230,51 @@
- VaginalSex
+ RSI_VaginalSex
- VaginalSex
+ RSI_VaginalSex
Sex_NonPromiscuous
- VaginalSex
+ RSI_VaginalSex
Sex_Know_NonPromiscuous
- AnalSex
+ RSI_AnalSex
- AnalSex
+ RSI_AnalSex
Sex_NonPromiscuous
- AnalSex
+ RSI_AnalSex
Sex_Know_NonPromiscuous
- OralSex
+ RSI_OralSex
- OralSex
+ RSI_OralSex
Sex_NonPromiscuous
- OralSex
+ RSI_OralSex
Sex_Know_NonPromiscuous
- MiscSex
+ RSI_MiscSex
- MiscSex
+ RSI_MiscSex
Sex_NonPromiscuous
- MiscSex
+ RSI_MiscSex
Sex_Know_NonPromiscuous
- PromiscuousSex
+ RSI_PromiscuousSex
Sex_Know_Promiscuous_Approval
diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Submissive.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Submissive.xml
index 62ebb21..a7c8bbf 100644
--- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Submissive.xml
+++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Submissive.xml
@@ -37,12 +37,12 @@
Male
- WasRaped
+ RSI_WasRaped
BeenRaped_Submissive
Male
- WasRaped
+ RSI_WasRaped
BeenRaped_NotSubmissive
Female
@@ -52,12 +52,12 @@
Male
- WasRapedPrisoner
+ RSI_WasRapedPrisoner
BeenRaped_Submissive
Male
- WasRapedPrisoner
+ RSI_WasRapedPrisoner
BeenRaped_NotSubmissive
Female
@@ -67,12 +67,12 @@
Male
- WasRapedSlave
+ RSI_WasRapedSlave
BeenRaped_Submissive
Male
- WasRapedSlave
+ RSI_WasRapedSlave
BeenRaped_NotSubmissive
Female
@@ -101,12 +101,12 @@
Female
- WasRaped
+ RSI_WasRaped
BeenRaped_Submissive
Female
- WasRaped
+ RSI_WasRaped
BeenRaped_NotSubmissive
Male
@@ -116,12 +116,12 @@
Female
- WasRapedPrisoner
+ RSI_WasRapedPrisoner
BeenRaped_Submissive
Female
- WasRapedPrisoner
+ RSI_WasRapedPrisoner
BeenRaped_NotSubmissive
Male
@@ -131,12 +131,12 @@
Female
- WasRapedSlave
+ RSI_WasRapedSlave
BeenRaped_Submissive
Female
- WasRapedSlave
+ RSI_WasRapedSlave
BeenRaped_NotSubmissive
Male
diff --git a/RJWSexperience_Ideology/Patches/InteractionDef/Necro.xml b/RJWSexperience_Ideology/Patches/InteractionDef/Necro.xml
index dfb6347..0a02d95 100644
--- a/RJWSexperience_Ideology/Patches/InteractionDef/Necro.xml
+++ b/RJWSexperience_Ideology/Patches/InteractionDef/Necro.xml
@@ -6,7 +6,7 @@
- SexWithCorpse
+ RSI_SexWithCorpse
@@ -17,7 +17,7 @@
- SexWithCorpse
+ RSI_SexWithCorpse
diff --git a/RJWSexperience_Ideology/Patches/InteractionDef/Sex.xml b/RJWSexperience_Ideology/Patches/InteractionDef/Sex.xml
index bdc0b1b..0be25d3 100644
--- a/RJWSexperience_Ideology/Patches/InteractionDef/Sex.xml
+++ b/RJWSexperience_Ideology/Patches/InteractionDef/Sex.xml
@@ -6,10 +6,10 @@
- VaginalSex
+ RSI_VaginalSex
- VaginalSex
+ RSI_VaginalSex
@@ -20,10 +20,10 @@
- AnalSex
+ RSI_AnalSex
- AnalSex
+ RSI_AnalSex
@@ -34,10 +34,10 @@
- OralSex
+ RSI_OralSex
- OralSex
+ RSI_OralSex
@@ -48,10 +48,10 @@
- MiscSex
+ RSI_MiscSex
- MiscSex
+ RSI_MiscSex
@@ -62,10 +62,10 @@
- PromiscuousSex
+ RSI_PromiscuousSex
- PromiscuousSex
+ RSI_PromiscuousSex
diff --git a/RJWSexperience_Ideology/Patches/InteractionDef/Sex_Reverse.xml b/RJWSexperience_Ideology/Patches/InteractionDef/Sex_Reverse.xml
index 2275830..2e41ab5 100644
--- a/RJWSexperience_Ideology/Patches/InteractionDef/Sex_Reverse.xml
+++ b/RJWSexperience_Ideology/Patches/InteractionDef/Sex_Reverse.xml
@@ -6,10 +6,10 @@
- VaginalSex
+ RSI_VaginalSex
- VaginalSex
+ RSI_VaginalSex
@@ -20,10 +20,10 @@
- AnalSex
+ RSI_AnalSex
- AnalSex
+ RSI_AnalSex
@@ -34,10 +34,10 @@
- OralSex
+ RSI_OralSex
- OralSex
+ RSI_OralSex
@@ -48,10 +48,10 @@
- MiscSex
+ RSI_MiscSex
- MiscSex
+ RSI_MiscSex
@@ -62,10 +62,10 @@
- PromiscuousSex
+ RSI_PromiscuousSex
- PromiscuousSex
+ RSI_PromiscuousSex