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

further weaponry tweaking - comment clean-up

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6042 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
flowtron
2011-01-24 17:27:12 +00:00
parent 25324d5c09
commit 381a6de134
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entity.h
+1 -1
View File
@@ -51,7 +51,7 @@ enum { GUN_KNIFE = 0, GUN_PISTOL, GUN_RIFLE, GUN_SHOTGUN, GUN_SUBGUN, GUN_SNIPER
#define SGRAYS 21
#define SGMAXDMGABS 105
#define SGMAXDMGLOC 84
#define SGBONUSDIST 60
#define SGBONUSDIST 80
#define SGSEGDMG_O 3
#define SGSEGDMG_M 4
#define SGSEGDMG_C 5
source/src/server.h
+7 -15
View File
@@ -449,17 +449,9 @@ const char *entnames[MAXENTTYPES] =
"mapmodel", "trigger", "ladder", "ctf-flag", "sound", "clip", "plclip"
};
// see entity.h:61: struct itemstat { int add, start, max, sound; };
itemstat ammostats[NUMGUNS] =
{
// =================================
// | EAPP = Extra ammo per-pickup |
// | AQOS = Ammo quantity on spawn |
// | MAR = Maximum ammo reserve |
// =================================
// Note: MAR does not include bullets currently in magazine
// to find maximum ammo quantity, add magsize to MAR.
// EAPP AQOS MAR
{ 1, 1, 1, S_ITEMAMMO }, // knife dummy
{ 20, 60, 100, S_ITEMAMMO }, // pistol : CHANGED since 1.1.0.4 2010nov19
{ 15, 30, 30, S_ITEMAMMO }, // rifle
@@ -487,15 +479,15 @@ guninfo guns[NUMGUNS] =
//modelname reload attackdelay projspeed spread magsize mKB reB reF isauto
// sound reloadtime damage part recoil mKR reI reM pFX
{ "knife", S_KNIFE, S_NULL, 0, 500, 50, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, false },
{ "pistol", S_PISTOL, S_RPISTOL, 1400, 160, 18, 0, 0, 53, 10, 10, 6, 5, 6, 35, 58, 125, 1, false }, // CHANGED : magsize
{ "pistol", S_PISTOL, S_RPISTOL, 1400, 160, 18, 0, 0, 53, 10, 10, 6, 5, 6, 35, 58, 125, 1, false },
{ "rifle", S_RIFLE, S_RRIFLE, 1800, 720, 60, 0, 0, 10, 60, 10, 4, 4, 10, 60, 60, 150, 1, false },
{ "shotgun", S_SHOTGUN, S_RSHOTGUN, 2400, 1000, 1, 0, 0, 1, 35, 7, 9, 9, 10, 140, 140, 125, 1, false }, // CHANGED : CAUTION dmg only sane for server!
{ "subgun", S_SUBGUN, S_RSUBGUN, 1650, 80, 15, 0, 0, 45, 15, 30, 1, 2, 4, 30, 50, 188, 1, true }, // CHANGED : [reI,reB,reM] + spread
{ "sniper", S_SNIPER, S_RSNIPER, 1950, 1500, 83, 0, 0, 47, 50, 5, 4, 4, 10, 85, 85, 100, 1, false }, // CHANGED : damage, spread // 2011jan17:ft: 85=>84
{ "assault", S_ASSAULT, S_RASSAULT, 2000, 120, 22, 0, 0, 20, 40, 20, 0, 2, 2, 22, 55, 115, 1, true }, // CHANGED // 2011jan17:ft: 24=>22
{ "shotgun", S_SHOTGUN, S_RSHOTGUN, 2400, 1000, 1, 0, 0, 1, 35, 7, 9, 9, 10, 140, 140, 125, 1, false }, // CAUTION dmg only sane for server!
{ "subgun", S_SUBGUN, S_RSUBGUN, 1650, 80, 15, 0, 0, 45, 15, 30, 1, 2, 4, 30, 50, 188, 1, true },
{ "sniper", S_SNIPER, S_RSNIPER, 1950, 1500, 82, 0, 0, 50, 50, 5, 4, 4, 10, 85, 85, 100, 1, false }, // 2011jan24:ft: dmg 82, spread 50
{ "assault", S_ASSAULT, S_RASSAULT, 2000, 120, 22, 0, 0, 20, 40, 20, 0, 2, 2, 22, 55, 115, 1, true }, // 2011jan17:ft: 24=>22
{ "cpistol", S_PISTOL, S_RPISTOL, 1400, 120, 19, 0, 0, 35, 10, 15, 6, 5, 6, 35, 58, 125, 1, false }, // temporary
{ "grenade", S_NULL, S_NULL, 1000, 650, 200, 20, 6, 1, 1, 1, 3, 1, 0, 0, 0, 0, 3, false },
{ "pistol", S_PISTOL, S_RAKIMBO, 1400, 80, 19, 0, 0, 50, 10, 20, 6, 5, 10, 10, 18, 115, 1, true }, // CHANGED
{ "pistol", S_PISTOL, S_RAKIMBO, 1400, 80, 19, 0, 0, 50, 10, 20, 6, 5, 10, 10, 18, 115, 1, true },
};
const char *teamnames[TEAM_NUM+1] = {"CLA", "RVSF", "CLA-SPECT", "RVSF-SPECT", "SPECTATOR", "void"};