From 3b4176ee5590ba128a5821ae32cba238d972309b Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Tue, 25 Apr 2023 10:25:11 -0700 Subject: [PATCH] Perks: make hint string not show while drinking --- scripts/zm/_zm_reimagined.gsc | 1 + scripts/zm/replaced/_zm_perks.gsc | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index de754e5c..ed8f8910 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -91,6 +91,7 @@ main() replaceFunc(maps\mp\zombies\_zm_perks::initialize_custom_perk_arrays, scripts\zm\replaced\_zm_perks::initialize_custom_perk_arrays); replaceFunc(maps\mp\zombies\_zm_perks::turn_tombstone_on, scripts\zm\replaced\_zm_perks::turn_tombstone_on); replaceFunc(maps\mp\zombies\_zm_perks::wait_for_player_to_take, scripts\zm\replaced\_zm_perks::wait_for_player_to_take); + replaceFunc(maps\mp\zombies\_zm_perks::check_player_has_perk, scripts\zm\replaced\_zm_perks::check_player_has_perk); replaceFunc(maps\mp\zombies\_zm_perks::perk_pause, scripts\zm\replaced\_zm_perks::perk_pause); replaceFunc(maps\mp\zombies\_zm_perks::perk_unpause, scripts\zm\replaced\_zm_perks::perk_unpause); replaceFunc(maps\mp\zombies\_zm_power::standard_powered_items, scripts\zm\replaced\_zm_power::standard_powered_items); diff --git a/scripts/zm/replaced/_zm_perks.gsc b/scripts/zm/replaced/_zm_perks.gsc index f61948b8..fc11bb41 100644 --- a/scripts/zm/replaced/_zm_perks.gsc +++ b/scripts/zm/replaced/_zm_perks.gsc @@ -966,6 +966,34 @@ wait_for_player_to_take( player, weapon, packa_timer, upgrade_as_attachment ) } } +check_player_has_perk( perk ) +{ + self endon( "death" ); + + dist = 16384; + + while ( true ) + { + players = get_players(); + + for ( i = 0; i < players.size; i++ ) + { + if ( distancesquared( players[i].origin, self.origin ) < dist ) + { + if ( !players[i] hasperk( perk ) && !players[i] has_perk_paused( perk ) && !players[i] in_revive_trigger() && !is_equipment_that_blocks_purchase( players[i] getcurrentweapon() ) && !players[i] hacker_active() && !players[i].is_drinking ) + { + self setinvisibletoplayer( players[i], 0 ); + continue; + } + + self setinvisibletoplayer( players[i], 1 ); + } + } + + wait 0.05; + } +} + perk_pause( perk ) { // disabled