From 1f008601771830a841860c8966c7abea7e3c8abb Mon Sep 17 00:00:00 2001 From: Shafe Date: Fri, 4 Aug 2017 17:55:48 -0400 Subject: [PATCH] - 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. --- Docs/CHANGELOG.TXT | 6 ++++++ game-media/pak0-vms/vm/qagame.qvm | Bin 587684 -> 587744 bytes .../pak1-ccdata/singleplayer/trepidation.cfg | 2 ++ vms-source/code/game/g_buildables.c | 7 ++++--- vms-source/code/game/g_main.c | 4 ++-- vms-source/code/game/g_weapon.c | 8 +++++++- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Docs/CHANGELOG.TXT b/Docs/CHANGELOG.TXT index 22fbe039..32848934 100644 --- a/Docs/CHANGELOG.TXT +++ b/Docs/CHANGELOG.TXT @@ -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 diff --git a/game-media/pak0-vms/vm/qagame.qvm b/game-media/pak0-vms/vm/qagame.qvm index 38e79d6830c5346d39b6d7f84e2d460993cd82e1..0434b353274398cd0cc36aca44665e455c98c653 100644 GIT binary patch delta 6535 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 PNPllyrj|Pv1`PT?$os_S delta 6531 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.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; @@ -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; } diff --git a/vms-source/code/game/g_main.c b/vms-source/code/game/g_main.c index 5e93213f..c0516bba 100644 --- a/vms-source/code/game/g_main.c +++ b/vms-source/code/game/g_main.c @@ -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)) @@ -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)) diff --git a/vms-source/code/game/g_weapon.c b/vms-source/code/game/g_weapon.c index d95445ae..22e85b11 100644 --- a/vms-source/code/game/g_weapon.c +++ b/vms-source/code/game/g_weapon.c @@ -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; + } } /////////////////////////////////////