INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-10 15:17:57 -05:00
Code Issues Releases Wiki Activity

Tranzit: fix collisions

Browse Source 
Remove replacing zm_transit_ffotd::main_end as it is not necessary
This commit is contained in:
Jbleezy
2022-01-01 21:35:11 -08:00
parent f972f8d77e
commit 73961ae95f
2 changed files with 14 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
scripts/zm/replaced/zm_transit_ffotd.gsc
View File

@ -1,129 +0,0 @@
#include maps\mp\_utility;
#include common_scripts\utility;
#include maps\mp\zombies\_zm_utility;
main_end()
{
if ( !is_true( level.optimise_for_splitscreen ) )
{
maps/mp/zombies/_zm::spawn_kill_brush( ( 33, -450, -90 ), 982, 15 );
location = level.scr_zm_map_start_location;
type = level.scr_zm_ui_gametype;
collision4 = spawn( "script_model", ( 12240, 8480, -720 ) );
collision4 setmodel( "collision_wall_64x64x10_standard" );
collision4.angles = ( 0, 1, 0 );
collision4 ghost();
collision5 = spawn( "script_model", ( 8320, -6679, 362 ) );
collision5 setmodel( "collision_wall_256x256x10_standard" );
collision5.angles = vectorScale( ( 0, 1, 0 ), 300 );
collision5 ghost();
collision6 = spawn( "script_model", ( 8340, -5018, 191 ) );
collision6 setmodel( "collision_geo_32x32x10_standard" );
collision6.angles = vectorScale( ( 0, 1, 0 ), 270 );
collision6 ghost();
collision7 = spawn( "script_model", ( 8340, -5018, 219 ) );
collision7 setmodel( "collision_geo_32x32x10_standard" );
collision7.angles = vectorScale( ( 0, 1, 0 ), 270 );
collision7 ghost();
collision8 = spawn( "script_model", ( 8044, -5018, 191 ) );
collision8 setmodel( "collision_geo_32x32x10_standard" );
collision8.angles = vectorScale( ( 0, 1, 0 ), 270 );
collision8 ghost();
collision9 = spawn( "script_model", ( 8044, -5018, 219 ) );
collision9 setmodel( "collision_geo_32x32x10_standard" );
collision9.angles = vectorScale( ( 0, 1, 0 ), 270 );
collision9 ghost();
if ( location == "town" && type == "zstandard" )
{
collision10 = spawn( "script_model", ( 1820, 126, 152 ) );
collision10 setmodel( "collision_wall_128x128x10_standard" );
collision10.angles = vectorScale( ( 0, 1, 0 ), 262 );
collision10 ghost();
}
collision11 = spawn( "script_model", ( 11216.3, 8188, -432 ) );
collision11 setmodel( "collision_wall_128x128x10_standard" );
collision11.angles = vectorScale( ( 0, 1, 0 ), 180 );
collision11 ghost();
collision12 = spawn( "script_model", ( -454, 620.25, -1.75 ) );
collision12 setmodel( "collision_wall_128x128x10_standard" );
collision12.angles = vectorScale( ( 0, 1, 0 ), 330 );
collision12 ghost();
collision13 = spawn( "script_model", ( 11798, 8410, -734 ) );
collision13 setmodel( "collision_wall_128x128x10_standard" );
collision13.angles = ( 90, 260.589, -10.311 );
collision13 ghost();
collision14 = spawn( "script_model", ( 652, 240, 124 ) );
collision14 setmodel( "collision_wall_128x128x10_standard" );
collision14.angles = vectorScale( ( 0, 1, 0 ), 105 );
collision14 ghost();
if ( location == "farm" && type == "zgrief" )
{
collision15 = spawn( "script_model", ( 8052, -5204, 380 ) );
collision15 setmodel( "collision_wall_64x64x10_standard" );
collision15.angles = vectorScale( ( 0, 1, 0 ), 180 );
collision15 ghost();
}
collision16 = spawn( "script_model", ( -448, 328, 112 ) );
collision16 setmodel( "collision_wall_512x512x10_standard" );
collision16.angles = ( 270, 67.822, 22.1776 );
collision16 ghost();
collision17 = spawn( "script_model", ( 6040, -5744, 240 ) );
collision17 setmodel( "collision_player_256x256x256" );
collision17.angles = vectorScale( ( 0, 1, 0 ), 90 );
collision17 ghost();
collision18 = spawn( "script_model", ( -6744, 4184, 64 ) );
collision18 setmodel( "collision_wall_128x128x10_standard" );
collision18.angles = vectorScale( ( 0, 1, 0 ), 90 );
collision18 ghost();
collision19 = spawn( "script_model", ( -6328, -7168, 264 ) );
collision19 setmodel( "collision_player_256x256x256" );
collision19.angles = vectorScale( ( 0, 1, 0 ), 90 );
collision19 ghost();
collision20 = spawn( "script_model", ( 9960, 7352, -136 ) );
collision20 setmodel( "collision_player_256x256x256" );
collision20.angles = vectorScale( ( 0, 1, 0 ), 90 );
collision20 ghost();
collision21 = spawn( "script_model", ( -4656, -7373, 0 ) );
collision21 setmodel( "collision_player_32x32x128" );
collision21.angles = vectorScale( ( 0, 1, 0 ), 341.6 );
collision21 ghost();
}
maps/mp/zm_transit_ffotd::apartment_exploit();
maps/mp/zm_transit_ffotd::town_truck_exploit();
maps/mp/zm_transit_ffotd::farm_porch_exploit();
maps/mp/zm_transit_ffotd::power_station_exploit();
maps/mp/zm_transit_ffotd::nacht_exploit();
town_bookstore_exploit();
level.equipment_dead_zone_pos = [];
level.equipment_dead_zone_rad2 = [];
level.equipment_dead_zone_type = [];
level.equipment_dead_zone_pos[ 0 ] = ( -6252.98, -7947.23, 149.125 );
level.equipment_dead_zone_rad2[ 0 ] = 3600;
level.equipment_dead_zone_pos[ 1 ] = ( -11752, -2515, 288 );
level.equipment_dead_zone_rad2[ 1 ] = 14400;
level.equipment_dead_zone_type[ 1 ] = "t6_wpn_zmb_shield_world";
level.equipment_dead_zone_pos[ 2 ] = ( -6664, 4592, -48 );
level.equipment_dead_zone_rad2[ 2 ] = 2304;
level.equipment_dead_zone_type[ 2 ] = "t6_wpn_zmb_shield_world";
level.equipment_dead_zone_pos[ 3 ] = ( 7656, -4741, 38 );
level.equipment_dead_zone_rad2[ 3 ] = 2304;
level.equipment_dead_zone_type[ 3 ] = "t6_wpn_zmb_shield_world";
level.equipment_dead_zone_pos[ 4 ] = ( -11712, -776, 224 );
level.equipment_dead_zone_rad2[ 4 ] = 16384;
level.equipment_dead_zone_type[ 4 ] = "t6_wpn_zmb_shield_world";
level.equipment_dead_zone_pos[ 5 ] = ( -4868, -7713, -42 );
level.equipment_dead_zone_rad2[ 5 ] = 256;
level.equipment_dead_zone_type[ 5 ] = "t6_wpn_zmb_shield_world";
level.equipment_safe_to_drop = maps/mp/zm_transit_ffotd::equipment_safe_to_drop_ffotd;
}
town_bookstore_exploit()
{
zombie_trigger_origin = ( 1045, -1521, 128 );
zombie_trigger_radius = 96;
zombie_trigger_height = 64;
player_trigger_origin = ( 1116, -1547, 128 );
player_trigger_radius = 72;
zombie_goto_point = ( 1098, -1521, 128 );
level thread maps/mp/zombies/_zm_ffotd::path_exploit_fix( zombie_trigger_origin, zombie_trigger_radius, zombie_trigger_height, player_trigger_origin, player_trigger_radius, zombie_goto_point );
}

16
scripts/zm/zm_transit/zm_transit_reimagined.gsc
View File

@ -3,7 +3,6 @@
#include maps\mp\zombies\_zm_utility;
#include scripts/zm/replaced/zm_transit;
#include scripts/zm/replaced/zm_transit_ffotd;
#include scripts/zm/replaced/_zm_weap_emp_bomb;
#include scripts/zm/replaced/_zm_equip_electrictrap;
#include scripts/zm/replaced/_zm_equip_turret;
@ -11,7 +10,6 @@
main()
{
replaceFunc(maps/mp/zm_transit::lava_damage_depot, scripts/zm/replaced/zm_transit::lava_damage_depot);
replaceFunc(maps/mp/zm_transit_ffotd::main_end, scripts/zm/replaced/zm_transit_ffotd::main_end);
replaceFunc(maps/mp/zombies/_zm_weap_emp_bomb::emp_detonate, scripts/zm/replaced/_zm_weap_emp_bomb::emp_detonate);
replaceFunc(maps/mp/zombies/_zm_equip_electrictrap::startelectrictrapdeploy, scripts/zm/replaced/_zm_equip_electrictrap::startelectrictrapdeploy);
replaceFunc(maps/mp/zombies/_zm_equip_turret::startturretdeploy, scripts/zm/replaced/_zm_equip_turret::startturretdeploy);
@ -20,6 +18,8 @@ main()
init()
{
level.grenade_safe_to_bounce = ::grenade_safe_to_bounce;
path_exploit_fixes();
}
grenade_safe_to_bounce( player, weapname )
@ -35,4 +35,16 @@ grenade_safe_to_bounce( player, weapname )
}
return 1;
}
path_exploit_fixes()
{
// town bookstore near jug
zombie_trigger_origin = ( 1045, -1521, 128 );
zombie_trigger_radius = 96;
zombie_trigger_height = 64;
player_trigger_origin = ( 1116, -1547, 128 );
player_trigger_radius = 72;
zombie_goto_point = ( 1098, -1521, 128 );
level thread maps/mp/zombies/_zm_ffotd::path_exploit_fix( zombie_trigger_origin, zombie_trigger_radius, zombie_trigger_height, player_trigger_origin, player_trigger_radius, zombie_goto_point );
}