diff --git a/src/Decentralized/ModFiles/Localization/en.csv b/src/Decentralized/ModFiles/Localization/en.csv index 63ca15b..1c48c90 100644 --- a/src/Decentralized/ModFiles/Localization/en.csv +++ b/src/Decentralized/ModFiles/Localization/en.csv @@ -294,10 +294,8 @@ nightlog.bm.sale_rug,"Black market: the platform rugged; your {0} and the payout black.sub.sell,Sell black.sell.h,Sell black.sell.mult,"Price x{0}" -black.sell.info,"Price {0} ~{1} days to sell payout tainted {2}% of the time ({3}% of it)" black.sell.list,List black.sell.none,Nothing sellable in storage. -black.sell.ref,"Ref {0}" black.sell.listed,"Listed: {0} at {1}." black.sell.delist,Take down black.sell.rating,"Rating {0}%" diff --git a/src/Decentralized/ModFiles/Localization/zh.csv b/src/Decentralized/ModFiles/Localization/zh.csv index 8cf1083..03fd2df 100644 --- a/src/Decentralized/ModFiles/Localization/zh.csv +++ b/src/Decentralized/ModFiles/Localization/zh.csv @@ -293,10 +293,8 @@ nightlog.bm.sale_rug,"黑市:平台跑路,你的 {0} 和货款({1})没 black.sub.sell,出售 black.sell.h,出售 black.sell.mult,"标价 ×{0}" -black.sell.info,"标价 {0} 约 {1} 天成交 货款带污点 {2}%(比例 {3}%)" black.sell.list,上架 black.sell.none,储藏区里没有能卖的货。 -black.sell.ref,"参考价 {0}" black.sell.listed,"已上架:{0},标价 {1}。" black.sell.delist,撤下 black.sell.rating,"好评 {0}%" diff --git a/src/Decentralized/TerminalWindow.cs b/src/Decentralized/TerminalWindow.cs index f292753..a919b8e 100644 --- a/src/Decentralized/TerminalWindow.cs +++ b/src/Decentralized/TerminalWindow.cs @@ -374,8 +374,7 @@ namespace Decentralized b.AddButton(Math.Abs(mult - _sellMult) < 1e-9 ? $"[×{n}]" : "×" + n, () => { _sellMult = mult; Open(); }); } b.End(); - b.AddLabel(L.T("black.sell.info", "×" + _sellMult.ToString("0.0", CultureInfo.InvariantCulture), (int)Math.Round(BlackMarket.ExpectedDays(_sellMult)), (int)Math.Round(BlackMarket.TaintChance(_sellMult) * 100), (int)Math.Round(BlackMarket.TaintRatio(_sellMult) * 100)) + " " + L.T("black.sell.rating", d.Black.Rating)); - b.AddLabel(L.T("mixer.balance", _payAsset, Fmt.Num(d.Hot.Avail(_payAsset)))); + b.AddLabel(L.T("mixer.balance", _payAsset, Fmt.Num(d.Hot.Avail(_payAsset))) + " " + L.T("black.sell.rating", d.Black.Rating)); b.AddSeparator(); var items = BlackDelivery.Sellable(); if (items.Count == 0) { b.AddLabel(L.T("black.sell.none")); return; } @@ -390,7 +389,7 @@ namespace Decentralized }).Select(x => { SellCards[x.g] = x.it; return x.g; }).ToList(), (c, g) => { var it = SellCards[g]; - GoodHead(c, g, L.T("black.sell.ref", BlackDelivery.RefValue(it))); + GoodHead(c, g, ""); c.AddLabel(L.T("black.price", g.Price)); c.AddFlexibleSpace(); c.AddButton(L.T("black.sell.list"), () => ListItem(it)); @@ -439,7 +438,7 @@ namespace Decentralized if (sprite != null) c.AddImage(sprite, 64f, 64f); else c.AddSpace(64f); c.AddLabel("" + ItemName(g.Item) + ""); c.AddLabel(g.Kind == GoodKind.Gpu ? L.T("black.kind.gpu", (int)Math.Round(g.Health)) : L.T("black.kind." + g.Kind + (g.Kind == GoodKind.Contraband ? "." + g.Level : ""))); - c.AddLabel(line2); + if (!string.IsNullOrEmpty(line2)) c.AddLabel(line2); } private static string ItemName(string id) => BlackDelivery.ItemName(id);