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/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..781c30e 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_" }; @@ -518,15 +519,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..f5fa633 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; }