diff --git a/README.md b/README.md index cfc3eaa1..5a6c44fe 100644 --- a/README.md +++ b/README.md @@ -575,6 +575,7 @@ ### Mob of the Dead * 1 afterlife max in solo * Entering afterlife no longer takes 2 additional seconds if the player had Electric Cherry +* Afterlife player model has collision * Plane parts are shared in coop * Plane parts must be all acquired to craft * Plane no longer has to be refueled after first use diff --git a/scripts/zm/replaced/_zm_afterlife.gsc b/scripts/zm/replaced/_zm_afterlife.gsc index 92f81361..9452bbaf 100644 --- a/scripts/zm/replaced/_zm_afterlife.gsc +++ b/scripts/zm/replaced/_zm_afterlife.gsc @@ -160,6 +160,13 @@ afterlife_spawn_corpse() corpse.revive_hud = self afterlife_revive_hud_create(); corpse thread afterlife_revive_trigger_spawn(); + collision = spawn( "script_model", corpse.origin + ( 0, 0, 16 ) ); + collision.angles = corpse.angles; + collision setmodel( "collision_clip_32x32x32" ); + collision linkto( corpse ); + collision ghost(); + corpse.collision = collision; + if ( get_players().size == 1 ) corpse thread afterlife_corpse_create_pois(); @@ -188,13 +195,6 @@ afterlife_fake_death() self freezecontrols( 1 ); } - collision = spawn( "script_model", corpse.origin + ( 0, 0, 16 ) ); - collision.angles = corpse.angles; - collision setmodel( "collision_clip_32x32x32" ); - collision linkto( corpse ); - collision ghost(); - corpse.collision = collision; - afterlife_revive_invincible() { self endon( "disconnect" ); diff --git a/scripts/zm/zm_prison/zm_prison_reimagined.gsc b/scripts/zm/zm_prison/zm_prison_reimagined.gsc index 64f4df72..9b4caac4 100644 --- a/scripts/zm/zm_prison/zm_prison_reimagined.gsc +++ b/scripts/zm/zm_prison/zm_prison_reimagined.gsc @@ -47,6 +47,7 @@ main() replaceFunc(maps\mp\zombies\_zm_afterlife::afterlife_add, scripts\zm\replaced\_zm_afterlife::afterlife_add); replaceFunc(maps\mp\zombies\_zm_afterlife::afterlife_laststand, scripts\zm\replaced\_zm_afterlife::afterlife_laststand); replaceFunc(maps\mp\zombies\_zm_afterlife::afterlife_revive_do_revive, scripts\zm\replaced\_zm_afterlife::afterlife_revive_do_revive); + replaceFunc(maps\mp\zombies\_zm_afterlife::afterlife_corpse_cleanup, scripts\zm\replaced\_zm_afterlife::afterlife_corpse_cleanup); replaceFunc(maps\mp\zombies\_zm_ai_brutus::init, scripts\zm\replaced\_zm_ai_brutus::init); replaceFunc(maps\mp\zombies\_zm_ai_brutus::brutus_round_tracker, scripts\zm\replaced\_zm_ai_brutus::brutus_round_tracker); replaceFunc(maps\mp\zombies\_zm_ai_brutus::get_brutus_spawn_pos_val, scripts\zm\replaced\_zm_ai_brutus::get_brutus_spawn_pos_val); @@ -71,6 +72,7 @@ main() init() { precacheModel("t6_wpn_zmb_severedhead_world"); + precacheModel("collision_clip_32x32x32"); level.zombie_init_done = ::zombie_init_done; level.special_weapon_magicbox_check = ::check_for_special_weapon_limit_exist;