Merge branch 'Akebi-Group:master' into master

This commit is contained in:
lunatic 2022-08-27 00:52:05 +07:00 committed by GitHub
commit ccae1b00c4
7 changed files with 90 additions and 4 deletions

View File

@ -102,6 +102,7 @@
<ClInclude Include="src\user\cheat\world\FreezeEnemies.h" />
<ClInclude Include="src\user\cheat\world\KillAura.h" />
<ClInclude Include="src\user\cheat\world\MobVacuum.h" />
<ClInclude Include="src\user\cheat\world\OpenTeamImmediately.h" />
<ClInclude Include="src\user\cheat\world\VacuumLoot.h" />
<ClInclude Include="src\user\main.h" />
</ItemGroup>
@ -194,6 +195,7 @@
<ClCompile Include="src\user\cheat\world\FreezeEnemies.cpp" />
<ClCompile Include="src\user\cheat\world\KillAura.cpp" />
<ClCompile Include="src\user\cheat\world\MobVacuum.cpp" />
<ClCompile Include="src\user\cheat\world\OpenTeamImmediately.cpp" />
<ClCompile Include="src\user\cheat\world\VacuumLoot.cpp" />
<ClCompile Include="src\user\main.cpp" />
</ItemGroup>

View File

@ -261,6 +261,9 @@
<ClInclude Include="src\user\cheat\world\AutoChallenge.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\user\cheat\world\OpenTeamImmediately.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Font Include="res\Ruda-Bold.ttf" />
@ -480,6 +483,9 @@
<ClCompile Include="src\user\cheat\world\AutoChallenge.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\user\cheat\world\OpenTeamImmediately.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\res.rc">

View File

@ -44,6 +44,7 @@
#include <cheat/world/AutoCook.h>
#include <cheat/world/AutoChallenge.h>
#include <cheat/world/CustomWeather.h>
#include <cheat/world/OpenTeamImmediately.h>
#include <cheat/visuals/NoFog.h>
#include <cheat/visuals/FPSUnlock.h>
@ -94,6 +95,7 @@ namespace cheat
FEAT_INST(AutoTreeFarm),
FEAT_INST(AutoDestroy),
FEAT_INST(AutoSeelie),
FEAT_INST(OpenTeamImmediately),
FEAT_INST(VacuumLoot),
FEAT_INST(DialogSkip),
FEAT_INST(DumbEnemies),

View File

@ -225,8 +225,8 @@ namespace cheat::game::filters
SimpleFilter Cicin = { EntityType__Enum_1::Monster, "_Cicin" };
SimpleFilter Beisht = { EntityType__Enum_1::Monster, "_Eldritch" };
SimpleFilter JadeplumeTerrorshroom = { EntityType__Enum_1::Monster, "Fungus_Raptor" };
SimpleFilter RishbolandTiger = { EntityType__Enum_1::Monster, "_Megamoth_" };
SimpleFilter ShaggySumpterBeast = { EntityType__Enum_1::Monster, "_Panther" };
SimpleFilter RishbolandTiger = { EntityType__Enum_1::Monster, "_Panther" };
SimpleFilter ShaggySumpterBeast = { EntityType__Enum_1::Monster, "_Megamoth_" };
SimpleFilter Spincrocodile = { EntityType__Enum_1::Monster, "_Gator" };
SimpleFilter SentryTurrets = { EntityType__Enum_1::Field, "SentryTurrets_" };
}
@ -310,7 +310,7 @@ namespace cheat::game::filters
SimpleFilter PirateHelm = { EntityType__Enum_1::Field, "_PirateHelm" };
WhitelistFilter PressurePlate = { {EntityType__Enum_1::Field, EntityType__Enum_1::Gadget }, {"Gear_Gravity", "_LitPathPlate" } };
SimpleFilter SealLocations = { EntityType__Enum_1::Gadget, "_RunesKey" };
SimpleFilter SeelieLamp = { EntityType__Enum_1::Field, "Gear_SeeliaLamp" };
SimpleFilter SeelieLamp = { EntityType__Enum_1::Field, {"Gear_SeeliaLamp", "LifeSeelieBase"} };
SimpleFilter Seelie = { EntityType__Enum_1::Platform, "Gear_Seelie" };
SimpleFilter SmallRockPile = { EntityType__Enum_1::Gadget, "_StonePile_01" };
SimpleFilter StormBarrier = { EntityType__Enum_1::Field, "_WindField_PushField" };

View File

@ -59,7 +59,7 @@ namespace cheat::feature
auto distance = manager.avatar()->distance(entity);
float radius = 100.0f;
if (entity->name().find("Seelie") != std::string::npos)
if (entity->name().find("_Seelie") != std::string::npos)
{
if (entity->name().find("ElectricSeelie") != std::string::npos)
{

View File

@ -0,0 +1,52 @@
#include "pch-il2cpp.h"
#include "OpenTeamImmediately.h"
#include <helpers.h>
namespace cheat::feature
{
static bool MoleMole_InLevelMainPageContext_DoTeamCountDown_c_Iterator0__MoveNext_Hook(app::InLevelMainPageContext_DoTeamCountDown_Iterator* __this, MethodInfo* method);
OpenTeamImmediately::OpenTeamImmediately() : Feature(),
NF(f_Enabled, "Enable Open Team Immediately", "Open Team", false)
{
HookManager::install(app::MoleMole_InLevelMainPageContext_DoTeamCountDown_c_Iterator0__MoveNext, MoleMole_InLevelMainPageContext_DoTeamCountDown_c_Iterator0__MoveNext_Hook);
}
const FeatureGUIInfo& OpenTeamImmediately::GetGUIInfo() const
{
static const FeatureGUIInfo info{ "", "World", false };
return info;
}
void OpenTeamImmediately::DrawMain()
{
ConfigWidget("Open Team Immediately", f_Enabled, "Open team immediately without waiting for count down.");
}
bool OpenTeamImmediately::NeedStatusDraw() const
{
return f_Enabled;
}
void OpenTeamImmediately::DrawStatus()
{
ImGui::Text("OpenTeamImmediately");
}
OpenTeamImmediately& OpenTeamImmediately::GetInstance()
{
static OpenTeamImmediately instance;
return instance;
}
static bool MoleMole_InLevelMainPageContext_DoTeamCountDown_c_Iterator0__MoveNext_Hook(app::InLevelMainPageContext_DoTeamCountDown_Iterator* __this, MethodInfo* method)
{
auto& openTeamImmediately = OpenTeamImmediately::GetInstance();
if (openTeamImmediately.f_Enabled)
{
__this->fields._levelMainPageContext->fields._countDownTime = __this->fields._levelMainPageContext->fields.EnterCountDown + 1.f;
}
return CALL_ORIGIN(MoleMole_InLevelMainPageContext_DoTeamCountDown_c_Iterator0__MoveNext_Hook, __this, method);
}
}

View File

@ -0,0 +1,24 @@
#include <cheat-base/cheat/Feature.h>
#include <cheat-base/config/config.h>
namespace cheat::feature
{
class OpenTeamImmediately : public Feature
{
public:
config::Field<config::Toggle<Hotkey>> f_Enabled;
static OpenTeamImmediately& GetInstance();
const FeatureGUIInfo& GetGUIInfo() const override;
void DrawMain() override;
virtual bool NeedStatusDraw() const override;
void DrawStatus() override;
private:
OpenTeamImmediately();
};
}