diff --git a/Core/DefInjected/QuestScriptDef/Scripts_Utility_ThreatsCore.xml b/Core/DefInjected/QuestScriptDef/Scripts_Utility_ThreatsCore.xml
index 8cc3cf3b..d7ccbc49 100644
--- a/Core/DefInjected/QuestScriptDef/Scripts_Utility_ThreatsCore.xml
+++ b/Core/DefInjected/QuestScriptDef/Scripts_Utility_ThreatsCore.xml
@@ -1,45 +1,45 @@
-
+
-
- root(priority=1,sitePart==ClimateAdjuster)->这儿有一台可以将气温改变[temperatureOffset]度的气候调节器
- root(priority=1,sitePart==PsychicDroner)->这儿有一台对[affectedGender]性起效的心灵放射器
- root(priority=1,sitePart==PsychicSuppressor)->这儿有一台对[affectedGender]性起效的心灵抑制器
- root(priority=1,sitePart==WeatherController)->这儿有一台会将整个区域的天气改变为[weather_label]的天气控制器
- root(priority=1,sitePart==SmokeSpewer)->这个地区有一台不断喷射烟雾的机器
- root(priority=1,sitePart==SunBlocker)->整个地区都在一台阳光阻隔器的阴影之下
- root(priority=1,sitePart==EMIDynamo)->这儿有一台正在运作的强电磁发射装置,导致这一区域的电子设备无法工作
- root(priority=1,sitePart==ToxicSpewer)->这个地区有一台机器在不断喷射毒气
- root(priority=1,sitePart==RaidSource)->这儿有一块被[enemiesCount]名敌人防守的军事集结区,他们每[mtbDays]天就会对你发动袭击
- root(priority=1,sitePart==Outpost)->这儿有一个被[enemiesCount]名敌人防守的哨站
- root(priority=1,sitePart==BanditCamp)->这儿有一个被[enemiesCount]名敌人防守的土匪营地
- root(priority=1,sitePart==Manhunters,count==1)->一群正在疯狂猎杀人类的[kindLabel]在附近游荡
- root(priority=1,sitePart==Manhunters,count>1)->[count]只猎杀人类的[kindLabel]正在附近游荡
- root(priority=1,sitePart==SleepingMechanoids,count==1)->附近有一台休眠的机械体
- root(priority=1,sitePart==SleepingMechanoids,count>1)->附近有[count]台休眠机械体
- root(priority=1,sitePart==Turrets)->[threatsInfo]防守这个地点
- root(priority=1,sitePart==AmbushEdge)->一支敌军正等着伏击任何靠近的人
- root(priority=1,sitePart==AmbushHidden)->一支敌军正等着伏击任何靠近的人
- root(priority=1,sitePart==MechCluster)->这儿有一堆带有敌意的机械结构体
- root(priority=1,sitePart==PossibleUnknownThreatMarker)->这儿可能有未知的威胁
- root->这儿[label]
-
+
+ root(priority=1,sitePart==ClimateAdjuster)->这有一台可以将温度调整[temperatureOffset]的气候调节器
+ root(priority=1,sitePart==PsychicDroner)->这有一台对[affectedGender]性起效的心灵放射器
+ root(priority=1,sitePart==PsychicSuppressor)->这有一台对[affectedGender]性起效的心灵抑制器
+ root(priority=1,sitePart==WeatherController)->这有一台天气控制器,会将整个区域的天气改变为[weather_label]
+ root(priority=1,sitePart==SmokeSpewer)->这个地区有一台不断喷射烟雾的机器
+ root(priority=1,sitePart==SunBlocker)->整个地区都在一台黑幕产生器的阴影之下
+ root(priority=1,sitePart==EMIDynamo)->这有一台正在工作的电磁干扰器,导致这一区域的所有电气设备无法工作
+ root(priority=1,sitePart==ToxicSpewer)->这个地区有一台空气污染器不断喷射毒气
+ root(priority=1,sitePart==RaidSource)->这有一块被[enemiesCount]名敌人防守的军事集结区,他们每[mtbDays]就会对你发起袭击
+ root(priority=1,sitePart==Outpost)->这有一个被[enemiesCount]名敌人防守的哨站
+ root(priority=1,sitePart==BanditCamp)->这有一个被[enemiesCount]名敌人防守的土匪营地
+ root(priority=1,sitePart==Manhunters,count==1)->一只猎杀人类的[kindLabel]正在附近游荡
+ root(priority=1,sitePart==Manhunters,count>1)->[count]只猎杀人类的[kindLabel]正在附近游荡
+ root(priority=1,sitePart==SleepingMechanoids,count==1)->附近有一台正在休眠的机械体
+ root(priority=1,sitePart==SleepingMechanoids,count>1)->附近有[count]台正在休眠的机械体
+ root(priority=1,sitePart==Turrets)->[threatsInfo]防守这个地点
+ root(priority=1,sitePart==AmbushEdge)->一支敌军正等着伏击任何靠近的人
+ root(priority=1,sitePart==AmbushHidden)->一支敌军正等着伏击任何靠近的人
+ root(priority=1,sitePart==MechCluster)->这有一个机械集群
+ root(priority=1,sitePart==PossibleUnknownThreatMarker)->这儿可能有未知的威胁
+ root->这[label]
+
- threatDescription->一群机械族将会在[map_definite]降落,其中包含:\n\n[allThreats]
+ threatDescription->一个机械集群将会空降至[map_definite]其中包扩:\n\n[allThreats]
- threatDescription->来自[enemyFaction_name]的一群[enemyFaction_pawnsPlural]即将发起进攻。他们的组成为:\n\n[raidPawnKinds]\n\n[raidArrivalModeInfo]
+ threatDescription->来自[enemyFaction_name]的[enemyFaction_pawnsPlural]将会攻击你。他们的组成为:\n\n[raidPawnKinds]\n\n[raidArrivalModeInfo]
- pawnKindsParagraph(raidCount==1)->[enemyFaction_pawnsPlural]的攻击集群组成为:\n\n[raid0/raidPawnKinds]\n\n[raid0/raidArrivalModeInfo]
- pawnKindsParagraph(raidCount==2)->[enemyFaction_pawnsPlural]的第一攻击集群组成为:\n\n[raid0/raidPawnKinds]\n\n第二支规模相仿的队伍即将到来。
- pawnKindsParagraph(raidCount==3)->[enemyFaction_pawnsPlural]的第一攻击集群组成为:\n\n[raid0/raidPawnKinds]\n\n两支规模相仿的队伍即将到来。
- pawnKindsParagraph(raidCount>=4)->[enemyFaction_pawnsPlural]的第一攻击集群组成为:\n\n[raid0/raidPawnKinds]\n\n[raidCountMinusOne]支规模相仿的队伍即将到来。
- numGroupsOf(raidCount==1)->一支
- numGroupsOf(raidCount==2)->两支
- numGroupsOf(raidCount==3)->三支
- numGroupsOf(raidCount>=4)->[raidCount]支
+ pawnKindsParagraph(raidCount==1)->这组[enemyFaction_pawnsPlural]的构成为: \n\n[raid0/raidPawnKinds]\n\n[raid0/raidArrivalModeInfo]
+ pawnKindsParagraph(raidCount==2)->第一组[enemyFaction_pawnsPlural]的构成为: \n\n[raid0/raidPawnKinds]\n\n第二支规模相仿的部队即将到来。
+ pawnKindsParagraph(raidCount==3)->第一组[enemyFaction_pawnsPlural]的构成为: \n\n[raid0/raidPawnKinds]\n\n两支规模相仿的部队即将到来。
+ pawnKindsParagraph(raidCount>=4)->第一组[enemyFaction_pawnsPlural]的构成为: \n\n[raid0/raidPawnKinds]\n\n[raidCountMinusOne]支规模相仿的部队即将到来。
+ numGroupsOf(raidCount==1)->
+ numGroupsOf(raidCount==2)->两组
+ numGroupsOf(raidCount==3)->三组
+ numGroupsOf(raidCount>=4)->[raidCount]组
\ No newline at end of file
diff --git a/Core/DefInjected/ResearchProjectDef/ResearchProjects_2_Electricity.xml b/Core/DefInjected/ResearchProjectDef/ResearchProjects_2_Electricity.xml
index db76c37a..5f33a0c9 100644
--- a/Core/DefInjected/ResearchProjectDef/ResearchProjects_2_Electricity.xml
+++ b/Core/DefInjected/ResearchProjectDef/ResearchProjects_2_Electricity.xml
@@ -1,4 +1,4 @@
-
+
@@ -47,7 +47,7 @@
解锁制作含有金属材质的衣服,用以抵抗子弹和爆炸。这类防具会稍微减慢移动速度。
- 气流操控
+ 气动系统
制作大威力枪械,比如重型冲锋枪,链式霰弹枪和轻机枪。
diff --git a/Core/Keyed/FloatMenu.xml b/Core/Keyed/FloatMenu.xml
index dbc1acda..5ce48047 100644
--- a/Core/Keyed/FloatMenu.xml
+++ b/Core/Keyed/FloatMenu.xml
@@ -342,7 +342,7 @@
无法优先(无法从事: {0})
- 无法交易:缺乏必要的所有权
+ 无法交易:缺乏必要的头衔
无法优先(无法{0})
diff --git a/Core/Keyed/Incidents.xml b/Core/Keyed/Incidents.xml
index 0601b067..bdd63bbc 100644
--- a/Core/Keyed/Incidents.xml
+++ b/Core/Keyed/Incidents.xml
@@ -1,4 +1,4 @@
-
+
@@ -34,11 +34,11 @@
逃生舱在附近坠毁了,里面载有名叫{PAWN_nameDef}的{PAWN_titleIndef}。\n\n即使在撞击后活了下来,{PAWN_pronoun}也会受重伤。
- {PAWN_pronoun}不属于任何派系。你可以救援{PAWN_objective}并希望{PAWN_pronoun}自由加入,或是为了招募或奴役而俘虏{PAWN_objective}。
+ {PAWN_pronoun}不属于任何派系。你可以救援{PAWN_objective}并希望{PAWN_pronoun}自由加入,或是俘虏{PAWN_objective}来招募或奴役。
- {PAWN_nameDef}来自于敌对派系{PAWN_factionName},你可以为了招募或奴役而俘虏{PAWN_objective}。
+ {PAWN_nameDef}来自于敌对派系{PAWN_factionName},你可以俘虏{PAWN_objective}来招募或奴役。
- {PAWN_nameDef}来自于{PAWN_factionName}。如果你救援{PAWN_objective},{PAWN_pronoun}可能会加入,也可能回到派系并改善双方的关系。\n\n你也可以为了招募或奴役而俘虏{PAWN_objective},但这会激怒{PAWN_possessive}派系。
+ {PAWN_nameDef}来自于{PAWN_factionName}。如果你救援{PAWN_objective},{PAWN_pronoun}可能会加入,也可能回到派系并改善双方的关系。\n\n你也可以俘虏{PAWN_objective}来招募或奴役,但这会激怒{PAWN_possessive}派系。
货舱坠毁
diff --git a/Core/Keyed/Menus_Main.xml b/Core/Keyed/Menus_Main.xml
index ecf2194b..46fd032f 100644
--- a/Core/Keyed/Menus_Main.xml
+++ b/Core/Keyed/Menus_Main.xml
@@ -1,4 +1,4 @@
-
+
@@ -171,7 +171,7 @@
下载中
- 显示符合要求
+ 显示已满足的要求
单击选择。
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Prisoners.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Prisoners.xml
index 486bbb63..62312ce0 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Prisoners.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Prisoners.xml
@@ -1,4 +1,4 @@
-
+
- questDescription(askerIsNull==true,lodgersCount==1)->一艘在轨飞船的舰长希望你能在[shuttleDelayTicks_duration]内保护一名位于[map_definite],名叫[lodgers0_nameFull]的囚犯。[allLodgerInfo][threatsInfo1]\n\n[commonDescEnding]
- threatsInfo1(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n[lodgers0_nameDef]最近和某人发生口角,那家伙是[enemyFaction_name]的[enemyFaction_leaderTitle],[enemyFaction_leader_nameFull]最得宠的孩子。[enemyFaction_leader_nameDef]派出[enemyFaction_pawnsPlural]搜寻报复[lodgers0_objective]和任何胆敢为其提供庇护的人。[enemyGroupsParagraph]
+ questDescription(askerIsNull==true,lodgersCount==1)->一艘在轨飞船的舰长希望你能在[shuttleDelayTicks_duration]内保护一名位于[map_definite], 名叫[lodgers0_nameFull]的囚犯。 [allLodgerInfo][threatsInfo1]\n\n[commonDescEnding]
+ threatsInfo1(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n[lodgers0_nameDef]最近和某人发生口角, 那家伙是[enemyFaction_name]的[enemyFaction_leaderTitle], [enemyFaction_leader_nameFull]最得宠的孩子。 [enemyFaction_leader_nameDef]派出[enemyFaction_pawnsPlural]搜寻报复[lodgers0_objective]和任何胆敢为其提供庇护的人。 [enemyGroupsParagraph]
threatsInfo1(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleHuman][enemyGroupsParagraph]
threatsInfo1(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersSingleHuman]
threatsInfo1(generateThreats==false)->
- questDescription(askerIsNull==true,lodgersCount>=2)->一艘在轨飞船的舰长希望你能在[shuttleDelayTicks_duration]内保护[lodgersCount]名位于[map_definite]的囚犯。[allLodgerInfo][threatsInfo2]\n\n[commonDescEnding]
- threatsInfo2(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n这些囚犯承认谋杀了[enemyFaction_name]的[enemyFaction_pawnsPlural],受害者们的家人正在到处搜寻报复。[enemyGroupsParagraph]
- threatsInfo2(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n这些囚犯承认最近[mechViolation],同时也被一个机械族巢穴标记。只要他们敢露面,机械族就会向他们袭来。[enemyGroupsParagraph]
+ questDescription(askerIsNull==true,lodgersCount>=2)->一艘在轨飞船的舰长希望你能在[shuttleDelayTicks_duration]内 保护[lodgersCount]名位于[map_definite]的囚犯。 [allLodgerInfo][threatsInfo2]\n\n[commonDescEnding]
+ threatsInfo2(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n这些囚犯承认谋杀了[enemyFaction_name]的[enemyFaction_pawnsPlural], 受害者们的家人正在到处搜寻报复。 [enemyGroupsParagraph]
+ threatsInfo2(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n这些囚犯承认最近[mechViolation], 同时也被一个机械族巢穴标记。 只要他们敢露面,机械族就会向他们袭来。 [enemyGroupsParagraph]
threatsInfo2(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersMultiPrisoners]
threatsInfo2(generateThreats==false)->
- questDescription(asker_factionLeader==True,lodgersCount==1)->[asker_faction_name]的[asker_faction_leaderTitle],[asker_nameFull]想要你帮助[asker_objective]匿藏一个特殊囚犯。这名囚犯名叫[lodgers0_nameFull],是一名[lodgers0_age]的[lodgers0_title],这家伙知晓一些关于[asker_nameDef]的[PersonalCharacteristic]隐秘信息,[asker_nameDef]并不想[lodgers0_objective]出去到处乱说。你要做的就是在[shuttleDelayTicks_duration]内看住这家伙直到丑闻事件过去。[allLodgerInfo][threatsInfo3]\n\n[commonDescEnding]
+ questDescription(asker_factionLeader==True,lodgersCount==1)->[asker_faction_name]的[asker_faction_leaderTitle], [asker_nameFull]想要你帮助[asker_objective]匿藏一个特殊囚犯。 这名囚犯名叫[lodgers0_nameFull],是一名[lodgers0_age]的[lodgers0_title], 这家伙知晓一些关于[asker_nameDef]的[PersonalCharacteristic]隐秘信息, [asker_nameDef]并不想[lodgers0_objective]出去到处乱说。 你要做的就是在[shuttleDelayTicks_duration]内看住这家伙直到丑闻事件过去。 [allLodgerInfo][threatsInfo3]\n\n[commonDescEnding]
threatsInfo3(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n不幸的是,[enemyFaction_name]打算利用这个丑闻,现在正在派出袭击部队营救[lodgers0_nameDef]。[enemyGroupsParagraph]
threatsInfo3(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleHuman][enemyGroupsParagraph]
threatsInfo3(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersSingleHuman]
threatsInfo3(generateThreats==false)->
- questDescription(asker_factionLeader==True,lodgersCount>=2)->[asker_faction_name]的[asker_faction_leaderTitle],[asker_nameFull]从敌方派系逮捕了[lodgersCount]人,现在的问题是无处安置这些囚犯,[asker_nameDef]希望你能帮助看管这些囚犯,[shuttleDelayTicks_duration]后[asker_possessive]为这些囚犯准备的的新监狱就能建好。[allLodgerInfo][threatsInfo4]\n\n[commonDescEnding]
- threatsInfo4(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n这些囚犯与签订了[enemyFaction_name]付费营救合同,所以他们会在你之后派出[enemyFaction_pawnsPlural]。[enemyGroupsParagraph]
- threatsInfo4(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[asker_nameDef]的敌人们已经激活了一个机械族巢穴用于猎杀囚犯,机械族攻击部队将在随后到达。[enemyGroupsParagraph]
+ questDescription(asker_factionLeader==True,lodgersCount>=2)->[asker_faction_name]的[asker_faction_leaderTitle], [asker_nameFull]从敌方派系逮捕了[lodgersCount]人,现在的问题是无处安置这些囚犯, [asker_nameDef]希望你能帮助看管这些囚犯, [shuttleDelayTicks_duration]后[asker_possessive]为这些囚犯准备的的新监狱就能建好。 [allLodgerInfo][threatsInfo4]\n\n[commonDescEnding]
+ threatsInfo4(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n这些囚犯与签订了[enemyFaction_name]付费营救合同,所以他们会在你之后派出[enemyFaction_pawnsPlural]。 [enemyGroupsParagraph]
+ threatsInfo4(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[asker_nameDef]的敌人们已经激活了一个机械族巢穴用于猎杀囚犯,机械族攻击部队将在随后到达。 [enemyGroupsParagraph]
threatsInfo4(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersMultiPrisoners]
threatsInfo4(generateThreats==false)->
questDescription(asker_royalInCurrentFaction==True,lodgersCount==1)->[asker_faction_name]的[asker_royalTitleInCurrentFaction],[asker_nameFull]被捉奸在床。[asker_pronoun]将情人关进监狱以示决心。现在[asker_pronoun]只想你持续关押[lodgers0_nameFull],等[shuttleDelayTicks_duration]后丑闻风波过去后再行计议。[allLodgerInfo][threatsInfo5]\n\n[commonDescEnding]
@@ -67,9 +67,9 @@
threatsInfo5(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n不幸的是,[asker_nameDef]的政敌们挑起了[enemyFaction_name]激活的机械族进攻,想要救出这个人并将所有的丑闻公之于众。[enemyGroupsParagraph]
threatsInfo5(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersSingleHuman]
threatsInfo5(generateThreats==false)->
- questDescription(asker_royalInCurrentFaction==True,lodgersCount>=2)->[asker_faction_name]的一名[asker_royalTitleInCurrentFaction],[asker_nameFull]寻求帮助。 [asker_nameDef]的皇家考古学家从一个古老的休眠监狱中提取了[lodgersCount]名囚犯进行审问。为了避免某些辛秘外泄,[asker_nameDef]希望你能在[shuttleDelayTicks_duration]内帮助看守囚犯。[allLodgerInfo][threatsInfo6]\n\n[commonDescEnding]
- threatsInfo6(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n不幸的是,来自[enemyFaction_name]的[enemyFaction_pawnsPlural]将提取的囚犯视为对他们的亵渎。他们将会攻击任何持有这些囚犯的人。[enemyGroupsParagraph]
- threatsInfo6(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n不幸的是,来自[enemyFaction_name]的[enemyFaction_pawnsPlural]担负这个监狱的守卫工作。他们将会派出机械族来追捕这些丢失的休眠者。[enemyGroupsParagraph]
+ questDescription(asker_royalInCurrentFaction==True,lodgersCount>=2)->[asker_faction_name]的一名[asker_royalTitleInCurrentFaction], [asker_nameFull]寻求帮助。 [asker_nameDef]的皇家考古学家从一个古老的休眠监狱中提取了[lodgersCount]名囚犯进行审问。 为了避免某些辛秘外泄,[asker_nameDef]希望你能在[shuttleDelayTicks_duration]内帮助看守囚犯。 [allLodgerInfo][threatsInfo6]\n\n[commonDescEnding]
+ threatsInfo6(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n不幸的是,来自[enemyFaction_name]的[enemyFaction_pawnsPlural]将提取的囚犯视为对他们的亵渎。 他们将会攻击任何持有这些囚犯的人。[enemyGroupsParagraph]
+ threatsInfo6(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n不幸的是,来自[enemyFaction_name]的[enemyFaction_pawnsPlural]担负这个监狱的守卫工作。 他们将会派出机械族来追捕这些丢失的休眠者。[enemyGroupsParagraph]
threatsInfo6(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersMultiPrisoners]
threatsInfo6(generateThreats==false)->
diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_ItemPodThreat.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_ItemPodThreat.xml
index 6812b1dd..7251d5e8 100644
--- a/Royalty/DefInjected/QuestScriptDef/Scripts_ItemPodThreat.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Scripts_ItemPodThreat.xml
@@ -1,4 +1,4 @@
-
+