From 53ece7a513b7c6ef33486339d47d26d6268fc0bf Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 19 Jun 2022 18:26:35 +0500 Subject: [PATCH] Create Precepts namespace --- ...ce.cs => DefExtension_ModifyPreference.cs} | 4 +- ... => DefExtension_MultipleMemesRequired.cs} | 4 +- ...xtype.cs => DefExtension_PreferSextype.cs} | 4 +- .../PreceptComp_SelftTookThoughtExtended.cs | 2 +- .../IdeologyAddon/Ideology/RJW_Patch_Ideo.cs | 5 +- .../IdeologyAddon/Ideology/Rimworld_Patch.cs | 3 +- .../Defs/PreceptDefs/Precepts_Bestiality.xml | 22 ++++---- .../Defs/PreceptDefs/Precepts_Incest.xml | 54 +++++++++--------- .../Defs/PreceptDefs/Precepts_Rape.xml | 2 +- .../Defs/PreceptDefs/Precepts_Ritual_sex.xml | 2 +- .../Defs/PreceptDefs/Precepts_Sex.xml | 56 +++++++++---------- .../Defs/PreceptDefs/Precepts_Submissive.xml | 36 ++++++------ .../Defs/PreceptDefs/Precepts_Virginity.xml | 28 +++++----- 13 files changed, 112 insertions(+), 110 deletions(-) rename RJWSexperience/IdeologyAddon/Ideology/Precepts/{PreceptDefExtension_ModifyPreference.cs => DefExtension_ModifyPreference.cs} (96%) rename RJWSexperience/IdeologyAddon/Ideology/Precepts/{PreceptDefExtension_MultipleMemesRequired.cs => DefExtension_MultipleMemesRequired.cs} (74%) rename RJWSexperience/IdeologyAddon/Ideology/Precepts/{PreceptDefExtension_PreferSextype.cs => DefExtension_PreferSextype.cs} (83%) diff --git a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptDefExtension_ModifyPreference.cs b/RJWSexperience/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyPreference.cs similarity index 96% rename from RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptDefExtension_ModifyPreference.cs rename to RJWSexperience/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyPreference.cs index faf9a16..6422cb9 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptDefExtension_ModifyPreference.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyPreference.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Verse; -namespace RJWSexperience.Ideology +namespace RJWSexperience.Ideology.Precepts { - public class PreceptDefExtension_ModifyPreference : DefModExtension + public class DefExtension_ModifyPreference : DefModExtension { [SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")] public List rules; diff --git a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptDefExtension_MultipleMemesRequired.cs b/RJWSexperience/IdeologyAddon/Ideology/Precepts/DefExtension_MultipleMemesRequired.cs similarity index 74% rename from RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptDefExtension_MultipleMemesRequired.cs rename to RJWSexperience/IdeologyAddon/Ideology/Precepts/DefExtension_MultipleMemesRequired.cs index dd8c16d..665fd15 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptDefExtension_MultipleMemesRequired.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Precepts/DefExtension_MultipleMemesRequired.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Verse; -namespace RJWSexperience.Ideology +namespace RJWSexperience.Ideology.Precepts { - public class PreceptDefExtension_MultipleMemesRequired : DefModExtension + public class DefExtension_MultipleMemesRequired : DefModExtension { [SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")] public List requiredAllMemes = new List(); diff --git a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptDefExtension_PreferSextype.cs b/RJWSexperience/IdeologyAddon/Ideology/Precepts/DefExtension_PreferSextype.cs similarity index 83% rename from RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptDefExtension_PreferSextype.cs rename to RJWSexperience/IdeologyAddon/Ideology/Precepts/DefExtension_PreferSextype.cs index e820c85..c67ee02 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptDefExtension_PreferSextype.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Precepts/DefExtension_PreferSextype.cs @@ -2,9 +2,9 @@ using System.Diagnostics.CodeAnalysis; using Verse; -namespace RJWSexperience.Ideology +namespace RJWSexperience.Ideology.Precepts { - public class PreceptDefExtension_PreferSextype : DefModExtension + public class DefExtension_PreferSextype : DefModExtension { [SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")] public List sextypes = new List(); diff --git a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_SelftTookThoughtExtended.cs b/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_SelftTookThoughtExtended.cs index f7645a6..8329f7f 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_SelftTookThoughtExtended.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_SelftTookThoughtExtended.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using Verse; -namespace RJWSexperience.Ideology +namespace RJWSexperience.Ideology.Precepts { public class PreceptComp_SelfTookThoughtTagged : PreceptComp_SelfTookMemoryThought { diff --git a/RJWSexperience/IdeologyAddon/Ideology/RJW_Patch_Ideo.cs b/RJWSexperience/IdeologyAddon/Ideology/RJW_Patch_Ideo.cs index 6770e0a..3b7432e 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/RJW_Patch_Ideo.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/RJW_Patch_Ideo.cs @@ -3,6 +3,7 @@ using RimWorld; using rjw; using rjw.Modules.Interactions.Internals.Implementation; using rjw.Modules.Interactions.Objects; +using RJWSexperience.Ideology.Precepts; using System; using Verse; @@ -280,7 +281,7 @@ namespace RJWSexperience.Ideology { for (int i = 0; i < ideo.PreceptsListForReading.Count; i++) { - if (ideo.PreceptsListForReading[i].def.GetModExtension()?.HasSextype(interaction.Extension.rjwSextype) == true) + if (ideo.PreceptsListForReading[i].def.GetModExtension()?.HasSextype(interaction.Extension.rjwSextype) == true) { float mult = 8.0f * Math.Max(0.3f, 1 / Math.Max(0.01f, sexdrive)); return score * mult; @@ -303,7 +304,7 @@ namespace RJWSexperience.Ideology return; for(int i = 0; i < ideo.PreceptsListForReading.Count; i++) - ideo.PreceptsListForReading[i].def.GetModExtension()?.Apply(fucker, fucked, ref __result); + ideo.PreceptsListForReading[i].def.GetModExtension()?.Apply(fucker, fucked, ref __result); } } diff --git a/RJWSexperience/IdeologyAddon/Ideology/Rimworld_Patch.cs b/RJWSexperience/IdeologyAddon/Ideology/Rimworld_Patch.cs index 9996516..fdab7b1 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Rimworld_Patch.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Rimworld_Patch.cs @@ -1,6 +1,7 @@ using HarmonyLib; using RimWorld; using rjw; +using RJWSexperience.Ideology.Precepts; using System.Collections.Generic; using Verse; @@ -48,7 +49,7 @@ namespace RJWSexperience.Ideology { public static void Postfix(PreceptDef precept, bool checkDuplicates, ref IdeoFoundation __instance, ref AcceptanceReport __result) { - PreceptDefExtension_MultipleMemesRequired extension = precept.GetModExtension(); + DefExtension_MultipleMemesRequired extension = precept.GetModExtension(); if (extension == null) return; diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Bestiality.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Bestiality.xml index 6df89b8..20e2c74 100644 --- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Bestiality.xml +++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Bestiality.xml @@ -40,7 +40,7 @@ SexWithVeneratedAnimal Bestiality_Abhorrent -
  • +
  • SexWithVeneratedAnimal Bestiality_Know_Abhorrent BeenRaped @@ -50,7 +50,7 @@ SexWithAnimal Bestiality_Abhorrent
    • -
  • +
  • SexWithAnimal Bestiality_Know_Abhorrent BeenRaped @@ -58,7 +58,7 @@
    • -
  • +
  • @@ -91,7 +91,7 @@ SexWithVeneratedAnimal Bestiality_Horrible
    • -
  • +
  • SexWithVeneratedAnimal Bestiality_Know_Horrible BeenRaped @@ -101,7 +101,7 @@ SexWithAnimal Bestiality_Horrible
    • -
  • +
  • SexWithAnimal Bestiality_Know_Horrible BeenRaped @@ -109,7 +109,7 @@
    • -
  • +
  • @@ -142,7 +142,7 @@ SexWithVeneratedAnimal Bestiality_Disapproved
    • -
  • +
  • SexWithVeneratedAnimal Bestiality_Know_Disapproved BeenRaped @@ -152,7 +152,7 @@ SexWithAnimal Bestiality_Disapproved
    • -
  • +
  • SexWithAnimal Bestiality_Know_Disapproved BeenRaped @@ -160,7 +160,7 @@
    • -
  • +
  • @@ -224,7 +224,7 @@
    • -
  • +
  • @@ -282,7 +282,7 @@
    • -
  • +
  • diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml index bb578c6..ee612b0 100644 --- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml +++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml @@ -41,34 +41,34 @@ Incestuos_Marriage IncestuosMarriage_Disapproved
    • -
  • +
  • VaginalSex Sex_Know_Incest_Disapproved Incestuos
    • -
  • +
  • AnalSex Sex_Know_Incest_Disapproved Incestuos
    • -
  • +
  • OralSex Sex_Know_Incest_Disapproved Incestuos
    • -
  • +
  • MiscSex Sex_Know_Incest_Disapproved Incestuos
    • -
  • +
  • PromiscuousSex Sex_Know_Incest_Disapproved Incestuos
    • -
  • +
  • @@ -107,38 +107,38 @@ Incestuos_Marriage IncestuosMarriage_Disapproved
    • -
  • +
  • Incestuos_Marriage Sex_Know_IncestMarriage_Disapproved
    • -
  • +
  • VaginalSex Sex_Know_Incest_Disapproved Incestuos
    • -
  • +
  • AnalSex Sex_Know_Incest_Disapproved Incestuos
    • -
  • +
  • OralSex Sex_Know_Incest_Disapproved Incestuos
    • -
  • +
  • MiscSex Sex_Know_Incest_Disapproved Incestuos
    • -
  • +
  • PromiscuousSex Sex_Know_Incest_Disapproved Incestuos
    • -
  • +
  • @@ -185,38 +185,38 @@ Incestuos_Marriage IncestuosMarriage_Forbidden
    • -
  • +
  • Incestuos_Marriage Sex_Know_IncestMarriage_Forbidden
    • -
  • +
  • VaginalSex Sex_Know_Incest_Forbidden Incestuos
    • -
  • +
  • AnalSex Sex_Know_Incest_Forbidden Incestuos
    • -
  • +
  • OralSex Sex_Know_Incest_Forbidden Incestuos
    • -
  • +
  • MiscSex Sex_Know_Incest_Forbidden Incestuos
    • -
  • +
  • PromiscuousSex Sex_Know_Incest_Forbidden Incestuos
    • -
  • +
  • @@ -261,37 +261,37 @@
  • Zoophile
    • -
  • +
  • GotMarried_SpouseCount_OneOrFewer Sex_Know_IncestMarriage_Violated Incestuos true
    • -
  • +
  • VaginalSex Sex_Know_Incest_Violated Incestuos true
    • -
  • +
  • AnalSex Sex_Know_Incest_Violated Incestuos true
    • -
  • +
  • OralSex Sex_Know_Incest_Violated Incestuos true
    • -
  • +
  • MiscSex Sex_Know_Incest_Violated Incestuos true
    • -
  • +
  • PromiscuousSex Sex_Know_Incest_Violated Incestuos @@ -299,7 +299,7 @@
    • -
  • +
  • diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml index 87a167d..ca6e7ce 100644 --- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml +++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml @@ -197,7 +197,7 @@ BloodlustStoleSomeLovin true
    • -
  • +
  • Raped Rape_Know_Honorable Someone raped other diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Ritual_sex.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Ritual_sex.xml index 13ea544..636b5d1 100644 --- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Ritual_sex.xml +++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Ritual_sex.xml @@ -63,7 +63,7 @@ true false -
  • +
  • Rapist
  • Zoophile
    • diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Sex.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Sex.xml index 9a3d755..c49bb61 100644 --- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Sex.xml +++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Sex.xml @@ -55,41 +55,41 @@ 1000 100 -
  • +
  • AnalSex Sex_Promiscuous
    • -
  • +
  • AnalSex Sex_Know_Promiscuous
    • -
  • +
  • OralSex Sex_Promiscuous
    • -
  • +
  • OralSex Sex_Know_Promiscuous
    • -
  • +
  • MiscSex Sex_Promiscuous
    • -
  • +
  • MiscSex Sex_Know_Promiscuous
    • -
  • +
  • PromiscuousSex Sex_Promiscuous
    • -
  • +
  • PromiscuousSex Sex_Know_Promiscuous
    • -
  • +
  • Vaginal
    • @@ -107,41 +107,41 @@ 1000 10 -
  • +
  • VaginalSex Sex_Promiscuous
    • -
  • +
  • VaginalSex Sex_Know_Promiscuous
    • -
  • +
  • OralSex Sex_Promiscuous
    • -
  • +
  • OralSex Sex_Know_Promiscuous
    • -
  • +
  • MiscSex Sex_Promiscuous
    • -
  • +
  • MiscSex Sex_Know_Promiscuous
    • -
  • +
  • PromiscuousSex Sex_Promiscuous
    • -
  • +
  • PromiscuousSex Sex_Know_Promiscuous
    • -
  • +
  • Anal
  • Rimming
    • @@ -160,41 +160,41 @@ 1000 5 -
  • +
  • VaginalSex Sex_Promiscuous
    • -
  • +
  • VaginalSex Sex_Know_Promiscuous
    • -
  • +
  • AnalSex Sex_Promiscuous
    • -
  • +
  • AnalSex Sex_Know_Promiscuous
    • -
  • +
  • MiscSex Sex_Promiscuous
    • -
  • +
  • MiscSex Sex_Know_Promiscuous
    • -
  • +
  • PromiscuousSex Sex_Promiscuous
    • -
  • +
  • PromiscuousSex Sex_Know_Promiscuous
    • -
  • +
  • Cunnilingus
  • Fellatio
    • @@ -255,7 +255,7 @@ -
  • +
  • DoublePenetration
  • Scissoring
    • diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Submissive.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Submissive.xml index c9a8e2f..9866151 100644 --- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Submissive.xml +++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Submissive.xml @@ -32,49 +32,49 @@
  • FemaleSupremacy
    • -
  • +
  • WasRaped BeenRaped_Submissive Male, BeenRaped
    • -
  • +
  • WasRaped BeenRaped_NotSubmissive Female, BeenRaped
    • -
  • +
  • Raped Raped_Know_NotBeingSubmissive not obedient Female, Raped
    • -
  • +
  • WasRapedPrisoner BeenRaped_Submissive Male, BeenRaped
    • -
  • +
  • WasRapedPrisoner BeenRaped_NotSubmissive Female, BeenRaped
    • -
  • +
  • RapedPrisoner Raped_Know_NotBeingSubmissive not obedient Female, Raped
    • -
  • +
  • WasRapedSlave BeenRaped_Submissive Male, BeenRaped
    • -
  • +
  • WasRapedSlave BeenRaped_NotSubmissive Female, BeenRaped
    • -
  • +
  • RapedSlave Raped_Know_NotBeingSubmissive not obedient @@ -95,49 +95,49 @@
  • MaleSupremacy
    • -
  • +
  • WasRaped BeenRaped_Submissive Female, BeenRaped
    • -
  • +
  • WasRaped BeenRaped_NotSubmissive Male, BeenRaped
    • -
  • +
  • Raped Raped_Know_NotBeingSubmissive not obedient Male, Raped
    • -
  • +
  • WasRapedPrisoner BeenRaped_Submissive Female, BeenRaped
    • -
  • +
  • WasRapedPrisoner BeenRaped_NotSubmissive Male, BeenRaped
    • -
  • +
  • RapedPrisoner Raped_Know_NotBeingSubmissive not obedient Male, Raped
    • -
  • +
  • WasRapedSlave BeenRaped_Submissive Female, BeenRaped
    • -
  • +
  • WasRapedSlave BeenRaped_NotSubmissive Male, BeenRaped
    • -
  • +
  • RapedSlave Raped_Know_NotBeingSubmissive not obedient diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Virginity.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Virginity.xml index 0b93ed2..b4b3c39 100644 --- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Virginity.xml +++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Virginity.xml @@ -67,18 +67,18 @@ 1000 80 -
  • +
  • Virgin_TakenF Virgin_Precious_Taken_Forcefully BeenRaped
    • -
  • +
  • Virgin_TakenF Virgin_Precious_Taken BeenRaped true
    • -
  • +
  • Virgin_TookF TookVirginity
    • @@ -95,18 +95,18 @@ 1000 1 -
  • +
  • Virgin_TakenM Virgin_Precious_Taken_Forcefully BeenRaped
    • -
  • +
  • Virgin_TakenM Virgin_Precious_Taken BeenRaped true
    • -
  • +
  • Virgin_TookM TookVirginity
    • @@ -132,18 +132,18 @@
  • MaleSupremacy
    • -
  • +
  • Virgin_TakenF Virgin_Precious_Taken_Forcefully BeenRaped
    • -
  • +
  • Virgin_TakenF Virgin_Precious_Taken BeenRaped true
    • -
  • +
  • Virgin_TakenF Virgin_OnlyForSpouse_Know_Taken Female, NotSpouse @@ -174,18 +174,18 @@
  • FemaleSupremacy
    • -
  • +
  • Virgin_TakenM Virgin_Precious_Taken_Forcefully BeenRaped
    • -
  • +
  • Virgin_TakenM Virgin_Precious_Taken BeenRaped true
    • -
  • +
  • Virgin_TakenM Virgin_OnlyForSpouse_Know_Taken Male, NotSpouse @@ -210,7 +210,7 @@
  • FemaleSupremacy
    • -
  • +
  • Virgin_TakenF Virgin_Shameful_Taken BeenRaped @@ -232,7 +232,7 @@
  • MaleSupremacy
    • -
  • +
  • Virgin_TakenM Virgin_Shameful_Taken BeenRaped