From 3beb2663f2cfc871b42da29c4f99cd072fb15930 Mon Sep 17 00:00:00 2001 From: Ed86 Date: Wed, 1 Jun 2022 12:23:51 +0300 Subject: [PATCH] fixes --- 1.3/Assemblies/STD.dll | Bin 19456 -> 19968 bytes 1.3/Defs/STDDefs/STDs.xml | 20 +++---- 1.3/Defs/ThoughtDefs/Thoughts_STD.xml | 6 +- 1.3/Source/STD/STD.csproj | 20 ++++--- .../STD/STDs/Boobitis/harmony_Boobitis.cs | 53 ++++++++++++++++++ .../STD/STDs/{ => Boobitis}/std_Boobitis.cs | 48 +--------------- .../STD/{Hediffs => STDs/HIV}/Hediff_ID.cs | 2 +- .../HIV}/ThoughtWorker_WastingAway.cs | 0 .../STD/STDs/HIV/harmony_Immunodeficiency.cs | 26 +++++++++ .../STDs/{ => HIV}/std_Immunodeficiency.cs | 19 +------ .../Rash}/ThoughtWorker_ItchyCrotch.cs | 0 1.3/Source/STD/STDs/Rash/harmony_Rash.cs | 26 +++++++++ 1.3/Source/STD/STDs/{ => Rash}/std_Rash.cs | 37 +++++------- .../ThoughtWorker_SyphiliticThoughts.cs | 2 +- .../STD/STDs/Syphilis/harmony_Syphilis.cs | 26 +++++++++ .../STD/STDs/{ => Syphilis}/std_Syphilis.cs | 27 ++------- 1.3/Source/STD/std.cs | 9 +-- 17 files changed, 180 insertions(+), 141 deletions(-) create mode 100644 1.3/Source/STD/STDs/Boobitis/harmony_Boobitis.cs rename 1.3/Source/STD/STDs/{ => Boobitis}/std_Boobitis.cs (63%) rename 1.3/Source/STD/{Hediffs => STDs/HIV}/Hediff_ID.cs (67%) rename 1.3/Source/STD/{Thoughts => STDs/HIV}/ThoughtWorker_WastingAway.cs (100%) create mode 100644 1.3/Source/STD/STDs/HIV/harmony_Immunodeficiency.cs rename 1.3/Source/STD/STDs/{ => HIV}/std_Immunodeficiency.cs (93%) rename 1.3/Source/STD/{Thoughts => STDs/Rash}/ThoughtWorker_ItchyCrotch.cs (100%) create mode 100644 1.3/Source/STD/STDs/Rash/harmony_Rash.cs rename 1.3/Source/STD/STDs/{ => Rash}/std_Rash.cs (69%) rename 1.3/Source/STD/{Thoughts => STDs/Syphilis}/ThoughtWorker_SyphiliticThoughts.cs (82%) create mode 100644 1.3/Source/STD/STDs/Syphilis/harmony_Syphilis.cs rename 1.3/Source/STD/STDs/{ => Syphilis}/std_Syphilis.cs (82%) diff --git a/1.3/Assemblies/STD.dll b/1.3/Assemblies/STD.dll index ea07a564b58bb4b3f75cba8e679b89bc7d3bc3aa..269d622bf64a1e9f12f689e44e69eec6c3f1c7ce 100644 GIT binary patch literal 19968 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 Izcldw06JC{iU0rr literal 19456 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 cpD5+uOL3?7Zw5W!nd;w*RR1BzzmW$1ACPT)eE - + HIV HIV consists of two parts: an acute and a chronic infection. Both parts follow the same course, reducing the infected pawn's blood filtration as their severity increases. The acute phase progresses rapidly but can be fought by the pawn's immune system, whereas the chronic phase progresses very slowly but can never be cured. Treatment can modestly slow the progress of the disease. @@ -10,9 +10,9 @@ 0.05 0.005 0.80 - + - + Herpes Herpes is an incurable but nonfatal disease. Affected pawns experience pain and itchiness in the affected body parts. Treatment is effective at reducing the intensity of the symptoms. @@ -23,9 +23,9 @@
  • Genitals
    •  -     + - + Warts Genital warts are unsightly and cause an itching/burning sensation. They are easily treated and never fatal. @@ -35,9 +35,9 @@
  • Genitals
    •  -     + - + Syphilis Syphilis is a serious disease that affects the mind. If left untreated, it leads to corrupted thoughts, mood problems, potential permanent damage to the brain, liver, and kidneys, and, ultimately, death. The good news is that it is easily defeated by proper treatment. @@ -45,9 +45,9 @@ 0.08 0.03 0.01 - + - + Boobitis Boobitis is a highly contagious mechanite plague that causes permanent breast growth if left untreated. It was initialy created as a harmless glittertech "party drug" but has since mutated and spread to virtually every human colony. @@ -59,5 +59,5 @@
  • Chest
    •  -     +     \ No newline at end of file diff --git a/1.3/Defs/ThoughtDefs/Thoughts_STD.xml b/1.3/Defs/ThoughtDefs/Thoughts_STD.xml index fb7fd6a..709b7d9 100644 --- a/1.3/Defs/ThoughtDefs/Thoughts_STD.xml +++ b/1.3/Defs/ThoughtDefs/Thoughts_STD.xml @@ -3,7 +3,7 @@ ItchyCrotch - rjw_std.ThoughtWorker_ItchyCrotch + STD.ThoughtWorker_ItchyCrotch
  • @@ -20,7 +20,7 @@ SyphiliticThoughts - rjw_std.ThoughtWorker_SyphiliticThoughts + STD.ThoughtWorker_SyphiliticThoughts
  • @@ -37,7 +37,7 @@ WastingAway - rjw_std.ThoughtWorker_WastingAway + STD.ThoughtWorker_WastingAway
  • diff --git a/1.3/Source/STD/STD.csproj b/1.3/Source/STD/STD.csproj index cb65ae1..092443f 100644 --- a/1.3/Source/STD/STD.csproj +++ b/1.3/Source/STD/STD.csproj @@ -60,19 +60,23 @@ - - + + + + + - + + - + - + - - - + + + diff --git a/1.3/Source/STD/STDs/Boobitis/harmony_Boobitis.cs b/1.3/Source/STD/STDs/Boobitis/harmony_Boobitis.cs new file mode 100644 index 0000000..e829822 --- /dev/null +++ b/1.3/Source/STD/STDs/Boobitis/harmony_Boobitis.cs @@ -0,0 +1,53 @@ +using Verse; +using HarmonyLib; +using System; +using rjw; + +namespace STD +{ + /// + ///boobitis increase sex need/make pawn horny + /// + [HarmonyPatch(typeof(Need_Sex), "diseasefactor")] + [StaticConstructorOnStartup] + static class SexNeed_diseasefactorSTD_Boobitis + { + [HarmonyPostfix] + private static void diseasefactor_StdPatch(Pawn pawn, ref float __result) + { + try + { + if (pawn.health.hediffSet.HasHediff(std_Boobitis.boobitis.hediff_def)) + { + __result *= 3f; + } + } + catch (Exception e) + { + Log.Error(e.ToString()); + } + } + } + + /// + /// boobitis increase breast size + /// this is probably outdated, but keep it for now atleast + /// + [HarmonyPatch(typeof(std_updater), "update")] + [StaticConstructorOnStartup] + static class std_updater_Boobitis + { + [HarmonyPostfix] + private static void updateSTD(Pawn p) + { + try + { + //std_Boobitis.update(p); + } + catch (Exception e) + { + Log.Error(e.ToString()); + } + } + } +} diff --git a/1.3/Source/STD/STDs/std_Boobitis.cs b/1.3/Source/STD/STDs/Boobitis/std_Boobitis.cs similarity index 63% rename from 1.3/Source/STD/STDs/std_Boobitis.cs rename to 1.3/Source/STD/STDs/Boobitis/std_Boobitis.cs index 381e827..ac76046 100644 --- a/1.3/Source/STD/STDs/std_Boobitis.cs +++ b/1.3/Source/STD/STDs/Boobitis/std_Boobitis.cs @@ -5,56 +5,12 @@ using rjw; namespace STD { - /// - ///boobitis increase sex need - /// - [HarmonyPatch(typeof(Need_Sex), "diseasefactor")] - [StaticConstructorOnStartup] - static class SexNeed_diseasefactorSTD_Boobitis - { - [HarmonyPostfix] - private static void diseasefactor_StdPatch(Pawn pawn, ref float __result) - { - try - { - if (pawn.health.hediffSet.HasHediff(std.boobitis.hediff_def)) - { - __result *= 3f; - } - } - catch (Exception e) - { - Log.Error(e.ToString()); - } - } - } - - /// - /// this is probably outdated, but keep it for now atleast - /// - [HarmonyPatch(typeof(std_updater), "update")] - [StaticConstructorOnStartup] - static class std_updater_Boobitis - { - [HarmonyPostfix] - private static void updateSTD(Pawn p) - { - try - { - //std_Boobitis.update(p); - } - catch (Exception e) - { - Log.Error(e.ToString()); - } - } - } - public static class std_Boobitis { + public static std_def boobitis = DefDatabase.GetNamed("Boobitis"); public static void update(Pawn pawn) { - if (pawn.health.hediffSet.HasHediff(std.boobitis.hediff_def)) + if (pawn.health.hediffSet.HasHediff(boobitis.hediff_def)) UpdateBoobitis(pawn); } diff --git a/1.3/Source/STD/Hediffs/Hediff_ID.cs b/1.3/Source/STD/STDs/HIV/Hediff_ID.cs similarity index 67% rename from 1.3/Source/STD/Hediffs/Hediff_ID.cs rename to 1.3/Source/STD/STDs/HIV/Hediff_ID.cs index 4184bcf..2cfaeb6 100644 --- a/1.3/Source/STD/Hediffs/Hediff_ID.cs +++ b/1.3/Source/STD/STDs/HIV/Hediff_ID.cs @@ -11,7 +11,7 @@ namespace STD { get { - if (!(pawn.health.hediffSet.HasHediff(std.ahiv.hediff_def) || pawn.health.hediffSet.HasHediff(std.chiv.hediff_def))) + if (!(pawn.health.hediffSet.HasHediff(std_Immunodeficiency.hiv.hediff_def))) return base.LabelBase; else return "AIDS"; diff --git a/1.3/Source/STD/Thoughts/ThoughtWorker_WastingAway.cs b/1.3/Source/STD/STDs/HIV/ThoughtWorker_WastingAway.cs similarity index 100% rename from 1.3/Source/STD/Thoughts/ThoughtWorker_WastingAway.cs rename to 1.3/Source/STD/STDs/HIV/ThoughtWorker_WastingAway.cs diff --git a/1.3/Source/STD/STDs/HIV/harmony_Immunodeficiency.cs b/1.3/Source/STD/STDs/HIV/harmony_Immunodeficiency.cs new file mode 100644 index 0000000..65af548 --- /dev/null +++ b/1.3/Source/STD/STDs/HIV/harmony_Immunodeficiency.cs @@ -0,0 +1,26 @@ +using Verse; +using HarmonyLib; +using System; +using rjw; +using RimWorld; + +namespace STD +{ + [HarmonyPatch(typeof(std_updater), "update")] + [StaticConstructorOnStartup] + static class std_updater_Immunodeficiency + { + [HarmonyPostfix] + private static void updateSTD(Pawn p) + { + try + { + std_Immunodeficiency.update(p); + } + catch (Exception e) + { + Log.Error(e.ToString()); + } + } + } +} diff --git a/1.3/Source/STD/STDs/std_Immunodeficiency.cs b/1.3/Source/STD/STDs/HIV/std_Immunodeficiency.cs similarity index 93% rename from 1.3/Source/STD/STDs/std_Immunodeficiency.cs rename to 1.3/Source/STD/STDs/HIV/std_Immunodeficiency.cs index 9521b13..dfca7ff 100644 --- a/1.3/Source/STD/STDs/std_Immunodeficiency.cs +++ b/1.3/Source/STD/STDs/HIV/std_Immunodeficiency.cs @@ -9,26 +9,9 @@ namespace STD /// /// add some infections /// - [HarmonyPatch(typeof(std_updater), "update")] - [StaticConstructorOnStartup] - static class std_updater_Immunodeficiency - { - [HarmonyPostfix] - private static void updateSTD(Pawn p) - { - try - { - std_Immunodeficiency.update(p); - } - catch (Exception e) - { - Log.Error(e.ToString()); - } - } - } - public static class std_Immunodeficiency { + public static std_def hiv = DefDatabase.GetNamed("HIV"); //vanilla rimworld public static readonly HediffDef immunodeficiency = DefDatabase.GetNamed("Immunodeficiency"); public static bool is_wasting_away(Pawn p) diff --git a/1.3/Source/STD/Thoughts/ThoughtWorker_ItchyCrotch.cs b/1.3/Source/STD/STDs/Rash/ThoughtWorker_ItchyCrotch.cs similarity index 100% rename from 1.3/Source/STD/Thoughts/ThoughtWorker_ItchyCrotch.cs rename to 1.3/Source/STD/STDs/Rash/ThoughtWorker_ItchyCrotch.cs diff --git a/1.3/Source/STD/STDs/Rash/harmony_Rash.cs b/1.3/Source/STD/STDs/Rash/harmony_Rash.cs new file mode 100644 index 0000000..43575ef --- /dev/null +++ b/1.3/Source/STD/STDs/Rash/harmony_Rash.cs @@ -0,0 +1,26 @@ +using Verse; +using HarmonyLib; +using rjw; +using System; +using RimWorld; + +namespace STD +{ + [HarmonyPatch(typeof(AfterSexUtility), "think_about_sex", new Type[] {typeof(Pawn), typeof(Pawn), typeof(bool), typeof(SexProps), typeof(bool)})] + [StaticConstructorOnStartup] + static class Aftersex_STDThoughtApply + { + [HarmonyPrefix] + private static void ThinkAboutDiseasesStdPatch(Pawn pawn, Pawn partner, bool isReceiving, SexProps props, bool whoring = false) + { + try + { + std_Rash.ThinkAboutDiseases(pawn, partner); + } + catch (Exception e) + { + Log.Error(e.ToString()); + } + } + } +} diff --git a/1.3/Source/STD/STDs/std_Rash.cs b/1.3/Source/STD/STDs/Rash/std_Rash.cs similarity index 69% rename from 1.3/Source/STD/STDs/std_Rash.cs rename to 1.3/Source/STD/STDs/Rash/std_Rash.cs index 3054d5d..d818dc0 100644 --- a/1.3/Source/STD/STDs/std_Rash.cs +++ b/1.3/Source/STD/STDs/Rash/std_Rash.cs @@ -6,49 +6,38 @@ using RimWorld; namespace STD { - /// - ///add aftersex thoughts about herpes, warts - /// - [HarmonyPatch(typeof(AfterSexUtility), "ThinkAboutDiseases")] - [StaticConstructorOnStartup] - static class Aftersex_STDThoughtApply - { - [HarmonyPrefix] - private static void ThinkAboutDiseasesStdPatch(Pawn pawn, Pawn partner) - { - try - { - std_Rash.ThinkAboutDiseases(pawn, partner); - } - catch (Exception e) - { - Log.Error(e.ToString()); - } - } - } - public static class std_Rash { + public static std_def herpes = DefDatabase.GetNamed("Herpes"); + public static std_def warts = DefDatabase.GetNamed("Warts"); + public static readonly ThoughtDef saw_rash_1 = DefDatabase.GetNamed("SawDiseasedPrivates1"); public static readonly ThoughtDef saw_rash_2 = DefDatabase.GetNamed("SawDiseasedPrivates2"); public static readonly ThoughtDef saw_rash_3 = DefDatabase.GetNamed("SawDiseasedPrivates3"); - // Returns how severely affected this pawn's crotch is by rashes and warts, on a scale from 0 to 3. + /// + /// Returns how severely affected this pawn's crotch is by rashes and warts, on a scale from 0 to 3. + /// + /// + /// public static int genital_rash_severity(Pawn p) { int tr = 0; - Hediff her = p.health.hediffSet.GetFirstHediffOfDef(std.herpes.hediff_def); + Hediff her = p.health.hediffSet.GetFirstHediffOfDef(std_Rash.herpes.hediff_def); if (her != null && her.Severity >= 0.25f) ++tr; - Hediff war = p.health.hediffSet.GetFirstHediffOfDef(std.warts.hediff_def); + Hediff war = p.health.hediffSet.GetFirstHediffOfDef(std_Rash.warts.hediff_def); if (war != null) tr += war.Severity < 0.40f ? 1 : 2; return tr; } + /// + ///add aftersex thoughts about herpes, warts + /// public static void ThinkAboutDiseases(Pawn pawn, Pawn partner) { if (pawn == null) diff --git a/1.3/Source/STD/Thoughts/ThoughtWorker_SyphiliticThoughts.cs b/1.3/Source/STD/STDs/Syphilis/ThoughtWorker_SyphiliticThoughts.cs similarity index 82% rename from 1.3/Source/STD/Thoughts/ThoughtWorker_SyphiliticThoughts.cs rename to 1.3/Source/STD/STDs/Syphilis/ThoughtWorker_SyphiliticThoughts.cs index 72eeba0..34e7fe0 100644 --- a/1.3/Source/STD/Thoughts/ThoughtWorker_SyphiliticThoughts.cs +++ b/1.3/Source/STD/STDs/Syphilis/ThoughtWorker_SyphiliticThoughts.cs @@ -7,7 +7,7 @@ namespace STD { protected override ThoughtState CurrentStateInternal(Pawn p) { - var syp = p.health.hediffSet.GetFirstHediffOfDef(std.syphilis.hediff_def); + var syp = p.health.hediffSet.GetFirstHediffOfDef(std_Syphilis.syphilis.hediff_def); if (syp != null) { if (syp.Severity >= 0.80f) diff --git a/1.3/Source/STD/STDs/Syphilis/harmony_Syphilis.cs b/1.3/Source/STD/STDs/Syphilis/harmony_Syphilis.cs new file mode 100644 index 0000000..43eddb1 --- /dev/null +++ b/1.3/Source/STD/STDs/Syphilis/harmony_Syphilis.cs @@ -0,0 +1,26 @@ +using Verse; +using HarmonyLib; +using System; +using rjw; +using RimWorld; + +namespace STD +{ + [HarmonyPatch(typeof(std_updater), "update")] + [StaticConstructorOnStartup] + static class std_updater_Syphilis + { + [HarmonyPostfix] + private static void updateSTD(Pawn p) + { + try + { + std_Syphilis.update(p); + } + catch (Exception e) + { + Log.Error(e.ToString()); + } + } + } +} diff --git a/1.3/Source/STD/STDs/std_Syphilis.cs b/1.3/Source/STD/STDs/Syphilis/std_Syphilis.cs similarity index 82% rename from 1.3/Source/STD/STDs/std_Syphilis.cs rename to 1.3/Source/STD/STDs/Syphilis/std_Syphilis.cs index c67b6af..9998d60 100644 --- a/1.3/Source/STD/STDs/std_Syphilis.cs +++ b/1.3/Source/STD/STDs/Syphilis/std_Syphilis.cs @@ -9,36 +9,19 @@ namespace STD /// /// do damage to pawn health /// - [HarmonyPatch(typeof(std_updater), "update")] - [StaticConstructorOnStartup] - static class std_updater_Syphilis - { - [HarmonyPostfix] - private static void updateSTD(Pawn p) - { - try - { - std_Syphilis.update(p); - } - catch (Exception e) - { - Log.Error(e.ToString()); - } - } - } - public static class std_Syphilis { + public static std_def syphilis = DefDatabase.GetNamed("Syphilis"); public static void update(Pawn pawn) { - if (pawn.health.hediffSet.HasHediff(std.syphilis.hediff_def)) + if (pawn.health.hediffSet.HasHediff(syphilis.hediff_def)) roll_for_syphilis_damage(pawn); } //[SyncMethod] public static void roll_for_syphilis_damage(Pawn p) { - Hediff syp = p.health.hediffSet.GetFirstHediffOfDef(std.syphilis.hediff_def); + Hediff syp = p.health.hediffSet.GetFirstHediffOfDef(syphilis.hediff_def); if (syp == null || !(syp.Severity >= 0.60f) || syp.FullyImmune()) return; // A 30% chance per day of getting any permanent damage works out to ~891 in 1 million for each roll @@ -89,9 +72,9 @@ namespace STD inj.Severity = sev; inj.TryGetComp().IsPermanent = true; p.health.AddHediff(inj, part, null); - string message_title = std.syphilis.label + " Damage"; + string message_title = syphilis.label + " Damage"; string baby_pronoun = p.gender == Gender.Male ? "his" : "her"; - string message_text = "RJW_Syphilis_Damage_Message".Translate(xxx.get_pawnname(p), baby_pronoun, part.def.label, std.syphilis.label).CapitalizeFirst(); + string message_text = "RJW_Syphilis_Damage_Message".Translate(xxx.get_pawnname(p), baby_pronoun, part.def.label, syphilis.label).CapitalizeFirst(); Find.LetterStack.ReceiveLetter(message_title, message_text, LetterDefOf.ThreatSmall, p); } } diff --git a/1.3/Source/STD/std.cs b/1.3/Source/STD/std.cs index 33aec02..16ebf7d 100644 --- a/1.3/Source/STD/std.cs +++ b/1.3/Source/STD/std.cs @@ -10,14 +10,7 @@ namespace STD /// public static class std { - //STDs - public static std_def ahiv = DefDatabase.GetNamed("AcuteHIV"); - public static std_def chiv = DefDatabase.GetNamed("ChronicHIV"); - public static std_def herpes = DefDatabase.GetNamed("Herpes"); - public static std_def warts = DefDatabase.GetNamed("Warts"); - public static std_def syphilis = DefDatabase.GetNamed("Syphilis"); - public static std_def boobitis = DefDatabase.GetNamed("Boobitis"); - + //all STDs public static List all => DefDatabase.AllDefsListForReading; public static Hediff get_infection(Pawn p, std_def sd)