Merge branch 'pokeworld' into 'master'

PokeWorld Gen 1/2

See merge request AsmodeusRex/rjw-race-support!1

generator/src/racegroups.rs

@@ -128,6 +128,21 @@ pub fn racegroup_data_humans() -> Vec<RaceGroup> {
 				"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",
@@ -314,10 +329,10 @@ pub fn racegroup_data_humans() -> Vec<RaceGroup> {
 		),
 		RaceGroup::standard(
 			vec![
-				"Alien_Eldar",
 				"AS_WHE_Race",
 				"Alien_Astoriel",
 				"Alien_Drow_Otto",
+				"Alien_Eldar",
 				"O21_Alien_DarkElf",
 				"O21_Alien_MoonElf",
 				"O21_Alien_SunElf",
@@ -326,12 +341,21 @@ pub fn racegroup_data_humans() -> Vec<RaceGroup> {
 				"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",
@@ -366,6 +390,20 @@ pub fn racegroup_data_humans() -> Vec<RaceGroup> {
 				"Alien_NiHal",
 				"Alien_Quarren",
 				"Alien_MonCalamari",
+				"PW_Corsola",
+				"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",
@@ -379,6 +417,10 @@ pub fn racegroup_data_humans() -> Vec<RaceGroup> {
 				"DRSKT_Race",
 				"HPLovecraft_MistCreature",
 				"MM_WillOWisp",
+				"PW_Gastly",
+				"PW_Gengar",
+				"PW_Haunter",
+				"PW_Misdreavus",
 				"WoW_Skeleton",
 			],
 			"Ghost",
@@ -523,6 +565,26 @@ pub fn racegroup_data_humans() -> Vec<RaceGroup> {
 				"Alien_Dryad",
 				"Alien_DryadWild",
 				"Alien_Tree",
+				"PW_Bayleef",
+				"PW_Bellossom",
+				"PW_Bellsprout",
+				"PW_Bulbasaur",
+				"PW_Chikorita",
+				"PW_Gloom",
+				"PW_Hoppip",
+				"PW_Ivysaur",
+				"PW_Jumpluff",
+				"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",
@@ -556,6 +618,11 @@ pub fn racegroup_data_humans() -> Vec<RaceGroup> {
 				"Alien_Slime",
 				"Alien_Slug",
 				"Mincho_ThingDef",
+				"PW_Ditto",
+				"PW_Grimer",
+				"PW_Magcargo",
+				"PW_Muk",
+				"PW_Slugma",
 				"Yokai_HihiiroKabe",
 				"Slime",
 			],
@@ -597,6 +664,12 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"AEXP_Lemur",
 				"AEXP_Bonobo",
 				"GR_ParagonHumanoid",
+				"PW_Aipom",
+				"PW_Electabuzz",
+				"PW_Lickitung",
+				"PW_Magmar",
+				"PW_Mankey",
+				"PW_Primeape",
 				"Dinopithecus",
 				"Gigantopithecus",
 			],
@@ -631,6 +704,16 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"AEXP_Megascorpion",
 				"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",
@@ -676,19 +759,41 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"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",
-				"RG-EAP_Dodo",
+				"PW_Articuno",
+				"PW_Delibird",
+				"PW_Dodrio",
+				"PW_Doduo",
+				"PW_Farfetchd",
+				"PW_Fearow",
+				"PW_Golduck",
+				"PW_HoOh",
+				"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",
@@ -734,18 +839,35 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"AEXP_WelshTerrier",
 				"AEXP_AfricanWildDog",
 				"ERN_Palamute",
-				"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",
+				"MM_Kitsune",
+				"PW_Arcanine",
+				"PW_Eevee",
+				"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",
@@ -780,6 +902,8 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"AEXP_Camel",
 				"AEXP_Giraffe",
 				"AEXP_Moose",
+				"PW_Girafarig",
+				"PW_Stantler",
 				"RG-WF_WastelandDeer",
 			],
 			"Cervine",
@@ -791,8 +915,11 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 		RaceGroup::standard_animal(
 			vec![
 				"AA_RoughPlatedMonitor",
-				"AEXP_Crocodile",
 				"AEXP_Alligator",
+				"AEXP_Crocodile",
+				"PW_Croconaw",
+				"PW_Feraligatr",
+				"PW_Totodile",
 				"Quinkana",
 				"Purussaurus",
 			],
@@ -805,6 +932,7 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 		RaceGroup::standard_animal(
 			vec![
 				"AA_PedigreedRaptor",
+				"PW_Aerodactyl",
 				"Dakotaraptor",
 				"Deinocheirus",
 				"Gallimimus",
@@ -821,6 +949,11 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 		),
 		RaceGroup::standard_animal(
 			vec![
+				"PW_Cubone",
+				"PW_Marowak",
+				"PW_Kangaskhan",
+				"PW_Larvitar",
+				"PW_Tyranitar",
 				"Allosaurus",
 				"Ankylosaurus",
 				"Baryonyx",
@@ -858,8 +991,14 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 			vec![
 				"AA_Behemoth",
 				"AA_DecayDrake",
-				"MM_Qilin",
 				"MM_LesserWyvern",
+				"MM_Qilin",
+				"PW_Charizard",
+				"PW_Charmander",
+				"PW_Charmeleon",
+				"PW_Dragonair",
+				"PW_Dragonite",
+				"PW_Dratini",
 				"Yokai_RyuunoIkariAnimal",
 				// Colored dragons
 				"Black_Dragon",
@@ -893,6 +1032,10 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"AEXP_IndianElephant",
 				"AEXP_Tapir",
 				"HC_WoollyMammoth",
+				"PW_Donphan",
+				"PW_Drowzee",
+				"PW_Hypno",
+				"PW_Phanpy",
 				"RG-EAP_WoollyMammoth",
 				"Boltusk",
 				"Deinotherium",
@@ -948,9 +1091,11 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"GR_Catman",
 				"GR_ParagonFeline",
 				"MM_Chimera",
+				"MM_Griffin",
 				"MM_Manticore",
 				"MM_Xiezhi",
-				"MM_Griffin",
+				"PW_Meowth",
+				"PW_Persian",
 				"Carnagrius",
 				"Dinocrocuta",
 				"eBlackcat",
@@ -1004,6 +1149,10 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"GR_ParagonHorse",
 				"MM_Pegasus",
 				"MM_Unicorn",
+				"PW_Ponyta",
+				"PW_Rapidash",
+				"PW_Rhydon",
+				"PW_Rhyhorn",
 				"RG-EAP_WoollyRhino",
 				"Chalicotherium",
 				"Elasmotherium",
@@ -1024,6 +1173,10 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"ACPHippopotamus",
 				"AEXP_Seal",
 				"AEXP_Walrus",
+				"PW_Azumarill",
+				"PW_Dewgong",
+				"PW_Marill",
+				"PW_Seel",
 				"Gomphotaria",
 			],
 			"MarineMammal",
@@ -1048,6 +1201,8 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 			vec![
 				"AEXP_Koala",
 				"AEXP_TasmanianDevil",
+				"PW_Diglett",
+				"PW_Dugtrio",
 				"Diprotodon",
 			],
 			"MarsupialBi",
@@ -1078,6 +1233,11 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"AA_WindBeast",
 				"AA_Darkbeast",
 				"AA_DarkVandal",
+				"PW_Piloswine",
+				"PW_Slowbro",
+				"PW_Slowking",
+				"PW_Slowpoke",
+				"PW_Swinub",
 				"ACPTapir",
 				"ACPPeccary",
 				"MM_ErymanthianBoar",
@@ -1114,6 +1274,8 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"AEXP_MegaWolverine",
 				"AEXP_Otter",
 				"AEXP_Badger",
+				"PW_Smeargle",
+				"PW_Sneasel",
 				"Enhydriodon",
 			],
 			"Raccoon",
@@ -1151,6 +1313,8 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"MM_Basilisk",
 				"MM_Salamander",
 				"MM_Tlilcoatl",
+				"PW_Arbok",
+				"PW_Ekans",
 				"RG-WF_WastelandDeathclaw",
 				"Gigantophis",
 				"Megalania",
@@ -1206,8 +1370,27 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"GR_Rabbitchicken",
 				"GR_Ratffalo",
 				"GR_Squirralope",
-				"RG-WF_WastelandSquirrel",
+				"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_Sentret",
+				"PW_Typhlosion",
 				"RG-WF_WastelandBeaver",
+				"RG-WF_WastelandSquirrel",
 				"Yokai_SpinMouse",
 				"Archojerboa",
 				"Castoroides",
@@ -1227,6 +1410,9 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"AA_Plasmorph",
 				"AA_SandSquid",
 				"AA_TarGuzzler",
+				"PW_Octillery",
+				"PW_Tentacool",
+				"PW_Tentacruel",
 			],
 			"Tentacle",
 			"Slime", "0.8", Some(false),
@@ -1262,6 +1448,11 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 			vec![
 				"Tortoise",
 				"AEXP_DesertTortoise",
+				"PW_Blastoise",
+				"PW_Lapras",
+				"PW_Shuckle",
+				"PW_Squirtle",
+				"PW_Wartortle",
 				"Archotortoise",
 				"Megalochelys",
 			],
@@ -1289,6 +1480,8 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"GR_Bearwolf",
 				"GR_Manbear",
 				"GR_ParagonBear",
+				"PW_Teddiursa",
+				"PW_Ursaring",
 				"RG-WF_WastelandBear",
 				"Archopanda",
 				"AnimaBear",
@@ -1342,26 +1535,31 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"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",
+				"MM_WildMinotaur",
+				"PW_Ampharos",
+				"PW_Flaaffy",
+				"PW_Mareep",
+				"PW_Miltank",
+				"PW_Tauros",
+				"RG-EAP-Protoceratidae",
 				"Addax",
 				"AngusCow",
 				"AnkoleWatusiCow",
@@ -1428,6 +1626,26 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"AA_Feralisk",
 				"AA_Junglelisk",
 				"AACP_AnimaMegaspider",
+				"PW_Ariados",
+				"PW_Beedrill",
+				"PW_Butterfree",
+				"PW_Caterpie",
+				"PW_Heracross",
+				"PW_Kakuna",
+				"PW_Ledian",
+				"PW_Ledyba",
+				"PW_Metapod",
+				"PW_Paras",
+				"PW_Parasect",
+				"PW_Pineco",
+				"PW_Pinsir",
+				"PW_Scizor",
+				"PW_Scyther",
+				"PW_Spinarak",
+				"PW_Venomoth",
+				"PW_Venonat",
+				"PW_Weedle",
+				"PW_Yanma",
 				"Meganeura",
 				"Spiderant",
 			],