diff --git a/.vscode/settings.json b/.vscode/settings.json index 7430ef8..fd32fbf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -20,6 +20,7 @@ "baculum", "Boomalope", "Bovinemorph", + "Bumbledrone", "Byakhee", "Callistan", "Callistans", @@ -45,6 +46,7 @@ "Fleshbeast", "Fogman", "Futa", + "Gallatross", "Gigantea", "Girthy", "Gnollmorph", @@ -82,6 +84,7 @@ "Mustelids", "Necro", "Neko", + "Nightling", "Nukos", "Nyaron", "Ooka", @@ -103,6 +106,7 @@ "selffertilized", "Shoggoth", "Shoujo", + "Silkie", "siro", "Skaven", "Skrix", @@ -114,6 +118,7 @@ "Thermadon", "thingdef", "thingdefs", + "Thrumbo", "Thrumkin", "Vulpes", "Vulpinemorph", diff --git a/Content/Base/Defs/HediffDefs/Hediffs_Animals.xml b/Content/Base/Defs/HediffDefs/Hediffs_Animals.xml index e0725ee..32acf29 100644 --- a/Content/Base/Defs/HediffDefs/Hediffs_Animals.xml +++ b/Content/Base/Defs/HediffDefs/Hediffs_Animals.xml @@ -136,24 +136,6 @@ - - EquineAnus - - an equine anus - An anus shaped like a doughnut. - - EquineAnus - - EquineAnus - -
  • - -
  • Loose
    • - - -     -     - FelineAnus @@ -228,6 +210,23 @@ + + MammalPenis + + a mammalian penis + A generic mammalian animal's penis. + + MammalPenis + + MammalPenis + +
  • + + +
    • +     +     + MammalVagina @@ -279,6 +278,23 @@ + + HorseAnus + + an quine anus + An anus shaped like a doughnut. + + HorseAnus + + HorseAnus + +
  • + + +
    • +     +     + HyenaVagina @@ -415,14 +431,14 @@ - Aedeagus + AedeagusPenis an aedeagus The phallus of a male arthropod, for excreting a spermatophore to inseminate a female arthropod. - Aedeagus + AedeagusPenis - Aedeagus + AedeagusPenis
  • @@ -510,7 +526,7 @@ VinePenis a mass of vines - Genetically altered vines capable of reproduction. + A mass of vines where a penis would be. VinePenis diff --git a/Content/Base/Defs/RaceSupport/Animals.xml b/Content/Base/Defs/RaceSupport/Animals.xml index 7bdb236..223ec93 100644 --- a/Content/Base/Defs/RaceSupport/Animals.xml +++ b/Content/Base/Defs/RaceSupport/Animals.xml @@ -4,8 +4,10 @@ GenericMammalAnimal +
  • ACPRedPanda
  • AEXP_Pangolin
  • AEXP_RedPanda
    • +
  • Andrewsarchus
  • MammalAnus
    • @@ -65,21 +67,22 @@ ArthropodAnimal
  • AA_AngelMoth
    • -
  • AA_Animalisk
  • AA_Atispec
  • AA_Barbslinger
  • AA_BedBug
    • +
  • AA_Bobeene
  • AA_ChemfuelMyrmidon
    • +
  • AA_CrepuscularBeetle
  • AA_Drainer
  • AA_FireWasp
  • AA_GreatDevourer
  • AA_IronhuskBeetle
    • -
  • AA_Blizzarisk
    • -
  • AA_Cinderlisk
    • -
  • AA_Dunealisk
    • -
  • AA_Feralisk
    • -
  • AA_Junglelisk
    • -
  • AA_Ravager
    • +
  • AA_LuciferBug
    • +
  • AA_Metallovore
    • +
  • AA_BoulderMit
    • +
  • AA_CrystalMit
    • +
  • AA_PebbleMit
    • +
  • AA_SummitCrab
  • ACPSilkspider
  • AEXP_Megascorpion
  • BWFlooferMoth
    • @@ -136,6 +139,7 @@
  • ACPSilkieChicken
  • ACPPtarmigan
  • AA_DesertAve
    • +
  • AA_GiantCrownedSilkie
  • AA_FrostAve
  • AA_MeadowAve
  • AA_NightAve
    • @@ -178,6 +182,7 @@
  • Feathers
    •  + true 0.8 @@ -251,10 +256,9 @@ CanineSkinAnimal
  • AA_RipperHound
    • -
  • RRY_Yautja_Hound
    •  -
  • CanineAnus
    • +
  • DogAnus
    •
  • MammalBreasts
    • @@ -377,6 +381,7 @@
  • Corythosaurus
  • Dilophosaurus
  • Diplodocus
    • +
  • Doedicurus
  • Dryosaurus
  • Iguanodon
  • Magyarosaurus
    • @@ -416,18 +421,6 @@
  • AA_Behemoth
  • AA_DecayDrake
    • -
  • GR_Thrumbear
    • -
  • GR_Thrumbalope
    • -
  • GR_Thrumbochicken
    • -
  • GR_Thrumffalo
    • -
  • GR_Thrumwolf
    • -
  • GR_Thrumbocat
    • -
  • GR_Thrumbospider
    • -
  • GR_Thrumbolizard
    • -
  • GR_Thrumborat
    • -
  • GR_Thrumhorse
    • -
  • GR_Thrumboman
    • -
  • GR_ParagonThrumbo
  • MM_Qilin
  • MM_LesserWyvern
  • Black_Dragon
    • @@ -442,10 +435,8 @@
  • True_Dragon
  • White_Dragon
  • Yellow_Dragon
    • -
  • Archothrumbo
  • Draclone
  • Mystogen
    • -
  • RoyalThrumbo
  • Voltaic
    •  @@ -471,6 +462,7 @@
  • Elephant
  • AA_Gallatross
    • +
  • AA_GallatrossMoribund
  • AEXP_AsianElephant
  • AEXP_IndianElephant
  • AEXP_Tapir
    • @@ -503,68 +495,15 @@ 0.9 - - HorseAnimal - -
  • Rhinoceros
    • -
  • AA_Thunderox
    • -
  • ACPHorse
    • -
  • ACPWoolyHorse
    • -
  • ACPLlama
    • -
  • ACPBlackRhinoceros
    • -
  • ACPWoolyRhino
    • -
  • AEXP_BlackRhino
    • -
  • AEXP_Zebra
    • -
  • AEXP_Quagga
    • -
  • GR_Bearhorse
    • -
  • GR_Boomhorse
    • -
  • GR_Chickenhorse
    • -
  • GR_Cathorse
    • -
  • GR_Molehorse
    • -
  • GR_Wolfhorse
    • -
  • GR_Muffalohorse
    • -
  • GR_Crocorse
    • -
  • GR_Spiderhorse
    • -
  • GR_Hurseman
    • -
  • GR_Mancat
    • -
  • GR_ParagonHorse
    • -
  • MM_Pegasus
    • -
  • MM_Unicorn
    • -
  • RG-EAP_WoollyRhino
    • -
  • Chalicotherium
    • -
  • Elasmotherium
    • -
  • Paraceratherium
    • -
  • Uintatherium
    • -     - -
  • MammalAnus
    • -     - -
  • MammalBreasts
    • -     - -
  • HorseVagina
    • -     - -
  • MammalBreasts
    • -     - -
  • HorsePenis
    • -     - -
  • Fur
    • -     - 1 -     - FelineAnimal
  • AA_ArcticLion
    • +
  • AA_CrystallineCaracal
  • AA_DuskProwler
    • +
  • AA_Genix
  • AA_SandLion
  • AA_PhoenixOwlcat
    • -
  • AA_SandProwler
  • ACPMunchkinCat
  • ACPLion
  • ACPTiger
    • @@ -653,6 +592,60 @@ 1.3     + + HorseAnimal + +
  • Rhinoceros
    • +
  • AA_Thunderox
    • +
  • ACPHorse
    • +
  • ACPWoolyHorse
    • +
  • ACPLlama
    • +
  • ACPBlackRhinoceros
    • +
  • ACPWoolyRhino
    • +
  • AEXP_BlackRhino
    • +
  • AEXP_Zebra
    • +
  • AEXP_Quagga
    • +
  • GR_Bearhorse
    • +
  • GR_Boomhorse
    • +
  • GR_Chickenhorse
    • +
  • GR_Cathorse
    • +
  • GR_Molehorse
    • +
  • GR_Wolfhorse
    • +
  • GR_Muffalohorse
    • +
  • GR_Crocorse
    • +
  • GR_Spiderhorse
    • +
  • GR_Hurseman
    • +
  • GR_Mancat
    • +
  • GR_ParagonHorse
    • +
  • MM_Pegasus
    • +
  • MM_Unicorn
    • +
  • RG-EAP_WoollyRhino
    • +
  • Chalicotherium
    • +
  • Elasmotherium
    • +
  • Paraceratherium
    • +
  • Uintatherium
    • +     + +
  • MammalAnus
    • +     + +
  • MammalBreasts
    • +     + +
  • HorseVagina
    • +     + +
  • MammalBreasts
    • +     + +
  • HorsePenis
    • +     + +
  • Fur
    • +     + 1 +     + MarineMammalAnimal @@ -745,6 +738,7 @@
  • Pig
  • WildBoar
  • AA_Thunderbeast
    • +
  • AA_WindBeast
  • AA_Darkbeast
  • AA_DarkVandal
  • ACPTapir
    • @@ -842,10 +836,9 @@
  • Cobra
  • Iguana
    • -
  • AA_BloodShrimp
    • +
  • AA_CrescendoAnole
  • AA_Erin
  • AA_Lockjaw
    • -
  • AA_RaptorShrimp
  • AA_RayHound
  • AA_Skyeel
  • ACPXenguana
    • @@ -899,16 +892,14 @@
  • Capybara
  • Squirrel
  • AA_DuskRat
    • -
  • AA_FissionMouse
    • -
  • AA_FissionMouseSecond
    • -
  • AA_FissionMouseThird
  • AA_FrostboundBehemoth
    • -
  • AA_Frostling
  • AA_Frostmite
  • AA_Groundrunner
    • +
  • AA_Razorjack
    • +
  • AA_OcularNightling
  • AA_Murkling
  • AA_Nightling
    • -
  • AA_Razorjack
    • +
  • AA_Frostling
  • ACPAngoraRabbit
  • ACPChipmunk
  • ACPDomesticRabbit
    • @@ -960,9 +951,12 @@     - SquidAnimal + TentacleAnimal +
  • AA_Helixien
    • +
  • AA_Plasmorph
  • AA_SandSquid
    • +
  • AA_TarGuzzler
    •
  • CloacalAnus
    • @@ -975,8 +969,49 @@
  • TentaclePenis
    •  - + +
  • Slime
    • +     true + 0.8 +     + + + ThrumboAnimal + +
  • GR_Thrumbear
    • +
  • GR_Thrumbalope
    • +
  • GR_Thrumbochicken
    • +
  • GR_Thrumffalo
    • +
  • GR_Thrumwolf
    • +
  • GR_Thrumbocat
    • +
  • GR_Thrumbospider
    • +
  • GR_Thrumbolizard
    • +
  • GR_Thrumborat
    • +
  • GR_Thrumhorse
    • +
  • GR_Thrumboman
    • +
  • GR_ParagonThrumbo
    • +
  • Archothrumbo
    • +
  • RoyalThrumbo
    • +     + +
  • CloacalAnus
    • +     + +
  • MammalBreasts
    • +     + +
  • CloacalVagina
    • +     + +
  • MammalBreasts
    • +     + +
  • DragonPenis
    • +     + +
  • Fur
    • +     1     @@ -1051,6 +1086,32 @@ 1 + + AA_SandProwlerAnimal + +
  • AA_SandProwler
    • +     + +
  • FelineAnus
    • +     + +
  • CatBreasts
    • +     + +
  • CatVagina
    • +     + +
  • CatBreasts
    • +     + +
  • CatPenis
    • +     + +
  • Scales
    • +     + 1 +     + BovineAnimal @@ -1103,7 +1164,6 @@
  • MM_Catoblepas
  • MM_CeryneianHind
  • Addax
    • -
  • Andrewsarchus
  • AngusCow
  • AnkoleWatusiCow
  • AnimaYak
    • @@ -1166,13 +1226,18 @@
  • AA_BlackScarab
  • AA_BlackSpelopede
  • AA_BlackSpider
    • -
  • AA_CrepuscularBeetle
    • +
  • AA_BloodShrimp
  • AA_MammothWorm
  • AA_MegaLouse
    • -
  • AA_Metallovore
    • +
  • AA_RaptorShrimp
    • +
  • AA_Ravager
  • AA_Thermadon
    • -
  • AA_LuciferBug
    • -
  • ACPMegascorpion
    • +
  • AA_Animalisk
    • +
  • AA_Blizzarisk
    • +
  • AA_Cinderlisk
    • +
  • AA_Dunealisk
    • +
  • AA_Feralisk
    • +
  • AA_Junglelisk
  • Meganeura
  • Spiderant
    •  diff --git a/Content/Base/Defs/RaceSupport/AvP.xml b/Content/Base/Defs/RaceSupport/AvP.xml deleted file mode 100644 index a4bf023..0000000 --- a/Content/Base/Defs/RaceSupport/AvP.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - Yautja_Alien - -
  • RRY_Alien_Yautja
    • -     - -
  • Anus
    • -     - -
  • Breasts
    • -     - -
  • Vagina
    • -     - -
  • Breasts
    • -     - -
  • Penis
    • -     - -
  • Scales
    • -     -     - - - - Rynath_Animal - -
  • RRY_Rynath
    • -     - -
  • Anus
    • -     - -
  • FeaturelessChest
    • -     - -
  • HorseVagina
    • -     - -
  • FeaturelessChest
    • -     - -
  • HorsePenis
    • -     - -
  • Skin
    • -     -     - - - - Xenomorph_Predalien_Animal - -
  • RRY_Xenomorph_Predalien
    • -     - -
  • InsectAnus
    • -     - - - - -
  • HemiPenis
    • -     - -
  • Chitin
    • -     - true - true - false - false -     - - - - Xenomorph_Thrumbomorph_Animal - -
  • RRY_Xenomorph_Thrumbomorph
    • -     - -
  • InsectAnus
    • -     - - -
  • OvipositorF
    • -     - - -
  • DragonPenis
    • -     - -
  • Chitin
    • -     - true - true - false - false -     -     \ No newline at end of file diff --git a/Content/Base/Defs/RaceSupport/Custom_Parts.xml b/Content/Base/Defs/RaceSupport/Custom_Parts.xml index 730fca2..25b93a1 100644 --- a/Content/Base/Defs/RaceSupport/Custom_Parts.xml +++ b/Content/Base/Defs/RaceSupport/Custom_Parts.xml @@ -36,11 +36,6 @@ ElephantVagina - - EquineAnus - EquineAnus - - FelineAnus FelineAnus @@ -61,6 +56,11 @@ PigVagina + + MammalPenis + MammalPenis + + MammalVagina MammalVagina @@ -76,6 +76,11 @@ CervineAnus + + HorseAnus + HorseAnus + + HyenaVagina HyenaVagina @@ -112,8 +117,8 @@ - Aedeagus - Aedeagus + AedeagusPenis + AedeagusPenis diff --git a/Content/Base/Defs/RaceSupport/Humanoids.xml b/Content/Base/Defs/RaceSupport/Humanoids.xml index b075599..c24b28b 100644 --- a/Content/Base/Defs/RaceSupport/Humanoids.xml +++ b/Content/Base/Defs/RaceSupport/Humanoids.xml @@ -4,6 +4,7 @@ HumanPerson +
  • AA_Mime
  • Alien_Goblin
  • Alien_Dirach
  • Alien_Fimm
    • @@ -52,9 +53,15 @@     - ArachnidPerson + ArthropodPerson +
  • Alien_Beetle
    • +
  • Alien_Mantis
    • +
  • Ant_AntiniumRace
  • Arachne
    • +
  • Cults_ByakheeRace
    • +
  • KlickmalaRace
    • +
  • Poleepkwa
  • Races_BlackWidow
  • Yokai_JorouGumo
    •  @@ -84,12 +91,6 @@
  • ATK_Avianmorph
  • Harpy
    • -
  • ST_Cardinal
    • -
  • ST_Crow
    • -
  • ST_Finch
    • -
  • ST_Jay
    • -
  • ST_Sparrow
    • -
  • ST_Swallow
    •
  • CloacalAnus
    • @@ -307,7 +308,6 @@
  • HalfDragon
  • Dragon_Kilhn
  • ALapelli
    • -
  • Thrumkin
  • yuki
    •  @@ -365,16 +365,16 @@
  • Vulpes
    •  -
  • Petite_FoxGirlAnus
    • +
  • Petite_FoxGirl_Anus
    •  -
  • Petite_FoxGirlBreasts
    • +
  • Petite_FoxGirl_Breasts
    •  -
  • Petite_FoxGirlVagina
    • +
  • Petite_FoxGirl_Vagina
    •  -
  • Petite_FoxGirlBreasts
    • +
  • Petite_FoxGirl_Breasts
    •
  • Penis
    • @@ -502,8 +502,6 @@
  • HPLovecraft_MistCreature
  • MM_WillOWisp
  • WoW_Skeleton
    • -
  • WMH_Djinn
    • -
  • WMH_Hym
  • GhostAnus
    • @@ -778,6 +776,32 @@ 1.3 + + ThrumboPerson + +
  • Thrumkin
    • +     + +
  • CloacalAnus
    • +     + +
  • Breasts
    • +     + +
  • CloacalVagina
    • +     + +
  • Breasts
    • +     + +
  • DragonPenis
    • +     + +
  • Fur
    • +     + 1.2 +     + TreePerson diff --git a/Content/Base/Defs/RaceSupport/_Extra_Races.xml b/Content/Base/Defs/RaceSupport/_Extra_Races.xml index e38ac5b..bad8f25 100644 --- a/Content/Base/Defs/RaceSupport/_Extra_Races.xml +++ b/Content/Base/Defs/RaceSupport/_Extra_Races.xml @@ -87,9 +87,7 @@ - -
  • GolemVagina
    • -     +
  • GolemPenis
    • @@ -98,39 +96,31 @@ 0.8 false false + true     - InsectPerson + SingleGenderUndeadRace -
  • Alien_Mantis
    • -
  • Ant_AntiniumRace
    • -
  • Alien_Beetle
    • -
  • Cults_ByakheeRace
    • -
  • KlickmalaRace
    • -
  • Poleepkwa
    • +
  • WMH_Wraith
    •  -
  • InsectAnus
    • +
  • NecroAnus
    •  - -
  • FeaturelessChest
    • -     - -
  • OvipositorF
    • -     + + -
  • FeaturelessChest
    • +
  • NecroBreasts
    •  -
  • OvipositorM
    • +
  • NecroPenis
    •  -
  • Chitin
    • +
  • Demon
    •  - 0.8 - true - true + false + false + true     @@ -141,9 +131,7 @@
  • WoW_Forsaken
  • WMH_Fogler
  • WMH_Ghoul
    • -
  • WMH_Fogler
  • WMH_Nekker
    • -
  • WMH_Wraith
  • NecroAnus
    • @@ -243,19 +231,44 @@
  • ArchotechAnus
    • +
  • Anus
    •  + +
  • 0.25
    • +
  • 0.75
    • +
  • ArchotechBreasts
    • +
  • Breasts
    •  + +
  • 0.25
    • +
  • 0.75
    • +
  • ArchotechVagina
    • +
  • Vagina
    •  + +
  • 0.25
    • +
  • 0.75
    • +
  • ArchotechBreasts
    • +
  • Breasts
    •  + +
  • 0.25
    • +
  • 0.75
    • +
  • ArchotechPenis
    • +
  • Penis
    •  + +
  • 0.25
    • +
  • 0.75
    • +
  • Robot
    •  @@ -271,30 +284,35 @@
  • AA_AcanthamoebaGiganteaHuge
  • AA_Aerofleet
  • AA_ColossalAerofleet
    • +
  • AA_Eyeling
    • +
  • AA_FungalHusk
  • AA_GreenGoo
  • AA_InfectedAerofleet
  • AA_MatureFleshbeast
    • +
  • AA_MycoidColossus
  • AA_OcularJelly
  • AA_RedGoo
  • AA_RedSpore
    • +
  • AA_Slurrypede
  • AA_TeratogenicOriginator
  • AA_TetraSlug
    • +
  • AA_WaywardMobileAssembler
    • +
  • AA_Wildpawn
    • +
  • AA_Wildpod
  • Cults_FormlessSpawnRace
  • GR_AberrantFleshbeast
  • GR_Fleshling
  • GR_FleshMonstrosity
  • GR_FleshGrowth
  • GR_FleshFlies
    • -
  • RRY_Xenomorph_Neomorph
    • -
  • RRY_Xenomorph_FaceHugger
    • -
  • RRY_Xenomorph_Drone
    • -
  • RRY_Xenomorph_Warrior
    • -
  • RRY_Xenomorph_Runner
  • SPBoats_Caravel
  • SPBoats_FishingBoat
  • SPBoats_Galleon
  • SPBoats_PaddleSteamer
  • SPBoats_RowBoat
    • +
  • WMH_Bearofleet
    • +
  • WMH_Djinn
    • +
  • WMH_Hym
  • Yokai_HinoKo
  • Yokai_Hodama
  • Yokai_Nurikabe
    • @@ -314,12 +332,35 @@ false     + + ArchotechRobotAnimal + +
  • GR_ArchotechCentipede
    • +     + +
  • ArchotechAnus
    • +     + + +
  • ArchotechVagina
    • +     + + +
  • ArchotechPenis
    • +     + +
  • Robot
    • +     + false + false + false +     + ArthropodAnimalsQueen
  • AA_BumbledroneQueen
    • -
  • RRY_Xenomorph_Queen
  • Skrix_Royal
    •  @@ -343,6 +384,7 @@ ArthropodAnimalsPrince +
  • AA_BumbledroneHierophant
  • Kenshi_Hiver_Prince
  • Kenshi_Fogman_Prince
  • Kenshi_Hiver_Prince_Southern
    • @@ -370,6 +412,7 @@
  • AA_Bumbledrone
  • ACPHaulerAnt
  • ACPAcidAnt
    • +
  • ACPMegascorpion
  • Apini
  • Azuri
  • Moobee
    • @@ -470,41 +513,19 @@ true     - - TentacleHermAnimals - -
  • AA_Plasmorph
    • -
  • AA_TarGuzzler
    • -
  • AA_Helixien
    • -     - -
  • CloacalAnus
    • -     - - -
  • CloacalVagina
    • -     - - -
  • TentaclePenis
    • -     - - true - true -     - VineAnimals
  • AA_AnimaColossus
  • AA_Mantrap
    • -
  • AA_MycoidColossus
  • AA_OvergrownColossus
  • WMH_Leshy
    •  - + +
  • VinePenis
    • +
  • VinePenis
    • @@ -512,8 +533,75 @@
  • Plant
    •  - true false false     + + + + AA_ChitinDemonGroup + +
  • AA_UnblinkingEye
    • +     + + + + + +
  • DemonTentaclePenis
    • +     + +
  • Chitin
    • +     + true + false +     + + + AA_FlamingoGroup + +
  • AA_FlamingoPhoenix
    • +     + +
  • CloacalAnus
    • +     + + + + +
  • CloacalPenis
    • +     + +
  • Feathers
    • +     + true + false + 0.3 +     + + + AA_FissionMiceGroup + +
  • AA_FissionMouse
    • +
  • AA_FissionMouseSecond
    • +
  • AA_FissionMouseThird
    • +     + +
  • MammalAnus
    • +     + + + +
  • MammalBreasts
    • +     + +
  • RodentPenis
    • +     + +
  • Fur
    • +     + true + false + 0.3 +     \ No newline at end of file diff --git a/Content/Base/Defs/RecipeDefs/Recipes_Surgery.xml b/Content/Base/Defs/RecipeDefs/Recipes_Surgery.xml index b6254e9..e357c68 100644 --- a/Content/Base/Defs/RecipeDefs/Recipes_Surgery.xml +++ b/Content/Base/Defs/RecipeDefs/Recipes_Surgery.xml @@ -681,74 +681,6 @@ ElephantVagina - - MultiAnusEquineAnus - - Adds an equine anus - Adding an equine anus - -
  • - - -
  • Medicine
    • - - - 1 - -
  • - - -
  • EquineAnus
    • - - - 1 - -     - - -
  • Medicine
    • -     - -
  • EquineAnus
    • -     -     - EquineAnus -     - - - AnalSurgeryEquineAnus - - Attaches an equine anus - Attaching an equine anus - -
  • - - -
  • Medicine
    • - - - 1 - -
  • - - -
  • EquineAnus
    • - - - 1 - -     - - -
  • Medicine
    • -     - -
  • EquineAnus
    • -     -     - EquineAnus -     - MultiAnusFelineAnus @@ -1123,6 +1055,108 @@ PigVagina + + FutaMakingFMammalPenis + + Adds a mammalian penis + Adding a mammalian penis + +
  • + + +
  • Medicine
    • + + + 1 + +
  • + + +
  • MammalPenis
    • + + + 1 + +     + + +
  • Medicine
    • +     + +
  • MammalPenis
    • +     +     + MammalPenis +     + + + MultiPenisMammalPenis + + Adds a mammalian penis + Adding a mammalian penis + +
  • + + +
  • Medicine
    • + + + 1 + +
  • + + +
  • MammalPenis
    • + + + 1 + +     + + +
  • Medicine
    • +     + +
  • MammalPenis
    • +     +     + MammalPenis +     + + + SexReassignmentPMammalPenis + + Attaches a mammalian penis + Attaching a mammalian penis + +
  • + + +
  • Medicine
    • + + + 1 + +
  • + + +
  • MammalPenis
    • + + + 1 + +     + + +
  • Medicine
    • +     + +
  • MammalPenis
    • +     +     + MammalPenis +     + FutaMakingMMammalVagina @@ -1361,6 +1395,74 @@ CervineAnus + + MultiAnusHorseAnus + + Adds an quine anus + Adding an quine anus + +
  • + + +
  • Medicine
    • + + + 1 + +
  • + + +
  • HorseAnus
    • + + + 1 + +     + + +
  • Medicine
    • +     + +
  • HorseAnus
    • +     +     + HorseAnus +     + + + AnalSurgeryHorseAnus + + Attaches an quine anus + Attaching an quine anus + +
  • + + +
  • Medicine
    • + + + 1 + +
  • + + +
  • HorseAnus
    • + + + 1 + +     + + +
  • Medicine
    • +     + +
  • HorseAnus
    • +     +     + HorseAnus +     + FutaMakingMHyenaVagina @@ -2042,7 +2144,7 @@ - FutaMakingFAedeagus + FutaMakingFAedeagusPenis Adds an aedeagus Adding an aedeagus @@ -2058,7 +2160,7 @@
  • -
  • Aedeagus
    • +
  • AedeagusPenis
    • 1 @@ -2069,14 +2171,14 @@
  • Medicine
    • -
  • Aedeagus
    • +
  • AedeagusPenis
    •  - Aedeagus + AedeagusPenis     - MultiPenisAedeagus + MultiPenisAedeagusPenis Adds an aedeagus Adding an aedeagus @@ -2092,7 +2194,7 @@
  • -
  • Aedeagus
    • +
  • AedeagusPenis
    • 1 @@ -2103,14 +2205,14 @@
  • Medicine
    • -
  • Aedeagus
    • +
  • AedeagusPenis
    •  - Aedeagus + AedeagusPenis     - SexReassignmentPAedeagus + SexReassignmentPAedeagusPenis Attaches an aedeagus Attaching an aedeagus @@ -2126,7 +2228,7 @@
  • -
  • Aedeagus
    • +
  • AedeagusPenis
    • 1 @@ -2137,10 +2239,10 @@
  • Medicine
    • -
  • Aedeagus
    • +
  • AedeagusPenis
    •  - Aedeagus + AedeagusPenis     diff --git a/Content/Base/Defs/ThingDefs/Items_BodyParts.xml b/Content/Base/Defs/ThingDefs/Items_BodyParts.xml index 722b105..7c1168e 100644 --- a/Content/Base/Defs/ThingDefs/Items_BodyParts.xml +++ b/Content/Base/Defs/ThingDefs/Items_BodyParts.xml @@ -71,16 +71,6 @@ - - EquineAnus - - An anus shaped like a doughnut. - - 250 - 0.120 - - - FelineAnus @@ -121,6 +111,16 @@ + + MammalPenis + + A generic mammalian animal's penis. + + 250 + 0.160 + + + MammalVagina @@ -151,6 +151,16 @@ + + HorseAnus + + An anus shaped like a doughnut. + + 250 + 0.120 + + + HyenaVagina @@ -222,11 +232,11 @@ - Aedeagus + AedeagusPenis The phallus of a male arthropod, for excreting a spermatophore to inseminate a female arthropod. - 250 + 50 0.160 @@ -274,7 +284,7 @@ VinePenis - Genetically altered vines capable of reproduction. + A mass of vines where a penis would be. 250 0.224 diff --git a/ReadMe.md b/ReadMe.md index a0cd746..fae39fe 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -5,13 +5,13 @@ This mod requires RJW and must be placed somewhere below it. ### Supported Mods +: Fate uncertain (I may have to update the link for it when it gets updated to 1.4, or it may not get updated at all) +-: Waiting for update * +Add Elona Imouto Race https://steamcommunity.com/sharedfiles/filedetails/?id=1863723112 * Add Elona Shoujo https://steamcommunity.com/sharedfiles/filedetails/?id=1500213859 -* Alien Vs Predator https://steamcommunity.com/sharedfiles/filedetails/?id=2034103876 * Alpha Animals https://steamcommunity.com/sharedfiles/filedetails/?id=1541721856 -* Ancient Species https://steamcommunity.com/sharedfiles/filedetails/?id=2154569778 +* -Ancient Species https://steamcommunity.com/sharedfiles/filedetails/?id=2154569778 * +Androids https://steamcommunity.com/workshop/filedetails/?id=1541064015 -* Anima Animals - Community Pack https://steamcommunity.com/sharedfiles/filedetails/?id=2488975583 +* -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 @@ -21,62 +21,59 @@ This mod requires RJW and must be placed somewhere below it. * 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 +* -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 +* -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 (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2305644684 -* Call of Cthulhu - Cosmic Horrors https://steamcommunity.com/sharedfiles/filedetails/?id=765890823-- -* Call of Cthulhu - Cults https://steamcommunity.com/sharedfiles/filedetails/?id=815039373 +* -Cactaceae (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2025692982 +* -Call of Cthulhu - Elder Things (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2305644684 +* -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 -* Cribby's Avians https://steamcommunity.com/sharedfiles/filedetails/?id=2109316343 * Dinosauria https://steamcommunity.com/workshop/filedetails/?id=1136958577 -* Dragon's Descent https://steamcommunity.com/workshop/filedetails/?id=2026992161 +* -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 -* Epona Race [ Dead? ] https://steamcommunity.com/sharedfiles/filedetails/?id=2405585786 +* [Dead?]Epona Race https://steamcommunity.com/sharedfiles/filedetails/?id=2405585786 * Equiums II https://steamcommunity.com/sharedfiles/filedetails/?id=2878904290 * Erin's Palamutes https://steamcommunity.com/sharedfiles/filedetails/?id=2485624026 -* Fallout Races: Playable Ghoul (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2343993193 +* [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 -* Forsakens: Fauna https://steamcommunity.com/sharedfiles/filedetails/?id=1929101125 +* -Forgotten Realms https://steamcommunity.com/sharedfiles/filedetails/?id=2184183669 * Gods of Elona https://steamcommunity.com/sharedfiles/filedetails/?id=1505332648 -* Half Dragons [ Dead? ] https://steamcommunity.com/sharedfiles/filedetails/?id=2556121262 +* [Dead?]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 +* -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 * +Jello People https://steamcommunity.com/sharedfiles/filedetails/?id=1741456572 * +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 2.0 https://steamcommunity.com/sharedfiles/filedetails/?id=1918120749 -* Kilhn Race https://steamcommunity.com/sharedfiles/filedetails/?id=2025689796 -* Klickmala Race [ Dead? ] https://steamcommunity.com/sharedfiles/filedetails/?id=2489566199 +* -Kijin Race 2.0 https://steamcommunity.com/sharedfiles/filedetails/?id=1918120749 +* -Kilhn Race https://steamcommunity.com/sharedfiles/filedetails/?id=2025689796 +* [Dead?]Klickmala Race https://steamcommunity.com/sharedfiles/filedetails/?id=2489566199 * Kolra's Oni Race Mod (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2411504950 -* [WIP] Kurin HAR Edition https://steamcommunity.com/workshop/filedetails/?id=2326430787 +* 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 -* Momu https://steamcommunity.com/sharedfiles/filedetails/?id=1929605886 +* [Dead?]Momu https://steamcommunity.com/sharedfiles/filedetails/?id=1929605886 * +Moyo-From the depth https://steamcommunity.com/sharedfiles/filedetails/?id=2182305386 * +Nam' Hellhounds https://steamcommunity.com/sharedfiles/filedetails/?id=2381349496 * NewRatkinPlus https://steamcommunity.com/sharedfiles/filedetails/?id=1578693166 -* Nexomon https://steamcommunity.com/sharedfiles/filedetails/?id=2673298959 +* 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 +* -Nyaron Race https://steamcommunity.com/sharedfiles/filedetails/?id=1854376306 * +Oni of the Rim https://steamcommunity.com/sharedfiles/filedetails/?id=1632244750 * Ooka Miko https://steamcommunity.com/sharedfiles/filedetails/?id=1536817379 * Orassans https://steamcommunity.com/sharedfiles/filedetails/?id=1541519487 -* Outer Rim Galaxies https://steamcommunity.com/sharedfiles/filedetails/?id=2681363470 * 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 @@ -84,15 +81,14 @@ This mod requires RJW and must be placed somewhere below it. * 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 +* -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 -* Simple Ogre Race [ Dead? ] https://steamcommunity.com/sharedfiles/filedetails/?id=1873766929 +* -Save Our Ship 2 https://steamcommunity.com/workshop/filedetails/?id=1909914131 +* +ShadowRimRaces https://steamcommunity.com/sharedfiles/filedetails/?id=2444008208 +* [Dead?]Simple Ogre Race https://steamcommunity.com/sharedfiles/filedetails/?id=1873766929 * Skrix - An Insect-like Race https://steamcommunity.com/sharedfiles/filedetails/?id=2267078474 * Slime Race [Legacy mod, uncertain source???] -* Stupid Sexy Deathclaws https://steamcommunity.com/sharedfiles/filedetails/?id=2635389101 * 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 @@ -102,34 +98,39 @@ This mod requires RJW and must be placed somewhere below it. * +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 +* -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 +* -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 -* +[It has news but I can't read the language, will translate later] Yokai? https://steamcommunity.com/sharedfiles/filedetails/?id=1532938687 +* -Yokai? https://steamcommunity.com/sharedfiles/filedetails/?id=1532938687 * Zabrak Race (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2263389593&searchtext=race ### Plans -* Drop support for AVP, Cribby's Avians * Maintain -* Test Test Test -* LoadFolders for Alien Races patches * Rock skin type for golems * Eldritch and/or undead skin type? Or Necrophilia? * Improve marsupial parts * Animal breeding balancing and testing -* Review mod support and patches +* Review patches #### Mod support * Kenshi shek race * VFE insects * Android tiers * RimEffect * Update milk mod support +* Keep an eye out for Fallout Ghoul +* FCP vertibirds, dogmeat +#### Test and improve +* Emperor of dragon +* Gods of elona +* Race to the rim +* Ooka miko +* VAE and VGE test ### Thanks * Ed86 (for Maintaining RJW) diff --git a/changelog.txt b/changelog.txt index 443aa39..ac25112 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,13 @@ +11.2.1 +-Removed janky support for AvP +-Removed support for Cribby's Avians +-Fixed some issues with Alpha Animals +-Fixed ACP Red Panda and Megascorpion +-Witcher Monster Hunt improvements +-Archotech group improvements +-Insect person improvements +-Thrumbo group improvements + 11.2.0 -1.4 update -Changed old Forsakens Fauna defs to Alpha Animals diff --git a/generator/src/parts.rs b/generator/src/parts.rs index ce8fbe7..715c2f8 100644 --- a/generator/src/parts.rs +++ b/generator/src/parts.rs @@ -173,10 +173,6 @@ pub fn part_data_animals() -> Vec { "The deep vagina of a female elephant.", vec!["Deep"] ).unwrap(), - Part::standard("an", PartType::Anus, "equine", - "An anus shaped like a doughnut.", - vec!["Loose"] - ).unwrap(), Part::standard("a", PartType::Anus, "feline", "A feline anus.", vec!["Tight"] @@ -193,6 +189,14 @@ pub fn part_data_animals() -> Vec { "The foldy vagina of a female pig.", vec!["Tight"] ).unwrap(), + Part { + part_type: PartType::Penis, + name: "MammalPenis".to_string(), + label: "mammal penis".to_string(), + label_noun: "a mammalian penis".to_string(), + description: "A generic mammalian animal's penis.".to_string(), + props: vec![], + }, Part { part_type: PartType::Vagina, name: "MammalVagina".to_string(), @@ -217,6 +221,14 @@ pub fn part_data_animals() -> Vec { description: "A deer's anus.".to_string(), props: vec![], }, + Part { + part_type: PartType::Anus, + name: "HorseAnus".to_string(), + label: "equine anus".to_string(), + label_noun: "an quine anus".to_string(), + description: "An anus shaped like a doughnut.".to_string(), + props: vec![], + }, Part { part_type: PartType::Vagina, name: "HyenaVagina".to_string(), @@ -260,7 +272,7 @@ pub fn part_data_animals() -> Vec { ).unwrap(), Part { part_type: PartType::Penis, - name: "Aedeagus".to_string(), + name: "AedeagusPenis".to_string(), label: "aedeagus".to_string(), label_noun: "an aedeagus".to_string(), description: "The phallus of a male arthropod, for excreting a spermatophore to inseminate a female arthropod.".to_string(), @@ -303,7 +315,7 @@ pub fn part_data_animals() -> Vec { name: "VinePenis".to_string(), label: "vines".to_string(), label_noun: "a mass of vines".to_string(), - description: "Genetically altered vines capable of reproduction.".to_string(), + description: "A mass of vines where a penis would be.".to_string(), props: vec!["Long", "Multiple", "Prehensile", "Thin"], }, ] diff --git a/generator/src/racegroups.rs b/generator/src/racegroups.rs index c9d7331..20503ca 100644 --- a/generator/src/racegroups.rs +++ b/generator/src/racegroups.rs @@ -118,6 +118,7 @@ pub fn racegroup_data_humans() -> Vec { vec![ RaceGroup::standard( vec![ + "AA_Mime", "Alien_Goblin", "Alien_Dirach", "Alien_Fimm", @@ -152,11 +153,17 @@ pub fn racegroup_data_humans() -> Vec { ), RaceGroup::standard( vec![ + "Alien_Beetle", + "Alien_Mantis", + "Ant_AntiniumRace", "Arachne", + "Cults_ByakheeRace", + "KlickmalaRace", + "Poleepkwa", "Races_BlackWidow", "Yokai_JorouGumo", ], - "Arachnid", + "Arthropod", "Chitin", "0.8", "Breasts", "Insect", @@ -166,12 +173,6 @@ pub fn racegroup_data_humans() -> Vec { vec![ "ATK_Avianmorph", "Harpy", - "ST_Cardinal", - "ST_Crow", - "ST_Finch", - "ST_Jay", - "ST_Sparrow", - "ST_Swallow", ], "Avian", "Feathers", "0.9", @@ -278,7 +279,6 @@ pub fn racegroup_data_humans() -> Vec { "HalfDragon", "Dragon_Kilhn", "ALapelli", - "Thrumkin", "yuki", ], "Dragon", @@ -297,7 +297,7 @@ pub fn racegroup_data_humans() -> Vec { "", ("", "Elephant"), ), - RaceGroup::standard( // For foxes, hyenas, werewolves, etc (hyenas are felines oops) + RaceGroup::standard( vec![ "Alien_Hisa", "kon", @@ -305,9 +305,9 @@ pub fn racegroup_data_humans() -> Vec { ], "FoxGirl", "Fur", "1.3", - "Petite_FoxGirlBreasts", - "Petite_FoxGirl", - ("Petite_FoxGirl", ""), + "Petite_FoxGirl_Breasts", + "Petite_FoxGirl_", + ("Petite_FoxGirl_", ""), ), RaceGroup::standard( vec![ @@ -377,8 +377,6 @@ pub fn racegroup_data_humans() -> Vec { "HPLovecraft_MistCreature", "MM_WillOWisp", "WoW_Skeleton", - "WMH_Djinn", - "WMH_Hym", ], "Ghost", "Demon", "0.5", @@ -510,6 +508,16 @@ pub fn racegroup_data_humans() -> Vec { "Petite_", ("Rodent", "Rodent"), ), + RaceGroup::standard( + vec![ + "Thrumkin", + ], + "Thrumbo", + "Fur", "1.2", + "Breasts", + "Cloacal", + ("Cloacal", "Dragon") + ), RaceGroup::standard( vec![ "Alien_Dryad", @@ -568,8 +576,10 @@ pub fn racegroup_data_animals() -> Vec { vec![ RaceGroup::standard_animal( vec![ + "ACPRedPanda", "AEXP_Pangolin", "AEXP_RedPanda", + "Andrewsarchus", ], "GenericMammal", "Fur", "1", None, @@ -598,21 +608,23 @@ pub fn racegroup_data_animals() -> Vec { RaceGroup::standard_animal( vec![ "AA_AngelMoth", - "AA_Animalisk", "AA_Atispec", "AA_Barbslinger", "AA_BedBug", + "AA_Bobeene", "AA_ChemfuelMyrmidon", + "AA_CrepuscularBeetle", "AA_Drainer", "AA_FireWasp", "AA_GreatDevourer", "AA_IronhuskBeetle", - "AA_Blizzarisk", - "AA_Cinderlisk", - "AA_Dunealisk", - "AA_Feralisk", - "AA_Junglelisk", - "AA_Ravager", + "AA_LuciferBug", + "AA_Metallovore", + // AA Crabs + "AA_BoulderMit", + "AA_CrystalMit", + "AA_PebbleMit", + "AA_SummitCrab", "ACPSilkspider", "AEXP_Megascorpion", "BWFlooferMoth", @@ -656,6 +668,7 @@ pub fn racegroup_data_animals() -> Vec { "ACPSilkieChicken", "ACPPtarmigan", "AA_DesertAve", + "AA_GiantCrownedSilkie", "AA_FrostAve", "AA_MeadowAve", "AA_NightAve", @@ -685,7 +698,7 @@ pub fn racegroup_data_animals() -> Vec { "Titanis", ], "Avian", - "Feathers", "0.8", None, + "Feathers", "0.8", Some(false), "", "Cloacal", ("Cloacal", "Cloacal"), @@ -743,12 +756,11 @@ pub fn racegroup_data_animals() -> Vec { RaceGroup::standard_animal( vec![ "AA_RipperHound", - "RRY_Yautja_Hound" ], "CanineSkin", "Skin", "0.9", None, "MammalBreasts", - "Canine", + "Dog", ("Dog", "Dog"), ), // Most even-toed ungulates go here, obviously excluding cetaceans @@ -812,6 +824,7 @@ pub fn racegroup_data_animals() -> Vec { "Corythosaurus", "Dilophosaurus", "Diplodocus", + "Doedicurus", "Dryosaurus", "Iguanodon", "Magyarosaurus", @@ -838,18 +851,6 @@ pub fn racegroup_data_animals() -> Vec { vec![ "AA_Behemoth", "AA_DecayDrake", - "GR_Thrumbear", - "GR_Thrumbalope", - "GR_Thrumbochicken", - "GR_Thrumffalo", - "GR_Thrumwolf", - "GR_Thrumbocat", - "GR_Thrumbospider", - "GR_Thrumbolizard", - "GR_Thrumborat", - "GR_Thrumhorse", - "GR_Thrumboman", - "GR_ParagonThrumbo", "MM_Qilin", "MM_LesserWyvern", "Black_Dragon", @@ -864,10 +865,8 @@ pub fn racegroup_data_animals() -> Vec { "True_Dragon", "White_Dragon", "Yellow_Dragon", - "Archothrumbo", "Draclone", "Mystogen", - "RoyalThrumbo", "Voltaic", ], "Dragon", @@ -880,6 +879,7 @@ pub fn racegroup_data_animals() -> Vec { vec![ "Elephant", "AA_Gallatross", + "AA_GallatrossMoribund", "AEXP_AsianElephant", "AEXP_IndianElephant", "AEXP_Tapir", @@ -897,52 +897,14 @@ pub fn racegroup_data_animals() -> Vec { "Mammal", ("Elephant", "Elephant"), ), - // Rhinos belong here, not with elephants, as they are odd-toed ungulates - RaceGroup::standard_animal( - vec![ - "Rhinoceros", - "AA_Thunderox", - "ACPHorse", - "ACPWoolyHorse", - "ACPLlama", - "ACPBlackRhinoceros", - "ACPWoolyRhino", - "AEXP_BlackRhino", - "AEXP_Zebra", - "AEXP_Quagga", - "GR_Bearhorse", - "GR_Boomhorse", - "GR_Chickenhorse", - "GR_Cathorse", - "GR_Molehorse", - "GR_Wolfhorse", - "GR_Muffalohorse", - "GR_Crocorse", - "GR_Spiderhorse", - "GR_Hurseman", - "GR_Mancat", - "GR_ParagonHorse", - "MM_Pegasus", - "MM_Unicorn", - "RG-EAP_WoollyRhino", - "Chalicotherium", - "Elasmotherium", - "Paraceratherium", - "Uintatherium", - ], - "Horse", - "Fur", "1", None, - "MammalBreasts", - "Mammal", - ("Horse", "Horse"), - ), RaceGroup::standard_animal( vec![ "AA_ArcticLion", + "AA_CrystallineCaracal", "AA_DuskProwler", + "AA_Genix", "AA_SandLion", "AA_PhoenixOwlcat", - "AA_SandProwler", "ACPMunchkinCat", "ACPLion", "ACPTiger", @@ -1000,6 +962,45 @@ pub fn racegroup_data_animals() -> Vec { "Feline", ("Cat", "Cat"), ), + // Rhinos belong here, not with elephants, as they are odd-toed ungulates + RaceGroup::standard_animal( + vec![ + "Rhinoceros", + "AA_Thunderox", + "ACPHorse", + "ACPWoolyHorse", + "ACPLlama", + "ACPBlackRhinoceros", + "ACPWoolyRhino", + "AEXP_BlackRhino", + "AEXP_Zebra", + "AEXP_Quagga", + "GR_Bearhorse", + "GR_Boomhorse", + "GR_Chickenhorse", + "GR_Cathorse", + "GR_Molehorse", + "GR_Wolfhorse", + "GR_Muffalohorse", + "GR_Crocorse", + "GR_Spiderhorse", + "GR_Hurseman", + "GR_Mancat", + "GR_ParagonHorse", + "MM_Pegasus", + "MM_Unicorn", + "RG-EAP_WoollyRhino", + "Chalicotherium", + "Elasmotherium", + "Paraceratherium", + "Uintatherium", + ], + "Horse", + "Fur", "1", None, + "MammalBreasts", + "Mammal", + ("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( vec![ @@ -1045,6 +1046,7 @@ pub fn racegroup_data_animals() -> Vec { "Pig", "WildBoar", "AA_Thunderbeast", + "AA_WindBeast", "AA_Darkbeast", "AA_DarkVandal", "ACPTapir", @@ -1094,10 +1096,9 @@ pub fn racegroup_data_animals() -> Vec { vec![ "Cobra", "Iguana", - "AA_BloodShrimp", + "AA_CrescendoAnole", "AA_Erin", "AA_Lockjaw", - "AA_RaptorShrimp", "AA_RayHound", "AA_Skyeel", "ACPXenguana", @@ -1138,16 +1139,15 @@ pub fn racegroup_data_animals() -> Vec { "Capybara", "Squirrel", "AA_DuskRat", - "AA_FissionMouse", - "AA_FissionMouseSecond", - "AA_FissionMouseThird", "AA_FrostboundBehemoth", - "AA_Frostling", "AA_Frostmite", "AA_Groundrunner", + "AA_Razorjack", + // AA Lings + "AA_OcularNightling", "AA_Murkling", "AA_Nightling", - "AA_Razorjack", + "AA_Frostling", "ACPAngoraRabbit", "ACPChipmunk", "ACPDomesticRabbit", @@ -1185,14 +1185,40 @@ pub fn racegroup_data_animals() -> Vec { ), RaceGroup::standard_animal( vec![ + "AA_Helixien", + "AA_Plasmorph", "AA_SandSquid", + "AA_TarGuzzler", ], - "Squid", - "", "1", Some(false), + "Tentacle", + "Slime", "0.8", Some(false), "", "Cloacal", ("Cloacal", "Tentacle"), ), + RaceGroup::standard_animal( + vec![ + "GR_Thrumbear", + "GR_Thrumbalope", + "GR_Thrumbochicken", + "GR_Thrumffalo", + "GR_Thrumwolf", + "GR_Thrumbocat", + "GR_Thrumbospider", + "GR_Thrumbolizard", + "GR_Thrumborat", + "GR_Thrumhorse", + "GR_Thrumboman", + "GR_ParagonThrumbo", + "Archothrumbo", + "RoyalThrumbo", + ], + "Thrumbo", + "Fur", "1", None, + "MammalBreasts", + "Cloacal", + ("Cloacal", "Dragon"), + ), RaceGroup::standard_animal( vec![ "Tortoise", @@ -1235,6 +1261,17 @@ pub fn racegroup_data_animals() -> Vec { "Mammal", ("Mammal", "Bear"), ), + // AA + RaceGroup::standard_animal( + vec![ + "AA_SandProwler", + ], + "AA_SandProwler", + "Scales", "1", None, + "CatBreasts", + "Feline", + ("Cat", "Cat"), + ), RaceGroup { races: vec![ "Goat", @@ -1286,7 +1323,6 @@ pub fn racegroup_data_animals() -> Vec { "MM_Catoblepas", "MM_CeryneianHind", "Addax", - "Andrewsarchus", "AngusCow", "AnkoleWatusiCow", "AnimaYak", @@ -1338,13 +1374,19 @@ pub fn racegroup_data_animals() -> Vec { "AA_BlackScarab", "AA_BlackSpelopede", "AA_BlackSpider", - "AA_CrepuscularBeetle", + "AA_BloodShrimp", "AA_MammothWorm", "AA_MegaLouse", - "AA_Metallovore", + "AA_RaptorShrimp", + "AA_Ravager", "AA_Thermadon", - "AA_LuciferBug", - "ACPMegascorpion", + // AA Lisks + "AA_Animalisk", + "AA_Blizzarisk", + "AA_Cinderlisk", + "AA_Dunealisk", + "AA_Feralisk", + "AA_Junglelisk", "Meganeura", "Spiderant", ],