Split up japp_saberSystem 1 into japp_saberTweaks bit value

Razish · Aug 21, 2014 · 7d73403 · 7d73403
1 parent 6dbe8fe
commit 7d73403
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 692 deletions.
diff --git a/game/g_cmds.c b/game/g_cmds.c
@@ -2904,18 +2904,37 @@ static void Cmd_AMInfo_f( gentity_t *ent ) {
 		Q_strncpyz( buf, "Saber settings:\n", sizeof(buf) );
 
 		// SP/MP
-		if ( d_saberSPStyleDamage.integer )		Q_strcat( buf, sizeof(buf), "    SP style (default)" );
-		else									Q_strcat( buf, sizeof(buf), "    MP style" );
+		if ( d_saberSPStyleDamage.integer ) {
+			Q_strcat( buf, sizeof(buf), "    SP style (default)\n" );
+		}
+		else {
+			Q_strcat( buf, sizeof(buf), "    MP style\n" );
+		}
+
+		// JA++ tweaks
+		if ( japp_saberTweaks.integer ) {
+			const uint32_t tweaks = japp_saberTweaks.integer;
+			Q_strcat( buf, sizeof(buf), " JA++ tweaks:\n" );
 
-		// tweaks
-		if ( japp_saberSystem.integer == SABERSYSTEM_JAPP )	Q_strcat( buf, sizeof(buf), " with JA++ tweaks\n" );
-		else if ( japp_saberSystem.integer == SABERSYSTEM_JK2 )		Q_strcat( buf, sizeof(buf), " with JK2 tweaks\n" );
-		else														Q_strcat( buf, sizeof(buf), " with no tweaks (default)\n" );
+			Q_strcat( buf, sizeof(buf), va( "    %sInterpolation\n",
+				(tweaks & SABERTWEAK_INTERPOLATE) ? S_COLOR_GREEN : S_COLOR_RED ) );
+			Q_strcat( buf, sizeof(buf), va( "    %sProlonged swing damage\n",
+				(tweaks & SABERTWEAK_PROLONGDAMAGE) ? S_COLOR_GREEN : S_COLOR_RED ) );
+			Q_strcat( buf, sizeof(buf), va( "    %sDeflection\n",
+				(tweaks & SABERTWEAK_DEFLECTION) ? S_COLOR_GREEN : S_COLOR_RED ) );
+			Q_strcat( buf, sizeof(buf), va( "    %sSpecial moves\n",
+				(tweaks & SABERTWEAK_SPECIALMOVES) ? S_COLOR_GREEN : S_COLOR_RED ) );
+
+			Q_strcat( buf, sizeof(buf), S_COLOR_WHITE "\n" );
+		}
 
 		// damage scale
 		Q_strcat( buf, sizeof(buf), va( "    %.03f damage scale\n", g_saberDamageScale.value ) );
-		Q_strcat( buf, sizeof(buf), va( "    Idle damage %s\n", (japp_saberIdleDamage.integer || japp_saberSystem.integer == SABERSYSTEM_JK2)
+
+		// idle damage
+		Q_strcat( buf, sizeof(buf), va( "    Idle damage %s\n", japp_saberIdleDamage.integer
 			? S_COLOR_GREEN"enabled" : S_COLOR_RED"disabled" ) );
+
 		trap->SendServerCommand( ent - g_entities, va( "print \"%s\n\"", buf ) );
 		buf[0] = '\0';
 	}

diff --git a/game/g_local.h b/game/g_local.h
@@ -699,11 +699,11 @@ typedef struct bot_settings_s {
 	char team[MAX_FILEPATH];
 } bot_settings_t;
 
-typedef enum saberSystems_e {//japp_saberSystem
-	SABERSYSTEM_BASE = 0,
-	SABERSYSTEM_JAPP,
-	SABERSYSTEM_JK2,
-} saberSystems_t;
+// japp_saberTweaks
+#define SABERTWEAK_INTERPOLATE		(0x0001u)
+#define SABERTWEAK_PROLONGDAMAGE	(0x0002u)
+#define SABERTWEAK_DEFLECTION		(0x0004u)
+#define SABERTWEAK_SPECIALMOVES		(0x0008u)
 
 typedef enum teleportBits_e {
 	JAPP_TPBIT_SILENT = 0,

diff --git a/game/g_xcvar.h b/game/g_xcvar.h
@@ -192,7 +192,7 @@ XCVAR_DEF( japp_randFix, "1", NULL, CVAR_NONE, qtrue )
 XCVAR_DEF( japp_readyThreshold, "0.5", NULL, CVAR_NONE, qtrue )
 XCVAR_DEF( japp_removeOldMines, "1", NULL, CVAR_NONE, qfalse )
 XCVAR_DEF( japp_saberIdleDamage, "0", NULL, CVAR_NONE, qtrue )
-XCVAR_DEF( japp_saberSystem, "0", NULL, CVAR_NONE, qtrue )
+XCVAR_DEF( japp_saberTweaks, "0", NULL, CVAR_NONE, qtrue )
 XCVAR_DEF( japp_scorePlums, "0", NULL, CVAR_NONE, qfalse )
 XCVAR_DEF( japp_scoreUpdateRate, "1000", NULL, CVAR_NONE, qfalse )
 XCVAR_DEF( japp_shootFromEye, "0", NULL, CVAR_NONE, qtrue )