2024-03-14

2024-03-14 12:29:36 +08:00 · 2024-03-14 12:29:36 +08:00 · d3ec6672a7
commit d3ec6672a7
parent e8b2b9acb8
20 changed files with 188 additions and 71 deletions
--- a/README.md
+++ b/README.md
@ -9,6 +9,54 @@ dump文件目录
 - sprites
 - textmap

+# 2024年3月14日 更新日志
+
+## 新事件： 
+
+- 4天护盾/宝物事件——协会基地 
+  - 获得4点护盾上限。 
+  - 使护盾上限变为10点。 
+  - 失去2点护盾上限，获得指定传说宝物。 
+
+## 新宝物： 
+
+- `罪犯身份信息`-欺诈师专属宝物 普通 
+  - 天赋-`喂！你好`的事件额外提供1个选项。 
+- `备用画笔`-画家专属宝物 稀有 
+  - 天赋-`颜色遮罩`变为对每回合限2次。 
+- `强化之眼`-目盲的观者专属宝物 稀有 
+  - 拥有威力翻倍的攻击部件装载能量后，获得1点威力。 
+- `核燃料` 稀有
+  - 第三回合开始时，飞船中心的攻击部件获得威力翻倍。 
+
+## 平衡性调整： 
+- 增长装置加强，效果为`发动(1)：手牌中所有白色能量点数提升1点。升级后增强为2点。 `
+- 伪装假面加强，不再有方位限制，可以选择任意辅助部件作为目标。 
+- 略微加强了三阶段爪牙和精英的强度。 
+- 事件——珍品拍卖调整为3天。
+
+## 体验优化： 
+
+- 优化部分描述。 
+- 移除一阶段精英——黄金号，我们将来会补上其他敌人。 
+
+## bug修复： 
+
+- 修复了部件-延迟防护装置在某些情况下不触发宝物-无损奖章的问题。 
+- 修复了事件-锻造空间前2次选择继续，第3次选择加槽位时有可能出现给没有槽位的部件加槽位的问题。 
+- 修复了天赋-传说优选在战斗中完成天赋任务后，如选择暂时撤退会导致无法触发天赋奖励的问题。 
+- 修复了部件-跳蛙核心触发效果增加功率时，部件-辐射接收器/宝物-邪恶投影增加的威力会被立刻清除的问题。 
+- 修复了2个部件-模拟器串联，左侧的模拟器能模拟攻击部件的问题。 
+- 修复了部分情况下部件-模拟器和部件-升级装置会出现bug的问题。 
+- 修复了领取悬赏奖励结束进入度假时，极短时间内立即退出游戏会导致下次进入时度假事件重叠的问题。 
+- 修复了多个部件-外置油桶和宝物-滑板特定情况会获得额外燃料的问题。
+
+---
+
+> 开发者碎碎念： 
+> 
+> 本周没什么大事，正在稳步推进三职业。
+
 # 2024年3月7日 更新日志

 ## 平衡性调整： 
--- a/csv/encounterevents/EncounterEvents
+++ b/csv/encounterevents/EncounterEvents
@ -45,6 +45,7 @@ int,int,string,void,int,int,bool,int[],int,string,void,int[],int,int,string,void
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 530,530,EventName/530,喂？你好~,0,0,FALSE,;7;;77;;;,,EventDes/530,翻看手中的悬赏单，你随意挑选了下一个目标，通讯接通后，他被你巧舌如簧的话术唬得一愣一愣的，很快就将自己的身价信息全部告诉了你。,;2;;;,,,EvenOptionDes/530_1,[诈骗]<g>获得[0]。</g>,OC_LiarRandomItemNew,,,,531,,,,,,,,,,,
 530,530,EventName/530,喂？你好~,,,,,,,,,,,EvenOptionDes/530_1,[诈骗]<g>获得[0]。</g>,OC_LiarRandomItemNew,,,,531,,,,,,,,,,,
+530,530,EventName/530,喂？你好~,,,,,,,,,,,EvenOptionDes/530_1,[诈骗]<g>获得[0]。</g>,OC_LiarRandomItemNew,,,1,531,OC_HideByEqualTalentVal,;50037;;1;;;,,2,,,,,,,
 530,530,EventName/530,喂？你好~,,,,,,,,,,,EvenOptionDes/Close,[离开],OC_Close,,,,532,,,,,,,,,,,
 531,530,EventName/530,喂？你好~,,,,,,EventDes/531,在你缜密的语言攻势下，他完全相信了正有1000个赏金猎人前往他的坐标，他的声音都带着哭腔，连忙把{0}快递给了你，祈求你能引开这1000个赏金猎人，你信心十足的告诉他：“放心吧，有我在，不会有赏金猎人找到你的！”,,,,EvenOptionDes/Close,[离开],OC_Close,,,,,,,,,,,,,,,
 532,530,EventName/530,喂？你好~,,,,,,EventDes/532,你详细了解到了这名罪犯的生平后，才发现原来他也是一个命途坎坷的可怜人，随着轻轻一声叹息，你告诉他不要再被骗了，默默的挂断了通讯。,,,,EvenOptionDes/Close,[离开],OC_Close,,,,,,,,,,,,,,,
@ -621,7 +622,7 @@ int,int,string,void,int,int,bool,int[],int,string,void,int[],int,int,string,void
 1710,1710,EventName/1710,锻造空间,,,,,,,,,,,EvenOptionDes/1710_3,[没有要求]继续。,OC_Close,,,,1711,OC_SetDicValue_1710,;1710;;-1;;;,,2,,,,,,,
 1711,1710,EventName/1710,锻造空间,,,,,,EventDes/1711,老师傅也没有抬头看你，埋头专心的制作你的部件……,,,,EvenOptionDes/1710_4,[要求多槽位]<b>失去{0}星币。</b><g>制作拥有2个及以上槽位的部件。</g>,OC_StarCoinLose,;2;;;,,,1713,OC_SetDicValue_1710,;1711;;2;;;,,2,,,,,,,
 1711,1710,EventName/1710,锻造空间,,,,,,,,,,,EvenOptionDes/1710_5,[要求单槽位]<b>失去{0}星币。</b><g>制作拥有1个槽位的部件。</g>,OC_StarCoinLose,;2;;;,,,1713,OC_SetDicValue_1710,;1711;;1;;;,,2,,,,,,,
-1711,1710,EventName/1710,锻造空间,,,,,,,,,,,EvenOptionDes/1710_3,[没有要求]继续。,OC_Close,,,,1713,OC_SetDicValue_1710,;1711;;-1;;;,,2,,,,,,,
+1711,1710,EventName/1710,锻造空间,,,,,,,,,,,EvenOptionDes/1710_3,[没有要求]继续。,OC_Close,,,,1714,OC_SetDicValue_1710,;1711;;-1;;;,,2,,,,,,,
 1712,1710,EventName/1710,锻造空间,,,,,,EventDes/1712,老师傅也没有抬头看你，埋头专心的制作你的部件……,,,,EvenOptionDes/1710_4,[要求多槽位]<b>失去{0}星币。</b><g>制作拥有2个及以上槽位的部件。</g>,OC_StarCoinLose,;2;;;,,,1713,OC_SetDicValue_1710,;1711;;2;;;,,2,,,,,,,
 1712,1710,EventName/1710,锻造空间,,,,,,,,,,,EvenOptionDes/1710_5,[要求单槽位]<b>失去{0}星币。</b><g>制作拥有1个槽位的部件。</g>,OC_StarCoinLose,;2;;;,,,1713,OC_SetDicValue_1710,;1711;;1;;;,,2,,,,,,,
 1712,1710,EventName/1710,锻造空间,,,,,,,,,,,EvenOptionDes/1710_6,[要求零槽位]<b>失去{0}星币。</b><g>制作没有槽位的部件。</g>,OC_StarCoinLose,;2;;;,,,1714,OC_SetDicValue_1710,;1711;;0;;;,,2,,,,,,,
@ -936,7 +937,7 @@ int,int,string,void,int,int,bool,int[],int,string,void,int[],int,int,string,void
 2090,2090,EventName/2090,店主答谢,,,,,,,,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
 2091,2090,EventName/2090,店主答谢,,,,,,EventDes/2091, 一通消费之后，你感谢了店主的热情，不过总感觉哪里好像有点不对。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-2100,2100,EventName/2100,珍品拍卖,3,4,,;7;;77;;;,,EventDes/2100,这个星球上正在举办号称十年一度的珍品拍卖会，身为小有名气的赏金猎人，你受邀来到了VIP席位。本次拍卖会共有传说宝物和传说部件两件拍品，第一件拍品出现了，是<OP0>[2]！每人只有一次出价机会。,;1;;2;;;,,,EvenOptionDes/2100_1,[低价捡漏]25%概率<b>失去{0}星币</b><g>并获得[2]。</g>,OC_StarCoinLose,;4;;;,25,1,2101,OC_Jump,,75,1,2102,OC_RandomTreasureSignDicEventID,;2100;;3;;;,,2,,
+2100,2100,EventName/2100,珍品拍卖,3,3,,;7;;77;;;,,EventDes/2100,这个星球上正在举办号称十年一度的珍品拍卖会，身为小有名气的赏金猎人，你受邀来到了VIP席位。本次拍卖会共有传说宝物和传说部件两件拍品，第一件拍品出现了，是<OP0>[2]！每人只有一次出价机会。,;1;;2;;;,,,EvenOptionDes/2100_1,[低价捡漏]25%概率<b>失去{0}星币</b><g>并获得[2]。</g>,OC_StarCoinLose,;4;;;,25,1,2101,OC_Jump,,75,1,2102,OC_RandomTreasureSignDicEventID,;2100;;3;;;,,2,,
 2100,2100,EventName/2100,珍品拍卖,,,,,,,,,,,EvenOptionDes/2100_2,[平价竞拍]50%概率<b>失去{0}星币</b><g>并获得[2]。</g>,OC_StarCoinLose,;9;;;,50,1,2103,OC_Jump,,50,1,2104,OC_RandomTreasureSignDicEventID,;2100;;3;;;,,2,,
 2100,2100,EventName/2100,珍品拍卖,,,,,,,,,,,EvenOptionDes/2100_3,[高价拿下]<b>失去{0}星币。</b><g>获得[1]。</g>,OC_StarCoinLose,;20;;;,,1,2105,OC_RandomTreasureSignDicEventID,;2100;;3;;;,,2,,,,,,,
 2100,2100,EventName/2100,珍品拍卖,,,,,,,,,,,EvenOptionDes/2100_4,[等待竞拍]等下一件拍品[0]。,OC_RandomShipUnitSignDicListEventID,;2106;;3;;;,,,2106,,,,,,,,,,,
@ -1308,3 +1309,12 @@ int,int,string,void,int,int,bool,int[],int,string,void,int[],int,int,string,void
 2491,2490,EventName/2490,生产技能,,,,,,EventDes/2491,完成改造之后，年轻智械开心说了句“exp+3”就去找其他赏金猎人了。你虽然不懂他的想法，但你大受震撼。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
 2492,2490,EventName/2490,生产技能,,,,,,EventDes/2492,完成改造之后，年轻智械开心说了句“exp+3”就去找其他赏金猎人了。你虽然不懂他的想法，但你大受震撼。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
 2493,2490,EventName/2490,生产技能,,,,,,EventDes/2493,你才不会把自己的部件交给一个神志不清的智械。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+2500,2500,EventName/2500,协会基地,0,4,,;7;;;,,EventDes/2500,端点星，这里正是赏金猎人协会的基地所在，其标志性建筑——百科全书编写大楼就伫立在基地中心。\n\n你来到了护盾号的维护中心，不少驾驶着护盾号的赏金猎人正在进进出出。\n\n在这里，你可以享受到协会的顶级护盾维护服务。,;2;;9;;;,,,EvenOptionDes/2500_1,[强化]<g>获得{0}点护盾上限。</g>,OC_Shield,;4;;;,,,2501,,,,,,,,,,,
+2500,2500,EventName/2500,协会基地,,,,,,,,,,,EvenOptionDes/2500_2,[更换]使护盾上限变为{0}点。,OC_ShieldTo,;10;;;,,,2502,,,,,,,,,,,
+2500,2500,EventName/2500,协会基地,,,,,,,,,,,EvenOptionDes/2500_3,[交易]<b>失去{0}点护盾上限。</b><g>获得[1]。</g>,OC_ShieldLose,;2;;;,,1,2503,OC_RandomTreasure,;3;;;,,2,,,,,,,
+2500,2500,EventName/2500,协会基地,,,,,,,,,,,EvenOptionDes/Close,[离开],OC_Close,,,,2504,,,,,,,,,,,
+2501,2500,EventName/2500,协会基地,,,,,,EventDes/2501,你将飞船开进维护中心，并申请了强化服务。协会的工程师轻车熟路地给你的护盾完成了强化。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
+2502,2500,EventName/2500,协会基地,,,,,,EventDes/2502,你将飞船开进维护中心，向他们反馈你的护盾系统在抓捕途中遭受了严重的损耗，申请更换一套新的护盾模组。\n\n协会的工程师二话不说，直接拿出维护中心最高级的护盾模组换了上去。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
+2503,2500,EventName/2500,协会基地,,,,,,EventDes/2503,你在门口被一个赏金猎人拦了下来，他说他的护盾号已经拿到了护盾流派最强的部件，现在急需提高护盾值上限。他愿意用他最最珍贵的宝物和你交易一些护盾组件。\n\n竟然还有这种好事，你想都不想就和他达成了交易。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
+2504,2500,EventName/2500,协会基地,,,,,,EventDes/2504,比起维护飞船，你还是对基地更感兴趣。你参观了百科全书编写大楼之后，就离开了端点星。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
--- a/csv/enemyship/EnemyShip
+++ b/csv/enemyship/EnemyShip
@ -17,7 +17,7 @@ int,string,void,string,string,void,int,string,void,int,int,int,int,int,int,strin
 203,EnemyName/203,索敌号,ship_frog,EnemyPilotName/203,娜塔,1,EnemyDes/203,从外表看，娜塔和他的飞船都显得有些平庸，不过她却有一套从智械神教搞来的神秘武器——索敌装置，这让她即使在声名狼藉的鬣狗帮中也有了一席之地。,30,35,4,5,1,11,Battleground_1,ScriptableAssets/EnemyShipAssets/Ship_LockEnemyUnit,ScriptableAssets/EnemyShipAssets/Ship_LockEnemyUnit_1,ScriptableAssets/EnemyShipAssets/Ship_LockEnemyUnit_2,;92012;;;,;1;;;,;92012;;;,;1;;;,;92012;;;,;1;;;,Frog,,,StartYell/203_1,来~让你的部件好好放松一下~,,,,
 204,EnemyName/204,涡轮号,ship_frog,EnemyPilotName/204,汉斯,0,EnemyDes/204,“受到冲击，然后加速。”即使是在以爱冒险著称的飙船圈里，汉斯也是出名的亡命徒。他的涡轮号也是以此为基础设计的。,32,37,1,1,1,11,Battleground_1,ScriptableAssets/EnemyShipAssets/Ship_BreakUp,ScriptableAssets/EnemyShipAssets/Ship_BreakUp_1,ScriptableAssets/EnemyShipAssets/Ship_BreakUp_2,;92025;;;,;1;;;,;92025;;;,;1;;;,;92025;;;,;1;;;,Frog,,,StartYell/204_1,你要懂得珍惜这些生命，不过我更享受尝尝他们的味道。,,,,
 205,EnemyName/205,四极号,ship_razor,EnemyPilotName/205,布莱克,8,EnemyDes/205,众所周知，熊熊族一般只能数到3，比某位大名鼎鼎的老板还要多1。布莱克在小学读了4年，也没学会数4，所以他恨透了能数到4的人。,32,37,3,4,1,11,Battleground_1,ScriptableAssets/EnemyShipAssets/Ship_FourLimit,ScriptableAssets/EnemyShipAssets/Ship_FourLimit_1,ScriptableAssets/EnemyShipAssets/Ship_FourLimit_2,;92027;;91016;;;,;1;;1;;;,;92027;;91016;;;,;1;;1;;;,;92027;;91016;;;,;1;;1;;;,Crest,,,StartYell/205_1,123！我们熊熊族是宇宙中最智慧的种族！,EndYell/205_1,看来我要回小学重修一下了。,WinYell/205_1,这已经是我今天赢得第1、2、3……然后是几来着？
-206,EnemyName/206,黄金号,ship_razor_gold,EnemyPilotName/206,葛鲁德,15,EnemyDes/206,“哇！金色传说！”葛鲁德飞船上的黄金部件的售价甚至远远高过了他本人的悬赏。,32,37,4,5,1,11,Battleground_1,ScriptableAssets/EnemyShipAssets/Ship_Gold,ScriptableAssets/EnemyShipAssets/Ship_Gold_1,ScriptableAssets/EnemyShipAssets/Ship_Gold_2,;92039;;91039;;;,;1;;1;;;,;92039;;91039;;;,;1;;1;;;,;92039;;91039;;;,;1;;1;;;,Crest_Gold,,,StartYell/206_1,你的飞船看起来可真便宜。,EndYell/206_1,黄金，我的黄金！,WinYell/206_1,感受到金钱的力量了吗？
+206,EnemyName/206,黄金号,ship_razor_gold,EnemyPilotName/206,葛鲁德,15,EnemyDes/206,“哇！金色传说！”葛鲁德飞船上的黄金部件的售价甚至远远高过了他本人的悬赏。,32,37,4,5,1,11,Battleground_1,ScriptableAssets/EnemyShipAssets/Ship_Gold,ScriptableAssets/EnemyShipAssets/Ship_Gold_1,ScriptableAssets/EnemyShipAssets/Ship_Gold_2,;92039;;91039;;;,;1;;1;;;,;92039;;91039;;;,;1;;1;;;,;92039;;91039;;;,;1;;1;;;,Crest_Gold,FALSE,,StartYell/206_1,你的飞船看起来可真便宜。,EndYell/206_1,黄金，我的黄金！,WinYell/206_1,感受到金钱的力量了吗？
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 208,EnemyName/208,滑轨号,ship_builder_slide,EnemyPilotName/208,尼亚,1,EnemyDes/208,尼亚是一个生活拮据的机械师，他绞尽脑汁为他的飞船安装了3条轨道，这样就能把1个滑轮核心当3个来用。,34,39,5,6,1,11,Battleground_1,ScriptableAssets/EnemyShipAssets/Ship_Slideway,ScriptableAssets/EnemyShipAssets/Ship_Slideway_1,ScriptableAssets/EnemyShipAssets/Ship_Slideway_2,;91055;;91056;;91057;;;,;1;;1;;1;;;,;91055;;91056;;91057;;;,;1;;1;;1;;;,;91055;;91056;;91057;;;,;1;;1;;1;;;,Builder_Slideway,,,StartYell/208_1,你知道我在矿洞里学到的最重要的技能是什么吗？就是遇到事情，就要划！,EndYell/208_1,我一定会重获自由的，总有一天，一定会！,,
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@ -67,10 +67,10 @@ int,string,void,string,string,void,int,string,void,int,int,int,int,int,int,strin
 705,EnemyName/705,战斧号,ship_frog,EnemyPilotName/705,伊万,0,EnemyDes/705,熊熊族的伊万曾是名健身教练，因为给一名树人推销了五百年的健身卡而遭到通缉。不过就算成了星际海盗，他也不忘督促所有人（和他自己）锻炼。,58,76,5,6,0,3,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_BattleAxe,ScriptableAssets/EnemyShipAssets/Ship_BattleAxe_1,ScriptableAssets/EnemyShipAssets/Ship_BattleAxe_2,;92029;;91060;;;,;1;;1;;;,;92029;;91060;;;,;1;;1;;;,;92029;;91060;;;,;2;;1;;;,Frog,,,StartYell/705_1,你这个小身板还得锻炼锻炼才能当好赏金猎人！,EndYell/705_1,看来最近我的锻炼有所松懈。,WinYell/705_1,你还需要多多锻炼！
 706,EnemyName/706,决斗号,ship_wall,EnemyPilotName/706,格瑞,0,EnemyDes/706,性如烈火的爆裂牛仔格瑞从不会占人便宜！他只会在完全公平的条件下和人对决，然后再用自己的强大火力征服一切！,1,1,2,2,0,3,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_Duel,ScriptableAssets/EnemyShipAssets/Ship_Duel_1,ScriptableAssets/EnemyShipAssets/Ship_Duel_2,;92034;;;,;1;;;,;92034;;;,;1;;;,;92034;;;,;1;;;,Wall,,,StartYell/706_1,如果有人想要战争！我就给他战争！,EndYell/706_1,这便是战士的宿命。,,
 707,EnemyName/707,赛马号,ship_spinner,EnemyPilotName/707,田因齐,3,EnemyDes/707,田因齐是一个赛马高手，他将自己的赛马经验带到了飞船对波之中。尽管他的飞船看上去并不强，但是总能让很多赏金猎人浑身难受。,140,170,8,9,1,13,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_AdvancedHorse,ScriptableAssets/EnemyShipAssets/Ship_AdvancedHorse_1,ScriptableAssets/EnemyShipAssets/Ship_AdvancedHorse_2,;91078;;;,;1;;;,;91078;;;,;1;;;,;91078;;;,;1;;;,Spinner,,,StartYell/707_1,让我看看，你的薄弱处在哪！,EndYell/707_1,我的策略，失效了…,,
-708,EnemyName/708,一拳号,ship_razor,EnemyPilotName/708,友藏,0,EnemyDes/708,能挡下友藏一拳的，都会被他当做真正的男人所敬重。顺带一提，这个猥琐的光头有个很可爱的孙女。,90,110,7,8,0,3,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_OneWave,ScriptableAssets/EnemyShipAssets/Ship_OneWave_1,ScriptableAssets/EnemyShipAssets/Ship_OneWave_2,;92033;;;,;1;;;,;92033;;;,;1;;;,;92033;;;,;1;;;,Crest,,,StartYell/708_1,找我茬是吧，看我不莽死你！,EndYell/708_1,这这这…我还没开始莽呢…,,
+708,EnemyName/708,一拳号,ship_razor,EnemyPilotName/708,友藏,0,EnemyDes/708,能挡下友藏一拳的，都会被他当做真正的男人所敬重。顺带一提，这个猥琐的光头有个很可爱的孙女。,94,116,7,8,0,3,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_OneWave,ScriptableAssets/EnemyShipAssets/Ship_OneWave_1,ScriptableAssets/EnemyShipAssets/Ship_OneWave_2,;92033;;;,;1;;;,;92033;;;,;1;;;,;92033;;;,;1;;;,Crest,,,StartYell/708_1,找我茬是吧，看我不莽死你！,EndYell/708_1,这这这…我还没开始莽呢…,,
 709,EnemyName/703,女王号,ship_spinner,EnemyPilotName/703,安蒂,0,EnemyDes/703,安蒂是一个时尚的宇宙海盗，她对时尚的理解就是独一无二，她无法忍受和别人穿一样的衣服，吃一样的食物，甚至不愿意和别人用相同点数的能量。,64,80,6,7,0,3,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_BloodyMoon_yt,ScriptableAssets/EnemyShipAssets/Ship_BloodyMoon_yt_1,ScriptableAssets/EnemyShipAssets/Ship_BloodyMoon_yt_2,;91067;;;,;1;;;,;91067;;;,;1;;;,;91067;;;,;1;;;,Spinner,,;77;;;,StartYell/703_1,又一个老土的赏金猎人...,EndYell/703_1,别送我去星际监狱！我无法忍受制式的囚服！,,
 710,EnemyName/710,本源号,ship_wall_blue,EnemyPilotName/710,L,0,EnemyDes/710,万物本源，皆为混沌，吾道天道，皆为虚妄。L在天门星立誓，要扫清一切花里胡哨的部件。然后…他就被通缉了。,42,55,5,6,0,3,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_Basic,ScriptableAssets/EnemyShipAssets/Ship_Basic_1,ScriptableAssets/EnemyShipAssets/Ship_Basic_2,;92058;;;,;1;;;,;92058;;;,;1;;;,;92058;;;,;1;;;,Wall_Blue,FALSE,,StartYell/710_1,万物本源，皆为混沌，吾道天道，皆为虚妄。,EndYell/710_1,尘归尘…土归土…,,
-712,EnemyName/712,跳蛙号,ship_builder,EnemyPilotName/712,瑞文,0,EnemyDes/712,跳蛙号是瑞文精心研发的飞船，以战斗力的不稳定著称，强的时候谁都打不过，弱的时候谁都打不过。,50,62,7,8,0,3,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_JumpFrog,ScriptableAssets/EnemyShipAssets/Ship_JumpFrog_1,ScriptableAssets/EnemyShipAssets/Ship_JumpFrog_2,;91053;;;,;1;;;,;91053;;;,;1;;;,;91053;;;,;1;;;,Builder,,,StartYell/712_1,注意你的回合时间，因为我的过场可能长到演不完！,EndYell/712_1,我的回合，结…结束了？,,
+712,EnemyName/712,跳蛙号,ship_builder,EnemyPilotName/712,瑞文,0,EnemyDes/712,跳蛙号是瑞文精心研发的飞船，以战斗力的不稳定著称，强的时候谁都打不过，弱的时候谁都打不过。,55,68,7,8,0,3,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_JumpFrog,ScriptableAssets/EnemyShipAssets/Ship_JumpFrog_1,ScriptableAssets/EnemyShipAssets/Ship_JumpFrog_2,;91053;;;,;1;;;,;91053;;;,;1;;;,;91053;;;,;1;;;,Builder,,,StartYell/712_1,注意你的回合时间，因为我的过场可能长到演不完！,EndYell/712_1,我的回合，结…结束了？,,
 713,EnemyName/713,压制号,ship_razor,EnemyPilotName/713,艾德,0,EnemyDes/713,艾德因为乱丢垃圾被星际警察罚了100星币，为了交罚单他改造了飞船，成了一名靠肆意倾泻垃圾战斗的星际海盗，喜提通缉。,52,64,5,6,0,3,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_OnePoint,ScriptableAssets/EnemyShipAssets/Ship_OnePoint_1,ScriptableAssets/EnemyShipAssets/Ship_OnePoint_2,;92036;;;,;1;;;,;92036;;;,;1;;;,;92036;;;,;1;;;,Crest,,,StartYell/713_1,听说你好像能量不够多？让我来帮帮你！,,,,
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 801,EnemyName/801,公平号,ship_yellow,EnemyPilotName/801,九筒,0,EnemyDes/801,曾发表过著名宣言：我来当宇宙海盗只为三件事——公平，公平，还是公平！,70,86,6,7,1,13,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_Justice,ScriptableAssets/EnemyShipAssets/Ship_Justice_1,ScriptableAssets/EnemyShipAssets/Ship_Justice_2,;92047;;;,;1;;;,;92047;;;,;1;;;,;92047;;;,;1;;;,Yellow,,,StartYell/801_1,我就是要站着把钱挣了！,EndYell/801_1,我成替身了？,WinYell/801_1,没有你对我很重要。
@ -79,7 +79,7 @@ int,string,void,string,string,void,int,string,void,int,int,int,int,int,int,strin
 804,EnemyName/804,联防号,ship_normal,EnemyPilotName/804,LINKTP5620,0,EnemyDes/804,通过联合防御部件来防御对手的攻击对莱雷这样的均衡性海盗确实是最好的选择，他的防御堪称完美，当然在他被电话诈骗走一个组件之前。,62,78,6,7,1,13,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_LinkDefence,ScriptableAssets/EnemyShipAssets/Ship_LinkDefence_1,ScriptableAssets/EnemyShipAssets/Ship_LinkDefence_2,;92014;;;,;2;;;,;92014;;;,;2;;;,;92014;;;,;2;;;,Normal,,,StartYell/804_1,喂！喂！我听过你的声音，你就是给我打电话的那个混蛋吧！,EndYell/804_1,早知道就贷款再买一个联防装置了…,WinYell/804_1,把我的部件交出来！
 805,EnemyName/805,21点号,ship_razor,EnemyPilotName/805,本,10,EnemyDes/805,作为数学天才，本运用自己的计算能力在宇宙赌场中通过算牌赢得了大量星币，最终被星际赌场高额通缉。,48,62,5,6,1,13,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_Blackjack,ScriptableAssets/EnemyShipAssets/Ship_Blackjack_1,ScriptableAssets/EnemyShipAssets/Ship_Blackjack_2,;92090;;91075;;;,;1;;1;;;,;92090;;91075;;;,;1;;1;;;,;92090;;91075;;;,;1;;1;;;,Crest,,,StartYell/805_1,赌博？不，我只是追求数学期望！,EndYell/805_1,逃了这么久，被抓捕也是符合概率的...,,
 806,EnemyName/806,十字扩散号,ship_razor,EnemyPilotName/806,加布,5,EnemyDes/806,加布是一个奸商，但他的店铺总是因为被小偷光顾，被僧侣化缘而入不敷出。直到有一天，一个赏金猎人拿着无敌屏障抢光了他的装甲商店，一怒之下，他踏上了宇宙海盗这条犯罪之路…,74,90,6,7,1,13,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_NearbyOne,ScriptableAssets/EnemyShipAssets/Ship_NearbyOne_1,ScriptableAssets/EnemyShipAssets/Ship_NearbyOne_2,;92096;;;,;1;;;,;92096;;;,;1;;;,;92096;;;,;1;;;,Crest,,,StartYell/806_1,是不是你！你有没有抢过我的商店？,EndYell/806_1,在孤星宇宙，开商店果然是个错误的选择…,,
-809,EnemyName/809,三角号,ship_triangle,EnemyPilotName/809,舍基狮,0,EnemyDes/809,作为一名飞船设计师，舍基狮认为非对称的三角形飞船才是最好的。不过他的新飞船还有点小瑕疵，他现在正在四处打劫筹措资金来修复它。,58,76,6,7,0,3,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_Triangle,ScriptableAssets/EnemyShipAssets/Ship_Triangle_1,ScriptableAssets/EnemyShipAssets/Ship_Triangle_2,;92008;;;,;2;;;,;92008;;;,;2;;;,;92008;;;,;2;;;,Triangle,,,StartYell/809_1,感受到三角形的美了吗？,EndYell/809_1,哦，我完美的设计，碎了一地……,WinYell/809_1,我的飞船无懈可击。
+809,EnemyName/809,三角号,ship_triangle,EnemyPilotName/809,舍基狮,0,EnemyDes/809,作为一名飞船设计师，舍基狮认为非对称的三角形飞船才是最好的。不过他的新飞船还有点小瑕疵，他现在正在四处打劫筹措资金来修复它。,62,80,6,7,0,3,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_Triangle,ScriptableAssets/EnemyShipAssets/Ship_Triangle_1,ScriptableAssets/EnemyShipAssets/Ship_Triangle_2,;92008;;;,;2;;;,;92008;;;,;2;;;,;92008;;;,;2;;;,Triangle,,,StartYell/809_1,感受到三角形的美了吗？,EndYell/809_1,哦，我完美的设计，碎了一地……,WinYell/809_1,我的飞船无懈可击。
 810,EnemyName/810,断电号,ship_razor,EnemyPilotName/810,加西亚,2,EnemyDes/810,加西亚从小就是一名这样的学生，告诉同学不用做作业，回家疯狂做习题。他深刻的明白，让对手划才是取胜之道。,60,78,6,7,1,13,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_Restrict,ScriptableAssets/EnemyShipAssets/Ship_Restrict_1,ScriptableAssets/EnemyShipAssets/Ship_Restrict_2,;92035;;;,;1;;;,;92035;;;,;1;;;,;92035;;;,;1;;;,Crest,FALSE,,StartYell/810_1,有什么好努力的，你看我，从来都不认真干活，快来划吧。,EndYell/810_1,这下我真的可以休息了...,WinYell/810_1,刚好可以好好休息一下了。
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 901,EnemyName/901,秩序号,ship_order,EnemyPilotName/901,柯里昂,0,EnemyDes/901,作为鬣狗帮的首领，柯里昂倾尽家财打造了他的无敌战舰秩序号，他只想告诉世人他的秩序：在这孤星宇宙，天上掉下枚星币也是他柯里昂家的。,160,200,9,10,2,103,Battleground_3,ScriptableAssets/EnemyShipAssets/Ship_Order,ScriptableAssets/EnemyShipAssets/Ship_Order_1,ScriptableAssets/EnemyShipAssets/Ship_Order_2,;91014;;;,;1;;;,;91014;;;,;1;;;,;91014;;;,;2;;;,Order,,,StartYell/901_1,告诉迈克，我想吃鱼了。,EndYell/901_1,看来这次轮到我节哀了。,WinYell/901_1,什么档次跟我在一个游戏里。
--- a/csv/shipunit/ShipUnit
+++ b/csv/shipunit/ShipUnit
@ -60,14 +60,14 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 11809,Name/11809_2,微弱能源+,2,Text/11809,微弱,0,0,,,0,;7;;;,,,,1,Des/11809_2,发动({0})：生成1个[橙色{1}点]能量。,;US:1;;;,;1;;;,,,2,Support_Player/Skill_StrongGenerate,device_pure,Pure
 11810,Name/11810_1,装甲熔炼器,1,Text/11810,熔炼装甲,0,0,,,0,;7;;;,,,,1,Des/11810_1,发动({0})：受到{1}点伤害，生成1个能量。,;US:1;;;,;2;;;,,,2,Support_Player/Skill_SelfDamageGenerateCore,device_armour_lighter,
 11810,Name/11810_2,装甲熔炼器+,2,Text/11810,熔炼装甲,0,0,,,0,;7;;;,,,,1,Des/11810_1,发动({0})：受到{1}点伤害，生成1个能量。,;US:1;;;,;1;;;,,,2,Support_Player/Skill_SelfDamageGenerateCore,device_armour_lighter,
-11812,Name/11812_1,增长装置,1,Text/11812,增长,0,0,,,0,;7;;;,,,,1,Des/11812_1,发动({0})：使手牌中所有[白色]能量点数提升{1}点。,;US:2;;;,;2;;;,,,2,Support_Player/Skill_TurnEndPowerUp,device_turn_end_point_up,
-11812,Name/11812_2,增长装置+,2,Text/11812,增长,0,0,,,0,;7;;;,,,,1,Des/11812_1,发动({0})：使手牌中所有[白色]能量点数提升{1}点。,;US:2;;;,;3;;;,,,2,Support_Player/Skill_TurnEndPowerUp,device_turn_end_point_up,
+11812,Name/11812_1,增长装置,1,Text/11812,增长,0,0,,,0,;7;;;,,,,1,Des/11812_1,发动({0})：手牌中所有[白色]能量点数提升{1}点。,;US:1;;;,;1;;;,,,2,Support_Player/Skill_TurnEndPowerUp,device_turn_end_point_up,
+11812,Name/11812_2,增长装置+,2,Text/11812,增长,0,0,,,0,;7;;;,,,,1,Des/11812_1,发动({0})：手牌中所有[白色]能量点数提升{1}点。,;US:1;;;,;2;;;,,,2,Support_Player/Skill_TurnEndPowerUp,device_turn_end_point_up,
 11813,Name/11813_1,脉冲供能器,1,Text/11813,脉冲供能,0,0,,,0,;7;;;,,,,1,Des/11813_1,发动({0})：生成1个[白色{1}点]能量。,;US:3;;;,;9;;;,,,2,Support_Player/Skill_FreePurple,device_free,
 11813,Name/11813_2,脉冲供能器+,2,Text/11813,脉冲供能,0,0,,,0,;7;;;,,,,1,Des/11813_2,发动({0})：生成1个[橙色{1}点]能量。,;US:3;;;,;9;;;,,,2,Support_Player/Skill_FreePurple,device_free,
 11814,Name/11814_1,回合能量装置,1,Text/11814,能量,2,0,,,0,;7;;;,,,,1,Des/11814_1,每场战斗限3次，发动({0})：生成{1}个与当前回合数相同点数的[白色]能量。,;US:0;;;,;1;;;,ExtraDes/BattleOnce,效果剩余：{0}次,2,Support_Player/Skill_TurnPower,device_round_energy_3,
 11814,Name/11814_2,回合能量装置+,2,Text/11814,能量,2,0,,,0,;7;;;,,,,1,Des/11814_2,每场战斗限3次，发动({0})：生成{1}个与当前回合数相同点数的[橙色]能量。,;US:0;;;,;1;;;,ExtraDes/BattleOnce,效果剩余：{0}次,2,Support_Player/Skill_TurnPower,device_round_energy_3,
-11815,Name/11815_1,升级装置,1,Text/11815,升级,0,1,;11;;;,,0,;7;;;,,,-20,1,Des/11815_1,战斗开始时，在本场战斗中升级相邻部件。,,,,,2,Support_Player/Skill_AroundUnitUpgrade,device_upgrade,
-11815,Name/11815_2,升级装置+,2,Text/11815,升级,0,1,;11;;;,,0,;7;;;,,,-20,1,Des/11815_2,战斗开始时，在本场战斗中升级所有部件。,,,,,2,Support_Player/Skill_AroundUnitUpgrade,device_upgrade,
+11815,Name/11815_1,升级装置,1,Text/11815,升级,0,1,;11;;;,,0,;7;;;,,,,1,Des/11815_1,战斗开始时，在本场战斗中升级相邻非同名部件。,,,,,2,Support_Player/Skill_AroundUnitUpgrade,device_upgrade,
+11815,Name/11815_2,升级装置+,2,Text/11815,升级,0,1,;11;;;,,0,;7;;;,,,,1,Des/11815_2,战斗开始时，在本场战斗中升级所有非同名部件。,,,,,2,Support_Player/Skill_AroundUnitUpgrade,device_upgrade,
 11816,Name/11816_1,外置油桶,1,Text/11816,临时燃料,0,1,;11;;;,,0,;7;;;,,,,1,Des/11816_1,战斗开始时，在本场战斗中获得{0}点燃料。,,;2;;;,,,2,Support_Player/Skill_LoadNextMoveFree,device_fuel,
 11816,Name/11816_2,外置油桶+,2,Text/11816,临时燃料,0,1,;11;;;,,0,;7;;;,,,,1,Des/11816_1,战斗开始时，在本场战斗中获得{0}点燃料。,,;3;;;,,,2,Support_Player/Skill_LoadNextMoveFree,device_fuel,
 11819,Name/11819_1,能量增强装置,1,Text/11819,增强,0,1,,,0,;7;;;,,,,1,Des/11819_1,使同列攻击部件装载能量时，额外获得{0}点威力。 ,,;2;;;,,,2,Support_Player/Skill_SupprotFrontPowerLoad,device_energy_amplifier,EnergyAmplifier
@ -419,8 +419,8 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 80005,Name/80005_2,跳蛙核心+,2,Text/80005,跳蛙,0,1,,,3,;7;;77;;;,;1;;;,,,1,Des/80005_1,在战斗中拥有{0}点功率，对波失败：若自身为最前方的部件，则使自身功率翻倍并随机转移至1个攻击部件，并摧毁自身。,;PA:3;;;,,,,1,Cannon_Player/Skill_JumpFrogPlayer,cannon_frog,Frog
 80006,Name/80006_1,连胜核心,1,Text/80006,连胜,0,1,,,3,;7;;77;;;,;1;;;,,,1,Des/80006_1,对波胜利：获得{0}点功率。,,;1;;;,,,1,Cannon_Player/Skill_PowerUpByWin,cannon_win_poweradd,
 80006,Name/80006_2,连胜核心,2,Text/80006,连胜,0,1,,,3,;7;;77;;;,;1;;;,,,1,Des/80006_1,对波胜利：获得{0}点功率。,,;2;;;,,,1,Cannon_Player/Skill_PowerUpByWin,cannon_win_poweradd,
-80007,Name/80007_1,终结者,1,Text/80007,终结,0,2,,,3,;7;;77;;;,;1;;;,,,1,Des/80007_1,当自身为唯一一种存在的部件时，额外拥有{0}点威力。,,;77;;;,,,1,Cannon_Player/Skill_SnapLastPlayer,cannon_terminator,
-80007,Name/80007_2,终结者+,2,Text/80007,终结,0,2,,,3,;7;;77;;;,;1;;;,,,1,Des/80007_1,当自身为唯一一种存在的部件时，额外拥有{0}点威力。,,;99;;;,,,1,Cannon_Player/Skill_SnapLastPlayer,cannon_terminator,
+80007,Name/80007_1,终结者,1,Text/80007,终结,0,2,,,3,;7;;77;;;,;1;;;,,,1,Des/80007_1,当终结者为唯一一种存在的部件时，额外拥有{0}点威力。,,;77;;;,,,1,Cannon_Player/Skill_SnapLastPlayer,cannon_terminator,
+80007,Name/80007_2,终结者+,2,Text/80007,终结,0,2,,,3,;7;;77;;;,;1;;;,,,1,Des/80007_1,当终结者为唯一一种存在的部件时，额外拥有{0}点威力。,,;99;;;,,,1,Cannon_Player/Skill_SnapLastPlayer,cannon_terminator,
 80008,Name/80008_1,狂暴核心,1,Text/80008,狂暴,0,1,,,3,;7;;77;;;,;1;;1;;;,,,1,Des/80008_1,计时({0})：获得威力翻倍。,;CD:3;;;,,,,1,Cannon_Player/Skill_CriticalCannonPlayer,cannon_crit,
 80008,Name/80008_2,狂暴核心+,2,Text/80008,狂暴,0,1,,,3,;7;;77;;;,;1;;1;;;,,,1,Des/80008_1,计时({0})：获得威力翻倍。,;CD:2;;;,,,,1,Cannon_Player/Skill_CriticalCannonPlayer,cannon_crit,
 80009,Name/80009_1,受损的恐怖骨刺,1,Text/80009,恐怖,0,2,,,3,;7;;77;;;,;3;;;,,,1,Des/80009_1,在战斗中拥有{0}点功率，对波失败：若本回合自身装载过能量，自身功率翻倍。,;PA:1;;;,,,,1,Cannon_Player/Skill_LoseDoubleAddedPlayer,cannon_fishbone,
@ -432,8 +432,8 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 80801,Name/80801_2,启航能量+,2,Text/80801,启航,0,0,,,2,;7;;;,,,,1,Des/80801_2,战斗开始时，生成1个[橙色{0}点]能量。,,;7;;;,,,2,Support_Player/Skill_StartCreatPower,device_start,
 80802,Name/80802_1,启航功率,1,Text/80802,启航,0,0,,,2,;7;;;,,,,1,Des/80802_1,战斗开始时，使所有初始攻击部件获得{0}点功率。,,;2;;;,,,2,Support_Player/Skill_PowerBaseCannon,device_basic_poweradd,
 80802,Name/80802_2,启航功率+,2,Text/80802,启航,0,0,,,2,;7;;;,,,,1,Des/80802_1,战斗开始时，使所有初始攻击部件获得{0}点功率。,,;3;;;,,,2,Support_Player/Skill_PowerBaseCannon,device_basic_poweradd,
-80803,Name/80803_1,伪装假面,1,Text/80803,伪装,0,2,,,3,;7;;;,,,,0,Des/80803_1,发动({0})：选择1个相邻辅助部件，使其随机替换为1个未升级的辅助部件。,;US:1;;;,,,,2,Support_Player/Skill_ReplaceHand,device_mask,
-80803,Name/80803_2,伪装假面+,2,Text/80803,伪装,0,2,,,3,;7;;;,,,,0,Des/80803_2,发动({0})：选择1个相邻辅助部件，使其随机替换为1个已升级的辅助部件。,;US:1;;;,,,,2,Support_Player/Skill_ReplaceHand,device_mask,
+80803,Name/80803_1,伪装假面,1,Text/80803,伪装,0,2,,,3,;7;;;,,,,0,Des/80803_1,发动({0})：选择1个其他辅助部件，使其随机替换为1个未升级的辅助部件。,;US:1;;;,,,,2,Support_Player/Skill_ReplaceHand,device_mask,
+80803,Name/80803_2,伪装假面+,2,Text/80803,伪装,0,2,,,3,;7;;;,,,,0,Des/80803_2,发动({0})：选择1个其他辅助部件，使其随机替换为1个已升级的辅助部件。,;US:1;;;,,,,2,Support_Player/Skill_ReplaceHand,device_mask,
 80804,Name/80804_1,未经改造的普通怀表,1,Text/80804,回溯,0,2,,,3,;7;;77;;;,,,,1,Des/80804_1,回合开始时的效果会额外触发{0}次。,,;0;;;,,,2,Support_Player/Skill_SetTurn,device_pocket_watch,PocketWatch
 80804,Name/80804_2,金金的怀表+,2,Text/80804,回溯,0,2,,,3,;7;;77;;;,,,,1,Des/80804_1,回合开始时的效果会额外触发{0}次。,,;1;;;,,,2,Support_Player/Skill_SetTurn,device_pocket_watch,PocketWatch
 80805,Name/80805_1,僚机火炮,1,Text/80805,开火,0,1,,,5,;7;;77;;;,;3;;2;;1;;;,,,1,Des/80805_1,装载后，对敌方造成{1}点伤害。计时({0})：摧毁自身。,;CD:3;;;,;6;;;,,,2,Support_Player/Skill_SupportLoadDamage,device_wingman,
@ -467,6 +467,9 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 80819,Name/80819_1,一次性防御装置,1,Text/80819,一次性防御,0,1,,,3,;7;;77;;;,,,,1,Des/80819_1,对波失败：只受到1点伤害并摧毁自身。,,,,,2,Support_Player/Skill_OnceDefencePlayer,device_once_defence,
 80820,Name/80820_1,恒星,1,Text/80820,双方功率提升,0,1,,,3,;7;;77;;;,,,,1,Des/80820_1,回合开始时，使敌我双方所有攻击部件获得{0}点功率。,,;2;;;,,,2,Support_Player/Skill_BattleAxeSupportPlayer,device_sun,Sun
 80820,Name/80820_2,恒星+,2,Text/80820,双方功率提升,0,1,,,3,;7;;77;;;,,,,1,Des/80820_1,回合开始时，使敌我双方所有攻击部件获得{0}点功率。,,;3;;;,,,2,Support_Player/Skill_BattleAxeSupportPlayer,device_sun,Sun
+80821,Name/80821_1,对波机器,1,Text/80821,对波,0,2,,,3,;7;;77;;;,,,,2,Des/80821_1,第{0}回合对波结束后会额外进行1次对波。,,;1;;;,,,2,Support_Player/Skill_BoBo,device_mask,
+80821,Name/80821_2,对波机器+,2,Text/80821,对波,0,2,,,3,;7;;77;;;,,,,1,Des/80821_1,第{0}回合对波结束后会额外进行1次对波。,,;1;;;,,,2,Support_Player/Skill_BoBo,device_mask,
+,,,,,,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,,,,
 91001,Name/91001_1,基础核心,1,Text/Empty,,0,0,,FALSE,5,,;1;;;,,,1,Des/Empty,,,,,,1,Cannon_Player/Skill_Null,cannon_basic_duel,
 91001,Name/91001_2,基础核心+,2,Text/Empty,,0,0,,FALSE,5,,;1;;1;;;,,,1,Des/Empty,,,,,,1,Cannon_Player/Skill_Null,cannon_basic_duel,
@ -548,22 +551,22 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 91050,Name/91050_1,宝石核心,1,Text/91050,增幅,0,1,,FALSE,5,,;1;;1;;;,,,1,Des/91050_1,当被摧毁时，使其余宝石核心获得{0}点功率。,,;2;;;,,,1,Cannon_Enemy/Skill_SnapCannon,cannon_gem,
 91050,Name/91050_2,宝石核心+,2,Text/91050,增幅,0,1,,FALSE,5,,;1;;1;;;,,,1,Des/91050_1,当被摧毁时，使其余宝石核心获得{0}点功率。,,;3;;;,,,1,Cannon_Enemy/Skill_SnapCannon,cannon_gem,
 91050,Name/91050_3,宝石核心++,3,Text/91050,增幅,0,1,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91050_1,当被摧毁时，使其余宝石核心获得{0}点功率。,,;4;;;,,,1,Cannon_Enemy/Skill_SnapCannon,cannon_gem,
-91051,Name/91051_1,终结者,1,Text/91051,终结,0,2,,FALSE,5,,;1;;;,,,1,Des/91051_1,当自身为唯一一种存在的部件时，额外拥有{0}点威力。,,;77;;;,,,1,Cannon_Enemy/Skill_SnapLast,cannon_terminator,
-91051,Name/91051_2,终结者+,2,Text/91051,终结,0,2,,FALSE,5,,;1;;;,,,2,Des/91051_1,当自身为唯一一种存在的部件时，额外拥有{0}点威力。,,;99;;;,,,1,Cannon_Enemy/Skill_SnapLast,cannon_terminator,
+91051,Name/91051_1,终结者,1,Text/91051,终结,0,2,,FALSE,5,,;1;;;,,,1,Des/91051_1,当终结者为唯一一种存在的部件时，额外拥有{0}点威力。,,;77;;;,,,1,Cannon_Enemy/Skill_SnapLast,cannon_terminator,
+91051,Name/91051_2,终结者+,2,Text/91051,终结,0,2,,FALSE,5,,;1;;;,,,1,Des/91051_1,当终结者为唯一一种存在的部件时，额外拥有{0}点威力。,,;99;;;,,,1,Cannon_Enemy/Skill_SnapLast,cannon_terminator,
 91053,Name/91053_1,跳蛙核心,1,Text/91053,跳蛙,0,1,,FALSE,5,,;1;;;,,,1,Des/91053_1,在战斗中拥有{0}点功率，对波失败：若自身为最前方的部件，则使自身功率翻倍并随机转移至1个攻击部件，并摧毁自身。,;PA:2;;;,,,,1,Cannon_Enemy/Skill_JumpFrog,cannon_frog,Frog
 91053,Name/91053_2,跳蛙核心+,2,Text/91053,跳蛙,0,1,,FALSE,5,,;1;;;,,,1,Des/91053_1,在战斗中拥有{0}点功率，对波失败：若自身为最前方的部件，则使自身功率翻倍并随机转移至1个攻击部件，并摧毁自身。,;PA:3;;;,,,,1,Cannon_Enemy/Skill_JumpFrog,cannon_frog,Frog
 91055,Name/91055_1,滑轮核心-前排,1,Text/91055,换位,0,1,,FALSE,5,,;1;;;,,,1,Des/91055_1,敌方前排部件装载后，自身换位至同列。,,,,,1,Cannon_Enemy/Skill_Tramcar,cannon_pulley_1,Pulley1
 91056,Name/91056_1,滑轮核心-中排,1,Text/91056,换位,0,1,,FALSE,5,,;1;;;,,,1,Des/91056_1,敌方中排部件装载后，自身换位至同列。,,,,,1,Cannon_Enemy/Skill_Tramcar,cannon_pulley_2,Pulley2
 91057,Name/91057_1,滑轮核心-后排,1,Text/91057,换位,0,1,,FALSE,5,,;1;;;,,,1,Des/91057_1,敌方后排部件装载后，自身换位至同列。,,,,,1,Cannon_Enemy/Skill_Tramcar,cannon_pulley_3,Pulley3
 91058,Name/91058_1,木马核心,1,Text/91058,木马,0,0,,FALSE,5,,;1;;;,,,1,Des/Empty,,,,,,1,Cannon_Enemy/Skill_Horse,cannon_horse,Horse
-91060,Name/91060_1,双刃战斧,1,Text/91060,双刃,0,2,,FALSE,5,,;3;;;,,,1,Des/91060_1,获得的功率翻倍。,,,,,1,Cannon_Enemy/Skill_AddedDoubleEnemy,cannon_axe,
-91060,Name/91060_2,双刃战斧+,2,Text/91060,双刃,0,2,,FALSE,5,,;1;;;,,,1,Des/91060_1,获得的功率翻倍。,,,,,1,Cannon_Enemy/Skill_AddedDoubleEnemy,cannon_axe,
+91060,Name/91060_1,双刃战斧,1,Text/91060,双刃,0,2,,FALSE,5,,;1;;;,,,1,Des/91060_1,获得的功率翻倍。,,,,,1,Cannon_Enemy/Skill_AddedDoubleEnemy,cannon_axe,
+91060,Name/91060_2,双刃战斧+,2,Text/91060,双刃,0,2,,FALSE,5,,;1;;1;;;,,,1,Des/91060_1,获得的功率翻倍。,,,,,1,Cannon_Enemy/Skill_AddedDoubleEnemy,cannon_axe,
 91061,Name/91061_1,对子核心,1,Text/91061,对子,0,0,,FALSE,5,,;1;;1;;;,,,1,Des/91061_1,装载2个相同点数的能量时，获得{0}点威力。,,;2;;;,,,1,Cannon_Enemy/Skill_DoublePowerUpEnemy,cannon_double,
 91061,Name/91061_2,对子核心+,2,Text/91061,对子,0,0,,FALSE,5,,;1;;1;;;,,,1,Des/91061_1,装载2个相同点数的能量时，获得{0}点威力。,,;4;;;,,,1,Cannon_Enemy/Skill_DoublePowerUpEnemy,cannon_double,
 91062,Name/91062_1,橙色星钻,1,Text/91062,橙色星钻,0,2,,FALSE,5,,;3;;;,,,1,Des/91062_1,装载后，额外获得装载点数的威力。,,,,,1,Cannon_Enemy/Skill_PurpleDoubleEnemy,cannon_orange_core,
 91062,Name/91062_2,橙色星钻+,2,Text/91062,橙色星钻,0,2,,FALSE,5,,;3;;3;;;,,,1,Des/91062_1,装载后，额外获得装载点数的威力。,,,,,1,Cannon_Enemy/Skill_PurpleDoubleEnemy,cannon_orange_core,
-91063,Name/91063_1,三棱核心,1,Text/91063,三棱,0,1,,FALSE,5,,;2;;2;;;,,,1,Des/91063_1,三重：获得{0}点功率。,,;2;;;,,,1,Cannon_Enemy/Skill_TrianglePowerCannonEnemy,cannon_triangle,
-91063,Name/91063_2,三棱核心+,2,Text/91063,三棱,0,1,,FALSE,5,,;2;;2;;;,,,1,Des/91063_1,三重：获得{0}点功率。,,;3;;;,,,1,Cannon_Enemy/Skill_TrianglePowerCannonEnemy,cannon_triangle,
+91063,Name/91063_1,三棱核心,1,Text/91063,三棱,0,1,,FALSE,5,,;2;;2;;;,,,1,Des/91063_1,三重：获得{0}点功率。,,;3;;;,,,1,Cannon_Enemy/Skill_TrianglePowerCannonEnemy,cannon_triangle,
+91063,Name/91063_2,三棱核心+,2,Text/91063,三棱,0,1,,FALSE,5,,;2;;2;;;,,,1,Des/91063_1,三重：获得{0}点功率。,,;4;;;,,,1,Cannon_Enemy/Skill_TrianglePowerCannonEnemy,cannon_triangle,
 91064,Name/91064_1,自装核心,1,Text/91064,自装,0,1,,FALSE,5,,;1;;1;;;,,,0,Des/91064_1,回合开始时，为自身所有槽位装载[橙色{0}点]能量。,,;1;;;,,,1,Cannon_Enemy/Skill_SelfLoadEnergyEnemy,cannon_self_load,
 91064,Name/91064_2,自装核心+,2,Text/91064,自装,0,1,,FALSE,5,,;1;;1;;1;;;,,,0,Des/91064_1,回合开始时，为自身所有槽位装载[橙色{0}点]能量。,,;1;;;,,,1,Cannon_Enemy/Skill_SelfLoadEnergyEnemy,cannon_self_load,
 91066,Name/91066_1,稳定光束,1,Text/91066,稳定,0,0,,FALSE,5,,;3;;2;;;,,,1,Des/91066_1,装载的能量点数视为{0}点。,,;4;;;,,,1,Cannon_Enemy/Skill_StabilityEnemy,cannon_stable_red,
@ -649,7 +652,7 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 92085,Name/92085_1,[宝具]直伤之镖,1,Text/92085,直伤,0,1,,FALSE,5,,,,,1,Des/92085_1,若本列没有对波失败，则对敌方造成{0}点伤害。,,;5;;;,,,2,Support_Enemy/Skill_KingsNeedle,weapon_dart,
 92086,Name/92086_1,[宝具]销毁之书,1,Text/92086,销毁,0,1,,FALSE,5,,,,,1,Des/92086_1,若本列没有对波失败，则销毁敌方所有能量。,,,,,2,Support_Enemy/Skill_KingsCurseBook,weapon_book,
 92089,Name/92089_1,耐久回复装置,1,Text/92089,耐久回复,0,1,,FALSE,5,,;1;;;,,,1,Des/92089_1,装载后，回复耐久值至3点。,,,,,2,Support_Enemy/Skill_BreakRecoverTo3,device_break_recover,
-92090,Name/92090_1,21点控制器,1,Text/92090,清零,0,1,,FALSE,5,,,,,1,Des/92090_1,当我方/敌方任意一列威力＞21点时，对我方/敌方该列部件造成1回合休眠。,,,,,2,Support_Enemy/Skill_Clear21,device_blackjack,
+92090,Name/92090_1,21点控制器,1,Text/92090,清零,0,1,,FALSE,5,,,,,1,Des/92090_1,当我方/敌方任意一列威力＞21点时，对我方/敌方该列攻击部件造成1回合休眠。,,,,,2,Support_Enemy/Skill_Clear21,device_blackjack,
 92092,Name/92092_1,飞船漏洞,1,Text/92092,漏洞,0,1,,FALSE,5,,;2;;1;;;,,,1,Des/92092_1,超频({0})：削减自身1点耐久。,;OC:3;;;,,,,2,Support_Enemy/Skill_BrokenPart,device_1st,
 92092,Name/92092_1,飞船漏洞+,2,Text/92092,漏洞,0,1,,FALSE,5,,;2;;1;;;,,,1,Des/92092_1,超频({0})：削减自身1点耐久。,;OC:4;;;,,,,2,Support_Enemy/Skill_BrokenPart,device_1st,
 92093,Name/92093_1,修复粒子,1,Text/92093,完美修复,0,1,,FALSE,5,,,,,1,Des/92093_1,回合开始时，回复所有血量。,,,,,2,Support_Enemy/Skill_RecoverAllHP,device_repair_particle,RepairParticle
--- a/csv/treasure/Treasure
+++ b/csv/treasure/Treasure
@ -53,6 +53,7 @@ int,string,void,int,bool,int,int[],int,int,int[],int,bool,string,void,int[],stri
 813,TreasureName/813,三节棍,1,,0,;77;;;,,5,;9;;;,,,TreasureDes/813,回合开始时，若同列有3个攻击部件，则此列所有攻击部件获得{0}点威力。,;2;;;,TS_ThreeCannonLine,Sprites/Treasures/3_staff,0,0
 814,TreasureName/814,余烬,1,,0,;7;;77;;;,,0,,,,TreasureDes/814,若攻击部件装载的能量是手牌中最后1个能量，则获得{0}点威力。,;5;;;,TS_LastPowerAllCannon,Sprites/Treasures/embers,0,0
 815,TreasureName/815,自动化模组,1,,0,;7;;77;;;,,1,,,,TreasureDes/815,回合开始时，若上回合装载的手牌能量数≤{0}，则所有攻击部件获得{1}点威力。,;3;;2;;;,TS_AutoLight,Sprites/Treasures/automatic_module,0,0
+816,TreasureName/816,核燃料,1,,0,;7;;77;;;,,1,;9;;;,,,TreasureDes/816,第{0}回合开始时，飞船中心的攻击部件获得威力翻倍。,;3;;;,TS_PowerRateCenter,Sprites/Treasures/nuclear_fuel,0,0
 ,,,,,,,,,,,,,,,,,,
 901,TreasureName/901,舰载音响·低音,2,,0,;7;;77;;;,,0,,,,TreasureDes/901,战斗开始时，所有攻击部件获得{0}点功率。,;1;;;,TS_StartPowerUp,Sprites/Treasures/loudspeaker_bass,0,0
 902,TreasureName/902,舰载音响·上,0,,0,;7;;77;;;,,0,,,,TreasureDes/902,战斗开始时，飞船上列所有攻击部件获得{0}点功率。,;1;;;,TS_StartUpCannonPowerUp,Sprites/Treasures/loudspeaker_up,0,0
@ -205,3 +206,6 @@ int,string,void,int,bool,int,int[],int,int,int[],int,bool,string,void,int[],stri
 5034,TreasureName/5034,升级模组,0,,0,;7;;77;;;,50038,0,,,FALSE,TreasureDes/5034,获得该宝物时，随机升级{0}个部件。,;2;;;,TS_UpgradeRandom,Sprites/Treasures/upgrade_module,0,0
 5035,TreasureName/5035,星币贷款,0,,0,;7;;77;;;,50009,0,,,FALSE,TreasureDes/5035,获得{0}星币，进入最后1个星系时，失去{0}星币。,;25;;;,TS_CoinLoan,Sprites/Treasures/star_coin_loan,0,0
 5036,TreasureName/5036,喷气背包,1,,0,;7;;;,50036,0,,,FALSE,TreasureDes/5036,获得该宝物时，所有初始攻击部件获得改造：负载-1。,,TS_GetLimitLowerInit,Sprites/Treasures/jetpack,0,0
+5037,TreasureName/5037,罪犯身份信息,0,,0,;7;;77;;;,50037,0,,,FALSE,TreasureDes/5037,<TALENT>50037</TALENT>天赋的事件变为提供3个选项。,;50037;;1;;;,TS_SetTalentValue,Sprites/Treasures/ID_card,0,2
+5038,TreasureName/5038,备用画笔,1,,0,;7;;77;;;,50039,0,,,,TreasureDes/5038,<TALENT>50039</TALENT>天赋效果变为每回合限2次。,;50039;;1;;;,TS_SetTalentValue,Sprites/Treasures/brush,0,0
+5039,TreasureName/5039,强化之眼,1,,0,;77;;;,50032,0,,,,TreasureDes/5039,拥有威力翻倍的攻击部件装载能量后，获得{0}点威力。,;1;;;,TS_DoubleLoadExtraPower,Sprites/Treasures/strengthen_eye,0,0
--- a/sprites/treasures/brush/brush.png
+++ b/sprites/treasures/brush/brush.png
--- a/sprites/treasures/id_card/ID_card.png
+++ b/sprites/treasures/id_card/ID_card.png
--- a/sprites/treasures/nuclear_fuel/nuclear_fuel.png
+++ b/sprites/treasures/nuclear_fuel/nuclear_fuel.png
--- a/sprites/treasures/strengthen_eye/strengthen_eye.png
+++ b/sprites/treasures/strengthen_eye/strengthen_eye.png
--- a/textmap/chinesetextmap_encounterevent/ChineseTextMap_EncounterEvent
+++ b/textmap/chinesetextmap_encounterevent/ChineseTextMap_EncounterEvent
@ -135,6 +135,7 @@ EventName/2460;"部件采购"
 EventName/2470;"分类商店"
 EventName/2480;"自动升级"
 EventName/2490;"生产技能"
+EventName/2500;"协会基地"
 EventDes/100;"远程商店服务，任何星系都可以远程送达。"
 EventDes/110;"定向部件升级，但仅限使用一次，若暂时不需要可关闭稍后再使用。"
 EventDes/130;"飞船修理和补给服务，为所有陷入窘境的赏金猎人提供帮助。"
@ -754,6 +755,11 @@ EventDes/2490;"酒馆里，一个年轻的智械拉住了你，嘴里说着孤
 EventDes/2491;"完成改造之后，年轻智械开心说了句“exp+3”就去找其他赏金猎人了。你虽然不懂他的想法，但你<shake>大受震撼</shake>。"
 EventDes/2492;"完成改造之后，年轻智械开心说了句“exp+3”就去找其他赏金猎人了。你虽然不懂他的想法，但你<shake>大受震撼</shake>。"
 EventDes/2493;"你才不会把自己的部件交给一个神志不清的智械。"
+EventDes/2500;"端点星，这里正是赏金猎人协会的基地所在，其标志性建筑——<color=#FFFF80>百科全书编写大楼</color>就在基地中心。\n\n你来到了护盾号的维护中心，不少驾驶着护盾号的赏金猎人正在进进出出。\n\n在这里，你可以享受到协会的顶级护盾维护服务。"
+EventDes/2501;"你将飞船开进维护中心，并申请了强化服务。协会的工程师轻车熟路地给你的护盾<color=#4DFF4D>完成了强化</color>。"
+EventDes/2502;"你将飞船开进维护中心，向他们反馈你的护盾系统在抓捕途中遭受了严重的损耗，申请更换一套新的护盾模组。\n\n协会的工程师二话不说，直接拿出维护中心<color=#4DFF4D>最高级的护盾模组</color>换了上去。"
+EventDes/2503;"你在门口被一个赏金猎人拦了下来，他说他的护盾号已经拿到了<wiggle>护盾流派最强的部件</wiggle>，现在急需提高护盾值上限。他愿意用他<glow>最最珍贵的宝物</glow>和你交易一些护盾组件。\n\n竟然还有这种好事，你想都不想就和他达成了交易。"
+EventDes/2504;"比起维护飞船，你还是对基地更感兴趣。你参观了百科全书编写大楼之后，就离开了端点星。"
 EvenOptionDes/StartDeal;"[进行交易]"
 EvenOptionDes/StartDealBounty;"[进行交易]（<b>消耗</b>本次支援）"
 EvenOptionDes/Get;"[获得]<g>[0]。</g>"
@ -1206,3 +1212,6 @@ EvenOptionDes/2480_1;"[星币]<b>失去{0}星币。</b><g>选择1个部件升级
 EvenOptionDes/2480_2;"[装甲]<b>受到{0}点伤害。</b><g>选择1个部件升级。</g>（可重复）"
 EvenOptionDes/2490_1;"[攻击部件]<b>失去{0}星币。</b><g>选择1个攻击部件，使其在战斗中拥有1点功率。</g>"
 EvenOptionDes/2490_2;"[辅助部件]<g>选择1个辅助部件，降低1次最高颜色槽位。</g>"
+EvenOptionDes/2500_1;"[强化]<g>获得{0}点护盾上限。</g>"
+EvenOptionDes/2500_2;"[更换]使护盾上限变为{0}点。"
+EvenOptionDes/2500_3;"[交易]<b>失去{0}点护盾上限。</b><g>获得[1]。</g>"
--- a/textmap/chinesetextmap_pilot/ChineseTextMap_Pilot
+++ b/textmap/chinesetextmap_pilot/ChineseTextMap_Pilot
@ -39,6 +39,7 @@ PilotName/10039;"PS003"
 PilotName/10041;"巴迪"
 PilotName/10042;"乘风"
 PilotName/10043;"暗影"
+PilotName/10044;"戴拿"
 PilotTitle/10000;"教官"
 PilotTitle/10001;"维修大师"
 PilotTitle/10002;"冥想者"
@ -80,6 +81,7 @@ PilotTitle/10039;"画家"
 PilotTitle/10041;"测距员"
 PilotTitle/10042;"ESTP"
 PilotTitle/10043;"黑客"
+PilotTitle/10044;"对波狂魔"
 PilotDes/10000;"赏金协会为所有初来乍到的新手猎人们提供尽可能的帮助，而教官正是其中的第一环。"
 PilotDes/10001;"动动师从一位猫猫族的大佬维修师，这位维修师擅长把汰换的零件翻新后再高价转售出去。"
 PilotDes/10002;"格瑞在工作之余开办了一个冥想班，用于帮助各类失眠者改善睡眠。"
@ -121,6 +123,7 @@ PilotDes/10039;"PS003原来是个菜鸡策划，后来被迫转行成为了一
 PilotDes/10041;"巴迪是曾是一名宇宙天体测距员，但是不知为何他测出的距离总是比实际上要多一格。"
 PilotDes/10042;"乘风作为兽族中的SSR种——熊猫族，几乎受到所有生物的喜欢，ESTP性格的他随随便便就能交到朋友。"
 PilotDes/10043;"有一次天才黑客暗影意外黑进了一个从未见过的资料库，在随意修改了几个参数之后，她发现整个世界的规则都变了。"
+PilotDes/10044;"戴拿钟爱对波，但他总是输，直到今天，他决定改变自己的命运！"
 PilotMono/10000/Init_1;"新人，准备好面对你的第一场战斗了吗？别担心，我会指导你的！"
 PilotMono/10000/Init_2;"这次你可要加油了，相信你可以的。"
 PilotMono/10000/Idle_1;"如果你有所疑惑，可以点击右上角的教程按钮进行查看。"
--- a/textmap/chinesetextmap_talent/ChineseTextMap_Talent
+++ b/textmap/chinesetextmap_talent/ChineseTextMap_Talent
@ -39,6 +39,7 @@ Talent/talent_ignorecolor_name;"颜色遮罩"
 Talent/talent_dirextension_name;"偏移的护目镜"
 Talent/talent_makefriends_name;"交个朋友"
 Talent/talent_rareorder_name;"错乱规则"
+Talent/talent_bobo_name;"再波一次"
 Talent/talent_tutorial_name;"坚韧"
 Talent/talent_recover_addcoin_name;"维修达人"
 Talent/talent_centeradded_name;"中心聚焦"
@ -131,6 +132,7 @@ Talent/talent_ignorecolor_des;"每回合限1次，装载的手牌能量可以无
 Talent/talent_dirextension_des;"所有*方位*的效果额外延长1格。"
 Talent/talent_makefriends_des;"前2场精英战斗结束后，获得1次固有天赋2选1的机会。"
 Talent/talent_rareorder_des;"在第1/2/3个星系中，随机部件和宝物时，稀有度强制变为普通/稀有/传说，且没有数量限制。"
+Talent/talent_bobo_des;"初始获得专属部件：<UNIT>80821|2</UNIT>。"
 Talent/talent_tutorial_des;"初始获得{0}点血量上限和{1}点燃料上限。"
 Talent/talent_recover_addcoin_des;"回复血量时，获得相同数量的星币。"
 Talent/talent_centeradded_des;"战斗开始时，*飞船中心*的*攻击部件*获得{0}点*功率*。"
--- a/textmap/chinesetextmap_treasure/ChineseTextMap_Treasure
+++ b/textmap/chinesetextmap_treasure/ChineseTextMap_Treasure
@ -44,6 +44,7 @@ TreasureName/812;"爆炸气体"
 TreasureName/813;"三节棍"
 TreasureName/814;"余烬"
 TreasureName/815;"自动化模组"
+TreasureName/816;"核燃料"
 TreasureName/901;"舰载音响·低音"
 TreasureName/902;"舰载音响·上"
 TreasureName/903;"舰载音响·中"
@ -178,6 +179,9 @@ TreasureName/5033;"白色槽位"
 TreasureName/5034;"升级模组"
 TreasureName/5035;"星币贷款"
 TreasureName/5036;"喷气背包"
+TreasureName/5037;"罪犯身份信息"
+TreasureName/5038;"备用画笔"
+TreasureName/5039;"强化之眼"
 TreasureDes/102;"*充能*效果触发时，生成1个[*蓝色*{0}点]能量。"
 TreasureDes/104;"战斗开始时，所有*充能*部件获得等同于其*充能*阈值一半的进度。"
 TreasureDes/105;"*充能*完成时，溢出的点数会继续*充能*。"
@ -224,6 +228,7 @@ TreasureDes/812;"*攻击部件*在装载后若仍有空槽位，则获得{0}点
 TreasureDes/813;"回合开始时，若*同列*有3个*攻击部件*，则此列所有*攻击部件*获得{0}点威力。"
 TreasureDes/814;"若*攻击部件*装载的能量是手牌中最后1个能量，则获得{0}点威力。"
 TreasureDes/815;"回合开始时，若上回合装载的手牌能量数≤{0}，则所有*攻击部件*获得{1}点威力。"
+TreasureDes/816;"第{0}回合开始时，*飞船中心*的*攻击部件*获得*威力翻倍*。"
 TreasureDes/901;"战斗开始时，所有*攻击部件*获得{0}点*功率*。"
 TreasureDes/902;"战斗开始时，飞船上列所有*攻击部件*获得{0}点*功率*。"
 TreasureDes/903;"战斗开始时，飞船中列所有*攻击部件*获得{0}点*功率*。"
@ -358,3 +363,6 @@ TreasureDes/5033;"通过腐化槽位部件获得的槽位颜色变为[*白色*]
 TreasureDes/5034;"获得该宝物时，随机升级{0}个部件。"
 TreasureDes/5035;"获得{0}星币，进入最后1个星系时，失去{0}星币。"
 TreasureDes/5036;"获得该宝物时，所有初始*攻击部件*获得改造：负载-1。"
+TreasureDes/5037;"<TALENT>50037</TALENT>天赋的事件变为提供3个选项。"
+TreasureDes/5038;"<TALENT>50039</TALENT>天赋效果变为每回合限2次。"
+TreasureDes/5039;"拥有*威力翻倍*的*攻击部件*装载能量后，获得{0}点威力。"
--- a/textmap/chinesetextmap_unit/ChineseTextMap_Unit
+++ b/textmap/chinesetextmap_unit/ChineseTextMap_Unit
@ -430,6 +430,8 @@ Name/80818_2;"建造装置+"
 Name/80819_1;"一次性防御装置"
 Name/80820_1;"恒星"
 Name/80820_2;"恒星+"
+Name/80821_1;"对波机器"
+Name/80821_2;"对波机器+"
 Name/91001_1;"基础核心"
 Name/91001_2;"基础核心+"
 Name/91002_1;"连胜核心"
@ -814,6 +816,7 @@ Text/80817;"防御"
 Text/80818;"建造"
 Text/80819;"一次性防御"
 Text/80820;"双方功率提升"
+Text/80821;"对波"
 Text/91002;"连胜"
 Text/91004;"连锁"
 Text/91005;"反击"
@ -960,13 +963,13 @@ Des/11808_1;"装载后，生成1个点数降低1点的能量，并使*后方**
 Des/11809_1;"*发动*({0})：生成1个[*白色*{1}点]能量。"
 Des/11809_2;"*发动*({0})：生成1个[*橙色*{1}点]能量。"
 Des/11810_1;"*发动*({0})：受到{1}点伤害，生成1个能量。"
-Des/11812_1;"*发动*({0})：使手牌中所有[*白色*]能量点数提升{1}点。"
+Des/11812_1;"*发动*({0})：手牌中所有[*白色*]能量点数提升{1}点。"
 Des/11813_1;"*发动*({0})：生成1个[*白色*{1}点]能量。"
 Des/11813_2;"*发动*({0})：生成1个[*橙色*{1}点]能量。"
 Des/11814_1;"每场战斗限3次，*发动*({0})：生成{1}个与当前回合数相同点数的[*白色*]能量。"
 Des/11814_2;"每场战斗限3次，*发动*({0})：生成{1}个与当前回合数相同点数的[*橙色*]能量。"
-Des/11815_1;"战斗开始时，在本场战斗中升级*相邻*部件。"
-Des/11815_2;"战斗开始时，在本场战斗中升级所有部件。"
+Des/11815_1;"战斗开始时，在本场战斗中升级*相邻*非同名部件。"
+Des/11815_2;"战斗开始时，在本场战斗中升级所有非同名部件。"
 Des/11816_1;"战斗开始时，在本场战斗中获得{0}点燃料。"
 Des/11819_1;"使*同列**攻击部件*装载能量时，额外获得{0}点威力。"
 Des/11820_1;"任意部件*发动*时，使自身*后方**攻击部件*获得{0}点威力。"
@ -1152,15 +1155,15 @@ Des/80003_1;"*超频*({0})：获得{1}点威力。"
 Des/80004_1;"回合开始时，获得与上回合本列所受到伤害相同的威力。"
 Des/80005_1;"在战斗中拥有{0}点*功率*，*对波失败*：若自身为最前方的部件，则使自身*功率*翻倍并随机转移至1个*攻击部件*，并*摧毁*自身。"
 Des/80006_1;"*对波胜利*：获得{0}点*功率*。"
-Des/80007_1;"当自身为唯一一种存在的部件时，额外拥有{0}点威力。"
+Des/80007_1;"当终结者为唯一一种存在的部件时，额外拥有{0}点威力。"
 Des/80008_1;"*计时*({0})：获得*威力翻倍*。"
 Des/80009_1;"在战斗中拥有{0}点*功率*，*对波失败*：若本回合自身装载过能量，自身*功率*翻倍。"
 Des/80010_1;"*同列*敌我双方所有*攻击部件*拥有*威力翻倍*。"
 Des/80801_1;"战斗开始时，生成1个[*蓝色*{0}点]能量。"
 Des/80801_2;"战斗开始时，生成1个[*橙色*{0}点]能量。"
 Des/80802_1;"战斗开始时，使所有初始*攻击部件*获得{0}点*功率*。"
-Des/80803_1;"*发动*({0})：选择1个*相邻**辅助部件*，使其随机替换为1个未升级的*辅助部件*。"
-Des/80803_2;"*发动*({0})：选择1个*相邻**辅助部件*，使其随机替换为1个已升级的*辅助部件*。"
+Des/80803_1;"*发动*({0})：选择1个其他*辅助部件*，使其随机替换为1个未升级的*辅助部件*。"
+Des/80803_2;"*发动*({0})：选择1个其他*辅助部件*，使其随机替换为1个已升级的*辅助部件*。"
 Des/80804_1;"回合开始时的效果会额外触发{0}次。"
 Des/80805_1;"装载后，对敌方造成{1}点伤害。*计时*({0})：*摧毁*自身。"
 Des/80806_1;"装载后，获得{0}星币，对波结束后，*摧毁*自身。"
@ -1178,6 +1181,7 @@ Des/80817_1;"*对波失败*：只受到1点伤害。"
 Des/80818_1;"装载后，在前方空位装备1个<UNIT>80819|1</UNIT>。"
 Des/80819_1;"*对波失败*：只受到1点伤害并*摧毁*自身。"
 Des/80820_1;"回合开始时，使敌我双方所有*攻击部件*获得{0}点*功率*。"
+Des/80821_1;"第{0}回合对波结束后会额外进行1次对波。"
 Des/91002_1;"*对波胜利*：获得{0}点*功率*。"
 Des/91003_1;"攻击状态下激活；蓄力状态下*休眠*，*休眠*时每回合获得{0}点*功率*。"
 Des/91004_1;"*连锁*。"
@ -1207,7 +1211,7 @@ Des/91044_1;"仅在横斩模式下激活。"
 Des/91044_2;"在战斗中拥有{0}点*功率*，仅在横斩模式下激活。"
 Des/91049_1;"在战斗中拥有{0}点*功率*，*对波失败*：自身*功率*翻倍。"
 Des/91050_1;"当被*摧毁*时，使其余宝石核心获得{0}点*功率*。"
-Des/91051_1;"当自身为唯一一种存在的部件时，额外拥有{0}点威力。"
+Des/91051_1;"当终结者为唯一一种存在的部件时，额外拥有{0}点威力。"
 Des/91053_1;"在战斗中拥有{0}点*功率*，*对波失败*：若自身为最前方的部件，则使自身*功率*翻倍并随机转移至1个*攻击部件*，并*摧毁*自身。"
 Des/91055_1;"敌方前排部件装载后，自身*换位*至*同列*。"
 Des/91056_1;"敌方中排部件装载后，自身*换位*至*同列*。"
@ -1283,7 +1287,7 @@ Des/92083_1;"若本列没有*对波失败*，则使所有<UNIT>91068|1</UNIT>获
 Des/92085_1;"若本列没有*对波失败*，则对敌方造成{0}点伤害。"
 Des/92086_1;"若本列没有*对波失败*，则销毁敌方所有手牌能量。"
 Des/92089_1;"装载后，回复*耐久*值至3点。"
-Des/92090_1;"当我方/敌方任意一列威力＞21点时，对我方/敌方该列部件造成1回合*休眠*。"
+Des/92090_1;"当我方/敌方任意一列威力＞21点时，对我方/敌方该列*攻击部件*造成1回合*休眠*。"
 Des/92092_1;"*超频*({0})：削减自身1点*耐久*。"
 Des/92093_1;"回合开始时，回复所有血量。"
 Des/92094_1;"装载后，随机使1个己方*攻击部件*和敌方*攻击部件*获得*威力翻倍*。"
--- a/textmap/englishtextmap_encounterevent/EnglishTextMap_EncounterEvent
+++ b/textmap/englishtextmap_encounterevent/EnglishTextMap_EncounterEvent
@ -135,6 +135,7 @@ EventName/2460;"Unit Procurement"
 EventName/2470;"Classified Stores"
 EventName/2480;"Automatic Upgrade"
 EventName/2490;"Production Skills"
+EventName/2500;"Terminus"
 EventDes/100;"Remote Shopping Services, available for delivery to any galaxy."
 EventDes/110;"Select a Unit to Upgrade, can be used once only. Turn it off to use it later if you don't need it immediately."
 EventDes/130;"Ship Repair and Supply Services, providing assistance to all struggling Bounty Hunters."
@ -754,6 +755,11 @@ EventDes/2490;"In the tavern, a young Mech pulls you aside and mutters incompreh
 EventDes/2491;"After completing the modification, the young Mech happily says "exp+3" before moving on to seek out other bounty hunters. Though you can't quite grasp his intentions, you are <shake>shocked</shake> by his actions."
 EventDes/2492;"After completing the modification, the young Mech happily says "exp+3" before moving on to seek out other bounty hunters. Though you can't quite grasp his intentions, you are <shake>shocked</shake> by his actions."
 EventDes/2493;"But you won't hand over your Units to a delusional Mech."
+EventDes/2500;"Terminus is the base of the Bounty Hunter Association. Its landmark building, <color=#FFFF80>the Encyclopedia Headquarters</color>, stands in the center of the base.\n\nYou arrive at the Shielder's Maintenance Center. Many Shielder-driven bounty hunters are frequently entering and exiting.\n\nThis place provides top-notch services of shield maintenance."
+EventDes/2501;"You pilot your spaceship into the Maintenance Center to request shield enhancement services. The Association's engineers <color=#4DFF4D>swiftly complete their task</color>."
+EventDes/2502;"You pilot your spaceship into the Maintenance Center, reporting that your shield system sustained severe damage during the capture. You then apply for a replacement shield module.\n\nWithout saying a word, the engineers of the Association take out their <color=#4DFF4D>most advanced shield module</color> and install it in place."
+EventDes/2503;"You are stopped by a bounty hunter at the door. He says that his Shielder has already obtained <wiggle>the most powerful Units of the shield genre</wiggle>, and now he really needs to increase the Max Shield Points. He is willing to trade his <glow>most precious Treasure</glow> with you for some shield components.\n\nWhat a surprise! You seal the deal without even thinking about it."
+EventDes/2504;"You're more interested in traveling than in spaceship maintenance. After visiting the Encyclopedia Headquarters, you leave Terminus."
 EvenOptionDes/StartDeal;"[Start Trade]"
 EvenOptionDes/StartDealBounty;"[Start Trade] (<b>Consumes</b> this support chance)"
 EvenOptionDes/Get;"[Gain] <g>[0].</g>"
@ -846,8 +852,8 @@ EvenOptionDes/1200_5;"[Explore Ruins] <g>Gain {0} Star Coins.</g>"
 EvenOptionDes/1200_6;"[Explore Camp] <g>Restore {0} HP.</g>"
 EvenOptionDes/1200_7;"[Explore Battlefield] <g>Gain [0].</g>"
 EvenOptionDes/1210_1;"[Reinforce Hull] <b>Lose {0} Star Coins.</b> <g>Gain {1} Max HP.</g>"
-EvenOptionDes/1210_2;"[Reinforce Shield] <b>Lose {0} Star Coins.</b> <g>Gain {1} Max Shield Point.</g>"
-EvenOptionDes/1210_3;"[Comprehensive Reinforcement] <b>Lose {0} Star Coins.</b> <g>Gain {1} Max HP and {2} Max Shield Point.</g>"
+EvenOptionDes/1210_2;"[Reinforce Shield] <b>Lose {0} Star Coins.</b> <g>Gain {1} Max Shield Points.</g>"
+EvenOptionDes/1210_3;"[Comprehensive Reinforcement] <b>Lose {0} Star Coins.</b> <g>Gain {1} Max HP and {2} Max Shield Points.</g>"
 EvenOptionDes/1210_4;"[Super Reinforcement] <b>Lose all Star Coins.</b> <g>Gain {0} Max HP and {1} Max Shield Points.</g> <r>(Exclusive to Human)</r>"
 EvenOptionDes/1220_1;"[Enter Competition - "You're the Boss"] <g>Gain {0} Star Coins.</g> <b>Take {1} damage.</b>"
 EvenOptionDes/1220_2;"[Report to Space Police] <g>Gain {0} Star Coins.</g>"
@ -960,7 +966,7 @@ EvenOptionDes/1570_3;"[I Don't Want It]"
 EvenOptionDes/1570_4;"[Insider Info] <g>Gain 2 random Common Treasures.</g> <r>(Exclusive to Treant)</r>"
 EvenOptionDes/1570_5;"[Gain] <g>[0] and [1].</g>"
 EvenOptionDes/1580_1;"[Fuel Balance] <b>Lose {0} Max Fuel.</b> <g>Gain {1} Max Shield Points.</g>"
-EvenOptionDes/1580_2;"[Defense Balance] <b>Lose {0} Max HP.</b> <g>Gain {1} Max Shield Point.</g>"
+EvenOptionDes/1580_2;"[Defense Balance] <b>Lose {0} Max HP.</b> <g>Gain {1} Max Shield Points.</g>"
 EvenOptionDes/1580_3;"[Hull Balance] <b>Take {0} damage.</b> <g>Gain {1} Max Shield Points.</g>"
 EvenOptionDes/1590_1;"[Work] <g>Gain {0} Star Coins.</g>"
 EvenOptionDes/1590_2;"[Boost] <b>Lose {0} Star Coins.</b> <g>Gain {1} Max Fuel.</g>"
@ -1206,3 +1212,6 @@ EvenOptionDes/2480_1;"[Star Coin] <b>Lose {0} Star Coins.</b> <g>Select 1 Unit t
 EvenOptionDes/2480_2;"[Armor] <b>Take {0} damage.</b> <g>Select 1 Unit to upgrade.</g> (Repeatable)"
 EvenOptionDes/2490_1;"[Attack Unit] <b>Lose {0} Star Coins.</b> <g>Select 1 Attack Unit to be modified: have 1 Power in battle.</g>"
 EvenOptionDes/2490_2;"[Support Unit] <g>Select 1 Support Unit to degrade its highest-graded color slot by 1 level.</g>"
+EvenOptionDes/2500_1;"[Strengthen] <g>Gain {0} Max Shield Points.</g>"
+EvenOptionDes/2500_2;"[Replace] Turn Max Shield Point into {0}."
+EvenOptionDes/2500_3;"[Trade] <b>Lose {0} Max Shield Points.</b> <g>Gain [1].</g>"
--- a/textmap/englishtextmap_keyword/EnglishTextMap_KeyWord
+++ b/textmap/englishtextmap_keyword/EnglishTextMap_KeyWord
@ -41,7 +41,7 @@ KeyWord/White;"*White*"
 KeyWord/Blue;"*Blue*"
 KeyWord/Purple;"*Orange*"
 KeyWordDes/Empty;""
-KeyWordDes/PowerAdded;"If at least 1 Energy has been loaded onto the Unit, Power will provide additional Strength for this Unit during this turn. The Power persists for the entire battle."
+KeyWordDes/PowerAdded;"If at least 1 Energy has been loaded into the Unit, Power will provide additional Strength for this Unit during this turn. Power persists for the entire battle."
 KeyWordDes/Win;"You win the Shockwave Showdown if the Strength of the Units in the lane exceeds that of the enemy."
 KeyWordDes/Lose;"You lose the Shockwave Showdown if the Strength of the Units in the lane is lower than that of the enemy."
 KeyWordDes/Equal;"During Shockwave Showdown, it's considered a draw if the Strength of the Units in the lane equals that of the enemy."
@ -52,9 +52,9 @@ KeyWordDes/CountDown;"Countdown number is decreased by each start of a turn. Whe
 KeyWordDes/Sleep;"Unable to load energy on this slot. Strength becomes ineffective."
 KeyWordDes/Break;"After you win a Showdown, the enemy's durability is reduced. If their durability reaches 0, they cannot act the next turn."
 KeyWordDes/Exchange;"Units' positions can be adjusted during battle."
-KeyWordDes/Overclock;"When loading Energy onto this Unit, if the Energy Points ≥ Overclock threshold, its effect is triggered."
-KeyWordDes/Triangle;"After loading a total of 3 Energy onto this Unit, the effect is triggered. The loading progress will be retained until triggered."
-KeyWordDes/PowerRate;"The Strength of the Unit is doubled for 1 turn, cannot stack"
+KeyWordDes/Overclock;"When loading Energy into this Unit, if the Energy Points ≥ Overclock threshold, its effect is triggered."
+KeyWordDes/Triangle;"After loading a total of 3 Energy into this Unit, the effect is triggered. The loading progress will be retained until triggered."
+KeyWordDes/PowerRate;"The Strength of the Unit is doubled for 1 turn, does not stack"
 KeyWordDes/DestroyUnit;"Will be removed in this battle."
 KeyWordDes/Grip;"Upon loading this Unit, consume the Loaded Energy and remove Suppression. Suppression lasts for 1 turn."
 KeyWordDes/Burn;"When loading Energy, receive 1 damage."
--- a/textmap/englishtextmap_pilot/EnglishTextMap_Pilot
+++ b/textmap/englishtextmap_pilot/EnglishTextMap_Pilot
@ -39,6 +39,7 @@ PilotName/10039;"PS003"
 PilotName/10041;"Buddy"
 PilotName/10042;"Windrider"
 PilotName/10043;"Shade"
+PilotName/10044;"戴拿"
 PilotTitle/10000;"Instructor"
 PilotTitle/10001;"Repair Master"
 PilotTitle/10002;"Meditator"
@ -80,6 +81,7 @@ PilotTitle/10039;"Painter"
 PilotTitle/10041;"Surveyor"
 PilotTitle/10042;"ESTP"
 PilotTitle/10043;"Hacker"
+PilotTitle/10044;"对波狂魔"
 PilotDes/10000;"The Bounty Hunter Association provides as much help as possible to all new hunters, with their instructors serving as their initial guides."
 PilotDes/10001;"Dongdong learned from a repair expert of the Cat Clan, who excels at modifying discarded units and reselling them at a high price."
 PilotDes/10002;"Grey, in her spare time, runs a meditation class to help various insomniacs improve their sleep."
@ -121,6 +123,7 @@ PilotDes/10039;"PS003 used to be a novice game designer but was later forced to
 PilotDes/10041;"Buddy was once a cosmic celestial surveyor, but for some reason, the distance he measures always ends up being one grid longer than the actual distance."
 PilotDes/10042;"Windrider, as an SSR breed—Pandafolk within the Beastkin, is favored by almost all creatures. He is an ESTP type, which makes it effortless for him to make friends."
 PilotDes/10043;"Once, the genius hacker, Shade, accidentally hacked into an unseen database. After casually modifying a few parameters, she discovered that the rules of the entire world had since changed."
+PilotDes/10044;"戴拿钟爱对波，但他总是输，直到今天，他决定改变自己的命运！"
 PilotMono/10000/Init_1;"Are you ready for your first battle, newcomer? Don't worry, I'll guide you!"
 PilotMono/10000/Init_2;"This time, you'll need to try your best. I have faith in you."
 PilotMono/10000/Idle_1;"If you're still unsure, feel free to hit that 'Tutorial' button in the upper right corner for a quick refresher!"
--- a/textmap/englishtextmap_talent/EnglishTextMap_Talent
+++ b/textmap/englishtextmap_talent/EnglishTextMap_Talent
@ -39,6 +39,7 @@ Talent/talent_ignorecolor_name;"Color Mask"
 Talent/talent_dirextension_name;"Offset Goggles"
 Talent/talent_makefriends_name;"Make Friends"
 Talent/talent_rareorder_name;"Disrupted Rules"
+Talent/talent_bobo_name;"再波一次"
 Talent/talent_tutorial_name;"Tenacity"
 Talent/talent_recover_addcoin_name;"Repair Expert"
 Talent/talent_centeradded_name;"Center-focused"
@ -131,6 +132,7 @@ Talent/talent_ignorecolor_des;"Once per turn, the to-be-equipped Energy in hand
 Talent/talent_dirextension_des;"All *directional* effects extend by 1 more grid."
 Talent/talent_makefriends_des;"After each of the first two elite battles, choose 1 from 2 Inherent Talents."
 Talent/talent_rareorder_des;"In the 1st/2nd/3rd galaxy, all randomly dropped Units and Treasures are mandated to be Common/Rare/Legendary ones, with no limit on the quantity."
+Talent/talent_bobo_des;"初始获得专属部件：<UNIT>80821|2</UNIT>。"
 Talent/talent_tutorial_des;"Gain {0} Max HP and {1} Max Fuel at the start of the run."
 Talent/talent_recover_addcoin_des;"When restoring HP, gain the same amount of Star Coins."
 Talent/talent_centeradded_des;"At the start of the battle, the *Attack Unit* at the *Spaceship Center* gains {0} *Power*."
@ -159,7 +161,7 @@ Talent/talent_losecoin_heal_des;"Restore {0} HP when losing Star Coins."
 Talent/talent_hurt_getcoin_des;"Gain {0} Star Coins when receiving damage outside of the battle."
 Talent/talent_twice_sameevent_des;"A Vacation Event is allowed to be completed for 1 extra time."
 Talent/talent_doublecoin_butlimit_des;"Star Coins are doubled when gained, but you can only have a maximum of {0} Star Coins."
-Talent/talent_copyother_des;"At the start of the run, turns into another copy of your other Random Talent."
+Talent/talent_copyother_des;"At the start of the run, turns into a copy of your other Random Talent."
 Talent/talent_vacationrefresh_des;"During a vacation, Vacation Events can be refreshed once."
 Talent/talent_resetpoint_des;"Outside of battle, you can spend 2 Star Coins to reassign Point Energy Resource."
 Talent/talent_normalguy_des;"For every 3 Common Units gained, gain 1 Common Treasure."
--- a/textmap/englishtextmap_treasure/EnglishTextMap_Treasure
+++ b/textmap/englishtextmap_treasure/EnglishTextMap_Treasure
@ -44,6 +44,7 @@ TreasureName/812;"Explosive Gas"
 TreasureName/813;"Three-section Staff"
 TreasureName/814;"Embers"
 TreasureName/815;"Automatic Module"
+TreasureName/816;"Nuclear Fuel"
 TreasureName/901;"Onboard Audio System (Subwoofer)"
 TreasureName/902;"Onboard Audio System (Top)"
 TreasureName/903;"Onboard Audio System (Middle)"
@ -178,6 +179,9 @@ TreasureName/5033;"White Slots"
 TreasureName/5034;"Upgrade Module"
 TreasureName/5035;"Star Coin Loan"
 TreasureName/5036;"Jetpack"
+TreasureName/5037;"Criminal Information"
+TreasureName/5038;"Backup Brush"
+TreasureName/5039;"Strengthened Eye"
 TreasureDes/102;"Upon triggering a *Charge* effect, generate 1 [*Blue* {0}-point] Energy."
 TreasureDes/104;"At the start of the battle, all *Charge* Units gain progress equal to half their *recharging* threshold."
 TreasureDes/105;"When the *Charge* is finished, any excess points will continue to *Charge*."
@ -224,6 +228,7 @@ TreasureDes/812;"If an *Attack Unit* still has empty slots after being loaded wi
 TreasureDes/813;"At the start of the turn, if there are 3 *Attack Units* in the *same lane*, all *Attack Units* in this lane gain {0} Strength."
 TreasureDes/814;"If the Energy loaded on an *Attack Unit* is the last Energy in hand, gain {0} Strength."
 TreasureDes/815;"At the start of the turn, if the number of the Energy in hand loaded in the previous turn ≤ {0}, all *Attack Units* gain {1} Strength."
+TreasureDes/816;"At the start of the 3rd turn, the *Attack Unit* in the *Spaceship Center* gains *Double Strength*."
 TreasureDes/901;"At the start of the battle, all *Attack Units* gain {0} *Power*."
 TreasureDes/902;"At the start of the battle, all *Attack Units* in the top lane gain {0} *Power*."
 TreasureDes/903;"At the start of the battle, all *Attack Units* in the middle lane gain {0} *Power*."
@ -358,3 +363,6 @@ TreasureDes/5033;"The color of the slots added by Corruption Engine changes to [
 TreasureDes/5034;"Upon gaining this Treasure, randomly upgrade {0} Units."
 TreasureDes/5035;"Gain {0} Star Coins, after entering the last galaxy, lose {0} Star Coins."
 TreasureDes/5036;"Upon gaining this Treasure, grant all *Attack Units* that you have started the run with the modification: Weight -1."
+TreasureDes/5037;"<TALENT>50037</TALENT> talent event now provides 3 options."
+TreasureDes/5038;"Change the <TALENT>50039</TALENT> talent effect to: twice per turn."
+TreasureDes/5039;"When an *Attack Unit* with *Double Strength* loads an Energy, it gains {0} Strength."
--- a/textmap/englishtextmap_unit/EnglishTextMap_Unit
+++ b/textmap/englishtextmap_unit/EnglishTextMap_Unit
@ -430,6 +430,8 @@ Name/80818_2;"Construction Device+"
 Name/80819_1;"Disposable Defense Device"
 Name/80820_1;"Fixed Star"
 Name/80820_2;"Fixed Star+"
+Name/80821_1;"对波机器"
+Name/80821_2;"对波机器+"
 Name/91001_1;"Basic Core"
 Name/91001_2;"Basic Core+"
 Name/91002_1;"Winning Streak Core"
@ -814,6 +816,7 @@ Text/80817;"Defense"
 Text/80818;"Construction"
 Text/80819;"Disposable Defense"
 Text/80820;"Both Sides Power Up"
+Text/80821;"对波"
 Text/91002;"Winning Streak"
 Text/91004;"Chain"
 Text/91005;"Counter"
@ -931,18 +934,18 @@ Des/Empty;""
 Des/Added;"Have {0} *Power* in battle."
 Des/11002_1;"When loading 2 Energy of the same point, gain {0} Strength."
 Des/11003_1;"If the loaded Energy Point is 1 point higher than the previously loaded one, gain extra Strength that equals to the loaded Energy point."
-Des/11004_1;"While the amount of Energy in hand ≥ {0}, temporarily gain *Double Strength*."
+Des/11004_1;"If the amount of Energy in hand ≥ {0}, temporarily gain *Double Strength*."
 Des/11005_1;"When loading [*White*] Energy, gain {0} Strength."
-Des/11006_1;"After loading an Energy, if Energy Points ≤ {0}, gain extra Strength that equals the loaded Energy points."
+Des/11006_1;"After loading an Energy, if the Energy Points is ≤ {0}, gain extra Strength that equals the loaded Energy points."
 Des/11007_1;"When an Energy is loaded into a [*White*] slot of the *nearby* Unit, gain {0} Strength."
 Des/11008_1;"When Single Star is the only kind of *Attack Unit* that has loaded Energy, temporarily gain *Double Strength*."
-Des/11009_1;"All loaded energy points are considered as the highest energy point loaded."
-Des/11010_1;"After loading an Energy, for each slot this Unit owns, gain 1 Strength."
+Des/11009_1;"All loaded Energy Points are considered as the highest energy point loaded."
+Des/11010_1;"After loading an Energy, for each slot this Unit has, gain 1 Strength."
 Des/11011_1;"When generating [*Orange*] Energy within a turn, gain {0} Strength."
 Des/11012_1;"When any *Attack Unit* loads Energy ≥ [{0} points], this Unit gains {1} Strength."
-Des/11013_1;"If the Energy to be loaded is the last one in hand, generate 1 Energy."
+Des/11013_1;"If the Energy to be loaded into this Unit is the last one in hand, generate 1 Energy."
 Des/11014_1;"Phantom benefits from *directional* effects regardless of its position."
-Des/11015_1;"The Strength not gained through Energy/*Power* will be doubled."
+Des/11015_1;"Strength not gained by Energy/*Power* is doubled."
 Des/11016_1;"When generating Energy within a turn, this Unit loads 1 identical Energy."
 Des/11017_1;"After loading an Energy, gain extra Strength that equals the loaded Energy points."
 Des/11018_1;"After movement, gain {0} Strength."
@ -965,10 +968,10 @@ Des/11813_1;"*Initiate* ({0}): Generate 1 [*White* {1}-point] Energy."
 Des/11813_2;"*Initiate* ({0}): Generate 1 [*Orange* {1}-point] Energy."
 Des/11814_1;"3 times per battle. *Initiate* ({0}): Generate {1} [*White*] Energy whose point equals the current turn number."
 Des/11814_2;"3 times per battle. *Initiate* ({0}): Generate {1} [*Orange*] Energy whose point equals the current turn number."
-Des/11815_1;"At the start of the battle, upgrade *nearby* Units for this battle."
-Des/11815_2;"At the start of the battle, upgrade all Units for this battle."
+Des/11815_1;"At the start of the battle, upgrade *nearby* Units of different types for this battle."
+Des/11815_2;"At the start of the battle, upgrade all Units of different types for this battle."
 Des/11816_1;"At the start of the battle, gain {0} Fuel for this battle."
-Des/11819_1;"Grants the *Attack Units* of the *same lane* {0} extra Strength when loading Energy."
+Des/11819_1;"*Attack Units* in the *same lane* gain {0} extra Strength when loading Energy."
 Des/11820_1;"When any Unit is *initiated*, the *Attack Unit* *behind* gains {0} Strength."
 Des/11821_1;"*Initiate* ({0}): Consume 1 Fuel to generate 1 [*Blue* 9-point] Energy."
 Des/11821_2;"*Initiate* ({0}): Consume 1 Fuel to generate 1 [*Orange* 9-point] Energy."
@ -977,7 +980,7 @@ Des/11822_2;"At the start of the battle, degrade the colors of all Unit slots."
 Des/11823_1;"At the start of the battle, *nearby* *Attack Units* gain an additional [*Orange*] slot."
 Des/11823_2;"At the start of the battle, *nearby* *Attack Units* gain an additional [*Blue*] slot."
 Des/11824_1;"After loading an Energy, generate another Energy with twice the Points of the loaded one."
-Des/11825_1;"At the start of the battle, change the skill to that of the *Support Unit* in *front*."
+Des/11825_1;"At the start of the battle, change the skill of this Unit to that of the *Support Unit* in *front*."
 Des/11826_1;"At the start of the battle, the Unit in *front* gains 1 additional [*Orange*] slot and 1 additional [*Blue*] slot."
 Des/11826_2;"At the start of the battle, the Unit in *front* gains 1 additional [*Blue*] slot and 1 additional [*White*] slot."
 Des/11827_1;"When the Unit *behind* loads a [*White*] Energy, it loads the identical Energy {0} more time(s)."
@ -992,14 +995,14 @@ Des/12007_2;"When any Unit generates Energy, this Unit gains {0} Strength."
 Des/12008_1;"This Unit always gains double *Power*."
 Des/12009_1;"Has {0} *Power* in battle. After loading an Energy, equip a Reproducing Core in all *nearby* grids."
 Des/12009_2;"Has {0} *Power* in battle. After loading an Energy, equip a Reproducing Core+ in all *nearby* grids."
-Des/12010_1;"Every time an Energy is loaded into this Unit, its *Power* bonus will be triggered."
+Des/12010_1;"*Power* affects this Unit once for each Energy loaded into this Unit."
 Des/12801_1;"At the start of the battle, the *Attack Unit* in *front* gains {0} *Power*."
 Des/12802_1;"At the start of the 3rd turn, all *Attack Units* gain {0} *Power*."
 Des/12803_1;"At the start of the battle, all *nearby* *Attack Units* gain {0} *Power*."
 Des/12803_2;"At the start of the battle, all *Attack Units* gain {0} *Power*."
-Des/12805_1;"*Initiate* ({0}): Consume 1 Fuel to give 1 *Power* to all *Attack Units*."
-Des/12806_1;"After loading an Energy, *Destroy* itself and doubles the *Power* of the *Attack Unit* *behind*."
-Des/12807_1;"*Initiate* ({0}): Choose 1 *nearby* Unit or this Unit itself to *Destroy*, and give 1 *Power* to all *Attack Units*."
+Des/12805_1;"*Initiate* ({0}): Consume 1 Fuel and all *Attack Units* gain 1 *Power*."
+Des/12806_1;"After loading an Energy, *Destroy* itself and double the *Power* of the *Attack Unit* *behind*."
+Des/12807_1;"*Initiate* ({0}): Choose 1 *nearby* Unit or this Unit itself to *Destroy*, and all *Attack Units* gain 1 *Power*."
 Des/13001_1;"*Overclock* ({0}): Gain {2} Strength, *Overclock* ({1}): Gain {2} Strength."
 Des/13002_1;"*Overclock* ({0}): Gain {1} *Power*."
 Des/13003_1;"When an *Overclock*/*Tripower* effect is triggered, this Unit gains {0}/{1} Strength."
@ -1007,14 +1010,14 @@ Des/13005_1;"*Overclock* ({0}): Gain {1} Strength."
 Des/13006_1;"*Initiate* ({0}): Gain {2} Strength, *Overclock* ({1}): Reduce this Unit's cooldown by 1 turn."
 Des/13801_1;"After loading an Energy, generate 1 [*White* 3-point] Energy, *Overclock* ({0}): Generate an extra [*White* 3-point] Energy."
 Des/13801_2;"After loading an Energy, generate 1 [*Blue* 3-point] Energy, *Overclock* ({0}): Generate an extra [*Blue* 3-point] Energy."
-Des/13802_1;"*Overclock* ({0}): all different Units load 1 [*Blue* 1-point] Energy."
-Des/13802_2;"*Overclock* ({0}): all different Units load 1 [*Orange* 1-point] Energy."
+Des/13802_1;"*Overclock* ({0}): all Units of different types load 1 [*Blue* 1-point] Energy."
+Des/13802_2;"*Overclock* ({0}): all Units of different types load 1 [*Orange* 1-point] Energy."
 Des/13803_1;"*Overclock* ({0}): Grant {1} Strength to *Attack Unit* *behind*."
 Des/13804_1;"*Overclock* ({0}): Generate 1 [*Blue* 9-point] Energy."
 Des/13804_2;"*Overclock* ({0}): Generate 1 [*Orange* 9-point] Energy."
 Des/13805_1;"*Overclock* ({0}): Generate 2 Energy at the start of the next turn."
 Des/13807_1;"When *Overclock* is triggered, deal {0} damage to the enemy."
-Des/13808_1;"After loading an Energy, use its Energy Points to trigger all *Overclock*."
+Des/13808_1;"After loading an Energy, use its Energy Points to trigger every Unit's *Overclock*."
 Des/14001_1;"*Tripower*: Gain {0} Strength."
 Des/14002_1;"*Tripower*: Gain {0} *Power*."
 Des/14004_1;"*Tripower*: Gain *Double Strength*."
@ -1027,13 +1030,13 @@ Des/14803_1;"*Tripower*: Generate {0} Energy."
 Des/14805_1;"*Tripower*: The *Attack Unit* in *front* gains {0} *Power*."
 Des/14806_1;"When a *Tripower* effect is triggered, generate 1 [*White*] Energy."
 Des/14806_2;"When a *Tripower* effect is triggered, generate 1 [*Orange*] Energy."
-Des/14807_1;"*Tripower*: Every *Attack Unit* gains {0} Strength for each slot they have."
-Des/15001_1;"After loading an Energy, gain extra Strength equal to the total damage received from the last Showdown."
-Des/15002_1;"When Shield Point reduces, gain {0} *Power*."
-Des/15003_1;"When Shield Point changes, gain *Double Strength*."
+Des/14807_1;"*Tripower*: All *Attack Units* gain {0} Strength for each slot they have."
+Des/15001_1;"After loading an Energy, gain Strength equal to the total damage received from the last Showdown."
+Des/15002_1;"When the Shield Points reduces, gain {0} *Power*."
+Des/15003_1;"When the Shield Points changes, gain *Double Strength*."
 Des/15801_1;"After loading an Energy, restore {0} Shield Points."
 Des/15802_1;"At the start of the 2nd turn, increase the Max Shield Points by {0} for this battle, and restore all Shield Points."
-Des/15803_1;"*Initiate* ({0}): The *Attack Unit* *behind* gains Strength equal to twice the current Shield Points, and receive damage equal to the current Shield Points."
+Des/15803_1;"*Initiate* ({0}): The *Attack Unit* *behind* gains Strength equal to twice the current Shield Points. And receive damage equal to the current Shield Points."
 Des/21004_1;"The loaded Energy Points are considered as {0} points."
 Des/21005_1;"When generating 1 [1-point] Energy, gain {0} Strength."
 Des/21010_1;"At the start of the turn, load [*Orange* {0}-point] Energy into all slots of this Unit."
@ -1042,7 +1045,7 @@ Des/21016_1;"After loading an Energy, gain extra Strength that is double of the
 Des/21017_1;"For every 10 Energy loaded into this Unit, gain {0} Strength."
 Des/21018_1;"When *swapped* to an empty grid, consume 1 extra *swap* chance, leave behind a copy of this Unit."
 Des/21019_1;"After loading an Energy, if there is empty grid *nearby*, gain {0} Strength."
-Des/21020_1;"When different Units load [1-point] Energy, this Unit loads a [*Orange* 1-point] Energy."
+Des/21020_1;"When Units of different types load [1-point] Energy, this Unit loads a [*Orange* 1-point] Energy."
 Des/21021_1;"After loading an Energy, gain Strength equal to the current *Swap* Chance."
 Des/21024_1;"After loading an Energy, gain *Double Strength*."
 Des/21025_1;"After loading an Energy, gain 1 Strength."
@ -1051,7 +1054,7 @@ Des/21028_1;"After loading an Energy, *Destroy* the Unit in *front*. When any Un
 Des/21029_1;"When loading [*Orange*] Energy, load 1 extra identical Energy."
 Des/21030_1;"When the last Energy in hand is loaded, gain {0} Strength."
 Des/21031_1;"When loading [1-point]/[*Orange*] Energy, gain {0} Strength."
-Des/21032_1;"When different *Attack Units* load Energy ≥ [{0} points], this Unit loads 1 identical Energy."
+Des/21032_1;"When *Attack Units* of different types load Energy ≥ [{0} points], this Unit loads 1 identical Energy."
 Des/21801_1;"After loading an Energy, generate another Energy whose color is 1 grade higher than the loaded one."
 Des/21802_1;"When an [*Orange*] Energy is loaded in a *nearby* *Attack Unit*, it gains {0} Strength."
 Des/21803_1;"After loading an Energy, generate 1 [*Orange* {0}-point] Energy."
@ -1152,19 +1155,19 @@ Des/80003_1;"*Overclock* ({0}): Gain {1} Strength."
 Des/80004_1;"At the start of the turn, gain Strength that equals to the damage taken by this lane in the previous turn."
 Des/80005_1;"Have {0} *Power* in battle. *Failure in the Showdown*: If it is the foremost Unit, double its *Power*, randomly transfer it to 1 *Attack Unit*, and then *Destroy* itself."
 Des/80006_1;"*Victory in the Showdown*: Gain {0} *Power*."
-Des/80007_1;"If this Unit is the only kind of remaining Unit, it'll have extra {0} Strength."
+Des/80007_1;"If Terminator is the only kind of remaining Unit, it'll have extra {0} Strength."
 Des/80008_1;"*Countdown* ({0}): Gain *Double Strength*."
 Des/80009_1;"Have {0} *Power* in battle. *Failure in the Showdown*: If this Unit has loaded Energy this turn, double this Unit's *Power*."
 Des/80010_1;"Grant Friendly and Enemy *Attack Units* in the *same lane* *Double Strength*."
 Des/80801_1;"At the start of the battle, generate 1 [*Blue* {0}-point] Energy."
 Des/80801_2;"At the start of the battle, generate 1 [*Orange* {0}-point] Energy."
 Des/80802_1;"At the start of the battle, all *Attack Units* that you have started the run with will gain {0} *Power*."
-Des/80803_1;"*Initiate* ({0}): Choose one *nearby* *Support Unit* and randomly replace it with an unupgraded *Support Unit*."
-Des/80803_2;"*Initiate* ({0}): Choose one *nearby* *Support Unit* and randomly replace it with an upgraded *Support Unit*."
+Des/80803_1;"*Initiate* ({0}): Choose another *Support Unit* and randomly replace it with an unupgraded *Support Unit*."
+Des/80803_2;"*Initiate* ({0}): Choose another *Support Unit* and randomly replace it with an upgraded *Support Unit*."
 Des/80804_1;"The effect at the start of the turn will be triggered for an additional {0} time."
 Des/80805_1;"After loading an Energy, deal {1} damage to the enemy. *Countdown* ({0}): *Destroy* itself."
 Des/80806_1;"After loading an Energy, gain {0} Star Coin(s). After the Showdown, *Destroy* itself."
-Des/80807_1;"*Tripower*: Make a *draw* in this Showdown and end the turn, then *Destroy* itself at the start of the next turn."
+Des/80807_1;"*Tripower*: Achieve a *draw* for all three lanes in this Showdown and end the turn, then *Destroy* itself at the start of the next turn."
 Des/80808_1;"After the battle, gain {0} chance(s) to enter the shop. *Failure in the Showdown*: *Destroy* itself."
 Des/80809_1;"*Initiate* ({0}): Choose one Unit to gain *Corruption* and give it 2 [*Blue*] slots."
 Des/80810_1;"Grant Friendly and Enemy *Attack Units* in the *same lane* *Double Strength*."
@ -1178,6 +1181,7 @@ Des/80817_1;"*Failure in the Showdown*: Take only 1 damage."
 Des/80818_1;"After loading an Energy, equip <UNIT>80819|1</UNIT> in the *front* empty grid."
 Des/80819_1;"*Failure in the Showdown*: Take only 1 damage and *Destroy* itself."
 Des/80820_1;"At the start of the turn, all Friendly and Enemy *Attack Units* gain {0} *Power*."
+Des/80821_1;"第{0}回合对波结束后会额外进行1次对波。"
 Des/91002_1;"*Victory in the Showdown*: Gain {0} *Power*."
 Des/91003_1;"Activated under Attack state; *Hibernate* under Accumulation state, gain {0} *Power* per turn while hibernating."
 Des/91004_1;"*Chain*."
@ -1207,7 +1211,7 @@ Des/91044_1;"Activated only in Horizontal Slash mode."
 Des/91044_2;"Have {0} *Power* in battle. Activated only in Horizontal Slash mode."
 Des/91049_1;"Have {0} *Power* in battle. *Failure in the Showdown*: Double this Unit's *Power*."
 Des/91050_1;"When *destroyed*, the remaining Stone Cores gain {0} *Power*."
-Des/91051_1;"If this Unit is the only kind of remaining Unit, it'll have extra {0} Strength."
+Des/91051_1;"If Terminator is the only kind of remaining Unit, it'll have extra {0} Strength."
 Des/91053_1;"Have {0} *Power* in battle. *Failure in the Showdown*: If this Unit is the foremost Unit, doubles its *Power*, randomly transfers it to another *Attack Unit*, and then *Destroy* itself"
 Des/91055_1;"When an enemy's front-column Unit loads an Energy, *swap* this Unit to the *same lane*."
 Des/91056_1;"When an enemy's middle-column Unit loads an Energy, *swap* this Unit to the *same lane*."
@ -1283,7 +1287,7 @@ Des/92083_1;"If the Showdown of this lane is not a *failure*, all <UNIT>91068|1<
 Des/92085_1;"If the Showdown of this lane is not a *failure*, deal {0} damage to the enemy."
 Des/92086_1;"If the Showdown of this lane is not a *failure*, remove all enemy Energy in hand."
 Des/92089_1;"After loading an Energy, restore *Durability* to 3 points."
-Des/92090_1;"When any lane's Strength＞21, make all Units in that lane *hibernate* for 1 turn, works for both the enemy and player."
+Des/92090_1;"When any lane's Strength＞21, make all *Attack Units* in that lane *hibernate* for 1 turn, works for both the enemy and player."
 Des/92092_1;"*Overclock* ({0}): Reduce *Durability* by 1."
 Des/92093_1;"At the start of the turn, restore all HP."
 Des/92094_1;"After loading an Energy, one of your *Attack Units* and one of the enemy's *Attack Units* randomly gain *Double Strength*."