Merge pull request #365 from FawazTakhji/master

Add GAA puzzles to ESP

cheat-library/res/res.rc

@@ -768,6 +768,16 @@ HDYUMEMIRUWOOD          PNG                     "iconsHD\\YumemiruWood.png"
 
 HDZAYTUNPEACH           PNG                     "iconsHD\\ZaytunPeach.png"
 
+HDMELODICBLOOM          PNG                     "iconsHD\\MelodicBloom.png"
+
+HDCLOUDLEISURESTEPS     PNG                     "iconsHD\\CloudleisureSteps.png"
+
+HDDREAMFORM             PNG                     "iconsHD\\DreamForm.png"
+
+HDSTARLIGHTCOALESCENCE  PNG                     "iconsHD\\StarlightCoalescence.png"
+
+HDTHERAVENFORUM         PNG                     "iconsHD\\TheRavenForum.png"
+
 ABIDINGANGELFISH        PNG                     "icons\\AbidingAngelfish.png"
 
 ABYSSMAGE               PNG                     "icons\\AbyssMage.png"
@@ -1470,6 +1480,15 @@ YUMEMIRUWOOD            PNG                     "icons\\YumemiruWood.png"
 
 ZAYTUNPEACH             PNG                     "icons\\ZaytunPeach.png"
 
+MELODICBLOOM            PNG                     "icons\\MelodicBloom.png"
+
+CLOUDLEISURESTEPS       PNG                     "icons\\CloudleisureSteps.png"
+
+DREAMFORM               PNG                     "icons\\DreamForm.png"
+
+STARLIGHTCOALESCENCE    PNG                     "icons\\StarlightCoalescence.png"
+
+THERAVENFORUM           PNG                     "icons\\TheRavenForum.png"
 
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////

cheat-library/src/user/cheat/esp/ESP.cpp

@@ -822,6 +822,11 @@ namespace cheat::feature
 		ADD_FILTER_FIELD(puzzle, UniqueRocks);
 		ADD_FILTER_FIELD(puzzle, WarmingSeelie);
 		ADD_FILTER_FIELD(puzzle, WindmillMechanism);
+		ADD_FILTER_FIELD(puzzle, MelodicBloom);
+		ADD_FILTER_FIELD(puzzle, CloudleisureSteps);
+		ADD_FILTER_FIELD(puzzle, DreamForm);
+		ADD_FILTER_FIELD(puzzle, StarlightCoalescence);
+		ADD_FILTER_FIELD(puzzle, TheRavenForum);
 	}
 #undef ADD_FILTER_FIELD
 }

cheat-library/src/user/cheat/game/filters.cpp

@@ -313,6 +313,12 @@ namespace cheat::game::filters
 		SimpleFilter UniqueRocks = { EntityType__Enum_1::Gadget, "_Chalcedony" };
 		SimpleFilter WarmingSeelie = { EntityType__Enum_1::Platform, "_FireSeelie" };
 		SimpleFilter WindmillMechanism = { EntityType__Enum_1::Gear, "Gear_Windmill" };
+		WhitelistFilter MelodicBloom = { {EntityType__Enum_1::Worktop, EntityType__Enum_1::Gadget }, {"_TransferFlowerSmall", "_NotePlant" } };
+		SimpleFilter CloudleisureSteps = { EntityType__Enum_1::Field, "_CloudPlatform" };
+		WhitelistFilter DreamForm = { {EntityType__Enum_1::Field, EntityType__Enum_1::Platform }, "_AnimalSeelie" };
+		SimpleFilter StarlightCoalescence = { EntityType__Enum_1::Field, "_PaperStar" };
+		SimpleFilter TheRavenForum = { EntityType__Enum_1::Gadget, "_NightCrowStatue" };
+
 	}
 
 	namespace combined

cheat-library/src/user/cheat/game/filters.h

@@ -284,7 +284,6 @@ namespace cheat::game::filters
 		extern SimpleFilter BakeDanuki;
 		extern SimpleFilter BloattyFloatty;
 		extern WhitelistFilter CubeDevices;
-
 		extern SimpleFilter EightStoneTablets;
 		extern SimpleFilter ElectricConduction;
 		extern SimpleFilter RelayStone;
@@ -313,6 +312,11 @@ namespace cheat::game::filters
 		extern SimpleFilter UniqueRocks;
 		extern SimpleFilter WarmingSeelie;
 		extern SimpleFilter WindmillMechanism;
+		extern WhitelistFilter MelodicBloom;
+		extern SimpleFilter CloudleisureSteps;
+		extern WhitelistFilter DreamForm;
+		extern SimpleFilter StarlightCoalescence;
+		extern SimpleFilter TheRavenForum;
 	}
 
 	namespace combined