diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 871ff97d..11e30fe9 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -7,6 +7,8 @@ #include scripts\zm\replaced\zm_melee; #include scripts\zm\replaced\zm_utility; #include scripts\zm\replaced\zm_shared; +#include scripts\zm\replaced\_damagefeedback; +#include scripts\zm\replaced\_hud_message; #include scripts\zm\replaced\_zm_gametype; #include scripts\zm\replaced\_zm; #include scripts\zm\replaced\_zm_audio; @@ -42,6 +44,8 @@ main() replaceFunc(maps\mp\animscripts\zm_melee::meleecombat, scripts\zm\replaced\zm_melee::meleecombat); replaceFunc(maps\mp\animscripts\zm_utility::wait_network_frame, scripts\zm\replaced\_zm_utility::wait_network_frame); replaceFunc(maps\mp\animscripts\traverse\zm_shared::dotraverse, scripts\zm\replaced\zm_shared::dotraverse); + replaceFunc(maps\mp\gametypes_zm\_damagefeedback::onplayerconnect, scripts\zm\replaced\_damagefeedback::onplayerconnect); + replaceFunc(maps\mp\gametypes_zm\_hud_message::onplayerconnect, scripts\zm\replaced\_hud_message::onplayerconnect); replaceFunc(maps\mp\gametypes_zm\_zm_gametype::hide_gump_loading_for_hotjoiners, scripts\zm\replaced\_zm_gametype::hide_gump_loading_for_hotjoiners); replaceFunc(maps\mp\zombies\_zm::round_start, scripts\zm\replaced\_zm::round_start); replaceFunc(maps\mp\zombies\_zm::ai_calculate_health, scripts\zm\replaced\_zm::ai_calculate_health); @@ -253,11 +257,6 @@ on_player_spawned() self thread additionalprimaryweapon_stowed_weapon_refill(); self thread electric_cherry_unlimited(); - - //self.score = 100000; - //maps\mp\zombies\_zm_perks::give_perk( "specialty_armorvest", 0 ); - //self GiveWeapon("dsr50_zm"); - //self GiveMaxAmmo("dsr50_zm"); } self.statusicon = ""; diff --git a/scripts/zm/replaced/_damagefeedback.gsc b/scripts/zm/replaced/_damagefeedback.gsc new file mode 100644 index 00000000..51ebf7e2 --- /dev/null +++ b/scripts/zm/replaced/_damagefeedback.gsc @@ -0,0 +1,6 @@ +#include maps\mp\gametypes_zm\_damagefeedback; + +onplayerconnect() +{ + // removed +} \ No newline at end of file diff --git a/scripts/zm/replaced/_hud_message.gsc b/scripts/zm/replaced/_hud_message.gsc new file mode 100644 index 00000000..1dd1f9a3 --- /dev/null +++ b/scripts/zm/replaced/_hud_message.gsc @@ -0,0 +1,10 @@ +#include maps\mp\gametypes_zm\_hud_util; +#include maps\mp\gametypes_zm\_hud_message; +#include maps\mp\_music; +#include maps\mp\gametypes_zm\_globallogic_audio; +#include maps\mp\_utility; + +onplayerconnect() +{ + // removed +} \ No newline at end of file diff --git a/scripts/zm/replaced/_zm_powerups.gsc b/scripts/zm/replaced/_zm_powerups.gsc index f0a9b03c..8fd4545c 100644 --- a/scripts/zm/replaced/_zm_powerups.gsc +++ b/scripts/zm/replaced/_zm_powerups.gsc @@ -374,7 +374,7 @@ full_ammo_powerup( drop_item, player ) } i++; } - level thread maps\mp\zombies\_zm_powerups::full_ammo_on_hud( drop_item, player.team ); + level thread full_ammo_on_hud( drop_item, player.team ); if(level.scr_zm_ui_gametype == "zgrief") { @@ -382,6 +382,36 @@ full_ammo_powerup( drop_item, player ) } } +full_ammo_on_hud( drop_item, player_team ) +{ + self endon( "disconnect" ); + hudelem = maps\mp\gametypes_zm\_hud_util::createserverfontstring( "objective", 2, player_team ); + hudelem maps\mp\gametypes_zm\_hud_util::setpoint( "TOP", undefined, 0, level.zombie_vars["zombie_timer_offset"] - level.zombie_vars["zombie_timer_offset_interval"] * 2 ); + hudelem.sort = 0.5; + hudelem.alpha = 0; + hudelem fadeovertime( 0.5 ); + hudelem.alpha = 1; + + if ( isdefined( drop_item ) ) + hudelem.label = drop_item.hint; + + hudelem thread full_ammo_move_hud( player_team ); +} + +full_ammo_move_hud( player_team ) +{ + players = get_players( player_team ); + players[0] playsoundtoteam( "zmb_full_ammo", player_team ); + wait 0.5; + move_fade_time = 1.5; + self fadeovertime( move_fade_time ); + self moveovertime( move_fade_time ); + self.y = 270; + self.alpha = 0; + wait( move_fade_time ); + self destroyelem(); +} + empty_clip_powerup( drop_item, player ) { team = getOtherTeam(player.team);