vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Implemented new impact effects based around materials

Browse source 
Implemented round-draw
Ricochet sounds and whatnot
This commit is contained in:
Marco Cawthorne 2017-01-07 17:29:27 +01:00
parent 99b25733a3
commit 5347482d9c
17 changed files with 202 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Source/Client/Defs.h
View file

@ -33,6 +33,13 @@ var float autocvar_cl_bobcycle = 0.8;
var float autocvar_cl_bobup = 0.5;
var float autocvar_cl_bobclassic = 0;
// Particle stuff
var float PARTICLE_SPARK;
var float PARTICLE_PIECES_BLACK;
var float PARTICLE_SMOKE_GREY;
var float PARTICLE_SMOKE_BROWN;
var float PARTICLE_BLOOD;
vector vHUDColor; // Defined in HUD_Draw (HUD.c)
vector vVGUIColor; // Defined in HUD_Draw (VGUI.c)
vector vCrossColor; // Defined in HUD_Draw (HUDCrosshair.c)

14
Source/Client/Event.c
View file

@ -124,6 +124,20 @@ void CSQC_Parse_Event( void ) {
Radio_BroadcastMessage( readbyte() );
} else if ( fHeader == EV_ORBITUARY ) {
HUD_AddOrbituaries( readbyte(), readbyte(), readbyte(), readbyte(), readbyte(), readbyte());
} else if ( fHeader == EV_IMPACT ) {
int iType;
vector vOrigin, vNormal;
iType = (int)readbyte();
vOrigin_x = readcoord();
vOrigin_y = readcoord();
vOrigin_z = readcoord();
vNormal_x = readcoord();
vNormal_y = readcoord();
vNormal_z = readcoord();
Effect_Impact( iType, vOrigin, vNormal );
}
}

6
Source/Client/Init.c
View file

@ -46,6 +46,12 @@ void CSQC_Init(float apilevel, string enginename, float engineversion) {
precache_model( sViewModels[ i ] );
}
PARTICLE_SPARK = particleeffectnum( "part_spark" );
PARTICLE_PIECES_BLACK = particleeffectnum( "part_pieces_black" );
PARTICLE_SMOKE_GREY = particleeffectnum( "part_smoke_grey" );
PARTICLE_SMOKE_BROWN = particleeffectnum( "part_smoke_brown" );
PARTICLE_BLOOD = particleeffectnum( "part_blood" );
Radio_InitSounds();
CSQC_ConsoleCommand_Init();

13
Source/Globals.h
View file

@ -200,6 +200,7 @@ enum {
EV_WEAPON_PRIMARYATTACK,
EV_WEAPON_SECONDARYATTACK,
EV_WEAPON_RELOAD,
EV_IMPACT,
EV_MODELGIB,
EV_CAMERATRIGGER,
EV_RADIOMSG,
@ -220,6 +221,18 @@ enum {
MATERIAL_NONE
};
// Impact types
enum {
IMPACT_MELEE = 0,
IMPACT_EXPLOSION,
IMPACT_DEFAULT,
IMPACT_GLASS,
IMPACT_WOOD,
IMPACT_METAL,
IMPACT_FLESH,
IMPACT_ROCK,
};
// Actually used by input_button etc.
#define INPUT_BUTTON0 1
#define INPUT_BUTTON2 2

8
Source/Server/Damage.c
View file

@ -84,14 +84,6 @@ void Damage_Apply( entity eTarget, entity eAttacker, int iDamage, vector vHitPos
bprint( sprintf( "[DEBUG] Hit Bodypart: %s\n", Damage_GetHitLocation( trace_surface_id ) ) );
// Don't be like Q1 and make everything bleed.
if ( eTarget.iBleeds == TRUE ) {
makevectors( eAttacker.angles );
pointparticles( EFFECT_BLOOD, vHitPos, v_forward * -1, 1 );
} else {
pointparticles( EFFECT_GUNSHOT, trace_endpos, trace_plane_normal, 1 );
}
// Target is dead and a client....
if ( eTarget.health <= 0 ) {
if ( eTarget.flags & FL_CLIENT ) {

5
Source/Server/Defs.h
View file

@ -46,10 +46,6 @@ enum {
BODY_LEGRIGHT
};
// Particle Fields
float EFFECT_GUNSHOT;
float EFFECT_BLOOD;
// Player specific fields
.float fInBuyZone;
.float fInHostageZone;
@ -145,6 +141,7 @@ void BaseMelee_Attack( void );
float Player_GetMaxSpeed( float fWeapon );
void Effect_Impact( int iType, vector vPos, vector vNormal );
void TraceAttack_FireBullets( int iShots );
void Damage_Radius( vector vOrigin, entity eAttacker, float fDamage, float fRadius );
void Damage_Apply( entity eTarget, entity eAttacker, int iDamage, vector vHitPos );

17
Source/Server/Entities.c
View file

@ -284,4 +284,21 @@ void func_illusionary( void ){
void func_water( void ) {
func_wall();
self.skin = CONTENT_WATER;
/*self.forceshader = shaderforname( "{\n"
"surfaceparm nodlight\n"
"surfaceparm nomarks\n"
"{\n"
"map $refraction\n"
"}\n"
"{\n"
"map $null\n"
"}\n"
"{\n"
"map $ripplemap\n"
"}\n"
"{\n"
"map $null\n"
"}\n"
"program altwater#RIPPLEMAP#FRESNEL=4\n"
"}\n" );*/
}

6
Source/Server/Footsteps.c
View file

@ -29,7 +29,7 @@ TODO: Read sound/materials.txt and use that somehow
*/
void Footsteps_Update( void ) {
float fForce;
float dDelay;
float fDelay;
vector vStep;
string sStepSound = "";
@ -42,7 +42,7 @@ void Footsteps_Update( void ) {
vStep_y = fabs( self.velocity_y );
fForce = ( vStep_x + vStep_y );
dDelay = clamp( 0.1, 1 / ( fForce / 90 ), 1 );
fDelay = clamp( 0.1, 1 / ( fForce / 100 ), 1 );
traceline( self.origin + self.view_ofs, self.origin + '0 0 -48', FALSE, self );
@ -85,6 +85,6 @@ void Footsteps_Update( void ) {
}
sound( self, CHAN_BODY, sStepSound, 0.5, ATTN_IDLE );
self.fSteptime = time + dDelay;
self.fSteptime = time + fDelay;
}
}

4
Source/Server/FuncLadder.c
View file

@ -35,7 +35,7 @@ void func_ladder_sound( entity target ) {
}
float fForce = vStep;
float dDelay = ( clamp( 0.1, 1 / (fForce / 50), 1 ) );
float fDelay = clamp( 0.1, 1 / ( fForce / 90 ), 1 );
float fRandom = random();
if ( fRandom <= 0.25 ) {
@ -48,7 +48,7 @@ void func_ladder_sound( entity target ) {
sound( target, CHAN_BODY, "player/pl_ladder4.wav", 0.5, ATTN_IDLE );
}
target.fStepTime = ( time + dDelay );
target.fStepTime = ( time + fDelay );
}
/*

3
Source/Server/Main.c
View file

@ -85,9 +85,6 @@ void worldspawn( void ) {
precache_model( "models/player/vip/vip.mdl" );
precache_model( "models/w_c4.mdl" );
EFFECT_GUNSHOT = particleeffectnum( "te_gunshot" );
EFFECT_BLOOD = particleeffectnum( "te_blood" );
precache_sound( "hostage/hos1.wav" );
precache_sound( "hostage/hos2.wav" );
precache_sound( "hostage/hos3.wav" );

21
Source/Server/Player.c
View file

@ -69,20 +69,23 @@ void Player_Death( void ) {
if ( self.team == TEAM_T ) {
iAlivePlayers_T--;
// If the bomb has been planted, T deaths don't matter anymore
if ( ( iAlivePlayers_T == 0 ) && ( iBombPlanted == FALSE ) ) {
Rules_RoundOver( TEAM_CT, 3600, FALSE );
}
} else if ( self.team == TEAM_CT ) {
iAlivePlayers_CT--;
if ( iAlivePlayers_CT == 0 ) {
Rules_RoundOver( TEAM_T, 3600, FALSE );
}
} else if ( self.team == TEAM_VIP ) {
iAlivePlayers_CT--; // For consistency
Rules_RoundOver( TEAM_T, 2500, FALSE );
return;
}
if ( ( iAlivePlayers_T == 0 ) && ( iAlivePlayers_CT == 0 ) && ( iBombPlanted == FALSE ) ) {
Rules_RoundOver( FALSE, 3600, FALSE );
} else {
// If the bomb has been planted, T deaths don't matter anymore
if ( ( iAlivePlayers_T == 0 ) && ( iBombPlanted == FALSE ) ) {
Rules_RoundOver( TEAM_CT, 3600, FALSE );
} else if ( iAlivePlayers_CT == 0 ) {
Rules_RoundOver( TEAM_T, 3600, FALSE );
}
}
}

27
Source/Server/TraceAttack.c
View file

@ -32,8 +32,33 @@ void TraceAttack_FireBullets( int iShots ) {
if (trace_fraction != 1.0) {
if ( trace_ent.takedamage == DAMAGE_YES ) {
Damage_Apply( trace_ent, self, wptTable[ self.weapon ].iDamage, trace_endpos );
}
if ( trace_ent.iBleeds == TRUE ) {
Effect_Impact( IMPACT_FLESH, trace_endpos, trace_plane_normal );
} else {
pointparticles( EFFECT_GUNSHOT, trace_endpos, trace_plane_normal, 1 );
string sTexture = getsurfacetexture( trace_ent, getsurfacenearpoint( trace_ent, trace_endpos ) );
switch( (float)hash_get( hashMaterials, sTexture ) ) {
case 'M':
case 'V':
case 'G':
case 'P':
Effect_Impact( IMPACT_METAL, trace_endpos, trace_plane_normal );
break;
case 'D':
case 'W':
Effect_Impact( IMPACT_WOOD, trace_endpos, trace_plane_normal );
break;
case 'Y':
Effect_Impact( IMPACT_GLASS, trace_endpos, trace_plane_normal );
break;
case 'N':
case 'T':
default:
Effect_Impact( IMPACT_DEFAULT, trace_endpos, trace_plane_normal );
break;
}
}
}
iShots--;

6
Source/Shared/BaseMelee.c
View file

@ -42,7 +42,11 @@ void BaseMelee_Attack( void ) {
Damage_Apply( trace_ent, self, wptTable[ self.weapon ].iDamage, trace_endpos );
return;
} else {
pointparticles( EFFECT_GUNSHOT, trace_endpos, trace_plane_normal, 1 );
if ( trace_ent.iBleeds == TRUE ) {
Effect_Impact( IMPACT_FLESH, trace_endpos, trace_plane_normal );
} else {
Effect_Impact( IMPACT_MELEE, trace_endpos, trace_plane_normal );
}
}
}

58
Source/Shared/Effects.c
View file

@ -45,6 +45,64 @@ void Effect_AnimatedSprite( vector vPos, float fIndex, float fFPS, float fScale,
}
#endif
void Effect_Impact( int iType, vector vPos, vector vNormal ) {
#ifdef SSQC
WriteByte( MSG_MULTICAST, SVC_CGAMEPACKET );
WriteByte( MSG_MULTICAST, EV_IMPACT );
WriteByte( MSG_MULTICAST, (float)iType );
WriteCoord( MSG_MULTICAST, vPos_x);
WriteCoord( MSG_MULTICAST, vPos_y);
WriteCoord( MSG_MULTICAST, vPos_z);
WriteCoord( MSG_MULTICAST, vNormal_x);
WriteCoord( MSG_MULTICAST, vNormal_y);
WriteCoord( MSG_MULTICAST, vNormal_z);
msg_entity = self;
multicast( vPos, MULTICAST_PVS );
#else
switch ( iType ) {
case IMPACT_MELEE:
pointparticles( PARTICLE_PIECES_BLACK, vPos, vNormal, 1 );
pointsound( vPos, "weapons/knife_hitwall1.wav", 1, ATTN_STATIC );
break;
case IMPACT_EXPLOSION:
break;
case IMPACT_GLASS:
pointparticles( PARTICLE_PIECES_BLACK, vPos, vNormal, 1 );
break;
case IMPACT_WOOD:
pointparticles( PARTICLE_SPARK, vPos, vNormal, 1 );
pointparticles( PARTICLE_PIECES_BLACK, vPos, vNormal, 1 );
pointparticles( PARTICLE_SMOKE_BROWN, vPos, vNormal, 1 );
break;
case IMPACT_METAL:
pointparticles( PARTICLE_SPARK, vPos, vNormal, 1 );
pointparticles( PARTICLE_SPARK, vPos, vNormal, 1 );
pointparticles( PARTICLE_PIECES_BLACK, vPos, vNormal, 1 );
break;
case IMPACT_FLESH:
pointparticles( PARTICLE_BLOOD, vPos, vNormal, 1 );
break;
case IMPACT_DEFAULT:
pointparticles( PARTICLE_SPARK, vPos, vNormal, 1 );
pointparticles( PARTICLE_PIECES_BLACK, vPos, vNormal, 1 );
pointparticles( PARTICLE_SMOKE_GREY, vPos, vNormal, 1 );
break;
default:
}
switch ( iType ) {
case IMPACT_METAL:
pointsound( vPos, sprintf( "weapons/ric_metal-%d.wav", floor( ( random() * 2 ) + 1 ) ), 1, ATTN_STATIC );
break;
default:
pointsound( vPos, sprintf( "weapons/ric%d.wav", floor( ( random() * 5 ) + 1 ) ), 1, ATTN_STATIC );
break;
}
#endif
}
void Effect_BreakModel( vector vMins, vector vMaxs, vector vVel, float fStyle ) {
#ifdef SSQC
WriteByte( MSG_MULTICAST, SVC_CGAMEPACKET );

BIN
opencs/csprogs.dat
View file

Binary file not shown.

59
opencs/particles/default.cfg
View file

@ -1,10 +1,10 @@
r_part te_gunshot
r_part part_spark
{
type texturedspark
texture ball
tcoords 1 65 31 95 256 8 32
scale 1
count 8
count 4
scalefactor 1
alpha 0.5
die 0.8
@ -18,24 +18,7 @@ r_part te_gunshot
gravity 800
}
r_part +te_gunshot
{
texture ball
tcoords 1 65 31 95 256 8 32
count 3
scale 25
scalefactor 1
die 1
alpha 0.5
rgb 10 10 10
blend add
spawnmode ball
spawnorg 2
spawnvel 20
veladd 20
}
r_part +te_gunshot
r_part part_pieces_black
{
type ball
texture ball
@ -54,7 +37,41 @@ r_part +te_gunshot
gravity 800
}
r_part te_blood
r_part part_smoke_brown
{
texture ball
tcoords 1 65 31 95 256 8 32
count 3
scale 25
scalefactor 1
die 1
alpha 0.5
rgb 155 90 0
blend add
spawnmode ball
spawnorg 2
spawnvel 20
veladd 20
}
r_part part_smoke_grey
{
texture ball
tcoords 1 65 31 95 256 8 32
count 3
scale 25
scalefactor 1
die 1
alpha 0.5
rgb 25 25 25
blend add
spawnmode ball
spawnorg 2
spawnvel 20
veladd 20
}
r_part part_blood
{
type texturedspark
texture ball

BIN
opencs/progs.dat
View file

Binary file not shown.