Weapons: make camo material overrides consistent between camos

2025-06-10 15:17:57 -05:00 · 2024-04-04 01:26:56 -07:00
parent cedfdc73fc
commit ad64706246
41 changed files with 23681 additions and 119 deletions
--- a/zone_source/includes/weapons/an94_zm.zone
+++ b/zone_source/includes/weapons/an94_zm.zone
@ -14,7 +14,6 @@ xmodel,t6_attach_mag_an94_view
 xmodel,t6_attach_mag_an94_world
 tracer,assaultrifle_enemy
 material,mc/mtl_weapon_camo_dragon_2
-camo,camo_an94
 xanim,viewmodel_an94_idle
 xanim,viewmodel_an94_intro_fire
 xanim,viewmodel_an94_fire
--- a/zone_source/includes/weapons/as50_zm.zone
+++ b/zone_source/includes/weapons/as50_zm.zone
@ -64,5 +64,4 @@ xanim,viewmodel_xpr50_d2p_in
 xanim,viewmodel_xpr50_d2p_loop
 xanim,viewmodel_xpr50_d2p_out
 xanim,viewmodel_xpr50_ads_up
-xanim,viewmodel_xpr50_ads_down
-camo,camo_xpr50
+xanim,viewmodel_xpr50_ads_down
--- a/zone_source/includes/weapons/ballista_zm.zone
+++ b/zone_source/includes/weapons/ballista_zm.zone
@ -34,7 +34,6 @@ material,mc/mtl_t6_wpn_sniper_ballista_scope_camo1
 material,mc/mtl_t6_wpn_sniper_ballista_scope_camo2
 material,mc/mtl_weapon_camo_muertos_3
 material,mc/mtl_weapon_camo_zmb_dlc2_alt_2
-camo,camo_ballista
 xanim,viewmodel_ballista_idle
 xanim,viewmodel_ballista_fire
 xanim,viewmodel_ballista_rechamber
--- a/zone_source/includes/weapons/fnp45_zm.zone
+++ b/zone_source/includes/weapons/fnp45_zm.zone
@ -89,7 +89,6 @@ fx,weapon/muzzleflashes/fx_muz_smg_flash_3p
 fx,weapon/shellejects/fx_pistol
 tracer,pistol
 tracer,pistol_enemy
-camo,camo_fnp45
 xmodel,projectile_m203grenade
 fx,weapon/grenade/fx_trail_grenade
 fx,temp_effects/fx_tmp_m203_flash
--- a/zone_source/includes/weapons/hk416_zm.zone
+++ b/zone_source/includes/weapons/hk416_zm.zone
@ -21,7 +21,6 @@ xmodel,t6_attach_mag_hk416_world
 tracer,assaultrifle_enemy
 material,mc/mtl_t6_wpn_ar_hk416_grip
 material,mc/mtl_weapon_camo_zombies_2
-camo,camo_hk416
 xanim,viewmodel_hk416_idle
 xanim,viewmodel_hk416_fire
 xanim,viewmodel_hk416_first_raise
--- a/zone_source/includes/weapons/insas_zm.zone
+++ b/zone_source/includes/weapons/insas_zm.zone
@ -8,7 +8,6 @@ material,mc/mtl_t6_wpn_smg_msmc_camo1
 material,mc/mtl_t6_wpn_smg_msmc_camo3
 material,mc/mtl_t6_wpn_smg_msmc_camo2
 material,mc/mtl_t6_wpn_smg_msmc_camo4
-camo,camo_msmc
 xanim,viewmodel_msmc_idle
 xanim,viewmodel_msmc_fire
 xanim,viewmodel_msmc_reload
--- a/zone_source/includes/weapons/knife_ballistic_zm.zone
+++ b/zone_source/includes/weapons/knife_ballistic_zm.zone
@ -36,5 +36,4 @@ xanim,viewmodel_ballistic_knife_t6_ads_up
 xanim,viewmodel_ballistic_knife_t6_ads_down
 xanim,viewmodel_ballistic_knife_t6_d2p_in
 xanim,viewmodel_ballistic_knife_t6_d2p_loop
-xanim,viewmodel_ballistic_knife_t6_d2p_out
-camo,camo_ballistic_knife
+xanim,viewmodel_ballistic_knife_t6_d2p_out
--- a/zone_source/includes/weapons/knife_zm.zone
+++ b/zone_source/includes/weapons/knife_zm.zone
@ -28,7 +28,6 @@ xanim,viewmodel_strider_d2p_loop
 xanim,viewmodel_strider_d2p_out
 fx,impacts/fx_flesh_hit_knife_mp
 fx,impacts/fx_flesh_hit_knife_noblood
-camo,camo_knife
 xanim,pt_knife_prone_flinch_right
 xanim,pt_knife_prone_flinch_left
 xanim,pt_knife_prone_flinch_back
--- a/zone_source/includes/weapons/mk48_zm.zone
+++ b/zone_source/includes/weapons/mk48_zm.zone
@ -43,5 +43,4 @@ xanim,viewmodel_mark48_d2p_in
 xanim,viewmodel_mark48_d2p_loop
 xanim,viewmodel_mark48_d2p_out
 xanim,viewmodel_mark48_ads_up
-xanim,viewmodel_mark48_ads_down
-camo,camo_mk48
+xanim,viewmodel_mark48_ads_down
--- a/zone_source/includes/weapons/pdw57_zm.zone
+++ b/zone_source/includes/weapons/pdw57_zm.zone
@ -13,7 +13,6 @@ xmodel,t6_wpn_smg_pdw57_world
 xmodel,t6_attach_mag_pdw57_view
 xmodel,t6_attach_mag_pdw57_world
 tracer,smg_enemy
-camo,camo_pdw57
 xanim,viewmodel_pdw57_idle
 xanim,viewmodel_pdw57_fire
 xanim,viewmodel_pdw57_reload
--- a/zone_source/includes/weapons/sa58_zm.zone
+++ b/zone_source/includes/weapons/sa58_zm.zone
@ -12,7 +12,6 @@ xmodel,t6_wpn_ar_sa58_view
 xmodel,t6_wpn_ar_sa58_world
 xmodel,t6_attach_mag_sa58_view
 xmodel,t6_attach_mag_sa58_world
-camo,camo_sa58
 xanim,viewmodel_sa58_idle
 xanim,viewmodel_sa58_fire
 xanim,viewmodel_sa58_reload
--- a/zone_source/includes/weapons/saritch_zm.zone
+++ b/zone_source/includes/weapons/saritch_zm.zone
@ -62,7 +62,6 @@ material,mc/mtl_t6_attach_optic_combo_camo1
 material,mc/mtl_t6_attach_optic_combo_camo2
 xmodel,t6_attach_optic_combo_view
 xmodel,t6_attach_optic_combo_world
-camo,camo_hybrid
 attachmentunique,au_saritch_upgraded_dualoptic
 attachmentunique,au_saritch_upgraded_mms
 attachmentunique,au_saritch_upgraded_rangefinder
--- a/zone_source/includes/weapons/sig556_zm.zone
+++ b/zone_source/includes/weapons/sig556_zm.zone
@ -6,7 +6,6 @@ material,mc/mtl_t6_wpn_ar_sig556_camo1
 material,mc/mtl_t6_wpn_ar_sig556_camo2
 material,mc/mtl_t6_wpn_ar_sig556_camo4
 material,mc/mtl_t6_wpn_ar_sig556_camo3
-camo,camo_sig556
 xanim,viewmodel_sig556_idle
 xanim,viewmodel_sig556_idle_empty
 xanim,viewmodel_sig556_fire
--- a/zone_source/includes/weapons/svu_zm.zone
+++ b/zone_source/includes/weapons/svu_zm.zone
@ -27,7 +27,6 @@ xmodel,t6_wpn_sniper_svu_scope_world
 xmodel,t6_attach_mag_svu_world
 tracer,svu_tracer
 material,mc/mtl_weapon_camo_ghost_4
-camo,camo_svu
 xanim,viewmodel_svu_as_idle
 xanim,viewmodel_svu_as_fire
 xanim,viewmodel_svu_as_reload
--- a/zone_source/includes/weapons/vector_zm.zone
+++ b/zone_source/includes/weapons/vector_zm.zone
@ -7,7 +7,6 @@ material,mc/mtl_t6_wpn_smg_vector_camo3
 material,mc/mtl_t6_wpn_smg_vector_camo2
 material,mc/mtl_t6_wpn_smg_vector_camo4
 material,mc/mtl_t6_attach_grip_vector
-camo,camo_vector
 xanim,viewmodel_vector_idle
 xanim,viewmodel_vector_fire
 xanim,viewmodel_vector_reload
@ -40,13 +39,11 @@ attachmentunique,au_vector_extclip
 xmodel,t6_attach_grip_vector_view
 xmodel,t6_attach_grip_vector_world
 attachmentunique,au_vector_grip
-camo,camo_holo
 attachmentunique,au_vector_holo
 xmodel,t6_attach_optic_mms_view
 xmodel,t6_attach_optic_mms_world
 material,mc/mtl_t6_attach_optic_mms
 material,mc/mtl_t6_attach_optic_mms_camo1
-camo,camo_mms
 attachmentunique,au_vector_mms
 xmodel,t6_attach_optic_rangefinder_view
 xmodel,t6_attach_optic_rangefinder_ads
@ -54,14 +51,12 @@ xmodel,t6_attach_optic_rangefinder_world
 material,mc/mtl_t6_attach_optic_rangefinder_camo1
 material,mc/mtl_t6_attach_optic_rangefinder_ads
 material,mc/mtl_t6_attach_optic_rangefinder_camo2
-camo,camo_targetfinder
 attachmentunique,au_vector_rangefinder
 xmodel,t6_attach_optic_reflex_view
 xmodel,t6_attach_optic_reflex_world
 material,mc/mtl_t6_attach_optic_reflex_camo1
 material,mc/mtl_t6_attach_optic_reflex_camo2
 material,mc/mtl_t6_attach_optic_reflex
-camo,camo_reflex
 attachmentunique,au_vector_reflex
 attachmentunique,au_vector_sf
 xmodel,t6_attach_smg_silencer2_view