From 90ce1bca4502001e2a580862b71b631994c0fa3b Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Fri, 14 Jan 2022 16:31:15 -0800 Subject: [PATCH] Diner: change collision models Matches more closely to Turned Diner --- scripts/zm/locs/zm_transit_loc_diner.gsc | 61 ++++++++++++++++++++---- 1 file changed, 53 insertions(+), 8 deletions(-) diff --git a/scripts/zm/locs/zm_transit_loc_diner.gsc b/scripts/zm/locs/zm_transit_loc_diner.gsc index 0c262b9c..fde20095 100644 --- a/scripts/zm/locs/zm_transit_loc_diner.gsc +++ b/scripts/zm/locs/zm_transit_loc_diner.gsc @@ -10,7 +10,7 @@ struct_init() { scripts/zm/replaced/utility::register_perk_struct( "specialty_armorvest", "zombie_vending_jugg", ( -3563, -7196, -59 ), ( 0, 0, 0 ) ); - scripts/zm/replaced/utility::register_perk_struct( "specialty_quickrevive", "zombie_vending_quickrevive", ( -6207, -6544, -46 ), ( 0, 60, 0 ) ); + scripts/zm/replaced/utility::register_perk_struct( "specialty_quickrevive", "zombie_vending_quickrevive", ( -6207, -6541, -46 ), ( 0, 60, 0 ) ); scripts/zm/replaced/utility::register_perk_struct( "specialty_fastreload", "zombie_vending_sleight", ( -5470, -7859.5, 0 ), ( 0, 270, 0 ) ); scripts/zm/replaced/utility::register_perk_struct( "specialty_rof", "zombie_vending_doubletap2", ( -4170, -7592, -63 ), ( 0, 270, 0 ) ); @@ -39,10 +39,59 @@ struct_init() gameObjects = getEntArray( "script_model", "classname" ); foreach ( object in gameObjects ) { - if ( object.script_gameobjectname == "zcleansed zturned" ) + if ( isDefined( object.script_noteworthy ) && object.script_noteworthy == getDvar( "ui_zm_mapstartlocation" ) ) { - object.script_gameobjectname = "zstandard zgrief zcleansed zturned"; - } + if ( isDefined( object.script_gameobjectname ) && object.script_gameobjectname == "zcleansed zturned" ) + { + object.script_gameobjectname = "zstandard zgrief zcleansed zturned"; + + if(object.origin == (-6460.7, -7115, 6.8)) + { + object setModel("veh_t6_civ_microbus_dead"); + object.origin += anglesToUp(object.angles) * -65; + object.origin += anglesToForward(object.angles) * 125; + } + else if(object.origin == (-6550.5, -6901.7, 6.8)) + { + object setModel("veh_t6_civ_smallwagon_dead"); + object.origin += anglesToUp(object.angles) * -60; + object.origin += anglesToForward(object.angles) * 150; + } + else if(object.origin == (-6251.1, -6449.4, 20.8)) + { + object setModel("veh_t6_civ_60s_coupe_dead"); + object.origin += anglesToUp(object.angles) * -60; + object.origin += anglesToForward(object.angles) * 125; + object.origin += anglesToRight(object.angles) * 25; + } + else if(object.origin == (-5822.9, -6434.6, 20.8)) + { + object setModel("p6_zm_rocks_medium_05"); + object.origin += anglesToUp(object.angles) * -80; + object.origin += anglesToForward(object.angles) * 50; + object.origin += anglesToRight(object.angles) * 100; + } + else if(object.origin == (-5589.5, -6310.3, 24.8)) + { + object setModel("p6_zm_rocks_medium_05"); + object.origin += anglesToUp(object.angles) * -80; + object.origin += anglesToForward(object.angles) * 50; + object.origin += anglesToRight(object.angles) * 125; + } + else if(object.origin == (-4813, -6665.3, 0.8)) + { + object setModel("veh_t6_civ_60s_coupe_dead"); + object.origin += anglesToUp(object.angles) * -65; + object.origin += anglesToForward(object.angles) * 100; + } + else if(object.origin == (-3902.4, -6884.9, 0.8)) + { + object setModel("veh_t6_civ_microbus_dead"); + object.origin += anglesToUp(object.angles) * -65; + object.origin += anglesToForward(object.angles) * 50; + } + } + } } } @@ -82,10 +131,6 @@ init_barriers() collision = spawn( "script_model", ( -5000, -6700, 0 ), 1 ); collision setmodel( "zm_collision_transit_diner_survival" ); collision disconnectpaths(); - - collision = spawn( "script_model", ( -5569, -6385, 25 ) ); - collision.angles = ( 0, 0, 0 ); - collision setmodel( "collision_wall_128x128x10_standard" ); } generatebuildabletarps()