diff --git a/AutoTrackR2/ConfigPage.xaml b/AutoTrackR2/ConfigPage.xaml index a6ad808..210257a 100644 --- a/AutoTrackR2/ConfigPage.xaml +++ b/AutoTrackR2/ConfigPage.xaml @@ -75,7 +75,7 @@ <TextBlock Text="Offline Mode:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,7,0,5"/> <Slider Name="OfflineModeSlider" Minimum="0" Maximum="1" TickFrequency="1" IsSnapToTickEnabled="True" Value="0" Style="{StaticResource ToggleSliderStyle}" Margin="12,-4,0,0" ValueChanged="OfflineModeSlider_ValueChanged"/> <TextBlock Text="OtherLog:" Foreground="{DynamicResource TextBrush}" FontSize="16" Margin="0,7,0,5"/> - <Slider Name="OtherLogSlider" Minimum="0" Maximum="1" TickFrequency="1" IsSnapToTickEnabled="True" Value="0" Style="{StaticResource ToggleSliderStyle}" Margin="10,-4,0,0" ValueChanged="OfflineModeSlider_ValueChanged"/> + <Slider Name="OtherLogSlider" Minimum="0" Maximum="1" TickFrequency="1" IsSnapToTickEnabled="True" Value="0" Style="{StaticResource ToggleSliderStyle}" Margin="22,-4,0,0" ValueChanged="OfflineModeSlider_ValueChanged"/> </StackPanel> <!-- 3-Position Toggle Slider --> diff --git a/AutoTrackR2/KillTrackR_MainScript.ps1 b/AutoTrackR2/KillTrackR_MainScript.ps1 index a8b65d1..97cf931 100644 --- a/AutoTrackR2/KillTrackR_MainScript.ps1 +++ b/AutoTrackR2/KillTrackR_MainScript.ps1 @@ -1,4 +1,4 @@ -$TrackRver = "2.06-mod" +$TrackRver = "2.06-koda-mod" # Path to the config file $appName = "AutoTrackR2" @@ -312,6 +312,7 @@ function Read-LogEntry { } #Define the Type + #kill IF ($agressorPilot -eq $global:userName -and $victimPilot -ne $global:userName){ $type = "Kill" Try { @@ -320,15 +321,23 @@ function Read-LogEntry { $page1 = $null $type = "none" } + #death }elseif ($agressorPilot -ne $global:userName -and $victimPilot -eq $global:userName) { - $type = "Death" - $victimShip = "unknown" + #acception for "unknown" + if ($agressorPilot -eq "unknown" -and $weapon -eq "unknown"){ + #$damageType = "snusnu" + $type = "Other" + } else { + $type = "Death" + } + $agressorShip = "unknown" Try { $page1 = Invoke-WebRequest -uri "https://robertsspaceindustries.com/citizens/$agressorPilot" } Catch { $page1 = $null $type = "none" } + #other }elseif($agressorPilot -eq $global:userName -or $victimPilot -eq $global:userName) { $type = "Other" }else { @@ -364,6 +373,7 @@ function Read-LogEntry { if ($damageType -eq "Bullet" -or $weapon -like "apar_special_ballistic*") { $ship = "Person" $victimShip = "Person" + $agressorShip = "Person" } If ($ship -match $cleanupPattern){ $ship = $matches[1] @@ -509,13 +519,13 @@ function Read-LogEntry { Type = $type KillTime = $killTime EnemyPilot = $agressorPilot - EnemyShip = $ship + EnemyShip = $agressorShip Enlisted = $joinDate2 RecordNumber = $citizenRecord OrgAffiliation = $enemyOrgs Player = $victimPilot Weapon = $weapon - Ship = $victimShip + Ship = $Ship Method = $damageType Mode = $global:GameMode GameVersion = $global:GameVersion @@ -532,7 +542,7 @@ function Read-LogEntry { #write Death $global:deathTally++ Write-Output "DeathTally=$global:deathTally" - Write-Output "NewDeath=throwaway,$agressorPilot,$ship,$enemyOrgs,$joinDate2,$citizenRecord,$killTime,$enemyPFP" + Write-Output "NewDeath=throwaway,$agressorPilot,$agressorShip,$enemyOrgs,$joinDate2,$citizenRecord,$killTime,$enemyPFP" #process Other data } elseif ($type -eq "Other" -and $otherLog -eq $true) { @@ -582,7 +592,7 @@ function Read-LogEntry { $sleeptimer = 10 # VisorWipe - If ($visorWipe -eq $true -and $victimShip -ne "Passenger" -and $damageType -notlike "*Bullet*" -and $type -ne "Other"){ + If ($visorWipe -eq $true -and $victimShip -ne "Passenger" -and $damageType -notlike "*Bullet*" -and $type -ne "Other"){ # send keybind for visorwipe start-sleep 1 $sleeptimer = $sleeptimer -1 diff --git a/AutoTrackR2/UpdatePage.xaml.cs b/AutoTrackR2/UpdatePage.xaml.cs index 37175f0..9fa4fa9 100644 --- a/AutoTrackR2/UpdatePage.xaml.cs +++ b/AutoTrackR2/UpdatePage.xaml.cs @@ -9,7 +9,7 @@ namespace AutoTrackR2 { public partial class UpdatePage : UserControl { - private string currentVersion = "v2.06-mod"; + private string currentVersion = "v2.06-koda-mod"; private string latestVersion; public UpdatePage()