From e81576694dbfc8fc37e2ea283154b23f79bd5334 Mon Sep 17 00:00:00 2001 From: flowtron Date: Fri, 19 Nov 2010 21:56:13 +0000 Subject: [PATCH] more weapon tweakage & linux64 bins git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5905 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/server.h | 26 +++++++++++++------------- source/src/weapon.cpp | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/source/src/server.h b/source/src/server.h index 1a76d1bc..dd463d30 100644 --- a/source/src/server.h +++ b/source/src/server.h @@ -451,16 +451,16 @@ const char *entnames[MAXENTTYPES] = itemstat ammostats[NUMGUNS] = { - {1, 1, 1, S_ITEMAMMO}, //knife dummy - {10, 40, 72, S_ITEMAMMO}, //pistol // CHANGED since 1.1.0.4 2010nov19 (magsize was 16 (max:32)) - {15, 30, 30, S_ITEMAMMO}, //rifle - {14, 28, 21, S_ITEMAMMO}, //shotgun - {60, 90, 90, S_ITEMAMMO}, //subgun - {10, 20, 15, S_ITEMAMMO}, //sniper - {40, 60, 60, S_ITEMAMMO}, //assault - {30, 45, 75, S_ITEMAMMO}, //cpistol - {1, 0, 3, S_ITEMAMMO}, //grenade - {72, 0, 72, S_ITEMAKIMBO} //akimbo + {1, 1, 1, S_ITEMAMMO }, // knife dummy + {20, 80, 100, S_ITEMAMMO }, // pistol : CHANGED since 1.1.0.4 2010nov19 + {15, 30, 30, S_ITEMAMMO }, // rifle + {14, 28, 21, S_ITEMAMMO }, // shotgun + {60, 90, 90, S_ITEMAMMO }, // subgun + {10, 20, 15, S_ITEMAMMO }, // sniper + {40, 60, 60, S_ITEMAMMO }, // assault + {30, 45, 75, S_ITEMAMMO }, // cpistol + { 1, 0, 3, S_ITEMAMMO }, // grenade + {72, 0, 72, S_ITEMAKIMBO} // akimbo }; itemstat powerupstats[I_ARMOUR-I_HEALTH+1] = @@ -478,11 +478,11 @@ 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, 55, 10, 8, 6, 5, 6, 35, 58, 125, 1, false }, + { "pistol", S_PISTOL, S_RPISTOL, 1400, 160, 18, 0, 0, 55, 10, 10, 6, 5, 6, 35, 58, 125, 1, false }, // CHANGED : magsize { "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, 5, 0, 0, 1, 35, 7, 9, 9, 10, 140, 140, 125, 1, false }, // CHANGED - { "subgun", S_SUBGUN, S_RSUBGUN, 1650, 80, 15, 0, 0, 45, 15, 30, 1, 2, 4, 30, 50, 155, 1, true }, // CHANGED : [reI,reB,reM] + spread - { "sniper", S_SNIPER, S_RSNIPER, 1950, 1500, 83, 0, 0, 45, 50, 5, 4, 4, 10, 85, 85, 100, 1, false }, // CHANGED : damage, spread + { "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, 50, 50, 5, 4, 4, 10, 85, 85, 100, 1, false }, // CHANGED : damage, spread { "assault", S_ASSAULT, S_RASSAULT, 2000, 120, 24, 0, 0, 20, 40, 20, 0, 2, 2, 22, 55, 115, 1, true }, // CHANGED { "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 }, diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index bd7d5f22..769fb858 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -1132,7 +1132,7 @@ bool shotgun::attack(vec &targ) if(1==0)conoutf("shotgun:attack(%.2f, %.2f, %.2f)", targ.x, targ.y, targ.z); // 2010nov19 vec from = owner->o; from.z -= weaponbeloweye; - createrays(from, targ, false); // force: false^=check-PLAYER-attacking-FLAG new:2010nov19 + createrays(from, targ, false); // force: false^=check-PLAYER-attacking-FLAG new:2010nov19 // TODO make check here not in createrays return gun::attack(targ); }