From 9766742ae3e2b524626d4456e09614fbde157372 Mon Sep 17 00:00:00 2001 From: purplepenguinonion Date: Fri, 2 Dec 2022 19:24:06 -0800 Subject: [PATCH 1/6] Add PokeWorld gen1/2 --- generator/src/racegroups.rs | 233 ++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+) diff --git a/generator/src/racegroups.rs b/generator/src/racegroups.rs index 5b1a79b..8dae0a5 100644 --- a/generator/src/racegroups.rs +++ b/generator/src/racegroups.rs @@ -131,6 +131,21 @@ pub fn racegroup_data_humans() -> Vec { "WMH_Cyclops", "Yokai_Yamanba", "Yokai_YukiShizuku", + "PW_Abra", + "PW_Kadabra", + "PW_Alakazam", + "PW_Machop", + "PW_Machoke", + "PW_Machamp", + "PW_Hitmonlee", + "PW_Hitmonchan", + "PW_MrMime", + "PW_Jynx", + "PW_Snorlax", + "PW_Mewtwo", + "PW_Tyrogue", + "PW_Hitmontop", + "PW_Smoochum", "DwarfRace", "eCutefairy", "eDefender", @@ -318,6 +333,15 @@ pub fn racegroup_data_humans() -> Vec { "AS_WHE_Race", "Alien_Astoriel", "Alien_Drow_Otto", + "PW_Clefairy", + "PW_Clefable", + "PW_Cleffa", + "PW_Jigglypuff", + "PW_Wigglytuff", + "PW_Igglybuff", + "PW_Togepi", + "PW_Togetic", + "PW_Celebi", "O21_Alien_DarkElf", "O21_Alien_MoonElf", "O21_Alien_SunElf", @@ -366,6 +390,20 @@ pub fn racegroup_data_humans() -> Vec { "Alien_NiHal", "Alien_Quarren", "Alien_MonCalamari", + "PW_Horsea", + "PW_Seadra", + "PW_Goldeen", + "PW_Seaking", + "PW_Staryu", + "PW_Starmie", + "PW_Magikarp", + "PW_Gyarados", + "PW_Lanturn", + "PW_Qwilfish", + "PW_Corsola", + "PW_Remoraid", + "PW_Mantine", + "PW_Kingdra", "IkquanRace", ], "Fish", @@ -380,6 +418,10 @@ pub fn racegroup_data_humans() -> Vec { "HPLovecraft_MistCreature", "MM_WillOWisp", "WoW_Skeleton", + "PW_Gastly", + "PW_Haunter", + "PW_Gengar", + "PW_Misdreavus", ], "Ghost", "Demon", "0.5", @@ -523,6 +565,26 @@ pub fn racegroup_data_humans() -> Vec { "Alien_Dryad", "Alien_DryadWild", "Alien_Tree", + "PW_Bulbasaur", + "PW_Ivysaur", + "PW_Venusaur", + "PW_Oddish", + "PW_Gloom", + "PW_Vileplume", + "PW_Bellsprout", + "PW_Weepinbell", + "PW_Victreebel", + "PW_Tangela", + "PW_Chikorita", + "PW_Bayleef", + "PW_Meganium", + "PW_Bellossom", + "PW_Sudowoodo", + "PW_Hoppip", + "PW_Skiploom", + "PW_Jumpluff", + "PW_Sunkern", + "PW_Sunflora", ], "Tree", "Plant", "1", @@ -557,6 +619,11 @@ pub fn racegroup_data_humans() -> Vec { "Alien_Slug", "Mincho_ThingDef", "Yokai_HihiiroKabe", + "PW_Grimer", + "PW_Muk", + "PW_Ditto", + "PW_Slugma", + "PW_Magcargo", "Slime", ], name: "Slime".to_string(), @@ -597,6 +664,12 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_Lemur", "AEXP_Bonobo", "GR_ParagonHumanoid", + "PW_Mankey", + "PW_Primeape", + "PW_Lickitung", + "PW_Electabuzz", + "PW_Magmar", + "PW_Aipom", "Dinopithecus", "Gigantopithecus", ], @@ -629,6 +702,16 @@ pub fn racegroup_data_animals() -> Vec { "AA_SummitCrab", "ACPSilkspider", "AEXP_Megascorpion", + "PW_Shellder", + "PW_Cloyster", + "PW_Krabby", + "PW_Kingler", + "PW_Omanyte", + "PW_Omastar", + "PW_Kabuto", + "PW_Kabutops", + "PW_Forretress", + "PW_Dunsparce", "BWFlooferMoth", "Cults_ByakheeRace", "VAECaves_AncientGiantSpider", @@ -687,6 +770,34 @@ pub fn racegroup_data_animals() -> Vec { "MM_Ieltxu", "MM_Fenghuang", "MM_Phoenix", + "PW_Pidgey", + "PW_Pidgeotto", + "PW_Pidgeot", + "PW_Spearow", + "PW_Fearow", + // TODO: Figure out where bats go + "PW_Zubat", + "PW_Golbat", + "PW_Crobat", + "PW_Gligar", + // End bats + "PW_Psyduck", + "PW_Golduck", + "PW_Farfetchd", + "PW_Doduo", + "PW_Dodrio", + "PW_Articuno", + "PW_Zapdos", + "PW_Moltres", + "PW_Hoothoot", + "PW_Noctowl", + "PW_Natu", + "PW_Xatu", + "PW_Murkrow", + "PW_Delibird", + "PW_Skarmory", + "PW_Lugia", + "PW_HoOh", "RG-EAP_Dodo", "RG-EAP_ArcticDrak", "Archostrich", @@ -734,6 +845,8 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_WelshTerrier", "AEXP_AfricanWildDog", "ERN_Palamute", + "PW_Vulpix", + "PW_Ninetales", "GR_Wolfbear", "GR_Wolfalope", "GR_Wolfchicken", @@ -746,6 +859,21 @@ pub fn racegroup_data_animals() -> Vec { "MM_Ahuizotl", "MM_Kitsune", "MM_Cerberus", + "PW_Growlithe", + "PW_Arcanine", + "PW_Eevee", + "PW_Vaporeon", + "PW_Jolteon", + "PW_Flareon", + "PW_Espeon", + "PW_Umbreon", + "PW_Snubbull", + "PW_Granbull", + "PW_Houndour", + "PW_Houndoom", + "PW_Raikou", + "PW_Entei", + "PW_Suicune", "Archomutt", "AnimaWarg", "Abaddog", @@ -780,6 +908,8 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_Camel", "AEXP_Giraffe", "AEXP_Moose", + "PW_Girafarig", + "PW_Stantler", "RG-WF_WastelandDeer", ], "Cervine", @@ -791,6 +921,9 @@ pub fn racegroup_data_animals() -> Vec { RaceGroup::standard_animal( vec![ "AA_RoughPlatedMonitor", + "PW_Totodile", + "PW_Croconaw", + "PW_Feraligatr", "AEXP_Crocodile", "AEXP_Alligator", "Quinkana", @@ -805,6 +938,7 @@ pub fn racegroup_data_animals() -> Vec { RaceGroup::standard_animal( vec![ "AA_PedigreedRaptor", + "PW_Aerodactyl", "Dakotaraptor", "Deinocheirus", "Gallimimus", @@ -821,6 +955,11 @@ pub fn racegroup_data_animals() -> Vec { ), RaceGroup::standard_animal( vec![ + "PW_Cubone", + "PW_Marowak", + "PW_Kangaskhan", + "PW_Larvitar", + "PW_Tyranitar", "Allosaurus", "Ankylosaurus", "Baryonyx", @@ -860,6 +999,12 @@ pub fn racegroup_data_animals() -> Vec { "AA_DecayDrake", "MM_Qilin", "MM_LesserWyvern", + "PW_Charmander", + "PW_Charmeleon", + "PW_Charizard", + "PW_Dratini", + "PW_Dragonair", + "PW_Dragonite", "Yokai_RyuunoIkariAnimal", // Colored dragons "Black_Dragon", @@ -894,6 +1039,10 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_Tapir", "HC_WoollyMammoth", "RG-EAP_WoollyMammoth", + "PW_Drowzee", + "PW_Hypno", + "PW_Phanpy", + "PW_Donphan", "Boltusk", "Deinotherium", "Platybelodon", @@ -951,6 +1100,8 @@ pub fn racegroup_data_animals() -> Vec { "MM_Manticore", "MM_Xiezhi", "MM_Griffin", + "PW_Meowth", + "PW_Persian", "Carnagrius", "Dinocrocuta", "eBlackcat", @@ -1004,6 +1155,10 @@ pub fn racegroup_data_animals() -> Vec { "GR_ParagonHorse", "MM_Pegasus", "MM_Unicorn", + "PW_Ponyta", + "PW_Rapidash", + "PW_Rhyhorn", + "PW_Rhydon", "RG-EAP_WoollyRhino", "Chalicotherium", "Elasmotherium", @@ -1024,6 +1179,10 @@ pub fn racegroup_data_animals() -> Vec { "ACPHippopotamus", "AEXP_Seal", "AEXP_Walrus", + "PW_Seel", + "PW_Dewgong", + "PW_Marill", + "PW_Azumarill", "Gomphotaria", ], "MarineMammal", @@ -1048,6 +1207,8 @@ pub fn racegroup_data_animals() -> Vec { vec![ "AEXP_Koala", "AEXP_TasmanianDevil", + "PW_Diglett", + "PW_Dugtrio", "Diprotodon", ], "MarsupialBi", @@ -1078,6 +1239,11 @@ pub fn racegroup_data_animals() -> Vec { "AA_WindBeast", "AA_Darkbeast", "AA_DarkVandal", + "PW_Slowpoke", + "PW_Slowbro", + "PW_Slowking", + "PW_Swinub", + "PW_Piloswine", "ACPTapir", "ACPPeccary", "MM_ErymanthianBoar", @@ -1114,6 +1280,8 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_MegaWolverine", "AEXP_Otter", "AEXP_Badger", + "PW_Sneasel", + "PW_Smeargle", "Enhydriodon", ], "Raccoon", @@ -1151,6 +1319,8 @@ pub fn racegroup_data_animals() -> Vec { "MM_Basilisk", "MM_Salamander", "MM_Tlilcoatl", + "PW_Ekans", + "PW_Arbok", "RG-WF_WastelandDeathclaw", "Gigantophis", "Megalania", @@ -1206,6 +1376,25 @@ pub fn racegroup_data_animals() -> Vec { "GR_Rabbitchicken", "GR_Ratffalo", "GR_Squirralope", + "PW_Rattata", + "PW_Raticate", + "PW_Pikachu", + "PW_Raichu", + "PW_Sandshrew", + "PW_Sandslash", + "PW_NidoranF", + "PW_Nidorina", + "PW_Nidoqueen", + "PW_NidoranM", + "PW_Nidorino", + "PW_Nidoking", + "PW_Mew", + "PW_Cyndaquil", + "PW_Quilava", + "PW_Typhlosion", + "PW_Sentret", + "PW_Furret", + "PW_Pichu", "RG-WF_WastelandSquirrel", "RG-WF_WastelandBeaver", "Yokai_SpinMouse", @@ -1227,6 +1416,18 @@ pub fn racegroup_data_animals() -> Vec { "AA_Plasmorph", "AA_SandSquid", "AA_TarGuzzler", + // Do frogs go here? + "PW_Poliwag", + "PW_Poliwhirl", + "PW_Poliwrath", + "PW_Tentacool", + "PW_Tentacruel", + "PW_Chinchou", + "PW_Politoed", + "PW_Wooper", + "PW_Quagsire", + "PW_Wobbuffet", + "PW_Octillery", ], "Tentacle", "Slime", "0.8", Some(false), @@ -1262,6 +1463,11 @@ pub fn racegroup_data_animals() -> Vec { vec![ "Tortoise", "AEXP_DesertTortoise", + "PW_Squirtle", + "PW_Wartortle", + "PW_Blastoise", + "PW_Lapras", + "PW_Shuckle", "Archotortoise", "Megalochelys", ], @@ -1290,6 +1496,8 @@ pub fn racegroup_data_animals() -> Vec { "GR_Manbear", "GR_ParagonBear", "RG-WF_WastelandBear", + "PW_Teddiursa", + "PW_Ursaring", "Archopanda", "AnimaBear", "ShortfacedBear", @@ -1362,6 +1570,11 @@ pub fn racegroup_data_animals() -> Vec { "MM_WildMinotaur", "MM_Catoblepas", "MM_CeryneianHind", + "PW_Tauros", + "PW_Mareep", + "PW_Flaaffy", + "PW_Ampharos", + "PW_Miltank", "Addax", "AngusCow", "AnkoleWatusiCow", @@ -1428,6 +1641,26 @@ pub fn racegroup_data_animals() -> Vec { "AA_Feralisk", "AA_Junglelisk", "AACP_AnimaMegaspider", + "PW_Caterpie", + "PW_Metapod", + "PW_Butterfree", + "PW_Weedle", + "PW_Kakuna", + "PW_Beedrill", + "PW_Paras", + "PW_Parasect", + "PW_Venonat", + "PW_Venomoth", + "PW_Scyther", + "PW_Pinsir", + "PW_Ledyba", + "PW_Ledian", + "PW_Spinarak", + "PW_Ariados", + "PW_Yanma", + "PW_Pineco", + "PW_Scizor", + "PW_Heracross", "Meganeura", "Spiderant", ], From f7ca97ed7fbb350e389d4ed549c391f492ebbd43 Mon Sep 17 00:00:00 2001 From: purplepenguinonion Date: Fri, 2 Dec 2022 20:04:26 -0800 Subject: [PATCH 2/6] Alphabetize lists --- generator/src/racegroups.rs | 383 +++++++++++++++++------------------- 1 file changed, 184 insertions(+), 199 deletions(-) diff --git a/generator/src/racegroups.rs b/generator/src/racegroups.rs index 8dae0a5..c92c0ba 100644 --- a/generator/src/racegroups.rs +++ b/generator/src/racegroups.rs @@ -128,24 +128,24 @@ pub fn racegroup_data_humans() -> Vec { "Alien_Twi'lek", "Alien_Zabrak", "HC_Giant", + "PW_Abra", + "PW_Alakazam", + "PW_Hitmonchan", + "PW_Hitmonlee", + "PW_Hitmontop", + "PW_Jynx", + "PW_Kadabra", + "PW_Machamp", + "PW_Machoke", + "PW_Machop", + "PW_Mewtwo", + "PW_MrMime", + "PW_Smoochum", + "PW_Snorlax", + "PW_Tyrogue", "WMH_Cyclops", "Yokai_Yamanba", "Yokai_YukiShizuku", - "PW_Abra", - "PW_Kadabra", - "PW_Alakazam", - "PW_Machop", - "PW_Machoke", - "PW_Machamp", - "PW_Hitmonlee", - "PW_Hitmonchan", - "PW_MrMime", - "PW_Jynx", - "PW_Snorlax", - "PW_Mewtwo", - "PW_Tyrogue", - "PW_Hitmontop", - "PW_Smoochum", "DwarfRace", "eCutefairy", "eDefender", @@ -329,19 +329,10 @@ pub fn racegroup_data_humans() -> Vec { ), RaceGroup::standard( vec![ - "Alien_Eldar", "AS_WHE_Race", "Alien_Astoriel", "Alien_Drow_Otto", - "PW_Clefairy", - "PW_Clefable", - "PW_Cleffa", - "PW_Jigglypuff", - "PW_Wigglytuff", - "PW_Igglybuff", - "PW_Togepi", - "PW_Togetic", - "PW_Celebi", + "Alien_Eldar", "O21_Alien_DarkElf", "O21_Alien_MoonElf", "O21_Alien_SunElf", @@ -350,12 +341,21 @@ pub fn racegroup_data_humans() -> Vec { "O21_FR_MoonElf", "O21_FR_SunElf", "O21_FR_WoodElf", + "PW_Celebi", + "PW_Clefable", + "PW_Clefairy", + "PW_Cleffa", + "PW_Igglybuff", + "PW_Jigglypuff", + "PW_Togepi", + "PW_Togetic", + "PW_Wigglytuff", + "Sandy_Angel", "WoW_BloodElf", - "WoW_HighElf", - "WoW_NightElf", "WoW_ForsakenHighElf", "WoW_ForsakenNightElf", - "Sandy_Angel", + "WoW_HighElf", + "WoW_NightElf", "ElfRace", ], "Elf", @@ -390,20 +390,20 @@ pub fn racegroup_data_humans() -> Vec { "Alien_NiHal", "Alien_Quarren", "Alien_MonCalamari", - "PW_Horsea", - "PW_Seadra", - "PW_Goldeen", - "PW_Seaking", - "PW_Staryu", - "PW_Starmie", - "PW_Magikarp", - "PW_Gyarados", - "PW_Lanturn", - "PW_Qwilfish", "PW_Corsola", - "PW_Remoraid", - "PW_Mantine", + "PW_Goldeen", + "PW_Gyarados", + "PW_Horsea", "PW_Kingdra", + "PW_Lanturn", + "PW_Magikarp", + "PW_Mantine", + "PW_Qwilfish", + "PW_Remoraid", + "PW_Seadra", + "PW_Seaking", + "PW_Starmie", + "PW_Staryu", "IkquanRace", ], "Fish", @@ -417,11 +417,11 @@ pub fn racegroup_data_humans() -> Vec { "DRSKT_Race", "HPLovecraft_MistCreature", "MM_WillOWisp", - "WoW_Skeleton", "PW_Gastly", - "PW_Haunter", "PW_Gengar", + "PW_Haunter", "PW_Misdreavus", + "WoW_Skeleton", ], "Ghost", "Demon", "0.5", @@ -565,26 +565,26 @@ pub fn racegroup_data_humans() -> Vec { "Alien_Dryad", "Alien_DryadWild", "Alien_Tree", - "PW_Bulbasaur", - "PW_Ivysaur", - "PW_Venusaur", - "PW_Oddish", - "PW_Gloom", - "PW_Vileplume", - "PW_Bellsprout", - "PW_Weepinbell", - "PW_Victreebel", - "PW_Tangela", - "PW_Chikorita", "PW_Bayleef", - "PW_Meganium", "PW_Bellossom", - "PW_Sudowoodo", + "PW_Bellsprout", + "PW_Bulbasaur", + "PW_Chikorita", + "PW_Gloom", "PW_Hoppip", - "PW_Skiploom", + "PW_Ivysaur", "PW_Jumpluff", - "PW_Sunkern", + "PW_Meganium", + "PW_Oddish", + "PW_Skiploom", + "PW_Sudowoodo", "PW_Sunflora", + "PW_Sunkern", + "PW_Tangela", + "PW_Venusaur", + "PW_Victreebel", + "PW_Vileplume", + "PW_Weepinbell", ], "Tree", "Plant", "1", @@ -618,12 +618,12 @@ pub fn racegroup_data_humans() -> Vec { "Alien_Slime", "Alien_Slug", "Mincho_ThingDef", - "Yokai_HihiiroKabe", - "PW_Grimer", - "PW_Muk", "PW_Ditto", - "PW_Slugma", + "PW_Grimer", "PW_Magcargo", + "PW_Muk", + "PW_Slugma", + "Yokai_HihiiroKabe", "Slime", ], name: "Slime".to_string(), @@ -664,12 +664,12 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_Lemur", "AEXP_Bonobo", "GR_ParagonHumanoid", + "PW_Aipom", + "PW_Electabuzz", + "PW_Lickitung", + "PW_Magmar", "PW_Mankey", "PW_Primeape", - "PW_Lickitung", - "PW_Electabuzz", - "PW_Magmar", - "PW_Aipom", "Dinopithecus", "Gigantopithecus", ], @@ -702,18 +702,18 @@ pub fn racegroup_data_animals() -> Vec { "AA_SummitCrab", "ACPSilkspider", "AEXP_Megascorpion", - "PW_Shellder", - "PW_Cloyster", - "PW_Krabby", - "PW_Kingler", - "PW_Omanyte", - "PW_Omastar", - "PW_Kabuto", - "PW_Kabutops", - "PW_Forretress", - "PW_Dunsparce", "BWFlooferMoth", "Cults_ByakheeRace", + "PW_Cloyster", + "PW_Dunsparce", + "PW_Forretress", + "PW_Kabuto", + "PW_Kabutops", + "PW_Kingler", + "PW_Krabby", + "PW_Omanyte", + "PW_Omastar", + "PW_Shellder", "VAECaves_AncientGiantSpider", "VAECaves_CaveCrawler", "VAECaves_GiantSpider", @@ -759,47 +759,41 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_RockhopperPenguin", "AEXP_WildGoose", "GR_Chickenbear", - "GR_Chickenlope", - "GR_Chickenffalo", - "GR_Chickenwolf", - "GR_Chickenrabbit", "GR_Chickencat", + "GR_Chickenffalo", + "GR_Chickenlope", + "GR_Chickenrabbit", + "GR_Chickenwolf", "GR_Manchicken", - "GR_Turkeyman", "GR_ParagonChicken", - "MM_Ieltxu", + "GR_Turkeyman", "MM_Fenghuang", + "MM_Ieltxu", "MM_Phoenix", - "PW_Pidgey", - "PW_Pidgeotto", - "PW_Pidgeot", - "PW_Spearow", - "PW_Fearow", - // TODO: Figure out where bats go - "PW_Zubat", - "PW_Golbat", - "PW_Crobat", - "PW_Gligar", - // End bats - "PW_Psyduck", - "PW_Golduck", - "PW_Farfetchd", - "PW_Doduo", - "PW_Dodrio", "PW_Articuno", - "PW_Zapdos", - "PW_Moltres", - "PW_Hoothoot", - "PW_Noctowl", - "PW_Natu", - "PW_Xatu", - "PW_Murkrow", "PW_Delibird", - "PW_Skarmory", - "PW_Lugia", + "PW_Dodrio", + "PW_Doduo", + "PW_Farfetchd", + "PW_Fearow", + "PW_Golduck", "PW_HoOh", - "RG-EAP_Dodo", + "PW_Hoothoot", + "PW_Lugia", + "PW_Moltres", + "PW_Murkrow", + "PW_Natu", + "PW_Noctowl", + "PW_Pidgeot", + "PW_Pidgeotto", + "PW_Pidgey", + "PW_Psyduck", + "PW_Skarmory", + "PW_Spearow", + "PW_Xatu", + "PW_Zapdos", "RG-EAP_ArcticDrak", + "RG-EAP_Dodo", "Archostrich", "Dinornis", "Palaeeudyptes", @@ -845,35 +839,35 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_WelshTerrier", "AEXP_AfricanWildDog", "ERN_Palamute", - "PW_Vulpix", - "PW_Ninetales", - "GR_Wolfbear", - "GR_Wolfalope", - "GR_Wolfchicken", - "GR_Wolffalo", - "GR_Wolfbeaver", - "GR_Wolfcat", "GR_Dogman", "GR_Manwolf", "GR_ParagonWolf", + "GR_Wolfalope", + "GR_Wolfbear", + "GR_Wolfbeaver", + "GR_Wolfcat", + "GR_Wolfchicken", + "GR_Wolffalo", "MM_Ahuizotl", - "MM_Kitsune", "MM_Cerberus", - "PW_Growlithe", + "MM_Kitsune", "PW_Arcanine", "PW_Eevee", - "PW_Vaporeon", - "PW_Jolteon", - "PW_Flareon", - "PW_Espeon", - "PW_Umbreon", - "PW_Snubbull", - "PW_Granbull", - "PW_Houndour", - "PW_Houndoom", - "PW_Raikou", "PW_Entei", + "PW_Espeon", + "PW_Flareon", + "PW_Granbull", + "PW_Growlithe", + "PW_Houndoom", + "PW_Houndour", + "PW_Jolteon", + "PW_Ninetales", + "PW_Raikou", + "PW_Snubbull", "PW_Suicune", + "PW_Umbreon", + "PW_Vaporeon", + "PW_Vulpix", "Archomutt", "AnimaWarg", "Abaddog", @@ -921,11 +915,11 @@ pub fn racegroup_data_animals() -> Vec { RaceGroup::standard_animal( vec![ "AA_RoughPlatedMonitor", - "PW_Totodile", + "AEXP_Alligator", + "AEXP_Crocodile", "PW_Croconaw", "PW_Feraligatr", - "AEXP_Crocodile", - "AEXP_Alligator", + "PW_Totodile", "Quinkana", "Purussaurus", ], @@ -997,14 +991,14 @@ pub fn racegroup_data_animals() -> Vec { vec![ "AA_Behemoth", "AA_DecayDrake", - "MM_Qilin", "MM_LesserWyvern", + "MM_Qilin", + "PW_Charizard", "PW_Charmander", "PW_Charmeleon", - "PW_Charizard", - "PW_Dratini", "PW_Dragonair", "PW_Dragonite", + "PW_Dratini", "Yokai_RyuunoIkariAnimal", // Colored dragons "Black_Dragon", @@ -1038,11 +1032,11 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_IndianElephant", "AEXP_Tapir", "HC_WoollyMammoth", - "RG-EAP_WoollyMammoth", + "PW_Donphan", "PW_Drowzee", "PW_Hypno", "PW_Phanpy", - "PW_Donphan", + "RG-EAP_WoollyMammoth", "Boltusk", "Deinotherium", "Platybelodon", @@ -1097,9 +1091,9 @@ pub fn racegroup_data_animals() -> Vec { "GR_Catman", "GR_ParagonFeline", "MM_Chimera", + "MM_Griffin", "MM_Manticore", "MM_Xiezhi", - "MM_Griffin", "PW_Meowth", "PW_Persian", "Carnagrius", @@ -1157,8 +1151,8 @@ pub fn racegroup_data_animals() -> Vec { "MM_Unicorn", "PW_Ponyta", "PW_Rapidash", - "PW_Rhyhorn", "PW_Rhydon", + "PW_Rhyhorn", "RG-EAP_WoollyRhino", "Chalicotherium", "Elasmotherium", @@ -1179,10 +1173,10 @@ pub fn racegroup_data_animals() -> Vec { "ACPHippopotamus", "AEXP_Seal", "AEXP_Walrus", - "PW_Seel", + "PW_Azumarill", "PW_Dewgong", "PW_Marill", - "PW_Azumarill", + "PW_Seel", "Gomphotaria", ], "MarineMammal", @@ -1239,11 +1233,11 @@ pub fn racegroup_data_animals() -> Vec { "AA_WindBeast", "AA_Darkbeast", "AA_DarkVandal", - "PW_Slowpoke", + "PW_Piloswine", "PW_Slowbro", "PW_Slowking", + "PW_Slowpoke", "PW_Swinub", - "PW_Piloswine", "ACPTapir", "ACPPeccary", "MM_ErymanthianBoar", @@ -1280,8 +1274,8 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_MegaWolverine", "AEXP_Otter", "AEXP_Badger", - "PW_Sneasel", "PW_Smeargle", + "PW_Sneasel", "Enhydriodon", ], "Raccoon", @@ -1319,8 +1313,8 @@ pub fn racegroup_data_animals() -> Vec { "MM_Basilisk", "MM_Salamander", "MM_Tlilcoatl", - "PW_Ekans", "PW_Arbok", + "PW_Ekans", "RG-WF_WastelandDeathclaw", "Gigantophis", "Megalania", @@ -1376,27 +1370,27 @@ pub fn racegroup_data_animals() -> Vec { "GR_Rabbitchicken", "GR_Ratffalo", "GR_Squirralope", - "PW_Rattata", - "PW_Raticate", + "PW_Cyndaquil", + "PW_Furret", + "PW_Mew", + "PW_Nidoking", + "PW_Nidoqueen", + "PW_NidoranF", + "PW_NidoranM", + "PW_Nidorina", + "PW_Nidorino", + "PW_Pichu", "PW_Pikachu", + "PW_Quilava", "PW_Raichu", + "PW_Raticate", + "PW_Rattata", "PW_Sandshrew", "PW_Sandslash", - "PW_NidoranF", - "PW_Nidorina", - "PW_Nidoqueen", - "PW_NidoranM", - "PW_Nidorino", - "PW_Nidoking", - "PW_Mew", - "PW_Cyndaquil", - "PW_Quilava", - "PW_Typhlosion", "PW_Sentret", - "PW_Furret", - "PW_Pichu", - "RG-WF_WastelandSquirrel", + "PW_Typhlosion", "RG-WF_WastelandBeaver", + "RG-WF_WastelandSquirrel", "Yokai_SpinMouse", "Archojerboa", "Castoroides", @@ -1416,18 +1410,9 @@ pub fn racegroup_data_animals() -> Vec { "AA_Plasmorph", "AA_SandSquid", "AA_TarGuzzler", - // Do frogs go here? - "PW_Poliwag", - "PW_Poliwhirl", - "PW_Poliwrath", + "PW_Octillery", "PW_Tentacool", "PW_Tentacruel", - "PW_Chinchou", - "PW_Politoed", - "PW_Wooper", - "PW_Quagsire", - "PW_Wobbuffet", - "PW_Octillery", ], "Tentacle", "Slime", "0.8", Some(false), @@ -1463,11 +1448,11 @@ pub fn racegroup_data_animals() -> Vec { vec![ "Tortoise", "AEXP_DesertTortoise", - "PW_Squirtle", - "PW_Wartortle", "PW_Blastoise", "PW_Lapras", "PW_Shuckle", + "PW_Squirtle", + "PW_Wartortle", "Archotortoise", "Megalochelys", ], @@ -1495,9 +1480,9 @@ pub fn racegroup_data_animals() -> Vec { "GR_Bearwolf", "GR_Manbear", "GR_ParagonBear", - "RG-WF_WastelandBear", "PW_Teddiursa", "PW_Ursaring", + "RG-WF_WastelandBear", "Archopanda", "AnimaBear", "ShortfacedBear", @@ -1550,31 +1535,31 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_Wildebeest", "GR_Boomabear", "GR_Boomachicken", - "GR_Boomffalo", - "GR_Boomwolf", - "GR_Boomsquirrel", - "GR_Boomcat", "GR_Booman", + "GR_Boomcat", + "GR_Boomffalo", + "GR_Boomsquirrel", + "GR_Boomwolf", "GR_Manalope", "GR_Manffalo", "GR_Muffalobear", - "GR_Muffalope", - "GR_Muffalochicken", - "GR_Muffalowolf", "GR_Muffalocat", - "GR_Muffalorat", + "GR_Muffalochicken", "GR_Muffaloman", + "GR_Muffalope", + "GR_Muffalorat", + "GR_Muffalowolf", "GR_ParagonBoomalope", "GR_ParagonMuffalo", - "RG-EAP-Protoceratidae", - "MM_WildMinotaur", "MM_Catoblepas", "MM_CeryneianHind", - "PW_Tauros", - "PW_Mareep", - "PW_Flaaffy", + "MM_WildMinotaur", "PW_Ampharos", + "PW_Flaaffy", + "PW_Mareep", "PW_Miltank", + "PW_Tauros", + "RG-EAP-Protoceratidae", "Addax", "AngusCow", "AnkoleWatusiCow", @@ -1641,26 +1626,26 @@ pub fn racegroup_data_animals() -> Vec { "AA_Feralisk", "AA_Junglelisk", "AACP_AnimaMegaspider", - "PW_Caterpie", - "PW_Metapod", - "PW_Butterfree", - "PW_Weedle", - "PW_Kakuna", + "PW_Ariados", "PW_Beedrill", + "PW_Butterfree", + "PW_Caterpie", + "PW_Heracross", + "PW_Kakuna", + "PW_Ledian", + "PW_Ledyba", + "PW_Metapod", "PW_Paras", "PW_Parasect", - "PW_Venonat", - "PW_Venomoth", - "PW_Scyther", - "PW_Pinsir", - "PW_Ledyba", - "PW_Ledian", - "PW_Spinarak", - "PW_Ariados", - "PW_Yanma", "PW_Pineco", + "PW_Pinsir", "PW_Scizor", - "PW_Heracross", + "PW_Scyther", + "PW_Spinarak", + "PW_Venomoth", + "PW_Venonat", + "PW_Weedle", + "PW_Yanma", "Meganeura", "Spiderant", ], From b9084af56f5a6f27bbbdefdb3b9d1b2570d1c82d Mon Sep 17 00:00:00 2001 From: AsmodeusRex Date: Tue, 13 Dec 2022 14:15:57 -0800 Subject: [PATCH 3/6] Change racegroup to defer to default egg settings --- generator/src/racegroups.rs | 228 ++++++++++++++++++------------------ 1 file changed, 113 insertions(+), 115 deletions(-) diff --git a/generator/src/racegroups.rs b/generator/src/racegroups.rs index 5b1a79b..c4c00cc 100644 --- a/generator/src/racegroups.rs +++ b/generator/src/racegroups.rs @@ -2,8 +2,8 @@ use std::collections::HashMap; #[derive(Clone, Debug)] pub struct RaceGroup { - pub races: Vec<&'static str>, pub name: String, + pub races: Vec<&'static str>, pub anus: String, pub f_breasts: String, pub m_breasts: String, @@ -11,17 +11,19 @@ pub struct RaceGroup { pub m_genitals: String, pub tag: String, pub sex_drive: String, - pub egg_implant: Option, + pub egg_implant: bool, } impl RaceGroup { - fn standard(races: Vec<&'static str>, - species: &'static str, - tag: &'static str, - sex_drive: &'static str, - breasts: &'static str, - anus: &'static str, - genitals: (&'static str, &'static str)) -> Self { + fn standard( + species: &'static str, + races: Vec<&'static str>, + tag: &'static str, + sex_drive: &'static str, + breasts: &'static str, + anus: &'static str, + genitals: (&'static str, &'static str) + ) -> Self { Self { races, name: format!("{}Person", species), @@ -32,17 +34,18 @@ impl RaceGroup { m_genitals: format!("{}Penis", genitals.1), tag: tag.to_string(), sex_drive: sex_drive.to_string(), - egg_implant: None, + egg_implant: false, } } - fn standard_animal(races: Vec<&'static str>, - species: &'static str, - tag: &'static str, - sex_drive: &'static str, - egg_implant: Option, - breasts: &'static str, - anus: &'static str, - genitals: (&'static str, &'static str)) -> Self { + fn standard_animal( + species: &'static str, + races: Vec<&'static str>, + tag: &'static str, + sex_drive: &'static str, + breasts: &'static str, + anus: &'static str, + genitals: (&'static str, &'static str) + ) -> Self { Self { races, name: format!("{}Animal", species), @@ -53,7 +56,7 @@ impl RaceGroup { m_genitals: format!("{}Penis", genitals.1), tag: tag.to_string(), sex_drive: sex_drive.to_string(), - egg_implant, + egg_implant: false, } } } @@ -74,13 +77,8 @@ pub fn construct_racegroup(group: &RaceGroup) -> String { races.push_str(&format!("\n\t\t\t
  • {race}
    • ")); } let fields = match group.egg_implant { - Some(imp) => { - match imp { - true => "true\n\t\ttrue\n\t\t".to_string(), - false => "true\n\t\t".to_string(), - } - }, - None => String::new() + true => "true\n\t\ttrue\n\t\t".to_string(), + false => String::new() }; let replace = HashMap::from([ ("{name}", group.name.clone()), @@ -117,6 +115,7 @@ const RACEGROUP_STRING: &'static str = " pub fn racegroup_data_humans() -> Vec { vec![ RaceGroup::standard( + "Human", vec![ "AA_Mime", "Alien_Goblin", @@ -146,13 +145,13 @@ pub fn racegroup_data_humans() -> Vec { "Ooka_Miko", "TrollRace", ], - "Human", "Skin", "1", "Breasts", "", ("", ""), ), RaceGroup::standard( + "Arthropod", vec![ "Alien_Beetle", "Alien_Mantis", @@ -163,35 +162,35 @@ pub fn racegroup_data_humans() -> Vec { "Races_BlackWidow", "Yokai_JorouGumo", ], - "Arthropod", "Chitin", "0.8", "Breasts", "Insect", ("Ovipore", "Aedeagus"), ), RaceGroup::standard( + "Avian", vec![ "ATK_Avianmorph", "Harpy", ], - "Avian", "Feathers", "0.9", "FeaturelessChest", "Cloacal", ("Cloacal", "Cloacal"), ), RaceGroup::standard( + "Bear", vec![ "WoW_Pandaren", "BearMan", ], - "Bear", "Fur", "0.9", "Breasts", "", ("", "Bear"), ), RaceGroup::standard( + "Canine", vec![ "ATK_Caninemorph", "WoW_Worgen", @@ -200,7 +199,6 @@ pub fn racegroup_data_humans() -> Vec { "siro", "WolfMan", ], - "Canine", "Fur", "1", "Breasts", "", @@ -208,6 +206,7 @@ pub fn racegroup_data_humans() -> Vec { ), // For foxes, hyenas, werewolves, etc (hyenas are felines oops) RaceGroup::standard( + "CanineHighSex", vec![ "ATK_Gnollmorph", "ATK_Vulpinemorph", @@ -219,25 +218,25 @@ pub fn racegroup_data_humans() -> Vec { "Yokai_NineTailWhite", "FoxMan", ], - "CanineHighSex", "Fur", "1.3", "Breasts", "", ("Dog", "Dog"), ), RaceGroup::standard( + "Crocodilian", vec![ "Alien_Argonian", "SSD_DeathclawRace", "Races_Lizardman", ], - "Crocodilian", "Scales", "0.9", "ScaleBreasts", "Cloacal", ("Cloacal", "Crocodilian"), ), RaceGroup::standard( + "Deer", vec![ "ATK_Cervinemorph", "CamelMan", @@ -246,24 +245,24 @@ pub fn racegroup_data_humans() -> Vec { "GazelleMan", "Lliscean", ], - "Deer", "Fur", "1", "Breasts", "", ("Narrow", "Needle"), ), RaceGroup::standard( + "Dino", vec![ "Raptor", "Tyrannosaur", ], - "Dino", "Scales", "0.9", "ScaleBreasts", "Cloacal", ("Cloacal", "Dino"), ), RaceGroup::standard( + "Dragon", vec![ "ATK_Dragomorph", "WMH_Basilisk", @@ -284,35 +283,35 @@ pub fn racegroup_data_humans() -> Vec { "ALapelli", "yuki", ], - "Dragon", "Scales", "1.2", "ScaleBreasts", "Cloacal", ("Cloacal", "Dragon") ), RaceGroup::standard( + "Elephant", vec![ "ElephantMan", ], - "Elephant", "Fur", "1", "Breasts", "", ("Elephant", "Elephant"), ), RaceGroup::standard( + "FoxGirl", vec![ "Alien_Hisa", "kon", "Vulpes", ], - "FoxGirl", "Fur", "1.3", "Petite_FoxGirl_Breasts", "Petite_FoxGirl_", ("Petite_FoxGirl_", ""), ), RaceGroup::standard( + "Elf", vec![ "Alien_Eldar", "AS_WHE_Race", @@ -334,13 +333,13 @@ pub fn racegroup_data_humans() -> Vec { "Sandy_Angel", "ElfRace", ], - "Elf", "Skin", "1.1", "Breasts", "Elf", ("Elf", "Elf"), ), RaceGroup::standard( + "Feline", vec![ "Alien_Nyaron", "ATK_Felinemorph", @@ -355,60 +354,60 @@ pub fn racegroup_data_humans() -> Vec { "Maidnukos", "miko", ], - "Feline", "Fur", "1", "Breasts", "Feline", ("Cat", "Cat"), ), RaceGroup::standard( + "Fish", vec![ "Alien_NiHal", "Alien_Quarren", "Alien_MonCalamari", "IkquanRace", ], - "Fish", "Scales", "0.8", "FeaturelessChest", "Cloacal", ("Cloacal", "Marine"), ), RaceGroup::standard( + "Ghost", vec![ "DRSKT_Race", "HPLovecraft_MistCreature", "MM_WillOWisp", "WoW_Skeleton", ], - "Ghost", "Demon", "0.5", "GhostBreasts", "Ghost", ("Ghost", "Ghost"), ), RaceGroup::standard( + "Ghoul", vec![ "Ghoul", "GlowingGhoul", ], - "Ghoul", "Demon", "0.5", "GhoulBreasts", "Ghoul", ("Ghoul", "Ghoul"), ), RaceGroup::standard( + "Horny", vec![ "Alien_Kijin", ], - "Horny", "Skin", "1.4", "Horny_Breasts", "", ("Horny_", "Horny_"), ), RaceGroup::standard( + "Orc", vec![ "Alien_Orc", "O21_Alien_Orc", @@ -425,13 +424,13 @@ pub fn racegroup_data_humans() -> Vec { "OG_Alien_Grot", "WoW_Orc", ], - "Orc", "Skin", "1.3", "OrcBreasts", "Orc", ("Orc", "Orc"), ), RaceGroup::standard( + "Horse", vec![ "Alien_Bullgor", "Alien_Equium", @@ -444,34 +443,34 @@ pub fn racegroup_data_humans() -> Vec { "Alien_ZPEquium", "WoW_Draenei", ], - "Horse", "Fur", "1.2", "Breasts", "Horse", ("Horse", "Horse"), ), RaceGroup::standard( + "Pig", vec![ "PigMan", ], - "Pig", "Fur", "1", "Breasts", "", ("Pig", "Pig"), ), RaceGroup::standard( + "Raccoon", vec![ "RaccoonMan", "StarWarsRaces_Ewok", ], - "Raccoon", "Fur", "1.1", "Breasts", "", ("", "Raccoon"), ), RaceGroup::standard( + "Reptile", vec![ "O21_Alien_Kobold", "O21_FR_Kobold", @@ -481,13 +480,13 @@ pub fn racegroup_data_humans() -> Vec { "Yokai_Samia", "Naga", ], - "Reptile", "Scales", "0.9", "ScaleBreasts", "Cloacal", ("Cloacal", "Hemi"), ), RaceGroup::standard( + "Rodent", vec![ "ATK_Lagomorph", "Alien_Skaven", @@ -502,29 +501,28 @@ pub fn racegroup_data_humans() -> Vec { "Rotti", "Rabbie", ], - "Rodent", "Fur", "1.3", "Petite_Breasts", "Petite_", ("Rodent", "Rodent"), ), RaceGroup::standard( + "Thrumbo", vec![ "Thrumkin", ], - "Thrumbo", "Fur", "1.2", "Breasts", "Cloacal", ("Cloacal", "Dragon") ), RaceGroup::standard( + "Tree", vec![ "Alien_Dryad", "Alien_DryadWild", "Alien_Tree", ], - "Tree", "Plant", "1", "TreeBreasts", "Tree", @@ -549,7 +547,7 @@ pub fn racegroup_data_humans() -> Vec { m_genitals: "BovinePenis".to_string(), tag: "Fur".to_string(), sex_drive: "1".to_string(), - egg_implant: None, + egg_implant: false, }, RaceGroup { races: vec![ @@ -567,7 +565,7 @@ pub fn racegroup_data_humans() -> Vec { m_genitals: "SlimeTentacles".to_string(), tag: "Slime".to_string(), sex_drive: "1".to_string(), - egg_implant: None, + egg_implant: false, }, ] } @@ -575,6 +573,7 @@ pub fn racegroup_data_humans() -> Vec { pub fn racegroup_data_animals() -> Vec { vec![ RaceGroup::standard_animal( + "GenericMammal", vec![ "Megasloth", "ACPRedPanda", @@ -583,13 +582,13 @@ pub fn racegroup_data_animals() -> Vec { "Yokai_IssunAnimal", "Andrewsarchus", ], - "GenericMammal", - "Fur", "1", None, + "Fur", "1", "MammalBreasts", "Mammal", ("Mammal", "Mammal"), ), RaceGroup::standard_animal( + "Ape", vec![ "Monkey", "AEXP_Gorilla", @@ -600,14 +599,14 @@ pub fn racegroup_data_animals() -> Vec { "Dinopithecus", "Gigantopithecus", ], - "Ape", - "Fur", "1.1", None, + "Fur", "1.1", "MammalBreasts", "Mammal", ("Mammal", "Monkey"), ), // Arthropods that have aedeagi and ovipores, and reproduce via spermatophores and egg-laying RaceGroup::standard_animal( + "Arthropod", vec![ "AA_AngelMoth", "AA_Atispec", @@ -639,13 +638,13 @@ pub fn racegroup_data_animals() -> Vec { "Arthropleura", "Pulmonoscorpius", ], - "Arthropod", - "Chitin", "0.7", Some(false), + "Chitin", "0.7", "", "Insect", ("Ovipore", "Aedeagus"), ), RaceGroup::standard_animal( + "Avian", vec![ "Cassowary", "Chicken", @@ -694,13 +693,13 @@ pub fn racegroup_data_animals() -> Vec { "Palaeeudyptes", "Titanis", ], - "Avian", - "Feathers", "0.8", Some(false), + "Feathers", "0.8", "", "Cloacal", ("Cloacal", "Cloacal"), ), RaceGroup::standard_animal( + "Canine", vec![ "Fox_Arctic", "Fox_Fennec", @@ -753,24 +752,24 @@ pub fn racegroup_data_animals() -> Vec { "Omnicron", "Fuzztino", ], - "Canine", - "Fur", "1", None, + "Fur", "1", "MammalBreasts", "Dog", ("Dog", "Dog"), ), RaceGroup::standard_animal( + "CanineSkin", vec![ "AA_RipperHound", ], - "CanineSkin", - "Skin", "0.9", None, + "Skin", "0.9", "MammalBreasts", "Dog", ("Dog", "Dog"), ), // Most even-toed ungulates go here, obviously excluding cetaceans RaceGroup::standard_animal( + "Cervine", vec![ "Alpaca", "Deer", @@ -782,13 +781,13 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_Moose", "RG-WF_WastelandDeer", ], - "Cervine", - "Fur", "1", None, + "Fur", "1", "MammalBreasts", "Mammal", ("Narrow", "Needle"), ), RaceGroup::standard_animal( + "Crocodilian", vec![ "AA_RoughPlatedMonitor", "AEXP_Crocodile", @@ -796,13 +795,13 @@ pub fn racegroup_data_animals() -> Vec { "Quinkana", "Purussaurus", ], - "Crocodilian", - "Scales", "0.8", Some(false), + "Scales", "0.8", "", "Cloacal", ("Cloacal", "Crocodilian"), ), RaceGroup::standard_animal( + "DinoFeathered", vec![ "AA_PedigreedRaptor", "Dakotaraptor", @@ -813,13 +812,13 @@ pub fn racegroup_data_animals() -> Vec { "Velociraptor", "Yutyrannus", ], - "DinoFeathered", - "Feathers", "1", Some(false), + "Feathers", "1", "", "Cloacal", ("Cloacal", "Dino"), ), RaceGroup::standard_animal( + "DinoScaled", vec![ "Allosaurus", "Ankylosaurus", @@ -848,13 +847,13 @@ pub fn racegroup_data_animals() -> Vec { "TyrannosaurusRex", "Utahraptor", ], - "DinoScaled", - "Scales", "1", Some(false), + "Scales", "1", "", "Cloacal", ("Cloacal", "Dino"), ), RaceGroup::standard_animal( + "Dragon", vec![ "AA_Behemoth", "AA_DecayDrake", @@ -878,13 +877,13 @@ pub fn racegroup_data_animals() -> Vec { "Mystogen", "Voltaic", ], - "Dragon", - "Scales", "1.2", Some(false), + "Scales", "1.2", "", "Cloacal", ("Cloacal", "Dragon"), ), RaceGroup::standard_animal( + "Elephant", vec![ "Elephant", "AA_Gallatross", @@ -900,13 +899,13 @@ pub fn racegroup_data_animals() -> Vec { "WoollyMammoth", "Zygolophodon", ], - "Elephant", - "Fur", "0.9", None, + "Fur", "0.9", "MammalBreasts", "Mammal", ("Elephant", "Elephant"), ), RaceGroup::standard_animal( + "Feline", vec![ "Cat", "Cougar", @@ -959,24 +958,24 @@ pub fn racegroup_data_animals() -> Vec { "Smilodon", "Snow_leopard", ], - "Feline", - "Fur", "1", None, + "Fur", "1", "CatBreasts", "Feline", ("Cat", "Cat"), ), RaceGroup::standard_animal( + "FelineHorny", vec![ "AEXP_Hyena", ], - "FelineHorny", - "Fur", "1.3", None, + "Fur", "1.3", "CatBreasts", "Feline", ("Cat", "Cat"), ), // Rhinos belong here, not with elephants, as they are odd-toed ungulates RaceGroup::standard_animal( + "Horse", vec![ "Donkey", "Horse", @@ -1010,14 +1009,14 @@ pub fn racegroup_data_animals() -> Vec { "Paraceratherium", "Uintatherium", ], - "Horse", - "Fur", "1", None, + "Fur", "1", "MammalBreasts", "Horse", ("Horse", "Horse"), ), // 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", vec![ "ACPSpottedSeal", "ACPWalrus", @@ -1026,51 +1025,51 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_Walrus", "Gomphotaria", ], - "MarineMammal", - "Fur", "0.9", None, + "Fur", "0.9", "MammalBreasts", "Mammal", ("Mammal", "Marine"), ), RaceGroup::standard_animal( + "Marsupial", vec![ "AEXP_Kangaroo", "Procoptodon", ], - "Marsupial", - "Fur", "1", None, + "Fur", "1", "MammalBreasts", "Cloacal", ("Cloacal", "Cloacal"), ), // Marsupials with a bifurcated penis: All except kangaroos and marsupial moles RaceGroup::standard_animal( + "MarsupialBi", vec![ "AEXP_Koala", "AEXP_TasmanianDevil", "Diprotodon", ], - "MarsupialBi", - "Fur", "1", None, + "Fur", "1", "MammalBreasts", "Cloacal", ("Cloacal", "Hemi"), ), // TODO: Should be single gender RaceGroup::standard_animal( + "Orc", vec![ "OG_Squig", "OG_Squig_Eatin", "OG_Squig_Oily", "OG_Snotling", ], - "Orc", - "Skin", "1", None, + "Skin", "1", "MammalBreasts", "Orc", ("Orc", "Orc"), ), RaceGroup::standard_animal( + "Pig", vec![ "Pig", "WildBoar", @@ -1083,25 +1082,25 @@ pub fn racegroup_data_animals() -> Vec { "MM_ErymanthianBoar", "Daeodon", ], - "Pig", - "Fur", "1", None, + "Fur", "1", "MammalBreasts", "Mammal", ("Pig", "Pig"), ), RaceGroup::standard_animal( + "Platypus", vec![ "ACPDuckBilledPlatypus", "AEXP_Platypus", ], - "Platypus", - "Fur", "0.9", Some(false), + "Fur", "0.9", "MammalBreasts", "Cloacal", ("Cloacal", "Cloacal"), ), // Mustelids RaceGroup::standard_animal( + "Raccoon", vec![ "Raccoon", "ACPMegaFerret", @@ -1116,13 +1115,13 @@ pub fn racegroup_data_animals() -> Vec { "AEXP_Badger", "Enhydriodon", ], - "Raccoon", - "Fur", "1", None, + "Fur", "1", "MammalBreasts", "Mammal", ("Mammal", "Raccoon"), ), RaceGroup::standard_animal( + "Reptile", vec![ "Cobra", "Iguana", @@ -1157,14 +1156,14 @@ pub fn racegroup_data_animals() -> Vec { "Rakk", "Titanoboa", ], - "Reptile", - "Scales", "0.8", Some(false), + "Scales", "0.8", "", "Cloacal", ("Cloacal", "Hemi"), ), // Rodents and Lagomorphs RaceGroup::standard_animal( + "Rodent", vec![ "Alphabeaver", "Boomrat", @@ -1215,26 +1214,26 @@ pub fn racegroup_data_animals() -> Vec { "Josephoartigasia", "Pika", ], - "Rodent", - "Fur", "1.1", None, + "Fur", "1.1", "MammalBreasts", "Mammal", ("Mammal", "Rodent"), ), RaceGroup::standard_animal( + "Tentacle", vec![ "AA_Helixien", "AA_Plasmorph", "AA_SandSquid", "AA_TarGuzzler", ], - "Tentacle", - "Slime", "0.8", Some(false), + "Slime", "0.8", "", "Cloacal", ("Cloacal", "Tentacle"), ), RaceGroup::standard_animal( + "Thrumbo", vec![ "Thrumbo", "GR_Thrumbear", @@ -1252,26 +1251,26 @@ pub fn racegroup_data_animals() -> Vec { "Archothrumbo", "RoyalThrumbo", ], - "Thrumbo", - "Fur", "1", None, + "Fur", "1", "MammalBreasts", "Cloacal", ("Cloacal", "Dragon"), ), RaceGroup::standard_animal( + "Turtle", vec![ "Tortoise", "AEXP_DesertTortoise", "Archotortoise", "Megalochelys", ], - "Turtle", - "Scales", "0.8", Some(false), + "Scales", "0.8", "", "Cloacal", ("Cloacal", "Turtle"), ), RaceGroup::standard_animal( + "Ursine", vec![ "Bear", "Bear_Grizzly", @@ -1294,19 +1293,18 @@ pub fn racegroup_data_animals() -> Vec { "AnimaBear", "ShortfacedBear", ], - "Ursine", - "Fur", "1", None, + "Fur", "1", "MammalBreasts", "Mammal", ("Mammal", "Bear"), ), // AA RaceGroup::standard_animal( + "AA_SandProwler", vec![ "AA_SandProwler", ], - "AA_SandProwler", - "Scales", "1", None, + "Scales", "1", "CatBreasts", "Feline", ("Cat", "Cat"), @@ -1406,7 +1404,7 @@ pub fn racegroup_data_animals() -> Vec { m_genitals: "BovinePenis".to_string(), tag: "Fur".to_string(), sex_drive: "1".to_string(), - egg_implant: None, + egg_implant: false, }, // Arthropods that reproduce through oviposition RaceGroup { @@ -1439,7 +1437,7 @@ pub fn racegroup_data_animals() -> Vec { m_genitals: "OvipositorM".to_string(), tag: "Chitin".to_string(), sex_drive: "1".to_string(), - egg_implant: Some(true), + egg_implant: true, }, RaceGroup { races: vec![ @@ -1454,7 +1452,7 @@ pub fn racegroup_data_animals() -> Vec { m_genitals: "OvipositorM".to_string(), tag: "Chitin".to_string(), sex_drive: "1.5".to_string(), - egg_implant: Some(true), + egg_implant: true, }, ] } \ No newline at end of file From 104ed3ee1345625917c77977f1ec1a5ee32bd8e4 Mon Sep 17 00:00:00 2001 From: AsmodeusRex Date: Tue, 13 Dec 2022 14:58:06 -0800 Subject: [PATCH 4/6] Add missing VAE Caves races --- generator/src/racegroups.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/generator/src/racegroups.rs b/generator/src/racegroups.rs index 9c01a7e..1db2576 100644 --- a/generator/src/racegroups.rs +++ b/generator/src/racegroups.rs @@ -998,6 +998,7 @@ pub fn racegroup_data_animals() -> Vec { "PW_Dragonair", "PW_Dragonite", "PW_Dratini", + "VAECaves_Wyrm", "Yokai_RyuunoIkariAnimal", // Colored dragons "Black_Dragon", @@ -1315,6 +1316,7 @@ pub fn racegroup_data_animals() -> Vec { "PW_Arbok", "PW_Ekans", "RG-WF_WastelandDeathclaw", + "VAECaves_BlindSalamander", "Gigantophis", "Megalania", "Rakk", @@ -1482,6 +1484,7 @@ pub fn racegroup_data_animals() -> Vec { "PW_Teddiursa", "PW_Ursaring", "RG-WF_WastelandBear", + "VAECaves_CaveBear", "Archopanda", "AnimaBear", "ShortfacedBear", From b3adfdfb78c7eeb8ef4106ccfa52856e4edde37b Mon Sep 17 00:00:00 2001 From: AsmodeusRex Date: Tue, 13 Dec 2022 15:00:53 -0800 Subject: [PATCH 5/6] Increment version --- ReadMe.md | 1 + changelog.txt | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ReadMe.md b/ReadMe.md index cba84a5..c10e94b 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -126,6 +126,7 @@ This mod requires RJW and must be placed somewhere below it. * Ed86 (for Maintaining RJW) * Glitched Securitron (Preview image) * Mlie (for keeping so many of these mods alive) +* purplepenguinonion (PokeWorld support) * MewTopian (for the expansion on RaceSupport) * DarkSlayerEX (for Traits and Breeders Charm) * ShauaPuta (Adding Support for their Races, Age Patches) diff --git a/changelog.txt b/changelog.txt index b3bb2cc..4d19124 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +11.3.0 +-Fixed some viviparous species laying chicken eggs +-Added PokeWorld support +-Improved VAE Caves support + 11.2.7 -Fixed Androids race support From 85f5fc460077ee63bdd015b17a707c9b8a57fd37 Mon Sep 17 00:00:00 2001 From: AsmodeusRex Date: Tue, 13 Dec 2022 15:11:22 -0800 Subject: [PATCH 6/6] Update ReadMe.md --- ReadMe.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index c10e94b..67e2adb 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -3,7 +3,7 @@ Provides RJW compatibility for a wide array of mods that add races and animals. The base RJW mod automatically patches most races in a way that works, but your cat-girls by default will only have normal human genitalia. This mod fixes that, giving the appropriate anatomy to animals and people from numerous mods. -Download: https://gitgud.io/AsmodeusRex/rjw-race-support/-/releases/permalink/latest +Download: https://gitgud.io/AsmodeusRex/rjw-race-support/-/releases/permalink/latest/downloads/rjw-race-support.zip This mod requires RJW and must be placed somewhere below it. @@ -108,7 +108,7 @@ This mod requires RJW and must be placed somewhere below it. ## Plans * Maintain -* Egg and milk fixes and improvements +* Milk fixes and improvements ### Mod support * VFE insects * Update milk mod support @@ -120,7 +120,6 @@ This mod requires RJW and must be placed somewhere below it. * Race to the rim * Ooka miko * kemomimihouse -* VAE test ## Thanks * Ed86 (for Maintaining RJW)