Archived
1
0

Compare commits

..

No commits in common. "9f3632650f04ac601518c5a67be8cbe0be7b383c" and "3b43051200e5556593671020d1bfb4f7dee06b70" have entirely different histories.

6 changed files with 4 additions and 29 deletions

View File

@ -26,7 +26,7 @@ namespace NonaBGS.BGS {
public override string ToString() { public override string ToString() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat("Sold {0} worth of Cartographics Data", Credits.FormatCredits(TotalSum)); builder.AppendFormat("Sold {0} CR worth of Cartographics Data", TotalSum);
return builder.ToString(); return builder.ToString();
} }

View File

@ -22,7 +22,7 @@ namespace NonaBGS.BGS {
} }
public override string ToString() { public override string ToString() {
return string.Format("Sell Micro Resources: {0}", Credits.FormatCredits(TotalSum)); return string.Format("Sell Micro Resources: {0} CR", TotalSum);
} }
} }
} }

View File

@ -31,7 +31,7 @@ namespace NonaBGS.BGS {
public override string ToString() { public override string ToString() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat("{0} Vouchers: {1}", Type, Credits.FormatCredits(TotalSum)); builder.AppendFormat("{0} Vouchers: {1} CR", TotalSum, Type);
return builder.ToString(); return builder.ToString();
} }

View File

@ -1,21 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace NonaBGS.Journal {
public class Credits {
public static string FormatCredits(int amount) {
if ((amount % 1000000) == 0) {
amount /= 1000000;
return string.Format("{0}M CR", amount);
} else if ((amount % 1000) == 0) {
amount /= 1000;
return string.Format("{0}K CR", amount);
}
return string.Format("{0} CR", amount);
}
}
}

View File

@ -20,9 +20,7 @@ namespace NonaBGS.Journal {
*/ */
private static readonly Dictionary<string, string> humanreadable = new Dictionary<string, string> { private static readonly Dictionary<string, string> humanreadable = new Dictionary<string, string> {
{ "Mission_AltruismCredits_name", "Donate Credits" }, { "Mission_AltruismCredits_name", "Donate Credits" },
{ "Mission_AltruismCredits_Bust_name", "Donate Credits (Bust)" },
{ "Mission_Collect_name", "Collect" }, { "Mission_Collect_name", "Collect" },
{ "Mission_Courier_Democracy_name", "Courier (Democracy)" },
{ "Mission_Courier_Elections_name", "Courier (Elections)" }, { "Mission_Courier_Elections_name", "Courier (Elections)" },
{ "Mission_Courier_name", "Courier" }, { "Mission_Courier_name", "Courier" },
{ "Mission_Courier_RankEmp_name", "Courier (Empire)" }, { "Mission_Courier_RankEmp_name", "Courier (Empire)" },
@ -37,7 +35,6 @@ namespace NonaBGS.Journal {
{ "Mission_OnFoot_Onslaught_Offline_MB_name", "On Foot Onslaught (Offline)" }, { "Mission_OnFoot_Onslaught_Offline_MB_name", "On Foot Onslaught (Offline)" },
{ "Mission_OnFoot_RebootRestore_MB_name", "On Foot Reboot/Restore" }, { "Mission_OnFoot_RebootRestore_MB_name", "On Foot Reboot/Restore" },
{ "Mission_OnFoot_Reboot_MB_name", "On Foot Reboot" }, { "Mission_OnFoot_Reboot_MB_name", "On Foot Reboot" },
{ "Mission_OnFoot_Salvage_MB_name", "On Foot Salvage" },
{ "Mission_Rescue_Planet_name", "Planet Rescue" }, { "Mission_Rescue_Planet_name", "Planet Rescue" },
{ "Mission_Salvage_name", "Salvage" }, { "Mission_Salvage_name", "Salvage" },
{ "MISSION_Salvage_CivilUnrest_name", "Salvage (Civil Unrest)" }, { "MISSION_Salvage_CivilUnrest_name", "Salvage (Civil Unrest)" },
@ -101,7 +98,7 @@ namespace NonaBGS.Journal {
} }
if (donated > 0) { if (donated > 0) {
builder.AppendFormat(" ({0})", Credits.FormatCredits(donated)); builder.AppendFormat(" ({0} CR)", donated);
} }
readable_name = builder.ToString().Trim(); readable_name = builder.ToString().Trim();

View File

@ -75,7 +75,6 @@
<Compile Include="BGS\SellMicroResources.cs" /> <Compile Include="BGS\SellMicroResources.cs" />
<Compile Include="EDDB\PopulatedSystems.cs" /> <Compile Include="EDDB\PopulatedSystems.cs" />
<Compile Include="EDDB\Stations.cs" /> <Compile Include="EDDB\Stations.cs" />
<Compile Include="Journal\Credits.cs" />
<Compile Include="Journal\EliteDangerous.cs" /> <Compile Include="Journal\EliteDangerous.cs" />
<Compile Include="Journal\MarketSellEntry.cs" /> <Compile Include="Journal\MarketSellEntry.cs" />
<Compile Include="Journal\MultiSellExplorationDataEntry.cs" /> <Compile Include="Journal\MultiSellExplorationDataEntry.cs" />