Storm PSR: add on Tranzit

README: reorganize map specific weapon changes

.gitignore

@@ -1,5 +1,6 @@
 /.vscode
-*.ff
+/zone_source/*.ff
+/*.ff
 *.iwd
 *.sabs
 *.sabl

CONTRIBUTING.md

@@ -8,4 +8,8 @@
 
 **OAT_BASE** - path to folder containing `Linker.exe`
 
-**OAT_GAME** - path to Black Ops 2 game folder
+**OAT_GAME** - path to Black Ops 2 root folder
+
+# Building
+
+Copy `zone` folder to Black Ops 2 root folder

README.md

@@ -70,6 +70,7 @@
 		* [War Machine](#war-machine)
 	* [Specials](#specials)
 		* [Ballistic Knife](#ballistic-knife)
+		* [Storm PSR](#storm-psr)
 	* [Wonder Weapons](#wonder-weapons)
 		* [Ray Gun](#ray-gun)
 		* [Ray Gun Mark 2](#ray-gun-mark-2)
@@ -88,7 +89,10 @@
 	* [Equipment](#equipment)
 		* [Combat Knife](#combat-knife)
 		* [One Inch Punch](#one-inch-punch)
+		* [Frag Grenade](#frag-grenade)
+		* [Semtex](#semtex)
 		* [Claymore](#claymore)
+		* [Bouncing Betty](#bouncing-betty)
 		* [Time Bomb](#time-bomb)
 * [Wallbuys](#wallbuys)
 * [Mystery Box](#mystery-box)
@@ -109,6 +113,7 @@
 * [Powerups](#powerups)
 	* [Nuke](#nuke)
 	* [Carpenter](#carpenter)
+	* [Fire Sale](#fire-sale)
 	* [Zombie Blood](#zombie-blood)
 	* [Meat](#meat)
 * [Persistent Upgrades](#persistent-upgrades)
@@ -344,6 +349,7 @@
 * Removed
 
 #### M27
+* Added on Tranzit, Die Rise, and Buried
 * Upgraded: changed attachment from Reflex Sight to None
 
 #### M8A1
@@ -478,6 +484,9 @@
 * Projectiles can be picked up while the weapon is not reloaded
 * Projectiles can be picked up while the player is not on the ground
 
+#### Storm PSR
+* Added on Tranzit
+
 ### Wonder Weapons
 
 #### Ray Gun
@@ -623,6 +632,12 @@
 * Fixed zombies not being flung when Insta Kill powerup is active
 * Fixed an issue where a player's melee weapon wouldn't reset if the player bled out in the Giant Robots
 
+#### Frag Grenade
+* Replaces Semtex on Origins
+
+#### Semtex
+* Replaces Frag Grenade on Mob of the Dead
+
 #### Claymore
 * Added plant and alert sounds to all maps
 * Can be repurchased
@@ -632,6 +647,9 @@
 * Added weapon name on HUD
 * Removed initial weapon raise anim
 
+#### Bouncing Betty
+* Replaces Claymore on Origins
+
 #### Time Bomb
 * No longer sends players back in time
 * Kills all zombies
@@ -758,6 +776,9 @@
 ### Carpenter
 * Removed
 
+### Fire Sale
+* Added on Tranzit and Die Rise
+
 ### Zombie Blood
 * No longer makes zombies ignore the player
 * Makes the player invulnerable to zombie melee swipes
@@ -907,8 +928,6 @@
 * Added PDW-57 wallbuy at Bus Depot
 * Added AN-94 wallbuy at Town
 * Added SVU-AS wallbuy at Cornfield
-* Added M27 to the Mystery Box
-* Added Fire Sale powerup
 * Added Mystery Box at Tunnel
 * Added Mystery Box at Cornfield
 * Power switch, Pack-a-Punch, and Diner hatch automatically crafted
@@ -985,8 +1004,6 @@
 * Pack-a-Punch
 
 ### Die Rise
-* Added M27 to the Mystery Box
-* Added Fire Sale powerup
 * Added Mystery Box at Blue Highrise area
 * Added Mystery Box at Orange Highrise area
 * Moved Mystery Box at Green Rooftop area from Green Rooftop Behind Restaurant zone to Green Rooftop Restaurant zone
@@ -1022,7 +1039,6 @@
 
 ### Buried
 * Added Frag Grenade wallbuy at General Store
-* Added M27 to the Mystery Box
 * Removed Turbine, key, booze, and candy
 * Power automatically on
 * Noose and Guillotine parts automatically picked up
@@ -1076,7 +1092,6 @@
 * Perks and wallbuys within the maze are randomized each game
 
 ### Mob of the Dead
-* Replaced Frag Grenade with Semtex
 * Replaced Remington 870 MCS wallbuy at Citadel with Semtex wallbuy
 * 1 afterlife max in solo
 * Entering afterlife no longer takes 2 additional seconds if the player had Electric Cherry
@@ -1140,8 +1155,6 @@
 * Grief: Tower Trap targets and stuns players
 
 ### Origins
-* Replaced Semtex with Frag Grenade
-* Replaced Claymore with Bouncing Betty
 * Door prices in solo cost the same as in coop
 * Shovels automatically picked up
 * Records automatically picked up

build.bat

@@ -1,6 +1,7 @@
 @echo off
 
 "%OAT_BASE%\Linker.exe" ^
+--load "%OAT_GAME%\zone\all\weapons!metalstorm_mms_sp.ff" ^
 --load "%OAT_GAME%\zone\all\so_cmp_afghanistan.ff" ^
 --load "%OAT_GAME%\zone\all\frontend_patch.ff" ^
 --load "%OAT_GAME%\zone\all\frontend.ff" ^

camo/camo_metalstorm.json

@@ -0,0 +1,776 @@
+{
+	"_type": "weaponCamo",
+	"_version": 1,
+	"camoMaterials": [
+		{
+			"materials": [
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": false
+				},
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": false
+				}
+			]
+		},
+		{
+			"materials": [
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": false
+				},
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": false
+				}
+			]
+		},
+		{
+			"materials": [
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						8.0,
+						8.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": false,
+					"useSpecularMap": false
+				},
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": false
+				}
+			]
+		},
+		{
+			"materials": [
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				},
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				}
+			]
+		},
+		{
+			"materials": [
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						1.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": false,
+					"useSpecularMap": true
+				},
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				}
+			]
+		},
+		{
+			"materials": [
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				},
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				}
+			]
+		},
+		{
+			"materials": [
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						1.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				},
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						10.0,
+						10.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				}
+			]
+		},
+		{
+			"materials": [
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				},
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				}
+			]
+		},
+		{
+			"materials": [
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				},
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				}
+			]
+		},
+		{
+			"materials": [
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				},
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						10.0,
+						10.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				}
+			]
+		},
+		{
+			"materials": [
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				},
+				{
+					"materialOverrides": [],
+					"shaderConsts": [
+						1.0,
+						1.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				}
+			]
+		},
+		{
+			"materials": [
+				{
+					"materialOverrides": [
+						{
+							"baseMaterial": "mc/mtl_t6_wpn_special_storm",
+							"camoMaterial": "mc/mtl_weapon_camo_dragon"
+						}
+					],
+					"shaderConsts": [
+						2.0,
+						2.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				},
+				{
+					"materialOverrides": [
+						{
+							"baseMaterial": "mc/mtl_t6_wpn_special_storm_scope",
+							"camoMaterial": "mc/mtl_weapon_camo_dragon_alt"
+						}
+					],
+					"shaderConsts": [
+						3.0,
+						3.0,
+						0.0,
+						1.0,
+						0.0,
+						0.0,
+						0.0,
+						0.0
+					],
+					"useColorMap": false,
+					"useNormalMap": true,
+					"useSpecularMap": true
+				}
+			]
+		}
+	],
+	"camoSets": [
+		{
+			"patternCamoImage": "t6_camo_devgru_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_devgru_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_atacs_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_atacs_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_erdl_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_erdl_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_siberia_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_siberia_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_choco_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_choco_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_tiger_blue_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_tiger_blue_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_bloodshot_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_bloodshot_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_ghostex_delta6_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_ghostex_delta6_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_kryptek_typhon_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_kryptek_typhon_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_blossom_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_blossom_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_artofwar_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_artofwar_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_ronin_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_ronin_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_skulls_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_skulls_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_bo2collectors_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "dark_grey_swatch"
+		},
+		{
+			"patternCamoImage": "t6_camo_elite_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_elite_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_viper_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_viper_pattern"
+		},
+		{
+			"patternCamoImage": "t6_camo_mango_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_mango_pattern"
+		},
+		{
+			"patternCamoImage": "t6_camo_ukpunk_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_ukpunk_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_benjamins_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_benjamins_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_dayofdead_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_dayofdead_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_graffiti_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_graffiti_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_kawaii_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_kawaii_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_partyrock_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_partyrock_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_zombies_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_zombies_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_nevada_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_nevada_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_sahara_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_sahara_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_urban_russia_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_urban_russia_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_flecktarn_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_flecktarn_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_flora_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_flora_solid"
+		},
+		{
+			"patternCamoImage": "t6_camo_tiger_jungle_pattern",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_tiger_jungle_solid"
+		},
+		{
+			"patternCamoImage": "camo_comic_col",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_comic_alt_col"
+		},
+		{
+			"patternCamoImage": "camo_mtx3_aqua_pat",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "camo_mtx3_aqua_pat"
+		},
+		{
+			"patternCamoImage": "camo_mtx3_breach_pat",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "camo_mtx3_breach_pat"
+		},
+		{
+			"patternCamoImage": "camo_mtx3_coyote_pat",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "camo_mtx3_coyote_pat"
+		},
+		{
+			"patternCamoImage": "camo_mtx3_zulu_pat",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "camo_mtx3_zulu_pat"
+		},
+		{
+			"patternCamoImage": "camo_mtx3_massacre_pat",
+			"patternOffset": {
+				"x": 0.0,
+				"y": 0.0
+			},
+			"patternScale": 1.0,
+			"solidCamoImage": "t6_camo_zombies_solid"
+		}
+	],
+	"patternBaseImage": "camo_off_pattern",
+	"solidBaseImage": "camo_off_solid"
+}

english/localizedstrings/reimagined.str

@@ -1099,6 +1099,9 @@ LANG_ENGLISH        "Xtreme Pain Releaser 5000"
 REFERENCE           ZMWEAPON_SLIPGUN_UPGRADED
 LANG_ENGLISH        "Sliquidizer"
 
+REFERENCE           ZMWEAPON_METALSTORM_UPGRADED
+LANG_ENGLISH        "Tempest PTR"
+
 // HINT STRINGS
 
 REFERENCE           PLATFORM_PICKUPNEWWEAPON

scripts/zm/_zm_reimagined.gsc

@@ -599,6 +599,15 @@ set_dvars()
 
 	setDvar("sv_voice", 2);
 	setDvar("sv_voiceQuality", 9);
+
+	if (level.script == "zm_transit")
+	{
+		setDvar("bg_chargeShotMaxBulletsInQueue", 5);
+	}
+	else
+	{
+		setDvar("bg_chargeShotMaxBulletsInQueue", 3);
+	}
 }
 
 set_client_dvars()
@@ -1648,6 +1657,11 @@ weapon_changes()
 		include_weapon("svu_zm", 0);
 		include_weapon("svu_upgraded_zm", 0);
 		add_zombie_weapon("svu_zm", "svu_upgraded_zm", &"ZOMBIE_WEAPON_SVU", 1000, "", "", undefined, 1);
+
+		include_weapon("metalstorm_mms_zm");
+		include_weapon("metalstorm_mms_upgraded_zm", 0);
+		add_limited_weapon("metalstorm_mms_zm", 1);
+		add_zombie_weapon("metalstorm_mms_zm", "metalstorm_mms_upgraded_zm", &"WEAPON_METALSTORM", 1000, "", "", undefined, 1);
 	}
 
 	if (level.script == "zm_prison")

soundbank/mod.all.aliases.csv

@@ -709,6 +709,24 @@ wpn_slipgun_flux_last_l_npc_pap,raw\sound\wpn\pap\pap_flux_left.LN65.pc.snd,,,wp
 wpn_slipgun_flux_last_l_plr_pap,raw\sound\wpn\pap\pap_flux_left.LN65.pc.snd,,,wpn_slipgun_flux_last_r_plr_pap,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,left_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
 wpn_slipgun_flux_last_r_npc_pap,raw\sound\wpn\pap\pap_flux_right.LN65.pc.snd,,,wpn_slipgun_fire_last_npc,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,right_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
 wpn_slipgun_flux_last_r_plr_pap,raw\sound\wpn\pap\pap_flux_right.LN65.pc.snd,,,wpn_slipgun_fire_last_plr,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,right_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_fire_npc_pap,raw\sound\wpn\pap\pap_shot_st.LN65.pc.snd,,,wpn_metalstormsnp_flux_l_npc_pap,grp_weapon,8250,8250,,75,1250,1250,default,default,allon,allon,10,priority,3,oldest,30927,34715,,50,90,89,-1,,loaded,nonlooping,variant,-1,0,6553,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,none,0,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_flux_l_npc_pap,raw\sound\wpn\pap\pap_flux_left.LN65.pc.snd,,,wpn_metalstormsnp_flux_r_npc_pap,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,left_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_flux_r_npc_pap,raw\sound\wpn\pap\pap_flux_right.LN65.pc.snd,,,wpn_metalstormsnp_fire_npc,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,right_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_fire_plr_1_pap,raw\sound\wpn\pap\pap_shot_st.LN65.pc.snd,,,wpn_metalstormsnp_flux_l_plr_1_pap,grp_weapon,14671,14671,,0,5000,5000,default,default,allon,allon,1,oldest,8,oldest,32767,32767,,90,90,63,-1,,loaded,nonlooping,volume,-1,0,2072,,snp_wpn_1p,2d,0,0,0,0,63,,no,no,none,0,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_hdrfx,
+wpn_metalstormsnp_flux_l_plr_1_pap,raw\sound\wpn\pap\pap_flux_left.LN65.pc.snd,,,wpn_metalstormsnp_flux_r_plr_1_pap,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,left_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_flux_r_plr_1_pap,raw\sound\wpn\pap\pap_flux_right.LN65.pc.snd,,,wpn_metalstormsnp_fire_plr_1,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,right_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_fire_plr_2_pap,raw\sound\wpn\pap\pap_shot_st.LN65.pc.snd,,,wpn_metalstormsnp_flux_l_plr_2_pap,grp_weapon,14671,14671,,0,5000,5000,default,default,allon,allon,1,oldest,8,oldest,32767,32767,,90,90,63,-1,,loaded,nonlooping,volume,-1,0,2072,,snp_wpn_1p,2d,0,0,0,0,63,,no,no,none,0,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_hdrfx,
+wpn_metalstormsnp_flux_l_plr_2_pap,raw\sound\wpn\pap\pap_flux_left.LN65.pc.snd,,,wpn_metalstormsnp_flux_r_plr_2_pap,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,left_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_flux_r_plr_2_pap,raw\sound\wpn\pap\pap_flux_right.LN65.pc.snd,,,wpn_metalstormsnp_fire_plr_2,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,right_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_fire_plr_3_pap,raw\sound\wpn\pap\pap_shot_st.LN65.pc.snd,,,wpn_metalstormsnp_flux_l_plr_3_pap,grp_weapon,14671,14671,,0,5000,5000,default,default,allon,allon,1,oldest,8,oldest,32767,32767,,90,90,63,-1,,loaded,nonlooping,volume,-1,0,2072,,snp_wpn_1p,2d,0,0,0,0,63,,no,no,none,0,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_hdrfx,
+wpn_metalstormsnp_flux_l_plr_3_pap,raw\sound\wpn\pap\pap_flux_left.LN65.pc.snd,,,wpn_metalstormsnp_flux_r_plr_3_pap,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,left_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_flux_r_plr_3_pap,raw\sound\wpn\pap\pap_flux_right.LN65.pc.snd,,,wpn_metalstormsnp_fire_plr_3,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,right_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_fire_plr_4_pap,raw\sound\wpn\pap\pap_shot_st.LN65.pc.snd,,,wpn_metalstormsnp_flux_l_plr_4_pap,grp_weapon,14671,14671,,0,5000,5000,default,default,allon,allon,1,oldest,8,oldest,32767,32767,,90,90,63,-1,,loaded,nonlooping,volume,-1,0,2072,,snp_wpn_1p,2d,0,0,0,0,63,,no,no,none,0,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_hdrfx,
+wpn_metalstormsnp_flux_l_plr_4_pap,raw\sound\wpn\pap\pap_flux_left.LN65.pc.snd,,,wpn_metalstormsnp_flux_r_plr_4_pap,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,left_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_flux_r_plr_4_pap,raw\sound\wpn\pap\pap_flux_right.LN65.pc.snd,,,wpn_metalstormsnp_fire_plr_4,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,right_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_fire_plr_5_pap,raw\sound\wpn\pap\pap_shot_st.LN65.pc.snd,,,wpn_metalstormsnp_flux_l_plr_5_pap,grp_weapon,14671,14671,,0,5000,5000,default,default,allon,allon,1,oldest,8,oldest,32767,32767,,90,90,63,-1,,loaded,nonlooping,volume,-1,0,2072,,snp_wpn_1p,2d,0,0,0,0,63,,no,no,none,0,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_hdrfx,
+wpn_metalstormsnp_flux_l_plr_5_pap,raw\sound\wpn\pap\pap_flux_left.LN65.pc.snd,,,wpn_metalstormsnp_flux_r_plr_5_pap,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,left_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
+wpn_metalstormsnp_flux_r_plr_5_pap,raw\sound\wpn\pap\pap_flux_right.LN65.pc.snd,,,wpn_metalstormsnp_fire_plr_5,grp_weapon,3685,3685,,25,900,900,default,default,allon,allon,8,priority,4,priority,32129,33416,,85,90,63,-1,,loaded,nonlooping,variant,-1,0,10386,,snp_wpn_3p,3d,0,0,0,0,63,,no,no,right_shot,4000,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_fx,
 zmb_melee_whoosh_npc,raw\sound\wpn\melee\knife\knife_new\swing\swings\swing_00.LN50.pc.snd,,,,grp_hdrfx,16461,20723,,150,500,500,default,default,allon,allon,4,priority,8,oldest,31143,32767,,40,90,63,-1,,loaded,nonlooping,volume,-1,0,20,,snp_igc,3d,0,25,75,20723,63,,no,yes,none,0,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_hdrfx,
 zmb_melee_whoosh_npc,raw\sound\wpn\melee\knife\knife_new\swing\swings\swing_01.LN50.pc.snd,,,,grp_hdrfx,16461,20723,,150,500,500,default,default,allon,allon,4,priority,8,oldest,31143,32767,,40,90,63,-1,,loaded,nonlooping,volume,-1,0,20,,snp_igc,3d,0,25,75,20723,63,,no,yes,none,0,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_hdrfx,
 zmb_melee_whoosh_npc,raw\sound\wpn\melee\knife\knife_new\swing\swings\swing_02.LN50.pc.snd,,,,grp_hdrfx,16461,20723,,150,500,500,default,default,allon,allon,4,priority,8,oldest,31143,32767,,40,90,63,-1,,loaded,nonlooping,volume,-1,0,20,,snp_igc,3d,0,25,75,20723,63,,no,yes,none,0,,,,no,0,0,0,,yes,no,0,0,,yes,no,bus_hdrfx,

zone_source/common_sp.zone

@@ -4,6 +4,8 @@
 
 >level.ipak_read,sp
 
+include,includes/weapons/metalstorm_mms_zm
+
 image,menu_mp_weapons_minigun_future
 material,menu_mp_weapons_minigun_future
 image,menu_mp_weapons_m32gl

zone_source/includes/mp/camo.zone

@@ -31,4 +31,5 @@ camo,camo_knife
 camo,camo_ballistic_knife
 camo,camo_mms
 camo,camo_acog
-camo,camo_hybrid
+camo,camo_hybrid
+camo,camo_metalstorm

zone_source/includes/weapons/metalstorm_mms_zm.zone

@@ -0,0 +1,107 @@
+techniqueset,mc_sw4_3d_reticle_static_35866wj0
+techniqueset,mc_sw4_3d_wpn_storm_charge_eef23z3q
+techniqueset,mc_unlit_blend_588ewzff
+techniqueset,mc_sw4_3d_sonar_attachment_lens_grid_8e617j9j
+techniqueset,mc_sw4_3d_viewmodel_unlit_q44141fe
+image,~~-gmtl_t6_wpn_special_storm_~0a7fc009
+image,mtl_t6_wpn_special_storm_nml
+image,~mtl_t6_wpn_special_storm_ao-~0f30bd84
+image,~-gmtl_t6_wpn_special_storm_col
+image,~_mtl_t6_wpn_base_ir-rrb
+material,mc/mtl_t6_wpn_special_storm_thermal
+material,mc/mtl_t6_wpn_special_storm
+image,mtl_t6_wpn_storm_scope_reticle_sp
+material,mc/mtl_t6_wpn_storm_scope_reticle_sp
+image,mtl_t6_wpn_storm_scope_lens_nml
+image,~-gmtl_t6_wpn_storm_scope_lens_spc
+image,~-gmtl_t6_wpn_storm_scope_lens_col
+image,~-rmtl_t6_wpn_storm_scope_len~26907f3e
+material,mc/mtl_t6_wpn_storm_scope_lens
+image,~-gmtl_t6_wpn_storm_charge
+image,~-gmtl_t6_wpn_storm_used
+image,~-gmtl_t6_wpn_storm_ready
+material,mc/mtl_t6_wpn_storm_charge_temp
+image,~-gmtl_t6_wpn_storm_charge_display
+material,mc/mtl_t6_wpn_storm_charge_display
+image,~~-gmtl_t6_wpn_special_storm_~acae36dc
+image,mtl_t6_wpn_special_storm_scope_nml
+image,~mtl_t6_wpn_special_storm_sco~a223dc9a
+image,~-gmtl_t6_wpn_special_storm_scope_col
+material,mc/mtl_t6_wpn_special_storm_scope_thermal
+material,mc/mtl_t6_wpn_special_storm_scope
+image,~~-gmtl_t6_wpn_storm_charge_l~e9c6b902
+image,mtl_t6_wpn_storm_charge_lens_nml
+image,~-gmtl_t6_wpn_storm_charge_lens_col
+material,mc/mtl_t6_wpn_storm_charge_lens
+image,test_grid_white
+image,~sonar_attachment_lookup_puls~4187f661
+material,mc/mtl_t6_attach_scanner_lens
+image,mtl_t6_attach_mms_burn
+material,mc/mtl_t6_attach_scanner_burn
+xmodel,t6_wpn_special_storm_view_sp
+techniqueset,effect_23712j0e
+material,gfx_fxt_gas_flash_blnd
+material,gfx_fxt_fire_flame_vert_e_blnd
+fx,weapon/muzzleflashes/fx_muz_md_gas_flash_1p
+fx,weapon/muzzleflashes/fx_muz_md_smk
+fx,weapon/muzzleflashes/fx_muz_break_sm_4_sqr
+fx,weapon/muzzleflashes/fx_muz_mstorm_flash_1p_sm
+fx,weapon/muzzleflashes/fx_muz_sm_gas_flash_3p
+fx,weapon/muzzleflashes/fx_muz_md_smk_3p
+fx,weapon/muzzleflashes/fx_muz_break_md_4_sqr
+fx,weapon/muzzleflashes/fx_muz_mstorm_flash_3p_sm
+image,~-gmtl_t6_wpn_launch_xm25_c
+material,mc/mtl_t6_wpn_launch_xm25
+physpreset,weapon
+xmodel,t6_wpn_special_storm_world
+tracer,assaultrifle
+xanim,viewmodel_storm_idle
+xanim,viewmodel_storm_fire
+xanim,viewmodel_storm_rechamber
+xanim,viewmodel_storm_reload_empty
+xanim,viewmodel_storm_pullout
+xanim,viewmodel_storm_first_raise
+xanim,viewmodel_storm_putaway
+xanim,viewmodel_storm_pullout_quick
+xanim,viewmodel_storm_putaway_quick
+xanim,viewmodel_storm_sprint_in
+xanim,viewmodel_storm_sprint_loop
+xanim,viewmodel_storm_sprint_out
+xanim,viewmodel_storm_crawl_in
+xanim,viewmodel_storm_crawl_forward
+xanim,viewmodel_storm_crawl_back
+xanim,viewmodel_storm_crawl_right
+xanim,viewmodel_storm_crawl_left
+xanim,viewmodel_storm_crawl_out
+xanim,viewmodel_storm_ads_fire
+xanim,viewmodel_storm_d2p_in
+xanim,viewmodel_storm_d2p_loop
+xanim,viewmodel_storm_d2p_out
+xanim,viewmodel_storm_ads_sp_up
+xanim,viewmodel_storm_ads_sp_down
+image,side_small_glow
+material,reticle_side_small_glow
+image,menu_mp_weapons_metalstorm
+material,menu_mp_weapons_metalstorm
+tracer,mstorm_2
+tracer,mstorm_enemy_2
+image,fxt_fx_shimmer
+material,gfx_fxt_fx_shimmer
+image,fxt_fx_thundergun_ring
+material,gfx_fxt_fx_thundergun_ring
+fx,weapon/muzzleflashes/fx_muz_mstorm_flash_1p_md
+fx,weapon/muzzleflashes/fx_muz_md_gas_flash_3p
+fx,weapon/muzzleflashes/fx_muz_break_lg_4_sqr
+fx,weapon/muzzleflashes/fx_muz_mstorm_flash_3p_md
+tracer,mstorm_3
+fx,weapon/muzzleflashes/fx_muz_xlg_gas_flash_1p
+image,distortion_ring
+material,gfx_distortion_ring_heavy
+material,gfx_fxt_smk_light_ds128_top
+fx,weapon/muzzleflashes/fx_muz_mstorm_flash_1p_lg_sp
+fx,weapon/muzzleflashes/fx_muz_xlg_gas_flash_3p
+material,gfx_fxt_smk_trail_grf_88_90
+fx,trail/fx_mstorm_bullet_trail
+fx,weapon/muzzleflashes/fx_muz_mstorm_flash_3p_lg_sp
+tracer,mstorm_5
+soundbank,wpn_metalstormsnp.all