add gitignore

2020-02-27 20:59:39 +08:00 · 2020-02-27 20:59:39 +08:00 · d9e23d9391
commit d9e23d9391
parent 2504098b96
14 changed files with 464 additions and 26 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,438 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- Backup*.rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+##
+## Visual studio for Mac
+##
+
+
+# globs
+Makefile.in
+*.userprefs
+*.usertasks
+config.make
+config.status
+aclocal.m4
+install-sh
+autom4te.cache/
+*.tar.gz
+tarballs/
+test-results/
+
+# Mac bundle stuff
+*.dmg
+*.app
+
+# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+##
+## Visual Studio Code
+##
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+##
+## RimWorld Language Package
+##
+*.tar
--- a/.vs/RimWorld-ChineseSimplified/v16/.suo
+++ b/.vs/RimWorld-ChineseSimplified/v16/.suo
--- a/.vs/slnx.sqlite
+++ b/.vs/slnx.sqlite
--- a/Core/DefInjected/ResearchProjectDef/ResearchProjects_2_Electricity.xml
+++ b/Core/DefInjected/ResearchProjectDef/ResearchProjects_2_Electricity.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
  
  <!-- EN: air conditioning -->
@ -47,7 +47,7 @@
  <FlakArmor.description>解锁制作含有金属材质的衣服，用以抵抗子弹和爆炸。这类防具会稍微减慢移动速度。</FlakArmor.description>
  
  <!-- EN: gas operation -->
-  <GasOperation.label>气流操控</GasOperation.label>
+  <GasOperation.label>气动系统</GasOperation.label>
  <!-- EN: Craft high-power guns like chain shotguns, LMGs, and heavy SMGs. -->
  <GasOperation.description>制作大威力枪械，比如重型冲锋枪，链式霰弹枪和轻机枪。</GasOperation.description>
  
--- a/Core/DefInjected/WorkGiverDef/WorkGivers.xml
+++ b/Core/DefInjected/WorkGiverDef/WorkGivers.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
  
  <!-- EN: release prisoners -->
@ -291,7 +291,7 @@
  <!-- EN: tend to self -->
  <DoctorTendToSelfEmergency.label>治疗自己</DoctorTendToSelfEmergency.label>
  <!-- EN: tending to -->
-  <DoctorTendToSelfEmergency.gerund>正在治疗</DoctorTendToSelfEmergency.gerund>
+  <DoctorTendToSelfEmergency.gerund>治疗</DoctorTendToSelfEmergency.gerund>
  <!-- EN: tend to -->
  <DoctorTendToSelfEmergency.verb>治疗</DoctorTendToSelfEmergency.verb>
  
--- a/Core/Keyed/Dialogs_Various.xml
+++ b/Core/Keyed/Dialogs_Various.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>

  <!-- EN: Confirm -->
@ -895,7 +895,7 @@

  <!-- Confirm cancel monument marker -->
  <!-- EN: Do you really want to remove this monument marker? -->
-  <ConfirmCancelMonumentMarker>确定要消除纪念碑上的标记嘛？</ConfirmCancelMonumentMarker>
+  <ConfirmCancelMonumentMarker>确定要移除这个纪念碑标记吗？</ConfirmCancelMonumentMarker>

  <!-- Abilities -->
  <!-- EN: Line of sight required -->
--- a/Core/Keyed/MainTabs.xml
+++ b/Core/Keyed/MainTabs.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>

  <!-- Work tab -->
@ -239,7 +239,7 @@
  <!-- EN: Accept with {0_labelShort} -->
  <AcceptWith>接受{0_labelShort}</AcceptWith>
  <!-- EN: The offer expired. -->
-  <QuestOutcomeInfo_OfferExpired>折价已过期</QuestOutcomeInfo_OfferExpired>
+  <QuestOutcomeInfo_OfferExpired>提议已过期</QuestOutcomeInfo_OfferExpired>
  <!-- EN: You completed this quest. -->
  <QuestOutcomeInfo_UnknownOrSuccess>你已完成此任务。</QuestOutcomeInfo_UnknownOrSuccess>
  <!-- EN: You failed this quest. -->
--- a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Root_Basic.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Root_Basic.xml
@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
  
  <!-- EN:
    <li>commonEnding->The monument is [monumentSize] in size and will require these resources (total value [monumentRequiredResourcesMarketValue_money]):\n\n[monumentRequiredResources]\n\nConstruction must be completed within [constructionTimeoutTicks_duration] of accepting the task. Upon completion, [allRewardsDescriptions]</li>
  -->
  <BuildMonument_Basic.questDescriptionRules.rulesStrings>
-    <li>commonEnding->建造这个[monumentSize]纪念需要如下资源（总价值：[monumentRequiredResourcesMarketValue_money]）：\n\n[monumentRequiredResources]\n\n一旦开始这项工程，建设必须在[constructionTimeoutTicks_duration]内完成。完成后，[allRewardsDescriptions]</li>
+    <li>commonEnding->建造这个[monumentSize]纪念碑需要如下资源（总价值：[monumentRequiredResourcesMarketValue_money]）：\n\n[monumentRequiredResources]\n\n一旦开始这项工程，建设必须在[constructionTimeoutTicks_duration]内完成。完成后，[allRewardsDescriptions]</li>
  </BuildMonument_Basic.questDescriptionRules.rulesStrings>
  
 </LanguageData>
--- a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Root_TimeProtect.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Root_TimeProtect.xml
@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
  
  <!-- EN:
    <li>commonEnding->The monument is [monumentSize] in size and will require these resources (total value [monumentRequiredResourcesMarketValue_money]):\n\n[monumentRequiredResources]\n\nConstruction must be completed within [constructionTimeoutTicks_duration] of accepting the task.\n\nAfter completion, you'll have to protect the monument for [haveToProtectForTicks_duration]. If any piece of it is destroyed, [asker2]'s enforcement system will activate and [threatDescription]\n\nWhen you finish construction, [allRewardsDescriptions]</li>
  -->
  <BuildMonument_TimeProtect.questDescriptionRules.rulesStrings>
-    <li>commonEnding->建造这个[monumentSize]纪念需要如下资源（总价值：[monumentRequiredResourcesMarketValue_money]）：\n\n[monumentRequiredResources]\n\n一旦开始这项工程，建设必须在[constructionTimeoutTicks_duration]内完成。\n\n建造完成后，你需要在[haveToProtectForTicks_duration]内持续保护好纪念碑。如果纪念碑受到一点损伤，[asker2]的执行系统将会激活并且[threatDescription]\n\n当你完成所有工作后，[allRewardsDescriptions]</li>
+    <li>commonEnding->建造这个[monumentSize]纪念碑需要如下资源（总价值：[monumentRequiredResourcesMarketValue_money]）：\n\n[monumentRequiredResources]\n\n一旦开始这项工程，建设必须在[constructionTimeoutTicks_duration]内完成。\n\n建造完成后，你需要在[haveToProtectForTicks_duration]内持续保护好纪念碑。如果纪念碑受到一点损伤，[asker2]的执行系统将会激活并且[threatDescription]\n\n当你完成所有工作后，[allRewardsDescriptions]</li>
  </BuildMonument_TimeProtect.questDescriptionRules.rulesStrings>
  <!-- EN: Monument completed -->
  <BuildMonument_TimeProtect.root.nodes.monumentMarkerMonumentCompleted.node.label.slateRef>纪念碑已完成</BuildMonument_TimeProtect.root.nodes.monumentMarkerMonumentCompleted.node.label.slateRef>
--- a/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_BuildMonument_Worker.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
  
  <!-- EN: The monument for the quest '[resolvedQuestName]' has been violated. Punishment will now occur. -->
@ -6,7 +6,7 @@
  <!-- EN: New monument marker arrived -->
  <BuildMonumentWorker.root.nodes.monumentMarkerDestroyed.node.nodes.Letter.label.slateRef>新的纪念碑标记已抵达</BuildMonumentWorker.root.nodes.monumentMarkerDestroyed.node.nodes.Letter.label.slateRef>
  <!-- EN: Since the monument marker has been destroyed, a new one has been sent. -->
-  <BuildMonumentWorker.root.nodes.monumentMarkerDestroyed.node.nodes.Letter.text.slateRef>一个新的纪念碑标记已经发出，用于替换被摧毁的那个。</BuildMonumentWorker.root.nodes.monumentMarkerDestroyed.node.nodes.Letter.text.slateRef>
+  <BuildMonumentWorker.root.nodes.monumentMarkerDestroyed.node.nodes.Letter.text.slateRef>已发送一个新的纪念碑标记，用于替换被摧毁的那个。</BuildMonumentWorker.root.nodes.monumentMarkerDestroyed.node.nodes.Letter.text.slateRef>
  <!-- EN: Protect the monument for {0} -->
  <BuildMonumentWorker.root.nodes.Delay-0.expiryInfoPart.slateRef>保护纪念碑{0}</BuildMonumentWorker.root.nodes.Delay-0.expiryInfoPart.slateRef>
  <!-- EN: Protect the monument until {0} -->
--- a/Royalty/DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_ChangeRoyalHeir.xml
@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
  
  <!-- EN:
    <li>questDescription->\nIn order to consecrate making [titleHeir_nameFull] the heir of [titleHolder_nameFull]'s title, you must build a monument.\n\nThe monument will be [monumentSize] in size and will require these resources (total value [monumentRequiredResourcesMarketValue_money]):\n\n[monumentRequiredResources]\n\nFailing to finish the monument within 20 days is considered to profane the ritual. Your relations with [asker_factionName] will fall by 25, and the heir will not be changed.</li>
  -->
  <ChangeRoyalHeir.questDescriptionRules.rulesStrings>
-    <li>questDescription->\n为了让[titleHeir_nameFull]名正言顺的承袭[titleHolder_nameFull]头衔，你必须为此建造一座纪念碑。\n\n建造这个[monumentSize]纪念需要如下资源（总价值：[monumentRequiredResourcesMarketValue_money]）：\n\n[monumentRequiredResources]\n\n如果你没能在20天内完成这项工作，将被视为对此仪式的一种亵渎。与[asker_factionName]的关系将下降25，承袭人也不会有任何改变。</li>
+    <li>questDescription->\n为了让[titleHeir_nameFull]名正言顺的承袭[titleHolder_nameFull]头衔，你必须为此建造一座纪念碑。\n\n建造这个[monumentSize]纪念碑需要如下资源（总价值：[monumentRequiredResourcesMarketValue_money]）：\n\n[monumentRequiredResources]\n\n如果你没能在20天内完成这项工作，将被视为对此仪式的一种亵渎。与[asker_factionName]的关系将下降25，承袭人也不会有任何改变。</li>
  </ChangeRoyalHeir.questDescriptionRules.rulesStrings>
  <!-- EN:
    <li>questName->[titleHeir_nameDef]'s inheritance</li>
--- a/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
+++ b/Royalty/DefInjected/QuestScriptDef/Script_Hospitality_Root_Joiners.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
  
  <!-- EN:
@ -77,7 +77,7 @@
    <li>threatsInfo2(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[threatsInfoMechRaidsMultiHuman] [enemyGroupsParagraph]</li>
    <li>threatsInfo2(generateThreats==true,allowedThreats==MechClusters)->\n\n这些旅行者最近[mechViolation]，并成为轨道平台上机械集群的目标。只要它们还存在，机械集群就会定期从轨道上降落。</li>
    <li>threatsInfo2(generateThreats==false)-></li>
-    <li>questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==false)->[asker_faction_name]的[asker_faction_leaderTitle][asker_nameFull]正在寻求帮助。[asker_possessive]的朋友[lodgers0_nameFull]对学习异族文化很感兴趣。[asker_nameDef]希望你能在[shuttleDelayTicks_duration]内向[map_definite]提供[lodgers0_nameDef]。[allLodgerInfo]\n\n[commonDescEnding] [joinerEnding]</li>
+    <li>questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==false)->[asker_faction_name]的[asker_faction_leaderTitle][asker_nameFull]正在寻求帮助。[asker_possessive]朋友[lodgers0_nameFull]对学习异族文化很感兴趣。[asker_nameDef]希望你能在[shuttleDelayTicks_duration]内向[map_definite]提供[lodgers0_nameDef]。[allLodgerInfo]\n\n[commonDescEnding] [joinerEnding]</li>
    <li>questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->[asker_faction_name]的[asker_faction_leaderTitle][asker_nameFull]正在寻求帮助。[asker_possessive][lodgers0_age]岁的朋友，[lodgers0_title][lodgers0_nameDef]被发现对[enemyFaction_leader_nameFull]的PersonalCharacteristic]进行恶意侮辱。[asker_nameDef]希望你为[lodgers0_nameDef]提供[shuttleDelayTicks_duration]的保护，让[asker_possessive]有足够的时间缓和与 [enemyFaction_name]的关系。[allLodgerInfo]\n\n因为[enemyFaction_leader_nameDef]是[enemyFaction_name]的[enemyFaction_leaderTitle]，[enemyFaction_leader_pronoun]已经派遣一群[enemyFaction_pawnsPlural]前来抓捕侮辱者[lodgers0_nameDef]。 [enemyGroupsParagraph]\n\n[commonDescEnding] [joinerEnding]</li>
    <li>questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->[asker_faction_name]的[asker_faction_leaderTitle][asker_nameFull]正在寻求帮助。[asker_possessive][lodgers0_age]岁的朋友，[lodgers0_title][lodgers0_nameDef]最近[mechViolation]。[asker_nameDef]希望你为[lodgers0_nameDef]提供[shuttleDelayTicks_duration]的保护，让[asker_possessive]有足够的时间处理机械族巢穴。[allLodgerInfo]\n\n机械族会来抓捕[lodgers0_nameDef]。[enemyGroupsParagraph]\n\n[commonDescEnding] [joinerEnding]</li>
    <li>questDescription(asker_factionLeader==True,lodgersCount==1,generateThreats==true,allowedThreats==MechClusters)->[asker_faction_name]的[asker_faction_leaderTitle][asker_nameFull]正在寻求帮助。[asker_possessive][lodgers0_age]岁的朋友，[lodgers0_title][lodgers0_nameDef]最近被[mechViolation]。[asker_nameDef]希望你为[lodgers0_nameDef]提供[shuttleDelayTicks_duration]的保护。只要[lodgers0_nameDef]在这里，机械集群就会到来。 [allLodgerInfo][threatsInfo1] [allLodgerInfo]\n\n[commonDescEnding] [joinerEnding]</li>
@ -96,9 +96,9 @@
    <li>threatsInfo5(generateThreats==true,allowedThreats==MechClusters)->\n\n[asker_nameDef]的敌人用某种未知的方式引来机械集群猎杀[asker_objective]。只要[asker_nameDef]还在那里，机械战斗集群就会不断地在[asker_nameDef]降落。</li>
    <li>threatsInfo5(generateThreats==false)-></li>
    <li>questDescription(asker_royalInCurrentFaction==True,lodgersCount>=2)->[asker_faction_name]的[asker_royalTitleInCurrentFaction][asker_nameFull]想在[map_definite]停留[shuttleDelayTicks_duration]对[lodgersCountMinusOne]个[allyAllies]进行审判。 [allLodgerInfo][threatsInfo6]\n\n[commonDescEnding] [joinerEnding]</li>
-    <li>threatsInfo6(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n[asker_nameDef]和[asker_possessive]的 [allyAllies] 被列上了暗杀名单，他们需要一个安全的庇护所直到他们可以免于被审判。然而，[asker_nameDef]的敌人雇佣了[enemyFaction_name]来追捕[asker_objective]。他们会不断进攻，直到[asker_nameDef]离开。[enemyGroupsParagraph]</li>
-    <li>threatsInfo6(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[asker_nameDef]和[asker_possessive]的 [allyAllies] 被列上了暗杀名单，他们需要一个安全的庇护所直到他们可以免于被审判。然而，[asker_nameDef]的敌人引诱[enemyFaction_name]来猎杀[asker_objective]。机械族会不断进攻，直到[asker_nameDef]离开。 [enemyGroupsParagraph]</li>
-    <li>threatsInfo6(generateThreats==true,allowedThreats==MechClusters)->\n\n[asker_nameDef]和[asker_possessive]的 [allyAllies] 被列上了暗杀名单，他们需要一个安全的庇护所直到他们可以免于被审判。然而，[asker_nameDef]的敌人以某种未知的方式引诱机械集群来猎杀[asker_objective]。因此，机械战斗集群会定期降落到[map_definite] ，直到[asker_nameDef]离开。</li>
+    <li>threatsInfo6(generateThreats==true,allowedThreats==Raids,enemyFaction!=Mechanoid)->\n\n[asker_nameDef]和[asker_possessive][allyAllies] 被列上了暗杀名单，他们需要一个安全的庇护所直到他们可以免于被审判。然而，[asker_nameDef]的敌人雇佣了[enemyFaction_name]来追捕[asker_objective]。他们会不断进攻，直到[asker_nameDef]离开。[enemyGroupsParagraph]</li>
+    <li>threatsInfo6(generateThreats==true,allowedThreats==Raids,enemyFaction==Mechanoid)->\n\n[asker_nameDef]和[asker_possessive][allyAllies] 被列上了暗杀名单，他们需要一个安全的庇护所直到他们可以免于被审判。然而，[asker_nameDef]的敌人引诱[enemyFaction_name]来猎杀[asker_objective]。机械族会不断进攻，直到[asker_nameDef]离开。 [enemyGroupsParagraph]</li>
+    <li>threatsInfo6(generateThreats==true,allowedThreats==MechClusters)->\n\n[asker_nameDef]和[asker_possessive][allyAllies] 被列上了暗杀名单，他们需要一个安全的庇护所直到他们可以免于被审判。然而，[asker_nameDef]的敌人以某种未知的方式引诱机械集群来猎杀[asker_objective]。因此，机械战斗集群会定期降落到[map_definite] ，直到[asker_nameDef]离开。</li>
    <li>threatsInfo6(generateThreats==false)-></li>
    <li>allyAllies(lodgersCountMinusOne==1)->盟友</li>
    <li>allyAllies(lodgersCountMinusOne>=2)->盟友们</li>
--- a/Royalty/DefInjected/TipSetDef/Tips.xml
+++ b/Royalty/DefInjected/TipSetDef/Tips.xml
@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <LanguageData>
  
  <!-- EN: Some royal titles allow the holder to call for military aid. This can save you in a tough moment. -->
  <RoyaltyTips.tips.0>一些荣誉头衔允许持有者要求军事援助。这能够帮助你脱离险境。</RoyaltyTips.tips.0>
  <!-- EN: Higher royal title holders have a special need for authority. They satisfy it by reigning from a throne. -->
-  <RoyaltyTips.tips.1>高级荣誉头衔持有者需要更高的权威。请通过建造「宝座」满足需求。</RoyaltyTips.tips.1>
+  <RoyaltyTips.tips.1>高级荣誉头衔持有者对于威严有独特的要求。请通过建造「宝座」满足需求。</RoyaltyTips.tips.1>
  <!-- EN: Higher level royal colonists won't eat food that is below their expectations, unless they're starving. -->
  <RoyaltyTips.tips.2>高等贵族殖民者不会吃低于他们期望的食物，除非他们要饿死了。</RoyaltyTips.tips.2>
  <!-- EN: Power armor, cataphract armor and psyfocus apparel will satisfy the apparel requirements of royal titles. -->
@ -20,7 +20,7 @@
  <!-- EN: The Empire restricts usage of certain implants to those with specific royal titles. Using them illegally may lead to diplomatic consequences with the Empire. -->
  <RoyaltyTips.tips.8>「帝国」限制某些植入物为特定荣誉头衔专用。非法使用将造成不良的外交后果。</RoyaltyTips.tips.8>
  <!-- EN: The psychic silencer implant masks psychic signatures, preventing authorities from detecting illegal psychic powers. -->
-  <RoyaltyTips.tips.9>「心灵静默装置」会掩盖心灵签名，防止非法使用心灵力量被发现。</RoyaltyTips.tips.9>
+  <RoyaltyTips.tips.9>「心灵静默装置」会掩盖心灵信号，防止非法使用心灵力量被发现。</RoyaltyTips.tips.9>
  <!-- EN: Installing a new level of psychic amplifier grants knowledge of one psycast. -->
  <RoyaltyTips.tips.10>每次安装更高级别的「心灵增幅装置」都会授予一个新的「心灵能力」。</RoyaltyTips.tips.10>
  <!-- EN: Psycasts can give you significant advantage in combat. -->
@ -34,7 +34,7 @@
  <!-- EN: Creatures with higher psychic sensitivity are affected more by psycasts. -->
  <RoyaltyTips.tips.15>「心理敏感度」越高，受到「心灵能力」的影响越大。</RoyaltyTips.tips.15>
  <!-- EN: Fitting your psycasters with psyfocus gear will increase their psychic entropy limit and regeneration rate. -->
-  <RoyaltyTips.tips.16>为「心灵能力者」安装「心灵聚合物齿轮」会提高「心灵熵阈值」上限，增加「心灵熵降低速率」。</RoyaltyTips.tips.16>
+  <RoyaltyTips.tips.16>为「心灵能力者」配备心灵聚焦饰品会提高「心灵熵阈值」上限，增加「心灵熵降低速率」。</RoyaltyTips.tips.16>
  <!-- EN: When fighting a mech cluster, try shooting their power cells. They explode, dealing heavy damage to surrounding creatures and structures. -->
  <RoyaltyTips.tips.17>与机械集群战斗时，请尝试射击它们的能量电池。巨大的爆炸将破坏范围内的生物，机械和建筑。</RoyaltyTips.tips.17>
  <!-- EN: Some mech clusters remain dormant until disturbed. Use that time to prepare your attack. -->
--- a/Royalty/Keyed/GameplayCommands.xml
+++ b/Royalty/Keyed/GameplayCommands.xml
@ -5,7 +5,7 @@
  <!-- EN: Choose a new heir for {HOLDER_nameIndef}: -->
  <ChooseHeir>为{HOLDER_nameIndef}选择一个新的继承人:</ChooseHeir>
  <!-- EN: You're about to change the heir of the title {HOLDER_nameIndef} recieved from {0_name}. This requires building a monument in a limited time, to consecrate the new inheritance. -->
-  <MakeHeirConfirm>你要更改从{0_name}获得的头衔{HOLDER_nameIndef}的继承人。这需要在有限的时间内建造一个纪念碑，以奉献新的继承权。</MakeHeirConfirm>
+  <MakeHeirConfirm>你要更改从{0_name}获得的头衔{HOLDER_nameIndef}的继承人。这需要在有限的时间内建造一个纪念碑，以宣称新的继承权。</MakeHeirConfirm>
  <!-- EN: This will upset {HOLDER_possessive} current heir {HEIR_nameFull}. -->
  <MakeHeirPreviousHeirWarning>这将使{HOLDER_possessive}个当前继承人{HEIR_nameFull}不高兴。</MakeHeirPreviousHeirWarning>