checked 54 patch_mp/maps/mp scripts

This commit is contained in:
JezuzLizard
2020-06-13 01:37:00 -07:00
parent a46530d2fd
commit d2202281cd
55 changed files with 1781 additions and 1815 deletions

View File

@ -1,10 +1,14 @@
//checked includes changed to match cerberus output
#include maps/mp/gametypes/_deathicons;
#include maps/mp/gametypes/_spawning;
#include maps/mp/_compass;
#include maps/mp/mp_bridge_amb;
#include maps/mp/_load;
#include maps/mp/mp_bridge_fx;
#include common_scripts/utility;
#include maps/mp/_utility;
main()
main() //checked changed to match cerberus output
{
level.levelspawndvars = ::levelspawndvars;
maps/mp/mp_bridge_fx::main();
@ -28,37 +32,37 @@ main()
game[ "strings_menu" ][ "war_callsign_c" ] = "@MPUI_CALLSIGN_MAPNAME_C";
game[ "strings_menu" ][ "war_callsign_d" ] = "@MPUI_CALLSIGN_MAPNAME_D";
game[ "strings_menu" ][ "war_callsign_e" ] = "@MPUI_CALLSIGN_MAPNAME_E";
spawncollision( "collision_physics_128x128x10", "collider", ( -1190, -876, -76 ), ( 342, 2,63, -90 ) );
barricade1 = spawn( "script_model", ( 850,5, -812,5, 0 ) );
spawncollision( "collision_physics_128x128x10", "collider", ( -1190, -876, -76 ), ( 342, 2.63, -90 ) );
barricade1 = spawn( "script_model", ( 850.5, -812.5, 0 ) );
barricade1.angles = vectorScale( ( 0, 0, 1 ), 90 );
barricade1 setmodel( "p6_bri_construction_tarp" );
spawncollision( "collision_missile_128x128x10", "collider", ( -2182, -185,5, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2310, -185,5, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2438, -185,5, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2182, -57,5, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2310, -57,5, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2438, -57,5, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2366,5, 91, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1401,5, 759,5, -158,5 ), vectorScale( ( 0, 0, 1 ), 92,40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1309, 726,5, -158,5 ), ( 2,4, 359,9, -91,70473 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1401,5, 634, -154,5 ), vectorScale( ( 0, 0, 1 ), 92,40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1373,5, 634, -154,5 ), vectorScale( ( 0, 0, 1 ), 92,40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1401,5, 559,5, -154,5 ), vectorScale( ( 0, 0, 1 ), 92,40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1422, 375,5, -141,5 ), vectorScale( ( 0, 0, 1 ), 92,40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1322,5, 438, -146 ), vectorScale( ( 0, 0, 1 ), 92,40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1304,5, 438, -146 ), vectorScale( ( 0, 0, 1 ), 92,40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1322,5, 378,5, -144 ), vectorScale( ( 0, 0, 1 ), 92,40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1230, 396, -144 ), vectorScale( ( 0, 0, 1 ), 92,40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1357, 248, -139 ), vectorScale( ( 0, 0, 1 ), 92,40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1230, 285, -139 ), vectorScale( ( 0, 0, 1 ), 92,40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1230, 248, -139 ), vectorScale( ( 0, 0, 1 ), 92,40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2182, -185.5, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2310, -185.5, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2438, -185.5, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2182, -57.5, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2310, -57.5, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2438, -57.5, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2366.5, 91, -142 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1401.5, 759.5, -158.5 ), vectorScale( ( 0, 0, -1 ), 92.40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1309, 726.5, -158.5 ), ( 2.4, 359.9, -91.70473 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1401.5, 634, -154.5 ), vectorScale( ( 0, 0, -1 ), 92.40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1373.5, 634, -154.5 ), vectorScale( ( 0, 0, -1 ), 92.40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1401.5, 559.5, -154.5 ), vectorScale( ( 0, 0, -1 ), 92.40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1422, 375.5, -141.5 ), vectorScale( ( 0, 0, -1 ), 92.40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1322.5, 438, -146 ), vectorScale( ( 0, 0, -1 ), 92.40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1304.5, 438, -146 ), vectorScale( ( 0, 0, -1 ), 92.40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1322.5, 378.5, -144 ), vectorScale( ( 0, 0, -1 ), 92.40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1230, 396, -144 ), vectorScale( ( 0, 0, -1 ), 92.40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1357, 248, -139 ), vectorScale( ( 0, 0, -1 ), 92.40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1230, 285, -139 ), vectorScale( ( 0, 0, -1 ), 92.40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -1230, 248, -139 ), vectorScale( ( 0, 0, -1 ), 92.40023 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( 1370, -697, -134 ), vectorScale( ( 0, 0, 1 ), 90 ) );
spawncollision( "collision_physics_64x64x10", "collider", ( 2432, -44, 30,5 ), ( 0, 270, -90 ) );
spawncollision( "collision_physics_64x64x10", "collider", ( 2113,5, -44, 30,5 ), ( 0, 270, -90 ) );
spawncollision( "collision_missile_32x32x128", "collider", ( -2292, -174, -7,5 ), vectorScale( ( 0, 0, 1 ), 270 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2219,5, -184,5, 37 ), vectorScale( ( 0, 0, 1 ), 2,9 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2197,5, -184,5, 33 ), vectorScale( ( 0, 0, 1 ), 23,9 ) );
spawncollision( "collision_clip_32x32x10", "collider", ( 1923,5, 553,5, 43,5 ), ( 1,265, 43,3, -90 ) );
spawncollision( "collision_physics_64x64x10", "collider", ( 2432, -44, 30.5 ), ( 0, 270, -90 ) );
spawncollision( "collision_physics_64x64x10", "collider", ( 2113.5, -44, 30.5 ), ( 0, 270, -90 ) );
spawncollision( "collision_missile_32x32x128", "collider", ( -2292, -174, -7.5 ), vectorScale( ( 0, 1, 0 ), 270 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2219.5, -184.5, 37 ), vectorScale( ( 1, 0, 0 ), 2.9 ) );
spawncollision( "collision_missile_128x128x10", "collider", ( -2197.5, -184.5, 33 ), vectorScale( ( 1, 0, 0 ), 23.9 ) );
spawncollision( "collision_clip_32x32x10", "collider", ( 1923.5, 553.5, 43.5 ), ( 1.265, 43.3, -90 ) );
maps/mp/gametypes/_spawning::level_use_unified_spawning( 1 );
registerclientfield( "scriptmover", "police_car_lights", 1, 1, "int" );
level thread destructible_lights();
@ -71,38 +75,34 @@ main()
level thread pathing_fix();
}
levelspawndvars( reset_dvars )
levelspawndvars( reset_dvars ) //checked matches cerberus output
{
ss = level.spawnsystem;
ss.enemy_influencer_radius = set_dvar_float_if_unset( "scr_spawn_enemy_influencer_radius", "2400", reset_dvars );
ss.hq_objective_influencer_inner_radius = set_dvar_float_if_unset( "scr_spawn_hq_objective_influencer_inner_radius", "1000", reset_dvars );
}
destructible_lights()
destructible_lights() //checked changed to match cerberus output
{
wait 0,05;
wait 0.05;
destructibles = getentarray( "destructible", "targetname" );
_a125 = destructibles;
_k125 = getFirstArrayKey( _a125 );
while ( isDefined( _k125 ) )
foreach ( destructible in destructibles )
{
destructible = _a125[ _k125 ];
if ( destructible.destructibledef == "veh_t6_dlc_police_car_destructible" )
{
destructible thread destructible_think( "police_car_lights" );
destructible setclientfield( "police_car_lights", 1 );
}
_k125 = getNextArrayKey( _a125, _k125 );
}
}
destructible_think( clientfield )
destructible_think( clientfield ) //checked matches cerberus output
{
self waittill_any( "death", "destructible_base_piece_death" );
self setclientfield( clientfield, 0 );
}
ragdoll_override( idamage, smeansofdeath, sweapon, shitloc, vdir, vattackerorigin, deathanimduration, einflictor, ragdoll_jib, body )
ragdoll_override( idamage, smeansofdeath, sweapon, shitloc, vdir, vattackerorigin, deathanimduration, einflictor, ragdoll_jib, body ) //checked matches cerberus output
{
if ( smeansofdeath == "MOD_FALLING" )
{
@ -127,7 +127,7 @@ ragdoll_override( idamage, smeansofdeath, sweapon, shitloc, vdir, vattackerorigi
return 0;
}
water_spash()
water_spash() //checked matches cerberus output
{
self endon( "disconnect" );
self endon( "spawned_player" );
@ -138,16 +138,16 @@ water_spash()
{
while ( self.origin[ 2 ] > ( trace[ "position" ][ 2 ] + 5 ) )
{
wait 0,05;
wait 0.05;
}
bone = self gettagorigin( "j_spinelower" );
origin = ( bone[ 0 ], bone[ 1 ], trace[ "position" ][ 2 ] + 2,5 );
origin = ( bone[ 0 ], bone[ 1 ], trace[ "position" ][ 2 ] + 2.5 );
self playsound( "mpl_splash_death" );
playfx( level._effect[ "water_splash" ], origin );
}
}
leveloverridetime( defaulttime )
leveloverridetime( defaulttime ) //checked matches cerberus output
{
if ( self isinwater() )
{
@ -156,19 +156,16 @@ leveloverridetime( defaulttime )
return defaulttime;
}
useintermissionpointsonwavespawn()
useintermissionpointsonwavespawn() //checked matches cerberus output
{
return self isinwater();
}
isinwater()
isinwater() //checked partially changed to match cerberus output see info.md
{
triggers = getentarray( "trigger_hurt", "classname" );
_a212 = triggers;
_k212 = getFirstArrayKey( _a212 );
while ( isDefined( _k212 ) )
foreach ( trigger in triggers )
{
trigger = _a212[ _k212 ];
if ( trigger.origin[ 2 ] > level.mapcenter[ 2 ] )
{
}
@ -179,12 +176,11 @@ isinwater()
return 1;
}
}
_k212 = getNextArrayKey( _a212, _k212 );
}
return 0;
}
pathing_fix()
pathing_fix() //checked matches cerberus output
{
wait 1;
nodes = getallnodes();
@ -192,7 +188,7 @@ pathing_fix()
disconnect_node( nodes[ 600 ] );
}
disconnect_node( node )
disconnect_node( node ) //checked matches cerberus output
{
ent = spawn( "script_model", node.origin, 1 );
ent setmodel( level.deployedshieldmodel );
@ -200,3 +196,4 @@ disconnect_node( node )
ent disconnectpaths();
ent.origin -= vectorScale( ( 0, 0, 1 ), 64 );
}