diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll
index b65ab1a..bd8049f 100644
Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ
diff --git a/Common/Defs/Genes/GeneCategories.xml b/Common/Defs/Genes/GeneCategories.xml
index ab92117..68dc199 100644
--- a/Common/Defs/Genes/GeneCategories.xml
+++ b/Common/Defs/Genes/GeneCategories.xml
@@ -50,15 +50,9 @@
- rjw_genes_damage
+ rjw_damage11
-
- rjw_genes_special
-
- 8
-
-
\ No newline at end of file
diff --git a/Common/Defs/Genes/GeneDefs_Damage.xml b/Common/Defs/Genes/GeneDefs_Damage.xml
index b3c21ef..5922066 100644
--- a/Common/Defs/Genes/GeneDefs_Damage.xml
+++ b/Common/Defs/Genes/GeneDefs_Damage.xml
@@ -4,7 +4,7 @@
rjw_genes_elasticity
- rjw_genes_damage
+ rjw_damageThis Xenotype cannot get stretched by huge penetrators.Genes/Icons/ElasticityRJW_Genes.Gene_Elasticity
diff --git a/Common/Defs/Genes/GeneDefs_SexSpecial.xml b/Common/Defs/Genes/GeneDefs_SexSpecial.xml
deleted file mode 100644
index 51d4269..0000000
--- a/Common/Defs/Genes/GeneDefs_SexSpecial.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- rjw_genes_orgasm_rush
-
- rjw_genes_special
- On Orgasm, carriers of this gene get a boost in activity. (rest-need is partially filled)
- 1
- UI/Memes/FleshPurity
- 1
-
-
-
\ No newline at end of file
diff --git a/Common/Defs/RaceGeneDefs/RaceGeneDefs_Vanilla_Racegroups.xml b/Common/Defs/RaceGeneDefs/RaceGeneDefs_Vanilla_Racegroups.xml
index cfd2154..8453665 100644
--- a/Common/Defs/RaceGeneDefs/RaceGeneDefs_Vanilla_Racegroups.xml
+++ b/Common/Defs/RaceGeneDefs/RaceGeneDefs_Vanilla_Racegroups.xml
@@ -6,31 +6,7 @@
Ears_Floppy
- 0.75
-
-
- Tail_Furry
- 0.2
-
-
- Furskin
- 0.5
-
-
- rjw_genes_canine_genitalia
- 0.4
-
-
- ViolenceDisabled
- 0.05
-
-
- PsychicBonding
- 0.05
-
-
- Mood_Sanguine
- 0.1
+ 0.9
@@ -43,30 +19,6 @@
Beauty_Ugly0.5
-
-
- Immunity_Strong
- 0.6
-
-
- ToxicEnvironmentResistance_Partial
- 0.4
-
-
- rjw_genes_ovipositor_genitalia
- 0.15
-
-
- rjw_genes_insectincubator
- 0.1
-
-
- rjw_genes_insectbreeder
- 0.1
-
-
- Body_Thin
- 0.3
@@ -75,22 +27,10 @@
FelineFeline_Group
-
- Tail_Furry
- 0.2
-
-
- Furskin
- 0.5
-
Ears_Cat0.9
-
- PsychicBonding
- 0.05
-
Sleepy0.25
@@ -98,49 +38,21 @@
DarkVision0.25
-
-
- rjw_genes_feline_genitalia
- 0.25
-
+
DragonDragon_Group
@@ -152,38 +64,6 @@
Headbone_CenterHorn0.9
-
-
- VoiceRoar
- 0.6
-
-
- MaxTemp_SmallIncrease
- 0.7
-
-
- MaxTemp_LargeIncrease
- 0.1
-
-
- rjw_genes_draconic_genitalia
- 0.6
-
-
- FireResistant
- 0.15
-
-
- rjw_genes_much_cum
- 0.3
-
-
- rjw_genes_very_much_cum
- 0.05
-
-
- Body_Hulk
- 0.7
@@ -192,33 +72,9 @@
RodentRodent_Group
-
- Furskin
- 0.2
-
Fertile0.25
-
-
- FastRunner
- 0.6
-
-
- rjw_genes_small_genitalia
- 0.6
-
-
- Immunity_Strong
- 0.4
-
-
- ToxicEnvironmentResistance_Partial
- 0.1
-
-
- Body_Thin
- 0.45
@@ -228,26 +84,33 @@
Raccon_Group
- Furskin
- 0.25
-
-
- Tail_Furry
- 0.25
-
+ StrongStomach
+ 0.5
+
+
+
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index ec21dd7..5abb92e 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ This is my first Mod I started from scratch so any feedback is very welcome.
See [planned things](TODOS.md) and feel free to contribute.
With the Human-Animal-Gene Inheritance we have a lot of XML that you can contribute!
-We have a [template](./Common/Defs/RaceGeneDefs/RaceGeneDefs_template.xml) and you can add animals and/or genes from mods there (Racegroups are base-rjw).
+We have a [template](./Common/Defs/RaceGeneDefs/RaceGeneDefs_template.xml) and you can add animals and/or genes from mods there.
## Bugs?
diff --git a/Source/GeneDefOf.cs b/Source/GeneDefOf.cs
index 744eb11..859f9e3 100644
--- a/Source/GeneDefOf.cs
+++ b/Source/GeneDefOf.cs
@@ -10,8 +10,6 @@ namespace RJW_Genes
public static readonly GeneCategoryDef rjw_genes_genitalia_size;
public static readonly GeneCategoryDef rjw_genes_gender;
public static readonly GeneCategoryDef rjw_genes_breeding;
- public static readonly GeneCategoryDef rjw_genes_damage;
- public static readonly GeneCategoryDef rjw_genes_special;
// Base Genitalia Types
public static readonly GeneDef rjw_genes_equine_genitalia;
@@ -67,9 +65,5 @@ namespace RJW_Genes
// Damage & Side Effects
[MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_elasticity;
-
- // Special
- public static readonly GeneDef rjw_genes_orgasm_rush;
-
}
}
diff --git a/Source/Genes/Special/Patch_OrgasmRush.cs b/Source/Genes/Special/Patch_OrgasmRush.cs
deleted file mode 100644
index 7f4c167..0000000
--- a/Source/Genes/Special/Patch_OrgasmRush.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using HarmonyLib;
-using rjw;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RJW_Genes
-{
-
- [HarmonyPatch(typeof(SexUtility), nameof(SexUtility.SatisfyPersonal))]
- public static class Patch_OrgasmRush
- {
-
- private const float REST_INCREASE = 0.05f;
-
- public static void Postfix(SexProps props)
- {
- // ShortCuts: Exit Early if Pawn or Partner are null (can happen with Animals or Masturbation)
- if (props.pawn == null || !props.hasPartner())
- return;
-
- if (props.pawn.genes.HasGene(GeneDefOf.rjw_genes_orgasm_rush))
- {
- props.pawn.needs.rest.CurLevel += REST_INCREASE;
- }
- }
- }
-
-}
diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj
index 554b542..94d2403 100644
--- a/Source/Rjw-Genes.csproj
+++ b/Source/Rjw-Genes.csproj
@@ -116,7 +116,6 @@
-
diff --git a/TODOS.md b/TODOS.md
index 0dc2a0a..a03b835 100644
--- a/TODOS.md
+++ b/TODOS.md
@@ -12,14 +12,10 @@ Showstopper here is the amount of code required, and that I need to understand a
**Infectious Hypersexuality Gene** (Maybe?) add Hypersexuality Gene through sex with a certain chance.
+**Stat Boost on Orgasm** restore stamina
+
**Cum Addiction** add Cum-Addiction from Sexpererience, slowly loose conciousness while addiction is not attended.
-**Cum-Drugs** eating cum has an effect similar to Go-Juice (including (separate?) addiction)
-
-**More Orgasm Boost** currently only does sleep, other things could be cool here too. Maybe a separate hediff boosting movement or fight.
-
-**Self-Fertilizing Eggs** Pawns fertilize eggs that are put inside them (with themselves as a parent)
-
## Animal Gene Inheritance
It should be doable to have a per-category list of genes that a child can inherit on bestiality.
@@ -38,11 +34,4 @@ There were some suggestions on the Discord I saved them somewhere else. I am far
- Genitalia deal damage as per size (on normal sex-use)
- Genitalia can cause Terror (as ability)
- Cumshot Sniper Abilities
-- Healing Pussy
-
-## Things to add/change for base-rjw
-
-(Bit dependable on RJW-Core people)
-
-1. Make Racegroup-Defs accessible and non-private [This file here](https://gitgud.io/Ed86/rjw/-/blob/master/1.4/Source/Common/Helpers/RaceGroupDef_Helper.cs)
-2. Make [this](https://gitgud.io/Ed86/rjw/-/blob/master/1.4/Source/Common/Helpers/Gender_Helper.cs#L316) not warn, to reduce errors towards users
\ No newline at end of file
+- Healing Pussy
\ No newline at end of file