Skip to content

Conversation

@DESTROYGIRL
Copy link
Contributor

@DESTROYGIRL DESTROYGIRL commented Dec 24, 2025

Description

Title

Toolchain

  • Windows MSVC VS2022

Linked Issues

@DESTROYGIRL DESTROYGIRL requested a review from a team December 24, 2025 13:49
@sunzenshen
Copy link
Contributor

sunzenshen commented Dec 25, 2025

For what it's worth, after cherry picking #1553 into this branch (to fix bots crashing DM mode), I tried setting sv_neo_gamemode_enforcement 1; to force DM mode, and this branch didn't seem to make a difference, as I still see x-rays for enemies on my same team, and no x-rays for enemies on the other team.

Not sure if this fix requires that the map natively supports DM, or if DM mode should be enabled in a different way.

I also tried neo_vote_game_mode 3; mp_restartgame 1; and this didn't work either for disabling the friendly marker in DM mode.

bot-dm-xray-highlight-bug.mp4

(Notice how I am on team NSF and the Jinrai players are not highlighted. In spectate mode they are all highlighted.)

@sunzenshen
Copy link
Contributor

Also I'm not sure if we're keeping the PR changes small in scope, but CNEO_Player::GetFogObscuredRatio probably needs to be updated with a IsTeamplay() check such that enemies from the same team are not fully visible to each other:

float CNEO_Player::GetFogObscuredRatio(CBaseEntity* target) const
{
	/*---[snip]---*/

	if (GetTeamNumber() == targetPlayer->GetTeamNumber())
	{
		// Teammates are always labeled with IFF markers
		return 0.0f;
	}

(CNEOBotVision::IsAbleToSee seems fine already in this context but we might need to sanity check later that we don't forget to keep teammates not omniscient of each other.)

@sunzenshen sunzenshen added the (T)DM Related to the (Team) Deathmatch gamemode. label Dec 25, 2025
@AdamTadeusz
Copy link
Contributor

master...AdamTadeusz:neo:306_dontGlowDMPlayers heres how you would solve this issue. I was gonna wait until the dm fix was in so it could be tested with bots.

@DESTROYGIRL
Copy link
Contributor Author

master...AdamTadeusz:neo:306_dontGlowDMPlayers heres how you would solve this issue. I was gonna wait until the dm fix was in so it could be tested with bots.

Would you prefer if I remove that half from this PR and you can submit that seperately

@DESTROYGIRL DESTROYGIRL changed the title Disable xray in DM and maps with friendly markers disabled Disable xray in maps with friendly markers disabled Dec 27, 2025
@DESTROYGIRL
Copy link
Contributor Author

Not handling dm here

@DESTROYGIRL DESTROYGIRL removed the (T)DM Related to the (Team) Deathmatch gamemode. label Dec 27, 2025
@DESTROYGIRL DESTROYGIRL merged commit 6463a7c into NeotokyoRebuild:master Dec 27, 2025
7 checks passed
@DESTROYGIRL DESTROYGIRL deleted the 21_xray_dmanddisabled branch December 27, 2025 23:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Xray is enabled in maps where IFF hud elements are disabled

4 participants