Skip to content

Commit

Permalink
- Time to build a power core has been reduce to 35 seconds from 55.
Browse files Browse the repository at this point in the history
- generators work regardless of the power cores health with instagib modifier on.
- power core can no longer be destroyed with one shot with instagib modifier on.
  • Loading branch information
q3shafe committed Aug 4, 2017
1 parent 0f727c8 commit 1f00860
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 6 deletions.
6 changes: 6 additions & 0 deletions Docs/CHANGELOG.TXT
Expand Up @@ -46,6 +46,12 @@ Trepidation Changelog - Most Recent Changes First
==============================================
***** CURRENT SNAPSHOT *****
==============================================
- Time to build a power core has been reduce to 35 seconds from 55.

- generators work regardless of the power cores health with instagib modifier on.

- power core can no longer be destroyed with one shot with instagib modifier on.

- Updated website references with new website.

- Updating sevrer configs for new master server
Expand Down
Binary file modified game-media/pak0-vms/vm/qagame.qvm
Binary file not shown.
2 changes: 2 additions & 0 deletions game-media/pak1-ccdata/singleplayer/trepidation.cfg
Expand Up @@ -79,6 +79,8 @@ seta g_RegenAmmo "1" // This is because of the issue where bots keep trying to s
seta g_RegenHealth "0"
seta g_turrets "1"
seta g_maxTurrets "5"
seta g_PCTeamkills "2"
///////////////////////////////////////
// Map Rotation
Expand Down
7 changes: 4 additions & 3 deletions vms-source/code/game/g_buildables.c
Expand Up @@ -56,14 +56,14 @@ void turret_remove(gentity_t *self, gentity_t *inflictor, gentity_t *attacker, i

if (self->s.team == TEAM_BLUE)
{
trap_SendServerCommand( -1, "print \"DEBUG: Called destroy buildables for BLUE.\n\"" );
//trap_SendServerCommand( -1, "print \"DEBUG: Called destroy buildables for BLUE.\n\"" );
level.blueMC = 0;
level.blueBuilding = level.time;
level.blueNeedMC= 1;
}
if (self->s.team == TEAM_RED)
{
trap_SendServerCommand( -1, "print \"DEBUG: Called destroy buildables for RED.\n\"" );
//trap_SendServerCommand( -1, "print \"DEBUG: Called destroy buildables for RED.\n\"" );
level.redMC = 0;
level.redBuilding = level.time;
level.redNeedMC= 1;
Expand Down Expand Up @@ -924,7 +924,8 @@ void MC_think(gentity_t *ent)
// This turns shielding off and regeneration stops.
if (ent->s.time2==1)
{
if (ent->health<150) // Was 350

if ((ent->health<150) && (g_instagib.integer == 0)) // Was 350
{
ent->s.time2=0;
}
Expand Down
4 changes: 2 additions & 2 deletions vms-source/code/game/g_main.c
Expand Up @@ -2242,7 +2242,7 @@ void CheckExitRules( void ) {


// If no one places the power core, place one for them after 55 seconds.
if ((level.time-level.redScoreTime) > 55000)
if ((level.time-level.redScoreTime) > 35000)
{

if ((level.blueMC == 0) && (level.blueNeedMC == 1))
Expand All @@ -2254,7 +2254,7 @@ void CheckExitRules( void ) {
}
}

if ((level.time-level.blueScoreTime) > 55000)
if ((level.time-level.blueScoreTime) > 35000)
{

if ((level.redMC == 0) && (level.redNeedMC == 1))
Expand Down
8 changes: 7 additions & 1 deletion vms-source/code/game/g_weapon.c
Expand Up @@ -724,7 +724,13 @@ void weapon_railgun_fire (gentity_t *ent) {
{
damage = 100 * s_quadFactor;
} else {
damage = 1000 * s_quadFactor;

if(g_GameMode.integer == 3)
{
damage = 200 * s_quadFactor;
} else {
damage = 1000 * s_quadFactor;
}

}
/////////////////////////////////////
Expand Down

0 comments on commit 1f00860

Please sign in to comment.