change "on foot" to "ground"
This commit is contained in:
parent
f0977b774b
commit
f14982f37a
@ -3,15 +3,40 @@ using System.Linq;
|
|||||||
|
|
||||||
namespace EDPlayerJournal.BGS;
|
namespace EDPlayerJournal.BGS;
|
||||||
public class CombatZone : Transaction {
|
public class CombatZone : Transaction {
|
||||||
|
/// <summary>
|
||||||
|
/// Type string for ground combat zone
|
||||||
|
/// </summary>
|
||||||
|
public static readonly string GroundCombatZone = "Ground";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Type string for ship combat zones
|
||||||
|
/// </summary>
|
||||||
|
public static readonly string ShipCombatZone = "Ship";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Difficulty low
|
||||||
|
/// </summary>
|
||||||
|
public static readonly string DifficultyLow = "Low";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Difficulty medium
|
||||||
|
/// </summary>
|
||||||
|
public static readonly string DifficultyMedium = "Medium";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Difficulty high
|
||||||
|
/// </summary>
|
||||||
|
public static readonly string DifficultyHigh = "High";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Type, either on foot or ship
|
/// Type, either on foot or ship
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Type { get; set; } = "Ship";
|
public string Type { get; set; } = ShipCombatZone;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Difficulty type, low, medium or high.
|
/// Difficulty type, low, medium or high.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Grade { get; set; } = "Low";
|
public string Grade { get; set; } = DifficultyLow;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Whether spec ops were won.
|
/// Whether spec ops were won.
|
||||||
@ -52,14 +77,14 @@ public class CombatZone : Transaction {
|
|||||||
/// Returns true if it is an on foot/ground combat zone
|
/// Returns true if it is an on foot/ground combat zone
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsGround {
|
public bool IsGround {
|
||||||
get { return string.Compare(Type, "On Foot") == 0; }
|
get { return string.Compare(Type, GroundCombatZone) == 0; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Returns true if it is an on foot combat zone
|
/// Returns true if it is an on foot combat zone
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsShip {
|
public bool IsShip {
|
||||||
get { return string.Compare(Type, "Ship") == 0; }
|
get { return string.Compare(Type, ShipCombatZone) == 0; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public override int CompareTo(Transaction? obj) {
|
public override int CompareTo(Transaction? obj) {
|
||||||
|
@ -57,7 +57,7 @@ internal class TransactionParserContext {
|
|||||||
public Dictionary<string, long> BuyCost = new();
|
public Dictionary<string, long> BuyCost = new();
|
||||||
|
|
||||||
public void DiscernCombatZone(TransactionList transactions, Entry e) {
|
public void DiscernCombatZone(TransactionList transactions, Entry e) {
|
||||||
string grade = "Low";
|
string grade = CombatZone.DifficultyLow;
|
||||||
string cztype;
|
string cztype;
|
||||||
ulong? highest = HighestCombatBond;
|
ulong? highest = HighestCombatBond;
|
||||||
|
|
||||||
@ -66,40 +66,40 @@ internal class TransactionParserContext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (OnFootKills > 0) {
|
if (OnFootKills > 0) {
|
||||||
cztype = "On Foot";
|
cztype = CombatZone.GroundCombatZone;
|
||||||
// High on foot combat zones have enforcers that bring 80k a pop
|
// High on foot combat zones have enforcers that bring 80k a pop
|
||||||
if (highest >= 80000) {
|
if (highest >= 80000) {
|
||||||
grade = "High";
|
grade = CombatZone.DifficultyHigh;
|
||||||
} else if (highest >= 40000) {
|
} else if (highest >= 40000) {
|
||||||
grade = "Medium";
|
grade = CombatZone.DifficultyMedium;
|
||||||
} else {
|
} else {
|
||||||
grade = "Low";
|
grade = CombatZone.DifficultyLow;
|
||||||
}
|
}
|
||||||
} else if (ShipKills > 0) {
|
} else if (ShipKills > 0) {
|
||||||
// Ship combat zones can be identified by the amount of kills
|
// Ship combat zones can be identified by the amount of kills
|
||||||
if (ShipKills > 20) {
|
if (ShipKills > 20) {
|
||||||
grade = "High";
|
grade = CombatZone.DifficultyHigh;
|
||||||
} else if (ShipKills > 10) {
|
} else if (ShipKills > 10) {
|
||||||
grade = "Medium";
|
grade = CombatZone.DifficultyMedium;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Cap ship, means a high conflict zone
|
// Cap ship, means a high conflict zone
|
||||||
if (HaveSeenCapShip) {
|
if (HaveSeenCapShip) {
|
||||||
grade = "High";
|
grade = CombatZone.DifficultyHigh;
|
||||||
} else {
|
} else {
|
||||||
int warzoneNpcs = new List<bool>() { HaveSeenCaptain, HaveSeenCorrespondent, HaveSeenSpecOps }
|
int warzoneNpcs = new List<bool>() { HaveSeenCaptain, HaveSeenCorrespondent, HaveSeenSpecOps }
|
||||||
.Where(x => x == true)
|
.Where(x => x == true)
|
||||||
.Count()
|
.Count()
|
||||||
;
|
;
|
||||||
|
|
||||||
if (warzoneNpcs >= 2 && grade != "High") {
|
if (warzoneNpcs >= 2 && grade != CombatZone.DifficultyHigh) {
|
||||||
// Only large combat zones have two NPCs
|
// Only large combat zones have two NPCs
|
||||||
grade = "High";
|
grade = CombatZone.DifficultyHigh;
|
||||||
} else if (warzoneNpcs >= 1 && grade == "Low") {
|
} else if (warzoneNpcs >= 1 && grade == CombatZone.DifficultyLow) {
|
||||||
grade = "Medium";
|
grade = CombatZone.DifficultyMedium;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cztype = "Ship";
|
cztype = CombatZone.ShipCombatZone;
|
||||||
} else {
|
} else {
|
||||||
transactions.AddIncomplete(new CombatZone(), "Failed to discern combat zone type");
|
transactions.AddIncomplete(new CombatZone(), "Failed to discern combat zone type");
|
||||||
return;
|
return;
|
||||||
|
@ -108,7 +108,7 @@
|
|||||||
<Separator Margin="2,0,2,0" VerticalAlignment="Top"/>
|
<Separator Margin="2,0,2,0" VerticalAlignment="Top"/>
|
||||||
<Button Content="High" x:Name="High" Click="High_Click"/>
|
<Button Content="High" x:Name="High" Click="High_Click"/>
|
||||||
<Separator Margin="2,0,2,0" VerticalAlignment="Top"/>
|
<Separator Margin="2,0,2,0" VerticalAlignment="Top"/>
|
||||||
<Button Content="On Foot" x:Name="OnFoot" Click="OnFoot_Click"/>
|
<Button Content="Ground" x:Name="Ground" Click="Ground_Click"/>
|
||||||
<Separator Margin="2,0,2,0" VerticalAlignment="Top"/>
|
<Separator Margin="2,0,2,0" VerticalAlignment="Top"/>
|
||||||
<Button Content="Ship" x:Name="Ship" Click="Ship_Click"/>
|
<Button Content="Ship" x:Name="Ship" Click="Ship_Click"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
@ -285,7 +285,7 @@ public partial class MainWindow : Window {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
transaction.Grade = "Low";
|
transaction.Grade = CombatZone.DifficultyLow;
|
||||||
RefreshView();
|
RefreshView();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -295,7 +295,7 @@ public partial class MainWindow : Window {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
transaction.Grade = "Medium";
|
transaction.Grade = CombatZone.DifficultyMedium;
|
||||||
RefreshView();
|
RefreshView();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -305,17 +305,17 @@ public partial class MainWindow : Window {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
transaction.Grade = "High";
|
transaction.Grade = CombatZone.DifficultyHigh;
|
||||||
RefreshView();
|
RefreshView();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnFoot_Click(object sender, RoutedEventArgs e) {
|
private void Ground_Click(object sender, RoutedEventArgs e) {
|
||||||
CombatZone transaction = GetTransaction<CombatZone>(sender);
|
CombatZone transaction = GetTransaction<CombatZone>(sender);
|
||||||
if (transaction == null) {
|
if (transaction == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
transaction.Type = "On Foot";
|
transaction.Type = CombatZone.GroundCombatZone;
|
||||||
RefreshView();
|
RefreshView();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -325,7 +325,7 @@ public partial class MainWindow : Window {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
transaction.Type = "Ship";
|
transaction.Type = CombatZone.ShipCombatZone;
|
||||||
RefreshView();
|
RefreshView();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user