Skip to content

Commit

Permalink
Merge branch 'Akebi-Group:master' into thwemes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Shichiha
Shichiha authored Aug 6, 2022
2 parents 30d5567 + 3279660 commit df702b9
Show file tree
Hide file tree
Showing 17 changed files with 567 additions and 161 deletions.
4 changes: 4 additions & 0 deletions cheat-library/cheat-library.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<ClInclude Include="src\user\cheat\misc\sniffer\pipe\PipeClient.h" />
<ClInclude Include="src\user\cheat\misc\sniffer\pipe\PipeIO.h" />
<ClInclude Include="src\user\cheat\player\AutoRun.h" />
<ClInclude Include="src\user\cheat\visuals\AnimationChanger.h" />
<ClInclude Include="src\user\cheat\visuals\TextureChanger.h" />
<ClInclude Include="src\user\cheat\visuals\FreeCamera.h" />
<ClInclude Include="src\user\cheat\world\AutoSeelie.h" />
Expand Down Expand Up @@ -113,6 +114,7 @@
<ClCompile Include="src\user\cheat\misc\sniffer\pipe\PipeClient.cpp" />
<ClCompile Include="src\user\cheat\misc\sniffer\pipe\PipeIO.cpp" />
<ClCompile Include="src\user\cheat\player\AutoRun.cpp" />
<ClCompile Include="src\user\cheat\visuals\AnimationChanger.cpp" />
<ClCompile Include="src\user\cheat\visuals\TextureChanger.cpp" />
<ClCompile Include="src\user\cheat\visuals\FreeCamera.cpp" />
<ClCompile Include="src\user\cheat\world\AutoSeelie.cpp" />
Expand Down Expand Up @@ -219,6 +221,7 @@
<Image Include="res\iconsHD\Andrius.png" />
<Image Include="res\iconsHD\Azhdaha.png" />
<Image Include="res\iconsHD\Boar.png" />
<Image Include="res\iconsHD\BookPage.png" />
<Image Include="res\iconsHD\Cat.png" />
<Image Include="res\iconsHD\Cicin.png" />
<Image Include="res\iconsHD\Crane.png" />
Expand Down Expand Up @@ -557,6 +560,7 @@
<Image Include="res\icons\Andrius.png" />
<Image Include="res\icons\Azhdaha.png" />
<Image Include="res\icons\Boar.png" />
<Image Include="res\icons\BookPage.png" />
<Image Include="res\icons\Cat.png" />
<Image Include="res\icons\Cicin.png" />
<Image Include="res\icons\Crane.png" />
Expand Down
12 changes: 12 additions & 0 deletions cheat-library/cheat-library.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@
<ClInclude Include="src\user\cheat\world\CustomWeather.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\user\cheat\visuals\AnimationChanger.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Font Include="res\Ruda-Bold.ttf" />
Expand Down Expand Up @@ -462,6 +465,9 @@
<ClCompile Include="src\user\cheat\world\CustomWeather.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\user\cheat\visuals\AnimationChanger.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\res.rc">
Expand Down Expand Up @@ -2508,5 +2514,11 @@
<Image Include="res\icons\Spincrocodile.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\BookPage.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\BookPage.png">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
</Project>
Binary file added cheat-library/res/icons/BookPage.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cheat-library/res/iconsHD/BookPage.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 17 additions & 9 deletions cheat-library/res/res.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions cheat-library/src/appdata/il2cpp-functions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
4 changes: 3 additions & 1 deletion cheat-library/src/user/cheat/cheat.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#include <cheat/visuals/EnablePeeking.h>
#include <cheat/visuals/TextureChanger.h>
#include <cheat/visuals/FreeCamera.h>
#include <cheat/visuals/AnimationChanger.h>

#include "GenshinCM.h"

Expand Down Expand Up @@ -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
Expand Down
92 changes: 48 additions & 44 deletions cheat-library/src/user/cheat/esp/ESP.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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.");
Expand All @@ -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.");
Expand Down Expand Up @@ -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;
}

}
if (name[i] == '(')
{
pos2 = i;
break;
pos1 = i;
}

}
if (name[i] == '(')
{
pos2 = i;
break;
}
name = name.substr(pos1, pos2 - pos1);
}
case 4:
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++)
{
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)
{
pos1 = i;
}
if (j == 4)
{
j++;
if (j == 3)
{
pos1 = i;
}
if (j == 4)
{
pos2 = i;
break;
}
pos2 = i;
break;
}
}
name = name.substr(pos1 + 1, pos2 - pos1 - 1);
}
default:
break;
name = name.substr(pos1 + 1, pos2 - pos1 - 1);
}
default:
break;
}
return;
}
Expand Down Expand Up @@ -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);
Expand Down
Loading

0 comments on commit df702b9

Please sign in to comment.