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.

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

Dev > Main #31

Merged
merged 34 commits into from
May 6, 2024
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3e8afda
nameplate improvements
NickMillion May 4, 2024
369bbca
peripheral checks now properly handle up/down scaling
NickMillion May 4, 2024
144d9cd
actually reverting some performance things to make sure i have a func…
NickMillion May 4, 2024
f5bb82e
Fix friendly fire not working not working with grenades
Lacyway May 4, 2024
41fd2e7
Fix reference
Lacyway May 4, 2024
60f1301
cleanup/refactor + performance probably
NickMillion May 4, 2024
0ebeefd
Revert "cleanup/refactor + performance probably"
NickMillion May 4, 2024
16e918e
why are you like this git
NickMillion May 4, 2024
a8e5809
Merge branch 'dev' into dev
NickMillion May 4, 2024
210b183
Fix friendly fire logic
Lacyway May 5, 2024
04651fa
Prevent crash from RaidLeave failure
Lacyway May 5, 2024
280d258
Cleanup
Lacyway May 5, 2024
ee5f698
basic nameplate occlusion using existing isVisible check
NickMillion May 5, 2024
7587223
Removed occlusion setting, implemented throttled updates, all element…
NickMillion May 5, 2024
4d19a38
remove unused int
NickMillion May 5, 2024
4d59ea2
Merge branch 'project-fika:dev' into dev
NickMillion May 5, 2024
0427165
NamePlate -> Name Plate to make Lacy happy
NickMillion May 5, 2024
da3184c
Merge pull request #25 from NickMillion/dev
Lacyway May 5, 2024
79a678f
WIP NetId resync
Lacyway May 5, 2024
4a4124a
Test before setting new NetId
Lacyway May 6, 2024
5048f81
Log NetId assignment
Lacyway May 6, 2024
2fe957d
WIP Allow pinging when moving
Lacyway May 6, 2024
28522fc
Ping servers before attempting to connect
Lacyway May 6, 2024
6bd3924
Cleanup
Lacyway May 6, 2024
5421dea
Update loggers
Lacyway May 6, 2024
ace8093
More logging in CoopHandler
Lacyway May 6, 2024
81361c0
More logging in Fika Client
Lacyway May 6, 2024
df2041d
Assign standard NetId of 1000 to clients
Lacyway May 6, 2024
6273364
Ping for 3 seconds rather than 5 ticks
Lacyway May 6, 2024
537b823
Improve health bar update
Lacyway May 6, 2024
248cf1b
Explicit vars
Lacyway May 6, 2024
e94466b
More explicit vars
Lacyway May 6, 2024
ad8406e
Update extract text when using modifiers
Lacyway May 6, 2024
00275b8
3s > 5s timeout
Lacyway May 6, 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
26 changes: 13 additions & 13 deletions Fika.Core/FikaPlugin.cs
Original file line number Diff line number Diff line change
@@ -106,7 +106,7 @@ public class FikaPlugin : BaseUnityPlugin
public static ConfigEntry<int> FasterInventoryScrollSpeed { get; set; }
public static ConfigEntry<KeyboardShortcut> ExtractKey { get; set; }

// Coop | NamePlates
// Coop | Name Plates
public static ConfigEntry<bool> UseNamePlates { get; set; }
public static ConfigEntry<bool> HideHealthBar { get; set; }
public static ConfigEntry<bool> UseHealthNumber { get; set; }
@@ -265,29 +265,29 @@ private void SetupConfig()

ExtractKey = Config.Bind("Coop", "Extract Key", new KeyboardShortcut(KeyCode.F8), new ConfigDescription("The key used to extract from the raid.", tags: new ConfigurationManagerAttributes() { Order = 1 }));

// Coop | NamePlates
// Coop | Name Plates

UseNamePlates = Config.Bind("Coop | NamePlates", "Show Player Name Plates", false, new ConfigDescription("Toggle Health-Bars & Names.", tags: new ConfigurationManagerAttributes() { Order = 10 }));
UseNamePlates = Config.Bind("Coop | Name Plates", "Show Player Name Plates", false, new ConfigDescription("Toggle Health-Bars & Names.", tags: new ConfigurationManagerAttributes() { Order = 10 }));

HideHealthBar = Config.Bind("Coop | NamePlates", "Hide Health Bar", false, new ConfigDescription("Completely hides the health bar.", tags: new ConfigurationManagerAttributes() { Order = 9 }));
HideHealthBar = Config.Bind("Coop | Name Plates", "Hide Health Bar", false, new ConfigDescription("Completely hides the health bar.", tags: new ConfigurationManagerAttributes() { Order = 9 }));

UseHealthNumber = Config.Bind("Coop | NamePlates", "Show HP% instead of bar", false, new ConfigDescription("Shows health in % amount instead of using the bar.", tags: new ConfigurationManagerAttributes() { Order = 8 }));
UseHealthNumber = Config.Bind("Coop | Name Plates", "Show HP% instead of bar", false, new ConfigDescription("Shows health in % amount instead of using the bar.", tags: new ConfigurationManagerAttributes() { Order = 8 }));

UsePlateFactionSide = Config.Bind("Coop | NamePlates", "Show Player Faction Icon", true, new ConfigDescription("Shows the player faction icon next to the HP bar.", tags: new ConfigurationManagerAttributes() { Order = 7 }));
UsePlateFactionSide = Config.Bind("Coop | Name Plates", "Show Player Faction Icon", true, new ConfigDescription("Shows the player faction icon next to the HP bar.", tags: new ConfigurationManagerAttributes() { Order = 7 }));

HideNamePlateInOptic = Config.Bind("Coop | NamePlates", "Hide Name Plate in Optic", true, new ConfigDescription("Hides the name plate when viewing through PiP scopes since it's kinda janky.", tags: new ConfigurationManagerAttributes() { Order = 6 }));
HideNamePlateInOptic = Config.Bind("Coop | Name Plates", "Hide Name Plate in Optic", true, new ConfigDescription("Hides the name plate when viewing through PiP scopes since it's kinda janky.", tags: new ConfigurationManagerAttributes() { Order = 6 }));

DecreaseOpacityNotLookingAt = Config.Bind("Coop | NamePlates", "Decrease Opacity In Peripheral", true, new ConfigDescription("Decreases the opacity of the name plates when not looking at a player.", tags: new ConfigurationManagerAttributes() { Order = 5 }));
DecreaseOpacityNotLookingAt = Config.Bind("Coop | Name Plates", "Decrease Opacity In Peripheral", true, new ConfigDescription("Decreases the opacity of the name plates when not looking at a player.", tags: new ConfigurationManagerAttributes() { Order = 5 }));

NamePlateScale = Config.Bind("Coop | NamePlates", "Name Plate Scale", 0.22f, new ConfigDescription("Size of the name plates", new AcceptableValueRange<float>(0.05f, 1f), new ConfigurationManagerAttributes() { Order = 4 }));
NamePlateScale = Config.Bind("Coop | Name Plates", "Name Plate Scale", 0.22f, new ConfigDescription("Size of the name plates", new AcceptableValueRange<float>(0.05f, 1f), new ConfigurationManagerAttributes() { Order = 4 }));

OpacityInADS = Config.Bind("Coop | NamePlates", "Opacity in ADS", 0.75f, new ConfigDescription("The opacity of the name plates when aiming down sights.", new AcceptableValueRange<float>(0.1f, 1f), new ConfigurationManagerAttributes() { Order = 3 }));
OpacityInADS = Config.Bind("Coop | Name Plates", "Opacity in ADS", 0.75f, new ConfigDescription("The opacity of the name plates when aiming down sights.", new AcceptableValueRange<float>(0.1f, 1f), new ConfigurationManagerAttributes() { Order = 3 }));

MaxDistanceToShow = Config.Bind("Coop | NamePlates", "Max Distance to Show", 500f, new ConfigDescription("The maximum distance at which name plates will become invisible, starts to fade at half the input value.", new AcceptableValueRange<float>(10f, 1000f), new ConfigurationManagerAttributes() { Order = 2 }));
MaxDistanceToShow = Config.Bind("Coop | Name Plates", "Max Distance to Show", 500f, new ConfigDescription("The maximum distance at which name plates will become invisible, starts to fade at half the input value.", new AcceptableValueRange<float>(10f, 1000f), new ConfigurationManagerAttributes() { Order = 2 }));

MinimumOpacity = Config.Bind("Coop | NamePlates", "Minimum Opacity", 0.1f, new ConfigDescription("The minimum opacity of the name plates.", new AcceptableValueRange<float>(0.0f, 1f), new ConfigurationManagerAttributes() { Order = 1 }));
MinimumOpacity = Config.Bind("Coop | Name Plates", "Minimum Opacity", 0.1f, new ConfigDescription("The minimum opacity of the name plates.", new AcceptableValueRange<float>(0.0f, 1f), new ConfigurationManagerAttributes() { Order = 1 }));

MinimumNamePlateScale = Config.Bind("Coop | NamePlates", "Minimum Name Plate Scale", 0.01f, new ConfigDescription("The minimum scale of the name plates.", new AcceptableValueRange<float>(0.0f, 1f), new ConfigurationManagerAttributes() { Order = 0 }));
MinimumNamePlateScale = Config.Bind("Coop | Name Plates", "Minimum Name Plate Scale", 0.01f, new ConfigDescription("The minimum scale of the name plates.", new AcceptableValueRange<float>(0.0f, 1f), new ConfigurationManagerAttributes() { Order = 0 }));

// Coop | Custom