diff --git a/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml b/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml index b9c57574..ea00c1d3 100644 --- a/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml +++ b/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml @@ -206,7 +206,7 @@ Graphic_Single - WULA_Synth_Addons_2_Technology + WULA_Synth_Addons_Technology
  • WULA_Cube_Productor_Energy
  • @@ -239,13 +239,14 @@ WULA_Energy_Furnace_Hediff_Regulator 安装于能源炉的特殊改件,提高能量上限并降低能量消耗速度。 + 1 1.0
  • - 0 + 0.01 0.5 @@ -983,6 +984,7 @@ WULA_MechRepairKit 一种一次性使用的堕落乌拉帝国修理套件,专门用来完全修复机械乌拉。 + AdministerWULA_MechRepairKit Things/Item/Special/MechSerumHealer Graphic_Single @@ -1004,6 +1006,10 @@
  • + + 25 + 2 +
  • RewardStandardCore
  • @@ -1019,16 +1025,17 @@ Smith Recipe_Machining 650 + +
  • WULA_Repair_All_Technology
  • +
    - -
  • WULA_Repair_All_Technology
  • -
    AdministerWULA_MechRepairKit 施用一个机械乌拉修理套件,修复乌拉族目标的所有健康状况。 WulaFallenEmpire.Recipe_AdministerWulaMechRepairKit + WULA_MechRepairKit 正在修理机械乌拉。 5000 Medicine @@ -1057,9 +1064,6 @@
  • WULA_MechRepairKit
  • - -
  • WULA_Repair_All_Technology
  • -
    diff --git a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml index d20d0a60..fe65806d 100644 --- a/1.6/Defs/PawnKinds/PawnKinds_Wula.xml +++ b/1.6/Defs/PawnKinds/PawnKinds_Wula.xml @@ -19,7 +19,7 @@ - 200 + 18 true 0 10~20 @@ -63,7 +63,7 @@ - 200 + 18 0 10~20 10~20 @@ -289,8 +289,8 @@
  • - Wula/Things/WULA_Cat/WULA_Cat_Thin - Wula/Things/WULA_Cat/AllegianceOverlays/None + Wula/Things/WULA_DM_Cat/WULA_Cat_Thin + Wula/Things/WULA_DM_Cat/AllegianceOverlays/None CutoutWithOverlay Graphic_Multi 1.1 diff --git a/1.6/Defs/RecipeDefs/Recipes_WULA.xml b/1.6/Defs/RecipeDefs/Recipes_WULA.xml index db232d1d..35ae2e24 100644 --- a/1.6/Defs/RecipeDefs/Recipes_WULA.xml +++ b/1.6/Defs/RecipeDefs/Recipes_WULA.xml @@ -104,7 +104,7 @@ Smith Recipe_Smith - 2000 + 200 true @@ -144,7 +144,7 @@ Smith Recipe_Smith - 1000 + 100 true @@ -176,7 +176,7 @@ Smith Recipe_Smith - 3500 + 350 true diff --git a/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml b/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml index 8a4bd8aa..43aeb7dc 100644 --- a/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml +++ b/1.6/Defs/ResearchProjectDefs/ResearchProjects_WULA.xml @@ -257,7 +257,7 @@ 获取乌拉帝国机械体CAt-96"暗物质猫猫"的生产权限,一种搭载了暗物质引擎的劳工型机械体,无需充电,但是死亡时会产生湮灭爆炸。 2000 9.00 - 5.60 + 5.50
  • WULA_Machine_Productor_1_Technology
  • WULA_Dark_Matter_Technology
  • @@ -290,9 +290,9 @@ WULA_New_Synth_Skill_2_Technology 开发用于从上行链路下载新人格和兴趣调整数据包的套件,以进一步调整合成人的发展定位。 - 400 - 2.00 - 5.70 + 600 + 3.00 + 4.70
  • WULA_New_Synth_Skill_Technology
  • @@ -307,6 +307,7 @@
  • WULA_Adv_WorkTable_Technology
  • WULA_Repair_All_Technology
  • +
  • WULA_New_Synth_Skill_2_Technology
  • @@ -321,4 +322,4 @@
  • WULA_Dark_Matter_Technology
  • - + \ No newline at end of file diff --git a/1.6/Defs/ThingDefs/WULA_Item.xml b/1.6/Defs/ThingDefs/WULA_Item.xml index 1a02b229..bb616ef6 100644 --- a/1.6/Defs/ThingDefs/WULA_Item.xml +++ b/1.6/Defs/ThingDefs/WULA_Item.xml @@ -59,7 +59,6 @@ 24 0.3 450 - 1 - (0.9, 0.8, 0.2, 0.5) + (0.9, 0.2, 0.2, 0.5) Interceptor_BlockedProjectile Shield_Break BulletShieldGenerator_Reactivate @@ -1021,7 +1021,7 @@ 15 - -0.1 + -0.075 -0.25 2 @@ -1105,7 +1105,7 @@ false - (0.9, 0.8, 0.2, 0.5) + (0.9, 0.2, 0.2, 0.5) Interceptor_BlockedProjectile Shield_Break BulletShieldGenerator_Reactivate @@ -1197,7 +1197,7 @@ 15 - -0.5 + -0.1 @@ -1374,7 +1374,7 @@ false - (0.9, 0.8, 0.2, 0.5) + (0.9, 0.2, 0.2, 0.5) Interceptor_BlockedProjectile Shield_Break BulletShieldGenerator_Reactivate diff --git a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml index f1448a90..ed8fbb3e 100644 --- a/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml +++ b/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml @@ -1777,7 +1777,7 @@ Mote_Wula_Dark_Matter_Beam GraserBeam_End - 0.75 + 0.35 0.6 @@ -1877,7 +1877,7 @@ Mote_Wula_Dark_Matter_Beam GraserBeam_End - 0.75 + 0.45 0.6 diff --git a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml index e74ece9a..6bc710a1 100644 --- a/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml +++ b/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml @@ -265,15 +265,6 @@
  • WULA_Charge_Cube
  • true - - -
  • WULA_Fix_Hand_Base
  • -
  • WULA_Fix_Arm_Base
  • -
  • WULA_Fix_Leg_Base
  • -
  • WULA_Fix_Foot_Base
  • -
  • WULA_Fix_Head_Base
  • -
  • WULA_Fix_Torso_Base
  • -
  • WULA_Official_Uniform
  • @@ -1082,7 +1073,7 @@ Mech_WULA_Cat_DM 乌拉帝国的一种小型机械体,可以执行包括搬运、烹饪、种植收割、清理、急救和灭火一类的简单工作。这种型号的乌拉猫猫内置了一台不稳定暗物质引擎,这使得其无需充电,但是在死亡时会产生巨大的爆炸。 - Wula/Things/WULA_Cat/WULA_Cat_Thin_south + Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_south 6 diff --git a/Textures/Wula/Item/WULA_Syhth_Passion_Trainer.png b/Textures/Wula/Item/WULA_Syhth_Passion_Trainer.png new file mode 100644 index 00000000..a8f52cbe Binary files /dev/null and b/Textures/Wula/Item/WULA_Syhth_Passion_Trainer.png differ diff --git a/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_east.dds b/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_east.dds new file mode 100644 index 00000000..b88cc944 Binary files /dev/null and b/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_east.dds differ diff --git a/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_east.png b/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_east.png new file mode 100644 index 00000000..37b54f7e Binary files /dev/null and b/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_east.png differ diff --git a/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_north.dds b/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_north.dds new file mode 100644 index 00000000..b88cc944 Binary files /dev/null and b/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_north.dds differ diff --git a/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_north.png b/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_north.png new file mode 100644 index 00000000..37b54f7e Binary files /dev/null and b/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_north.png differ diff --git a/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_south.dds b/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_south.dds new file mode 100644 index 00000000..b88cc944 Binary files /dev/null and b/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_south.dds differ diff --git a/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_south.png b/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_south.png new file mode 100644 index 00000000..37b54f7e Binary files /dev/null and b/Textures/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_south.png differ diff --git a/Textures/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_east.png b/Textures/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_east.png new file mode 100644 index 00000000..3fac4d9b Binary files /dev/null and b/Textures/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_east.png differ diff --git a/Textures/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_north.png b/Textures/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_north.png new file mode 100644 index 00000000..63359cf4 Binary files /dev/null and b/Textures/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_north.png differ diff --git a/Textures/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_south.png b/Textures/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_south.png new file mode 100644 index 00000000..3439fed4 Binary files /dev/null and b/Textures/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_south.png differ diff --git a/美术与文本源文件/Wula/Item/WULA_Syhth_Passion_Trainer.sai2 b/美术与文本源文件/Wula/Item/WULA_Syhth_Passion_Trainer.sai2 new file mode 100644 index 00000000..826cbd22 Binary files /dev/null and b/美术与文本源文件/Wula/Item/WULA_Syhth_Passion_Trainer.sai2 differ diff --git a/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_east.dds b/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_east.dds new file mode 100644 index 00000000..b88cc944 Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_east.dds differ diff --git a/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_east.png b/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_east.png new file mode 100644 index 00000000..37b54f7e Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_east.png differ diff --git a/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_north.dds b/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_north.dds new file mode 100644 index 00000000..b88cc944 Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_north.dds differ diff --git a/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_north.png b/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_north.png new file mode 100644 index 00000000..37b54f7e Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_north.png differ diff --git a/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_south.dds b/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_south.dds new file mode 100644 index 00000000..b88cc944 Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_south.dds differ diff --git a/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_south.png b/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_south.png new file mode 100644 index 00000000..37b54f7e Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_DM_Cat/AllegianceOverlays/None_south.png differ diff --git a/美术与文本源文件/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_east.png b/美术与文本源文件/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_east.png new file mode 100644 index 00000000..3fac4d9b Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_east.png differ diff --git a/美术与文本源文件/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_north.png b/美术与文本源文件/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_north.png new file mode 100644 index 00000000..63359cf4 Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_north.png differ diff --git a/美术与文本源文件/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_south.png b/美术与文本源文件/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_south.png new file mode 100644 index 00000000..3439fed4 Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_south.png differ diff --git a/美术与文本源文件/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_south.sai2 b/美术与文本源文件/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_south.sai2 new file mode 100644 index 00000000..38b21923 Binary files /dev/null and b/美术与文本源文件/Wula/Things/WULA_DM_Cat/WULA_Cat_Thin_south.sai2 differ diff --git a/美术与文本源文件/Wula/Things/WulaSpecies/Heads/Average_Normal_south.sai2 b/美术与文本源文件/Wula/Things/WulaSpecies/Heads/Average_Normal_south.sai2 index b75e100d..d3b61108 100644 Binary files a/美术与文本源文件/Wula/Things/WulaSpecies/Heads/Average_Normal_south.sai2 and b/美术与文本源文件/Wula/Things/WulaSpecies/Heads/Average_Normal_south.sai2 differ