[nexuiz-commits] r7921 - trunk/data

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-26 08:36:04 -0400 (Sat, 26 Sep 2009)
New Revision: 7921

Modified:
   trunk/data/balanceSamual.cfg
   trunk/data/update-cvarcount.sh
Log:
make balanceSamual.cfg cvar-checked too


Modified: trunk/data/balanceSamual.cfg
===================================================================
--- trunk/data/balanceSamual.cfg	2009-09-26 11:44:59 UTC (rev 7920)
+++ trunk/data/balanceSamual.cfg	2009-09-26 12:36:04 UTC (rev 7921)
@@ -1,9 +1,13 @@
+// NOTE: whenever you add a cvar to this file, run update-cvarcount.sh to
+// update this checksum!
+//
+// And... don't forget to edit the other balance*.cfg too.
+
+set cvar_check_balance 59ee376a58dfcc2e2ee440c6a9508e11
+
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map
 // use g_start_weapon_* to also replace the on-startup weapons!
-// {{{ weapon replacement
-// NOTE: this only replaces weapons on the map
-// use g_start_weapon_* to also replace the on-startup weapons!
 // example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times
 // set the cvars to "0" to totally disable a weapon
 set g_weaponreplace_laser ""

Modified: trunk/data/update-cvarcount.sh
===================================================================
--- trunk/data/update-cvarcount.sh	2009-09-26 11:44:59 UTC (rev 7920)
+++ trunk/data/update-cvarcount.sh	2009-09-26 12:36:04 UTC (rev 7921)
@@ -1,23 +1,22 @@
 #!/bin/sh
 
+balance_cfgs="balanceHavoc.cfg balance25.cfg balanceSamual.cfg"
+
 countd=`awk '/^seta? g_/ { print $2; }' defaultNexuiz.cfg | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
 countw=`awk '/^seta? g_/ { print $2; }' balance.cfg       | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
-counth=`awk '/^seta? g_/ { print $2; }' balanceHavoc.cfg  | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
-countl=`awk '/^seta? g_/ { print $2; }' balance25.cfg     | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
+for b in $balance_cfgs; do
+	countb=`awk '/^seta? g_/ { print $2; }' "$b"  | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
+	if [ "$countw" != "$countb" ]; then
+		echo "Mismatch between balance.cfg and $b. Aborting."
+		exit 1
+	fi
+done
 
-if [ "$countw" != "$counth" ]; then
-	echo "Mismatch between balance.cfg and balanceHavoc.cfg. Aborting."
-	exit 1
-fi
-if [ "$countw" != "$countl" ]; then
-	echo "Mismatch between balance.cfg and balanceHavoc.cfg. Aborting."
-	exit 1
-fi
-
 sed -i -e "s/^set cvar_check_default .*/set cvar_check_default $countd/" defaultNexuiz.cfg
 sed -i -e "s/^set cvar_check_balance .*/set cvar_check_balance $countw/" balance.cfg
-sed -i -e "s/^set cvar_check_balance .*/set cvar_check_balance $countw/" balanceHavoc.cfg
-sed -i -e "s/^set cvar_check_balance .*/set cvar_check_balance $countw/" balance25.cfg
+for b in $balance_cfgs; do
+	sed -i -e "s/^set cvar_check_balance .*/set cvar_check_balance $countw/" "$b"
+done
 
 sed -e "
 	s/^string CVAR_CHECK_DEFAULT = .*/string CVAR_CHECK_DEFAULT = \"$countd\";/;