diff --git a/source/src/server.h b/source/src/server.h index f49aa13b..260703f1 100644 --- a/source/src/server.h +++ b/source/src/server.h @@ -458,7 +458,7 @@ itemstat ammostats[NUMGUNS] = { 14, 28, 21, S_ITEMAMMO }, // shotgun { 60, 90, 90, S_ITEMAMMO }, // subgun { 10, 20, 15, S_ITEMAMMO }, // sniper - { 36, 54, 54, S_ITEMAMMO }, // assault + { 40, 60, 60, S_ITEMAMMO }, // assault { 30, 45, 75, S_ITEMAMMO }, // cpistol { 1, 0, 3, S_ITEMAMMO }, // grenade {100, 0, 100, S_ITEMAKIMBO} // akimbo @@ -481,11 +481,11 @@ guninfo guns[NUMGUNS] = // sound reloadtime damage projspeed spread magsize mKB reB reF isauto { "knife", S_KNIFE, S_NULL, 0, 500, 50, 100, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, false }, { "pistol", S_PISTOL, S_RPISTOL, 1400, 160, 18, 0, 0, 0, 53, 10, 10, 6, 5, 6, 35, 58, 125, 1, false }, - { "carbine", S_CARBINE, S_RCARBINE, 1800, 720, 60, 50, 0, 0, 10, 60, 10, 4, 4, 10, 60, 60, 150, 1, false }, + { "carbine", S_CARBINE, S_RCARBINE, 1800, 720, 60, 40, 0, 0, 10, 60, 10, 4, 4, 10, 60, 60, 150, 1, false }, { "shotgun", S_SHOTGUN, S_RSHOTGUN, 2400, 800, 1, 0, 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, 16, 0, 0, 0, 45, 15, 30, 1, 2, 4, 30, 50, 188, 1, true }, - { "sniper", S_SNIPER, S_RSNIPER, 1950, 1500, 80, 0, 0, 0, 50, 50, 5, 4, 4, 10, 85, 85, 100, 1, false }, - { "assault", S_ASSAULT, S_RASSAULT, 2000, 120, 22, 0, 0, 0, 18, 35, 18, 0, 2, 2, 22, 55, 115, 1, true }, + { "sniper", S_SNIPER, S_RSNIPER, 1950, 1500, 82, 25, 0, 0, 50, 50, 5, 4, 4, 10, 85, 85, 100, 1, false }, + { "assault", S_ASSAULT, S_RASSAULT, 2000, 120, 22, 0, 0, 0, 18, 30, 20, 0, 2, 2, 22, 55, 115, 1, true }, { "cpistol", S_PISTOL, S_RPISTOL, 1400, 120, 19, 0, 0, 0, 35, 10, 15, 6, 5, 6, 35, 58, 125, 1, false }, // temporary { "grenade", S_NULL, S_NULL, 1000, 650, 200, 0, 20, 6, 1, 1, 1, 3, 1, 0, 0, 0, 0, 3, false }, { "pistol", S_PISTOL, S_RAKIMBO, 1400, 80, 19, 0, 0, 0, 50, 10, 20, 6, 5, 10, 10, 18, 115, 1, true }, diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index 06093974..e7f2ed44 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -8,20 +8,20 @@ VARP(autoreload, 0, 1, 1); VARP(akimboautoswitch, 0, 1, 1); VARP(akimboendaction, 0, 1, 2); // 0: stay with pistol, 1: back to primary, 2: grenade - all fallback to previous one w/o ammo for target -int SGDMGTOTAL = 85; +int SGDMGTOTAL = 90; int SGDMGBONUS = 65; int SGDMGDISTB = 50; -int SGCCdmg = 550; +int SGCCdmg = 500; int SGCCbase = 0; int SGCCrange = 40; -int SGCMdmg = 350; +int SGCMdmg = 375; int SGCMbase = 25; int SGCMrange = 60; -int SGCOdmg = 100; +int SGCOdmg = 125; int SGCObase = 45; int SGCOrange = 75;