Skip to content

Commit

Permalink
Promod LIVE V2.05 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Trivve authored and Ingramz committed Sep 30, 2009
1 parent 8c3bc0e commit c610576
Show file tree
Hide file tree
Showing 91 changed files with 1,954 additions and 3,198 deletions.
Binary file modified 7za.exe
Binary file not shown.
4 changes: 2 additions & 2 deletions compile.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

@echo off

SET mod_name=promodlive204
SET mod_name=promodlive205
SET work_directory=%~dp0
cd %work_directory%

del ..\%mod_name%\*.iwd

7za a -r -mx=9 -mpass=15 -mfb=258 -mmt=on -mtc=off -tzip ..\%mod_name%\%mod_name%.iwd weapons images sound
7za a -r -mx=9 -mpass=15 -mfb=258 -mmt=on -mtc=off -tzip ..\%mod_name%\%mod_name%.iwd weapons images sound default_mp.cfg
7za a -r -mx=9 -mpass=15 -mfb=258 -mmt=on -mtc=off -tzip ..\%mod_name%\z_custom_ruleset.iwd promod_ruleset

compile_fastfile.bat
5 changes: 1 addition & 4 deletions compile_fastfile.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@

@echo off

xcopy images ..\..\raw\images\ /SY
xcopy maps ..\..\raw\maps\ /SY
xcopy material_properties ..\..\raw\material_properties\ /SY
xcopy materials ..\..\raw\materials\ /SY
xcopy promod ..\..\raw\promod\ /SY
xcopy shock ..\..\raw\shock\ /SY
xcopy sound ..\..\raw\sound\ /SY
Expand All @@ -24,7 +21,7 @@ copy promod.str ..\..\raw\english\localizedstrings /Y
cd ..\..\bin
linker_pc.exe -language english -compress -cleanup mod -verbose

cd ..\mods\promodlive204
cd ..\mods\promodlive205
copy ..\..\zone\english\mod.ff

pause
11 changes: 11 additions & 0 deletions default_mp.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
exec default_mp_gamesettings.cfg

set ui_buildLocation -60 460

sets __promod_attack_score ""
sets __promod_defence_score ""
sets __promod_ticker ""
sets __promod_version ""
sets __promod_mode ""

con_showchannel *
File renamed without changes.
File renamed without changes.
103 changes: 6 additions & 97 deletions maps/mp/_destructible.gsc
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ setup_destructibles()
if ( isdefined( level.destructible_type[ self.destuctableInfo ].parts[ i ][ 0 ].v[ "health" ] ) )
self.destructible_parts[ i ].v[ "health" ] = level.destructible_type[ self.destuctableInfo ].parts[ i ][ 0 ].v[ "health" ];

if ( i == 0 )
if ( !i )
continue;

modelName = level.destructible_type[ self.destuctableInfo ].parts[ i ][ 0 ].v[ "modelName" ];
Expand Down Expand Up @@ -397,7 +397,7 @@ destructible_update_part( damage, modelName, tagName, point, direction_vec, atta
{
if ( !isdefined( self.destructible_parts ) )
return;
if ( self.destructible_parts.size == 0 )
if ( !self.destructible_parts.size )
return;

partIndex = -1;
Expand Down Expand Up @@ -513,7 +513,7 @@ destructible_update_part( damage, modelName, tagName, point, direction_vec, atta

if ( isdefined( level.destructible_type[ self.destuctableInfo ].parts[ partIndex ][ stateIndex ] ) )
{
if ( partIndex == 0 )
if ( !partIndex )
{
newModel = level.destructible_type[ self.destuctableInfo ].parts[ partIndex ][ stateIndex ].v[ "modelName" ];
self setModel( newModel );
Expand Down Expand Up @@ -567,9 +567,9 @@ destructible_update_part( damage, modelName, tagName, point, direction_vec, atta
self.animsApplied = [];
self.animsApplied[ self.animsApplied.size ] = animName;

if ( partIndex == 0 )
if ( !partIndex )
self thread explodeAnim();
}
}
}

if ( !isdefined( self.exploded ) )
Expand Down Expand Up @@ -637,18 +637,7 @@ destructible_update_part( damage, modelName, tagName, point, direction_vec, atta
}

if ( isdefined( level.destructible_type[ self.destuctableInfo ].parts[ partIndex ][ actionStateIndex ].v[ "physics" ] ) )
{
initial_velocity = point;
impactDir = ( 0, 0, 0 );
if ( isdefined( attacker ) )
{
impactDir = attacker.origin;
initial_velocity = vectorNormalize( point - impactDir);
initial_velocity = vectorScale( initial_velocity, 200 );
}
self thread physics_launch( partIndex, actionStateIndex, point, initial_velocity );
return;
}

updateHealthValue = true;
}
Expand Down Expand Up @@ -678,7 +667,7 @@ destructible_splash_damage( damage, point, direction_vec, attacker, damageType )
modelName = level.destructible_type[ self.destuctableInfo ].parts[ i ][ j ].v[ "modelName" ];
assert( isdefined( modelName ) );

if ( i == 0 )
if ( !i )
{
d = distance( point, self.origin );
tagName = undefined;
Expand Down Expand Up @@ -816,41 +805,6 @@ health_drain( amount, interval, partIndex, modelName, tagName )
}
}

physics_launch( partIndex, stateIndex, point, initial_velocity )
{
modelName = level.destructible_type[ self.destuctableInfo ].parts[ partIndex ][ stateIndex ].v[ "modelName" ];
tagName = level.destructible_type[ self.destuctableInfo ].parts[ partIndex ][ stateIndex ].v[ "tagName" ];

self hideapart( tagName );

if ( getdvar( "destructibles_enable_physics" ) == "0" )
return;

if ( level.destructibleSpawnedEnts.size >= level.destructibleSpawnedEntsLimit )
physics_object_remove( level.destructibleSpawnedEnts[ 0 ] );

physicsObject = spawn( "script_model", self getTagOrigin( tagName ) );
physicsObject.angles = self getTagAngles( tagName );
physicsObject setModel( modelName );

level.destructibleSpawnedEnts[ level.destructibleSpawnedEnts.size ] = physicsObject;

physicsObject physicsLaunch( point, initial_velocity );
}

physics_object_remove( ent )
{
newArray = [];
for( i = 0 ; i < level.destructibleSpawnedEnts.size ; i++ )
{
if ( level.destructibleSpawnedEnts[ i ] == ent )
continue;
newArray[ newArray.size ] = level.destructibleSpawnedEnts[ i ];
}
level.destructibleSpawnedEnts = newArray;
ent delete();
}

explode( partIndex, force_min, force_max, range, mindamage, maxdamage )
{
assert( isdefined( force_min ) );
Expand All @@ -874,63 +828,18 @@ explode( partIndex, force_min, force_max, range, mindamage, maxdamage )

waittillframeend;

if ( isdefined( level.destructible_type[self.destuctableInfo].parts ) )
{
for( i = ( level.destructible_type[ self.destuctableInfo ].parts.size - 1 ) ; i >= 0 ; i-- )
{
if ( i == partIndex )
continue;

stateIndex = self.destructible_parts[ i ].v[ "currentState" ];
if ( stateIndex >= level.destructible_type[ self.destuctableInfo ].parts[ i ].size )
stateIndex = level.destructible_type[ self.destuctableInfo ].parts[ i ].size - 1;
modelName = level.destructible_type[ self.destuctableInfo ].parts[ i ][ stateIndex ].v[ "modelName" ];
tagName = level.destructible_type[ self.destuctableInfo ].parts[ i ][ stateIndex ].v[ "tagName" ];

if ( !isdefined( modelName ) )
continue;
if ( !isdefined( tagName ) )
continue;

if ( self.destructible_parts[ i ] isLinked() )
{
if ( isdefined( level.destructible_type[ self.destuctableInfo ].parts[ i ][ 0 ].v[ "physicsOnExplosion" ] ) )
{
if ( level.destructible_type[ self.destuctableInfo ].parts[ i ][ 0 ].v[ "physicsOnExplosion" ] > 0 )
{
velocityScaler = level.destructible_type[ self.destuctableInfo ].parts[ i ][ 0 ].v[ "physicsOnExplosion" ];

point = self getTagOrigin( tagName );
initial_velocity = vectorNormalize( point - explosionOrigin );
initial_velocity = vectorScale( initial_velocity, randomfloatrange( force_min, force_max ) * velocityScaler );

self thread physics_launch( i, stateIndex, point, initial_velocity );
continue;
}
}
}
}
}

self notify( "stop_taking_damage" );
wait 0.05;

if ( !isDefined( self.damageOwner ) )
{
self radiusDamage( explosionOrigin + ( 0, 0, 80 ), range, maxdamage, mindamage );
}
else
{
self radiusDamage( explosionOrigin + ( 0, 0, 80 ), range, maxdamage, mindamage, self.damageOwner );
self.damageOwner notify ( "destroyed_car" );
}
}

isLinked()
{
return !isDefined( self.unlinked );
}

play_loop_sound_on_destructible( alias, tag )
{
org = spawn ( "script_origin", ( 0, 0, 0 ) );
Expand Down
2 changes: 1 addition & 1 deletion maps/mp/_destructible_types.gsc
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ getInfoIndex( destructibleType )
{
if ( !isdefined( level.destructible_type ) )
return -1;
if ( level.destructible_type.size == 0 )
if ( !level.destructible_type.size )
return -1;

for( i = 0 ; i < level.destructible_type.size ; i++ )
Expand Down
8 changes: 4 additions & 4 deletions maps/mp/_explosive_barrels.gsc
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ oil_spill_burn(P, dest)
right = anglestoright(angle);

barrels = getentarray ("explodable_barrel","targetname");
distsqr = 22 * 22;
distsqr = 484;

test = spawn("script_origin", P);

Expand Down Expand Up @@ -268,15 +268,15 @@ explodable_barrel_burn()
playfx (level.breakables_fx["barrel"]["burn_start"], self.origin + offset1);
startedfx = true;
}

if (count > 20)
count = 0;

playfx (level.breakables_fx["barrel"]["burn"], self.origin + offset2);

if (count == 0)
{
if (!count)
self.damageTaken += (10 + randomfloat(10));
}

count++;
wait 0.05;
}
Expand Down
8 changes: 2 additions & 6 deletions maps/mp/_flashgrenades.gsc
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ flashRumbleLoop( duration )
monitorFlash()
{
self endon("disconnect");

self.flashEndTime = 0;
while(1)
{
Expand Down Expand Up @@ -72,13 +73,8 @@ monitorFlash()
assert(isdefined(self.pers["team"]));
if (level.teamBased && isdefined(attacker) && isdefined(attacker.pers["team"]) && attacker.pers["team"] == self.pers["team"] && attacker != self)
{
if(level.friendlyfire == 0)
{
if(!level.friendlyfire)
continue;
}
else if(level.friendlyfire == 1)
{
}
else if(level.friendlyfire == 2)
{
duration = duration * .5;
Expand Down
4 changes: 2 additions & 2 deletions maps/mp/_load.gsc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ main( bScriptgened, bCSVgened, bsgenabled )
level.flags_lock = [];
}

setDvar("scr_RequiredMapAspectratio", "1");
setDvar("scr_RequiredMapAspectratio", 1);

thread maps\mp\gametypes\_tweakables::init();
thread maps\mp\_minefields::minefields();
Expand Down Expand Up @@ -94,7 +94,7 @@ exploder_load( trigger )
level thread exploder_load( trigger );
return;
}
maps\mp\_utility::exploder( trigger.script_exploder );
exploder( trigger.script_exploder );
level notify( "killexplodertridgers" + trigger.script_exploder );
}

Expand Down
4 changes: 0 additions & 4 deletions maps/mp/gametypes/_class.gsc
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
Terms of license can be found in LICENSE.md document bundled with the project.
*/

#include common_scripts\utility;
#include maps\mp\_utility;
#include maps\mp\gametypes\_hud_util;

init()
{
level.primary_weapon_array = [];
Expand Down
Loading

0 comments on commit c610576

Please sign in to comment.