INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-10 15:17:57 -05:00
Code Issues Releases Wiki Activity

Melee weapons: fix second world model showing while meleeing

Browse Source
This commit is contained in:
Jbleezy
2024-01-05 22:22:32 -08:00
parent ad2374c613
commit c3611fc3c6
4 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
scripts/zm/_zm_reimagined.gsc
View File

@ -214,6 +214,8 @@ on_player_spawned()
self thread ignoreme_after_revived();
self thread held_melee_weapon_world_model_fix();
self thread fall_velocity_check();
self thread give_additional_perks();
@ -1544,6 +1546,49 @@ player_revive_protection_timeout()
self.revive_protection = 0;
}
held_melee_weapon_world_model_fix()
{
self endon("disconnect");
while (1)
{
melee_weapon = self get_player_melee_weapon();
current_weapon = self getcurrentweapon();
if (getweaponmodel(melee_weapon) == "t6_wpn_none_world")
{
wait 0.05;
continue;
}
if (current_weapon == "held_" + melee_weapon && self hasweapon(melee_weapon))
{
self takeweapon(melee_weapon);
if (is_held_melee_weapon_offhand_melee(melee_weapon))
{
self giveweapon("held_" + melee_weapon + "_offhand");
}
}
else if (current_weapon != "held_" + melee_weapon && !self hasweapon(melee_weapon))
{
self giveweapon(melee_weapon);
if (is_held_melee_weapon_offhand_melee(melee_weapon))
{
self takeweapon("held_" + melee_weapon + "_offhand");
}
}
wait 0.05;
}
}
is_held_melee_weapon_offhand_melee(weaponname)
{
return weaponname == "tazer_knuckles_zm";
}
fall_velocity_check()
{
self endon("disconnect");

6
scripts/zm/replaced/_zm_melee_weapon.gsc
View File

@ -9,6 +9,12 @@ init(weapon_name, flourish_weapon_name, ballistic_weapon_name, ballistic_upgrade
precacheitem(weapon_name);
precacheitem(flourish_weapon_name);
precacheitem("held_" + weapon_name);
if (scripts\zm\_zm_reimagined::is_held_melee_weapon_offhand_melee(weapon_name))
{
precacheitem("held_" + weapon_name + "_offhand");
}
add_melee_weapon(weapon_name, flourish_weapon_name, ballistic_weapon_name, ballistic_upgraded_weapon_name, cost, wallbuy_targetname, hint_string, vo_dialog_id, flourish_fn);
melee_weapon_triggers = getentarray(wallbuy_targetname, "targetname");