Merge remote-tracking branch 'videoP-jaPRO/master'

Bucky21659 · Bucky21659 · commit d5b95947d04f · 2018-10-11T11:20:26.000-06:00
diff --git a/codemp/game/bg_pmove.c b/codemp/game/bg_pmove.c
@@ -340,6 +340,7 @@ qboolean BG_KnockDownable(playerState_t *ps)
 	return qtrue;
 }
 
+extern qboolean BG_InKnockDown(int anim);
 qboolean BG_CanJetpack(playerState_t *ps)
 {
 	if (!(ps->stats[STAT_HOLDABLE_ITEMS] & (1 << HI_JETPACK)))
@@ -352,6 +353,8 @@ qboolean BG_CanJetpack(playerState_t *ps)
 		return qfalse;
 	if (BG_InSpecialJump(ps->legsAnim))
 		return qfalse;	
+	if (BG_InKnockDown(ps->legsAnim))
+		return qfalse;
 	return qtrue;
 }
 
diff --git a/codemp/game/bg_saber.c b/codemp/game/bg_saber.c
@@ -1522,6 +1522,7 @@ qboolean PM_SaberInBrokenParry( int move )
 	if (cgs.jcinfo & JAPRO_CINFO_NOREDCHAIN)
 		return qfalse;
 #endif
+
 	if ( move >= LS_V1_BR && move <= LS_V1_B_ )
 	{
 		return qtrue;
@@ -4218,7 +4219,7 @@ void PM_SetSaberMove(short newMove)
 		{//spins must be played on entire body
 			parts = SETANIM_BOTH;
 		}
-		else if ( (!pm->cmd.forwardmove&&!pm->cmd.rightmove&&!pm->cmd.upmove) )
+		else if ( (!pm->cmd.forwardmove && !pm->cmd.rightmove && !pm->cmd.upmove) )
 		{//not trying to run, duck or jump
 			if ( !BG_FlippingAnim( pm->ps->legsAnim ) &&
 				!BG_InRoll( pm->ps, pm->ps->legsAnim ) &&
diff --git a/codemp/game/g_items.c b/codemp/game/g_items.c
@@ -2540,7 +2540,9 @@ void Touch_Item (gentity_t *ent, gentity_t *other, trace_t *trace) {
 		}
 	}
 
-	G_LogPrintf( "Item: %i %s\n", other->s.number, ent->item->classname );
+	if (developer.integer) {
+		G_LogPrintf("Item: %i %s\n", other->s.number, ent->item->classname);
+	}
 
 	predict = other->client->pers.predictItemPickup;
 
diff --git a/codemp/game/g_main.c b/codemp/game/g_main.c
@@ -3390,7 +3390,7 @@ void G_RunFrame( int levelTime ) {
 				trap->Print("Auto quitting server %i\n", levelTime);
 				trap->SendConsoleCommand(EXEC_APPEND, "quit\n");
 			}
-			if (levelTime > (2147483648 - 1000)) { //just always quit if its this high.. 24 days?
+			if (levelTime > (2147483648 - 60*1000)) { //just always quit if its this high.. 24 days?
 				trap->Print("Auto quitting server %i\n", levelTime);
 				trap->SendConsoleCommand(EXEC_APPEND, "quit\n");
 			}
@@ -3838,7 +3838,7 @@ void G_RunFrame( int levelTime ) {
 			{ //using jetpack, drain fuel
 				if (ent->client->jetPackDebReduce < level.time)
 				{
-					ent->client->ps.jetpackFuel -= 5;
+					ent->client->ps.jetpackFuel -= 6;
 					
 					if (ent->client->ps.jetpackFuel <= 0)
 					{ //turn it off
diff --git a/codemp/game/g_trigger.c b/codemp/game/g_trigger.c
@@ -1361,7 +1361,9 @@ void TimerStart(gentity_t *trigger, gentity_t *player, trace_t *trace) {//JAPRO
 		return;
 	if (player->s.eType == ET_NPC)
 		return;
-	if (player->client->ps.pm_type != PM_NORMAL && player->client->ps.pm_type != PM_FLOAT && player->client->ps.pm_type != PM_FREEZE && player->client->ps.pm_type != PM_JETPACK)
+	if (player->client->ps.duelInProgress)
+		return;
+	if (player->client->ps.pm_type != PM_NORMAL && player->client->ps.pm_type != PM_FLOAT && player->client->ps.pm_type != PM_FREEZE && player->client->ps.pm_type != PM_JETPACK) //Allow racemode emotes?
 		return;
 	if (player->client->sess.raceMode && player->client->sess.movementStyle == MV_SWOOP && !player->client->ps.m_iVehicleNum) //Dont start the timer for swoop racers if they dont have a swoop
 		return;
diff --git a/codemp/game/g_weapon.c b/codemp/game/g_weapon.c
@@ -2316,6 +2316,10 @@ void rocketThink( gentity_t *ent )
 	float dot, dot2, dis;
 	int i;
 	float vel = (ent->spawnflags&1)?ent->speed:ROCKET_VELOCITY;
+	qboolean redeemerAllowed = qtrue;
+
+	if (!g_entities[ent->r.ownerNum].client || !g_entities[ent->r.ownerNum].client->sess.raceMode)
+		redeemerAllowed = qfalse;
 
 	if ( ent->genericValue1 && ent->genericValue1 < level.time )
 	{//time's up, we're done, remove us
@@ -2329,7 +2333,7 @@ void rocketThink( gentity_t *ent )
 		}
 		return;
 	}
-	if (!(g_tweakWeapons.integer & WT_ROCKET_REDEEMER) && ( !ent->enemy 
+	if ((!(g_tweakWeapons.integer & WT_ROCKET_REDEEMER) || !redeemerAllowed) && ( !ent->enemy 
 		|| !ent->enemy->client 
 		|| ent->enemy->health <= 0 
 		|| ent->enemy->client->ps.powerups[PW_CLOAKED] ))
@@ -2353,7 +2357,7 @@ void rocketThink( gentity_t *ent )
 		}
 	}
 
-	if ( !(g_tweakWeapons.integer & WT_ROCKET_REDEEMER) && ent->enemy && ent->enemy->inuse )
+	if ((!(g_tweakWeapons.integer & WT_ROCKET_REDEEMER) || !redeemerAllowed) && ent->enemy && ent->enemy->inuse )
 	{	
 		float newDirMult = ent->angle?ent->angle*2.0f:1.0f;
 		float oldDirMult = ent->angle?(1.0f-ent->angle)*2.0f:1.0f;
@@ -2464,7 +2468,7 @@ void rocketThink( gentity_t *ent )
 		VectorCopy( ent->r.currentOrigin, ent->s.pos.trBase );
 		ent->s.pos.trTime = level.time;
 	}
-	else if (g_tweakWeapons.integer & WT_ROCKET_REDEEMER)
+	else if ((g_tweakWeapons.integer & WT_ROCKET_REDEEMER) && redeemerAllowed)
 	{
 		vec3_t fwd, traceFrom, traceTo, dir;
 		trace_t tr;
@@ -2546,7 +2550,7 @@ static void WP_FireRocket( gentity_t *ent, qboolean altFire )
 	if ( altFire )
 		vel *= 0.5f;
 
-	if (altFire && g_tweakWeapons.integer & WT_ROCKET_REDEEMER)
+	if (altFire && g_tweakWeapons.integer & WT_ROCKET_REDEEMER && !ent->client->sess.raceMode)
 		damage *= 2;
 
 	if (q3style && ent->client->pers.backwardsRocket) {
@@ -2592,7 +2596,7 @@ static void WP_FireRocket( gentity_t *ent, qboolean altFire )
 		ent->client->ps.rocketLockTime = 0;
 		ent->client->ps.rocketTargetTime = 0;
 	}
-	else if (altFire && g_tweakWeapons.integer & WT_ROCKET_REDEEMER) 
+	else if (altFire && (g_tweakWeapons.integer & WT_ROCKET_REDEEMER) && !ent->client->sess.raceMode)
 	{
 		missile->angle = 0.5f;
 		missile->think = rocketThink;
diff --git a/codemp/game/w_saber.c b/codemp/game/w_saber.c
@@ -5053,7 +5053,7 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl
 			}
 		}
 
-		if ( !(g_tweakSaber.integer & ST_NO_REDCHAIN) && ((selfSaberLevel < FORCE_LEVEL_3 && ((tryDeflectAgain && Q_irand(1, 10) <= 3) || (!tryDeflectAgain && Q_irand(1, 10) <= 7))) || (Q_irand(1, 10) <= 1 && otherSaberLevel >= FORCE_LEVEL_3))
+		if (!(g_tweakSaber.integer & ST_NO_REDCHAIN) && ((selfSaberLevel < FORCE_LEVEL_3 && ((tryDeflectAgain && Q_irand(1, 10) <= 3) || (!tryDeflectAgain && Q_irand(1, 10) <= 7))) || (Q_irand(1, 10) <= 1 && otherSaberLevel >= FORCE_LEVEL_3))
 			&& !PM_SaberInBounce(self->client->ps.saberMove)
 
 			&& !PM_SaberInBrokenParry(otherOwner->client->ps.saberMove)
@@ -5100,7 +5100,7 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl
 
 			didDefense = qtrue;
 		}
-		else if ( !(g_tweakSaber.integer & ST_NO_REDCHAIN) && (selfSaberLevel > FORCE_LEVEL_2 || unblockable) && //if we're doing a special attack, we can send them into a broken parry too (MP only)
+		else if (!(g_tweakSaber.integer & ST_NO_REDCHAIN) && (selfSaberLevel > FORCE_LEVEL_2 || unblockable) && //if we're doing a special attack, we can send them into a broken parry too (MP only)
 				 ( otherOwner->client->ps.fd.forcePowerLevel[FP_SABER_DEFENSE] < selfSaberLevel || (otherOwner->client->ps.fd.forcePowerLevel[FP_SABER_DEFENSE] == selfSaberLevel && (Q_irand(1, 10) >= otherSaberLevel*1.5 || unblockable)) ) &&
 				 PM_SaberInParry(otherOwner->client->ps.saberMove) &&
 				 !PM_SaberInBrokenParry(otherOwner->client->ps.saberMove) &&
@@ -5199,22 +5199,21 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl
 				attackAdv = (attackStr+attackBonus+self->client->ps.fd.forcePowerLevel[FP_SABER_OFFENSE])-(defendStr+otherOwner->client->ps.fd.forcePowerLevel[FP_SABER_OFFENSE]);
 
 				if (!(g_tweakSaber.integer & ST_NO_REDCHAIN)) {
-
-					if ( attackAdv > 1 )
+					if (attackAdv > 1)
 					{//I won, he should knockaway
-						otherOwner->client->ps.saberMove = BG_BrokenParryForAttack( otherOwner->client->ps.saberMove );
+						otherOwner->client->ps.saberMove = BG_BrokenParryForAttack(otherOwner->client->ps.saberMove);
 						otherOwner->client->ps.saberBlocked = BLOCKED_BOUNCE_MOVE;
 					}
-					else if ( attackAdv > 0 )
+					else if (attackAdv > 0)
 					{//I won, he should bounce, I should continue
 						otherOwner->client->ps.saberBlocked = BLOCKED_ATK_BOUNCE;
 					}
-					else if ( attackAdv < 1 )
+					else if (attackAdv < 1)
 					{//I lost, I get knocked away
-						self->client->ps.saberMove = BG_BrokenParryForAttack( self->client->ps.saberMove );
+						self->client->ps.saberMove = BG_BrokenParryForAttack(self->client->ps.saberMove);
 						self->client->ps.saberBlocked = BLOCKED_BOUNCE_MOVE;
 					}
-					else if ( attackAdv < 0 )
+					else if (attackAdv < 0)
 					{//I lost, I bounce off
 						self->client->ps.saberBlocked = BLOCKED_ATK_BOUNCE;
 					}
@@ -5223,8 +5222,8 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl
 						self->client->ps.saberBlocked = BLOCKED_ATK_BOUNCE;
 						otherOwner->client->ps.saberBlocked = BLOCKED_ATK_BOUNCE;
 					}
-
 				}
+
 				didOffense = qtrue;
 				
 			}
@@ -5272,7 +5271,7 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl
 					otherOwner->client->ps.saberEventFlags |= SEF_PARRIED;
 					self->client->ps.saberEventFlags |= SEF_BLOCKED;
 
-					if ( attackStr+self->client->ps.fd.forcePowerLevel[FP_SABER_OFFENSE] > otherIdleStr+otherOwner->client->ps.fd.forcePowerLevel[FP_SABER_DEFENSE] && !(g_tweakSaber.integer & ST_NO_REDCHAIN) )
+					if (attackStr + self->client->ps.fd.forcePowerLevel[FP_SABER_OFFENSE] > otherIdleStr + otherOwner->client->ps.fd.forcePowerLevel[FP_SABER_DEFENSE] && !(g_tweakSaber.integer & ST_NO_REDCHAIN))
 					{
 						crushTheParry = qtrue;
 					}
@@ -5335,7 +5334,6 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl
 							Com_Printf("Equal attack level bounce/deflection for clients %i and %i\n", self->s.number, otherOwner->s.number);
 						}
 #endif
-
 						if (!(g_tweakSaber.integer & ST_NO_REDCHAIN)) {
 							self->client->ps.saberEventFlags |= SEF_DEFLECTED;
 							otherOwner->client->ps.saberEventFlags |= SEF_DEFLECTED;
@@ -5359,8 +5357,9 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl
 						}
 #endif
 
-						if (!(g_tweakSaber.integer & ST_NO_REDCHAIN))
+						if (!(g_tweakSaber.integer & ST_NO_REDCHAIN)) {
 							otherOwner->client->ps.saberEventFlags &= ~SEF_BLOCKED;
+						}
 
 						didOffense = qtrue;
 					}

Original file line number	Diff line number	Diff line change
`@@ -340,6 +340,7 @@ qboolean BG_KnockDownable(playerState_t *ps)`
`340`	`340`	`return qtrue;`
`341`	`341`	`}`
`342`	`342`
	`343`	`+extern qboolean BG_InKnockDown(int anim);`
`343`	`344`	`qboolean BG_CanJetpack(playerState_t *ps)`
`344`	`345`	`{`
`345`	`346`	`if (!(ps->stats[STAT_HOLDABLE_ITEMS] & (1 << HI_JETPACK)))`
`@@ -352,6 +353,8 @@ qboolean BG_CanJetpack(playerState_t *ps)`
`352`	`353`	`return qfalse;`
`353`	`354`	`if (BG_InSpecialJump(ps->legsAnim))`
`354`	`355`	`return qfalse;`
	`356`	`+ if (BG_InKnockDown(ps->legsAnim))`
	`357`	`+ return qfalse;`
`355`	`358`	`return qtrue;`
`356`	`359`	`}`
`357`	`360`
Original file line number	Diff line number	Diff line change
`@@ -2540,7 +2540,9 @@ void Touch_Item (gentity_t ent, gentity_t other, trace_t *trace) {`
`2540`	`2540`	`}`
`2541`	`2541`	`}`
`2542`	`2542`
`2543`		`- G_LogPrintf( "Item: %i %s\n", other->s.number, ent->item->classname );`
	`2543`	`+ if (developer.integer) {`
	`2544`	`+ G_LogPrintf("Item: %i %s\n", other->s.number, ent->item->classname);`
	`2545`	`+ }`
`2544`	`2546`
`2545`	`2547`	`predict = other->client->pers.predictItemPickup;`
`2546`	`2548`
Original file line number	Diff line number	Diff line change
`@@ -3390,7 +3390,7 @@ void G_RunFrame( int levelTime ) {`
`3390`	`3390`	`trap->Print("Auto quitting server %i\n", levelTime);`
`3391`	`3391`	`trap->SendConsoleCommand(EXEC_APPEND, "quit\n");`
`3392`	`3392`	`}`
`3393`		`- if (levelTime > (2147483648 - 1000)) { //just always quit if its this high.. 24 days?`
	`3393`	`+ if (levelTime > (2147483648 - 60*1000)) { //just always quit if its this high.. 24 days?`
`3394`	`3394`	`trap->Print("Auto quitting server %i\n", levelTime);`
`3395`	`3395`	`trap->SendConsoleCommand(EXEC_APPEND, "quit\n");`
`3396`	`3396`	`}`
`@@ -3838,7 +3838,7 @@ void G_RunFrame( int levelTime ) {`
`3838`	`3838`	`{ //using jetpack, drain fuel`
`3839`	`3839`	`if (ent->client->jetPackDebReduce < level.time)`
`3840`	`3840`	`{`
`3841`		`- ent->client->ps.jetpackFuel -= 5;`
	`3841`	`+ ent->client->ps.jetpackFuel -= 6;`
`3842`	`3842`
`3843`	`3843`	`if (ent->client->ps.jetpackFuel <= 0)`
`3844`	`3844`	`{ //turn it off`
Original file line number	Diff line number	Diff line change
`@@ -2316,6 +2316,10 @@ void rocketThink( gentity_t *ent )`
`2316`	`2316`	`float dot, dot2, dis;`
`2317`	`2317`	`int i;`
`2318`	`2318`	`float vel = (ent->spawnflags&1)?ent->speed:ROCKET_VELOCITY;`
	`2319`	`+ qboolean redeemerAllowed = qtrue;`
	`2320`	`+`
	`2321`	`+ if (!g_entities[ent->r.ownerNum].client \|\| !g_entities[ent->r.ownerNum].client->sess.raceMode)`
	`2322`	`+ redeemerAllowed = qfalse;`
`2319`	`2323`
`2320`	`2324`	`if ( ent->genericValue1 && ent->genericValue1 < level.time )`
`2321`	`2325`	`{//time's up, we're done, remove us`
`@@ -2329,7 +2333,7 @@ void rocketThink( gentity_t *ent )`
`2329`	`2333`	`}`
`2330`	`2334`	`return;`
`2331`	`2335`	`}`
`2332`		`- if (!(g_tweakWeapons.integer & WT_ROCKET_REDEEMER) && ( !ent->enemy`
	`2336`	`+ if ((!(g_tweakWeapons.integer & WT_ROCKET_REDEEMER) \|\| !redeemerAllowed) && ( !ent->enemy`
`2333`	`2337`	`\|\| !ent->enemy->client`
`2334`	`2338`	`\|\| ent->enemy->health <= 0`
`2335`	`2339`	`\|\| ent->enemy->client->ps.powerups[PW_CLOAKED] ))`
`@@ -2353,7 +2357,7 @@ void rocketThink( gentity_t *ent )`
`2353`	`2357`	`}`
`2354`	`2358`	`}`
`2355`	`2359`
`2356`		`- if ( !(g_tweakWeapons.integer & WT_ROCKET_REDEEMER) && ent->enemy && ent->enemy->inuse )`
	`2360`	`+ if ((!(g_tweakWeapons.integer & WT_ROCKET_REDEEMER) \|\| !redeemerAllowed) && ent->enemy && ent->enemy->inuse )`
`2357`	`2361`	`{`
`2358`	`2362`	`float newDirMult = ent->angle?ent->angle*2.0f:1.0f;`
`2359`	`2363`	`float oldDirMult = ent->angle?(1.0f-ent->angle)*2.0f:1.0f;`
`@@ -2464,7 +2468,7 @@ void rocketThink( gentity_t *ent )`
`2464`	`2468`	`VectorCopy( ent->r.currentOrigin, ent->s.pos.trBase );`
`2465`	`2469`	`ent->s.pos.trTime = level.time;`
`2466`	`2470`	`}`
`2467`		`- else if (g_tweakWeapons.integer & WT_ROCKET_REDEEMER)`
	`2471`	`+ else if ((g_tweakWeapons.integer & WT_ROCKET_REDEEMER) && redeemerAllowed)`
`2468`	`2472`	`{`
`2469`	`2473`	`vec3_t fwd, traceFrom, traceTo, dir;`
`2470`	`2474`	`trace_t tr;`
`@@ -2546,7 +2550,7 @@ static void WP_FireRocket( gentity_t *ent, qboolean altFire )`
`2546`	`2550`	`if ( altFire )`
`2547`	`2551`	`vel *= 0.5f;`
`2548`	`2552`
`2549`		`- if (altFire && g_tweakWeapons.integer & WT_ROCKET_REDEEMER)`
	`2553`	`+ if (altFire && g_tweakWeapons.integer & WT_ROCKET_REDEEMER && !ent->client->sess.raceMode)`
`2550`	`2554`	`damage *= 2;`
`2551`	`2555`
`2552`	`2556`	`if (q3style && ent->client->pers.backwardsRocket) {`
`@@ -2592,7 +2596,7 @@ static void WP_FireRocket( gentity_t *ent, qboolean altFire )`
`2592`	`2596`	`ent->client->ps.rocketLockTime = 0;`
`2593`	`2597`	`ent->client->ps.rocketTargetTime = 0;`
`2594`	`2598`	`}`
`2595`		`- else if (altFire && g_tweakWeapons.integer & WT_ROCKET_REDEEMER)`
	`2599`	`+ else if (altFire && (g_tweakWeapons.integer & WT_ROCKET_REDEEMER) && !ent->client->sess.raceMode)`
`2596`	`2600`	`{`
`2597`	`2601`	`missile->angle = 0.5f;`
`2598`	`2602`	`missile->think = rocketThink;`
Original file line number	Diff line number	Diff line change
`@@ -5053,7 +5053,7 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl`
`5053`	`5053`	`}`
`5054`	`5054`	`}`
`5055`	`5055`
`5056`		`- if ( !(g_tweakSaber.integer & ST_NO_REDCHAIN) && ((selfSaberLevel < FORCE_LEVEL_3 && ((tryDeflectAgain && Q_irand(1, 10) <= 3) \|\| (!tryDeflectAgain && Q_irand(1, 10) <= 7))) \|\| (Q_irand(1, 10) <= 1 && otherSaberLevel >= FORCE_LEVEL_3))`
	`5056`	`+ if (!(g_tweakSaber.integer & ST_NO_REDCHAIN) && ((selfSaberLevel < FORCE_LEVEL_3 && ((tryDeflectAgain && Q_irand(1, 10) <= 3) \|\| (!tryDeflectAgain && Q_irand(1, 10) <= 7))) \|\| (Q_irand(1, 10) <= 1 && otherSaberLevel >= FORCE_LEVEL_3))`
`5057`	`5057`	`&& !PM_SaberInBounce(self->client->ps.saberMove)`
`5058`	`5058`
`5059`	`5059`	`&& !PM_SaberInBrokenParry(otherOwner->client->ps.saberMove)`
`@@ -5100,7 +5100,7 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl`
`5100`	`5100`
`5101`	`5101`	`didDefense = qtrue;`
`5102`	`5102`	`}`
`5103`		`- else if ( !(g_tweakSaber.integer & ST_NO_REDCHAIN) && (selfSaberLevel > FORCE_LEVEL_2 \|\| unblockable) && //if we're doing a special attack, we can send them into a broken parry too (MP only)`
	`5103`	`+ else if (!(g_tweakSaber.integer & ST_NO_REDCHAIN) && (selfSaberLevel > FORCE_LEVEL_2 \|\| unblockable) && //if we're doing a special attack, we can send them into a broken parry too (MP only)`
`5104`	`5104`	`( otherOwner->client->ps.fd.forcePowerLevel[FP_SABER_DEFENSE] < selfSaberLevel \|\| (otherOwner->client->ps.fd.forcePowerLevel[FP_SABER_DEFENSE] == selfSaberLevel && (Q_irand(1, 10) >= otherSaberLevel*1.5 \|\| unblockable)) ) &&`
`5105`	`5105`	`PM_SaberInParry(otherOwner->client->ps.saberMove) &&`
`5106`	`5106`	`!PM_SaberInBrokenParry(otherOwner->client->ps.saberMove) &&`
`@@ -5199,22 +5199,21 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl`
`5199`	`5199`	`attackAdv = (attackStr+attackBonus+self->client->ps.fd.forcePowerLevel[FP_SABER_OFFENSE])-(defendStr+otherOwner->client->ps.fd.forcePowerLevel[FP_SABER_OFFENSE]);`
`5200`	`5200`
`5201`	`5201`	`if (!(g_tweakSaber.integer & ST_NO_REDCHAIN)) {`
`5202`		`-`
`5203`		`- if ( attackAdv > 1 )`
	`5202`	`+ if (attackAdv > 1)`
`5204`	`5203`	`{//I won, he should knockaway`
`5205`		`- otherOwner->client->ps.saberMove = BG_BrokenParryForAttack( otherOwner->client->ps.saberMove );`
	`5204`	`+ otherOwner->client->ps.saberMove = BG_BrokenParryForAttack(otherOwner->client->ps.saberMove);`
`5206`	`5205`	`otherOwner->client->ps.saberBlocked = BLOCKED_BOUNCE_MOVE;`
`5207`	`5206`	`}`
`5208`		`- else if ( attackAdv > 0 )`
	`5207`	`+ else if (attackAdv > 0)`
`5209`	`5208`	`{//I won, he should bounce, I should continue`
`5210`	`5209`	`otherOwner->client->ps.saberBlocked = BLOCKED_ATK_BOUNCE;`
`5211`	`5210`	`}`
`5212`		`- else if ( attackAdv < 1 )`
	`5211`	`+ else if (attackAdv < 1)`
`5213`	`5212`	`{//I lost, I get knocked away`
`5214`		`- self->client->ps.saberMove = BG_BrokenParryForAttack( self->client->ps.saberMove );`
	`5213`	`+ self->client->ps.saberMove = BG_BrokenParryForAttack(self->client->ps.saberMove);`
`5215`	`5214`	`self->client->ps.saberBlocked = BLOCKED_BOUNCE_MOVE;`
`5216`	`5215`	`}`
`5217`		`- else if ( attackAdv < 0 )`
	`5216`	`+ else if (attackAdv < 0)`
`5218`	`5217`	`{//I lost, I bounce off`
`5219`	`5218`	`self->client->ps.saberBlocked = BLOCKED_ATK_BOUNCE;`
`5220`	`5219`	`}`
`@@ -5223,8 +5222,8 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl`
`5223`	`5222`	`self->client->ps.saberBlocked = BLOCKED_ATK_BOUNCE;`
`5224`	`5223`	`otherOwner->client->ps.saberBlocked = BLOCKED_ATK_BOUNCE;`
`5225`	`5224`	`}`
`5226`		`-`
`5227`	`5225`	`}`
	`5226`	`+`
`5228`	`5227`	`didOffense = qtrue;`
`5229`	`5228`
`5230`	`5229`	`}`
`@@ -5272,7 +5271,7 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl`
`5272`	`5271`	`otherOwner->client->ps.saberEventFlags \|= SEF_PARRIED;`
`5273`	`5272`	`self->client->ps.saberEventFlags \|= SEF_BLOCKED;`
`5274`	`5273`
`5275`		`- if ( attackStr+self->client->ps.fd.forcePowerLevel[FP_SABER_OFFENSE] > otherIdleStr+otherOwner->client->ps.fd.forcePowerLevel[FP_SABER_DEFENSE] && !(g_tweakSaber.integer & ST_NO_REDCHAIN) )`
	`5274`	`+ if (attackStr + self->client->ps.fd.forcePowerLevel[FP_SABER_OFFENSE] > otherIdleStr + otherOwner->client->ps.fd.forcePowerLevel[FP_SABER_DEFENSE] && !(g_tweakSaber.integer & ST_NO_REDCHAIN))`
`5276`	`5275`	`{`
`5277`	`5276`	`crushTheParry = qtrue;`
`5278`	`5277`	`}`
`@@ -5335,7 +5334,6 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl`
`5335`	`5334`	`Com_Printf("Equal attack level bounce/deflection for clients %i and %i\n", self->s.number, otherOwner->s.number);`
`5336`	`5335`	`}`
`5337`	`5336`	`#endif`
`5338`		`-`
`5339`	`5337`	`if (!(g_tweakSaber.integer & ST_NO_REDCHAIN)) {`
`5340`	`5338`	`self->client->ps.saberEventFlags \|= SEF_DEFLECTED;`
`5341`	`5339`	`otherOwner->client->ps.saberEventFlags \|= SEF_DEFLECTED;`
`@@ -5359,8 +5357,9 @@ static QINLINE qboolean CheckSaberDamage(gentity_t *self, int rSaberNum, int rBl`
`5359`	`5357`	`}`
`5360`	`5358`	`#endif`
`5361`	`5359`
`5362`		`- if (!(g_tweakSaber.integer & ST_NO_REDCHAIN))`
	`5360`	`+ if (!(g_tweakSaber.integer & ST_NO_REDCHAIN)) {`
`5363`	`5361`	`otherOwner->client->ps.saberEventFlags &= ~SEF_BLOCKED;`
	`5362`	`+ }`
`5364`	`5363`
`5365`	`5364`	`didOffense = qtrue;`
`5366`	`5365`	`}`