IAmChrisAMA/iw4x-rawfiles
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: format

Browse Source
This commit is contained in:
FutureRave committed 2023-03-18 11:08:23 +00:00
1 parent 93a2a27df1
commit f7eed4ac86
24 files changed
+65 -65
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

iw4x/iw4x_00/maps/mp/_explosive_barrels.gsc
+1 -1
View File
@@ -22,7 +22,7 @@ main()
if(isdefined(oilspill) && oilspill.size > 0)
{
level.breakables_fx["oilspill"]["burn"] = loadfx ("props/barrel_fire");
level.breakables_fx["oilspill"]["spark"] = loadfx("impacts/small_metalhit_1");
level.breakables_fx["oilspill"]["spark"] = loadfx("impacts/small_metalhit_1");
}
//------------------
iw4x/iw4x_00/maps/mp/co_hunted_fx.gsc
+1 -1
View File
@@ -4,7 +4,7 @@
main()
{
//level._effect["firelp_vhc_lrg_pm_farview"] = loadfx ("fire/firelp_vhc_lrg_pm_farview");
//level._effect["lighthaze"] = loadfx ("misc/lighthaze");
//level._effect["lighthaze"] = loadfx ("misc/lighthaze");
level._effect[ "firelp_med_pm" ] = loadfx( "fire/firelp_med_pm" );
level._effect[ "firelp_small_pm" ] = loadfx( "fire/firelp_small_pm" );
level._effect[ "firelp_small_pm_a" ] = loadfx( "fire/firelp_small_pm_a" );
iw4x/iw4x_00/maps/mp/gametypes/_gamelogic.gsc
+3 -3
View File
@@ -5,7 +5,7 @@
FACTION_REF_COL = 0;
FACTION_NAME_COL = 1;
FACTION_SHORT_NAME_COL = 1;
FACTION_WIN_GAME_COL = 3;
FACTION_WIN_GAME_COL = 3;
FACTION_WIN_ROUND_COL = 4;
FACTION_MISSION_ACCOMPLISHED_COL = 5;
FACTION_ELIMINATED_COL = 6;
@@ -1099,7 +1099,7 @@ timeUntilRoundEnd()
timeRemaining = (getTimeLimit() * 60) - timePassed;
if ( isDefined( level.timePaused ) )
timeRemaining += level.timePaused;
timeRemaining += level.timePaused;
return timeRemaining + level.postRoundTime;
}
@@ -1238,7 +1238,7 @@ Callback_StartGameType()
levelFlagInit( "round_over", false );
levelFlagInit( "game_over", false );
levelFlagInit( "block_notifies", false );
levelFlagInit( "block_notifies", false );
level.prematchPeriod = 0;
level.prematchPeriodEnd = 0;
iw4x/iw4x_00/maps/mp/gametypes/_music_and_dialog.gsc
+1 -1
View File
@@ -492,7 +492,7 @@ suspenseMusic()
{
wait ( randomFloatRange( 60, 120 ) );
playSoundOnPlayers( game["music"]["suspense"][randomInt(numTracks)] );
playSoundOnPlayers( game["music"]["suspense"][randomInt(numTracks)] );
}
}
iw4x/iw4x_00/maps/mp/gametypes/_playerlogic.gsc
+1 -1
View File
@@ -619,7 +619,7 @@ spawnPlayer()
self setClientDvar( "cg_thirdPerson", "0" );
self setDepthOfField( 0, 0, 512, 512, 4, 0 );
//self setClientDvar( "cg_fov", "65" );
//self setClientDvar( "cg_fov", "65" );
// Don't do this stuff for TI spawn points
if ( isDefined( spawnPoint ) )
iw4x/iw4x_00/maps/mp/gametypes/dd.gsc
+2 -2
View File
@@ -692,7 +692,7 @@ bombPlanted( destroyedObj, player )
if ( level.destroyedObject.label == "_a" )
level.aPlanted = true;
else
level.bPlanted = true;
level.bPlanted = true;
level.destroyedObject.bombPlanted = true;
@@ -719,7 +719,7 @@ bombHandler( player, destType )
if ( self.label == "_a" )
level.aPlanted = false;
else
level.bPlanted = false;
level.bPlanted = false;
self.bombPlanted = 0;
iw4x/iw4x_00/maps/mp/gametypes/oneflag.gsc
+1 -1
View File
@@ -519,7 +519,7 @@ flagCaptured( winningTeam, endReasonText )
onTimeLimit()
{
if ( level.flagCaptured )
return;
return;
// TODO: change to "Flag Defended" or some such
maps\mp\gametypes\_gamelogic::endGame( game["defenders"], game["strings"]["time_limit_reached"] );
iw4x/iw4x_00/maps/mp/killstreaks/_ac130.gsc
+7 -7
View File
@@ -185,21 +185,21 @@ init_sounds()
add_context_sensative_dialog( "ai", "in_sight", 7, "ac130_fco_gonnagethim" ); // You gonna get him?
add_context_sensative_dialog( "ai", "in_sight", 8, "ac130_fco_personnelthere" ); // Personnel right there.
add_context_sensative_dialog( "ai", "in_sight", 9, "ac130_fco_nailthoseguys" ); // Nail those guys.
add_context_sensative_dialog( "ai", "in_sight", 11, "ac130_fco_lightemup" ); // Light ‘em up.
add_context_sensative_dialog( "ai", "in_sight", 11, "ac130_fco_lightemup" ); // Light �em up.
add_context_sensative_dialog( "ai", "in_sight", 12, "ac130_fco_takehimout" ); // Yeah take him out.
add_context_sensative_dialog( "ai", "in_sight", 14, "ac130_plt_yeahcleared" ); // Yeah, cleared to engage.
add_context_sensative_dialog( "ai", "in_sight", 15, "ac130_plt_copysmoke" ); // Copy, smoke ‘em.
add_context_sensative_dialog( "ai", "in_sight", 15, "ac130_plt_copysmoke" ); // Copy, smoke �em.
add_context_sensative_dialog( "ai", "in_sight", 16, "ac130_fco_rightthere" ); // Right there...tracking.
add_context_sensative_dialog( "ai", "in_sight", 17, "ac130_fco_tracking" ); // Tracking.
add_context_sensative_dialog( "ai", "wounded_crawl", 0, "ac130_fco_movingagain" ); // Ok he’s moving again.
add_context_sensative_dialog( "ai", "wounded_crawl", 0, "ac130_fco_movingagain" ); // Ok he�s moving again.
add_context_sensative_timeout( "ai", "wounded_crawl", undefined, 6 );
add_context_sensative_dialog( "ai", "wounded_pain", 0, "ac130_fco_doveonground" ); // Yeah, he just dove on the ground.
add_context_sensative_dialog( "ai", "wounded_pain", 1, "ac130_fco_knockedwind" ); // Probably just knocked the wind out of him.
add_context_sensative_dialog( "ai", "wounded_pain", 2, "ac130_fco_downstillmoving" ); // That guy's down but still moving.
add_context_sensative_dialog( "ai", "wounded_pain", 3, "ac130_fco_gettinbackup" ); // He's gettin' back up.
add_context_sensative_dialog( "ai", "wounded_pain", 4, "ac130_fco_yepstillmoving" ); // Yep, that guy’s still moving.
add_context_sensative_dialog( "ai", "wounded_pain", 4, "ac130_fco_yepstillmoving" ); // Yep, that guy�s still moving.
add_context_sensative_dialog( "ai", "wounded_pain", 5, "ac130_fco_stillmoving" ); // He's still moving.
add_context_sensative_timeout( "ai", "wounded_pain", undefined, 12 );
@@ -594,7 +594,7 @@ removeAC130Player( player, disconnected )
{
player clearUsingRemote();
player stopLocalSound( "missile_incoming" );
player stopLocalSound( "missile_incoming" );
player show();
player unlink();
@@ -1673,7 +1673,7 @@ stingerProximityDetonate( player, missileTeam )
missileTarget = newTarget;
if ( isDefined( level.ac130player ) )
level.ac130player stopLocalSound( "missile_incoming" );
level.ac130player stopLocalSound( "missile_incoming" );
}
if ( curDist < minDist )
@@ -1699,7 +1699,7 @@ stingerProximityDetonate( player, missileTeam )
if ( isDefined( level.ac130player ) )
{
level.ac130player stopLocalSound( "missile_incoming" );
level.ac130player stopLocalSound( "missile_incoming" );
if ( level.ac130player.team != missileTeam )
radiusDamage( self.origin, 1000, 1000, 1000, player );
iw4x/iw4x_00/maps/mp/killstreaks/_airstrike.gsc
+7 -7
View File
@@ -417,7 +417,7 @@ airstrikeDamageEntsThread( sWeapon )
ent = level.airstrikeDamagedEnts[level.airstrikeDamagedEntsIndex];
if ( !isDefined( ent.entity ) )
continue;
continue;
if ( !ent.isPlayer || isAlive( ent.entity ) )
{
@@ -533,7 +533,7 @@ doBomberStrike( lifeId, owner, requiredDeathCount, bombsite, startPoint, endPoin
plane.angles = direction;
forward = anglesToForward( direction );
plane moveTo( pathEnd, flyTime, 0, 0 );
plane moveTo( pathEnd, flyTime, 0, 0 );
thread stealthBomber_killCam( plane, pathEnd, flyTime, airStrikeType );
@@ -542,7 +542,7 @@ doBomberStrike( lifeId, owner, requiredDeathCount, bombsite, startPoint, endPoin
// Delete the plane after its flyby
wait ( flyTime );
plane notify( "delete" );
plane delete();
plane delete();
}
@@ -693,11 +693,11 @@ doPlaneStrike( lifeId, owner, requiredDeathCount, bombsite, startPoint, endPoint
plane.angles = direction;
forward = anglesToForward( direction );
plane thread playPlaneFx();
plane moveTo( pathEnd, flyTime, 0, 0 );
plane moveTo( pathEnd, flyTime, 0, 0 );
/#
if ( getdvar("scr_airstrikedebug") == "1" )
thread airstrikeLine( pathStart, pathEnd, (1,1,1), 20 );
thread airstrikeLine( pathStart, pathEnd, (1,1,1), 20 );
#/
//thread callStrike_planeSound( plane, bombsite );
@@ -706,7 +706,7 @@ doPlaneStrike( lifeId, owner, requiredDeathCount, bombsite, startPoint, endPoint
// Delete the plane after its flyby
wait flyTime;
plane notify( "delete" );
plane delete();
plane delete();
}
callStrike_bombEffect( plane, pathEnd, flyTime, launchTime, owner, requiredDeathCount, typeOfStrike )
@@ -1025,7 +1025,7 @@ targetisinfront(other, target)
{
forwardvec = anglestoforward(flat_angle(other.angles));
normalvec = vectorNormalize(flat_origin(target)-other.origin);
dot = vectordot(forwardvec,normalvec);
dot = vectordot(forwardvec,normalvec);
if(dot > 0)
return true;
else
iw4x/iw4x_00/maps/mp/killstreaks/_helicopter.gsc
+2 -2
View File
@@ -813,7 +813,7 @@ makeGunShip()
mgTurret makeTurretInoperable();
mgTurret.pers["team"] = self.team;
mgTurret.killCamEnt = self;
self.mgTurretLeft = mgTurret;
self.mgTurretLeft = mgTurret;
self.mgTurretLeft SetDefaultDropPitch( 0 );
mgTurret = spawnTurret( "misc_turret", self.origin, "pavelow_minigun_mp" );
@@ -825,7 +825,7 @@ makeGunShip()
mgTurret makeTurretInoperable();
mgTurret.pers["team"] = self.team;
mgTurret.killCamEnt = self;
self.mgTurretRight = mgTurret;
self.mgTurretRight = mgTurret;
self.mgTurretRight SetDefaultDropPitch( 0 );
if ( level.teamBased )
iw4x/iw4x_00/maps/mp/mp_bloc.gsc
+1 -1
View File
@@ -8,7 +8,7 @@ main()
setdvar( "compassmaxrange", "2000" );
ambientPlay( "ambient_trainer_ext2" );
ambientPlay( "ambient_trainer_ext2" );
game["attackers"] = "axis";
game["defenders"] = "allies";
iw4x/iw4x_00/maps/mp/mp_bloc_sh.gsc
+1 -1
View File
@@ -10,7 +10,7 @@ main()
setdvar( "compassmaxrange", "2000" );
ambientPlay( "ambient_trainer_ext2" );
ambientPlay( "ambient_trainer_ext2" );
game["attackers"] = "axis";
game["defenders"] = "allies";
iw4x/iw4x_00/maps/mp/mp_bloc_sh_fx.gsc
+1 -1
View File
@@ -5,7 +5,7 @@ main()
level._effect[ "leaves_ground_gentlewind_dust" ] = loadfx( "misc/leaves_ground_gentlewind_dust_sh" );
level._effect[ "dust_wind_slow_yel_loop" ] = loadfx( "dust/dust_wind_slow_yel_loop_sh" );
//level._effect[ "drips_player_hand" ] = loadfx( "water/drips_player_hand_sh" );
level._effect["water_spill_fall"] = loadfx("maps/mp_maps/fx_mp_water_spill");
level._effect["water_spill_fall"] = loadfx("maps/mp_maps/fx_mp_water_spill");
/#
if ( getdvar( "clientSideEffects" ) != "1" )
iw4x/iw4x_00/maps/mp/mp_firingrange_fx.gsc
+1 -1
View File
@@ -1,4 +1,4 @@
#include maps\mp\_utility;
#include maps\mp\_utility;
// Scripted effects
precache_scripted_fx()
iw4x/iw4x_00/maps/mp/mp_nuked_fx.gsc
+1 -1
View File
@@ -1,4 +1,4 @@
#include maps\mp\_utility;
#include maps\mp\_utility;
// fx used by utility scripts
precache_util_fx()