From 6e7ab323cccc9279b5906456f0189b12f2e9c940 Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Sat, 16 May 2020 08:45:42 +0800
Subject: [PATCH] update for 2635
---
.../HediffDef/Hediffs_Local_Injuries.xml | 9 +++++
Core/DefInjected/StatDef/Stats_Abilities.xml | 5 +++
.../StatDef/Stats_Pawns_General.xml | 4 +-
.../ThoughtDef/Thoughts_Situation_Special.xml | 3 +-
Core/DefInjected/TipSetDef/Tips.xml | 2 +
Core/Keyed/Dialog_StatsReports.xml | 2 +
Core/Keyed/Dialogs_Various.xml | 4 +-
Core/Keyed/Misc_Gameplay.xml | 27 ++++++-------
Core/LanguageInfo.xml | 2 +-
.../HediffDef/Hediffs_Psycasts.xml | 21 ++++++----
Royalty/DefInjected/NeedDef/Needs.xml | 4 +-
.../Script_Hospitality_Root_Joiners.xml | 32 ++++++++-------
.../Script_Hospitality_Worker.xml | 8 ++++
.../Script_Hospitality_TextCommon.xml | 40 ++++++++-----------
Royalty/Keyed/Alerts.xml | 9 ++---
Royalty/Keyed/GameplayCommands.xml | 10 ++++-
Royalty/Keyed/Misc_Gameplay.xml | 6 ++-
17 files changed, 110 insertions(+), 78 deletions(-)
diff --git a/Core/DefInjected/HediffDef/Hediffs_Local_Injuries.xml b/Core/DefInjected/HediffDef/Hediffs_Local_Injuries.xml
index 5836bd79..f90fda1b 100644
--- a/Core/DefInjected/HediffDef/Hediffs_Local_Injuries.xml
+++ b/Core/DefInjected/HediffDef/Hediffs_Local_Injuries.xml
@@ -134,6 +134,15 @@
{1}中的{0}
+
+ 割伤
+
+ 处决的割伤。
+
+ 割伤伤口
+
+ {1}中的{0}
+
冻伤
diff --git a/Core/DefInjected/StatDef/Stats_Abilities.xml b/Core/DefInjected/StatDef/Stats_Abilities.xml
index 956e1b1d..97b8ee07 100644
--- a/Core/DefInjected/StatDef/Stats_Abilities.xml
+++ b/Core/DefInjected/StatDef/Stats_Abilities.xml
@@ -35,6 +35,11 @@
对某人释放此能力对其所属派系的关系影响。
+
+ 精神力消耗
+
+ 释放此能力所必须的精神力消耗。
+
距离
diff --git a/Core/DefInjected/StatDef/Stats_Pawns_General.xml b/Core/DefInjected/StatDef/Stats_Pawns_General.xml
index 93cacf84..e77aade9 100644
--- a/Core/DefInjected/StatDef/Stats_Pawns_General.xml
+++ b/Core/DefInjected/StatDef/Stats_Pawns_General.xml
@@ -87,8 +87,8 @@
心灵熵降低速率
个体的心灵熵降低速率。
-
- {0}/30秒
+
+ {0}/秒
心灵敏感度
diff --git a/Core/DefInjected/ThoughtDef/Thoughts_Situation_Special.xml b/Core/DefInjected/ThoughtDef/Thoughts_Situation_Special.xml
index 72e7fab6..2d859c73 100644
--- a/Core/DefInjected/ThoughtDef/Thoughts_Situation_Special.xml
+++ b/Core/DefInjected/ThoughtDef/Thoughts_Situation_Special.xml
@@ -73,9 +73,8 @@
心灵放射器让我感觉很奇怪，但同时这感觉又让我很放松。
-
+
精神宿醉
-
我的眼睛酸痛，浑身无力，但我知道那是来自大脑的反馈。
diff --git a/Core/DefInjected/TipSetDef/Tips.xml b/Core/DefInjected/TipSetDef/Tips.xml
index f06ca726..012db900 100644
--- a/Core/DefInjected/TipSetDef/Tips.xml
+++ b/Core/DefInjected/TipSetDef/Tips.xml
@@ -51,6 +51,8 @@
当你尝试猎杀大群动物时，它们可能会一起主动攻击你。请预先评估狩猎风险，或选择落单及较弱的猎物。
你可以在下雨的时候捕猎会爆炸的动物，它们死后的爆炸不会引起森林大火。
+
+ 精心宰杀的动物比那些被粗暴杀死的动物产出的肉和皮革都要更多一些。
设置远行打包点能让你的远行队更加高效。
diff --git a/Core/Keyed/Dialog_StatsReports.xml b/Core/Keyed/Dialog_StatsReports.xml
index 073b1a04..c4b9b88f 100644
--- a/Core/Keyed/Dialog_StatsReports.xml
+++ b/Core/Keyed/Dialog_StatsReports.xml
@@ -62,6 +62,8 @@
设施
体型（{0}）乘数
+
+ 精心宰杀
DPS = 近战伤害 * 近战命中几率 / 冷却时间（秒）
diff --git a/Core/Keyed/Dialogs_Various.xml b/Core/Keyed/Dialogs_Various.xml
index b3b4ff73..2ef36c15 100644
--- a/Core/Keyed/Dialogs_Various.xml
+++ b/Core/Keyed/Dialogs_Various.xml
@@ -938,8 +938,10 @@
目标必须可视
-
+
熵增加
+
+ 精神力消耗
效果持续时间
diff --git a/Core/Keyed/Misc_Gameplay.xml b/Core/Keyed/Misc_Gameplay.xml
index fe6efb88..20a84c92 100644
--- a/Core/Keyed/Misc_Gameplay.xml
+++ b/Core/Keyed/Misc_Gameplay.xml
@@ -477,11 +477,9 @@
扫描进度
-
-
- 冥想专注力（{LASTUSER_labelShort}）
-
- 专注力效果受影响
+
+
+ 冥想
@@ -1234,16 +1232,14 @@
{0}\n{1}\n{2}
{0}\n{1}
-
- 心灵熵阈值：{0} / {1}\n降低速率：{2} / {3}秒 （{4}秒归零）\n\n精神力：{5}
-
- 最大阈值乘数
-
- 心灵熵在释放心灵能力之后会增加。超过安全限制之后会引起后遗症。每当熵归零都会产生精神宿醉。\n\n精神力与心灵熵是分开的，低于10%的精神力会限制心灵熵阈值。精神力可以通过冥想来提升。
-
- 痛苦使思想集中；同时能够更快恢复心灵熵。\n\n疼痛等级：{0}\n心灵熵恢复倍率：{1}
-
- 切换心灵熵限制器。\n\n心灵熵超限制可能会导致严重的健康后果，包括长期的心理崩溃，甚至会因严重超量而损害大脑。熵的极限值越高，超限的后果越严重。
+
+ 心灵熵阈值：{0} / {1}\n降低速率：{2} / 秒 （{3}秒归零）\n\n精神力：{4}
+
+ 心灵熵在释放心灵能力之后会增加。超过安全限制之后会引起后遗症。每当熵归零都会产生精神宿醉。\n\n除了心灵熵之外，一些心灵能力在释放的时候也会消耗精神力。精神力可以通过冥想来提升。
+
+ 痛苦使思想集中；同时能够加速恢复心灵熵。\n\n疼痛等级：{0}\n心灵熵恢复倍率：{1}
+
+ 切换心灵熵限制器。\n\n心灵熵超限制可能会导致长期的心灵崩溃，但并不会造成永久伤害。
@@ -1308,6 +1304,7 @@
由于：{0}
+ 最大阈值乘数
心灵熵：{0}/{1}\n下降速率：{2}/{3}秒（{4}秒归零）\n\n使用心灵能力后心灵熵增加。\n超出安全限制会导致后遗症。\n每当熵归零都会产生精神宿醉。
完成
diff --git a/Core/LanguageInfo.xml b/Core/LanguageInfo.xml
index 14e548a5..6026456e 100644
--- a/Core/LanguageInfo.xml
+++ b/Core/LanguageInfo.xml
@@ -130,7 +130,7 @@
Indeed
- 修订日期：2020-5-15
+ 修订日期：2020-5-16
MiddleRight
diff --git a/Royalty/DefInjected/HediffDef/Hediffs_Psycasts.xml b/Royalty/DefInjected/HediffDef/Hediffs_Psycasts.xml
index 55793eda..9a727031 100644
--- a/Royalty/DefInjected/HediffDef/Hediffs_Psycasts.xml
+++ b/Royalty/DefInjected/HediffDef/Hediffs_Psycasts.xml
@@ -24,8 +24,8 @@
心灵崩溃
-
- 精神上的长期不稳定，通常由过度的心灵熵引起。即使熵消失了，崩溃也会持续很多天，引起各种各样的精神紊乱。
+
+ 心灵深处的长期不稳定，通常由过度的心灵熵引起。即使熵消失了，崩溃也会持续很多天，引起各种各样的精神紊乱。它能随着时间自行消失。
轻微
@@ -40,17 +40,22 @@
心灵熵
-
- 混乱的心灵能量在头脑中作祟。心灵熵随时间逐渐下降，当它被清除后，会留下好几天的精神萎靡。如果心灵熵变得非常高，会导致精神病、长期的精神崩溃、情绪失控、甚至脑损伤。
+
+ 混乱的心灵能量在头脑中作祟。如果心灵熵超过安全阈值，可能会造成暂时的心灵崩溃、降低启灵等级，最终因为心灵休克失去意识。不过这些情况都不是永久的。
安全
- 过载
-
+ 高压
+
+ 过载
+
+ 超负荷
+
+ 崩坏
+
+
超负荷
-
脑损伤
-
脑死亡
diff --git a/Royalty/DefInjected/NeedDef/Needs.xml b/Royalty/DefInjected/NeedDef/Needs.xml
index 6b702c24..2e7c1d0d 100644
--- a/Royalty/DefInjected/NeedDef/Needs.xml
+++ b/Royalty/DefInjected/NeedDef/Needs.xml
@@ -3,7 +3,7 @@
精神力
-
- 精神力是释放心灵能力所必须的一种精神秩序。心灵能力者通过冥想来恢复精神力，它会在日常工作生活中不断降低。精神力有三个层次，更高的精神力水平能够使用更强的心灵能力，但同时也会使精神力降低更快：\n\n{0}\n低于10%的精神力会限制心灵能力者维持心灵熵阈值的能力。
+
+ 精神力是释放心灵能力所必须的一种精神秩序。心灵能力者通过冥想来恢复精神力，它会在日常工作生活中不断降低。精神力有三个层次，更高的精神力水平能够使用更强的心灵能力，但同时也会使精神力降低更快。
\ No newline at end of file
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
index 270e0380..d3873676 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
@@ -15,7 +15,9 @@
joinerEnding->You'll be able to direct [lodgersDef] the same way you direct your own colonists.[specialNeedsExplanation]
specialNeedsExplanation(asker_royalInCurrentFaction==True,priority=1)-> You'll need to satisfy any special royal needs the guests may have.
specialNeedsExplanation->
- goodwillForMood(goodwillRewardForMood==true,priority=1)->\n\n[asker_nameDef] appreciates quality accomodation. You will gain goodwill with [asker_faction_name] if you keep [asker_possessive] average mood high.
+ theirHisHer(lodgersCount==1)->[lodgers0_possessive]
+ theirHisHer(lodgersCount>=1)->their
+ goodwillForMood(goodwillRewardForMood==true,priority=1)->\n\n[asker_nameDef] appreciates quality accomodation. You will gain goodwill with [asker_faction_name] if you keep [lodgersLabelSingOrPluralDef] average mood high.
goodwillForMood->
questDescription(askerIsNull==true,lodgersCount==1)->A [lodgers0_title] named [lodgers0_nameFull] wants you to protect [lodgers0_objective] at [map_definite] for [shuttleDelayTicks_duration]. [allLodgerInfo][threatsInfo1]\n\n[commonDescEnding]\n\n[joinerEnding]
threatsInfo1(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n[lodgers0_nameDef] was recently caught [wrongAct]. Seeking revenge, [enemyFaction_pawnsPlural] will come for [lodgers0_objective] as long as [lodgers0_pronoun] is with you. [enemyGroupsParagraph]
@@ -33,13 +35,13 @@
threatsInfo2(generateThreats==true,threatType==MechClusters)->\n\nThe travelers recently [mechViolation], and have been targeted by an orbiting mechanoid swarm. [enemyGroupsParagraph]
threatsInfo2(generateThreats==false)->
questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==false)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name] is requesting a favor. [asker_possessive] friend [lodgers0_nameFull] is interested in learning about other cultures. [asker_nameDef] wants you to host [lodgers0_nameDef] at [map_definite] for [shuttleDelayTicks_duration]. [allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
- questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name] is requesting a favor. [asker_possessive] friend, a [lodgers0_age]-year-old [lodgers0_title] named [lodgers0_nameDef], was caught writing vicious insults about [enemyFaction_leader_nameFull]'s [PersonalCharacteristic]. [asker_nameDef] is asking for you to guard [lodgers0_nameDef] for [shuttleDelayTicks_duration], until [asker_pronoun] can smooth over relations with [enemyFaction_name]. Since [enemyFaction_leader_nameDef] is the [enemyFaction_leaderTitle] of [enemyFaction_name], [enemyFaction_leader_pronoun] has sent groups of [enemyFaction_pawnsPlural] to hunt the insulter [lodgers0_nameDef].\n\n[threatDescriptionParagraph]\n\n[allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
- questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name] is requesting a favor. [asker_possessive] friend, a [lodgers0_age]-year-old [lodgers0_title] named [lodgers0_nameDef], recently [mechViolation]. [asker_nameDef] is asking for you to guard [lodgers0_nameDef] for [shuttleDelayTicks_duration], until [asker_pronoun] can sooth the mechanoid hive.\n\n[threatDescriptionParagraph]\n\n[allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
- questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,threatType==MechClusters)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name] is requesting a favor. [asker_possessive] friend, a [lodgers0_age]-year-old [lodgers0_title] named [lodgers0_nameDef], recently [mechViolation]. [asker_nameDef] is asking for you to guard [lodgers0_nameDef] for [shuttleDelayTicks_duration].\n\n[threatDescriptionParagraph]\n\n[allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
+ questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name] is requesting a favor. [asker_possessive] friend, a [lodgers0_age]-year-old [lodgers0_title] named [lodgers0_nameDef], was caught writing vicious insults about [enemyFaction_leader_nameFull]'s [PersonalCharacteristic]. [asker_nameDef] is asking for you to guard [lodgers0_nameDef] for [shuttleDelayTicks_duration], until [asker_pronoun] can smooth over relations with [enemyFaction_name]. Since [enemyFaction_leader_nameDef] is the [enemyFaction_leaderTitle] of [enemyFaction_name], [enemyFaction_leader_pronoun] has sent groups of [enemyFaction_pawnsPlural] to hunt the insulter [lodgers0_nameDef].\n\n[threatDescriptionParagraph][allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
+ questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name] is requesting a favor. [asker_possessive] friend, a [lodgers0_age]-year-old [lodgers0_title] named [lodgers0_nameDef], recently [mechViolation]. [asker_nameDef] is asking for you to guard [lodgers0_nameDef] for [shuttleDelayTicks_duration], until [asker_pronoun] can sooth the mechanoid hive.\n\n[threatDescriptionParagraph][allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
+ questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,threatType==MechClusters)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name] is requesting a favor. [asker_possessive] friend, a [lodgers0_age]-year-old [lodgers0_title] named [lodgers0_nameDef], recently [mechViolation]. [asker_nameDef] is asking for you to guard [lodgers0_nameDef] for [shuttleDelayTicks_duration].\n\n[threatDescriptionParagraph][allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==false)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], recently rescued [lodgersCount] [asker_faction_pawnsPlural] from an enemy jail. [asker_nameDef] wants you to guard them at [map_definite] for [shuttleDelayTicks_duration] until [asker_pronoun] can send a shuttle to collect them. [allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
- questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], recently rescued [lodgersCount] [asker_faction_pawnsPlural] from the prisons of [enemyFaction_name]. [asker_nameDef] wants you to guard them at [map_definite] for [shuttleDelayTicks_duration] until [asker_pronoun] can send a shuttle to collect them. The [asker_faction_pawnsPlural] know secrets about the [secretInfo] of [enemyFaction_name], so they will be hunted.\n\n[threatDescriptionParagraph]\n\n[allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
- questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], recently rescued [lodgersCount] [asker_faction_pawnsPlural] from a crytosleep vault. [asker_nameDef] wants you to guard them at [map_definite] for [shuttleDelayTicks_duration] until [asker_pronoun] can send a shuttle to collect them. The [asker_faction_pawnsPlural] will be hunted by mechanoids.\n\n[threatDescriptionParagraph]\n\n[allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
- questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,threatType==MechClusters)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], recently rescued [lodgersCount] [asker_faction_pawnsPlural] from a mechanoid hive's holding pen. [asker_nameDef] wants you to guard them at [map_definite] for [shuttleDelayTicks_duration] until [asker_pronoun] can send a shuttle to collect them. The mechs are tracking their former prisoners.\n\n[threatDescriptionParagraph]\n\n[allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
+ questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], recently rescued [lodgersCount] [asker_faction_pawnsPlural] from the prisons of [enemyFaction_name]. [asker_nameDef] wants you to guard them at [map_definite] for [shuttleDelayTicks_duration] until [asker_pronoun] can send a shuttle to collect them. The [asker_faction_pawnsPlural] know secrets about the [secretInfo] of [enemyFaction_name], so they will be hunted.\n\n[threatDescriptionParagraph][allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
+ questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], recently rescued [lodgersCount] [asker_faction_pawnsPlural] from a crytosleep vault. [asker_nameDef] wants you to guard them at [map_definite] for [shuttleDelayTicks_duration] until [asker_pronoun] can send a shuttle to collect them. The [asker_faction_pawnsPlural] will be hunted by mechanoids.\n\n[threatDescriptionParagraph][allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
+ questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,threatType==MechClusters)->[asker_nameFull], [asker_faction_leaderTitle] of [asker_faction_name], recently rescued [lodgersCount] [asker_faction_pawnsPlural] from a mechanoid hive's holding pen. [asker_nameDef] wants you to guard them at [map_definite] for [shuttleDelayTicks_duration] until [asker_pronoun] can send a shuttle to collect them. The mechs are tracking their former prisoners.\n\n[threatDescriptionParagraph][allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
secretInfo->military capabilities
secretInfo->moral transgressions
secretInfo->weapons research
@@ -64,7 +66,9 @@
joinerEnding->你可以直接控制 [lodgersDef]， 如同指挥你自己的殖民者那样。 [specialNeedsExplanation]
specialNeedsExplanation(asker_royalInCurrentFaction==True,priority=1)->你必须满足访客们的各种需求。
specialNeedsExplanation->
- goodwillForMood(goodwillRewardForMood==true,priority=1)->\n\n[asker_nameDef] 会答谢高质量的住宿。 如果你能够保持[asker_possessive]平均心情在较高水平， 你将会获得与[asker_faction_name]的好感度。
+ theirHisHer(lodgersCount==1)->[lodgers0_possessive]
+ theirHisHer(lodgersCount>=1)->他们的
+ goodwillForMood(goodwillRewardForMood==true,priority=1)->\n\n[asker_nameDef] 会答谢高质量的住宿。 如果你能够保持[lodgersLabelSingOrPluralDef]平均心情在较高水平， 你将会获得与[asker_faction_name]的好感度。
goodwillForMood->
questDescription(askerIsNull==true,lodgersCount==1)->一个名叫 [lodgers0_nameFull] 的 [lodgers0_title] 希望你在 [map_definite] 保护 [lodgers0_objective] [shuttleDelayTicks_duration]。 [allLodgerInfo] [threatsInfo1]\n\n[commonDescEnding]\n\n[joinerEnding]
threatsInfo1(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n[lodgers0_nameDef] 不久前因 [wrongAct] 而被通缉。 只要 [lodgers0_pronoun] 在这里， [enemyFaction_pawnsPlural] 会来到 [lodgers0_objective] 寻求报复。\n[enemyGroupsParagraph]
@@ -82,13 +86,13 @@
threatsInfo2(generateThreats==true,threatType==MechClusters)->\n\n这些旅行者最近[mechViolation]， 并成为轨道平台上机械集群的目标。 [enemyGroupsParagraph]
threatsInfo2(generateThreats==false)->
questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==false)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 正在寻求帮助。 [asker_possessive]朋友 [lodgers0_nameFull] 对学习异族文化很感兴趣。 [asker_nameDef] 希望你能在[shuttleDelayTicks_duration]内 向[map_definite]提供[lodgers0_nameDef]。 [allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
- questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 正在寻求帮助。 [asker_possessive][lodgers0_age]岁的朋友， [lodgers0_title] [lodgers0_nameDef] 被发现对[enemyFaction_leader_nameFull]的PersonalCharacteristic]进行恶意侮辱。 [asker_nameDef] 希望你为 [lodgers0_nameDef] 提供[shuttleDelayTicks_duration]的保护， 让[asker_possessive]有足够的时间缓和与 [enemyFaction_name]的关系。 因为 [enemyFaction_leader_nameDef] 是 [enemyFaction_name] 的 [enemyFaction_leaderTitle]， [enemyFaction_leader_pronoun]已经派遣一群[enemyFaction_pawnsPlural]前来抓捕侮辱者[lodgers0_nameDef]。 \n\n[threatDescriptionParagraph]\n\n[allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
- questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 正在寻求帮助。 [asker_possessive][lodgers0_age]岁的朋友， [lodgers0_title] [lodgers0_nameDef] 最近 [mechViolation]。 [asker_nameDef] 希望你为 [lodgers0_nameDef] 提供[shuttleDelayTicks_duration]的保护， 让[asker_possessive]有足够的时间处理机械族巢穴。 \n\n[threatDescriptionParagraph]\n\n[allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
- questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,threatType==MechClusters)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 正在寻求帮助。 [asker_possessive] [lodgers0_age]岁的朋友， [lodgers0_title] [lodgers0_nameDef] 最近被 [mechViolation]。 [asker_nameDef] 希望你为 [lodgers0_nameDef] 提供[shuttleDelayTicks_duration]的保护。 \n\n[threatDescriptionParagraph]\n\n[allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
+ questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 正在寻求帮助。 [asker_possessive][lodgers0_age]岁的朋友， [lodgers0_title] [lodgers0_nameDef] 被发现对[enemyFaction_leader_nameFull]的PersonalCharacteristic]进行恶意侮辱。 [asker_nameDef] 希望你为 [lodgers0_nameDef] 提供[shuttleDelayTicks_duration]的保护， 让[asker_possessive]有足够的时间缓和与 [enemyFaction_name]的关系。 因为 [enemyFaction_leader_nameDef] 是 [enemyFaction_name] 的 [enemyFaction_leaderTitle]， [enemyFaction_leader_pronoun]已经派遣一群[enemyFaction_pawnsPlural]前来抓捕侮辱者[lodgers0_nameDef]。 \n\n[threatDescriptionParagraph][allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
+ questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 正在寻求帮助。 [asker_possessive][lodgers0_age]岁的朋友， [lodgers0_title] [lodgers0_nameDef] 最近 [mechViolation]。 [asker_nameDef] 希望你为 [lodgers0_nameDef] 提供[shuttleDelayTicks_duration]的保护， 让[asker_possessive]有足够的时间处理机械族巢穴。 \n\n[threatDescriptionParagraph][allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
+ questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,threatType==MechClusters)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 正在寻求帮助。 [asker_possessive] [lodgers0_age]岁的朋友， [lodgers0_title] [lodgers0_nameDef] 最近被 [mechViolation]。 [asker_nameDef] 希望你为 [lodgers0_nameDef] 提供[shuttleDelayTicks_duration]的保护。 \n\n[threatDescriptionParagraph][allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==false)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 最近从敌人的监狱中救出了 [lodgersCount] [asker_faction_pawnsPlural]。 [asker_nameDef] 希望你能在[map_definite]保护[asker_pronoun][shuttleDelayTicks_duration]， 以便派出穿梭机接走他们。 [allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
- questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 最近从敌人的监狱中救出了 [lodgersCount] [asker_faction_pawnsPlural]。 [asker_nameDef] 希望你能在[map_definite]保护[asker_pronoun][shuttleDelayTicks_duration]， 以便派出穿梭机接走他们。\n\n[asker_faction_pawnsPlural] 知晓 [enemyFaction_name] 关于 [secretInfo] 的机密，因此会对其进行抓捕。\n\n[threatDescriptionParagraph]\n\n[allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
- questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 最近从低温休眠仓中救出了 [lodgersCount] [asker_faction_pawnsPlural]。 [asker_nameDef] 希望你能在[map_definite]保护[asker_pronoun][shuttleDelayTicks_duration]， 以便派出穿梭机接走他们。\n\n[asker_faction_pawnsPlural]会被机械族猎杀。\n\n[threatDescriptionParagraph]\n\n[allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
- questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,threatType==MechClusters)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 最近从机械族巢穴的候宰栏中救出了 [lodgersCount] [asker_faction_pawnsPlural]。 [asker_nameDef] 希望你能在[map_definite]保护[asker_pronoun][shuttleDelayTicks_duration]， 以便派出穿梭机接走他们。\n\n机械族正在追捕它们的逃犯。 \n\n[threatDescriptionParagraph]\n\n[allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
+ questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 最近从敌人的监狱中救出了 [lodgersCount] [asker_faction_pawnsPlural]。 [asker_nameDef] 希望你能在[map_definite]保护[asker_pronoun][shuttleDelayTicks_duration]， 以便派出穿梭机接走他们。\n\n[asker_faction_pawnsPlural] 知晓 [enemyFaction_name] 关于 [secretInfo] 的机密，因此会对其进行抓捕。\n\n[threatDescriptionParagraph][allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
+ questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,threatType==Raids,enemyFaction==Mechanoid)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 最近从低温休眠仓中救出了 [lodgersCount] [asker_faction_pawnsPlural]。 [asker_nameDef] 希望你能在[map_definite]保护[asker_pronoun][shuttleDelayTicks_duration]， 以便派出穿梭机接走他们。\n\n[asker_faction_pawnsPlural]会被机械族猎杀。\n\n[threatDescriptionParagraph][allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
+ questDescription(asker_factionLeader==True,lodgersCount>=2,generateThreats==true,threatType==MechClusters)->[asker_faction_name] 的 [asker_faction_leaderTitle] [asker_nameFull] 最近从机械族巢穴的候宰栏中救出了 [lodgersCount] [asker_faction_pawnsPlural]。 [asker_nameDef] 希望你能在[map_definite]保护[asker_pronoun][shuttleDelayTicks_duration]， 以便派出穿梭机接走他们。\n\n机械族正在追捕它们的逃犯。 \n\n[threatDescriptionParagraph][allLodgerInfo][goodwillForMood]\n\n[commonDescEnding]\n\n[joinerEnding]
secretInfo->军事势力
secretInfo->不道德行为
secretInfo->武器研究
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml
index 11f7abb7..a07cc184 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml
@@ -39,6 +39,14 @@
穿梭机已损毁
被指派去装载[lodgersLabelSingOrPluralDef]的穿梭机已损毁。[lodgersLabelSingOrPluralDef]将尝试步行离开。[failLetterEndingCommon]
+
+ 任务完成
+
+ 你成功完成了任务'[resolvedQuestName]'！\n\n[asker_nameDef]说[asker_pronoun]乐意为高质量的住宿服务提供奖励。 [lodgersLabelSingOrPluralDef]在[theirHisHer]逗留期间内的平均心情为{AVERAGEMOOD}， 所以你与[asker_faction_name]的关系提升了{GOODWILL}
+
+ 任务完成
+
+ 你成功完成了任务'[resolvedQuestName]'！\n\n[asker_nameDef]本乐意为高质量的住宿服务提供奖励， 但[lodgersLabelSingOrPluralDef]在[theirHisHer]逗留期间内的平均心情只有{AVERAGEMOOD}。 你不会获得任何派系关系的奖励。
任务失败：[resolvedQuestName]
diff --git a/Royalty/DefInjected/RulePackDef/Script_Hospitality_TextCommon.xml b/Royalty/DefInjected/RulePackDef/Script_Hospitality_TextCommon.xml
index 681da13d..9b02cb86 100644
--- a/Royalty/DefInjected/RulePackDef/Script_Hospitality_TextCommon.xml
+++ b/Royalty/DefInjected/RulePackDef/Script_Hospitality_TextCommon.xml
@@ -7,21 +7,17 @@
lodgersLabelSingOrPlural(lodgersCount>=2)->[lodgersLabelPlural]
lodgersLabelSingOrPluralDef(lodgersCount==1)->[lodgers0_nameDef]
lodgersLabelSingOrPluralDef(lodgersCount>=2)->the [lodgersLabelPlural]
- lodgersLabelSingleOrWithAllies(lodgersCount==1)->[lodgers0_nameDef]
- lodgersLabelSingleOrWithAllies(lodgersCount>=2)->[lodgers0_nameDef] and [lodgers0_possessive] [allyAllies]
healthInfo->
- healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==false,lodgersCount==1,priority=1)->[lodgersLabelSingleOrWithAllies] is in a coma and must be kept in bed.
- healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==false,lodgersCount>=2,priority=1)->[lodgersLabelSingleOrWithAllies] are comatose and need to be kept in bed.
- healthInfo(lodgersHaveBloodRot==true,lodgersAreComatose==false,lodgersCount==1,priority=1)->[lodgersLabelSingleOrWithAllies] is sick with blood rot.
- healthInfo(lodgersHaveBloodRot==true,lodgersAreComatose==false,lodgersCount>=2,priority=1)->[lodgersLabelSingleOrWithAllies] are sick with blood rot.
- healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==true,lodgersCount==1,priority=1)->[lodgersLabelSingleOrWithAllies] is in a coma and must be kept in bed. [asker_possessive] is also sick with blood rot.
- healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==true,lodgersCount>=2,priority=1)->[lodgersLabelSingleOrWithAllies] are comatose and need to be kept in bed. They are also sick with blood rot.
+ healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==false,lodgersCount==1,priority=1)->\n\n[lodgersLabelSingOrPluralDef] is in a coma and must be kept in bed.
+ healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==false,lodgersCount>=2,priority=1)->\n\n[lodgersLabelSingOrPluralDef] are comatose and need to be kept in bed.
+ healthInfo(lodgersHaveBloodRot==true,lodgersAreComatose==false,lodgersCount==1,priority=1)->\n\n[lodgersLabelSingOrPluralDef] is sick with blood rot.
+ healthInfo(lodgersHaveBloodRot==true,lodgersAreComatose==false,lodgersCount>=2,priority=1)->\n\n[lodgersLabelSingOrPluralDef] are sick with blood rot.
+ healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==true,lodgersCount==1,priority=1)->\n\n[lodgersLabelSingOrPluralDef] is in a coma and must be kept in bed. [lodgersLabelSingOrPluralDef] is also sick with blood rot.
+ healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==true,lodgersCount>=2,priority=1)->\n\n[lodgersLabelSingOrPluralDef] are comatose and need to be kept in bed. They are also sick with blood rot.
minMoodInfo->
- minMoodInfo(lodgersCountWithMoodThreshold==1,priority=1)->\n\nyou must keep [lodgersWithMoodThreshold0_nameDef]'s mood above [lodgersMoodThreshold_percent].
- minMoodInfo(lodgersCountWithMoodThreshold==2,priority=1)->\n\nyou must keep [lodgersLabelSingleOrWithAllies]'s mood above [lodgersMoodThreshold_percent].
- minMoodInfo(lodgersCountWithMoodThreshold>2,priority=1)->\n\nyou must keep [lodgersLabelSingleOrWithAllies] moods above [lodgersMoodThreshold_percent].
+ minMoodInfo(lodgersCountWithMoodThreshold>0,priority=1)->\n\nyou must keep [lodgersLabelSingOrPluralDef]'s mood above [lodgersMoodThreshold_percent].
workInfo->
- workInfo(lodgersWillNotWork==true,priority=1)->\n\n[lodgersLabelSingleOrWithAllies] will not do any work.
+ workInfo(lodgersWillNotWork==true,priority=1)->\n\n[lodgersLabelSingOrPluralDef] will not do any work.
commonDescEnding->[helpersParagraph][shuttleWillComeParagraph]
enemyGroupsParagraph->[threatDescriptionParagraph]
threatDescriptionParagraph(threatType==Raids,threatCount==1,threatSize==1)->there will be a raid of roughly this size:\n\n[threatExample]
@@ -59,21 +55,17 @@
lodgersLabelSingOrPlural(lodgersCount>=2)->[lodgersLabelPlural]
lodgersLabelSingOrPluralDef(lodgersCount==1)->[lodgers0_nameDef]
lodgersLabelSingOrPluralDef(lodgersCount>=2)->[lodgersLabelPlural]
- lodgersLabelSingleOrWithAllies(lodgersCount==1)->[lodgers0_nameDef]
- lodgersLabelSingleOrWithAllies(lodgersCount>=2)->[lodgers0_nameDef] 与 [lodgers0_possessive] [allyAllies]
healthInfo->
- healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==false,lodgersCount==1,priority=1)->[lodgersLabelSingleOrWithAllies] 因为昏迷必须卧床。
- healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==false,lodgersCount>=2,priority=1)->[lodgersLabelSingleOrWithAllies] 因为昏迷必须卧床。
- healthInfo(lodgersHaveBloodRot==true,lodgersAreComatose==false,lodgersCount==1,priority=1)->[lodgersLabelSingleOrWithAllies] 因坏血病而虚弱不堪。
- healthInfo(lodgersHaveBloodRot==true,lodgersAreComatose==false,lodgersCount>=2,priority=1)->[lodgersLabelSingleOrWithAllies] 因坏血病而虚弱不堪。
- healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==true,lodgersCount==1,priority=1)->[lodgersLabelSingleOrWithAllies] 因为昏迷必须卧床。 [asker_possessive]同时也因为坏血病而虚弱不堪。
- healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==true,lodgersCount>=2,priority=1)->[lodgersLabelSingleOrWithAllies] 因为昏迷必须卧床。 他们同时也因为坏血病而虚弱不堪。
+ healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==false,lodgersCount==1,priority=1)->[lodgersLabelSingOrPluralDef] 因为昏迷必须卧床。
+ healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==false,lodgersCount>=2,priority=1)->[lodgersLabelSingOrPluralDef] 因为昏迷必须卧床。
+ healthInfo(lodgersHaveBloodRot==true,lodgersAreComatose==false,lodgersCount==1,priority=1)->[lodgersLabelSingOrPluralDef] 因坏血病而虚弱不堪。
+ healthInfo(lodgersHaveBloodRot==true,lodgersAreComatose==false,lodgersCount>=2,priority=1)->[lodgersLabelSingOrPluralDef] 因坏血病而虚弱不堪。
+ healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==true,lodgersCount==1,priority=1)->[lodgersLabelSingOrPluralDef] 因为昏迷必须卧床。 [asker_possessive]同时也因为坏血病而虚弱不堪。
+ healthInfo(lodgersAreComatose==true,lodgersHaveBloodRot==true,lodgersCount>=2,priority=1)->[lodgersLabelSingOrPluralDef] 因为昏迷必须卧床。 他们同时也因为坏血病而虚弱不堪。
minMoodInfo->
- minMoodInfo(lodgersCountWithMoodThreshold==1,priority=1)->\n\n你必须保持 [lodgersWithMoodThreshold0_nameDef] 的心情在 [lodgersMoodThreshold_percent] 以上。
- minMoodInfo(lodgersCountWithMoodThreshold==2,priority=1)->\n\n你必须保持 [lodgersLabelSingleOrWithAllies] 心情在 [lodgersMoodThreshold_percent]以上。
- minMoodInfo(lodgersCountWithMoodThreshold>2,priority=1)->\n\n你必须保持 [lodgersLabelSingleOrWithAllies] 心情在 [lodgersMoodThreshold_percent]以上。
+ minMoodInfo(lodgersCountWithMoodThreshold>0,priority=1)->\n\n你必须保持 [lodgersLabelSingOrPluralDef] 的心情在 [lodgersMoodThreshold_percent] 以上。
workInfo->
- workInfo(lodgersWillNotWork==true,priority=1)->\n\n[lodgersLabelSingleOrWithAllies] 不会做任何工作。
+ workInfo(lodgersWillNotWork==true,priority=1)->\n\n[lodgersLabelSingOrPluralDef] 不会做任何工作。
commonDescEnding->[helpersParagraph][shuttleWillComeParagraph]
enemyGroupsParagraph->[threatDescriptionParagraph]
threatDescriptionParagraph(threatType==Raids,threatCount==1,threatSize==1)->将会有一波大致与以下规模相当的袭击：\n\n[threatExample]
diff --git a/Royalty/Keyed/Alerts.xml b/Royalty/Keyed/Alerts.xml
index 298dd6fb..f451da53 100644
--- a/Royalty/Keyed/Alerts.xml
+++ b/Royalty/Keyed/Alerts.xml
@@ -45,13 +45,12 @@
一个飞船着陆信标通电但不可用。要想正常使用飞船着陆区，四个信标必须放置在至少9x9区域的角落，并且整个区域内必须没有任何障碍物，包括建筑、人类、动物等。
-
- 低精神力
-
- 这些殖民者的精神力过低，限制了他们使用心灵能力。为了获得精神力，他们需要进行冥想。\n\n{0}\n\n请放置一个「冥想点」并确保它可用。可以通过「管制」选项卡来为冥想指定一个特定的时间。
-
需要冥想点
这些殖民者有精神力需求，但是没有任何他们可用的冥想点。\n\n{0}\n\n请放置一个「冥想点」并确保它可用。殖民者更喜欢附近有他们能使用的最佳聚焦物的冥想点。
+
+ 低精神力
+ 这些殖民者的精神力过低，限制了他们使用心灵能力。为了获得精神力，他们需要进行冥想。\n\n{0}\n\n请放置一个「冥想点」并确保它可用。可以通过「管制」选项卡来为冥想指定一个特定的时间。
+
\ No newline at end of file
diff --git a/Royalty/Keyed/GameplayCommands.xml b/Royalty/Keyed/GameplayCommands.xml
index fac0501e..4bac518b 100644
--- a/Royalty/Keyed/GameplayCommands.xml
+++ b/Royalty/Keyed/GameplayCommands.xml
@@ -27,14 +27,20 @@
剩余{0}天，费用为{1} {FACTION_royalFavorLabel}
-
- 心灵熵将超限。
+
+ 心灵熵将超限。解除心灵熵限制将可以继续使用能力。
+
+ {PSYCASTNAME}需要消耗{0}精神力，但是{CASTERNAME}只有{1}。
需要等级{0}的启灵神经。
能力使用者不省人事。
至少需要{0}的精神力。
+
+ E
+
+ P
diff --git a/Royalty/Keyed/Misc_Gameplay.xml b/Royalty/Keyed/Misc_Gameplay.xml
index 97ab9ab4..6d8a7e22 100644
--- a/Royalty/Keyed/Misc_Gameplay.xml
+++ b/Royalty/Keyed/Misc_Gameplay.xml
@@ -51,14 +51,16 @@
距离其他信标太近
-
- 冥想
{0}-{1}%
达到{0}级心灵能力水平。
精神力每天降低{0}。
+
+ 冥想专注力（{LASTUSER_labelShort}）
+
+ 专注力效果受影响