kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new smg spread

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4970 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-05-21 13:30:18 +00:00
parent 5ae1987204
commit f3441764df
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/server.h
+1 -1
View File
@@ -396,7 +396,7 @@ guninfo guns[NUMGUNS] =
{ "pistol", S_PISTOL, S_RPISTOL, 1400, 160, 18, 0, 0, 55, 10, 8, 6, 5, 6, 35, 58, 125, 1, false },
{ "rifle", S_RIFLE, S_RRIFLE, 1950, 840, 50, 0, 0, 20, 50, 10, 4, 4, 10, 60, 60, 150, 1, false },
{ "shotgun", S_SHOTGUN, S_RSHOTGUN, 2400, 1000, 5, 0, 0, 1, 35, 7, 9, 9, 10, 115, 115, 150, 1, false },
{ "subgun", S_SUBGUN, S_RSUBGUN, 1650, 80, 15, 0, 0, 70, 15, 30, 1, 2, 4, 15, 40, 175, 1, true },
{ "subgun", S_SUBGUN, S_RSUBGUN, 1650, 80, 15, 0, 0, 20, 15, 30, 1, 2, 4, 15, 40, 175, 1, true },
{ "sniper", S_SNIPER, S_RSNIPER, 1950, 1500, 80, 0, 0, 60, 50, 5, 4, 4, 10, 85, 85, 100, 1, false },
{ "assault", S_ASSAULT, S_RASSAULT, 2000, 120, 24, 0, 0, 20, 40, 20, 0, 2, 2, 23, 50, 125, 1, true },
{ "grenade", S_NULL, S_NULL, 1000, 650, 200, 20, 6, 1, 1, 1, 3, 1, 0, 0, 0, 0, 3, false },
source/src/weapon.cpp
+3 -2
View File
@@ -1049,6 +1049,7 @@ bool shotgun::selectable() { return weapon::selectable() && !m_noprimary && this
subgun::subgun(playerent *owner) : gun(owner, GUN_SUBGUN) {}
bool subgun::selectable() { return weapon::selectable() && !m_noprimary && this == owner->primweap; }
int subgun::dynspread() { return min(info.spread * (shots - 1), info.spread * 5); }
// sniperrifle
@@ -1072,7 +1073,7 @@ bool sniperrifle::reload()
return r;
}
#define SCOPESETTLETIME 100
#define SCOPESETTLETIME 180
int sniperrifle::dynspread()
{
if(scoped)
@@ -1124,7 +1125,7 @@ bool rifle::selectable() { return weapon::selectable() && !m_noprimary && this =
assaultrifle::assaultrifle(playerent *owner) : gun(owner, GUN_ASSAULT) {}
int assaultrifle::dynspread() { return shots > 3 ? 70 : info.spread; }
int assaultrifle::dynspread() { return shots > 3 ? info.spread * 3 : info.spread; }
float assaultrifle::dynrecoil() { return info.recoil + (rnd(8)*-0.01f); }
bool assaultrifle::selectable() { return weapon::selectable() && !m_noprimary && this == owner->primweap; }