\ No newline at end of file
diff --git a/About/Manifest.xml b/About/Manifest.xml
index b99a84a..b1d6c81 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,12 +1,14 @@
RJW-Genes
- 1.1.0
+ 1.2.0
RimJobWorld
HugsLib
-
+
+
Male- and Female- Only Genes
+
RimJobWorld
HugsLib
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82a7e78..6ff0057 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,13 @@
- Many new icons
- Custom background icons when Vanilla-Expanded-Framework is loaded
- Sexual Age Drainer & Youth Fountain now change age as configured in XML
+- Draft for a Hive-Start Scenario
**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 (from breeding)
+- Some exclusion-tags for Alpha Genes
**Fixes:**
@@ -41,6 +43,16 @@ In general, the logic is the following:
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.
+**On Alpha Genes**
+
+Alpha genes might have colliding features, but I need some reports to find out about it.
+I disabled the specific gender and the oviparious reproduction (when you have rjw-ovipos).
+I recommend using alpha genes for the Hive-Playthroughs, as otherwise the Halamyr look a bit ... boring?
+But i don't want to add a bunch of cosmetic genes on top of things.
+
+*And what the fuck is a halamyr?* Well I had to name my little ants somehow. But I didn't want to call them `myr` as I maybe want to make some TiTs xenotypes separately.
+And I am aware that the TiTs-Myr work different than the things I built now.
+
# 1.1.4
Fixes:
diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll
index 7e3fd40..e0c5d0e 100644
Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ
diff --git a/Common/Defs/AbilityDefs/Ability_CockEater.xml b/Common/Defs/AbilityDefs/Ability_CockEater.xml
index f74e38c..4a8f2e3 100644
--- a/Common/Defs/AbilityDefs/Ability_CockEater.xml
+++ b/Common/Defs/AbilityDefs/Ability_CockEater.xml
@@ -1,7 +1,7 @@
- rjw_genes_cockeater
+ rjw_genes_ability_cockeaterEat the cock of another pawn, restoring fertilin based on the size of the cock.Genes/Icons/cockeater
diff --git a/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml b/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml
index 9e0e691..2a1577a 100644
--- a/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml
+++ b/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml
@@ -4,7 +4,7 @@
rjw_genes_ability_cocoonweaverWeaves the victim into a (self-sustaining) cocoon. The victim cannot move, but can be bred.
- Things/Mote/Heart
+ Genes/Icons/Cocoontruetruefalse
diff --git a/Common/Defs/AbilityDefs/Ability_Flight.xml b/Common/Defs/AbilityDefs/Ability_Flight.xml
index 82e6537..d643940 100644
--- a/Common/Defs/AbilityDefs/Ability_Flight.xml
+++ b/Common/Defs/AbilityDefs/Ability_Flight.xml
@@ -1,7 +1,7 @@
- rjw_genes_flight
+ rjw_genes_ability_flightFly to a short location using your wings.Genes/Icons/Succubus_Wings
diff --git a/Common/Defs/AbilityDefs/Ability_NakedProwess.xml b/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
index 06e5618..778f4d9 100644
--- a/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
+++ b/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
@@ -1,7 +1,7 @@
- rjw_genes_naked_prowess
+ rjw_genes_ability_naked_prowessEnhance the strength and resilience of your naked body with fertilin.Genes/Icons/rjw_naked_prowess
diff --git a/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml b/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml
index e327973..0d8959d 100644
--- a/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml
+++ b/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml
@@ -1,7 +1,7 @@
- rjw_genes_paralysingkiss
+ rjw_genes_ability_paralysingkissParalyse someone briefly with a kiss.Genes/Icons/rjw_genes_lips
diff --git a/Common/Defs/AbilityDefs/Ability_PussyHeal.xml b/Common/Defs/AbilityDefs/Ability_PussyHeal.xml
index 8f97b60..4445bf2 100644
--- a/Common/Defs/AbilityDefs/Ability_PussyHeal.xml
+++ b/Common/Defs/AbilityDefs/Ability_PussyHeal.xml
@@ -1,7 +1,7 @@
- rjw_genes_pussyheal
+ rjw_genes_ability_pussyhealRape another pawn, so you can heal them with your vagina's special healing power.Things/Mote/Heart
diff --git a/Common/Defs/AbilityDefs/Ability_Seduce.xml b/Common/Defs/AbilityDefs/Ability_Seduce.xml
index 65c281a..595c348 100644
--- a/Common/Defs/AbilityDefs/Ability_Seduce.xml
+++ b/Common/Defs/AbilityDefs/Ability_Seduce.xml
@@ -1,7 +1,7 @@
- rjw_genes_seduce
+ rjw_genes_ability_seduceSeduce the target to approach the caster.Genes/Icons/seduce
diff --git a/Common/Defs/AbilityDefs/Ability_SpawnSpelopede.xml b/Common/Defs/AbilityDefs/Ability_SpawnSpelopede.xml
index 771b61b..7279149 100644
--- a/Common/Defs/AbilityDefs/Ability_SpawnSpelopede.xml
+++ b/Common/Defs/AbilityDefs/Ability_SpawnSpelopede.xml
@@ -4,8 +4,7 @@
rjw_genes_ability_spawn_spelopedeGenerates a tame spelopede, ready to serve their master.
- World/WorldObjects/Expanding/Insects
-
+ Genes/Icons/Spelopede_Dispensertruefalse
diff --git a/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml b/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml
index 82bdbc2..8723630 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml
@@ -19,10 +19,10 @@
(0.75, 0.75, 0.75)1000
-
+
+
diff --git a/Common/Defs/GeneDefs/GeneDefs_Hive.xml b/Common/Defs/GeneDefs/GeneDefs_Hive.xml
index 33c9c74..e4a747d 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Hive.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Hive.xml
@@ -12,12 +12,12 @@
-
+ rjw_genes_queenqueenThis 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
+ Genes/Icons/Queen1
@@ -57,7 +57,7 @@
droneThis 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
+ Genes/Icons/Drone2
@@ -85,7 +85,7 @@
workerThis 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
+ Genes/Icons/Worker3
@@ -121,13 +121,12 @@
0
-
rjw_genes_zealous_loyaltyloyaltyCarriers 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
+ Genes/Icons/Loyalty10
@@ -167,7 +166,7 @@
spelopedeCarriers of this gene can generate tame spelopedes. Higher psychic-sensitivity will spawn more spelopedes.
- World/WorldObjects/Expanding/Insects
+ Genes/Icons/Spelopede_Dispenser12
+
\ No newline at end of file
diff --git a/Common/Defs/GeneDefs/Xenotype_Hive.xml b/Common/Defs/GeneDefs/Xenotype_Hive.xml
index eebb914..91f6023 100644
--- a/Common/Defs/GeneDefs/Xenotype_Hive.xml
+++ b/Common/Defs/GeneDefs/Xenotype_Hive.xml
@@ -1,44 +1,121 @@
+
+
- rjw_genes_test_queen_xenotype
-
+ rjw_genes_halamyr_queen_xenotype
+
Genes/Icons/Xenotypes/Xenotype-Queen
- PawnBecameSanguophage
+ false
+ false
+
+ The Halamyr are a race of insect-xenotypes living in a caste-system. On top of the caste, the queens are the centerpiece of any hive. They are the only Halamyr that can produce drones, or mass-produce workers. A hive can virtually not live without a queen - without their royalty the drones and workers are irritated and receive sever penalties. Queens are very fragile and need to be kept safe and in best conditions.
+ The fragile queens of the Halamyr are the center of the hives reproduction. Multiple queens, or and absence of a queen, can cause to fall the best hive into disarray real quick.
+
+
+
AG_LargerBodySize
+
AG_InsectBlood
+
AG_InsectJellyProduction
+
AG_SurvivalInstinct_Low
+
WoundHealing_Slow
+
PsychicAbility_Extreme
+
MoveSpeed_Slow
+
FireTerror
+
MeleeDamage_Weak
+
Sleepy
+
Delicate
+
rjw_genes_hypersexual
+
rjw_genes_bisexual
+
Libido_High
+
Beauty_Beautiful
+
AG_OutwardsAntennas
+
Skin_DeepRed
+
Learning_Fast
+
rjw_genes_fervent_ovipositor
+
AptitudeTerrible_Shooting
+
AptitudeTerrible_Melee
+
AptitudeRemarkable_Social
+
AptitudeRemarkable_Sex
+
rjw_genes_female_only
+
rjw_genes_ovipositor_genitalia
+
rjw_genes_aphrodisiac_pheromones
+
rjw_genes_queen
+
rjw_genes_cocoonweaver
+
rjw_genes_spawn_spelopede
+
+
+
+
+ rjw_genes_halamyr_hiveguard_xenotype
+
+ Genes/Icons/Xenotypes/Xenotype-Guard
+
+ 1.5
+ false
+
+ The Halamyr hiveguards are the bastion to protect the hive. Next to the walls, these meele specialists form the ultimate guard for the queen, for which they'd give their lifes. Their tuned bodies come with a price, crippling them for social interactions and increased hunger.
+ Frontline of the Halamyr, guards of the hive, specialised in meele combat. Heavily handicapped without a queen.
+
+
+
AG_InsectBlood
+
AG_EfficientMandibles
+
Immunity_Strong
+
WoundHealing_Fast
+
MoveSpeed_Quick
+
FireTerror
+
MeleeDamage_Strong
+
KillThirst
+
LowSleep
+
AG_WaspWings
+
Hair_ShortOnly
+
AG_DownwardsAntennas
+
Hair_DarkBlack
+
Skin_DeepRed
+
AG_FeraliskEyes
+
AptitudeTerrible_Shooting
+
AptitudeRemarkable_Melee
+
AptitudePoor_Construction
+
AptitudePoor_Cooking
+
AptitudePoor_Plants
+
AptitudePoor_Crafting
+
AptitudeTerrible_Artistic
+
AptitudeTerrible_Medicine
+
AptitudePoor_Social
+
rjw_genes_male_only
+
rjw_genes_ovipositor_genitalia
+
rjw_genes_drone
+
rjw_genes_zealous_loyalty
+
+
+
+
+ rjw_genes_halamyr_breeder_xenotype
+
+ Genes/Icons/Xenotypes/Xenotype-Breeder
+ false
+ false
+ 0.8
+
+ The Halamyr breeders are the last backbone of the hive. Their special genes allow them to carry more eggs and hatch them faster, enabling a steady output of hivelings. To support their position in the hive, breeders spend most of their life in the queens cocoon, a task which they gladly accept.
+ Made for incubating Halamyr eggs, breeders spend most of their life in the queens cocoon.
-
diff --git a/Common/Defs/Scenarios/Halamyr_Hive.xml b/Common/Defs/Scenarios/Halamyr_Hive.xml
new file mode 100644
index 0000000..338a611
--- /dev/null
+++ b/Common/Defs/Scenarios/Halamyr_Hive.xml
@@ -0,0 +1,156 @@
+
+
+
+
+ rjw_genes_scenario_halamyr_hive
+
+ A young queen set out to build a new hive. After a long path, a suitable place is found to generate new offspring. DEVNOTE: Try to choose a high-food biome to keep up with the Hive!
+
+ A Halamyr queen set out to build a new hive.
+
+ PlayerFaction
+ PlayerTribe
+
+
+
+
+
+
+ ConfigurePawnsXenotypes
+ 4
+ Start with a set of Halamyr Xenotypes and one other colonist of any age.
+
+
+
+ GameStartDialog
+ After a long journey, this is it: \n\nThis is the right place to start the new hive. Spin in your breeders, build your defenses and start mating.\n\nMake this a place worthy for a queen.
+ GameStartSting
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Common/Textures/Genes/Icons/Cocoon.png b/Common/Textures/Genes/Icons/Cocoon.png
index 5e9b0bc..4e62420 100644
Binary files a/Common/Textures/Genes/Icons/Cocoon.png and b/Common/Textures/Genes/Icons/Cocoon.png differ
diff --git a/Common/Textures/Genes/Icons/Cum-Base.png b/Common/Textures/Genes/Icons/Cum-Base.png
new file mode 100644
index 0000000..05ec22a
Binary files /dev/null and b/Common/Textures/Genes/Icons/Cum-Base.png differ
diff --git a/Common/Textures/Genes/Icons/Egg.png b/Common/Textures/Genes/Icons/Egg.png
index a635f14..81b16bd 100644
Binary files a/Common/Textures/Genes/Icons/Egg.png and b/Common/Textures/Genes/Icons/Egg.png differ
diff --git a/Common/Textures/Genes/Icons/Extra_Vagina.png b/Common/Textures/Genes/Icons/Extra_Vagina.png
index 4c93501..12bb91a 100644
Binary files a/Common/Textures/Genes/Icons/Extra_Vagina.png and b/Common/Textures/Genes/Icons/Extra_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Fervent_Ovipositor.png b/Common/Textures/Genes/Icons/Fervent_Ovipositor.png
index daa1704..b9cc33e 100644
Binary files a/Common/Textures/Genes/Icons/Fervent_Ovipositor.png and b/Common/Textures/Genes/Icons/Fervent_Ovipositor.png differ
diff --git a/Common/Textures/Genes/Icons/Insect_Breeder.png b/Common/Textures/Genes/Icons/Insect_Breeder.png
index 4898614..5315179 100644
Binary files a/Common/Textures/Genes/Icons/Insect_Breeder.png and b/Common/Textures/Genes/Icons/Insect_Breeder.png differ
diff --git a/Common/Textures/Genes/Icons/Loose_Vagina.png b/Common/Textures/Genes/Icons/Loose_Vagina.png
index c1b5808..57a4706 100644
Binary files a/Common/Textures/Genes/Icons/Loose_Vagina.png and b/Common/Textures/Genes/Icons/Loose_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Loyalty.png b/Common/Textures/Genes/Icons/Loyalty.png
index f7cbe57..8ac3c4c 100644
Binary files a/Common/Textures/Genes/Icons/Loyalty.png and b/Common/Textures/Genes/Icons/Loyalty.png differ
diff --git a/Common/Textures/Genes/Icons/No_Cum.png b/Common/Textures/Genes/Icons/No_Cum.png
index 8bcdc81..a7964f0 100644
Binary files a/Common/Textures/Genes/Icons/No_Cum.png and b/Common/Textures/Genes/Icons/No_Cum.png differ
diff --git a/Common/Textures/Genes/Icons/No_Vagina.png b/Common/Textures/Genes/Icons/No_Vagina.png
index ec99f03..a4f47ee 100644
Binary files a/Common/Textures/Genes/Icons/No_Vagina.png and b/Common/Textures/Genes/Icons/No_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png b/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png
index a2b5806..97421e1 100644
Binary files a/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png and b/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png differ
diff --git a/Common/Textures/Genes/Icons/Pheromone.png b/Common/Textures/Genes/Icons/Pheromone.png
new file mode 100644
index 0000000..342f695
Binary files /dev/null and b/Common/Textures/Genes/Icons/Pheromone.png differ
diff --git a/Common/Textures/Genes/Icons/Slime_Genitalia.png b/Common/Textures/Genes/Icons/Slime_Genitalia.png
index 09bbd61..91e6cd0 100644
Binary files a/Common/Textures/Genes/Icons/Slime_Genitalia.png and b/Common/Textures/Genes/Icons/Slime_Genitalia.png differ
diff --git a/Common/Textures/Genes/Icons/Spelopede_Dispenser.png b/Common/Textures/Genes/Icons/Spelopede_Dispenser.png
new file mode 100644
index 0000000..4308892
Binary files /dev/null and b/Common/Textures/Genes/Icons/Spelopede_Dispenser.png differ
diff --git a/Common/Textures/Genes/Icons/Tight_Vagina.png b/Common/Textures/Genes/Icons/Tight_Vagina.png
index cd8be97..eab0606 100644
Binary files a/Common/Textures/Genes/Icons/Tight_Vagina.png and b/Common/Textures/Genes/Icons/Tight_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Vitality_Drainer.png b/Common/Textures/Genes/Icons/Vitality_Drainer.png
index eb310c1..1de65a9 100644
Binary files a/Common/Textures/Genes/Icons/Vitality_Drainer.png and b/Common/Textures/Genes/Icons/Vitality_Drainer.png differ
diff --git a/Common/Textures/Genes/Icons/drone.png b/Common/Textures/Genes/Icons/drone.png
index e600639..a631565 100644
Binary files a/Common/Textures/Genes/Icons/drone.png and b/Common/Textures/Genes/Icons/drone.png differ
diff --git a/Common/Textures/Genes/Icons/much_cum.png b/Common/Textures/Genes/Icons/much_cum.png
index 412030f..21a9a17 100644
Binary files a/Common/Textures/Genes/Icons/much_cum.png and b/Common/Textures/Genes/Icons/much_cum.png differ
diff --git a/Common/Textures/Genes/Icons/queen.png b/Common/Textures/Genes/Icons/queen.png
index 8ef515f..b087f03 100644
Binary files a/Common/Textures/Genes/Icons/queen.png and b/Common/Textures/Genes/Icons/queen.png differ
diff --git a/Common/Textures/Genes/Icons/very_much_cum.png b/Common/Textures/Genes/Icons/very_much_cum.png
index 0e692ff..f2fedc1 100644
Binary files a/Common/Textures/Genes/Icons/very_much_cum.png and b/Common/Textures/Genes/Icons/very_much_cum.png differ
diff --git a/Common/Textures/Genes/Icons/worker.png b/Common/Textures/Genes/Icons/worker.png
index 743caa0..1f4e0c8 100644
Binary files a/Common/Textures/Genes/Icons/worker.png and b/Common/Textures/Genes/Icons/worker.png differ
diff --git a/README.md b/README.md
index f0a12ac..cbffc9d 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ This mod adds genes related and based on RJW to Rimworld.
- Mech Breeding / Insect Breeding Additions
- Human-Animal Gene Inheritance merged from [Shabakur](https://github.com/Shabakur/RJW_Animal_Gene_Inheritance)
- Succubi, Incubi & Cumazones that utilize Fertilin, similar to Hemogen
+- Insect-Caste Mechanics, with Queens, Drones and Workers and a conditional reproduction
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!
@@ -38,4 +39,5 @@ Please load this after any mod adding genes, and after the used RJW-Mods (Licent
**Conflicts:**
1. Should not be used with the original RJW_Animal_Gene_Inheritance anymore.
2. There was an issue with other "Male-Only / Female-Only" Mods --- for which we provide our own Genes now.
-3. CAI5000 will not crash, but will make *Seduce*-Ability fail. I think same goes for Combat Extended.
\ No newline at end of file
+3. CAI5000 will not crash, but will make *Seduce*-Ability fail. I think same goes for Combat Extended.
+4. Alpha Genes "Female / Male Only" Genes might overwrite later Genitalia-Changes and should be avoided in combination with RJW-Genes Features.
\ No newline at end of file