From caaa4dfa9eddcda043eea7192cc9fcadfd06dd6a Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Fri, 7 Aug 2009 13:59:17 +0000
Subject: [PATCH] weapon force factor

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7382 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/apply-eol-style.sh             | 14 ++++++++
 data/defaultNexuiz.cfg              |  5 +--
 data/eol-style.txt                  | 56 +++++++++++++++++++++++++++++
 data/find-eol-style.sh              | 27 ++++++++++++++
 data/maps/tutorial.mapinfo          |  1 +
 data/qcsrc/common/util.qc           | 12 +++++++
 data/qcsrc/common/util.qh           |  2 ++
 data/qcsrc/menu/nexuiz/serverlist.c |  4 +--
 data/qcsrc/menu/nexuiz/util.qc      |  8 +++++
 data/qcsrc/menu/nexuiz/util.qh      |  2 ++
 data/qcsrc/server/constants.qh      |  2 +-
 data/qcsrc/server/g_damage.qc       |  5 +++
 data/qcsrc/server/miscfunctions.qc  |  2 ++
 13 files changed, 135 insertions(+), 5 deletions(-)
 create mode 100644 data/apply-eol-style.sh
 create mode 100644 data/eol-style.txt
 create mode 100644 data/find-eol-style.sh

diff --git a/data/apply-eol-style.sh b/data/apply-eol-style.sh
new file mode 100644
index 000000000..6c6c997cc
--- /dev/null
+++ b/data/apply-eol-style.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+while read -r EXT EOLSTYLE; do
+	echo "Fixing $EXT..."
+	find . -name .svn -prune -o -type f \( -name "*.$EXT" -o -name "$EXT" \) -print0 | \
+		case "$EOLSTYLE" in
+			1)
+				xargs -0 svn propset svn:eol-style native
+				;;
+			0)
+				xargs -0 svn propdel svn:eol-style
+				;;
+		esac
+done <eol-style.txt
diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg
index 18717ea1a..48274e477 100644
--- a/data/defaultNexuiz.cfg
+++ b/data/defaultNexuiz.cfg
@@ -24,7 +24,7 @@ alias if_dedicated "_detect_dedicated_$qport $*"
 seta g_configversion 0	"Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
 // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default aed586a22dba9cc4fc03e03d90e60d6e
+set cvar_check_default cf10a5c13c0767a0f40fd748ce9a472c
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -1306,7 +1306,7 @@ seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in th
 // for menu server list (eventually make them have engine support?)
 seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join"
 seta menu_slist_showempty 1 "show servers even if they are no empty and have no opponents to play against"
-set menu_slist_modfilter "!havoc"
+set menu_slist_modfilter "=" // set to either: !modname or modname. modname of = means "same as we are running now".
 
 // for menu weapon arena
 set menu_weaponarena_with_laser 0 "also enable the Laser in this weapon arena"
@@ -1594,6 +1594,7 @@ set g_balance_pause_fuel_rot_spawn 10
 
 set g_weaponspeedfactor 1 "weapon fire rate multiplier"
 set g_weapondamagefactor 1 "weapon damage multiplier"
+set g_weaponforcefactor 1 "weapon force multiplier"
 
 set cl_effects_lightningarc_simple 0
 set cl_effects_lightningarc_segmentlength 64
diff --git a/data/eol-style.txt b/data/eol-style.txt
new file mode 100644
index 000000000..357f3c0a2
--- /dev/null
+++ b/data/eol-style.txt
@@ -0,0 +1,56 @@
+animinfo 1
+ase 0
+bgs 1
+blend 0
+bsp 0
+c 1
+cache 0
+cbp 0
+cfg 1
+db 0
+def 1
+dem 0
+dpm 0
+framegroups 1
+h 1
+hardwired 1
+inc 1
+instantaction 1
+jpg 0
+lmp 0
+Makefile 1
+makespr32 1
+map 0
+mapinfo 1
+md3 0
+mdl 0
+modinfo 1
+obj 0
+ogg 0
+options 1
+pcx 0
+pk3 0
+pl 1
+png 0
+proj 1
+psd 0
+qc 1
+qh 1
+rb 1
+rc 1
+rtlights 0
+sh 1
+shader 1
+skin 1
+sounds 1
+sp2 0
+spr 0
+spr32 0
+src 1
+svg 0
+tga 0
+txt 1
+wav 0
+waypoints 0
+width 1
+zym 0
diff --git a/data/find-eol-style.sh b/data/find-eol-style.sh
new file mode 100644
index 000000000..509ce1298
--- /dev/null
+++ b/data/find-eol-style.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+allstatus=$(
+	find . -name .svn -prune -o -type f -print | while IFS= read -r LINE; do
+		ext=${LINE##*/}
+		ext=${ext##*.}
+		if s=`svn propget svn:eol-style "$LINE"`; then
+			case "$s" in
+				*native*)
+					echo "$ext 1"
+					;;
+				*)
+					echo "$ext 0"
+					;;
+			esac
+		fi
+	done | sort -u
+)
+
+mixed=`echo "$allstatus" | rev | cut -c 3- | rev | uniq -d`
+if [ -n "$mixed" ]; then
+	echo "The following file extensions need to be manually fixed:"
+	echo "$mixed"
+	exit 1
+fi
+
+echo "$allstatus" > eol-style.txt
diff --git a/data/maps/tutorial.mapinfo b/data/maps/tutorial.mapinfo
index a72568733..8ac3bb97d 100644
--- a/data/maps/tutorial.mapinfo
+++ b/data/maps/tutorial.mapinfo
@@ -16,4 +16,5 @@ settemp_for_type all g_balance_selfdamagepercent 0
 settemp_for_type all g_balance_falldamage_minspeed 9999
 settemp_for_type all g_balance_kill_delay 1337
 settemp_for_type all g_use_ammunition 0
+settemp_for_type all sv_spectate 0
 clientsettemp_for_type all snd_mutewhenidle 0
diff --git a/data/qcsrc/common/util.qc b/data/qcsrc/common/util.qc
index 91d9e8984..289c62632 100644
--- a/data/qcsrc/common/util.qc
+++ b/data/qcsrc/common/util.qc
@@ -1604,3 +1604,15 @@ vector healtharmor_applydamage(float a, float armorblock, float damage)
 	v_z = 0;
 	return v;
 }
+
+string getcurrentmod()
+{
+	float n;
+	string m;
+	m = cvar_string("fs_gamedir");
+	n = tokenize_console(m);
+	if(n == 0)
+		return "data";
+	else
+		return argv(n - 1);
+}
diff --git a/data/qcsrc/common/util.qh b/data/qcsrc/common/util.qh
index 09f3cd0bc..e5ca0b77c 100644
--- a/data/qcsrc/common/util.qh
+++ b/data/qcsrc/common/util.qh
@@ -173,3 +173,5 @@ void RandomSelection_Add(entity e, float f, string s, float weight, float priori
 
 vector healtharmor_maxdamage(float h, float a, float armorblock); // returns vector: maxdamage, armorideal, 1 if fully armored
 vector healtharmor_applydamage(float a, float armorblock, float damage); // returns vector: take, save, 0
+
+string getcurrentmod();
diff --git a/data/qcsrc/menu/nexuiz/serverlist.c b/data/qcsrc/menu/nexuiz/serverlist.c
index 1d9721773..bc5855868 100644
--- a/data/qcsrc/menu/nexuiz/serverlist.c
+++ b/data/qcsrc/menu/nexuiz/serverlist.c
@@ -213,9 +213,9 @@ void refreshServerListNexuizServerList(entity me, float mode)
 		if(modstr != "")
 		{
 			if(substring(modstr, 0, 1) == "!")
-				sethostcachemaskstring(++m, SLIST_FIELD_MOD, substring(modstr, 1, strlen(modstr) - 1), SLIST_TEST_NOTEQUAL);
+				sethostcachemaskstring(++m, SLIST_FIELD_MOD, resolvemod(substring(modstr, 1, strlen(modstr) - 1)), SLIST_TEST_NOTEQUAL);
 			else
-				sethostcachemaskstring(++m, SLIST_FIELD_MOD, modstr, SLIST_TEST_EQUAL);
+				sethostcachemaskstring(++m, SLIST_FIELD_MOD, resolvemod(modstr), SLIST_TEST_EQUAL);
 		}
 		m = SLIST_MASK_OR - 1;
 		if(s != "")
diff --git a/data/qcsrc/menu/nexuiz/util.qc b/data/qcsrc/menu/nexuiz/util.qc
index 6212773cf..7ee4e8255 100644
--- a/data/qcsrc/menu/nexuiz/util.qc
+++ b/data/qcsrc/menu/nexuiz/util.qc
@@ -358,3 +358,11 @@ void preMenuDraw()
 		campaign_won_previous = cvar(strcat("g_campaign", campaign_name, "_won"));
 	}
 }
+
+string resolvemod(string m)
+{
+	if(m == "=")
+		return getcurrentmod();
+	else
+		return m;
+}
diff --git a/data/qcsrc/menu/nexuiz/util.qh b/data/qcsrc/menu/nexuiz/util.qh
index 6d7e42665..f34f8d581 100644
--- a/data/qcsrc/menu/nexuiz/util.qh
+++ b/data/qcsrc/menu/nexuiz/util.qh
@@ -15,3 +15,5 @@ float tooltipdb;
 void loadTooltips();
 void unloadTooltips();
 string getZonedTooltipForIdentifier(string s);
+
+string resolvemod(string m);
diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh
index d1d807971..2c2b1a29b 100644
--- a/data/qcsrc/server/constants.qh
+++ b/data/qcsrc/server/constants.qh
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "aed586a22dba9cc4fc03e03d90e60d6e";
+string CVAR_CHECK_DEFAULT = "cf10a5c13c0767a0f40fd748ce9a472c";
 string CVAR_CHECK_WEAPONS = "a7ca57b891d66754b856e24e5c1745e3";
 
 float	FALSE					= 0;
diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc
index 61a9ec7ad..39b904e7e 100644
--- a/data/qcsrc/server/g_damage.qc
+++ b/data/qcsrc/server/g_damage.qc
@@ -706,7 +706,12 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 		}
 
 		if not(DEATH_ISSPECIAL(deathtype))
+		{
 			damage *= g_weapondamagefactor;
+			mirrordamage *= g_weapondamagefactor;
+			force = force * g_weaponforcefactor;
+			mirrorforce *= g_weaponforcefactor;
+		}
 
 		// apply strength multiplier
 		if ((attacker.items & IT_STRENGTH) && !g_minstagib)
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 9bb83ed48..f00a3d5cf 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -705,6 +705,7 @@ float g_weaponarena;
 string g_weaponarena_list;
 float g_weaponspeedfactor;
 float g_weapondamagefactor;
+float g_weaponforcefactor;
 
 float start_weapons;
 float start_items;
@@ -1077,6 +1078,7 @@ void readlevelcvars(void)
 
     g_weaponspeedfactor = cvar("g_weaponspeedfactor");
     g_weapondamagefactor = cvar("g_weapondamagefactor");
+    g_weaponforcefactor = cvar("g_weaponforcefactor");
 
     g_pickup_shells                    = cvar("g_pickup_shells");
     g_pickup_shells_max                = cvar("g_pickup_shells_max");
-- 
2.39.2