diff --git a/1.5/Defs/HediffDefs/Hediffs_WULA.xml b/1.5/Defs/HediffDefs/Hediffs_WULA.xml index 74b00a46..0f8d428c 100644 --- a/1.5/Defs/HediffDefs/Hediffs_WULA.xml +++ b/1.5/Defs/HediffDefs/Hediffs_WULA.xml @@ -84,6 +84,8 @@ 1 1 1200 + 300 + 0.3 diff --git a/1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml b/1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml index c1d493ab..e101bfda 100644 --- a/1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml +++ b/1.5/Defs/ThingDefs_Buildings/Buildings_WULA.xml @@ -308,7 +308,7 @@ PassThroughOnly 0.5 true - false + true 42 Item diff --git a/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml b/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml index 48f6e3ac..b6c67665 100644 --- a/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml +++ b/1.5/Defs/ThingDefs_Misc/WULA_Apparel.xml @@ -433,7 +433,7 @@ 60 Standard_Reload Misc4 - jump + 炮弹 false
  • diff --git a/1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml index a1efcc55..634dbfee 100644 --- a/1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml +++ b/1.5/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml @@ -60,9 +60,10 @@ 乌拉帝国的旧式突击步枪，仍然使用落后的导气式结构驱动自动射击构件，通常被派发给炮灰战斗人员。不过好在这种突击步枪下挂了一枚榴弹，可以对付一些棘手目标，保卫殖民地也是绰绰有余。 Industrial + Normal - Wula/Weapon/WULA_RW_StarDrift_SG + Wula/Weapon/WULA_RW_Base_AR Graphic_Single Interact_Rifle @@ -91,13 +92,13 @@ 32 4 3 - ChargeLance_Fire - GunTail_Heavy + Shot_AssaultRifle + GunTail_Medium 7
    • - +
  • WULA_RW_Base_AR_Ability 1 @@ -107,26 +108,25 @@ 5 120
    • +
  • WULA_RW_Base_AR_Ability - UI/Abilities/Farskip - Skip 发射一枚榴弹，对敌方造成范围伤害，擅长对付低甲目标。 - false - + UI/Abilities/Burner true + true + FireSpew_Warmup false - false + 1 + 7200 Verb_AbilityShoot - 0.7 - 2 - 3 + 0.5 Mortar_LaunchA - GunTail_Light + false 28 Bullet_Shell_HighExplosive @@ -141,7 +141,9 @@ Wula/Weapon/WULA_MW_Breaker_Bar Graphic_Single - -65 + +
  • Spear
    • + Spacer 50 @@ -157,8 +159,8 @@
  • Poke
    •  - 185 - 8 + 225 + 6 1
  • @@ -188,12 +190,14 @@
  • Spear
    • - Wula/Weapon/WULA_MW_Breaker_Bar + Wula/Weapon/WULA_MW_Lance Graphic_Single + 2 Spacer 120 + -25
  • Metallic
    •  @@ -247,9 +251,9 @@ WULA_MW_ChainSword - 这种嗡嗡作响的链锯类武器看起来有些过时，但仍不失为撕碎敌人的好兵器。 + 这种嗡嗡作响的乌拉帝国链锯类武器有多条环绕剑脊高速旋转的多层复合锯齿链条，之间嵌有能量传导节点或微型冷却剂喷口，是力量与纯粹疯狂的象征。 - Wula/Weapon/WULA_MW_Breaker_Bar + Wula/Weapon/WULA_MW_ChainSword Graphic_Single @@ -310,7 +314,7 @@ 这种乌拉帝国战士使用的近战武器由多层复合的高密度钨合金或贫铀合金核心构成，可以利用无与伦比的冲击质量击碎护甲，同时锤头镶嵌着数个单分子碳化硅撞针，用于为EMP装置的释放创造接触点。 - Wula/Weapon/WULA_MW_Breaker_Bar + Wula/Weapon/WULA_MW_Charge_Mace Graphic_Single -65 @@ -329,13 +333,13 @@
  • Poke
    •  - 35 - 4 + 25 + 1.5 0.8
  • - EMP - 18 + Stun + 4
    • @@ -417,6 +421,10 @@ true false false + + 0 + -1 + Verb_EntitySkip false @@ -446,7 +454,7 @@ 乌拉帝国修女所持武器，可以使用魂锲作为充能媒介施展灵能法术，为其他殖民者提供随机灵感。 - Wula/Weapon/WULA_MW_Scepter_Of_Heaven + Wula/Weapon/WULA_MW_Scepter_Of_Perception Graphic_Single 1.3 @@ -505,15 +513,15 @@ false false - Verb_EntitySkip - false 2 - 30 - false True + + 0 + -1 +
  • False @@ -528,7 +536,7 @@ 乌拉帝国修女所持武器，可以使用魂锲作为充能媒介施展灵能法术，使得一片范围内的生物感到恶心眩晕。 - Wula/Weapon/WULA_MW_Scepter_Of_Heaven + Wula/Weapon/WULA_MW_Scepter_Of_Flash Graphic_Single 1.3 @@ -584,8 +592,8 @@ True false - - + 0 + -1 30 5 @@ -774,11 +782,11 @@ WULA_RW_Sphene_MG - 乌拉帝国的通用机枪，负责提供 + 乌拉帝国的通用机枪，负责在班组中提供如暴雨倾泻的高速连射光束流，产生的高温熔烧效果将融化一切敌人的装甲。 Ultra - Wula/Weapon/WULA_RW_StarDrift_SG + Wula/Weapon/WULA_RW_Sphene_MG Graphic_Single Interact_ChargeRifle @@ -972,4 +980,64 @@ Explosion_Rocket + + WULA_WM_Panzer_Turret + + 由乌拉帝国的"萨克森"战车所装备的战车炮塔，可以从极远距离上精准地点杀高价值目标。 + Ultra + + Wula/Weapon/WULA_WM_Panzer_Turret + Graphic_Single + 1.35 + + None + + 1400 + 150 + 1 + 2 + 2 + 2 + 4.0 + + +
  • Wula_AI_Heavy_Panzer_Turret
    • + + +
  • + Verb_Shoot + true + Bullet_WULA_WM_Panzer_Turret + 0 + 5.9 + 65 + 1 + Shot_TurretSniper + GunTail_Heavy + 18 +
    • +     +     + + Bullet_WULA_WM_Panzer_Turret + + Projectile_Explosive + Normal + True + + Things/Projectile/ChargeLanceShot + Graphic_Single + TransparentPostLight + 2.4 + + + Bullet + 285 + 220 + 3.5 + 0.4 + Explosion_Rocket + 1 + + \ No newline at end of file diff --git a/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml index 0c4812f3..3c80bf10 100644 --- a/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml +++ b/1.5/Defs/ThingDefs_Races/Races_Wulaspecies.xml @@ -410,13 +410,27 @@ -
  • skin - - 0 - 0 - + + +
  • + 1 + RGBA(1,1,1,1) +
    • + + + +
  • + favorite + + +
  • + 1 + RGBA(1,1,1,1) +
    • + +     (3, 3) @@ -432,7 +446,7 @@ Wula/Things/Wula_AI_Heavy_Panzer/Heads/ Things/Pawn/Humanlike/Bodies/Dessicated/Dessicated_Thin Wula/Things/Wula_AI_Heavy_Panzer/Bodies - (0,0,0,0) + (1,1,1,1) @@ -465,12 +479,19 @@
  • WULA_WM_Rocket_Pod
    • +
  • WULA_WM_Panzer_Turret
    •  true true true true true + +
  • Melanin
    • +
  • HairColor
    • +
  • BodyType
    • +     + true false @@ -514,7 +535,7 @@ -300 300 - 0.25 + 0 0 @@ -593,9 +614,9 @@ 20 NamerMech - 20 Heavy + 20 diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.png index e8862953..37df52a2 100644 Binary files a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.png and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.png differ diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png index cdc331b0..cc6c5a22 100644 Binary files a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_north.png differ diff --git a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png index a11bbad2..13c7469c 100644 Binary files a/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png and b/Textures/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_south.png differ diff --git a/Textures/Wula/Weapon/WULA_MW_Breaker_Bar.png b/Textures/Wula/Weapon/WULA_MW_Breaker_Bar.png index 3b857956..7befd1c0 100644 Binary files a/Textures/Wula/Weapon/WULA_MW_Breaker_Bar.png and b/Textures/Wula/Weapon/WULA_MW_Breaker_Bar.png differ diff --git a/Textures/Wula/Weapon/WULA_MW_ChainSword.png b/Textures/Wula/Weapon/WULA_MW_ChainSword.png new file mode 100644 index 00000000..731412ca Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_ChainSword.png differ diff --git a/Textures/Wula/Weapon/WULA_MW_ChainSword.sai2 b/Textures/Wula/Weapon/WULA_MW_ChainSword.sai2 new file mode 100644 index 00000000..76280edd Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_ChainSword.sai2 differ diff --git a/Textures/Wula/Weapon/WULA_MW_Charge_Mace.png b/Textures/Wula/Weapon/WULA_MW_Charge_Mace.png new file mode 100644 index 00000000..fd9c2d39 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Charge_Mace.png differ diff --git a/Textures/Wula/Weapon/WULA_MW_Charge_Mace.sai2 b/Textures/Wula/Weapon/WULA_MW_Charge_Mace.sai2 new file mode 100644 index 00000000..0cd033a6 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Charge_Mace.sai2 differ diff --git a/Textures/Wula/Weapon/WULA_MW_Lance.png b/Textures/Wula/Weapon/WULA_MW_Lance.png new file mode 100644 index 00000000..7e1eaafc Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Lance.png differ diff --git a/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Flash.png b/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Flash.png new file mode 100644 index 00000000..c7c1fab5 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Flash.png differ diff --git a/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Flash.sai2 b/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Flash.sai2 new file mode 100644 index 00000000..79258805 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Flash.sai2 differ diff --git a/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Perception.png b/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Perception.png new file mode 100644 index 00000000..e241fad3 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Perception.png differ diff --git a/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Perception.sai2 b/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Perception.sai2 new file mode 100644 index 00000000..d7e32d09 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_MW_Scepter_Of_Perception.sai2 differ diff --git a/Textures/Wula/Weapon/WULA_RW_Base_AR.png b/Textures/Wula/Weapon/WULA_RW_Base_AR.png new file mode 100644 index 00000000..c122fa16 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_RW_Base_AR.png differ diff --git a/Textures/Wula/Weapon/WULA_RW_Sphene_MG.png b/Textures/Wula/Weapon/WULA_RW_Sphene_MG.png new file mode 100644 index 00000000..8c4cfc7f Binary files /dev/null and b/Textures/Wula/Weapon/WULA_RW_Sphene_MG.png differ diff --git a/Textures/Wula/Weapon/WULA_RW_Sphene_MG.sai2 b/Textures/Wula/Weapon/WULA_RW_Sphene_MG.sai2 new file mode 100644 index 00000000..18121052 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_RW_Sphene_MG.sai2 differ diff --git a/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.png b/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.png new file mode 100644 index 00000000..a4e9698e Binary files /dev/null and b/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.png differ diff --git a/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.sai2 b/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.sai2 new file mode 100644 index 00000000..26402aa2 Binary files /dev/null and b/Textures/Wula/Weapon/WULA_WM_Panzer_Turret.sai2 differ