diff --git a/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA_FE_Spiritualist.xml b/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA_FE_Spiritualist.xml
index 09bd8354..078efb98 100644
--- a/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA_FE_Spiritualist.xml
+++ b/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA_FE_Spiritualist.xml
@@ -183,6 +183,7 @@
100
false
true
+ 0
ConsciousnessSource
@@ -193,6 +194,7 @@
120
false
true
+ 0
ConsciousnessSource
diff --git a/1.6/Defs/FactionDefs/Factions_Player_WULA.xml b/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
index 0c02927d..2114e4bb 100644
--- a/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
+++ b/1.6/Defs/FactionDefs/Factions_Player_WULA.xml
@@ -237,11 +237,8 @@
Wula_FE_Spiritualist_Leader
- Base_Empire_Standard
+ Wula_FE_Spiritualist_Faction_TraderKind
-
- Empire_Caravan_TraderGeneral
-
(0, 1)
@@ -277,20 +274,6 @@
1
-
- Trader
-
- 1
-
-
- 2
-
-
- 2
- 1
- 1
-
-
Miners
1
diff --git a/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml b/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
index f238aa72..faefe8ff 100644
--- a/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
+++ b/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml
@@ -457,7 +457,7 @@
为合成人安装暗物质处理器。
WULA_DM_CPU
- WULA_Energy_Furnace_Hediff_DM_CPU
+ WULA_DM_CPU_Hediff
安装暗物质处理器中
@@ -481,7 +481,7 @@
Brain
- WULA_Energy_Furnace_Hediff_DM_CPU
+ WULA_DM_CPU_Hediff
Smith
Recipe_Smith
diff --git a/1.6/Defs/HediffDefs/Hediffs_WULA_FE_Spiritualist.xml b/1.6/Defs/HediffDefs/Hediffs_WULA_FE_Spiritualist.xml
index f037a8fe..4ace4fa2 100644
--- a/1.6/Defs/HediffDefs/Hediffs_WULA_FE_Spiritualist.xml
+++ b/1.6/Defs/HediffDefs/Hediffs_WULA_FE_Spiritualist.xml
@@ -302,7 +302,7 @@
WULA_Brain_Soul_Wedge_Extract
HediffWithComps
- WULA_Brain_Hediff_Soul_Wedge_Extract
+ WULA_Brain_Soul_Wedge_Extract
true
diff --git a/1.6/Defs/HediffDefs/Hediffs_WULA_Maintenance.xml b/1.6/Defs/HediffDefs/Hediffs_WULA_Maintenance.xml
index 52cd2b90..c277ef6c 100644
--- a/1.6/Defs/HediffDefs/Hediffs_WULA_Maintenance.xml
+++ b/1.6/Defs/HediffDefs/Hediffs_WULA_Maintenance.xml
@@ -55,7 +55,7 @@
Consciousness
- 0.5
+ 0.1
diff --git a/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA_FE_Spiritualist.xml b/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA_FE_Spiritualist.xml
index f0f4ae4e..49b58137 100644
--- a/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA_FE_Spiritualist.xml
+++ b/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA_FE_Spiritualist.xml
@@ -3,9 +3,9 @@
Archotech
WULA_FE_Spiritualist_ResearchTab
-
+
@@ -19,6 +19,9 @@
WULA_Dark_Matter_Technology
WULA_Synth_Psi_Technology
+
diff --git a/1.6/Defs/ThingDefs/WULA_FE_Spiritualist_Item.xml b/1.6/Defs/ThingDefs/WULA_FE_Spiritualist_Item.xml
index 3adcf298..bba2a549 100644
--- a/1.6/Defs/ThingDefs/WULA_FE_Spiritualist_Item.xml
+++ b/1.6/Defs/ThingDefs/WULA_FE_Spiritualist_Item.xml
@@ -57,11 +57,11 @@
-
-
+
+
diff --git a/1.6/Defs/ThingDefs_Buildings/WULA_Buildings_Maintenance.xml b/1.6/Defs/ThingDefs_Buildings/WULA_Buildings_Maintenance.xml
index 4db8ff76..7f9943e9 100644
--- a/1.6/Defs/ThingDefs_Buildings/WULA_Buildings_Maintenance.xml
+++ b/1.6/Defs/ThingDefs_Buildings/WULA_Buildings_Maintenance.xml
@@ -1,6 +1,5 @@
-
WULA_MaintenancePod
@@ -34,7 +33,7 @@
150
10
- 2
+
8
@@ -84,5 +83,4 @@
PlaceWorker_PreventInteractionSpotOverlap
-
diff --git a/1.6/Defs/TraderKindDefs/TraderKinds_Wula.xml b/1.6/Defs/TraderKindDefs/TraderKinds_Wula.xml
new file mode 100644
index 00000000..4c2cb340
--- /dev/null
+++ b/1.6/Defs/TraderKindDefs/TraderKinds_Wula.xml
@@ -0,0 +1,475 @@
+
+
+
+ Wula_FE_Spiritualist_Faction_TraderKind
+ Wula_FE_Spiritualist_Faction
+ TradeSettlement
+
+
+
+
+ Silver
+ 800~3000
+
+
+ ComponentIndustrial
+ 20~70
+
+
+ ComponentSpacer
+ 8~16
+
+
+ Steel
+ 500~800
+
+
+ Plasteel
+ 200~350
+
+
+ Uranium
+ 80~300
+
+
+ Cloth
+ 400~600
+
+
+ Gold
+ 100~200
+
+
+ Neutroamine
+ 50~200
+
+
+ Chemfuel
+ 300~500
+
+
+ Chocolate
+ -30~70
+
+
+ MedicineUltratech
+ 25~50
+
+
+ 1~4
+
+
+ MortarShell
+ 1~2
+ 20~40
+
+ Shell_Deadlife
+
+
+
+ Textiles
+ 1~2
+ 400~800
+
+ Leather_Dread
+
+
+
+ ResourcesRaw
+ 2~4
+ 400~800
+
+ Bioferrite
+ GravlitePanel
+ BlocksVacstone
+
+
+
+ FoodRaw
+ 2~4
+ 400~800
+
+ EggsFertilized
+
+
+
+ FoodMeals
+ 2~3
+ 12~50
+
+
+
+
+ Drugs
+ 3~4
+ 700~1500
+
+
+
+
+
+
+ 2
+ 0.5
+
+
+ 3
+ 0.5
+
+
+
+
+
+
+ Books
+
+ Tome
+
+ 2
+ -2~1
+
+
+
+ -2~1
+
+
+
+ Schematic
+ 1~1
+
+
+
+
+ WeaponRanged
+ SpacerGun
+ 3~6
+
+
+ WeaponsMelee
+ 3~4
+ 1~2
+
+
+ PsychicWeapon
+ 1~2
+ 1~2
+
+
+ WeaponMelee
+ UltratechMelee
+ 1~2
+
+
+
+
+ BasicClothing
+ Royal
+ 7~12
+
+
+ Clothing
+ Royal
+ 3~4
+
+
+ HiTechArmor
+ 2~4
+ 2~4
+
+
+ PsychicApparel
+ 2~3
+ 1~3
+
+
+
+
+ ImplantEmpireCommon
+ 2~3
+ 1~3
+
+
+ ImplantEmpireRoyal
+ 2~3
+ 1~3
+
+
+ WeaponMelee
+ Bladelink
+ 1
+
+
+
+
+
+
+
+ Artifact
+ 1~4
+ 1~1
+
+
+ ExoticMisc
+ 1~4
+ 1~2
+
+ Luciferium
+ ComponentSpacer
+ MedicineUltratech
+
+
+ 100~200
+
+
+
+
+
+ Genepack
+ 1~1
+
+
+
+
+ Serum
+ 4~4
+ -3~1
+
+ VoidsightSerum
+
+
+
+
+
+ true
+ -1~2
+ Slave_Empire
+
+
+
+
+
+ AnimalUncommon
+ AnimalExotic
+ AnimalFarm
+
+ 1~2
+ 2~5
+
+ AnimalFarm
+
+
+
+
+
+ NeurotrainersPsycast
+ 2~2
+ 0~2
+
+
+
+
+ ArchiteCapsule
+ -1~2
+
+
+
+
+ DeathrestCapacitySerum
+ 0~1
+
+
+
+
+ Apparel_PackTurret
+ -1~2
+
+
+
+
+ Apparel_CultistMask
+ -1~2
+
+
+ Apparel_CeremonialCultistMask
+ -1~2
+
+
+
+
+ Art
+ MusicalInstrument
+ PsylinkNeuroformer
+ UtilitySpecial
+ Shell_Deadlife
+ VoidSculpture
+ Shard
+ Bioferrite
+ RevenantSpine
+
+
+
+
+
+ Wula_FE_Spiritualist_Faction_Caravan
+
+ 1
+ Wula_FE_Spiritualist_Faction
+ TradeCaravan
+
+
+
+
+ Silver
+ 750~1200
+
+
+ ResourcesRaw
+ 0~1
+
+ Bioferrite
+ GravlitePanel
+ BlocksVacstone
+
+
+
+ ComponentIndustrial
+ 3~7
+
+
+ ComponentSpacer
+ 3~7
+
+
+ Steel
+ 250~400
+
+
+ Cloth
+ 250~400
+
+
+ MedicineUltratech
+ 8~16
+
+
+ 1~4
+
+
+ MortarShell
+ 1~2
+ 10~20
+
+ Shell_Deadlife
+
+
+
+
+
+ Drugs
+
+
+
+
+
+
+ 1
+ 1
+
+
+
+
+
+
+ TextBook
+ 0~2
+
+
+
+ Schematic
+ 1~1
+
+
+
+ Novel
+ 1~1
+
+
+
+
+ WeaponRanged
+ SpacerGun
+ 1~3
+
+
+ PsychicWeapon
+ 1~2
+ 1~2
+
+
+
+
+ BasicClothing
+ Royal
+ 3~7
+
+
+ Clothing
+ Royal
+ 1~3
+
+
+ PsychicApparel
+ 2~3
+ 1~3
+
+
+ HiTechArmor
+ 0~2
+ 1~2
+
+
+
+
+ ImplantEmpireCommon
+ 1~2
+ 1~2
+
+
+ ImplantEmpireRoyal
+ 1~2
+ 1~2
+
+
+
+
+ 0.70
+
+ AnimalUncommon
+ AnimalExotic
+ AnimalFarm
+
+
+ AnimalExotic
+
+ 2~2
+ 3~4
+
+ AnimalFarm
+
+
+
+
+
+ Genepack
+ 1~2
+
+
+
+
+ Art
+ MusicalInstrument
+ PsylinkNeuroformer
+
+
+
+
\ No newline at end of file