From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 1 Dec 2010 20:13:36 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/perweap_xhair_centered'
X-Git-Tag: xonotic-v0.1.0preview~81
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=bc9c0387bed9a396b7fa98cb810a54a54b6d040c;hp=55f3c0980cec76e1de03b70a63c1e3de865a5790;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/perweap_xhair_centered'
---

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 6ff82fd83..eac056d85 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -394,11 +394,11 @@ set g_balance_electro_combo_comboradius 0
 set g_balance_electro_combo_speed 400
 // }}}
 // {{{ crylink
-set g_balance_crylink_primary_damage 8
+set g_balance_crylink_primary_damage 10
 set g_balance_crylink_primary_edgedamage 6
 set g_balance_crylink_primary_force 40
 set g_balance_crylink_primary_radius 80
-set g_balance_crylink_primary_speed 1200
+set g_balance_crylink_primary_speed 1250
 set g_balance_crylink_primary_spread 0.05
 set g_balance_crylink_primary_shots 7
 set g_balance_crylink_primary_bounces 2
@@ -421,11 +421,11 @@ set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300
 set g_balance_crylink_primary_other_fadetime 0.25
 
 set g_balance_crylink_secondary 1
-set g_balance_crylink_secondary_damage 2
+set g_balance_crylink_secondary_damage 3
 set g_balance_crylink_secondary_edgedamage 0
 set g_balance_crylink_secondary_force -20
 set g_balance_crylink_secondary_radius 5
-set g_balance_crylink_secondary_speed 1600
+set g_balance_crylink_secondary_speed 1700
 set g_balance_crylink_secondary_spread 0.03
 set g_balance_crylink_secondary_shots 3
 set g_balance_crylink_secondary_bounces 0
@@ -460,7 +460,7 @@ set g_balance_nex_primary_damagefalloff_forcehalflife 0
 
 set g_balance_nex_secondary 1
 set g_balance_nex_secondary_charge 1
-set g_balance_nex_secondary_charge_rate 0.5
+set g_balance_nex_secondary_charge_rate 0.4
 set g_balance_nex_secondary_charge_pool 1
 set g_balance_nex_secondary_charge_pool_regen 0.15
 set g_balance_nex_secondary_charge_pool_pause_regen 1
@@ -469,7 +469,7 @@ set g_balance_nex_secondary_damage 0
 set g_balance_nex_secondary_force 0
 set g_balance_nex_secondary_refire 0
 set g_balance_nex_secondary_animtime 0
-set g_balance_nex_secondary_ammo 0.25 // full charge pool is 1, so it depletes in 4 secs
+set g_balance_nex_secondary_ammo 0.2 // full charge pool is 1, so it depletes in 5 secs
 set g_balance_nex_secondary_damagefalloff_mindist 0
 set g_balance_nex_secondary_damagefalloff_maxdist 0
 set g_balance_nex_secondary_damagefalloff_halflife 0
diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc
index 690231b60..a6d31ca57 100644
--- a/qcsrc/server/ctf.qc
+++ b/qcsrc/server/ctf.qc
@@ -171,11 +171,6 @@ void place_flag()
 		return;
 	}
 
-	if(!self.t_width)
-		self.t_width = 0.1; // frame animation rate
-	if(!self.t_length)
-		self.t_length = 58; // maximum frame
-
 	setattachment(self, world, "");
 	self.mdl = self.model;
 	self.flags = FL_ITEM;
@@ -339,19 +334,6 @@ void DropFlag(entity e, entity penalty_receiver, entity attacker)
 		dprint("FLAG FALLTHROUGH will happen SOON\n");
 };
 
-void AnimateFlag()
-{
-	if(self.delay > time)
-		return;
-	self.delay = time + self.t_width;
-	if(self.nextthink > self.delay)
-		self.nextthink = self.delay;
-
-	self.frame = self.frame + 1;
-	if(self.frame > self.t_length)
-		self.frame = 0;
-}
-
 void FlagThink()
 {
 	local entity e;
@@ -373,8 +355,6 @@ void FlagThink()
 			ctf_captureshield_update(e, 1); // release shield only
 	}
 
-	AnimateFlag();
-
 	if(self.speedrunning)
 	if(self.cnt == FLAG_CARRY)
 	{
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index f72d32236..9a3c3614a 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -2736,7 +2736,7 @@ void MapVote_Start()
 		return;
 
 	// wait for stats to be sent first
-	if(!playerstats_sent)
+	if(!playerstats_waitforme)
 		return;
 
 	MapInfo_Enumerate();
diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index 7da57f2c2..829fe5767 100644
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -7,13 +7,14 @@ float playerstats_requested;
 void PlayerStats_Init()
 {
 	string uri;
-	playerstats_sent = TRUE;
+	playerstats_db = -1;
+	playerstats_waitforme = TRUE;
 	uri = cvar_string("g_playerstats_uri");
 	if(uri == "")
 		return;
 	playerstats_db = db_create();
 	if(playerstats_db >= 0)
-		playerstats_sent = FALSE; // must wait for it at match end
+		playerstats_waitforme = FALSE; // must wait for it at match end
 	
 	PlayerStats_AddEvent(PLAYERSTATS_ALIVETIME);
 	PlayerStats_AddEvent(PLAYERSTATS_KILLS);
@@ -81,7 +82,7 @@ void PlayerStats_Event(entity e, string event_id, float value)
 void PlayerStats_Sent_URI_Get_Callback(float id, float status, string data)
 {
 	if(playerstats_requested)
-		playerstats_sent = TRUE;
+		playerstats_waitforme = TRUE;
 }
 
 void PlayerStats_Shutdown()
@@ -126,12 +127,12 @@ void PlayerStats_Shutdown()
 		if(crypto_uri_postbuf(uri, URI_GET_PLAYERSTATS_SENT, "text/plain", "\n", b, 0))
 			playerstats_requested = TRUE;
 		else
-			playerstats_sent = TRUE; // if posting fails, we must continue anyway
+			playerstats_waitforme = TRUE; // if posting fails, we must continue anyway
 
 		buf_del(b);
 	}
 	else
-		playerstats_sent = TRUE;
+		playerstats_waitforme = TRUE;
 
 	db_close(playerstats_db);
 	playerstats_db = -1;
diff --git a/qcsrc/server/playerstats.qh b/qcsrc/server/playerstats.qh
index b7b425f29..fea546a12 100644
--- a/qcsrc/server/playerstats.qh
+++ b/qcsrc/server/playerstats.qh
@@ -3,7 +3,7 @@ string PLAYERSTATS_ALIVETIME = "alivetime";
 string PLAYERSTATS_KILLS     = "kills";
 
 // delay map switch until this is set
-float playerstats_sent;
+float playerstats_waitforme;
 
 // call at initialization
 void PlayerStats_Init();
diff --git a/sound/announcer/default/03kills.ogg b/sound/announcer/default/03kills.ogg
index 74b797ba1..d58d62b68 100644
Binary files a/sound/announcer/default/03kills.ogg and b/sound/announcer/default/03kills.ogg differ
diff --git a/sound/announcer/default/05kills.ogg b/sound/announcer/default/05kills.ogg
index 246029943..c6e4a1c57 100644
Binary files a/sound/announcer/default/05kills.ogg and b/sound/announcer/default/05kills.ogg differ
diff --git a/sound/announcer/default/10kills.ogg b/sound/announcer/default/10kills.ogg
index aeb209d2a..0002a3b1e 100644
Binary files a/sound/announcer/default/10kills.ogg and b/sound/announcer/default/10kills.ogg differ
diff --git a/sound/announcer/default/15kills.ogg b/sound/announcer/default/15kills.ogg
index f0f443944..a3ed1b2d3 100644
Binary files a/sound/announcer/default/15kills.ogg and b/sound/announcer/default/15kills.ogg differ
diff --git a/sound/announcer/default/1fragleft.ogg b/sound/announcer/default/1fragleft.ogg
index 14d667644..9e17e91f2 100644
Binary files a/sound/announcer/default/1fragleft.ogg and b/sound/announcer/default/1fragleft.ogg differ
diff --git a/sound/announcer/default/1minuteremains.ogg b/sound/announcer/default/1minuteremains.ogg
index 12d5f7c0a..f21a1bd81 100644
Binary files a/sound/announcer/default/1minuteremains.ogg and b/sound/announcer/default/1minuteremains.ogg differ
diff --git a/sound/announcer/default/20kills.ogg b/sound/announcer/default/20kills.ogg
index 638ec676e..5867d5925 100644
Binary files a/sound/announcer/default/20kills.ogg and b/sound/announcer/default/20kills.ogg differ
diff --git a/sound/announcer/default/25kills.ogg b/sound/announcer/default/25kills.ogg
index 1b700977e..44d6d8b38 100644
Binary files a/sound/announcer/default/25kills.ogg and b/sound/announcer/default/25kills.ogg differ
diff --git a/sound/announcer/default/2fragsleft.ogg b/sound/announcer/default/2fragsleft.ogg
index e346570b0..24ea3c393 100644
Binary files a/sound/announcer/default/2fragsleft.ogg and b/sound/announcer/default/2fragsleft.ogg differ
diff --git a/sound/announcer/default/30kills.ogg b/sound/announcer/default/30kills.ogg
index 536d5ec54..e6bb66ef2 100644
Binary files a/sound/announcer/default/30kills.ogg and b/sound/announcer/default/30kills.ogg differ
diff --git a/sound/announcer/default/3fragsleft.ogg b/sound/announcer/default/3fragsleft.ogg
index 9ccceff06..6a20bfdba 100644
Binary files a/sound/announcer/default/3fragsleft.ogg and b/sound/announcer/default/3fragsleft.ogg differ
diff --git a/sound/announcer/default/5minutesremain.ogg b/sound/announcer/default/5minutesremain.ogg
index 1ec462bf3..c4572ab35 100644
Binary files a/sound/announcer/default/5minutesremain.ogg and b/sound/announcer/default/5minutesremain.ogg differ
diff --git a/sound/announcer/default/airshot.ogg b/sound/announcer/default/airshot.ogg
index a4e14ba5e..39cf68d21 100644
Binary files a/sound/announcer/default/airshot.ogg and b/sound/announcer/default/airshot.ogg differ
diff --git a/sound/announcer/default/amazing.ogg b/sound/announcer/default/amazing.ogg
index 7ce6f3a9e..d28a8ef62 100644
Binary files a/sound/announcer/default/amazing.ogg and b/sound/announcer/default/amazing.ogg differ
diff --git a/sound/announcer/default/awesome.ogg b/sound/announcer/default/awesome.ogg
index 962a6bd30..004e086e2 100644
Binary files a/sound/announcer/default/awesome.ogg and b/sound/announcer/default/awesome.ogg differ
diff --git a/sound/announcer/default/blueteamtakeslead.ogg b/sound/announcer/default/blueteamtakeslead.ogg
index 500fed815..bea17ecb6 100644
Binary files a/sound/announcer/default/blueteamtakeslead.ogg and b/sound/announcer/default/blueteamtakeslead.ogg differ
diff --git a/sound/announcer/default/headshot.ogg b/sound/announcer/default/headshot.ogg
index 903fb8510..133294d9f 100644
Binary files a/sound/announcer/default/headshot.ogg and b/sound/announcer/default/headshot.ogg differ
diff --git a/sound/announcer/default/impressive.ogg b/sound/announcer/default/impressive.ogg
index 25d01c056..942bf2156 100644
Binary files a/sound/announcer/default/impressive.ogg and b/sound/announcer/default/impressive.ogg differ
diff --git a/sound/announcer/default/redteamtakeslead.ogg b/sound/announcer/default/redteamtakeslead.ogg
index 81ac853f3..1ac573fcd 100644
Binary files a/sound/announcer/default/redteamtakeslead.ogg and b/sound/announcer/default/redteamtakeslead.ogg differ
diff --git a/sound/misc/armor25.wav b/sound/misc/armor25.wav
index ca16d2188..9aea70caf 100644
Binary files a/sound/misc/armor25.wav and b/sound/misc/armor25.wav differ
diff --git a/sound/monsters/alien_chant_loop.ogg b/sound/monsters/alien_chant_loop.ogg
new file mode 100644
index 000000000..527411f7c
Binary files /dev/null and b/sound/monsters/alien_chant_loop.ogg differ
diff --git a/sound/monsters/giant_snoring_loop.ogg b/sound/monsters/giant_snoring_loop.ogg
new file mode 100644
index 000000000..aeb9c1cd6
Binary files /dev/null and b/sound/monsters/giant_snoring_loop.ogg differ
diff --git a/sound/monsters/growl1.wav b/sound/monsters/growl1.wav
new file mode 100644
index 000000000..bc0f25609
Binary files /dev/null and b/sound/monsters/growl1.wav differ
diff --git a/sound/monsters/growl2.wav b/sound/monsters/growl2.wav
new file mode 100644
index 000000000..58842b87a
Binary files /dev/null and b/sound/monsters/growl2.wav differ
diff --git a/sound/monsters/growl3.wav b/sound/monsters/growl3.wav
new file mode 100644
index 000000000..8b75efd23
Binary files /dev/null and b/sound/monsters/growl3.wav differ
diff --git a/sound/player/slime.wav b/sound/player/slime.wav
index 8d5a28c15..94514e5ac 100644
Binary files a/sound/player/slime.wav and b/sound/player/slime.wav differ
diff --git a/sound/weapons/crylink_fire.ogg b/sound/weapons/crylink_fire.ogg
index b93516083..bb18f53f1 100644
Binary files a/sound/weapons/crylink_fire.ogg and b/sound/weapons/crylink_fire.ogg differ
diff --git a/sound/weapons/crylink_fire2.ogg b/sound/weapons/crylink_fire2.ogg
index 1f8b75115..f10d6dd0c 100644
Binary files a/sound/weapons/crylink_fire2.ogg and b/sound/weapons/crylink_fire2.ogg differ
diff --git a/sound/weapons/electro_fire.ogg b/sound/weapons/electro_fire.ogg
index 26b0358ed..18b3e156d 100644
Binary files a/sound/weapons/electro_fire.ogg and b/sound/weapons/electro_fire.ogg differ
diff --git a/sound/weapons/electro_fire2.ogg b/sound/weapons/electro_fire2.ogg
index f96966d34..a7192fa89 100644
Binary files a/sound/weapons/electro_fire2.ogg and b/sound/weapons/electro_fire2.ogg differ
diff --git a/sound/weapons/grenade_fire.ogg b/sound/weapons/grenade_fire.ogg
index a6408b387..41895ed98 100644
Binary files a/sound/weapons/grenade_fire.ogg and b/sound/weapons/grenade_fire.ogg differ
diff --git a/sound/weapons/grenade_impact.ogg b/sound/weapons/grenade_impact.ogg
index 8cf78ea1e..8175cd7aa 100644
Binary files a/sound/weapons/grenade_impact.ogg and b/sound/weapons/grenade_impact.ogg differ
diff --git a/sound/weapons/hagar_fire.ogg b/sound/weapons/hagar_fire.ogg
index 2068d4414..fcb68c00b 100644
Binary files a/sound/weapons/hagar_fire.ogg and b/sound/weapons/hagar_fire.ogg differ
diff --git a/sound/weapons/hagexp1.ogg b/sound/weapons/hagexp1.ogg
index 664c4440a..f7b872e6e 100644
Binary files a/sound/weapons/hagexp1.ogg and b/sound/weapons/hagexp1.ogg differ
diff --git a/sound/weapons/hagexp2.ogg b/sound/weapons/hagexp2.ogg
index b58b3f12c..d0f6e8397 100644
Binary files a/sound/weapons/hagexp2.ogg and b/sound/weapons/hagexp2.ogg differ
diff --git a/sound/weapons/hagexp3.ogg b/sound/weapons/hagexp3.ogg
index 27192c177..f2fcbb5fd 100644
Binary files a/sound/weapons/hagexp3.ogg and b/sound/weapons/hagexp3.ogg differ
diff --git a/sound/weapons/minstanexfire.ogg b/sound/weapons/minstanexfire.ogg
index 09232de00..d08710985 100644
Binary files a/sound/weapons/minstanexfire.ogg and b/sound/weapons/minstanexfire.ogg differ
diff --git a/sound/weapons/nexfire.ogg b/sound/weapons/nexfire.ogg
index dc8936981..5d28b731c 100644
Binary files a/sound/weapons/nexfire.ogg and b/sound/weapons/nexfire.ogg differ
diff --git a/sound/weapons/nexwhoosh1.ogg b/sound/weapons/nexwhoosh1.ogg
index 55e4f7610..36f1183da 100644
Binary files a/sound/weapons/nexwhoosh1.ogg and b/sound/weapons/nexwhoosh1.ogg differ
diff --git a/sound/weapons/nexwhoosh2.ogg b/sound/weapons/nexwhoosh2.ogg
index 6fcaaeaea..38ffa22f3 100644
Binary files a/sound/weapons/nexwhoosh2.ogg and b/sound/weapons/nexwhoosh2.ogg differ
diff --git a/sound/weapons/nexwhoosh3.ogg b/sound/weapons/nexwhoosh3.ogg
index 4f3eb6cf8..3db8d4b44 100644
Binary files a/sound/weapons/nexwhoosh3.ogg and b/sound/weapons/nexwhoosh3.ogg differ
diff --git a/sound/weapons/rocket_impact.ogg b/sound/weapons/rocket_impact.ogg
index 1d600459f..56b114e65 100644
Binary files a/sound/weapons/rocket_impact.ogg and b/sound/weapons/rocket_impact.ogg differ
diff --git a/sound/weapons/shotgun_fire.ogg b/sound/weapons/shotgun_fire.ogg
index 81908df8a..8d4f607c7 100644
Binary files a/sound/weapons/shotgun_fire.ogg and b/sound/weapons/shotgun_fire.ogg differ
diff --git a/sound/weapons/strength_fire.ogg b/sound/weapons/strength_fire.ogg
index be1159d4f..8d27e4fde 100644
Binary files a/sound/weapons/strength_fire.ogg and b/sound/weapons/strength_fire.ogg differ
diff --git a/sound/weapons/uzi_fire.ogg b/sound/weapons/uzi_fire.ogg
index 6ed281ddb..24c73a4c0 100644
Binary files a/sound/weapons/uzi_fire.ogg and b/sound/weapons/uzi_fire.ogg differ