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

Ballistic Knife: add model and anims from BO2 MP

Browse Source 
Melee weapons: fix kill feed icons
This commit is contained in:
Jbleezy
2023-12-22 18:56:48 -08:00
parent 66f68fabc9
commit f8f426f466
32 changed files with 52423 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/zm/_zm_reimagined.gsc
View File

@ -109,6 +109,7 @@ main()
replaceFunc(maps\mp\zombies\_zm_melee_weapon::init, scripts\zm\replaced\_zm_melee_weapon::init);
replaceFunc(maps\mp\zombies\_zm_melee_weapon::change_melee_weapon, scripts\zm\replaced\_zm_melee_weapon::change_melee_weapon);
replaceFunc(maps\mp\zombies\_zm_melee_weapon::give_melee_weapon, scripts\zm\replaced\_zm_melee_weapon::give_melee_weapon);
replaceFunc(maps\mp\zombies\_zm_weap_ballistic_knife::init, scripts\zm\replaced\_zm_weap_ballistic_knife::init);
replaceFunc(maps\mp\zombies\_zm_weap_ballistic_knife::watch_use_trigger, scripts\zm\replaced\_zm_weap_ballistic_knife::watch_use_trigger);
replaceFunc(maps\mp\zombies\_zm_weap_claymore::claymore_detonation, scripts\zm\replaced\_zm_weap_claymore::claymore_detonation);
replaceFunc(maps\mp\zombies\_zm_weap_claymore::claymore_setup, scripts\zm\replaced\_zm_weap_claymore::claymore_setup);

15
scripts/zm/replaced/_zm_weap_ballistic_knife.gsc
View File

@ -3,6 +3,18 @@
#include common_scripts\utility;
#include maps\mp\zombies\_zm_utility;
init()
{
if ( !isdefined( level.ballistic_knife_autorecover ) )
level.ballistic_knife_autorecover = 1;
if ( isdefined( level._uses_retrievable_ballisitic_knives ) && level._uses_retrievable_ballisitic_knives == 1 )
{
precachemodel( "t6_wpn_ballistic_knife_projectile" );
precachemodel( "t6_wpn_ballistic_knife_blade_retrieve" );
}
}
on_spawn(watcher, player)
{
player endon("death");
@ -16,13 +28,14 @@ on_spawn(watcher, player)
if (is_upgraded && isDefined(prey) && isplayer(prey) && prey.team == player.team && prey maps\mp\zombies\_zm_laststand::player_is_in_laststand())
{
prey notify( "remote_revive", player );
return;
}
if (isDefined(endpos))
{
retrievable_model = spawn("script_model", endpos);
retrievable_model setmodel("t5_weapon_ballistic_knife_blade_retrieve");
retrievable_model setmodel("t6_wpn_ballistic_knife_blade_retrieve");
retrievable_model setowner(player);
retrievable_model.owner = player;
retrievable_model.angles = angles;

13
scripts/zm/zgrief/zgrief_reimagined.gsc
View File

@ -782,19 +782,16 @@ kill_feed()
{
self.last_griefed_by.attacker.killsconfirmed++;
// show weapon icon for impact damage
if (self.last_griefed_by.meansofdeath == "MOD_IMPACT")
// show weapon icon for melee damage
if (self.last_griefed_by.meansofdeath == "MOD_MELEE")
{
self.last_griefed_by.meansofdeath = "MOD_UNKNOWN";
}
// show weapon icon for melee damage (except for start melee weapon)
if (self.last_griefed_by.meansofdeath == "MOD_MELEE")
// show weapon icon for impact damage
if (self.last_griefed_by.meansofdeath == "MOD_IMPACT")
{
if (self.last_griefed_by.weapon != level.zombie_melee_weapon_player_init && self.last_griefed_by.weapon != "held_" + level.zombie_melee_weapon_player_init)
{
self.last_griefed_by.meansofdeath = "MOD_UNKNOWN";
}
self.last_griefed_by.meansofdeath = "MOD_UNKNOWN";
}
obituary(self, self.last_griefed_by.attacker, self.last_griefed_by.weapon, self.last_griefed_by.meansofdeath);