From 3b934eb624cf37f49a78bb4af67ddc734b4397b9 Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Fri, 16 Jul 2021 07:36:35 +0800
Subject: [PATCH] update 3061

---
 Core/DefInjected/ThingDef/Apparel_Headgear.xml             | 4 ++--
 Core/DefInjected/ThingDef/Apparel_Various.xml              | 4 ++--
 Core/Keyed/Messages.xml                                    | 6 ++++++
 Royalty/DefInjected/RitualBehaviorDef/Ritual_Behaviors.xml | 4 +++-
 Royalty/Keyed/GameplayCommands.xml                         | 7 ++++++-
 Royalty/Keyed/Messages.xml                                 | 2 ++
 Royalty/Keyed/Misc_Gameplay.xml                            | 4 ++--
 7 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Core/DefInjected/ThingDef/Apparel_Headgear.xml b/Core/DefInjected/ThingDef/Apparel_Headgear.xml
index 34e50ea1..f8cccb59 100644
--- a/Core/DefInjected/ThingDef/Apparel_Headgear.xml
+++ b/Core/DefInjected/ThingDef/Apparel_Headgear.xml
@@ -28,8 +28,8 @@
   
   <!-- EN: marine helmet -->
   <Apparel_PowerArmorHelmet.label>海军头盔</Apparel_PowerArmorHelmet.label>
-  <!-- EN: A marine armor helmet, with a built-in status computer and layered plasteel-weave plates.\n\nArmor like this is often used by imperial janissaries and rapid-incursion space marines. -->
-  <Apparel_PowerArmorHelmet.description>一个海军装甲配套的头盔，内置了状态检测计算机并且覆盖了玻璃钢装甲，提供完整的头部防护。\n\n这样的装甲通常由来自太空时代军队的重甲士兵和空间海军突击队员使用。</Apparel_PowerArmorHelmet.description>
+  <!-- EN: A marine armor helmet, with a built-in status computer and layered plasteel-weave plates.\n\nArmor like this is often used by rapid-incursion space marines. -->
+  <Apparel_PowerArmorHelmet.description>一个海军装甲配套的头盔，内置了状态检测计算机并且覆盖了玻璃钢装甲，提供完整的头部防护。\n\n这样的装甲通常由太空海军突击队员使用。</Apparel_PowerArmorHelmet.description>
   
   <!-- EN: psychic foil helmet -->
   <Apparel_PsychicFoilHelmet.label>心灵防护头盔</Apparel_PsychicFoilHelmet.label>
diff --git a/Core/DefInjected/ThingDef/Apparel_Various.xml b/Core/DefInjected/ThingDef/Apparel_Various.xml
index aec744f9..9830c5f2 100644
--- a/Core/DefInjected/ThingDef/Apparel_Various.xml
+++ b/Core/DefInjected/ThingDef/Apparel_Various.xml
@@ -58,8 +58,8 @@
   
   <!-- EN: marine armor -->
   <Apparel_PowerArmor.label>海军装甲</Apparel_PowerArmor.label>
-  <!-- EN: A suit of powered armor. Layered plasteel-weave plates are very effective at stopping attacks, with few vulnerable joint sections. Neuro-memetic assistors allow a human to wear the armor and still move easily.\n\nArmor like this is often used by imperial janissaries and rapid-incursion space marines. -->
-  <Apparel_PowerArmor.description>一套强调机动性的动力装甲。从颈部到脚部都覆盖玻璃钢纤维编制的装甲片，能够十分有效地防御攻击。神经模因机械让人在穿着重型装甲时仍然能够轻松行动。\n\n这样的装甲通常由来自太空时代军队的重甲士兵和空间海军突击队员使用。</Apparel_PowerArmor.description>
+  <!-- EN: A suit of powered armor. Layered plasteel-weave plates are very effective at stopping attacks, with few vulnerable joint sections. Neuro-memetic assistors allow a human to wear the armor and still move easily.\n\nArmor like this is often used by rapid-incursion space marines. -->
+  <Apparel_PowerArmor.description>一套强调机动性的动力装甲。从颈部到脚部都覆盖玻璃钢纤维编制的装甲片，能够十分有效地防御攻击。神经模因机械让人在穿着重型装甲时仍然能够轻松行动。\n\n这样的装甲通常由太空海军突击队员使用。</Apparel_PowerArmor.description>
   
   <!-- EN: tribalwear -->
   <Apparel_TribalA.label>部落装</Apparel_TribalA.label>
diff --git a/Core/Keyed/Messages.xml b/Core/Keyed/Messages.xml
index b5e3a1e0..4d27be3f 100644
--- a/Core/Keyed/Messages.xml
+++ b/Core/Keyed/Messages.xml
@@ -687,6 +687,12 @@
   <MessageRitualRoleMustBePrisonerOrSlave>{0}必须是囚犯或者奴隶。</MessageRitualRoleMustBePrisonerOrSlave>
   <!-- EN: {0_labelShort} must be capable of fighting. -->
   <MessageRitualRoleMustBeCapableOfFighting>{0_labelShort}必须具有暴力能力。</MessageRitualRoleMustBeCapableOfFighting>
+  <!-- EN: this role cannot be played by someone else. -->
+  <MessageRitualRoleCannotReplaceRequiredPawn>此角色不能选择其他人。</MessageRitualRoleCannotReplaceRequiredPawn>
+  <!-- EN: {0_labelShort} cannot link with an anima tree because {0_possessive} link was recently torn. -->
+  <MessageRitualRolePawnNotConnectable>{0_labelShort}与仙树的共鸣最近被打断，当前无法与仙树共鸣。</MessageRitualRolePawnNotConnectable>
+  <!-- EN: {0_labelShort} has the same ideoligion as the converter. -->
+  <MessageRitualRolePawnHasSameIdeo>{0_labelShort}具有相同的文化特质。</MessageRitualRolePawnHasSameIdeo>
   <!-- EN: {0_labelShort} must be capable of wardening. -->
   <MessageRitualRoleMustBeCapableOfWardening>{0_labelShort}必须具有监护能力。</MessageRitualRoleMustBeCapableOfWardening>
   <!-- EN: {0} must be capable of {1}. -->
diff --git a/Royalty/DefInjected/RitualBehaviorDef/Ritual_Behaviors.xml b/Royalty/DefInjected/RitualBehaviorDef/Ritual_Behaviors.xml
index 45fdd586..7d348e35 100644
--- a/Royalty/DefInjected/RitualBehaviorDef/Ritual_Behaviors.xml
+++ b/Royalty/DefInjected/RitualBehaviorDef/Ritual_Behaviors.xml
@@ -3,7 +3,9 @@
   
   <!-- EN: linker -->
   <AnimaTreeLinking.roles.0.label>共鸣者</AnimaTreeLinking.roles.0.label>
-  <!-- EN: Must be capable of nature focus. -->
+  <!-- EN: Need a colonist with the natural meditation focus type who is below maximum psylink level. -->
+  <AnimaTreeLinking.roles.0.noCandidatesGizmoDesc>必须有一名启灵等级未达到最大值，并且冥想媒介类型包含自然类的殖民者。</AnimaTreeLinking.roles.0.noCandidatesGizmoDesc>
+  <!-- EN: Must have natural focus type. -->
   <AnimaTreeLinking.spectatorFilter.description>必须有能力关注自然。</AnimaTreeLinking.spectatorFilter.description>
   <!-- EN: participate -->
   <AnimaTreeLinking.spectatorGerund>参与者</AnimaTreeLinking.spectatorGerund>
diff --git a/Royalty/Keyed/GameplayCommands.xml b/Royalty/Keyed/GameplayCommands.xml
index ae5ea6a2..a69851c2 100644
--- a/Royalty/Keyed/GameplayCommands.xml
+++ b/Royalty/Keyed/GameplayCommands.xml
@@ -84,5 +84,10 @@
   <CommandLeaveBestowingCeremony>离开授勋仪式</CommandLeaveBestowingCeremony>
   <!-- EN: Stop participating in the bestowing ceremony. -->
   <CommandLeaveBestowingCeremonyDesc>停止参加授勋仪式。</CommandLeaveBestowingCeremonyDesc>
-  
+  <!-- EN: Cancel bestowing ceremony -->
+  <CommandCancelBestowingCeremony>取消授勋仪式。</CommandCancelBestowingCeremony>
+  <!-- EN: End the bestowing ceremony immediately. The bestower will leave, but another opportunity to perform the ceremony will arise soon. -->
+  <CommandCancelBestowingCeremonyDesc>直接取消授勋仪式。布施者会离开，但是很快就会有另一次举行授勋仪式的机会。</CommandCancelBestowingCeremonyDesc>
+  <!-- EN: Are you sure you want to cancel bestowing ceremony? -->
+  <CommandCancelBestowingCeremonyConfirm>你想要取消授勋仪式吗？</CommandCancelBestowingCeremonyConfirm>
 </LanguageData>
\ No newline at end of file
diff --git a/Royalty/Keyed/Messages.xml b/Royalty/Keyed/Messages.xml
index 7721e9e9..8415ab71 100644
--- a/Royalty/Keyed/Messages.xml
+++ b/Royalty/Keyed/Messages.xml
@@ -23,6 +23,8 @@
   <MessageBestowerWaiting>选择{BESTOWER_definite}并点击「开始授勋仪式」来开始一场仪式。</MessageBestowerWaiting>
   <!-- EN: Cannot reach bestower! -->
   <MessageBestowerUnreachable>无法接触布施者！</MessageBestowerUnreachable>
+  <!-- EN: {0} is busy. -->
+  <MessageBestowingTargetIsBusy>{0}正忙。</MessageBestowingTargetIsBusy>
   <!-- EN: The bestower is annoyed with the interference and has decided to leave. -->
   <MessageBestowingSpotUnreachable>布施者对这种干扰很恼火并决定离开了。</MessageBestowingSpotUnreachable>
   <!-- EN: The bestower is leaving due to life-threatening danger. -->
diff --git a/Royalty/Keyed/Misc_Gameplay.xml b/Royalty/Keyed/Misc_Gameplay.xml
index a9e647d1..8262ffa4 100644
--- a/Royalty/Keyed/Misc_Gameplay.xml
+++ b/Royalty/Keyed/Misc_Gameplay.xml
@@ -167,13 +167,13 @@
   
   <!-- EN: No colonists that can link with anima tree right now. -->
   <RitualTargetAnimaTreeNoPawnsToLink>当前没有能与仙树共鸣的殖民者。</RitualTargetAnimaTreeNoPawnsToLink>
-  <!-- EN: No colonists that can use the natural psyfocus type. -->
+  <!-- EN: No colonists with the natural meditation focus type. -->
   <RitualTargetAnimaTreeNoPawnsWithNatureFocus>当前没有自然冥想者。</RitualTargetAnimaTreeNoPawnsWithNatureFocus>
   <!-- EN: Need at least {0} anima grass. -->
   <RitualTargetAnimaTreeNotEnoughAnimaGrass>需要至少{0}x灵草。</RitualTargetAnimaTreeNotEnoughAnimaGrass>
   <!-- EN: An anima tree. -->
   <RitualTargetAnimaTreeInfo>一棵仙树。</RitualTargetAnimaTreeInfo>
-  <!-- EN: Must be a colonist with the natural psyfocus type who is below maximum psylink level. -->
+  <!-- EN: Must be a colonist with the natural meditation focus type who is below maximum psylink level. -->
   <RitualTargetAnimaTreeMustBeCapableOfNature>必须是一名启灵等级低于最大值，并且具有自然冥想属性的殖民者。</RitualTargetAnimaTreeMustBeCapableOfNature>
 
   <!-- EN: The anima linking ceremony is more powerful with more participants. The more people participate, the less time the ceremony takes, and the more anima grass will grow.\n\nWith {0} additional participants, {1} anima grass will be restored at the end of the ceremony. -->