1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-08 06:12:17 -05:00

Blundergat and Acid Gat: add camo

This commit is contained in:
Jbleezy 2024-03-31 03:47:40 -07:00
parent ae392317dc
commit 83be62537e
9 changed files with 904 additions and 9 deletions

View File

@ -511,6 +511,7 @@
* Kills on any round in 1-2 shots * Kills on any round in 1-2 shots
* Increased pellet count from 7 to 8 * Increased pellet count from 7 to 8
* Increased pellet size * Increased pellet size
* Upgraded: added camo
#### Acid Gat #### Acid Gat
* Kills on any round in 1-2 bursts * Kills on any round in 1-2 bursts
@ -521,6 +522,7 @@
* Projectiles no longer seek toward zombies * Projectiles no longer seek toward zombies
* Deadshot improves accuracy * Deadshot improves accuracy
* Stuck zombie counts as a kill * Stuck zombie counts as a kill
* Upgraded: added camo
* Upgraded: fixed fire sound * Upgraded: fixed fire sound
#### Staffs #### Staffs

863
camo/camo_blundergat.json Normal file
View File

@ -0,0 +1,863 @@
{
"_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": [
{
"baseMaterial": "mc/mtl_t6_wpn_zmb_blundergat",
"camoMaterial": "mc/mtl_weapon_camo_zmb_dlc2"
}
],
"shaderConsts": [
1.72,
1.7,
0.0,
0.43,
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": [],
"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": [
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,
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
}
]
}
],
"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"
}

View File

@ -59,8 +59,10 @@ blundergat_upgrade_station()
player thread maps\mp\zombies\_zm_perks::do_knuckle_crack(); player thread maps\mp\zombies\_zm_perks::do_knuckle_crack();
player.is_pack_splatting = 1; player.is_pack_splatting = 1;
t_upgrade setinvisibletoall(); t_upgrade setinvisibletoall();
m_converter.worldgun = spawn_weapon_model(str_valid_weapon, undefined, m_converter.v_weapon_origin, m_converter.v_weapon_angles);
m_converter blundergat_upgrade_station_inject(str_valid_weapon); options = player get_pack_a_punch_weapon_options(str_valid_weapon);
m_converter.worldgun = spawn_weapon_model(str_valid_weapon, undefined, m_converter.v_weapon_origin, m_converter.v_weapon_angles, options);
m_converter blundergat_upgrade_station_inject(str_valid_weapon, options);
t_upgrade thread blundergat_change_hintstring(&"ZM_PRISON_CONVERT_PICKUP"); t_upgrade thread blundergat_change_hintstring(&"ZM_PRISON_CONVERT_PICKUP");
if (isdefined(player)) if (isdefined(player))
@ -118,6 +120,31 @@ blundergat_change_hintstring(hint_string, hint_string_cost)
} }
} }
blundergat_upgrade_station_inject(str_weapon_model, options)
{
wait 0.5;
self playsound("zmb_acidgat_upgrade_machine");
self setanim(self.fxanims["close"], 1, 0, 1);
wait(self.n_start_time);
for (i = 0; i < 3; i++)
{
self setanim(self.fxanims["inject"], 1, 0, 1);
wait(self.n_idle_time);
}
self.worldgun delete();
if (str_weapon_model == "blundergat_zm")
self.worldgun = spawn_weapon_model("blundersplat_zm", undefined, self.v_weapon_origin, self.v_weapon_angles, options);
else
self.worldgun = spawn_weapon_model("blundersplat_upgraded_zm", undefined, self.v_weapon_origin, self.v_weapon_angles, options);
self setanim(self.fxanims["open"], 1, 0, 1);
wait(self.n_end_time);
wait 0.5;
}
wait_for_player_to_take(player, str_valid_weapon) wait_for_player_to_take(player, str_valid_weapon)
{ {
self endon("acid_timeout"); self endon("acid_timeout");
@ -162,7 +189,7 @@ wait_for_player_to_take(player, str_valid_weapon)
player givemaxammo("blundersplat_upgraded_zm"); player givemaxammo("blundersplat_upgraded_zm");
else else
{ {
player giveweapon(str_new_weapon); player giveweapon(str_new_weapon, 0, player maps\mp\zombies\_zm_weapons::get_pack_a_punch_weapon_options(str_new_weapon));
player switchtoweapon(str_new_weapon); player switchtoweapon(str_new_weapon);
player givestartammo(str_new_weapon); player givestartammo(str_new_weapon);
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,2 +1,3 @@
camo,camo_xpr50 camo,camo_xpr50
camo,camo_slipgun camo,camo_slipgun
camo,camo_blundergat

View File

@ -9,3 +9,5 @@ weapon,spoon_zm_alcatraz
weapon,spork_zm_alcatraz weapon,spork_zm_alcatraz
xanim,viewmodel_raygun_t6_first_raise xanim,viewmodel_raygun_t6_first_raise
material,mc/mtl_t6_wpn_zmb_blundergat