Reprice listed goods; honeypot stays at 1%

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

CHANGELOG.md

@@ -30,6 +30,7 @@
 - 订单改成商家货架（用户意见）：黑市页"订单"改名"商家"，每周从 6 种类型里抽 5 家（全新矿卡经销商、二手矿卡贩子、模组高科技、军火、证件芯片、药物），另有 25% 的周出现一家大宗商家（库存 10–25 件、价格系数 0.55–0.75、送货 6 天）。每家有自己的价格系数（订单价 = 基础价 × 系数，一般 0.70–0.95，全新卡 0.85–1.00，二手卡 0.65–0.90），每家 4 种货、库存 3–6 件。一次订 5 件以上 95 折、10 件以上 9 折。界面：件数按钮 ×1 / ×5 / ×10，商家按钮，所选商家的货架。药物（药片、梦尘、管制化学品）只在药物商家和大宗商家出现，也能转手出售。每周货架总值在游戏里抽样 60 周平均 13.2k（目标 1.4 万）。
 - 商家类型扩到 18 种 + 大宗（用户意见，对照游戏的物品目录和玩家职业）：全新矿卡经销商、二手矿卡贩子、矿架与能源、模组、军火（枪、手雷、炸药、刀具、电击枪）、枪匠配件（枪械配件、3D 打印芯片与模组、枪械零件）、证件芯片、药物（药片、注射器、血袋、手术工具）、化学品（化学用品、助熔剂、化学设备模组、量筒试剂瓶）、酿酒（酵母、荧光莓、啤酒、酒瓶）、水培农场（种子、水培模组、植物分析仪）、养殖（鱼卵、鱼子酱、循环水养殖系统、血清、屠宰机）、矿工（矿石、金属锭、电子元件、拾荒扫描仪）、水务（滤水、净水、储水、检测）、仓储（走私暗格、储藏区扩建、军用背包）、工具（涡轮增压器、等离子切割机、X 射线扫描仪、心智重编程器）、奢侈品（香水、精华液、香烟）。每周 7 家：2 家从矿卡 / 矿架 / 模组 4 类里抽（保证矿工路线总有货），其余 5 家从其余类型里抽；每家 3 种货，库存 2–5 件，单件基础价超过 4000 的不上。游戏里抽样 60 周货架总值平均 13.2k（目标 1.4 万）。药物改成并入药物商家，现货柜台的货不变。所有货都能转手出售。
 - 尖端店铺与个人卖家（用户意见）：贵货（单件基础价 ≥ 2000：超科技涡轮增压器、超科技储藏区、心智重编程器、顶级显卡等）不再被一刀切掉，改由"尖端店铺"卖：每周只有 15% 的概率出现，2 种货、库存 1–2 件、价格系数 0.85–1.00、送货 5 天；顶级全新显卡也在这里。个人卖家：每周固定 2 位，什么都卖（可能是药、模组、显卡、仍有 10% 混进贵货），每件价格系数各自随机 0.50–1.20（捡漏或被宰），库存 1–2 件，是骗子的概率 25%，都是新号所以只接受托管。常规商家仍只卖基础价 ≤ 4000 的货。
+- 上架后可以改价（用户意见）："我的订单与情报"页每件上架的货下面一排倍率按钮（0.6–1.8，当前的带方括号）和"撤下"，点倍率先走付款确认（改价费 2%，`BmRepriceFee`，手输平台地址），标价按参考价重算，成交概率按新倍率走，上架日不变。游戏内验证：0.6 倍的 RTX 70 改成 ×1.2，改价费 12，标价 600。蜜罐基础概率维持 1%（模拟里进取策略罪证 ≥ 300 约 48 天，用户认为可接受）。
 - 追查调整（经济模拟后）：同一晚到期的追查按来源合成一次事件，记入货款的 40%（`BmTrapShare`），同一次蜜罐 / 落网累计最多 400（`BmTrapWindowCap`）；没收到货的订单（骗子退款、被截获、跑路、拒签、被查封）取消对应追查。原来每单各记一次、每晚上限 400，一个蜜罐窗口能连续记几千，模拟里一局 120 天几乎一直在罪证线以上。
 - 手输收款地址（用户意见）：Web3 里的付款与转账——黑市现货、商家下单、上架费、混币器存入、Ponero 兑换——点下去先出"确认付款"页，显示摘要和收款地址（商家是名字里的 0x… ，平台、混币器、Ponero 兑换处各有自己的随机地址，存档保存），要手输地址才放款，不分大小写，输错提示"地址不符，没有付款"，可取消。DEX 兑换和银行存取不加（没有收款方）；交易所的转账等阶段 5 多钱包时再接同一个确认页。游戏内验证：现货买超频模组，输错一位被拒、输对成交；Ponero 兑换处进入确认页。
 - 商家名用随机哈希匿名，前面用方括号标类型（用户意见，试过每类型 10 个主题店名后撤回）：如 "[全新矿卡] 0xdf9ec7"；选中的商家按钮前有 "> "。

src/Decentralized.Domain/BmSales.cs

@@ -14,6 +14,8 @@ namespace Decentralized.Domain
         public double Health;
         /// <summary>标价倍率与标价（信用点）。</summary>
         public double Mult;
+        /// <summary>参考价：改价时按它重算标价。</summary>
+        public long Ref;
         public int ListPrice;
         public int ListedDay, PayDay;
         public SaleState State = SaleState.Listed;
@@ -71,11 +73,31 @@ namespace Decentralized.Domain
             double share = total > 0 ? Math.Min(1, ListFee(listPrice) / total) : 0;
             w.Taint -= w.Taint * share; w.Basis -= w.Basis * share;
             w.Add(feeAsset, -qty);
-            var s = new BmSale { Item = item, Model = model, FakeOf = fakeOf, Health = health, Mult = m, ListPrice = listPrice, ListedDay = day };
+            var s = new BmSale { Item = item, Model = model, FakeOf = fakeOf, Health = health, Ref = refValue, Mult = m, ListPrice = listPrice, ListedDay = day };
             Sales.Add(s);
             return s;
         }
 
+        public static int RepriceFee(int newPrice) => (int)Math.Ceiling(newPrice * Tuning.BmRepriceFee);
+
+        /// <summary>改价：上架中的货换一个倍率，按参考价重算标价，收改价费；不改变上架日。</summary>
+        public bool Reprice(BmSale s, double m, Wallet w, string feeAsset, int day, Func<string, double> price)
+        {
+            if (s == null || s.State != SaleState.Listed || s.Ref <= 0 || Math.Abs(m - s.Mult) < 1e-9 || m < Tuning.BmSellMin - 1e-9 || m > Tuning.BmSellMax + 1e-9 || Closed(day) || feeAsset == Assets.CRC) return false;
+            int listPrice = ListPriceOf(s.Ref, m);
+            double p = price(feeAsset);
+            if (p <= 0) return false;
+            int fee = RepriceFee(listPrice);
+            double qty = fee / p;
+            if (w.Avail(feeAsset) + 1e-9 < qty) return false;
+            double total = w.Value(price);
+            double share = total > 0 ? Math.Min(1, fee / total) : 0;
+            w.Taint -= w.Taint * share; w.Basis -= w.Basis * share;
+            w.Add(feeAsset, -qty);
+            s.Mult = m; s.ListPrice = listPrice;
+            return true;
+        }
+
         public void Delist(BmSale s) { s.State = SaleState.Delisted; s.Why = "delist"; }
 
         /// <summary>未到账的货款（信用点）：跑路时一并归零，也推高跑路概率。</summary>

src/Decentralized.Domain/Tuning.cs

@@ -102,9 +102,9 @@ namespace Decentralized.Domain
         public const double BmTrapShare = 0.4, BmTrapWindowCap = 400;
         /// <summary>货架上除违禁品外的两类货：高科技物品（需中档声望）和显卡的出现概率、加价（在现货溢价 / 订单价之外再加），显卡里夹假卡的比例、是全新卡（成色 100、封条完好、不会是假卡）的概率。</summary>
         public const double BmTechChance = 0.30, BmGpuChance = 0.30, BmTechMarkup = 0.5, BmGpuMarkup = 0.2, BmGpuFake = 0.20, BmGpuNew = 0.15;
-        /// <summary>玩家上架出售：标价倍率范围（相对参考价）、上架费、成交抽成、成交后货款托管天数、假卡被买家看穿的概率；
+        /// <summary>玩家上架出售：标价倍率范围（相对参考价）、上架费、改价费、成交抽成、成交后货款托管天数、假卡被买家看穿的概率；
         /// 倍率 ≤0.9 / 1.0 / 1.8 时的期望成交天数（之间插值）；货款带污点的概率与比例随倍率从下限涨到上限；卖家好评的初始值、看穿一次扣的点数、同时上架的件数上限。</summary>
-        public const double BmListFee = 0.05, BmCommission = 0.08, BmSellMin = 0.6, BmSellMax = 1.8, BmFakeDetect = 0.5;
+        public const double BmListFee = 0.05, BmRepriceFee = 0.02, BmCommission = 0.08, BmSellMin = 0.6, BmSellMax = 1.8, BmFakeDetect = 0.5;
         public const double BmSellDaysFast = 1, BmSellDays1 = 2, BmSellDaysMax = 14;
         public const double BmSaleTaintChanceMin = 0.2, BmSaleTaintChanceMax = 0.9, BmSaleTaintRatioMin = 0.2, BmSaleTaintRatioMax = 0.8;
         public const int BmSaleHold = 3, BmRatingStart = 90, BmRatingFakeLoss = 10, BmMaxListings = 10;

src/Decentralized/ModFiles/Localization/en.csv

@@ -270,7 +270,7 @@ black.kind.Contraband.3,Contraband (high)
 black.kind.Tech,High-tech (markup)
 nightlog.bm.ready,"Black market: {0} arrived; a courier will come by once you open."
 item.web3guide.name,Web3 Handbook
-item.web3guide.desc,"Bank: depositing turns credits into CRC; withdrawing turns CRC back into credits and goes through compliance screening. Trading: buys are paid in the quote coin, sells in the traded coin. Mixer: pick a coin, amount and rounds; each round takes a fee and lowers taint, rounds equal days of waiting, and the coins come back to the same address; the more you deposit, the worse the cleaning. Payments and transfers (black market, mixer, Ponero desk, listing fees) require typing the payee address (the 0x string in the merchant name, or the platform's own) and a wrong address pays nothing. Black market: coin only, no CRC, 30% above normal channels, with extra markup on high-tech goods and GPUs; the coin you pay leaves its share of taint with the seller and the goods carry no stolen tag; GPUs may be fake, inspect them yourself. Orders are cheaper than spot but take days and may be intercepted; merchants sell by type at their own price factor, 5+ items get 5% off and 10+ get 10% off, and a bulk merchant appears at random with the lowest prices but six days of waiting; escrow costs 5%, is released on delivery and refunded if the seller runs; advance release takes another 10% off, but a scammer keeps the money and only sellers with 30+ trades accept; the platform itself can rug, be taken over by enforcement, or a seller can be arrested, after which your orders get traced and crime logged; forum rumors can be warnings. An intercepted parcel sometimes turns into enforcement at your door: signing logs the crime on the spot and seizes the goods, refusing only costs the payment. Selling: on the black market's Sell page, list contraband, high-tech goods and GPUs from storage at 0.6x to 1.8x the reference price. The higher the multiplier, the slower the sale (below 0.9x about a day, 1.0x about two, 1.8x about fourteen), and the likelier and larger the taint on the payout, which also grows with how much you sold in the last 7 days; at most 10 listings at a time, 5% listing fee, 8% commission, payout held 3 days before reaching your wallet; a fake card may be spotted and returned, hurting your rating; if the platform rugs, listed goods and unreleased payouts are gone. Ponero desk: Ponero is a privacy coin and swapping in wipes the taint on that value; 6% fee each way with a daily limit; coin swapped out of Ponero has no origin and cash-out screening gets stricter."
+item.web3guide.desc,"Bank: depositing turns credits into CRC; withdrawing turns CRC back into credits and goes through compliance screening. Trading: buys are paid in the quote coin, sells in the traded coin. Mixer: pick a coin, amount and rounds; each round takes a fee and lowers taint, rounds equal days of waiting, and the coins come back to the same address; the more you deposit, the worse the cleaning. Payments and transfers (black market, mixer, Ponero desk, listing fees) require typing the payee address (the 0x string in the merchant name, or the platform's own) and a wrong address pays nothing. Black market: coin only, no CRC, 30% above normal channels, with extra markup on high-tech goods and GPUs; the coin you pay leaves its share of taint with the seller and the goods carry no stolen tag; GPUs may be fake, inspect them yourself. Orders are cheaper than spot but take days and may be intercepted; merchants sell by type at their own price factor, 5+ items get 5% off and 10+ get 10% off, and a bulk merchant appears at random with the lowest prices but six days of waiting; escrow costs 5%, is released on delivery and refunded if the seller runs; advance release takes another 10% off, but a scammer keeps the money and only sellers with 30+ trades accept; the platform itself can rug, be taken over by enforcement, or a seller can be arrested, after which your orders get traced and crime logged; forum rumors can be warnings. An intercepted parcel sometimes turns into enforcement at your door: signing logs the crime on the spot and seizes the goods, refusing only costs the payment. Selling: on the black market's Sell page, list contraband, high-tech goods and GPUs from storage at 0.6x to 1.8x the reference price. The higher the multiplier, the slower the sale (below 0.9x about a day, 1.0x about two, 1.8x about fourteen), and the likelier and larger the taint on the payout, which also grows with how much you sold in the last 7 days; at most 10 listings at a time, 5% listing fee, repricing a listing costs 2% and the sale speed follows the new multiplier, 8% commission, payout held 3 days before reaching your wallet; a fake card may be spotted and returned, hurting your rating; if the platform rugs, listed goods and unreleased payouts are gone. Ponero desk: Ponero is a privacy coin and swapping in wipes the taint on that value; 6% fee each way with a daily limit; coin swapped out of Ponero has no origin and cash-out screening gets stricter."
 courier.odd1,...Package is here.
 courier.odd2,"(His hand stays in his pocket.) Sign here."
 courier.sign,Sign
@@ -344,3 +344,5 @@ black.pay.bad,Address does not match; nothing paid.
 pay.mix,"Mixer {0} {1}"
 pay.swap,"Ponero desk {0} {1}"
 pay.listfee, (listing fee)
+pay.repricefee," (repricing fee x{0})"
+black.sell.repriced,"Repriced: {0}, now {1}."

src/Decentralized/ModFiles/Localization/zh.csv

@@ -269,7 +269,7 @@ black.kind.Contraband.3,违禁品（高）
 black.kind.Tech,高科技物品（加价）
 nightlog.bm.ready,"黑市：{0} 到货，开店后会有快递员上门。"
 item.web3guide.name,Web3 手册
-item.web3guide.desc,"银行：存入把信用点换成 CRC；提取把 CRC 换回信用点，提取要过合规审查。交易：买入按计价币的数量支付，卖出按所交易币的数量卖出。混币器：选币种、填数量和轮数，每轮扣手续费并降低污点，轮数即等待天数，到期提回同一个地址；存入越多，清洗越差。付款与转账（黑市、混币器、Ponero 兑换处、上架费）前要手输收款地址（商家名里的 0x 开头那串，或平台自己的地址），输错不会付款。黑市：只收币，不收 CRC，价格比正常渠道贵 30%，高科技物品和显卡另有加价；付出去的币带着按比例的污点留在卖家那边，货不带赃物标签；显卡不保证真假，自己鉴定。订单比现货便宜，要等几天，路上可能被截获；商家按类型卖货，价格系数各不相同，一次订 5 件以上 95 折、10 件以上 9 折，大宗商家随机出现，价格最低但要等六天；托管多付 5% 托管费，收货后放款，卖家跑路时退款；提前放款再打九折，卖家若是骗子钱就没了，只有成交 30 单以上的卖家接受；平台自己也可能跑路，也可能被执法接管，或者卖家落网，之后你的订单会被追查、记罪证；论坛上的传闻可以当预兆。被截获的包裹有时会变成执法人员上门：签收当场记罪证并查封，拒签只损失货款。出售：在黑市的出售页把储藏区里的违禁品、高科技物品和显卡上架，标价是参考价的 0.6 到 1.8 倍。倍率越高成交越慢（0.9 以下约一天，1.0 约两天，1.8 约十四天），货款带污点的可能性和比例也越高，近 7 天出售的量越大，污点越重；同时最多上架 10 件，上架收 5% 上架费，成交扣 8% 抽成，货款托管 3 天后进钱包；卖假卡可能被买家看穿而退货，拉低好评；平台跑路时上架的货和未放款的货款都没了。Ponero 兑换处：Ponero 是隐私币，兑入时这部分价值的污点被清除；兑入、兑出各收 6% 手续费，每天有额度；从 Ponero 兑出的币来路不明，出金审查会加重。"
+item.web3guide.desc,"银行：存入把信用点换成 CRC；提取把 CRC 换回信用点，提取要过合规审查。交易：买入按计价币的数量支付，卖出按所交易币的数量卖出。混币器：选币种、填数量和轮数，每轮扣手续费并降低污点，轮数即等待天数，到期提回同一个地址；存入越多，清洗越差。付款与转账（黑市、混币器、Ponero 兑换处、上架费）前要手输收款地址（商家名里的 0x 开头那串，或平台自己的地址），输错不会付款。黑市：只收币，不收 CRC，价格比正常渠道贵 30%，高科技物品和显卡另有加价；付出去的币带着按比例的污点留在卖家那边，货不带赃物标签；显卡不保证真假，自己鉴定。订单比现货便宜，要等几天，路上可能被截获；商家按类型卖货，价格系数各不相同，一次订 5 件以上 95 折、10 件以上 9 折，大宗商家随机出现，价格最低但要等六天；托管多付 5% 托管费，收货后放款，卖家跑路时退款；提前放款再打九折，卖家若是骗子钱就没了，只有成交 30 单以上的卖家接受；平台自己也可能跑路，也可能被执法接管，或者卖家落网，之后你的订单会被追查、记罪证；论坛上的传闻可以当预兆。被截获的包裹有时会变成执法人员上门：签收当场记罪证并查封，拒签只损失货款。出售：在黑市的出售页把储藏区里的违禁品、高科技物品和显卡上架，标价是参考价的 0.6 到 1.8 倍。倍率越高成交越慢（0.9 以下约一天，1.0 约两天，1.8 约十四天），货款带污点的可能性和比例也越高，近 7 天出售的量越大，污点越重；同时最多上架 10 件，上架收 5% 上架费，上架后可以改价（收 2% 改价费，标价按参考价重算，成交的快慢跟着新倍率走），成交扣 8% 抽成，货款托管 3 天后进钱包；卖假卡可能被买家看穿而退货，拉低好评；平台跑路时上架的货和未放款的货款都没了。Ponero 兑换处：Ponero 是隐私币，兑入时这部分价值的污点被清除；兑入、兑出各收 6% 手续费，每天有额度；从 Ponero 兑出的币来路不明，出金审查会加重。"
 courier.odd1,……东西到了。
 courier.odd2,"（他的手一直放在口袋里）在这儿签个字。"
 courier.sign,签收
@@ -343,3 +343,5 @@ black.pay.bad,地址不符，没有付款。
 pay.mix,"混币器 {0} {1}"
 pay.swap,"Ponero 兑换处 {0} {1}"
 pay.listfee,（上架费）
+pay.repricefee,"（改价费 ×{0}）"
+black.sell.repriced,"已改价：{0}，标价 {1}。"

src/Decentralized/TerminalWindow.cs

@@ -551,6 +551,15 @@ namespace Decentralized
             Open();
         }
 
+        private static void RepriceSale(BmSale s, double mult)
+        {
+            var d = Session.Data;
+            if (!d.Black.Reprice(s, mult, d.Hot, _payAsset, StoreStation.GetDayCounter(), Session.Price)) { _message = L.T("msg.balance"); Open(); return; }
+            _message = L.T("black.sell.repriced", ItemName(s.Item), s.ListPrice);
+            Session.Save();
+            Open();
+        }
+
         private static void Delist(BmSale s)
         {
             var d = Session.Data;
@@ -573,7 +582,22 @@ namespace Decentralized
                     var sale = sl;
                     string st = sale.State == SaleState.Sold ? L.T("black.sale.Sold", sale.PayDay) : L.T("black.sale." + sale.State + (sale.State == SaleState.Delisted && sale.Why != null ? "." + sale.Why : ""));
                     l.AddLabel(L.T("black.mine.sale", ItemName(sale.Item), sale.Mult.ToString("0.0", CultureInfo.InvariantCulture), st));
-                    if (sale.State == SaleState.Listed) l.AddButton(L.T("black.sell.delist"), () => Delist(sale));
+                    if (sale.State == SaleState.Listed)
+                    {
+                        l.BeginRow();
+                        foreach (var m in SellMults)
+                        {
+                            double mult = m;
+                            string n = m.ToString("0.0", CultureInfo.InvariantCulture);
+                            l.AddButton(Math.Abs(mult - sale.Mult) < 1e-9 ? $"[{n}]" : n, () =>
+                            {
+                                if (Math.Abs(mult - sale.Mult) < 1e-9) return;
+                                BeginPay(d.Address("platform"), ItemName(sale.Item) + L.T("pay.repricefee", n), BlackMarket.RepriceFee(BlackMarket.ListPriceOf(sale.Ref, mult)), () => RepriceSale(sale, mult));
+                            });
+                        }
+                        l.AddButton(L.T("black.sell.delist"), () => Delist(sale));
+                        l.End();
+                    }
                 }
                 foreach (var o in d.Black.Orders.OrderByDescending(x => x.PlacedDay))
                     l.AddLabel(L.T("black.mine.line", ItemName(o.Item) + (o.Count > 1 ? " ×" + o.Count : ""), BlackDelivery.DisplayName(o.Seller), L.T("black.mode." + o.Mode), L.T("black.state." + o.State + (o.Why != null && o.State != OrderState.Done ? "." + o.Why : "")), o.DueDay));

tests/Decentralized.Domain.Tests/Program.cs

@@ -706,6 +706,13 @@ internal static class Program
             var b6 = new BlackMarket(); var w6 = new Wallet(); w6.Add(Assets.CRT, 100000);
             int ok6 = 0; for (int i = 0; i < 15; i++) if (b6.List("c4", null, null, 0, 500, 1.0, w6, Assets.CRT, 1, price) != null) ok6++;
             Check(ok6 == Tuning.BmMaxListings && b6.ActiveListings == 10, "同时最多上架 10 件");
+            var b7 = new BlackMarket(); var w7 = new Wallet(); w7.Add(Assets.CRT, 5000);
+            var s7 = b7.List("c4", null, null, 0, 500, 1.8, w7, Assets.CRT, 1, price);
+            double c7 = w7.Get(Assets.CRT);
+            Check(b7.Reprice(s7, 1.0, w7, Assets.CRT, 2, price) && s7.ListPrice == 500 && s7.Mult == 1.0 && Near(c7 - w7.Get(Assets.CRT), BlackMarket.RepriceFee(500), 1e-9), "改价：按参考价重算标价，收 2% 改价费");
+            Check(!b7.Reprice(s7, 1.0, w7, Assets.CRT, 2, price) && !b7.Reprice(s7, 2.5, w7, Assets.CRT, 2, price) && Near(b7.SaleChance(s7.Mult), 0.5 * Math.Min(1.1, 90 / 90.0), 1e-9), "同倍率或超范围不改；改价后成交概率按新倍率");
+            b7.Night(3, false, w7, new Rng(5), 0, price);
+            Check(!b7.Reprice(s7, 0.6, w7, Assets.CRT, 4, price) || s7.State == SaleState.Listed, "已成交的货不能改价");
             // 镇压期间不推进
             var b5 = new BlackMarket(); var w5 = new Wallet(); w5.Add(Assets.CRT, 1000);
             var s5 = b5.List("c4", null, null, 0, 500, 0.8, w5, Assets.CRT, 1, price);