AblativeAbsolute/RJW-Sexperience
1
0
Fork 0
mirror of https://github.com/amevarashi/RJW-Sexperience.git synced 2024-08-14 23:54:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Partial revert "Move/copy some classes to Ideology addon"

Browse source 
This reverts commit 99d3d18d8a.
This commit is contained in:
amevarashi 2022-04-18 19:11:12 +05:00
parent a7cdb15269
commit a34b539178
8 changed files with 176 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

42
RJWSexperience/IdeologyAddon/Ideology/Thought_Recordbased.cs
View file

@ -1,42 +0,0 @@
using RimWorld;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
namespace RJWSexperience.Ideology
{
/// <summary>
/// ThoughtDef using record
/// </summary>
public class ThoughtDef_Recordbased : ThoughtDef
{
[SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")]
public RecordDef recordDef;
[SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")]
public List<float> minimumValueforStage = new List<float>();
[SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")]
public float increment;
}
/// <summary>
/// Thought class using record.
/// </summary>
public class Thought_Recordbased : Thought_Memory
{
protected ThoughtDef_Recordbased Def => (ThoughtDef_Recordbased)def;
protected RecordDef RecordDef => Def.recordDef;
protected List<float> MinimumValueforStage => Def.minimumValueforStage;
public override int CurStageIndex
{
get
{
float value = pawn?.records?.GetValue(RecordDef) ?? 0f;
for (int i = MinimumValueforStage.Count - 1; i > 0; i--)
{
if (MinimumValueforStage[i] < value) return i + 1;
}
return 0;
}
}
}
}

3
RJWSexperience/IdeologyAddon/IdeologyAddon.csproj
View file

@ -76,9 +76,6 @@
<Compile Include="Ideology\Rituals\RitualRoles.cs" />
<Compile Include="Ideology\StatParts.cs" />
<Compile Include="Ideology\Utility.cs" />
<Compile Include="Ideology\Thought_IncreaseRecord.cs" />
<Compile Include="Ideology\Thought_Opinionbased.cs" />
<Compile Include="Ideology\Thought_Recordbased.cs" />
<Compile Include="VariousDefOf.cs" />
</ItemGroup>
<ItemGroup>

2
RJWSexperience/RJWSexperience/RJWSexperience.csproj
View file

@ -88,7 +88,7 @@
<Compile Include="Patches\RJW_Patch.cs" />
<Compile Include="SexperienceMod.cs" />
<Compile Include="StatParts.cs" />
<Compile Include="Thought_AteCum.cs" />
<Compile Include="Thought_Opinionbased.cs" />
<Compile Include="Thought_Recordbased.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UI\RJWUIUtility.cs" />

38
RJWSexperience/RJWSexperience/Thought_AteCum.cs
View file

@ -1,38 +0,0 @@
using RimWorld;
namespace RJWSexperience
{
public class Thought_AteCum : Thought_Recordbased
{
public override int CurStageIndex
{
get
{
if (pawn?.health?.hediffSet?.HasHediff(VariousDefOf.CumAddiction) ?? false) return MinimumValueforStage.Count;
return base.CurStageIndex;
}
}
public override bool TryMergeWithExistingMemory(out bool showBubble)
{
ThoughtHandler thoughts = pawn.needs.mood.thoughts;
if (thoughts.memories.NumMemoriesInGroup(this) >= def.stackLimit)
{
Thought_AteCum thought_Memory = (Thought_AteCum)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;
}
protected virtual void Merged()
{
age = 0;
}
}
}

42
RJWSexperience/RJWSexperience/Thought_Opinionbased.cs Normal file
View file

@ -0,0 +1,42 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Verse;
using RimWorld;
namespace RJWSexperience
{
/// <summary>
/// ThoughtDef using opinion
/// </summary>
public class ThoughtDef_Opinionbased : ThoughtDef
{
public List<float> minimumValueforStage = new List<float>();
}
/// <summary>
/// Thought class using record.
/// </summary>
public class Thought_Opinionbased : Thought_Memory
{
protected ThoughtDef_Opinionbased Def => (ThoughtDef_Opinionbased)def;
protected List<float> 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;
}
}
}
}

157
RJWSexperience/RJWSexperience/Thought_Recordbased.cs
View file

@ -1,40 +1,131 @@
using RimWorld;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Verse;
using RimWorld;
namespace RJWSexperience
{
/// <summary>
/// ThoughtDef using record
/// </summary>
public class ThoughtDef_Recordbased : ThoughtDef
{
[SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")]
public RecordDef recordDef;
[SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")]
public List<float> minimumValueforStage = new List<float>();
}
/// <summary>
/// ThoughtDef using record
/// </summary>
public class ThoughtDef_Recordbased : ThoughtDef
{
public RecordDef recordDef;
public List<float> minimumValueforStage = new List<float>();
public float increment;
}
/// <summary>
/// Thought class using record.
/// </summary>
public class Thought_Recordbased : Thought_Memory
{
protected ThoughtDef_Recordbased Def => (ThoughtDef_Recordbased)def;
protected RecordDef recordDef => Def.recordDef;
protected List<float> minimumValueforStage => Def.minimumValueforStage;
protected float increment => Def.increment;
public override int CurStageIndex
{
get
{
float value = pawn?.records?.GetValue(recordDef) ?? 0f;
for (int i = minimumValueforStage.Count - 1; i > 0; i--)
{
if (minimumValueforStage[i] < value) return i + 1;
}
return 0;
}
}
}
public class Thought_AteCum : Thought_Recordbased
{
public override int CurStageIndex
{
get
{
if (pawn?.health?.hediffSet?.HasHediff(VariousDefOf.CumAddiction) ?? false) return minimumValueforStage.Count;
return base.CurStageIndex;
}
}
public override bool TryMergeWithExistingMemory(out bool showBubble)
{
ThoughtHandler thoughts = pawn.needs.mood.thoughts;
if (thoughts.memories.NumMemoriesInGroup(this) >= def.stackLimit)
{
Thought_AteCum thought_Memory = (Thought_AteCum)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;
}
protected virtual void Merged()
{
age = 0;
}
}
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 = increment;
}
protected virtual void Merged()
{
age = 0;
recordIncrement += increment;
}
}
/// <summary>
/// Thought class using record.
/// </summary>
public class Thought_Recordbased : Thought_Memory
{
protected ThoughtDef_Recordbased Def => (ThoughtDef_Recordbased)def;
protected RecordDef RecordDef => Def.recordDef;
protected List<float> MinimumValueforStage => Def.minimumValueforStage;
public override int CurStageIndex
{
get
{
float value = pawn?.records?.GetValue(RecordDef) ?? 0f;
for (int i = MinimumValueforStage.Count - 1; i > 0; i--)
{
if (MinimumValueforStage[i] < value) return i + 1;
}
return 0;
}
}
}
}

6
RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Sex.xml
View file

@ -236,11 +236,11 @@
<!-- Thoughts -->
<RJWSexperience.Ideology.ThoughtDef_Recordbased>
<RJWSexperience.ThoughtDef_Recordbased>
<defName>Sex_Promiscuous</defName>
<durationDays>1</durationDays>
<stackLimit>1</stackLimit>
<thoughtClass>RJWSexperience.Ideology.Thought_IncreaseRecord</thoughtClass>
<thoughtClass>RJWSexperience.Thought_IncreaseRecord</thoughtClass>
<recordDef>Lust</recordDef>
<increment>3.0</increment>
<stages>
@ -250,7 +250,7 @@
<baseMoodEffect>5</baseMoodEffect>
</li>
</stages>
</RJWSexperience.Ideology.ThoughtDef_Recordbased>
</RJWSexperience.ThoughtDef_Recordbased>
<ThoughtDef>
<defName>Sex_NonPromiscuous</defName>

12
RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Virginity.xml
View file

@ -258,9 +258,9 @@
</stages>
</ThoughtDef>
<RJWSexperience.Ideology.ThoughtDef_Opinionbased>
<RJWSexperience.ThoughtDef_Opinionbased>
<defName>Virgin_Precious_Taken</defName>
<thoughtClass>RJWSexperience.Ideology.Thought_Opinionbased</thoughtClass>
<thoughtClass>RJWSexperience.Thought_Opinionbased</thoughtClass>
<durationDays>7</durationDays>
<stackLimit>1</stackLimit>
<minimumValueforStage>
@ -291,11 +291,11 @@
<baseMoodEffect>5</baseMoodEffect>
</li>
</stages>
</RJWSexperience.Ideology.ThoughtDef_Opinionbased>
</RJWSexperience.ThoughtDef_Opinionbased>
<RJWSexperience.Ideology.ThoughtDef_Opinionbased>
<RJWSexperience.ThoughtDef_Opinionbased>
<defName>Virgin_Shameful_Taken</defName>
<thoughtClass>RJWSexperience.Ideology.Thought_Opinionbased</thoughtClass>
<thoughtClass>RJWSexperience.Thought_Opinionbased</thoughtClass>
<durationDays>7</durationDays>
<stackLimit>1</stackLimit>
<minimumValueforStage>
@ -320,7 +320,7 @@
<baseMoodEffect>20</baseMoodEffect>
</li>
</stages>
</RJWSexperience.Ideology.ThoughtDef_Opinionbased>
</RJWSexperience.ThoughtDef_Opinionbased>
<ThoughtDef>