nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify yaw portion of code, make certain yaw angles different between types

Browse Source
This commit is contained in:
SheepyChris 2021-06-26 10:13:37 -04:00 committed by LightCat
parent 1c266f9292
commit 870b5ec741
2 changed files with 78 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/menu/nullifiedcat/antiaim.xml
View File

@ -47,11 +47,10 @@
<Option name="Spin" value="6"/> <Option name="Spin" value="6"/>
<Option name="Edge" value="7"/> <Option name="Edge" value="7"/>
<Option name="Sideways" value="8"/> <Option name="Sideways" value="8"/>
<Option name="Jitter" value="9"/> <Option name="Heck" value="9"/>
<Option name="Heck" value="10"/> <Option name="Omega" value="10"/>
<Option name="Omega" value="11"/> <Option name="Random" value="11"/>
<Option name="Random" value="12"/> <Option name="Random Clamped" value="12"/>
<Option name="Random Clamped" value="13"/>
</Select> </Select>
</LabeledObject> </LabeledObject>
<LabeledObject width="fill" label="Real Yaw"> <LabeledObject width="fill" label="Real Yaw">
@ -65,11 +64,10 @@
<Option name="Spin" value="6"/> <Option name="Spin" value="6"/>
<Option name="Edge" value="7"/> <Option name="Edge" value="7"/>
<Option name="Sideways" value="8"/> <Option name="Sideways" value="8"/>
<Option name="Jitter" value="9"/> <Option name="Heck" value="9"/>
<Option name="Heck" value="10"/> <Option name="Omega" value="10"/>
<Option name="Omega" value="11"/> <Option name="Random" value="11"/>
<Option name="Random" value="12"/> <Option name="Random Clamped" value="12"/>
<Option name="Random Clamped" value="13"/>
</Select> </Select>
</LabeledObject> </LabeledObject>
<AutoVariable width="fill" target="antiaim.yaw.fake.static" label="Custom Fake" tooltip="Used when 'Fake Yaw' is set to 'Custom'."/> <AutoVariable width="fill" target="antiaim.yaw.fake.static" label="Custom Fake" tooltip="Used when 'Fake Yaw' is set to 'Custom'."/>

199
src/hacks/AntiAim.cpp
View File

@ -40,8 +40,12 @@ static settings::Button aaaa_flip_key{ "antiaim.aaaa.flip-key", "<null>" };
static settings::Int yaw_sideways_min{ "antiaim.yaw.sideways.min", "0" }; static settings::Int yaw_sideways_min{ "antiaim.yaw.sideways.min", "0" };
static settings::Int yaw_sideways_max{ "antiaim.yaw.sideways.max", "4" }; static settings::Int yaw_sideways_max{ "antiaim.yaw.sideways.max", "4" };
float cur_yaw_fake = 0.0f; // Two values for fake and real angles
float cur_yaw_real = 0.0f; float cur_yaw[2] = {
0.0f,
0.0f
};
int safe_space = 0; int safe_space = 0;
float aaaa_timer_start = 0.0f; float aaaa_timer_start = 0.0f;
@ -333,8 +337,8 @@ bool findEdge(float edgeOrigYaw)
if (edgeRightDist < edgeLeftDist) if (edgeRightDist < edgeLeftDist)
{ {
edgeToEdgeOn = 1; edgeToEdgeOn = 1;
// Correction for pitches to keep the head behind walls // Correction for pitches to keep the head behind walls with real Up or Jitter
if (((int) pitch_real == 7) || ((int) pitch_real == 9) || ((int) pitch_real == 10)) if ((((int) pitch_real == 2) || ((int) pitch_real == 4)) && !g_pLocalPlayer->isFakeAngleCM)
edgeToEdgeOn = 2; edgeToEdgeOn = 2;
return true; return true;
} }
@ -342,7 +346,7 @@ bool findEdge(float edgeOrigYaw)
{ {
edgeToEdgeOn = 2; edgeToEdgeOn = 2;
// Same as above // Same as above
if (((int) pitch_real == 7) || ((int) pitch_real == 9) || ((int) pitch_real == 10)) if ((((int) pitch_real == 2) || ((int) pitch_real == 4)) && !g_pLocalPlayer->isFakeAngleCM)
edgeToEdgeOn = 1; edgeToEdgeOn = 1;
return true; return true;
} }
@ -406,6 +410,7 @@ void ProcessUserCmd(CUserCmd *cmd)
float &y = cmd->viewangles.y; float &y = cmd->viewangles.y;
static bool flip = false; static bool flip = false;
bool clamp = !no_clamping; bool clamp = !no_clamping;
bool yaw_mode = true;
static int ticksUntilSwap = 0; static int ticksUntilSwap = 0;
static bool swap = true; static bool swap = true;
@ -419,130 +424,66 @@ void ProcessUserCmd(CUserCmd *cmd)
// Yaw logic // Yaw logic
if (g_pLocalPlayer->isFakeAngleCM) if (g_pLocalPlayer->isFakeAngleCM)
switch ((int) yaw_fake) yaw_mode = false;
{
case 1: // Custom switch ((int) (yaw_mode ? yaw_real : yaw_fake))
y = (float) yaw_fake_static; {
break; case 1: // Custom
case 2: // Custom Offset y = (float) (yaw_mode ? yaw_real_static : yaw_fake_static);
y += (float) yaw_fake_static; break;
break; case 2: // Custom Offset
case 3: // Left y += (float) (yaw_mode ? yaw_real_static : yaw_fake_static);
y -= 90.0f; break;
break; case 3: // Left
case 4: // Right y -= 90.0f;
y += 90.0f; break;
break; case 4: // Right
case 5: // Back y += 90.0f;
y += 180.0f; break;
break; case 5: // Back
case 6: // Spin y += 180.0f;
cur_yaw_fake += (float) spin; break;
while (cur_yaw_fake > 180.0f) case 6: // Spin
cur_yaw_fake += -360.0f; cur_yaw[yaw_mode] += yaw_mode ? (float) spin : -((float) spin);
while (cur_yaw_fake < -180.0f) while (cur_yaw[yaw_mode] > 180.0f)
cur_yaw_fake += 360.0f; cur_yaw[yaw_mode] += -360.0f;
y = cur_yaw_fake; while (cur_yaw[yaw_mode] < -180.0f)
break; cur_yaw[yaw_mode] += 360.0f;
case 7: // Edge y = cur_yaw[yaw_mode];
// Attempt to find an edge and if found, rotate around it break;
if (findEdge(y)) case 7: // Edge
y = useEdge(y); // Attempt to find an edge and if found, rotate around it
break; if (findEdge(y))
case 8: // Sideways y = useEdge(y);
if (ticksUntilSwap--) break;
{ case 8: // Sideways
ticksUntilSwap = UniformRandomInt(*yaw_sideways_min, *yaw_sideways_max); if (!yaw_mode)
swap = !swap; swap = !swap;
} y += swap ? 90.0f : -90.0f;
y += swap ? 90.0f : -90.0f; break;
break; case 9: // Heck
case 9: // Jitter FuckYaw(y);
if (flip) clamp = false;
y += 90; break;
else case 10: // Omega
y -= 90; if (!yaw_mode)
break; {
case 10: // Heck randyaw += RandFloatRange(-30.0f, 30.0f);
FuckYaw(y); y = randyaw;
clamp = false; }
break; else
case 11: // Omega y = randyaw - 180.0f + RandFloatRange(-40.0f, 40.0f);
randyaw += RandFloatRange(-30.0f, 30.0f); break;
y = randyaw; case 11: // Random
break; y = RandFloatRange(-65536.0f, 65536.0f);
case 12: // Random clamp = false;
y = RandFloatRange(-65536.0f, 65536.0f); break;
clamp = false; case 12: // Random Clamped
break; y = RandFloatRange(-180.0f, 180.0f);
case 13: // Random Clamped break;
y = RandFloatRange(-180.0f, 180.0f); default:
break; break;
default: }
break;
}
else
switch ((int) yaw_real)
{
case 1: // Custom
y = (float) yaw_real_static;
break;
case 2: // Custom Offset
y += (float) yaw_real_static;
break;
case 3: // Left
y -= 90.0f;
break;
case 4: // Right
y += 90.0f;
break;
case 5: // Back
y += 180.0f;
break;
case 6: // Spin
cur_yaw_real += (float) spin;
while (cur_yaw_real > 180.0f)
cur_yaw_real += -360.0f;
while (cur_yaw_real < -180.0f)
cur_yaw_real += 360.0f;
y = cur_yaw_real;
break;
case 7: // Edge
// Attempt to find an edge and if found, rotate around it
if (findEdge(y))
y = useEdge(y);
break;
case 8: // Sideways
if (ticksUntilSwap--)
{
ticksUntilSwap = UniformRandomInt(*yaw_sideways_min, *yaw_sideways_max);
swap = !swap;
}
y += swap ? 90.0f : -90.0f;
break;
case 9: // Jitter
if (flip)
y += 90;
else
y -= 90;
break;
case 10: // Heck
FuckYaw(y);
clamp = false;
break;
case 11: // Omega
y = randyaw - 180.0f + RandFloatRange(-40.0f, 40.0f);
break;
case 12: // Random
y = RandFloatRange(-65536.0f, 65536.0f);
clamp = false;
break;
case 13: // Random Clamped
y = RandFloatRange(-180.0f, 180.0f);
break;
default:
break;
}
// Pitch logic // Pitch logic
switch (int(pitch_real)) switch (int(pitch_real))