ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-10 07:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

presets and 33b8 update

Browse source 
- adjust hivesight labels to be less visibile if they're not being attacked
- add crosshair scaling when above 1080p
- fix music not playing after the first map
- config updates
This commit is contained in:
pierow 2024-03-13 09:10:50 -04:00
parent de3ae12236
commit 417892f507
10 changed files with 95 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main/presetcfgs/AV/competitive.cfg
View file

@ -8,7 +8,7 @@ cl_intensity "0"
cl_intensityalt "1"
// High detail particles
cl_high_detail "0"
//cl_high_detail "0"
// No bobbing
cl_bob "0"
@ -31,6 +31,7 @@ cl_hudmapzoom "2"
// New crosshairs
crosshair "0"
cl_cross "1"
cl_cross_scaling "0"
cl_weaponcfgs "1"
echo " "

1
main/presetcfgs/AV/newdefault.cfg
View file

@ -31,6 +31,7 @@ cl_hudmapzoom "2"
// New crosshairs
crosshair "0"
cl_cross "1"
cl_cross_scaling "1"
cl_weaponcfgs "2"

1
main/server.cfg
View file

@ -103,6 +103,7 @@ mapchangecfgfile server.cfg
// Post HL 25th Aniversary update
sv_rollangle 0
sv_allow_shaders 0
// Set rate limits, otherwise they initialize to bad values
sv_maxupdaterate 102

74
main/source/cl_dll/hud_crosshairs.cpp
View file

@ -35,6 +35,7 @@ int CHudCrosshairs::Init()
cl_cross_line_bottom = CVAR_CREATE("cl_cross_line_bottom", "1", FCVAR_ARCHIVE);
cl_cross_line_left = CVAR_CREATE("cl_cross_line_left", "1", FCVAR_ARCHIVE);
cl_cross_line_right = CVAR_CREATE("cl_cross_line_right", "1", FCVAR_ARCHIVE);
cl_cross_scaling = CVAR_CREATE("cl_cross_scaling", "1", FCVAR_ARCHIVE);
gHUD.AddHudElem(this);
return 0;
@ -72,23 +73,42 @@ int CHudCrosshairs::Draw(float time)
outalpha = alpha;
float scalar = 1.0f;
if (cl_cross_scaling->value != 0)
{
// Scale from 1080 Y res, as it's what the default crosshairs are designed for, but don't scale when resolution is close to 1080, as it looks bad.
const float screenscale = ScreenHeight() / 1080.0f; //ScreenHeight() * 0.000926f
// Lowering scale looks like junk, don't bother.
//if (screenscale < 0.75f)
//{
// scalar = 1.0f / round(1080.0f / ScreenHeight());
// //scalar = 0.5f;
//}
if (screenscale > 1.0f)
{
scalar = screenscale;
}
// Additional scaling with the cvar value if desired.
scalar *= cl_cross_scaling->value;
}
Vector2D center(ScreenWidth() / 2.0f, ScreenHeight() / 2.0f);
HudGL gl;
// Draw the outline.
// TODO: this contains a terrible amount of repeating complex code.
//
// Possible solution: can be changed to this with the one downside being in rare cases where cl_cross_thickness is high AND its alpha is <255, the center of each line will be slightly darker.
// Example below is for bottom line. Would also cause certain crosshairs that have outlines on invisible cross lines to not look right.
// gl.rectangle(Vector2D(center.x + offset, center.y + gap - half_width), Vector2D(center.x - offset, center.y + gap + size + half_width));
// TODO: Swap out lines for rectangles to fix the line thickness limit of 10.
// The lines can also be changed to one rectangle with the one downside being in cases where the cross alpha is <255, the center of each line will be slightly darker.
// Example below is for bottom line. It would also cause certain crosshairs that have outlines on invisible cross lines to not look right.
// gl.rectangle(Vector2D(center.x + offset, center.y + gap /*- outline_width*/), Vector2D(center.x - offset, center.y + gap + size + outline_width));
if (cl_cross_outline->value > 0.0f && cl_cross_thickness->value > 0.0f && cl_cross_size->value > 0.0f) {
float size = cl_cross_size->value;
float gap = cl_cross_gap->value;
float half_thickness = min(cl_cross_thickness->value, ScreenHeight() * 0.3f) * 0.5f;
float outline_width = cl_cross_outline->value;
float size = cl_cross_size->value * scalar;
float gap = cl_cross_gap->value * scalar;
float half_thickness = min(cl_cross_thickness->value * scalar, ScreenHeight() * 0.3f) * 0.5f;
float outline_width = cl_cross_outline->value * scalar;
float offset = half_thickness + outline_width;
gl.color(0, 0, 0, outalpha);
@ -163,11 +183,11 @@ int CHudCrosshairs::Draw(float time)
if (cl_cross_dot_outline->string[0] == 0)
{
dotout = cl_cross_outline->value;
dotout = cl_cross_outline->value * scalar;
}
else
{
dotout = cl_cross_dot_outline->value;
dotout = cl_cross_dot_outline->value * scalar;
}
// Dot outline
if (cl_cross_dot_size->value > 0.0f && dotout > 0.0f) {
@ -177,7 +197,7 @@ int CHudCrosshairs::Draw(float time)
gl.color(0, 0, 0, dotoutalpha);
float size = min(cl_cross_dot_size->value, ScreenHeight() * 0.2f) + (dotout * 2.0f);
float size = min(cl_cross_dot_size->value * scalar, ScreenHeight() * 0.2f) + (dotout * 2.0f);
Vector2D offset = Vector2D(size / 2.0f, size / 2.0f);
gl.rectangle(center - offset, center + offset);
@ -186,11 +206,11 @@ int CHudCrosshairs::Draw(float time)
float circleout;
if (cl_cross_circle_outline->string[0] == 0)
{
circleout = cl_cross_outline->value;
circleout = cl_cross_outline->value * scalar;
}
else
{
circleout = cl_cross_circle_outline->value;
circleout = cl_cross_circle_outline->value * scalar;
}
// Circle outline
if (cl_cross_circle_radius->value > 0.0f && cl_cross_circle_thickness->value > 0.0f && circleout > 0.0f) {
@ -203,16 +223,16 @@ int CHudCrosshairs::Draw(float time)
gl.color(0, 0, 0, circleoutalpha);
auto radius = cl_cross_circle_radius->value;
auto radius = cl_cross_circle_radius->value * scalar;
if (!circleoutinner)
{
radius += cl_cross_circle_thickness->value * 0.5f;
radius += cl_cross_circle_thickness->value * scalar * 0.5f;
gl.line_width(circleout);
}
else
{
gl.line_width(cl_cross_circle_thickness->value + (circleout * 2.0f));
gl.line_width(cl_cross_circle_thickness->value * scalar + (circleout * 2.0f));
}
if (old_circle_radius != radius) {
@ -229,13 +249,13 @@ int CHudCrosshairs::Draw(float time)
if (cl_cross_thickness->value > 0.0f && cl_cross_size->value > 0.0f) {
float size;
float gap = cl_cross_gap->value;
float gap = cl_cross_gap->value * scalar;
// Box crosshair. This is needed since line thickness seems to cap out at 10 on my system.
if (cl_cross_thickness->value > cl_cross_size->value) {
gl.line_width(cl_cross_size->value);
float half_size = cl_cross_size->value * 0.5f;
float half_thickness = cl_cross_thickness->value * 0.5f;
gl.line_width(cl_cross_size->value * scalar);
float half_size = cl_cross_size->value * scalar * 0.5f;
float half_thickness = cl_cross_thickness->value * scalar * 0.5f;
if (cl_cross_line_top->value)
gl.line(Vector2D(center.x - half_thickness, center.y - gap - half_size), Vector2D(center.x + half_thickness, center.y - gap - half_size));
@ -248,8 +268,8 @@ int CHudCrosshairs::Draw(float time)
}
// Normal cross.
else {
gl.line_width(cl_cross_thickness->value);
size = cl_cross_size->value;
gl.line_width(cl_cross_thickness->value * scalar);
size = cl_cross_size->value * scalar;
if (cl_cross_line_top->value)
gl.line(Vector2D(center.x, center.y - gap - size), Vector2D(center.x, center.y - gap));
@ -279,9 +299,9 @@ int CHudCrosshairs::Draw(float time)
gl.color(r, g, b, circlealpha);
}
gl.line_width(cl_cross_circle_thickness->value);
gl.line_width(cl_cross_circle_thickness->value * scalar);
float radius = cl_cross_circle_radius->value;
float radius = cl_cross_circle_radius->value * scalar;
if (old_circle_radius != radius) {
// Recompute the circle points.
circle_points = HudGL::compute_circle(radius);
@ -307,9 +327,9 @@ int CHudCrosshairs::Draw(float time)
gl.color(r, g, b, dotalpha);
}
//float size = cl_cross_dot_size->value;
//float size = cl_cross_dot_size->value * scalar;
//clamp dot size to prevent using it as a full screen transparent mask for highlighting eneimies like with the /nvg night vision server plugin.
float size = min(cl_cross_dot_size->value, ScreenHeight() * 0.2f);
float size = min(cl_cross_dot_size->value * scalar, ScreenHeight() * 0.2f);
Vector2D offset = Vector2D(size / 2.0f, size / 2.0f);
gl.rectangle(center - offset, center + offset);

1
main/source/cl_dll/hud_crosshairs.h
View file

@ -31,6 +31,7 @@ class CHudCrosshairs : public CHudBase
cvar_t* cl_cross_line_bottom;
cvar_t* cl_cross_line_left;
cvar_t* cl_cross_line_right;
cvar_t* cl_cross_scaling;
float old_circle_radius;
std::vector<Vector2D> circle_points;

2
main/source/cl_dll/shader.cpp
View file

@ -33,7 +33,7 @@ void CPostProcessShader::Init()
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, ScreenWidth(), ScreenHeight(), 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
cl_postprocess = CVAR_CREATE("cl_postprocess", "1", FCVAR_ARCHIVE);
cl_intensity = CVAR_CREATE("cl_intensity", "1", FCVAR_ARCHIVE);
cl_intensity = CVAR_CREATE("cl_intensity", "0.55", FCVAR_ARCHIVE);
CVAR_CREATE("cl_intensityalt", "1", FCVAR_ARCHIVE);
// Store shaders in dll so swapping in different ones is harder.

12
main/source/mod/AvHHudRender.cpp
View file

@ -4211,7 +4211,17 @@ void AvHHud::RenderAlienUI()
float xdiff = fabs(theScreenPos[0] - screenWidth/2);
float ydiff = fabs(theScreenPos[1] - screenHeight/2);
float quadrance = xdiff * xdiff + ydiff * ydiff;
float alpha = max(0.0f, 0.9f - quadrance / (screenHeight * screenHeight));
float alpha;
if (theBlipStatus == kVulnerableFriendlyBlipStatus)
{
alpha = max(0.0f, 0.9f - (quadrance) / (screenHeight * screenHeight));
}
// 2024 - Reduce HUD visibility for unimportant blips.
else
{
alpha = max(0.0f, 0.7f - (quadrance * 10.0f) / (screenHeight * screenHeight));
}
alpha *= alpha * alpha * alpha;
// "MonsieurEvil is under attack"

4
main/source/ui/UIHud.cpp
View file

@ -72,10 +72,10 @@ bool UIHud::GetIsTimeForSong(float inCurrentTime) const
{
bool theTimeForNewSong = false;
if(this->mMusicEnabled && this->mMusicAllowed && !this->mSongIsPlaying && cl_musicdelay->value != -1.0f)
if(this->mMusicEnabled && this->mMusicAllowed && !this->mSongIsPlaying)
{
float theTimeElapsedSinceSongStopped = inCurrentTime - this->mTimeSongEnded;
if((this->mTimeSongEnded == -1) || (theTimeElapsedSinceSongStopped > this->mRandomSecondsBetweenSongs))
if((this->mTimeSongEnded == -1) || (theTimeElapsedSinceSongStopped > this->mRandomSecondsBetweenSongs && cl_musicdelay->value != -1.0f))
{
theTimeForNewSong = true;
}

15
main/user.scr
View file

@ -71,7 +71,7 @@ DESCRIPTION INFO_OPTIONS
"cl_musicdelay"
{
"Random seconds between songs (-1 = Play once at start)"
"Random seconds between songs (-1 = Play once)"
{ NUMBER -1.000000 10000.000000 }
{ "-1" }
}
@ -360,9 +360,9 @@ DESCRIPTION INFO_OPTIONS
{ "0" }
}
"crosshair"
"crosshair"
{
"Legacy crosshair system"
"Enable Legacy crosshair system ----------------------------------------------------------------------------------------"
{ BOOL }
{ "0" }
}
@ -383,7 +383,7 @@ DESCRIPTION INFO_OPTIONS
"cl_cross"
{
"New crosshair system"
"Enable New crosshair system -------------------------------------------------------------------------------------------"
{ BOOL }
{ "1" }
}
@ -400,6 +400,13 @@ DESCRIPTION INFO_OPTIONS
{ "2" }
}
"cl_cross_scaling"
{
"Upscale crosshairs when above 1080p"
{ BOOL }
{ "1" }
}
"cl_cross_color"
{
"Crosshair color (R G B)"

17
main/weaponcfgs/noweapon.cfg Normal file
View file

@ -0,0 +1,17 @@
// Enter commands to be executed when swapping to this weapon. Useful for per-weapon cl_cross commands or sensitivity.
//
// Default to white cross when no weapon is out for custom cfgs so people aren't stuck with whatever was last used when swapping to custom crosshairs.
cl_cross_color "255 255 255"
cl_cross_alpha "255"
cl_cross_thickness "2"
cl_cross_size "6"
cl_cross_gap "3"
cl_cross_outline "1"
cl_cross_outline_alpha ""
cl_cross_outline_inner "0"
cl_cross_line_top "1"
cl_cross_line_bottom "1"
cl_cross_line_left "1"
cl_cross_line_right "1"
cl_cross_dot_size "0"
cl_cross_circle_radius "0"