From 2b42a09e29871eae750068a6abb5a110f692194b Mon Sep 17 00:00:00 2001 From: VaniatD <188733149@qq.com> Date: Wed, 18 Mar 2020 09:26:42 +0800 Subject: [PATCH] update to 2576 --- Core/DefInjected/ExpansionDef/ExpansionDefs.xml | 2 +- Core/DefInjected/StatDef/Stats_Abilities.xml | 2 +- Core/DefInjected/ThingDef/Mote_Visual.xml | 5 ++++- Core/Keyed/Dialogs_Various.xml | 4 +++- Core/Keyed/MainTabs.xml | 2 +- Core/Keyed/Menus_Main.xml | 4 +++- Core/Keyed/Messages.xml | 2 +- .../QuestScriptDef/Script_Hospitality_Worker.xml | 4 +++- Royalty/DefInjected/QuestScriptDef/Script_Intro_Wimp.xml | 2 +- .../DefInjected/QuestScriptDef/Scripts_JoinerThreat.xml | 6 +++++- .../ThingDef/Hediffs_BodyParts_Archotech_EmpireRoyal.xml | 2 +- Royalty/DefInjected/ThoughtDef/Thoughts_RoyalTitles.xml | 2 +- Royalty/DefInjected/TipSetDef/Tips.xml | 2 +- Royalty/Keyed/Alerts.xml | 2 +- Royalty/Keyed/Designators.xml | 7 +++++++ Royalty/Keyed/GameplayCommands.xml | 2 +- Royalty/Keyed/ITabs.xml | 6 +++--- Royalty/Keyed/Letters.xml | 5 ++++- Royalty/Keyed/Misc_Gameplay.xml | 2 +- 19 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 Royalty/Keyed/Designators.xml diff --git a/Core/DefInjected/ExpansionDef/ExpansionDefs.xml b/Core/DefInjected/ExpansionDef/ExpansionDefs.xml index 5a7a7f85..2faae18a 100644 --- a/Core/DefInjected/ExpansionDef/ExpansionDefs.xml +++ b/Core/DefInjected/ExpansionDef/ExpansionDefs.xml @@ -1,4 +1,4 @@ - + diff --git a/Core/DefInjected/StatDef/Stats_Abilities.xml b/Core/DefInjected/StatDef/Stats_Abilities.xml index 795fd337..d07e2d6e 100644 --- a/Core/DefInjected/StatDef/Stats_Abilities.xml +++ b/Core/DefInjected/StatDef/Stats_Abilities.xml @@ -1,4 +1,4 @@ - + diff --git a/Core/DefInjected/ThingDef/Mote_Visual.xml b/Core/DefInjected/ThingDef/Mote_Visual.xml index a692d421..5b4a1981 100644 --- a/Core/DefInjected/ThingDef/Mote_Visual.xml +++ b/Core/DefInjected/ThingDef/Mote_Visual.xml @@ -1,4 +1,4 @@ - + @@ -85,6 +85,9 @@ 尘埃 + + EMP + 尘埃 diff --git a/Core/Keyed/Dialogs_Various.xml b/Core/Keyed/Dialogs_Various.xml index d7d6e48f..6d04a138 100644 --- a/Core/Keyed/Dialogs_Various.xml +++ b/Core/Keyed/Dialogs_Various.xml @@ -1,4 +1,4 @@ - + @@ -530,6 +530,8 @@ 礼物模式 - 向{0}馈赠礼物。 回到交易模式。 + + {FACTION_name}拒绝派遣远征队，{NEGOTIATOR_nameDef}没有合法的头衔（至少是{TITLE}）。text_todo diff --git a/Core/Keyed/MainTabs.xml b/Core/Keyed/MainTabs.xml index a91779d3..d8043cb7 100644 --- a/Core/Keyed/MainTabs.xml +++ b/Core/Keyed/MainTabs.xml @@ -237,7 +237,7 @@ 接受任务 - 接受{0_labelShort} + {0_labelShort}承接 请求已过期 diff --git a/Core/Keyed/Menus_Main.xml b/Core/Keyed/Menus_Main.xml index a1468130..53caa3fb 100644 --- a/Core/Keyed/Menus_Main.xml +++ b/Core/Keyed/Menus_Main.xml @@ -1,4 +1,4 @@ - + @@ -436,6 +436,8 @@ 继续 返回 + + 显示材料 游戏性 diff --git a/Core/Keyed/Messages.xml b/Core/Keyed/Messages.xml index f5358fb6..2fd0802d 100644 --- a/Core/Keyed/Messages.xml +++ b/Core/Keyed/Messages.xml @@ -1,4 +1,4 @@ - + diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml index a13674d9..2a5b40c4 100644 --- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml +++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml @@ -1,4 +1,4 @@ - + @@ -31,6 +31,8 @@ 访客失踪：{SUBJECT_definite} 指定由你保护的[letterSubject]不见了。[remainingWillNowLeave][failLetterEndingCommon] + + 访客失踪：{SUBJECT_definite} 指定由你保护的[letterSubject]已经加入了另一个派系。[remainingWillNowLeave][failLetterEndingCommon] diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Intro_Wimp.xml b/Royalty/DefInjected/QuestScriptDef/Script_Intro_Wimp.xml index cdc94b53..7a1b933e 100644 --- a/Royalty/DefInjected/QuestScriptDef/Script_Intro_Wimp.xml +++ b/Royalty/DefInjected/QuestScriptDef/Script_Intro_Wimp.xml @@ -1,4 +1,4 @@ - + [joiner_nameDef]已经向我们承认[joiner_pronoun]是逃出来的。\n \n[joiner_nameDef]当时正在在旅行，[joiner_pronoun]发现[enemyFaction_name]的首领[enemyFaction_leader_nameFull]病倒在路边。[joiner_nameDef]辱骂[enemyFaction_leader_nameDef]并将 [enemyFaction_leader_objective]比作一只[Animal]。\n \n如今，[enemyFaction_leader_nameDef]的[enemyFaction_pawnsPlural]在附近建立了一个据点对你进行袭扰。\n \n[allSitePartsDescriptions] + + {BASELABEL}: 追捕[joiner_nameDef] [joiner_nameDef]已经向我们承认[joiner_pronoun]是逃出来的。\n \n[joiner_nameDef]当时正在在旅行，[joiner_pronoun]遇到了一群[animalKind_labelPlural]。[joiner_pronoun]当时心情很糟，做了一些不理智的行为激怒了[animalKind_labelPlural]。没想到，它们开始攻击[joiner_objective]，并且一路追杀[joiner_objective]。\n \n{BASETEXT} @@ -161,6 +163,8 @@ {BASELABEL}追逐[../joiner_nameDef] {BASETEXT}\n \n[enemyFaction_pawnsPlural] 是为[../joiner_nameFull]而来。 + + TODO {BASETEXT}\n \n[enemyFaction_pawnsPlural]是为[../joiner_nameFull]而来。 diff --git a/Royalty/DefInjected/ThingDef/Hediffs_BodyParts_Archotech_EmpireRoyal.xml b/Royalty/DefInjected/ThingDef/Hediffs_BodyParts_Archotech_EmpireRoyal.xml index 738c5592..f1c2ac5d 100644 --- a/Royalty/DefInjected/ThingDef/Hediffs_BodyParts_Archotech_EmpireRoyal.xml +++ b/Royalty/DefInjected/ThingDef/Hediffs_BodyParts_Archotech_EmpireRoyal.xml @@ -1,4 +1,4 @@ - + diff --git a/Royalty/DefInjected/ThoughtDef/Thoughts_RoyalTitles.xml b/Royalty/DefInjected/ThoughtDef/Thoughts_RoyalTitles.xml index f08183f6..3662b663 100644 --- a/Royalty/DefInjected/ThoughtDef/Thoughts_RoyalTitles.xml +++ b/Royalty/DefInjected/ThoughtDef/Thoughts_RoyalTitles.xml @@ -1,4 +1,4 @@ - + diff --git a/Royalty/DefInjected/TipSetDef/Tips.xml b/Royalty/DefInjected/TipSetDef/Tips.xml index 8e33bab4..fde2247d 100644 --- a/Royalty/DefInjected/TipSetDef/Tips.xml +++ b/Royalty/DefInjected/TipSetDef/Tips.xml @@ -1,4 +1,4 @@ - + diff --git a/Royalty/Keyed/Alerts.xml b/Royalty/Keyed/Alerts.xml index d9380e15..823a2736 100644 --- a/Royalty/Keyed/Alerts.xml +++ b/Royalty/Keyed/Alerts.xml @@ -1,4 +1,4 @@ - + diff --git a/Royalty/Keyed/Designators.xml b/Royalty/Keyed/Designators.xml new file mode 100644 index 00000000..d631b047 --- /dev/null +++ b/Royalty/Keyed/Designators.xml @@ -0,0 +1,7 @@ + + + + + 蓝图将与纪念碑标记冲突。 + + \ No newline at end of file diff --git a/Royalty/Keyed/GameplayCommands.xml b/Royalty/Keyed/GameplayCommands.xml index f2bcccb7..fd4436be 100644 --- a/Royalty/Keyed/GameplayCommands.xml +++ b/Royalty/Keyed/GameplayCommands.xml @@ -1,4 +1,4 @@ - + diff --git a/Royalty/Keyed/ITabs.xml b/Royalty/Keyed/ITabs.xml index d4b649f0..ee5d8c72 100644 --- a/Royalty/Keyed/ITabs.xml +++ b/Royalty/Keyed/ITabs.xml @@ -1,13 +1,13 @@ - + {PAWN_labelShort}当前具有头衔{TITLE}，由{FACTION_name}授予。 - {PAWN_labelShort}将要求对此头衔的特权完全遵守。text_todo + {PAWN_labelShort}将索求此头衔的所有特权。text_todo - {PAWN_labelShort}对这个头衔的特权要求比较变通。text_todo + {PAWN_labelShort}对此头衔的某些特权不太在意。text_todo 下一个头衔 diff --git a/Royalty/Keyed/Letters.xml b/Royalty/Keyed/Letters.xml index b3138b77..6c823109 100644 --- a/Royalty/Keyed/Letters.xml +++ b/Royalty/Keyed/Letters.xml @@ -1,4 +1,4 @@ - + @@ -13,6 +13,9 @@ {PAWN_pronoun}希望穿着适合{PAWN_possessive}头衔的服装: {PAWN_possessive}期望值永远不会低于“{1}”。 + + + {PAWN_labelShort}将索求此头衔的所有特权（由于{1}）。{PAWN_pronoun}可能会拒绝进行某些工作，不吃低品质的食物并且会颁布法令。text_todo {PAWN_labelShort}从{FACTION_name}获得了{TITLE}的头衔！ diff --git a/Royalty/Keyed/Misc_Gameplay.xml b/Royalty/Keyed/Misc_Gameplay.xml index 991bddd5..2be62c30 100644 --- a/Royalty/Keyed/Misc_Gameplay.xml +++ b/Royalty/Keyed/Misc_Gameplay.xml @@ -1,4 +1,4 @@ - +