From af6befa33eb8c0a3dc5985be419cb13d5c580d0a Mon Sep 17 00:00:00 2001 From: VaniatD <188733149@qq.com> Date: Fri, 28 Aug 2020 10:03:29 +0800 Subject: [PATCH 1/2] update for 2739 --- Core/Keyed/FloatMenu.xml | 4 ++-- Core/LanguageInfo.xml | 2 +- .../DefInjected/HediffDef/Hediffs_Psycasts.xml | 4 ++-- .../Script_Hospitality_Refugee.xml | 18 ++++++++++++++++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Core/Keyed/FloatMenu.xml b/Core/Keyed/FloatMenu.xml index 61639e72..ac18808b 100644 --- a/Core/Keyed/FloatMenu.xml +++ b/Core/Keyed/FloatMenu.xml @@ -219,9 +219,9 @@ 无法穿上{1_label} - 强制装备{1_labelShort} + 强制装备{1_labelShort} - 无法装备{1_label} + 无法装备{1_label} 身体部位缺失 diff --git a/Core/LanguageInfo.xml b/Core/LanguageInfo.xml index 0715bc12..9f4f8adb 100644 --- a/Core/LanguageInfo.xml +++ b/Core/LanguageInfo.xml @@ -130,7 +130,7 @@ Indeed
  • - 修订日期： 2020年8月26日 21点29分 + 修订日期： 2020年8月28日 09点59分 MiddleRight
    • diff --git a/Royalty/DefInjected/HediffDef/Hediffs_Psycasts.xml b/Royalty/DefInjected/HediffDef/Hediffs_Psycasts.xml index 609b7cb1..8ce996b7 100644 --- a/Royalty/DefInjected/HediffDef/Hediffs_Psycasts.xml +++ b/Royalty/DefInjected/HediffDef/Hediffs_Psycasts.xml @@ -45,8 +45,8 @@ 心灵熵 - - 尽管被称为“熵”，但并不是传统意义的熵。它指的是在使用心灵能力时在大脑中产生的一种混乱的心灵能量，会随着时间逐渐消散。\n\n如果心灵熵超过安全阈值，可能会造成暂时的心灵崩溃、降低启灵等级，最终因为心灵休克失去意识。不过这些情况都不是永久的，它会让人在数天内失去意识。 + + 尽管被称为“熵”，但并不是传统意义的熵。它指的是在使用心灵能力时在大脑中积累的一种混乱的心灵能量，会在几秒到几分钟内自然消散。\n\n如果心灵熵超过安全阈值，可能会造成暂时的心灵崩溃、降低启灵等级，最终因为心灵休克失去意识。这些情况并不会造成永久性后遗症。 安全 diff --git a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Refugee.xml b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Refugee.xml index 0470b289..2c2a2973 100644 --- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Refugee.xml +++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Refugee.xml @@ -145,7 +145,16 @@
  • approachInfo(lodgerCount==2)->[asker_nameDef] and another desperate [faction_pawnSingular] are approaching.
  • approachInfo(lodgerCount>=3)->[lodgerCount] desperate [faction_pawnsPlural] are approaching. Their leader is called [asker_nameDef].
  • claimInfo(lodgerCount==1)->[asker_nameDef] claims to have lost [asker_possessive] home in a recent attack.
    • +
  • claimInfo(lodgerCount==1)->[asker_nameDef] claims to woken up from cryptosleep all alone and friendless.
    • +
  • claimInfo(lodgerCount==1)->[asker_nameDef] claims to have been chased from [asker_possessive] home by a vengeful ex-lover.
    • +
  • claimInfo(lodgerCount==1)->[asker_nameDef] claims to have been banished after an argument with a village leader.
  • claimInfo(lodgerCount>=2)->They claim to have lost their home in a recent attack.
    • +
  • claimInfo(lodgerCount>=2)->They claim to have escaped an organ harvesting operation.
    • +
  • claimInfo(lodgerCount>=2)->They say they escaped from a slave caravan.
    • +
  • claimInfo(lodgerCount>=2)->They say that crop blights starved them out of their village.
    • +
  • claimInfo(lodgerCount>=2)->They say a great flashstorm burned down their home.
    • +
  • claimInfo(lodgerCount>=2)->They say their caravan was ambushed and everything was taken.
    • +
  • claimInfo(lodgerCount>=2)->They say they were banished from their town due to moral disagreements.
  • joinInfo(lodgerCount==1)->If you make [asker_objective] happy, [asker_pronoun] may offer to join you.
  • joinInfo(lodgerCount>=2)->If you make them happy, some of them may offer to join you.
  • travelerInfo(lodgerCount==1)->This [faction_pawnSingular] is
    • @@ -169,7 +178,16 @@
  • approachInfo(lodgerCount==2)->[asker_nameDef]和其他绝望的[faction_pawnSingular]正在靠近。
  • approachInfo(lodgerCount>=3)->[lodgerCount] 名绝望的 [faction_pawnsPlural]正在靠近， 他们的领导者是[asker_nameDef]。
  • claimInfo(lodgerCount==1)->[asker_nameDef] 声称 [asker_possessive] 在最近一次袭击中失去了家园。
    • +
  • claimInfo(lodgerCount==1)->[asker_nameDef] 声称自己孤零零地从一个冷冻休眠舱中醒来。
    • +
  • claimInfo(lodgerCount==1)->[asker_nameDef] 声称被[asker_possessive]前情人从家中赶了出来。
    • +
  • claimInfo(lodgerCount==1)->[asker_nameDef] 声称因为和社区领导争吵被驱逐。
  • claimInfo(lodgerCount>=2)->他们声称在最近一次袭击中失去了家园。
    • +
  • claimInfo(lodgerCount>=2)->他们声称逃离了器官采割手术。
    • +
  • claimInfo(lodgerCount>=2)->他们说他们是从一个奴隶商队中逃出来的。
    • +
  • claimInfo(lodgerCount>=2)->他们说一场枯萎病让他们无法继续在社区生存。
    • +
  • claimInfo(lodgerCount>=2)->他们说一场大风暴毁了他们的家园。
    • +
  • claimInfo(lodgerCount>=2)->他们说他们的商队遭到袭击，所有的货物都被抢走了。
    • +
  • claimInfo(lodgerCount>=2)->他们说由于道德观不同，他们被赶出了城镇。
  • joinInfo(lodgerCount==1)->如果你能让[asker_objective]开心， [asker_pronoun]可能会提议加入你。
  • joinInfo(lodgerCount>=2)->如果你能让他们开心，他们中的一部分可能会提议加入你。
  • travelerInfo(lodgerCount==1)->这名 [faction_pawnSingular]
    • From b84ac019d5a8ea2d6919ae8ef341a519ed3bf266 Mon Sep 17 00:00:00 2001 From: VaniatD <188733149@qq.com> Date: Wed, 2 Sep 2020 20:09:53 +0800 Subject: [PATCH 2/2] update for 2744 --- Core/Keyed/Dialogs_Various.xml | 4 +++- Core/LanguageInfo.xml | 2 +- .../Script_EndGame_RoyalAscent.xml | 2 +- .../DefInjected/ThingDef/Apparel_Royal.xml | 19 +++++++++++++++++-- Royalty/Keyed/Letters.xml | 15 ++++++++------- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/Core/Keyed/Dialogs_Various.xml b/Core/Keyed/Dialogs_Various.xml index 2817d78d..7d27856a 100644 --- a/Core/Keyed/Dialogs_Various.xml +++ b/Core/Keyed/Dialogs_Various.xml @@ -196,7 +196,7 @@ 警告：你将会降落在一个冰冻地区。这会让生存非常艰难甚至是不可能。如果你并不想挑战艰难的环境，选择另一个降落点或另一个月份。 - 该游戏是以在中等地图上进行游戏来设计的。这些大小提供了充足的空间！\n\n大型地图不仅会降低游戏性能，也破坏了游戏设计。AI 将作出愚蠢的决定，游戏平衡将在多方面被严重影响。这些地图大小仅用作传统和测试原因，没有特定原因的话请勿使用。 + 该游戏是以在中等地图上进行游戏来设计的。这些大小提供了充足的空间！\n\n大型地图不仅会降低游戏性能，也破坏了游戏的设计目标。AI将可能会做出愚蠢的决定，并且游戏平衡可能会在多方面被严重影响。这些地图大小仅用作存档继承和测试，没有特定原因的话请勿使用。 地图大小 @@ -544,6 +544,8 @@ 贸易商拥有的待售物品数量。 接受 + + 加载已选项 重置 diff --git a/Core/LanguageInfo.xml b/Core/LanguageInfo.xml index 9f4f8adb..f533e6c7 100644 --- a/Core/LanguageInfo.xml +++ b/Core/LanguageInfo.xml @@ -130,7 +130,7 @@ Indeed
  • - 修订日期： 2020年8月28日 09点59分 + 修订日期： 2020年9月2日 20点09分 MiddleRight
    • diff --git a/Royalty/DefInjected/QuestScriptDef/Script_EndGame_RoyalAscent.xml b/Royalty/DefInjected/QuestScriptDef/Script_EndGame_RoyalAscent.xml index 115d8ce2..94afb7bc 100644 --- a/Royalty/DefInjected/QuestScriptDef/Script_EndGame_RoyalAscent.xml +++ b/Royalty/DefInjected/QuestScriptDef/Script_EndGame_RoyalAscent.xml @@ -85,7 +85,7 @@ 需要你护卫的{SUBJECT_definite}在你的殖民地回归自然。[failLetterEndingCommon] 任务[resolvedQuestName]已失败。 - + 前来迎接[asker_faction_leaderTitle]的穿梭机没有接到[asker_objective]。[asker_pronoun]现在只能走回去。[failLetterEndingCommon] \ No newline at end of file diff --git a/Royalty/DefInjected/ThingDef/Apparel_Royal.xml b/Royalty/DefInjected/ThingDef/Apparel_Royal.xml index 57a707fa..2bf7c70a 100644 --- a/Royalty/DefInjected/ThingDef/Apparel_Royal.xml +++ b/Royalty/DefInjected/ThingDef/Apparel_Royal.xml @@ -1,9 +1,19 @@  + + 贝雷帽 + + 一种柔软的平顶圆帽。 + + + 披肩 + + 具有典雅设计的长斗篷，它挂在躯干的一侧。 + 冠冕 - + 类似皇冠的金属小头饰。 @@ -13,9 +23,14 @@ 皇冠 - + 造型精美的大皇冠。 + + 星尘王冠 + + 精心设计的华丽的金属王冠，霸气十足。 + 兜帽 diff --git a/Royalty/Keyed/Letters.xml b/Royalty/Keyed/Letters.xml index 9b0fb8c2..a35a9b4c 100644 --- a/Royalty/Keyed/Letters.xml +++ b/Royalty/Keyed/Letters.xml @@ -82,16 +82,17 @@ 头衔{TITLE}无法被继承。 + 头衔继承 - - 自从{PAWN_nameFull}逝世后，{PAWN_possessive}头衔已根据授予头衔的派系之律法传授给{PAWN_possessive}继承人。 - - 根据{FACTION_name}的继承规则，{PAWN_possessive} {TITLE}头衔均由{HEIR_nameFull}来继承。取代了{HEIR_possessive} {REPLACEDTITLE}头衔。 + + 当{PAWN_nameFull}逝世后，{PAWN_possessive}头衔将会根据授予头衔的派系之律法传授给{PAWN_possessive}继承人。 + + 根据{FACTION_name}的继承规则， {PAWN_possessive} {TITLE}头衔被 {HEIR_nameFull} 继承。 在完成授予仪式之后将取代{HEIR_possessive} {REPLACEDTITLE}头衔。 - 根据{FACTION_name}的继承规则，{PAWN_possessive} {TITLE}头衔由{HEIR_nameFull}来继承。但是{HEIR_pronoun}已拥有了{HIGHERTITLE}头衔。 - - {PAWN_possessive}{TITLE}头衔是根据{FACTION_name}的继承法由{HEIR_nameFull}继承的。 + 根据{FACTION_name}的继承规则，{PAWN_possessive} {TITLE}头衔将由{HEIR_nameFull}来继承。 但是{HEIR_pronoun}已拥有了{HIGHERTITLE}头衔。 + + 根据{FACTION_name}的继承法， {PAWN_possessive}{TITLE}头衔将在完成授予仪式之后由{HEIR_nameFull}继承。 {PAWN_possessive}{TITLE}头衔未被任何人继承，因为{PAWN_pronoun}没有指定该头衔的继承人。