1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-07 21:59:49 -05:00

Time Bomb: fix being replaced by melee weapon

Time Bomb: decrease raise time
Ballistic Knife: decrease melee time
Add MOTD melee weapons to zone_source
This commit is contained in:
Jbleezy 2023-12-23 02:23:52 -08:00
parent 18ef6375c4
commit 30b2e08d67
11 changed files with 18 additions and 8 deletions

View File

@ -144,7 +144,7 @@
### Ballistic Knife ### Ballistic Knife
* Added model and anims from Black Ops 2 Multiplayer * Added model and anims from Black Ops 2 Multiplayer
* Increased melee time from 0.5 seconds to 0.75 seconds * Increased melee time from 0.5 seconds to 0.7 seconds
* Projectiles are no longer picked up by other players * Projectiles are no longer picked up by other players
* Projectiles can be picked up while the weapon is not reloaded * Projectiles can be picked up while the weapon is not reloaded
* Projectiles can be picked up while the player is not on the ground * Projectiles can be picked up while the player is not on the ground
@ -268,6 +268,7 @@
* Kills all zombies * Kills all zombies
* Can have with Monkey Bombs * Can have with Monkey Bombs
* Switches to detonator at correct time after throwing * Switches to detonator at correct time after throwing
* Decreased raise time from 0.3 seconds to 0.2 seconds
### Combat Knife ### Combat Knife
* Added model from Black Ops 2 Multiplayer * Added model from Black Ops 2 Multiplayer

View File

@ -172,7 +172,11 @@ change_melee_weapon(weapon_name, current_weapon)
} }
self giveweapon("held_" + weapon_name); self giveweapon("held_" + weapon_name);
self setactionslot(2, "weapon", "held_" + weapon_name);
if (!self hasweapon("time_bomb_zm") && !self hasweapon("time_bomb_detonator_zm"))
{
self setactionslot(2, "weapon", "held_" + weapon_name);
}
return current_weapon; return current_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

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

1
weapons/zm/time_bomb_zm Normal file

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,9 @@
weapon,zm/held_knife_zm weapon,zm/held_knife_zm
weapon,zm/held_bowie_knife_zm weapon,zm/held_bowie_knife_zm
weapon,zm/held_tazer_knuckles_zm weapon,zm/held_tazer_knuckles_zm
weapon,zm/held_knife_zm_alcatraz
weapon,zm/held_spoon_zm_alcatraz
weapon,zm/held_spork_zm_alcatraz
xmodel,t6_wpn_knife_base_view xmodel,t6_wpn_knife_base_view
xmodel,t6_wpn_knife_base_world xmodel,t6_wpn_knife_base_world
material,mc/mtl_t6_wpn_knife_base material,mc/mtl_t6_wpn_knife_base