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

Change VariousDefOf to RsDefOf

Browse source 
Fix some IDE messages
This commit is contained in:
amevarashi 2023-04-17 16:34:35 +05:00
parent 8a48d2e463
commit 67c2328ad6
23 changed files with 196 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Source/RJWSexperience/SexHistory/RecordRandomizer.cs
View file

@ -95,8 +95,8 @@ namespace RJWSexperience.SexHistory
minValue = float.MinValue;
value = Mathf.Clamp(value, minValue, float.MaxValue);
float recordvalue = pawn.records.GetValue(VariousDefOf.Lust);
pawn.records.AddTo(VariousDefOf.Lust, value - recordvalue);
float recordvalue = pawn.records.GetValue(RsDefOf.Record.Lust);
pawn.records.AddTo(RsDefOf.Record.Lust, value - recordvalue);
return value;
}
@ -145,7 +145,7 @@ namespace RJWSexperience.SexHistory
totalSexCount += RandomizeRecord(pawn, xxx.CountOfSexWithHumanlikes, avgsex, deviation);
if (totalSexCount > 0)
pawn.records.AddTo(VariousDefOf.SexPartnerCount, Math.Max(1, Rand.Range(0, totalSexCount / 7)));
pawn.records.AddTo(RsDefOf.Record.SexPartnerCount, Math.Max(1, Rand.Range(0, totalSexCount / 7)));
return totalSexCount;
}
@ -170,67 +170,67 @@ namespace RJWSexperience.SexHistory
Gender prefer = PreferredGender(pawn);
int sex = (int)(totalsex * RJWPreferenceSettings.vaginal / totalweight);
totalsex -= sex;
pawn.records.AddTo(VariousDefOf.VaginalSexCount, sex);
pawn.records.AddTo(RsDefOf.Record.VaginalSexCount, sex);
sex = (int)(totalsex * RJWPreferenceSettings.anal / totalweight);
totalsex -= sex;
pawn.records.AddTo(VariousDefOf.AnalSexCount, sex);
pawn.records.AddTo(RsDefOf.Record.AnalSexCount, sex);
sex = (int)(totalsex * RJWPreferenceSettings.fellatio / totalweight);
totalsex -= sex;
if (prefer == Gender.Male) pawn.records.AddTo(VariousDefOf.BlowjobCount, sex);
else pawn.records.AddTo(VariousDefOf.OralSexCount, sex);
if (prefer == Gender.Male) pawn.records.AddTo(RsDefOf.Record.BlowjobCount, sex);
else pawn.records.AddTo(RsDefOf.Record.OralSexCount, sex);
sex = (int)(totalsex * RJWPreferenceSettings.cunnilingus / totalweight);
totalsex -= sex;
if (prefer == Gender.Male) pawn.records.AddTo(VariousDefOf.OralSexCount, sex);
else pawn.records.AddTo(VariousDefOf.CunnilingusCount, sex);
if (prefer == Gender.Male) pawn.records.AddTo(RsDefOf.Record.OralSexCount, sex);
else pawn.records.AddTo(RsDefOf.Record.CunnilingusCount, sex);
sex = (int)(totalsex * RJWPreferenceSettings.rimming / totalweight);
totalsex -= sex;
pawn.records.AddTo(VariousDefOf.MiscSexualBehaviorCount, sex);
pawn.records.AddTo(RsDefOf.Record.MiscSexualBehaviorCount, sex);
sex = (int)(totalsex * RJWPreferenceSettings.double_penetration / totalweight) / 2;
totalsex -= sex;
totalsex -= sex;
pawn.records.AddTo(VariousDefOf.VaginalSexCount, sex);
pawn.records.AddTo(VariousDefOf.AnalSexCount, sex);
pawn.records.AddTo(RsDefOf.Record.VaginalSexCount, sex);
pawn.records.AddTo(RsDefOf.Record.AnalSexCount, sex);
sex = (int)(totalsex * RJWPreferenceSettings.breastjob / totalweight);
totalsex -= sex;
pawn.records.AddTo(VariousDefOf.MiscSexualBehaviorCount, sex);
pawn.records.AddTo(RsDefOf.Record.MiscSexualBehaviorCount, sex);
sex = (int)(totalsex * RJWPreferenceSettings.handjob / totalweight);
totalsex -= sex;
if (prefer == Gender.Male) pawn.records.AddTo(VariousDefOf.HandjobCount, sex);
else pawn.records.AddTo(VariousDefOf.GenitalCaressCount, sex);
if (prefer == Gender.Male) pawn.records.AddTo(RsDefOf.Record.HandjobCount, sex);
else pawn.records.AddTo(RsDefOf.Record.GenitalCaressCount, sex);
sex = (int)(totalsex * RJWPreferenceSettings.fingering / totalweight);
totalsex -= sex;
if (prefer == Gender.Female) pawn.records.AddTo(VariousDefOf.FingeringCount, sex);
else pawn.records.AddTo(VariousDefOf.GenitalCaressCount, sex);
if (prefer == Gender.Female) pawn.records.AddTo(RsDefOf.Record.FingeringCount, sex);
else pawn.records.AddTo(RsDefOf.Record.GenitalCaressCount, sex);
sex = (int)(totalsex * RJWPreferenceSettings.mutual_masturbation / totalweight);
totalsex -= sex;
if (prefer == Gender.Male) pawn.records.AddTo(VariousDefOf.HandjobCount, sex);
else pawn.records.AddTo(VariousDefOf.FingeringCount, sex);
pawn.records.AddTo(VariousDefOf.GenitalCaressCount, sex);
if (prefer == Gender.Male) pawn.records.AddTo(RsDefOf.Record.HandjobCount, sex);
else pawn.records.AddTo(RsDefOf.Record.FingeringCount, sex);
pawn.records.AddTo(RsDefOf.Record.GenitalCaressCount, sex);
sex = (int)(totalsex * RJWPreferenceSettings.footjob / totalweight);
totalsex -= sex;
pawn.records.AddTo(VariousDefOf.FootjobCount, sex);
pawn.records.AddTo(RsDefOf.Record.FootjobCount, sex);
sex = (int)(totalsex * RJWPreferenceSettings.scissoring / totalweight);
totalsex -= sex;
pawn.records.AddTo(VariousDefOf.MiscSexualBehaviorCount, sex);
pawn.records.AddTo(RsDefOf.Record.MiscSexualBehaviorCount, sex);
sex = (int)(totalsex * RJWPreferenceSettings.fisting / totalweight);
totalsex -= sex;
pawn.records.AddTo(VariousDefOf.MiscSexualBehaviorCount, sex);
pawn.records.AddTo(RsDefOf.Record.MiscSexualBehaviorCount, sex);
pawn.records.AddTo(VariousDefOf.OralSexCount, totalsex);
if (prefer == Gender.Male) pawn.records.AddTo(VariousDefOf.BlowjobCount, totalsex);
else pawn.records.AddTo(VariousDefOf.CunnilingusCount, totalsex);
pawn.records.AddTo(RsDefOf.Record.OralSexCount, totalsex);
if (prefer == Gender.Male) pawn.records.AddTo(RsDefOf.Record.BlowjobCount, totalsex);
else pawn.records.AddTo(RsDefOf.Record.CunnilingusCount, totalsex);
}
private static Gender PreferredGender(Pawn pawn)

4
Source/RJWSexperience/SexHistory/SexHistoryComp.cs
View file

@ -291,7 +291,7 @@ namespace RJWSexperience.SexHistory
SexPartnerHistoryRecord newRecord = new SexPartnerHistoryRecord(partner, partner.IsIncest(ParentPawn));
histories.Add(partnerId, newRecord);
ParentPawn.records.Increment(VariousDefOf.SexPartnerCount);
ParentPawn.records.Increment(RsDefOf.Record.SexPartnerCount);
return newRecord;
}
@ -442,7 +442,7 @@ namespace RJWSexperience.SexHistory
defaultLabel = Keyed.RS_Sex_History,
icon = HistoryUtility.HistoryIcon,
defaultIconColor = HistoryUtility.HistoryColor,
hotKey = VariousDefOf.OpenSexStatistics,
hotKey = RsDefOf.KeyBinding.OpenSexStatistics,
action = () => UI.SexStatusWindow.ToggleWindow(this)
};
}

20
Source/RJWSexperience/SexHistory/UI/SexStatusViewModel.cs
View file

@ -163,7 +163,7 @@ namespace RJWSexperience.SexHistory.UI
}
SexTypes.Add(new BarInfo(
label: String.Format(Keyed.RS_Sex_Partners + ": {0} ({1})", _history.PartnerCount, Pawn.records.GetValue(VariousDefOf.SexPartnerCount)),
label: String.Format(Keyed.RS_Sex_Partners + ": {0} ({1})", _history.PartnerCount, Pawn.records.GetValue(RsDefOf.Record.SexPartnerCount)),
fillPercent: _history.PartnerCount / 50,
fillTexture: HistoryUtility.Partners));
@ -178,7 +178,7 @@ namespace RJWSexperience.SexHistory.UI
fillTexture: HistoryUtility.TotalSex,
labelRight: Keyed.RS_SatAVG(_history.AVGSat));
float lust = Pawn.records.GetValue(VariousDefOf.Lust);
float lust = Pawn.records.GetValue(RsDefOf.Record.Lust);
float sexDrive = GetStatValue(xxx.sex_drive_stat);
float lustLimit = SexperienceMod.Settings.LustLimit * 3f;
Lust = new BarInfo(
@ -212,14 +212,14 @@ namespace RJWSexperience.SexHistory.UI
fillPercent: _history.IncestuousCount / 50,
fillTexture: HistoryUtility.Nurgle);
float amountofEatenCum = Pawn.records.GetValue(VariousDefOf.AmountofEatenCum);
float amountofEatenCum = Pawn.records.GetValue(RsDefOf.Record.AmountofEatenCum);
ConsumedCum = new BarInfo(
label: String.Format(Keyed.RS_Cum_Swallowed + ": {0} mL, {1} " + Keyed.RS_NumofTimes, amountofEatenCum, Pawn.records.GetValue(VariousDefOf.NumofEatenCum)),
label: String.Format(Keyed.RS_Cum_Swallowed + ": {0} mL, {1} " + Keyed.RS_NumofTimes, amountofEatenCum, Pawn.records.GetValue(RsDefOf.Record.NumofEatenCum)),
fillPercent: amountofEatenCum / 1000,
fillTexture: Texture2D.linearGrayTexture);
Hediff cumHediff = Pawn.health.hediffSet.GetFirstHediffOfDef(VariousDefOf.CumAddiction)
?? Pawn.health.hediffSet.GetFirstHediffOfDef(VariousDefOf.CumTolerance);
Hediff cumHediff = Pawn.health.hediffSet.GetFirstHediffOfDef(RsDefOf.Hediff.CumAddiction)
?? Pawn.health.hediffSet.GetFirstHediffOfDef(RsDefOf.Hediff.CumTolerance);
if (cumHediff != null)
{
CumHediff = new BarInfo(
@ -254,15 +254,15 @@ namespace RJWSexperience.SexHistory.UI
fillTexture: HistoryUtility.Satisfaction,
tooltip: GetStatTooltip(xxx.sex_satisfaction, sexSatisfaction));
SkillRecord skill = Pawn.skills?.GetSkill(VariousDefOf.Sex);
SkillRecord skill = Pawn.skills?.GetSkill(RsDefOf.Skill.Sex);
float sexSkillLevel = skill?.Level ?? 0f;
float sexStat = Pawn.GetSexStat();
SexSkill = new BarInfo(
label: $"{Keyed.RS_SexSkill}: {sexSkillLevel}, {skill?.xpSinceLastLevel / skill?.XpRequiredForLevelUp:P2}",
fillPercent: sexSkillLevel / 20,
fillTexture: HistoryUtility.Tzeentch,
tooltip: GetStatTooltip(VariousDefOf.SexAbility, sexStat),
labelRight: VariousDefOf.SexAbility.LabelCap + ": " + sexStat.ToStringPercent(),
tooltip: GetStatTooltip(RsDefOf.Stat.SexAbility, sexStat),
labelRight: RsDefOf.Stat.SexAbility.LabelCap + ": " + sexStat.ToStringPercent(),
border: HistoryUtility.GetPassionBG(skill?.passion));
}
@ -294,7 +294,7 @@ namespace RJWSexperience.SexHistory.UI
private void UpdateVirginAndSexuality()
{
Trait virginity = Pawn.story?.traits?.GetTrait(VariousDefOf.Virgin);
Trait virginity = Pawn.story?.traits?.GetTrait(RsDefOf.Trait.Virgin);
if (virginity != null && virginity.Degree != Virginity.TraitDegree.FemaleAfterSurgery)
{
VirginLabel = virginity.Label;