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

akimbo less recoil and 4-level armor approach

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4874 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-05-15 23:23:52 +00:00
parent 9260b80fbf
commit 76eb7d06a4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entity.h
+1 -1
View File
@@ -319,7 +319,7 @@ public:
// just subtract damage here, can set death, etc. later in code calling this
int dodamage(int damage)
{
int ad = damage*30/100; // let armour absorb when possible
int ad = damage * ( 100 + Av ) * 20 / 10000; // let armour absorb when possible // 4-level armor - continous approach
if(ad>armour) ad = armour;
armour -= ad;
damage -= ad;
source/src/server.h
+2 -2
View File
@@ -394,14 +394,14 @@ itemstat powerupstats[I_ARMOUR-I_HEALTH+1] =
guninfo guns[NUMGUNS] =
{
{ "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, 170, 19, 0, 0, 80, 10, 8, 6, 5, 1, 40, 75, 150, 1, false },
{ "pistol", S_PISTOL, S_RPISTOL, 1400, 160, 19, 0, 0, 80, 10, 8, 6, 5, 1, 40, 75, 150, 1, false },
{ "rifle", S_RIFLE, S_RRIFLE, 1950, 720, 50, 0, 0, 20, 50, 10, 4, 4, 2, 100, 60, 150, 1, false }, // temporary values
{ "shotgun", S_SHOTGUN, S_RSHOTGUN, 2400, 1000, 5, 0, 0, 1, 35, 7, 9, 9, 1, 130, 500, 150, 1, false },
{ "subgun", S_SUBGUN, S_RSUBGUN, 1650, 80, 14, 0, 0, 70, 15, 30, 1, 2, 5, 15, 55, 250, 1, true },
{ "sniper", S_SNIPER, S_RSNIPER, 1950, 1500, 85, 0, 0, 60, 50, 5, 4, 4, 1, 100, 500, 100, 1, false },
{ "assault", S_ASSAULT, S_RASSAULT, 2000, 120, 24, 0, 0, 20, 40, 20, 0, 2, 2, 25, 60, 150, 1, true },
{ "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, 80, 10, 16, 6, 5, 4, 30, 75, 150, 1, true },
{ "pistol", S_PISTOL, S_RAKIMBO, 1400, 80, 19, 0, 0, 80, 10, 16, 6, 5, 2, 15, 60, 150, 1, true },
};
const char *teamnames[TEAM_NUM+1] = {"CLA", "RVSF", "CLA-SPECT", "RVSF-SPECT", "SPECTATOR", "void"};