From 075260f091630fa62ef145ae3bf8b5c21b562373 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Fri, 14 Oct 2022 21:35:31 +0500 Subject: [PATCH] Fix folders and namespaces (except for the Rituals) --- 1.3/Defs/PreceptDefs/Precepts_Sex.xml | 4 +- ...odwillSituationWorker_MemeCompatibility.cs | 0 .../HistoryEvents/ArgsNamesCustom.cs | 0 .../DefExtension_EventOverrides.cs | 0 .../DefExtension_SecondaryEvents.cs | 0 .../HistoryEventDefExtensionMethods.cs | 0 .../HistoryEvents/TwoPawnEventRule.cs | 0 .../{Ideology => }/IdeoUtility.cs | 0 .../Ideology/Thought_IncreaseRecord.cs | 54 ------------ .../Ideology/Thought_Opinionbased.cs | 38 --------- Source/IdeologyAddon/IdeologyAddon.csproj | 82 +++++++++---------- .../InteractionDefExtension_HistoryEvents.cs | 0 Source/IdeologyAddon/{Ideology => }/Keyed.cs | 2 +- .../Patches/RJW_Patch_ChancePerHour.cs | 0 .../{Ideology => }/Patches/RJW_Patch_Ideo.cs | 0 .../{Ideology => }/Patches/Rimworld_Patch.cs | 0 .../Patches/Sexperience_Patch.cs | 0 .../ThoughtWorker_Precept_GenitalSize.cs | 0 ...houghtWorker_Precept_GenitalSize_Social.cs | 0 .../ThoughtWorker_Precept_NonPregnant.cs | 0 ...houghtWorker_Precept_NonPregnant_Social.cs | 0 .../ThoughtWorker_Precept_Pregnant.cs | 0 .../ThoughtWorker_Precept_Pregnant_Social.cs | 0 .../Comp_KnowsMemoryThought_Gendered.cs | 0 .../Comp_SelfTookMemoryThought_Gendered.cs | 0 .../DefExtension_ModifyBestialityMtb.cs | 0 .../Precepts/DefExtension_ModifyFappinMtb.cs | 0 .../Precepts/DefExtension_ModifyMtb.cs | 0 .../Precepts/DefExtension_ModifyNecroMtb.cs | 0 .../Precepts/DefExtension_ModifyPreference.cs | 0 .../Precepts/DefExtension_ModifyRapeCPMtb.cs | 0 .../DefExtension_MultipleMemesRequired.cs | 0 .../{Ideology => }/RelationFilter.cs | 0 .../Rituals/JobGiver_DrugOrgy.cs | 0 .../Rituals/JobGiver_GangbangConsensual.cs | 0 .../Rituals/JobGiver_GangbangVictim.cs | 0 .../{Ideology => }/Rituals/LordJob_Rituals.cs | 0 .../Rituals/RitualBehaviorWorkers.cs | 0 .../Rituals/RitualOutcomeComps.cs | 0 .../{Ideology => }/Rituals/RitualRoles.cs | 0 .../{Ideology => }/RsiHistoryEventDefOf.cs | 0 .../{Ideology => }/SinglePawnFilter.cs | 0 .../IdeologyAddon/{Ideology => }/StatParts.cs | 0 .../ThoughtDefExtension_IncreaseRecord.cs | 2 +- .../Thoughts/Thought_IncreaseRecord.cs | 2 +- .../{Ideology => }/TwoPawnFilter.cs | 0 .../{Ideology => }/VariousDefOf.cs | 0 47 files changed, 46 insertions(+), 138 deletions(-) rename Source/IdeologyAddon/{Ideology => }/GoodwillSituationWorker_MemeCompatibility.cs (100%) rename Source/IdeologyAddon/{Ideology => }/HistoryEvents/ArgsNamesCustom.cs (100%) rename Source/IdeologyAddon/{Ideology => }/HistoryEvents/DefExtension_EventOverrides.cs (100%) rename Source/IdeologyAddon/{Ideology => }/HistoryEvents/DefExtension_SecondaryEvents.cs (100%) rename Source/IdeologyAddon/{Ideology => }/HistoryEvents/HistoryEventDefExtensionMethods.cs (100%) rename Source/IdeologyAddon/{Ideology => }/HistoryEvents/TwoPawnEventRule.cs (100%) rename Source/IdeologyAddon/{Ideology => }/IdeoUtility.cs (100%) delete mode 100644 Source/IdeologyAddon/Ideology/Thought_IncreaseRecord.cs delete mode 100644 Source/IdeologyAddon/Ideology/Thought_Opinionbased.cs rename Source/IdeologyAddon/{Ideology => }/InteractionDefExtension_HistoryEvents.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Keyed.cs (93%) rename Source/IdeologyAddon/{Ideology => }/Patches/RJW_Patch_ChancePerHour.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Patches/RJW_Patch_Ideo.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Patches/Rimworld_Patch.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Patches/Sexperience_Patch.cs (100%) rename Source/IdeologyAddon/{Ideology => }/PreceptWorkers/ThoughtWorker_Precept_GenitalSize.cs (100%) rename Source/IdeologyAddon/{Ideology => }/PreceptWorkers/ThoughtWorker_Precept_GenitalSize_Social.cs (100%) rename Source/IdeologyAddon/{Ideology => }/PreceptWorkers/ThoughtWorker_Precept_NonPregnant.cs (100%) rename Source/IdeologyAddon/{Ideology => }/PreceptWorkers/ThoughtWorker_Precept_NonPregnant_Social.cs (100%) rename Source/IdeologyAddon/{Ideology => }/PreceptWorkers/ThoughtWorker_Precept_Pregnant.cs (100%) rename Source/IdeologyAddon/{Ideology => }/PreceptWorkers/ThoughtWorker_Precept_Pregnant_Social.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Precepts/Comp_KnowsMemoryThought_Gendered.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Precepts/Comp_SelfTookMemoryThought_Gendered.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Precepts/DefExtension_ModifyBestialityMtb.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Precepts/DefExtension_ModifyFappinMtb.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Precepts/DefExtension_ModifyMtb.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Precepts/DefExtension_ModifyNecroMtb.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Precepts/DefExtension_ModifyPreference.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Precepts/DefExtension_ModifyRapeCPMtb.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Precepts/DefExtension_MultipleMemesRequired.cs (100%) rename Source/IdeologyAddon/{Ideology => }/RelationFilter.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Rituals/JobGiver_DrugOrgy.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Rituals/JobGiver_GangbangConsensual.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Rituals/JobGiver_GangbangVictim.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Rituals/LordJob_Rituals.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Rituals/RitualBehaviorWorkers.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Rituals/RitualOutcomeComps.cs (100%) rename Source/IdeologyAddon/{Ideology => }/Rituals/RitualRoles.cs (100%) rename Source/IdeologyAddon/{Ideology => }/RsiHistoryEventDefOf.cs (100%) rename Source/IdeologyAddon/{Ideology => }/SinglePawnFilter.cs (100%) rename Source/IdeologyAddon/{Ideology => }/StatParts.cs (100%) rename Source/IdeologyAddon/{Ideology => }/TwoPawnFilter.cs (100%) rename Source/IdeologyAddon/{Ideology => }/VariousDefOf.cs (100%) diff --git a/1.3/Defs/PreceptDefs/Precepts_Sex.xml b/1.3/Defs/PreceptDefs/Precepts_Sex.xml index ea37742..8cf05e4 100644 --- a/1.3/Defs/PreceptDefs/Precepts_Sex.xml +++ b/1.3/Defs/PreceptDefs/Precepts_Sex.xml @@ -288,7 +288,7 @@ Sex_Promiscuous 1 1 - RJWSexperience.Thought_IncreaseRecord + RJWSexperience.Ideology.Thought_IncreaseRecord
  • @@ -297,7 +297,7 @@
    • -
  • +
  • Lust 3.0
    • diff --git a/Source/IdeologyAddon/Ideology/GoodwillSituationWorker_MemeCompatibility.cs b/Source/IdeologyAddon/GoodwillSituationWorker_MemeCompatibility.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/GoodwillSituationWorker_MemeCompatibility.cs rename to Source/IdeologyAddon/GoodwillSituationWorker_MemeCompatibility.cs diff --git a/Source/IdeologyAddon/Ideology/HistoryEvents/ArgsNamesCustom.cs b/Source/IdeologyAddon/HistoryEvents/ArgsNamesCustom.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/HistoryEvents/ArgsNamesCustom.cs rename to Source/IdeologyAddon/HistoryEvents/ArgsNamesCustom.cs diff --git a/Source/IdeologyAddon/Ideology/HistoryEvents/DefExtension_EventOverrides.cs b/Source/IdeologyAddon/HistoryEvents/DefExtension_EventOverrides.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/HistoryEvents/DefExtension_EventOverrides.cs rename to Source/IdeologyAddon/HistoryEvents/DefExtension_EventOverrides.cs diff --git a/Source/IdeologyAddon/Ideology/HistoryEvents/DefExtension_SecondaryEvents.cs b/Source/IdeologyAddon/HistoryEvents/DefExtension_SecondaryEvents.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/HistoryEvents/DefExtension_SecondaryEvents.cs rename to Source/IdeologyAddon/HistoryEvents/DefExtension_SecondaryEvents.cs diff --git a/Source/IdeologyAddon/Ideology/HistoryEvents/HistoryEventDefExtensionMethods.cs b/Source/IdeologyAddon/HistoryEvents/HistoryEventDefExtensionMethods.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/HistoryEvents/HistoryEventDefExtensionMethods.cs rename to Source/IdeologyAddon/HistoryEvents/HistoryEventDefExtensionMethods.cs diff --git a/Source/IdeologyAddon/Ideology/HistoryEvents/TwoPawnEventRule.cs b/Source/IdeologyAddon/HistoryEvents/TwoPawnEventRule.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/HistoryEvents/TwoPawnEventRule.cs rename to Source/IdeologyAddon/HistoryEvents/TwoPawnEventRule.cs diff --git a/Source/IdeologyAddon/Ideology/IdeoUtility.cs b/Source/IdeologyAddon/IdeoUtility.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/IdeoUtility.cs rename to Source/IdeologyAddon/IdeoUtility.cs diff --git a/Source/IdeologyAddon/Ideology/Thought_IncreaseRecord.cs b/Source/IdeologyAddon/Ideology/Thought_IncreaseRecord.cs deleted file mode 100644 index d50eb50..0000000 --- a/Source/IdeologyAddon/Ideology/Thought_IncreaseRecord.cs +++ /dev/null @@ -1,54 +0,0 @@ -using RimWorld; -using Verse; - -namespace RJWSexperience.Ideology -{ - public class Thought_IncreaseRecord : Thought_Recordbased - { - protected float recordIncrement; - - public override void ExposeData() - { - base.ExposeData(); - Scribe_Values.Look(ref recordIncrement, "recordIncrement", recordIncrement, true); - } - - public override void ThoughtInterval() - { - base.ThoughtInterval(); - if (recordIncrement != 0) - { - pawn.records.AddTo(RecordDef, recordIncrement); - recordIncrement = 0; - } - } - - public override bool TryMergeWithExistingMemory(out bool showBubble) - { - ThoughtHandler thoughts = pawn.needs.mood.thoughts; - if (thoughts.memories.NumMemoriesInGroup(this) >= def.stackLimit) - { - Thought_IncreaseRecord thought_Memory = (Thought_IncreaseRecord)thoughts.memories.OldestMemoryInGroup(this); - if (thought_Memory != null) - { - showBubble = (thought_Memory.age > thought_Memory.def.DurationTicks / 2); - thought_Memory.Merged(); - return true; - } - } - showBubble = true; - return false; - } - - public override void Init() - { - base.Init(); - recordIncrement = Def.increment; - } - protected virtual void Merged() - { - age = 0; - recordIncrement += Def.increment; - } - } -} diff --git a/Source/IdeologyAddon/Ideology/Thought_Opinionbased.cs b/Source/IdeologyAddon/Ideology/Thought_Opinionbased.cs deleted file mode 100644 index 16a83b4..0000000 --- a/Source/IdeologyAddon/Ideology/Thought_Opinionbased.cs +++ /dev/null @@ -1,38 +0,0 @@ -using RimWorld; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - -namespace RJWSexperience.Ideology -{ - /// - /// ThoughtDef using opinion - /// - public class ThoughtDef_Opinionbased : ThoughtDef - { - [SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")] - public List minimumValueforStage = new List(); - } - - /// - /// Thought class using record. - /// - public class Thought_Opinionbased : Thought_Memory - { - protected ThoughtDef_Opinionbased Def => (ThoughtDef_Opinionbased)def; - protected List MinimumValueforStage => Def.minimumValueforStage; - - public override int CurStageIndex - { - get - { - float value = 0f; - if (otherPawn != null) value = pawn.relations?.OpinionOf(otherPawn) ?? 0f; - for (int i = MinimumValueforStage.Count - 1; i > 0; i--) - { - if (MinimumValueforStage[i] < value) return i; - } - return 0; - } - } - } -} diff --git a/Source/IdeologyAddon/IdeologyAddon.csproj b/Source/IdeologyAddon/IdeologyAddon.csproj index 96f92ee..131a6c5 100644 --- a/Source/IdeologyAddon/IdeologyAddon.csproj +++ b/Source/IdeologyAddon/IdeologyAddon.csproj @@ -44,53 +44,53 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + diff --git a/Source/IdeologyAddon/Ideology/InteractionDefExtension_HistoryEvents.cs b/Source/IdeologyAddon/InteractionDefExtension_HistoryEvents.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/InteractionDefExtension_HistoryEvents.cs rename to Source/IdeologyAddon/InteractionDefExtension_HistoryEvents.cs diff --git a/Source/IdeologyAddon/Ideology/Keyed.cs b/Source/IdeologyAddon/Keyed.cs similarity index 93% rename from Source/IdeologyAddon/Ideology/Keyed.cs rename to Source/IdeologyAddon/Keyed.cs index 58c89cf..8a98c01 100644 --- a/Source/IdeologyAddon/Ideology/Keyed.cs +++ b/Source/IdeologyAddon/Keyed.cs @@ -1,6 +1,6 @@ using Verse; -namespace RJWSexperience +namespace RJWSexperience.Ideology { public static class Keyed { diff --git a/Source/IdeologyAddon/Ideology/Patches/RJW_Patch_ChancePerHour.cs b/Source/IdeologyAddon/Patches/RJW_Patch_ChancePerHour.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Patches/RJW_Patch_ChancePerHour.cs rename to Source/IdeologyAddon/Patches/RJW_Patch_ChancePerHour.cs diff --git a/Source/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs b/Source/IdeologyAddon/Patches/RJW_Patch_Ideo.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs rename to Source/IdeologyAddon/Patches/RJW_Patch_Ideo.cs diff --git a/Source/IdeologyAddon/Ideology/Patches/Rimworld_Patch.cs b/Source/IdeologyAddon/Patches/Rimworld_Patch.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Patches/Rimworld_Patch.cs rename to Source/IdeologyAddon/Patches/Rimworld_Patch.cs diff --git a/Source/IdeologyAddon/Ideology/Patches/Sexperience_Patch.cs b/Source/IdeologyAddon/Patches/Sexperience_Patch.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Patches/Sexperience_Patch.cs rename to Source/IdeologyAddon/Patches/Sexperience_Patch.cs diff --git a/Source/IdeologyAddon/Ideology/PreceptWorkers/ThoughtWorker_Precept_GenitalSize.cs b/Source/IdeologyAddon/PreceptWorkers/ThoughtWorker_Precept_GenitalSize.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/PreceptWorkers/ThoughtWorker_Precept_GenitalSize.cs rename to Source/IdeologyAddon/PreceptWorkers/ThoughtWorker_Precept_GenitalSize.cs diff --git a/Source/IdeologyAddon/Ideology/PreceptWorkers/ThoughtWorker_Precept_GenitalSize_Social.cs b/Source/IdeologyAddon/PreceptWorkers/ThoughtWorker_Precept_GenitalSize_Social.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/PreceptWorkers/ThoughtWorker_Precept_GenitalSize_Social.cs rename to Source/IdeologyAddon/PreceptWorkers/ThoughtWorker_Precept_GenitalSize_Social.cs diff --git a/Source/IdeologyAddon/Ideology/PreceptWorkers/ThoughtWorker_Precept_NonPregnant.cs b/Source/IdeologyAddon/PreceptWorkers/ThoughtWorker_Precept_NonPregnant.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/PreceptWorkers/ThoughtWorker_Precept_NonPregnant.cs rename to Source/IdeologyAddon/PreceptWorkers/ThoughtWorker_Precept_NonPregnant.cs diff --git a/Source/IdeologyAddon/Ideology/PreceptWorkers/ThoughtWorker_Precept_NonPregnant_Social.cs b/Source/IdeologyAddon/PreceptWorkers/ThoughtWorker_Precept_NonPregnant_Social.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/PreceptWorkers/ThoughtWorker_Precept_NonPregnant_Social.cs rename to Source/IdeologyAddon/PreceptWorkers/ThoughtWorker_Precept_NonPregnant_Social.cs diff --git a/Source/IdeologyAddon/Ideology/PreceptWorkers/ThoughtWorker_Precept_Pregnant.cs b/Source/IdeologyAddon/PreceptWorkers/ThoughtWorker_Precept_Pregnant.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/PreceptWorkers/ThoughtWorker_Precept_Pregnant.cs rename to Source/IdeologyAddon/PreceptWorkers/ThoughtWorker_Precept_Pregnant.cs diff --git a/Source/IdeologyAddon/Ideology/PreceptWorkers/ThoughtWorker_Precept_Pregnant_Social.cs b/Source/IdeologyAddon/PreceptWorkers/ThoughtWorker_Precept_Pregnant_Social.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/PreceptWorkers/ThoughtWorker_Precept_Pregnant_Social.cs rename to Source/IdeologyAddon/PreceptWorkers/ThoughtWorker_Precept_Pregnant_Social.cs diff --git a/Source/IdeologyAddon/Ideology/Precepts/Comp_KnowsMemoryThought_Gendered.cs b/Source/IdeologyAddon/Precepts/Comp_KnowsMemoryThought_Gendered.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Precepts/Comp_KnowsMemoryThought_Gendered.cs rename to Source/IdeologyAddon/Precepts/Comp_KnowsMemoryThought_Gendered.cs diff --git a/Source/IdeologyAddon/Ideology/Precepts/Comp_SelfTookMemoryThought_Gendered.cs b/Source/IdeologyAddon/Precepts/Comp_SelfTookMemoryThought_Gendered.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Precepts/Comp_SelfTookMemoryThought_Gendered.cs rename to Source/IdeologyAddon/Precepts/Comp_SelfTookMemoryThought_Gendered.cs diff --git a/Source/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyBestialityMtb.cs b/Source/IdeologyAddon/Precepts/DefExtension_ModifyBestialityMtb.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyBestialityMtb.cs rename to Source/IdeologyAddon/Precepts/DefExtension_ModifyBestialityMtb.cs diff --git a/Source/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyFappinMtb.cs b/Source/IdeologyAddon/Precepts/DefExtension_ModifyFappinMtb.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyFappinMtb.cs rename to Source/IdeologyAddon/Precepts/DefExtension_ModifyFappinMtb.cs diff --git a/Source/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyMtb.cs b/Source/IdeologyAddon/Precepts/DefExtension_ModifyMtb.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyMtb.cs rename to Source/IdeologyAddon/Precepts/DefExtension_ModifyMtb.cs diff --git a/Source/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyNecroMtb.cs b/Source/IdeologyAddon/Precepts/DefExtension_ModifyNecroMtb.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyNecroMtb.cs rename to Source/IdeologyAddon/Precepts/DefExtension_ModifyNecroMtb.cs diff --git a/Source/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyPreference.cs b/Source/IdeologyAddon/Precepts/DefExtension_ModifyPreference.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyPreference.cs rename to Source/IdeologyAddon/Precepts/DefExtension_ModifyPreference.cs diff --git a/Source/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyRapeCPMtb.cs b/Source/IdeologyAddon/Precepts/DefExtension_ModifyRapeCPMtb.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Precepts/DefExtension_ModifyRapeCPMtb.cs rename to Source/IdeologyAddon/Precepts/DefExtension_ModifyRapeCPMtb.cs diff --git a/Source/IdeologyAddon/Ideology/Precepts/DefExtension_MultipleMemesRequired.cs b/Source/IdeologyAddon/Precepts/DefExtension_MultipleMemesRequired.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Precepts/DefExtension_MultipleMemesRequired.cs rename to Source/IdeologyAddon/Precepts/DefExtension_MultipleMemesRequired.cs diff --git a/Source/IdeologyAddon/Ideology/RelationFilter.cs b/Source/IdeologyAddon/RelationFilter.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/RelationFilter.cs rename to Source/IdeologyAddon/RelationFilter.cs diff --git a/Source/IdeologyAddon/Ideology/Rituals/JobGiver_DrugOrgy.cs b/Source/IdeologyAddon/Rituals/JobGiver_DrugOrgy.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Rituals/JobGiver_DrugOrgy.cs rename to Source/IdeologyAddon/Rituals/JobGiver_DrugOrgy.cs diff --git a/Source/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangConsensual.cs b/Source/IdeologyAddon/Rituals/JobGiver_GangbangConsensual.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangConsensual.cs rename to Source/IdeologyAddon/Rituals/JobGiver_GangbangConsensual.cs diff --git a/Source/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangVictim.cs b/Source/IdeologyAddon/Rituals/JobGiver_GangbangVictim.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangVictim.cs rename to Source/IdeologyAddon/Rituals/JobGiver_GangbangVictim.cs diff --git a/Source/IdeologyAddon/Ideology/Rituals/LordJob_Rituals.cs b/Source/IdeologyAddon/Rituals/LordJob_Rituals.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Rituals/LordJob_Rituals.cs rename to Source/IdeologyAddon/Rituals/LordJob_Rituals.cs diff --git a/Source/IdeologyAddon/Ideology/Rituals/RitualBehaviorWorkers.cs b/Source/IdeologyAddon/Rituals/RitualBehaviorWorkers.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Rituals/RitualBehaviorWorkers.cs rename to Source/IdeologyAddon/Rituals/RitualBehaviorWorkers.cs diff --git a/Source/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs b/Source/IdeologyAddon/Rituals/RitualOutcomeComps.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs rename to Source/IdeologyAddon/Rituals/RitualOutcomeComps.cs diff --git a/Source/IdeologyAddon/Ideology/Rituals/RitualRoles.cs b/Source/IdeologyAddon/Rituals/RitualRoles.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/Rituals/RitualRoles.cs rename to Source/IdeologyAddon/Rituals/RitualRoles.cs diff --git a/Source/IdeologyAddon/Ideology/RsiHistoryEventDefOf.cs b/Source/IdeologyAddon/RsiHistoryEventDefOf.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/RsiHistoryEventDefOf.cs rename to Source/IdeologyAddon/RsiHistoryEventDefOf.cs diff --git a/Source/IdeologyAddon/Ideology/SinglePawnFilter.cs b/Source/IdeologyAddon/SinglePawnFilter.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/SinglePawnFilter.cs rename to Source/IdeologyAddon/SinglePawnFilter.cs diff --git a/Source/IdeologyAddon/Ideology/StatParts.cs b/Source/IdeologyAddon/StatParts.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/StatParts.cs rename to Source/IdeologyAddon/StatParts.cs diff --git a/Source/IdeologyAddon/Thoughts/ThoughtDefExtension_IncreaseRecord.cs b/Source/IdeologyAddon/Thoughts/ThoughtDefExtension_IncreaseRecord.cs index 63ce3d7..cf53e45 100644 --- a/Source/IdeologyAddon/Thoughts/ThoughtDefExtension_IncreaseRecord.cs +++ b/Source/IdeologyAddon/Thoughts/ThoughtDefExtension_IncreaseRecord.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Verse; -namespace RJWSexperience +namespace RJWSexperience.Ideology { public class ThoughtDefExtension_IncreaseRecord : DefModExtension { diff --git a/Source/IdeologyAddon/Thoughts/Thought_IncreaseRecord.cs b/Source/IdeologyAddon/Thoughts/Thought_IncreaseRecord.cs index f229813..1299dd3 100644 --- a/Source/IdeologyAddon/Thoughts/Thought_IncreaseRecord.cs +++ b/Source/IdeologyAddon/Thoughts/Thought_IncreaseRecord.cs @@ -1,6 +1,6 @@ using RimWorld; -namespace RJWSexperience +namespace RJWSexperience.Ideology { /// /// Increments record every time the thought is added diff --git a/Source/IdeologyAddon/Ideology/TwoPawnFilter.cs b/Source/IdeologyAddon/TwoPawnFilter.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/TwoPawnFilter.cs rename to Source/IdeologyAddon/TwoPawnFilter.cs diff --git a/Source/IdeologyAddon/Ideology/VariousDefOf.cs b/Source/IdeologyAddon/VariousDefOf.cs similarity index 100% rename from Source/IdeologyAddon/Ideology/VariousDefOf.cs rename to Source/IdeologyAddon/VariousDefOf.cs