configID checks for Rapid Fire
This commit is contained in:
parent
32796600c4
commit
954fa15555
@ -11,36 +11,36 @@ namespace cheat::feature
|
|||||||
static void LCBaseCombat_DoHitEntity_Hook(app::LCBaseCombat* __this, uint32_t targetID, app::AttackResult* attackResult,
|
static void LCBaseCombat_DoHitEntity_Hook(app::LCBaseCombat* __this, uint32_t targetID, app::AttackResult* attackResult,
|
||||||
bool ignoreCheckCanBeHitInMP, MethodInfo* method);
|
bool ignoreCheckCanBeHitInMP, MethodInfo* method);
|
||||||
|
|
||||||
RapidFire::RapidFire() : Feature(),
|
RapidFire::RapidFire() : Feature(),
|
||||||
NF(f_Enabled, "Attack Multiplier", "RapidFire", false),
|
NF(f_Enabled, "Attack Multiplier", "RapidFire", false),
|
||||||
NF(f_MultiHit, "Multi-hit", "RapidFire", false),
|
NF(f_MultiHit, "Multi-hit", "RapidFire", false),
|
||||||
NF(f_Multiplier, "Hit Multiplier", "RapidFire", 2),
|
NF(f_Multiplier, "Hit Multiplier", "RapidFire", 2),
|
||||||
NF(f_OnePunch, "One Punch Mode", "RapidFire", false),
|
NF(f_OnePunch, "One Punch Mode", "RapidFire", false),
|
||||||
NF(f_Randomize, "Randomize", "RapidFire", false),
|
NF(f_Randomize, "Randomize", "RapidFire", false),
|
||||||
NF(f_minMultiplier, "Min Multiplier", "RapidFire", 1),
|
NF(f_minMultiplier, "Min Multiplier", "RapidFire", 1),
|
||||||
NF(f_maxMultiplier, "Max Multiplier", "RapidFire", 3),
|
NF(f_maxMultiplier, "Max Multiplier", "RapidFire", 3),
|
||||||
NF(f_MultiTarget, "Multi-target", "RapidFire", false),
|
NF(f_MultiTarget, "Multi-target", "RapidFire", false),
|
||||||
NF(f_MultiTargetRadius, "Multi-target Radius", "RapidFire", 20.0f)
|
NF(f_MultiTargetRadius, "Multi-target Radius", "RapidFire", 20.0f)
|
||||||
{
|
{
|
||||||
HookManager::install(app::MoleMole_LCBaseCombat_DoHitEntity, LCBaseCombat_DoHitEntity_Hook);
|
HookManager::install(app::MoleMole_LCBaseCombat_DoHitEntity, LCBaseCombat_DoHitEntity_Hook);
|
||||||
}
|
}
|
||||||
|
|
||||||
const FeatureGUIInfo& RapidFire::GetGUIInfo() const
|
const FeatureGUIInfo& RapidFire::GetGUIInfo() const
|
||||||
{
|
{
|
||||||
static const FeatureGUIInfo info{ "Attack Effects", "Player", true };
|
static const FeatureGUIInfo info{ "Attack Effects", "Player", true };
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RapidFire::DrawMain()
|
void RapidFire::DrawMain()
|
||||||
{
|
{
|
||||||
ConfigWidget("Enabled", f_Enabled, "Enables attack multipliers. Need to choose a mode to work.");
|
ConfigWidget("Enabled", f_Enabled, "Enables attack multipliers. Need to choose a mode to work.");
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
ImGui::TextColored(ImColor(255, 165, 0, 255), "Choose any or both modes below.");
|
ImGui::TextColored(ImColor(255, 165, 0, 255), "Choose any or both modes below.");
|
||||||
|
|
||||||
ConfigWidget("Multi-hit Mode", f_MultiHit, "Enables multi-hit.\n" \
|
ConfigWidget("Multi-hit Mode", f_MultiHit, "Enables multi-hit.\n" \
|
||||||
"Multiplies your attack count.\n" \
|
"Multiplies your attack count.\n" \
|
||||||
"This is not well tested, and can be detected by anticheat.\n" \
|
"This is not well tested, and can be detected by anticheat.\n" \
|
||||||
"Not recommended to be used with main accounts or used with high values.\n" \
|
"Not recommended to be used with main accounts or used with high values.\n" \
|
||||||
"Known issues with certain multi-hit attacks, e.g. Xiao E, Ayaka CA, etc.");
|
"Known issues with certain multi-hit attacks, e.g. Xiao E, Ayaka CA, etc.");
|
||||||
|
|
||||||
ImGui::Indent();
|
ImGui::Indent();
|
||||||
@ -77,15 +77,15 @@ namespace cheat::feature
|
|||||||
ImGui::Indent();
|
ImGui::Indent();
|
||||||
ConfigWidget("Radius (m)", f_MultiTargetRadius, 0.1f, 5.0f, 50.0f, "Radius to check for valid targets.");
|
ConfigWidget("Radius (m)", f_MultiTargetRadius, 0.1f, 5.0f, 50.0f, "Radius to check for valid targets.");
|
||||||
ImGui::Unindent();
|
ImGui::Unindent();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool RapidFire::NeedStatusDraw() const
|
bool RapidFire::NeedStatusDraw() const
|
||||||
{
|
{
|
||||||
return f_Enabled && (f_MultiHit || f_MultiTarget);
|
return f_Enabled && (f_MultiHit || f_MultiTarget);
|
||||||
}
|
}
|
||||||
|
|
||||||
void RapidFire::DrawStatus()
|
void RapidFire::DrawStatus()
|
||||||
{
|
{
|
||||||
if (f_MultiHit)
|
if (f_MultiHit)
|
||||||
{
|
{
|
||||||
if (f_Randomize)
|
if (f_Randomize)
|
||||||
@ -97,13 +97,13 @@ namespace cheat::feature
|
|||||||
}
|
}
|
||||||
if (f_MultiTarget)
|
if (f_MultiTarget)
|
||||||
ImGui::Text("Multi-Target [%.01fm]", f_MultiTargetRadius.value());
|
ImGui::Text("Multi-Target [%.01fm]", f_MultiTargetRadius.value());
|
||||||
}
|
}
|
||||||
|
|
||||||
RapidFire& RapidFire::GetInstance()
|
RapidFire& RapidFire::GetInstance()
|
||||||
{
|
{
|
||||||
static RapidFire instance;
|
static RapidFire instance;
|
||||||
return instance;
|
return instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int RapidFire::CalcCountToKill(float attackDamage, uint32_t targetID)
|
int RapidFire::CalcCountToKill(float attackDamage, uint32_t targetID)
|
||||||
@ -183,6 +183,20 @@ namespace cheat::feature
|
|||||||
return attackerID == avatarID || IsAvatarOwner(attacker);
|
return attackerID == avatarID || IsAvatarOwner(attacker);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool IsConfigByAvatar(game::Entity& attacker)
|
||||||
|
{
|
||||||
|
if (attacker.raw() == nullptr)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
auto& manager = game::EntityManager::instance();
|
||||||
|
auto avatarID = manager.avatar()->raw()->fields._configID_k__BackingField;
|
||||||
|
auto attackerID = attacker.raw()->fields._configID_k__BackingField;
|
||||||
|
// Taiga#5555: IDs can be found in ConfigAbility_Avatar_*.json or GadgetExcelConfigData.json
|
||||||
|
bool bulletID = attackerID >= 40000160 && attackerID <= 41069999;
|
||||||
|
|
||||||
|
return avatarID == attackerID || bulletID;
|
||||||
|
}
|
||||||
|
|
||||||
bool IsValidByFilter(game::Entity* entity)
|
bool IsValidByFilter(game::Entity* entity)
|
||||||
{
|
{
|
||||||
if (game::filters::combined::OrganicTargets.IsValid(entity) ||
|
if (game::filters::combined::OrganicTargets.IsValid(entity) ||
|
||||||
@ -203,7 +217,7 @@ namespace cheat::feature
|
|||||||
{
|
{
|
||||||
auto attacker = game::Entity(__this->fields._._._entity);
|
auto attacker = game::Entity(__this->fields._._._entity);
|
||||||
RapidFire& rapidFire = RapidFire::GetInstance();
|
RapidFire& rapidFire = RapidFire::GetInstance();
|
||||||
if (!IsAttackByAvatar(attacker) || !rapidFire.f_Enabled)
|
if (!IsConfigByAvatar(attacker) || !IsAttackByAvatar(attacker) || !rapidFire.f_Enabled)
|
||||||
return CALL_ORIGIN(LCBaseCombat_DoHitEntity_Hook, __this, targetID, attackResult, ignoreCheckCanBeHitInMP, method);
|
return CALL_ORIGIN(LCBaseCombat_DoHitEntity_Hook, __this, targetID, attackResult, ignoreCheckCanBeHitInMP, method);
|
||||||
|
|
||||||
auto& manager = game::EntityManager::instance();
|
auto& manager = game::EntityManager::instance();
|
||||||
@ -243,7 +257,8 @@ namespace cheat::feature
|
|||||||
int attackCount = rapidFire.GetAttackCount(__this, entity->runtimeID(), attackResult);
|
int attackCount = rapidFire.GetAttackCount(__this, entity->runtimeID(), attackResult);
|
||||||
for (int i = 0; i < attackCount; i++)
|
for (int i = 0; i < attackCount; i++)
|
||||||
CALL_ORIGIN(LCBaseCombat_DoHitEntity_Hook, __this, entity->runtimeID(), attackResult, ignoreCheckCanBeHitInMP, method);
|
CALL_ORIGIN(LCBaseCombat_DoHitEntity_Hook, __this, entity->runtimeID(), attackResult, ignoreCheckCanBeHitInMP, method);
|
||||||
} else CALL_ORIGIN(LCBaseCombat_DoHitEntity_Hook, __this, entity->runtimeID(), attackResult, ignoreCheckCanBeHitInMP, method);
|
}
|
||||||
|
else CALL_ORIGIN(LCBaseCombat_DoHitEntity_Hook, __this, entity->runtimeID(), attackResult, ignoreCheckCanBeHitInMP, method);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user