diff --git a/images/hud_highrise_dpad.iwi b/images/hud_highrise_dpad.iwi index ef2b2a60..d26a6be4 100644 Binary files a/images/hud_highrise_dpad.iwi and b/images/hud_highrise_dpad.iwi differ diff --git a/images/hud_nuked_dpad.iwi b/images/hud_nuked_dpad.iwi new file mode 100644 index 00000000..c464b3be Binary files /dev/null and b/images/hud_nuked_dpad.iwi differ diff --git a/images/hud_nuked_dpad_bar.iwi b/images/hud_nuked_dpad_bar.iwi new file mode 100644 index 00000000..8858ebcd Binary files /dev/null and b/images/hud_nuked_dpad_bar.iwi differ diff --git a/images/hud_transit_dpad.iwi b/images/hud_transit_dpad.iwi index 5d275b62..49bf3545 100644 Binary files a/images/hud_transit_dpad.iwi and b/images/hud_transit_dpad.iwi differ diff --git a/images/hud_transit_zom_num_0.iwi b/images/hud_transit_zom_num_0.iwi index db7fb0a0..83808173 100644 Binary files a/images/hud_transit_zom_num_0.iwi and b/images/hud_transit_zom_num_0.iwi differ diff --git a/images/hud_transit_zom_num_1.iwi b/images/hud_transit_zom_num_1.iwi index 23dbffcb..79c726db 100644 Binary files a/images/hud_transit_zom_num_1.iwi and b/images/hud_transit_zom_num_1.iwi differ diff --git a/images/hud_transit_zom_num_2.iwi b/images/hud_transit_zom_num_2.iwi index 3ced07de..50256469 100644 Binary files a/images/hud_transit_zom_num_2.iwi and b/images/hud_transit_zom_num_2.iwi differ diff --git a/images/hud_transit_zom_num_3.iwi b/images/hud_transit_zom_num_3.iwi index 8ef779cd..66acb9d6 100644 Binary files a/images/hud_transit_zom_num_3.iwi and b/images/hud_transit_zom_num_3.iwi differ diff --git a/images/hud_transit_zom_num_4.iwi b/images/hud_transit_zom_num_4.iwi index 3d29f0a5..191a407d 100644 Binary files a/images/hud_transit_zom_num_4.iwi and b/images/hud_transit_zom_num_4.iwi differ diff --git a/images/hud_transit_zom_num_5.iwi b/images/hud_transit_zom_num_5.iwi index efa32c47..878baee8 100644 Binary files a/images/hud_transit_zom_num_5.iwi and b/images/hud_transit_zom_num_5.iwi differ diff --git a/images/hud_transit_zom_num_6.iwi b/images/hud_transit_zom_num_6.iwi index 871d4942..80ac816d 100644 Binary files a/images/hud_transit_zom_num_6.iwi and b/images/hud_transit_zom_num_6.iwi differ diff --git a/images/hud_transit_zom_num_7.iwi b/images/hud_transit_zom_num_7.iwi index 876aaffd..9d57f7d7 100644 Binary files a/images/hud_transit_zom_num_7.iwi and b/images/hud_transit_zom_num_7.iwi differ diff --git a/images/hud_transit_zom_num_8.iwi b/images/hud_transit_zom_num_8.iwi index 4a48c0eb..80563f9a 100644 Binary files a/images/hud_transit_zom_num_8.iwi and b/images/hud_transit_zom_num_8.iwi differ diff --git a/images/hud_transit_zom_num_9.iwi b/images/hud_transit_zom_num_9.iwi index ab5917b1..e04c9910 100644 Binary files a/images/hud_transit_zom_num_9.iwi and b/images/hud_transit_zom_num_9.iwi differ diff --git a/images/hud_transit_zom_num_line.iwi b/images/hud_transit_zom_num_line.iwi index afc7ab23..3c6fc42d 100644 Binary files a/images/hud_transit_zom_num_line.iwi and b/images/hud_transit_zom_num_line.iwi differ diff --git a/images/hud_transit_zom_num_slash.iwi b/images/hud_transit_zom_num_slash.iwi index 5bd2ccea..17cf0e35 100644 Binary files a/images/hud_transit_zom_num_slash.iwi and b/images/hud_transit_zom_num_slash.iwi differ diff --git a/materials/hud_zm_nuked_dpad.json b/materials/hud_zm_nuked_dpad.json new file mode 100644 index 00000000..66942314 --- /dev/null +++ b/materials/hud_zm_nuked_dpad.json @@ -0,0 +1,94 @@ +{ + "_type": "material", + "_version": 1, + "cameraRegion": "none", + "constants": [], + "contents": 1, + "gameFlags": [], + "hashIndex": 0, + "layeredSurfaceTypes": 536870912, + "probeMipBits": 0, + "sortKey": 40, + "stateBits": [ + { + "alphaTest": "gt0", + "blendOpAlpha": "add", + "blendOpRgb": "add", + "colorWriteAlpha": true, + "colorWriteRgb": true, + "cullFace": "none", + "depthTest": "disabled", + "depthWrite": false, + "dstBlendAlpha": "one", + "dstBlendRgb": "invsrcalpha", + "polygonOffset": "offset0", + "polymodeLine": false, + "srcBlendAlpha": "invdestalpha", + "srcBlendRgb": "srcalpha", + "stencilBack": null, + "stencilFront": null + } + ], + "stateBitsEntry": [ + -1, + -1, + 0, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1 + ], + "stateFlags": 0, + "surfaceFlags": 0, + "surfaceTypeBits": 0, + "techniqueSet": "trivial_9z33feqw", + "textureAtlas": { + "columns": 1, + "rows": 1 + }, + "textures": [ + { + "image": "hud_nuked_dpad", + "isMatureContent": false, + "name": "colorMap", + "samplerState": { + "clampU": true, + "clampV": true, + "clampW": true, + "filter": "linear", + "mipMap": "disabled" + }, + "semantic": "2D" + } + ], + "thermalMaterial": null +} \ No newline at end of file diff --git a/materials/hud_zm_nuked_dpad_bar.json b/materials/hud_zm_nuked_dpad_bar.json new file mode 100644 index 00000000..b1351342 --- /dev/null +++ b/materials/hud_zm_nuked_dpad_bar.json @@ -0,0 +1,94 @@ +{ + "_type": "material", + "_version": 1, + "cameraRegion": "none", + "constants": [], + "contents": 1, + "gameFlags": [], + "hashIndex": 0, + "layeredSurfaceTypes": 536870912, + "probeMipBits": 0, + "sortKey": 40, + "stateBits": [ + { + "alphaTest": "gt0", + "blendOpAlpha": "add", + "blendOpRgb": "add", + "colorWriteAlpha": true, + "colorWriteRgb": true, + "cullFace": "none", + "depthTest": "disabled", + "depthWrite": false, + "dstBlendAlpha": "one", + "dstBlendRgb": "invsrcalpha", + "polygonOffset": "offset0", + "polymodeLine": false, + "srcBlendAlpha": "invdestalpha", + "srcBlendRgb": "srcalpha", + "stencilBack": null, + "stencilFront": null + } + ], + "stateBitsEntry": [ + -1, + -1, + 0, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1 + ], + "stateFlags": 0, + "surfaceFlags": 0, + "surfaceTypeBits": 0, + "techniqueSet": "trivial_9z33feqw", + "textureAtlas": { + "columns": 1, + "rows": 1 + }, + "textures": [ + { + "image": "hud_nuked_dpad_bar", + "isMatureContent": false, + "name": "colorMap", + "samplerState": { + "clampU": true, + "clampV": true, + "clampW": true, + "filter": "linear", + "mipMap": "disabled" + }, + "semantic": "2D" + } + ], + "thermalMaterial": null +} \ No newline at end of file diff --git a/ui_mp/t6/zombie/ammoareazombie.lua b/ui_mp/t6/zombie/ammoareazombie.lua index e481d755..a040a0ba 100644 --- a/ui_mp/t6/zombie/ammoareazombie.lua +++ b/ui_mp/t6/zombie/ammoareazombie.lua @@ -30,7 +30,9 @@ LUI.createMenu.AmmoAreaZombie = function(f1_arg0) f1_local0.scaleContainer:setTopBottom(false, true, 0, 0) f1_local0:addElement(f1_local0.scaleContainer) local f1_local1 = "transit_" - if CoD.Zombie.IsDLCMap(CoD.Zombie.DLC1Maps) then + if CoD.Zombie.IsDLCMap(CoD.Zombie.DLC0Maps) then + f1_local1 = "nuked_" + elseif CoD.Zombie.IsDLCMap(CoD.Zombie.DLC1Maps) then f1_local1 = "highrise_" elseif CoD.Zombie.IsDLCMap(CoD.Zombie.DLC2Maps) then f1_local1 = "hell_" @@ -533,8 +535,8 @@ CoD.AmmoAreaZombie.UpdateOverheat = function(f8_arg0, f8_arg1) f8_arg0.ammoDigits[f8_local10]:setTopBottom(false, true, f8_local5 + offsetTopBottom, f8_local5 + (f8_local6 / digitRatio) + offsetTopBottom) f8_local10 = f8_local10 + 1 - offsetLeftRight = 5 - offsetTopBottom = 32 + offsetLeftRight = 4 + offsetTopBottom = 33 f8_arg0.ammoDigits[f8_local10]:setDigit(0, f8_local0) f8_arg0.ammoDigits[f8_local10]:setLeftRight(false, true, f8_local2 - (f8_local3 / digitRatio) - offsetLeftRight, f8_local2 - offsetLeftRight) f8_arg0.ammoDigits[f8_local10]:setTopBottom(false, true, f8_local5 + offsetTopBottom, f8_local5 + (f8_local6 / digitRatio) + offsetTopBottom) diff --git a/zone_source/includes/materials.zone b/zone_source/includes/materials.zone index c6f8868e..ad8f4be7 100644 --- a/zone_source/includes/materials.zone +++ b/zone_source/includes/materials.zone @@ -28,6 +28,8 @@ material,hud_zm_num_transit_8 material,hud_zm_num_transit_9 material,hud_zm_num_transit_slash material,hud_zm_num_transit_line +material,hud_zm_nuked_dpad +material,hud_zm_nuked_dpad_bar material,hud_zm_highrise_dpad material,hud_zm_highrise_dpad_bar material,hud_zm_num_highrise_0 @@ -73,6 +75,8 @@ image,hud_transit_zom_num_8 image,hud_transit_zom_num_9 image,hud_transit_zom_num_slash image,hud_transit_zom_num_line +image,hud_nuked_dpad +image,hud_nuked_dpad_bar image,hud_highrise_dpad image,hud_highrise_dpad_bar image,hud_highrise_zom_num_0