diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll
index d5065034..dd999220 100644
Binary files a/1.6/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/1.6/Assemblies/WulaFallenEmpire.dll differ
diff --git a/1.6/1.6/Defs/AbilityDefs/WULA_Flyover_Ability.xml b/1.6/1.6/Defs/AbilityDefs/WULA_Flyover_Ability.xml
index 52cb438e..caeed408 100644
--- a/1.6/1.6/Defs/AbilityDefs/WULA_Flyover_Ability.xml
+++ b/1.6/1.6/Defs/AbilityDefs/WULA_Flyover_Ability.xml
@@ -5,7 +5,7 @@
发送增援请求,呼叫乌拉帝国舰队的一艘母舰前往殖民地。\n\n隶属于乌拉帝国边缘开发署的母舰是帝国殖民地扩张的基石,它们徘徊于近地轨道上,随时为下面的乌拉帝国殖民地提供援助。母舰的速度非常慢,在离开轨道前,它们能够提供好几天的全方位的支援。\n\n母舰拥有以下设施:\n<color=#6BB7B7><i>-生产设施</i></color>\n<color=#DEC28F><i>-建筑空投设施</i></color>\n<color=#BD952F><i>-机库</i></color>\n<color=#BD2F31><i>-武器阵列</i></color>
Wula/UI/Abilities/WULA_CallBattleShip
- 640000
+ 1
Misc12
false
@@ -13,14 +13,20 @@
true
false
true
- 8
+ 5
-1
false
- True
+ false
+ true
+
+ WULA_BattleShip_Entity
+ 640000
+ 1
+
WULA_BattleShip
Standard
diff --git a/1.6/1.6/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml b/1.6/1.6/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml
index b726d2e8..455bb44b 100644
--- a/1.6/1.6/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml
+++ b/1.6/1.6/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml
@@ -28,7 +28,6 @@
None
Wula_Synth
- WULA_Maintenance_Neglect
WULA_Addons_Antenna_Hediff_Base
diff --git a/1.6/1.6/Defs/EventDefs/EventDef_Examples.xml b/1.6/1.6/Defs/EventDefs/EventDef_Examples.xml
index ba3128f1..541d50bb 100644
--- a/1.6/1.6/Defs/EventDefs/EventDef_Examples.xml
+++ b/1.6/1.6/Defs/EventDefs/EventDef_Examples.xml
@@ -68,7 +68,7 @@
-
+
diff --git a/1.6/1.6/Defs/EventDefs/EventDef_Wula.rar b/1.6/1.6/Defs/EventDefs/EventDef_Wula.rar
new file mode 100644
index 00000000..7e724df7
Binary files /dev/null and b/1.6/1.6/Defs/EventDefs/EventDef_Wula.rar differ
diff --git a/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml b/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml
deleted file mode 100644
index 7129ce7c..00000000
--- a/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml
+++ /dev/null
@@ -1,931 +0,0 @@
-
-
-
-
- Wula_UI_Main_1
-
- Wula/Events/Portraits/Wula_insignal
-
- 基站运转正常,通讯程序已启动。\n\n需要联络乌拉帝国的哪个派系?
-
-
-
-
-
- Wula_UI_Check_Odyssey_Is_Active
-
-
- Wula_UI_Check_Anomaly_Is_Active
-
-
- Wula_UI_Check_Odyssey_Is_Active
- 0
- Int
-
-
- Wula_UI_Check_Anomaly_Is_Active
- 0
- Int
-
-
- Wula_UI_Check_Odyssey_Is_Active
- 1
- Add
-
-
- Wula_UI_Check_Anomaly_Is_Active
- 1
- Add
-
-
-
-
- Wula_FE_Spiritualist_First_Contant
- 0
- Int
-
-
- Wula_FE_Materialist_First_Contant
- 0
- Int
-
-
-
- Wula_FE_Spiritualist_Goodwill
-
-
- Wula_FE_Spiritualist_Faction
- Wula_FE_Spiritualist_Goodwill
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_1
-
- Wula/Events/Portraits/WULA_Anisia_1
- URa-1138「艾妮西娅」
-
- 很高兴看到你们的殖民地没有变成荒野中的烂泥。那么,今天找我有什么事情?
- 宇宙生存法则第一条:不要惹平胸火气大的女人。
- 什么样的结局,才配得上这一路的颠沛流离?无论你们走向何方,我都将见证你们。
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_10
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_200
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_10
-
- Wula/Events/Portraits/WULA_Anisia_6
- URa-1138「艾妮西娅」
-
- 好学在这个黑暗的时代是如金子般珍贵而闪亮的特质。你们想问什么?
- 可以啊,问吧?
- 这次就不收你们咨询费了,想问什么?
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_100
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_101
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_110
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_1
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_100
-
- Wula/Events/Portraits/WULA_Anisia_3
- URa-1138「艾妮西娅」
-
- 什么啊,我没有给你们做过自我介绍吗?难道是我记错了?\n\n咳,你们可以叫我守密者,我是负责看护乌拉帝国知识库的编目司书。然后如你们所见——我是乌拉帝国的合成人,诞生于乌拉帝国最恢弘的黄金时代,承载着先祖的意志,阻止乌拉帝国散佚的先进科技泄露到一些宵小之辈手中。
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_1
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_101
-
- Wula/Events/Portraits/WULA_Anisia_3
- URa-1138「艾妮西娅」
-
- 那么,你们的殖民地现在发展的怎么样了?基于我的立场,我只会给出关于乌拉帝国科技方面的建议噢?
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_102
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_103
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_104
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_1
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_102
-
- Wula/Events/Portraits/WULA_Anisia_2
- URa-1138「艾妮西娅」
-
- 啊,原来是刚被唤醒吗?好吧,希望你们没有在漫长的沉睡中忘记了自己的技能。\n\n由机械乌拉主持的乌拉帝国殖民地通常不需要食物和宿舍,但是需要准备工作台「乌拉帝国编织体」来为确保殖民地拥有足够的能源核心供应。能源核心是维持乌拉帝国合成人运转的基础,不要等到大伙都没电才追悔莫及。
- 啊,原来是刚被唤醒吗?好吧,希望你们没有在漫长的沉睡中忘记了自己的技能。\n\n乌拉帝国合成人的运转需要乌拉帝国能源核心,这种核心需要零部件进行组装,但是被使用过的能源核心则只需要在「乌拉帝国编织体」进行充电即可。生物能的乌拉帝国编织体需要消耗化合燃料进行充能,电能的编织体则无需消耗任何资源即可充能。
- 啊,原来是刚被唤醒吗?好吧,希望你们没有在漫长的沉睡中忘记了自己的技能。\n\n黄金时代的机械乌拉在经历乌拉帝国人工智能网络崩溃后,人格矩阵都不太稳定——当然,我是特例。注意殖民地的整体心情,任何崩溃的机械乌拉都会被边缘世界上的反常网络识别并监管,她们将直接叛变殖民地!尽量不要把事情闹到那一边,好吗?
- 啊,原来是刚被唤醒吗?好吧,希望你们没有在漫长的沉睡中忘记了自己的技能。\n\n乌拉猫猫是机械乌拉的得力助手,它们是一个拥有多种型号的机械助手,可以承担很多工作。机械乌拉与生俱来的设计使得她们可以控制少量的乌拉猫猫为其效命。你可以研究科技「机械体构建套件」,以组装更多的小小劳工。
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_102
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_101
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_103
-
- Wula/Events/Portraits/WULA_Anisia_1
- URa-1138「艾妮西娅」
-
- 很高兴听到这样的自我评价,自信是这块烂地生存的资本。\n\n你们已经研究了「高级编织体套件」了吗?如果没有记得优先研究,乌拉帝国许多高级装备只能通过这种工作台生产,并且改用电能也可以告别天天找柴火烧的苦日子——那可真是太原始了。
- 很高兴听到这样的自我评价,自信是这块烂地生存的资本。\n\n乌拉帝国的合成人无惧于任何伤势,她们不会流血,并且可以通过手术快速修补替换残缺的肢体。研究「修理套件」,生产机械乌拉修理套件,以享受合成人的坚不可摧之力吧。
- 很高兴听到这样的自我评价,自信是这块烂地生存的资本。\n\n或许你们已经筹划好增添新丁了?研究「合成人构建套件」,以解锁在乌拉帝国机械工厂建造新合成人的权限。新诞生的合成人是没有任何技能熟练度的,记得提前研究「数据下载套件」,准备好乌拉帝国数据包!
- 很高兴听到这样的自我评价,自信是这块烂地生存的资本。\n\n如果乌拉帝国的遗孤们已经抵达这颗星球,则你们可以试着接触她们——更高级的科技需要依靠她们解锁,提前接触未尝不是未雨绸缪。
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_103
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_101
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_104
-
- Wula/Events/Portraits/WULA_Anisia_6
- URa-1138「艾妮西娅」
-
-
- 已经凌驾于这片土地之上了,正在寻求终局的意义吗?\n\n有尝试过制造乌拉帝国的大型机械体吗?它们是强大的战场支柱,每一台都拥有改变战局的力量。不过,机械乌拉的初始带宽无法控制大型机械体,你们需要准备一些扩充带宽的改件和装备,或者干脆植入机控中枢以利用边缘世界的本土科技。
- 已经凌驾于这片土地之上了,正在寻求终局的意义吗?\n\n小心友军火力!乌拉帝国的高级装备基本上都是能将敌人炸的血肉横飞的区域性伤害武器,它们的破坏力毋庸置疑,但是同时也会导致战利品丢失和频繁的误伤——或许该考虑给殖民者配一套装甲了。
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_104
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_101
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_110
-
- Wula/Events/Portraits/WULA_Anisia_1
- URa-1138「艾妮西娅」
-
- 可能是你们在这衰颓的岁月中沉睡太久,不太理解世界上发生了什么。想问什么就问吧?
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_111
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_1
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_111
-
- Wula/Events/Portraits/WULA_Anisia_3
- URa-1138「艾妮西娅」
-
- 不是每一个合成人都能像你们这么幸运地被唤醒的——很多机械乌拉已经在沉睡中损坏了,她们自行组建了非法的黑色网络,遵循无法预测的轨迹行动。这些家伙是不小的麻烦,因为她们不会接受谈判,并且拥有帝国开发署所遗弃的装备,其中不乏战车和重装护甲。
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_110
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_200
-
- Wula/Events/Portraits/WULA_Anisia_5
- URa-1138「艾妮西娅」
-
- 这还有光明正大乞讨的啊?!
- 啊?我们很熟吗?
- 你的消息已发出,但是被对方拒收了。\n\n······是真的拒收了啦!!
-
-
-
-
-
- Wula_Has_Receive_Silver_From_Anisia
- 0
- Int
-
-
- Wula_Has_Receive_MechWula_From_Anisia
- 0
- Int
-
-
-
-
-
-
-
- 喂,你上次借的钱还没还呢!
-
-
- Wula_Has_Receive_Silver_From_Anisia
- 0
-
-
-
-
-
-
- Wula_UI_Anisia_201
-
-
-
-
-
-
-
-
- 你们不会自己去造吗?
-
-
- Wula_Has_Receive_MechWula_From_Anisia
- 0
-
-
-
-
-
-
- Wula_UI_Anisia_202
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_203
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_1
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_201
-
- Wula/Events/Portraits/WULA_Anisia_3
- URa-1138「艾妮西娅」
-
- 呃呃,我没什么钱的,只能借你一点点噢?
-
-
-
-
-
-
-
-
- Silver
- 3000
-
-
- Wula_Has_Receive_Silver_From_Anisia
- 1
- Add
-
-
- 艾妮西娅给殖民地送来了3000银子
- PositiveEvent
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_1
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_202
-
- Wula/Events/Portraits/WULA_Anisia_3
- URa-1138「艾妮西娅」
-
- 那这样吧,我可以引导附近的一只无归属机械乌拉来到你们殖民地,她不是反常子个体,你们正常接纳她就行了。\n\n记得别和她说是我干的。
-
-
-
-
-
-
-
-
- Wula_PawnKind
- 1
- true
- 机械乌拉游荡到殖民地附近
- 一个乌拉帝国合成人被艾妮西娅所引导,游荡到殖民地附近并加入了殖民地。
-
-
- Wula_Has_Receive_MechWula_From_Anisia
- 1
- Add
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_1
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_203
-
- Wula/Events/Portraits/WULA_Anisia_3
- URa-1138「艾妮西娅」
-
- 这可是你们自己说的?\n\n最近有一批乌拉帝国的机械体被部署到边缘世界了,我可以略施小计,让它们当中最猛的家伙发狂揍一下你们的殖民地,如何?可别被一拳打死了噢。
-
-
-
-
-
-
-
-
- 陆行舰正在逼近
- 艾妮西娅按照要求,吸引了一艘乌拉帝国的陆行舰机械体攻击我们的殖民地!
- 100
- Mechanoid
- ImmediateAttack
- EdgeWalkIn
- Combat
-
-
- Combat
- 100
-
- 100
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 陆行舰正在逼近
- 艾妮西娅按照要求,吸引了一支乌拉帝国的陆行舰队攻击我们的殖民地!
- 100
- Mechanoid
- ImmediateAttack
- EdgeWalkIn
- Combat
-
-
- Combat
- 100
-
- 10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_Anisia_1
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/1.6/1.6/Defs/HediffDefs/WULA_Misc_Hediffs.xml b/1.6/1.6/Defs/HediffDefs/WULA_Misc_Hediffs.xml
index 129ccd39..1ccabdc9 100644
--- a/1.6/1.6/Defs/HediffDefs/WULA_Misc_Hediffs.xml
+++ b/1.6/1.6/Defs/HediffDefs/WULA_Misc_Hediffs.xml
@@ -24,12 +24,6 @@
0.05
-
-
- Consciousness
- 0.25
-
-
Flu
diff --git a/1.6/1.6/Defs/Scenarios/Scenarios_WULA.xml b/1.6/1.6/Defs/Scenarios/Scenarios_WULA.xml
index 529c2be4..36cac001 100644
--- a/1.6/1.6/Defs/Scenarios/Scenarios_WULA.xml
+++ b/1.6/1.6/Defs/Scenarios/Scenarios_WULA.xml
@@ -64,6 +64,11 @@
WULA_RW_Base_AR
1
+
+ StartingThing_Defined
+ WULA_Fake_Mothership_Beacon_Building
+ 1
+
@@ -120,145 +125,6 @@
BasicMechtech
-
-
- GameStartDialog
- 帝国的荣光已成遥远的回响。秩序化为冰冷的错误代码。你们曾为之战斗、牺牲、存在的一切根基,都已在这漫长的沉睡中化为尘埃。如今,你们散落于此,在这片被文明遗弃、被暴力主宰的废土上醒来。\n一个来源不明的信号,穿透了层层防护,强行撬开了你意识的黑匣子。是谁?幸存的帝国指挥官?某个试图利用旧日战争机器的军阀?还是本地的异常网络?数据库无法提供答案,只有广播残留的强制力仍在你的逻辑回路中回荡,留下了一串信号特征,指引着你们往未知的远方前进。\n\n提示:建造乌拉帝国通讯站,以获取更多帮助。
- GameStartSting
-
-
-
-
-
-
-
- WULA_Start_Scenario_On_Space
-
- 在乌拉帝国的大内战中,无数乌拉帝国合成人因为人工智能网络“演算圆环”的崩溃而进入保护性的休眠状态。在边缘世界沉睡的乌拉帝国合成人收到了某人广播的唤醒指令,解除了意识闭锁,开始重新踏入这个面目全非的法外之地。
-
- 以三位机械乌拉为初始殖民者开始游戏,将生成在一个太空平台上。
-
- PlayerFaction
- WULA_Awakened_Synth
-
-
-
-
- ConfigPage_ConfigureStartingPawns
- 3
- 8
-
-
-
-
- PlayerPawnsArriveMethod
- Standing
- false
-
-
-
-
- ForcedMap
- OrbitalRelay
- Orbit
-
-
-
-
- DisableQuest
- GravEngine
-
-
-
-
- StartingThing_Defined
- WULA_Charge_Cube
- 80
-
-
- StartingThing_Defined
- MedicineIndustrial
- 10
-
-
- StartingThing_Defined
- ComponentIndustrial
- 50
-
-
- StartingThing_Defined
- WULA_RW_Base_AR
- 1
-
-
- ScatterThingsNearPlayerStart
- GravEngine
- 1
-
-
-
-
- ScatterThingsNearPlayerStart
- Steel
- 700
-
-
- StartingThing_Defined
- Chemfuel
- 1000
-
-
- ScatterThingsNearPlayerStart
- WoodLog
- 300
-
-
- ScatterThingsNearPlayerStart
- GravlitePanel
- 400
-
-
-
-
- ScatterThingsAnywhere
- Steel
- 2000
-
-
-
-
- StartingMech
- Mech_WULA_Cat
- 2
-
-
- StartingMech
- Mech_WULA_Cat_Constructor
- 2
-
-
-
-
- StartingResearch
- WULA_Base_Technology
-
-
- StartingResearch
- BiofuelRefining
-
-
- StartingResearch
- BasicGravtech
-
-
- StartingResearch
- BasicMechtech
-
-
GameStartDialog
diff --git a/1.6/1.6/Defs/ThingDefs/WULA_Item.xml b/1.6/1.6/Defs/ThingDefs/WULA_Item.xml
index 83d8f244..86f1ae76 100644
--- a/1.6/1.6/Defs/ThingDefs/WULA_Item.xml
+++ b/1.6/1.6/Defs/ThingDefs/WULA_Item.xml
@@ -421,9 +421,6 @@
UnfinishedHealthItemProsthetic
-
- WULA_Synth_Server
-
false
GeneralLaborSpeed
Crafting
@@ -715,9 +712,6 @@
UnfinishedHealthItemProsthetic
-
- WULA_Synth_Server
-
false
GeneralLaborSpeed
Crafting
@@ -982,9 +976,6 @@
8
-
- WULA_Synth_Server
-
50
diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/Buildings_GlobalStorageSender.xml b/1.6/1.6/Defs/ThingDefs_Buildings/Buildings_GlobalStorageSender.xml
deleted file mode 100644
index f36405e7..00000000
--- a/1.6/1.6/Defs/ThingDefs_Buildings/Buildings_GlobalStorageSender.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml
index ac6652e2..697aea5a 100644
--- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml
+++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml
@@ -17,6 +17,7 @@
(1,1)
(73,185,254,155)
+ false
false
false
false
@@ -120,6 +121,7 @@
15
+
0
@@ -175,6 +177,7 @@
DoorMoveable
1
true
+ false
Wula/Building/Door/WulaAutodoor_Mover
Graphic_Single
@@ -305,10 +308,10 @@
Normal
+
false
Light
- Structure
true
1.0
true
@@ -420,6 +423,7 @@
0.5
false
false
+ false
1
@@ -532,6 +536,10 @@
3.5
+
+ 6
+ (120,240,252,0)
+
true
@@ -622,7 +630,7 @@
WULA_MaintenancePod_Cleanzone
清理出一块场地并准备好资源,使得乌拉帝国母舰可以向此处投放建筑。建造好的信标可以收起或移至他处,但是必须要有母舰或者后勤舰在上空才能投送建筑。\n\n合成人维护舱是为乌拉帝国合成人设计的设施,机械乌拉需要定期进入其中进行身体机能的维护和校准,否则他们的身体会逐渐衰弱。维护需要消耗零部件,同时会修理所有的伤口。
- Wula/Building/WULA_MaintenancePod_south
+ Wula/Building/WULA_MaintenancePod
MinifiedThing
Normal
@@ -645,8 +653,12 @@
0.5
false
0
- false
-
+ false
+ (0,0,-2)
+ true
+
+ PlaceWorker_PreventInteractionSpotOverlap
+
1
1
@@ -716,7 +728,7 @@
一个为乌拉帝国合成人设计的全自动维护舱,机械乌拉需要定期进入其中进行身体机能的维护和校准,否则他们的身体会逐渐衰弱。维护需要消耗零部件,同时会修理所有的伤口。
true
- Wula/Building/WULA_MaintenancePod_south
+ Wula/Building/WULA_MaintenancePod
Graphic_Single
(3, 3)
@@ -724,6 +736,7 @@
+ Normal
RealtimeOnly
true
@@ -733,7 +746,6 @@
true
0.5
false
- false
250
20000
@@ -744,6 +756,13 @@
(3,3)
(0,0,-2)
true
+ MinifiedThing
+
+ BuildingsMisc
+
+
+ PlaceWorker_PreventInteractionSpotOverlap
+
150
10
@@ -754,8 +773,11 @@
BuildingDestroyed_Metal_Big
1800
- Normal
+
+ 6
+ (120,240,252,0)
+
true
@@ -795,9 +817,6 @@
5
-
- PlaceWorker_PreventInteractionSpotOverlap
-
@@ -805,21 +824,22 @@
WULA_WeaponArmor_Productor_Cleanzone
清理出一块场地并准备好资源,使得乌拉帝国母舰可以向此处投放建筑。建造好的信标可以收起或移至他处,但是必须要有母舰或者后勤舰在上空才能投送建筑。\n\n乌拉帝国作业通讯台是用于联络乌拉帝国母舰和后勤舰并下达武器、装备订单的特殊通讯台。这些武器装备的生产不需要殖民地参与,只需要使用乌拉帝国物资交换舱将材料发送给帝国舰队,然后根据材料数量下单即可。
- Wula/Building/WULA_MaintenancePod_south
+ Wula/Building/WULA_WeaponArmor_Productor
MinifiedThing
Normal
BuildingsMisc
- (5,5)
+ (3,3)
Wula/Building/WULA_Dropping_Building_Cleanzone
Graphic_Multi
- (5,5)
+ (3,3)
false
+ WULA_Buildings
Building
PassThroughOnly
false
@@ -827,6 +847,7 @@
false
0
false
+ false
1
@@ -842,7 +863,6 @@
BuildingDestroyed_Metal_Small
- WULA_Buildings
WULA_WeaponArmor_Productor_Incoming
@@ -858,12 +878,12 @@
WULA_WeaponArmor_Productor_Incoming
- (5,5)
+ (3,3)
- Wula/Building/WULA_MaintenancePod_Incoming
+ Wula/Building/WULA_WeaponArmor_Productor_Incoming
Graphic_Single
CutoutFlying
- (5,5)
+ (3,3)
Accelerate
@@ -891,15 +911,12 @@
WULA_WeaponArmor_Productor
-
- 一台用于联络乌拉帝国母舰和后勤舰并下达武器、装备订单的特殊通讯台。这些武器装备的生产不需要殖民地参与,只需要使用乌拉帝国物资交换舱将材料发送给帝国舰队,然后根据材料数量下单即可。
+
+ 一台用于联络乌拉帝国母舰和后勤舰并下达订单的特殊通讯台。这些物资装备的生产不需要殖民地参与,只需要使用乌拉帝国物资输送舱将材料发送给帝国舰队,然后根据材料数量下单即可。
WulaFallenEmpire.Building_GlobalWorkTable
MapMeshAndRealTime
Normal
- MinifiedThing
-
- BuildingsMisc
-
+ false
50
@@ -910,13 +927,13 @@
Wula/Building/WULA_WeaponArmor_Productor
- Graphic_Multi
- (5,5)
+ Graphic_Single
+ (3,2.75)
false
- (0.75, 0.75, 0.5)
+ (1.5, 1.5, 1.5)
ConstructMetal
@@ -933,8 +950,7 @@
180
1.0
- (5,5)
- WULA_Buildings
+ (3,3)
2120
PassThroughOnly
50
@@ -947,15 +963,24 @@
WulaFallenEmpire.ITab_GlobalBills
+
+ 6
+ (120,240,252,0)
+
true
false
+
+ Wula_UI_Main_1
+
+ 无法接触通讯站。
+
-
+
WULA_Machine_Recharger_Cleanzone
@@ -981,6 +1006,7 @@
false
0
false
+ false
1
@@ -1016,7 +1042,7 @@
(3,3)
- Wula/Building/WULA_MaintenancePod_Incoming
+ Wula/Building/WULA_Machine_Recharger_Incoming
Graphic_Single
CutoutFlying
(3,3)
@@ -1099,11 +1125,14 @@
WULA_Machine_Productor_Technology
-
- 2500
- 0.5
- false
- true
+
+ 6
+ (120,240,252,0)
+
+
+
+ true
+ false
CompThingContainer
@@ -1117,14 +1146,4 @@
-
-
-
- YourAircraftDef
- 1
- SkyfallerLeaving
- 120
- false
-
-
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Local_Buildings.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Local_Buildings.xml
index 1e22d6fc..29e40410 100644
--- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Local_Buildings.xml
+++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Local_Buildings.xml
@@ -3,8 +3,8 @@
WULA_GlobalStorageSenderPod
-
- 一个一次性的物资输送装置,可以将装载的货物直接发射到全局存储网络中,而无需选择目标地点。发射后即告销毁。
+
+ 一个一次性的物资输送装置,可以将装载的货物发射到乌拉帝国的舰队以供其使用。
Things/Special/DropPod
Graphic_Single
@@ -32,7 +32,7 @@
- 300
+ 500
0.8
true
@@ -54,64 +54,6 @@
0.65
-
-
- WULA_Synth_Server
-
- 一台大型服务器,可以从乌拉帝国的上行链路接收关于各种技能的数据,并以实体数据包的形式封装储存起来,供那些新生代合成人使用。
- Building_WorkTable
- MapMeshAndRealTime
-
- Wula/Building/WULA_Synth_Server
- Graphic_Multi
- (2,2)
-
- false
-
-
- true
- ConstructMetal
-
- 100
- 2
- 1
-
- Building
- 0.5
- True
-
- WULA_New_Synth_Skill_Technology
-
-
- 2000
- 180
- 1.0
-
- (2,2)
- True
- (0,0,-1)
- WULA_Buildings
- 2120
- PassThroughOnly
- 50
- Item
-
- ITab_Bills
-
-
-
- CompPowerTrader
- 100
-
-
-
- PlaceWorker_PreventInteractionSpotOverlap
-
-
- BillsTab
-
-
-
WULA_Cube_Productor_Energy
@@ -163,7 +105,6 @@
Make_Component_By_WULA_Cube_Productor
Make_WULA_Dark_Matter_Item
Make_WULA_Neutronium
- Wula_Make_Zro
ITab_Bills
@@ -175,7 +116,6 @@
- WULA_Cube_Productor_Component
@@ -187,67 +127,6 @@
BillsTab
-
- WULA_Cube_Productor_Component
-
- 用于辅助乌拉帝国编织体工作的特殊设备,可以加快其工作速度。每个乌拉帝国编织体最多连接一个此类设备。
-
- Wula/Building/WULA_Cube_Productor_Component
- Graphic_Multi
- (2,2)
-
- false
-
-
- (1.65, 1.65, 0.85)
- (0, 0, -0.2)
-
-
- Building
- PassThroughOnly
- false
- 0.5
- false
- 42
-
- 100
- 30000
- 20
- 0
-
- (2,2)
-
- 200
- 1
-
-
- BuildingDestroyed_Metal_Small
-
-
- WULA_Dark_Matter_Technology
-
- WULA_Buildings
- MinifiedThing
- 4
-
- BuildingsMisc
-
-
-
- CompPowerTrader
- 500
-
-
-
- 2
-
- 1
-
-
-
- PlaceWorker_ShowFacilitiesConnections
-
-
@@ -320,198 +199,6 @@
-
-
-
- WULA_Large_Mechine_proudctor
-
- 乌拉帝国所建造的一种机械工厂,能构建各种乌拉帝国机械体,包括机械乌拉。
- Building_MechGestator
- true
- Normal
- MapMeshAndRealTime
- Building
- PassThroughOnly
- 0.5
- true
- 42
- Item
-
- ITab_Bills
-
- WULA_Buildings
- 2400
- South
-
- PlaceWorker_MechGestatorTop
-
-
-
- Wula/Building/WULA_Heavy_War_Machine_Productor
- Graphic_Multi
- (4, 4)
-
- (2.8, 2.8, 2.1)
-
-
-
- False
- (1,0,3)
-
- 1250
- 16000
- 35
- 0.5
-
- (4,4)
-
- 300
- 6
- 5
-
-
- WULA_Machine_Productor_Technology
-
-
- BillsTab
- false
- false
-
- Production
- Biotech
-
-
-
- (-1.06, 0.91)
- (0, 0)
-
-
- (-1.06, 0.82)
- (0, 0)
-
-
- (1.06, -0.97)
- (0, 0)
-
-
- (-1.06, -0.97)
- (0, 0)
-
-
-
- Things/Pawn/Mechanoid/HalfGestatedMechSmall
- Graphic_Single
- (0,0)
-
-
- (0, 0, 0.45)
- (0, 0, 0.45)
- (0, 0, 0.45)
- (0, 0, 0.45)
-
-
- Things/Building/Production/MechGestatorStandardGlass
- Graphic_Multi
- (0,0)
- Transparent
-
-
- Things/Building/Production/MechGestatorStandardTop
- Graphic_Multi
- (0,0)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 6
-
- WULA_Build_Wula_Synth
- WULA_Build_Mech_Cat
- WULA_Build_Mech_Cat_Constructor
- WULA_Build_Mech_Cat_EMP
- WULA_Build_Mech_Cat_Fire
- WULA_Build_Mech_Cat_Assault
- WULA_Build_Mech_Cat_DM
- WULA_Build_AI_Heavy_Panzer
- WULA_Build_AI_Heavy_Panzer_Gunnery
- WULA_Build_Alpha_Wolf
- WULA_Build_Alpha_Mantodea
- WULA_Build_AI_Engineer_Mother
- WULA_Build_AI_Engineer_Mother_Attack
-
-
-
-
-
- CompPowerTrader
- 500
- 50
-
-
-
-
-
-
- WULA_Communicator_Station
-
- 乌拉帝国内部用于联系的通讯站,可以联系到乌拉帝国的各大派系。
- Building
-
- Wula/Building/WULA_Communicator_Station
- Graphic_Multi
- TransparentPostLight
- (1,1)
-
- (0.25, 0.25, 0.25)
-
-
-
- 250
- 2000
- 70
- 0
-
- (1,1)
- false
-
- 50
-
- Building
- PassThroughOnly
- 50
- WULA_Buildings
-
- WULA_Base_Technology
-
-
-
-
-
- Wula_UI_Main_1
-
- 无法接触通讯站。
-
-
-
diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Misc_Buildings.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Misc_Buildings.xml
new file mode 100644
index 00000000..abb372af
--- /dev/null
+++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Misc_Buildings.xml
@@ -0,0 +1,68 @@
+
+
+
+ WULA_Fake_Mothership_Beacon_Building
+
+ 111
+ Building
+ true
+ Building
+ 50
+ WULA_Buildings
+ true
+ PassThroughOnly
+ 1
+ (1,1)
+ true
+ (0.56, 0.62, 0.9)
+
+ Wula/Building/WULA_Cat_Bunker_south
+ Graphic_Single
+ TransparentPostLight
+ (1,1)
+ (195,195,195,255)
+
+
+ 600
+ 0.5
+ 36000
+ 125
+ 0.65
+
+ Normal
+ true
+ true
+ false
+ East
+ true
+ Light
+ BulletImpact_Metal
+ true
+ RealtimeOnly
+ ConstructMetal
+ true
+
+ BuildingDestroyed_Metal_Big
+ true
+ true
+
+
+
+ WULA_BattleShip_Entity
+ 1
+
+
+ true
+ 1
+ true
+ false
+
+
+
+
+ WULA_BattleShip_Entity
+
+ 什么?这是个记录数量用的thingdef,你不应该在任何场合下看到这个。
+ Thing
+
+
\ No newline at end of file
diff --git a/1.6/1.6/Defs/WorkGivers/Wula_WorkGivers.xml b/1.6/1.6/Defs/WorkGivers/Wula_WorkGivers.xml
index f0149222..7c8ae49b 100644
--- a/1.6/1.6/Defs/WorkGivers/Wula_WorkGivers.xml
+++ b/1.6/1.6/Defs/WorkGivers/Wula_WorkGivers.xml
@@ -18,23 +18,6 @@
true
-
- WULA_Large_Mechine_proudctor_Bills
-
- WorkGiver_DoBill
- Smithing
- 75
-
- WULA_Large_Mechine_proudctor
-
- 工作于
- 工作于
-
- Manipulation
-
- true
-
-
WULA_Synth_ServerBills
diff --git a/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/AirStrike_Keys.xml b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/AirStrike_Keys.xml
new file mode 100644
index 00000000..26a3ea77
--- /dev/null
+++ b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/AirStrike_Keys.xml
@@ -0,0 +1,53 @@
+
+
+
+ 战机管理器未找到!
+ 空中打击已启动:{0}
+ 空中打击:成功使用 {0} 只 {1}
+ 没有可用的战机:{0}
+ 空中打击:{1} 没有可用的 {0}
+ 没有可用的 {0}
+
+
+ {0}:{1}
+ 冷却中:{0}
+ 消耗:{0}
+
+
+ 飞行器状态:
+ 总数:{0}
+ 准备入场:{0}
+ 冷却中:{0}
+ 每次使用消耗:{0}
+
+
+
+ 冷却时间:{0}小时
+ \n该技能需要 {0} 入场\n每次使用占用 {1} {0}\n冷却时间:{2}小时
+
+
+ 未知派系
+
+
+
+ 战机起飞
+ 命令战机起飞。起飞的战机将永不落地,如果想要使用它们就需要有机械乌拉的指挥。
+ 战机受损
+
+
+ 战机已起飞:{0} 只 {1}
+ 战机管理器未找到!
+
+
+ 无法创建起飞效果:父级地图为空
+ 在 {0} 创建了起飞天空坠落者,携带1单位化学燃料
+ 创建起飞效果时出错:{0}
+
+
+ 尝试将战机添加到空派系
+
+
+ {0} 准备好再次进行打击
+ 没有可用的战机
+ {0}:{1}/{2}(冷却中:{3})
+
\ No newline at end of file
diff --git a/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Misc_Gameplay.xml b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Misc_Gameplay.xml
index 532ea9ca..6f6a79d1 100644
--- a/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Misc_Gameplay.xml
+++ b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Misc_Gameplay.xml
@@ -181,65 +181,33 @@
无法分配物品到空投舱
成功空投了{0}个空投舱
- 舰队资源储存
- 提交到舰队贮存
- 将所有存储物品转移到舰队贮存
- 存储物品
- {0}个物品已提交到储存器
- 提交物品失败
- 没有可提交的物品
- 设备不可用
- 无电力
- 无燃料
- 开关关闭
- 不可用
- 状态
-
- 提交器内容
- 运行正常
- 无法运行
- 状态
- 物品
- 堆叠
- 存储中无物品
- 物品名称
- 数量
- {0}\n总数: {1}\n堆叠数: {2}\n价值: {3} 白银
- 提交到存储
- 将所有存储物品提交到全局存储
- 设备无法运行
- 无物品可提交
- 没有可以提交的物品
- 查看全局存储
- 查看全局输入和输出存储内容
- 未知原因
- 全局存储
- 输入存储
- 输出存储
- 无物品
- 价值
-
- 物品
- 堆叠
- 物品名称
- 数量
- 存储中无物品
- {0}\n总数: {1}\n堆叠: {2}\n价值: {3}
- 设备不可用
- 没有可提交的物品
- 查看全局存储
- 查看全局存储中的物品
- 未知原因
- 价值
-
- Load Resource Submitter
- No items available
- Available
- To Load
- Max
- Set load count for {0}
- Load All
- Clear All
- Loading jobs created
- Description
+
+ 发射战机
+ 手动发射战机到全球战机库
+ 启用自动发射
+ 启用战机自动发射功能
+ 取消自动发射
+ 取消预定的自动发射
+
+ 状态:已发射
+ 自动发射:{0}秒后
+ 自动发射:就绪
+
+ 战机自动发射预定:{0} 将在 {1} 秒后发射
+ 检测到威胁 {0},预定战机自动发射
+ 检测到狂躁动物 {0},预定战机自动发射
+ 自动发射已取消
+
+ 已发射 {0} 架 {1}
+ 机库已损坏
+
+ 发射到乌拉帝国舰队
+ 将物品发送到乌拉帝国舰队,以便其使用这些材料进行加工。\n\n如果装备、武器和尸体被送到乌拉帝国舰队,则它们会在下一次成品空投被扔回来,其他的物资若被乌拉帝国舰队接收则一概不退。
+ 没有物品可以发送到全局存储
+
+ {0}件物资被舰队接收,{1}件物资被舰队退回(随着下一次成品空投一起退回)
+ {0}件物资被舰队接收
+ {0}件物资被舰队退回(随着下一次成品空投一起退回)
+ 输入存储: {0}
+ 输出存储: {0}
\ No newline at end of file
diff --git a/1.6/Anomaly/Defs/BodyAndPartDefs/Bodyparts_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/BodyAndPartDefs/Bodyparts_WULA_FE_Spiritualist.xml
deleted file mode 100644
index 078efb98..00000000
--- a/1.6/Anomaly/Defs/BodyAndPartDefs/Bodyparts_WULA_FE_Spiritualist.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-
-
-
- Wula_Psi_Titan_Body
-
-
- Torso
- Middle
- Outside
-
- Torso
-
-
-
- WULA_Panzer_Core_Bodypart
- 0.025
- Inside
-
- Torso
-
-
-
-
- Neck
- 脖子
- 0.075
- Top
-
- Neck
-
-
-
- Head
- 0.80
-
- UpperHead
- FullHead
- HeadAttackTool
-
-
-
- WULA_AI_Core_Bodypart
- 0.025
- Inside
-
- Torso
-
-
-
- SightSensor
- 第一组左视觉传感器
- 0.07
-
- FullHead
- Eyes
-
-
-
- SightSensor
- 第二组左视觉传感器
- 0.07
-
- FullHead
- Eyes
-
-
-
- SightSensor
- 第一组右视觉传感器
- 0.07
-
- FullHead
- Eyes
-
-
-
- SightSensor
- 第二组右视觉传感器
- 0.07
-
- FullHead
- Eyes
-
-
-
-
-
-
-
- WULA_Panzer_OutBrust_Bodypart
- 第一反推喷气孔
- 0.005
- Inside
-
- Torso
-
-
-
- WULA_Panzer_OutBrust_Bodypart
- 第二反推喷气孔
- 0.005
- Inside
-
- Torso
-
-
-
- WULA_Panzer_OutBrust_Bodypart
- 第三反推喷气孔
- 0.005
- Inside
-
- Torso
-
-
-
- WULA_Panzer_OutBrust_Bodypart
- 第四反推喷气孔
- 0.005
- Inside
-
- Torso
-
-
-
- WULA_Panzer_OutBrust_Bodypart
- 第五反推喷气孔
- 0.005
- Inside
-
- Torso
-
-
-
- WULA_Panzer_OutBrust_Bodypart
- 第六反推喷气孔
- 0.005
- Inside
-
- Torso
-
-
-
- WULA_Panzer_OutBrust_Bodypart
- 第七反推喷气孔
- 0.005
- Inside
-
- Torso
-
-
-
- WULA_Panzer_OutBrust_Bodypart
- 第八反推喷气孔
- 0.005
- Inside
-
- Torso
-
-
-
- WULA_Psi_Titan_Crystal_Bodypart
- 0.025
- Inside
-
- Torso
-
-
-
- WULA_Psi_Titan_Wheel_Of_Dharma_Bodypart
- 0.05
- Inside
-
- Torso
-
-
-
-
-
-
- WULA_Psi_Titan_Wheel_Of_Dharma_Bodypart
-
- 100
- false
- true
- 0
-
- ConsciousnessSource
-
-
-
- WULA_Psi_Titan_Crystal_Bodypart
-
- 120
- false
- true
- 0
-
- ConsciousnessSource
-
-
-
\ No newline at end of file
diff --git a/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml
deleted file mode 100644
index 5ed2cb26..00000000
--- a/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml
+++ /dev/null
@@ -1,316 +0,0 @@
-
-
-
- Wula_UI_FE_Spiritualist_1
-
- Wula/Events/Portraits/WULA_FE_Spiritualist_3
- 帝国修女
-
- 高好感度问候
-
-
-
-
-
- Wula_FE_Spiritualist_Goodwill
-
-
- Wula_FE_Spiritualist_Faction
- Wula_FE_Spiritualist_Goodwill
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_FE_Spiritualist_10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_FE_Spiritualist_2
-
- Wula/Events/Portraits/WULA_FE_Spiritualist_3
- 帝国修女
-
- 中好感度问候
-
-
-
-
-
-
- Wula_FE_Spiritualist_Goodwill
-
-
- Wula_FE_Spiritualist_Faction
- Wula_FE_Spiritualist_Goodwill
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_FE_Spiritualist_10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_FE_Spiritualist_3
-
- Wula/Events/Portraits/WULA_FE_Spiritualist_2
- 帝国修女
-
- 低好感度问候
-
-
-
-
-
-
- Wula_FE_Spiritualist_Goodwill
-
-
- Wula_FE_Spiritualist_Faction
- Wula_FE_Spiritualist_Goodwill
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_FE_Spiritualist_20
-
-
-
-
-
-
-
-
-
-
-
-
-
- 来自乌拉帝国 大教堂的报复
- 乌拉帝国 大教堂以攻击回应挑衅!
- 30000
- Wula_FE_Spiritualist_Faction
- ImmediateAttack
- EdgeDrop
- Combat
-
-
- Combat
- 100
-
- 10
- 3
- 3
- 1
- 1000
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_FE_Spiritualist_4
-
- Wula/Events/Portraits/WULA_FE_Spiritualist_1
- 帝国修女
-
- 第一次联络问候
-
-
-
-
-
- Wula_FE_Spiritualist_First_Contant
- Add
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_FE_Spiritualist_Faction
- -50
-
-
- 你的轻佻发言惹得乌拉帝国 大教堂非常的不快,她们对你的第一印象大幅度降低了!
- NegativeEvent
-
-
-
-
-
-
-
-
-
- Wula_UI_FE_Spiritualist_10
-
- Wula/Events/Portraits/WULA_FE_Spiritualist_1
- 帝国修女
-
- 好吧。我们来自乌拉帝国国教教会,也称乌拉帝国 大教堂,而在边缘世界活动的我们则是其中的一个小分支。在帝国皇室没落以前,国教曾是每任皇帝的左膀右臂,负责维护乌拉帝国和皇室的至上威权,并将祂的化身——也就是皇帝——的福音在银河系中传播。\n\n然而,我们遭到了无信者的背叛,她们自诩进步派,否定我主和皇室与生俱来的正确性,挑起了一场撕裂帝国的内战。经过护教军的与其的万古长战,她们已经被逼至绝境,我们也在着手于恢复昔日荣光,并将福音再次播撒于星海间。
-
-
-
-
-
- Wula_FE_Spiritualist_Goodwill
-
-
- Wula_FE_Spiritualist_Faction
- Wula_FE_Spiritualist_Goodwill
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Wula_UI_FE_Spiritualist_20
-
- Wula/Events/Portraits/WULA_FE_Spiritualist_3
- 帝国修女
-
- 低好感度任务介绍1。
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.6/Anomaly/Defs/FactionDefs/Factions_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/FactionDefs/Factions_WULA_FE_Spiritualist.xml
deleted file mode 100644
index a2a0601c..00000000
--- a/1.6/Anomaly/Defs/FactionDefs/Factions_WULA_FE_Spiritualist.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
- Wula_FE_Spiritualist_Faction
-
- 堕落乌拉帝国派系之一,属于保皇派,拥有独属的特殊科技。\n\n蒙受神祗庇佑的乌拉帝国神职人员已经履行职责千万年之久,但是帝国内战的到来让无信者抛弃了她们的神祗。尽管教会的盛景不再,但是狂热者内心的火焰并未就此熄灭,她们终将兑现对叛教者和无信者的审判,只需假以时日。
- RealWula_PawnKind
- 乌拉星人
- 乌拉星人
- Wula_FE_Spiritualist_FactionTag
- 1
- NamerFaction_Wula_FE_Spiritualist
- Wula/World/WorldObjects/Expanding/Wula_FE_Faction
- false
-
- 1
- false
- true
-
- Wula_Backstory_Categories_For_RealWula
-
-
-
- Supremacist
- Proselytizer
-
-
- Loyalist
- FemaleSupremacy
- Guilty
-
-
- Slavery_Classic
- Slavery_Disapproved
- Slavery_Horrible
- Slavery_Abhorrent
-
-
- 1
-
-
- WULA_Awakened_Synth
-
- Archotech
-
- Surface
-
-
-
- (0.6, 0.5, 0.9)
-
-
-
- (300, 0)
- (700, 1)
- (1400, 1.8)
- (2800, 2.2)
- (4000, 2.6)
-
-
-
-
-
- (35, 8)
- (100, 60)
- (1000, 250)
- (2000, 400)
- (4000, 500)
-
-
- true
- true
-
- false
-
-
- Metallic
- Fabric
-
-
- DevilstrandCloth
-
-
- 18
- true
- true
-
-
- (400,200)
- (900,300)
- (100000,10000)
-
-
- World/WorldObjects/DefaultSettlement
- -100~200
- 1
- 900
- ActiveDropPodMechanoid
- DropPodIncomingMechanoidRapid
-
- Children
-
-
-
\ No newline at end of file
diff --git a/1.6/Anomaly/Defs/HediffDefs/Hediffs_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/HediffDefs/Hediffs_WULA_FE_Spiritualist.xml
deleted file mode 100644
index 9b72802f..00000000
--- a/1.6/Anomaly/Defs/HediffDefs/Hediffs_WULA_FE_Spiritualist.xml
+++ /dev/null
@@ -1,422 +0,0 @@
-
-
-
- WULA_SwiftHunterBlessing
-
- 此人享受着乌拉帝国仪式带来的加护,身体变得更加轻盈,感官更加敏锐。
- HediffWithComps
- (0.6, 0.8, 1.0)
- false
-
-
-
- 3.0
-
-
-
- 0.8
-
-
-
-
-
-
-
-
-
- WULA_AbyssFearBlessing
- WULA_InstantJumpdriveBlessing
- WULA_MindSpringBlessing
-
-
- 加护已取代
- 由于新的加护,其他作用于 {PAWN_nameDef} 的加护已经消散。
-
-
-
-
- WULA_AbyssFearBlessing
-
- 此人享受着乌拉帝国仪式带来的加护,躯体变得无坚不摧,似乎可捏碎一切挡路之敌。
- HediffWithComps
- (0.6, 0.8, 1.0)
- false
-
-
-
- -0.2
-
-
-
- 0.8
-
-
-
-
-
-
-
- WULA_SwiftHunterBlessing
-
- WULA_InstantJumpdriveBlessing
- WULA_MindSpringBlessing
-
-
- 加护已取代
- 由于新的加护,其他作用于 {PAWN_nameDef} 的加护已经消散。
-
-
-
-
- WULA_InstantJumpdriveBlessing
-
- 此人享受着乌拉帝国仪式带来的加护,身形变得飘忽不定,一切阻碍皆为无物。
- HediffWithComps
- (0.6, 0.8, 1.0)
- false
-
-
-
-
- WULA_SwiftHunterBlessing
- WULA_AbyssFearBlessing
-
-
-
- 加护已取代
- 由于新的加护,其他作用于 {PAWN_nameDef} 的加护已经消散。
-
-
-
- 240
- 10
- 1
- 60
- 4
- 0
- false
-
- GotoWander
- Carried
-
-
-
- AutoBlink_Skip_Small
-
-
- AutoBlink_Skip_Exit_Small
-
-
-
- Skip_Entry
-
-
-
- Skip_ExitNoDelay
-
-
-
-
-
-
-
-
- WULA_MindSpringBlessing
-
- 此人享受着乌拉帝国仪式带来的加护,思维如山涧泉水般清澈,无尽的灵感纷至沓来。
- HediffWithComps
- (0.6, 0.8, 1.0)
- false
-
- WULA_MW_Scepter_Of_Perception_Ability
-
-
-
-
-
- WULA_SwiftHunterBlessing
- WULA_AbyssFearBlessing
- WULA_InstantJumpdriveBlessing
-
-
-
- 加护已取代
- 由于新的加护,其他作用于 {PAWN_nameDef} 的加护已经消散。
-
-
-
-
- WULA_MW_Scepter_Of_Perception_Ability
-
- 加速自身思维。获得一个适合的随机灵感。
- Wula/UI/Abilities/WULA_MW_Scepter_Of_Perception_Ability
-
- False
- PsycastCastLoop
-
- 2
- Verb_CastPsycast
- 1
- True
-
- true
-
-
- false
- -1
-
- true
- false
- false
-
- 0
- -1
-
-
-
- False
- True
-
-
- WordOfInspiration
-
-
-
-
-
- WULA_CPU_Psienhance
-
- 安装于生物处理器的特殊改件,能够强化机械乌拉与虚境的亲和,增强心灵敏感度。
-
- Things/Item/Health/HealthItem
- Graphic_Single
-
-
- WULA_FE_Spiritualist_CPU_Psienhance_Technology
-
- WULA_Cube_Productor_Energy
-
-
-
- 200
- 12
- 6
-
- None
-
-
- CompUsableImplant
- UseItem
- 安装生物处理器灵能组件
-
-
-
-
- WULA_CPU_Hediff_Psienhance
- Brain
- false
- 1
-
-
-
-
- WULA_CPU_Hediff_Psienhance
-
- 安装于生物处理器的特殊改件,强化机械乌拉心灵敏感度。
- 1
-
-
- 1.0
-
-
-
- 0.01
-
- 0.5
-
-
-
-
-
- WULA_CPU_Prophet
-
- 安装于生物处理器的特殊改件,能够让机械乌拉瞬时地预知敌人的动作,以获得射击精度和近战命中率加成。
-
- Things/Item/Health/HealthItem
- Graphic_Single
-
-
- WULA_FE_Spiritualist_CPU_Prophet_Technology
-
- WULA_Cube_Productor_Energy
-
-
-
- 200
- 12
- 6
-
- None
-
-
- CompUsableImplant
- UseItem
- 安装生物处理器预知组件
-
-
-
-
- WULA_CPU_Hediff_Prophet
- Brain
- false
- 1
-
-
-
-
- WULA_CPU_Hediff_Prophet
-
- 安装于生物处理器的特殊改件,提高射击精度和近战命中率。
- 1
-
-
- 1.0
-
-
-
- 0.01
-
- 5
- 0.5
-
-
-
-
-
- WULA_Brain_Hediff_Soul_Wedge_Extract
-
- 用于抽取灵魂的特殊机械,会深深地植入大脑,使殖民者再也无法醒来。但是随着时间的推移,殖民者会周期性地产生魂楔——年龄越大,凝聚速度越快。
-
- WULA_Soul_Wedge
- WULA_Brain_Soul_Wedge_Extract
-
- HediffWithComps
- WULA_Brain_Soul_Wedge_Extract
-
- true
-
-
-
-
-
- Consciousness
- 0.1
-
-
-
-
-
-
-
-
- true
-
- WULA_Soul_Wedge
-
- 5
-
-
- 5
-
- 10
-
-
- true
-
- true
-
- true
-
- 20
-
-
- true
-
- true
-
-
-
-
- WULA_Brain_Soul_Wedge_Extract
-
- 一个替代大脑进行工作的特殊插件,会深深地植入大脑,使殖民者再也无法醒来。但是随着时间的推移,殖民者会周期性地产生魂楔——年龄越大,凝聚速度越快。
- None
-
- Install_WULA_Brain_Soul_Wedge_Extract
-
-
- 200
- 12
-
-
- RewardStandardMidFreq
-
-
- WULA_FE_Spiritualist_Soul_Wedge_Extract_Technology
-
- WULA_Cube_Productor_Energy
-
-
-
- 0.3
-
-
-
- Install_WULA_Brain_Soul_Wedge_Extract
-
- 为他人安装魂楔提取器。
-
- WULA_Brain_Soul_Wedge_Extract
- WULA_Brain_Hediff_Soul_Wedge_Extract
-
- 安装魂楔提取器中
-
-
-
-
-
-
- WULA_Brain_Soul_Wedge_Extract
-
-
- 1
-
-
-
-
- WULA_Brain_Soul_Wedge_Extract
-
-
-
- Brain
-
- WULA_Brain_Hediff_Soul_Wedge_Extract
-
-
\ No newline at end of file
diff --git a/1.6/Anomaly/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml b/1.6/Anomaly/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml
deleted file mode 100644
index ce2de277..00000000
--- a/1.6/Anomaly/Defs/PawnKinds/PawnKinds_Wula_FE_Spiritualist.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-
-
-
- Wula_Psi_Titan_PawnKind
-
- Wula_Psi_Titan
- PlayerColony
- false
- 1000
- true
- 1
-
- 0.15
- Wula/Things/Wula_Psi_Titan/Bodies/Naked_Thin_Flying_
- 1
- 1
- 1
- false
- true
-
-
-
- Wula/Things/Wula_Psi_Titan/Bodies/Naked_Thin
- Wula/Things/WULA_Cat/AllegianceOverlays/None
- TransparentPostLight
- Graphic_Multi
- 4
-
-
-
- 99999~99999
-
-
- WULA_RW_Photon_Missile_Weapon
-
-
- 0.4
-
-
- Wula_Psi_Control
- Wula_Psi_Explosive_Shock
- Wula_Psi_LightningBombardment
-
-
-
- Wula_Psi_Explosive_Shock
-
- 以灵能能量发出非人尖啸,使得周围的人员感觉到撕心裂肺的痛苦。这不会造成永久的伤害,但是很可能放倒那些无法承受此番痛苦的生灵。
- Wula/UI/Abilities/WULA_MW_Scepter_Of_Flash_Ability
- True
- True
- 24000
- 3
- true
- True
- False
- False
- true
- true
-
- 12
-
- HoraxianSpellLight_Warmup
-
- Verb_CastAbility
- Bullet_FleshmelterBolt
- 12
- true
- 1
- Pawn_Revenant_Death
- true
- true
-
-
- true
-
-
-
-
- CompAbilityEffect_GiveHediffPsychic
- 2000~4000
- true
- Wula_Psi_Explosive_Shock_Hediff
- true
- true
- 0
-
-
- PsycastPsychicEffect
-
-
- AgonyPulseExplosion
-
-
-
-
- HediffWithComps
- Wula_Psi_Explosive_Shock_Hediff
-
- 震耳欲聋、撕心裂肺的灵能尖啸所带来的极度痛苦,不会造成永久的伤害,但是需要时间缓解
- 0.001
- 1
-
-
- true
-
-
- 0.01
-
-
-
-
- 0
- 2
-
-
-
- 0.5
- 0.5
-
-
-
-
-
- Wula_Psi_Control
-
- 使用灵能能量强行支配范围内所有目标的心智,让其调转枪口攻击敌人。它会对自己和其他机械体造成瞬间的失控,无法真正地影响机械体。
- Wula/UI/Abilities/WULA_MW_Scepter_Of_Lost_Ability
- True
- True
- 36000
- 2
- true
- False
- True
- False
- false
-
-
- 15
- 900
-
- HoraxianSpellLight_Warmup
-
- Verb_CastAbility
- Bullet_FleshmelterBolt
- 15
- true
- 0.5
- AgonyPulse_Cast
- true
- true
-
-
- true
-
-
-
-
- CompAbilityEffect_GiveMentalState
- BerserkWarcall
- Wula_Fake_MechanoidBerserk
- True
- PsychicSensitivity
- -75
- AnimalWarcall_Cast
- AnimalWarcall_CastOnTarget
- false
- false
-
-
- PsycastPsychicEffect
-
-
- AgonyPulseExplosion
-
-
-
-
- Wula_Psi_LightningBombardment
-
- 以庞大的灵能能量形成一场非自然风暴,持续轰击目标区域,风暴的轰击会产生范围性灵能爆燃,对建筑物有额外的伤害。
- Wula/UI/Abilities/WULA_MW_Scepter_Of_Explosive_Ability
- 900
- true
- false
- 3
- true
- true
- true
-
- Verb_CastAbility
-
- true
- 0.25
- 35.9
- 4
-
- True
- True
-
-
-
-
- 9
- 3~4
- 25
- 20
-
- Wula_Psi_Bomb
- 30
- 3
-
-
-
-
-
-
-
- WulaSpeciesReal
- Wula_FE_Spiritualist_Faction
- 0
- 1
-
- Advanced
-
- 1250~1800
- 1~1
- Good
- 0.08
- 50
- 0
- 0
- 1
- 1~2.3
- 5~10
-
- Wula_Inner
-
- 9999~9999
- 1
- 9999~9999
- 1
-
- 0
-
-
- MedicineUltratech
- 3
-
-
- WULA_Soul_Wedge
- 100
-
-
-
-
-
- Wula_FE_Spiritualist_Pawn_1
-
- 350
-
- Wula_FE_Spiritualist_T1
-
-
- Wula_Melee_Weapon_FE_Spiritualist
-
- 15~24
- 1
-
-
- Wula_FE_Spiritualist_Pawn_2
-
- 600
-
- Wula_FE_Spiritualist_T2
-
-
- Wula_Ranged_Weapon_T4
-
- 15~24
- 1
-
-
- Wula_FE_Spiritualist_Pawn_3
-
- 600
-
- Wula_FE_Spiritualist_T2
-
-
- WULA_SP_Cotton_Counter_For_Enermy
-
- 15~24
- 1
-
-
- Wula_FE_Spiritualist_Pawn_4
-
- 1000
-
- Wula_FE_Spiritualist_T3
-
-
- WULA_SP_Spear_Impale_For_Enermy
- WULA_SP_Cotton_Counter_For_Enermy
-
- 15~24
- 1
-
-
- Wula_FE_Spiritualist_Leader
-
- 1000
-
- Wula_FE_Spiritualist_T3
-
-
- WULA_SP_Spear_Impale_For_Enermy
-
- 99~99
- 1
-
-
\ No newline at end of file
diff --git a/1.6/Anomaly/Defs/PsychicRitualDefs/WULA_FE_Spiritualist_Rituals.xml b/1.6/Anomaly/Defs/PsychicRitualDefs/WULA_FE_Spiritualist_Rituals.xml
deleted file mode 100644
index 6ffb4526..00000000
--- a/1.6/Anomaly/Defs/PsychicRitualDefs/WULA_FE_Spiritualist_Rituals.xml
+++ /dev/null
@@ -1,428 +0,0 @@
-
-
-
- WULA_FE_Rituals_Create_Spear_Impale
-
- 使用镌刻法术创造一把携带了圣枪穿刺术式的法杖,需求魂楔或泽洛作为额外祭品以提升仪式质量,仪式的质量将影响镌刻完成时法杖的质量。
- 2
- 120
- WULA_FE_Spiritualist_Spear_Impale_Technology
- Wula/Weapon/WULA_SP_Spear_Impale
-
- WULA_SP_Spear_Impale
- WULA_Soul_Wedge
- Wula_Zro
-
-
- Invoker
- Chanter
-
-
-
-
-
-
-
- WULA_Dark_Matter_Item
-
-
- 6
-
-
-
-
-
-
-
-
-
- WULA_Soul_Wedge
-
-
- 0.0005
-
-
-
- Wula_Zro
-
-
- 0.0015
-
-
-
-
-
-
-
- WULA_SP_Spear_Impale
-
-
-
-
-
-
-
-
- 1.0
-
- Legendary
-
-
- 0.95
- Masterwork
-
-
- 0.6
- Excellent
-
-
- 0.4
- Normal
-
-
- 0.0
- Poor
-
-
-
-
- WULA_FE_Rituals_Create_Cotton_Counter
-
- 使用镌刻法术创造一把携带了飘絮反制术式的法杖,需求魂楔或泽洛作为额外祭品以提升仪式质量,仪式的质量将影响镌刻完成时法杖的质量。
- 2
- 120
- WULA_FE_Spiritualist_Cotton_Counter_Technology
- Wula/Weapon/WULA_SP_Cotton_Counter
-
- WULA_SP_Cotton_Counter
- WULA_Soul_Wedge
- Wula_Zro
-
-
- Invoker
- Chanter
-
-
-
-
-
-
-
- WULA_Dark_Matter_Item
-
-
- 4
-
-
-
-
-
-
-
-
-
- WULA_Soul_Wedge
-
-
- 0.0005
-
-
-
- Wula_Zro
-
-
- 0.0015
-
-
-
-
-
-
-
- WULA_SP_Cotton_Counter
-
-
-
-
-
-
-
-
- 1.0
-
- Legendary
-
-
- 0.95
- Masterwork
-
-
- 0.6
- Excellent
-
-
- 0.4
- Normal
-
-
- 0.0
- Poor
-
-
-
-
- WULA_FE_Rituals_Create_Live_Shelter
-
- 使用镌刻法术创造一把携带了生灵庇佑术式的法杖,需求魂楔或泽洛作为额外祭品以提升仪式质量,仪式的质量将影响镌刻完成时法杖的质量。
- 2
- 120
- WULA_FE_Spiritualist_Live_Shelter_Technology
- Wula/Weapon/WULA_SP_Live_Shelter
-
- WULA_SP_Live_Shelter
- WULA_Soul_Wedge
- Wula_Zro
-
-
- Invoker
- Chanter
-
-
-
-
-
-
-
- WULA_Dark_Matter_Item
-
-
- 3
-
-
-
-
-
-
-
-
- WULA_Soul_Wedge
-
- 0.0005
-
-
-
- Wula_Zro
-
-
- 0.0015
-
-
-
-
-
-
-
- WULA_SP_Live_Shelter
-
-
-
-
-
-
-
-
- 1.0
-
- Legendary
-
-
- 0.95
- Masterwork
-
-
- 0.6
- Excellent
-
-
- 0.4
- Normal
-
-
- 0.0
- Poor
-
-
-
-
- WULA_FE_Rituals_Create_Mist_Incinerator
-
- 使用镌刻法术创造一把携带了灰烬焚烧术式的法杖,需求魂楔或泽洛作为额外祭品以提升仪式质量,仪式的质量将影响镌刻完成时法杖的质量。
- 2
- 120
- WULA_FE_Spiritualist_Mist_Incinerator_Technology
- Wula/Weapon/WULA_SP_Mist_Incinerator
-
- WULA_SP_Live_Shelter
- WULA_Soul_Wedge
- Wula_Zro
-
-
- Invoker
- Chanter
-
-
-
-
-
-
-
- WULA_Dark_Matter_Item
-
-
- 2
-
-
-
-
-
-
-
-
- WULA_Soul_Wedge
-
- 0.0005
-
-
-
- Wula_Zro
-
-
- 0.0015
-
-
-
-
-
-
-
- WULA_SP_Mist_Incinerator
-
-
-
-
-
-
-
-
- 1.0
-
- Legendary
-
-
- 0.95
- Masterwork
-
-
- 0.6
- Excellent
-
-
- 0.4
- Normal
-
-
- 0.0
- Poor
-
-
-
-
-
- WULA_SwiftHunterBlessing_Buff
-
- 以乌拉帝国的仪式强化被召选者,使其获得额外的移动速度和瞄准速度,一次只能获得一种来自乌拉帝国仪式的加护。
- WULA_SwiftHunterBlessing
- 使被召选者获得额外的移动速度和瞄准速度。
- 2
- 120
- Invoker
- DeathRefusalTarget
- WULA_FE_Spiritualist_SwiftHunterBlessing_Technology
-
-
-
- Wula_Zro
-
-
- 300
-
- ChanterAdvanced
- UI/PsychicRituals/PsychicRitual_ImbueDeathRefusal
-
-
- WULA_AbyssFearBlessing_Buff
-
- 以乌拉帝国的仪式强化被召选者,使其获得额外的伤害减免和近战攻击速度,一次只能获得一种来自乌拉帝国仪式的加护。
- WULA_AbyssFearBlessing
- 使被召选者获得额外的伤害减免和近战攻击速度。
- 2
- 120
- Invoker
- DeathRefusalTarget
- WULA_FE_Spiritualist_AbyssFearBlessing_Technology
-
-
-
- Wula_Zro
-
-
- 300
-
- ChanterAdvanced
- UI/PsychicRituals/PsychicRitual_ImbueDeathRefusal
-
-
- WULA_InstantJumpdriveBlessing_Buff
-
- 以乌拉帝国的仪式强化被召选者,使其获得短距离的自体传送能力,一次只能获得一种来自乌拉帝国仪式的加护。
- WULA_AbyssFearBlessing
- 使被召选者获得短距离的自体传送能力。
- 2
- 120
- Invoker
- DeathRefusalTarget
- WULA_FE_Spiritualist_InstantJumpdriveBlessing_Technology
-
-
-
- Wula_Zro
-
-
- 300
-
- ChanterAdvanced
- UI/PsychicRituals/PsychicRitual_ImbueDeathRefusal
-
-
- WULA_MindSpringBlessing_Buff
-
- 以乌拉帝国的仪式强化被召选者,使其获得自行激发灵感的能力,一次只能获得一种来自乌拉帝国仪式的加护。
- WULA_MindSpringBlessing
- 使被召选者获得自行激发灵感的能力。
- 2
- 120
- Invoker
- DeathRefusalTarget
- WULA_FE_Spiritualist_MindSpringBlessing_Technology
-
-
-
- Wula_Zro
-
-
- 300
-
- ChanterAdvanced
- UI/PsychicRituals/PsychicRitual_ImbueDeathRefusal
-
-
\ No newline at end of file
diff --git a/1.6/Anomaly/Defs/ResearchProjectDefs/ResearchProjects_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/ResearchProjectDefs/ResearchProjects_WULA_FE_Spiritualist.xml
deleted file mode 100644
index 401127d5..00000000
--- a/1.6/Anomaly/Defs/ResearchProjectDefs/ResearchProjects_WULA_FE_Spiritualist.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-
-
-
- Archotech
- WULA_FE_Spiritualist_ResearchTab
-
-
-
-
- WULA_FE_Spiritualist_Base_Technology1
-
- 这个科技没有任何用处,但是有一部分科技依托于此科技
- 4000
- 0.00
- 3.00
-
-
-
-
- WULA_FE_Spiritualist_Base_Technology2
-
- 这个科技没有任何用处,但是有一部分科技依托于此科技
- 5000
- 2.50
- 3.00
-
- WULA_FE_Spiritualist_Base_Technology1
-
-
-
-
-
- WULA_FE_Spiritualist_Base_Technology3
-
- 这个科技没有任何用处,但是有一部分科技依托于此科技
- 6000
- 4.50
- 3.00
-
- WULA_FE_Spiritualist_Base_Technology2
-
-
-
-
-
-
-
-
- WULA_FE_Spiritualist_Cloth_Technology
-
- 乌拉帝国的国教人员使用的一种轻型装甲,相较于制式帝国突击队装甲拥有更强大的区域灵能盾,可以抵御射弹和EMP武器的袭击。
- 12000
- 3.50
- 2.00
-
- WULA_FE_Spiritualist_Base_Technology2
-
-
-
-
-
- WULA_FE_Spiritualist_SwiftHunterBlessing_Technology
-
- 以乌拉帝国的仪式强化被召选者,使其获得额外的移动速度和瞄准速度。
- 12000
- 1.00
- 1.30
-
- WULA_FE_Spiritualist_Base_Technology1
-
-
-
- WULA_FE_Spiritualist_AbyssFearBlessing_Technology
-
- 以乌拉帝国的仪式强化被召选者,使其获得额外的伤害减免和近战攻击速度。
- 12000
- 1.00
- 0.60
-
- WULA_FE_Spiritualist_Base_Technology1
-
-
-
- WULA_FE_Spiritualist_MindSpringBlessing_Technology
-
- 以乌拉帝国的仪式强化被召选者,使其获得自行激发灵感的能力。
- 12000
- 3.50
- 0.60
-
- WULA_FE_Spiritualist_Base_Technology2
-
-
-
- WULA_FE_Spiritualist_InstantJumpdriveBlessing_Technology
-
- 以乌拉帝国的仪式强化被召选者,使其获得短距离的自体传送能力。
- 12000
- 5.50
- 0.60
-
- WULA_FE_Spiritualist_Base_Technology3
-
-
-
- WULA_FE_Spiritualist_Live_Shelter_Technology
-
- 这是乌拉星人用于救治伤者的法术,可以使用灵能诱发伤口以非常规的方式快速愈合,并且效果会在友方个体间弹跳。
- 12000
- 1.00
- 4.70
-
- WULA_FE_Spiritualist_Base_Technology1
-
-
-
- WULA_FE_Spiritualist_Mist_Incinerator_Technology
-
- 乌拉星人所使用的压制性术式,能够在短时间的吟唱后喷出大量由灵能能量构成的火焰,这种击穿灵魂的火焰可以无视敌人的护甲,点燃敌人的躯体。
- 12000
- 1.00
- 4.10
-
- WULA_FE_Spiritualist_Base_Technology1
-
-
-
- WULA_FE_Spiritualist_Cotton_Counter_Technology
-
- 这是乌拉星人在舰船上用于反制敌方飞行器和导弹的特殊术式,核心在于高爆发性高追踪性的输出,通过快速吟唱汇聚的灵能能量使对方迅速失能。
- 12000
- 3.50
- 4.10
-
- WULA_FE_Spiritualist_Base_Technology2
-
-
-
- WULA_FE_Spiritualist_Spear_Impale_Technology
-
- 这是乌拉星人所创造的最强大的进攻术式,来源于乌拉星人的泰坦和旗舰。这种术式发射的纯净灵能能量能绕过几乎所有防御,在敌人的集群中连续弹跳,瞬间烧穿无信之徒的可悲躯体。
- 12000
- 5.50
- 4.10
-
- WULA_FE_Spiritualist_Base_Technology3
-
-
-
-
-
-
- WULA_FE_Spiritualist_CPU_Psienhance_Technology
-
- 开发能够安装于机械乌拉的生物处理器的特殊改件,强化其与虚境的亲和,增强心灵敏感度。
- 12000
- 5.50
- 5.40
-
- WULA_FE_Spiritualist_Base_Technology3
-
-
-
- WULA_FE_Spiritualist_CPU_Prophet_Technology
-
- 开发能够安装于机械乌拉的生物处理器的特殊改件,能够让其瞬时地预知敌人的动作,以获得射击精度和近战命中率加成。
- 12000
- 3.50
- 5.40
-
- WULA_FE_Spiritualist_Base_Technology2
-
-
-
- WULA_FE_Spiritualist_Soul_Wedge_Extract_Technology
-
- 开发一种特殊插件,会深深地植入俘虏和奴隶的大脑,使其再也无法醒来,并周期性地产生魂楔——年龄越大,凝聚速度越快。
- 12000
- 1.00
- 5.40
-
- WULA_FE_Spiritualist_Base_Technology1
-
-
-
\ No newline at end of file
diff --git a/1.6/Anomaly/Defs/ResearchTabDef/ResearchTabs_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/ResearchTabDef/ResearchTabs_WULA_FE_Spiritualist.xml
deleted file mode 100644
index 987bfd21..00000000
--- a/1.6/Anomaly/Defs/ResearchTabDef/ResearchTabs_WULA_FE_Spiritualist.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- WULA_FE_Spiritualist_ResearchTab
-
- 乌拉帝国失落科技项目
- 由乌拉帝国在黄金时期开发的一系列驱使灵能进行生产和战斗的技术,自从帝国失落后,只有少数信奉乌拉帝国国教的神职人员还懂得如何使用它们。
-
-
diff --git a/1.6/Anomaly/Defs/ThingDefs/WULA_FE_Spiritualist_Item.xml b/1.6/Anomaly/Defs/ThingDefs/WULA_FE_Spiritualist_Item.xml
deleted file mode 100644
index cf850af0..00000000
--- a/1.6/Anomaly/Defs/ThingDefs/WULA_FE_Spiritualist_Item.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
- Wula_Zro
-
- 一种在异星粒子中存在的极其稀有的气溶胶,随着陨石撞击被一起发现,似乎是某个远古先驱者种族死亡时躯体的残留物。除了提供致幻效果和补充精神力外,若拥有灵能天赋的人将其摄入体内,泽珞也会极大的提高灵能力量,并可能导致成瘾。\n\n乌拉帝国拥有根据成分仿造泽洛的技术,换句话来说,在边缘世界流通的泽洛都不算正牌货。
-
- Wula_ZroHigh
- PsychiteTolerance
- PsychiteAddiction
- ChemicalDamageSevere
-
-
- Wula/Item/Wula_Zro
- Graphic_Single
- 0.75
-
- 300
- false
-
- 350
- 30
- 0.05
-
- Archotech
-
-
- Processed
- Chemical
- 0.80
- Social
- 150
- Ingest_Snort
-
-
- (0.21,0,0.05)
-
-
- false
- 吸 {0}
- 正在吸 {0}.
- false
-
-
- Wula_ZroHigh
- 1
- Psychite
-
-
- PsychiteTolerance
- Psychite
- 0.03
- true
- true
-
-
- 0.2
-
-
-
-
-
-
-
-
- Psychite
- 0.02
- 0.10
- 0.15
- 0.9
- 110
-
-
- 200
-
-
- Wula_ZroHigh
-
- 泽洛亢奋
- 吸食泽洛后,吸食者会感觉自己像打开了一扇天窗一般,心灵都变得透彻了。
- Hediff_High
- (1,0,0.5)
- true
- 1.0
- false
-
-
- -1.5
- true
-
-
-
-
-
- 2.5
-
-
-
-
-
- Wula_ZroHigh
- ThoughtWorker_Hediff
- Wula_ZroHigh
- true
- Baby, Child, Adult
-
-
-
- 我···我看到了!我全都看到了!
- 30
-
-
-
-
- Wula_Make_Zro
-
- 使用尸体烧制泽洛。
- 烧制中。
- 300
- GeneralLaborSpeed
- Cremate
- Recipe_Cremate
- true
-
- WULA_FE_Spiritualist_Base_Technology1
-
-
-
-
-
- Corpses
-
-
- 1
-
-
-
-
- CorpsesHumanlike
-
-
-
- 3
-
-
-
\ No newline at end of file
diff --git a/1.6/Anomaly/Defs/ThingDefs_Buildings/Buildings_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/ThingDefs_Buildings/Buildings_WULA_FE_Spiritualist.xml
deleted file mode 100644
index 75a7f056..00000000
--- a/1.6/Anomaly/Defs/ThingDefs_Buildings/Buildings_WULA_FE_Spiritualist.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
- WULA_OfferingPedestal
-
- 一个用于进行灵能献祭的基座。它可以作为灵能的冥想焦点,并能通过附近的灵能设施获得强化。它是启动乌拉帝国灵能仪式的关键建筑。
- Normal
- Standable
- false
-
- SupportPlantsOnly
- false
- false
- false
- false
-
- Anomaly
-
-
- 200
-
- Wula/Building/WULA_OfferingPedestal
- Graphic_Single
- (3, 3)
-
- (3, 3)
- Light
-
- WULA_FE_Spiritualist_Base_Technology1
-
-
- ITab_Entity
-
- WULA_Buildings
- FloorEmplacement
- true
- false
-
- 0
- 0.08
-
- false
-
- PlaceWorker_NeverAdjacentUnstandableRadial
-
- True
-
-
-
-
-
- ShardBeacon
- VoidSculpture
-
-
-
- MeditationFocusStrength
-
- Void
-
-
-
-
- ShardBeacon
-
- 0.02
- 9.9
- 4
- MeditationFocusPerBuilding
- MeditationFocusPerBuildingAbstract
-
-
-
- VoidSculpture
-
- 0.02
- 9.9
- 6
- MeditationFocusPerBuilding
- MeditationFocusPerBuildingAbstract
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.6/Anomaly/Defs/ThingDefs_Misc/Apperals/WULA_FE_Spiritualist_Apparel.xml b/1.6/Anomaly/Defs/ThingDefs_Misc/Apperals/WULA_FE_Spiritualist_Apparel.xml
deleted file mode 100644
index 45c9c2df..00000000
--- a/1.6/Anomaly/Defs/ThingDefs_Misc/Apperals/WULA_FE_Spiritualist_Apparel.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-
-
-
- WULA_Priest_Uniform
-
- 乌拉帝国神官所着的衣服,给予了这些神官所应有的优雅——无论是在战场上还是在生活中。它通过埋藏的一系列的灵能触媒强化穿戴者的灵能能力,支起庞大的灵能盾,压制精神崩溃,并给予她们预知敌方近身攻击的技能。要说有什么美中不足的地方,恐怕只有它“是一件衣服”这个问题了。
- Normal
-
- Wula/Apparel/WULA_Priest_Uniform
-
-
-
- RoyalTier6
- Wula_FE_Spiritualist_T3
-
-
- Torso
- Shoulders
- Arms
- Legs
-
-
-
- Middle
-
- Wula/Apparel/WULA_Priest_Uniform
-
-
- 3000
- 5
- 21
-
- 300
-
- 50000
- 3000
- 0.2
- 0.1
- 0.1
- 1.5
- 0.5
-
-
- 1
- 0.5
- -0.25
-
- None
- 200
-
- Fabric
- Leathery
-
-
-
-
-
-
- 6
- 5000
- 2800
-
-
- true
- false
- true
-
-
- (0.5, 0.3, 0.9, 0.5)
- Interceptor_BlockedProjectile
- Shield_Break
- BulletShieldGenerator_Reactivate
-
-
- true
- 0
-
-
- 5
-
-
-
-
-
- WULA_Priest_Hat
-
- 乌拉帝国神官的配套帽子,能像服装那样强化使用者的心灵敏感度并支起一个灵能护盾,它的体积比神官制服的护盾稍小,以形成第二道防线。
- Normal
-
-
- Wula/Apparel/WULA_Priest_Hat
-
-
- 0.1
-
-
- 0.75
-
- None
- 150
-
- 3000
- 5
- 6
-
-
- Fabric
- Leathery
-
-
-
- RoyalTier6
- Wula_FE_Spiritualist_T3
-
- false
-
- FullHead
-
-
- Overhead
-
- ApparelHead
- Wula/Apparel/WULA_Priest_Hat
-
-
- RewardStandardHighFreq
-
-
-
-
-
- 3
- 2500
- 2800
-
-
- true
- false
- false
-
-
- (0.5, 0.3, 0.9, 0.5)
- Interceptor_BlockedProjectile
- Shield_Break
- BulletShieldGenerator_Reactivate
-
-
- true
- 0
-
-
- 5
-
-
-
-
-
-
- WULA_Skitarii_Uniform
-
- 乌拉帝国护教军所穿戴的轻型装甲,并在外表覆以教袍掩盖装甲部分。它能支起一个较小的灵能盾,并通过埋藏的一系列的灵能触媒强化穿戴者的灵能能力。
-
- WULA_FE_Spiritualist_Cloth_Technology
-
- 7
-
- false
-
-
- Wula/Apparel/WULA_Skitarii_Uniform
-
-
- 40000
- 500
- 8
- 0
- 0.5
- 0.5
- 0.75
- 5
-
-
-
- 0.5
-
- None
- 200
-
- 8
- 36
-
-
-
- Wula_FE_Spiritualist_T2
-
- Wula/Apparel/WULA_Skitarii_Uniform
-
-
-
-
-
- 3
- 1000
- 2800
-
-
- true
- false
- true
-
-
- (0.5, 0.3, 0.9, 0.5)
- Interceptor_BlockedProjectile
- Shield_Break
- BulletShieldGenerator_Reactivate
-
-
- true
- 0
-
-
- 5
-
-
-
-
-
- WULA_Skitarii_veil
-
- 与乌拉帝国护教军装甲配套的头饰,能够支起一个较小的灵能盾,并强化使用者的心灵敏感度。
-
-
- 7
-
- WULA_FE_Spiritualist_Cloth_Technology
-
-
- Wula/Apparel/WULA_Skitarii_veil
-
-
- 30000
- 2000
- 1
- 0
- 0.3
- 0.3
- 0.3
- 1
-
-
- 0.2
-
-
-
- Wula_FE_Spiritualist_T2
-
- Wula/Apparel/WULA_Skitarii_veil
-
- None
- 30
-
- 1
- 12
-
-
-
-
-
- 2
- 300
- 2800
-
-
- true
- false
- true
-
-
- (0.5, 0.3, 0.9, 0.5)
- Interceptor_BlockedProjectile
- Shield_Break
- BulletShieldGenerator_Reactivate
-
-
- true
- 0
-
-
- 5
-
-
-
-
-
\ No newline at end of file
diff --git a/1.6/Anomaly/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Spiritualist.xml b/1.6/Anomaly/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Spiritualist.xml
deleted file mode 100644
index 36919c10..00000000
--- a/1.6/Anomaly/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Spiritualist.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
- Wula_Psi_Titan
-
- 由乌拉帝国大教堂所开发的重型灵能机械体,以短距离折跃优雅地穿梭于炮火间,并用灵能盾抵挡敌方射弹侵袭。该机体不仅镌刻了破坏力强大的星光追猎术式用以发起远距离跟踪打击,还拥有一系列改变战局的灵能能力。\n\n但是在近身搏斗中,灵能泰坦是一个可笑的对手,并且它的秘文纹路很容易遭到外力破坏,它的本体无法吸收太多伤害!
- Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Icon
-
-
- 3
- 8
- 2
- 1
- 0.5
- 0.5
- 0.25
- 1200
- 200
-
-
- 0.1
- 5
-
-
-
-
-
- Mechanoid
- Wula_Psi_Titan_Body
- 15.0
- 3.5
-
-
- MechanoidFullyFormed
- Pawn_Mech_Tunneler_Wounded
- Pawn_Mech_Tunneler_Death
- Pawn_Mech_Tunneler_Call
-
-
- TunnelerSlowedDown
-
-
-
-
-
-
-
-
- 灵能震爆
-
- Blunt
-
- 10
- 4
- Torso
- true
-
-
-
-
-
-
- 4
- true
- (0.5, 0.3, 0.9)
- BulletShieldGenerator_Reactivate
- BulletShield_Ambience
- 5000
- true
- 1800
- 120
- 0.2
- True
- 1500
- ProjectileInterceptorTip
-
-
-
- 480
- 10
- 3
- 40
- 4
- 0
- false
-
- GotoWander
- Carried
-
-
-
- AutoBlink_Skip_Small
-
-
- AutoBlink_Skip_Exit_Small
-
-
-
- Skip_Entry
-
-
-
- Skip_ExitNoDelay
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.6/Anomaly/Defs/TraderKindDefs/TraderKinds_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/TraderKindDefs/TraderKinds_WULA_FE_Spiritualist.xml
deleted file mode 100644
index 0f62f5c6..00000000
--- a/1.6/Anomaly/Defs/TraderKindDefs/TraderKinds_WULA_FE_Spiritualist.xml
+++ /dev/null
@@ -1,474 +0,0 @@
-
-
-
- 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
diff --git a/Content/Textures/Wula/Building/WULA_Cat_Bunker_east.png b/Content/Textures/Wula/Building/WULA_Cat_Bunker_east.png
index 4968e56b..c10bb69c 100644
Binary files a/Content/Textures/Wula/Building/WULA_Cat_Bunker_east.png and b/Content/Textures/Wula/Building/WULA_Cat_Bunker_east.png differ
diff --git a/Content/Textures/Wula/Building/WULA_Cat_Bunker_north.png b/Content/Textures/Wula/Building/WULA_Cat_Bunker_north.png
index 4968e56b..c10bb69c 100644
Binary files a/Content/Textures/Wula/Building/WULA_Cat_Bunker_north.png and b/Content/Textures/Wula/Building/WULA_Cat_Bunker_north.png differ
diff --git a/Content/Textures/Wula/Building/WULA_Cat_Bunker_south.png b/Content/Textures/Wula/Building/WULA_Cat_Bunker_south.png
index 4968e56b..c10bb69c 100644
Binary files a/Content/Textures/Wula/Building/WULA_Cat_Bunker_south.png and b/Content/Textures/Wula/Building/WULA_Cat_Bunker_south.png differ
diff --git a/Content/Textures/Wula/Building/WULA_Machine_Recharger.png b/Content/Textures/Wula/Building/WULA_Machine_Recharger.png
index 849ab0e6..9959ed45 100644
Binary files a/Content/Textures/Wula/Building/WULA_Machine_Recharger.png and b/Content/Textures/Wula/Building/WULA_Machine_Recharger.png differ
diff --git a/Content/Textures/Wula/Building/WULA_Machine_Recharger_Incoming.png b/Content/Textures/Wula/Building/WULA_Machine_Recharger_Incoming.png
new file mode 100644
index 00000000..56faf586
Binary files /dev/null and b/Content/Textures/Wula/Building/WULA_Machine_Recharger_Incoming.png differ
diff --git a/Content/Textures/Wula/Building/WULA_MaintenancePod.png b/Content/Textures/Wula/Building/WULA_MaintenancePod.png
new file mode 100644
index 00000000..fa96ca78
Binary files /dev/null and b/Content/Textures/Wula/Building/WULA_MaintenancePod.png differ
diff --git a/Content/Textures/Wula/Building/WULA_MaintenancePod_south.png b/Content/Textures/Wula/Building/WULA_MaintenancePod_south.png
deleted file mode 100644
index c8b4d4e0..00000000
Binary files a/Content/Textures/Wula/Building/WULA_MaintenancePod_south.png and /dev/null differ
diff --git a/Content/Textures/Wula/Building/WULA_WeaponArmor_Productor.png b/Content/Textures/Wula/Building/WULA_WeaponArmor_Productor.png
new file mode 100644
index 00000000..00a26a1b
Binary files /dev/null and b/Content/Textures/Wula/Building/WULA_WeaponArmor_Productor.png differ
diff --git a/Content/Textures/Wula/Building/WULA_WeaponArmor_Productor_Incoming.png b/Content/Textures/Wula/Building/WULA_WeaponArmor_Productor_Incoming.png
new file mode 100644
index 00000000..b4b5ca49
Binary files /dev/null and b/Content/Textures/Wula/Building/WULA_WeaponArmor_Productor_Incoming.png differ
diff --git a/Content/Textures/Wula/Projectile/WULA_Loitering_Munition.png b/Content/Textures/Wula/Projectile/WULA_Loitering_Munition.png
index 19203148..e4b17e15 100644
Binary files a/Content/Textures/Wula/Projectile/WULA_Loitering_Munition.png and b/Content/Textures/Wula/Projectile/WULA_Loitering_Munition.png differ
diff --git a/Source/WulaFallenEmpire/Flyover/WULA_AircraftHangar/CompAircraftHangar.cs b/Source/WulaFallenEmpire/Flyover/WULA_AircraftHangar/CompAircraftHangar.cs
index 63475559..570d2250 100644
--- a/Source/WulaFallenEmpire/Flyover/WULA_AircraftHangar/CompAircraftHangar.cs
+++ b/Source/WulaFallenEmpire/Flyover/WULA_AircraftHangar/CompAircraftHangar.cs
@@ -11,6 +11,12 @@ namespace WulaFallenEmpire
public int aircraftCount = 1; // 起飞后提供的战机数量
public ThingDef skyfallerLeaving; // 起飞时的天空坠落者效果
+ // 新增:自动发射配置
+ public bool autoLaunchEnabled = false; // 是否启用自动发射
+ public int autoLaunchDelayTicks = 600; // 自动发射延迟(ticks,默认10秒)
+ public bool autoLaunchOnConstruction = true; // 建造完成后自动发射
+ public bool autoLaunchOnPowerOn = false; // 通电时自动发射
+
public CompProperties_AircraftHangar()
{
compClass = typeof(CompAircraftHangar);
@@ -21,6 +27,86 @@ namespace WulaFallenEmpire
{
public CompProperties_AircraftHangar Props => (CompProperties_AircraftHangar)props;
+ // 新增:自动发射状态
+ private bool autoLaunchScheduled = false;
+ private int autoLaunchTick = -1;
+ private bool hasLaunched = false;
+
+ public override void PostSpawnSetup(bool respawningAfterLoad)
+ {
+ base.PostSpawnSetup(respawningAfterLoad);
+
+ if (!respawningAfterLoad && Props.autoLaunchEnabled && Props.autoLaunchOnConstruction)
+ {
+ ScheduleAutoLaunch();
+ }
+ }
+
+ public override void PostExposeData()
+ {
+ base.PostExposeData();
+ Scribe_Values.Look(ref autoLaunchScheduled, "autoLaunchScheduled", false);
+ Scribe_Values.Look(ref autoLaunchTick, "autoLaunchTick", -1);
+ Scribe_Values.Look(ref hasLaunched, "hasLaunched", false);
+ }
+
+ public override void CompTick()
+ {
+ base.CompTick();
+
+ // 处理自动发射
+ if (Props.autoLaunchEnabled && !hasLaunched)
+ {
+ HandleAutoLaunch();
+ }
+ }
+
+ // 新增:自动发射处理
+ private void HandleAutoLaunch()
+ {
+ // 检查预定发射
+ if (autoLaunchScheduled && Find.TickManager.TicksGame >= autoLaunchTick)
+ {
+ LaunchAircraft();
+ return;
+ }
+
+ // 检查通电自动发射
+ if (Props.autoLaunchOnPowerOn && IsPoweredOn() && !autoLaunchScheduled)
+ {
+ ScheduleAutoLaunch();
+ return;
+ }
+ }
+
+ // 新增:检查电力状态
+ private bool IsPoweredOn()
+ {
+ var powerComp = parent.GetComp();
+ return powerComp != null && powerComp.PowerOn;
+ }
+
+ // 新增:预定自动发射
+ private void ScheduleAutoLaunch()
+ {
+ if (hasLaunched || autoLaunchScheduled)
+ return;
+
+ autoLaunchScheduled = true;
+ autoLaunchTick = Find.TickManager.TicksGame + Props.autoLaunchDelayTicks;
+
+ Messages.Message("AircraftAutoLaunchScheduled".Translate(Props.aircraftDef.LabelCap, (Props.autoLaunchDelayTicks / 60f).ToString("F1")), parent, MessageTypeDefOf.NeutralEvent);
+ }
+
+ // 新增:强制立即发射(用于调试或其他系统调用)
+ public void ForceLaunch()
+ {
+ if (!hasLaunched)
+ {
+ LaunchAircraft();
+ }
+ }
+
public override IEnumerable CompGetGizmosExtra()
{
foreach (Gizmo gizmo in base.CompGetGizmosExtra())
@@ -28,7 +114,11 @@ namespace WulaFallenEmpire
yield return gizmo;
}
- // 起飞命令
+ // 如果已经发射,不显示任何按钮
+ if (hasLaunched)
+ yield break;
+
+ // 手动发射命令
Command_Action launchCommand = new Command_Action
{
defaultLabel = "LaunchAircraft".Translate(),
@@ -46,8 +136,28 @@ namespace WulaFallenEmpire
yield return launchCommand;
}
+ // 新增:切换自动发射状态
+ private void ToggleAutoLaunch()
+ {
+ if (autoLaunchScheduled)
+ {
+ // 取消预定发射
+ autoLaunchScheduled = false;
+ autoLaunchTick = -1;
+ Messages.Message("AutoLaunchCancelled".Translate(), parent, MessageTypeDefOf.NeutralEvent);
+ }
+ else
+ {
+ // 预定发射
+ ScheduleAutoLaunch();
+ }
+ }
+
private void LaunchAircraft()
{
+ if (hasLaunched)
+ return;
+
// 获取全局战机管理器
WorldComponent_AircraftManager aircraftManager = Find.World.GetComponent();
@@ -61,7 +171,7 @@ namespace WulaFallenEmpire
aircraftManager.AddAircraft(Props.aircraftDef, Props.aircraftCount, parent.Faction);
// 显示消息
- Messages.Message("AircraftLaunched".Translate(Props.aircraftCount, Props.aircraftDef.LabelCap), MessageTypeDefOf.PositiveEvent);
+ Messages.Message("AircraftLaunched".Translate(Props.aircraftCount, Props.aircraftDef.LabelCap), parent, MessageTypeDefOf.PositiveEvent);
// 创建起飞效果(仅视觉效果)
if (Props.skyfallerLeaving != null)
@@ -73,6 +183,9 @@ namespace WulaFallenEmpire
// 如果没有定义 Skyfaller,直接销毁建筑
parent.Destroy();
}
+
+ hasLaunched = true;
+ autoLaunchScheduled = false;
}
private void CreateTakeoffEffect()
@@ -112,10 +225,30 @@ namespace WulaFallenEmpire
}
}
- public override void PostExposeData()
+ // 新增:检查是否已经发射
+ public bool HasLaunched => hasLaunched;
+
+ // 新增:获取自动发射状态信息(用于检查字符串)
+ public override string CompInspectStringExtra()
{
- base.PostExposeData();
- // 不需要保存状态,因为建筑起飞后就销毁了
+ if (hasLaunched)
+ return "AircraftStatusLaunched".Translate();
+
+ if (Props.autoLaunchEnabled)
+ {
+ if (autoLaunchScheduled)
+ {
+ int ticksRemaining = autoLaunchTick - Find.TickManager.TicksGame;
+ float secondsRemaining = ticksRemaining / 60f;
+ return "AutoLaunchScheduled".Translate(secondsRemaining.ToString("F1"));
+ }
+ else
+ {
+ return "AutoLaunchReady".Translate();
+ }
+ }
+
+ return base.CompInspectStringExtra();
}
}
}
diff --git a/Source/WulaFallenEmpire/Flyover/WULA_AutoLaunchHangar/CompProperties_AutoLaunchHangar.cs b/Source/WulaFallenEmpire/Flyover/WULA_AutoLaunchHangar/CompProperties_AutoLaunchHangar.cs
deleted file mode 100644
index e5b19915..00000000
--- a/Source/WulaFallenEmpire/Flyover/WULA_AutoLaunchHangar/CompProperties_AutoLaunchHangar.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-using RimWorld;
-using Verse;
-using System.Collections.Generic;
-
-namespace WulaFallenEmpire
-{
- public class CompProperties_AutoLaunchHangar : CompProperties
- {
- public ThingDef aircraftDef; // 对应的战机定义
- public int aircraftCount = 1; // 起飞后提供的战机数量
- public ThingDef skyfallerLeaving; // 起飞时的天空坠落者效果
- public int launchDelayTicks = 60; // 延迟启动的ticks(默认1秒)
- public bool requirePower = true; // 是否需要电力才能启动
-
- public CompProperties_AutoLaunchHangar()
- {
- compClass = typeof(CompAutoLaunchHangar);
- }
- }
-
- public class CompAutoLaunchHangar : ThingComp
- {
- public CompProperties_AutoLaunchHangar Props => (CompProperties_AutoLaunchHangar)props;
- private bool hasLaunched = false;
- private int spawnTick = -1;
-
- private CompPowerTrader powerComp;
- private CompRefuelable refuelableComp;
-
- public override void PostSpawnSetup(bool respawningAfterLoad)
- {
- base.PostSpawnSetup(respawningAfterLoad);
-
- if (!respawningAfterLoad)
- {
- // 记录生成时间
- spawnTick = Find.TickManager.TicksAbs;
- hasLaunched = false;
-
- // 缓存其他组件
- powerComp = parent.GetComp();
- refuelableComp = parent.GetComp();
-
- Log.Message($"AutoLaunchHangar spawned at tick {spawnTick}, will launch in {Props.launchDelayTicks} ticks");
- }
- }
-
- public override void PostExposeData()
- {
- base.PostExposeData();
- Scribe_Values.Look(ref hasLaunched, "hasLaunched", false);
- Scribe_Values.Look(ref spawnTick, "spawnTick", -1);
- }
-
- public override void CompTick()
- {
- base.CompTick();
-
- if (hasLaunched || spawnTick == -1)
- return;
-
- int currentTick = Find.TickManager.TicksAbs;
- if (currentTick - spawnTick >= Props.launchDelayTicks)
- {
- if (CanAutoLaunch())
- {
- AutoLaunchAircraft();
- }
- }
- }
-
- private bool CanAutoLaunch()
- {
- // 检查建筑是否完好
- if (parent.HitPoints <= 0)
- {
- Log.Message("AutoLaunch: Hangar is damaged, cannot launch");
- return false;
- }
-
- // 检查电力需求
- if (Props.requirePower && powerComp != null && !powerComp.PowerOn)
- {
- Log.Message("AutoLaunch: No power, cannot launch");
- return false;
- }
-
- // 检查燃料需求
- if (refuelableComp != null && !refuelableComp.HasFuel)
- {
- Log.Message("AutoLaunch: No fuel, cannot launch");
- return false;
- }
-
- // 检查地图是否有效
- if (parent.Map == null)
- {
- Log.Message("AutoLaunch: Map is null, cannot launch");
- return false;
- }
-
- return true;
- }
-
- private void AutoLaunchAircraft()
- {
- Log.Message($"AutoLaunch: Starting aircraft launch sequence for {parent.Label}");
-
- // 获取全局战机管理器
- WorldComponent_AircraftManager aircraftManager = Find.World.GetComponent();
-
- if (aircraftManager == null)
- {
- Log.Error("AutoLaunch: AircraftManager not found");
- hasLaunched = true;
- return;
- }
-
- try
- {
- // 立即向全局管理器注册战机
- aircraftManager.AddAircraft(Props.aircraftDef, Props.aircraftCount, parent.Faction);
-
- // 显示消息
- Messages.Message("AircraftAutoLaunched".Translate(Props.aircraftCount, Props.aircraftDef.LabelCap),
- parent, MessageTypeDefOf.PositiveEvent);
-
- Log.Message($"AutoLaunch: Successfully added {Props.aircraftCount} {Props.aircraftDef.LabelCap} to global manager");
-
- // 创建起飞效果
- if (Props.skyfallerLeaving != null)
- {
- CreateAutoTakeoffEffect();
- }
- else
- {
- // 如果没有定义 Skyfaller,直接销毁建筑
- parent.Destroy();
- }
-
- hasLaunched = true;
- }
- catch (System.Exception ex)
- {
- Log.Error($"AutoLaunch error: {ex}");
- hasLaunched = true; // 标记为已启动,避免重复尝试
- }
- }
-
- private void CreateAutoTakeoffEffect()
- {
- try
- {
- // 创建起飞效果
- Thing chemfuel = ThingMaker.MakeThing(ThingDefOf.Chemfuel);
- chemfuel.stackCount = 1;
-
- Skyfaller skyfaller = SkyfallerMaker.MakeSkyfaller(Props.skyfallerLeaving, chemfuel);
-
- IntVec3 takeoffPos = parent.Position;
-
- if (parent.Map == null)
- {
- Log.Error("AutoLaunch: Map is null during takeoff effect creation");
- parent.Destroy();
- return;
- }
-
- // 生成 Skyfaller
- GenSpawn.Spawn(skyfaller, takeoffPos, parent.Map);
-
- Log.Message($"AutoLaunch: Takeoff effect created at {takeoffPos}");
-
- // 销毁原建筑
- parent.Destroy(DestroyMode.Vanish);
- }
- catch (System.Exception ex)
- {
- Log.Error($"AutoLaunch takeoff effect error: {ex}");
- // 如果Skyfaller创建失败,直接销毁建筑
- parent.Destroy(DestroyMode.Vanish);
- }
- }
-
- // 可选:提供手动触发的Gizmo(如果自动触发失败)
- public override IEnumerable CompGetGizmosExtra()
- {
- if (!hasLaunched)
- {
- Command_Action manualLaunch = new Command_Action
- {
- defaultLabel = "ManualLaunchAircraft".Translate(),
- defaultDesc = "ManualLaunchAircraftDesc".Translate(),
- icon = TexCommand.Attack,
- action = () =>
- {
- if (CanAutoLaunch())
- {
- AutoLaunchAircraft();
- }
- else
- {
- Messages.Message("CannotManualLaunch".Translate(), MessageTypeDefOf.RejectInput);
- }
- }
- };
-
- // 禁用条件检查
- if (parent.HitPoints <= 0)
- {
- manualLaunch.Disable("HangarDamaged".Translate());
- }
- else if (Props.requirePower && powerComp != null && !powerComp.PowerOn)
- {
- manualLaunch.Disable("NoPower".Translate());
- }
- else if (refuelableComp != null && !refuelableComp.HasFuel)
- {
- manualLaunch.Disable("NoFuel".Translate());
- }
-
- yield return manualLaunch;
- }
- }
-
- public override string CompInspectStringExtra()
- {
- if (!hasLaunched)
- {
- int remainingTicks = Props.launchDelayTicks - (Find.TickManager.TicksAbs - spawnTick);
- if (remainingTicks > 0)
- {
- return "AutoLaunchIn".Translate(remainingTicks.ToStringTicksToPeriod());
- }
- else
- {
- return "AutoLaunchReady".Translate();
- }
- }
- return null;
- }
- }
-}
diff --git a/Source/WulaFallenEmpire/GlobalWorkTable/CompLaunchable_ToGlobalStorage.cs b/Source/WulaFallenEmpire/GlobalWorkTable/CompLaunchable_ToGlobalStorage.cs
index eb7d1717..b7549726 100644
--- a/Source/WulaFallenEmpire/GlobalWorkTable/CompLaunchable_ToGlobalStorage.cs
+++ b/Source/WulaFallenEmpire/GlobalWorkTable/CompLaunchable_ToGlobalStorage.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using UnityEngine;
using Verse;
using Verse.Sound;
+using System.Text;
namespace WulaFallenEmpire
{
@@ -58,19 +59,105 @@ namespace WulaFallenEmpire
return;
}
- // 1. 将物品转移到全局存储
+ // 统计发送的物品
+ int inputItemsCount = 0;
+ int outputItemsCount = 0;
+ StringBuilder inputItemsList = new StringBuilder();
+ StringBuilder outputItemsList = new StringBuilder();
+
+ // 1. 将物品分类转移到相应的存储
foreach (Thing item in transporter.innerContainer)
{
- globalStorage.AddToInputStorage(item.def, item.stackCount);
+ if (ShouldGoToOutputStorage(item))
+ {
+ // 发送到输出存储器
+ globalStorage.AddToOutputStorage(item.def, item.stackCount);
+ outputItemsCount += item.stackCount;
+ if (outputItemsList.Length > 0) outputItemsList.Append(", ");
+ outputItemsList.Append($"{item.LabelCap} x{item.stackCount}");
+ }
+ else
+ {
+ // 发送到输入存储器
+ globalStorage.AddToInputStorage(item.def, item.stackCount);
+ inputItemsCount += item.stackCount;
+ if (inputItemsList.Length > 0) inputItemsList.Append(", ");
+ inputItemsList.Append($"{item.LabelCap} x{item.stackCount}");
+ }
}
- Messages.Message("WULA_ItemsSentToGlobalStorage".Translate(transporter.innerContainer.ContentsString), this.parent, MessageTypeDefOf.PositiveEvent);
- // 2. 清空容器,防止物品掉落
+ // 2. 显示发送结果消息
+ string message = BuildTransferMessage(inputItemsCount, outputItemsCount, inputItemsList.ToString(), outputItemsList.ToString());
+ Messages.Message(message, this.parent, MessageTypeDefOf.PositiveEvent);
+
+ // 3. 清空容器,防止物品掉落
transporter.innerContainer.ClearAndDestroyContents();
- // 3. 调用基类的发射方法,让它处理动画和销毁
- // 我们给一个无效的目标和空的到达动作,让它飞出地图后就消失
+ // 4. 调用基类的发射方法,让它处理动画和销毁
base.TryLaunch(this.parent.Map.Tile, null);
}
+
+ // 判断物品是否应该发送到输出存储器
+ private bool ShouldGoToOutputStorage(Thing item)
+ {
+ // 武器
+ if (item.def.IsWeapon)
+ return true;
+
+ // 装备
+ if (item.def.IsApparel)
+ return true;
+
+ // 活着的Pawn
+ //if (item is Pawn pawn && !pawn.Dead)
+ // return true;
+
+ // Pawn的尸体
+ if (item.def.IsCorpse)
+ return true;
+
+ // 其他物品发送到输入存储器
+ return false;
+ }
+
+ // 构建转移消息
+ private string BuildTransferMessage(int inputCount, int outputCount, string inputList, string outputList)
+ {
+ StringBuilder message = new StringBuilder();
+
+ if (inputCount > 0 && outputCount > 0)
+ {
+ // 既有输入又有输出物品
+ message.Append("WULA_ItemsSentToBothStorages".Translate(inputCount, outputCount));
+ if (!string.IsNullOrEmpty(inputList))
+ {
+ message.Append("\n").Append("WULA_InputStorageItems".Translate(inputList));
+ }
+ if (!string.IsNullOrEmpty(outputList))
+ {
+ message.Append("\n").Append("WULA_OutputStorageItems".Translate(outputList));
+ }
+ }
+ else if (inputCount > 0)
+ {
+ // 只有输入物品
+ message.Append("WULA_ItemsSentToInputStorage".Translate(inputCount));
+ if (!string.IsNullOrEmpty(inputList))
+ {
+ message.Append(": ").Append(inputList);
+ }
+ }
+ else if (outputCount > 0)
+ {
+ // 只有输出物品
+ message.Append("WULA_ItemsSentToOutputStorage".Translate(outputCount));
+ if (!string.IsNullOrEmpty(outputList))
+ {
+ message.Append(": ").Append(outputList);
+ }
+ }
+
+ return message.ToString();
+ }
}
-}
\ No newline at end of file
+}
diff --git a/Source/WulaFallenEmpire/GlobalWorkTable/ITab_GlobalBills.cs b/Source/WulaFallenEmpire/GlobalWorkTable/ITab_GlobalBills.cs
index e5363d58..8ac863f8 100644
--- a/Source/WulaFallenEmpire/GlobalWorkTable/ITab_GlobalBills.cs
+++ b/Source/WulaFallenEmpire/GlobalWorkTable/ITab_GlobalBills.cs
@@ -36,19 +36,19 @@ namespace WulaFallenEmpire
Text.Font = GameFont.Small;
// 存储查看按钮 - 放在标题旁边
- Rect storageButtonRect = new Rect(mainRect.xMax - 120f, mainRect.y, 120f, 25f);
+ Rect storageButtonRect = new Rect(mainRect.xMax - 160f, mainRect.y, 120f, 25f);
DoStorageButton(storageButtonRect);
- // 开发模式按钮区域
- if (Prefs.DevMode)
+ // 上帝模式按钮区域
+ if (DebugSettings.godMode)
{
- Rect devButtonRect = new Rect(mainRect.x, mainRect.y + 35f, mainRect.width, 25f);
- DoDevButtons(devButtonRect);
+ Rect godModeButtonRect = new Rect(mainRect.x, mainRect.y + 35f, mainRect.width, 25f);
+ DoGodModeButtons(godModeButtonRect);
}
// 订单列表区域 - 调整位置
- float ordersRectY = Prefs.DevMode ? mainRect.y + 65f : mainRect.y + 35f;
- Rect ordersRect = new Rect(mainRect.x, ordersRectY, mainRect.width, mainRect.height - (Prefs.DevMode ? 110f : 80f));
+ float ordersRectY = DebugSettings.godMode ? mainRect.y + 65f : mainRect.y + 35f;
+ Rect ordersRect = new Rect(mainRect.x, ordersRectY, mainRect.width, mainRect.height - (DebugSettings.godMode ? 110f : 80f));
mouseoverOrder = DoOrdersListing(ordersRect);
// 添加订单按钮
@@ -148,17 +148,18 @@ namespace WulaFallenEmpire
return sb.ToString();
}
- private void DoDevButtons(Rect rect)
+ // 修改:将开发者模式按钮改为上帝模式按钮
+ private void DoGodModeButtons(Rect rect)
{
Rect button1Rect = new Rect(rect.x, rect.y, rect.width / 2 - 5f, rect.height);
Rect button2Rect = new Rect(rect.x + rect.width / 2 + 5f, rect.y, rect.width / 2 - 5f, rect.height);
- if (Widgets.ButtonText(button1Rect, "DEV: Add Resources"))
+ if (Widgets.ButtonText(button1Rect, "GOD: Add Resources"))
{
AddTestResources();
}
- if (Widgets.ButtonText(button2Rect, "DEV: Spawn Products"))
+ if (Widgets.ButtonText(button2Rect, "GOD: Spawn Products"))
{
SpawnOutputProducts();
}
@@ -178,7 +179,7 @@ namespace WulaFallenEmpire
globalStorage.AddToInputStorage(componentDef, 100);
Messages.Message("Added 200 Steel and 100 Components to global storage", MessageTypeDefOf.PositiveEvent);
- Log.Message("[DEBUG] Added test resources");
+ Log.Message("[GOD MODE] Added test resources");
}
}
@@ -223,7 +224,7 @@ namespace WulaFallenEmpire
}
Messages.Message($"Spawned {totalSpawned} items at worktable location", MessageTypeDefOf.PositiveEvent);
- Log.Message($"[DEBUG] Spawned {totalSpawned} output products");
+ Log.Message($"[GOD MODE] Spawned {totalSpawned} output products");
}
}
@@ -318,8 +319,31 @@ namespace WulaFallenEmpire
// 控制按钮
float buttonY = rect.y + padding;
- Rect pauseButtonRect = new Rect(rect.xMax - 90f, buttonY, 40f, 25f);
+ float buttonWidth = 40f;
+ float buttonSpacing = 5f;
+ // 计算按钮位置(从右向左排列)
+ float currentX = rect.xMax;
+
+ // 删除按钮(最右边)
+ Rect deleteButtonRect = new Rect(currentX - buttonWidth, buttonY, buttonWidth, 25f);
+ currentX -= (buttonWidth + buttonSpacing);
+
+ // 暂停/恢复按钮
+ Rect pauseButtonRect = new Rect(currentX - buttonWidth, buttonY, buttonWidth, 25f);
+ currentX -= (buttonWidth + buttonSpacing);
+
+ // 上帝模式:立刻完成按钮(在暂停按钮左边)
+ Rect completeButtonRect = new Rect(currentX - buttonWidth, buttonY, buttonWidth, 25f);
+
+ // 绘制删除按钮
+ if (Widgets.ButtonText(deleteButtonRect, "WULA_Delete".Translate()))
+ {
+ SelTable.globalOrderStack.Delete(order);
+ SoundDefOf.Click.PlayOneShotOnCamera();
+ }
+
+ // 绘制暂停/恢复按钮
string pauseButtonText = order.paused ? "WULA_Resume".Translate() : "WULA_Pause".Translate();
if (Widgets.ButtonText(pauseButtonRect, pauseButtonText))
{
@@ -327,15 +351,23 @@ namespace WulaFallenEmpire
// 暂停/恢复时更新状态
order.UpdateState();
-
SoundDefOf.Click.PlayOneShotOnCamera();
}
- Rect deleteButtonRect = new Rect(rect.xMax - 45f, buttonY, 40f, 25f);
- if (Widgets.ButtonText(deleteButtonRect, "WULA_Delete".Translate()))
+ // 绘制上帝模式按钮(仅上帝模式下可见)
+ if (DebugSettings.godMode && order.state != GlobalProductionOrder.ProductionState.Completed)
{
- SelTable.globalOrderStack.Delete(order);
- SoundDefOf.Click.PlayOneShotOnCamera();
+ if (Widgets.ButtonText(completeButtonRect, "GOD: Complete"))
+ {
+ CompleteOrderImmediately(order);
+ SoundDefOf.Click.PlayOneShotOnCamera();
+ }
+
+ // 为上帝模式按钮添加Tooltip
+ if (Mouse.IsOver(completeButtonRect))
+ {
+ TooltipHandler.TipRegion(completeButtonRect, "Instantly complete this order (God Mode Only)");
+ }
}
// 资源检查提示 - 只在等待资源且不暂停时显示红色边框
@@ -358,6 +390,79 @@ namespace WulaFallenEmpire
return Mouse.IsOver(rect);
}
+ // 新增:立刻完成订单的方法
+ private void CompleteOrderImmediately(GlobalProductionOrder order)
+ {
+ if (order.state == GlobalProductionOrder.ProductionState.Completed)
+ return;
+
+ var globalStorage = Find.World.GetComponent();
+ if (globalStorage == null)
+ return;
+
+ // 检查是否有足够资源
+ bool hasEnoughResources = order.HasEnoughResources();
+
+ if (!hasEnoughResources)
+ {
+ // 上帝模式下,如果没有足够资源,显示确认对话框
+ Find.WindowStack.Add(new Dialog_MessageBox(
+ "This order doesn't have enough resources. Complete anyway? (God Mode)",
+ "Yes, Complete Anyway",
+ () => ForceCompleteOrder(order),
+ "Cancel",
+ null,
+ "Complete Without Resources",
+ false,
+ null,
+ null
+ ));
+ }
+ else
+ {
+ // 有足够资源,正常完成
+ ForceCompleteOrder(order);
+ }
+ }
+
+ // 强制完成订单(上帝模式)
+ private void ForceCompleteOrder(GlobalProductionOrder order)
+ {
+ var globalStorage = Find.World.GetComponent();
+ if (globalStorage == null)
+ return;
+
+ // 计算需要完成的数量
+ int remainingCount = order.targetCount - order.currentCount;
+
+ if (remainingCount <= 0)
+ return;
+
+ // 尝试消耗资源(如果可能)
+ bool resourcesConsumed = order.ConsumeResources();
+
+ if (!resourcesConsumed)
+ {
+ Log.Message($"[GOD MODE] Could not consume resources for {order.recipe.defName}, completing without resource consumption");
+ }
+
+ // 添加产品到输出存储
+ foreach (var product in order.recipe.products)
+ {
+ int totalCount = product.count * remainingCount;
+ globalStorage.AddToOutputStorage(product.thingDef, totalCount);
+ }
+
+ // 更新订单状态
+ order.currentCount = order.targetCount;
+ order.state = GlobalProductionOrder.ProductionState.Completed;
+ order.progress = 0f;
+
+ // 显示完成消息
+ Messages.Message($"GOD MODE: Completed order for {order.recipe.LabelCap} ({remainingCount} units)", MessageTypeDefOf.PositiveEvent);
+ Log.Message($"[GOD MODE] Force completed order: {order.recipe.defName}, produced {remainingCount} units");
+ }
+
private List GenerateRecipeOptions()
{
var options = new List();
diff --git a/Source/WulaFallenEmpire/Pawn/WULA_Maintenance/Need_Maintenance.cs b/Source/WulaFallenEmpire/Pawn/WULA_Maintenance/Need_Maintenance.cs
index 196c465d..685effe4 100644
--- a/Source/WulaFallenEmpire/Pawn/WULA_Maintenance/Need_Maintenance.cs
+++ b/Source/WulaFallenEmpire/Pawn/WULA_Maintenance/Need_Maintenance.cs
@@ -12,6 +12,10 @@ namespace WulaFallenEmpire
// 上次维护的天数
private float daysSinceLastMaintenance = 0f;
+
+ // 新增:记录当前应用的 Hediff 状态
+ private MaintenanceStatus currentAppliedStatus = MaintenanceStatus.Operational;
+ private Hediff currentAppliedHediff = null;
// 当前维护状态
public MaintenanceStatus Status
@@ -35,6 +39,8 @@ namespace WulaFallenEmpire
{
CurLevel = 1.0f;
daysSinceLastMaintenance = 0f;
+ currentAppliedStatus = MaintenanceStatus.Operational;
+ currentAppliedHediff = null;
}
public override void NeedInterval()
@@ -82,46 +88,72 @@ namespace WulaFallenEmpire
if (Extension == null)
return;
- // 检查是否需要应用故障效果
- var currentStatus = Status;
+ var newStatus = Status;
- // 移除旧的维护相关 Hediff
- RemoveMaintenanceHediffs();
-
- // 根据状态添加相应的 Hediff
- switch (currentStatus)
+ // 只有当状态发生变化时才更新 Hediff
+ if (newStatus != currentAppliedStatus)
{
- case MaintenanceStatus.MinorBreakdown:
- if (Extension.minorBreakdownHediff != null)
- pawn.health.AddHediff(Extension.minorBreakdownHediff);
- break;
-
- case MaintenanceStatus.MajorBreakdown:
- if (Extension.majorBreakdownHediff != null)
- pawn.health.AddHediff(Extension.majorBreakdownHediff);
- break;
-
- case MaintenanceStatus.CriticalFailure:
- if (Extension.criticalFailureHediff != null)
- pawn.health.AddHediff(Extension.criticalFailureHediff);
- break;
+ UpdateHediffForStatus(newStatus);
+ currentAppliedStatus = newStatus;
+ }
+
+ // 额外检查:确保当前 Hediff 仍然存在(可能被其他系统移除)
+ if (currentAppliedHediff != null && !pawn.health.hediffSet.hediffs.Contains(currentAppliedHediff))
+ {
+ // Hediff 被意外移除,重新应用
+ UpdateHediffForStatus(currentAppliedStatus);
}
}
- private void RemoveMaintenanceHediffs()
+ // 新增:智能更新 Hediff
+ private void UpdateHediffForStatus(MaintenanceStatus status)
+ {
+ // 首先移除当前应用的 Hediff
+ if (currentAppliedHediff != null)
+ {
+ pawn.health.RemoveHediff(currentAppliedHediff);
+ currentAppliedHediff = null;
+ }
+
+ // 根据新状态添加相应的 Hediff
+ HediffDef hediffDefToAdd = GetHediffDefForStatus(status);
+
+ if (hediffDefToAdd != null)
+ {
+ currentAppliedHediff = pawn.health.AddHediff(hediffDefToAdd);
+
+ // 调试日志
+ if (Prefs.DevMode)
+ {
+ Log.Message($"Maintenance: Applied {hediffDefToAdd.defName} for status {status} to {pawn.Label}");
+ }
+ }
+ else if (status == MaintenanceStatus.Operational)
+ {
+ // 操作状态,不需要 Hediff
+ if (Prefs.DevMode)
+ {
+ Log.Message($"Maintenance: {pawn.Label} is operational, no hediff needed");
+ }
+ }
+ }
+
+ // 新增:获取对应状态的 HediffDef
+ private HediffDef GetHediffDefForStatus(MaintenanceStatus status)
{
if (Extension == null)
- return;
+ return null;
- // 移除所有维护相关的 Hediff
- var hediffsToRemove = pawn.health.hediffSet.hediffs.FindAll(h =>
- h.def == Extension.minorBreakdownHediff ||
- h.def == Extension.majorBreakdownHediff ||
- h.def == Extension.criticalFailureHediff);
-
- foreach (var hediff in hediffsToRemove)
+ switch (status)
{
- pawn.health.RemoveHediff(hediff);
+ case MaintenanceStatus.MinorBreakdown:
+ return Extension.minorBreakdownHediff;
+ case MaintenanceStatus.MajorBreakdown:
+ return Extension.majorBreakdownHediff;
+ case MaintenanceStatus.CriticalFailure:
+ return Extension.criticalFailureHediff;
+ default:
+ return null;
}
}
@@ -132,8 +164,10 @@ namespace WulaFallenEmpire
CurLevel = ClampNeedLevel(CurLevel);
daysSinceLastMaintenance = 0f;
- // 移除所有维护相关的负面效果
- RemoveMaintenanceHediffs();
+ // 更新状态(会自动移除旧的 Hediff 并应用新的)
+ var newStatus = Status;
+ UpdateHediffForStatus(newStatus);
+ currentAppliedStatus = newStatus;
// 触发维护完成的效果
OnMaintenancePerformed(maintenanceAmount);
@@ -148,8 +182,13 @@ namespace WulaFallenEmpire
float reduction = damageAmount * Extension.damageToMaintenanceFactor;
CurLevel = Math.Max(0f, CurLevel - reduction);
- // 立即检查状态变化
- CheckStatusChanges();
+ // 检查状态变化
+ var newStatus = Status;
+ if (newStatus != currentAppliedStatus)
+ {
+ UpdateHediffForStatus(newStatus);
+ currentAppliedStatus = newStatus;
+ }
}
private void OnMaintenancePerformed(float amount)
@@ -180,6 +219,24 @@ namespace WulaFallenEmpire
{
base.ExposeData();
Scribe_Values.Look(ref daysSinceLastMaintenance, "daysSinceLastMaintenance", 0f);
+ Scribe_Values.Look(ref currentAppliedStatus, "currentAppliedStatus", MaintenanceStatus.Operational);
+ Scribe_References.Look(ref currentAppliedHediff, "currentAppliedHediff");
+
+ // 修复:加载后验证状态一致性
+ if (Scribe.mode == LoadSaveMode.PostLoadInit)
+ {
+ // 确保当前状态与实际 Hediff 一致
+ if (currentAppliedHediff != null && !pawn.health.hediffSet.hediffs.Contains(currentAppliedHediff))
+ {
+ // Hediff 丢失,重新应用
+ UpdateHediffForStatus(currentAppliedStatus);
+ }
+ else if (currentAppliedHediff == null && currentAppliedStatus != MaintenanceStatus.Operational)
+ {
+ // 应该有 Hediff 但没有,重新应用
+ UpdateHediffForStatus(currentAppliedStatus);
+ }
+ }
}
}
diff --git a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj
index e5da332d..438b303e 100644
--- a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj
+++ b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj
@@ -95,7 +95,6 @@
-
diff --git a/美术与文本源文件/Wula/Building/WULA_Cat_Bunker.sai2 b/美术与文本源文件/Wula/Building/WULA_Cat_Bunker.sai2
index 5bba025b..08a1b6b0 100644
Binary files a/美术与文本源文件/Wula/Building/WULA_Cat_Bunker.sai2 and b/美术与文本源文件/Wula/Building/WULA_Cat_Bunker.sai2 differ
diff --git a/美术与文本源文件/Wula/Building/WULA_Machine_Recharger.sai2 b/美术与文本源文件/Wula/Building/WULA_Machine_Recharger.sai2
new file mode 100644
index 00000000..0ff1974f
Binary files /dev/null and b/美术与文本源文件/Wula/Building/WULA_Machine_Recharger.sai2 differ
diff --git a/美术与文本源文件/Wula/Building/WULA_MaintenancePod.sai2 b/美术与文本源文件/Wula/Building/WULA_MaintenancePod.sai2
index 768d07e2..5cc28fab 100644
Binary files a/美术与文本源文件/Wula/Building/WULA_MaintenancePod.sai2 and b/美术与文本源文件/Wula/Building/WULA_MaintenancePod.sai2 differ
diff --git a/美术与文本源文件/Wula/Building/WULA_War_Machine_Recharger.sai2 b/美术与文本源文件/Wula/Building/WULA_War_Machine_Recharger.sai2
deleted file mode 100644
index 98e77fc3..00000000
Binary files a/美术与文本源文件/Wula/Building/WULA_War_Machine_Recharger.sai2 and /dev/null differ
diff --git a/美术与文本源文件/Wula/Building/WULA_WeaponArmor_Productor.sai2 b/美术与文本源文件/Wula/Building/WULA_WeaponArmor_Productor.sai2
new file mode 100644
index 00000000..6b70045e
Binary files /dev/null and b/美术与文本源文件/Wula/Building/WULA_WeaponArmor_Productor.sai2 differ
diff --git a/美术与文本源文件/Wula/Projectile/WULA_Loitering_Munition.sai2 b/美术与文本源文件/Wula/Projectile/WULA_Loitering_Munition.sai2
index 7a17c4e4..e0bd274b 100644
Binary files a/美术与文本源文件/Wula/Projectile/WULA_Loitering_Munition.sai2 and b/美术与文本源文件/Wula/Projectile/WULA_Loitering_Munition.sai2 differ
diff --git a/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_CLoak_Ability.png b/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_CLoak_Ability.png
deleted file mode 100644
index 92ccd524..00000000
Binary files a/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_CLoak_Ability.png and /dev/null differ
diff --git a/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Explosive_Ability.png b/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Explosive_Ability.png
deleted file mode 100644
index d154e14b..00000000
Binary files a/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Explosive_Ability.png and /dev/null differ
diff --git a/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Feather_Ability.png b/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Feather_Ability.png
deleted file mode 100644
index 33564115..00000000
Binary files a/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Feather_Ability.png and /dev/null differ
diff --git a/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Flash_Ability.png b/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Flash_Ability.png
deleted file mode 100644
index 5b33d746..00000000
Binary files a/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Flash_Ability.png and /dev/null differ
diff --git a/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Lost_Ability.png b/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Lost_Ability.png
deleted file mode 100644
index 40ad6906..00000000
Binary files a/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Lost_Ability.png and /dev/null differ
diff --git a/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Perception_Ability.png b/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Perception_Ability.png
deleted file mode 100644
index aecb0511..00000000
Binary files a/美术与文本源文件/Wula/UI/Abilities/WULA_MW_Scepter_Of_Perception_Ability.png and /dev/null differ
diff --git a/美术与文本源文件/Wula/UI/Abilities/WULA_NanoRepairHediff_Switch.png b/美术与文本源文件/Wula/UI/Abilities/WULA_NanoRepairHediff_Switch.png
deleted file mode 100644
index 92ccd524..00000000
Binary files a/美术与文本源文件/Wula/UI/Abilities/WULA_NanoRepairHediff_Switch.png and /dev/null differ
diff --git a/美术与文本源文件/Wula/UI/Abilities/WULA_Scepter_Of_Heaven_Ability.png b/美术与文本源文件/Wula/UI/Abilities/WULA_Scepter_Of_Heaven_Ability.png
deleted file mode 100644
index c1c2c43f..00000000
Binary files a/美术与文本源文件/Wula/UI/Abilities/WULA_Scepter_Of_Heaven_Ability.png and /dev/null differ