diff --git a/cheat-library/cheat-library.vcxproj b/cheat-library/cheat-library.vcxproj index af6ba65..04f14df 100644 --- a/cheat-library/cheat-library.vcxproj +++ b/cheat-library/cheat-library.vcxproj @@ -21,6 +21,7 @@ + @@ -113,6 +114,7 @@ + @@ -219,6 +221,7 @@ + @@ -557,6 +560,7 @@ + diff --git a/cheat-library/cheat-library.vcxproj.filters b/cheat-library/cheat-library.vcxproj.filters index 7392f94..c949b36 100644 --- a/cheat-library/cheat-library.vcxproj.filters +++ b/cheat-library/cheat-library.vcxproj.filters @@ -252,6 +252,9 @@ Header Files + + Header Files + @@ -462,6 +465,9 @@ Source Files + + Source Files + @@ -2508,5 +2514,11 @@ Resource Files + + Resource Files + + + Resource Files + \ No newline at end of file diff --git a/cheat-library/res/icons/BookPage.png b/cheat-library/res/icons/BookPage.png new file mode 100644 index 0000000..c504ebe Binary files /dev/null and b/cheat-library/res/icons/BookPage.png differ diff --git a/cheat-library/res/iconsHD/BookPage.png b/cheat-library/res/iconsHD/BookPage.png new file mode 100644 index 0000000..d13b14f Binary files /dev/null and b/cheat-library/res/iconsHD/BookPage.png differ diff --git a/cheat-library/res/res.rc b/cheat-library/res/res.rc index 3b9e066..923ed0e 100644 --- a/cheat-library/res/res.rc +++ b/cheat-library/res/res.rc @@ -25,21 +25,21 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN - "resource.h\0" +"resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN - "#include ""winres.h""\r\n" - "\0" +"#include ""winres.h""\r\n" +"\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN - "\r\n" - "\0" +"\r\n" +"\0" END #endif // APSTUDIO_INVOKED @@ -140,6 +140,8 @@ HDBOAR PNG "iconsHD\\Boar.png" HDBOOK PNG "iconsHD\\Book.png" +HDBOOKPAGE PNG "iconsHD\\BookPage.png" + HDBOOTWEASEL PNG "iconsHD\\BootWeasel.png" HDBRIGHTCROWNPIGEON PNG "iconsHD\\BrightcrownPigeon.png" @@ -316,6 +318,8 @@ HDGEOGRANUM PNG "iconsHD\\Geogranum.png" HDGEOHYPOSTASIS PNG "iconsHD\\GeoHypostasis.png" +HDGEOPUZZLE PNG "iconsHD\\MiniPuzzle.png" + HDGEOSIGIL PNG "iconsHD\\GeoSigil.png" HDGEOVISHAP PNG "iconsHD\\Geovishap.png" @@ -626,7 +630,7 @@ HDSHOGUN PNG "iconsHD\\Shogun.png" HDSHOGUNATEINFANTRY PNG "iconsHD\\ShogunateInfantry.png" -HDSHRINEOFDEPTH PNG "iconsHD\\ShrineOfDepth.png" +HDSHRINEOFDEPTH PNG "iconsHD\\Mondstadt.png" HDSIGNORA PNG "iconsHD\\Signora.png" @@ -850,6 +854,8 @@ BOAR PNG "icons\\Boar.png" BOOK PNG "icons\\Book.png" +BOOKPAGE PNG "icons\\BookPage.png" + BOOTWEASEL PNG "icons\\BootWeasel.png" BRIGHTCROWNPIGEON PNG "icons\\BrightcrownPigeon.png" @@ -1026,6 +1032,8 @@ GEOGRANUM PNG "icons\\Geogranum.png" GEOHYPOSTASIS PNG "icons\\GeoHypostasis.png" +GEOPUZZLE PNG "icons\\MiniPuzzle.png" + GEOSIGIL PNG "icons\\GeoSigil.png" GEOVISHAP PNG "icons\\Geovishap.png" diff --git a/cheat-library/src/appdata/il2cpp-functions.h b/cheat-library/src/appdata/il2cpp-functions.h index f9ceaba..b40a760 100644 --- a/cheat-library/src/appdata/il2cpp-functions.h +++ b/cheat-library/src/appdata/il2cpp-functions.h @@ -344,6 +344,9 @@ DO_APP_FUNC(0x057E9D10, int32_t, Camera_get_pixelHeight, (Camera* __this, Method DO_APP_FUNC(0x0579EB70, int32_t, Screen_get_width, (MethodInfo* method)); DO_APP_FUNC(0x0579EB00, int32_t, Screen_get_height, (MethodInfo* method)); +DO_APP_FUNC(0x05822EE0, void, Animator_Play, (Animator* __this, String* stateName, int32_t layer, float normalizedTime, MethodInfo* method)); +DO_APP_FUNC(0x05823060, void, Animator_Rebind, (Animator* __this, MethodInfo* method)); +DO_APP_FUNC(0x058235C0, float, Animator_get_speed, (Animator* __this, MethodInfo* method)); DO_APP_FUNC(0x058236F0, void, Animator_set_speed, (Animator* __this, float value, MethodInfo* method)); DO_APP_FUNC(0x058AE2D0, bool, Behaviour_get_isActiveAndEnabled, (Behaviour* __this, MethodInfo* method)); diff --git a/cheat-library/src/user/cheat/cheat.cpp b/cheat-library/src/user/cheat/cheat.cpp index 5093d7f..1dbdcae 100644 --- a/cheat-library/src/user/cheat/cheat.cpp +++ b/cheat-library/src/user/cheat/cheat.cpp @@ -55,6 +55,7 @@ #include #include #include +#include #include "GenshinCM.h" @@ -122,7 +123,8 @@ namespace cheat FEAT_INST(Browser), FEAT_INST(EnablePeeking), FEAT_INST(TextureChanger), - FEAT_INST(FreeCamera) + FEAT_INST(FreeCamera), + FEAT_INST(AnimationChanger) }); #undef FEAT_INST diff --git a/cheat-library/src/user/cheat/esp/ESP.cpp b/cheat-library/src/user/cheat/esp/ESP.cpp index 98a8d30..43d5d0b 100644 --- a/cheat-library/src/user/cheat/esp/ESP.cpp +++ b/cheat-library/src/user/cheat/esp/ESP.cpp @@ -21,17 +21,17 @@ namespace cheat::feature ESP::ESP() : Feature(), NF(f_Enabled, "ESP", "ESP", false), - NF(f_DrawBoxMode, "Draw Mode", "ESP", DrawMode::Box), + NF(f_DrawBoxMode, "Draw Mode", "ESP", DrawMode::Box), NF(f_DrawTracerMode, "Tracer Mode", "ESP", DrawTracerMode::Line), - NF(f_Fill, "Fill Box/Rectangle/Arrows", "ESP", false), - NF(f_FillTransparency, "Fill Transparency", "ESP", 0.5f), + NF(f_Fill, "Fill Box/Rectangle/Arrows", "ESP", false), + NF(f_FillTransparency, "Fill Transparency", "ESP", 0.5f), NF(f_ArrowRadius, "Arrow Radius", "ESP", 100.0f), NF(f_OutlineThickness, "Outline Thickness", "ESP", 1.0f), NF(f_TracerSize, "Tracer Size", "ESP", 1.0f), NF(f_MiddleScreenTracer, "Middle Screen Tracer", "ESP", false), - NF(f_DrawDistance, "Draw Distance", "ESP", false), - NF(f_DrawName, "Draw Name", "ESP", false), + NF(f_DrawDistance, "Draw Distance", "ESP", false), + NF(f_DrawName, "Draw Name", "ESP", false), NF(f_FontSize, "Font Size", "ESP", 12.0f), NF(f_FontOutline, "Font outline", "ESP", true), @@ -69,7 +69,7 @@ namespace cheat::feature ConfigWidget(f_DrawBoxMode, "Select the mode of box drawing."); ConfigWidget(f_DrawTracerMode, "Select the mode of tracer drawing."); - + ConfigWidget(f_Fill); ConfigWidget(f_FillTransparency, 0.01f, 0.0f, 1.0f, "Transparency of filled part."); ConfigWidget(f_MiddleScreenTracer, "Draw tracer from middle part of the screen."); @@ -84,7 +84,7 @@ namespace cheat::feature } ImGui::EndGroupPanel(); } - + ImGui::Spacing(); ConfigWidget(f_DrawName, "Draw name of object."); ConfigWidget(f_DrawDistance, "Draw distance of object."); @@ -189,55 +189,55 @@ namespace cheat::feature //switch statement to determine how we will get name switch (count) { - case 3: + case 3: + { + j = 0; // j is the number of spaces before the name starts + pos1 = 0; + pos2 = 0; + for (int i = 0; i < name.length(); i++) { - j = 0; // j is the number of spaces before the name starts - pos1 = 0; - pos2 = 0; - for (int i = 0; i < name.length(); i++) + if (name[i] == '_') { - if (name[i] == '_') + j++; + if (j == 3) { - j++; - if (j == 3) - { - pos1 = i; - } - + pos1 = i; } - if (name[i] == '(') + + } + if (name[i] == '(') + { + pos2 = i; + break; + } + } + name = name.substr(pos1, pos2 - pos1); + } + case 4: + { + j = 0; // j is the number of spaces before the name starts + pos1 = 0; + pos2 = 0; + for (int i = 0; i < name.length(); i++) + { + if (name[i] == '_') + { + j++; + if (j == 3) + { + pos1 = i; + } + if (j == 4) { pos2 = i; break; } } - name = name.substr(pos1, pos2 - pos1); } - case 4: - { - j = 0; // j is the number of spaces before the name starts - pos1 = 0; - pos2 = 0; - for (int i = 0; i < name.length(); i++) - { - if (name[i] == '_') - { - j++; - if (j == 3) - { - pos1 = i; - } - if (j == 4) - { - pos2 = i; - break; - } - } - } - name = name.substr(pos1 + 1, pos2 - pos1 - 1); - } - default: - break; + name = name.substr(pos1 + 1, pos2 - pos1 - 1); + } + default: + break; } return; } @@ -574,12 +574,16 @@ namespace cheat::feature ADD_FILTER_FIELD(collection, WoodenCrate); ADD_FILTER_FIELD(collection, GeoSigil); + // Regular Chests ADD_FILTER_FIELD(chest, CommonChest); ADD_FILTER_FIELD(chest, ExquisiteChest); ADD_FILTER_FIELD(chest, PreciousChest); ADD_FILTER_FIELD(chest, LuxuriousChest); ADD_FILTER_FIELD(chest, RemarkableChest); + // Other Chests + ADD_FILTER_FIELD(chest, BuriedChest); ADD_FILTER_FIELD(chest, SearchPoint); + ADD_FILTER_FIELD(featured, Anemoculus); ADD_FILTER_FIELD(featured, CrimsonAgate); diff --git a/cheat-library/src/user/cheat/game/filters.cpp b/cheat-library/src/user/cheat/game/filters.cpp index 0827961..3c23e4f 100644 --- a/cheat-library/src/user/cheat/game/filters.cpp +++ b/cheat-library/src/user/cheat/game/filters.cpp @@ -32,6 +32,7 @@ namespace cheat::game::filters ChestFilter SFrozen = ChestFilter(Chest::ChestState::Frozen); ChestFilter SBramble = ChestFilter(Chest::ChestState::Bramble); ChestFilter STrap = ChestFilter(Chest::ChestState::Trap); + SimpleFilter BuriedChest = { EntityType__Enum_1::Field, "_WorldArea_Operator" }; } namespace equipment @@ -111,7 +112,7 @@ namespace cheat::game::filters SimpleFilter WeaselThief = { EntityType__Enum_1::Monster, "Thoarder_Weasel" }; SimpleFilter Kitsune = { EntityType__Enum_1::EnvAnimal, "Vulpes" }; SimpleFilter BakeDanuki = { EntityType__Enum_1::Monster, "Inu_Tanuki" }; - SimpleFilter Meat = { EntityType__Enum_1::GatherObject , { "_Food_BirdMeat", "_Food_Meat", "_Fishmeat" }}; + SimpleFilter Meat = { EntityType__Enum_1::GatherObject , { "_Food_BirdMeat", "_Food_Meat", "_Fishmeat" } }; } namespace mineral @@ -131,7 +132,7 @@ namespace cheat::game::filters SimpleFilter DunlinsTooth = { EntityType__Enum_1::GatherObject, "_DunlinsTooth" }; SimpleFilter AmethystLumpDrop = { EntityType__Enum_1::GatherObject, "_Thundercrystaldrop" }; - SimpleFilter CrystalChunkDrop = { EntityType__Enum_1::GatherObject,"_Drop_Crystal"}; + SimpleFilter CrystalChunkDrop = { EntityType__Enum_1::GatherObject,"_Drop_Crystal" }; SimpleFilter ElectroCrystalDrop = { EntityType__Enum_1::GatherObject, "_Drop_Ore_ElectricRock" }; SimpleFilter IronChunkDrop = { EntityType__Enum_1::GatherObject, "_Drop_Stone" }; SimpleFilter NoctilucousJadeDrop = { EntityType__Enum_1::GatherObject,"_NightBerth" }; @@ -161,7 +162,7 @@ namespace cheat::game::filters SimpleFilter RuinGrader = { EntityType__Enum_1::Monster, "_Konungmathr" }; SimpleFilter RuinSentinel = { EntityType__Enum_1::Monster, "_Apparatus_Enigma" }; SimpleFilter Samachurl = { EntityType__Enum_1::Monster, "_Shaman" }; - SimpleFilter ShadowyHusk = { EntityType__Enum_1::Monster, "ForlornVessel_Strong" }; + SimpleFilter ShadowyHusk = { EntityType__Enum_1::Monster, "ForlornVessel_Strong" }; SimpleFilter Slime = { EntityType__Enum_1::Monster, "_Slime" }; SimpleFilter FloatingFungus = { EntityType__Enum_1::Monster, "Fungus_Un_" }; SimpleFilter StretchyFungus = { EntityType__Enum_1::Monster, "Fungus_Deux_" }; @@ -221,7 +222,7 @@ namespace cheat::game::filters SimpleFilter JadeplumeTerrorshroom = { EntityType__Enum_1::Monster, "Fungus_Raptor" }; SimpleFilter RishbolandTiger = { EntityType__Enum_1::Monster, "_Megamoth_" }; SimpleFilter ShaggySumpterBeast = { EntityType__Enum_1::Monster, "_Panther" }; - SimpleFilter Spincrocodile = { EntityType__Enum_1::Monster, "_Gator" }; + SimpleFilter Spincrocodile = { EntityType__Enum_1::Monster, "_Gator" }; SimpleFilter SentryTurrets = { EntityType__Enum_1::Field, "SentryTurrets_" }; } @@ -285,7 +286,7 @@ namespace cheat::game::filters SimpleFilter AncientRime = { EntityType__Enum_1::Gadget, "_IceSolidBulk" }; SimpleFilter BakeDanuki = { EntityType__Enum_1::Monster, "Animal_Inu_Tanuki_" }; SimpleFilter BloattyFloatty = { EntityType__Enum_1::Field, "_Flower_PongPongTree_" }; - WhitelistFilter CubeDevices = { {EntityType__Enum_1::Gadget, EntityType__Enum_1::Platform }, {"_ElecStone", "_ElecSwitch" }}; + WhitelistFilter CubeDevices = { {EntityType__Enum_1::Gadget, EntityType__Enum_1::Platform }, {"_ElecStone", "_ElecSwitch" } }; SimpleFilter EightStoneTablets = { EntityType__Enum_1::Gadget, "_HistoryBoard" }; SimpleFilter ElectricConduction = { EntityType__Enum_1::Gear, "_ElectricPowerSource" }; SimpleFilter RelayStone = { EntityType__Enum_1::Worktop, "_ElectricTransfer_" }; @@ -346,6 +347,13 @@ namespace cheat::game::filters mineral::Starsilver, mineral::WhiteIronChunk }; + SimpleFilter PlantDestroy = { + //plant::SakuraBloom, + plant::DandelionSeed, + plant::MistFlowerCorolla, + plant::FlamingFlowerStamen + }; + WhitelistFilter Doodads = { EntityType__Enum_1::Gadget, { @@ -518,15 +526,15 @@ namespace cheat::game::filters monster::Whopperflower }; SimpleFilter MonsterEquips = { EntityType__Enum_1::MonsterEquip }; - BlacklistFilter Living = { - {EntityType__Enum_1::EnvAnimal, EntityType__Enum_1::Monster}, - { - // Environmental mobs - "Cat", "DogPrick", "Vulpues", "Inu_Tanuki", - // Overworld bosses - "Ningyo", "Regisvine", "Hypostasis", "Planelurker", "Nithhoggr" - } - }; + BlacklistFilter Living = { + {EntityType__Enum_1::EnvAnimal, EntityType__Enum_1::Monster}, + { + // Environmental mobs + "Cat", "DogPrick", "Vulpues", "Inu_Tanuki", + // Overworld bosses + "Ningyo", "Regisvine", "Hypostasis", "Planelurker", "Nithhoggr" + } + }; SimpleFilter OrganicTargets = { Monsters, Animals }; // Solael: Please don't mess around with this filter. //m0nkrel: We can choose the entities we need ourselves so as not to magnetize cats, dogs, etc. //AdvancedFilter Animals = { {EntityType__Enum_1::EnvAnimal, EntityType__Enum_1::Monster }, {"Crane", "Tit", "Boar", "Squirrel", "Fox", "Pigeon", "Wigeon", "Falcon" ,"Marten" } }; diff --git a/cheat-library/src/user/cheat/game/filters.h b/cheat-library/src/user/cheat/game/filters.h index 8a9f2a2..2edd84f 100644 --- a/cheat-library/src/user/cheat/game/filters.h +++ b/cheat-library/src/user/cheat/game/filters.h @@ -32,6 +32,8 @@ namespace cheat::game::filters extern ChestFilter SFrozen; extern ChestFilter SBramble; extern ChestFilter STrap; + + extern SimpleFilter BuriedChest; } namespace equipment @@ -220,7 +222,7 @@ namespace cheat::game::filters extern SimpleFilter Beisht; extern SimpleFilter RishbolandTiger; extern SimpleFilter ShaggySumpterBeast; - extern SimpleFilter Spincrocodile; + extern SimpleFilter Spincrocodile; extern SimpleFilter SentryTurrets; } @@ -325,6 +327,7 @@ namespace cheat::game::filters extern SimpleFilter Oculies; extern SimpleFilter Chests; extern SimpleFilter Ores; + extern SimpleFilter PlantDestroy; extern WhitelistFilter Doodads; extern SimpleFilter Animals; extern SimpleFilter AnimalDrop; diff --git a/cheat-library/src/user/cheat/teleport/CustomTeleports.cpp b/cheat-library/src/user/cheat/teleport/CustomTeleports.cpp index 8e6738f..e3d9984 100644 --- a/cheat-library/src/user/cheat/teleport/CustomTeleports.cpp +++ b/cheat-library/src/user/cheat/teleport/CustomTeleports.cpp @@ -17,10 +17,11 @@ namespace cheat::feature { CustomTeleports::CustomTeleports() : Feature(), - NF(f_DebugMode, "Debug Mode", "CustomTeleports", false), // Soon to be added NF(f_Enabled, "Custom Teleport", "CustomTeleports", false), NF(f_Next, "Teleport Next", "CustomTeleports", Hotkey(VK_OEM_6)), NF(f_Previous, "Teleport Previous", "CustomTeleports", Hotkey(VK_OEM_4)), + NF(f_Interpolate, "Custom Teleport", "CustomTeleports", false), + NF(f_Speed, "Interpolation Speed", "CustomTeleports", 10.0f), dir(util::GetCurrentPath() / "teleports") { f_Next.value().PressedEvent += MY_METHOD_HANDLER(CustomTeleports::OnNext); @@ -122,6 +123,42 @@ namespace cheat::feature return sqrt(pow(a.x - b.x, 2) + pow(a.y - b.y, 2) + pow(a.z - b.z, 2)); } + void CustomTeleports::TeleportTo(app::Vector3 position, bool interpolate) + { + auto &manager = game::EntityManager::instance(); + auto avatar = manager.avatar(); + if (avatar->moveComponent() == nullptr) + { + LOG_ERROR("Avatar has no move component, Is scene loaded?"); + return; + } + if (interpolate) + { + float speed = this->f_Speed; + auto avatarPos = manager.avatar()->absolutePosition(); + auto endPos = position; + std::thread interpolate([avatarPos, endPos, &manager, speed]() + { + float t = 0.0f; + app::Vector3 zero = {0,0,0}; + auto newPos = zero; + while (t < 1.0f) { + newPos = app::Vector3_Lerp(avatarPos, endPos, t, nullptr); + manager.avatar()->setAbsolutePosition(newPos); + t += speed / 100.0f; + Sleep(10); + } }); + interpolate.detach(); + } + else + { + if (PositionDistance(position, app::ActorUtils_GetAvatarPos(nullptr)) > 60.0f) + MapTeleport::GetInstance().TeleportTo(position); + else + manager.avatar()->setAbsolutePosition(position); + } + } + void CustomTeleports::OnTeleportKeyPressed(bool next) { if (!f_Enabled || selectedIndex < 0) @@ -138,13 +175,14 @@ namespace cheat::feature else { std::vector list(checkedIndices.begin(), checkedIndices.end()); - if (selectedIndex == list.back() ? next : selectedIndex == list.front()) + if (next ? selectedIndex == list.back() : selectedIndex == list.front()) return; + auto index = std::distance(list.begin(), std::find(list.begin(), list.end(), selectedIndex)); - position = Teleports.at(list.at(index + (next ? 1 : -1))).position; selectedIndex = list.at(index + (next ? 1 : -1)); + position = Teleports.at(selectedIndex).position; } - mapTeleport.TeleportTo(position); + TeleportTo(position, this->f_Interpolate); UpdateIndexName(); } @@ -157,38 +195,28 @@ namespace cheat::feature OnTeleportKeyPressed(true); } + void itr(std::regex exp, std::string name, std::string s) + { + std::sregex_iterator itr(name.begin(), name.end(), exp); + while (itr != std::sregex_iterator()) + { + for (unsigned i = 0; i < itr->size(); i++) + s.append((*itr)[i]); + itr++; + } + } void CustomTeleports::UpdateIndexName() { - std::string name(selectedIndex == -1 || checkedIndices.empty() ? "" : Teleports.at(selectedIndex).name); - // abbreviate teleport names that are too long + std::string name(selectedIndex == -1 || checkedIndices.empty() ? "" : Teleports.at(selectedIndex).name); if (name.length() > 15) { std::string shortened; std::regex numsExp("[\\d]+"); std::regex firstCharsExp("\\b[A-Za-z]"); - - std::sregex_iterator wordItr(name.begin(), name.end(), firstCharsExp); - while (wordItr != std::sregex_iterator()) - { - for (unsigned i = 0; i < wordItr->size(); i++) - { - shortened.append((*wordItr)[i]); - } - wordItr++; - } - - std::sregex_iterator numItr(name.begin(), name.end(), numsExp); - while (numItr != std::sregex_iterator()) - { - for (unsigned i = 0; i < numItr->size(); i++) - { - shortened.append(" "); - shortened.append((*numItr)[i]); - } - numItr++; - } + itr(firstCharsExp, name, shortened); + itr(numsExp, name, shortened); name = shortened; } selectedIndexName = name; @@ -249,7 +277,9 @@ namespace cheat::feature "3. You can now press Next or Previous Hotkey to Teleport through the Checklist\n" "Initially it will teleport the player to the selection made\n" "Note: Double click or click the arrow to open teleport details"); - ImGui::SameLine(); + ConfigWidget("Enable Interpolation", f_Interpolate, "Enable interpolation between teleports when using keybinds"); + ConfigWidget("Interpolation Speed", f_Speed, 0.1f, 0.1f, 99.0f, + "Interpolation speed.\n recommended setting below or equal to 0.1."); if (ImGui::Button("Delete Checked")) { @@ -281,8 +311,8 @@ namespace cheat::feature { std::sort(Teleports.begin(), Teleports.end(), [](const auto &a, const auto &b) { return StrCmpLogicalW(std::wstring(a.name.begin(), a.name.end()).c_str(), std::wstring(b.name.begin(), b.name.end()).c_str()) < 0; }); - bool allChecked = checkedIndices.size() == Teleports.size() && !Teleports.empty(); - bool allSearchChecked = checkedIndices.size() == searchIndices.size() && !searchIndices.empty(); + bool allSearchChecked = std::includes(checkedIndices.begin(), checkedIndices.end(), searchIndices.begin(), searchIndices.end()) && !searchIndices.empty(); + bool allChecked = (checkedIndices.size() == Teleports.size() && !Teleports.empty()) || allSearchChecked; ImGui::Checkbox("All", &allChecked); if (ImGui::IsItemClicked()) { @@ -316,11 +346,10 @@ namespace cheat::feature maxNameLength = Teleport.name.length(); ImGui::BeginTable("Teleports", 4, ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable | ImGuiTableFlags_NoSavedSettings); ImGui::TableSetupColumn("#", ImGuiTableColumnFlags_WidthFixed, 20); - ImGui::TableSetupColumn("Commands", ImGuiTableColumnFlags_WidthFixed, 100); + ImGui::TableSetupColumn("Commands", ImGuiTableColumnFlags_WidthFixed, 130); ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, maxNameLength * 8 + 10); ImGui::TableSetupColumn("Position"); ImGui::TableHeadersRow(); - ImGuiTreeNodeFlags nodeFlags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_SpanAvailWidth; for (const auto &[name, position, description] : Teleports) { @@ -332,12 +361,13 @@ namespace cheat::feature bool checked = std::any_of(checkedIndices.begin(), checkedIndices.end(), [&index](const auto &i) { return i == index; }); bool selected = index == selectedIndex; + std::string stringIndex = std::to_string(index); ImGui::TableNextRow(); ImGui::TableNextColumn(); ImGui::Text("%d", index); ImGui::TableNextColumn(); - ImGui::Checkbox(("##Index" + std::to_string(index)).c_str(), &checked); + ImGui::Checkbox(("##Index" + stringIndex).c_str(), &checked); if (ImGui::IsItemClicked(0)) { if (checked) @@ -352,37 +382,29 @@ namespace cheat::feature } ImGui::SameLine(); - if (ImGui::Button(("TP##Button" + std::to_string(index)).c_str())) + if (ImGui::Button(("TP##Button" + stringIndex).c_str())) { - auto &manager = game::EntityManager::instance(); - auto avatar = manager.avatar(); - if (avatar->moveComponent() == nullptr) - { - LOG_ERROR("Avatar has no move component, Is scene loaded?"); - return; - } - if (PositionDistance(position, app::ActorUtils_GetAvatarPos(nullptr)) > 60.0f) - MapTeleport::GetInstance().TeleportTo(position); - else - manager.avatar()->setAbsolutePosition(position); + TeleportTo(position, false); } ImGui::SameLine(); - if (ImGui::Button(("Select##Button" + std::to_string(index)).c_str())) + if (ImGui::Button(("Lerp##Button" + stringIndex).c_str())) + { + TeleportTo(position, true); + } + ImGui::SameLine(); + + if (ImGui::Button(("Select##Button" + stringIndex).c_str())) { selectedIndex = index; selectedByClick = true; UpdateIndexName(); } - ImGui::SameLine(); - ImGui::PushStyleColor(ImGuiCol_Text, selected ? IM_COL32(40, 90, 175, 255) : IM_COL32(255, 255, 255, 255)); - - if (selected) - nodeFlags |= ImGuiTreeNodeFlags_Selected; - ImGui::PopStyleColor(); ImGui::TableNextColumn(); + ImGui::PushStyleColor(ImGuiCol_Text, selected ? IM_COL32(40, 90, 175, 255) : ImGui::ColorConvertFloat4ToU32(ImGui::GetStyle().Colors[ImGuiCol_Text])); ImGui::Text("%s", name.c_str()); + ImGui::PopStyleColor(); if (ImGui::IsItemHovered()) { ImGui::BeginTooltip(); diff --git a/cheat-library/src/user/cheat/teleport/CustomTeleports.h b/cheat-library/src/user/cheat/teleport/CustomTeleports.h index e1fd414..6b2de3c 100644 --- a/cheat-library/src/user/cheat/teleport/CustomTeleports.h +++ b/cheat-library/src/user/cheat/teleport/CustomTeleports.h @@ -25,8 +25,9 @@ namespace cheat::feature class CustomTeleports : public Feature { public: - config::Field> f_DebugMode; config::Field> f_Enabled; + config::Field> f_Interpolate; + config::Field f_Speed; config::Field f_Next; config::Field f_Previous; static CustomTeleports& GetInstance(); @@ -55,6 +56,7 @@ namespace cheat::feature std::string selectedName; std::string selectedIndexName; CustomTeleports(); + void TeleportTo(app::Vector3 position, bool interpolate); void OnTeleportKeyPressed(bool next); void OnPrevious(); void OnNext(); diff --git a/cheat-library/src/user/cheat/visuals/AnimationChanger.cpp b/cheat-library/src/user/cheat/visuals/AnimationChanger.cpp new file mode 100644 index 0000000..37f36e0 --- /dev/null +++ b/cheat-library/src/user/cheat/visuals/AnimationChanger.cpp @@ -0,0 +1,301 @@ +#include "pch-il2cpp.h" +#include "AnimationChanger.h" + +#include +#include +#include +#include + +namespace cheat::feature +{ + static std::string animations[] = { + // All characters + "SlipFaceWall", + "SlipBackWall", + "DropDown", + "JumpOffWall", + "Jump", + "JumpForRun", + "JumpForWalk", + "Fly", + "FlyStart", + "JumpForSprint", + "SwimIdle", + "SwimMove", + "SwimDash", + "ClimbMove1", + "ClimbIdle", + "ClimbJump", + "ClimbMove0", + "FallToGroundRun", + "FallOnGroundLit", + "FallOnGround", + "FallToGroundRunHard", + "FallToGroundSprint", + "Walk", + "Run", + "Standby", + "RunToIdle", + "RunToWalk", + "WalkToIdle", + "WalkToRun", + "Sprint", + "SprintToIdle", + "SprintToRun", + "ClimbDownToGround", + "SprintBS", + "ShowUp", + "CrouchToStandby", + "CrouchIdle", + "CrouchRoll", + "CrouchMove", + "SkiffNormal", + "Upstairs", + "JumpUpWallForStandby", + "JumpUpWallReady", + "Standby2ClimbA", + "SwimJump", + "SwimJumpDrop", + "SwimJumpToWater", + "Standby2ClimbB", + "CrouchDrop", + "TurnDir", + "StandbyWeapon", + "StandbyPutaway", + "StandbyPutawayOver", + "Icespine_Out", + "Icespine", + "LiquidStrike_MoveStandby", + "LiquidStrike_AS", + "LiquidStrike_BS", + "LiquidStrike_BS1", + "LiquidStrike_Move", + "LiquidStrike_Strike", + "LiquidStrike_FatalStandby", + "LiquidStrike_FatalMove", + "LiquidStrike_AS_OnWater", + "LiquidStrike_BS_0", + "FrozenWindmill", + "FrozenWindmill_AS", + "Attack03", + "Attack04", + "Attack05", + "Attack01", + "Attack02", + "ExtraAttack", + "ExtraAttack_AS", + "FallingAnthem_Loop", + "FallingAnthem_AS_2", + "FallingAnthem_BS_1", + "FallingAnthem_BS_2", + "FallingAnthem_AS_1", + "FallingAnthem_Loop_Low", + "SitBDown", + "SitBLoop", + "SitBUp", + "SitDown", + "SitLoop", + "SitUp", + "StandbyShow_01", + "StandbyShow_02", + "StandbyVoice", + "Think01BS", + "Think01Loop", + "Think01AS", + "Akimbo02BS", + "Akimbo02Loop", + "Akimbo02AS", + "ChannelBS", + "ChannelLoop", + "ChannelAS", + "PlayMusic_Lyre_AS", + "PlayMusic_Lyre_BS", + "PlayMusic_Lyre_Loop", + "PlayMusic_Qin_BS", + "PlayMusic_Qin_AS", + "PlayMusic_Qin_Loop", + "ActivitySkill_ElectricCoreFly", + "Hit_H", + "Hit_L", + "Hit_Throw", + "Hit_Throw_Ground", + "Hit_ThrowAir", + "Struggle", + "NormalDie", + "SwimDie", + "HitGroundDie", + "FallDie_AS", + "FallDie", + // Main Character only + "UziExplode_AS", + "UziExplode_BS", + "UziExplode_Charge_01", + "UziExplode_Strike_02", + "UziExplode_Charge_02", + "UziExplode_Strike_01", + "UziExplode_BS_1", + "WindBreathe_AS", + "WindBreathe", + "Hogyoku_AS", + "Hogyoku_BS", + "Hogyoku", + "Hogyoku_Charge", + "Hogyoku_Charge_AS", + "Hogyoku_Charge_2", + "RockTide_AS", + "RockTide", + "CrouchThrowBS", + "CrouchThrowLoop", + "CrouchThrowAS", + "FindCatThrowBS", + "FindCatThrowLoop", + "FindCatThrowAS", + "Player_Electric_ElementalArt", + "Player_Electric_ElementalArt_AS", + "Player_Electric_ElementalBurst", + "Player_Electric_ElementalBurst_AS", + "PutHand01BS", + "PutHand01Loop", + "PutHand01AS", + "Akimbo01BS", + "Backrake01BS", + "Forerake01BS", + "StrikeChest01BS", + "Akimbo01Loop", + "Akimbo01AS", + "Backrake01Loop", + "Backrake01AS", + "Forerake01Loop", + "Forerake01AS", + "StrikeChest01Loop", + "StrikeChest01AS", + "HoldHead01BS", + "HoldHead01Loop", + "HoldHead01AS", + "Clap01", + "Turn01_90LBS", + "Turn01_90RBS", + "Turn01_90LAS", + "Turn01_90RAS", + "Alert01BS", + "Alert01Loop", + "Alert01AS", + "Fishing01_BS", + "Fishing01Loop", + "Fishing01AS", + "Think01_BS", + "Think01_Loop", + "Think01_AS", + "Channel01BS", + "Channel01Loop", + "Channel01AS", + "Fishing_Battle_BS", + "Fishing_Cast_AS", + "Fishing_Cast_BS", + "Fishing_Cast_Loop", + "Fishing_Choose", + "Fishing_Choose_Loop", + "Fishing_End", + "Fishing_Pull_01", + "Fishing_Pull_02", + "Fishing_Wait", + "Fishing_Pull_Fail", + "Bartender_MixingStandby", + "Bartender_MixingStart", + "Bartender_MixingToPour", + "Bartender_Pour", + "Bartender_PourFinish", + "Bartender_PourStandby", + "Bartender_AddLoop", + "Bartender_PrepareStart", + "Bartender_Standby", + "Bartender_AddStandby", + "Bartender_PrepareToStandby", + "Bartender_StandbyFinish", + "Blocking_BS", + "Blocking_Loop", + "Blocking_Back", + "Blocking_Bounce", + "Blocking_Hit", + "Blocking_AS" + }; + + AnimationChanger::AnimationChanger() : Feature(), + NF(f_Enabled, "Animation Changer", "Visuals::AnimationChanger", false), + NF(f_Animation, "Animation", "Visuals::AnimationChanger", "ExtraAttack"), + NF(f_ApplyKey, "Apply Animation", "Visuals::AnimationChanger", Hotkey('Y')), + NF(f_ResetKey, "Reset Animation", "Visuals::AnimationChanger", Hotkey('R')) + { + events::GameUpdateEvent += MY_METHOD_HANDLER(AnimationChanger::OnGameUpdate); + } + + const FeatureGUIInfo& AnimationChanger::GetGUIInfo() const + { + static const FeatureGUIInfo info{ "AnimationChanger", "Visuals", false }; + return info; + } + + void AnimationChanger::DrawMain() + { + ImGui::BeginGroupPanel("Animation Changer"); + { + ConfigWidget(f_Enabled, "Changes active character's animation.\nNot all animations work for every character except Main Character."); + if (f_Enabled) + { + if (ImGui::BeginCombo("Animations", f_Animation.value().c_str())) + { + for (auto &animation : animations) + { + bool is_selected = (f_Animation.value().c_str() == animation); + if (ImGui::Selectable(animation.c_str(), is_selected)) + f_Animation.value() = animation; + + if (is_selected) + ImGui::SetItemDefaultFocus(); + } + ImGui::EndCombo(); + } + + ConfigWidget("Apply Key", f_ApplyKey, true); + ConfigWidget("Reset Key", f_ResetKey, true); + } + } + ImGui::EndGroupPanel(); + } + + bool AnimationChanger::NeedStatusDraw() const + { + return f_Enabled; + } + + void AnimationChanger::DrawStatus() + { + ImGui::Text("AnimationChanger"); + } + + AnimationChanger& AnimationChanger::GetInstance() + { + static AnimationChanger instance; + return instance; + } + + void AnimationChanger::OnGameUpdate() + { + if (!f_Enabled) + return; + + // Taiga#5555: Maybe need to add separate option to change delay value if user feels like it's too fast or slow. + UPDATE_DELAY(400); + + auto& manager = game::EntityManager::instance(); + auto avatar = manager.avatar(); + if (avatar->animator() == nullptr) + return; + + if (f_ApplyKey.value().IsPressed()) + app::Animator_Play(avatar->animator(), string_to_il2cppi(f_Animation.value().c_str()), 0, 0, nullptr); + + if (f_ResetKey.value().IsPressed()) + app::Animator_Rebind(avatar->animator(), nullptr); + } +} diff --git a/cheat-library/src/user/cheat/visuals/AnimationChanger.h b/cheat-library/src/user/cheat/visuals/AnimationChanger.h new file mode 100644 index 0000000..b8f9d0c --- /dev/null +++ b/cheat-library/src/user/cheat/visuals/AnimationChanger.h @@ -0,0 +1,27 @@ +#pragma once +#include +#include + +namespace cheat::feature +{ + + class AnimationChanger : public Feature + { + public: + config::Field> f_Enabled; + config::Field f_Animation; + config::Field f_ApplyKey; + config::Field f_ResetKey; + + const FeatureGUIInfo& GetGUIInfo() const override; + void DrawMain() override; + virtual bool NeedStatusDraw() const override; + void DrawStatus() override; + static AnimationChanger& GetInstance(); + void OnGameUpdate(); + + private: + AnimationChanger(); + }; +} + diff --git a/cheat-library/src/user/cheat/world/AutoDestroy.cpp b/cheat-library/src/user/cheat/world/AutoDestroy.cpp index 65d26a3..757d7d1 100644 --- a/cheat-library/src/user/cheat/world/AutoDestroy.cpp +++ b/cheat-library/src/user/cheat/world/AutoDestroy.cpp @@ -18,6 +18,7 @@ namespace cheat::feature NF(f_DestroyOres, "Destroy Ores", "AutoDestroy", false), NF(f_DestroyShields, "Destroy Shields", "AutoDestroy", false), NF(f_DestroyDoodads, "Destroy Doodads", "AutoDestroy", false), + NF(f_DestroyPlants, "Destroy Plants", "AutoDestroy", false), NF(f_Range, "Range", "AutoDestroy", 10.0f) { HookManager::install(app::MoleMole_LCAbilityElement_ReduceModifierDurability, LCAbilityElement_ReduceModifierDurability_Hook); @@ -43,6 +44,7 @@ namespace cheat::feature ConfigWidget("Doodads", f_DestroyDoodads, "Barrels, boxes, vases, etc."); ImGui::SameLine(); ImGui::TextColored(ImColor(255, 165, 0, 255), "Extremely risky!"); + ConfigWidget("Plants", f_DestroyPlants, "Dandelion Seeds, Sakura Bloom, etc."); ImGui::Unindent(); ConfigWidget("Range (m)", f_Range, 0.1f, 1.0f, 15.0f); } @@ -54,12 +56,13 @@ namespace cheat::feature void AutoDestroy::DrawStatus() { - ImGui::Text("Destroy [%.01fm%s%s%s%s]", + ImGui::Text("Destroy [%.01fm%s%s%s%s%s]", f_Range.value(), - f_DestroyOres || f_DestroyShields || f_DestroyDoodads ? "|" : "", + f_DestroyOres || f_DestroyShields || f_DestroyDoodads || f_DestroyPlants ? "|" : "", f_DestroyOres ? "O" : "", f_DestroyShields ? "S" : "", - f_DestroyDoodads ? "D" : ""); + f_DestroyDoodads ? "D" : "", + f_DestroyPlants ? "P" : ""); } AutoDestroy& AutoDestroy::GetInstance() @@ -82,12 +85,13 @@ namespace cheat::feature if (autoDestroy.f_Enabled && autoDestroy.f_Range > manager.avatar()->distance(entity) && ( - (autoDestroy.f_DestroyOres && game::filters::combined::Ores.IsValid(manager.entity(entity))) || - (autoDestroy.f_DestroyDoodads && game::filters::combined::Doodads.IsValid(manager.entity(entity))) || + (autoDestroy.f_DestroyOres && game::filters::combined::Ores.IsValid(manager.entity(entity))) || + (autoDestroy.f_DestroyDoodads && (game::filters::combined::Doodads.IsValid(manager.entity(entity)) || game::filters::chest::SBramble.IsValid(manager.entity(entity)))) || (autoDestroy.f_DestroyShields && !game::filters::combined::MonsterBosses.IsValid(manager.entity(entity)) && ( game::filters::combined::MonsterShielded.IsValid(manager.entity(entity)) || // For shields attached to monsters, e.g. abyss mage shields. - game::filters::combined::MonsterEquips.IsValid(manager.entity(entity)) // For shields/weapons equipped by monsters, e.g. rock shield. - )) + game::filters::combined::MonsterEquips.IsValid(manager.entity(entity)) || // For shields/weapons equipped by monsters, e.g. rock shield. + (autoDestroy.f_DestroyPlants && game::filters::combined::PlantDestroy.IsValid(manager.entity(entity))) // For plants e.g dandelion seeds. + )) ) ) { diff --git a/cheat-library/src/user/cheat/world/AutoDestroy.h b/cheat-library/src/user/cheat/world/AutoDestroy.h index 14e0985..d4c47a0 100644 --- a/cheat-library/src/user/cheat/world/AutoDestroy.h +++ b/cheat-library/src/user/cheat/world/AutoDestroy.h @@ -12,6 +12,7 @@ namespace cheat::feature config::Field> f_DestroyOres; config::Field> f_DestroyShields; config::Field> f_DestroyDoodads; + config::Field> f_DestroyPlants; config::Field f_Range; static AutoDestroy& GetInstance(); diff --git a/cheat-library/src/user/cheat/world/FreezeEnemies.cpp b/cheat-library/src/user/cheat/world/FreezeEnemies.cpp index a9d8bed..183b4d1 100644 --- a/cheat-library/src/user/cheat/world/FreezeEnemies.cpp +++ b/cheat-library/src/user/cheat/world/FreezeEnemies.cpp @@ -47,6 +47,7 @@ namespace cheat::feature void FreezeEnemies::OnGameUpdate() { auto& manager = game::EntityManager::instance(); + static bool change = false; for (const auto& monster : manager.entities(game::filters::combined::Monsters)) { @@ -61,11 +62,16 @@ namespace cheat::feature //LOG_DEBUG("%s", magic_enum::enum_name(constraints).data()); app::Rigidbody_set_constraints(rigidBody, app::RigidbodyConstraints__Enum::FreezeAll, nullptr); app::Animator_set_speed(animator, 0.f, nullptr); + change = false; } else { app::Rigidbody_set_constraints(rigidBody, app::RigidbodyConstraints__Enum::FreezeRotation, nullptr); - app::Animator_set_speed(animator, 1.f, nullptr); + if (!change) + { + app::Animator_set_speed(animator, 1.f, nullptr); + change = true; + } } } }