From d84b84d7e8d675fd3cbca71055475edd5a555476 Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Tue, 28 Apr 2020 09:42:23 +0800
Subject: [PATCH] update for 2617
---
Core/Backstories/Backstories.xml | 6 +-
.../DesignatorDropdownGroupDef.xml | 25 ++++++
.../ExpansionDef/ExpansionDefs.xml | 2 +-
.../ResearchProjects_3_Microelectronics.xml | 2 +-
.../ThingDef/Buildings_Security_Turrets.xml | 8 +-
Core/DefInjected/TipSetDef/Tips.xml | 2 +-
Core/Keyed/Designators.xml | 10 ++-
Core/Keyed/Dialog_StatsReports.xml | 2 +-
Core/Keyed/MainTabs.xml | 8 +-
Core/Keyed/Menus_Main.xml | 2 +-
Core/Keyed/Misc_Gameplay.xml | 2 +-
.../ConceptDef/Concepts_TriggeredModal.xml | 2 +-
.../Script_BuildMonument_Worker.xml | 4 +-
.../QuestScriptDef/Script_ChangeRoyalHeir.xml | 4 +-
.../Script_Hospitality_Root_Animals.xml | 76 +++++++++----------
.../Script_Hospitality_Root_Joiners.xml | 74 +++++++++---------
.../Script_Hospitality_Root_Prisoners.xml | 74 +++++++++---------
.../Script_Hospitality_Worker.xml | 4 +-
.../QuestScriptDef/Scripts_Decree.xml | 4 +-
.../QuestScriptDef/Scripts_ItemPodThreat.xml | 2 +-
.../Script_Hospitality_TextCommon.xml | 34 ++++-----
.../ThingDef/Buildings_Mech_Spawners.xml | 2 +-
Royalty/Keyed/Letters.xml | 2 +
23 files changed, 187 insertions(+), 164 deletions(-)
create mode 100644 Core/DefInjected/DesignatorDropdownGroupDef/DesignatorDropdownGroupDef.xml
diff --git a/Core/Backstories/Backstories.xml b/Core/Backstories/Backstories.xml
index ccefb2b2..e8a14b7b 100644
--- a/Core/Backstories/Backstories.xml
+++ b/Core/Backstories/Backstories.xml
@@ -3791,14 +3791,14 @@
[PAWN_nameDef]从年轻的时候就是一名雇佣兵,干着刀口舔血的事情。[PAWN_pronoun]身材高大,可怕,极具威胁性,让他人的内心充满恐惧,[PAWN_pronoun]想要干掉的任何目标都会变成尸体。
-
+
雇佣兵厨师
厨师
-
+
[PAWN_nameDef]跟随着家族传统也成为了一名雇佣兵。\n\n[PAWN_pronoun]是一个天生的神射手,但是[PAWN_possessive]热情却在完善一种新的食谱或拆解一些新奇的小玩意上。[PAWN_pronoun]在射击上的天赋比研发食谱好得多。
-
+
diff --git a/Core/DefInjected/DesignatorDropdownGroupDef/DesignatorDropdownGroupDef.xml b/Core/DefInjected/DesignatorDropdownGroupDef/DesignatorDropdownGroupDef.xml
new file mode 100644
index 00000000..a8207821
--- /dev/null
+++ b/Core/DefInjected/DesignatorDropdownGroupDef/DesignatorDropdownGroupDef.xml
@@ -0,0 +1,25 @@
+
+
+
+
+ 地毯
+
+
+ 精致地毯
+
+
+ 石板
+
+
+ 地砖
+
+
+ 精致地砖
+
+
+ 金属地砖
+
+
+ 落地灯
+
+
\ No newline at end of file
diff --git a/Core/DefInjected/ExpansionDef/ExpansionDefs.xml b/Core/DefInjected/ExpansionDef/ExpansionDefs.xml
index c61d8852..267d260d 100644
--- a/Core/DefInjected/ExpansionDef/ExpansionDefs.xml
+++ b/Core/DefInjected/ExpansionDef/ExpansionDefs.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/Core/DefInjected/ResearchProjectDef/ResearchProjects_3_Microelectronics.xml b/Core/DefInjected/ResearchProjectDef/ResearchProjects_3_Microelectronics.xml
index caecaa23..8625787e 100644
--- a/Core/DefInjected/ResearchProjectDef/ResearchProjects_3_Microelectronics.xml
+++ b/Core/DefInjected/ResearchProjectDef/ResearchProjects_3_Microelectronics.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/Core/DefInjected/ThingDef/Buildings_Security_Turrets.xml b/Core/DefInjected/ThingDef/Buildings_Security_Turrets.xml
index bdfd6ba8..7cf15002 100644
--- a/Core/DefInjected/ThingDef/Buildings_Security_Turrets.xml
+++ b/Core/DefInjected/ThingDef/Buildings_Security_Turrets.xml
@@ -1,4 +1,4 @@
-
+
@@ -69,11 +69,11 @@
铀弹加农炮塔
一种自动穿甲炮塔。所使用的超高密度铀弹可以在远距离轻易击穿各式装甲。需要消耗大量铀作为弹药。远距离精确度高,不擅长追踪近距离目标。受损严重时可能会爆炸。
-
+
铀弹
射击直到弹药打空
-
- 无法射击:需要补充弹药
+
+ 无法射击:没有弹药
\ No newline at end of file
diff --git a/Core/DefInjected/TipSetDef/Tips.xml b/Core/DefInjected/TipSetDef/Tips.xml
index 9dee0489..ca0abdd3 100644
--- a/Core/DefInjected/TipSetDef/Tips.xml
+++ b/Core/DefInjected/TipSetDef/Tips.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/Core/Keyed/Designators.xml b/Core/Keyed/Designators.xml
index f201972f..92c8ad63 100644
--- a/Core/Keyed/Designators.xml
+++ b/Core/Keyed/Designators.xml
@@ -1,4 +1,4 @@
-
+
@@ -214,8 +214,14 @@
互动区会与{1_labelShort}的互动区重叠。
互动区会与{1_labelShort}的互动区重叠。
-
+
+ 纪念碑不能放置在其他建筑之上。
+
纪念碑标记不能直接放置在任何建筑物附近。
+
+ 纪念碑无法放置在无法支撑结构的地形。
+
+ 纪念碑无法放置在永久障碍物之上。
diff --git a/Core/Keyed/Dialog_StatsReports.xml b/Core/Keyed/Dialog_StatsReports.xml
index f8834592..84e1f59c 100644
--- a/Core/Keyed/Dialog_StatsReports.xml
+++ b/Core/Keyed/Dialog_StatsReports.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/Core/Keyed/MainTabs.xml b/Core/Keyed/MainTabs.xml
index 08837e00..c14e1a42 100644
--- a/Core/Keyed/MainTabs.xml
+++ b/Core/Keyed/MainTabs.xml
@@ -1,4 +1,4 @@
-
+
@@ -258,8 +258,10 @@
满足头衔要求的空置卧室
一名拥有{0}头衔的殖民者。
-
- 选择奖励
+
+ 奖励偏好
+
+ 用以告诉其他派系你想要在将来获取何种类型的奖励。这不会影响到已经发布的任务。
接受{FACTION_royalFavorLabel}
diff --git a/Core/Keyed/Menus_Main.xml b/Core/Keyed/Menus_Main.xml
index cb796630..636bfbce 100644
--- a/Core/Keyed/Menus_Main.xml
+++ b/Core/Keyed/Menus_Main.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/Core/Keyed/Misc_Gameplay.xml b/Core/Keyed/Misc_Gameplay.xml
index 06f267dd..4bcaca67 100644
--- a/Core/Keyed/Misc_Gameplay.xml
+++ b/Core/Keyed/Misc_Gameplay.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/Royalty/DefInjected/ConceptDef/Concepts_TriggeredModal.xml b/Royalty/DefInjected/ConceptDef/Concepts_TriggeredModal.xml
index b5638f5a..003c5782 100644
--- a/Royalty/DefInjected/ConceptDef/Concepts_TriggeredModal.xml
+++ b/Royalty/DefInjected/ConceptDef/Concepts_TriggeredModal.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml
index caae1cf5..440e42f3 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml
@@ -1,4 +1,4 @@
-
+
@@ -11,8 +11,6 @@
你在完成纪念碑之后让它被破坏得太快了, 这冒犯了 [asker_nameDef]。\n\n你与 [asker_faction_name] 的关系下降了 [goodwillChangeIfMonumentDestroyed]。
不要破坏纪念碑{0}
-
- 不要破坏纪念碑{0}
保护纪念碑 {0}
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml b/Royalty/DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml
index 8c250160..904db295 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml
@@ -1,4 +1,4 @@
-
+
不要破坏纪念碑{0}
-
- 不要破坏纪念碑{0}
保护纪念碑{0}
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Animals.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Animals.xml
index 6e1e8f96..48d676cc 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Animals.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Animals.xml
@@ -15,39 +15,39 @@
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]
- threatsInfo1(generateThreats==true,allowedThreats==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,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleAnimal] [enemyGroupsParagraph]
- threatsInfo1(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersSingleAnimal] [enemyGroupsParagraph]
+ 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]
victim->child
victim->woman
victim->man
victim->[PersonJob]
- victim(generateThreats==true,allowedThreats==Raids)->friend of the [enemyFaction_leaderTitle] of [enemyFaction_name]
- threatsInfo2(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\nUnfortunately, these [lodgersLabelPlural] were recently implicated in the death of a [victim]. Now, [enemyFaction_pawnsPlural] from [enemyFaction_name] are hunting them for ritual revenge. If you accept the [lodgersLabelPlural], [enemyGroupsParagraph]
- threatsInfo2(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiAnimal] [enemyGroupsParagraph]
- threatsInfo2(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersMultiAnimal] [enemyGroupsParagraph]
+ victim(generateThreats==true,threatType==Raids)->friend of the [enemyFaction_leaderTitle] of [enemyFaction_name]
+ threatsInfo2(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\nUnfortunately, these [lodgersLabelPlural] were recently implicated in the death of a [victim]. Now, [enemyFaction_pawnsPlural] from [enemyFaction_name] are hunting them for ritual revenge. If you accept the [lodgersLabelPlural], [enemyGroupsParagraph]
+ 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]
- threatsInfo3(generateThreats==true,allowedThreats==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,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleAnimal] [enemyGroupsParagraph]
- threatsInfo3(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersSingleAnimal] [enemyGroupsParagraph]
+ 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]
- threatsInfo4(generateThreats==true,allowedThreats==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,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiAnimal] [enemyGroupsParagraph]
- threatsInfo4(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersMultiAnimal] [enemyGroupsParagraph]
+ 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]
- threatsInfo5(generateThreats==true,allowedThreats==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,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleAnimal] [enemyGroupsParagraph]
- threatsInfo5(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersSingleAnimal] [enemyGroupsParagraph]
+ 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]
- threatsInfo6(generateThreats==true,allowedThreats==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,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiAnimal] [enemyGroupsParagraph]
- threatsInfo6(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersMultiAnimal] [enemyGroupsParagraph]
+ 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]
threatsInfo6(generateThreats==false)->
letterSubject(priority=1)->{SUBJECT_definite} the [lodgersLabel]
-->
@@ -57,39 +57,39 @@
threatsInfoMechRaidsSingleAnimal->出于未知的原因, [lodgersLabel]已经被一个机械族巢穴盯上。
threatsInfoMechRaidsMultiAnimal->出于未知地原因, [lodgersLabelPlural]已经被一个机械族巢穴盯上。
questDescription(askerIsNull==true,lodgersCount==1)->一个动物保护组织希望你能够在[shuttleDelayTicks_duration]内 照顾位于[map_definite]名叫[lodgers0_nameDef]的[lodgersLabel]。[healthInfo][threatsInfo1]\n\n[commonDescEnding]
- threatsInfo1(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n激进的动物保护组织成员在[enemyFaction_name]举行的一场屠宰仪式上偷走了[lodgers0_nameDef]。 现在[enemyFaction_pawnsPlural]将会来寻仇。 如果你选择接纳[lodgers0_nameDef], [enemyGroupsParagraph]
- threatsInfo1(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleAnimal] [enemyGroupsParagraph]
- threatsInfo1(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersSingleAnimal] [enemyGroupsParagraph]
+ 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]
victim->孩子
victim->女性
victim->男性
victim->[PersonJob]
- victim(generateThreats==true,allowedThreats==Raids)->[enemyFaction_leaderTitle]在[enemyFaction_name]的朋友
- threatsInfo2(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n不幸的是, 这些[lodgersLabelPlural]与一名[victim]之死有所牵连。 现在,来自[enemyFaction_name]的[enemyFaction_pawnsPlural]将会狩猎他们进行复仇仪式。 如果你接纳[lodgersLabelPlural], [enemyGroupsParagraph]
- threatsInfo2(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiAnimal] [enemyGroupsParagraph]
- threatsInfo2(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersMultiAnimal] [enemyGroupsParagraph]
+ victim(generateThreats==true,threatType==Raids)->[enemyFaction_leaderTitle]在[enemyFaction_name]的朋友
+ threatsInfo2(generateThreats==true,threatType==Raids,enemyFaction!=Mechanoid)->\n\n不幸的是, 这些[lodgersLabelPlural]与一名[victim]之死有所牵连。 现在,来自[enemyFaction_name]的[enemyFaction_pawnsPlural]将会狩猎他们进行复仇仪式。 如果你接纳[lodgersLabelPlural], [enemyGroupsParagraph]
+ 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]
- threatsInfo3(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n来自 [enemyFaction_name] 的 [enemyFaction_pawnsPlural] 正试图通过残杀可怜的 [lodgers0_nameDef]来抓捕[asker_nameDef]。 如果你选择接纳[lodgers0_nameDef], [enemyGroupsParagraph]
- threatsInfo3(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleAnimal] [enemyGroupsParagraph]
- threatsInfo3(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersSingleAnimal] [enemyGroupsParagraph]
+ 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]
- threatsInfo4(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n这些 [lodgersLabelPlural] 对于 [asker_nameDef] 履行一项重要的贸易承诺是必须的。 为了引发冲突, [enemyFaction_name]正派出[enemyFaction_pawnsPlural]追击他们。 如果你选择接纳[lodgersLabelPlural], [enemyGroupsParagraph]
- threatsInfo4(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiAnimal] [enemyGroupsParagraph]
- threatsInfo4(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersMultiAnimal] [enemyGroupsParagraph]
+ 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]
- threatsInfo5(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n[lodgers0_nameDef] 是 [asker_nameDef] 承诺给孩子的结婚礼物。 为了阻止这场婚礼, [enemyFaction_name]正派出[enemyFaction_pawnsPlural]追踪[lodgers0_objective]。 如果你选择接纳[lodgers0_nameDef], [enemyGroupsParagraph]
- threatsInfo5(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleAnimal] [enemyGroupsParagraph]
- threatsInfo5(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersSingleAnimal] [enemyGroupsParagraph]
+ 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]
- threatsInfo6(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n不幸的是, [enemyFaction_name] 正在试图以狩猎 [lodgersLabelPlural] 的方式去伤害 [asker_nameDef]。 如果你选择接纳 [lodgersLabelPlural], [enemyGroupsParagraph]
- threatsInfo6(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiAnimal] [enemyGroupsParagraph]
- threatsInfo6(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersMultiAnimal] [enemyGroupsParagraph]
+ 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]
threatsInfo6(generateThreats==false)->
letterSubject(priority=1)->{SUBJECT_definite} [lodgersLabel]
diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
index 52e553a3..8c9fc5ba 100644
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.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]
- threatsInfo1(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleHuman][enemyGroupsParagraph]
- threatsInfo1(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersSingleHuman] [enemyGroupsParagraph]
+ 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]
- 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] [enemyGroupsParagraph]
+ 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]
- 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] [enemyGroupsParagraph]
+ 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]
- 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] [enemyGroupsParagraph]
+ 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]
- threatsInfo5(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n不幸的是, [asker_nameDef] 的政敌们和 [enemyFaction_name] 达成交易, 想要救出这个人并将所有的丑闻公之于众。 [enemyGroupsParagraph]
- threatsInfo5(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n不幸的是, [asker_nameDef] 的政敌们挑起了 [enemyFaction_name] 激活的机械族进攻, 想要救出这个人并将所有的丑闻公之于众。 [enemyGroupsParagraph]
- threatsInfo5(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersSingleHuman] [enemyGroupsParagraph]
+ 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]
- 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] [enemyGroupsParagraph]
+ 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]
threatsInfo6(generateThreats==false)->
@@ -31,8 +31,6 @@
访客失踪:{SUBJECT_definite}
指定由你保护的[letterSubject]不见了。[remainingWillNowLeave][failLetterEndingCommon]
-
- 访客失踪:{SUBJECT_definite}
指定由你保护的[letterSubject]已经加入了另一个派系。[remainingWillNowLeave][failLetterEndingCommon]
diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml
index 2e90fb58..631ac6e0 100644
--- a/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Scripts_Decree.xml
@@ -1,4 +1,4 @@
-
+
不要破坏纪念碑{0}
-
- 不要破坏纪念碑{0}
保护纪念碑{0}
diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_ItemPodThreat.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_ItemPodThreat.xml
index 45b53176..fbc45829 100644
--- a/Royalty/DefInjected/QuestScriptDef/Scripts_ItemPodThreat.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Scripts_ItemPodThreat.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/Royalty/Keyed/Letters.xml b/Royalty/Keyed/Letters.xml
index 46d298c8..9c44b9c8 100644
--- a/Royalty/Keyed/Letters.xml
+++ b/Royalty/Keyed/Letters.xml
@@ -78,6 +78,8 @@
继承者死了
{HEIR_nameFull}死亡,{HOLDER_labelShort}没有继承自{FACTION_name}的头衔。你可以通过通讯台与{FACTION_name}联系,以指定新的继承人。
+
+ 头衔{TITLE}无法被继承。
头衔继承