diff --git a/1.6/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml b/1.6/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml index 7622a006..1c7a406d 100644 --- a/1.6/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml +++ b/1.6/1.6/Defs/BodyAndPartDefs/Bodyparts_WULA.xml @@ -842,6 +842,7 @@ Top
  • Torso
    • +
  • HeadAttackTool
    •
  • diff --git a/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml b/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml index 224c5f0d..093f756a 100644 --- a/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml +++ b/1.6/1.6/Defs/DamageDefs/Damages_Wula.xml @@ -166,10 +166,10 @@ 8 5 - Blast_WULA_Plasma_Explosive + Blast_WULA_Plasma (0.95, 0.6, 0.3) (1, 0.5, 0.15) - ElectricalSpark_WULA_Plasma_Explosive + Explosion_EMP Damage_Bomb diff --git a/1.6/1.6/Defs/Effects/WulaFleckDefs.xml b/1.6/1.6/Defs/Effects/WulaFleckDefs.xml index 36008bd2..b94e326e 100644 --- a/1.6/1.6/Defs/Effects/WulaFleckDefs.xml +++ b/1.6/1.6/Defs/Effects/WulaFleckDefs.xml @@ -31,6 +31,18 @@ + + Blast_WULA_Plasma + + Things/Mote/BlastEMP + TransparentPostLight + true + (0.2, 0.8, 0.3, 0.5) + + MoteOverhead + 0 + 0.2 + Blast_WULA_Plasma_Explosive diff --git a/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml b/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml index 1fcd9b7a..7129ce7c 100644 --- a/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml +++ b/1.6/1.6/Defs/EventDefs/EventDef_Wula.xml @@ -75,7 +75,7 @@
    • -
  • +
  • diff --git a/1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml b/1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml index b737bd41..cdf1d85d 100644 --- a/1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml +++ b/1.6/1.6/Defs/HediffDefs/Hediffs_BodyParts_WULA.xml @@ -1229,6 +1229,153 @@
  • WulaSpecies
    • + + WULA_Addons_Antenna_Hediff_Shotgun + + 一种特殊的上行链路天线，通过省去一些结构以在小小的天线中塞下两具微型梭镖发射器，这使得换装此天线的机械乌拉可以将自己的头当霰弹枪用——尽管射程不会太长并且会挤占天线的机械体带宽。 + + WULA_Addons_Antenna_Shotgun + WULA_Addons_Antenna_Shotgun_Turret + Install_WULA_Addons_Antenna_Shotgun + + WULA_Addons_Antenna_Shield + + + true + + +
  • + + -2 + -1 + + +
  • + Consciousness + -0.1 +
    • + + +     + +
  • + WULA_Addons_Antenna_Shotgun_Turret + 0 + true +
    • +     +     + + WULA_Addons_Antenna_Shotgun_Turret + + 藏在机械乌拉脑袋两侧天线中的微型霰弹枪，射程不远但是对接近的敌人有很大的威慑力。 + + Wula/Weapon/WULA_Weapon_Empty + Graphic_Single + + + WULA_Addons_Antenna_Shotgun + Install_WULA_Addons_Antenna_Shotgun + + + 1 + 0.6 + 0.3 + 0.1 + 5 + + +
  • + Verb_Shoot + Bullet_WULA_Addons_Antenna_Shotgun_Turret + 4 + 8 + 2 + Shot_BeamRepeater + GunTail_Medium + 9 + 6 +
    • +     +     + + Bullet_WULA_Addons_Antenna_Shotgun_Turret + + + Wula/Projectile/WULA_Bullet_StarDrift_Shotgun_Spear + Graphic_Single + + + Bullet + 10 + 15 + 0.65 + 55 + + + + WULA_Addons_Antenna_Shotgun + + 一种特殊的上行链路天线，通过省去一些结构以在小小的天线中塞下两具微型梭镖发射器，这使得换装此天线的机械乌拉可以将自己的头当霰弹枪用——尽管射程不会太长并且会挤占天线的机械体带宽。 + None + + Install_WULA_Addons_Antenna_Shotgun + WULA_Addons_Antenna_Shotgun_Turret + + + 100 + 4 + + +
  • RewardStandardMidFreq
    • +     + + WULA_Synth_Addons_Technology + +
  • WULA_Cube_Productor_Energy
    • +     +     + + 0.3 + +     + + Install_WULA_Addons_Antenna_Shotgun + + 为合成人安装梭镖发射器天线。 + + WULA_Addons_Antenna_Shotgun + WULA_Addons_Antenna_Hediff_Shotgun + + 安装梭镖发射器天线中 + + + false + +
  • + + +
  • WULA_Addons_Antenna_Shotgun
    • + + + 1 + +     + + +
  • WULA_Addons_Antenna_Shotgun
    • +     +     + +
  • WULA_Addons_Antenna_Bodypart
    • +     + WULA_Addons_Antenna_Hediff_Shotgun + Smith + Recipe_Smith + +
  • WulaSpecies
    • +     +     diff --git a/1.6/1.6/Defs/MapGeneration/MapGenerator_WULA_PocketSpace_Small.xml b/1.6/1.6/Defs/MapGeneration/MapGenerator_WULA_PocketSpace_Small.xml index 5420e634..a0a0e9c2 100644 --- a/1.6/1.6/Defs/MapGeneration/MapGenerator_WULA_PocketSpace_Small.xml +++ b/1.6/1.6/Defs/MapGeneration/MapGenerator_WULA_PocketSpace_Small.xml @@ -25,7 +25,7 @@ WULA_PocketSpace_Small_GenStep 990 - WULA_Shuttle_Prefab + \ No newline at end of file diff --git a/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml index 1e08f34b..1120143c 100644 --- a/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml +++ b/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml @@ -143,7 +143,7 @@ 1000 true 1 - true + false
  • diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml b/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml index dc2e9f5c..9cd3368e 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml @@ -1061,6 +1061,7 @@ true true true + 0.01 true true diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml index df859ce0..b85b6121 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml @@ -127,7 +127,7 @@ - Wula_CR_Mobile_Factory_Turret_MK2 + Wula_CR_Mobile_Factory_Turret_MKII 由乌拉帝国的MFm-87"天秤"陆行舰所配备的炮塔之一，此改进版比起其原型可以将热熔束喷到更远的地方，但是无法处理过近的目标。 @@ -393,89 +393,4 @@
    • - - Wula_MIS_Mobile_Factory_Turret - - 由乌拉帝国的MFm-87"天秤"陆行舰所配备的炮塔之一，可以射出两道交叉扫射的暗物质射流以引发爆炸毁灭中等范围内的敌军。 - None - true - - Wula/Weapon/Wula_Mobile_Factory_Turret - Graphic_Single - 0.5 - - 2 - - 2.6 - 1 - 1 - 1 - 1 - - -
  • - Verb_Shoot - true - Bullet_Wula_MIS_Mobile_Factory_Turret - 0.1 - 2 - 4 - 4 - true - false - 16 - 500 - RocketswarmLauncher_Fire - 4 - - - - - - true - -
    • -     -     - - Bullet_Wula_MIS_Mobile_Factory_Turret - - - Things/Projectile/Rocket_Swarm - Graphic_Single - 1.2 - - WulaFallenEmpire.Projectile_CruiseMissile - -
  • - 3.5 - Bomb -
    • -
  • - 0.1 - 60 - - 60 - 120 - - WULA_GunTail_Blue - 1 -
    • -     - - Bomb - 50 - 15 - 3.5 - 1 - true - 0.4 - Explosion_Rocket - MortarRound_Ambient - -     \ No newline at end of file diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml index 9d79c1f6..4d47bcc5 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Plasma_Weapon.xml @@ -183,7 +183,7 @@ 乌拉帝国的等离子体霰弹枪，搭载了一套用于发射等离子体的谐振器，可以喷射多道等离子体射流；也可以进入超频状态，聚焦于主枪管以发射能量高度集中且会产生爆炸的射弹。 Spacer - Wula/Weapon/WULA_RW_Plasma_AR + Wula/Weapon/WULA_RW_Plasma_Homing_AR Graphic_Single 1.4 @@ -253,7 +253,7 @@ 乌拉帝国的等离子体霰弹枪，搭载了一套用于发射等离子体的谐振器，可以喷射多道等离子体射流；也可以进入超频状态，聚焦于主枪管以发射能量高度集中且会产生爆炸的射弹。 Spacer - Wula/Weapon/WULA_RW_Plasma_AR + Wula/Weapon/WULA_RW_Plasma_Homing_AR_Ex Graphic_Single 1.4 diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml index 34d61870..97b43dbc 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml @@ -950,9 +950,9 @@ Wula/Weapon/WULA_WM_Panzer_Turret Graphic_Single - 2 + 3 - 0.5 + 0.33 150 1 @@ -1010,9 +1010,9 @@ Wula/Weapon/WULA_WM_Panzer_Autocannon Graphic_Single - 2 + 3 - 0.5 + 0.33 150 0.5 @@ -1021,19 +1021,6 @@ 0.35 -
  • - Verb_Shoot - true - Bullet_WULA_WM_Panzer_Turret - 4 - 5.9 - 75 - 1 - 0.1 - Shot_TurretSniper - GunTail_Heavy - 18 -
  • Verb_Shoot true diff --git a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml index 6dafe117..d6313555 100644 --- a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml +++ b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml @@ -972,8 +972,21 @@ 20 Any + + 180 + (0.04, 0, 0) + true + + + + + + + (0.04, 0, 0) + 180 +
    • @@ -1023,12 +1036,25 @@ PawnRenderNode_TurretGun PawnRenderNodeWorker_TurretGun Body - (1, 1) + (1.5, 1.5) 20 Any + + 180 + (0.04, 0, 0) + true + + + + + + + (0.04, 0, 0) + 180 + diff --git a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml index 8c6f2c79..a5f51bdd 100644 --- a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml +++ b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml @@ -659,7 +659,7 @@
  • - Wula_CR_Mobile_Factory_Turret_MK2 + Wula_CR_Mobile_Factory_Turret_MKII
  • @@ -694,7 +694,7 @@
  • - Wula_CR_Mobile_Factory_Turret_MK2 + Wula_CR_Mobile_Factory_Turret_MKII
  • diff --git a/Content/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png b/Content/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png index 8f29d6eb..e5c392ed 100644 Binary files a/Content/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png and b/Content/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png differ diff --git a/Content/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png b/Content/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png index 61fb45ad..b29925d1 100644 Binary files a/Content/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png and b/Content/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png differ diff --git a/Content/Textures/Wula/Weapon/WULA_RW_Plasma_Homing_AR.png b/Content/Textures/Wula/Weapon/WULA_RW_Plasma_Homing_AR.png new file mode 100644 index 00000000..936f5898 Binary files /dev/null and b/Content/Textures/Wula/Weapon/WULA_RW_Plasma_Homing_AR.png differ diff --git a/Content/Textures/Wula/Weapon/WULA_RW_Plasma_Homing_AR_Ex.png b/Content/Textures/Wula/Weapon/WULA_RW_Plasma_Homing_AR_Ex.png new file mode 100644 index 00000000..6b34e40c Binary files /dev/null and b/Content/Textures/Wula/Weapon/WULA_RW_Plasma_Homing_AR_Ex.png differ diff --git a/Source/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.sai2 b/Source/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.sai2 index a34c488c..45391331 100644 Binary files a/Source/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.sai2 and b/Source/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.sai2 differ diff --git a/Source/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png b/Source/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png index 8f29d6eb..e5c392ed 100644 Binary files a/Source/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png and b/Source/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png differ diff --git a/Source/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png b/Source/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png index 61fb45ad..b29925d1 100644 Binary files a/Source/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png and b/Source/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png differ diff --git a/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Plasma_Homing_AR.sai2 b/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Plasma_Homing_AR.sai2 new file mode 100644 index 00000000..999ca0e7 Binary files /dev/null and b/Source/美术与文本源文件/Wula/Weapon/WULA_RW_Plasma_Homing_AR.sai2 differ