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

Fix movement.xml and add disguised option to chams (#915)

Browse Source 
* Fixed capitalization

* Added disguised option

* Added disguised option

* Added disguised option

* fixed IsPlayerDisguised(ent)

* Fixed IsPlayerDisguised(ent)

* Fixed IsPlayerDisguised(ent)
This commit is contained in:
LightPower392 2020-02-17 08:04:02 -08:00 committed by GitHub
parent 547c145c1a
commit 32baac5c8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
data/menu/nullifiedcat/movement.xml
View File

@ -9,19 +9,19 @@
<List width="180"> <List width="180">
<AutoVariable width="fill" target="follow-bot.enable" label="Enable FollowBot"/> <AutoVariable width="fill" target="follow-bot.enable" label="Enable FollowBot"/>
<AutoVariable width="fill" target="follow-bot.roaming" label="Roaming"/> <AutoVariable width="fill" target="follow-bot.roaming" label="Roaming"/>
<AutoVariable width="fill" target="follow-bot.change-roaming-target" label="Change when possible"/> <AutoVariable width="fill" target="follow-bot.change-roaming-target" label="Change When Possible"/>
<AutoVariable width="fill" target="follow-bot.jump-if-stuck" label="Jump if stuck"/> <AutoVariable width="fill" target="follow-bot.jump-if-stuck" label="Jump If Stuck"/>
<AutoVariable width="fill" target="follow-bot.taunt-sync" label="Synced taunts"/> <AutoVariable width="fill" target="follow-bot.taunt-sync" label="Synced Taunts"/>
<AutoVariable width="fill" target="follow-bot.max-range" label="Activation range"/> <AutoVariable width="fill" target="follow-bot.max-range" label="Activation Range"/>
<AutoVariable width="fill" target="follow-bot.distance" label="Follow distance"/> <AutoVariable width="fill" target="follow-bot.distance" label="Follow distance"/>
<AutoVariable width="fill" target="follow-bot.ipc-distance" label="IRC additive distance"/> <AutoVariable width="fill" target="follow-bot.ipc-distance" label="IRC Additive Distance"/>
<AutoVariable width="fill" target="follow-bot.mimic-slot" label="Mimic slot"/> <AutoVariable width="fill" target="follow-bot.mimic-slot" label="Mimic Slot"/>
<AutoVariable width="fill" target="follow-bot.mimic-crouch" label="Mimic crouch"/> <AutoVariable width="fill" target="follow-bot.mimic-crouch" label="Mimic Crouch"/>
<AutoVariable width="fill" target="follow-bot.always-medigun" label="Always Medigun"/> <AutoVariable width="fill" target="follow-bot.always-medigun" label="Always Medigun"/>
<AutoVariable width="fill" target="follow-bot.switch-afk" label="AFK Switch"/> <AutoVariable width="fill" target="follow-bot.switch-afk" label="AFK Switch"/>
<AutoVariable width="fill" target="follow-bot.afk-time" label="AFK limit"/> <AutoVariable width="fill" target="follow-bot.afk-time" label="AFK Limit"/>
<AutoVariable width="fill" target="follow-bot.corners" label="Corner activate"/> <AutoVariable width="fill" target="follow-bot.corners" label="Corner Activate"/>
<AutoVariable width="fill" target="follow-bot.steamid" label="SteamID to follow"/> <AutoVariable width="fill" target="follow-bot.steamid" label="SteamID to Follow"/>
<AutoVariable width="fill" target="follow-bot.prioritize-friends" label="Prioritize Friends"/> <AutoVariable width="fill" target="follow-bot.prioritize-friends" label="Prioritize Friends"/>
<AutoVariable width="fill" target="follow-bot.prioritize-leader" label="Prioritize the Party Leader"/> <AutoVariable width="fill" target="follow-bot.prioritize-leader" label="Prioritize the Party Leader"/>
<AutoVariable width="fill" target="follow-bot.draw-crumbs" label="Draw Crumbs"/> <AutoVariable width="fill" target="follow-bot.draw-crumbs" label="Draw Crumbs"/>
@ -33,16 +33,16 @@
<AutoVariable width="fill" target="misc.pathing.draw" label="Draw Path"/> <AutoVariable width="fill" target="misc.pathing.draw" label="Draw Path"/>
<AutoVariable width="fill" target="misc.pathing.look-at-path" label="Look at Path"/> <AutoVariable width="fill" target="misc.pathing.look-at-path" label="Look at Path"/>
<AutoVariable width="fill" target="navbot.enabled" label="Enable Navbot"/> <AutoVariable width="fill" target="navbot.enabled" label="Enable Navbot"/>
<AutoVariable width="fill" target="navbot.engineer-mode" label="Enable Engineer mode"/> <AutoVariable width="fill" target="navbot.engineer-mode" label="Enable Engineer Mode"/>
<AutoVariable width="fill" target="navbot.get-health-and-ammo" label="Get Health and Ammo"/> <AutoVariable width="fill" target="navbot.get-health-and-ammo" label="Get Health and Ammo"/>
<AutoVariable width="fill" target="navbot.spy-mode" label="Enable Spy Mode"/> <AutoVariable width="fill" target="navbot.spy-mode" label="Enable Spy Mode"/>
<AutoVariable width="fill" target="navbot.other-mode" label="General Mode"/> <AutoVariable width="fill" target="navbot.other-mode" label="General Mode"/>
<AutoVariable width="fill" target="navbot.primary-only" label="Best Weapon only"/> <AutoVariable width="fill" target="navbot.primary-only" label="Best Weapon Only"/>
<AutoVariable width="fill" target="navbot.autojump.enabled" label="Enable Autojump"/> <AutoVariable width="fill" target="navbot.autojump.enabled" label="Enable Autojump"/>
<AutoVariable width="fill" target="navbot.autojump.trigger-distance" label="Jump Distance"/> <AutoVariable width="fill" target="navbot.autojump.trigger-distance" label="Jump Distance"/>
<!--AutoVariable width="fill" target="navbot.target-sentry" label="Try to target sentries"/--> <!--AutoVariable width="fill" target="navbot.target-sentry" label="Try to target sentries"/-->
<AutoVariable width="fill" target="navbot.stay-near" label="Zone enemies (stay near)"/> <AutoVariable width="fill" target="navbot.stay-near" label="Zone Enemies (Stay Near)"/>
<AutoVariable width="fill" target="navbot.spy-ignore-time" label="Spy ignore time"/> <AutoVariable width="fill" target="navbot.spy-ignore-time" label="Spy ignore Time"/>
<!-- <!AutoVariable width="fill" target="navbot.take-teleporters" label="take teleporters"/> --> <!-- <!AutoVariable width="fill" target="navbot.take-teleporters" label="take teleporters"/> -->
</List> </List>
</Box> </Box>

18
data/menu/nullifiedcat/trigger/autoheal.xml
View File

@ -15,13 +15,13 @@
<Box padding="12 6 6 6" width="content" height="content" name="Health Priority" y="155"> <Box padding="12 6 6 6" width="content" height="content" name="Health Priority" y="155">
<List width="160"> <List width="160">
<AutoVariable width="fill" target="autoheal.priority-scout" label="Scout Weight"/> <AutoVariable width="fill" target="autoheal.priority-scout" label="Scout Weight"/>
<AutoVariable width="fill" target="autoheal.priority-soldier" label="Soldier weight"/> <AutoVariable width="fill" target="autoheal.priority-soldier" label="Soldier Weight"/>
<AutoVariable width="fill" target="autoheal.priority-pyro" label="Pyro weight"/> <AutoVariable width="fill" target="autoheal.priority-pyro" label="Pyro Weight"/>
<AutoVariable width="fill" target="autoheal.priority-demoman" label="Demoman weight"/> <AutoVariable width="fill" target="autoheal.priority-demoman" label="Demoman Weight"/>
<AutoVariable width="fill" target="autoheal.priority-heavy" label="Heavy weight"/> <AutoVariable width="fill" target="autoheal.priority-heavy" label="Heavy Weight"/>
<AutoVariable width="fill" target="autoheal.priority-engineer" label="Engineer weight"/> <AutoVariable width="fill" target="autoheal.priority-engineer" label="Engineer Weight"/>
<AutoVariable width="fill" target="autoheal.priority-medic" label="Medic weight"/> <AutoVariable width="fill" target="autoheal.priority-medic" label="Medic Weight"/>
<AutoVariable width="fill" target="autoheal.priority-sniper" label="Sniper weight"/> <AutoVariable width="fill" target="autoheal.priority-sniper" label="Sniper Weight"/>
<AutoVariable width="fill" target="autoheal.priority-spy" label="Spy Weight"/> <AutoVariable width="fill" target="autoheal.priority-spy" label="Spy Weight"/>
</List> </List>
</Box> </Box>
@ -40,7 +40,7 @@
</List> </List>
<Box padding="12 6 6 6" name="Bullet" width="content" height="content" x="170"> <Box padding="12 6 6 6" name="Bullet" width="content" height="content" x="170">
<List width="150"> <List width="150">
<LabeledObject width="fill" label="Sniper Pp"> <LabeledObject width="fill" label="Sniper Pop">
<Select target="autoheal.vacc.bullet.sniper-pop"> <Select target="autoheal.vacc.bullet.sniper-pop">
<Option name="Never" value="0"/> <Option name="Never" value="0"/>
<Option name="Visible, zoom" value="1"/> <Option name="Visible, zoom" value="1"/>
@ -66,7 +66,7 @@
<AutoVariable width="fill" target="autoheal.vacc.fire.prevent-afterburn" label="Prevent Afterburn"/> <AutoVariable width="fill" target="autoheal.vacc.fire.prevent-afterburn" label="Prevent Afterburn"/>
<AutoVariable width="fill" target="autoheal.vacc.fire.pyro-range" label="Danger Range"/> <AutoVariable width="fill" target="autoheal.vacc.fire.pyro-range" label="Danger Range"/>
<AutoVariable width="fill" target="autoheal.vacc.fire.min-charges" label="Min. Charges" min="0" max="4"/> <AutoVariable width="fill" target="autoheal.vacc.fire.min-charges" label="Min. Charges" min="0" max="4"/>
<LabeledObject width="fill" label="Pyro pop"> <LabeledObject width="fill" label="Pyro Pop">
<Select target="autoheal.vacc.fire.pyro-pop"> <Select target="autoheal.vacc.fire.pyro-pop">
<Option name="Never" value="0"/> <Option name="Never" value="0"/>
<Option name="Near, flames" value="1"/> <Option name="Near, flames" value="1"/>

1
data/menu/nullifiedcat/visuals/chams.xml
View File

@ -22,6 +22,7 @@
<List width="150"> <List width="150">
<AutoVariable width="fill" target="chams.show.players" label="Players"/> <AutoVariable width="fill" target="chams.show.players" label="Players"/>
<AutoVariable width="fill" target="chams.show.teammates" label="Teammates"/> <AutoVariable width="fill" target="chams.show.teammates" label="Teammates"/>
<AutoVariable width="fill" target="chams.show.disguised" label="Disguised"/>
<AutoVariable width="fill" target="chams.self" label="Chams Self"/> <AutoVariable width="fill" target="chams.self" label="Chams Self"/>
<AutoVariable width="fill" target="chams.show.buildings" label="Buildings"/> <AutoVariable width="fill" target="chams.show.buildings" label="Buildings"/>
<AutoVariable width="fill" target="chams.show.teammate-buildings" label="Team Buildings"/> <AutoVariable width="fill" target="chams.show.teammate-buildings" label="Team Buildings"/>

3
src/visual/EffectChams.cpp
View File

@ -16,6 +16,7 @@ namespace effect_chams
static settings::Boolean flat{ "chams.flat", "false" }; static settings::Boolean flat{ "chams.flat", "false" };
static settings::Boolean health{ "chams.health", "false" }; static settings::Boolean health{ "chams.health", "false" };
static settings::Boolean teammates{ "chams.show.teammates", "false" }; static settings::Boolean teammates{ "chams.show.teammates", "false" };
static settings::Boolean disguised{ "chams.show.disguised", "true" };
static settings::Boolean players{ "chams.show.players", "true" }; static settings::Boolean players{ "chams.show.players", "true" };
static settings::Boolean medkits{ "chams.show.medkits", "false" }; static settings::Boolean medkits{ "chams.show.medkits", "false" };
static settings::Boolean ammobox{ "chams.show.ammoboxes", "false" }; static settings::Boolean ammobox{ "chams.show.ammoboxes", "false" };
@ -233,6 +234,8 @@ bool EffectChams::ShouldRenderChams(IClientEntity *entity)
case ENTITY_PLAYER: case ENTITY_PLAYER:
if (!players) if (!players)
return false; return false;
if (!disguised && IsPlayerDisguised(ent))
return false;
if (!teammates && !ent->m_bEnemy() && playerlist::IsDefault(ent)) if (!teammates && !ent->m_bEnemy() && playerlist::IsDefault(ent))
return false; return false;
if (CE_BYTE(ent, netvar.iLifeState)) if (CE_BYTE(ent, netvar.iLifeState))

2
src/visual/EffectGlow.cpp
View File

@ -286,7 +286,7 @@ bool EffectGlow::ShouldRenderGlow(IClientEntity *entity)
case ENTITY_PLAYER: case ENTITY_PLAYER:
if (!players) if (!players)
return false; return false;
if (!disguised && (IsPlayerDisguised(ent))) if (!disguised && IsPlayerDisguised(ent))
return false; return false;
if (!teammates && !ent->m_bEnemy() && playerlist::IsDefault(ent)) if (!teammates && !ent->m_bEnemy() && playerlist::IsDefault(ent))
return false; return false;