From bde0fa23664e2b49b55340fd0602f06ed7acd267 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Sun, 31 Mar 2024 21:38:16 -0700
Subject: [PATCH] Ray Gun Mark 2: add secondary camo

---
 README.md                   |  1 +
 build.bat                   |  2 ++
 camo/camo_raygun_mark2.json | 37 ++++++++++++++++++++++++++-----------
 zone_source/common_zm.zone  |  4 +++-
 zone_source/zm_tomb.zone    |  3 +--
 5 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index fe32197c..b5c14a53 100644
--- a/README.md
+++ b/README.md
@@ -471,6 +471,7 @@
 * Ammo gets added to the clip at the same time that it gets added in the reload anim
 * Limited to 1 player on all maps
 * Decreased last stand ammo from 3 clips to 1 clip
+* Upgraded: added secondary camo
 
 #### Jet Gun
 * Kills multiple zombies significantly faster
diff --git a/build.bat b/build.bat
index 3bc6c6bd..f1f8ae27 100644
--- a/build.bat
+++ b/build.bat
@@ -18,6 +18,8 @@ if %ERRORLEVEL% NEQ 0 pause
 --load "%cd%\zone_source\common_mp.ff" ^
 --load "%OAT_GAME%\zone\all\patch_ui_zm.ff" ^
 --load "%OAT_GAME%\zone\all\ui_zm.ff" ^
+--load "%OAT_GAME%\zone\all\patch_zm.ff" ^
+--load "%OAT_GAME%\zone\all\common_zm.ff" ^
 --base-folder "%OAT_BASE%" ^
 --asset-search-path "%cd%" ^
 --source-search-path "%cd%\zone_source" ^
diff --git a/camo/camo_raygun_mark2.json b/camo/camo_raygun_mark2.json
index a0d0b90a..a699aaa6 100644
--- a/camo/camo_raygun_mark2.json
+++ b/camo/camo_raygun_mark2.json
@@ -303,11 +303,16 @@
 					"useSpecularMap": true
 				},
 				{
-					"materialOverrides": [],
+					"materialOverrides": [
+						{
+							"baseMaterial": "mc/mtl_t6_wpn_zmb_raygun2_1",
+							"camoMaterial": "mc/mtl_weapon_camo_zmb_dlc2_alt"
+						}
+					],
 					"shaderConsts": [
-						1.0,
-						1.0,
-						0.0,
+						10.0,
+						10.0,
+						0.8500000238418579,
 						0.0,
 						0.0,
 						0.0,
@@ -416,12 +421,17 @@
 					"useSpecularMap": true
 				},
 				{
-					"materialOverrides": [],
+					"materialOverrides": [
+						{
+							"baseMaterial": "mc/mtl_t6_wpn_zmb_raygun2_1",
+							"camoMaterial": "mc/mtl_weapon_camo_dragon_alt"
+						}
+					],
 					"shaderConsts": [
-						1.0,
-						1.0,
-						0.0,
+						3.0,
+						3.0,
 						0.0,
+						1.0,
 						0.0,
 						0.0,
 						0.0,
@@ -457,10 +467,15 @@
 					"useSpecularMap": false
 				},
 				{
-					"materialOverrides": [],
+					"materialOverrides": [
+						{
+							"baseMaterial": "mc/mtl_t6_wpn_zmb_raygun2_1",
+							"camoMaterial": "mc/mtl_weapon_camo_zmb_dlc4_alt"
+						}
+					],
 					"shaderConsts": [
-						6.0,
-						6.0,
+						4.320000171661377,
+						4.090000152587891,
 						0.0,
 						1.0,
 						0.0,
diff --git a/zone_source/common_zm.zone b/zone_source/common_zm.zone
index c041bd8d..7e537afd 100644
--- a/zone_source/common_zm.zone
+++ b/zone_source/common_zm.zone
@@ -2,4 +2,6 @@
 >type,fastfile
 >name,common_zm
 
-include,includes/zm/materials
\ No newline at end of file
+include,includes/zm/materials
+
+camo,camo_raygun_mark2
\ No newline at end of file
diff --git a/zone_source/zm_tomb.zone b/zone_source/zm_tomb.zone
index 2e693658..68ee094c 100644
--- a/zone_source/zm_tomb.zone
+++ b/zone_source/zm_tomb.zone
@@ -17,5 +17,4 @@ xmodel,t6_wpn_none_world
 
 xanim,viewmodel_bare_hands_falling
 
-camo,camo_raygun
-camo,camo_raygun_mark2
\ No newline at end of file
+camo,camo_raygun
\ No newline at end of file