From 5c5b7bd65ffabf0d39130417fd9743e1766f5a00 Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Mon, 28 Feb 2022 21:57:11 +0800
Subject: [PATCH 1/2] 3287

---
 Core/Backstories/Backstories.xml              | 72 +++++++++++++++++++
 .../IdeoPresetCategoryDef/IdeoPresetDefs.xml  | 16 ++---
 Ideology/DefInjected/InstructionDef/Tutor.xml |  9 ---
 .../PreceptDef/Precepts_Ranching.xml          |  2 -
 .../RulePackDef/RulePacks_Ritual_Funeral.xml  |  8 +--
 .../ThoughtDef/Precepts_Ranching.xml          |  5 --
 Ideology/Keyed/Alerts.xml                     | 15 +---
 Ideology/Keyed/Dialogs_Various.xml            |  2 -
 Ideology/Keyed/Misc_Gameplay.xml              | 24 +++----
 9 files changed, 97 insertions(+), 56 deletions(-)
 delete mode 100644 Ideology/DefInjected/InstructionDef/Tutor.xml

diff --git a/Core/Backstories/Backstories.xml b/Core/Backstories/Backstories.xml
index 6d94c3ad..41bbf373 100644
--- a/Core/Backstories/Backstories.xml
+++ b/Core/Backstories/Backstories.xml
@@ -1283,6 +1283,15 @@
     <desc>[PAWN_nameDef]在一个濒临崩溃的政府官僚体系中担任低级行政人员。[PAWN_pronoun]大多数时候都在家写复杂的文件和玩玩办公室政治。</desc>
   </CivilServant2>
   
+  <CivilServant25>
+    <!-- EN: Civil servant -->
+    <title>公务员</title>
+    <!-- EN: Bureaucrat -->
+    <titleShort>官员</titleShort>
+    <!-- EN: [PAWN_nameDef] was bureaucrat in the civil service.\n\nAlthough his family connections took him far, his vocal opposition to his bosses' plans hindered his advancement. Called a "red prince" by some, [PAWN_nameDef] sympathized with the poor, leading ultimately to disgrace in [PAWN_possessive] career. -->
+    <desc>[PAWN_nameDef]是一名政府官员。\n\n虽然他的家庭关系让他走得很远，但他对上司计划的强烈反对阻碍了他的进步。[PAWN_nameDef]因为同情穷人被一些人戏称为“红色王子”，这是[PAWN_posessive]职业生涯的耻辱。</desc>
+  </CivilServant25>
+  
   <ClanChief14>
     <!-- EN: clan chief -->
     <title>帮派头目</title>
@@ -4304,6 +4313,15 @@
     <desc>[PAWN_nameDef]是一名服装和珠宝广告的模特，还是虚拟现实中某个人物的原型。</desc>
   </Model99>
   
+  <MonkeyChild67>
+    <!-- EN: Monkey child -->
+    <title>猴孩儿</title>
+    <!-- EN: Monkey kid -->
+    <titleShort>猴孩儿</titleShort>
+    <!-- EN: When he was a baby, [PAWN_nameDef]'s parents traded their son to a troop of monkeys. Little is known of his life among the primates. -->
+    <desc>当他还是个婴儿时，[PAWN_nameDef]的父母将他们的儿子换给了一群猴子。人们对他在灵长类动物中的生活知之甚少。</desc>
+  </MonkeyChild67>
+  
   <MuffaloResearcher67>
     <!-- EN: muffalo researcher -->
     <title>雪牛研究员</title>
@@ -4322,6 +4340,15 @@
     <desc>因为冷静、睿智和强大的力量，[PAWN_nameDef]成为了游牧部落的精神领袖。据说[PAWN_nameDef]可以和雪牛神直接交流。</desc>
   </MuffaloShaman95>
   
+  <MusicalKid14>
+    <!-- EN: Musical kid -->
+    <title>音乐神童</title>
+    <!-- EN: Music kid -->
+    <titleShort>乐童</titleShort>
+    <!-- EN: [PAWN_nameDef] was born with an almost magic voice. He learned to sing as a baby. His voice also had a special timbre to it which calmed down everyone who listened to it. -->
+    <desc>[PAWN_nameDef]天生就有一副近乎神奇的嗓子。他在婴儿时期就学会了唱歌。他的声音也有一种特殊的音色，能让听的人都安静下来。</desc>
+  </MusicalKid14>
+  
   <MusicalKid86>
     <!-- EN: musical kid -->
     <title>音乐小子</title>
@@ -4484,6 +4511,15 @@
     <desc>[PAWN_nameDef]在一个远离世界中的战士培养设施中出生和长大。从很小的时候，[PAWN_pronoun]就被教授了近距离作战战术、侵略，以及如何在遥远星球上生存。\n\n作为最优异者之一，[PAWN_nameDef]最终决定加入轨道部署突击部队。</desc>
   </OffworldRecruit91>
   
+  <OldMoneyHeir46>
+    <!-- EN: Old money heir -->
+    <title>财阀继承人</title>
+    <!-- EN: Heir -->
+    <titleShort>新贵</titleShort>
+    <!-- EN: [PAWN_nameDef] grew up a sheltered and spoiled child in one of the many manors of his old-money industrialist family.\n\nWhile attending an elite private school, [PAWN_nameDef] received an extensive education in the arts and sciences, but never saw the horrors of the real world. -->
+    <desc>[PAWN_nameDef]在他工业财阀家族的众多庄园中长大，是一个被庇护和宠坏的孩子。\n\n上精英私立学校时，[PAWN_nameDef]接受了广泛的艺术和科学教育，但从未见过现实世界的恐怖。</desc>
+  </OldMoneyHeir46>
+  
   <OptimisticChild30>
     <!-- EN: optimistic child -->
     <title>乐观儿童</title>
@@ -5327,6 +5363,15 @@
     <desc>[PAWN_nameDef]来自一个富有而有影响力的血统。这使得[PAWN_nameDef]从小就接受了包括决斗、领导力和军事战略的贵族教育。</desc>
   </RichKid61>
   
+  <RimworldExile32>
+    <!-- EN: Rimworld exile -->
+    <title>边缘流亡者</title>
+    <!-- EN: Exile -->
+    <titleShort>难民</titleShort>
+    <!-- EN: After [PAWN_possessive] planet was technologically uplifted by a benevolent glitterworld charity, [PAWN_nameDef] saw an opportunity to make some money by defrauding the wealthy glitterworld visitors.\n\nAfter [PAWN_pronoun] was caught, [PAWN_pronoun] was exiled to the rim, where [PAWN_pronoun] targeted rich trading companies to continue [PAWN_possessive] life of crime. -->
+    <desc>在[PAWN_possessive]星球被仁慈的闪光世界慈善机构掘升后，[PAWN_nameDef]看到了一个机会，通过欺诈富有的闪光世界游客来赚取一些钱。\n\n[PAWN_pronoun]被抓后，[PAWN_pronoun]被流放到边缘地区，在那里[PAWN_pronoun]针对富有的贸易公司继续[PAWN_possessive]犯罪生活。</desc>
+  </RimworldExile32>
+  
   <RitualChild20>
     <!-- EN: ritual child -->
     <title>仪式儿童</title>
@@ -6306,6 +6351,15 @@
     <desc>[PAWN_nameDef]是一艘海盗船的船长。[PAWN_pronoun]和[PAWN_possessive]船员靠掠夺偏离轨道的商人为生。\n\n[PAWN_pronoun]会以平衡方式解决问题，根据需要选择开发、谈判或者战斗，并因此而闻名。</desc>
   </StellarPirate10>
   
+  <StewardsAssisant28>
+    <!-- EN: Steward's assisant -->
+    <title>管家助手</title>
+    <!-- EN: Steward -->
+    <titleShort>管家</titleShort>
+    <!-- EN: A steward on medieval merchant ships, [PAWN_nameDef] was well-travelled on [PAWN_possessive] homeworld by [PAWN_possessive] early teens.\n\nThe constant orders from [PAWN_possessive] captain, however, fostered a defiant streak, as well as a general disaste for anything [PAWN_pronoun] considered to be busywork. -->
+    <desc>作为中世纪商船的管家，[PAWN_nameDef]在十几岁的时候就已经在[PAWN_possessive]家乡游刃有余了。\n\n然而，[PAWN_possessive]船长持续不断的命令培养了他的反抗倾向，以及对任何[PAWN_pronoun]认为是繁忙工作的普遍不喜欢。</desc>
+  </StewardsAssisant28>
+  
   <StewKeeper95>
     <!-- EN: stew keeper -->
     <title>餐食管理员</title>
@@ -6351,6 +6405,15 @@
     <desc>尽管被祝福，[PAWN_nameDef]和父母并不熟悉。[PAWN_pronoun]经常被留下来一个人玩设备。这使[PAWN_pronoun]有更多的时间探索感兴趣的东西...以及陷入麻烦。</desc>
   </Straggler71>
   
+  <Streamer52>
+    <!-- EN: Streamer -->
+    <title>游戏主播</title>
+    <!-- EN: Streamer -->
+    <titleShort>主播</titleShort>
+    <!-- EN: [PAWN_nameDef] worked as a videogame streamer, and was known for his monkey-related impressions and jokes.\n\nA pandemic forced him to go into cryptosleep for several years. During his sleep, he was launched on an interstellar diplomatic mission. Nothing was heard of him ever again. -->
+    <desc>[PAWN_nameDef]是一名电子游戏主播，以其与猴子有关的印象和笑话而闻名。\n\n一次大流行病迫使他进入了数年的冷冻休眠。在他休眠期间，在一项星际外交任务中被送出。此后再也没有听到他的消息。</desc>
+  </Streamer52>
+  
   <StreetChild4>
     <!-- EN: street child -->
     <title>街头流浪儿</title>
@@ -6747,6 +6810,15 @@
     <desc>[PAWN_nameDef]生活在一个轻松的中寰世界。\n\n[PAWN_possessive]的妈妈得了心脏病。绝望之中, [PAWN_nameDef]的爹绑架别人来抢他们的心脏以至于被捕，[PAWN_nameDef]从未从这一创伤事件中恢复过来。</desc>
   </TraumatizedYouth87>
   
+  <TravelingBard93>
+    <!-- EN: Traveling bard -->
+    <title>吟游诗人</title>
+    <!-- EN: Musician -->
+    <titleShort>奏者</titleShort>
+    <!-- EN: [PAWN_nameDef] joined the famous Star Pilots On Channel K (aka S.P.O.C.K) and toured the star system, but eventually the band split up and their fame faded away.\n\nHe ended up as a travelling bard playing on his portable synthesizer as he traveled from spaceport to spaceport. -->
+    <desc>[PAWN_nameDef]加入了著名的Star Pilots On Channel K（又名S.P.O.C.K），并在星系中巡回演出，但最终乐队解散了，他们的名气也逐渐消失了。\n\n他最后成了一个旅行吟游诗人，在他从一个太空港到另一个太空港的过程中用他的便携式合成器演奏。</desc>
+  </TravelingBard93>
+  
   <TreasureHunter82>
     <!-- EN: treasure hunter -->
     <title>宝藏猎人</title>
diff --git a/Ideology/DefInjected/IdeoPresetCategoryDef/IdeoPresetDefs.xml b/Ideology/DefInjected/IdeoPresetCategoryDef/IdeoPresetDefs.xml
index 7c8552a6..494b1694 100644
--- a/Ideology/DefInjected/IdeoPresetCategoryDef/IdeoPresetDefs.xml
+++ b/Ideology/DefInjected/IdeoPresetCategoryDef/IdeoPresetDefs.xml
@@ -3,8 +3,8 @@
   
   <!-- EN: classic -->
   <Classic.label>经典</Classic.label>
-  <!-- EN: Classic RimWorld without the ideoligion system active. Good for your first few games, and when you're not trying to do something specific. -->
-  <Classic.description>不激活文化系统的经典游戏模式。适合你最初的几场游戏或者不希望特立独行。</Classic.description>
+  <!-- EN: Classic RimWorld without the ideoligion system. Good for your first few games, or when you're not trying to do something specific. All Ideology expansion content remains active. -->
+  <Classic.description>不激活文化系统的经典游戏模式。适合你最初的几场游戏或者不希望特立独行。所有的文化DLC相关内容仍然有效。</Classic.description>
   <!-- EN: Classic -->
   <Classic.groupLabel>经典</Classic.groupLabel>
   
@@ -26,21 +26,21 @@
   <Intense.label>极端</Intense.label>
   <!-- EN: Extremely disruptive beliefs which make the game very different from classic RimWorld. These add significant difficulty. -->
   <Intense.description>这些文化非常极端，你的游戏将会与传统边缘世界玩法有极大差异。几乎都大大增加了游戏难度。</Intense.description>
-  <!-- EN: Presets -->
-  <Intense.groupLabel>极端</Intense.groupLabel>
+  <!-- EN: Preset ideoligions -->
+  <Intense.groupLabel>极端文化</Intense.groupLabel>
   
   <!-- EN: mild -->
   <Mild.label>温和</Mild.label>
   <!-- EN: Classic-like gameplay with small variations. -->
   <Mild.description>类似经典模式的文化形态，不过稍稍有些变化。</Mild.description>
-  <!-- EN: Presets -->
-  <Mild.groupLabel>温和</Mild.groupLabel>
+  <!-- EN: Preset ideoligions -->
+  <Mild.groupLabel>温和文化</Mild.groupLabel>
   
   <!-- EN: strong -->
   <Strong.label>激进</Strong.label>
   <!-- EN: Strong beliefs which support playstyles significantly different from classic RimWorld. -->
   <Strong.description>这些文化稍有些激进，与经典边缘世界明显不同。</Strong.description>
-  <!-- EN: Presets -->
-  <Strong.groupLabel>激进</Strong.groupLabel>
+  <!-- EN: Preset ideoligions -->
+  <Strong.groupLabel>激进文化</Strong.groupLabel>
   
 </LanguageData>
\ No newline at end of file
diff --git a/Ideology/DefInjected/InstructionDef/Tutor.xml b/Ideology/DefInjected/InstructionDef/Tutor.xml
deleted file mode 100644
index cb415562..00000000
--- a/Ideology/DefInjected/InstructionDef/Tutor.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LanguageData>
-  
-  <!-- EN: Please click PLAY CLASSIC to continue the tutorial. -->
-  <ChooseIdeo.rejectInputMessage>点击「经典模式」以继续</ChooseIdeo.rejectInputMessage>
-  <!-- EN: This page is for choosing the ideoligion of your colonists. The term ideoligion includes religions, ideologies, and every other belief system that defines a moral structure in the universe.\n\nThe PLAY CLASSIC option here will work - go ahead and click it! -->
-  <ChooseIdeo.text>此页面用于选择你殖民地的文化形态。文化形态这个术语在本扩展中泛指宗教，意识形态和其他所有在这个宇宙种定义道德结构的信仰体系。\n\n「经典模式」选项现在可用——点击它以继续下一步！</ChooseIdeo.text>
-  
-</LanguageData>
\ No newline at end of file
diff --git a/Ideology/DefInjected/PreceptDef/Precepts_Ranching.xml b/Ideology/DefInjected/PreceptDef/Precepts_Ranching.xml
index 0982bd77..2607c5b6 100644
--- a/Ideology/DefInjected/PreceptDef/Precepts_Ranching.xml
+++ b/Ideology/DefInjected/PreceptDef/Precepts_Ranching.xml
@@ -17,7 +17,5 @@
   <Ranching_Central.comps.0.thoughtStageDescriptions.4>很多动物 {STAGE5}</Ranching_Central.comps.0.thoughtStageDescriptions.4>
   <!-- EN: Tons of animals -->
   <Ranching_Central.comps.0.thoughtStageDescriptions.5>大量动物</Ranching_Central.comps.0.thoughtStageDescriptions.5>
-  <!-- EN: No slaughter for {ANIMALSLAUGHTERREQUIREDINTERVAL} days -->
-  <Ranching_Central.comps.2.description>有 {ANIMALSLAUGHTERREQUIREDINTERVAL} 天没有屠宰</Ranching_Central.comps.2.description>
   
 </LanguageData>
\ No newline at end of file
diff --git a/Ideology/DefInjected/RulePackDef/RulePacks_Ritual_Funeral.xml b/Ideology/DefInjected/RulePackDef/RulePacks_Ritual_Funeral.xml
index 97b3e358..0bccdaff 100644
--- a/Ideology/DefInjected/RulePackDef/RulePacks_Ritual_Funeral.xml
+++ b/Ideology/DefInjected/RulePackDef/RulePacks_Ritual_Funeral.xml
@@ -9,15 +9,13 @@
     <li>r_ritualName->[funeral] of [keyDeity]</li>
     <li>r_ritualName->[funeral] of [memeConcept]</li>
     <li>r_ritualName->[funeral] of [chosenIdeoName]</li>
-    <li>r_ritualName(p=0.0001)->funeral</li>
+    <li>r_ritualName(p=0.01)->funeral</li>
     <li>funeral->funeral</li>
     <li>funeral->mourning</li>
     <li>funeral->eulogy</li>
     <li>funeral->burial</li>
     <li>funeral->interment</li>
-    <li>funeral->inhumation</li>
     <li>funeral->requiem</li>
-    <li>funeral->sepulture</li>
   -->
   <NamerRitualFuneral.rulePack.rulesStrings>
     <li>r_ritualName(p=2)->[memeAdjective][funeral]</li>
@@ -27,13 +25,11 @@
     <li>r_ritualName->[keyDeity][funeral]</li>
     <li>r_ritualName->[memeConcept]之[funeral]</li>
     <li>r_ritualName->[chosenIdeoName][funeral]</li>
-    <li>r_ritualName(p=0.0001)->葬礼</li>
+    <li>r_ritualName(p=0.01)->葬礼</li>
     <li>funeral->葬礼</li>
     <li>funeral->哀悼</li>
     <li>funeral->悼辞</li>
     <li>funeral->追思</li>
-    <li>funeral->葬礼</li>
-    <li>funeral->葬礼</li>
     <li>funeral->安魂曲</li>
     <li>funeral->墓地</li>
   </NamerRitualFuneral.rulePack.rulesStrings>
diff --git a/Ideology/DefInjected/ThoughtDef/Precepts_Ranching.xml b/Ideology/DefInjected/ThoughtDef/Precepts_Ranching.xml
index 285fc95a..e8b96304 100644
--- a/Ideology/DefInjected/ThoughtDef/Precepts_Ranching.xml
+++ b/Ideology/DefInjected/ThoughtDef/Precepts_Ranching.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
   
-  <!-- EN: no recent slaughter -->
-  <NoRecentAnimalSlaughter.stages.no_recent_slaughter.label>最近没有屠宰</NoRecentAnimalSlaughter.stages.no_recent_slaughter.label>
-  <!-- EN: It's been too long since we slaughtered a large animal. -->
-  <NoRecentAnimalSlaughter.stages.no_recent_slaughter.description>我们已经很久没有屠宰过一只大型动物了。</NoRecentAnimalSlaughter.stages.no_recent_slaughter.description>
-  
   <!-- EN: no animals -->
   <Ranching_Central_AnimalMassPerCapita.stages.no_animals.label>没有动物</Ranching_Central_AnimalMassPerCapita.stages.no_animals.label>
   <!-- EN: We have no animals at all! It's everything I am against. -->
diff --git a/Ideology/Keyed/Alerts.xml b/Ideology/Keyed/Alerts.xml
index 80e61038..872c922d 100644
--- a/Ideology/Keyed/Alerts.xml
+++ b/Ideology/Keyed/Alerts.xml
@@ -45,11 +45,11 @@
   <!-- EN: {0} desired -->
   <IdeoBuildingMissing>需求：{0}</IdeoBuildingMissing>
   <!-- EN: {IDEO_name} requires that you have a {0} in your colony as long as {2} or higher.\n\n{0} is a variant of {BASEBUILDING_label}.{BUILDINGINFO}\n\nThis requirement is only active if {IDEO_name} is your faction's primary ideoligion, or there are {MINBELIEVERS} believers in your faction.{4}\n\nIf the requirement isn't met, these believers will become unhappy:\n{3} -->
-  <IdeoBuildingMissingDesc>{IDEO_name}需要你的殖民地在{2}或更高时有{0}。\n\n{0}是{BASEBUILDING_label}的一种变体。{BUILDINGINFO}\n\n这个要求只会在{IDEO_name}是你派系的主流文化， 或者最少有{MINBELIEVERS}名追随者时生效。 {4}\n\n如果此需求未被满足，以下追随者将会不满：\n {3} </IdeoBuildingMissingDesc> <!-- text_todo -->
+  <IdeoBuildingMissingDesc>{IDEO_name}需要你的殖民地在{2}或更高时有{0}。\n\n{0}是{BASEBUILDING_label}的一种变体。{BUILDINGINFO}\n\n这个要求只会在{IDEO_name}是你派系的主流文化， 或者最少有{MINBELIEVERS}名追随者时生效。 {4}\n\n如果此需求未被满足，以下追随者将会不满：\n {3} </IdeoBuildingMissingDesc>
   <!-- EN:  You can find it by opening the '{TABNAME}' tab of the architect menu. -->
-  <IdeoBuildingArchitectTabDesc>你可以通过打开⌈{TABNAME}⌋标签找到它。</IdeoBuildingArchitectTabDesc> <!-- text_todo -->
+  <IdeoBuildingArchitectTabDesc>你可以通过打开⌈{TABNAME}⌋标签找到它。</IdeoBuildingArchitectTabDesc>
   <!-- EN:  It can be created at:\n{0}. -->
-  <IdeoBuildingCanBeCraftedAt>它可以被以下目标制作：\n{0}。</IdeoBuildingCanBeCraftedAt> <!-- text_todo -->
+  <IdeoBuildingCanBeCraftedAt>它可以被以下目标制作：\n{0}。</IdeoBuildingCanBeCraftedAt>
   <!-- EN: In order to dignify {0}, these room requirements must be met -->
   <IdeoBuildingRoomRequirementsDesc>为了神圣化{0}，这些房间的需求必须被满足</IdeoBuildingRoomRequirementsDesc>
   <!-- EN: expectations are -->
@@ -77,15 +77,6 @@
   <!-- EN: Security threats will activate in {0}. They will attack any who may threaten the relic. -->
   <AncientAltarThreatsWakingDesc>安全协议将在{0}内激活，它们将攻击任何可能对圣物造成威胁的目标。</AncientAltarThreatsWakingDesc>
 
-  <!-- EN: No recent slaughter -->
-  <AlertNoRecentSlaughter>近期未宰杀</AlertNoRecentSlaughter>
-  <!-- EN: No large {0} animal has been slaughtered recently. This is a requirement of the following ideoligions -->
-  <AlertNoRecentSlaughterDesc>近期未能宰杀大型动物{0}，这对于以下信仰而言是必须的：</AlertNoRecentSlaughterDesc>
-  <!-- EN: {0} body size or above -->
-  <BodySizeOrAbove>体积为{0}或更大</BodySizeOrAbove>
-  <!-- EN: If no slaughter is performed, these colonists will remain unhappy -->
-  <AlertNoRecentSlaughterDescPost>如果不进行宰杀，殖民者们将一直不高兴</AlertNoRecentSlaughterDescPost>
-  
   <!-- EN: Ritual opportunity soon -->
   <AlertRitualComing>仪式机会即将来临</AlertRitualComing>
   <!-- EN: A ritual opportunity is coming soon for following rituals -->
diff --git a/Ideology/Keyed/Dialogs_Various.xml b/Ideology/Keyed/Dialogs_Various.xml
index 25202c8a..cffd4d27 100644
--- a/Ideology/Keyed/Dialogs_Various.xml
+++ b/Ideology/Keyed/Dialogs_Various.xml
@@ -164,8 +164,6 @@
   <LastHumanMeat>最后的人肉</LastHumanMeat>
   <!-- EN: Because of {PAWN_possessive} belief in {IDEO_name}, {PAWN_nameDef} will become unhappy if {PAWN_pronoun} goes more than {DURATION} days without eating human meat. -->
   <LastHumanMeatDesc>由于 {PAWN_possessive} 信奉 {IDEO_name}，如果 {PAWN_pronoun} 超过 {DURATION} 天不吃人肉，{PAWN_nameDef} 会变得不高兴。</LastHumanMeatDesc>
-  <!-- EN: Last large animal slaughter -->
-  <LastAnimalSlaughter>最后一次大型动物屠宰</LastAnimalSlaughter>
 
   <!-- EN: Executing {PAWN_labelShort} will negatively affect relations with {FACTION_name}. -->
   <ExectueNeutralFactionSlave>执行 {PAWN_labelShort} 将对与 {FACTION_name} 的关系产生负面影响。</ExectueNeutralFactionSlave>
diff --git a/Ideology/Keyed/Misc_Gameplay.xml b/Ideology/Keyed/Misc_Gameplay.xml
index 49c81f68..89e6247d 100644
--- a/Ideology/Keyed/Misc_Gameplay.xml
+++ b/Ideology/Keyed/Misc_Gameplay.xml
@@ -11,12 +11,14 @@
   <RandomStructureTip>会为你的文化应用一个随机结构。</RandomStructureTip>
   <!-- EN: A random style will be used for your ideoligion. -->
   <RandomStyleTip>会为你的文化应用一个随机风格。</RandomStyleTip>
-  <!-- EN: Classic\nRimWorld -->
-  <PlayClassic>经典模式\n边缘世界</PlayClassic> <!-- text_todo -->
+  <!-- EN: Ideology system inactive -->
+  <PlayClassic>经典模式\n边缘世界</PlayClassic>
   <!-- EN: Create custom\n(fluid) -->
-  <CreateCustomFluid>自定义\n演进模式</CreateCustomFluid> <!-- text_todo -->
+  <CreateCustomFluid>自定义\n演进模式</CreateCustomFluid>
   <!-- EN: Create custom\n(fixed) -->
-  <CreateCustomFixed>自定义\n固定模式</CreateCustomFixed>  <!-- text_todo -->
+  <CreateCustomFixed>自定义\n固定模式</CreateCustomFixed>
+  <!-- EN: Custom ideoligions -->
+  <CustomIdeoligions>自定义文化</CustomIdeoligions>
   <!-- EN: Load saved -->
   <LoadSaved>载入预设</LoadSaved>
   <!-- EN: Structure -->
@@ -88,15 +90,13 @@
   <!-- EN: Disables -->
   <Disables>禁用</Disables>
   <!-- EN: Requires one of precepts -->
-  <RequiresOnePrecept>需要以下戒律之一</RequiresOnePrecept>
+  <RequiresOnePrecept>规定以下戒律之一</RequiresOnePrecept>
   <!-- EN: Required precepts -->
-  <RequiredPrecepts>需要戒律</RequiredPrecepts>
+  <RequiredPrecepts>规定戒律</RequiredPrecepts>
   <!-- EN: Required rituals -->
-  <RequiredRituals>需要仪式</RequiredRituals>
-  <!-- EN: Disables precepts -->
-  <DisablesPrecepts>禁用戒律</DisablesPrecepts>
-  <!-- EN: Disables {0} precepts. -->
-  <DisablesPreceptsCount>禁用了{0}戒律</DisablesPreceptsCount>
+  <RequiredRituals>规定仪式</RequiredRituals>
+  <!-- EN: Prevents precepts -->
+  <PreventsPrecepts>豁免戒律</PreventsPrecepts>
   <!-- EN: Styles -->
   <Styles>风格</Styles>
   <!-- EN: Chance to have precept -->
@@ -172,7 +172,7 @@
   <!-- EN: A grave containing {IDEO_memberNameIndef}'s corpse -->
   <RitualTargetGraveInfoAbstract>装有{IDEO_memberNameIndef}的坟墓</RitualTargetGraveInfoAbstract>
   <!-- EN: A grave containing a corpse. -->
-  <RitualTargetGraveInfoAbstractNoIdeo>一个装有尸体的坟墓。</RitualTargetGraveInfoAbstractNoIdeo> <!-- text_todo -->
+  <RitualTargetGraveInfoAbstractNoIdeo>一个装有尸体的坟墓。</RitualTargetGraveInfoAbstractNoIdeo>
   <!-- EN: An empty grave to mourn {IDEO_memberNameIndef}'s passing. -->
   <RitualTargetEmptyGraveInfoAbstract>一座空坟，用来缅怀{IDEO_memberNameIndef}的逝世。</RitualTargetEmptyGraveInfoAbstract>
   <!-- EN: {PAWN_labelShort}'s body must be buried first -->

From 92fc35f6f46c1a5085456470ec49dce55a5d8bea Mon Sep 17 00:00:00 2001
From: VaniatD <188733149@qq.com>
Date: Mon, 28 Feb 2022 22:10:40 +0800
Subject: [PATCH 2/2] typos fix

---
 Core/DefInjected/ThingDef/Items_Resource_Shell.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/DefInjected/ThingDef/Items_Resource_Shell.xml b/Core/DefInjected/ThingDef/Items_Resource_Shell.xml
index 69aab976..2d282d23 100644
--- a/Core/DefInjected/ThingDef/Items_Resource_Shell.xml
+++ b/Core/DefInjected/ThingDef/Items_Resource_Shell.xml
@@ -22,12 +22,12 @@
   <!-- EN: antigrain warhead -->
   <Shell_AntigrainWarhead.label>反粒子弹头</Shell_AntigrainWarhead.label>
   <!-- EN: An ultra-tech warhead powered by a grain of antimatter. Usually used by spacecraft or glitterworld war machines, it creates a huge explosion and starts fires around the target. Can be fired from mortars or installed as a trap. Explodes when damaged. -->
-  <Shell_AntigrainWarhead.description>一个极致科技弹头，通常用于空间战争或闪耀世界战争机器。由一个反物质粒子提供能量，造成巨大爆炸并点燃周围目标。可以用迫击炮发射或者安装成一个陷阱。受损后爆炸。</Shell_AntigrainWarhead.description>
+  <Shell_AntigrainWarhead.description>一个极致科技弹头，通常用于太空飞船或闪耀世界战争机器。由一个反物质粒子提供能量，造成巨大爆炸并点燃周围目标。可以用迫击炮发射或者安装成一个陷阱。受损后爆炸。</Shell_AntigrainWarhead.description>
   
   <!-- EN: EMP shell -->
   <Shell_EMP.label>EMP弹</Shell_EMP.label>
   <!-- EN: A shell filled with batteries and antennas, for generating an electromagnetic pulse when detonated. Electromagnetic pulses temporarily disable electrical devices and mechanoids. Can be fired from mortars or installed as a trap. Explodes when damaged. -->
-  <Shell_EMP.description>装填了电池和天线的，用于在爆炸时产生EMP。电磁脉冲波会暂时性瘫痪电路。可以用迫击炮发射或者安装成一个陷阱。受损后爆炸。</Shell_EMP.description>
+  <Shell_EMP.description>装填了电池和天线的炮弹，用于在爆炸时产生EMP。电磁脉冲波会暂时性瘫痪电路。可以用迫击炮发射或者安装成一个陷阱。受损后爆炸。</Shell_EMP.description>
   
   <!-- EN: firefoam shell -->
   <Shell_Firefoam.label>泡沫灭火弹</Shell_Firefoam.label>