diff options
| -rw-r--r-- | src/game/bg_misc.c | 14 | ||||
| -rw-r--r-- | src/game/g_active.c | 2 | ||||
| -rw-r--r-- | src/game/g_combat.c | 6 | ||||
| -rw-r--r-- | src/game/g_weapon.c | 6 | ||||
| -rw-r--r-- | src/game/tremulous.h | 6 |
5 files changed, 16 insertions, 18 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index c826199..89d2335 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -2385,7 +2385,7 @@ static const classAttributes_t bg_classList[ ] = LEVEL2_HEALTH, //int health; 0.0f, //float fallDamage; LEVEL2_REGEN, //float regenRate; - SCA_WALLJUMPER|SCA_FOVWARPS|SCA_ALIENSENSE|SCA_WALLCLIMBER, //int abilities; + SCA_WALLJUMPER|SCA_FOVWARPS|SCA_ALIENSENSE, //int abilities; WP_ALEVEL2, //weapon_t startWeapon 0.0f, //float buildDist; 90, //int fov; @@ -2407,14 +2407,12 @@ static const classAttributes_t bg_classList[ ] = PCL_ALIEN_LEVEL2_UPG, //int classnum; "level2upg", //char *classname; "The Advanced Marauder has all the abilities of the basic Marauder " - "with the addition of an area effect electric shock attack. " - "It also has 3 barbs which may be used to attack humans " - "from a distance.", + "with the addition of an area effect electric shock attack.", ( 1 << S2 )|( 1 << S3 ), //int stages LEVEL2_UPG_HEALTH, //int health; 0.0f, //float fallDamage; LEVEL2_UPG_REGEN, //float regenRate; - SCA_WALLJUMPER|SCA_FOVWARPS|SCA_ALIENSENSE|SCA_WALLCLIMBER, //int abilities; + SCA_WALLJUMPER|SCA_FOVWARPS|SCA_ALIENSENSE, //int abilities; WP_ALEVEL2_UPG, //weapon_t startWeapon 0.0f, //float buildDist; 90, //int fov; @@ -3213,17 +3211,17 @@ static const weaponAttributes_t bg_weapons[ ] = "level2upg", //char *weaponName; "Zap", //char *humanName; "", - 3, //int maxAmmo; + 0, //int maxAmmo; 0, //int maxClips; qtrue, //int infiniteAmmo; qfalse, //int usesEnergy; LEVEL2_CLAW_U_REPEAT, //int repeatRate1; LEVEL2_AREAZAP_REPEAT,//int repeatRate2; - LEVEL2_BOUNCEBALL_REPEAT,//int repeatRate3; + 0, //LEVEL2_BOUNCEBALL_REPEAT,//int repeatRate3; 0, //int reloadTime; LEVEL2_CLAW_U_K_SCALE,//float knockbackScale; qtrue, //qboolean hasAltMode; - qtrue, //qboolean hasThirdMode; + qfalse, //qboolean hasThirdMode; qfalse, //qboolean canZoom; 90.0f, //float zoomFov; qfalse, //qboolean purchasable; diff --git a/src/game/g_active.c b/src/game/g_active.c index b8d1bac..9a4eb00 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -1021,7 +1021,7 @@ void ClientTimerActions( gentity_t *ent, int msec ) else ent->timestamp = level.time; } - + // Regenerate Hummel Prickles if( client->ps.weapon == WP_ALEVEL5 ) { diff --git a/src/game/g_combat.c b/src/game/g_combat.c index e616c5a..f9d7f24 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -384,7 +384,7 @@ float G_RewardAttackers( gentity_t *self ) // killing buildables earns score, but not credits if( self->s.eType != ET_BUILDABLE ) { - Com_Printf(S_COLOR_YELLOW "Killer: kills = %f deaths = %f percent_of_damage = %f -> factor = %f\n",player->client->pers.kills,player->client->pers.deaths,killValue,G_RewardScaleFactor( player, self, teamFactor) ); + // Com_Printf(S_COLOR_YELLOW "Killer: kills = %f deaths = %f percent_of_damage = %f -> factor = %f\n",player->client->pers.kills,player->client->pers.deaths,killValue,G_RewardScaleFactor( player, self, teamFactor) ); stageValue *= G_RewardScaleFactor( player, self, teamFactor ); player->client->pers.kills += killValue; // add to stage counters @@ -403,8 +403,8 @@ float G_RewardAttackers( gentity_t *self ) } ++self->client->pers.deaths; - Com_Printf(S_COLOR_YELLOW "Killed: kills = %f deaths = %d\n",self->client->pers.kills,self->client->pers.deaths); - Com_Printf(S_COLOR_YELLOW "Team: kills = %f deaths = %f\n",level.alienRewardKills,level.humanRewardKills); + // Com_Printf(S_COLOR_YELLOW "Killed: kills = %f deaths = %d\n",self->client->pers.kills,self->client->pers.deaths); + // Com_Printf(S_COLOR_YELLOW "Team: kills = %f deaths = %f\n",level.alienRewardKills,level.humanRewardKills); if( alienCredits ) { diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index b86f41a..115c451 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -1731,9 +1731,9 @@ gclient_t *client; slowBlobFire( ent ); break; - case WP_ALEVEL2_UPG: - bounceBallFire_level2( ent ); - break; + //case WP_ALEVEL2_UPG: + // bounceBallFire_level2( ent ); + // break; case WP_ALEVEL5: Prickles( ent ); diff --git a/src/game/tremulous.h b/src/game/tremulous.h index b6dad3f..39cd82a 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -296,7 +296,7 @@ TREMULOUS EDGE MOD SRC FILE #define LEVEL5_UPG_COST 2 #define LEVEL5_CLAW_U_REPEAT 300 #define LEVEL5_CLAW_U_K_SCALE 1.0f -#define LEVEL5_CLAW_U_RANGE 85.0f +#define LEVEL5_CLAW_U_RANGE 80.0f #define LEVEL5_CLAW_WIDTH 12.0f #define LEVEL5_CLAW_DMG ADM(30) #define LEVEL5_PRICKLES_REPEAT 160 @@ -1039,14 +1039,14 @@ TREMULOUS EDGE MOD SRC FILE #define BARRIER_LINE_VALUE HBVM(BARRIER_LINE_BP) #define BARRIER_CORNER_BP 2 -#define BARRIER_CORNER_BT 13000 +#define BARRIER_CORNER_BT 12000 #define BARRIER_CORNER_HEALTH HBHM(300) #define BARRIER_CORNER_SPLASHDAMAGE 10 #define BARRIER_CORNER_SPLASHRADIUS 50 #define BARRIER_CORNER_VALUE HBVM(BARRIER_CORNER_BP) #define BARRIER_POINT_BP 3 -#define BARRIER_POINT_BT 15000 +#define BARRIER_POINT_BT 12000 #define BARRIER_POINT_HEALTH HBHM(350) #define BARRIER_POINT_SPLASHDAMAGE 10 #define BARRIER_POINT_SPLASHRADIUS 50 |