GuillaumeHemmen/AutoTrackR2
1
0
Fork 0
mirror of https://github.com/BubbaGumpShrump/AutoTrackR2.git synced 2025-05-04 01:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'BubbaGumpShrump:default' into default

Browse source
This commit is contained in:
Heavy Bob 2025-04-05 23:03:35 +11:00 • committed by GitHub
commit e5f968633d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 32 additions and 28 deletions

BIN
AutoTrackR2/Assets/HEX.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

(image error) Size: 68 KiB

After

(image error) Size: 297 KiB

Before After
Before After

BIN
AutoTrackR2/Assets/IP.png Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 618 KiB

9
AutoTrackR2/AutoTrackR2.csproj
View file

@ -45,6 +45,12 @@
<Resource Include="Assets\Gankhub.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\HEX.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\IP.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\NMOS.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
@ -72,9 +78,6 @@
<Resource Include="Assets\AutoTrackR.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\HEX.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Assets\HIT.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>

2
AutoTrackR2/ConfigPage.xaml
View file

@ -77,7 +77,7 @@
<TextBlock Text="Theme:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,7,0,5"/>
<Slider x:Name="ThemeSlider"
Minimum="0"
Maximum="20"
Maximum="21"
Value="0"
TickFrequency="1"
IsSnapToTickEnabled="True"

10
AutoTrackR2/ConfigPage.xaml.cs
View file

@ -341,6 +341,16 @@ namespace AutoTrackR2
);
ChangeLogo("/Assets/Gankhub.png");
break;
case 21: // IronPoint
UpdateThemeColors(
(Color)ColorConverter.ConvertFromString("#C83300"), // Accent/Border
(Color)ColorConverter.ConvertFromString("#2D2D2D"), // Button
(Color)ColorConverter.ConvertFromString("#161515"), // Background
(Color)ColorConverter.ConvertFromString("#ffffff"), // Text
(Color)ColorConverter.ConvertFromString("#aaaaaa") // AltText
);
ChangeLogo("/Assets/IP.png", (Color)ColorConverter.ConvertFromString("#3F1210"));
break;
}
}

37
AutoTrackR2/KillTrackR_MainScript.ps1
View file

@ -89,9 +89,9 @@ $prefixes = @(
# Define the regex pattern to extract information
$killPattern = "<Actor Death> CActor::Kill: '(?<EnemyPilot>[^']+)' \[\d+\] in zone '(?<EnemyShip>[^']+)' killed by '(?<Player>[^']+)' \[[^']+\] using '(?<Weapon>[^']+)' \[Class (?<Class>[^\]]+)\] with damage type '(?<DamageType>[^']+)'"
$puPattern = '<\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z> \[Notice\] <ContextEstablisherTaskFinished> establisher="CReplicationModel" message="CET completed" taskname="StopLoadingScreen" state=[^ ]+ status="Finished" runningTime=\d+\.\d+ numRuns=\d+ map="megamap" gamerules="SC_Default" sessionId="[a-f0-9\-]+" \[Team_Network\]\[Network\]\[Replication\]\[Loading\]\[Persistence\]'
$acPattern = "ArenaCommanderFeature"
$loadoutPattern = '\[InstancedInterior\] OnEntityLeaveZone - InstancedInterior \[(?<InstancedInterior>[^\]]+)\] \[\d+\] -> Entity \[(?<Entity>[^\]]+)\] \[\d+\] -- m_openDoors\[\d+\], m_managerGEID\[(?<ManagerGEID>\d+)\], m_ownerGEID\[(?<OwnerGEID>[^\[]+)\]'
$puPattern = '<\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z> \[Notice\] <ContextEstablisherTaskFinished> establisher="CReplicationModel" message="CET completed" taskname="StopLoadingScreen" state=[^\s()]+\(\d+\) status="Finished" runningTime=\d+\.\d+ numRuns=\d+ map="megamap" gamerules="SC_Default" sessionId="[a-f0-9\-]+" \[Team_Network\]\[Network\]\[Replication\]\[Loading\]\[Persistence\]'
$loadoutPattern = '<Jump Drive State Changed>.*.adam: (?<ShipName>.*.) in'
$acPattern = "Requesting Mode Change" # "ArenaCommanderFeature"
$shipManPattern = "^(" + ($prefixes -join "|") + ")"
# $loginPattern = "\[Notice\] <AccountLoginCharacterStatus_Character> Character: createdAt [A-Za-z0-9]+ - updatedAt [A-Za-z0-9]+ - geid [A-Za-z0-9]+ - accountId [A-Za-z0-9]+ - name (?<Player>[A-Za-z0-9_-]+) - state STATE_CURRENT" # KEEP THIS INCASE LEGACY LOGIN IS REMOVED
$loginPattern = "\[Notice\] <Legacy login response> \[CIG-net\] User Login Success - Handle\[(?<Player>[A-Za-z0-9_-]+)\]"
@ -148,19 +148,13 @@ Do {
}
# Get Loadout
if ($line -match $loadoutPattern) {
$entity = $matches['Entity']
$ownerGEID = $matches['OwnerGEID']
If ($ownerGEID -eq $global:userName -and $entity -match $shipManPattern) {
$tryloadOut = $entity
If ($tryloadOut -match $cleanupPattern){
If ($matches['ShipName'] -match $cleanupPattern){
if ($null -ne $matches[1]){
$global:loadOut = $matches[1]
}
}
}
}
Write-Output "PlayerShip=$global:loadOut"
}
Write-Output "PlayerShip=$global:loadOut"
If ($line -match $versionPattern){
$global:GameVersion = $matches['gameversion']
@ -465,18 +459,15 @@ function Read-LogEntry {
}
#Set loadout
if ($line -match $loadoutPattern) {
$entity = $matches['Entity']
$ownerGEID = $matches['OwnerGEID']
if ($line -match $loadoutPattern) {
If ($matches['ShipName'] -match $cleanupPattern){
if ($null -ne $matches[1]){
$global:loadOut = $matches[1]
}
}
Write-Output "PlayerShip=$global:loadOut"
}
If ($ownerGEID -eq $global:userName -and $entity -match $shipManPattern) {
$tryloadOut = $entity
If ($tryloadOut -match $cleanupPattern){
$global:loadOut = $matches[1]
}
Write-Output "PlayerShip=$global:loadOut"
}
}
}

2
AutoTrackR2/UpdatePage.xaml.cs
View file

@ -9,7 +9,7 @@ namespace AutoTrackR2
{
public partial class UpdatePage : UserControl
{
private string currentVersion = "v2.06-stable";
private string currentVersion = "v2.08";
private string latestVersion;
public UpdatePage()