diff --git a/1.5/Defs/PawnKinds/PawnKinds_Wula.xml b/1.5/Defs/PawnKinds/PawnKinds_Wula.xml index e55b0c07..27482428 100644 --- a/1.5/Defs/PawnKinds/PawnKinds_Wula.xml +++ b/1.5/Defs/PawnKinds/PawnKinds_Wula.xml @@ -85,7 +85,6 @@ - Wula_AI_Heavy_Panzer_PawnKind @@ -95,14 +94,11 @@
  • - Wula/Item/WULA_Species_Icon - SRA/Pawn/Mechanoid/AllegianceOverlays/None + Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin + Wula/Things/WULA_Cat/AllegianceOverlays/None CutoutWithOverlay Graphic_Multi 1.1 - - (0.2, 0.3, 0.2) -
    • @@ -122,4 +118,22 @@     + + + Mech_WULA_Cat + + Mech_WULA_Cat + PlayerColony + +
  • + + Wula/Things/WULA_Cat/WULA_Cat_Thin + Wula/Things/WULA_Cat/AllegianceOverlays/None + CutoutWithOverlay + Graphic_Multi + 1.1 + +
    • +     +     \ 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 46f28950..93b08dec 100644 --- a/1.5/Defs/RecipeDefs/Recipes_WULA.xml +++ b/1.5/Defs/RecipeDefs/Recipes_WULA.xml @@ -77,7 +77,40 @@ Wula_AI_Heavy_Panzer -
  • WULA_Machine_Productor_2_Technology
    • +
  • WULA_AI_Machine_Panzer_Technology
    • +     + + + + WULA_Build_Mech_Cat + + 建造一台CAt-11"猫猫"辅助机器人，可以执行包括搬运、挖矿、建造、烹饪、种植收割、清理、急救和灭火一类的简单工作。 + +
  • + + +
  • Steel
    • + + + 50 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + 1 + + + Mech_WULA_Cat + + +
  • WULA_Machine_Productor_Technology
    •      \ No newline at end of file diff --git a/1.5/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml b/1.5/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml index 85922c86..6e701516 100644 --- a/1.5/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml +++ b/1.5/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml @@ -231,9 +231,9 @@ - WULA_Machine_Productor_2_Technology - - 获取构建乌拉帝国高级机械体知识，用最强大的机械体支配战场。 + WULA_AI_Machine_Panzer_Technology + + 获取构建乌拉帝国智能战车SMp-38"萨克森"的知识，并得以生产它所装备的各种强大火力武备。 1200 4.00 4.60 diff --git a/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml b/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml index c0446a3b..3a2592b6 100644 --- a/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml +++ b/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml @@ -526,7 +526,7 @@ - Wula/Apparel/WULA_Knight_PowerArmor + Wula/Apparel/WULA_Assault_Troop_PowerArmor Graphic_Single @@ -538,7 +538,7 @@ 1 2.0 15 - 1.5 + -0.2 @@ -564,7 +564,7 @@
  • Arms
  • Legs
    • - Wula/Apparel/WULA_Knight_PowerArmor + Wula/Apparel/WULA_Assault_Troop_PowerArmor
  • Middle
  • Shell
    • @@ -593,7 +593,7 @@ - WULA_Knight_Helmet + WULA_Assault_Troop_Helmet 与乌拉帝国突击队装甲配套的头盔，能够辅助穿戴者的瞄准。 Spacer @@ -612,7 +612,7 @@ - Wula/Apparel/WULA_Knight_Helmet + Wula/Apparel/WULA_Assault_Troop_Helmet Graphic_Single @@ -645,7 +645,7 @@
  • Overhead
    •  ApparelHead - Wula/Apparel/WULA_Knight_Helmet + Wula/Apparel/WULA_Assault_Troop_Helmet true Wear_PowerArmor Remove_PowerArmor @@ -854,4 +854,299 @@
  • RewardStandardHighFreq
    • + + + + + WULA_SMp38_Shield + + 由乌拉帝国的"萨克森"战车所装备的中型护盾立场，可以保护车体免受敌方远程火力打击，但是会拖累战车的移动。 + Spacer + Normal + +
  • ApparelNoble
    • +     + + 105 + UnfinishedTechArmor + WULA_AI_Machine_Panzer_Technology + +
  • WULA_War_Machine_Weapon_Productor
    • +     + + 10 + +     + + Wula/Apparel/WULA_Knight_PowerArmor + Graphic_Single + + + 60000 + 200 + 100 + 0 + + 2.0 + + + -1 + + + + + 150 + +
  • Metallic
    • +     + + 4 + + + +
  • Wula_AI_Heavy_Panzer_Armor
    • +     + +
  • Torso
    • +     + + +
  • OnSkin
    • +
  • Middle
    • +
  • Shell
    • +     + true + Wear_PowerArmor + Remove_PowerArmor + false + false + false +     + Apparel + +
  • +
  • + 3600 + 3.5 + 3.8 + 0.01 + 4.0 + false +
    • + +     + +
  • RewardStandardHighFreq
    • +     +     + + WULA_SMp38_Armor + + 由乌拉帝国的"萨克森"战车所装备的额外的零素装甲，给予车体更大的防护力度,并减免受到的伤害。 + Spacer + Normal + +
  • ApparelNoble
    • +     + + 105 + UnfinishedTechArmor + WULA_AI_Machine_Panzer_Technology + +
  • WULA_War_Machine_Weapon_Productor
    • +     + + 10 + +     + + Wula/Apparel/WULA_Knight_PowerArmor + Graphic_Single + + + 60000 + 5000 + 100 + 0 + 1.5 + 1.5 + 2.0 + + + + + -0.5 + + 300 + +
  • Metallic
    • +     + + + + + +
  • Wula_AI_Heavy_Panzer_Armor
    • +     + +
  • Torso
    • +     + + +
  • OnSkin
    • +
  • Middle
    • +
  • Shell
    • +     + true + Wear_PowerArmor + Remove_PowerArmor + false + false + false +     + Apparel + +
  • + + + + +
  • RewardStandardHighFreq
    • + +     + + WULA_SMp38_Engine + + 由乌拉帝国的"萨克森"战车所装备的额外的移动组件，可以让战车获得更大的速度，并且增加额外的近战手段。 + Spacer + Normal + +
  • ApparelNoble
    • +     + + 105 + UnfinishedTechArmor + WULA_AI_Machine_Panzer_Technology + +
  • WULA_War_Machine_Weapon_Productor
    • +     + + 10 + +     + + Wula/Apparel/WULA_Knight_PowerArmor + Graphic_Single + + + 60000 + 1000 + 100 + 0 + + + + + 4 + 5 + -0.85 + + 300 + +
  • Metallic
    • +     + + + + + +
  • Wula_AI_Heavy_Panzer_Armor
    • +     + +
  • Torso
    • +     + + +
  • OnSkin
    • +
  • Middle
    • +
  • Shell
    • +     + true + Wear_PowerArmor + Remove_PowerArmor + false + false + false +     + Apparel + +
  • + + + + +
  • RewardStandardHighFreq
    • + +     \ No newline at end of file diff --git a/1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml index 89ff6073..a5e0cccf 100644 --- a/1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml +++ b/1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml @@ -1045,7 +1045,7 @@ - + WULA_WM_Rocket_Pod @@ -1075,7 +1075,7 @@
  • WULA_War_Machine_Weapon_Productor
    •  - WULA_Machine_Equipment_Technology + WULA_AI_Machine_Panzer_Technology
  • Wula_AI_Heavy_Panzer_Turret
    • @@ -1155,7 +1155,7 @@
  • WULA_War_Machine_Weapon_Productor
    •  - WULA_Machine_Equipment_Technology + WULA_AI_Machine_Panzer_Technology
  • Wula_AI_Heavy_Panzer_Turret
    • @@ -1229,7 +1229,7 @@
  • WULA_War_Machine_Weapon_Productor
    •  - WULA_Machine_Equipment_Technology + WULA_AI_Machine_Panzer_Technology
  • @@ -1303,7 +1303,7 @@
  • WULA_War_Machine_Weapon_Productor
    • - WULA_Machine_Equipment_Technology + WULA_AI_Machine_Panzer_Technology
  • Wula_AI_Heavy_Panzer_Turret
    • diff --git a/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml index 8deb062b..755309d7 100644 --- a/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml +++ b/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml @@ -4,7 +4,8 @@ WulaSpecies 乌拉星人是一个曾统治银河系的堕落帝国的主要种族，机械乌拉则是仿照她们样貌制作的合成人——随着帝国的衰颓，大量乌拉合成人流散各地。她们拥有近乎无限的寿命，并且拥有一部分机械体的特性。 - + Wula/Things/WulaSpecies/WULA_Species_Icon + @@ -367,21 +368,13 @@ Wula_AI_Heavy_Panzer 乌拉帝国所使用的中型突击战车，搭载了一个和合成人相同的AI核心，这使得它可以像生物一样思考——只是没有多余的感情，它们唯一思考的就是如何撕碎敌人。 - + Wula/Things/Wula_AI_Heavy_Panzer/Wula_AI_Heavy_Panzer_Icon + 0 - - -
  • - Beauty -
    • -
  • - Beauty -
    • -     true @@ -477,12 +470,19 @@
  • WULA_AI_War_Machine
    •  +
  • WULA_WM_Rocket_Pod
  • WULA_WM_Panzer_Turret
  • WULA_WM_Panzer_Autocannon
  • WULA_WM_Panzer_Mortar
    •  + + +
  • WULA_SMp38_Shield
    • +
  • WULA_SMp38_Armor
    • +
  • WULA_SMp38_Engine
    • +     true true true @@ -617,8 +617,8 @@ NamerMech Heavy + - 20 @@ -652,4 +652,49 @@ + + + + Mech_WULA_Cat + + 乌拉帝国的一种小型机械体，可以执行包括搬运、挖矿、建造、烹饪、种植收割、清理、急救和灭火一类的简单工作，因为似猫的外形受到乌拉星人欢迎。 + + 6 + + + +
  • Hauling
    • +
  • Mining
    • +
  • Construction
    • + + + +
  • Cooking
    • + +
  • PlantCutting
    • +
  • Growing
    • +
  • Cleaning
    • +
  • Doctor
    • +
  • Firefighter
    • +     + +
  • + MechanoidFullyFormed +
    • +     + + +     + +     \ No newline at end of file diff --git a/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet.png b/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet.png new file mode 100644 index 00000000..6ee20ce3 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet.png differ diff --git a/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet_east.png b/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet_east.png new file mode 100644 index 00000000..b8792ed5 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet_east.png differ diff --git a/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet_north.png b/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet_north.png new file mode 100644 index 00000000..c5dbe5aa Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet_north.png differ diff --git a/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet_south.png b/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet_south.png new file mode 100644 index 00000000..4aeff814 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet_south.png differ diff --git a/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet_south.sai2 b/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet_south.sai2 new file mode 100644 index 00000000..0db8b50d Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Assault_Troop_Helmet_south.sai2 differ diff --git a/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor.png b/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor.png new file mode 100644 index 00000000..eda2db70 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor.png differ diff --git a/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor_Thin_east.png b/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor_Thin_east.png new file mode 100644 index 00000000..0b0f7add Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor_Thin_east.png differ diff --git a/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor_Thin_north.png b/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor_Thin_north.png new file mode 100644 index 00000000..f09631c8 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor_Thin_north.png differ diff --git a/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor_Thin_south.png b/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor_Thin_south.png new file mode 100644 index 00000000..76c7ee46 Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor_Thin_south.png differ diff --git a/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor_Thin_south.sai2 b/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor_Thin_south.sai2 new file mode 100644 index 00000000..8a315d9e Binary files /dev/null and b/Textures/Wula/Apparel/WULA_Assault_Troop_PowerArmor_Thin_south.sai2 differ diff --git a/Textures/Wula/Apparel/WULA_Knight_Helmet.png b/Textures/Wula/Apparel/WULA_Knight_Helmet.png index 92f05e28..65de3b9f 100644 Binary files a/Textures/Wula/Apparel/WULA_Knight_Helmet.png and b/Textures/Wula/Apparel/WULA_Knight_Helmet.png differ diff --git a/Textures/Wula/Apparel/WULA_Knight_Helmet_east.png b/Textures/Wula/Apparel/WULA_Knight_Helmet_east.png index b8792ed5..f723c4cd 100644 Binary files a/Textures/Wula/Apparel/WULA_Knight_Helmet_east.png and b/Textures/Wula/Apparel/WULA_Knight_Helmet_east.png differ diff --git a/Textures/Wula/Apparel/WULA_Knight_Helmet_south.png b/Textures/Wula/Apparel/WULA_Knight_Helmet_south.png index 4aeff814..0cbec85c 100644 Binary files a/Textures/Wula/Apparel/WULA_Knight_Helmet_south.png and b/Textures/Wula/Apparel/WULA_Knight_Helmet_south.png differ diff --git a/Textures/Wula/Apparel/WULA_Knight_Helmet_south.sai2 b/Textures/Wula/Apparel/WULA_Knight_Helmet_south.sai2 index 351aa910..27ad5013 100644 Binary files a/Textures/Wula/Apparel/WULA_Knight_Helmet_south.sai2 and b/Textures/Wula/Apparel/WULA_Knight_Helmet_south.sai2 differ diff --git a/Textures/Wula/Apparel/WULA_Knight_PowerArmor.png b/Textures/Wula/Apparel/WULA_Knight_PowerArmor.png index 8f89d2e4..f73561f7 100644 Binary files a/Textures/Wula/Apparel/WULA_Knight_PowerArmor.png and b/Textures/Wula/Apparel/WULA_Knight_PowerArmor.png differ diff --git a/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_east.png b/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_east.png index bb0d3304..0ddbe013 100644 Binary files a/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_east.png and b/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_east.png differ diff --git a/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_north.png b/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_north.png index 1d417bd9..04899d9f 100644 Binary files a/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_north.png and b/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_north.png differ diff --git a/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_south.png b/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_south.png index 59549213..0fca09f1 100644 Binary files a/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_south.png and b/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_south.png differ diff --git a/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_south.sai2 b/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_south.sai2 index 5a101bba..944caf91 100644 Binary files a/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_south.sai2 and b/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_south.sai2 differ diff --git a/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_west.png b/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_west.png index 03928242..b1b6923d 100644 Binary files a/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_west.png and b/Textures/Wula/Apparel/WULA_Knight_PowerArmor_Thin_west.png differ diff --git a/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_east.dds b/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_east.dds new file mode 100644 index 00000000..b88cc944 Binary files /dev/null and b/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_east.dds differ diff --git a/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_east.png b/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_east.png new file mode 100644 index 00000000..37b54f7e Binary files /dev/null and b/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_east.png differ diff --git a/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_north.dds b/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_north.dds new file mode 100644 index 00000000..b88cc944 Binary files /dev/null and b/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_north.dds differ diff --git a/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_north.png b/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_north.png new file mode 100644 index 00000000..37b54f7e Binary files /dev/null and b/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_north.png differ diff --git a/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_south.dds b/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_south.dds new file mode 100644 index 00000000..b88cc944 Binary files /dev/null and b/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_south.dds differ diff --git a/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_south.png b/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_south.png new file mode 100644 index 00000000..37b54f7e Binary files /dev/null and b/Textures/Wula/Things/WULA_Cat/AllegianceOverlays/None_south.png differ diff --git a/Textures/Wula/Things/WULA_Cat/WULA_Cat_Thin_east.png b/Textures/Wula/Things/WULA_Cat/WULA_Cat_Thin_east.png new file mode 100644 index 00000000..38d9fc5c Binary files /dev/null and b/Textures/Wula/Things/WULA_Cat/WULA_Cat_Thin_east.png differ diff --git a/Textures/Wula/Things/WULA_Cat/WULA_Cat_Thin_north.png b/Textures/Wula/Things/WULA_Cat/WULA_Cat_Thin_north.png new file mode 100644 index 00000000..9e9ef510 Binary files /dev/null and b/Textures/Wula/Things/WULA_Cat/WULA_Cat_Thin_north.png differ diff --git a/Textures/Wula/Things/WULA_Cat/WULA_Cat_Thin_south.png b/Textures/Wula/Things/WULA_Cat/WULA_Cat_Thin_south.png new file mode 100644 index 00000000..174d13d8 Binary files /dev/null and b/Textures/Wula/Things/WULA_Cat/WULA_Cat_Thin_south.png differ diff --git a/Textures/Wula/Things/WULA_Cat/WULA_Cat_Thin_south.sai2 b/Textures/Wula/Things/WULA_Cat/WULA_Cat_Thin_south.sai2 new file mode 100644 index 00000000..378230dd Binary files /dev/null and b/Textures/Wula/Things/WULA_Cat/WULA_Cat_Thin_south.sai2 differ diff --git a/Textures/Wula/Item/WULA_Species_Icon.png b/Textures/Wula/Things/WulaSpecies/WULA_Species_Icon.png similarity index 100% rename from Textures/Wula/Item/WULA_Species_Icon.png rename to Textures/Wula/Things/WulaSpecies/WULA_Species_Icon.png diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Wula_AI_Heavy_Panzer_Icon.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Wula_AI_Heavy_Panzer_Icon.png new file mode 100644 index 00000000..5ff9957b Binary files /dev/null and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Wula_AI_Heavy_Panzer_Icon.png differ