W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'EpochModTeam:master' into master

Browse Source
This commit is contained in:
W0LF
2021-05-13 08:47:11 +03:00
parent 922603c8fc 4e70a7d4cc
commit d993d4c5d4
64 changed files with 705 additions and 1304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGE LOG 1.0.7.1.txt
View File

@@ -1,4 +1,11 @@
[FIXED] Side Chat was unintentionally disabled on Podagorsk Mission. (cf43c20d) @AirwavesMan
[ADDED] Blunt hatchet and wet box of matches. (69408ab3) @AirwavesMan
[FIXED] Side Chat was unintentionally disabled on Podagorsk Mission. (cf43c20d) @Voltan, @AirwavesMan
[FIXED] English string from the Broken APSI got overwritten by the german string. (43786eec) @seelenapparat, @AirwavesMan
[FIXED] Open or close a winter lockbox or an upgraded lockbox had the wrong sound. (ffccff6a, cdfc57fd) @AirwavesMan
[FIXED] MK12 SPR and DMR had always night vision optics even when the player had no NVG. (6f7a17ca) @AirwavesMan
[FIXED] MK12 SPR and DMR had always night vision optics even when the player had no NVG. (6f7a17ca) @Voltan, @AirwavesMan
[FIXED] DayZ Mod gates could not be removed. (2bbb126a) @Aschalder, @AirwavesMan
[FIXED] The AK74 taped magazine could not be used with the AN94. (31c4a0a7) @Schalldampfer, @AirwavesMan
[FIXED] Dupe with player_emptyContainer and dayz_actionInProgress bug. (44c94541) @F507DMT, @AirwavesMan
[FIXED] Remove the iron sight view from the RK95 ACOG since it does not work. (ee259c4a) @IsGoose, @AirwavesMan
[FIXED] Some building wrecks could not be removed. (b43279cd) @Seelenapparat, @AirwavesMan
[REMOVED] gsc_cloth_loner_head_DZ model and Skin_gsc_cloth_loner_head_DZ due to model issues. (b1e77a39) @Seelenapparat, @AirwavesMan

1
Documents/Epoch 1.0.7 Classnames/CfgMagazines all.txt
View File

@@ -740,7 +740,6 @@ Skin_gsc_scientist1_DZ
Skin_gsc_scientist1_head_DZ
Skin_gsc_scientist2_DZ
Skin_gsc_scientist2_head_DZ
Skin_gsc_cloth_loner_head_DZ
Skin_gsc_eco_stalker_mask_neutral_DZ
Skin_gsc_eco_stalker_head_neutral_DZ
Skin_gsc_eco_stalker_mask_fred_DZ

1
SQF/dayz_code/Configs/CfgLoot/Groups/Clothes.hpp
View File

@@ -169,7 +169,6 @@ stalkerclothes[] = {
{Loot_MAGAZINE, 1, Skin_gsc_scientist2_DZ},
{Loot_MAGAZINE, 1, Skin_gsc_scientist2W_DZ},
{Loot_MAGAZINE, 1, Skin_gsc_scientist2_head_DZ},
//{Loot_MAGAZINE, 1, Skin_gsc_cloth_loner_head_DZ}, has some rpt errors, it is up to server admins to add it, skin still works
{Loot_MAGAZINE, 1, Skin_gsc_eco_stalker_mask_neutral_DZ},
{Loot_MAGAZINE, 1, Skin_gsc_eco_stalker_mask_neutralW_DZ},
{Loot_MAGAZINE, 1, Skin_gsc_eco_stalker_head_neutral_DZ},

8
SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp
View File

@@ -212,8 +212,8 @@ class ItemWire : CA_Magazine
type = 256;
model = "\dayz_equip\models\Fence_wire_kit.p3d";
picture = "\dayz_equip\textures\equip_fencewire_kit_CA.paa";
displayName = $STR_EQUIP_NAME_23;
descriptionShort = $STR_EQUIP_DESC_23;
displayName = $STR_EQUIP_NAME_WIRE_FENCE;
descriptionShort = $STR_EQUIP_DESC_WIRE_FENCE;
class ItemActions
{
@@ -236,8 +236,8 @@ class ItemTankTrap : CA_Magazine
type = 256;
model = "\dayz_equip\models\tank_trap_kit.p3d";
picture = "\dayz_equip\textures\equip_tanktrap_kit_CA.paa";
displayName = $STR_EQUIP_NAME_22;
descriptionShort = $STR_EQUIP_DESC_22;
displayName = $STR_EQUIP_NAME_TANK_TRAP;
descriptionShort = $STR_EQUIP_DESC_TANK_TRAP;
class ItemActions
{

4
SQF/dayz_code/Configs/CfgMagazines/Buildings/Sandbag.hpp
View File

@@ -5,8 +5,8 @@ class ItemSandbag : CA_Magazine
type = 256;
model = "\dayz_equip\models\sandbags.p3d";
picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
displayName = $STR_EQUIP_NAME_21;
descriptionShort = $STR_EQUIP_DESC_21;
displayName = $STR_EQUIP_NAME_SANDBAGS;
descriptionShort = $STR_EQUIP_DESC_SANDBAGS;
class ItemActions
{

12
SQF/dayz_code/Configs/CfgMagazines/Buildings/Tent.hpp
View File

@@ -5,8 +5,8 @@ class ItemTent : CA_Magazine
type = 256;
model = "\dayz_equip\models\tentbag_gear.p3d";
picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
displayName = $STR_EQUIP_NAME_20;
descriptionShort = $STR_EQUIP_DESC_20;
displayName = $STR_EQUIP_NAME_CAMPING_TENT;
descriptionShort = $STR_EQUIP_DESC_CAMPING_TENT;
class ItemActions
{
@@ -37,7 +37,7 @@ class ItemTentWinter : CA_Magazine
model = "\dayz_equip\models\tentbag_gear.p3d";
picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
displayName = $STR_VEH_NAME_TENTWINTER;
descriptionShort = $STR_EQUIP_DESC_20;
descriptionShort = $STR_EQUIP_DESC_CAMPING_TENT;
class ItemActions
{
@@ -68,7 +68,7 @@ class ItemDomeTent : CA_Magazine
model = "\dayz_equip\models\tentbag_gear.p3d";
picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
displayName = $STR_VEH_NAME_DOME_TENT;
descriptionShort = $STR_EQUIP_DESC_20;
descriptionShort = $STR_EQUIP_DESC_CAMPING_TENT;
class ItemActions
{
@@ -99,7 +99,7 @@ class ItemWinterDomeTent : CA_Magazine
model = "\dayz_equip\models\tentbag_gear.p3d";
picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
displayName = $STR_VEH_NAME_WINTER_DOME_TENT;
descriptionShort = $STR_EQUIP_DESC_20;
descriptionShort = $STR_EQUIP_DESC_CAMPING_TENT;
class ItemActions
{
@@ -130,7 +130,7 @@ class ItemDesertTent : CA_Magazine
model = "\dayz_equip\models\tentbag_gear.p3d";
picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
displayName = $STR_VEH_NAME_DESERT_TENT;
descriptionShort = $STR_EQUIP_DESC_20;
descriptionShort = $STR_EQUIP_DESC_CAMPING_TENT;
class ItemActions
{

7
SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp
View File

@@ -742,13 +742,6 @@ class Skin_gsc_scientist2_head_DZ : SkinBase {
sex = "male";
playerModel = "gsc_scientist2_head_DZ";
};
class Skin_gsc_cloth_loner_head_DZ : SkinBase {
scope = 2;
displayName = $STR_DZE_EQUIP_STALKER_ROOKIE_NAME;
descriptionShort = $STR_DZE_EQUIP_STALKER_ROOKIE_DESC;
sex = "male";
playerModel = "gsc_cloth_loner_head_DZ";
};
class Skin_gsc_eco_stalker_mask_neutral_DZ : SkinBase {
scope = 2;
displayName = $STR_DZE_EQUIP_STALKER_LONER_MASK_NAME;

56
SQF/dayz_code/Configs/CfgMagazines/Consumables/Meat.hpp
View File

@@ -3,8 +3,8 @@ class FoodGoatRaw : FoodRaw
scope = 2;
model = "\dayz_equip\models\food_steak_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_ca.paa";
displayName = $STR_FOOD_NAME_GOAT_RAW;
descriptionShort = $STR_FOOD_EQUIP_GOAT_RAW;
displayName = $STR_EQUIP_FOOD_NAME_GOAT_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_GOAT_RAW;
bloodRegen = 300;
Nutrition[] = {143,300,0,0};
cookOutput = "FoodGoatCooked";
@@ -15,8 +15,8 @@ class FoodGoatCooked : FoodCooked
scope = 2;
model = "\dayz_equip\models\food_steak_cooked_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa";
displayName = $STR_FOOD_NAME_GOAT_COOKED;
descriptionShort = $STR_FOOD_EQUIP_GOAT_COOKED;
displayName = $STR_EQUIP_FOOD_NAME_GOAT_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_GOAT_COOKED;
bloodRegen = 600;
Nutrition[] = {143,600,0,0};
};
@@ -26,8 +26,8 @@ class FoodMuttonRaw : FoodRaw
scope = 2;
model = "z\addons\dayz_communityassets\models\mutton_raw.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_mutton_raw_CA.paa";
displayName = $STR_FOOD_EQUIP_CODE_NAME_1;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_1;
displayName = $STR_EQUIP_FOOD_NAME_MUTTON_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_MUTTON_RAW;
bloodRegen = 400;
Nutrition[] = {294,350,0,0};
cookOutput = "FoodMuttonCooked";
@@ -39,8 +39,8 @@ class FoodMuttonCooked : FoodCooked
model = "z\addons\dayz_communityassets\models\mutton_cooked.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_mutton_cooked_CA.paa";
displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_1;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_1;
displayName = $STR_EQUIP_FOOD_NAME_MUTTON_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_MUTTON_COOKED;
bloodRegen = 800;
Nutrition[] = {294,700,0,0};
};
@@ -50,8 +50,8 @@ class FoodChickenRaw : FoodRaw
scope = 2;
model = "\dayz_equip\models\food_steak_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_ca.paa";
displayName = $STR_FOOD_EQUIP_CODE_NAME_2;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_2;
displayName = $STR_EQUIP_FOOD_NAME_CHICKEN_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_CHICKEN_RAW;
bloodRegen = 400;
Nutrition[] = {219,350,0,0};
cookOutput = "FoodChickenCooked";
@@ -62,8 +62,8 @@ class FoodChickenCooked : FoodCooked
scope = 2;
model = "\dayz_equip\models\food_steak_cooked_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa";
displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_2;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_2;
displayName = $STR_EQUIP_FOOD_NAME_CHICKEN_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_CHICKEN_COOKED;
bloodRegen = 800;
Nutrition[] = {219,700,0,0};
};
@@ -73,8 +73,8 @@ class FoodBaconRaw : FoodRaw
scope = 2;
model = "z\addons\dayz_communityassets\models\bacon_raw.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_bacon_raw_CA.paa";
displayName = $STR_FOOD_EQUIP_CODE_NAME_4;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_4;
displayName = $STR_EQUIP_FOOD_NAME_BACON_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_BACON_RAW;
bloodRegen = 300;
Nutrition[] = {417,350,0,0};
cookOutput = "FoodBaconCooked";
@@ -85,8 +85,8 @@ class FoodBaconCooked : FoodCooked
scope = 2;
model = "z\addons\dayz_communityassets\models\bacon_fried.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_bacon_fried_CA.paa";
displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_4;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_4;
displayName = $STR_EQUIP_FOOD_NAME_BACON_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_BACON_COOKED;
bloodRegen = 600;
Nutrition[] = {417,700,0,0};
};
@@ -96,8 +96,8 @@ class FoodRabbitRaw : FoodRaw
scope = 2;
model = "\dayz_equip\models\food_steak_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_ca.paa";
displayName = $STR_FOOD_EQUIP_CODE_NAME_3;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_3;
displayName = $STR_EQUIP_FOOD_NAME_RABBIT_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_RABBIT_RAW;
bloodRegen = 500;
Nutrition[] = {517,450,0,0};
cookOutput = "FoodRabbitCooked";
@@ -108,8 +108,8 @@ class FoodRabbitCooked : FoodCooked
scope = 2;
model = "\dayz_equip\models\food_steak_cooked_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa";
displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_3;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_3;
displayName = $STR_EQUIP_FOOD_NAME_RABBIT_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_RABBIT_COOKED;
bloodRegen = 1000;
Nutrition[] = {517,900,0,0};
};
@@ -119,8 +119,8 @@ class FoodBeefRaw : FoodRaw
scope = 2;
model = "\dayz_equip\models\food_steak_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_ca.paa";
displayName = $STR_FOOD_EQUIP_CODE_NAME_6;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_6;
displayName = $STR_EQUIP_FOOD_NAME_BEEF_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_BEEF_RAW;
bloodRegen = 400;
Nutrition[] = {332,350,0,0};
cookOutput = "FoodBeefCooked";
@@ -131,8 +131,8 @@ class FoodBeefCooked : FoodCooked
scope = 2;
model = "\dayz_equip\models\food_steak_cooked_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa";
displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_6;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_6;
displayName = $STR_EQUIP_FOOD_NAME_BEEF_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_BEEF_COOKED;
bloodRegen = 800;
Nutrition[] = {332,700,0,0};
};
@@ -142,8 +142,8 @@ class FoodDogRaw : FoodRaw
scope = 2;
model = "\dayz_equip\models\food_steak_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_ca.paa";
displayName = $STR_FOOD_NAME_DOG_RAW;
descriptionShort = $STR_EQUIP_DESC_47;
displayName = $STR_EQUIP_FOOD_NAME_DOG_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_DOG_RAW;
bloodRegen = 300;
Nutrition[] = {143,300,0,0};
cookOutput = "FoodDogCooked";
@@ -154,8 +154,8 @@ class FoodDogCooked : FoodCooked
scope = 2;
model = "\dayz_equip\models\food_steak_cooked_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa";
displayName = $STR_FOOD_NAME_DOG_COOKED;
descriptionShort = $STR_EQUIP_DESC_25;
displayName = $STR_EQUIP_FOOD_NAME_DOG_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_DOG_COOKED;
bloodRegen = 600;
Nutrition[] = {143,600,0,0};
};

16
SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp
View File

@@ -388,8 +388,8 @@ class FoodCanBakedBeans : FoodPackaged
scope = 2;
model = "\dayz_equip\models\food_bbtin.p3d";
picture = "\dayz_equip\textures\equip_bbtin_ca.paa";
displayName = $STR_EQUIP_NAME_26;
descriptionShort = $STR_EQUIP_DESC_26;
displayName = $STR_EQUIP_NAME_BAKED_BEANS;
descriptionShort = $STR_EQUIP_DESC_BAKED_BEANS;
bloodRegen = 100;
Nutrition[] = {0,400,320,0};
consumeOutput = "FoodCanUnlabeledEmpty";
@@ -400,8 +400,8 @@ class FoodCanSardines : FoodPackaged
scope = 2;
model = "\dayz_equip\models\food_sardinestin.p3d";
picture = "\dayz_equip\textures\equip_Sardinestin_ca.paa";
displayName = $STR_EQUIP_NAME_27;
descriptionShort = $STR_EQUIP_DESC_27;
displayName = $STR_EQUIP_NAME_SARDINES;
descriptionShort = $STR_EQUIP_DESC_SARDINES;
bloodRegen = 100;
Nutrition[] = {0,450,320,0};
consumeOutput = "FoodCanUnlabeledEmpty";
@@ -412,8 +412,8 @@ class FoodCanFrankBeans : FoodPackaged
scope = 2;
model = "\dayz_equip\models\food_fbtin.p3d";
picture = "\dayz_equip\textures\equip_fbtin_ca.paa";
displayName = $STR_EQUIP_NAME_28;
descriptionShort = $STR_EQUIP_DESC_28;
displayName = $STR_EQUIP_NAME_FRANK_BEANS;
descriptionShort = $STR_EQUIP_DESC_FRANK_BEANS;
bloodRegen = 100;
Nutrition[] = {0,450,320,0};
consumeOutput = "FoodCanUnlabeledEmpty";
@@ -424,8 +424,8 @@ class FoodCanPasta : FoodPackaged
scope = 2;
model = "\dayz_equip\models\food_pastatin.p3d";
picture = "\dayz_equip\textures\equip_pastatin_ca.paa";
displayName = $STR_EQUIP_NAME_29;
descriptionShort = $STR_EQUIP_DESC_29;
displayName = $STR_EQUIP_NAME_PASTA;
descriptionShort = $STR_EQUIP_DESC_PASTA;
bloodRegen = 100;
Nutrition[] = {0,500,0,0};
consumeOutput = "FoodCanUnlabeledEmpty";

23
SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp
View File

@@ -3,8 +3,8 @@ class ItemSodaCoke : ItemSoda
scope = 2;
model = "\dayz_equip\models\soda_coke.p3d";
picture = "\dayz_equip\textures\equip_soda_coke_ca.paa";
displayName = $STR_EQUIP_NAME_36a;
descriptionShort = $STR_EQUIP_DESC_36;
displayName = $STR_EQUIP_NAME_SODA_CAN_COKE;
descriptionShort = $STR_EQUIP_DESC_SODA_CAN;
Nutrition[] = {90,0,300,0};
};
@@ -13,8 +13,8 @@ class ItemSodaPepsi : ItemSoda
scope = 2;
model = "\dayz_equip\models\soda_pepsi.p3d";
picture = "\dayz_equip\textures\equip_soda_pepsi_ca.paa";
displayName = $STR_EQUIP_NAME_36b;
descriptionShort = $STR_EQUIP_DESC_36;
displayName = $STR_EQUIP_NAME_SODA_CAN_PEPSI;
descriptionShort = $STR_EQUIP_DESC_SODA_CAN;
Nutrition[] = {90,0,300,0};
};
@@ -23,8 +23,8 @@ class ItemSodaMdew : ItemSoda
scope = 2;
model = "\dayz_equip\models\soda_mdew.p3d";
picture = "\dayz_equip\textures\equip_soda_mdew_ca.paa";
displayName = $STR_EQUIP_NAME_37;
descriptionShort = $STR_EQUIP_NAME_37;
displayName = $STR_EQUIP_NAME_MOUNTAIN_DEW;
descriptionShort = $STR_EQUIP_DESC_MOUNTAIN_DEW;
Nutrition[] = {90,0,400,0};
};
@@ -110,12 +110,11 @@ class ItemSodaLemonade : ItemSoda
class ItemSodaLirik : ItemSoda
{
scope = 2;
scope = 2;
model = "z\addons\dayz_communityassets\models\soda_lirik_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_soda_lirik_clean_full_ca.paa";
displayName = $STR_EQUIP_NAME_36a;
descriptionShort = $STR_EQUIP_DESC_36;
displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_7;
descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_7;
Nutrition[] = {90,0,300,0};
consumeOutput = "ItemSodaLirikEmpty";
};
@@ -147,8 +146,8 @@ class ItemSodaPeppsy : ItemSoda
scope = 2;
model = "z\addons\dayz_communityassets\models\soda_peppsy_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_soda_peppsy_clean_full_ca.paa";
displayName = $STR_EQUIP_NAME_36b;
descriptionShort = $STR_EQUIP_DESC_36;
displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_10;
descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_10;
Nutrition[] = {90,0,300,0};
consumeOutput = "ItemSodaPeppsyEmpty";
};

8
SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp
View File

@@ -3,8 +3,8 @@ class ItemWaterBottle : FoodDrink
scope = 2;
model = "\dayz_equip\models\waterbottle_gear.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa";
displayName = $STR_EQUIP_NAME_12;
descriptionShort = $STR_EQUIP_DESC_12;
displayName = $STR_EQUIP_NAME_WATER_BOTTLE;
descriptionShort = $STR_EQUIP_DESC_WATER_BOTTLE;
Nutrition[] = {0,0,1000,0};
@@ -81,8 +81,8 @@ class ItemWaterBottleUnfilled : CA_Magazine
type = 256;
model = "\dayz_equip\models\waterbottle_gear.p3d";
picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa";
displayName = $STR_EQUIP_NAME_13;
descriptionShort = $STR_EQUIP_DESC_13;
displayName = $STR_EQUIP_NAME_WATER_BOTTLE_EMPTY;
descriptionShort = $STR_EQUIP_DESC_WATER_BOTTLE_EMPTY;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";

16
SQF/dayz_code/Configs/CfgMagazines/Items/Flares.hpp
View File

@@ -3,8 +3,8 @@ class HandRoadFlare : HandGrenade
scope = 2;
picture = "\dayz_weapons\textures\equip_roadflare_ca.paa";
model = "\dayz_weapons\models\roadflare";
displayName = $STR_MAG_NAME_4;
descriptionShort = $STR_MAG_DESC_4;
displayName = $STR_MAG_NAME_ROAD_FLARE;
descriptionShort = $STR_MAG_DESC_ROAD_FLARE;
ammo = "RoadFlare";
count = 10;
@@ -23,8 +23,8 @@ class HandChemBlue : HandGrenade
scope = 2;
picture = "\dayz_weapons\textures\equip_chem_blue_ca.paa";
model = "\dayz_weapons\models\chem_gear_blue";
displayName = $STR_MAG_NAME_7;
descriptionShort = $STR_MAG_DESC_5;
displayName = $STR_MAG_NAME_CHEMLIGHT_BLUE;
descriptionShort = $STR_MAG_DESC_CHEMLIGHT;
ammo = "ChemBlue";
count = 10;
@@ -43,8 +43,8 @@ class HandChemGreen : HandGrenade
scope = 2;
picture = "\dayz_weapons\textures\equip_chem_green_ca.paa";
model = "\dayz_weapons\models\chem_gear_green";
displayName = $STR_MAG_NAME_5;
descriptionShort = $STR_MAG_DESC_5;
displayName = $STR_MAG_NAME_CHEMLIGHT_GREEN;
descriptionShort = $STR_MAG_DESC_CHEMLIGHT;
ammo = "ChemGreen";
count = 10;
@@ -63,8 +63,8 @@ class HandChemRed : HandGrenade
scope = 2;
picture = "\dayz_weapons\textures\equip_chem_red_ca.paa";
model = "\dayz_weapons\models\chem_gear_red";
displayName = $STR_MAG_NAME_6;
descriptionShort = $STR_MAG_DESC_5;
displayName = $STR_MAG_NAME_CHEMLIGHT_RED;
descriptionShort = $STR_MAG_DESC_CHEMLIGHT;
ammo = "ChemRed";
count = 10;

4
SQF/dayz_code/Configs/CfgMagazines/Items/Metal.hpp
View File

@@ -5,8 +5,8 @@ class PartGeneric : CA_Magazine
type = 256;
model = "\dayz_equip\models\genericparts.p3d";
picture = "\dayz_equip\textures\equip_genericparts_ca.paa";
displayName = $STR_EQUIP_NAME_10;
descriptionShort = $STR_EQUIP_DESC_10;
displayName = $STR_EQUIP_NAME_SCRAP_METAL;
descriptionShort = $STR_EQUIP_DESC_SCRAP_METAL;
class ItemActions
{

20
SQF/dayz_code/Configs/CfgMagazines/Items/VehicleParts.hpp
View File

@@ -5,8 +5,8 @@ class PartFueltank : CA_Magazine
type = 256;
model = "\dayz_equip\models\fueltank.p3d";
picture = "\dayz_equip\textures\equip_fueltank_ca.paa";
displayName = $STR_EQUIP_NAME_8;
descriptionShort = $STR_EQUIP_DESC_8;
displayName = $STR_EQUIP_NAME_FUELTANK;
descriptionShort = $STR_EQUIP_DESC_FUELTANK;
class ItemActions
{
@@ -29,8 +29,8 @@ class PartWheel : CA_Magazine
type = 256;
model = "\dayz_equip\models\wheel.p3d";
picture = "\dayz_equip\textures\equip_wheel_ca.paa";
displayName = $STR_EQUIP_NAME_9;
descriptionShort = $STR_EQUIP_DESC_9;
displayName = $STR_EQUIP_NAME_CAR_WHEEL;
descriptionShort = $STR_EQUIP_DESC_CAR_WHEEL;
};
class PartEngine : CA_Magazine
@@ -40,8 +40,8 @@ class PartEngine : CA_Magazine
type = 256;
model = "\dayz_equip\models\engine.p3d";
picture = "\dayz_equip\textures\equip_engine_ca.paa";
displayName = $STR_EQUIP_NAME_11;
descriptionShort = $STR_EQUIP_DESC_11;
displayName = $STR_EQUIP_NAME_ENGINE;
descriptionShort = $STR_EQUIP_DESC_ENGINE;
class ItemActions
{
@@ -64,8 +64,8 @@ class PartVRotor : CA_Magazine
type = 256;
model = "\dayz_equip\models\vrotor.p3d";
picture = "\dayz_equip\textures\equip_vrotor_ca.paa";
displayName = $STR_EQUIP_NAME_32;
descriptionShort = $STR_EQUIP_DESC_32;
displayName = $STR_EQUIP_NAME_MAIN_ROTOR;
descriptionShort = $STR_EQUIP_DESC_MAIN_ROTOR;
class ItemActions
{
@@ -88,8 +88,8 @@ class PartGlass : CA_Magazine
type = 256;
model = "\dayz_equip\models\carglass.p3d";
picture = "\dayz_equip\textures\equip_carglass_ca.paa";
displayName = $STR_EQUIP_NAME_30;
descriptionShort = $STR_EQUIP_DESC_30;
displayName = $STR_EQUIP_NAME_WINDSCREEN_GLASS;
descriptionShort = $STR_EQUIP_DESC_WINDSCREEN_GLASS;
class ItemActions
{

8
SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
View File

@@ -37,7 +37,7 @@ class ItemLog : CA_Magazine
};
class Crafting2
{
text = $STR_EQUIP_NAME_40;//"Wood Piles"
text = $STR_EQUIP_NAME_WOOD_PILE;//"Wood Piles"
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {"ItemHatchet"};
@@ -79,7 +79,7 @@ class ItemPlank : CA_Magazine
{
class Crafting
{
text = $STR_EQUIP_NAME_40;//"Wood Piles"
text = $STR_EQUIP_NAME_WOOD_PILE;//"Wood Piles"
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {"ItemHatchet"};
@@ -141,8 +141,8 @@ class PartWoodPile : CA_Magazine
type = 256;
model = "\dayz_equip\models\woodPile.p3d";
picture = "\dayz_equip\textures\equip_woodPile_ca.paa";
displayName = $STR_EQUIP_NAME_40;
descriptionShort = $STR_EQUIP_DESC_40;
displayName = $STR_EQUIP_NAME_WOOD_PILE;
descriptionShort = $STR_EQUIP_DESC_WOOD_PILE;
class ItemActions
{

18
SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp
View File

@@ -5,13 +5,13 @@ class ItemAntibiotic_base : CA_Magazine
type = 256;
model = "\dayz_equip\models\med_antibiotic_gear.p3d";
picture = "\dayz_equip\textures\equip_antibiotics_ca.paa";
displayName = $STR_EQUIP_NAME_17;
displayName = $STR_EQUIP_NAME_ANTIBIOTICS;
};
class ItemAntibiotic : ItemAntibiotic_base
{
scope = 2;
descriptionShort = $STR_EQUIP_DESC_17;
descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS;
class medical
{
@@ -37,7 +37,7 @@ class ItemAntibiotic : ItemAntibiotic_base
class ItemAntibiotic6 : ItemAntibiotic
{
displayName = $STR_EQUIP_NAME_ANTIBIOTICS_6;
descriptionShort = $STR_EQUIP_DESC_48;
descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_6;
class medical
{
@@ -49,7 +49,7 @@ class ItemAntibiotic6 : ItemAntibiotic
class ItemAntibiotic5 : ItemAntibiotic
{
displayName = $STR_EQUIP_NAME_ANTIBIOTICS_5;
descriptionShort = $STR_EQUIP_DESC_49;
descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_5;
class medical
{
@@ -61,7 +61,7 @@ class ItemAntibiotic5 : ItemAntibiotic
class ItemAntibiotic4 : ItemAntibiotic
{
displayName = $STR_EQUIP_NAME_ANTIBIOTICS_4;
descriptionShort = $STR_EQUIP_DESC_50;
descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_4;
class medical
{
@@ -73,7 +73,7 @@ class ItemAntibiotic4 : ItemAntibiotic
class ItemAntibiotic3 : ItemAntibiotic
{
displayName = $STR_EQUIP_NAME_ANTIBIOTICS_3;
descriptionShort = $STR_EQUIP_DESC_51;
descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_3;
class medical
{
@@ -85,7 +85,7 @@ class ItemAntibiotic3 : ItemAntibiotic
class ItemAntibiotic2 : ItemAntibiotic
{
displayName = $STR_EQUIP_NAME_ANTIBIOTICS_2;
descriptionShort = $STR_EQUIP_DESC_52;
descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_2;
class medical
{
@@ -97,7 +97,7 @@ class ItemAntibiotic2 : ItemAntibiotic
class ItemAntibiotic1 : ItemAntibiotic
{
displayName = $STR_EQUIP_NAME_ANTIBIOTICS_1;
descriptionShort = $STR_EQUIP_DESC_53;
descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_1;
class medical
{
@@ -110,6 +110,6 @@ class ItemAntibioticEmpty : ItemAntibiotic_base
{
scope = 2;
displayName = $STR_EQUIP_NAME_ANTIBIOTICS_EMPTY;
descriptionShort = $STR_EQUIP_DESC_54;
descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_EMPTY;
picture = "\dayz_epoch_c\icons\equipment\ItemAntibioticsEmpty.paa";
};

4
SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp
View File

@@ -207,10 +207,10 @@ class ItemBloodbag: CA_Magazine
scope = 2;
count = 1;
type = 256;
displayName = "$STR_EQUIP_NAME_16";
displayName = $STR_EQUIP_NAME_BLOOD_BAG;
model = "\dayz_equip\models\bloodbag.p3d";
picture = "\dayz_equip\textures\equip_bloodbag_ca.paa";
descriptionShort = "$STR_EQUIP_DESC_16";
descriptionShort = $STR_EQUIP_DESC_BLOOD_BAG;
class ItemActions
{

16
SQF/dayz_code/Configs/CfgMagazines/Medical/Medical.hpp
View File

@@ -29,8 +29,8 @@ class ItemBandage : CA_Magazine
type = 16;
model = "\dayz_equip\models\fad.p3d";
picture = "\dayz_equip\textures\equip_fad_ca.paa";
displayName = $STR_EQUIP_NAME_7;
descriptionShort = $STR_EQUIP_DESC_7;
displayName = $STR_EQUIP_NAME_BANDAGE;
descriptionShort = $STR_EQUIP_DESC_BANDAGE;
class ItemActions
{
@@ -79,8 +79,8 @@ class ItemEpinephrine : CA_Magazine
type = 256;
model = "\dayz_equip\models\epi.p3d";
picture = "\dayz_equip\textures\equip_epi_ca.paa";
displayName = $STR_EQUIP_NAME_14;
descriptionShort = $STR_EQUIP_DESC_14;
displayName = $STR_EQUIP_NAME_EPI_PEN;
descriptionShort = $STR_EQUIP_DESC_EPI_PEN;
};
class ItemMorphine : CA_Magazine
@@ -90,8 +90,8 @@ class ItemMorphine : CA_Magazine
type = 256;
model = "\dayz_equip\models\morphine.p3d";
picture = "\dayz_equip\textures\equip_morphine_ca.paa";
displayName = $STR_EQUIP_NAME_15;
descriptionShort = $STR_EQUIP_DESC_15;
displayName = $STR_EQUIP_NAME_MORPHINE;
descriptionShort = $STR_EQUIP_DESC_MORPHINE;
class ItemActions
{
@@ -110,8 +110,8 @@ class ItemHeatPack : CA_Magazine
type = 256;
model = "\dayz_equip\models\Heat_pack.p3d";
picture = "\dayz_equip\textures\equip_heat_pack_ca.paa";
displayName = $STR_EQUIP_NAME_42;
descriptionShort = $STR_EQUIP_DESC_42;
displayName = $STR_EQUIP_NAME_HEAT_PACK;
descriptionShort = $STR_EQUIP_DESC_HEAT_PACK;
class ItemActions
{

4
SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp
View File

@@ -5,8 +5,8 @@ class ItemPainkiller : CA_Magazine
type = 256;
model = "\dayz_equip\models\med_painkiller_gear.p3d";
picture = "\dayz_equip\textures\equip_painkiller_ca.paa";
displayName = $STR_EQUIP_NAME_18;
descriptionShort = $STR_EQUIP_DESC_18;
displayName = $STR_EQUIP_NAME_PAINKILLER;
descriptionShort = $STR_EQUIP_DESC_PAINKILLER;
class medical
{

4
SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp
View File

@@ -3,8 +3,8 @@ class TrashJackDaniels : HandGrenade
scope = 2;
model = "\dayz_equip\models\bottle_jd.p3d";
picture = "\dayz_equip\textures\equip_bottle_jd_ca.paa";
displayName = $STR_EQUIP_NAME_34;
descriptionShort = $STR_EQUIP_DESC_34;
displayName = $STR_EQUIP_NAME_EMPTY_WHISKEY_BOTTLE;
descriptionShort = $STR_EQUIP_DESC_EMPTY_WHISKEY_BOTTLE;
ammo = "JackDaniels";
};

8
SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp
View File

@@ -3,8 +3,8 @@ class ItemSodaEmpty : HandGrenade
scope = 2;
model = "\dayz_equip\models\soda_coke_e.p3d";
picture = "\dayz_equip\textures\equip_soda_empty_ca.paa";
displayName = $STR_EQUIP_NAME_35;
descriptionShort = $STR_EQUIP_DESC_35;
displayName = $STR_EQUIP_NAME_EMPTY_SODA_CAN;
descriptionShort = $STR_EQUIP_DESC_EMPTY_SODA_CAN;
ammo = "SodaCan";
class ItemActions
@@ -31,8 +31,8 @@ class TrashTinCan : HandGrenade
scope = 2;
model = "\dayz_equip\models\trash_tincan.p3d";
picture = "\dayz_equip\textures\equip_tincan_ca.paa";
displayName = $STR_EQUIP_NAME_33;
descriptionShort = $STR_EQUIP_DESC_33;
displayName = $STR_EQUIP_NAME_EMPTY_TIN_CAN;
descriptionShort = $STR_EQUIP_DESC_EMPTY_TIN_CAN;
ammo = "TinCan";
class ItemActions

1
SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp
View File

@@ -357,7 +357,6 @@ class Category_10 {
class Skin_gsc_scientist2_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class Skin_gsc_scientist2W_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class Skin_gsc_scientist2_head_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class Skin_gsc_cloth_loner_head_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class Skin_gsc_eco_stalker_mask_neutral_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class Skin_gsc_eco_stalker_mask_neutralW_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class Skin_gsc_eco_stalker_head_neutral_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};

1
SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp
View File

@@ -354,7 +354,6 @@ class Category_5 {
class Skin_gsc_scientist2_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class Skin_gsc_scientist2W_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class Skin_gsc_scientist2_head_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class Skin_gsc_cloth_loner_head_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class Skin_gsc_eco_stalker_mask_neutral_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class Skin_gsc_eco_stalker_mask_neutralW_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class Skin_gsc_eco_stalker_head_neutral_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};

1
SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Bandit.hpp
View File

@@ -357,7 +357,6 @@ class Category_10 {
class Skin_gsc_scientist2_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};
class Skin_gsc_scientist2W_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};
class Skin_gsc_scientist2_head_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};
class Skin_gsc_cloth_loner_head_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};
class Skin_gsc_eco_stalker_mask_neutral_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};
class Skin_gsc_eco_stalker_mask_neutralW_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};
class Skin_gsc_eco_stalker_head_neutral_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};

1
SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Hero.hpp
View File

@@ -354,7 +354,6 @@ class Category_5 {
class Skin_gsc_scientist2_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};
class Skin_gsc_scientist2W_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};
class Skin_gsc_scientist2_head_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};
class Skin_gsc_cloth_loner_head_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};
class Skin_gsc_eco_stalker_mask_neutral_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};
class Skin_gsc_eco_stalker_mask_neutralW_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};
class Skin_gsc_eco_stalker_head_neutral_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};};

4
SQF/dayz_code/Configs/CfgVehicles/Buildables/FencesGates.hpp
View File

@@ -78,6 +78,7 @@ class WoodenGate_1_DZ: DZE_Housebase
};
lockable = 3;
removeoutput[] = {{"ItemComboLock",1}};
};
class WoodenGate_2_DZ: DZE_Housebase
@@ -139,6 +140,7 @@ class WoodenGate_2_DZ: DZE_Housebase
};
lockable = 3;
removeoutput[] = {{"ItemComboLock",1}};
};
class WoodenGate_3_DZ: DZE_Housebase
@@ -200,6 +202,7 @@ class WoodenGate_3_DZ: DZE_Housebase
};
lockable = 3;
removeoutput[] = {{"ItemComboLock",1}};
};
class WoodenGate_4_DZ: DZE_Housebase
@@ -260,4 +263,5 @@ class WoodenGate_4_DZ: DZE_Housebase
};
lockable = 3;
removeoutput[] = {{"ItemComboLock",1}};
};

6
SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp
View File

@@ -1054,12 +1054,6 @@ class gsc_scientist2_head_DZ : gsc_scientist1_DZ {
model = "\gsc_stalker\gsc_eco_suit2_head.p3d";
};
class gsc_cloth_loner_head_DZ : Survivor_DZ {
scope = 2;
displayName = $STR_DZE_SKIN_STALKER_ROOKIE_NAME;
model = "\gsc_stalker\gsc_cloth_loner_head.p3d";
};
class gsc_eco_stalker_mask_neutral_DZ : SoldierLight_Base_DZ {
scope = 2;
displayName = $STR_DZE_SKIN_STALKER_LONER_MASK_NAME;

26
SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp
View File

@@ -70,7 +70,7 @@ class WeaponHolder_MeleeMachete: WeaponHolderBase
};
class WeaponHolder_ItemJerrycanEmpty : WeaponHolderBase {
scope = 2;
displayName = "$STR_EQUIP_NAME_39";
displayName = $STR_ITEM_NAME_JERRYCAN_EMPTY;
model = "\dayz_equip\proxy\jerrycan_side.p3d";
destrType = "DestructNo";
@@ -221,7 +221,7 @@ class WeaponHolder_M4A1 : WeaponHolderBase {
class WeaponHolder_ItemTent : WeaponHolderBase {
scope = 2;
displayName = $STR_EQUIP_NAME_20;
displayName = $STR_EQUIP_NAME_CAMPING_TENT;
model = "\dayz_equip\proxy\tentbag.p3d";
destrType = "DestructNo";
@@ -232,7 +232,7 @@ class WeaponHolder_ItemTent : WeaponHolderBase {
class WeaponHolder_ItemFlashlight : WeaponHolderBase {
scope = 2;
displayName = $STR_EQUIP_NAME_5;
displayName = $STR_EQUIP_NAME_FLASHLIGHT;
model = "\dayz_equip\proxy\flashlight.p3d";
destrType = "DestructNo";
@@ -243,7 +243,7 @@ class WeaponHolder_ItemFlashlight : WeaponHolderBase {
class WeaponHolder_ItemFlashlightRed : WeaponHolderBase {
scope = 2;
displayName = $STR_EQUIP_NAME_6;
displayName = $STR_EQUIP_NAME_FLASHLIGHT_MILITARY;
model = "\dayz_equip\proxy\flashlight_mil.p3d";
destrType = "DestructNo";
@@ -254,7 +254,7 @@ class WeaponHolder_ItemFlashlightRed : WeaponHolderBase {
class WeaponHolder_ItemWaterbottle : WeaponHolderBase {
scope = 2;
displayName = $STR_EQUIP_NAME_12;
displayName = $STR_EQUIP_NAME_WATER_BOTTLE;
model = "\dayz_equip\proxy\waterbottle.p3d";
destrType = "DestructNo";
@@ -276,7 +276,7 @@ class WeaponHolder_ItemGenerator : WeaponHolderBase {
class WeaponHolder_ItemToolbox : WeaponHolderBase {
scope = 2;
displayName = $STR_EQUIP_NAME_2;
displayName = $STR_EQUIP_NAME_TOOLBOX;
model = "\dayz_equip\proxy\toolbox.p3d";
destrType = "DestructNo";
@@ -287,7 +287,7 @@ class WeaponHolder_ItemToolbox : WeaponHolderBase {
class WeaponHolder_PartFueltank : WeaponHolderBase {
scope = 2;
displayName = $STR_EQUIP_NAME_8;
displayName = $STR_EQUIP_NAME_FUELTANK;
model = "\dayz_equip\proxy\fueltank.p3d";
destrType = "DestructNo";
@@ -298,7 +298,7 @@ class WeaponHolder_PartFueltank : WeaponHolderBase {
class WeaponHolder_PartWheel : WeaponHolderBase {
scope = 2;
displayName = $STR_EQUIP_NAME_9;
displayName = $STR_EQUIP_NAME_CAR_WHEEL;
model = "\dayz_equip\proxy\wheel.p3d";
destrType = "DestructNo";
@@ -309,7 +309,7 @@ class WeaponHolder_PartWheel : WeaponHolderBase {
class WeaponHolder_PartGeneric : WeaponHolderBase {
scope = 2;
displayName = $STR_EQUIP_NAME_10;
displayName = $STR_EQUIP_NAME_SCRAP_METAL;
model = "\dayz_equip\proxy\genericparts.p3d";
destrType = "DestructNo";
@@ -320,7 +320,7 @@ class WeaponHolder_PartGeneric : WeaponHolderBase {
class WeaponHolder_PartVRotor : WeaponHolderBase {
scope = 2;
displayName = $STR_EQUIP_NAME_32;
displayName = $STR_EQUIP_NAME_MAIN_ROTOR;
model = "\dayz_equip\proxy\vrotor.p3d";
destrType = "DestructNo";
@@ -331,7 +331,7 @@ class WeaponHolder_PartVRotor : WeaponHolderBase {
class WeaponHolder_PartEngine : WeaponHolderBase {
scope = 2;
displayName = $STR_EQUIP_NAME_11;
displayName = $STR_EQUIP_NAME_ENGINE;
model = "\dayz_equip\proxy\engine.p3d";
destrType = "DestructNo";
@@ -342,7 +342,7 @@ class WeaponHolder_PartEngine : WeaponHolderBase {
class WeaponHolder_PartGlass : WeaponHolderBase {
scope = 2;
displayName = $STR_EQUIP_NAME_30;
displayName = $STR_EQUIP_NAME_WINDSCREEN_GLASS;
model = "\dayz_equip\proxy\carglass.p3d";
destrType = "DestructNo";
@@ -540,7 +540,7 @@ class WeaponHolder_ItemBucket : WeaponHolderBase {
class WeaponHolder_ItemJerrycan : WeaponHolderBase {
scope = 2;
displayName = $STR_EQUIP_NAME_19;
displayName = $STR_ITEM_NAME_JERRYCAN;
model = "\dayz_equip\proxy\jerrycan.p3d";
destrType = "DestructNo";

7
SQF/dayz_code/Configs/CfgWeapons/Rifles/AN94.hpp
View File

@@ -11,7 +11,12 @@ class AN94_DZ: AK_74
dexterity = 1.7;
displayName = $STR_DZ_WPN_AN94_NAME;
reloadMagazineSound[] = {"\RH_aks\sound\an94_reload.wss",0.056234,1,20};
magazines[] = {"30Rnd_545x39_AK","75Rnd_545x39_RPK"};
magazines[] =
{
30Rnd_545x39_AK,
60Rnd_545x39_AK_Taped,
75Rnd_545x39_RPK
};
modes[] = {"Single","Burst","Fullauto"};
class Single: Mode_SemiAuto
{

17
SQF/dayz_code/Configs/CfgWeapons/Rifles/RK95.hpp
View File

@@ -17,23 +17,6 @@ class OpticsModes\
opticsPPEffects[] = {"OpticsCHAbera3","OpticsBlur3"};\
cameraDir = "";\
};\
\
class Iron\
{\
opticsID = 2;\
useModelOptics = false;\
opticsFlare = false;\
opticsDisablePeripherialVision = false;\
opticsZoomMin = 0.25;\
opticsZoomMax = 1.1;\
opticsZoomInit = 0.5;\
distanceZoomMin = 100;\
distanceZoomMax = 100;\
memoryPointCamera = "eye";\
visionMode[] = {};\
opticsPPEffects[] = {};\
cameraDir = "";\
};\
}
class RK95_DZ: AKM_DZ

2
SQF/dayz_code/Configs/CfgWeapons/Throw.hpp
View File

@@ -60,7 +60,7 @@ class Throw : GrenadeLauncher
class ChemLightMuzzle : ThrowMuzzle
{
displayName = $STR_MAG_ACTION_5;
displayName = $STR_MAG_ACTION_CHEMLIGHT;
magazines[] = {"HandChemGreen", "HandChemRed", "HandChemBlue"};
};

8
SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp
View File

@@ -3,8 +3,8 @@ class ItemEtool : ItemCore
scope = 2;
model = "\dayz_equip\models\etool.p3d";
picture = "\dayz_equip\textures\equip_etool_ca.paa";
displayName = $STR_EQUIP_NAME_1;
descriptionShort = $STR_EQUIP_DESC_1;
displayName = $STR_EQUIP_NAME_ETOOL;
descriptionShort = $STR_EQUIP_DESC_ETOOL;
};
class ItemEtoolBroken : ItemCore
@@ -12,8 +12,8 @@ class ItemEtoolBroken : ItemCore
scope = 2;
model = "\dayz_equip\models\etool.p3d";
picture = "\dayz_epoch_c\icons\tools\ItemEtoolBroken.paa";
displayName = $STR_EQUIP_NAME_1_BROKEN;
descriptionShort = $STR_EQUIP_DESC_1_BROKEN;
displayName = $STR_EQUIP_NAME_ETOOL_BROKEN;
descriptionShort = $STR_EQUIP_DESC_ETOOL_BROKEN;
class ItemActions
{

24
SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp
View File

@@ -3,8 +3,8 @@ class ItemFlashlight : ItemCore
scope = 2;
model = "\dayz_equip\models\flashlight.p3d";
picture = "\dayz_equip\textures\equip_flashlight_ca.paa";
displayName = $STR_EQUIP_NAME_5;
descriptionShort = $STR_EQUIP_DESC_5;
displayName = $STR_EQUIP_NAME_FLASHLIGHT;
descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT;
class ItemActions
{
@@ -23,8 +23,8 @@ class ItemFlashlightBroken : ItemCore
scope = 2;
model = "\dayz_equip\models\flashlight.p3d";
picture = "\dayz_epoch_c\icons\tools\ItemFlashlightBroken.paa";
displayName = $STR_EQUIP_NAME_5_BROKEN;
descriptionShort = $STR_EQUIP_DESC_5_BROKEN;
displayName = $STR_EQUIP_NAME_FLASHLIGHT_BROKEN;
descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT_BROKEN;
};
class MeleeFlashlight : Pistol
@@ -32,8 +32,8 @@ class MeleeFlashlight : Pistol
scope = 2;
model = "\dayz_equip\models\flashlight.p3d";
picture = "\dayz_equip\textures\equip_flashlight_ca.paa";
displayName = $STR_EQUIP_NAME_5;
descriptionShort = $STR_EQUIP_DESC_5;
displayName = $STR_EQUIP_NAME_FLASHLIGHT;
descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT;
modelOptics = "-";
magazines[] = {};
@@ -65,8 +65,8 @@ class ItemFlashlightRed : ItemFlashlight
{
model = "\dayz_equip\models\flashlight_mil.p3d";
picture = "\dayz_equip\textures\equip_flashlight_mil_ca.paa";
displayName = $STR_EQUIP_NAME_6;
descriptionShort = $STR_EQUIP_DESC_6;
displayName = $STR_EQUIP_NAME_FLASHLIGHT_MILITARY;
descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT_MILITARY;
class ItemActions
{
@@ -85,16 +85,16 @@ class ItemFlashlightRedBroken : ItemCore
scope = 2;
model = "\dayz_equip\models\flashlight_mil.p3d";
picture = "\dayz_epoch_c\icons\tools\ItemMilitaryFlashlightBroken.paa";
displayName = $STR_EQUIP_NAME_6_BROKEN;
descriptionShort = $STR_EQUIP_DESC_6_BROKEN;
displayName = $STR_EQUIP_NAME_FLASHLIGHT_MILITARY_BROKEN;
descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT_MILITARY_BROKEN;
};
class MeleeFlashlightRed : MeleeFlashlight
{
model = "\dayz_equip\models\flashlight_mil.p3d";
picture = "\dayz_equip\textures\equip_flashlight_mil_ca.paa";
displayName = $STR_EQUIP_NAME_6;
descriptionShort = $STR_EQUIP_DESC_6;
displayName = $STR_EQUIP_NAME_FLASHLIGHT_MILITARY;
descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT_MILITARY;
class FlashLight
{

18
SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp
View File

@@ -48,4 +48,22 @@ class ItemHatchetBroken : ItemCore
inputweapons[] = {"ItemHatchetBroken"};
};
};
};
class ItemHatchetBlunt : ItemCore
{
scope = 2;
picture = "\dayz_epoch_c\icons\tools\ItemHatchetBroken.paa";
model = "\dayz_equip\models\hatchet.p3d";
displayName = $STR_EQUIP_NAME_HATCHET_DULL;
descriptionShort = $STR_EQUIP_DESC_HATCHET_DULL;
class ItemActions
{
class SharpenHatchet
{
text = $STR_ACTIONS_SHARPEN_HATCHET;
script = "; ['ItemHatchetBlunt','ItemHatchet'] spawn player_sharpen;";
};
};
};

19
SQF/dayz_code/Configs/CfgWeapons/Tools/Knife.hpp
View File

@@ -3,7 +3,7 @@ class ItemKnife_Base : ItemCore
scope = 0;
model = "\dayz_equip\models\knife_gear.p3d";
picture = "\dayz_equip\textures\equip_knife_ca.paa";
displayName = $STR_EQUIP_NAME_4;
displayName = $STR_EQUIP_NAME_KNIFE;
class ItemActions
{
@@ -20,55 +20,56 @@ class ItemKnife : ItemKnife_Base
scope = 2;
model = "\dayz_equip\models\knife_gear.p3d"; // Some mods override this. We leave this here just to be sure.
picture = "\dayz_equip\textures\equip_knife_ca.paa";
descriptionShort = $STR_EQUIP_DESC_4;
descriptionShort = $STR_EQUIP_DESC_KNIFE;
sharpnessRemaining = "ItemKnife5";
};
class ItemKnife5 : ItemKnife_Base
{
scope = 2;
descriptionShort = $STR_EQUIP_DESC_4_A;
descriptionShort = $STR_EQUIP_DESC_KNIFE_5;
sharpnessRemaining = "ItemKnife4";
};
class ItemKnife4 : ItemKnife_Base
{
scope = 2;
descriptionShort = $STR_EQUIP_DESC_4_B;
descriptionShort = $STR_EQUIP_DESC_KNIFE_4;
sharpnessRemaining = "ItemKnife3";
};
class ItemKnife3 : ItemKnife_Base
{
scope = 2;
descriptionShort = $STR_EQUIP_DESC_4_C;
descriptionShort = $STR_EQUIP_DESC_KNIFE_3;
sharpnessRemaining = "ItemKnife2";
};
class ItemKnife2 : ItemKnife_Base
{
scope = 2;
descriptionShort = $STR_EQUIP_DESC_4_D;
descriptionShort = $STR_EQUIP_DESC_KNIFE_2;
sharpnessRemaining = "ItemKnife1";
};
class ItemKnife1 : ItemKnife_Base
{
scope = 2;
descriptionShort = $STR_EQUIP_DESC_4_E;
descriptionShort = $STR_EQUIP_DESC_KNIFE_1;
sharpnessRemaining = "ItemKnifeBlunt";
};
class ItemKnifeBlunt : ItemKnife_Base
{
scope = 2;
descriptionShort = $STR_EQUIP_CODE_DESC_4;
displayName = $STR_EQUIP_NAME_KNIFE_DULL;
descriptionShort = $STR_EQUIP_DESC_KNIFE_DULL;
sharpnessRemaining = "ItemKnifeBlunt";
class ItemActions
{
class FixKnife
{
text = $STR_ACTIONS_FIX_KNIFE;
text = $STR_ACTIONS_SHARPEN_KNIFE;
script = "; ['ItemKnifeBlunt','ItemKnife'] spawn player_sharpen;";
};
class Use

26
SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp
View File

@@ -3,16 +3,24 @@ class ItemMatchbox_base : ItemCore
scope = 0;
model = "\dayz_equip\models\matchbox_gear.p3d";
picture = "\dayz_equip\textures\equip_matchbox_ca.paa";
displayName = $STR_EQUIP_NAME_3;
descriptionShort = $STR_EQUIP_DESC_3;
displayName = $STR_EQUIP_NAME_MATCHES;
descriptionShort = $STR_EQUIP_DESC_MATCHES;
};
class ItemMatchboxWet : ItemMatchbox_base
{
scope = 2;
picture = "\dayz_epoch_c\icons\tools\ItemMatchesEmpty.paa";
displayName = $STR_EQUIP_NAME_MATCHES_WET;
descriptionShort = $STR_EQUIP_DESC_MATCHES_WET;
};
class ItemMatchboxEmpty : ItemMatchbox_base
{
scope = 2;
picture = "\dayz_epoch_c\icons\tools\ItemMatchesEmpty.paa";
displayName = $STR_EQUIP_NAME_3_EMPTY;
descriptionShort = $STR_EQUIP_DESC_3_EMPTY;
displayName = $STR_EQUIP_NAME_MATCHES_EMPTY;
descriptionShort = $STR_EQUIP_DESC_MATCHES_EMPTY;
};
//Loot Spawn Table.
@@ -38,35 +46,35 @@ class ItemMatchbox : ItemMatchbox_base
class Item5Matchbox : ItemMatchbox
{
displayName = $STR_EQUIP_NAME_MATCHES_5;
descriptionShort = $STR_EQUIP_DESC_3_A;
descriptionShort = $STR_EQUIP_DESC_MATCHES_5;
matches = 5;
qtyRemaining = "Item4Matchbox";
};
class Item4Matchbox : ItemMatchbox
{
displayName = $STR_EQUIP_NAME_MATCHES_4;
descriptionShort = $STR_EQUIP_DESC_3_B;
descriptionShort = $STR_EQUIP_DESC_MATCHES_4;
qtyRemaining = "Item3Matchbox";
matches = 4;
};
class Item3Matchbox : ItemMatchbox
{
displayName = $STR_EQUIP_NAME_MATCHES_3;
descriptionShort = $STR_EQUIP_DESC_3_C;
descriptionShort = $STR_EQUIP_DESC_MATCHES_3;
qtyRemaining = "Item2Matchbox";
matches = 3;
};
class Item2Matchbox : ItemMatchbox
{
displayName = $STR_EQUIP_NAME_MATCHES_2;
descriptionShort = $STR_EQUIP_DESC_3_D;
descriptionShort = $STR_EQUIP_DESC_MATCHES_2;
qtyRemaining = "Item1Matchbox";
matches = 2;
};
class Item1Matchbox : ItemMatchbox
{
displayName = $STR_EQUIP_NAME_MATCHES_1;
descriptionShort = $STR_EQUIP_DESC_3_E;
descriptionShort = $STR_EQUIP_DESC_MATCHES_1;
qtyRemaining = "ItemMatchboxEmpty";
matches = 1;
};

8
SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp
View File

@@ -3,8 +3,8 @@ class ItemShovel : ItemCore
scope = 2;
model = "\z\addons\dayz_communityassets\models\shovel.p3d";
picture = "\dayz_epoch_c\icons\tools\ItemShovel.paa";
displayName = $STR_EQUIP_NAME_1b;
descriptionShort = $STR_EQUIP_DESC_1b;
displayName = $STR_EQUIP_NAME_SHOVEL;
descriptionShort = $STR_EQUIP_DESC_SHOVEL;
};
class ItemShovelBroken : ItemCore
@@ -12,8 +12,8 @@ class ItemShovelBroken : ItemCore
scope = 2;
model = "\z\addons\dayz_communityassets\models\shovel.p3d";
picture = "\dayz_epoch_c\icons\tools\ItemShovelBroken.paa";
displayName = $STR_EQUIP_NAME_1b_BROKEN;
descriptionShort = $STR_EQUIP_DESC_1b_BROKEN;
displayName = $STR_EQUIP_NAME_SHOVEL_BROKEN;
descriptionShort = $STR_EQUIP_DESC_SHOVEL_BROKEN;
class ItemActions
{

8
SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp
View File

@@ -3,8 +3,8 @@ class ItemToolbox : ItemCore
scope = 2;
model = "\dayz_equip\models\toolbox.p3d";
picture = "\dayz_equip\textures\equip_toolbox_ca.paa";
displayName = $STR_EQUIP_NAME_2;
descriptionShort = $STR_EQUIP_DESC_2;
displayName = $STR_EQUIP_NAME_TOOLBOX;
descriptionShort = $STR_EQUIP_DESC_TOOLBOX;
class ItemActions
{
@@ -21,6 +21,6 @@ class ItemToolboxBroken : ItemCore
scope = 2;
model = "\dayz_equip\models\toolbox.p3d";
picture = "\dayz_epoch_c\icons\tools\ItemToolboxBroken.paa";
displayName = $STR_EQUIP_NAME_2_BROKEN;
descriptionShort = $STR_EQUIP_DESC_2_BROKEN;
displayName = $STR_EQUIP_NAME_TOOLBOX_BROKEN;
descriptionShort = $STR_EQUIP_DESC_TOOLBOX_BROKEN;
};

2
SQF/dayz_code/Configs/cfgAmmo.hpp
View File

@@ -820,7 +820,7 @@ class CfgAmmo
class ChemLight : LitObject
{
displayName = $STR_MAG_ACTION_5;
displayName = $STR_MAG_ACTION_CHEMLIGHT;
simulation = "shotShell";
simulationStep = 5;
soundFly[] = {"", 0, 0};

2
SQF/dayz_code/actions/changeCode.sqf
View File

@@ -73,7 +73,7 @@ if (_isStorage) then {
_vector = [vectorDir _cursorTarget,vectorUp _cursorTarget];
_object = createVehicle [_typeOf, [0,0,0], [], 0, "CAN_COLLIDE"];
_object setDir _dir;
//_object setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp
_object setVectorDirAndUp _vector;
_object setPosATL _location;
_object setVariable ["memDir",_dir,true];

2
SQF/dayz_code/actions/modular_build.sqf
View File

@@ -362,7 +362,7 @@ if (_canBuild select 0) then {
if (!_cancel) then {
_classname = _classnametmp;
_tmpbuilt = _classname createVehicle _location;
_tmpbuilt setdir _dir;
//_tmpbuilt setdir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp
_tmpbuilt setVariable["memDir",_dir,true];
_location = _position;

2
SQF/dayz_code/actions/player_buildingDowngrade.sqf
View File

@@ -79,7 +79,7 @@ if ((count _upgrade) > 0) then {
_classname = _newclassname;
_object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"];
_object setDir _dir;
//_object setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp
_object setVariable["memDir",_dir,true];
_object setVectorDirAndUp _vector;
_object setPosATL _location;

11
SQF/dayz_code/actions/player_emptyContainer.sqf
View File

@@ -10,6 +10,7 @@
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_56" call dayz_rollingMessages;};
dayz_actionInProgress = true;
closeDialog 0;
private "_cfg";
@@ -19,28 +20,32 @@ _cfg = (ConfigFile >> "CfgMagazines" >> _this);
if (!isClass(_cfg)) exitWith
{
diag_log format ["DAYZ ERROR: Invalid magazine classname given to player_emptyContainer: %1", _this];
dayz_actionInProgress = false;
};
//class isn't a consumable
if (!isText(_cfg >> "containerEmpty")) exitWith
{
diag_log format ["DAYZ ERROR: Non-emptiable item classname given to player_emptyContainer: %1", _this];
dayz_actionInProgress = false;
};
//player is on a ladder
if ((getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1) exitWith
{
(localize "str_player_21") call dayz_rollingMessages;
dayz_actionInProgress = false;
};
//player doesn't have the consumable item
if (!(_this in magazines player)) exitWith { localize "str_misplaced_container" call dayz_rollingMessages; };
if (!(_this in magazines player)) exitWith { dayz_actionInProgress = false;localize "str_misplaced_container" call dayz_rollingMessages; };
//Remove container
player removeMagazine _this;
[player,(getPosATL player),5,"refuel"] spawn fnc_alertZombies;
player playActionNow "PutDown";
//Remove container
player removeMagazine _this;
player addMagazine getText (_cfg >> "containerEmpty");
//update gear ui or close if the player is in a vehicle

2
SQF/dayz_code/actions/player_upgrade.sqf
View File

@@ -117,7 +117,7 @@ if ((count _upgrade) > 0) then {
_objectCharacterID = _obj getVariable ["CharacterID","0"];
_classname = _newclassname;
_object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"];
_object setDir _dir;
//_object setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp
_object setVariable["memDir",_dir,true];
_object setVectorDirAndUp _vector;
_object setPosATL _location;

4
SQF/dayz_code/actions/remove.sqf
View File

@@ -33,7 +33,7 @@ _objectUID = _obj getVariable ["ObjectUID","0"];
_isOk = true;
_proceed = false;
_objType = typeOf _obj;
if (_objType in DZE_DoorsLocked) exitWith {dayz_actionInProgress = false; localize "STR_EPOCH_ACTIONS_20" call dayz_rollingMessages;};
if (_objType in DZE_DoorsLocked && !(_objType in ["WoodenGate_1_DZ","WoodenGate_2_DZ","WoodenGate_3_DZ","WoodenGate_4_DZ"])) exitWith {dayz_actionInProgress = false; localize "STR_EPOCH_ACTIONS_20" call dayz_rollingMessages;};
// Chance to break tools
_isDestructable = _obj isKindOf "BuiltItems";
@@ -77,7 +77,7 @@ _nameVehicle = getText(configFile >> "CfgVehicles" >> _objType >> "displayName")
format[localize "str_epoch_player_162",_nameVehicle] call dayz_rollingMessages;
if (_isModular && {_objType in _x} count DZE_modularConfig == 0) then {
localize "STR_EPOCH_ACTIONS_21" call dayz_rollingMessages;
localize "STR_EPOCH_ACTIONS_21" call dayz_rollingMessages;
};
// Alert zombies once.

7
SQF/dayz_code/compile/fn_buildWeightedArray.sqf
View File

@@ -18,9 +18,9 @@ scriptName "Functions\arrays\fn_selectRandomWeighted.sqf";
[*] Algorithm is inefficient?
*/
private["_weighted"];
private["_weights","_weighted","_weight"];
_array = _this select 0;
// _array = _this select 0;
_weights = _this select 1;
/*
@@ -34,7 +34,6 @@ if ((count _array) > (count _weights)) exitWith {debugLog "Log: [selectRandomWei
_weighted = [];
for "_i" from 0 to ((count _weights) - 1) do
{
private ["_weight"];
_weight = _weights select _i;
//Ensure the weight is a Number.
@@ -53,4 +52,4 @@ for "_i" from 0 to ((count _weights) - 1) do
_weighted set [(count _weighted), _i];
};
};
_weighted
_weighted

4
SQF/dayz_code/compile/fn_inAngleSector.sqf
View File

@@ -15,7 +15,7 @@
// Revision History:
// 09/01/08 0.1 - First cut VBS2
//------------------
private["_r","_dir1"];
private["_small","_large","_xpos","_ypos","_dir2","_dir3"];
_r = false;
@@ -34,4 +34,4 @@ _dir3 = _dir1 + 360;
if ((_dir1 >= _small && _dir1 <= _large) || (_dir2 >= _small && _dir2 <= _large) || (_dir3 >= _small && _dir3 <= _large)) then {_r = true};
_r
_r

2
SQF/dayz_code/compile/fn_inString.sqf
View File

@@ -1,7 +1,7 @@
//Kilzone_Kid's megafast inString function
//caseinsensitive
//params [needle,haystack];
private ["_found","_hayArr"];
private["_needle","_haystack","_haystackArr","_haystackLen","_needleLen","_found","_hayArr"];
scopeName "main";
_needle = _this select 0;

5
SQF/dayz_code/compile/fn_selectRandomLocation.sqf
View File

@@ -1,4 +1,5 @@
private["_location","_minDistance","_maxDistance","_minobjectDistance","_X","_Y","_index"];
private["_position","_minDistance","_maxDistance","_minobjectDistance","_X","_Y","_location","_index","_PosX","_PosY","_isFlat"];
_position = _this select 0;
_minDistance = _this select 1;
@@ -35,4 +36,4 @@ while {_index < 50} do {
//_location = [_location select 0,_location select 1,0];
//diag_log(str(_position));
//diag_log(str(_location));
_location
_location

4
SQF/dayz_code/compile/fn_sunRise.sqf
View File

@@ -14,10 +14,10 @@
Reference:
http://forums.bistudio.com/showthread.php?107476-How-do-I-detect-sundown-sunrise
*/
private["_daytime"];
private["_lat","_day","_hour","_daytime"];
_lat = -1 * getNumber(configFile >> "CfgWorlds" >> worldName >> "latitude");
_day = 360 * (dateToNumber date);
_hour = acos ((24 * sin(_lat) * cos(_day)) / ((12 * cos(_day) - 78) * cos(_lat)));
_daytime = _hour / 360 * 24;
_daytime
_daytime

4
SQF/dayz_code/compile/fnc_getSetPos.sqf
View File

@@ -1,5 +1,5 @@
//DO NOT USE IF YOU NEED ANGLE COMPENSATION!!!!
private "_pos";
private["_params","_thingy","_isATL","_pos"];
_params = count _this;
_thingy = _this select 0;
@@ -28,4 +28,4 @@ if (surfaceIsWater _pos) then {
};
};
_pos;
_pos;

4
SQF/dayz_code/compile/player_attackfsmdelay.sqf
View File

@@ -2,10 +2,10 @@
Created exclusively for ArmA2:OA - DayZMod.
Please request permission to use/alter/distribute from project leader (R4Z0R49) AND the author (facoptere@gmail.com)
*/
private [];
private ["_unit","_type"];
//_start = diag_tickTime;
_unit = _this select 0;
_type = _this select 1;
[_unit, _type] call player_zombieAttack;
[_unit, _type] call player_zombieAttack;

2
SQF/dayz_code/compile/player_checkStealth.sqf
View File

@@ -1,4 +1,4 @@
private ["_scalePose","_scaleMvmt","_scaleLight","_initial"];
private["_vel","_speed","_pos","_isPZombie","_anim","_anim4","_scaleSound","_nearFlare","_scaler","_nearLight","_nearFire","_building","_isPlayerInside","_audial"];
_vel = velocity (vehicle player);
_speed = (_vel distance [0,0,0]);
_pos = getPosATL player;

2
SQF/dayz_code/compile/player_gearSet.sqf
View File

@@ -1,4 +1,4 @@
private "_idc";
private["_inventory","_wpns","_mags","_item","_val","_idc"];
_inventory = _this;
if (count _inventory > 0) then {
_wpns = _inventory select 0;

3
SQF/dayz_code/compile/player_music.sqf
View File

@@ -1,3 +1,4 @@
private["_num","_sound","_length","_pause"];
while {!r_player_dead} do {
_num = round(random 37);
_sound = "z_suspense_" + str(_num);
@@ -7,4 +8,4 @@ while {!r_player_dead} do {
playMusic _sound;
};
uiSleep _pause;
};
};

2
SQF/dayz_code/compile/player_projectileNear.sqf
View File

@@ -1,4 +1,4 @@
private ["_currentNear","_listNear","_callCount"];
private["_unit","_projectile","_isInComat","_listNear","_callCount","_projectilespeed","_projectflight","_currentNear","_nearVehicle","_isInCombat"];
_unit = _this select 0;
_projectile = _this select 6;

4
SQF/dayz_code/compile/veh_handleKilled.sqf
View File

@@ -1,4 +1,4 @@
_unit = _this select 0;
local _unit = _this select 0;
//_killer = _this select 1;
// ask server to set global damage to 1, save to the hive
@@ -15,4 +15,4 @@ if (local _unit) then {
_unit removeAllEventHandlers "HandleDamage";
_unit removeAllEventHandlers "Killed";
_unit removeAllEventHandlers "GetIn";
_unit removeAllEventHandlers "GetOut";
_unit removeAllEventHandlers "GetOut";

8
SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Tools.hpp vendored
View File

@@ -162,6 +162,10 @@ class ItemHatchetBroken
{
weight = 1;
};
class ItemHatchetBlunt
{
weight = 1;
};
class ItemCrowbar
{
weight = 1;
@@ -198,6 +202,10 @@ class ItemMatchboxEmpty
{
weight = 0.001;
};
class ItemMatchboxWet
{
weight = 0.009;
};
class ItemToolbox
{
weight = 1;

4
SQF/dayz_code/init/variables.sqf
View File

File diff suppressed because one or more lines are too long

1485
SQF/dayz_code/stringtable.xml
View File

File diff suppressed because it is too large Load Diff

2
SQF/dayz_server/compile/server_changeCode.sqf
View File

@@ -40,7 +40,7 @@ if (Z_singleCurrency) then {_coins = _object getVariable ["cashMoney",0];};
[_objectID,_objectUID,_object] call server_deleteObjDirect;
_holder = _lockedClass createVehicle [0,0,0];
_holder setDir _dir;
//_holder setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp
_holder setVariable ["memDir",_dir,true];
_holder setVectorDirAndUp _vector;
_holder setPosATL _pos;

4
SQF/dayz_server/compile/server_handleSafeGear.sqf
View File

@@ -61,7 +61,7 @@ call {
// Create new unlocked safe, then delete old locked safe
_holder = _unlockedClass createVehicle [0,0,0];
_holder setDir _dir;
//_holder setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp
_holder setVariable ["memDir",_dir,true];
_holder setVectorDirAndUp _vector;
_holder setPosATL _pos;
@@ -89,7 +89,7 @@ call {
// Create new locked safe, then delete old unlocked safe
_holder = _lockedClass createVehicle [0,0,0];
_holder setDir _dir;
//_holder setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp
_holder setVariable ["memDir",_dir,true];
_holder setVectorDirAndUp _vector;
_holder setPosATL _pos;

8
SQF/dayz_server/system/server_monitor.sqf
View File

@@ -183,14 +183,16 @@ if ((playersNumber west + playersNumber civilian) == 0) exitWith {
};
};
_object = _type createVehicle [0,0,0]; //more than 2x faster than createvehicle array
_object setDir _dir;
_object setPosATL _pos;
_object = _type createVehicle [0,0,0]; //more than 2x faster than createvehicle array
_object setDamage _damage;
if (_vecExists) then {
_object setVectorDirAndUp _vector;
} else {
_object setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp
};
_object enableSimulation false;
_object setPosATL _pos;
_doorLocked = _type in DZE_DoorsLocked;
_isPlot = _type == "Plastic_Pole_EP1_DZ";

4
Server Files/SQL/update epoch 1.0.7 to 1.0.7.1.sql Normal file
View File

@@ -0,0 +1,4 @@
UPDATE character_data SET Backpack = REPLACE(Backpack, '"Skin_gsc_cloth_loner_head_DZ"', '"Skin_Survivor2_DZ"') WHERE INSTR(Backpack, '"Skin_gsc_cloth_loner_head_DZ"') > 0;
UPDATE character_data SET Inventory = REPLACE(Inventory, '"Skin_gsc_cloth_loner_head_DZ"', '"Skin_Survivor2_DZ"') WHERE INSTR(Inventory, '"Skin_gsc_cloth_loner_head_DZ"') > 0;
UPDATE object_data SET Inventory = REPLACE(Inventory, '"Skin_gsc_cloth_loner_head_DZ"', '"Skin_Survivor2_DZ"') WHERE INSTR(Inventory, '"Skin_gsc_cloth_loner_head_DZ"') > 0;
UPDATE character_data SET Model = "Survivor2_DZ" WHERE Model = "gsc_cloth_loner_head_DZ";