Merge pull request #153 from VaniatD/master

update to 2577

Core/DefInjected/RulePackDef/RulePacks_CombatIncludes.xml

@@ -186,8 +186,6 @@
     <li>wince(recipient_flesh!=Mechanoid)->发出噪音</li>
     <li>wince->退缩</li>
     <li>wince->跌倒</li>
-    <li>to->to</li>
-    <li>to->into</li>
     <li>painstate->感到</li>
     <li>painstate->觉得</li>
     <li>painstate-></li>
@@ -196,6 +194,8 @@
     <li>painevent(recipient_flesh==Normal)->痛苦</li>
     <li>painevent->受伤部位</li>
     <li>painevent->伤口</li>
+    <li>to->到</li>
+    <li>to->至</li>
   </Combat_MeleeIncludes.rulePack.rulesStrings>
   
   <!-- EN:

Core/Keyed/Messages.xml

@@ -470,7 +470,7 @@
   <!-- EN: harvested {0} -->
   <GoodwillChangedReason_RemovedBodyPart>割取了{0}的器官</GoodwillChangedReason_RemovedBodyPart>
   <!-- EN: removed {0} -->
-  <GoodwillChangedReason_RemovedImplant>移除了{0}</GoodwillChangedReason_RemovedImplant>
+  <GoodwillChangedReason_RemovedImplant>移除了{0}的植入物</GoodwillChangedReason_RemovedImplant>
   <!-- EN: downgraded {0} -->
   <GoodwillChangedReason_DowngradedImplant>降低了 {0}</GoodwillChangedReason_DowngradedImplant>
   <!-- EN: needlessly installed {0} -->

Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml

@@ -67,7 +67,7 @@
     <li>threatsInfo1(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsSingleHuman] [enemyGroupsParagraph]</li>
     <li>threatsInfo1(generateThreats==true,allowedThreats==MechClusters)->\n\n[threatsInfoMechClustersSingleHuman]</li>
     <li>threatsInfo1(generateThreats==false)-></li>
-    <li>wrongAct->侮辱了[enemyFaction_name]的[enemyFaction_leaderTitle][enemyFaction_leader_nameDef]的[PersonalCharacteristic]</li>
+    <li>wrongAct->侮辱了 [enemyFaction_name] [enemyFaction_leaderTitle] [enemyFaction_leader_nameDef] 的 [PersonalCharacteristic]</li>
     <li>wrongAct->窃取了 [enemyFaction_name] 的牲畜</li>
     <li>wrongAct->窃取了 [enemyFaction_name] 的食物</li>
     <li>wrongAct->窃取了 [enemyFaction_name] 的精神象征物</li>