-
- https://github.com/vegapnk/RJW-Genes/tree/main/About/Manifest.xml
- https://github.com/vegapnk/RJW-Genes
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50a2b82..0d034b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,6 @@
- Animal Gene Inheritance Gene-Chance Multiplier per Setting (#13, Shabakur)
- Lots of Debug-Only Logging for Animal Gene Inheritance
- Patches for some popular Xenotype Mods (Nyaron, Kijin3, Roos Minotaurs, VRE Phytokin)
-- Generous Donor Cheatmode
- Mod-Settings
## Fertilin:
@@ -54,16 +53,6 @@ Xenotypes:
Incubi and Succubi can spawn in a special event at night when pawns have low sex need. Cumazones can just appear randomly.
-**_On Inheritance:_**
-
-We realized that it's not nice if the Succubi Babies do not have all Succubi Genes, and have Fertilin with no use for it or look like wookies instead. Hence, we changed the Fertilin Xenotypes to be Xenogenes (non-inheritable) *BUT* we recommend using the [dominant-gene](https://steamcommunity.com/sharedfiles/filedetails/?id=2884110898) mod.
-If the dominant-gene mod is loaded, our xenotypes will spawn with it, making Succubus Babies Succubi.
-In case you do not want that behaviour, look for the Patch `Patch_Dominant_Gene.xml` and delete it.
-
-**_On Making your own Succubi_:**
-
-Currently Succubi and Incubi only spawn through a special event determined by their xenotype def name. So if you make your own, they will not spawn with this event. Make sure that you have a way to get your custom xenotypes appear. You might want to "just alter" the xenotype xml provided by us, then they will spawn with the event.
-
## Fixes:
- Issue with Breast-Size (#8) fixed by lowercasing breast-match (Shabakur)
diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll
index 9878f26..0be1a48 100644
Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ
diff --git a/Common/Defs/AbilityDefs/Ability_NakedProwess.xml b/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
index 71ad638..a5b8ee7 100644
--- a/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
+++ b/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
@@ -3,7 +3,7 @@
rjw_genes_naked_prowess
- Enhance the strength and resilience of your naked body with fertilin.
+ Enhance the strenght and resilience of your naked body with fertilin.Things/Mote/HeartThings/Mote/HeartCastAbilityOnThing
diff --git a/Common/Defs/GeneDefs/GeneCategories.xml b/Common/Defs/Genes/GeneCategories.xml
similarity index 100%
rename from Common/Defs/GeneDefs/GeneCategories.xml
rename to Common/Defs/Genes/GeneCategories.xml
diff --git a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml b/Common/Defs/Genes/GeneDefs_Breeding.xml
similarity index 100%
rename from Common/Defs/GeneDefs/GeneDefs_Breeding.xml
rename to Common/Defs/Genes/GeneDefs_Breeding.xml
diff --git a/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml b/Common/Defs/Genes/GeneDefs_Cosmetic.xml
similarity index 100%
rename from Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml
rename to Common/Defs/Genes/GeneDefs_Cosmetic.xml
diff --git a/Common/Defs/GeneDefs/GeneDefs_Cum.xml b/Common/Defs/Genes/GeneDefs_Cum.xml
similarity index 100%
rename from Common/Defs/GeneDefs/GeneDefs_Cum.xml
rename to Common/Defs/Genes/GeneDefs_Cum.xml
diff --git a/Common/Defs/GeneDefs/GeneDefs_Damage.xml b/Common/Defs/Genes/GeneDefs_Damage.xml
similarity index 100%
rename from Common/Defs/GeneDefs/GeneDefs_Damage.xml
rename to Common/Defs/Genes/GeneDefs_Damage.xml
diff --git a/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml b/Common/Defs/Genes/GeneDefs_ExtraGenitalia.xml
similarity index 100%
rename from Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml
rename to Common/Defs/Genes/GeneDefs_ExtraGenitalia.xml
diff --git a/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml b/Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml
similarity index 100%
rename from Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
rename to Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml
diff --git a/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml b/Common/Defs/Genes/GeneDefs_GenitaliaTypes.xml
similarity index 100%
rename from Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml
rename to Common/Defs/Genes/GeneDefs_GenitaliaTypes.xml
diff --git a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml b/Common/Defs/Genes/GeneDefs_LifeForce.xml
similarity index 99%
rename from Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
rename to Common/Defs/Genes/GeneDefs_LifeForce.xml
index fe67321..fd738ed 100644
--- a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
+++ b/Common/Defs/Genes/GeneDefs_LifeForce.xml
@@ -154,7 +154,7 @@
rjw_genes_naked_prowess
- Carriers of this gene are able to temporarily increase their strength and resilience, while they are naked.
+ Carriers of this gene are able to temporarily increase their strenght and resilience, while they are naked.Things/Mote/Heartrjw_genes_lifeforce13
diff --git a/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml b/Common/Defs/Genes/GeneDefs_Reproduction.xml
similarity index 100%
rename from Common/Defs/GeneDefs/GeneDefs_Reproduction.xml
rename to Common/Defs/Genes/GeneDefs_Reproduction.xml
diff --git a/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml b/Common/Defs/Genes/GeneDefs_SexSpecial.xml
similarity index 100%
rename from Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml
rename to Common/Defs/Genes/GeneDefs_SexSpecial.xml
diff --git a/Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml b/Common/Defs/Genes/GeneDefs_SpecifiedGender.xml
similarity index 100%
rename from Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml
rename to Common/Defs/Genes/GeneDefs_SpecifiedGender.xml
diff --git a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml b/Common/Defs/Genes/Xenotype_Lifeforce.xml
similarity index 97%
rename from Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
rename to Common/Defs/Genes/Xenotype_Lifeforce.xml
index 9942abf..9af34ef 100644
--- a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
+++ b/Common/Defs/Genes/Xenotype_Lifeforce.xml
@@ -13,7 +13,7 @@
1-10000.005
- false
+ true0.020.02
@@ -42,6 +42,8 @@
-
-
-
\ No newline at end of file
diff --git a/Common/Patches/Xenotypes/FromOtherMods/GenitaliaUpdate.xml b/Common/Patches/Xenotypes/GenitaliaUpdate.xml
similarity index 100%
rename from Common/Patches/Xenotypes/FromOtherMods/GenitaliaUpdate.xml
rename to Common/Patches/Xenotypes/GenitaliaUpdate.xml
diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchBiotechNyaron.xml b/Common/Patches/Xenotypes/PatchBiotechNyaron.xml
similarity index 100%
rename from Common/Patches/Xenotypes/FromOtherMods/PatchBiotechNyaron.xml
rename to Common/Patches/Xenotypes/PatchBiotechNyaron.xml
diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchKijinRace3.xml b/Common/Patches/Xenotypes/PatchKijinRace3.xml
similarity index 100%
rename from Common/Patches/Xenotypes/FromOtherMods/PatchKijinRace3.xml
rename to Common/Patches/Xenotypes/PatchKijinRace3.xml
diff --git a/Common/Patches/Xenotypes/PatchLicentiaLabs.xml b/Common/Patches/Xenotypes/PatchLicentiaLabs.xml
new file mode 100644
index 0000000..0e9dc2e
--- /dev/null
+++ b/Common/Patches/Xenotypes/PatchLicentiaLabs.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchNarai.xml b/Common/Patches/Xenotypes/PatchNarai.xml
similarity index 100%
rename from Common/Patches/Xenotypes/FromOtherMods/PatchNarai.xml
rename to Common/Patches/Xenotypes/PatchNarai.xml
diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchNyaron.xml b/Common/Patches/Xenotypes/PatchNyaron.xml
similarity index 100%
rename from Common/Patches/Xenotypes/FromOtherMods/PatchNyaron.xml
rename to Common/Patches/Xenotypes/PatchNyaron.xml
diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchPapou.xml b/Common/Patches/Xenotypes/PatchPapou.xml
similarity index 100%
rename from Common/Patches/Xenotypes/FromOtherMods/PatchPapou.xml
rename to Common/Patches/Xenotypes/PatchPapou.xml
diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchRoosMinotaur.xml b/Common/Patches/Xenotypes/PatchRoosMinotaur.xml
similarity index 100%
rename from Common/Patches/Xenotypes/FromOtherMods/PatchRoosMinotaur.xml
rename to Common/Patches/Xenotypes/PatchRoosMinotaur.xml
diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchSaurid.xml b/Common/Patches/Xenotypes/PatchSaurid.xml
similarity index 100%
rename from Common/Patches/Xenotypes/FromOtherMods/PatchSaurid.xml
rename to Common/Patches/Xenotypes/PatchSaurid.xml
diff --git a/Common/Patches/Xenotypes/FromOtherMods/PatchVREPhytokin.xml b/Common/Patches/Xenotypes/PatchVREPhytokin.xml
similarity index 100%
rename from Common/Patches/Xenotypes/FromOtherMods/PatchVREPhytokin.xml
rename to Common/Patches/Xenotypes/PatchVREPhytokin.xml
diff --git a/KNOWN_BUGS.md b/KNOWN_BUGS.md
index a5efec9..904d9a0 100644
--- a/KNOWN_BUGS.md
+++ b/KNOWN_BUGS.md
@@ -2,19 +2,6 @@
Collection of Known Bugs and reasons for their origin.
-## Fertilin does not go up after Sex!
-
-Error: An Incubus or Succubus had sex with another pawn, but did not gain Fertilin.
-
-Things to consider:
-
-1. Please read descriptions of the respective genes - did you have "the right sex?"
-2. Check Hediffs of the fucked pawn - was it already drained?
-3. Did you fuck an animal? Check Settings for Fertilin-Multiplier
-4. Did the pawns really *finish* ? In case they throw up or get drafted there is no gain.
-
-There also is a known mod-conflict with `rjw Animations patch` (See #18), so make sure you use up-to-date versions of everything.
-
## Random Vaginas for Goblins
Error: Pawns have different genitalia than expected, e.g. if the "no vagina" gene is specified there are pawns with vaginas AND a penis.
diff --git a/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs b/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs
index 74cb0bb..b368c1b 100644
--- a/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs
+++ b/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs
@@ -73,19 +73,10 @@ namespace RJW_Genes
&& !props.pawn.health.hediffSet.HasHediff(HediffDefOf.rjw_genes_succubus_drained)
&& !GeneUtility.IsSexualDrainer(props.pawn))
{
- if (GeneUtility.IsGenerousDonor(props.pawn) && RJW_Genes_Settings.rjw_genes_generous_donor_cheatmode)
- {
- // Cheatmode is on, do not drain but give life
- GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(PawnWithLifeForce), LIFEFORCE_GAINED_FROM_DRAINER_GENE);
- if (RJW_Genes_Settings.rjw_genes_detailed_debug)
- ModLog.Message($"{props.pawn.Name} was not (sexually) drained by {PawnWithLifeForce.Name}, because Cheatmode for Generous Donors is on");
- } else
- {
- if (RJW_Genes_Settings.rjw_genes_detailed_debug)
- ModLog.Message($"{props.pawn.Name} has been (sexually) drained by {PawnWithLifeForce.Name}");
- props.pawn.health.AddHediff(HediffDefOf.rjw_genes_succubus_drained);
- GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(PawnWithLifeForce), LIFEFORCE_GAINED_FROM_DRAINER_GENE);
- }
+ if (RJW_Genes_Settings.rjw_genes_detailed_debug)
+ ModLog.Message($"{props.pawn.Name} has been (sexually) drained by {PawnWithLifeForce.Name}");
+ props.pawn.health.AddHediff(HediffDefOf.rjw_genes_succubus_drained);
+ GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(PawnWithLifeForce), LIFEFORCE_GAINED_FROM_DRAINER_GENE);
}
}
}
@@ -97,26 +88,20 @@ namespace RJW_Genes
Hediff fertilin_lost = props.pawn.health.hediffSet.GetFirstHediffOfDef(HediffDefOf.rjw_genes_fertilin_lost);
//Around quarter get ejected everytime pawn cums
- float multiplier = Rand.Range(0.10f, 0.40f);
+ float multiplier = Rand.Range(0.10f, 0.40f);
+
- if (GeneUtility.IsGenerousDonor(props.pawn) && RJW_Genes_Settings.rjw_genes_generous_donor_cheatmode)
+ //Create a new ferilin_lost hediff or increase it
+ if (fertilin_lost == null)
{
- // Do nothing, Cheatmode is on
- multiplier = 1;
- }
- else
- {
- //Create a new ferilin_lost hediff or increase it
- if (fertilin_lost == null)
- {
- Hediff new_fertilin_lost = HediffMaker.MakeHediff(HediffDefOf.rjw_genes_fertilin_lost, props.pawn);
- props.pawn.health.AddHediff(new_fertilin_lost);
- new_fertilin_lost.Severity = multiplier;
- } else
- {
- multiplier *= 1 - fertilin_lost.Severity;
- fertilin_lost.Severity += multiplier;
- }
+ Hediff new_fertilin_lost = HediffMaker.MakeHediff(HediffDefOf.rjw_genes_fertilin_lost, props.pawn);
+ props.pawn.health.AddHediff(new_fertilin_lost);
+ new_fertilin_lost.Severity = multiplier;
+ }
+ else
+ {
+ multiplier *= 1 - fertilin_lost.Severity;
+ fertilin_lost.Severity += multiplier;
}
multiplier *= absorb_percentage;
diff --git a/Source/Settings/RJW_Genes_Settings.cs b/Source/Settings/RJW_Genes_Settings.cs
index 71cf028..0db1b15 100644
--- a/Source/Settings/RJW_Genes_Settings.cs
+++ b/Source/Settings/RJW_Genes_Settings.cs
@@ -36,9 +36,6 @@ namespace RJW_Genes
}
- listing_Standard.Gap(5f);
- listing_Standard.CheckboxLabeled("generous-donor cheatmode", ref rjw_genes_generous_donor_cheatmode, "When enabled, pawns with the 'generous donor' are not drained and not fertilin exhausted. Hence they can fuel succubi and incubi non-stop. This makes them drastically easier to keep, and you should not do it.", 0f, 1f);
-
listing_Standard.Gap(5f);
listing_Standard.CheckboxLabeled("detailed-debug", ref rjw_genes_detailed_debug, "Adds detailed information to the log about interactions and genes.", 0f, 1f);
listing_Standard.End();
@@ -49,14 +46,11 @@ namespace RJW_Genes
base.ExposeData();
Scribe_Values.Look(ref RJW_Genes_Settings.rjw_genes_fertilin_from_animals_factor, "rjw_genes_fertilin_from_animals_factor", RJW_Genes_Settings.rjw_genes_fertilin_from_animals_factor, true);
Scribe_Values.Look(ref RJW_Genes_Settings.rjw_genes_detailed_debug, "rjw_genes_detailed_debug", RJW_Genes_Settings.rjw_genes_detailed_debug, true);
-
Scribe_Values.Look(ref RJW_Genes_Settings.rjw_genes_sexdemon_visit, "rjw_genes_sexdemon_visit", RJW_Genes_Settings.rjw_genes_sexdemon_visit, true);
Scribe_Values.Look(ref RJW_Genes_Settings.rjw_genes_sexdemon_join_size_matters, "rjw_genes_sexdemon_join_size_matters", RJW_Genes_Settings.rjw_genes_sexdemon_join_size_matters, true);
Scribe_Values.Look(ref RJW_Genes_Settings.rjw_genes_sexdemon_visit_groups, "rjw_genes_sexdemon_groups", RJW_Genes_Settings.rjw_genes_sexdemon_visit_groups, true);
Scribe_Values.Look(ref RJW_Genes_Settings.rjw_genes_sexdemon_visit_succubi, "rjw_genes_sexdemon_succubi", RJW_Genes_Settings.rjw_genes_sexdemon_visit_succubi, true);
Scribe_Values.Look(ref RJW_Genes_Settings.rjw_genes_sexdemon_visit_incubi, "rjw_genes_sexdemon_incubi", RJW_Genes_Settings.rjw_genes_sexdemon_visit_incubi, true);
-
- Scribe_Values.Look(ref RJW_Genes_Settings.rjw_genes_generous_donor_cheatmode, "rjw_genes_generous_donor_cheatmode", RJW_Genes_Settings.rjw_genes_generous_donor_cheatmode, true);
}
public static bool rjw_genes_detailed_debug = false;
@@ -68,7 +62,5 @@ namespace RJW_Genes
public static bool rjw_genes_sexdemon_visit_groups = true;
public static bool rjw_genes_sexdemon_visit_succubi = true;
public static bool rjw_genes_sexdemon_visit_incubi = true;
-
- public static bool rjw_genes_generous_donor_cheatmode = false;
}
}