diff --git a/images/minimap_icon_chugabud.iwi b/images/minimap_icon_chugabud.iwi index c4d6a3ae..a937be38 100644 Binary files a/images/minimap_icon_chugabud.iwi and b/images/minimap_icon_chugabud.iwi differ diff --git a/images/minimap_icon_electric_cherry.iwi b/images/minimap_icon_electric_cherry.iwi new file mode 100644 index 00000000..3b8658b3 Binary files /dev/null and b/images/minimap_icon_electric_cherry.iwi differ diff --git a/images/specialty_ads_zombies.iwi b/images/specialty_ads_zombies.iwi index ffea97b4..dfcc98d5 100644 Binary files a/images/specialty_ads_zombies.iwi and b/images/specialty_ads_zombies.iwi differ diff --git a/images/specialty_divetonuke_zombies.iwi b/images/specialty_divetonuke_zombies.iwi index 6b0d6cf3..6af8f217 100644 Binary files a/images/specialty_divetonuke_zombies.iwi and b/images/specialty_divetonuke_zombies.iwi differ diff --git a/images/specialty_doubletap_zombies.iwi b/images/specialty_doubletap_zombies.iwi new file mode 100644 index 00000000..a5935591 Binary files /dev/null and b/images/specialty_doubletap_zombies.iwi differ diff --git a/images/specialty_fastreload_zombies.iwi b/images/specialty_fastreload_zombies.iwi new file mode 100644 index 00000000..3a4214ea Binary files /dev/null and b/images/specialty_fastreload_zombies.iwi differ diff --git a/images/specialty_juggernaut_zombies.iwi b/images/specialty_juggernaut_zombies.iwi new file mode 100644 index 00000000..f07440fc Binary files /dev/null and b/images/specialty_juggernaut_zombies.iwi differ diff --git a/images/specialty_marathon_zombies.iwi b/images/specialty_marathon_zombies.iwi new file mode 100644 index 00000000..5feb6af6 Binary files /dev/null and b/images/specialty_marathon_zombies.iwi differ diff --git a/images/specialty_mulekick_zombies.iwi b/images/specialty_mulekick_zombies.iwi new file mode 100644 index 00000000..a6942d0c Binary files /dev/null and b/images/specialty_mulekick_zombies.iwi differ diff --git a/images/specialty_quickrevive_zombies.iwi b/images/specialty_quickrevive_zombies.iwi new file mode 100644 index 00000000..53c1d34a Binary files /dev/null and b/images/specialty_quickrevive_zombies.iwi differ diff --git a/images/specialty_tombstone_zombies.iwi b/images/specialty_tombstone_zombies.iwi index 4950a853..3a1b9f6e 100644 Binary files a/images/specialty_tombstone_zombies.iwi and b/images/specialty_tombstone_zombies.iwi differ diff --git a/images/specialty_vulture_zombies.iwi b/images/specialty_vulture_zombies.iwi new file mode 100644 index 00000000..b7786610 Binary files /dev/null and b/images/specialty_vulture_zombies.iwi differ diff --git a/ui_mp/t6/hud/weaponlabel.lua b/ui_mp/t6/hud/weaponlabel.lua index 5a17c726..ba7a4011 100644 --- a/ui_mp/t6/hud/weaponlabel.lua +++ b/ui_mp/t6/hud/weaponlabel.lua @@ -27,12 +27,12 @@ CoD.WeaponLabel.new = function(f1_arg0) }) Widget:addElement(Widget.weaponLabel) - local additionalPrimaryWeaponImageSize = f1_local1 * 0.75 + local additionalPrimaryWeaponImageSize = 24 Widget.additionalPrimaryWeaponImage = LUI.UIImage.new({ left = -additionalPrimaryWeaponImageSize, - top = -additionalPrimaryWeaponImageSize / 2 - additionalPrimaryWeaponImageSize - 2, + top = -additionalPrimaryWeaponImageSize / 2 - additionalPrimaryWeaponImageSize, right = 0, - bottom = additionalPrimaryWeaponImageSize / 2 - additionalPrimaryWeaponImageSize - 2, + bottom = additionalPrimaryWeaponImageSize / 2 - additionalPrimaryWeaponImageSize, leftAnchor = false, topAnchor = false, rightAnchor = true, diff --git a/ui_mp/t6/zombie/ammoareazombie.lua b/ui_mp/t6/zombie/ammoareazombie.lua index 77b2a8c1..144e6e2c 100644 --- a/ui_mp/t6/zombie/ammoareazombie.lua +++ b/ui_mp/t6/zombie/ammoareazombie.lua @@ -146,12 +146,12 @@ LUI.createMenu.AmmoAreaZombie = function(f1_arg0) f1_local0.weaponLabelContainer:addElement(f1_local29) f1_local0.weaponText = f1_local29 - local additionalPrimaryWeaponImageSize = f1_local27 * 0.75 + local additionalPrimaryWeaponImageSize = 24 f1_local0.additionalPrimaryWeaponImage = LUI.UIImage.new({ left = -additionalPrimaryWeaponImageSize, - top = -additionalPrimaryWeaponImageSize / 2 - f1_local28 - additionalPrimaryWeaponImageSize - 2, + top = -additionalPrimaryWeaponImageSize / 2 - f1_local28 - additionalPrimaryWeaponImageSize, right = 0, - bottom = additionalPrimaryWeaponImageSize / 2 - f1_local28 - additionalPrimaryWeaponImageSize - 2, + bottom = additionalPrimaryWeaponImageSize / 2 - f1_local28 - additionalPrimaryWeaponImageSize, leftAnchor = false, topAnchor = false, rightAnchor = true, diff --git a/zone_source/includes/perks/specialty_divetonuke.zone b/zone_source/includes/perks/specialty_divetonuke.zone index 6170ede5..ce7dc494 100644 --- a/zone_source/includes/perks/specialty_divetonuke.zone +++ b/zone_source/includes/perks/specialty_divetonuke.zone @@ -1,5 +1,3 @@ -image,specialty_divetonuke_zombies -material,specialty_divetonuke_zombies image,~-gmtl_t6_zmb_perk_bottle_nuke_col material,mc/mtl_t6_wpn_zmb_perk_bottle_nuke material,mc/mtl_t6_wpn_zmb_perk_bottle_nuke_alpha diff --git a/zone_source/includes/perks/specialty_doubletap.zone b/zone_source/includes/perks/specialty_doubletap.zone deleted file mode 100644 index f7c23dc9..00000000 --- a/zone_source/includes/perks/specialty_doubletap.zone +++ /dev/null @@ -1 +0,0 @@ -image,specialty_doubletap_zombies \ No newline at end of file diff --git a/zone_source/includes/perks/specialty_fastreload.zone b/zone_source/includes/perks/specialty_fastreload.zone deleted file mode 100644 index 87e84fa2..00000000 --- a/zone_source/includes/perks/specialty_fastreload.zone +++ /dev/null @@ -1 +0,0 @@ -image,specialty_fastreload_zombies \ No newline at end of file diff --git a/zone_source/includes/perks/specialty_juggernaut.zone b/zone_source/includes/perks/specialty_juggernaut.zone deleted file mode 100644 index 36986a73..00000000 --- a/zone_source/includes/perks/specialty_juggernaut.zone +++ /dev/null @@ -1 +0,0 @@ -image,specialty_juggernaut_zombies \ No newline at end of file diff --git a/zone_source/includes/perks/specialty_marathon.zone b/zone_source/includes/perks/specialty_marathon.zone deleted file mode 100644 index abe87570..00000000 --- a/zone_source/includes/perks/specialty_marathon.zone +++ /dev/null @@ -1 +0,0 @@ -image,specialty_marathon_zombies \ No newline at end of file diff --git a/zone_source/includes/perks/specialty_mulekick.zone b/zone_source/includes/perks/specialty_mulekick.zone index 1cceb3e9..68ba7e55 100644 --- a/zone_source/includes/perks/specialty_mulekick.zone +++ b/zone_source/includes/perks/specialty_mulekick.zone @@ -1,6 +1,4 @@ fx,misc/fx_zombie_cola_arsenal_on -image,specialty_mulekick_zombies -material,specialty_additionalprimaryweapon_zombies image,~-gmtl_t6_zmb_perk_bottle_mul~af598fa4 material,mc/mtl_t6_wpn_zmb_perk_bottle_mule_kick material,mc/mtl_t6_wpn_zmb_perk_bottle_mule_kick_alpha diff --git a/zone_source/includes/perks/specialty_quickrevive.zone b/zone_source/includes/perks/specialty_quickrevive.zone deleted file mode 100644 index 54ce28fe..00000000 --- a/zone_source/includes/perks/specialty_quickrevive.zone +++ /dev/null @@ -1 +0,0 @@ -image,specialty_quickrevive_zombies \ No newline at end of file diff --git a/zone_source/zm_tomb.zone b/zone_source/zm_tomb.zone index 3b9c3f9a..c071e269 100644 --- a/zone_source/zm_tomb.zone +++ b/zone_source/zm_tomb.zone @@ -4,11 +4,6 @@ include,includes/weapons/ballista_zm -include,includes/perks/specialty_juggernaut -include,includes/perks/specialty_quickrevive -include,includes/perks/specialty_fastreload -include,includes/perks/specialty_doubletap -include,includes/perks/specialty_marathon include,includes/perks/specialty_divetonuke include,includes/perks/specialty_mulekick