diff --git a/CHANGELOG.md b/CHANGELOG.md index 69f9b81..8719cf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# 1.1.2 + +Changes: + +- Added more cool images from WasMachenDennSachen (#22) + +Fixes: + +- Aphrodisiac Pheromones checks for children and other conditions (#25) + # 1.1.1 Changes: diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll index bcf809b..cf2ff5d 100644 Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ diff --git a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml index bd201cc..a2d7d7e 100644 --- a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml +++ b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml @@ -40,7 +40,7 @@ rjw_genes_breeding Xenotypes with this Gene are Zoophile. - Genes/Icons/Zoophile_2 + Genes/Icons/Zoophile 54
  • diff --git a/Common/Textures/Genes/Icons/Extra_Anus.png b/Common/Textures/Genes/Icons/Extra_Anus.png index 1075bbd..9dfbbb6 100644 Binary files a/Common/Textures/Genes/Icons/Extra_Anus.png and b/Common/Textures/Genes/Icons/Extra_Anus.png differ diff --git a/Common/Textures/Genes/Icons/Extra_Breasts.png b/Common/Textures/Genes/Icons/Extra_Breasts.png index f2c470e..5e7cbc3 100644 Binary files a/Common/Textures/Genes/Icons/Extra_Breasts.png and b/Common/Textures/Genes/Icons/Extra_Breasts.png differ diff --git a/Common/Textures/Genes/Icons/Genitalia_Demon.png b/Common/Textures/Genes/Icons/Genitalia_Demon.png index 7831b4d..d8ace83 100644 Binary files a/Common/Textures/Genes/Icons/Genitalia_Demon.png and b/Common/Textures/Genes/Icons/Genitalia_Demon.png differ diff --git a/Common/Textures/Genes/Icons/Loose_Anus.png b/Common/Textures/Genes/Icons/Loose_Anus.png index c96dec3..86036d8 100644 Binary files a/Common/Textures/Genes/Icons/Loose_Anus.png and b/Common/Textures/Genes/Icons/Loose_Anus.png differ diff --git a/Common/Textures/Genes/Icons/No_Anus.png b/Common/Textures/Genes/Icons/No_Anus.png index f5a9a03..69f7d6b 100644 Binary files a/Common/Textures/Genes/Icons/No_Anus.png and b/Common/Textures/Genes/Icons/No_Anus.png differ diff --git a/Common/Textures/Genes/Icons/No_Male_Genitalia.png b/Common/Textures/Genes/Icons/No_Male_Genitalia.png index ce1fa4e..9104ea6 100644 Binary files a/Common/Textures/Genes/Icons/No_Male_Genitalia.png and b/Common/Textures/Genes/Icons/No_Male_Genitalia.png differ diff --git a/Common/Textures/Genes/Icons/Tight_Anus.png b/Common/Textures/Genes/Icons/Tight_Anus.png index dd355fb..0e797de 100644 Binary files a/Common/Textures/Genes/Icons/Tight_Anus.png and b/Common/Textures/Genes/Icons/Tight_Anus.png differ diff --git a/Common/Textures/Genes/Icons/Zoophile.png b/Common/Textures/Genes/Icons/Zoophile.png index ed45040..75afdf4 100644 Binary files a/Common/Textures/Genes/Icons/Zoophile.png and b/Common/Textures/Genes/Icons/Zoophile.png differ diff --git a/Common/Textures/Genes/Icons/Zoophile_2.png b/Common/Textures/Genes/Icons/Zoophile_2.png deleted file mode 100644 index d313bcb..0000000 Binary files a/Common/Textures/Genes/Icons/Zoophile_2.png and /dev/null differ diff --git a/Common/Textures/Genes/Icons/extra_male.png b/Common/Textures/Genes/Icons/extra_male.png index 5390ecc..c39e163 100644 Binary files a/Common/Textures/Genes/Icons/extra_male.png and b/Common/Textures/Genes/Icons/extra_male.png differ diff --git a/KNOWN_BUGS.md b/KNOWN_BUGS.md index ccf7ea8..f9bc556 100644 --- a/KNOWN_BUGS.md +++ b/KNOWN_BUGS.md @@ -2,6 +2,17 @@ Collection of Known Bugs and reasons for their origin. +## I changed Parts of a pawn and my genes do not apply! + +Issue: You had a pawn with "huge genitalia" and add a horse-cock with licentia or surgery. This new genitalia is not huge. + +Reason: The genes are applied when they are added. This is usually character-spawn. The genes change the attributes of the genitalia-hediff, and thus genitalia added after the genes are not affected. + +I think I will not gonna fix this. +First of all, I think transplants wouldn't reasonably affected by genes. +Second, for implementation I'd need to regularly check if every gene changed all relevant genitalia already, and do the same every x-ticks. +This seems like a performance sink, so I will not gonna do it. + ## Pawn does not refresh empty Fertilin! Issue: A pawn has 0 (or low) Fertilin, and a mood debuff. But they do not do anything about it. diff --git a/Source/Genes/Special/Gene_Aphrodisiac_Pheromones.cs b/Source/Genes/Special/Gene_Aphrodisiac_Pheromones.cs index e3628dc..875d1dd 100644 --- a/Source/Genes/Special/Gene_Aphrodisiac_Pheromones.cs +++ b/Source/Genes/Special/Gene_Aphrodisiac_Pheromones.cs @@ -39,9 +39,25 @@ namespace RJW_Genes { foreach (Pawn pawn in map.mapPawns.AllPawns) { - if (pawn != null && this.pawn != null && pawn != this.pawn - && pos.DistanceTo(pawn.Position) < APHRODISIAC_DISTANCE && GenSight.LineOfSight(pos, pawn.Position, pawn.Map) - && !GeneUtility.HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_aphrodisiac_pheromones)) + // Return for trivial errors + if (pawn == null || this.pawn == null || pawn == this.pawn) + continue; + // Check for position-existance + if (pawn.Position == null || pos == null || pawn.Map == null) + continue; + // Do nothing if pawn is carried + if (pawn.CarriedBy != null) + continue; + // Do nothing if Pawn is Baby or Child (#25) + if (!pawn.ageTracker.Adult) + continue; + // Do nothing for pawns that also have pheromones + if (GeneUtility.HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_aphrodisiac_pheromones)) + continue; + + // Actual Logic: + // Pawn qualifies in right distance and needs line of sight. + if (pos.DistanceTo(pawn.Position) < APHRODISIAC_DISTANCE && GenSight.LineOfSight(pos, pawn.Position, pawn.Map)) { yield return pawn; } diff --git a/TODOS.md b/TODOS.md index 1977952..ebb6550 100644 --- a/TODOS.md +++ b/TODOS.md @@ -25,8 +25,27 @@ So any help is very appreciated, even if it is just pointing me to existing simi ## Planned Xenotypes -- "Beastmaster": Zoophile with various genes to command animals to rape, mate etc. and increased animal "handling". -- "Hive-Mother": for breeding Insect Armies, maybe it is also possible to "store" small insects in her etc. +**Beastmaster:** + +- [] Animal Mating Call (Get fucked by everything nearby, potentially ending animal rage) +- [] Pheromone Spit that marks a target for being raped by animals +- [] Power-Boost & Bonding to animals through zoophilia +- [] Maybe: Boost pregnancy times of Animals +- [] Maybe: Make it Animal-Fertilin-Dependend +- [] Either: Can only eat meat or cannot eat meat + +Can't help but think about Rexxar Porn now I am a bad person. + +**Hive Mother:** + +- [] Spawn the small scarabs +- [] Fertilise Eggs inside her +- [] Produce cocoons +- [] Maybe: Insert "dropped" Insect eggs +- [] Very fragile, no use except breeding +- [] Maybe: can only eat insect jelly +- [] Should look like a nice green-yellow alien as we all know fuckable insects would look like. +- [] There can only be one Hive Mother, some penalties if there are others. This could be implement with an "Alpha Gene" that gives heavy penalties when other Alpha exists. ## Genes with Abilities and more Effects @@ -34,5 +53,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 \ No newline at end of file +- Cumshot Sniper Abilities \ No newline at end of file