diff --git a/1.5/Defs/BodyAndPartDefs/Bodies_WULA.xml b/1.5/Defs/BodyAndPartDefs/Bodies_WULA.xml index d0743eb0..2a7653ab 100644 --- a/1.5/Defs/BodyAndPartDefs/Bodies_WULA.xml +++ b/1.5/Defs/BodyAndPartDefs/Bodies_WULA.xml @@ -13,7 +13,7 @@
  • - WULA_Alloy_Framework + WULA_Alloy_Framework_Bodypart 0.076 Inside @@ -59,7 +59,7 @@
    • -->
  • - WULA_Energy_Furnace + WULA_Energy_Furnace_Bodypart 能源炉 0.025 Inside @@ -224,7 +224,7 @@
  • - WULA_Addons_Antenna + WULA_Addons_Antenna_Bodypart 0.1
  • UpperHead
    • diff --git a/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml b/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml index 0afe8868..6f6e15b1 100644 --- a/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml +++ b/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml @@ -107,9 +107,11 @@
  • - + 0 + + 0.3 0.2 diff --git a/1.5/Defs/PawnKinds/PawnKinds_Wula.xml b/1.5/Defs/PawnKinds/PawnKinds_Wula.xml index bb23eba3..f067ef8f 100644 --- a/1.5/Defs/PawnKinds/PawnKinds_Wula.xml +++ b/1.5/Defs/PawnKinds/PawnKinds_Wula.xml @@ -10,6 +10,11 @@ 13~21 20 + + +
  • WULA_Sailor_Dress
    • + + true diff --git a/1.5/Defs/RecipeDefs/Recipes_WULA.xml b/1.5/Defs/RecipeDefs/Recipes_WULA.xml index 3e2445e7..da313ff0 100644 --- a/1.5/Defs/RecipeDefs/Recipes_WULA.xml +++ b/1.5/Defs/RecipeDefs/Recipes_WULA.xml @@ -4,7 +4,7 @@ WULA_Make_New_Synth 制造一个新的机械乌拉，这是乌拉帝国合成人派系增加人口的唯一方式。 - + false - 1 + 1 WulaSpecies @@ -136,7 +136,7 @@ Installing ghoul barbs. false - +
  • Ghoul
    •  @@ -158,6 +158,4 @@
  • WULA_Energy_Furnace_Bodypart
    •  - --> - diff --git a/1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml b/1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml index d4b905e5..4087d404 100644 --- a/1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml +++ b/1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml @@ -106,15 +106,15 @@ 一台用于给乌拉帝国合成人进行充电的充电站，效率比自机充电高很多。 - Things/Building/Furniture/Bed/Bed + Wula/Building/WULA_Charging_Station_Synth Graphic_Multi - CutoutComplex - (2,2) + (1.2,2) (0,0.05,1,1.95) + 0.75 140 1 800 @@ -122,16 +122,35 @@ 5 (1,2) + +
  • Metallic
    • +     45 Misc2 2010 + false true + true + 0 + +
  • PlaceWorker_GlowRadius
    • +
  • CompPowerTrader - 300 + 30 +
    • +
  • + 12 + + + + + (177, 0, 31, 0) + true + true
    • diff --git a/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml b/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml index b9c7441c..ee8c4d78 100644 --- a/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml +++ b/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml @@ -16,7 +16,7 @@
  • Legs
    • -
  • Middle
    • +
  • OnSkin
    •  Wula/Apparel/WULA_official_uniform @@ -24,6 +24,38 @@ -0.1 0.15 + + GeneralLaborSpeed + + 7 + + + 1 + + + WULA_Sailor_Dress + + 这是乌拉帝国的一款连衣裙，在肃穆的帝国中传递出了一丝俏皮和活泼。 + + Wula/Apparel/WULA_Sailor_Dress + Graphic_Single + + + +
  • Torso
    • +
  • Shoulders
    • +
  • Arms
    • +
  • Legs
    • +     + +
  • OnSkin
    • +     + Wula/Apparel/WULA_Sailor_Dress +     + + + GeneralLaborSpeed diff --git a/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml index 0a43479b..3dac4bf2 100644 --- a/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml +++ b/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml @@ -4,6 +4,7 @@ WulaSpecies 乌拉星人是一个曾统治银河系的堕落帝国的主要种族，机械乌拉则是仿照她们样貌制作的合成人——随着帝国的衰颓，大量乌拉合成人流散各地。她们拥有近乎无限的寿命，并且拥有一部分机械体的特性。 + @@ -68,7 +69,7 @@
  • 6 (0,0,0) - (0,0.12,0.12) + (0,0,0.1)
  • 6 @@ -105,7 +106,7 @@ true - WULA_Addons_Antenna + WULA_Addons_Antenna_Bodypart
    • @@ -198,6 +199,7 @@
  • WULA_Official_Uniform
    • +
  • WULA_Sailor_Dress
    •  false @@ -233,8 +235,8 @@ 50 4.5 - 0 - 0 + 100 + -100 0.25 diff --git a/Textures/Wula/Apparel/SRA_Clothes_Thin_east.png b/Textures/Wula/Apparel/SRA_Clothes_Thin_east.png new file mode 100644 index 00000000..c04fb76d Binary files /dev/null and b/Textures/Wula/Apparel/SRA_Clothes_Thin_east.png differ diff --git a/Textures/Wula/Apparel/SRA_Clothes_Thin_north.png b/Textures/Wula/Apparel/SRA_Clothes_Thin_north.png new file mode 100644 index 00000000..7e5e0abb Binary files /dev/null and b/Textures/Wula/Apparel/SRA_Clothes_Thin_north.png differ diff --git a/Textures/Wula/Apparel/SRA_Clothes_Thin_south.png b/Textures/Wula/Apparel/SRA_Clothes_Thin_south.png new file mode 100644 index 00000000..9bd16c70 Binary files /dev/null and b/Textures/Wula/Apparel/SRA_Clothes_Thin_south.png differ diff --git a/Textures/Wula/Apparel/SRA_Clothes_Thin_west.png b/Textures/Wula/Apparel/SRA_Clothes_Thin_west.png new file mode 100644 index 00000000..b818c237 Binary files /dev/null and b/Textures/Wula/Apparel/SRA_Clothes_Thin_west.png differ diff --git a/Textures/Wula/Apparel/WULA_Sailor_Dress.png b/Textures/Wula/Apparel/WULA_Sailor_Dress.png new file mode 100644 index 00000000..bc5662cd Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Sailor_Dress.png differ diff --git a/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_east.png b/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_east.png new file mode 100644 index 00000000..a5cd1612 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_east.png differ diff --git a/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_east.sai2 b/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_east.sai2 new file mode 100644 index 00000000..54bffea5 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_east.sai2 differ diff --git a/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_north.png b/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_north.png new file mode 100644 index 00000000..e90cc659 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_north.png differ diff --git a/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_north.sai2 b/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_north.sai2 new file mode 100644 index 00000000..f9e2daea Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_north.sai2 differ diff --git a/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_south.png b/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_south.png new file mode 100644 index 00000000..021c2b7f Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_south.png differ diff --git a/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_south.sai2 b/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_south.sai2 new file mode 100644 index 00000000..16c7975b Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Sailor_Dress_Thin_south.sai2 differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Fat_east.png b/Textures/Wula/Apparel/WULA_official_uniform_Fat_east.png deleted file mode 100644 index f2fc0a24..00000000 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Fat_east.png and /dev/null differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Fat_north.png b/Textures/Wula/Apparel/WULA_official_uniform_Fat_north.png deleted file mode 100644 index f2fc0a24..00000000 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Fat_north.png and /dev/null differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Fat_south.png b/Textures/Wula/Apparel/WULA_official_uniform_Fat_south.png deleted file mode 100644 index f2fc0a24..00000000 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Fat_south.png and /dev/null differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Female_east.png b/Textures/Wula/Apparel/WULA_official_uniform_Female_east.png deleted file mode 100644 index f2fc0a24..00000000 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Female_east.png and /dev/null differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Female_north.png b/Textures/Wula/Apparel/WULA_official_uniform_Female_north.png deleted file mode 100644 index f2fc0a24..00000000 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Female_north.png and /dev/null differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Female_south.png b/Textures/Wula/Apparel/WULA_official_uniform_Female_south.png deleted file mode 100644 index f2fc0a24..00000000 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Female_south.png and /dev/null differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Hulk_east.png b/Textures/Wula/Apparel/WULA_official_uniform_Hulk_east.png deleted file mode 100644 index f2fc0a24..00000000 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Hulk_east.png and /dev/null differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Hulk_north.png b/Textures/Wula/Apparel/WULA_official_uniform_Hulk_north.png deleted file mode 100644 index f2fc0a24..00000000 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Hulk_north.png and /dev/null differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Hulk_south.png b/Textures/Wula/Apparel/WULA_official_uniform_Hulk_south.png deleted file mode 100644 index f2fc0a24..00000000 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Hulk_south.png and /dev/null differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Male_east.png b/Textures/Wula/Apparel/WULA_official_uniform_Male_east.png deleted file mode 100644 index f2fc0a24..00000000 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Male_east.png and /dev/null differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Male_north.png b/Textures/Wula/Apparel/WULA_official_uniform_Male_north.png deleted file mode 100644 index f2fc0a24..00000000 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Male_north.png and /dev/null differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Male_south.png b/Textures/Wula/Apparel/WULA_official_uniform_Male_south.png deleted file mode 100644 index f2fc0a24..00000000 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Male_south.png and /dev/null differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Thin_west.png b/Textures/Wula/Apparel/WULA_official_uniform_Thin_west.png index e5da4ca3..22160257 100644 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Thin_west.png and b/Textures/Wula/Apparel/WULA_official_uniform_Thin_west.png differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Thin_west.sai2 b/Textures/Wula/Apparel/WULA_official_uniform_Thin_west.sai2 index 34b0a7b9..0a11af43 100644 Binary files a/Textures/Wula/Apparel/WULA_official_uniform_Thin_west.sai2 and b/Textures/Wula/Apparel/WULA_official_uniform_Thin_west.sai2 differ diff --git a/Textures/Wula/Building/Door/SRAAutodoor.dds b/Textures/Wula/Building/Door/SRAAutodoor.dds deleted file mode 100644 index 42035c62..00000000 Binary files a/Textures/Wula/Building/Door/SRAAutodoor.dds and /dev/null differ diff --git a/Textures/Wula/Building/Door/SRAAutodoor.png b/Textures/Wula/Building/Door/SRAAutodoor.png deleted file mode 100644 index 2cd1e5f0..00000000 Binary files a/Textures/Wula/Building/Door/SRAAutodoor.png and /dev/null differ diff --git a/Textures/Wula/Building/Door/SRAAutodoor_BluePrint.dds b/Textures/Wula/Building/Door/SRAAutodoor_BluePrint.dds deleted file mode 100644 index 377d9daf..00000000 Binary files a/Textures/Wula/Building/Door/SRAAutodoor_BluePrint.dds and /dev/null differ diff --git a/Textures/Wula/Building/Door/SRAAutodoor_BluePrint.png b/Textures/Wula/Building/Door/SRAAutodoor_BluePrint.png deleted file mode 100644 index 92ebedd3..00000000 Binary files a/Textures/Wula/Building/Door/SRAAutodoor_BluePrint.png and /dev/null differ diff --git a/Textures/Wula/Building/Door/SRAAutodoor_Mover.dds b/Textures/Wula/Building/Door/SRAAutodoor_Mover.dds deleted file mode 100644 index a1ce180c..00000000 Binary files a/Textures/Wula/Building/Door/SRAAutodoor_Mover.dds and /dev/null differ diff --git a/Textures/Wula/Building/Door/SRAAutodoor_Mover.png b/Textures/Wula/Building/Door/SRAAutodoor_Mover.png deleted file mode 100644 index 51617287..00000000 Binary files a/Textures/Wula/Building/Door/SRAAutodoor_Mover.png and /dev/null differ diff --git a/Textures/Wula/Building/Door/SRAAutodoor_Mover.psd b/Textures/Wula/Building/Door/SRAAutodoor_Mover.psd deleted file mode 100644 index 57d30bea..00000000 Binary files a/Textures/Wula/Building/Door/SRAAutodoor_Mover.psd and /dev/null differ diff --git a/Textures/Wula/Building/Linked/WULA_Fortress_Wall_Blueprint.png b/Textures/Wula/Building/Linked/WULA_Fortress_Wall_Blueprint.png index 40f6fda9..fa272079 100644 Binary files a/Textures/Wula/Building/Linked/WULA_Fortress_Wall_Blueprint.png and b/Textures/Wula/Building/Linked/WULA_Fortress_Wall_Blueprint.png differ diff --git a/Textures/Wula/Building/Linked/WULA_Fortress_Wall_Blueprint.sai2 b/Textures/Wula/Building/Linked/WULA_Fortress_Wall_Blueprint.sai2 deleted file mode 100644 index 2ceb6ffe..00000000 Binary files a/Textures/Wula/Building/Linked/WULA_Fortress_Wall_Blueprint.sai2 and /dev/null differ diff --git a/Textures/Wula/Building/Linked/WULA_Fortress_Wall_MenuIcon.png b/Textures/Wula/Building/Linked/WULA_Fortress_Wall_MenuIcon.png index df6c4ff6..7322d361 100644 Binary files a/Textures/Wula/Building/Linked/WULA_Fortress_Wall_MenuIcon.png and b/Textures/Wula/Building/Linked/WULA_Fortress_Wall_MenuIcon.png differ diff --git a/Textures/Wula/Building/SRAHeavyTurret_Base.png b/Textures/Wula/Building/SRAHeavyTurret_Base.png deleted file mode 100644 index d1681eae..00000000 Binary files a/Textures/Wula/Building/SRAHeavyTurret_Base.png and /dev/null differ diff --git a/Textures/Wula/Building/SRAHeavyTurret_Base.sai2 b/Textures/Wula/Building/SRAHeavyTurret_Base.sai2 deleted file mode 100644 index c9f36bb9..00000000 Binary files a/Textures/Wula/Building/SRAHeavyTurret_Base.sai2 and /dev/null differ diff --git a/Textures/Wula/Building/SRARepairTower.png b/Textures/Wula/Building/SRARepairTower.png deleted file mode 100644 index 338d845c..00000000 Binary files a/Textures/Wula/Building/SRARepairTower.png and /dev/null differ diff --git a/Textures/Wula/Building/SRARepairTower.sai2 b/Textures/Wula/Building/SRARepairTower.sai2 deleted file mode 100644 index e81be262..00000000 Binary files a/Textures/Wula/Building/SRARepairTower.sai2 and /dev/null differ diff --git a/Textures/Wula/Building/SRA_WorkTable_east.png b/Textures/Wula/Building/SRA_WorkTable_east.png deleted file mode 100644 index eae1f4e2..00000000 Binary files a/Textures/Wula/Building/SRA_WorkTable_east.png and /dev/null differ diff --git a/Textures/Wula/Building/SRA_WorkTable_east.sai2 b/Textures/Wula/Building/SRA_WorkTable_east.sai2 deleted file mode 100644 index 20b6e95f..00000000 Binary files a/Textures/Wula/Building/SRA_WorkTable_east.sai2 and /dev/null differ diff --git a/Textures/Wula/Building/SRA_WorkTable_north.png b/Textures/Wula/Building/SRA_WorkTable_north.png deleted file mode 100644 index f15074e1..00000000 Binary files a/Textures/Wula/Building/SRA_WorkTable_north.png and /dev/null differ diff --git a/Textures/Wula/Building/SRA_WorkTable_south.png b/Textures/Wula/Building/SRA_WorkTable_south.png deleted file mode 100644 index f15074e1..00000000 Binary files a/Textures/Wula/Building/SRA_WorkTable_south.png and /dev/null differ diff --git a/Textures/Wula/Building/SRA_WorkTable_west.png b/Textures/Wula/Building/SRA_WorkTable_west.png deleted file mode 100644 index eae1f4e2..00000000 Binary files a/Textures/Wula/Building/SRA_WorkTable_west.png and /dev/null differ diff --git a/Textures/Wula/Building/WULA_Charging_Station_Synth_east.png b/Textures/Wula/Building/WULA_Charging_Station_Synth_east.png new file mode 100644 index 00000000..98d22794 Binary files /dev/null and b/Textures/Wula/Building/WULA_Charging_Station_Synth_east.png differ diff --git a/Textures/Wula/Building/WULA_Charging_Station_Synth_north.png b/Textures/Wula/Building/WULA_Charging_Station_Synth_north.png new file mode 100644 index 00000000..6a769223 Binary files /dev/null and b/Textures/Wula/Building/WULA_Charging_Station_Synth_north.png differ diff --git a/Textures/Wula/Building/WULA_Charging_Station_Synth_south.png b/Textures/Wula/Building/WULA_Charging_Station_Synth_south.png new file mode 100644 index 00000000..4bac38d8 Binary files /dev/null and b/Textures/Wula/Building/WULA_Charging_Station_Synth_south.png differ diff --git a/Textures/Wula/Building/WULA_Charging_Station_Synth_south.sai2 b/Textures/Wula/Building/WULA_Charging_Station_Synth_south.sai2 new file mode 100644 index 00000000..f5cd72fd Binary files /dev/null and b/Textures/Wula/Building/WULA_Charging_Station_Synth_south.sai2 differ diff --git a/Textures/Wula/Hair/WULA_Double_Ponytail_Long_east.png b/Textures/Wula/Hair/WULA_Double_Ponytail_Long_east.png index ba97abdb..dfccf9df 100644 Binary files a/Textures/Wula/Hair/WULA_Double_Ponytail_Long_east.png and b/Textures/Wula/Hair/WULA_Double_Ponytail_Long_east.png differ diff --git a/Textures/Wula/Hair/WULA_Double_Ponytail_Long_north.png b/Textures/Wula/Hair/WULA_Double_Ponytail_Long_north.png index d793b9a2..8ae228c2 100644 Binary files a/Textures/Wula/Hair/WULA_Double_Ponytail_Long_north.png and b/Textures/Wula/Hair/WULA_Double_Ponytail_Long_north.png differ diff --git a/Textures/Wula/Hair/WULA_Double_Ponytail_Long_south.png b/Textures/Wula/Hair/WULA_Double_Ponytail_Long_south.png index c4320d26..5e386944 100644 Binary files a/Textures/Wula/Hair/WULA_Double_Ponytail_Long_south.png and b/Textures/Wula/Hair/WULA_Double_Ponytail_Long_south.png differ diff --git a/Textures/Wula/Hair/WULA_Scattered_Hair_Long_east.png b/Textures/Wula/Hair/WULA_Scattered_Hair_Long_east.png index cd53f9b3..20dd75c5 100644 Binary files a/Textures/Wula/Hair/WULA_Scattered_Hair_Long_east.png and b/Textures/Wula/Hair/WULA_Scattered_Hair_Long_east.png differ diff --git a/Textures/Wula/Hair/WULA_Scattered_Hair_Long_north.png b/Textures/Wula/Hair/WULA_Scattered_Hair_Long_north.png index e5a735b9..b0ab23d4 100644 Binary files a/Textures/Wula/Hair/WULA_Scattered_Hair_Long_north.png and b/Textures/Wula/Hair/WULA_Scattered_Hair_Long_north.png differ diff --git a/Textures/Wula/Hair/WULA_Scattered_Hair_Long_south.png b/Textures/Wula/Hair/WULA_Scattered_Hair_Long_south.png index a14d4518..102f2004 100644 Binary files a/Textures/Wula/Hair/WULA_Scattered_Hair_Long_south.png and b/Textures/Wula/Hair/WULA_Scattered_Hair_Long_south.png differ diff --git a/Textures/Wula/Item/WULA_Species_Icon.png b/Textures/Wula/Item/WULA_Species_Icon.png new file mode 100644 index 00000000..0dfed0c8 Binary files /dev/null and b/Textures/Wula/Item/WULA_Species_Icon.png differ