From e35519ec8ab1b958408ab2a90b88dffc1bcc7fb2 Mon Sep 17 00:00:00 2001 From: 12xx12 <44411062+12xx12@users.noreply.github.com> Date: Mon, 23 Nov 2020 00:41:13 +0100 Subject: Adding new monster types to enum and saving/loading for easier future implementation (#4941) * added new monster types to enum added string <-> enum conversion in namespace serializer added loading functions added to saving * renamed zombie pigman to zombified piglins in enum Co-authored-by: 12xx12 <12xx12100@gmail.com> Co-authored-by: Tiger Wang --- src/Mobs/MonsterTypes.h | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'src/Mobs/MonsterTypes.h') diff --git a/src/Mobs/MonsterTypes.h b/src/Mobs/MonsterTypes.h index ea51f3539..5a591b31f 100644 --- a/src/Mobs/MonsterTypes.h +++ b/src/Mobs/MonsterTypes.h @@ -13,37 +13,76 @@ enum eMonsterType mtBat, mtBlaze, + mtCat, // Added in 1.14 mtCaveSpider, mtChicken, + mtCod, // Added in 1.13 mtCow, mtCreeper, + mtDolphin, // Added in 1.13 + mtDonkey, // Added in 1.6 + mtDrowned, // Added in 1.13 + mtElderGuardian, // Added in 1.13 mtEnderDragon, mtEnderman, + mtEndermite, // Added in 1.8 + mtEvoker, // Added in 1.11 + mtFox, // Added in 1.14 mtGhast, mtGiant, mtGuardian, mtHorse, + mtHoglin, // Added in 1.16 + mtHusk, // Added in 1.10 + mtIllusioner, // Added in 1.12 mtIronGolem, + mtLlama, // Added in 1.11 mtMagmaCube, mtMooshroom, + mtMule, // Added in 1.6 mtOcelot, + mtPanda, // Added in 1.14 + mtParrot, // Added in 1.12 + mtPhantom, // Added in 1.13 mtPig, + mtPiglin, // Added in 1.16 + mtPiglinBrute, // Added in 1.16 + mtPillager, // Added in 1.14 + mtPolarBear, // Added in 1.10 + mtPufferfish, // Added in 1.13 mtRabbit, + mtRavager, // Added in 1.14 + mtSalmon, // Added in 1.13 mtSheep, + mtShulker, // Added in 1.9 mtSilverfish, mtSkeleton, + mtSkeletonHorse, mtSlime, mtSnowGolem, mtSpider, mtSquid, + mtStray, // Added in 1.10 + mtStrider, // Added in 1.16 + mtTraderLlama, // Added in 1.11 + mtTropicalFish, // Added in 1.13 + mtTurtle, // Added in 1.13 + mtVex, // Added in 1.11 mtVillager, + mtVindicator, // Added in 1.11 + mtWanderingTrader, // Added in 1.14 mtWitch, mtWither, mtWitherSkeleton, mtWolf, + mtZoglin, // Added in 1.16 mtZombie, - mtZombiePigman, + mtZombieHorse, // Added in 1.6 + mtZombifiedPiglin, mtZombieVillager, + + // Synonyms: + mtZombiePigman = mtZombifiedPiglin, } ; // tolua_end -- cgit v1.2.3