summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/cgame/cg_draw.c10
-rw-r--r--src/game/bg_misc.c4
-rw-r--r--src/game/g_main.c1
-rw-r--r--src/game/g_missile.c6
-rw-r--r--src/game/g_weapon.c14
-rw-r--r--src/game/tremulous.h14
6 files changed, 22 insertions, 27 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 8007bfe..09777b6 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -3165,7 +3165,7 @@ void CG_OwnerDraw( float x, float y, float w, float h, float text_x,
CG_DrawPlayerBoosterBolt( &rect, backColor, foreColor, shader );
break;
case CG_PLAYER_FBREATH:
- CG_DrawPlayerFbreath( &rect, foreColor, shader );
+ // CG_DrawPlayerFbreath( &rect, foreColor, shader );
break;
case CG_PLAYER_PRICKLES:
CG_DrawPlayerPrickles( &rect, foreColor, shader );
@@ -3610,17 +3610,17 @@ static void CG_DrawVote( team_t team )
int offset = 0;
vec4_t white = { 1.0f, 1.0f, 1.0f, 1.0f };
char yeskey[ 32 ] = "", nokey[ 32 ] = "";
+ static int lastVoteTime[ NUM_TEAMS ] = { 0 };
-
if( !cgs.voteTime[ team ] )
return;
-
+
sec = ( VOTE_TIME - ( cg.time - cgs.voteTime[ team ] ) ) / 1000;
- //play dong sound
- if(sec > 28 )
+ if( cgs.voteTime[ team ] != lastVoteTime[ team ] )
{
trap_S_StartLocalSound( cgs.media.iniVote, CHAN_LOCAL_SOUND );
+ lastVoteTime[ team ] = cgs.voteTime[ team ];
}
// if( cgs.voteModified[ team ] && (sec < 26 ) )
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 137d9ea..09da2b8 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -2525,7 +2525,7 @@ static const classAttributes_t bg_classList[ ] =
{
PCL_ALIEN_LEVEL4, //int classnum;
"level4", //char *classname;
- "A large alien with a strong melee attack and a weak flame blast. "
+ "A large alien with a strong melee attack. "
"This class can also charge at enemy players and structures, "
"inflicting great damage. Any humans caught under a falling "
"Tyrant will be crushed by its weight.",
@@ -3329,7 +3329,7 @@ static const weaponAttributes_t bg_weapons[ ] =
0, //int reloadTime;
LEVEL4_CLAW_K_SCALE, //float knockbackScale;
qfalse, //qboolean hasAltMode;
- qtrue, //qboolean hasThirdMode;
+ qfalse, //qboolean hasThirdMode;
qfalse, //qboolean canZoom;
90.0f, //float zoomFov;
qfalse, //qboolean purchasable;
diff --git a/src/game/g_main.c b/src/game/g_main.c
index d8003cc..4a966b3 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -209,7 +209,6 @@ vmCvar_t g_MinHumanExtraBuildPoints;
vmCvar_t g_MaxHumanExtraBuildPoints;
vmCvar_t g_BuildingCreditsFactor;
-
// copy cvars that can be set in worldspawn so they can be restored later
static char cv_gravity[ MAX_CVAR_VALUE_STRING ];
static char cv_humanMaxStage[ MAX_CVAR_VALUE_STRING ];
diff --git a/src/game/g_missile.c b/src/game/g_missile.c
index e627f14..a7781a7 100644
--- a/src/game/g_missile.c
+++ b/src/game/g_missile.c
@@ -1618,8 +1618,10 @@ gentity_t *launch_mine( gentity_t *self, vec3_t start, vec3_t dir )
VectorNormalize( dir );
bolt = G_Spawn( );
bolt->classname = "mine";
- bolt->nextthink = level.time + MINE_INIT_TIME;
- bolt->think = G_ProcessMine;
+ /* bolt->nextthink = level.time + MINE_INIT_TIME;
+ bolt->think = G_ProcessMine; */
+ bolt->nextthink = level.time + 5000;
+ bolt->think = G_ExplodeMissile;
bolt->s.eType = ET_MISSILE;
bolt->r.svFlags = SVF_USE_CURRENT_ORIGIN;
bolt->s.weapon = WP_MINE;
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index 95e0b11..d1f7694 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -1897,7 +1897,7 @@ void FireWeapon3( gentity_t *ent )
break;
case WP_ALEVEL4:
- FireBreath_tyrant( ent );
+ // FireBreath_tyrant( ent );
break;
case WP_MASS_DRIVER:
@@ -1908,16 +1908,10 @@ void FireWeapon3( gentity_t *ent )
break;
case WP_ALEVEL1:
+ acidBombFire2x( ent, WP_ALEVEL1 );
+ break;
case WP_ALEVEL1_UPG:
-
- if( ent->s.weapon == WP_ALEVEL1 )
- {
- acidBombFire2x( ent, WP_ALEVEL1 );
- }
- else
- {
- acidBombFire( ent, WP_ALEVEL1_UPG );
- }
+ acidBombFire( ent, WP_ALEVEL1_UPG );
break;
default:
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index addf274..69eb4b1 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -407,7 +407,7 @@ TREMULOUS EDGE MOD SRC FILE
#define GRENADE_RANGE 192.0f
#define GRENADE_SPEED 700.0f
-#define MINE_PRICE 1000
+#define MINE_PRICE 600
#define MINE_REPEAT 0
#define MINE_K_SCALE 1.0f
#define MINE_DAMAGE HDM(250)
@@ -874,7 +874,7 @@ TREMULOUS EDGE MOD SRC FILE
#define POD_BP 20
#define POD_BT 20000
-#define POD_HEALTH ABHM(850)
+#define POD_HEALTH ABHM(600)
#define POD_REGEN 5
#define POD_SPLASHDAMAGE 50
#define POD_SPLASHRADIUS 150
@@ -883,7 +883,7 @@ TREMULOUS EDGE MOD SRC FILE
#define POD_STUMP_BP 15
#define POD_STUMP_BT 20000
-#define POD_STUMP_HEALTH ABHM(650)
+#define POD_STUMP_HEALTH ABHM(460)
#define POD_STUMP_REGEN 15
#define POD_STUMP_SPLASHDAMAGE 25
#define POD_STUMP_SPLASHRADIUS 100
@@ -1087,7 +1087,7 @@ TREMULOUS EDGE MOD SRC FILE
#define SHIELD_BP 8
#define SHIELD_BT 20000
-#define SHIELD_HEALTH HBHM(600)
+#define SHIELD_HEALTH HBHM(480)
#define SHIELD_SPLASHDAMAGE 50
#define SHIELD_SPLASHRADIUS 150
#define SHIELD_SHRINKPROP 0.001f
@@ -1124,14 +1124,14 @@ TREMULOUS EDGE MOD SRC FILE
#define COVER_BP 20
#define COVER_BT 20000
-#define COVER_HEALTH HBHM(850)
+#define COVER_HEALTH HBHM(600)
#define COVER_SPLASHDAMAGE 50
#define COVER_SPLASHRADIUS 150
#define COVER_VALUE HBVM(COVER_BP)
#define COVER_STUMP_BP 15
-#define COVER_STUMP_BT 20000
-#define COVER_STUMP_HEALTH HBHM(650)
+#define COVER_STUMP_BT 20000
+#define COVER_STUMP_HEALTH HBHM(480)
#define COVER_STUMP_SPLASHDAMAGE 50
#define COVER_STUMP_SPLASHRADIUS 150
#define COVER_STUMP_VALUE HBVM(COVER_STUMP_BP)
generated by cgit (git 2.34.1) at 2024-12-26 04:19:43 +0000