diff --git a/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml b/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml index 351f745c..2d5dcdd2 100644 --- a/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml +++ b/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml @@ -38,6 +38,17 @@ Add + +
  • + Wula_FE_Spiritualist_First_Contant + 0 + Int +
    • +
  • + Wula_FE_Materialist_First_Contant + 0 + Int +
  • Wula_FE_Spiritualist_Goodwill @@ -64,7 +75,7 @@
    • - + +
  • + + true + +
  • + Wula_FE_Spiritualist_Faction +
    • +
  • + Wula_FE_Spiritualist_First_Contant + 0 +
    • + + +
  • + +
  • + Wula_UI_FE_Spiritualist_4 +
    • +
  • + +
    • +     +
  • diff --git a/1.6/1.6/Defs/FactionDefs/Factions_Player_WULA.xml b/1.6/1.6/Defs/FactionDefs/Factions_Player_WULA.xml index c757cff8..1fc9bba0 100644 --- a/1.6/1.6/Defs/FactionDefs/Factions_Player_WULA.xml +++ b/1.6/1.6/Defs/FactionDefs/Factions_Player_WULA.xml @@ -89,12 +89,13 @@ - +
  • Combat - 50 + 40 100 + 100 60 30 10 @@ -104,12 +105,12 @@
  • Combat - 50 + 40 20 20 - 2 - 1 + 4 + 2
    • @@ -135,7 +136,7 @@
  • Combat - 20 + 30 2 2 @@ -148,7 +149,7 @@
  • Combat - 10 + 30 10 2 diff --git a/1.6/1.6/Defs/FactionDefs/Factions_WULA_FE_Materialist.xml b/1.6/1.6/Defs/FactionDefs/Factions_WULA_FE_Materialist.xml new file mode 100644 index 00000000..3a39099e --- /dev/null +++ b/1.6/1.6/Defs/FactionDefs/Factions_WULA_FE_Materialist.xml @@ -0,0 +1,115 @@ + + + + WULA_FE_Materialist_Faction + + 堕落乌拉帝国派系之一，属于进步派，拥有独属的特殊科技。\n\n反抗乌拉帝国皇权的学生联盟和其他有志之士一起打响了帝国内战的第一枪，但是在千百年间，这些踌躇满志的奋斗者渐渐堕落成了刁钻刻板的学士，她们固执己见，致力于收集和垄断乌拉帝国遗留的科技资产而不再是推翻皇室残党。然而保皇派势力并未在时间中消亡，星海间的仇恨并未熄灭，革命的大旗正在等待新的有识之士高举······ + RealWula_PawnKind + 乌拉星人 + 乌拉星人 + Wula_FE_Materialist_Faction + 1 + NamerFaction_Wula_FE_Materialist + Wula/World/WorldObjects/Expanding/Wula_FE_Faction + + 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.15, 0.9, 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)
    • +     +     + +
  • + Combat + 50 + + 60 + 30 + 20 + 20 + +
    • +     + World/WorldObjects/DefaultSettlement + -100~200 + 1 + 900 + ActiveDropPodMechanoid + DropPodIncomingMechanoidRapid + +
  • Children
    • +     + + \ No newline at end of file diff --git a/1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml b/1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml index 9309437a..28279b9e 100644 --- a/1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml +++ b/1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml @@ -914,91 +914,6 @@ - - - Wula_BackstoryRegeneratorImplant - - 从乌拉帝国上行链路下载的数据包，内含随机的人格数据，机械乌拉在使用后会改变其人格，这会重置它禁止的工作，但是不会重设其热情和特质。\n\n新的人格有可能和旧人格一模一样！ - ThingWithComps - - Wula/Item/WULA_Syhth_Trainer - Graphic_Single - - - 1500 - 0.1 - - - -
  • WULA_New_Synth_Skill_2_Technology
    • -     - - - 8 - - -
  • WULA_Synth_Server
    • -     -     - - 50 - 1 - 1 - - -
  • - CompUsableImplant - UseItem - 使用 {0_label} -
    • -
  • - Wula_RegenerateBackstory - Brain -
    • -
  • - - - - Wula_RegenerateBackstory - - a backstory regenerator - A backstory regenerator is installed. - Wula_BackstoryRegeneratorImplant - -
  • - -
  • Wula_Backstory_Categories
    • - - false - -     - - - WULA_MechRepairKit diff --git a/1.6/1.6/Defs/HediffDefs/Hediffs_WULA.xml b/1.6/1.6/Defs/HediffDefs/Hediffs_WULA.xml index bcf26bbe..b38c8537 100644 --- a/1.6/1.6/Defs/HediffDefs/Hediffs_WULA.xml +++ b/1.6/1.6/Defs/HediffDefs/Hediffs_WULA.xml @@ -5,7 +5,7 @@ Wula_Synth 乌拉帝国制式合成人，拥有一部分机械体的特性——她们无法被点燃、不会中毒、免疫大量疾病、不会抱怨温度，但是无法自我修复，并且需要获取能量以维持机体运转。 - HediffWithComps + Hediff_High false false True diff --git a/1.6/1.6/Defs/ThingDefs/WULA_Item.xml b/1.6/1.6/Defs/ThingDefs/WULA_Item.xml index f055eb29..88b6e1f0 100644 --- a/1.6/1.6/Defs/ThingDefs/WULA_Item.xml +++ b/1.6/1.6/Defs/ThingDefs/WULA_Item.xml @@ -885,4 +885,65 @@ + + + + + Wula_BackstoryRegeneratorImplant + + 从乌拉帝国上行链路下载的数据包，内含随机的人格数据，机械乌拉在使用后会改变其人格，这会重置它禁止的工作，但是不会重设其热情和特质。\n\n新的人格有可能和旧人格一模一样，且必须保存游戏后重新加载才能起效！ + ThingWithComps + + Wula/Item/WULA_Syhth_Trainer + Graphic_Single + + + 1500 + 0.1 + + + +
  • WULA_New_Synth_Skill_2_Technology
    • +     + + + 8 + + +
  • WULA_Synth_Server
    • +     +     + + 50 + 1 + 1 + + +
  • + CompUsableImplant + UseItem + 使用 {0_label} +
    • +
  • + Wula_RegenerateBackstory + Brain +
    • +
  • + + + + Wula_RegenerateBackstory + + a backstory regenerator + A backstory regenerator is installed. + Wula_BackstoryRegeneratorImplant + +
  • + +
  • Wula_Backstory_Categories
    • + + false + +     + diff --git a/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml index a3f0a9e8..85a53a17 100644 --- a/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml +++ b/1.6/Anomaly/Defs/EventDefs/EventDef_WULA_FE_Spiritualist.xml @@ -1,18 +1,12 @@ - Wula_UI_FE_Spiritualist_1 Wula/Events/Portraits/WULA_FE_Spiritualist_3 帝国修女 -
  • 当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}]]>
    • -
  • 当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}]]>
    • -
  • 当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}]]>
    • +
  • 高好感度问候
    •
  • @@ -34,7 +28,7 @@
  • - +
  • @@ -78,19 +72,13 @@
    • - Wula_UI_FE_Spiritualist_2 Wula/Events/Portraits/WULA_FE_Spiritualist_3 帝国修女 -
  • 当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}]]>
    • -
  • 当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}]]>
    • -
  • 当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}]]>
    • +
  • 中好感度问候
    •
  • @@ -113,7 +101,7 @@
  • - +
  • @@ -144,19 +132,13 @@
    • - Wula_UI_FE_Spiritualist_3 Wula/Events/Portraits/WULA_FE_Spiritualist_2 帝国修女 -
  • 当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}]]>
    • -
  • 当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}]]>
    • -
  • 当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}]]>
    • +
  • 低好感度问候
    •
  • @@ -222,15 +204,64 @@
    • + + 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_Influence}]]>
  • Wula/Events/Portraits/WULA_FE_Spiritualist_1 帝国修女 -
  • 当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}]]>
    • -
  • 当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}]]>
    • -
  • 当前在乌拉帝国大教堂的影响力: {WULA_FE_Spiritualist_Influence}]]>
    • - - +
  • diff --git a/1.6/Anomaly/Defs/FactionDefs/Factions_WULA_FE_Spiritualist.xml b/1.6/Anomaly/Defs/FactionDefs/Factions_WULA_FE_Spiritualist.xml index 08f84115..8533ee3e 100644 --- a/1.6/Anomaly/Defs/FactionDefs/Factions_WULA_FE_Spiritualist.xml +++ b/1.6/Anomaly/Defs/FactionDefs/Factions_WULA_FE_Spiritualist.xml @@ -1,6 +1,5 @@  - Wula_FE_Spiritualist_Faction @@ -8,24 +7,14 @@ RealWula_PawnKind 乌拉星人 乌拉星人 - 1 - 1 Wula_FE_Spiritualist_Faction + 1 + NamerFaction_Wula_FE_Spiritualist + Wula/World/WorldObjects/Expanding/Wula_FE_Faction + + 1 false true - 星域主教 - true - Wula/World/WorldObjects/Expanding/Wula_FE_Faction - -
  • (0.6, 0.5, 0.9)
    • - - NamerFaction_Wula_FE_Spiritualist - NamerSettlement_Wula_FE_Spiritualist -
  • Sophian
    •  - -
  • Surface
    • - -
  • Wula_Backstory_Categories_For_RealWula
    •  @@ -52,6 +41,36 @@
  • 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
    • @@ -61,83 +80,34 @@
  • DevilstrandCloth
    •  - -40~45 - World/WorldObjects/DefaultSettlement - -
  • (0.85, 0.85, 0.75)
    • -     - -
  • Wula_FE_Spiritualist_Leader
    • -     - -
  • Wula_FE_Spiritualist_Faction_TraderKind
    • -     - - -
  • (0, 1)
    • -     -     - EmpireRaidLootMaker + 18 + true + true -
  • (500, 100)
    • -
  • (1000, 150)
    • -
  • (2000, 250)
    • -
  • (2001, 10000)
    • +
  • (400,200)
    • +
  • (900,300)
    • +
  • (100000,10000)
    •
  • - - Settlement + Combat + 50 - 10 - 3 - 3 - 1 - -
    • -
  • - - Peaceful - - 10 - 3 - 3 - 1 - -
    • -
  • - Miners - 1 - - 1 - -
    • -
  • - Hunters - 1 - - 1 - -
    • -
  • - Loggers - 1 - - 1 - -
    • -
  • - Farmers - 1 - - 1 + 60 + 30 + 20 + 20
    • + World/WorldObjects/DefaultSettlement + -100~200 1 - 70 + 900 + ActiveDropPodMechanoid + DropPodIncomingMechanoidRapid
  • Children
    •  diff --git a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon_MeltBeam_Example.xml b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon_MeltBeam_Example.xml deleted file mode 100644 index dc363ecb..00000000 --- a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon_MeltBeam_Example.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - WULA_RW_MeltBeam_Cannon_Example - - 一个使用Verb_ShootMeltBeam的示例武器。它会扫射出两条弯曲的能量光束，并造成范围爆炸。 - Ultra - - Wula/Weapon/WULA_RW_DM_Cannon - Graphic_Single - 1.5 - - -
  • Wula_Ranged_Weapon_T4
    • -     - 0.8 - Interact_ChargeRifle - - -
  • WULA_Cube_Productor_Energy
    • -     - WULA_Synth_Weapon_4_DM_Base_Technology - UnfinishedWeapon -     - - 500 - 300 - 6 - - - 50000 - 10 - 0.6 - 0.6 - 0.6 - 0.6 - 3 - - -
  • - - WulaFallenEmpire.Verb_ShootMeltBeam - - - true - 1.5 - 25 - 20 - 5 - Wula_Dark_Matter_Beam - - - 12 - 5 - 0.8 - 0.7 - 0.5 - - - 0 - BeamGraser_Shooting - Fleck_BeamBurn - 0.32 - Mote_Wula_Dark_Matter_Beam - GraserBeam_End - Fleck_ShotGlow - - -
  • (0, 0)
    • -
  • (0.65, 0.4)
    • -
  • (1, 0.75)
    • - - - - - true - 0.5 - 0.5 - 0.2~0.4 - - - true - false - - - - true - - - - true - 3 - 2.5 - Wula_Dark_Matter_Flame - 20 - Explosion_Bomb - 0.6 - 0.3 - -     - None - -
  • RewardStandardQualitySuper
    • -     -     - -     \ No newline at end of file diff --git a/Content/Textures/Wula/Things/WulaSpeciesReal/Heads_Blank/Normal/Unisex/blush_east.png b/Content/Textures/Wula/Things/WulaSpeciesReal/Heads_Blank/Normal/Unisex/blush_east.png index a6babe22..c27a8bab 100644 Binary files a/Content/Textures/Wula/Things/WulaSpeciesReal/Heads_Blank/Normal/Unisex/blush_east.png and b/Content/Textures/Wula/Things/WulaSpeciesReal/Heads_Blank/Normal/Unisex/blush_east.png differ diff --git a/Content/Textures/Wula/Things/WulaSpeciesReal/Heads_Blank/Normal/Unisex/normal_east.png b/Content/Textures/Wula/Things/WulaSpeciesReal/Heads_Blank/Normal/Unisex/normal_east.png index f59a4947..2c21b7c5 100644 Binary files a/Content/Textures/Wula/Things/WulaSpeciesReal/Heads_Blank/Normal/Unisex/normal_east.png and b/Content/Textures/Wula/Things/WulaSpeciesReal/Heads_Blank/Normal/Unisex/normal_east.png differ