Grasscutters/Akebi-GC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #340 from m0nkrel/master

Browse Source 
Hotfix #323
This commit is contained in:
Taiga 2022-07-21 10:04:29 -07:00 committed by GitHub
commit 254e1b7b6d
2 changed files with 99 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
cheat-library/src/user/cheat/esp/ESP.cpp
View File

@ -173,6 +173,97 @@ namespace cheat::feature
} }
name = name.substr(pos1 + 1, pos2 - pos1 - 1); name = name.substr(pos1 + 1, pos2 - pos1 - 1);
} }
else if (name.find("Animal") != std::string::npos)
{
int count = 0;
int j = 0;
int pos1 = 0;
int pos2 = 0;
for (int i = 0; i < name.length(); i++)
{
if (name[i] == '_')
{
count++;
}
}
//switch statement to determine how we will get name
switch (count)
{
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++)
{
if (name[i] == '_')
{
j++;
if (j == 3)
{
pos1 = 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 + 1, pos2 - pos1 - 1);
}
default:
break;
}
return;
}
else if (name.find("Monster") != std::string::npos)
{
int j = 0; //number of underscores in the name
int pos1 = 0; //position of the first underscore in the name
int pos2 = 0; //position of the second underscore in the name
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);
}
else else
{ {
int j = 0; //number of underscores in the name int j = 0; //number of underscores in the name
@ -316,12 +407,14 @@ namespace cheat::feature
if (entry.m_Name == "Npc" || "AvatarOwn" || "AvatarTeammate") if (entry.m_Name == "Npc" || "AvatarOwn" || "AvatarTeammate")
{ {
auto name = entity->name(); if (entity->type() == app::EntityType__Enum_1::Avatar || entity->type() == app::EntityType__Enum_1::NPC)
GetNpcName(name); {
esp::render::DrawEntity(name, entity, entry.m_Color, entry.m_ContrastColor); std::string name = entity->name();
break; GetNpcName(name);
esp::render::DrawEntity(name, entity, entry.m_Color, entry.m_ContrastColor);
break;
}
} }
esp::render::DrawEntity(entry.m_Name, entity, entry.m_Color, entry.m_ContrastColor); esp::render::DrawEntity(entry.m_Name, entity, entry.m_Color, entry.m_ContrastColor);
break; break;
} }

2
cheat-library/src/user/cheat/game/filters.cpp
View File

@ -95,7 +95,7 @@ namespace cheat::game::filters
SimpleFilter Boar = { EntityType__Enum_1::Monster, "Boar" }; SimpleFilter Boar = { EntityType__Enum_1::Monster, "Boar" };
SimpleFilter Fox = { EntityType__Enum_1::Monster, "Fox" }; SimpleFilter Fox = { EntityType__Enum_1::Monster, "Fox" };
SimpleFilter Squirrel = { EntityType__Enum_1::Monster, "Squirrel" }; SimpleFilter Squirrel = { EntityType__Enum_1::Monster, "Squirrel" };
SimpleFilter Npc = { EntityType__Enum_1::NPC, { "_Liyue", "_Mengde", "_Inazuma", "_Coop", "_Quest", "_Enkanomiya", "_Animal", "_Guide", "_Homeworld" } }; SimpleFilter Npc = { EntityType__Enum_1::NPC, { "_Liyue", "_Mengde", "_Inazuma", "_Coop", "_Quest", "_Enkanomiya", "_Animal", "_Guide", "_Homeworld", "_Monster"}};
SimpleFilter Crane = { EntityType__Enum_1::Monster, "Crane" }; SimpleFilter Crane = { EntityType__Enum_1::Monster, "Crane" };
SimpleFilter Falcon = { EntityType__Enum_1::Monster, "Falcon" }; SimpleFilter Falcon = { EntityType__Enum_1::Monster, "Falcon" };
SimpleFilter LucklightFly = { EntityType__Enum_1::EnvAnimal, "Boltbug_" }; SimpleFilter LucklightFly = { EntityType__Enum_1::EnvAnimal, "Boltbug_" };