diff --git a/README.md b/README.md index 7617633f..12ae8ad9 100644 --- a/README.md +++ b/README.md @@ -104,6 +104,7 @@ ### Leapers * No longer give each player 2000 points when rewarded a free perk powerup * Initial leaper round always happens on round 5 or 6 +* Fixed getting kill points twice ### Brutus * Decreased player damage from 99 to 90 diff --git a/scripts/zm/replaced/_zm_ai_leaper.gsc b/scripts/zm/replaced/_zm_ai_leaper.gsc index 22754ad4..ea40b35d 100644 --- a/scripts/zm/replaced/_zm_ai_leaper.gsc +++ b/scripts/zm/replaced/_zm_ai_leaper.gsc @@ -105,4 +105,34 @@ leaper_round_accuracy_tracking() level thread maps\mp\zombies\_zm_powerups::specific_powerup_drop( "free_perk", power_up_origin + vectorscale( ( 1, 1, 0 ), 30.0 ) ); } } +} + +leaper_death() +{ + self endon( "leaper_cleanup" ); + + self waittill( "death" ); + + self leaper_stop_trail_fx(); + self playsound( "zmb_vocals_leaper_death" ); + playfx( level._effect["leaper_death"], self.origin ); + + if ( get_current_zombie_count() == 0 && level.zombie_total == 0 ) + { + level.last_leaper_origin = self.origin; + level notify( "last_leaper_down" ); + } + + if ( isplayer( self.attacker ) ) + { + self.deathpoints_already_given = 1; + + event = "death"; + + if ( issubstr( self.damageweapon, "knife_ballistic_" ) ) + event = "ballistic_knife_death"; + + self.attacker thread do_player_general_vox( "general", "leaper_killed", 20, 20 ); + self.attacker maps\mp\zombies\_zm_score::player_add_points( event, self.damagemod, self.damagelocation, 1 ); + } } \ No newline at end of file diff --git a/scripts/zm/zm_highrise/zm_highrise_reimagined.gsc b/scripts/zm/zm_highrise/zm_highrise_reimagined.gsc index eb69ccfb..1a051f99 100644 --- a/scripts/zm/zm_highrise/zm_highrise_reimagined.gsc +++ b/scripts/zm/zm_highrise/zm_highrise_reimagined.gsc @@ -40,6 +40,7 @@ main() replaceFunc(maps\mp\zm_highrise_distance_tracking::delete_zombie_noone_looking, scripts\zm\replaced\zm_highrise_distance_tracking::delete_zombie_noone_looking); replaceFunc(maps\mp\zombies\_zm_ai_leaper::leaper_round_tracker, scripts\zm\replaced\_zm_ai_leaper::leaper_round_tracker); replaceFunc(maps\mp\zombies\_zm_ai_leaper::leaper_round_accuracy_tracking, scripts\zm\replaced\_zm_ai_leaper::leaper_round_accuracy_tracking); + replaceFunc(maps\mp\zombies\_zm_ai_leaper::leaper_death, scripts\zm\replaced\_zm_ai_leaper::leaper_death); replaceFunc(maps\mp\zombies\_zm_equip_springpad::springpadthink, scripts\zm\replaced\_zm_equip_springpad::springpadthink); replaceFunc(maps\mp\zombies\_zm_weap_slipgun::init, scripts\zm\replaced\_zm_weap_slipgun::init); replaceFunc(maps\mp\zombies\_zm_weap_slipgun::slipgun_zombie_1st_hit_response, scripts\zm\replaced\_zm_weap_slipgun::slipgun_zombie_1st_hit_response);