From 59412ae33025f9b16016ab0152d15b1680935a3f Mon Sep 17 00:00:00 2001 From: Vegapnk Date: Mon, 8 May 2023 07:58:31 +0200 Subject: [PATCH] Updated Docs, shrank some XML --- CHANGELOG.md | 25 +++--- Common/Defs/GeneDefs/GeneDefs_Hive.xml | 88 +++++--------------- Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml | 51 ++++-------- TODOS.md | 10 +-- 4 files changed, 54 insertions(+), 120 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89390cf..af67de6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,43 +3,42 @@ **Changes:** - Cocoon Weaver Gene -- Spawn Spelopede Gene (Can be changed to spawn Megascarabs or other insects via xml) -- Queens & Caste Logic (see below) +- Spawn Spelopede Gene (Can be changed to spawn megascarabs or other insects via xml) +- Queens & Caste logic (see below) - Addition to InsectIncubator: Now fertilizes eggs once placed inside a host, and breeds out eggs twice as fast. +- Many new icons +- Custom background icons when Vanilla-Expanded-Framework is loaded **Internal:** -- Renamed Abilities to have _ability_ in their name, to not exactly match the gene-defnames. -- Moved Insect-Incubator & Insect-Breeder to Hive Category and Folders +- Renamed abilities to have _ability_ in their name, to not exactly match the gene-defnames. +- Moved Insect-Incubator & Insect-Breeder to hive category and folders (from breeding) **Fixes:** - Cockeater Ability has now Icon of Cockeater Gene - Cockeater now leaves a bite wound! - Pythokin-Patch checks for Licentialabs (#30) +- Removed Sex-Change thoughts for pawns born or spawned with a gender-altering gene (Issue #32, PR #33 by @callavico) **Queen & Caste Logic** There are 3 genes revolting around a new, hopefully flexible insect-caste system. Queens, Drones and Workers. These reproduce either through normal sex, or can utilize the insect birth once [this PR](https://gitgud.io/Ed86/rjw/-/merge_requests/266) has been merged in. +Update: It has been merged into [RJW 5.3.5](https://gitgud.io/Ed86/rjw/-/tags/5.3.5), make sure you update! In general, the logic is the following: - A queen can have sex with anyone. If the partner was a drone, there is chance for the baby to become a queen, drone or worker. - If the partner of the queen was not a drone, the baby will be a worker. - If the drone didn't mate with a queen but someone else, normal inheritance happens -- The assignemnt is done by xenotypes for queen and drones. The baby will get all xenogenes of their parents xenotypes. +- The assignment is done by xenotypes for queen and drones. The baby will get all xenogenes of their parents chosen xenotypes. - For workers, every queen can have a set of genes for their workers defined in [a special def](./Common/Defs/QueenWorkerMappingDefs/QueenWorkerMappingDefs_base.xml). These will be added as endogenes, so that pawns can still become xenotypes. -- There is a default set for worker genes, making mentally dumb, sterile and servile pawns. -- Chances for Offsprings (Drone, Queen, Worker) is defined in an [XML-Def](./Common/Defs/HiveOffspringChanceDef/HiveOffspringChanceDefs.xml) +- There is a default gene-set for workers, making dumb, sterile and servile pawns. +- Chances for Offsprings (Drone, Queen, Worker) is defined in an [XML-Def](./Common/Defs/HiveOffspringChanceDef/HiveOffspringChanceDefs.xml). They are set per Queen. -I am not sure if I want to have a specific mapping defining that Queen can only mate with certain Drones, let me know how you feel about it. +I am not sure if I want to have a specific mapping defining that queen can only mate with certain drones, let me know how you feel about it. *Queens can be male*. I just used the female-term, but implementation is gender-neutral. -**ToDo:** - -- Icons: Cocoon, Spelopede Spawn -- Sound: Spelopede Spawn - # 1.1.4 Fixes: diff --git a/Common/Defs/GeneDefs/GeneDefs_Hive.xml b/Common/Defs/GeneDefs/GeneDefs_Hive.xml index 26e4ebc..33c9c74 100644 --- a/Common/Defs/GeneDefs/GeneDefs_Hive.xml +++ b/Common/Defs/GeneDefs/GeneDefs_Hive.xml @@ -1,13 +1,24 @@ - + + + rjw_genes_hive + + +
  • + Genes/Icons/RJW_Genes_Endogene_Background + Genes/Icons/RJW_Genes_Xenogene_Background +
    • +     +     + + rjw_genes_queen queen This gene represents the royal caste amongst its xenotype. Children of a queen are usually born as sterile workers, unless the father was a drone. Having multiple (adult) queens leads to intense rivalry and can throw the whole colony into chaos! Genes/Icons/queen 1 - rjw_genes_hive 0.5 @@ -39,23 +50,15 @@ 7 -3 - - -
  • - Genes/Icons/RJW_Genes_Endogene_Background - Genes/Icons/RJW_Genes_Xenogene_Background -
    • -     - + rjw_genes_drone drone This gene represents the drone caste amongst its xenotype. Drones are highly specialised experts that ensure the hives functioning. Other than that, drones are the only xenotypes capable of producing fertile offspring with a queen. Genes/Icons/drone 2 - rjw_genes_hive
  • rjw_genes_hive_caste
    • @@ -74,24 +77,16 @@ 4 -2 - - -
  • - Genes/Icons/RJW_Genes_Endogene_Background - Genes/Icons/RJW_Genes_Xenogene_Background -
    • -     - + rjw_genes_worker worker This gene marks the lowest caste of a hive, the workers. Usually sterile, they are despised by higher castes and only live to serve with labour. Genes/Icons/worker 3 - rjw_genes_hive
  • rjw_genes_hive_caste
    • @@ -124,24 +119,16 @@ 1 0 - - -
  • - Genes/Icons/RJW_Genes_Endogene_Background - Genes/Icons/RJW_Genes_Xenogene_Background -
    • -     - + rjw_genes_zealous_loyalty loyalty Carriers of this gene are genetically wired to worship carriers of the 'Queen'-gene. They receive a massive relation-ship bonus towards the queen and a slight mood bonus. Having multiple queens in the colony causes severe distress. Things/Mote/Heart 10 - rjw_genes_hive
  • rjw_genes_swearing_loyalty
    • @@ -158,14 +145,13 @@     - + rjw_genes_cocoonweaver cocooner - Carriers of this gene can produce a cocoon to prepare helpless victims for breeding. + Carriers of this gene can produce a cocoon to prepare helpless (or willing) victims for breeding. Genes/Icons/Cocoon 11 - rjw_genes_hive
  • rjw_genes_ability_cocoonweaver
    •  @@ -174,23 +160,15 @@ 1 -1 - - -
  • - Genes/Icons/RJW_Genes_Endogene_Background - Genes/Icons/RJW_Genes_Xenogene_Background -
    • -     - + rjw_genes_spawn_spelopede spelopede Carriers of this gene can generate tame spelopedes. Higher psychic-sensitivity will spawn more spelopedes. World/WorldObjects/Expanding/Insects 12 - rjw_genes_hive
  • rjw_genes_ability_spawn_spelopede
    •  @@ -199,42 +177,26 @@ 1 -1 - - -
  • - Genes/Icons/RJW_Genes_Endogene_Background - Genes/Icons/RJW_Genes_Xenogene_Background -
    • -     - + rjw_genes_insectincubator RJW_Genes.Gene_InsectIncubator Pawns with this gene are able to hold more insect eggs. Genes/Icons/Egg 52 - rjw_genes_hive 1 -1 - - -
  • - Genes/Icons/RJW_Genes_Endogene_Background - Genes/Icons/RJW_Genes_Xenogene_Background -
    • -     - + rjw_genes_insectbreeder Pawns with this gene are able to fertilize eggs with any fertile penis. Genes/Icons/Insect_Breeder 53 - rjw_genes_hive 1 -1 @@ -253,16 +215,8 @@ Pawns that have a female (egg producing) ovipositor produce eggs at drastically increased speed. Genes/Icons/Fervent_Ovipositor 55 - rjw_genes_hive 1 -1 - - -
  • - Genes/Icons/RJW_Genes_Endogene_Background - Genes/Icons/RJW_Genes_Xenogene_Background -
    • -     \ No newline at end of file diff --git a/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml b/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml index 75ab7c2..f68126f 100644 --- a/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml +++ b/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml @@ -1,75 +1,56 @@ - + + + rjw_genes_special + + +
  • + Genes/Icons/RJW_Genes_Endogene_Background + Genes/Icons/RJW_Genes_Xenogene_Background +
    • +     +     + + rjw_genes_orgasm_rush - rjw_genes_special On Orgasm, carriers of this gene get a boost in activity. (rest-need is partially filled) 1 -2 UI/Memes/FleshPurity 1 - -
  • - Genes/Icons/RJW_Genes_Endogene_Background - Genes/Icons/RJW_Genes_Xenogene_Background -
    • -     - + rjw_genes_youth_fountain - rjw_genes_special Having sex with a carrier of this gene makes the partner slightly younger. (Partner stays adult) 2 -2 UI/Ideoligions/FireLeaves 2 - - -
  • - Genes/Icons/RJW_Genes_Endogene_Background - Genes/Icons/RJW_Genes_Xenogene_Background -
    • -     - + rjw_genes_sex_age_drain - rjw_genes_special Having sex transfers some of the partners life-time to themselves. (Pawn stays adult) 2 -1 UI/Icons/ColonistBar/Idle 3 - - -
  • - Genes/Icons/RJW_Genes_Endogene_Background - Genes/Icons/RJW_Genes_Xenogene_Background -
    • -     - + rjw_genes_aphrodisiac_pheromones - rjw_genes_special RJW_Genes.Gene_Aphrodisiac_Pheromones Pheremones of this pawn induce an incressed sexdrive to others nearby. Genes/Icons/Pheromones 4 1 1 - - -
  • - Genes/Icons/RJW_Genes_Endogene_Background - Genes/Icons/RJW_Genes_Xenogene_Background -
    • -     \ No newline at end of file diff --git a/TODOS.md b/TODOS.md index 7e223a1..16c5906 100644 --- a/TODOS.md +++ b/TODOS.md @@ -39,14 +39,14 @@ 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 +- [X] Spawn the small scarabs +- [X] Fertilise Eggs inside her +- [X] 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. +- [X] Should look like a nice green-yellow alien as we all know fuckable insects would look like. +- [X] 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