Merge remote-tracking branch 'upstream/master'

This commit is contained in:
facoptere
2013-11-19 09:48:31 +01:00
11 changed files with 62 additions and 58 deletions

View File

@@ -87,4 +87,5 @@ class CfgWeapons {
#include "CfgWeapons\Weapon\LMG\m240_scoped.hpp"
#include "CfgWeapons\Weapon\LMG\m249_scoped.hpp"
#include "CfgWeapons\Weapon\LMG\M60A4.hpp"
// #include "CfgWeapons\Weapon\Rifle\FN_FAL_ANPVS4_DZE.hpp"
};

View File

@@ -9,7 +9,7 @@ class ItemFishingPole: ItemCore
{
class Toolbelt
{
text="STR_EPOCH_PLAYER_295";
text="$STR_EPOCH_PLAYER_295";
script="spawn player_addToolbelt;";
use[]=
{

View File

@@ -9,7 +9,7 @@ class ItemSledge: ItemCore
{
class Toolbelt
{
text="STR_EPOCH_PLAYER_295";
text="$STR_EPOCH_PLAYER_295";
script="spawn player_addToolbelt;";
use[]=
{

View File

@@ -8,7 +8,7 @@ class ItemHatchet_DZE : ItemCore {
class Toolbelt
{
text="STR_EPOCH_PLAYER_295";
text="$STR_EPOCH_PLAYER_295";
script="spawn player_addToolbelt;";
use[]=
{

View File

@@ -9,7 +9,7 @@ class ItemMachete: ItemCore
{
class Toolbelt
{
text="STR_EPOCH_PLAYER_295";
text="$STR_EPOCH_PLAYER_295";
script="spawn player_addToolbelt;";
use[]=
{

View File

@@ -21,7 +21,7 @@ class MeleeCrowbar: MeleeWeapon
{
class Toolbelt
{
text="STR_EPOCH_PLAYER_296";
text="$STR_EPOCH_PLAYER_296";
script="spawn player_addToolbelt;";
use[]=
{

View File

@@ -19,12 +19,12 @@ class MeleeFishingPole: MeleeWeapon
{
class Use
{
text="STR_EPOCH_PLAYER_297";
text="$STR_EPOCH_PLAYER_297";
script="spawn player_goFishing;";
};
class Toolbelt
{
text="STR_EPOCH_PLAYER_296";
text="$STR_EPOCH_PLAYER_296";
script="spawn player_addToolbelt;";
use[]=
{

View File

@@ -1,41 +1,41 @@
class MeleeHatchet: MeleeWeapon
{
scope=2;
melee= "true";
autoreload=1;
magazineReloadTime=0;
model="\dayz_weapons\models\Hatchet_weaponized";
picture="\dayz_equip\textures\equip_hatchet_CA.paa";
displayName="$STR_EQUIP_NAME_41";
droppeditem= "ItemHatchet_DZE";
magazines[]=
{
scope=2;
melee= "true";
autoreload=1;
magazineReloadTime=0;
model="\dayz_weapons\models\Hatchet_weaponized";
picture="\dayz_equip\textures\equip_hatchet_CA.paa";
displayName="$STR_EQUIP_NAME_41";
droppeditem= "ItemHatchet_DZE";
magazines[]=
"Hatchet_Swing"
};
handAnim[]=
{
"OFP2_ManSkeleton",
"\dayz_weapons\anim\melee_hatchet_holding.rtm"
};
class ItemActions
{
class Toolbelt
{
"Hatchet_Swing"
};
handAnim[]=
{
"OFP2_ManSkeleton",
"\dayz_weapons\anim\melee_hatchet_holding.rtm"
};
class ItemActions
{
class Toolbelt
text="$STR_EPOCH_PLAYER_296";
script="spawn player_addToolbelt;";
use[]=
{
text="STR_EPOCH_PLAYER_296";
script="spawn player_addToolbelt;";
use[]=
{
"MeleeHatchet"
};
output[]=
{
"ItemHatchet_DZE"
};
"MeleeHatchet"
};
output[]=
{
"ItemHatchet_DZE"
};
};
class Library
{
libTextDesc="$STR_EQUIP_DESC_41";
};
descriptionShort="$STR_EQUIP_DESC_41";
};
class Library
{
libTextDesc="$STR_EQUIP_DESC_41";
};
descriptionShort="$STR_EQUIP_DESC_41";
};

View File

@@ -21,7 +21,7 @@ class MeleeSledge: MeleeWeapon
{
class Toolbelt
{
text="STR_EPOCH_PLAYER_296";
text="$STR_EPOCH_PLAYER_296";
script="spawn player_addToolbelt;";
use[]=
{

View File

@@ -0,0 +1,3 @@
class FN_FAL_ANPVS4_DZE:FN_FAL_ANPVS4 {
visionMode[] = {"Normal", NVG};
};