Merge pull request #290 from hellomykami/master

add golden apple archipelago interactive map data and conches to esp

cheat-library/cheat-library.vcxproj

@@ -206,6 +206,7 @@
     <None Include="res\map_enkanomiya.json" />
     <None Include="res\map_teyvat.json" />
     <None Include="res\map_undeground_mines.json" />
+    <None Include="res\map_golden_apple_archipelago.json" />
     <None Include="res\signatures.json" />
   </ItemGroup>
   <ItemGroup>
@@ -278,6 +279,7 @@
     <Image Include="res\iconsHD\Dendrobium.png" />
     <Image Include="res\iconsHD\DivdaRay.png" />
     <Image Include="res\iconsHD\Domain.png" />
+    <Image Include="res\iconsHD\EchoingConch.png" />
     <Image Include="res\iconsHD\EightStoneTablets.png" />
     <Image Include="res\iconsHD\ElectricConduction.png" />
     <Image Include="res\iconsHD\ElectroCrystal.png" />
@@ -333,6 +335,7 @@
     <Image Include="res\iconsHD\Horsetail.png" />
     <Image Include="res\iconsHD\HydroHypostasis.png" />
     <Image Include="res\iconsHD\Illusion.png" />
+    <Image Include="res\iconsHD\ImagingConch.png" />
     <Image Include="res\iconsHD\InazumaShrineofDepths.png" />
     <Image Include="res\iconsHD\IronChunk.png" />
     <Image Include="res\iconsHD\JadeChamber.png" />
@@ -561,6 +564,7 @@
     <Image Include="res\icons\Dendrobium.png" />
     <Image Include="res\icons\DivdaRay.png" />
     <Image Include="res\icons\Domain.png" />
+    <Image Include="res\icons\EchoingConch.png" />
     <Image Include="res\icons\EightStoneTablets.png" />
     <Image Include="res\icons\ElectricConduction.png" />
     <Image Include="res\icons\ElectroCrystal.png" />
@@ -616,6 +620,7 @@
     <Image Include="res\icons\Horsetail.png" />
     <Image Include="res\icons\HydroHypostasis.png" />
     <Image Include="res\icons\Illusion.png" />
+    <Image Include="res\icons\ImagingConch.png" />
     <Image Include="res\icons\InazumaShrineofDepths.png" />
     <Image Include="res\icons\IronChunk.png" />
     <Image Include="res\icons\JadeChamber.png" />

cheat-library/res/res.rc

@@ -62,6 +62,8 @@ MAPTEYVATDATA           RCDATA                  "map_teyvat.json"
 
 MAPUNDEGROUNDMINESDATA  RCDATA                  "map_undeground_mines.json"
 
+MAPGOLDENAPPLEARCHIPELAGODATA   RCDATA                  "map_golden_apple_archipelago.json"
+
 AssemblyChecksums       RCDATA                  "assembly_checksum.json"
 
 
@@ -206,6 +208,8 @@ HDDIVDARAY              PNG                     "iconsHD\\DivdaRay.png"
 
 HDDOMAIN                PNG                     "iconsHD\\Domain.png"
 
+HDECHOINGCONCH          PNG                     "iconsHD\\EchoingConch.png"
+
 HDEIGHTSTONETABLETS     PNG                     "iconsHD\\EightStoneTablets.png"
 
 HDELECTRICCONDUCTION    PNG                     "iconsHD\\ElectricConduction.png"
@@ -316,6 +320,8 @@ HDHYDROHYPOSTASIS       PNG                     "iconsHD\\HydroHypostasis.png"
 
 HDILLUSION              PNG                     "iconsHD\\Illusion.png"
 
+HDIMAGINGCONCH          PNG                     "iconsHD\\ImagingConch.png"
+
 HDINAZUMASHRINEOFDEPTHS PNG                     "iconsHD\\InazumaShrineofDepths.png"
 
 HDIRONCHUNK             PNG                     "iconsHD\\IronChunk.png"
@@ -776,6 +782,8 @@ DIVDARAY                PNG                     "icons\\DivdaRay.png"
 
 DOMAIN                  PNG                     "icons\\Domain.png"
 
+ECHOINGCONCH            PNG                     "icons\\EchoingConch.png"
+
 EIGHTSTONETABLETS       PNG                     "icons\\EightStoneTablets.png"
 
 ELECTRICCONDUCTION      PNG                     "icons\\ElectricConduction.png"
@@ -886,6 +894,8 @@ HYDROHYPOSTASIS         PNG                     "icons\\HydroHypostasis.png"
 
 ILLUSION                PNG                     "icons\\Illusion.png"
 
+IMAGINGCONCH            PNG                     "icons\\ImagingConch.png"
+
 INAZUMASHRINEOFDEPTHS   PNG                     "icons\\InazumaShrineofDepths.png"
 
 IRONCHUNK               PNG                     "icons\\IronChunk.png"

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

@@ -429,10 +429,12 @@ namespace cheat::feature
 
 		ADD_FILTER_FIELD(featured, Anemoculus);
 		ADD_FILTER_FIELD(featured, CrimsonAgate);
+		ADD_FILTER_FIELD(featured, EchoingConch);
 		ADD_FILTER_FIELD(featured, Electroculus);
 		ADD_FILTER_FIELD(featured, Electrogranum);
 		ADD_FILTER_FIELD(featured, FishingPoint);
 		ADD_FILTER_FIELD(featured, Geoculus);
+		ADD_FILTER_FIELD(featured, ImagingConch);
 		ADD_FILTER_FIELD(featured, ItemDrops);
 		ADD_FILTER_FIELD(featured, KeySigil);
 		ADD_FILTER_FIELD(featured, Lumenspar);

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

@@ -48,10 +48,12 @@ namespace cheat::game::filters
 	{
 		SimpleFilter Anemoculus = { EntityType__Enum_1::GatherObject, "WindCrystalShell" };
 		SimpleFilter CrimsonAgate = { EntityType__Enum_1::GatherObject, "Prop_Essence" };
+		SimpleFilter EchoingConch = { EntityType__Enum_1::EchoShell, "_Echoconch" };
 		SimpleFilter Electroculus = { EntityType__Enum_1::GatherObject, "Prop_ElectricCrystal" };
 		SimpleFilter Electrogranum = { EntityType__Enum_1::Gadget, "ThunderSeedCreate" };
 		SimpleFilter FishingPoint = { EntityType__Enum_1::FishPool, "_FishingShoal" };
 		SimpleFilter Geoculus = { EntityType__Enum_1::GatherObject, "RockCrystalShell" };
+		SimpleFilter ImagingConch = { EntityType__Enum_1::EchoShell, "_Dreamconch" };
 		WhitelistFilter ItemDrops = { {EntityType__Enum_1::GatherObject, EntityType__Enum_1::DropItem }, {"_Food_BirdMeat", "_Food_Meat", "_DropItem" } };
 		SimpleFilter Lumenspar = { EntityType__Enum_1::GatherObject, "CelestiaSplinter" };
 		SimpleFilter KeySigil = { EntityType__Enum_1::GatherObject, "RuneContent" };

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

@@ -48,10 +48,12 @@ namespace cheat::game::filters
 	{
 		extern SimpleFilter Anemoculus;
 		extern SimpleFilter CrimsonAgate;
+		extern SimpleFilter EchoingConch;
 		extern SimpleFilter Electroculus;
 		extern SimpleFilter Electrogranum;
 		extern SimpleFilter FishingPoint;
 		extern SimpleFilter Geoculus;
+		extern SimpleFilter ImagingConch;
 		extern WhitelistFilter ItemDrops;
 		extern SimpleFilter Lumenspar;
 		extern SimpleFilter KeySigil;

cheat-library/src/user/cheat/imap/InteractiveMap.cpp

@@ -1212,6 +1212,7 @@ namespace cheat::feature
         LoadSceneData(nlohmann::json::parse(ResourceLoader::Load("MapTeyvatData", RT_RCDATA)), 3);
         LoadSceneData(nlohmann::json::parse(ResourceLoader::Load("MapEnkanomiyaData", RT_RCDATA)), 5);
         LoadSceneData(nlohmann::json::parse(ResourceLoader::Load("MapUndegroundMinesData", RT_RCDATA)), 6);
+        LoadSceneData(nlohmann::json::parse(ResourceLoader::Load("MapGoldenAppleArchipelagoData", RT_RCDATA)), 9);
 
         LOG_INFO("Interactive map data loaded successfully.");
     }
@@ -1280,6 +1281,10 @@ namespace cheat::feature
 		APPLY_SCENE_OFFSETS(6,
 			"Medaka", -649.27f, 776.9f,
 			"SweetFlowerMedaka", -720.16f, 513.55f);
+
+    	APPLY_SCENE_OFFSETS(9,
+			"PaleRedCrab", -396.38f, -253.75f,
+			"GoldenCrab", 145.89f, 215.34f);
 #undef APPLY_SCENE_OFFSETS
 
 	}