diff --git a/1.5/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml b/1.5/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml index 9be99b8f..eb34760f 100644 --- a/1.5/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml +++ b/1.5/Defs/BackstoryDefs/Solid/Solid_Adult_WULA.xml @@ -360,6 +360,7 @@ + WULA_Adult_Backstory999 Adulthood diff --git a/1.5/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml b/1.5/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml index d24d80da..30fd9580 100644 --- a/1.5/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml +++ b/1.5/Defs/BackstoryDefs/Solid/Solid_Child_WULA.xml @@ -4,9 +4,9 @@ WULA_Child_Backstory01 False Childhood - 乌拉帝国的人造物 - 缸中之脑 - [PAWN_nameDef] 是诞生于培养缸中的大脑，生来便是为了作为乌拉帝国合成人的核心处理器。\n\n纯净、一尘不染的大脑被培养舱人为地植入了大量预设的技能，使得它还未感知这个世界便已经成为了完人。 + 旧日遗物 + 旧日遗物 + [PAWN_nameDef] 是诞生于乌拉帝国大内战前的合成人，高度依赖上行链路系统与网络链接，在人工智能网络“演算圆环”崩溃时受到了大量冲击。 5 5 @@ -22,11 +22,46 @@ 5 -
  • Wula_Backstory_Categories
    • +
  • Wula_Old_Synth_Backstory_Categories
    •  None - - 2 - + +
  • Wula_Synth
    • +
  • WULA_Addons_Antenna_Hediff_Base
    • +
  • WULA_Alloy_Framework_Hediff_Base
    • +
  • MechlinkImplant
    • +     +     + + WULA_Child_Backstory02 + False + Childhood + 新生代合成人 + 新生代 + [PAWN_nameDef] 诞生于人工智能网络“演算圆环”崩溃后，软硬件未受到崩溃的影响。 + + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + + +
  • Wula_New_Synth_Backstory_Categories
    • +     + None + +
  • Wula_Synth
    • +
  • WULA_Addons_Antenna_Hediff_Base
    • +
  • WULA_Alloy_Framework_Hediff_Base
    • +
  • MechlinkImplant
    • +     diff --git a/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml b/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml index 60ef9de5..3a2234c3 100644 --- a/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml +++ b/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml @@ -7,12 +7,12 @@ - Wula/Item/WULA_Energy_Furnace + Things/Item/Health/HealthItem Graphic_Single 40 - 8 + 2 Machining @@ -31,7 +31,7 @@ - Wula/Item/WULA_Energy_Furnace + Things/Item/Health/HealthItem Graphic_Single @@ -54,12 +54,12 @@ - Wula/Item/WULA_Energy_Furnace + Things/Item/Health/HealthItem Graphic_Single - 60 - 8 + 30 + 2 Machining @@ -81,9 +81,6 @@ false false true - -
  • Wula_PawnKind
    • -
  • @@ -111,9 +108,6 @@ false false true - -
  • Wula_PawnKind
    • -
  • diff --git a/1.5/Defs/HediffDefs/Hediffs_WULA.xml b/1.5/Defs/HediffDefs/Hediffs_WULA.xml index ea6a12e8..244c6c19 100644 --- a/1.5/Defs/HediffDefs/Hediffs_WULA.xml +++ b/1.5/Defs/HediffDefs/Hediffs_WULA.xml @@ -38,7 +38,7 @@
    • -
  • Food
    • +
  • Rest
    •  \ No newline at end of file diff --git a/1.5/Defs/Misc/LifeStageDefs/LifeStages_WULA.xml b/1.5/Defs/Misc/LifeStageDefs/LifeStages_WULA.xml new file mode 100644 index 00000000..dee38215 --- /dev/null +++ b/1.5/Defs/Misc/LifeStageDefs/LifeStages_WULA.xml @@ -0,0 +1,16 @@ + + + + Wula_Species_Lifestage + + LifeStageWorker_HumanlikeAdult + false + true + 0.18 + + Things/Pawn/Humanlike/Silhouettes/Silhouette_HumanAdult + Graphic_Single + 1 + + + diff --git a/1.5/Defs/PawnKinds/PawnKinds_Wula.xml b/1.5/Defs/PawnKinds/PawnKinds_Wula.xml index f067ef8f..0512e79b 100644 --- a/1.5/Defs/PawnKinds/PawnKinds_Wula.xml +++ b/1.5/Defs/PawnKinds/PawnKinds_Wula.xml @@ -1,51 +1,74 @@  - - Wula_PawnKind - - WulaSpecies - PlayerColony + + Wula_PawnKind + + WulaSpecies + PlayerColony + +
  • + + Wula/Item/WULA_Species_Icon + SRA/Pawn/Mechanoid/AllegianceOverlays/None + CutoutWithOverlay + Graphic_Multi + 1.1 + + (0.2, 0.3, 0.2) + + +
    • +     + 200 + true + 0 + Poor + false - - 13~21 - 20 + +
  • + +
  • Wula_Backstory_Categories
    • +
  • Wula_Old_Synth_Backstory_Categories
    • + + +     +     + + Wula_PawnKind_Ingame + + WulaSpecies + PlayerColony + +
  • + + Wula/Item/WULA_Species_Icon + SRA/Pawn/Mechanoid/AllegianceOverlays/None + CutoutWithOverlay + Graphic_Multi + 1.1 + + (0.2, 0.3, 0.2) + + +
    • +     + 200 + 0 + Poor + false - - -
  • WULA_Sailor_Dress
    • -     + 0 + 0 + 0 - - true - - -
  • - Wula_Synth -
    • -
  • - WULA_Addons_Antenna_Hediff_Base -
    • -
  • - WULA_Alloy_Framework_Hediff_Base -
    • -
  • - MechlinkImplant -
    • -     - - -
  • - -
  • Wula_Backstory_Categories
    • - - -     - - + +
  • + +
  • Wula_Backstory_Categories
    • +
  • Wula_New_Synth_Backstory_Categories
    • + + +     \ No newline at end of file diff --git a/1.5/Defs/RecipeDefs/Recipes_WULA.xml b/1.5/Defs/RecipeDefs/Recipes_WULA.xml index da313ff0..5b141730 100644 --- a/1.5/Defs/RecipeDefs/Recipes_WULA.xml +++ b/1.5/Defs/RecipeDefs/Recipes_WULA.xml @@ -1,70 +1,5 @@  - - WULA_Make_New_Synth - - 制造一个新的机械乌拉，这是乌拉帝国合成人派系增加人口的唯一方式。 - - - false - - 1 - - - WulaSpecies - - - + + + Make_WULA_Charge_Cube + + 制造一块乌拉帝国能源核心，内部包括供给有机部分的营养与供给机械部分的能量，这是机械乌拉唯一可接受的外部输入性能量来源。 + 正在制造乌拉帝国能源核心 + GeneralLaborSpeed + + Smith + Recipe_Smith + + true + +
  • + + +
  • Steel
    • + + + 0.5 + +     + + 1 + + Crafting + 100 +     + + BuildingDestroyed_Metal_Big + GeothermalPlant_Ambience + false + + +
  • + Flame + 0 +
    • +     + 0 + false + Heavy + + ConstructMetal + ConstructMetal + Biotech - 150 - 3 + 1 + 1 + 1 + 4 + 100 + 100 + + WulaSpecies + WULA_Antenna_Base + WULA_Energy_Furnace_Base + WULA_Alloy_Framework_Base +
  • BasicMechtech
    •  - - - - (-1.06, 0.91) - (0.7, 0.13) - - - (-1.06, 0.82) - (0.7, 0.13) - - - (1.06, -0.97) - (0.7, 0.13) - - - (-1.06, -0.97) - (0.7, 0.13) - - - - Things/Pawn/Mechanoid/HalfGestatedMechSmall - Graphic_Single - (1,1) - - -
  • (0, 0, 0.45)
    • -
  • (0, 0, 0.45)
    • -
  • (0, 0, 0.45)
    • -
  • (0, 0, 0.45)
    • -     - - Things/Building/Production/MechGestatorStandardGlass - Graphic_Multi - (5.6,4) - Transparent - - - Things/Building/Production/MechGestatorStandardTop - Graphic_Multi - (5.6,4) - - - MechGestatorForming_North - MechGestatorForming_East - MechGestatorForming_East - MechGestatorForming_South - - - MechGestatorCycleComplete_North - MechGestatorCycleComplete_East - MechGestatorCycleComplete_East - MechGestatorCycleComplete_South - - - MechGestatorFormed_North - MechGestatorFormed_East - MechGestatorFormed_East - MechGestatorFormed_South - -     -
  • - CompPowerTrader - 350 - 50 +
  • + +
  • Wula_PawnKind_Ingame
    • + + 1 + 12 + True + True + MessageMechanoidsAssembled + MessageMechanoidsLeftToAssemble + ShutDown + MechAssemblyCompleteIn + MechAssemblyNextType + MechAssembler_Spawn + true + LordJob_MechanoidsDefend + True + +
  • + 6 + + + + + (177, 0, 31, 0) + true + true
    • + + + WULA_Cube_Productor_BIO + + 一台仿制乌拉帝国科技而建造的能源核心制造机，用于在没有电力的情况下，通过燃烧木材输入生物能以制造可维持机械乌拉正常运转的能源核心。 + Building_WorkTable_HeatPush + MapMeshAndRealTime + + Wula/Building/WULA_Cube_Productor_BIO + Graphic_Multi + (1,1) + + Damage/Corner + Damage/Corner + Damage/Corner + Damage/Corner + + + true + 0.20 + ConstructMetal + + 80 + + Building + 0.5 + True + + 2000 + 180 + 1.0 + + (1,1) + Production + 2120 + PassThroughOnly + 50 + True + (0,0,-1) + Item + + +
  • Make_WULA_Charge_Cube
    • +     + +
  • ITab_Bills
    • +     + +
  • + 500.0 + 150.0 + + +
  • WoodLog
    • + + + true + true + +
  • + CompHeatPusherPowered + 4 +
    • +     + +
  • PlaceWorker_PreventInteractionSpotOverlap
    • +     + + true + BillsTab + 0.10 + +     + WULA_Charging_Station_Synth - - 一台用于给乌拉帝国合成人进行充电的充电站，效率比自机充电高很多。 + + 一台供乌拉帝国合成人进行机体修复的检修站。 Wula/Building/WULA_Charging_Station_Synth Graphic_Multi @@ -119,7 +188,7 @@ 1 800 30 - 5 + 10 (1,2) diff --git a/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml b/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml index 5ae52741..9422e745 100644 --- a/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml +++ b/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml @@ -124,7 +124,7 @@ 这是乌拉帝国的战斗人员专用的制服，紧致拥有一整套神经接口用以和其他战斗机械的驾驶舱连接——不过在边缘星区这种贫瘠之地很难见到拥有此类驾驶舱的帝国载具。 - Wula/Apparel/WULA_Sailor_Dress + Wula/Apparel/WULA_Body_Suit Graphic_Single @@ -134,7 +134,7 @@
  • OnSkin
    •  - Wula/Apparel/WULA_Sailor_Dress + Wula/Apparel/WULA_Body_Suit     + 1.3     1.1 Medieval @@ -77,7 +77,6 @@
  • Neolithic
    •  - 40 1200 2 @@ -86,11 +85,6 @@ 10     -65 - -
  • Metallic
    • -
  • Woody
    • -
  • Stony
    • -
  • ElectricSmithy
    • @@ -108,22 +102,60 @@ 1 0.5 -
  • - - false - -
  • Stab
    • - - 18 - 1.25 - + + +
  • + WULA_Scepter_Of_Heaven_Ability + 1 + AnomalyAbilityWarmup + 魂锲 + Steel + 1 + 60 +
    • +     + + WULA_Scepter_Of_Heaven_Ability + + UI/Abilities/Farskip + Skip + 选择任意目标，然后选择地图内的一个位置将其传送过去，至多只能传送10体型大小的目标。 + false + + true + false + false + + Verb_EntitySkip + false + 0 + 30 + false + + True + + + +
  • + CompAbilityEffect_Teleport + Selected + false + 80 + Ability + 10 + Ability + 10 + 10 +
    • +     +     WULA_RW_Fractal_AR - + 乌拉帝国镇暴部队使用的震爆武器之一，在发射前会照射目标并用微型处理器分析目标特征，随后经过编译的复合能量脉冲将以集束形式射出，瘫痪目标并点燃暴动者的身体，同时还不造成直击伤害。 Wula/Weapon/WULA_RW_Fractal_AR @@ -220,7 +252,7 @@ WULA_RW_StarDrift_SG - + 乌拉帝国配发的近距离霰弹枪，以威力巨大的梭镖破甲弹为核心，专注于在短距离上的快速反应战斗和持续性压制能力 @@ -272,5 +304,86 @@ - + + + WULA_RW_Handle_Cannon + + 一般由乌拉帝国跳帮组或骑士军团携带的手持火炮，能够在锁定后连续发射三发炮弹，夷平敌人的复合型工事或舰船内壁，并给敌人送来最炽热的消亡。 + Spacer + + Wula/Weapon/WULA_RW_Handle_Cannon + Graphic_Single + 1.35 + + None + + 1400 + 25 + 0.6 + 0.6 + 0.6 + 0.4 + 4.0 + + +
  • + Verb_Shoot + true + Bullet_WULA_RW_Handle_Cannon + 1.5 + 22 + Shot_HellsphereCannonGun + GunTail_Heavy + 9 + 6 + true + true + true + 50 + 6 + + true + false + + Mote_HellsphereCannon_Aim + Mote_HellsphereCannon_Charge + 1.07 + 3.9 + Mote_HellsphereCannon_Target + 3 + true + HellsphereCannon_Aiming + false +
    • +     + +
  • + + +
  • Blunt
    • +
  • Poke
    • + + 9 + 2.6 + +     +     + + Bullet_WULA_RW_Handle_Cannon + + Projectile_HellsphereCannon + + Things/Projectile/HellsphereCannon + Graphic_Single + MoteGlow + (1.5, 3) + + + Vaporize + 75 + 300 + 3.9 + 1.5 + + \ No newline at end of file diff --git a/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml index 06a9668b..5fbb6c3a 100644 --- a/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml +++ b/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml @@ -26,7 +26,7 @@ true - 18 + 0 true @@ -68,8 +68,8 @@
  • 6 - (0,0,0) - (0,0,0.1) + (0.9,0.9,0.9) + (0.9,0.9,0.9)
  • 6 @@ -112,6 +112,9 @@
    • + +
  • 0
    • +     @@ -193,7 +196,7 @@ false - +
  • WULA_Charge_Cube
    •  true @@ -224,6 +227,10 @@ 0 0 + + + false + @@ -280,9 +287,34 @@ WULA_Machine_Body 5000 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 +
  • - EntityFullyFormed + Wula_Species_Lifestage + 0
    • diff --git a/1.5/Defs/TraitDefs/Traits_WULA.xml b/1.5/Defs/TraitDefs/Traits_WULA.xml index 81f8bf6d..af7e6f4a 100644 --- a/1.5/Defs/TraitDefs/Traits_WULA.xml +++ b/1.5/Defs/TraitDefs/Traits_WULA.xml @@ -48,7 +48,9 @@
  • 这个乌拉帝国合成人没有完整的人格，这使得她更像是一台真正的机械——除了休息外，所有的需求都已经被禁用。 + 1 +
  • Mood
  • Joy
  • Beauty
  • Comfort
    • diff --git a/1.5/Defs/WorkGivers/Wula_WorkGivers.xml b/1.5/Defs/WorkGivers/Wula_WorkGivers.xml index a2a992b2..eb41a0e0 100644 --- a/1.5/Defs/WorkGivers/Wula_WorkGivers.xml +++ b/1.5/Defs/WorkGivers/Wula_WorkGivers.xml @@ -1,6 +1,23 @@ + + WULA_Cube_ProductorBills + + WorkGiver_DoBill + Smithing + 75 + +
  • WULA_Cube_Productor_BIO
    • +     + 工作于 + 工作于 + +
  • Manipulation
    • +     + true +     + WULA_Mech_Constructor_Small_Bills diff --git a/Textures/Wula/Apparel/WULA_Body_Suit.png b/Textures/Wula/Apparel/WULA_Body_Suit.png new file mode 100644 index 00000000..2058ad46 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Body_Suit.png differ diff --git a/Textures/Wula/Apparel/WULA_Body_Suit_Thin_east.png b/Textures/Wula/Apparel/WULA_Body_Suit_Thin_east.png new file mode 100644 index 00000000..f8f58546 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Body_Suit_Thin_east.png differ diff --git a/Textures/Wula/Apparel/WULA_Body_Suit_Thin_north.png b/Textures/Wula/Apparel/WULA_Body_Suit_Thin_north.png new file mode 100644 index 00000000..01a1ce65 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Body_Suit_Thin_north.png differ diff --git a/Textures/Wula/Apparel/WULA_Body_Suit_Thin_south.png b/Textures/Wula/Apparel/WULA_Body_Suit_Thin_south.png new file mode 100644 index 00000000..6f38e63b Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Body_Suit_Thin_south.png differ diff --git a/Textures/Wula/Apparel/WULA_Body_Suit_Thin_south.sai2 b/Textures/Wula/Apparel/WULA_Body_Suit_Thin_south.sai2 new file mode 100644 index 00000000..c3d86701 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Body_Suit_Thin_south.sai2 differ diff --git a/Textures/Wula/Building/SRA_Floor.png b/Textures/Wula/Building/SRA_Floor.png deleted file mode 100644 index a04cdd33..00000000 Binary files a/Textures/Wula/Building/SRA_Floor.png and /dev/null differ diff --git a/Textures/Wula/Building/SRA_Floor.sai2 b/Textures/Wula/Building/SRA_Floor.sai2 deleted file mode 100644 index f6668850..00000000 Binary files a/Textures/Wula/Building/SRA_Floor.sai2 and /dev/null differ diff --git a/Textures/Wula/Building/SRA_Floor_UI.png b/Textures/Wula/Building/SRA_Floor_UI.png deleted file mode 100644 index 67eb787f..00000000 Binary files a/Textures/Wula/Building/SRA_Floor_UI.png and /dev/null differ diff --git a/Textures/Wula/Building/SRA_TempControler.dds b/Textures/Wula/Building/SRA_TempControler.dds deleted file mode 100644 index 63f01fbb..00000000 Binary files a/Textures/Wula/Building/SRA_TempControler.dds and /dev/null differ diff --git a/Textures/Wula/Building/SRA_TempControler.png b/Textures/Wula/Building/SRA_TempControler.png deleted file mode 100644 index ed9e91fb..00000000 Binary files a/Textures/Wula/Building/SRA_TempControler.png and /dev/null differ diff --git a/Textures/Wula/Building/WULA_Charging_Station_Synth_south.png b/Textures/Wula/Building/WULA_Charging_Station_Synth_south.png index 4bac38d8..1f3bdf04 100644 Binary files a/Textures/Wula/Building/WULA_Charging_Station_Synth_south.png and b/Textures/Wula/Building/WULA_Charging_Station_Synth_south.png differ diff --git a/Textures/Wula/Building/WULA_Cube_Productor_BIO.sai2 b/Textures/Wula/Building/WULA_Cube_Productor_BIO.sai2 new file mode 100644 index 00000000..50413a48 Binary files /dev/null and b/Textures/Wula/Building/WULA_Cube_Productor_BIO.sai2 differ diff --git a/Textures/Wula/Building/WULA_Cube_Productor_BIO_east.png b/Textures/Wula/Building/WULA_Cube_Productor_BIO_east.png new file mode 100644 index 00000000..7cc65130 Binary files /dev/null and b/Textures/Wula/Building/WULA_Cube_Productor_BIO_east.png differ diff --git a/Textures/Wula/Building/WULA_Cube_Productor_BIO_south.png b/Textures/Wula/Building/WULA_Cube_Productor_BIO_south.png new file mode 100644 index 00000000..7cc65130 Binary files /dev/null and b/Textures/Wula/Building/WULA_Cube_Productor_BIO_south.png differ diff --git a/Textures/Wula/Building/WULA_Floor.png b/Textures/Wula/Building/WULA_Floor.png new file mode 100644 index 00000000..d6aa0304 Binary files /dev/null and b/Textures/Wula/Building/WULA_Floor.png differ diff --git a/Textures/Wula/Building/WULA_Floor_Icon.png b/Textures/Wula/Building/WULA_Floor_Icon.png new file mode 100644 index 00000000..1b7b5111 Binary files /dev/null and b/Textures/Wula/Building/WULA_Floor_Icon.png differ diff --git a/Textures/Wula/Building/WULA_Mech_Constructor_Small.png b/Textures/Wula/Building/WULA_Mech_Constructor_Small.png new file mode 100644 index 00000000..7393e631 Binary files /dev/null and b/Textures/Wula/Building/WULA_Mech_Constructor_Small.png differ diff --git a/Textures/Wula/Building/WULA_Mech_Constructor_Small.sai2 b/Textures/Wula/Building/WULA_Mech_Constructor_Small.sai2 new file mode 100644 index 00000000..4296cc50 Binary files /dev/null and b/Textures/Wula/Building/WULA_Mech_Constructor_Small.sai2 differ diff --git a/Textures/Wula/Item/WULA_Energy_Furnace.png b/Textures/Wula/Item/WULA_Charge_Cube.png similarity index 100% rename from Textures/Wula/Item/WULA_Energy_Furnace.png rename to Textures/Wula/Item/WULA_Charge_Cube.png diff --git a/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Heaven.png b/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Heaven.png new file mode 100644 index 00000000..bcd78e52 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Heaven.png differ diff --git a/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Heaven.sai2 b/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Heaven.sai2 new file mode 100644 index 00000000..daf7e3a9 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Heaven.sai2 differ diff --git a/Textures/Wula/Weapon/WULA_RW_Handle_Cannon.png b/Textures/Wula/Weapon/WULA_RW_Handle_Cannon.png new file mode 100644 index 00000000..39a21cd9 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_RW_Handle_Cannon.png differ diff --git a/Textures/Wula/Weapon/WULA_RW_Handle_Cannon.sai2 b/Textures/Wula/Weapon/WULA_RW_Handle_Cannon.sai2 new file mode 100644 index 00000000..7151c355 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_RW_Handle_Cannon.sai2 differ