teambeef/rtcwquest
0
0
Fork 0
mirror of https://github.com/DrBeef/RTCWQuest.git synced 2025-04-23 15:33:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Several weapon improvements

Browse source 
- Updated to latest weapons pack from baggyg
- Ensure shell casings are ejected from an approximately correct location on each weapon
- Ensure muzzle flash occurs at the correct location (especially for the Garand and the Venom)
- Made the two handed weapons more accurate
- Improved the default accuracy of: Mauser, FG42 and MP40
This commit is contained in:
Simon 2020-08-18 22:25:33 +01:00
parent 8d54ccd46e
commit dfb8170353
2 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Projects/Android/jni/rtcw/src/cgame/cg_weapons.c
View file

@ -3080,13 +3080,23 @@ void CG_AddPlayerWeapon( refEntity_t *parent, playerState_t *ps, centity_t *cent
if ( isPlayer ) {
refEntity_t brass;
int brassOffset[WP_NUM_WEAPONS];
memset (brassOffset, 0, sizeof brassOffset);
brassOffset[WP_LUGER] = 1;
brassOffset[WP_COLT] = 1;
brassOffset[WP_FG42] = 1;
brassOffset[WP_MP40] = 2;
brassOffset[WP_THOMPSON] = 2;
brassOffset[WP_STEN] = 6;
brassOffset[WP_VENOM] = 5;
// opposite tag in akimbo, since at this point the weapon
// has fired and the fire seq has switched over
if ( weaponNum == WP_AKIMBO && akimboFire ) {
CG_PositionRotatedEntityOnTag( &brass, &gun, "tag_brass2" );
} else if ( weaponNum == WP_STEN) {
//Correct bad tag on STEN model
CG_CalcMuzzlePoint(cent->currentState.clientNum, 6, brass.origin);
} else if ( brassOffset[weaponNum] != 0) {
//Correct bad tag on certain models
CG_CalcMuzzlePoint(cent->currentState.clientNum, brassOffset[weaponNum], brass.origin);
} else {
CG_PositionRotatedEntityOnTag( &brass, &gun, "tag_brass" );
}
@ -3222,15 +3232,24 @@ void CG_AddPlayerWeapon( refEntity_t *parent, playerState_t *ps, centity_t *cent
angles[ROLL] = crandom() * 10;
AnglesToAxis( angles, flash.axis );
if (weaponNum != WP_TESLA && weaponNum != WP_STEN) {
int flashOffset[WP_NUM_WEAPONS];
memset (flashOffset, 0, sizeof flashOffset);
flashOffset[WP_TESLA] = 11;
flashOffset[WP_STEN] = 24;
flashOffset[WP_VENOM] = 18;
flashOffset[WP_GARAND] = 30;
if (flashOffset[weaponNum] == 0) {
CG_PositionRotatedEntityOnTag(&flash, &gun, "tag_flash");
}
else
{
//For the Tesla/ Sten, set the origin of the flash to be a distance forward of the controller
//Set the origin of the flash to be a distance forward of the controller
//Corrects the confused tag in the altered models
CG_CalcMuzzlePoint(cent->currentState.clientNum, weaponNum == WP_TESLA ? 11 : 24, flash.origin);
}
CG_CalcMuzzlePoint(cent->currentState.clientNum, flashOffset[weaponNum], flash.origin);
MatrixMultiply( flash.axis, gun.axis, flash.axis );
}
// store this position for other cgame elements to access
cent->pe.gunRefEnt = gun;

8
Projects/Android/jni/rtcw/src/game/g_weapon.c
View file

@ -700,12 +700,12 @@ float G_GetWeaponSpread( int weapon ) {
case WP_COLT: return 200;//600; // make colt as accurate as luger for VR
case WP_AKIMBO: return 700; //----(SA) added
case WP_VENOM: return 1000;
case WP_MP40: return 1000;
case WP_MP40: return 800;
case WP_FG42SCOPE: return 100;
case WP_FG42: return 800;
case WP_FG42: return 200;
case WP_THOMPSON: return 1000;
case WP_STEN: return 800;//1200; Improve accuracy of Sten for more fun on stealth missions
case WP_MAUSER: return 400;
case WP_MAUSER: return 200;
case WP_GARAND: return 500;
case WP_SNIPERRIFLE: return 100;
case WP_SNOOPERSCOPE: return 100;
@ -1933,7 +1933,7 @@ void FireWeapon( gentity_t *ent ) {
if (gVR->weapon_stabilised)
{
//Stabilised weapon is even more accurate
aimSpreadScale /= 2.5f;
aimSpreadScale /= 3.0f;
}