florian/edjournal
1
0
Fork 0
Code Releases Activity

Compare commits

base: florian:ff41f79dd8c7f76a048182c462843660c78bf589
Branches Tags
florian:master
..
compare: florian:d82d672df6888789167829231d230be33a967722
Branches Tags
florian:master

No commits in common. "ff41f79dd8c7f76a048182c462843660c78bf589" and "d82d672df6888789167829231d230be33a967722" have entirely different histories.
ff41f79dd8 ... d82d672df6

5 changed files with 2 additions and 49 deletions
Show Stats Expand all files Collapse all files

16
Credits.cs
View File

@ -3,25 +3,13 @@
namespace EDJournal {
public class Credits {
public static string FormatCredits(int amount) {
return FormatCredits((long)amount);
}
public static string FormatCredits(long amount) {
var format = new CultureInfo(CultureInfo.CurrentCulture.Name, true).NumberFormat;
format.NumberGroupSeparator = ",";
format.NumberDecimalSeparator = ".";
format.NumberGroupSizes = new int[1] { 3 };
format.NumberDecimalDigits = 1;
if (amount > 0 && (amount % 1000000000) == 0) {
amount /= 1000000000;
return string.Format("{0}M CR", amount.ToString("N", format));
} else if (amount > 0 && (amount % 1000000) == 0) {
format.NumberDecimalDigits = 0;
if (amount > 0 && (amount % 1000000) == 0) {
amount /= 1000000;
return string.Format("{0}M CR", amount.ToString("N", format));
} else if (amount > 0 && (amount % 100000) == 0) {
double am = ((double)amount) / 1000000;
format.NumberDecimalDigits = 1;
return string.Format("{0}M CR", am.ToString("N", format));
} else if (amount > 0 && (amount % 1000) == 0) {
amount /= 1000;
return string.Format("{0}K CR", amount.ToString("N", format));

1
Entry.cs
View File

@ -29,7 +29,6 @@ namespace EDJournal {
{ Events.MissionRedirected, typeof(MissionRedirectedEntry) },
{ Events.MultiSellExplorationData, typeof(MultiSellExplorationDataEntry) },
{ Events.RedeemVoucher, typeof(RedeemVoucherEntry) },
{ Events.SellExplorationData, typeof(SellExplorationDataEntry) },
{ Events.SellMicroResources, typeof(SellMicroResourcesEntry) },
{ Events.ShieldState, typeof(ShieldStateEntry) },
{ Events.ShipTargeted, typeof(ShipTargetedEntry) },

1
Events.cs
View File

@ -18,7 +18,6 @@
public static readonly string MissionRedirected = "MissionRedirected";
public static readonly string MultiSellExplorationData = "MultiSellExplorationData";
public static readonly string RedeemVoucher = "RedeemVoucher";
public static readonly string SellExplorationData = "SellExplorationData";
public static readonly string SellMicroResources = "SellMicroResources";
public static readonly string ShieldState = "ShieldState";
public static readonly string ShipTargeted = "ShipTargeted";

32
SellExplorationDataEntry.cs
View File

@ -1,32 +0,0 @@
using System.Collections.Generic;
using Newtonsoft.Json.Linq;
using System.Linq;
namespace EDJournal {
public class SellExplorationDataEntry : Entry {
private List<string> systems = new List<string>();
private List<string> discovered = new List<string>();
public long BaseValue { get; set; }
public long Bonus { get; set; }
public long TotalEarnings { get; set; }
public List<string> Systems => systems;
public List<string> Discovered => discovered;
protected override void Initialise() {
BaseValue = JSON.Value<long?>("BaseValue") ?? 0;
Bonus = JSON.Value<long?>("Bonus") ?? 0;
TotalEarnings = JSON.Value<long?>("TotalEarnings") ?? 0;
var sys = JSON.Value<JArray>("Systems");
if (sys != null) {
systems = sys.Select(x => x.ToString()).ToList<string>();
}
var dis = JSON.Value<JArray>("Discovered");
if (dis != null) {
discovered = dis.Select(x => x.ToString()).ToList<string>();
}
}
}
}

1
edjournal.csproj
View File

@ -68,7 +68,6 @@
<Compile Include="PlayerJournal.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RedeemVoucherEntry.cs" />
<Compile Include="SellExplorationDataEntry.cs" />
<Compile Include="SellMicroResourcesEntry.cs" />
<Compile Include="ShieldStateEntry.cs" />
<Compile Include="ShipTargetedEntry.cs" />