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

[WIP] Support for upcoming SPT 3.10, using EFT 0.15.2.32757 #576

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
e9b9c2c
Proto for upcoming spt release
sailro Sep 4, 2024
8f683dd
Rewrite
sailro Sep 4, 2024
8d66285
Fix instant-reveal
sailro Sep 5, 2024
46d5b52
Remove unused namespaces
sailro Sep 5, 2024
cbd927f
Removve newline
sailro Sep 5, 2024
4b64f36
Only enable when needed
sailro Sep 5, 2024
0036089
Fix wishlist
sailro Sep 6, 2024
c8f9897
Add an option to track the auto-wishlist
sailro Sep 6, 2024
61e341f
Add `spawnhi` command
sailro Sep 6, 2024
d17130f
Reword/consistency, do not use `wallhack` term anymore.
sailro Sep 9, 2024
bc0d583
Update Strings.zh-cn.resx
sailro Sep 9, 2024
35b9861
Update Strings.zh-cn.resx
sailro Sep 10, 2024
0ae1c64
Merge pull request #561 from sailro/wallhack-to-players
sailro Sep 10, 2024
c7b1e1b
Add noflash feature
sailro Sep 10, 2024
0570c89
Update readme
sailro Sep 10, 2024
6cb895b
Merge pull request #562 from sailro/noflash
sailro Sep 11, 2024
4169c94
Refine installer
sailro Sep 11, 2024
c728c4d
Improve prompt
sailro Sep 12, 2024
798cbb0
Bump installer version
sailro Sep 12, 2024
91ded69
Check if the version is supported
sailro Sep 12, 2024
fbf6616
Faster branch check
sailro Sep 12, 2024
0d219d9
Refine implementation
sailro Sep 13, 2024
a78e85d
Merge pull request #563 from sailro/refine-installer
sailro Sep 13, 2024
de3c698
Reword
sailro Sep 16, 2024
8d12206
Detect SPT-AKI install locations from MUI cache
sailro Sep 17, 2024
1691856
handle 'The variable 'e' is declared but never used'
sailro Sep 17, 2024
5ce1bae
Merge pull request #566 from sailro/muicache
sailro Sep 17, 2024
52f2fc4
Bump installer version
sailro Sep 17, 2024
f7e2847
Minor fixes
sailro Sep 23, 2024
532768d
Add extra setup for spawned items
sailro Sep 25, 2024
7533eb4
Merge pull request #570 from sailro/setup-items
sailro Sep 26, 2024
fa1c0f2
Update readme
sailro Sep 27, 2024
bb59f45
Triggers a mortar strike at the player's location
sailro Sep 27, 2024
0ec5e85
Merge pull request #572 from sailro/mortar
sailro Sep 28, 2024
21da983
Improve spawn
sailro Sep 29, 2024
e8be903
Merge pull request #573 from sailro/better-spawn
sailro Sep 30, 2024
f115e22
Triggers an airdrop at the player's location
sailro Sep 30, 2024
0ed1cab
Simplify
sailro Sep 30, 2024
e0f6c0d
Comment is now incorrect
sailro Sep 30, 2024
dc27e4d
Merge pull request #574 from sailro/airdrop
sailro Oct 1, 2024
78eaa8e
Bump Microsoft.CodeAnalysis.Analyzers in the roslyn group
dependabot[bot] Oct 7, 2024
2e4c206
Merge pull request #579 from sailro/dependabot/nuget/roslyn-31eff403df
sailro Oct 8, 2024
1c6773f
Fix translation
sailro Oct 24, 2024
9f80c94
Enable IAmDevShowMeLogs
sailro Oct 24, 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
14 changes: 11 additions & 3 deletions Features/LootItems.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using EFT.Trainer.Configuration;
using EFT.Trainer.Extensions;
using EFT.Trainer.Properties;
using EFT.UI;
using JsonType;
using UnityEngine;

Expand Down Expand Up @@ -39,6 +38,9 @@ internal class LootItems : PointOfInterests
[ConfigurationProperty]
public bool TrackWishlist { get; set; } = false;

[ConfigurationProperty]
public bool TrackAutoWishlist { get; set; } = false;

public override float CacheTimeInSec { get; set; } = 3f;
public override Color GroupingColor => Color;

Expand Down Expand Up @@ -71,7 +73,7 @@ public bool UnTrack(string lootname)

private HashSet<string> RefreshWishlist()
{
if (!TrackWishlist)
if (!TrackWishlist && !TrackAutoWishlist)
return [];

var player = GameState.Current?.LocalPlayer;
Expand All @@ -82,7 +84,13 @@ private HashSet<string> RefreshWishlist()
if (manager == null)
return [];

return [.. manager.UserItems.Keys];
return TrackWishlist switch
{
true when TrackAutoWishlist => [.. manager.GetWishlist().Keys], // this will get user items + auto-add hideout items if enabled in settings
true when !TrackAutoWishlist => [.. manager.UserItems.Keys], // this will get user items only
false when TrackAutoWishlist => [.. manager.GetWishlist().Keys.Except(manager.UserItems.Keys)],
_ => []
};
}

public override void RefreshData(List<PointOfInterest> data)
Expand Down
1 change: 0 additions & 1 deletion Features/PointOfInterests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using EFT.Trainer.Configuration;
using EFT.Trainer.Extensions;
using EFT.Trainer.Properties;
Expand Down
9 changes: 9 additions & 0 deletions Properties/Strings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Properties/Strings.fr.resx
Original file line number Diff line number Diff line change
Expand Up @@ -937,4 +937,7 @@ Les couleurs sont stockées sous la forme d'un tableau de valeurs flottantes 'RG
<data name="CommandSpawnQuestItems" xml:space="preserve">
<value>spawnqi</value>
</data>
<data name="PropertyTrackAutoWishlist" xml:space="preserve">
<value>Suivre la liste de souhaits auto</value>
</data>
</root>
3 changes: 3 additions & 0 deletions Properties/Strings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -937,4 +937,7 @@ Colors are stored as an array of 'RGBA' floats</value>
<data name="CommandSpawnQuestItems" xml:space="preserve">
<value>spawnqi</value>
</data>
<data name="PropertyTrackAutoWishlist" xml:space="preserve">
<value>Track Auto Wishlist</value>
</data>
</root>
3 changes: 3 additions & 0 deletions Properties/Strings.zh-cn.resx
sailro marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -938,4 +938,7 @@
<data name="CommandSpawnQuestItems" xml:space="preserve">
<value>spawnqi</value>
</data>
<data name="PropertyTrackAutoWishlist" xml:space="preserve">
<value>跟踪汽车愿望清单</value>
</data>
</root>