From: Mircea Kitsune Date: Thu, 28 Oct 2010 11:09:29 +0000 (+0300) Subject: Remake this branch to fix some possible issues and conflicts from yesterday's version... X-Git-Tag: xonotic-v0.1.0preview~233^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dd7638f74d027fdf3a889b055967f5035098a8c1;p=xonotic%2Fxonotic-data.pk3dir.git Remake this branch to fix some possible issues and conflicts from yesterday's version. This moves the Camping Rifle on the same slot as the Nex, because IMO it's a sniper rather than a machine gun. --- diff --git a/qcsrc/server/w_campingrifle.qc b/qcsrc/server/w_campingrifle.qc index 61d4af6fa..07268a7a0 100644 --- a/qcsrc/server/w_campingrifle.qc +++ b/qcsrc/server/w_campingrifle.qc @@ -1,5 +1,5 @@ #ifdef REGISTER_WEAPON -REGISTER_WEAPON(CAMPINGRIFLE, w_campingrifle, IT_NAILS, 3, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_MID, "campingrifle", "campingrifle", "Sniper Rifle"); +REGISTER_WEAPON(CAMPINGRIFLE, w_campingrifle, IT_NAILS, 7, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_MID, "campingrifle", "campingrifle", "Sniper Rifle"); #else #ifdef SVQC //Camping rifle Primary mode: manually operated bolt*, Secondary: full automatic**