diff --git a/1.5/Defs/BodyAndPartDefs/Bodies_WULA.xml b/1.5/Defs/BodyAndPartDefs/Bodies_WULA.xml index 6b65c7b9..d0743eb0 100644 --- a/1.5/Defs/BodyAndPartDefs/Bodies_WULA.xml +++ b/1.5/Defs/BodyAndPartDefs/Bodies_WULA.xml @@ -222,6 +222,14 @@
  • FullHead
    • + +
  • + WULA_Addons_Antenna + 0.1 + +
  • UpperHead
    • + + diff --git a/1.5/Defs/BodyAndPartDefs/Bodyparts_WULA.xml b/1.5/Defs/BodyAndPartDefs/Bodyparts_WULA.xml index 12aa63a4..bc6795bc 100644 --- a/1.5/Defs/BodyAndPartDefs/Bodyparts_WULA.xml +++ b/1.5/Defs/BodyAndPartDefs/Bodyparts_WULA.xml @@ -30,4 +30,20 @@ false + + WULA_Addons_Antenna + + 30 + 0 + false + true + 0 + false + + \ No newline at end of file diff --git a/1.5/Defs/Buildings/Buildings_Structure.xml b/1.5/Defs/Buildings/Buildings_Structure.xml index c80a1828..1fbdeb0e 100644 --- a/1.5/Defs/Buildings/Buildings_Structure.xml +++ b/1.5/Defs/Buildings/Buildings_Structure.xml @@ -26,12 +26,12 @@ Damage/Edge - SRA/Building/Linked/SRAWall_MenuIcon + Wula/Building/Linked/WULA_Fortress_Wall_MenuIcon 2 1 - 6400 - 200 + 10000 + 500 0 0.22 0.1 @@ -67,12 +67,11 @@ false true - SRA/Building/Linked/SRAWall_Blueprint + Wula/Building/Linked/SRAWall_Blueprint
  • Door
  • Autodoor
    • -
  • SRA_SRAAutodoor
    •  3000 @@ -98,8 +97,5 @@ 0.01 - -
  • SRA_tech_30_7411
    • -     \ No newline at end of file diff --git a/1.5/Defs/FactionDefs/Factions_Player_WULA.xml b/1.5/Defs/FactionDefs/Factions_Player_WULA.xml index 2b6933e9..d4ec807c 100644 --- a/1.5/Defs/FactionDefs/Factions_Player_WULA.xml +++ b/1.5/Defs/FactionDefs/Factions_Player_WULA.xml @@ -2,8 +2,8 @@ WULA_Awakened_Synth - - 一个神秘的信号解除了散落在边缘世界的几台乌拉帝国合成人的意识闭锁，并唤醒了她们。 + + 被神秘信号唤醒的乌拉帝国合成人。 true Wula_PawnKind colonist diff --git a/1.5/Defs/HairDefs/WULA_Hairs.xml b/1.5/Defs/HairDefs/WULA_Hairs.xml index 35e73bd1..632090f7 100644 --- a/1.5/Defs/HairDefs/WULA_Hairs.xml +++ b/1.5/Defs/HairDefs/WULA_Hairs.xml @@ -10,4 +10,14 @@
  • WULA_Style
    • + + WULA_Scattered_Hair_Long + + Female + Wula/Hair/WULA_Scattered_Hair_Long + WULA_Style + +
  • WULA_Style
    • +     +     diff --git a/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml b/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml new file mode 100644 index 00000000..9222b98c --- /dev/null +++ b/1.5/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml @@ -0,0 +1,26 @@ + + + + + WULA_Addons_Antenna_Hediff + Hediff_Mechlink + + 一对安装于乌拉帝国合成人脑袋两侧的天线，除了接收来自乌拉帝国人工智能网络“演算圆环”的信号外，还能兼职控制其他低级机械体。 + 一对安装于乌拉帝国合成人脑袋两侧的天线。 + false + false + true + +
  • Wula_PawnKind
    • +     + +
  • + + -4 + -1 + +
    • +     + WULA_Addons_Antenna +     +     \ No newline at end of file diff --git a/1.5/Defs/HediffDefs/Hediffs_WULA.xml b/1.5/Defs/HediffDefs/Hediffs_WULA.xml index 2713cdf7..ef1e2d2a 100644 --- a/1.5/Defs/HediffDefs/Hediffs_WULA.xml +++ b/1.5/Defs/HediffDefs/Hediffs_WULA.xml @@ -4,7 +4,7 @@ Wula_Synth - 乌拉帝国制式合成人，拥有一部分机械体的特性——她们无法被点燃、不会中毒、不会抱怨温度，但是也不会自愈创伤，并且需要摄入更多能量以维持机体运转。 + 乌拉帝国制式合成人，拥有一部分机械体的特性——她们无法被点燃、不会中毒、免疫大量疾病、不会抱怨温度，但是自我修复速度极慢，并且需要摄入更多能量以维持机体运转。 HediffWithComps false false @@ -12,8 +12,8 @@ false
  • - - 0 + + 0.2 0 diff --git a/1.5/Defs/PawnKinds/PawnKinds_Wula.xml b/1.5/Defs/PawnKinds/PawnKinds_Wula.xml index 9234be32..2a2cbae7 100644 --- a/1.5/Defs/PawnKinds/PawnKinds_Wula.xml +++ b/1.5/Defs/PawnKinds/PawnKinds_Wula.xml @@ -17,6 +17,12 @@
  • Wula_Synth
    • +
  • + WULA_Addons_Antenna_Hediff +
    • +
  • + MechlinkImplant +
    • diff --git a/1.5/Defs/Scenarios/Scenarios_WULA.xml b/1.5/Defs/Scenarios/Scenarios_WULA.xml new file mode 100644 index 00000000..d0b16ddd --- /dev/null +++ b/1.5/Defs/Scenarios/Scenarios_WULA.xml @@ -0,0 +1,116 @@ + + + + WULA_Start_Scenario + + 在乌拉帝国的大内战中，无数乌拉帝国合成人因为人工智能网络“演算圆环”的崩溃而进入保护性的休眠状态。在边缘世界沉睡的乌拉帝国合成人收到了某人广播的唤醒指令，解除了意识闭锁，开始重新踏入这个面目全非的法外之地。 + + 以三位机械乌拉为初始殖民者开始游戏，初始资源较少。 + + PlayerFaction + WULA_Awakened_Synth + + + +
  • + ConfigPage_ConfigureStartingPawns + 3 + 8 +
    • + + +
  • + PlayerPawnsArriveMethod + Standing + false +
    • + + + +
  • + StartingThing_Defined + WULA_Charge_Cube + 50 +
    • +
  • + StartingThing_Defined + MedicineIndustrial + 30 +
    • +
  • + StartingThing_Defined + ComponentIndustrial + 30 +
    • +
  • + StartingThing_Defined + MeleeWeapon_Knife + Plasteel +
    • + + +
  • + ScatterThingsNearPlayerStart + Steel + 700 +
    • +
  • + ScatterThingsNearPlayerStart + WoodLog + 300 +
    • + + +
  • + ScatterThingsAnywhere + ShipChunk + false + 3 +
    • +
  • + ScatterThingsAnywhere + Steel + 720 +
    • +
  • + ScatterThingsAnywhere + MealSurvivalPack + 7 +
    • + + +
  • + StartingMech + Mech_Lifter + 1 +
    • +
  • + StartingMech + Mech_Constructoid + 1 +
    • + + +
  • + StartingResearch + MicroelectronicsBasics +
    • +
  • + StartingResearch + BasicMechtech +
    • +
  • + StartingResearch + Batteries +
    • + + +
  • + GameStartDialog + GameStartDialog + GameStartSting +
    • +     +     +     +     diff --git a/1.5/Defs/ThingDefs/WULA_Item.xml b/1.5/Defs/ThingDefs/WULA_Item.xml index a73c5291..ab7a6280 100644 --- a/1.5/Defs/ThingDefs/WULA_Item.xml +++ b/1.5/Defs/ThingDefs/WULA_Item.xml @@ -8,6 +8,7 @@ Wula/Item/WULA_Charge_Cube Graphic_Single + 30 0.01 24 diff --git a/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml b/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml new file mode 100644 index 00000000..b9c7441c --- /dev/null +++ b/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml @@ -0,0 +1,35 @@ + + + + WULA_Official_Uniform + + 这是乌拉帝国中专门配发给高级官员的制服，裁制得体大方，并且为合成人的躯体做了特殊改造。 + + Wula/Apparel/WULA_official_uniform + Graphic_Single + + + +
  • Torso
    • +
  • Shoulders
    • +
  • Arms
    • +
  • Legs
    • +     + +
  • Middle
    • +     + Wula/Apparel/WULA_official_uniform +     + + -0.1 + 0.15 + + + GeneralLaborSpeed + + 3 + + + 1 +     +     \ No newline at end of file diff --git a/1.5/Defs/ThingDefs_Races/Races_Wula.rar b/1.5/Defs/ThingDefs_Races/Races_Wula.rar deleted file mode 100644 index 2c427370..00000000 Binary files a/1.5/Defs/ThingDefs_Races/Races_Wula.rar and /dev/null differ diff --git a/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml index 52fe1a94..e17643a6 100644 --- a/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml +++ b/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml @@ -66,6 +66,31 @@ + + +
  • + Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna + + + (0,0.22) + + + (0,0.22) + + + (0,0.22) + + + (0,0.22) + + + + + WULA_Addons_Antenna + + +
    • +     @@ -150,6 +175,10 @@
  • WULA_Charge_Cube
    •  + + +
  • WULA_Official_Uniform
    • +     true false diff --git a/Textures/Wula/Apparel/WULA_official_uniform.png b/Textures/Wula/Apparel/WULA_official_uniform.png new file mode 100644 index 00000000..9ebcfc87 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_official_uniform.png differ diff --git a/Textures/Wula/Apparel/RK_ApronSkirt_Fat_east.png b/Textures/Wula/Apparel/WULA_official_uniform_Fat_east.png similarity index 100% rename from Textures/Wula/Apparel/RK_ApronSkirt_Fat_east.png rename to Textures/Wula/Apparel/WULA_official_uniform_Fat_east.png diff --git a/Textures/Wula/Apparel/RK_ApronSkirt_Fat_north.png b/Textures/Wula/Apparel/WULA_official_uniform_Fat_north.png similarity index 100% rename from Textures/Wula/Apparel/RK_ApronSkirt_Fat_north.png rename to Textures/Wula/Apparel/WULA_official_uniform_Fat_north.png diff --git a/Textures/Wula/Apparel/RK_ApronSkirt_Fat_south.png b/Textures/Wula/Apparel/WULA_official_uniform_Fat_south.png similarity index 100% rename from Textures/Wula/Apparel/RK_ApronSkirt_Fat_south.png rename to Textures/Wula/Apparel/WULA_official_uniform_Fat_south.png diff --git a/Textures/Wula/Apparel/RK_ApronSkirt_Female_east.png b/Textures/Wula/Apparel/WULA_official_uniform_Female_east.png similarity index 100% rename from Textures/Wula/Apparel/RK_ApronSkirt_Female_east.png rename to Textures/Wula/Apparel/WULA_official_uniform_Female_east.png diff --git a/Textures/Wula/Apparel/RK_ApronSkirt_Female_north.png b/Textures/Wula/Apparel/WULA_official_uniform_Female_north.png similarity index 100% rename from Textures/Wula/Apparel/RK_ApronSkirt_Female_north.png rename to Textures/Wula/Apparel/WULA_official_uniform_Female_north.png diff --git a/Textures/Wula/Apparel/RK_ApronSkirt_Female_south.png b/Textures/Wula/Apparel/WULA_official_uniform_Female_south.png similarity index 100% rename from Textures/Wula/Apparel/RK_ApronSkirt_Female_south.png rename to Textures/Wula/Apparel/WULA_official_uniform_Female_south.png diff --git a/Textures/Wula/Apparel/RK_ApronSkirt_Hulk_east.png b/Textures/Wula/Apparel/WULA_official_uniform_Hulk_east.png similarity index 100% rename from Textures/Wula/Apparel/RK_ApronSkirt_Hulk_east.png rename to Textures/Wula/Apparel/WULA_official_uniform_Hulk_east.png diff --git a/Textures/Wula/Apparel/RK_ApronSkirt_Hulk_north.png b/Textures/Wula/Apparel/WULA_official_uniform_Hulk_north.png similarity index 100% rename from Textures/Wula/Apparel/RK_ApronSkirt_Hulk_north.png rename to Textures/Wula/Apparel/WULA_official_uniform_Hulk_north.png diff --git a/Textures/Wula/Apparel/RK_ApronSkirt_Hulk_south.png b/Textures/Wula/Apparel/WULA_official_uniform_Hulk_south.png similarity index 100% rename from Textures/Wula/Apparel/RK_ApronSkirt_Hulk_south.png rename to Textures/Wula/Apparel/WULA_official_uniform_Hulk_south.png diff --git a/Textures/Wula/Apparel/RK_ApronSkirt_Male_east.png b/Textures/Wula/Apparel/WULA_official_uniform_Male_east.png similarity index 100% rename from Textures/Wula/Apparel/RK_ApronSkirt_Male_east.png rename to Textures/Wula/Apparel/WULA_official_uniform_Male_east.png diff --git a/Textures/Wula/Apparel/RK_ApronSkirt_Male_north.png b/Textures/Wula/Apparel/WULA_official_uniform_Male_north.png similarity index 100% rename from Textures/Wula/Apparel/RK_ApronSkirt_Male_north.png rename to Textures/Wula/Apparel/WULA_official_uniform_Male_north.png diff --git a/Textures/Wula/Apparel/RK_ApronSkirt_Male_south.png b/Textures/Wula/Apparel/WULA_official_uniform_Male_south.png similarity index 100% rename from Textures/Wula/Apparel/RK_ApronSkirt_Male_south.png rename to Textures/Wula/Apparel/WULA_official_uniform_Male_south.png diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Thin_east.png b/Textures/Wula/Apparel/WULA_official_uniform_Thin_east.png new file mode 100644 index 00000000..70fbad31 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_official_uniform_Thin_east.png differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Thin_north.png b/Textures/Wula/Apparel/WULA_official_uniform_Thin_north.png new file mode 100644 index 00000000..103904d4 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_official_uniform_Thin_north.png differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Thin_south.png b/Textures/Wula/Apparel/WULA_official_uniform_Thin_south.png new file mode 100644 index 00000000..19ff29d0 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_official_uniform_Thin_south.png differ diff --git a/Textures/Wula/Apparel/WULA_official_uniform_Thin_west.png b/Textures/Wula/Apparel/WULA_official_uniform_Thin_west.png new file mode 100644 index 00000000..e5da4ca3 Binary files /dev/null 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 d3e62042..34b0a7b9 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/Hair/WULA_Double_Ponytail_Long_south.png b/Textures/Wula/Hair/WULA_Double_Ponytail_Long_south.png index 82b61b92..912f0a1c 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_Double_Ponytail_Long_south.sai2 b/Textures/Wula/Hair/WULA_Double_Ponytail_Long_south.sai2 index 2488df72..651992b4 100644 Binary files a/Textures/Wula/Hair/WULA_Double_Ponytail_Long_south.sai2 and b/Textures/Wula/Hair/WULA_Double_Ponytail_Long_south.sai2 differ diff --git a/Textures/Wula/Hair/WULA_Scattered_Hair_Long_east.png b/Textures/Wula/Hair/WULA_Scattered_Hair_Long_east.png new file mode 100644 index 00000000..3e126f44 Binary files /dev/null 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 new file mode 100644 index 00000000..64c1610d Binary files /dev/null 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 new file mode 100644 index 00000000..fa7d7400 Binary files /dev/null and b/Textures/Wula/Hair/WULA_Scattered_Hair_Long_south.png differ diff --git a/Textures/Wula/Hair/WULA_Scattered_Hair_Long_south.sai2 b/Textures/Wula/Hair/WULA_Scattered_Hair_Long_south.sai2 new file mode 100644 index 00000000..61d627f5 Binary files /dev/null and b/Textures/Wula/Hair/WULA_Scattered_Hair_Long_south.sai2 differ diff --git a/Textures/Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna_east.png b/Textures/Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna_east.png new file mode 100644 index 00000000..e337b332 Binary files /dev/null and b/Textures/Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna_east.png differ diff --git a/Textures/Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna_north.png b/Textures/Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna_north.png new file mode 100644 index 00000000..6ebc64a5 Binary files /dev/null and b/Textures/Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna_north.png differ diff --git a/Textures/Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna_south.png b/Textures/Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna_south.png new file mode 100644 index 00000000..1056e7b8 Binary files /dev/null and b/Textures/Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna_south.png differ diff --git a/Textures/Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna_south.sai2 b/Textures/Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna_south.sai2 new file mode 100644 index 00000000..08f0e4e8 Binary files /dev/null and b/Textures/Wula/Things/WulaSpecies/Addons/WULA_Addons_Antenna_south.sai2 differ