diff options
| author | Mikko Tiusanen <ams@daug.net> | 2014-05-15 22:13:54 +0300 |
|---|---|---|
| committer | Mikko Tiusanen <ams@daug.net> | 2014-05-15 22:13:54 +0300 |
| commit | 8d5bc92565146baee1f77f8ff7a9b6d229e05613 (patch) | |
| tree | a6b37c333b710857ca8778b12297a7bab4e64ebb /src | |
| parent | de7bd9bbba26589b9deb1e7c9eda80a75ff0184f (diff) | |
Mines no longer trigger on anything <= adv. basilisk.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cgame/cg_scanner.c | 6 | ||||
| -rw-r--r-- | src/game/bg_misc.c | 2 | ||||
| -rw-r--r-- | src/game/g_missile.c | 4 | ||||
| -rw-r--r-- | src/game/tremulous.h | 20 |
4 files changed, 17 insertions, 15 deletions
diff --git a/src/cgame/cg_scanner.c b/src/cgame/cg_scanner.c index f4c86de..ad3d47d 100644 --- a/src/cgame/cg_scanner.c +++ b/src/cgame/cg_scanner.c @@ -57,9 +57,9 @@ void CG_UpdateEntityPositions( void ) for( i = 0; i < cg.snap->numEntities; i++ ) { cent = &cg_entities[ cg.snap->entities[ i ].number ]; - //make adv basilisk invisble to human helmet if invisble + //make adv basilisk invisble to human helmet if invisble if( cent->currentState.eType == ET_BUILDABLE && - !( cent->currentState.eFlags & EF_DEAD )) + !( cent->currentState.eFlags & EF_DEAD )) { // add to list of item positions (for creep) if( cent->currentState.modelindex2 == TEAM_ALIENS ) @@ -84,7 +84,7 @@ void CG_UpdateEntityPositions( void ) else if( cent->currentState.eType == ET_PLAYER ) { int team = cent->currentState.misc & 0x00FF; - //make adv basilisk invisble to radar if invisble + //make adv basilisk invisble to radar if invisble if( team == TEAM_ALIENS && !(cent->invisible ) ) { VectorCopy( cent->lerpOrigin, entityPositions.alienClientPos[ diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index 404b24b..c968d76 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -3620,7 +3620,7 @@ static const weaponAttributes_t bg_weapons[ ] = qfalse, //qboolean longRanged; TEAM_HUMANS //team_t team; }, - { + { WP_SMOKE, //int weaponNum; SMOKE_PRICE, //int price; ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages diff --git a/src/game/g_missile.c b/src/game/g_missile.c index 7ee7dea..aaa1f2b 100644 --- a/src/game/g_missile.c +++ b/src/game/g_missile.c @@ -520,7 +520,9 @@ void G_ProcessMine(gentity_t *ent) { // Loop entities looking for an enemy body for(i=0; i<total_entities; i++) { target = &g_entities[entityList[i]]; - if(target->client && target->client->ps.stats[ STAT_TEAM ] == TEAM_ALIENS) { + if(target->client && + target->client->ps.stats[ STAT_TEAM ] == TEAM_ALIENS && + target->client->ps.weapon > WP_ALEVEL1_UPG ) { if (G_Visible( ent, target, MASK_SHOT )) { // Found an enemy, boom time! diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 82a2c7e..8dd2ccd 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -402,18 +402,18 @@ TREMULOUS EDGE MOD SRC FILE #define GRENADE_RANGE 192.0f #define GRENADE_SPEED 700.0f -#define MINE_PRICE 1000 +#define MINE_PRICE 1000 #define MINE_REPEAT 0 #define MINE_K_SCALE 1.0f #define MINE_DAMAGE HDM(250) -#define MINE_RANGE 200.0f -#define MINE_DETECT 100.0f +#define MINE_RANGE 200.0f +#define MINE_DETECT 100.0f #define MINE_SPEED 500.0f -#define MINE_INIT_TIME 3000 -#define MINE_CHECK_FREQUENCY 100 -#define MINE_BOOM_TIME 25 +#define MINE_INIT_TIME 3000 +#define MINE_CHECK_FREQUENCY 100 +#define MINE_BOOM_TIME 25 #define MINE_TAKEDAMAGE qtrue -#define MINE_HEALTH 20 +#define MINE_HEALTH 40 #define NADEFLAMES_SPEED 400.0f #define CHECK_FREQUENCY 100 @@ -423,13 +423,13 @@ TREMULOUS EDGE MOD SRC FILE #define FLAMES_CHECK_FREQUENCY 100 #define FLAMES_SPEED 400.0f -#define SMOKE_PRICE 250 +#define SMOKE_PRICE 250 #define SMOKE_REPEAT 0 #define SMOKE_K_SCALE 1.0f #define SMOKE_SPEED 400.0f #define SMOKE_DAMAGE HDM(1) -#define SMOKE_RANGE 10.0f -#define SMOKE_DETECT 10.0f +#define SMOKE_RANGE 10.0f +#define SMOKE_DETECT 10.0f #define SMOKE_CHECK_FREQUENCY 100 #define SHOTGUN_PRICE 150 |