Replace ghetto roundup function with ceil

pull/3/head
FutureRave 2022-03-02 23:28:46 +00:00
parent 9076c854be
commit 5d34835cc6
No known key found for this signature in database
GPG Key ID: E883E2BC9657D955
1 changed files with 52 additions and 56 deletions

View File

@ -4,48 +4,45 @@
main() main()
{ {
maps\mp\_load::main(); maps\mp\_load::main();
game[ "attackers" ] = "allies"; game[ "attackers" ] = "allies";
game[ "defenders" ] = "axis"; game[ "defenders" ] = "axis";
maps\mp\_compass::setupMiniMap( "compass_map_oilrig_lvl_3" ); maps\mp\_compass::setupMiniMap( "compass_map_oilrig_lvl_3" );
setdvar( "compassmaxrange", "4000" ); setdvar( "compassmaxrange", "4000" );
array_thread( getentarray( "breach_solid", "targetname" ), ::self_delete ); array_thread( getentarray( "breach_solid", "targetname" ), ::selfDelete );
array_thread( getentarray( "compassTriggers", "targetname" ), ::compass_triggers_think ); array_thread( getentarray( "compassTriggers", "targetname" ), ::compass_triggers_think );
CreateRamps( ( 1676, 1330, -70 ), ( 2489, 1844, 900 ) );
CreateRamps((1676, 1330, -70), (2489, 1844, 900)); CreateRamps( ( -965, 256, -200 ), ( -854, -77, 54 ) );
CreateRamps((-965, 256, -200), (-854, -77, 54)); thread customKilltrigger();
thread custom_killtrigger();
thread level_think(); thread level_think();
thread level_think2(); thread level_think2();
} }
self_delete() selfDelete()
{ {
self delete(); self delete ();
} }
// Kills the player if he goes under them map
custom_killtrigger() customKilltrigger()
{ {
while (true) while ( true )
{ {
wait 0.1; wait 0.1;
foreach (player in level.players) foreach ( player in level.players )
{ {
if (!isDefined(player) || !isPlayer(player)) if ( !isDefined( player ) || !isPlayer( player ) )
{ {
continue; continue;
} }
if (player.origin[2] < -350.0) if ( player.origin[2] < -350.0 )
{ {
player suicide(); player suicide();
} }
@ -56,8 +53,9 @@ custom_killtrigger()
compass_triggers_think() compass_triggers_think()
{ {
assertex( isdefined( self.script_noteworthy ), "compassTrigger at " + self.origin + " needs to have a script_noteworthy with the name of the minimap to use" ); assertex( isDefined( self.script_noteworthy ), "compassTrigger at " + self.origin + " needs to have a script_noteworthy with the name of the minimap to use" );
while( true )
while ( true )
{ {
wait( 1 ); wait( 1 );
self waittill( "trigger" ); self waittill( "trigger" );
@ -65,56 +63,52 @@ compass_triggers_think()
} }
} }
CreateRamps(top, bottom) CreateRamps( top, bottom )
{ {
D = Distance(top, bottom); D = Distance( top, bottom );
blocks = roundUp(D/30); blocks = ceil( D / 30 );
CX = top[0] - bottom[0]; CX = top[0] - bottom[0];
CY = top[1] - bottom[1]; CY = top[1] - bottom[1];
CZ = top[2] - bottom[2]; CZ = top[2] - bottom[2];
XA = CX/blocks; XA = CX / blocks;
YA = CY/blocks; YA = CY / blocks;
ZA = CZ/blocks; ZA = CZ / blocks;
CXY = Distance((top[0], top[1], 0), (bottom[0], bottom[1], 0)); CXY = Distance( ( top[0], top[1], 0 ), ( bottom[0], bottom[1], 0 ) );
Temp = VectorToAngles(top - bottom); Temp = VectorToAngles( top - bottom );
BA = (Temp[2], Temp[1] + 90, Temp[0]); BA = ( Temp[2], Temp[1] + 90, Temp[0] );
for(b = 0; b < blocks; b++){
block = spawn("script_model", (bottom + ((XA, YA, ZA) * b))); for ( b = 0; b < blocks; b++ )
{
block = spawn( "script_model", ( bottom + ( ( XA, YA, ZA ) * b ) ) );
//block setModel("com_plasticcase_friendly"); //block setModel("com_plasticcase_friendly");
block.angles = BA; block.angles = BA;
block Solid(); block Solid();
block CloneBrushmodelToScriptmodel( level.airDropCrateCollision ); block CloneBrushmodelToScriptmodel( level.airDropCrateCollision );
wait 0.01; wait 0.01;
} }
block = spawn("script_model", (bottom + ((XA, YA, ZA) * blocks) - (0, 0, 5)));
block = spawn( "script_model", ( bottom + ( ( XA, YA, ZA ) * blocks ) - ( 0, 0, 5 ) ) );
//block setModel("com_plasticcase_friendly"); //block setModel("com_plasticcase_friendly");
block.angles = (BA[0], BA[1], 0); block.angles = ( BA[0], BA[1], 0 );
block Solid(); block Solid();
block CloneBrushmodelToScriptmodel( level.airDropCrateCollision ); block CloneBrushmodelToScriptmodel( level.airDropCrateCollision );
wait 0.01; wait 0.01;
} }
roundUp( floatVal )
{
if ( int( floatVal ) != floatVal )
return int( floatVal+1 );
else
return int( floatVal );
}
level_think() level_think()
{ {
/*----------------------- /*
MOVING DERRICK DRILL THING -----------------------
-------------------------*/ MOVING DERRICK DRILL THING
-------------------------
*/
eDerrick_thing = getent( "derrick_thing", "targetname" ); eDerrick_thing = getent( "derrick_thing", "targetname" );
eDerrick_thing.origin = eDerrick_thing.origin + ( 0, 0, -2816 ); eDerrick_thing.origin = eDerrick_thing.origin + ( 0, 0, -2816 );
assert( isdefined( eDerrick_thing ) ); assert( isDefined( eDerrick_thing ) );
time = 2; time = 2;
speed = 300; speed = 300;
while ( true ) while ( true )
{ {
eDerrick_thing rotatevelocity( ( 0, speed, 0 ), time ); eDerrick_thing rotatevelocity( ( 0, speed, 0 ), time );
@ -122,27 +116,29 @@ level_think()
} }
} }
level_think2() level_think2()
{ {
model1 = getent( "fx_spotlight_beam", "targetname" ); model1 = getent( "fx_spotlight_beam", "targetname" );
model2 = getent( "com_blackhawk_spotlight_on_mg_setup", "targetname" ); model2 = getent( "com_blackhawk_spotlight_on_mg_setup", "targetname" );
assert( isdefined( model1 ) ); assert( isDefined( model1 ) );
assert( isdefined( model2 ) ); assert( isDefined( model2 ) );
time = 10; time = 10;
while ( true ) while ( true )
{ {
model1 rotateto(model1.angles+(0,45,0),time); model1 rotateto( model1.angles + ( 0, 45, 0 ), time );
model2 rotateto(model2.angles+(0,45,0),time); model2 rotateto( model2.angles + ( 0, 45, 0 ), time );
wait( time ); wait( time );
model1 rotateto(model1.angles+(0,-45,0),time); model1 rotateto( model1.angles + ( 0, -45, 0 ), time );
model2 rotateto(model2.angles+(0,-45,0),time); model2 rotateto( model2.angles + ( 0, -45, 0 ), time );
wait( time ); wait( time );
model1 rotateto(model1.angles+(10,45,0),time); model1 rotateto( model1.angles + ( 10, 45, 0 ), time );
model2 rotateto(model2.angles+(10,45,0),time); model2 rotateto( model2.angles + ( 10, 45, 0 ), time );
wait( time ); wait( time );
model1 rotateto(model1.angles+(-10,-45,0),time); model1 rotateto( model1.angles + ( -10, -45, 0 ), time );
model2 rotateto(model2.angles+(-10,-45,0),time); model2 rotateto( model2.angles + ( -10, -45, 0 ), time );
wait( time ); wait( time );
} }