Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add "night vision" character parameter #14530

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add "night vision" character parameter #14530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37b205a
Add night vision and ability-to-see submarine icon character parameters
TheNinjaScout Aug 29, 2024
304fb8b
Fix night vision halo being visible by spectators, increase night vis…
TheNinjaScout Sep 1, 2024
bfab6a1
Merge remote-tracking branch 'upstream/master' into MonsterEnhancements
TheNinjaScout Oct 23, 2024
af54df8
Remove "canseesubmarineicon"
TheNinjaScout Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Barotrauma/BarotraumaClient/ClientSource/Map/Lights/LightManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,9 +532,17 @@ void DrawHalo(Character character)
//ambient light decreases the brightness of the halo (no need for a bright halo if the ambient light is bright enough)
float ambientBrightness = (AmbientLight.R + AmbientLight.B + AmbientLight.G) / 255.0f / 3.0f;
Color haloColor = Color.White.Multiply(0.3f - ambientBrightness);
if (character.HasNightVision && character == Character.Controlled)
{
haloColor.A = 180;
}
if (haloColor.A > 0)
{
float scale = 512.0f / LightSource.LightTexture.Width;
if (character.HasNightVision && character == Character.Controlled)
{
scale = 5120.0f;
}
spriteBatch.Draw(
LightSource.LightTexture, haloDrawPos, null, haloColor, 0.0f,
new Vector2(LightSource.LightTexture.Width, LightSource.LightTexture.Height) / 2, scale, SpriteEffects.None, 0.0f);
Expand Down
6 changes: 6 additions & 0 deletions Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,12 @@ public bool CanSpeak
set => Params.CanSpeak = value;
}

public bool HasNightVision
{
get => Params.HasNightVision;
set => Params.HasNightVision = value;
}

public bool NeedsAir
{
get => Params.NeedsAir;
Expand Down
3 changes: 3 additions & 0 deletions Barotrauma/BarotraumaShared/SharedSource/Characters/Params/CharacterParams.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ public string Tags
[Serialize("", IsPropertySaveable.Yes, description: "Identifier or tag of the item the character's items are placed inside when the character despawns."), Editable]
public Identifier DespawnContainer { get; private set; }

[Serialize(false, IsPropertySaveable.Yes, description: "Does this character have night vision when player controlled?"), Editable]
public bool HasNightVision { get; set; }

public readonly CharacterFile File;

public XDocument VariantFile { get; private set; }
Expand Down