mirror of
https://github.com/SunsetMkt/Akebi-GC.git
synced 2025-09-20 04:26:01 +08:00
Merge branch 'master' into vacuum-change
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@ -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);
|
||||
|
@ -48,11 +48,13 @@ 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" };
|
||||
WhitelistFilter ItemDrops = { {EntityType__Enum_1::GatherObject, EntityType__Enum_1::DropItem }, {"_Food_BirdMeat", "_Food_Meat", "_DropItem","_Fishmeat" } };
|
||||
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" };
|
||||
SimpleFilter ShrineOfDepth = { EntityType__Enum_1::Gadget, "Temple" };
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
||||
}
|
||||
|
@ -55,7 +55,7 @@ namespace cheat::feature
|
||||
|
||||
if (f_InstantBow) {
|
||||
ImGui::Text("If Instant Bow Charge doesn't work:");
|
||||
TextURL("Please contribute to issue on GitHub.", "https://github.com/CallowBlack/genshin-cheat/issues/47", false, false);
|
||||
TextURL("Please contribute to issue on GitHub.", "https://github.com/Akebi-Group/Akebi-GC/issues/281", false, false);
|
||||
if (ImGui::TreeNode("Ability Log [DEBUG]"))
|
||||
{
|
||||
if (ImGui::Button("Copy to Clipboard"))
|
||||
|
Reference in New Issue
Block a user