Merge pull request #444 from Creeper-of-Fire/master

fix

Biotech/DefInjected/GeneDef/GeneDefs_Endogenes.xml

@@ -77,7 +77,7 @@
   <!-- EN: reed -->
   <Body_Thin.symbolPack.prefixSymbols.8.symbol>芦苇</Body_Thin.symbolPack.prefixSymbols.8.symbol>
   <!-- EN: slink -->
-  <Body_Thin.symbolPack.prefixSymbols.9.symbol>鬼祟</Body_Thin.symbolPack.prefixSymbols.9.symbol>
+  <Body_Thin.symbolPack.prefixSymbols.9.symbol>麻杆</Body_Thin.symbolPack.prefixSymbols.9.symbol>
   <!-- EN: stilt -->
   <Body_Thin.symbolPack.prefixSymbols.10.symbol>细高</Body_Thin.symbolPack.prefixSymbols.10.symbol>
   <!-- EN: twig -->
@@ -93,7 +93,7 @@
   <!-- EN: reed -->
   <Body_Thin.symbolPack.suffixSymbols.4.symbol>芦苇</Body_Thin.symbolPack.suffixSymbols.4.symbol>
   <!-- EN: slink -->
-  <Body_Thin.symbolPack.suffixSymbols.5.symbol>鬼祟</Body_Thin.symbolPack.suffixSymbols.5.symbol>
+  <Body_Thin.symbolPack.suffixSymbols.5.symbol>麻杆</Body_Thin.symbolPack.suffixSymbols.5.symbol>
   <!-- EN: stilt -->
   <Body_Thin.symbolPack.suffixSymbols.6.symbol>细高</Body_Thin.symbolPack.suffixSymbols.6.symbol>
   
@@ -153,11 +153,11 @@
   <!-- EN: pig -->
   <Ears_Pig.symbolPack.prefixSymbols.0.symbol>猪</Ears_Pig.symbolPack.prefixSymbols.0.symbol>
   <!-- EN: pork -->
-  <Ears_Pig.symbolPack.prefixSymbols.1.symbol>豚</Ears_Pig.symbolPack.prefixSymbols.1.symbol>
+  <Ears_Pig.symbolPack.prefixSymbols.1.symbol>阉猪</Ears_Pig.symbolPack.prefixSymbols.1.symbol>
   <!-- EN: pig -->
-  <Ears_Pig.symbolPack.suffixSymbols.0.symbol>猪</Ears_Pig.symbolPack.suffixSymbols.0.symbol>
+  <Ears_Pig.symbolPack.suffixSymbols.0.symbol>大肥猪</Ears_Pig.symbolPack.suffixSymbols.0.symbol>
   <!-- EN: pork -->
-  <Ears_Pig.symbolPack.suffixSymbols.1.symbol>豚</Ears_Pig.symbolPack.suffixSymbols.1.symbol>
+  <Ears_Pig.symbolPack.suffixSymbols.1.symbol>耙耳朵</Ears_Pig.symbolPack.suffixSymbols.1.symbol>
   <!-- EN: ear -->
   <Ears_Pig.symbolPack.suffixSymbols.2.symbol>猪耳</Ears_Pig.symbolPack.suffixSymbols.2.symbol>
   
@@ -273,15 +273,15 @@
   <!-- EN: demon -->
   <Headbone_MiniHorns.symbolPack.prefixSymbols.4.symbol>恶魔</Headbone_MiniHorns.symbolPack.prefixSymbols.4.symbol>
   <!-- EN: luci -->
-  <Headbone_MiniHorns.symbolPack.prefixSymbols.5.symbol>路西</Headbone_MiniHorns.symbolPack.prefixSymbols.5.symbol>
+  <Headbone_MiniHorns.symbolPack.prefixSymbols.5.symbol>路西法</Headbone_MiniHorns.symbolPack.prefixSymbols.5.symbol>
   <!-- EN: beelze -->
-  <Headbone_MiniHorns.symbolPack.prefixSymbols.6.symbol>别西</Headbone_MiniHorns.symbolPack.prefixSymbols.6.symbol>
+  <Headbone_MiniHorns.symbolPack.prefixSymbols.6.symbol>别西卜</Headbone_MiniHorns.symbolPack.prefixSymbols.6.symbol>
   <!-- EN: hell -->
   <Headbone_MiniHorns.symbolPack.prefixSymbols.7.symbol>地狱</Headbone_MiniHorns.symbolPack.prefixSymbols.7.symbol>
   <!-- EN: horn -->
   <Headbone_MiniHorns.symbolPack.suffixSymbols.0.symbol>角</Headbone_MiniHorns.symbolPack.suffixSymbols.0.symbol>
   <!-- EN: spike -->
-  <Headbone_MiniHorns.symbolPack.suffixSymbols.1.symbol>见此</Headbone_MiniHorns.symbolPack.suffixSymbols.1.symbol>
+  <Headbone_MiniHorns.symbolPack.suffixSymbols.1.symbol>尖刺</Headbone_MiniHorns.symbolPack.suffixSymbols.1.symbol>
   <!-- EN: vil -->
   <Headbone_MiniHorns.symbolPack.suffixSymbols.2.symbol>魔鬼</Headbone_MiniHorns.symbolPack.suffixSymbols.2.symbol>
   
@@ -297,7 +297,7 @@
   <!-- EN: grunt -->
   <Jaw_Heavy.symbolPack.prefixSymbols.0.symbol>嘟囔</Jaw_Heavy.symbolPack.prefixSymbols.0.symbol>
   <!-- EN: jaw -->
-  <Jaw_Heavy.symbolPack.prefixSymbols.1.symbol>颌</Jaw_Heavy.symbolPack.prefixSymbols.1.symbol>
+  <Jaw_Heavy.symbolPack.prefixSymbols.1.symbol>迷人下颌</Jaw_Heavy.symbolPack.prefixSymbols.1.symbol>
   <!-- EN: lug -->
   <Jaw_Heavy.symbolPack.prefixSymbols.2.symbol>拖拉</Jaw_Heavy.symbolPack.prefixSymbols.2.symbol>
   <!-- EN: grunt -->
@@ -307,7 +307,7 @@
   <!-- EN: lug -->
   <Jaw_Heavy.symbolPack.suffixSymbols.2.symbol>拖拉</Jaw_Heavy.symbolPack.suffixSymbols.2.symbol>
   <!-- EN: thal -->
-  <Jaw_Heavy.symbolPack.suffixSymbols.3.symbol>拖拉</Jaw_Heavy.symbolPack.suffixSymbols.3.symbol>
+  <Jaw_Heavy.symbolPack.suffixSymbols.3.symbol>拖拖拉拉</Jaw_Heavy.symbolPack.suffixSymbols.3.symbol>
   
   <!-- EN: human nose -->
   <Nose_Human.label>人类鼻子</Nose_Human.label>
@@ -323,13 +323,13 @@
   <!-- EN: pork -->
   <Nose_Pig.symbolPack.prefixSymbols.1.symbol>豚</Nose_Pig.symbolPack.prefixSymbols.1.symbol>
   <!-- EN: snout -->
-  <Nose_Pig.symbolPack.prefixSymbols.2.symbol>鼻</Nose_Pig.symbolPack.prefixSymbols.2.symbol>
+  <Nose_Pig.symbolPack.prefixSymbols.2.symbol>猪鼻</Nose_Pig.symbolPack.prefixSymbols.2.symbol>
   <!-- EN: boar -->
   <Nose_Pig.symbolPack.prefixSymbols.3.symbol>野猪</Nose_Pig.symbolPack.prefixSymbols.3.symbol>
   <!-- EN: hog -->
   <Nose_Pig.symbolPack.prefixSymbols.4.symbol>肥猪</Nose_Pig.symbolPack.prefixSymbols.4.symbol>
   <!-- EN: pig -->
-  <Nose_Pig.symbolPack.suffixSymbols.0.symbol>大</Nose_Pig.symbolPack.suffixSymbols.0.symbol>
+  <Nose_Pig.symbolPack.suffixSymbols.0.symbol>猪猪</Nose_Pig.symbolPack.suffixSymbols.0.symbol>
   <!-- EN: snout -->
   <Nose_Pig.symbolPack.suffixSymbols.1.symbol>鼻子</Nose_Pig.symbolPack.suffixSymbols.1.symbol>
   <!-- EN: swine -->
@@ -342,14 +342,14 @@
   <Nose_Pig.symbolPack.suffixSymbols.5.symbol>猪鼻</Nose_Pig.symbolPack.suffixSymbols.5.symbol>
   
   <!-- EN: human voice -->
-  <Voice_Human.label>人类声音</Voice_Human.label>
+  <Voice_Human.label>人声</Voice_Human.label>
   <!-- EN: Carriers of this gene have regular human vocal chords. -->
   <Voice_Human.description>这种基因的携带者有着标准的人类声带。</Voice_Human.description>
   
   <!-- EN: pig voice -->
-  <VoicePig.label>猪声音</VoicePig.label>
+  <VoicePig.label>猪叫</VoicePig.label>
   <!-- EN: Carriers have a squealing voice like that of a pig. -->
-  <VoicePig.description>这种基因的携带者在说话如同猪叫。</VoicePig.description>
+  <VoicePig.description>这种基因的携带者发出的声音和猪叫一样。</VoicePig.description>
   <!-- EN: squeal -->
   <VoicePig.symbolPack.prefixSymbols.0.symbol>尖声</VoicePig.symbolPack.prefixSymbols.0.symbol>
   <!-- EN: oink -->
@@ -363,7 +363,7 @@
   <!-- EN: hog -->
   <VoicePig.symbolPack.suffixSymbols.1.symbol>肥猪</VoicePig.symbolPack.suffixSymbols.1.symbol>
   <!-- EN: pig -->
-  <VoicePig.symbolPack.suffixSymbols.2.symbol>猪</VoicePig.symbolPack.suffixSymbols.2.symbol>
+  <VoicePig.symbolPack.suffixSymbols.2.symbol>阉猪</VoicePig.symbolPack.suffixSymbols.2.symbol>
   <!-- EN: snorter -->
   <VoicePig.symbolPack.suffixSymbols.3.symbol>粗鼻</VoicePig.symbolPack.suffixSymbols.3.symbol>
   <!-- EN: squealer -->
@@ -374,9 +374,9 @@
   <VoicePig.symbolPack.wholeNameSymbols.2.symbol>粗鼻</VoicePig.symbolPack.wholeNameSymbols.2.symbol>
   
   <!-- EN: roar voice -->
-  <VoiceRoar.label>动物声音</VoiceRoar.label>
+  <VoiceRoar.label>兽吼</VoiceRoar.label>
   <!-- EN: Carriers have an animal-like roaring voice. -->
-  <VoiceRoar.description>这种基因的携带者在说话如同野兽咆哮。</VoiceRoar.description>
+  <VoiceRoar.description>这种基因的携带者发出的声音和野兽咆哮一样。</VoiceRoar.description>
   <!-- EN: roar -->
   <VoiceRoar.symbolPack.prefixSymbols.0.symbol>咆哮</VoiceRoar.symbolPack.prefixSymbols.0.symbol>
   <!-- EN: growl -->

Biotech/DefInjected/GeneDef/GeneDefs_Misc.xml

@@ -20,7 +20,7 @@
   <!-- EN: umbra -->
   <DarkVision.symbolPack.prefixSymbols.6.symbol>暗影的</DarkVision.symbolPack.prefixSymbols.6.symbol>
   <!-- EN: shadow -->
-  <DarkVision.symbolPack.suffixSymbols.0.symbol>阴影的</DarkVision.symbolPack.suffixSymbols.0.symbol>
+  <DarkVision.symbolPack.suffixSymbols.0.symbol>阴影</DarkVision.symbolPack.suffixSymbols.0.symbol>
   
   <!-- EN: fire resistant -->
   <FireResistant.label>火焰抗性</FireResistant.label>

Biotech/DefInjected/GeneDef/GeneDefs_Sanguophage.xml

@@ -6,21 +6,21 @@
   <!-- EN: Carriers of this gene have archites in the bloodstream which continuously reverse the process of aging. Starting at the age of 13, carriers begin to biologically age slower. By 18, the aging process stops completely. -->
   <Ageless.description>这种基因的携带者会将超凡微械充斥在血液中，不断逆转衰老过程。从13岁开始携带者的衰老速度便会不断减缓，在18岁时彻底停滞。</Ageless.description>
   <!-- EN: god -->
-  <Ageless.symbolPack.prefixSymbols.0.symbol>神之</Ageless.symbolPack.prefixSymbols.0.symbol>
+  <Ageless.symbolPack.prefixSymbols.0.symbol>太上</Ageless.symbolPack.prefixSymbols.0.symbol>
   <!-- EN: deo -->
   <Ageless.symbolPack.prefixSymbols.1.symbol>神圣</Ageless.symbolPack.prefixSymbols.1.symbol>
   <!-- EN: deu -->
-  <Ageless.symbolPack.prefixSymbols.2.symbol>圣</Ageless.symbolPack.prefixSymbols.2.symbol>
+  <Ageless.symbolPack.prefixSymbols.2.symbol>寿</Ageless.symbolPack.prefixSymbols.2.symbol>
   <!-- EN: methu -->
-  <Ageless.symbolPack.prefixSymbols.3.symbol>玛土</Ageless.symbolPack.prefixSymbols.3.symbol>
+  <Ageless.symbolPack.prefixSymbols.3.symbol>椿龄</Ageless.symbolPack.prefixSymbols.3.symbol>
   <!-- EN: god -->
-  <Ageless.symbolPack.suffixSymbols.0.symbol>神灵</Ageless.symbolPack.suffixSymbols.0.symbol>
+  <Ageless.symbolPack.suffixSymbols.0.symbol>仙</Ageless.symbolPack.suffixSymbols.0.symbol>
   <!-- EN: deus -->
-  <Ageless.symbolPack.suffixSymbols.1.symbol>神明</Ageless.symbolPack.suffixSymbols.1.symbol>
+  <Ageless.symbolPack.suffixSymbols.1.symbol>祖</Ageless.symbolPack.suffixSymbols.1.symbol>
   <!-- EN: immortal -->
-  <Ageless.symbolPack.wholeNameSymbols.0.symbol>不朽</Ageless.symbolPack.wholeNameSymbols.0.symbol>
+  <Ageless.symbolPack.wholeNameSymbols.0.symbol>不朽者</Ageless.symbolPack.wholeNameSymbols.0.symbol>
   <!-- EN: methuselah -->
-  <Ageless.symbolPack.wholeNameSymbols.1.symbol>玛土撒拉</Ageless.symbolPack.wholeNameSymbols.1.symbol>
+  <Ageless.symbolPack.wholeNameSymbols.1.symbol>彭祖</Ageless.symbolPack.wholeNameSymbols.1.symbol>
   
   <!-- EN: archite metabolism -->
   <ArchiteMetabolism.label>超凡代谢</ArchiteMetabolism.label>
@@ -38,15 +38,15 @@
   <!-- EN: god -->
   <Deathless.symbolPack.prefixSymbols.0.symbol>神之</Deathless.symbolPack.prefixSymbols.0.symbol>
   <!-- EN: deo -->
-  <Deathless.symbolPack.prefixSymbols.1.symbol>神圣</Deathless.symbolPack.prefixSymbols.1.symbol>
+  <Deathless.symbolPack.prefixSymbols.1.symbol>上帝</Deathless.symbolPack.prefixSymbols.1.symbol>
   <!-- EN: deu -->
   <Deathless.symbolPack.prefixSymbols.2.symbol>圣</Deathless.symbolPack.prefixSymbols.2.symbol>
   <!-- EN: god -->
-  <Deathless.symbolPack.suffixSymbols.0.symbol>神灵</Deathless.symbolPack.suffixSymbols.0.symbol>
+  <Deathless.symbolPack.suffixSymbols.0.symbol>之神</Deathless.symbolPack.suffixSymbols.0.symbol>
   <!-- EN: deus -->
-  <Deathless.symbolPack.suffixSymbols.1.symbol>神明</Deathless.symbolPack.suffixSymbols.1.symbol>
+  <Deathless.symbolPack.suffixSymbols.1.symbol>天神</Deathless.symbolPack.suffixSymbols.1.symbol>
   <!-- EN: immortal -->
-  <Deathless.symbolPack.wholeNameSymbols.0.symbol>不朽</Deathless.symbolPack.wholeNameSymbols.0.symbol>
+  <Deathless.symbolPack.wholeNameSymbols.0.symbol>不灭者</Deathless.symbolPack.wholeNameSymbols.0.symbol>
   
   <!-- EN: deathrest -->
   <Deathrest.label>死眠</Deathrest.label>

Biotech/DefInjected/GeneDef/GeneDefs_Spectrum.xml

@@ -538,7 +538,7 @@
   <!-- EN: psy-extreme -->
   <PsychicAbility_Extreme.labelShortAdj>心灵过敏的</PsychicAbility_Extreme.labelShortAdj>
   <!-- EN: psy -->
-  <PsychicAbility_Extreme.symbolPack.prefixSymbols.0.symbol>精神</PsychicAbility_Extreme.symbolPack.prefixSymbols.0.symbol>
+  <PsychicAbility_Extreme.symbolPack.prefixSymbols.0.symbol>阿莎丽</PsychicAbility_Extreme.symbolPack.prefixSymbols.0.symbol>
   <!-- EN: senso -->
   <PsychicAbility_Extreme.symbolPack.prefixSymbols.1.symbol>通感</PsychicAbility_Extreme.symbolPack.prefixSymbols.1.symbol>
   <!-- EN: sensi -->
@@ -596,7 +596,7 @@
   <!-- EN: tox-immune -->
   <ToxResist_Total.labelShortAdj>毒素免疫的</ToxResist_Total.labelShortAdj>
   <!-- EN: tox -->
-  <ToxResist_Total.symbolPack.prefixSymbols.0.symbol>毒免</ToxResist_Total.symbolPack.prefixSymbols.0.symbol>
+  <ToxResist_Total.symbolPack.prefixSymbols.0.symbol>免毒</ToxResist_Total.symbolPack.prefixSymbols.0.symbol>
   
   <!-- EN: intense UV sensitivity -->
   <UVSensitivity_Intense.label>日光过敏</UVSensitivity_Intense.label>

Biotech/DefInjected/RulePackDef/RulePacks_Genepacks.xml

@@ -89,56 +89,68 @@
     <li>commonPrefix->瑕疵</li>
     <li>commonPrefix->子株</li>
     <li>commonPrefix->外源</li>
-    <li>commonPrefix->管</li>
+    <li>commonPrefix->试管</li>
     <li>commonPrefix->实验</li>
     <li>commonPrefix->分离</li>
-    <li>commonPrefix->单</li>
+    <li>commonPrefix->非</li>
     <li>commonPrefix->优</li>
     <li>commonPrefix->厘</li>
-    <li>commonPrefix->微分</li>
+    <li>commonPrefix->回音</li>
     <li>commonPrefix->共鸣</li>
     <li>commonPrefix->过滤</li>
     <li>commonPrefix->格</li>
     <li>commonPrefix->角</li>
-    <li>commonPrefix->一</li>
+    <li>commonPrefix->仿</li>
-    <li>commonPrefix->根</li>
+    <li>commonPrefix->根源</li>
-    <li>commonPrefix->科尔</li>
+    <li>commonPrefix->半</li>
-    <li>commonPrefix->洛兹</li>
+    <li>commonPrefix->奎因</li>
-    <li>commonPrefix->马克</li>
+    <li>commonPrefix->普洛</li>
-    <li>commonPrefix->诺尔</li>
+    <li>commonPrefix->纯血</li>
     <li>commonPrefix->骨</li>
-    <li>commonPrefix->依</li>
+    <li>commonPrefix->器官收取</li>
-    <li>commonPrefix->组</li>
+    <li>commonPrefix->组件</li>
     <li>commonPrefix->拉克斯</li>
     <li>commonPrefix->塞尔</li>
-    <li>commonPrefix->特</li>
+    <li>commonPrefix->变异</li>
-    <li>commonPrefix->极</li>
+    <li>commonPrefix->特化</li>
-    <li>commonPrefix->沃克斯</li>
+    <li>commonPrefix->突锐</li>
-    <li>commonPrefix->呼</li>
+    <li>commonPrefix->异</li>
-    <li>commonPrefix->泽</li>
-    <li>commonPrefix->永</li>
     <li>commonPrefix->泽尔</li>
+    <li>commonPrefix->半兽</li>
+    <li>commonPrefix->兽</li>
     <li>commonSuffix->种</li>
     <li>commonSuffix->人</li>
-    <li>commonSuffix->按</li>
+    <li>commonSuffix->少女</li>
-    <li>commonSuffix->阿尔</li>
+    <li>commonSuffix->女孩</li>
-    <li>commonSuffix->多尔</li>
+    <li>commonSuffix->男孩</li>
-    <li>commonSuffix->达尔</li>
+    <li>commonSuffix->玩意</li>
-    <li>commonSuffix(p=3)->尔</li>
+    <li>commonSuffix->东西</li>
-    <li>commonSuffix(p=2)->恩</li>
+    <li>commonSuffix->儿</li>
-    <li>commonSuffix->亿滋</li>
+    <li>commonSuffix->偶</li>
-    <li>commonSuffix->名</li>
+    <li>commonSuffix(p=3)->人</li>
-    <li>commonSuffix->里</li>
+    <li>commonSuffix(p=2)->类</li>
-    <li>commonSuffix->伊尔</li>
+    <li>commonSuffix->民</li>
-    <li>commonSuffix->伊斯特</li>
+    <li>commonSuffix->族</li>
-    <li>commonSuffix->上</li>
+    <li>commonSuffix->民族</li>
-    <li>commonSuffix->欧尔</li>
+    <li>commonSuffix->蛮族</li>
-    <li>commonSuffix->欧克</li>
+    <li>commonSuffix->裔</li>
-    <li>commonSuffix->欧斯</li>
+    <li>commonSuffix->后裔</li>
-    <li>commonSuffix->阿布</li>
+    <li>commonSuffix->精</li>
-    <li>commonSuffix->阿尔</li>
+    <li>commonSuffix->精灵</li>
-    <li>commonSuffix->乌尔</li>
+    <li>commonSuffix->者</li>
-    <li>commonSuffix->乌斯</li>
+    <li>commonSuffix->之人</li>
+    <li>commonSuffix->子</li>
+    <li>commonSuffix->众</li>
+    <li>commonSuffix->怪</li>
+    <li>commonSuffix->怪兽</li>
+    <li>commonSuffix->灵</li>
+    <li>commonSuffix->鬼</li>
+    <li>commonSuffix->妖</li>
+    <li>commonSuffix->妖灵</li>
+    <li>commonSuffix->妖精</li>
+    <li>commonSuffix->佬</li>
+    <li>commonSuffix->侠</li>
+    <li>commonSuffix->仙</li>
   </NamerXenotype.rulePack.rulesStrings>
   
 </LanguageData>

Core/Strings/Names/EmpireTown.txt

@@ -151,4 +151,5 @@
 开罗
 贝鲁特
 雅法
-奥德萨
+奥德萨
+格拉摩根

Core/Strings/Names/Nick_Unisex_Pig.txt

@@ -27,7 +27,6 @@
 缝合怪
 肥佬
 狗牙
-野猪
 塔特
 斯塔
 地毯
@@ -134,7 +133,6 @@
 脂肪
 油脂
 驼背
-野猪
 粪便
 干草球
 馒头
@@ -150,4 +148,21 @@
 恶心
 涂抹
 卷曲的
-硬毛
+硬毛
+猪排
+猪扒
+肉脯
+公猪
+阉猪
+种猪
+野彘
+大猪
+肥猪
+佩奇
+猪猪侠
+麦兜
+波鲁克・罗梭
+肥嘟嘟左卫门
+炸猪排
+乙事主
+有田春雪