feedback5: merge W5M — the nine 0.1.4 PRs (#150 #66 #146 #74 #72 #103 #149 #109 #160) and W4A (高台 per the trait, 阿戈尔 revive slots, 联防 devour) ported into the split layout
Conflicts: server/match/bot.js (W4A's comment + W5K's player data view pgd), test/golden/diy.json (regenerated). data/ equals an offline build of the merged tools/build-data.mjs. Golden regenerated on the merged code: against feedback5 the moved roster / bonds / fields / matches / standins scenarios are exactly W5M's per-PR attribution (#160 skill events, #109 deploy-timed lifecycle, #66 灵巧 sources and hidden layers, 83fc408 歌蕾蒂娅 placement), plus coop2-NORMAL-70-diy (fields operators those PRs touch) and diy-051 / diy-052 (events.skill only: Misery's deploy passives, #160); against fb5-merge4 only feedback5's own additions (the diy kits, coop2-NORMAL-70-diy).
This commit is contained in:
commit
9ce5435373
74 files changed
+2966
-1338
No files matched your search
@@ -83,6 +83,7 @@
|
||||
"移除 AI 队友": "Remove AI Teammate",
|
||||
"已复制同盟密钥 {code}": "Alliance Key {code} copied",
|
||||
"已复制邀请链接": "Invite link copied",
|
||||
"{name}邀请你加入卫戍协议:盟约【{difficulty}】": "{name} invites you to Stronghold Protocol: Alliance [{difficulty}]",
|
||||
"复制失败,请手动复制": "Copy failed, please copy manually",
|
||||
"同盟密钥": "Alliance Key",
|
||||
"同盟密钥 {code}": "Alliance Key {code}",
|
||||
|
||||
Reference in new issue
Block a user