From 1cccb5105486e75b46abebd279c67c4569444dac Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Wed, 20 May 2020 21:08:56 +0800
Subject: [PATCH] update for 2639
---
.../ExpansionDef/ExpansionDefs.xml | 4 +-
Core/DefInjected/ThingDef/Mote_Water.xml | 2 +-
Core/Keyed/Dialog_StatsReports.xml | 2 +-
Core/Keyed/MainTabs.xml | 6 +-
Core/Keyed/Messages.xml | 4 +-
Core/Keyed/Misc_Gameplay.xml | 10 ++-
Core/LanguageInfo.xml | 2 +-
Royalty/DefInjected/JobDef/Jobs_Misc.xml | 4 +-
Royalty/DefInjected/NeedDef/Needs.xml | 4 +-
.../Script_Hospitality_Root_Animals.xml | 24 +++---
.../Script_Hospitality_Root_Joiners.xml | 78 ++++++++++---------
.../Script_Hospitality_Root_Prisoners.xml | 24 +++---
.../Scripts_Utility_Helpers.xml | 8 +-
.../Script_Hospitality_TextCommon.xml | 8 +-
Royalty/DefInjected/ThingDef/Mote_Visual.xml | 3 +
Royalty/DefInjected/ThingDef/Plants_Wild.xml | 12 +--
Royalty/DefInjected/TipSetDef/Tips.xml | 4 +-
Royalty/Keyed/Misc_Gameplay.xml | 10 +--
18 files changed, 110 insertions(+), 99 deletions(-)
diff --git a/Core/DefInjected/ExpansionDef/ExpansionDefs.xml b/Core/DefInjected/ExpansionDef/ExpansionDefs.xml
index 8e7781dc..b13b74e2 100644
--- a/Core/DefInjected/ExpansionDef/ExpansionDefs.xml
+++ b/Core/DefInjected/ExpansionDef/ExpansionDefs.xml
@@ -8,7 +8,7 @@
Royalty(皇权)
-
- 帝国已经到来。虽然要向国王、王后、头衔及荣誉的古老传统低头,他们受荣誉约束的文化依然指导着极致的科学技术。\n\n赢得荣誉头衔。建造华丽的谒见厅和豪华房间。召唤帝国精英部队,并与帝国独特的绑定武器形成牵绊。\n\n使用新的心灵能力。致盲、精神控制、眩晕并引发精神错乱。传送、止痛、赋予致命集中以及获得隐身。\n\n为帝国的星系主宰服务并获得在边缘世界的通行证。\n\n一个新的任务系统会程序性地产生独特的任务,结合不同的目标、敌人、访客、奖励、援军、特殊威胁以及世界条件等等。这个扩展增加了大量新的任务内容。\n\n机械族现在可以创建一个机械族建筑集群。每一个机械集群都有一个独特的布局,构成一个独特的战术难题。机械集群在最初的时候总是休眠的,所以你可以计划一次精心计划的袭击——或者利用它们来对付你的其他敌人。\n\n当然你也可以选择不为帝国服务。你可以偷取启灵神经构造装置和其他的帝国技术。叛逆的人生总是自由的——当然也更具挑战性。\n\n这一扩展含有一张新的音乐专辑,由RimWorld原声带作曲家Alistair Lindsay制作。
+
+ - 帝国派系开始出现在星球上\n- 为你的殖民者带来一条荣誉头衔的晋升道路\n- 帝国贵族将持有特殊的心灵力量\n- 随时呼唤帝国军队\n- 部落居民将能与仙树心灵结合\n- 心灵能力者将通过冥想来保持力量\n- 程序化的任务系统带来大量的任务\n- 机械集群将空投部署\n- 属于极致时代的帝国武器已启用\n- 现在能够与人格武器进行绑定\n- 新增坚韧的禁卫装甲\n- 有些科技需要使用蓝图\n- 帝国特有的植入物\n- 一个独特的结局——荣誉晋升\n- 新的音乐专辑
\ No newline at end of file
diff --git a/Core/DefInjected/ThingDef/Mote_Water.xml b/Core/DefInjected/ThingDef/Mote_Water.xml
index b74974c9..9b7fb855 100644
--- a/Core/DefInjected/ThingDef/Mote_Water.xml
+++ b/Core/DefInjected/ThingDef/Mote_Water.xml
@@ -4,7 +4,7 @@
尘埃
-
+
水
\ No newline at end of file
diff --git a/Core/Keyed/Dialog_StatsReports.xml b/Core/Keyed/Dialog_StatsReports.xml
index acee94db..81d42fda 100644
--- a/Core/Keyed/Dialog_StatsReports.xml
+++ b/Core/Keyed/Dialog_StatsReports.xml
@@ -248,7 +248,7 @@
食物中毒系数
食用可能有毒食物时中毒概率的乘数。
-
+
该情况下血液流失的速度。
该情况下引起的疼痛程度。
diff --git a/Core/Keyed/MainTabs.xml b/Core/Keyed/MainTabs.xml
index 0e72e255..77ce9bfe 100644
--- a/Core/Keyed/MainTabs.xml
+++ b/Core/Keyed/MainTabs.xml
@@ -228,8 +228,10 @@
于{0}过期
于{0}到期
-
- 访客平均心情:{0}
+
+ 访客平均心情(以往的 {0}):{1}
+
+ {0}先前的平均心情{1}
穿梭机于{0}抵达
diff --git a/Core/Keyed/Messages.xml b/Core/Keyed/Messages.xml
index f7b87c5a..79aac8fd 100644
--- a/Core/Keyed/Messages.xml
+++ b/Core/Keyed/Messages.xml
@@ -166,8 +166,8 @@
{PAWN_labelShort}由于{2}而丧失了{1}的级别。
{PAWN_labelShort}因{2}而遭受{1}点脑损伤。
-
- {PAWN_labelShort}已经超过了心灵熵值的安全极限。
+
+ {PAWN_labelShort}已经超过了心灵熵值的常规限制。
亲昵之后,{NAMER_nameFull}给{1}起名{NAMEE_nameFull}。
diff --git a/Core/Keyed/Misc_Gameplay.xml b/Core/Keyed/Misc_Gameplay.xml
index 86828328..09164695 100644
--- a/Core/Keyed/Misc_Gameplay.xml
+++ b/Core/Keyed/Misc_Gameplay.xml
@@ -455,7 +455,7 @@
心灵熵
- 熵
+ 心灵熵
{0}疼痛激励
@@ -1238,8 +1238,8 @@
{0}\n{1}
心灵熵阈值:{0} / {1}\n降低速率:{2} / 秒 ({3}秒归零)
-
- 心灵熵在释放心灵能力之后会增加。超过安全限制之后会导致持续数天的心灵崩溃。\n\n心灵熵会随着时间自然消散。这一过程可以通过穿着灵质服装或者感受苦痛来加快。
+
+ 心灵熵在释放心灵能力之后会增加。超过常规限制之后可能会导致持续数天的心灵崩溃。\n\n心灵熵会随着时间自然消散。这一过程可以通过穿着灵质服装或者感受苦痛来加快。
疼痛激励\n\n痛苦使思想集中;同时能够加速恢复心灵熵。\n\n疼痛等级:{0}\n心灵熵恢复倍率:{1}
@@ -1270,6 +1270,10 @@
你将被带到星星上
前往其他世界
+
+ 你可以从这个营地劫走任何东西
+
+ 营地洗劫
总价值 {0}
diff --git a/Core/LanguageInfo.xml b/Core/LanguageInfo.xml
index 638efd1f..4e431b36 100644
--- a/Core/LanguageInfo.xml
+++ b/Core/LanguageInfo.xml
@@ -130,7 +130,7 @@
Indeed
- 修订日期:2020年5月19日 11点02分
+ 修订日期:2020年5月20日 21点08分
MiddleRight
diff --git a/Royalty/DefInjected/JobDef/Jobs_Misc.xml b/Royalty/DefInjected/JobDef/Jobs_Misc.xml
index 4e28c176..f517e97e 100644
--- a/Royalty/DefInjected/JobDef/Jobs_Misc.xml
+++ b/Royalty/DefInjected/JobDef/Jobs_Misc.xml
@@ -1,8 +1,8 @@
-
- 连接
+
+ 连接TargetA
庄严地沉思于
diff --git a/Royalty/DefInjected/NeedDef/Needs.xml b/Royalty/DefInjected/NeedDef/Needs.xml
index 9dd3590d..2ded6985 100644
--- a/Royalty/DefInjected/NeedDef/Needs.xml
+++ b/Royalty/DefInjected/NeedDef/Needs.xml
@@ -3,7 +3,7 @@
精神力
-
- 精神力是释放心灵能力所必须的一种精神结构。精神力会随着时间的推移而消散,可以通过定期冥想来恢复精神力。失去所有的精神力并不会导致除了无法执行心灵能力之外的后果。\n\n更高的精神力水平能够使用更强的心灵能力,但同时也会使精神力降低更快。
+
+ 精神力是释放心灵能力所必须的一种精神结构。精神力会随着时间的推移而消散,可以通过定期冥想来恢复精神力。失去所有的精神力便无法使用心灵能力。\n\n更高的精神力水平能够使用更强的心灵能力,但同时也会使精神力降低更快。
\ No newline at end of file
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Animals.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Animals.xml
index 48d676cc..f50b9fe9 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Animals.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Animals.xml
@@ -14,12 +14,12 @@
threatsInfoMechClustersMultiAnimal->For unknown reasons, the [lodgersLabelPlural] have been targeted by an orbiting mechanoid swarm.
threatsInfoMechRaidsSingleAnimal->For unknown reasons, the [lodgersLabel] has been targeted by a mechanoid hive.
threatsInfoMechRaidsMultiAnimal->For unknown reasons, the [lodgersLabelPlural] have been targeted by a mechanoid hive.
- questDescription(askerIsNull==true,lodgersCount==1)->An animal rescue organization wants you to take care of a [lodgersLabel] named [lodgers0_nameDef] at [map_definite] for [shuttleDelayTicks_duration]. [healthInfo][threatsInfo1]\n\n[commonDescEnding]
+ questDescription(askerIsNull==true,lodgersCount==1)->An animal rescue organization wants you to take care of a [lodgersLabel] named [lodgers0_nameDef] at [map_definite] for [shuttleDelayTicks_duration]. [healthInfo][threatsInfo1][commonDescEnding]
threatsInfo1(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\nThe animal rescue activists stole [lodgers0_nameDef] from a slaughtering ceremony being held by [enemyFaction_name]. Now the [enemyFaction_pawnsPlural] are coming to seek revenge. If you accept [lodgers0_nameDef], [enemyGroupsParagraph]
threatsInfo1(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleAnimal] [enemyGroupsParagraph]
threatsInfo1(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersSingleAnimal] [enemyGroupsParagraph]
threatsInfo1(generateThreats==false)->
- questDescription(askerIsNull==true,lodgersCount>=2)->An animal rescue organization wants you to take care of [lodgersCount] [lodgersLabelPlural] at [map_definite] for [shuttleDelayTicks_duration]. [healthInfo][threatsInfo2]\n\n[commonDescEnding]
+ questDescription(askerIsNull==true,lodgersCount>=2)->An animal rescue organization wants you to take care of [lodgersCount] [lodgersLabelPlural] at [map_definite] for [shuttleDelayTicks_duration]. [healthInfo][threatsInfo2][commonDescEnding]
victim->child
victim->woman
victim->man
@@ -29,22 +29,22 @@
threatsInfo2(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiAnimal] [enemyGroupsParagraph]
threatsInfo2(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersMultiAnimal] [enemyGroupsParagraph]
threatsInfo2(generateThreats==false)->
- questDescription(asker_factionLeader==True,lodgersCount==1,priority=1)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name] is looking for a safe settlement to take care of [asker_possessive] pet [lodgersLabel] [lodgers0_nameDef] for [shuttleDelayTicks_duration]. [healthInfo][threatsInfo3]\n\n[commonDescEnding]
+ questDescription(asker_factionLeader==True,lodgersCount==1,priority=1)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name] is looking for a safe settlement to take care of [asker_possessive] pet [lodgersLabel] [lodgers0_nameDef] for [shuttleDelayTicks_duration]. [healthInfo][threatsInfo3][commonDescEnding]
threatsInfo3(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n[enemyFaction_pawnsPlural] from [enemyFaction_name] are trying to kill poor little [lodgers0_nameDef] to get at [asker_nameDef]. If you accept [lodgers0_nameDef], [enemyGroupsParagraph]
threatsInfo3(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleAnimal] [enemyGroupsParagraph]
threatsInfo3(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersSingleAnimal] [enemyGroupsParagraph]
threatsInfo3(generateThreats==false)->
- questDescription(asker_factionLeader==True,lodgersCount>=2,priority=1)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], is making a request. [asker_pronoun] wants you to take care of [lodgersCount] [lodgersLabelPlural] at [map_definite] for [shuttleDelayTicks_duration]. [healthInfo][threatsInfo4]\n\n[commonDescEnding]
+ questDescription(asker_factionLeader==True,lodgersCount>=2,priority=1)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], is making a request. [asker_pronoun] wants you to take care of [lodgersCount] [lodgersLabelPlural] at [map_definite] for [shuttleDelayTicks_duration]. [healthInfo][threatsInfo4][commonDescEnding]
threatsInfo4(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\nThe [lodgersLabelPlural] are necessary for [asker_nameDef] to fulfill an important trade promise. To provoke conflict, [enemyFaction_name] is sending [enemyFaction_pawnsPlural] after them. If you accept the [lodgersLabelPlural], [enemyGroupsParagraph]
threatsInfo4(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiAnimal] [enemyGroupsParagraph]
threatsInfo4(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersMultiAnimal] [enemyGroupsParagraph]
threatsInfo4(generateThreats==false)->
- questDescription(asker_royalInCurrentFaction==True,lodgersCount==1,priority=1)->[asker_nameFull], a [asker_royalTitleInCurrentFaction] of [asker_faction_name], is making a request. [asker_pronoun] wants you to take care of [asker_possessive] favorite pet, the [lodgersLabel] [lodgers0_nameDef], at [map_definite] for [shuttleDelayTicks_duration]. [healthInfo][threatsInfo5]\n\n[commonDescEnding]
+ questDescription(asker_royalInCurrentFaction==True,lodgersCount==1,priority=1)->[asker_nameFull], a [asker_royalTitleInCurrentFaction] of [asker_faction_name], is making a request. [asker_pronoun] wants you to take care of [asker_possessive] favorite pet, the [lodgersLabel] [lodgers0_nameDef], at [map_definite] for [shuttleDelayTicks_duration]. [healthInfo][threatsInfo5][commonDescEnding]
threatsInfo5(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n[lodgers0_nameDef] is a gift promised to [asker_nameDef]'s child for a marriage ceremony. To try to prevent the marriage, [enemyFaction_name] is sending [enemyFaction_pawnsPlural] after [lodgers0_objective]. If you accept [lodgers0_nameDef], [enemyGroupsParagraph]
threatsInfo5(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleAnimal] [enemyGroupsParagraph]
threatsInfo5(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersSingleAnimal] [enemyGroupsParagraph]
threatsInfo5(generateThreats==false)->
- questDescription(asker_royalInCurrentFaction==True,lodgersCount>=2,priority=1)->[asker_nameFull], a [asker_royalTitleInCurrentFaction] of [asker_faction_name], is making a request. [asker_pronoun] wants you to take care of [lodgersCount] [lodgersLabelPlural] at [map_definite] for [shuttleDelayTicks_duration]. The [lodgersLabelPlural] are [asker_nameDef]'s favorite pets, and [asker_pronoun] wants them to see the world outside [asker_possessive] royal court. [healthInfo][threatsInfo6]\n\n[commonDescEnding]
+ questDescription(asker_royalInCurrentFaction==True,lodgersCount>=2,priority=1)->[asker_nameFull], a [asker_royalTitleInCurrentFaction] of [asker_faction_name], is making a request. [asker_pronoun] wants you to take care of [lodgersCount] [lodgersLabelPlural] at [map_definite] for [shuttleDelayTicks_duration]. The [lodgersLabelPlural] are [asker_nameDef]'s favorite pets, and [asker_pronoun] wants them to see the world outside [asker_possessive] royal court. [healthInfo][threatsInfo6][commonDescEnding]
threatsInfo6(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\nUnfortunately, [enemyFaction_name] is hunting the [lodgersLabelPlural] to try to hurt [asker_nameDef] personally. If you accept the [lodgersLabelPlural], [enemyGroupsParagraph]
threatsInfo6(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiAnimal] [enemyGroupsParagraph]
threatsInfo6(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersMultiAnimal] [enemyGroupsParagraph]
@@ -56,12 +56,12 @@
threatsInfoMechClustersMultiAnimal->出于未知的原因, [lodgersLabelPlural] 已经被轨道上的一群机械体盯上。
threatsInfoMechRaidsSingleAnimal->出于未知的原因, [lodgersLabel]已经被一个机械族巢穴盯上。
threatsInfoMechRaidsMultiAnimal->出于未知地原因, [lodgersLabelPlural]已经被一个机械族巢穴盯上。
- questDescription(askerIsNull==true,lodgersCount==1)->一个动物保护组织希望你能够在[shuttleDelayTicks_duration]内 照顾位于[map_definite]名叫[lodgers0_nameDef]的[lodgersLabel]。[healthInfo][threatsInfo1]\n\n[commonDescEnding]
+ questDescription(askerIsNull==true,lodgersCount==1)->一个动物保护组织希望你能够在[shuttleDelayTicks_duration]内 照顾位于[map_definite]名叫[lodgers0_nameDef]的[lodgersLabel]。[healthInfo][threatsInfo1][commonDescEnding]
threatsInfo1(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n激进的动物保护组织成员在[enemyFaction_name]举行的一场屠宰仪式上偷走了[lodgers0_nameDef]。 现在[enemyFaction_pawnsPlural]将会来寻仇。 如果你选择接纳[lodgers0_nameDef], [enemyGroupsParagraph]
threatsInfo1(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleAnimal] [enemyGroupsParagraph]
threatsInfo1(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersSingleAnimal] [enemyGroupsParagraph]
threatsInfo1(generateThreats==false)->
- questDescription(askerIsNull==true,lodgersCount>=2)->一个动物保护组织希望你能够在 [map_definite] 照顾 [lodgersCount] 只 [lodgersLabelPlural] [shuttleDelayTicks_duration]。 [healthInfo][threatsInfo2]\n\n[commonDescEnding]
+ questDescription(askerIsNull==true,lodgersCount>=2)->一个动物保护组织希望你能够在 [map_definite] 照顾 [lodgersCount] 只 [lodgersLabelPlural] [shuttleDelayTicks_duration]。 [healthInfo][threatsInfo2][commonDescEnding]
victim->孩子
victim->女性
victim->男性
@@ -71,22 +71,22 @@
threatsInfo2(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiAnimal] [enemyGroupsParagraph]
threatsInfo2(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersMultiAnimal] [enemyGroupsParagraph]
threatsInfo2(generateThreats==false)->
- questDescription(asker_factionLeader==True,lodgersCount==1,priority=1)->[asker_faction_name] 的 [asker_faction_leaderTitle], [asker_nameFull] 正在寻找一个安全的庇护所能在[shuttleDelayTicks_duration]里 照顾[asker_possessive]名叫的宠物[lodgersLabel]。 [healthInfo][threatsInfo3]\n\n[commonDescEnding]
+ questDescription(asker_factionLeader==True,lodgersCount==1,priority=1)->[asker_faction_name] 的 [asker_faction_leaderTitle], [asker_nameFull] 正在寻找一个安全的庇护所能在[shuttleDelayTicks_duration]里 照顾[asker_possessive]名叫的宠物[lodgersLabel]。 [healthInfo][threatsInfo3][commonDescEnding]
threatsInfo3(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n来自 [enemyFaction_name] 的 [enemyFaction_pawnsPlural] 正试图通过残杀可怜的 [lodgers0_nameDef]来抓捕[asker_nameDef]。 如果你选择接纳[lodgers0_nameDef], [enemyGroupsParagraph]
threatsInfo3(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleAnimal] [enemyGroupsParagraph]
threatsInfo3(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersSingleAnimal] [enemyGroupsParagraph]
threatsInfo3(generateThreats==false)->
- questDescription(asker_factionLeader==True,lodgersCount>=2,priority=1)->[asker_faction_name] 的 [asker_faction_leaderTitle], [asker_nameFull] 正发来请求。 [asker_pronoun]希望你能在[map_definite]照料[lodgersCount]只[lodgersLabelPlural][shuttleDelayTicks_duration]。 [healthInfo][threatsInfo4]\n\n[commonDescEnding]
+ questDescription(asker_factionLeader==True,lodgersCount>=2,priority=1)->[asker_faction_name] 的 [asker_faction_leaderTitle], [asker_nameFull] 正发来请求。 [asker_pronoun]希望你能在[map_definite]照料[lodgersCount]只[lodgersLabelPlural][shuttleDelayTicks_duration]。 [healthInfo][threatsInfo4][commonDescEnding]
threatsInfo4(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n这些 [lodgersLabelPlural] 对于 [asker_nameDef] 履行一项重要的贸易承诺是必须的。 为了引发冲突, [enemyFaction_name]正派出[enemyFaction_pawnsPlural]追击他们。 如果你选择接纳[lodgersLabelPlural], [enemyGroupsParagraph]
threatsInfo4(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiAnimal] [enemyGroupsParagraph]
threatsInfo4(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersMultiAnimal] [enemyGroupsParagraph]
threatsInfo4(generateThreats==false)->
- questDescription(asker_royalInCurrentFaction==True,lodgersCount==1,priority=1)->[asker_faction_name] 的一名 [asker_royalTitleInCurrentFaction], [asker_nameFull] 正发来请求。 [asker_pronoun]希望你能在[map_definite]照料[lodgersLabel][lodgers0_nameDef][shuttleDelayTicks_duration], 这是[asker_possessive]最喜欢的宠物。 [healthInfo][threatsInfo5]\n\n[commonDescEnding]
+ questDescription(asker_royalInCurrentFaction==True,lodgersCount==1,priority=1)->[asker_faction_name] 的一名 [asker_royalTitleInCurrentFaction], [asker_nameFull] 正发来请求。 [asker_pronoun]希望你能在[map_definite]照料[lodgersLabel][lodgers0_nameDef][shuttleDelayTicks_duration], 这是[asker_possessive]最喜欢的宠物。 [healthInfo][threatsInfo5][commonDescEnding]
threatsInfo5(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n[lodgers0_nameDef] 是 [asker_nameDef] 承诺给孩子的结婚礼物。 为了阻止这场婚礼, [enemyFaction_name]正派出[enemyFaction_pawnsPlural]追踪[lodgers0_objective]。 如果你选择接纳[lodgers0_nameDef], [enemyGroupsParagraph]
threatsInfo5(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleAnimal] [enemyGroupsParagraph]
threatsInfo5(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersSingleAnimal] [enemyGroupsParagraph]
threatsInfo5(generateThreats==false)->
- questDescription(asker_royalInCurrentFaction==True,lodgersCount>=2,priority=1)->[asker_faction_name] 的一名 [asker_royalTitleInCurrentFaction], [asker_nameFull] 正发来请求。 [asker_pronoun]希望你能在[map_definite]照料 [lodgersCount] 只 [lodgersLabelPlural] [shuttleDelayTicks_duration]。 这些[lodgersLabelPlural]是[asker_nameDef]最喜爱的宠物, [asker_pronoun]希望他们能看看[asker_possessive]上流圈子之外的世界。 [healthInfo][threatsInfo6]\n\n[commonDescEnding]
+ questDescription(asker_royalInCurrentFaction==True,lodgersCount>=2,priority=1)->[asker_faction_name] 的一名 [asker_royalTitleInCurrentFaction], [asker_nameFull] 正发来请求。 [asker_pronoun]希望你能在[map_definite]照料 [lodgersCount] 只 [lodgersLabelPlural] [shuttleDelayTicks_duration]。 这些[lodgersLabelPlural]是[asker_nameDef]最喜爱的宠物, [asker_pronoun]希望他们能看看[asker_possessive]上流圈子之外的世界。 [healthInfo][threatsInfo6][commonDescEnding]
threatsInfo6(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n不幸的是, [enemyFaction_name] 正在试图以狩猎 [lodgersLabelPlural] 的方式去伤害 [asker_nameDef]。 如果你选择接纳 [lodgersLabelPlural], [enemyGroupsParagraph]
threatsInfo6(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiAnimal] [enemyGroupsParagraph]
threatsInfo6(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersMultiAnimal] [enemyGroupsParagraph]
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
index fe48b8d3..b98aaa8f 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
@@ -12,14 +12,17 @@
- questDescription(askerIsNull==true,lodgersCount==1)->一艘在轨飞船的舰长希望你能在 [shuttleDelayTicks_duration] 内保护一名位于[map_definite], 名叫[lodgers0_nameFull]的囚犯。 [allLodgerInfo][threatsInfo1]\n\n[commonDescEnding]
+ questDescription(askerIsNull==true,lodgersCount==1)->一艘在轨飞船的舰长希望你能在 [shuttleDelayTicks_duration] 内保护一名位于[map_definite], 名叫[lodgers0_nameFull]的囚犯。 [allLodgerInfo][threatsInfo1][commonDescEnding]
threatsInfo1(generateThreats==true,threatType==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,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleHuman][enemyGroupsParagraph]
threatsInfo1(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersSingleHuman] [enemyGroupsParagraph]
threatsInfo1(generateThreats==false)->
- questDescription(askerIsNull==true,lodgersCount>=2)->一艘在轨飞船的舰长希望你能在[shuttleDelayTicks_duration]内 保护[lodgersCount]名位于[map_definite]的囚犯。 [allLodgerInfo][threatsInfo2]\n\n[commonDescEnding]
+ questDescription(askerIsNull==true,lodgersCount>=2)->一艘在轨飞船的舰长希望你能在[shuttleDelayTicks_duration]内 保护[lodgersCount]名位于[map_definite]的囚犯。 [allLodgerInfo][threatsInfo2][commonDescEnding]
threatsInfo2(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n这些囚犯承认谋杀了[enemyFaction_name]的[enemyFaction_pawnsPlural], 受害者们的家人正在到处搜寻报复。 [enemyGroupsParagraph]
threatsInfo2(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n这些囚犯承认最近[mechViolation], 同时也被一个机械族巢穴标记。 [enemyGroupsParagraph]
threatsInfo2(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersMultiPrisoners] [enemyGroupsParagraph]
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][commonDescEnding]
threatsInfo3(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n不幸的是, [enemyFaction_name] 打算利用这个丑闻, 现在正在派出袭击部队营救[lodgers0_nameDef]。 [enemyGroupsParagraph]
threatsInfo3(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleHuman] [enemyGroupsParagraph]
threatsInfo3(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersSingleHuman] [enemyGroupsParagraph]
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]
+ questDescription(asker_factionLeader==True,lodgersCount>=2)->[asker_faction_name] 的 [asker_faction_leaderTitle], [asker_nameFull] 从敌方派系逮捕了[lodgersCount]人, 现在的问题是无处安置这些囚犯, [asker_nameDef]希望你能帮助看管这些囚犯, [shuttleDelayTicks_duration]后[asker_possessive]为这些囚犯准备的的新监狱就能建好。 [allLodgerInfo][threatsInfo4][commonDescEnding]
threatsInfo4(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n这些囚犯与签订了[enemyFaction_name]付费营救合同, 所以他们会在你之后派出[enemyFaction_pawnsPlural]。 [enemyGroupsParagraph]
threatsInfo4(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n[asker_nameDef]的敌人们已经激活了一个机械族巢穴用于猎杀囚犯, 机械族攻击部队将在随后到达。 [enemyGroupsParagraph]
threatsInfo4(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersMultiPrisoners] [enemyGroupsParagraph]
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]
+ questDescription(asker_royalInCurrentFaction==True,lodgersCount==1)->[asker_faction_name] 的 [asker_royalTitleInCurrentFaction], [asker_nameFull] 被捉奸在床。 [asker_pronoun]将情人关进监狱以示决心。 现在[asker_pronoun]只想你持续关押 [lodgers0_nameFull], 等[shuttleDelayTicks_duration]后丑闻风波过去后再行计议。 [allLodgerInfo][threatsInfo5][commonDescEnding]
threatsInfo5(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n不幸的是, [asker_nameDef] 的政敌们和 [enemyFaction_name] 达成交易, 想要救出这个人并将所有的丑闻公之于众。 [enemyGroupsParagraph]
threatsInfo5(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n不幸的是, [asker_nameDef] 的政敌们挑起了 [enemyFaction_name] 激活的机械族进攻, 想要救出这个人并将所有的丑闻公之于众。 [enemyGroupsParagraph]
threatsInfo5(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersSingleHuman] [enemyGroupsParagraph]
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]
+ questDescription(asker_royalInCurrentFaction==True,lodgersCount>=2)->[asker_faction_name] 的一名 [asker_royalTitleInCurrentFaction], [asker_nameFull]寻求帮助。 [asker_nameDef] 的皇家考古学家从一个古老的休眠监狱中提取了 [lodgersCount]名囚犯进行审问。 为了避免某些辛秘外泄, [asker_nameDef] 希望你能在 [shuttleDelayTicks_duration]内帮助看守囚犯。 [allLodgerInfo][threatsInfo6][commonDescEnding]
threatsInfo6(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n不幸的是, 来自 [enemyFaction_name] 的[enemyFaction_pawnsPlural]将提取的囚犯视为对他们的亵渎。 他们将会攻击任何持有这些囚犯的人。[enemyGroupsParagraph]
threatsInfo6(generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->\n\n不幸的是, 来自 [enemyFaction_name] 的[enemyFaction_pawnsPlural]担负这个监狱的守卫工作。 他们将会派出机械族来追捕这些丢失的休眠者。[enemyGroupsParagraph]
threatsInfo6(generateThreats==true,threatType==MechClusters)->\n\n[threatsInfoMechClustersMultiPrisoners] [enemyGroupsParagraph]
diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml
index fcbdf3dd..4ca21a72 100644
--- a/Royalty/DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Scripts_Utility_Helpers.xml
@@ -3,8 +3,8 @@
helpersParagraph(helpersCount==0)->
- helpersParagraph(helpersCount==1)->[helperKind_label] 将会听命于你。 你需要为[helpers0_objective]提供各种基本生活条件, 如果[helpers0_pronoun]在战斗中不幸牺牲的话也不会有任何后果。\n\n
- helpersParagraph(helpersCount>=2)->[helpersCount]名[helperKind_labelPlural] 将会听命于你。 你需要为这些人提供各种基本生活条件, 如果他们在战斗中不幸牺牲的话也不会有任何后果。\n\n
+ helpersParagraph(helpersCount==1)->\n\n[helperKind_label] 将会听命于你。 你需要为[helpers0_objective]提供各种基本生活条件, 如果[helpers0_pronoun]在战斗中不幸牺牲的话也不会有任何后果。\n\n
+ helpersParagraph(helpersCount>=2)->\n\n[helpersCount]名[helperKind_labelPlural] 将会听命于你。 你需要为这些人提供各种基本生活条件, 如果他们在战斗中不幸牺牲的话也不会有任何后果。\n\n
helpersArrivalLetterEnd(helpersCount==0)->
helpersArrivalLetterEnd(helpersCount>=1)->\n\n[helpersCount]个[helpersLabelSingOrPlural][helpersHasHave]前来协助你。
helpersLabelSingOrPlural(helpersCount==1)->[helperKind_label]
diff --git a/Royalty/DefInjected/RulePackDef/Script_Hospitality_TextCommon.xml b/Royalty/DefInjected/RulePackDef/Script_Hospitality_TextCommon.xml
index 5045d68d..42a2dd8b 100644
--- a/Royalty/DefInjected/RulePackDef/Script_Hospitality_TextCommon.xml
+++ b/Royalty/DefInjected/RulePackDef/Script_Hospitality_TextCommon.xml
@@ -17,7 +17,7 @@
minMoodInfo(lodgersCountWithMoodThreshold>0,priority=1)->\n\nyou must keep the mood of [lodgersLabelSingOrPluralDef] above [lodgersMoodThreshold_percent].
workInfo->
workInfo(lodgersWillNotWork==true,priority=1)->\n\n[lodgersLabelSingOrPluralDef] will not do any work.
- commonDescEnding->[helpersParagraph][shuttleWillComeParagraph]
+ commonDescEnding->[helpersParagraph]
enemyGroupsParagraph->[threatDescriptionParagraph]
threatDescriptionParagraph(threatType==Raids,threatCount==1,threatSize==1)->there will be a raid of roughly this size:\n\n[threatExample]
threatDescriptionParagraph(threatType==Raids,threatCount==1,threatSize>1)->there will be a raid of strength [threatSize]x and roughly this size:\n\n[threatExample]
@@ -27,8 +27,6 @@
threatDescriptionParagraph(threatType==MechClusters,threatCount==2,threatSize==1)->two mech clusters will deploy nearby.
threatDescriptionParagraph(threatType==MechClusters,threatCount==1,threatSize>1)->a mech cluster of [threatSize]x size will deploy nearby.
threatDescriptionParagraph(threatType==MechClusters,threatCount==2,threatSize>1)->two mech clusters of [threatSize]x size will deploy nearby.
- shuttleWillComeParagraph(lodgersCount==1)->After [shuttleDelayTicks_duration], a shuttle will arrive to collect [lodgers0_nameDef].
- shuttleWillComeParagraph(lodgersCount>=2)->After [shuttleDelayTicks_duration], a shuttle will arrive to collect the [lodgersLabelPlural].
threatsInfoMechClustersSingleHuman->[lodgers0_nameDef] recently [mechViolation], and has been targeted by an orbiting mechanoid swarm.
threatsInfoMechClustersMultiPrisoners->The prisoners recently [mechViolation], and have been targeted by an orbiting mechanoid swarm.
threatsInfoMechRaidsSingleHuman->[lodgers0_nameDef] recently [mechViolation], and has been targeted by a mechanoid hive.
@@ -66,7 +64,7 @@
minMoodInfo(lodgersCountWithMoodThreshold>0,priority=1)->\n\n你必须保持 [lodgersLabelSingOrPluralDef] 的心情在 [lodgersMoodThreshold_percent] 以上。
workInfo->
workInfo(lodgersWillNotWork==true,priority=1)->\n\n[lodgersLabelSingOrPluralDef] 不会做任何工作。
- commonDescEnding->[helpersParagraph][shuttleWillComeParagraph]
+ commonDescEnding->[helpersParagraph]
enemyGroupsParagraph->[threatDescriptionParagraph]
threatDescriptionParagraph(threatType==Raids,threatCount==1,threatSize==1)->将会有一波大致与以下规模相当的袭击:\n\n[threatExample]
threatDescriptionParagraph(threatType==Raids,threatCount==1,threatSize>1)->将会有一波强度为[threatSize]x的袭击,与以下规模相当:\n\n[threatExample]
@@ -76,8 +74,6 @@
threatDescriptionParagraph(threatType==MechClusters,threatCount==2,threatSize==1)->两个机械集群将部署到附近。
threatDescriptionParagraph(threatType==MechClusters,threatCount==1,threatSize>1)->一个[threatSize]x规模的机械集群将部署到附近。
threatDescriptionParagraph(threatType==MechClusters,threatCount==2,threatSize>1)->两个[threatSize]x规模的机械集群将部署到附近。
- shuttleWillComeParagraph(lodgersCount==1)->在[shuttleDelayTicks_duration]后, 一艘负责运送[lodgers0_nameDef]的穿梭机将会到达。
- shuttleWillComeParagraph(lodgersCount>=2)->在[shuttleDelayTicks_duration]后, 一艘负责运送[lodgersLabelPlural]的穿梭机将会到达。
threatsInfoMechClustersSingleHuman->[lodgers0_nameDef]近期[mechViolation],已经被在轨的大批机械族锁定。
threatsInfoMechClustersMultiPrisoners->囚犯们近期[mechViolation],已经被在轨的大批机械族锁定。
threatsInfoMechRaidsSingleHuman->[lodgers0_nameDef]近期[mechViolation],已经被大批机械族锁定。
diff --git a/Royalty/DefInjected/ThingDef/Mote_Visual.xml b/Royalty/DefInjected/ThingDef/Mote_Visual.xml
index 110e787b..227ff8f7 100644
--- a/Royalty/DefInjected/ThingDef/Mote_Visual.xml
+++ b/Royalty/DefInjected/ThingDef/Mote_Visual.xml
@@ -37,4 +37,7 @@
心灵波
+
+ 水花
+
\ No newline at end of file
diff --git a/Royalty/DefInjected/ThingDef/Plants_Wild.xml b/Royalty/DefInjected/ThingDef/Plants_Wild.xml
index 25319d00..76deb3be 100644
--- a/Royalty/DefInjected/ThingDef/Plants_Wild.xml
+++ b/Royalty/DefInjected/ThingDef/Plants_Wild.xml
@@ -3,20 +3,20 @@
灵草
-
- 一株色彩斑斓的草。部落居民在仙树附近发现了这些灵草,当他们与仙树建立心灵连接时,这些仙草会更茂盛。\n\n外域的科学家们曾试图研究这一现象,但如果太过靠近观察,灵草就会退化成普通的植物。
+
+ 一株蕴含有大量发光微粒的草。部落居民在仙树附近冥想时发现了这些灵草,这些灵草生长在仙树的根部。\n\n外域的科学家们曾试图研究这一现象,但如果太过靠近观察,灵草就会退化成普通的植物。\n\n动物会拒绝食用灵草,在部落的故事中,这种行为被认为是动物的恐惧与敬畏。
仙树
-
- 一种罕见的树种,树皮光滑,叶长,有色彩斑斓的光。仙树会与周围的生命体共鸣产生一种奇特的精神波动,这使得它们能够在各种环境生长。\n\n部落的人们学会了在冥想时集中注意力与仙树建立精神联系。如果在附近放置了人工结构,这一联系会减弱。\n\n大多数的部落认为,仙树并不只是一棵树,而是世界意志的一部分肢体。
+
+ 一种罕见的树种,树皮温暖光滑,叶长,充满了发光微粒。仙树会与周围的生命体共鸣产生一种奇特的精神波动,这使得它们能够在各种环境生长。\n\n如果有人在仙树附近冥想,它会在根部附近长出灵草。长出足够数量的灵草之后,就可以与仙树进行心灵连接仪式,这个仪式能提升人的心灵力量。只有部落的居民知道这个仪式的秘密。部落的心灵能力者也能够通过在仙树附近冥想来提升精神力。\n\n如果在附近放置了人工结构,这一联系会减弱。祂们拒绝被封闭或者研究,并且必须保持是自然的一部分。\n\n大多数的部落认为,仙树并不只是一棵树,而是世界意志的一部分肢体。
仙树死亡,同时发出了令人不安的心灵尖啸。
仙树
-
- 一种罕见的树种,树皮光滑,叶长,有色彩斑斓的光。仙树会与周围的生命体共鸣产生一种奇特的精神波动,这使得它们能够在各种环境生长。\n\n部落的人们学会了在冥想时集中注意力与仙树建立精神联系。如果在附近放置了人工结构,这一联系会减弱。\n\n大多数的部落认为,仙树并不只是一棵树,而是世界意志的一部分肢体。
+
+ 一种罕见的树种,树皮温暖光滑,叶长,充满了发光微粒。仙树会与周围的生命体共鸣产生一种奇特的精神波动,这使得它们能够在各种环境生长。\n\n如果有人在仙树附近冥想,它会在根部附近长出灵草。长出足够数量的灵草之后,就可以与仙树进行心灵连接仪式,这个仪式能提升人的心灵力量。只有部落的居民知道这个仪式的秘密。部落的心灵能力者也能够通过在仙树附近冥想来提升精神力。\n\n如果在附近放置了人工结构,这一联系会减弱。祂们拒绝被封闭或者研究,并且必须保持是自然的一部分。\n\n大多数的部落认为,仙树并不只是一棵树,而是世界意志的一部分肢体。
仙树死亡,同时发出了令人不安的心灵尖啸。
diff --git a/Royalty/DefInjected/TipSetDef/Tips.xml b/Royalty/DefInjected/TipSetDef/Tips.xml
index b1b46148..b721db54 100644
--- a/Royalty/DefInjected/TipSetDef/Tips.xml
+++ b/Royalty/DefInjected/TipSetDef/Tips.xml
@@ -5,8 +5,8 @@
一些荣誉头衔允许持有者要求军事援助。这能够帮助你脱离险境。
帝国的贵族们会要求他们所有的特权,而持有荣誉头衔的殖民者会更灵活变通一些,除非他们贪婪或是嫉妒。
-
- 「皇家动力装甲」、「皇家禁卫装甲」和灵质服装能够满足荣誉头衔的服装要求。
+
+ 「皇家动力装甲」和「灵质服装」也能够满足荣誉头衔的服装要求。
若荣誉头衔持有者去世,该头衔将传给他们选择的继承人。
diff --git a/Royalty/Keyed/Misc_Gameplay.xml b/Royalty/Keyed/Misc_Gameplay.xml
index 009176ea..e49f47fa 100644
--- a/Royalty/Keyed/Misc_Gameplay.xml
+++ b/Royalty/Keyed/Misc_Gameplay.xml
@@ -101,17 +101,17 @@
开始共鸣仪式
附近需要{0} {1}(有{2})
-
- 需要起灵神经
-
+
+ 需要{0}精神力
+
需要在3格之内有一个可用的地点来进行连接
连接仪式完成
{PAWN_labelShort}完成了与{LINKABLE_labelShort}的连接仪式。\n\n{PAWN_pronoun}现在获得了一次启灵升级,能够使用新的心灵能力。
-
- {PAWN_pronoun}也获得了一个新的心灵能力:{1}
+ 需要起灵神经
+ {PAWN_pronoun}也获得了一个新的心灵能力:{1}
需要心灵增幅装置
谒见厅中有多个宝座,但这只适用于已婚夫妇。
没有可用的谒见厅