diff --git a/CHANGELOG.md b/CHANGELOG.md index be29d22..eed9c51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2.1.1 + +- “矿架与能源”商家的货表加入稀有电子元件(普通货,不加科技品溢价),上新时更容易买到,矿架第 4、5 槽升级和矿机修理要用。 + ## 2.1.0 - Web3 商店的现货和商家货架改为每周一、周四早上上新(原来每 7 天一次);镇压等原因错过的上新日在下一晚补上。 diff --git a/src/Decentralized.Domain/BmMerchants.cs b/src/Decentralized.Domain/BmMerchants.cs index 3909c20..44182c2 100644 --- a/src/Decentralized.Domain/BmMerchants.cs +++ b/src/Decentralized.Domain/BmMerchants.cs @@ -24,7 +24,7 @@ namespace Decentralized.Domain public static readonly Dictionary Table = new Dictionary { - [MerchantType.Rigs] = new[] { T("pd_rig"), T("energy_credit_ext"), T("energy_credit_hyp"), T("energy_credit_breeder"), T("powerblock"), T("recharger"), T("current_converter") }, + [MerchantType.Rigs] = new[] { T("pd_rig"), T("energy_credit_ext"), T("energy_credit_hyp"), T("energy_credit_breeder"), T("powerblock"), T("recharger"), T("current_converter"), G("rare_electronic") }, [MerchantType.Modules] = new[] { T("system_module_overclock"), T("system_module_performance"), T("system_module_quality"), T("system_module_eco"), T("system_module_efficiancy"), T("system_module_fineness"), T("system_module_streamlining"), T("module_extractor_advanced"), T("module_bay_expansion_kit") }, [MerchantType.Arms] = new[] { C("handmade_pistol", 1), C("printed_gun", 1), C("stun_baton", 1), C("revolver", 2), C("heavy_handmade_pistol", 2), C("flashbang_grenade", 2), C("smoke_grenade", 2), diff --git a/src/Decentralized/Core.cs b/src/Decentralized/Core.cs index cc7bb26..904be89 100644 --- a/src/Decentralized/Core.cs +++ b/src/Decentralized/Core.cs @@ -7,7 +7,7 @@ namespace Decentralized { public const string Id = "probably_decentralized"; public const string Name = "Probably Decentralized"; - public const string Version = "2.1.0"; + public const string Version = "2.1.1"; } /// 本地化:游戏的 mod 本地化表(ModFiles/Localization/*.csv),当前语言缺失时回退英文。 diff --git a/src/Decentralized/ModFiles/manifest.xml b/src/Decentralized/ModFiles/manifest.xml index 17bdb2e..2727af8 100644 --- a/src/Decentralized/ModFiles/manifest.xml +++ b/src/Decentralized/ModFiles/manifest.xml @@ -3,7 +3,7 @@ probably_decentralized Probably Decentralized edward - 2.1.0 + 2.1.1 Mine PSC with graphics cards, trade it on a fictional exchange, and cash it out past the compliance desk. Work in progress. All coins, exchanges and events are fictional and have no real-world value. 0.46 diff --git a/tests/Decentralized.Domain.Tests/Program.cs b/tests/Decentralized.Domain.Tests/Program.cs index 3447f49..c56d5dc 100644 --- a/tests/Decentralized.Domain.Tests/Program.cs +++ b/tests/Decentralized.Domain.Tests/Program.cs @@ -2052,6 +2052,7 @@ internal static class Program Check(acc.Length >= 2 && acc.Distinct().Count() == acc.Length && acc.All(a => a == Assets.PSC || a == Assets.CRT || a == Assets.CRA || a == Assets.Ponero), $"{ty} 收 {string.Join("/", acc)}"); } Check(Merchants.Accepts(MerchantType.Arms).Contains(Assets.Ponero) && !Merchants.Accepts(MerchantType.Rigs).Contains(Assets.Ponero), "违禁类收隐私币,硬件类不收"); + Check(Merchants.Table[MerchantType.Rigs].Any(e => e.Id == "rare_electronic" && e.Kind == GoodKind.Goods), "矿架与能源商家卖稀有电子元件(升级矿架槽要用),按普通货计价"); Check(Merchants.PlatformAccepts.Contains(Assets.CRT) && Tuning.BmAutoSwapSlip > Tuning.DexFee * 10, "自动换币的滑点远高于 DEX 手续费"); });