diff --git a/Content/Base/Defs/_Extra_Races.xml b/Content/Base/Defs/_Extra_Races.xml
index f4f7bd3..e997588 100644
--- a/Content/Base/Defs/_Extra_Races.xml
+++ b/Content/Base/Defs/_Extra_Races.xml
@@ -60,8 +60,6 @@
Alien_Slaaneshi
Alien_SlaaPrince
Alien_Daemonette
- eBlackangel
- eExile
kohime
MM_Kappa
O21_Alien_Tiefling
@@ -250,6 +248,7 @@
Battle_Droid
B-1_Droid_Specialist
B-1_Commander_Droid
+ eAndroid
Super_Battle_Droid
Droidekas
BX_Droid_Commando
@@ -280,7 +279,6 @@
FemaleEscortBot
MaleEscortBot
DomestiBot
- eAndroid
ChjAndroid
Alien_Engi
diff --git a/ReadMe.md b/ReadMe.md
index 67e2adb..d7255ad 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -8,103 +8,103 @@ Download: https://gitgud.io/AsmodeusRex/rjw-race-support/-/releases/permalink/la
This mod requires RJW and must be placed somewhere below it.
## Supported Mods
-* Add Elona Imouto Race https://steamcommunity.com/sharedfiles/filedetails/?id=1863723112
-* Add Elona Shoujo https://steamcommunity.com/sharedfiles/filedetails/?id=1500213859
-* Alpha Animals https://steamcommunity.com/sharedfiles/filedetails/?id=1541721856
-* Ancient Species https://steamcommunity.com/sharedfiles/filedetails/?id=2154569778
-* Androids https://steamcommunity.com/sharedfiles/filedetails/?id=2889326293
-* Anima Animals - Community Pack https://steamcommunity.com/sharedfiles/filedetails/?id=2488975583
-* Angels and Devils https://steamcommunity.com/sharedfiles/filedetails/?id=2048192285
-* Animal Collab Project https://steamcommunity.com/sharedfiles/filedetails/?id=2208467668
-* Antinium (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2209261976
-* Apini Playable Race, Continued https://steamcommunity.com/workshop/filedetails/?id=2204437968
-* Arachne Race (Continued) https://steamcommunity.com/workshop/filedetails/?id=2571931604
-* Archotech Race https://steamcommunity.com/sharedfiles/filedetails/?id=2500371387
-* Argonians of Blackmarsh (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2263851875
-* Astoriel https://steamcommunity.com/sharedfiles/filedetails/?id=1342510409
-* Barky's Lupaios Race Pack https://steamcommunity.com/sharedfiles/filedetails/?id=1718452287
-* Beast Man Tribes https://steamcommunity.com/sharedfiles/filedetails/?id=1119191638
-* Beetle People (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2568676996
-* -Black Widows (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2243686995
-* +Borderlands: The Rim https://steamcommunity.com/sharedfiles/filedetails/?id=1911170462
-* Cactaceae (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2025692982
-* Call of Cthulhu - Elder Things https://steamcommunity.com/sharedfiles/filedetails/?id=882126182
-* Call of Cthulhu - Cosmic Horrors https://steamcommunity.com/sharedfiles/filedetails/?id=765890823
-* Call of Cthulhu - Cults https://steamcommunity.com/sharedfiles/filedetails/?id=815039373
-* -Callistans (Legacy) https://steamcommunity.com/sharedfiles/filedetails/?id=1545178908
-* -Callistan Robotics https://steamcommunity.com/sharedfiles/filedetails/?id=1661171313
-* Dinosauria https://steamcommunity.com/workshop/filedetails/?id=1136958577
-* Dragon's Descent https://steamcommunity.com/workshop/filedetails/?id=2026992161
-* Drow Race Continued https://steamcommunity.com/sharedfiles/filedetails/?id=2012718526
-* Emperor of Dragon https://steamcommunity.com/sharedfiles/filedetails/?id=2033332545
-* Equiums II https://steamcommunity.com/sharedfiles/filedetails/?id=2878904290
-* Erin's Palamutes https://steamcommunity.com/sharedfiles/filedetails/?id=2485624026
-* [FCP] Stupid Sexy Deathclaws https://steamcommunity.com/sharedfiles/filedetails/?id=2635389101
-* Fantasy Goblins Updated https://steamcommunity.com/sharedfiles/filedetails/?id=2011680079
-* Feles - Felines of the Rim https://steamcommunity.com/sharedfiles/filedetails/?id=2690125435
-* Filthy Orc Invasion (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2178698397
-* -Forgotten Realms https://steamcommunity.com/sharedfiles/filedetails/?id=2184183669
-* Gods of Elona https://steamcommunity.com/sharedfiles/filedetails/?id=1505332648
-* Half Dragons https://steamcommunity.com/sharedfiles/filedetails/?id=2556121262
-* Hisa Faction https://steamcommunity.com/sharedfiles/filedetails/?id=1617772184
-* Horrors (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2036315072
-* House Maid Nukos https://steamcommunity.com/sharedfiles/filedetails/?id=1418683071
-* Ikquan Race https://steamcommunity.com/sharedfiles/filedetails/?id=2489566052
-* kemomimihouse https://steamcommunity.com/sharedfiles/filedetails/?id=2075974335
-* +Kenshi Hiver Race https://steamcommunity.com/sharedfiles/filedetails/?id=1840737944
-* +Kenshi Skeleton Race https://steamcommunity.com/sharedfiles/filedetails/?id=1841876651
-* Kijin Race 3.0 https://steamcommunity.com/sharedfiles/filedetails/?id=2884551646
-* Kilhn Race https://steamcommunity.com/sharedfiles/filedetails/?id=2025689796
-* Klickmala Race [Continued] https://steamcommunity.com/sharedfiles/filedetails/?id=2806331695
-* Kolra's Oni Race Mod (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2411504950
-* Kurin HAR Edition https://steamcommunity.com/workshop/filedetails/?id=2326430787
-* Lapelli Race https://steamcommunity.com/sharedfiles/filedetails/?id=2025057326
-* Lizardmen (Continued) https://steamcommunity.com/workshop/filedetails/?id=2777768013
-* Lighter Than Fast https://steamcommunity.com/sharedfiles/filedetails/?id=1240656304
-* Lliscean https://steamcommunity.com/sharedfiles/filedetails/?id=2124019366
-* Megafauna https://steamcommunity.com/workshop/filedetails/?id=1055485938
-* Mincho, The Mint Choco Slime ~ HAR ver. https://steamcommunity.com/sharedfiles/filedetails/?id=2477501851
-* -Moyo-From the depth https://steamcommunity.com/sharedfiles/filedetails/?id=2182305386
-* NewRatkinPlus https://steamcommunity.com/sharedfiles/filedetails/?id=1578693166
-* Nexomon https://steamcommunity.com/sharedfiles/filedetails/?id=2764736074
-* Ni'Hal https://steamcommunity.com/sharedfiles/filedetails/?id=1541567184
-* Nyaron Race https://steamcommunity.com/sharedfiles/filedetails/?id=1854376306
-* Oni of the Rim https://steamcommunity.com/sharedfiles/filedetails/?id=2891432261
-* Ooka Miko https://steamcommunity.com/sharedfiles/filedetails/?id=1536817379
-* Orassans https://steamcommunity.com/sharedfiles/filedetails/?id=1541519487
-* Pawnbold Race https://steamcommunity.com/sharedfiles/filedetails/?id=2104039874
-* Poleepkwa Race [1.3] https://steamcommunity.com/sharedfiles/filedetails/?id=2557294864
-* Protogen! Marley Race Mod https://steamcommunity.com/sharedfiles/filedetails/?id=1716136868
-* Rabbie The Moonrabbit race https://steamcommunity.com/sharedfiles/filedetails/?id=1837246563
-* Race to the Rim https://steamcommunity.com/sharedfiles/filedetails/?id=2325478123
-* Rakkle 1.4 (unofficial update) https://steamcommunity.com/sharedfiles/filedetails/?id=2584844208
-* Raptor Race https://steamcommunity.com/sharedfiles/filedetails/?id=2566540065
-* Rimcraft https://steamcommunity.com/workshop/filedetails/?id=1686288212
-* RimWorld - Witcher Monster Hunt https://steamcommunity.com/sharedfiles/filedetails/?id=2008529522
-* Royal Thrumbos (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2846919540
-* Save Our Ship 2 https://steamcommunity.com/workshop/filedetails/?id=1909914131
-* ShadowRimRaces https://steamcommunity.com/sharedfiles/filedetails/?id=2444008208
-* Skrix - An Insect-like Race https://steamcommunity.com/sharedfiles/filedetails/?id=2267078474
-* SYR Harpy https://steamcommunity.com/sharedfiles/filedetails/?id=2092823139
-* SYR Naga https://steamcommunity.com/sharedfiles/filedetails/?id=1539971494
-* SYR Thrumkin https://steamcommunity.com/sharedfiles/filedetails/?id=2017359567
-* The GiantRace https://steamcommunity.com/sharedfiles/filedetails/?id=2270904535
-* Tree People (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2568676212
-* Twi'lek Race (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2263363126
-* Tyrannosaur Race https://steamcommunity.com/sharedfiles/filedetails/?id=2567384337
-* Vanilla Animals Expanded https://steamcommunity.com/workshop/filedetails/?id=1884025115
-* Vanilla Genetics Expanded https://steamcommunity.com/sharedfiles/filedetails/?id=2801160906
-* Vulpes - Adorable Foxes! https://steamcommunity.com/sharedfiles/filedetails/?id=2174717519
-* Vulpine Race Pack (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2263865049
-* Wa! Skeleton! (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2159119022
-* +Warhammer: Daemonettes https://steamcommunity.com/sharedfiles/filedetails/?id=1659631711
-* +Warhammer: Fimir https://steamcommunity.com/sharedfiles/filedetails/?id=1953175950
-* +Warhammer: Gor https://steamcommunity.com/sharedfiles/filedetails/?id=1669073318
-* +Warhammer"ish":Dryad https://steamcommunity.com/sharedfiles/filedetails/?id=1694750191
-* [WH40K]Adeptus Xenobiologis: Orkoids https://steamcommunity.com/workshop/filedetails/?id=1541518264/
-* Xenohumans - Anthromorphs https://steamcommunity.com/sharedfiles/filedetails/?id=2349467636
-* Yokai https://steamcommunity.com/sharedfiles/filedetails/?id=1532938687
-* Zabrak Race (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2263389593
+* [Add Elona Imouto Race](https://steamcommunity.com/sharedfiles/filedetails/?id=1863723112)
+* [Add Elona Shoujo](https://steamcommunity.com/sharedfiles/filedetails/?id=1500213859)
+* [Alpha Animals](https://steamcommunity.com/sharedfiles/filedetails/?id=1541721856)
+* [Ancient Species](https://steamcommunity.com/sharedfiles/filedetails/?id=2154569778)
+* [Androids](https://steamcommunity.com/sharedfiles/filedetails/?id=2889326293)
+* [Anima Animals - Community Pack](https://steamcommunity.com/sharedfiles/filedetails/?id=2488975583)
+* [Angels and Devils](https://steamcommunity.com/sharedfiles/filedetails/?id=2048192285)
+* [Animal Collab Project](https://steamcommunity.com/sharedfiles/filedetails/?id=2208467668)
+* [Antinium (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2209261976)
+* [Apini Playable Race, Continued](https://steamcommunity.com/workshop/filedetails/?id=2204437968)
+* [Arachne Race (Continued)](https://steamcommunity.com/workshop/filedetails/?id=2571931604)
+* [Archotech Race](https://steamcommunity.com/sharedfiles/filedetails/?id=2500371387)
+* [Argonians of Blackmarsh (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2263851875)
+* [Astoriel](https://steamcommunity.com/sharedfiles/filedetails/?id=1342510409)
+* [Barky's Lupaios Race Pack](https://steamcommunity.com/sharedfiles/filedetails/?id=1718452287)
+* [Beast Man Tribes](https://steamcommunity.com/sharedfiles/filedetails/?id=1119191638)
+* [Beetle People (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2568676996)
+* [-Black Widows (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2243686995)
+* [+Borderlands: The Rim](https://steamcommunity.com/sharedfiles/filedetails/?id=1911170462)
+* [Cactaceae (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2025692982)
+* [Call of Cthulhu - Elder Things](https://steamcommunity.com/sharedfiles/filedetails/?id=882126182)
+* [Call of Cthulhu - Cosmic Horrors](https://steamcommunity.com/sharedfiles/filedetails/?id=765890823)
+* [Call of Cthulhu - Cults](https://steamcommunity.com/sharedfiles/filedetails/?id=815039373)
+* [-Callistans (Legacy)](https://steamcommunity.com/sharedfiles/filedetails/?id=1545178908)
+* [-Callistan Robotics](https://steamcommunity.com/sharedfiles/filedetails/?id=1661171313)
+* [Dinosauria](https://steamcommunity.com/workshop/filedetails/?id=1136958577)
+* [Dragon's Descent](https://steamcommunity.com/workshop/filedetails/?id=2026992161)
+* [Drow Race Continued](https://steamcommunity.com/sharedfiles/filedetails/?id=2012718526)
+* [Emperor of Dragon](https://steamcommunity.com/sharedfiles/filedetails/?id=2033332545)
+* [Equiums II](https://steamcommunity.com/sharedfiles/filedetails/?id=2878904290)
+* [Erin's Palamutes](https://steamcommunity.com/sharedfiles/filedetails/?id=2485624026)
+* [FCP Stupid Sexy Deathclaws](https://steamcommunity.com/sharedfiles/filedetails/?id=2635389101)
+* [Fantasy Goblins Updated](https://steamcommunity.com/sharedfiles/filedetails/?id=2011680079)
+* [Feles - Felines of the Rim](https://steamcommunity.com/sharedfiles/filedetails/?id=2690125435)
+* [Filthy Orc Invasion (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2178698397)
+* [-Forgotten Realms](https://steamcommunity.com/sharedfiles/filedetails/?id=2184183669)
+* [Gods of Elona](https://steamcommunity.com/sharedfiles/filedetails/?id=1505332648)
+* [Half Dragons](https://steamcommunity.com/sharedfiles/filedetails/?id=2556121262)
+* [Hisa Faction](https://steamcommunity.com/sharedfiles/filedetails/?id=1617772184)
+* [Horrors (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2036315072)
+* [House Maid Nukos](https://steamcommunity.com/sharedfiles/filedetails/?id=1418683071)
+* [Ikquan Race](https://steamcommunity.com/sharedfiles/filedetails/?id=2489566052)
+* [kemomimihouse](https://steamcommunity.com/sharedfiles/filedetails/?id=2075974335)
+* [+Kenshi Hiver Race](https://steamcommunity.com/sharedfiles/filedetails/?id=1840737944)
+* [+Kenshi Skeleton Race](https://steamcommunity.com/sharedfiles/filedetails/?id=1841876651)
+* [Kijin Race 3.0](https://steamcommunity.com/sharedfiles/filedetails/?id=2884551646)
+* [Kilhn Race](https://steamcommunity.com/sharedfiles/filedetails/?id=2025689796)
+* [Klickmala Race (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2806331695)
+* [Kolra's Oni Race Mod (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2411504950)
+* [Kurin HAR Edition](https://steamcommunity.com/workshop/filedetails/?id=2326430787)
+* [Lapelli Race](https://steamcommunity.com/sharedfiles/filedetails/?id=2025057326)
+* [Lizardmen (Continued)](https://steamcommunity.com/workshop/filedetails/?id=2777768013)
+* [Lighter Than Fast](https://steamcommunity.com/sharedfiles/filedetails/?id=1240656304)
+* [Lliscean](https://steamcommunity.com/sharedfiles/filedetails/?id=2124019366)
+* [Megafauna](https://steamcommunity.com/workshop/filedetails/?id=1055485938)
+* [Mincho, The Mint Choco Slime ~ HAR ver.](https://steamcommunity.com/sharedfiles/filedetails/?id=2477501851)
+* [-Moyo-From the depth](https://steamcommunity.com/sharedfiles/filedetails/?id=2182305386)
+* [NewRatkinPlus](https://steamcommunity.com/sharedfiles/filedetails/?id=1578693166)
+* [Nexomon](https://steamcommunity.com/sharedfiles/filedetails/?id=2764736074)
+* [Ni'Hal](https://steamcommunity.com/sharedfiles/filedetails/?id=1541567184)
+* [Nyaron Race](https://steamcommunity.com/sharedfiles/filedetails/?id=1854376306)
+* [Oni of the Rim](https://steamcommunity.com/sharedfiles/filedetails/?id=2891432261)
+* [Ooka Miko](https://steamcommunity.com/sharedfiles/filedetails/?id=1536817379)
+* [Orassans](https://steamcommunity.com/sharedfiles/filedetails/?id=1541519487)
+* [Pawnbold Race](https://steamcommunity.com/sharedfiles/filedetails/?id=2104039874)
+* [Poleepkwa Race](https://steamcommunity.com/sharedfiles/filedetails/?id=2557294864)
+* [Protogen! Marley Race Mod](https://steamcommunity.com/sharedfiles/filedetails/?id=1716136868)
+* [Rabbie The Moonrabbit race](https://steamcommunity.com/sharedfiles/filedetails/?id=1837246563)
+* [Race to the Rim](https://steamcommunity.com/sharedfiles/filedetails/?id=2325478123)
+* [Rakkle 1.4 (unofficial update)](https://steamcommunity.com/sharedfiles/filedetails/?id=2584844208)
+* [Raptor Race](https://steamcommunity.com/sharedfiles/filedetails/?id=2566540065)
+* [Rimcraft](https://steamcommunity.com/workshop/filedetails/?id=1686288212)
+* [RimWorld - Witcher Monster Hunt](https://steamcommunity.com/sharedfiles/filedetails/?id=2008529522)
+* [Royal Thrumbos (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2846919540)
+* [Save Our Ship 2](https://steamcommunity.com/workshop/filedetails/?id=1909914131)
+* [ShadowRimRaces](https://steamcommunity.com/sharedfiles/filedetails/?id=2444008208)
+* [Skrix - An Insect-like Race](https://steamcommunity.com/sharedfiles/filedetails/?id=2267078474)
+* [SYR Harpy](https://steamcommunity.com/sharedfiles/filedetails/?id=2092823139)
+* [SYR Naga](https://steamcommunity.com/sharedfiles/filedetails/?id=1539971494)
+* [SYR Thrumkin](https://steamcommunity.com/sharedfiles/filedetails/?id=2017359567)
+* [The GiantRace](https://steamcommunity.com/sharedfiles/filedetails/?id=2270904535)
+* [Tree People (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2568676212)
+* [Twi'lek Race (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2263363126)
+* [Tyrannosaur Race](https://steamcommunity.com/sharedfiles/filedetails/?id=2567384337)
+* [Vanilla Animals Expanded](https://steamcommunity.com/workshop/filedetails/?id=1884025115)
+* [Vanilla Genetics Expanded](https://steamcommunity.com/sharedfiles/filedetails/?id=2801160906)
+* [Vulpes - Adorable Foxes!](https://steamcommunity.com/sharedfiles/filedetails/?id=2174717519)
+* [Vulpine Race Pack (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2263865049)
+* [Wa! Skeleton! (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2159119022)
+* [+Warhammer: Daemonettes](https://steamcommunity.com/sharedfiles/filedetails/?id=1659631711)
+* [+Warhammer: Fimir](https://steamcommunity.com/sharedfiles/filedetails/?id=1953175950)
+* [+Warhammer: Gor](https://steamcommunity.com/sharedfiles/filedetails/?id=1669073318)
+* [+Warhammer"ish":Dryad](https://steamcommunity.com/sharedfiles/filedetails/?id=1694750191)
+* [Adeptus Xenobiologis: Orkoids](https://steamcommunity.com/workshop/filedetails/?id=1541518264/)
+* [Xenohumans - Anthromorphs](https://steamcommunity.com/sharedfiles/filedetails/?id=2349467636)
+* [Yokai](https://steamcommunity.com/sharedfiles/filedetails/?id=1532938687)
+* [Zabrak Race (Continued)](https://steamcommunity.com/sharedfiles/filedetails/?id=2263389593)
## Plans
* Maintain
@@ -115,11 +115,8 @@ This mod requires RJW and must be placed somewhere below it.
* FCP dogmeat
* Alpha mythology
### Test and improve
-* Emperor of dragon
-* Gods of elona
* Race to the rim
-* Ooka miko
-* kemomimihouse
+* Dragon's descent crossbreeding
## Thanks
* Ed86 (for Maintaining RJW)
diff --git a/changelog.txt b/changelog.txt
index 4d19124..21f241b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+11.3.2
+-Hotfixed Gods of Elona, Ooka miko, KMH
+
+11.3.1
+-Fixed Emperor of dragon, Gods of elona, Ooka miko, and kemomimihouse
+-Added support for insect girls
+
11.3.0
-Fixed some viviparous species laying chicken eggs
-Added PokeWorld support
diff --git a/generator/src/racegroups.rs b/generator/src/racegroups.rs
index 1db2576..ab40fca 100644
--- a/generator/src/racegroups.rs
+++ b/generator/src/racegroups.rs
@@ -11,6 +11,7 @@ pub struct RaceGroup {
pub m_genitals: String,
pub tag: String,
pub sex_drive: String,
+ pub gendered: bool,
pub egg_implant: bool,
}
@@ -20,6 +21,7 @@ impl RaceGroup {
races: Vec<&'static str>,
tag: &'static str,
sex_drive: &'static str,
+ gendered: bool,
breasts: &'static str,
anus: &'static str,
genitals: (&'static str, &'static str)
@@ -34,6 +36,7 @@ impl RaceGroup {
m_genitals: format!("{}Penis", genitals.1),
tag: tag.to_string(),
sex_drive: sex_drive.to_string(),
+ gendered,
egg_implant: false,
}
}
@@ -42,6 +45,7 @@ impl RaceGroup {
races: Vec<&'static str>,
tag: &'static str,
sex_drive: &'static str,
+ gendered: bool,
breasts: &'static str,
anus: &'static str,
genitals: (&'static str, &'static str)
@@ -56,6 +60,7 @@ impl RaceGroup {
m_genitals: format!("{}Penis", genitals.1),
tag: tag.to_string(),
sex_drive: sex_drive.to_string(),
+ gendered,
egg_implant: false,
}
}
@@ -72,22 +77,37 @@ fn tagify(content: &str, tag: &str) -> String {
pub fn construct_racegroup(group: &RaceGroup) -> String {
let mut s = String::from(RACEGROUP_STRING);
+
let mut races = String::new();
for race in &group.races {
races.push_str(&format!("\n\t\t\t{race}"));
}
+
let fields = match group.egg_implant {
true => "true\n\t\ttrue\n\t\t".to_string(),
false => String::new()
};
+
+ let mut m_breasts = group.m_breasts.clone();
+ let mut m_genital = group.m_genitals.clone();
+ let gender = match !group.gendered {
+ true => {
+ m_breasts = String::new();
+ m_genital = String::new();
+ format!("\n\t\t{}", !group.gendered)
+ },
+ false => String::new(),
+ };
+
let replace = HashMap::from([
("{name}", group.name.clone()),
("{anus}", tagify(&group.anus, "anuses")),
- ("{f_breasts}", tagify(&group.f_breasts, "femaleBreasts")),
+ ("{f_breasts}", tagify(&group.f_breasts, "femaleBreasts")),
("{f_genitals}", tagify(&group.f_genitals, "femaleGenitals")),
- ("{m_breasts}", tagify(&group.m_breasts, "maleBreasts")),
- ("{m_genitals}", tagify(&group.m_genitals, "maleGenitals")),
+ ("{m_breasts}", tagify(&m_breasts, "maleBreasts")),
+ ("{m_genitals}", tagify(&m_genital, "maleGenitals")),
("{tag}", tagify(&group.tag, "tags")),
+ ("{gendered}", gender),
("{sex_drive}", group.sex_drive.clone()),
("{races}", races),
("{fields}", fields)
@@ -109,7 +129,7 @@ const RACEGROUP_STRING: &'static str = "
{m_breasts}
{m_genitals}
{tag}
- {fields}{sex_drive}
+ {fields}{sex_drive}{gendered}
\n";
pub fn racegroup_data_humans() -> Vec {
@@ -146,12 +166,6 @@ pub fn racegroup_data_humans() -> Vec {
"Yokai_Yamanba",
"Yokai_YukiShizuku",
"DwarfRace",
- "eCutefairy",
- "eDefender",
- "eGoldenknight",
- "eGwen",
- "eYoungercatsister",
- "eYoungersister",
"HorrorsInfestedHuman",
"HorrorsOverlord",
"Elona_Imouto",
@@ -160,7 +174,7 @@ pub fn racegroup_data_humans() -> Vec {
"Ooka_Miko",
"TrollRace",
],
- "Skin", "1",
+ "Skin", "1", true,
"Breasts",
"",
("", ""),
@@ -177,7 +191,7 @@ pub fn racegroup_data_humans() -> Vec {
"Races_BlackWidow",
"Yokai_JorouGumo",
],
- "Chitin", "0.8",
+ "Chitin", "0.8", true,
"Breasts",
"Insect",
("Ovipore", "Aedeagus"),
@@ -188,7 +202,7 @@ pub fn racegroup_data_humans() -> Vec {
"ATK_Avianmorph",
"Harpy",
],
- "Feathers", "0.9",
+ "Feathers", "0.9", true,
"FeaturelessChest",
"Cloacal",
("Cloacal", "Cloacal"),
@@ -199,7 +213,7 @@ pub fn racegroup_data_humans() -> Vec {
"WoW_Pandaren",
"BearMan",
],
- "Fur", "0.9",
+ "Fur", "0.9", true,
"Breasts",
"",
("", "Bear"),
@@ -214,7 +228,7 @@ pub fn racegroup_data_humans() -> Vec {
"siro",
"WolfMan",
],
- "Fur", "1",
+ "Fur", "1", true,
"Breasts",
"",
("Dog", "Dog"),
@@ -233,7 +247,7 @@ pub fn racegroup_data_humans() -> Vec {
"Yokai_NineTailWhite",
"FoxMan",
],
- "Fur", "1.3",
+ "Fur", "1.3", true,
"Breasts",
"",
("Dog", "Dog"),
@@ -245,7 +259,7 @@ pub fn racegroup_data_humans() -> Vec {
"SSD_DeathclawRace",
"Races_Lizardman",
],
- "Scales", "0.9",
+ "Scales", "0.9", true,
"ScaleBreasts",
"Cloacal",
("Cloacal", "Crocodilian"),
@@ -260,7 +274,7 @@ pub fn racegroup_data_humans() -> Vec {
"GazelleMan",
"Lliscean",
],
- "Fur", "1",
+ "Fur", "1", true,
"Breasts",
"",
("Narrow", "Needle"),
@@ -271,7 +285,7 @@ pub fn racegroup_data_humans() -> Vec {
"Raptor",
"Tyrannosaur",
],
- "Scales", "0.9",
+ "Scales", "0.9", true,
"ScaleBreasts",
"Cloacal",
("Cloacal", "Dino"),
@@ -292,13 +306,12 @@ pub fn racegroup_data_humans() -> Vec {
"Yokai_Tenaga",
"Yokai_TenagaH",
"Yokai_TubakiAnimal",
- "EmperorDragon",
"HalfDragon",
"Dragon_Kilhn",
"ALapelli",
"yuki",
],
- "Scales", "1.2",
+ "Scales", "1.2", true,
"ScaleBreasts",
"Cloacal",
("Cloacal", "Dragon")
@@ -308,7 +321,7 @@ pub fn racegroup_data_humans() -> Vec {
vec![
"ElephantMan",
],
- "Fur", "1",
+ "Fur", "1", true,
"Breasts",
"",
("Elephant", "Elephant"),
@@ -320,7 +333,7 @@ pub fn racegroup_data_humans() -> Vec {
"kon",
"Vulpes",
],
- "Fur", "1.3",
+ "Fur", "1.3", true,
"Petite_FoxGirl_Breasts",
"Petite_FoxGirl_",
("Petite_FoxGirl_", ""),
@@ -357,7 +370,7 @@ pub fn racegroup_data_humans() -> Vec {
"WoW_NightElf",
"ElfRace",
],
- "Skin", "1.1",
+ "Skin", "1.1", true,
"Breasts",
"Elf",
("Elf", "Elf"),
@@ -378,7 +391,7 @@ pub fn racegroup_data_humans() -> Vec {
"Maidnukos",
"miko",
],
- "Fur", "1",
+ "Fur", "1", true,
"Breasts",
"Feline",
("Cat", "Cat"),
@@ -405,7 +418,7 @@ pub fn racegroup_data_humans() -> Vec {
"PW_Staryu",
"IkquanRace",
],
- "Scales", "0.8",
+ "Scales", "0.8", true,
"FeaturelessChest",
"Cloacal",
("Cloacal", "Marine"),
@@ -422,7 +435,7 @@ pub fn racegroup_data_humans() -> Vec {
"PW_Misdreavus",
"WoW_Skeleton",
],
- "Demon", "0.5",
+ "Demon", "0.5", true,
"GhostBreasts",
"Ghost",
("Ghost", "Ghost"),
@@ -433,7 +446,7 @@ pub fn racegroup_data_humans() -> Vec {
"Ghoul",
"GlowingGhoul",
],
- "Demon", "0.5",
+ "Demon", "0.5", true,
"GhoulBreasts",
"Ghoul",
("Ghoul", "Ghoul"),
@@ -443,7 +456,7 @@ pub fn racegroup_data_humans() -> Vec {
vec![
"Alien_Kijin",
],
- "Skin", "1.4",
+ "Skin", "1.4", true,
"Horny_Breasts",
"",
("Horny_", "Horny_"),
@@ -466,7 +479,7 @@ pub fn racegroup_data_humans() -> Vec {
"OG_Alien_Grot",
"WoW_Orc",
],
- "Skin", "1.3",
+ "Skin", "1.3", true,
"OrcBreasts",
"Orc",
("Orc", "Orc"),
@@ -485,7 +498,7 @@ pub fn racegroup_data_humans() -> Vec {
"Alien_ZPEquium",
"WoW_Draenei",
],
- "Fur", "1.2",
+ "Fur", "1.2", true,
"Breasts",
"Horse",
("Horse", "Horse"),
@@ -495,7 +508,7 @@ pub fn racegroup_data_humans() -> Vec {
vec![
"PigMan",
],
- "Fur", "1",
+ "Fur", "1", true,
"Breasts",
"",
("Pig", "Pig"),
@@ -506,7 +519,7 @@ pub fn racegroup_data_humans() -> Vec {
"RaccoonMan",
"StarWarsRaces_Ewok",
],
- "Fur", "1.1",
+ "Fur", "1.1", true,
"Breasts",
"",
("", "Raccoon"),
@@ -522,7 +535,7 @@ pub fn racegroup_data_humans() -> Vec {
"Yokai_Samia",
"Naga",
],
- "Scales", "0.9",
+ "Scales", "0.9", true,
"ScaleBreasts",
"Cloacal",
("Cloacal", "Hemi"),
@@ -543,7 +556,7 @@ pub fn racegroup_data_humans() -> Vec {
"Rotti",
"Rabbie",
],
- "Fur", "1.3",
+ "Fur", "1.3", true,
"Petite_Breasts",
"Petite_",
("Rodent", "Rodent"),
@@ -553,7 +566,7 @@ pub fn racegroup_data_humans() -> Vec {
vec![
"Thrumkin",
],
- "Fur", "1.2",
+ "Fur", "1.2", true,
"Breasts",
"Cloacal",
("Cloacal", "Dragon")
@@ -585,7 +598,7 @@ pub fn racegroup_data_humans() -> Vec {
"PW_Vileplume",
"PW_Weepinbell",
],
- "Plant", "1",
+ "Plant", "1", true,
"TreeBreasts",
"Tree",
("Tree", "Tree"),
@@ -609,6 +622,7 @@ pub fn racegroup_data_humans() -> Vec {
m_genitals: "BovinePenis".to_string(),
tag: "Fur".to_string(),
sex_drive: "1".to_string(),
+ gendered: true,
egg_implant: false,
},
RaceGroup {
@@ -632,6 +646,7 @@ pub fn racegroup_data_humans() -> Vec {
m_genitals: "SlimeTentacles".to_string(),
tag: "Slime".to_string(),
sex_drive: "1".to_string(),
+ gendered: true,
egg_implant: false,
},
]
@@ -649,7 +664,7 @@ pub fn racegroup_data_animals() -> Vec {
"Yokai_IssunAnimal",
"Andrewsarchus",
],
- "Fur", "1",
+ "Fur", "1", true,
"MammalBreasts",
"Mammal",
("Mammal", "Mammal"),
@@ -672,7 +687,7 @@ pub fn racegroup_data_animals() -> Vec {
"Dinopithecus",
"Gigantopithecus",
],
- "Fur", "1.1",
+ "Fur", "1.1", true,
"MammalBreasts",
"Mammal",
("Mammal", "Monkey"),
@@ -721,7 +736,7 @@ pub fn racegroup_data_animals() -> Vec {
"Arthropleura",
"Pulmonoscorpius",
],
- "Chitin", "0.7",
+ "Chitin", "0.7", true,
"",
"Insect",
("Ovipore", "Aedeagus"),
@@ -798,7 +813,7 @@ pub fn racegroup_data_animals() -> Vec {
"Palaeeudyptes",
"Titanis",
],
- "Feathers", "0.8",
+ "Feathers", "0.8", true,
"",
"Cloacal",
("Cloacal", "Cloacal"),
@@ -874,7 +889,22 @@ pub fn racegroup_data_animals() -> Vec {
"Omnicron",
"Fuzztino",
],
- "Fur", "1",
+ "Fur", "1", true,
+ "MammalBreasts",
+ "Dog",
+ ("Dog", "Dog"),
+ ),
+ RaceGroup::standard_animal(
+ "CanineSingleGender",
+ vec![
+ "kon",
+ "konf",
+ "kuro",
+ "Ooka_Miko",
+ "siro",
+ "sirof",
+ ],
+ "Fur", "1", false,
"MammalBreasts",
"Dog",
("Dog", "Dog"),
@@ -884,7 +914,7 @@ pub fn racegroup_data_animals() -> Vec {
vec![
"AA_RipperHound",
],
- "Skin", "0.9",
+ "Skin", "0.9", true,
"MammalBreasts",
"Dog",
("Dog", "Dog"),
@@ -905,7 +935,7 @@ pub fn racegroup_data_animals() -> Vec {
"PW_Stantler",
"RG-WF_WastelandDeer",
],
- "Fur", "1",
+ "Fur", "1", true,
"MammalBreasts",
"Mammal",
("Narrow", "Needle"),
@@ -922,11 +952,23 @@ pub fn racegroup_data_animals() -> Vec {
"Quinkana",
"Purussaurus",
],
- "Scales", "0.8",
+ "Scales", "0.8", true,
"",
"Cloacal",
("Cloacal", "Crocodilian"),
),
+ RaceGroup::standard_animal(
+ "DemonSingleGender",
+ vec![
+ "eBlackangel",
+ "eExile",
+ "kohime",
+ ],
+ "Demon", "1", false,
+ "Breasts",
+ "",
+ ("Demon", "Demon"),
+ ),
RaceGroup::standard_animal(
"DinoFeathered",
vec![
@@ -940,7 +982,7 @@ pub fn racegroup_data_animals() -> Vec {
"Velociraptor",
"Yutyrannus",
],
- "Feathers", "1",
+ "Feathers", "1", true,
"",
"Cloacal",
("Cloacal", "Dino"),
@@ -980,7 +1022,7 @@ pub fn racegroup_data_animals() -> Vec {
"TyrannosaurusRex",
"Utahraptor",
],
- "Scales", "1",
+ "Scales", "1", true,
"",
"Cloacal",
("Cloacal", "Dino"),
@@ -1017,7 +1059,17 @@ pub fn racegroup_data_animals() -> Vec {
"Mystogen",
"Voltaic",
],
- "Scales", "1.2",
+ "Scales", "1.2", true,
+ "",
+ "Cloacal",
+ ("Cloacal", "Dragon"),
+ ),
+ RaceGroup::standard_animal(
+ "DragonSingleGender",
+ vec![
+ "yuki",
+ ],
+ "Scales", "1.2", false,
"",
"Cloacal",
("Cloacal", "Dragon"),
@@ -1043,7 +1095,7 @@ pub fn racegroup_data_animals() -> Vec {
"WoollyMammoth",
"Zygolophodon",
],
- "Fur", "0.9",
+ "Fur", "0.9", true,
"MammalBreasts",
"Mammal",
("Elephant", "Elephant"),
@@ -1098,13 +1150,12 @@ pub fn racegroup_data_animals() -> Vec {
"PW_Persian",
"Carnagrius",
"Dinocrocuta",
- "eBlackcat",
"Jeeta",
"Pallas_cat",
"Smilodon",
"Snow_leopard",
],
- "Fur", "1",
+ "Fur", "1", true,
"CatBreasts",
"Feline",
("Cat", "Cat"),
@@ -1114,7 +1165,19 @@ pub fn racegroup_data_animals() -> Vec {
vec![
"AEXP_Hyena",
],
- "Fur", "1.3",
+ "Fur", "1.3", true,
+ "CatBreasts",
+ "Feline",
+ ("Cat", "Cat"),
+ ),
+ RaceGroup::standard_animal(
+ "FelineSingleGender",
+ vec![
+ "eBlackcat",
+ "eYoungercatsister",
+ "miko",
+ ],
+ "Fur", "1", false,
"CatBreasts",
"Feline",
("Cat", "Cat"),
@@ -1159,11 +1222,32 @@ pub fn racegroup_data_animals() -> Vec {
"Paraceratherium",
"Uintatherium",
],
- "Fur", "1",
+ "Fur", "1", true,
"MammalBreasts",
"Horse",
("Horse", "Horse"),
),
+ RaceGroup::standard_animal(
+ "HumanlikeGenderless",
+ vec![
+ "eCutefairy",
+ "eDefender",
+ "eGoldenknight",
+ "eGwen",
+ "eYoungersister",
+ "EmperorDragon",
+ "baier",
+ "buer",
+ "jiaer",
+ "juer",
+ "kuoer",
+ "zhuer",
+ ],
+ "Skin", "1", false,
+ "Breasts",
+ "",
+ ("", ""),
+ ),
// I know hippos are more closely related to other artiodactyls than to pinnipeds, but their genitalia are strikingly similar due to convergent evolution
RaceGroup::standard_animal(
"MarineMammal",
@@ -1179,7 +1263,7 @@ pub fn racegroup_data_animals() -> Vec {
"PW_Seel",
"Gomphotaria",
],
- "Fur", "0.9",
+ "Fur", "0.9", true,
"MammalBreasts",
"Mammal",
("Mammal", "Marine"),
@@ -1190,7 +1274,7 @@ pub fn racegroup_data_animals() -> Vec {
"AEXP_Kangaroo",
"Procoptodon",
],
- "Fur", "1",
+ "Fur", "1", true,
"MammalBreasts",
"Cloacal",
("Cloacal", "Cloacal"),
@@ -1205,7 +1289,7 @@ pub fn racegroup_data_animals() -> Vec {
"PW_Dugtrio",
"Diprotodon",
],
- "Fur", "1",
+ "Fur", "1", true,
"MammalBreasts",
"Cloacal",
("Cloacal", "Hemi"),
@@ -1219,7 +1303,7 @@ pub fn racegroup_data_animals() -> Vec {
"OG_Squig_Oily",
"OG_Snotling",
],
- "Skin", "1",
+ "Skin", "1", true,
"MammalBreasts",
"Orc",
("Orc", "Orc"),
@@ -1243,7 +1327,7 @@ pub fn racegroup_data_animals() -> Vec {
"MM_ErymanthianBoar",
"Daeodon",
],
- "Fur", "1",
+ "Fur", "1", true,
"MammalBreasts",
"Mammal",
("Pig", "Pig"),
@@ -1254,7 +1338,7 @@ pub fn racegroup_data_animals() -> Vec {
"ACPDuckBilledPlatypus",
"AEXP_Platypus",
],
- "Fur", "0.9",
+ "Fur", "0.9", true,
"MammalBreasts",
"Cloacal",
("Cloacal", "Cloacal"),
@@ -1278,7 +1362,7 @@ pub fn racegroup_data_animals() -> Vec {
"PW_Sneasel",
"Enhydriodon",
],
- "Fur", "1",
+ "Fur", "1", true,
"MammalBreasts",
"Mammal",
("Mammal", "Raccoon"),
@@ -1322,7 +1406,7 @@ pub fn racegroup_data_animals() -> Vec {
"Rakk",
"Titanoboa",
],
- "Scales", "0.8",
+ "Scales", "0.8", true,
"",
"Cloacal",
("Cloacal", "Hemi"),
@@ -1399,7 +1483,17 @@ pub fn racegroup_data_animals() -> Vec {
"Josephoartigasia",
"Pika",
],
- "Fur", "1.1",
+ "Fur", "1.1", true,
+ "MammalBreasts",
+ "Mammal",
+ ("Mammal", "Rodent"),
+ ),
+ RaceGroup::standard_animal(
+ "RodentSingleGender",
+ vec![
+ "hana",
+ ],
+ "Fur", "1.1", false,
"MammalBreasts",
"Mammal",
("Mammal", "Rodent"),
@@ -1415,7 +1509,7 @@ pub fn racegroup_data_animals() -> Vec {
"PW_Tentacool",
"PW_Tentacruel",
],
- "Slime", "0.8",
+ "Slime", "0.8", true,
"",
"Cloacal",
("Cloacal", "Tentacle"),
@@ -1439,7 +1533,7 @@ pub fn racegroup_data_animals() -> Vec {
"Archothrumbo",
"RoyalThrumbo",
],
- "Fur", "1",
+ "Fur", "1", true,
"MammalBreasts",
"Cloacal",
("Cloacal", "Dragon"),
@@ -1457,7 +1551,7 @@ pub fn racegroup_data_animals() -> Vec {
"Archotortoise",
"Megalochelys",
],
- "Scales", "0.8",
+ "Scales", "0.8", true,
"",
"Cloacal",
("Cloacal", "Turtle"),
@@ -1489,7 +1583,7 @@ pub fn racegroup_data_animals() -> Vec {
"AnimaBear",
"ShortfacedBear",
],
- "Fur", "1",
+ "Fur", "1", true,
"MammalBreasts",
"Mammal",
("Mammal", "Bear"),
@@ -1500,7 +1594,7 @@ pub fn racegroup_data_animals() -> Vec {
vec![
"AA_SandProwler",
],
- "Scales", "1",
+ "Scales", "1", true,
"CatBreasts",
"Feline",
("Cat", "Cat"),
@@ -1605,6 +1699,23 @@ pub fn racegroup_data_animals() -> Vec {
m_genitals: "BovinePenis".to_string(),
tag: "Fur".to_string(),
sex_drive: "1".to_string(),
+ gendered: true,
+ egg_implant: false,
+ },
+ RaceGroup {
+ races: vec![
+ "akame",
+ "aome",
+ ],
+ name: "BovineSingleGenderAnimal".to_string(),
+ anus: "MammalAnus".to_string(),
+ f_breasts: "UdderBreasts".to_string(),
+ m_breasts: "MammalBreasts".to_string(),
+ f_genitals: "BovineVagina".to_string(),
+ m_genitals: "BovinePenis".to_string(),
+ tag: "Fur".to_string(),
+ sex_drive: "1".to_string(),
+ gendered: false,
egg_implant: false,
},
// Arthropods that reproduce through oviposition
@@ -1658,6 +1769,7 @@ pub fn racegroup_data_animals() -> Vec {
m_genitals: "OvipositorM".to_string(),
tag: "Chitin".to_string(),
sex_drive: "1".to_string(),
+ gendered: true,
egg_implant: true,
},
RaceGroup {
@@ -1673,6 +1785,7 @@ pub fn racegroup_data_animals() -> Vec {
m_genitals: "OvipositorM".to_string(),
tag: "Chitin".to_string(),
sex_drive: "1.5".to_string(),
+ gendered: true,
egg_implant: true,
},
]