diff --git a/Core/Backstories/Backstories.xml b/Core/Backstories/Backstories.xml index 9979a8e4..0ac2c89f 100644 --- a/Core/Backstories/Backstories.xml +++ b/Core/Backstories/Backstories.xml @@ -1,4 +1,4 @@ - + @@ -6104,14 +6104,14 @@ [PAWN_nameDef]为了消遣,学习了化学和量子力学。\n\n[PAWN_pronoun]很擅长说服别人去做[PAWN_pronoun]应该做的工作,躲避体力劳动是[PAWN_pronoun]这辈子的目标。 - + 实习工程师 工程师 - - 作为一个极有天分的孩子,[PAWN_nameDef]被选入一个特殊的培训计划,培训内容涵盖太空作战和工程学。\n\n有一天,[PAWN_pronoun]尝试为一只松鼠带上项圈,希望成为它的朋友。但是却被松鼠咬了一口,这为[PAWN_nameDef]赢得了"松鼠小子"的绰号。\n\n这使[PAWN_pronoun]相信涉及手工劳动的工作是不适合自己的。 - + + 作为一个极有天分的孩子,[PAWN_nameDef]被选入一个特殊的培训计划,培训内容涵盖太空作战和工程学。\n\n有一天,[PAWN_pronoun]尝试为一只松鼠带上项圈,希望成为它的朋友。但是却被松鼠咬了一口,这为[PAWN_nameDef]赢得了"松鼠{PAWN_gender ? Boy : Girl}"的绰号。\n\n这使[PAWN_pronoun]相信涉及手工劳动的工作是不适合自己的。 + diff --git a/Core/DefInjected/QuestScriptDef/Scripts_Utility_RewardsCore.xml b/Core/DefInjected/QuestScriptDef/Scripts_Utility_RewardsCore.xml index 242c27ba..3e35a859 100644 --- a/Core/DefInjected/QuestScriptDef/Scripts_Utility_RewardsCore.xml +++ b/Core/DefInjected/QuestScriptDef/Scripts_Utility_RewardsCore.xml @@ -1,4 +1,4 @@ - +
  • r_logentry->[action],[result]。
  • +
  • r_logentry(priority=-10)->[action]。
  • implement(IMPLEMENTOWNER_type==weapon,p=2)->[INITIATOR_possessive][WEAPON_label]的[TOOL_label]
  • implement(IMPLEMENTOWNER_type==weapon,p=1)->[INITIATOR_possessive][WEAPON_label]
  • implement(IMPLEMENTOWNER_type==weapon,p=1)->[WEAPON_label]的[TOOL_label]
  • diff --git a/Core/DefInjected/RulePackDef/RulePacks_CombatRanged.xml b/Core/DefInjected/RulePackDef/RulePacks_CombatRanged.xml index 5eb0e1ed..b77800ed 100644 --- a/Core/DefInjected/RulePackDef/RulePacks_CombatRanged.xml +++ b/Core/DefInjected/RulePackDef/RulePacks_CombatRanged.xml @@ -1,4 +1,4 @@ - +
  • r_name->[WordTribal][political_union_tribal]
  • -
  • r_name->[tribalworld][political_union_tribal]
  • +
  • r_name->[WordTribal][political_union_tribal]
  • r_name->[Color]色[TerrainFeature][political_union_tribal]
  • r_name->[WordTribal][political_union_tribal]
  • r_name->[Color]色[Animal][WordTribal]
  • diff --git a/Core/DefInjected/StatDef/Stats_Basics_General.xml b/Core/DefInjected/StatDef/Stats_Basics_General.xml index bd9e60ed..99a44903 100644 --- a/Core/DefInjected/StatDef/Stats_Basics_General.xml +++ b/Core/DefInjected/StatDef/Stats_Basics_General.xml @@ -1,4 +1,4 @@ - + diff --git a/Core/DefInjected/StatDef/Stats_Pawns_Combat.xml b/Core/DefInjected/StatDef/Stats_Pawns_Combat.xml index 9ca50420..180d5fa5 100644 --- a/Core/DefInjected/StatDef/Stats_Pawns_Combat.xml +++ b/Core/DefInjected/StatDef/Stats_Pawns_Combat.xml @@ -1,4 +1,4 @@ - + diff --git a/Core/DefInjected/ThingDef/Buildings_Production.xml b/Core/DefInjected/ThingDef/Buildings_Production.xml index 39eaa799..8dc06341 100644 --- a/Core/DefInjected/ThingDef/Buildings_Production.xml +++ b/Core/DefInjected/ThingDef/Buildings_Production.xml @@ -1,4 +1,4 @@ - + diff --git a/Core/DefInjected/ThingDef/ImpliedDefs.xml b/Core/DefInjected/ThingDef/ImpliedDefs.xml index c2edbc47..b39505fe 100644 --- a/Core/DefInjected/ThingDef/ImpliedDefs.xml +++ b/Core/DefInjected/ThingDef/ImpliedDefs.xml @@ -1,4 +1,4 @@ - + diff --git a/Core/Keyed/Dialogs_Various.xml b/Core/Keyed/Dialogs_Various.xml index 84de7b80..6f8b7105 100644 --- a/Core/Keyed/Dialogs_Various.xml +++ b/Core/Keyed/Dialogs_Various.xml @@ -1,4 +1,4 @@ - + diff --git a/Core/Keyed/ITabs.xml b/Core/Keyed/ITabs.xml index b3414282..87187a57 100644 --- a/Core/Keyed/ITabs.xml +++ b/Core/Keyed/ITabs.xml @@ -1,4 +1,4 @@ - + @@ -323,5 +323,7 @@ 取消关闭此任务。\n\n该任务将返回到「可接受」或「进行中」标签,通知将重新启用。 该任务已被取消。\n\n你可以在该任务到期之前随时撤销取消的操作。 + + 删除并将其永久从任务列表移除。text_todo \ No newline at end of file diff --git a/Core/Keyed/Messages.xml b/Core/Keyed/Messages.xml index 05590031..2335486e 100644 --- a/Core/Keyed/Messages.xml +++ b/Core/Keyed/Messages.xml @@ -502,11 +502,11 @@ 出售{0_labelShort} - 安乐死 {PAWN_labelShort} + {PAWN_labelShort}被安乐死 - TODO + 请求军事支援 - TODO + 请求贸易商队 {0}接受了你的礼物,但并无谢意。 diff --git a/Core/Keyed/Misc_Gameplay.xml b/Core/Keyed/Misc_Gameplay.xml index 3dfe8010..462a0631 100644 --- a/Core/Keyed/Misc_Gameplay.xml +++ b/Core/Keyed/Misc_Gameplay.xml @@ -1,4 +1,4 @@ - + @@ -1218,8 +1218,8 @@ {0}\n{1} 心灵熵:{0}/{1}\n下降速率:{2}/{3}秒({4}秒归零)\n\n使用心灵能力后心灵熵增加。\n超出安全限制会导致后遗症。\n每当熵归零都会产生精神宿醉。 - - 身体上的痛苦使思想集中并清除了无关的想法;同时能够更快恢复心灵熵。 + + 痛苦使思想集中;同时能够更快恢复心灵熵。\n\n疼痛等级:{0}\n心灵熵恢复倍率:{1} 切换心灵熵限制器。\n\n心灵熵超限制可能会导致严重的健康后果,包括长期的心理崩溃,甚至会因严重超量而损害大脑。熵的极限值越高,超限的后果越严重。 diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml index 2a5b40c4..a13674d9 100644 --- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml +++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Worker.xml @@ -1,4 +1,4 @@ - + @@ -31,8 +31,6 @@ 访客失踪:{SUBJECT_definite} 指定由你保护的[letterSubject]不见了。[remainingWillNowLeave][failLetterEndingCommon] - - 访客失踪:{SUBJECT_definite} 指定由你保护的[letterSubject]已经加入了另一个派系。[remainingWillNowLeave][failLetterEndingCommon] diff --git a/Royalty/DefInjected/QuestScriptDef/Scripts_JoinerThreat.xml b/Royalty/DefInjected/QuestScriptDef/Scripts_JoinerThreat.xml index e8b62cdf..779fedf1 100644 --- a/Royalty/DefInjected/QuestScriptDef/Scripts_JoinerThreat.xml +++ b/Royalty/DefInjected/QuestScriptDef/Scripts_JoinerThreat.xml @@ -1,4 +1,4 @@ - + + 拆除心灵增幅装置 - + 拆除心灵增幅装置。 - + 正在拆除心灵增幅装置。 diff --git a/Royalty/Keyed/Designators.xml b/Royalty/Keyed/Designators.xml index 94dbf06f..bcc327ab 100644 --- a/Royalty/Keyed/Designators.xml +++ b/Royalty/Keyed/Designators.xml @@ -1,4 +1,4 @@ - + diff --git a/Royalty/Keyed/Dialogs_Various.xml b/Royalty/Keyed/Dialogs_Various.xml index 70bd50cd..c6096373 100644 --- a/Royalty/Keyed/Dialogs_Various.xml +++ b/Royalty/Keyed/Dialogs_Various.xml @@ -1,4 +1,4 @@ - + @@ -12,6 +12,8 @@ 卧室要求 谒见厅要求 + + 头衔特权 允许的最大心灵等级 diff --git a/Royalty/Keyed/ITabs.xml b/Royalty/Keyed/ITabs.xml index ab1bd481..2f504377 100644 --- a/Royalty/Keyed/ITabs.xml +++ b/Royalty/Keyed/ITabs.xml @@ -1,4 +1,4 @@ - + diff --git a/Royalty/Keyed/Letters.xml b/Royalty/Keyed/Letters.xml index 4ee7b476..8ad61cd1 100644 --- a/Royalty/Keyed/Letters.xml +++ b/Royalty/Keyed/Letters.xml @@ -1,4 +1,4 @@ - + diff --git a/Royalty/Keyed/Misc_Gameplay.xml b/Royalty/Keyed/Misc_Gameplay.xml index 19cbac77..4909ed99 100644 --- a/Royalty/Keyed/Misc_Gameplay.xml +++ b/Royalty/Keyed/Misc_Gameplay.xml @@ -1,4 +1,4 @@ - +