Add RSASS, MSR, XM2010

- Add RSASS, MSR, XM2010 normal, SD, NV and TWS versions
- SD versions have a slightly slower bullet speed as the non sd versions. Server Admins have to be careful with adding the SD versions to not hurt the server balance.
- Remove old AS50 ammo config, it is not needed any longer, also switch to the correct AS50 magazine classname.

Thx @AlwarrenSidh for the weapons.
This commit is contained in:
A Man
2020-02-14 02:18:02 +01:00
parent 848cc6d971
commit d236ef123e
16 changed files with 1097 additions and 52 deletions

View File

@@ -1,5 +0,0 @@
class 5Rnd_127x99_as50;
class 5Rnd_127x99_as50_CP : 5Rnd_127x99_as50
{
ammo = "B_127x99_Ball_noTracer";
};

View File

@@ -118,4 +118,27 @@ class 10Rnd_762x51_CZ750 : 5Rnd_762x51_M24
};
};
class 20Rnd_762x51_RSASS: CA_Magazine
{
scope = public;
initSpeed = 900;
picture = "\FHQ_Remington\ammo\ui\i_20rndpmag.paa";
model = "\FHQ_Remington\RSASS\magazine.p3d";
displayName = $STR_DZ_MAG_20RND_RSASS_NAME;
descriptionShort = $STR_DZ_MAG_20RND_RSASS_DESC;
count = 20;
ammo = "Rem_762x51_Ball";
class ItemActions
{
COMBINE_MAG
};
};
class 20Rnd_762x51_RSASS_SD: 20Rnd_762x51_RSASS
{
initSpeed = 850;
displayName = $STR_DZ_MAG_20RND_RSASSSD_NAME;
descriptionShort = $STR_DZ_MAG_20RND_RSASSSD_DESC;
ammo = "Rem_762x51_SD";
};

View File

@@ -0,0 +1,19 @@
class 5Rnd_762x67_XM2010: CA_Magazine
{
scope = public;
displayName = $STR_DZ_MAG_5RND_XM2010_NAME;
descriptionShort = $STR_DZ_MAG_5RND_XM2010_DESC;
count = 5;
ammo = "Rem_300Win_Ball";
initSpeed = 850;
picture = "\FHQ_Remington\ammo\ui\i_xm2010.paa";
model = "\FHQ_Remington\XM2010\magazine.p3d";
};
class 5Rnd_762x67_XM2010_SD: 5Rnd_762x67_XM2010
{
initSpeed = 750;
displayName = $STR_DZ_MAG_5RND_XM2010SD_NAME;
descriptionShort = $STR_DZ_MAG_5RND_XM2010SD_DESC;
ammo = "Rem_300Win_SD";
};

View File

@@ -0,0 +1,28 @@
//L115
class 5Rnd_86x70_L115A1: CA_Magazine
{
displayName = $STR_DZ_MAG_5Rnd_86x70_L115A1_NAME;
cartridgeName = "86x70";
class ItemActions
{
COMBINE_MAG
};
};
class 7Rnd_86x70_MSR: 5Rnd_86x70_L115A1
{
displayName = $STR_DZ_MAG_7RND_MSR_NAME;
descriptionShort = $STR_DZ_MAG_7RND_MSR_DESC;
count = 7;
picture = "\FHQ_Remington\ammo\ui\i_msr.paa";
model = "\FHQ_Remington\XM2010\magazine.p3d";
};
class 7Rnd_86x70_MSR_SD: 7Rnd_86x70_MSR
{
initSpeed = 850;
displayName = $STR_DZ_MAG_7RND_MSRSD_NAME;
descriptionShort = $STR_DZ_MAG_7RND_MSRSD_DESC;
};

View File

@@ -17,10 +17,11 @@
#include "762x54r.hpp" //PK, SVD, Mosin
#include "46x30.hpp" //MP7
#include "680x43.hpp" //ACR
#include "86x70.hpp" //L115, MSR
#include "762x67.hpp" //XM2010
#include "Misc.hpp" //CZ550, Lee-Enfield
#include "Shotgun.hpp"
#include "Arrows.hpp"
#include "LauncherAmmo.hpp"
#include "127x99.hpp" //Remove after A2OA stable branch exceeds Version 1.63.131129
#undef COMBINE_MAG

View File

@@ -50,18 +50,7 @@ class 5Rnd_127x108_KSVK : CA_Magazine
COMBINE_MAG
};
};
//L115
class 5Rnd_86x70_L115A1: CA_Magazine
{
displayName = $STR_DZ_MAG_5Rnd_86x70_L115A1_NAME;
cartridgeName = "86x70";
class ItemActions
{
COMBINE_MAG
};
};
//VSS
class 10Rnd_9x39_SP5_VSS: CA_Magazine
{