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 275b87e8..d28d09e4 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 @@ -576,7 +576,7 @@ 1.5 1.5 2.0 - 10 + 2 @@ -707,12 +707,12 @@ 5000 1000 - 10 + 5 0 - 0.6 - 0.6 + 0.5 + 0.5 0.2 - 3 + 0.1 @@ -734,6 +734,21 @@
  • Legs
  • Wula/Apparel/WULA_Shield_Base + + true + + + + + (0,0) + + + (-0.1,0) + + + (0.1,0) + + diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Machine_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Machine_Weapon.xml index e8721f60..2d1aa30a 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Machine_Weapon.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Machine_Weapon.xml @@ -245,9 +245,9 @@ True RealtimeOnly - Wula/Projectile/WULA_Shrapnel + Wula/Projectile/WULA_Huge_Shrapnel Graphic_Single - (2,3) + (2.5,2.5) WULA_GiantBomb @@ -565,22 +565,22 @@ True RealtimeOnly - Wula/Projectile/WULA_Shrapnel + Wula/Projectile/WULA_Rocket Graphic_Single - (2,3) + (2,2.5) Flame - 10 + 20 60 - 6 + 3.9 1.5 true Artillery_HitThickRoof Explosion_Rocket MortarRound_PreImpact MortarRound_Ambient - 10 + 2
  • diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml index 96bb3795..05fe461f 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml @@ -943,7 +943,7 @@ 0.75 0.65 0.45 - 0.25 + 0.1
  • @@ -1030,10 +1030,6 @@ Graphic_Single Interact_Rifle - -
  • LongShots
  • -
  • RangedHeavy
  • - 1300 3.5 @@ -1041,7 +1037,7 @@ 0.72 0.65 0.6 - 1.5 + 0.1 70 @@ -1054,14 +1050,14 @@ WulaFallenEmpire.Verb_ShootShotgun true Bullet_WULA_RW_Penetrating_Beam - 2.0 + 3.0 28 3 12 Shot_BeamRepeater GunTail_Medium 9 - Mote_BeamRepeater_Charge + Mote_WULA_Beam_Charge 1.07 @@ -1078,6 +1074,10 @@ WULA_RW_Penetrating_Beam_Rifle_Ranged WULA_RW_Penetrating_Beam_RifleSwitchAbility +
  • + WULA_Beam_Weapon_Aiming_Hediff + 1 +
  • @@ -1102,8 +1102,8 @@ BeamBypassShields - 6 - 0.8 + 2 + 0.4 1 @@ -1117,10 +1117,6 @@ Graphic_Single Interact_Rifle - -
  • LongShots
  • -
  • RangedHeavy
  • -
    1300 3.5 @@ -1128,7 +1124,7 @@ 0.8 0.9 0.8 - 2.0 + 0.1 70 @@ -1148,13 +1144,13 @@ true Bullet_WULA_RW_Penetrating_Beam_Ranged 3.0 - 38 + 32 3 12 Shot_BeamRepeater GunTail_Medium 9 - Mote_BeamRepeater_Charge + Mote_WULA_Beam_Charge 1.07 @@ -1171,6 +1167,10 @@ WULA_RW_Penetrating_Beam_Rifle WULA_RW_Penetrating_Beam_RifleSwitchAbility +
  • + WULA_Beam_Weapon_Aiming_Hediff + 1 +
  • @@ -1196,7 +1196,7 @@ BeamBypassShields - 8 + 3 0.8 1 @@ -1725,7 +1725,7 @@ Apparel_WULA_Manpack_Loitering_Munition - 派发给乌拉帝国突击队的一次性巡飞弹发射器,装有温压炸药,能对大量软目标造成范围性的伤害——而且不需要占用编制,允许突击队携带其他武器。 + 派发给乌拉帝国突击队的一次性火箭弹发射器,装有温压炸药,能对大量软目标造成范围性的伤害——而且不需要占用编制,允许突击队携带其他武器。 Wula/Apparel/WULA_Manpack_Loitering_Munition Graphic_Single @@ -1818,17 +1818,25 @@ WulaFallenEmpire.Projectile_ExplosiveTrackingBullet 25 - Bomb - 60 + Flame + 7 + 20 0.25 10
  • - 4.5 - Bomb + 7 + Flame
  • + WULA_Smoke_Tail + 2 + 1 + 1~2 + 0.5~1.0 + 0.1~0.3 + -30~30 0.75 0 @@ -2067,11 +2075,14 @@ Bullet_WULA_RW_Auto_GL + WulaFallenEmpire.Projectile_NorthArcTrail + Normal + True + RealtimeOnly Wula/Projectile/WULA_Shrapnel Graphic_Single - WulaFallenEmpire.Projectile_ExplosiveWithTrail Bomb 8 @@ -2086,9 +2097,19 @@ 10 +
  • + 6 + 1.0 + true +
  • WULA_Smoke_Tail - 1 + 2 + 1 + 1~2 + 0.5~1.0 + 0.1~0.3 + -30~30
  • diff --git a/Content/Textures/Wula/Apparel/WULA_Heavy_Infantry_Helmet_south.png b/Content/Textures/Wula/Apparel/WULA_Heavy_Infantry_Helmet_south.png index 88efad68..98fe5ed9 100644 Binary files a/Content/Textures/Wula/Apparel/WULA_Heavy_Infantry_Helmet_south.png and b/Content/Textures/Wula/Apparel/WULA_Heavy_Infantry_Helmet_south.png differ diff --git a/Content/Textures/Wula/Apparel/WULA_Shield_Base.png b/Content/Textures/Wula/Apparel/WULA_Shield_Base.png index 179e3755..c9b4d883 100644 Binary files a/Content/Textures/Wula/Apparel/WULA_Shield_Base.png and b/Content/Textures/Wula/Apparel/WULA_Shield_Base.png differ diff --git a/Content/Textures/Wula/Apparel/WULA_Shield_Base_Thin_east.png b/Content/Textures/Wula/Apparel/WULA_Shield_Base_Thin_east.png index edb9cced..2e746701 100644 Binary files a/Content/Textures/Wula/Apparel/WULA_Shield_Base_Thin_east.png and b/Content/Textures/Wula/Apparel/WULA_Shield_Base_Thin_east.png differ diff --git a/Content/Textures/Wula/Apparel/WULA_Shield_Base_Thin_north.png b/Content/Textures/Wula/Apparel/WULA_Shield_Base_Thin_north.png index 77d75899..080e8bd1 100644 Binary files a/Content/Textures/Wula/Apparel/WULA_Shield_Base_Thin_north.png and b/Content/Textures/Wula/Apparel/WULA_Shield_Base_Thin_north.png differ diff --git a/Content/Textures/Wula/Apparel/WULA_Shield_Base_Thin_south.png b/Content/Textures/Wula/Apparel/WULA_Shield_Base_Thin_south.png index 9a46f97f..277db87f 100644 Binary files a/Content/Textures/Wula/Apparel/WULA_Shield_Base_Thin_south.png and b/Content/Textures/Wula/Apparel/WULA_Shield_Base_Thin_south.png differ diff --git a/Content/Textures/Wula/Projectile/WULA_Huge_Shrapnel.png b/Content/Textures/Wula/Projectile/WULA_Huge_Shrapnel.png new file mode 100644 index 00000000..095ef701 Binary files /dev/null and b/Content/Textures/Wula/Projectile/WULA_Huge_Shrapnel.png differ diff --git a/Content/Textures/Wula/Projectile/WULA_Loitering_Munition.png b/Content/Textures/Wula/Projectile/WULA_Loitering_Munition.png index e4b17e15..1fbd958d 100644 Binary files a/Content/Textures/Wula/Projectile/WULA_Loitering_Munition.png and b/Content/Textures/Wula/Projectile/WULA_Loitering_Munition.png differ diff --git a/Content/Textures/Wula/Projectile/WULA_Mortar_Shell.png b/Content/Textures/Wula/Projectile/WULA_Mortar_Shell.png index f2d06ea2..6c01ec2f 100644 Binary files a/Content/Textures/Wula/Projectile/WULA_Mortar_Shell.png and b/Content/Textures/Wula/Projectile/WULA_Mortar_Shell.png differ diff --git a/Content/Textures/Wula/Projectile/WULA_Rocket.png b/Content/Textures/Wula/Projectile/WULA_Rocket.png new file mode 100644 index 00000000..f901e7ff Binary files /dev/null and b/Content/Textures/Wula/Projectile/WULA_Rocket.png differ diff --git a/Content/Textures/Wula/Projectile/WULA_Shrapnel.png b/Content/Textures/Wula/Projectile/WULA_Shrapnel.png index 0540126a..bafb6491 100644 Binary files a/Content/Textures/Wula/Projectile/WULA_Shrapnel.png and b/Content/Textures/Wula/Projectile/WULA_Shrapnel.png differ diff --git a/美术与文本源文件/Wula/Apparel/WULA_Shield_Base_Thin_south.sai2 b/美术与文本源文件/Wula/Apparel/WULA_Shield_Base_Thin_south.sai2 index 927ecd71..28c3a732 100644 Binary files a/美术与文本源文件/Wula/Apparel/WULA_Shield_Base_Thin_south.sai2 and b/美术与文本源文件/Wula/Apparel/WULA_Shield_Base_Thin_south.sai2 differ diff --git a/美术与文本源文件/Wula/Projectile/WULA_Bullet_Plasma.png b/美术与文本源文件/Wula/Projectile/WULA_Bullet_Plasma.png deleted file mode 100644 index a34c3326..00000000 Binary files a/美术与文本源文件/Wula/Projectile/WULA_Bullet_Plasma.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Projectile/WULA_Bullet_Plasma_Yellow.png b/美术与文本源文件/Wula/Projectile/WULA_Bullet_Plasma_Yellow.png deleted file mode 100644 index 473ed0e9..00000000 Binary files a/美术与文本源文件/Wula/Projectile/WULA_Bullet_Plasma_Yellow.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Projectile/WULA_Huge_Shrapnel.sai2 b/美术与文本源文件/Wula/Projectile/WULA_Huge_Shrapnel.sai2 new file mode 100644 index 00000000..91f03b6d Binary files /dev/null and b/美术与文本源文件/Wula/Projectile/WULA_Huge_Shrapnel.sai2 differ diff --git a/美术与文本源文件/Wula/Projectile/WULA_Loitering_Munition.sai2 b/美术与文本源文件/Wula/Projectile/WULA_Loitering_Munition.sai2 index e0bd274b..ce38333a 100644 Binary files a/美术与文本源文件/Wula/Projectile/WULA_Loitering_Munition.sai2 and b/美术与文本源文件/Wula/Projectile/WULA_Loitering_Munition.sai2 differ diff --git a/美术与文本源文件/Wula/Projectile/WULA_Mortar_Shell.png b/美术与文本源文件/Wula/Projectile/WULA_Mortar_Shell.png index f2d06ea2..6c01ec2f 100644 Binary files a/美术与文本源文件/Wula/Projectile/WULA_Mortar_Shell.png and b/美术与文本源文件/Wula/Projectile/WULA_Mortar_Shell.png differ diff --git a/美术与文本源文件/Wula/Projectile/WULA_Mortar_Shell.sai2 b/美术与文本源文件/Wula/Projectile/WULA_Mortar_Shell.sai2 new file mode 100644 index 00000000..8ddf1b61 Binary files /dev/null and b/美术与文本源文件/Wula/Projectile/WULA_Mortar_Shell.sai2 differ diff --git a/美术与文本源文件/Wula/Projectile/WULA_Rocket.sai2 b/美术与文本源文件/Wula/Projectile/WULA_Rocket.sai2 new file mode 100644 index 00000000..c2deb1a1 Binary files /dev/null and b/美术与文本源文件/Wula/Projectile/WULA_Rocket.sai2 differ diff --git a/美术与文本源文件/Wula/Projectile/WULA_Shrapnel.png b/美术与文本源文件/Wula/Projectile/WULA_Shrapnel.png deleted file mode 100644 index 0540126a..00000000 Binary files a/美术与文本源文件/Wula/Projectile/WULA_Shrapnel.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Projectile/WULA_Shrapnel.sai2 b/美术与文本源文件/Wula/Projectile/WULA_Shrapnel.sai2 new file mode 100644 index 00000000..1fec33cb Binary files /dev/null and b/美术与文本源文件/Wula/Projectile/WULA_Shrapnel.sai2 differ