W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	SQF/dayz_code/compile/fn_damageActions.sqf
#	SQF/dayz_code/compile/fn_selfActions.sqf
This commit is contained in:
icomrade
2016-05-02 20:44:50 -04:00
parent 575682b7c8 d361abaec3
commit 5f054393e5
31 changed files with 1944 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documents/1.0.6 Variable Name Changes.txt
View File

@@ -38,7 +38,7 @@
- PVDZE_plr_Login --> PVDZ_plr_Login1
- PVDZE_plr_Login2 --> PVDZ_plr_Login2
- PVDZE_plr_LoginRecord --> PVDZ_plr_LoginRecord
- PVDZE_plr_Save --> PVDZ_plr_Save
- PVDZE_plr_Save --> PVDZ_plr_Save Note: 2nd param is now a nested array (was array) 4th param is now achievements array (was bool)
- PVDZE_plr_SetDate --> dayzSetDate
- PVDZE_send --> PVDZ_send
- PVDZE_Server_Simulation --> PVDZ_Server_Simulation

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

@@ -1,122 +1,122 @@
class Skin_Rocket_DZ: SkinBase {
scope = public;
displayName = "Officer Suit";
descriptionShort = "Officer Suit";
displayName = $STR_EPOCH_SKINS_OFFICERSUIT;
descriptionShort = $STR_EPOCH_SKINS_OFFICERSUIT;
};
class Skin_RU_Policeman_DZ: SkinBase {
scope = public;
displayName = "Sergei";
descriptionShort = "Police Officer Uniform";
displayName = $STR_EPOCH_SKINS_SERGEI;
descriptionShort = $STR_EPOCH_SKINS_SERGEI_DESC;
};
class Skin_Pilot_EP1_DZ: SkinBase {
scope = public;
displayName = "Ethan";
descriptionShort = "Pilot Uniform";
displayName = $STR_EPOCH_SKINS_ETHAN;
descriptionShort = $STR_EPOCH_SKINS_ETHAN_DESC;
};
class Skin_Haris_Press_EP1_DZ: SkinBase {
scope = public;
displayName = "Harry";
descriptionShort = "Press Uniform";
displayName = $STR_EPOCH_SKINS_HARRY;
descriptionShort = $STR_EPOCH_SKINS_HARRY_DESC;
};
class Skin_Ins_Soldier_GL_DZ: SkinBase {
scope = public;
displayName = "Terrorist Uniform";
descriptionShort = "Terrorist Uniform";
displayName = $STR_EPOCH_SKINS_TERRORISTUNIFORM;
descriptionShort = $STR_EPOCH_SKINS_TERRORISTUNIFORM;
};
class Skin_GUE_Commander_DZ: SkinBase {
scope = public;
displayName = "Rebel Uniform";
descriptionShort = "Rebel Uniform";
displayName = $STR_EPOCH_SKINS_REBELUNIFORM;
descriptionShort = $STR_EPOCH_SKINS_REBELUNIFORM;
};
class Skin_Functionary1_EP1_DZ: SkinBase {
scope = public;
displayName = "Donald";
descriptionShort = "Business Suit";
displayName = $STR_EPOCH_SKINS_DONALD;
descriptionShort = $STR_EPOCH_SKINS_DONALD_DESC;
};
class Skin_Priest_DZ: SkinBase {
scope = public;
displayName = "James";
descriptionShort = "Priest Outfit";
displayName = $STR_EPOCH_SKINS_JAMES;
descriptionShort = $STR_EPOCH_SKINS_JAMES_DESC;
};
class Skin_Rocker1_DZ: SkinBase {
scope = public;
displayName = "Duane";
descriptionShort = "Rocker (black)";
displayName = $STR_EPOCH_SKINS_DUANE;
descriptionShort = $STR_EPOCH_SKINS_DUANE_DESC;
};
class Skin_Rocker2_DZ: SkinBase {
scope = public;
displayName = "Rod";
descriptionShort = "Rocker (brown)";
displayName = $STR_EPOCH_SKINS_ROD;
descriptionShort = $STR_EPOCH_SKINS_ROD_DESC;
};
class Skin_Rocker3_DZ: SkinBase {
scope = public;
displayName = "Van";
descriptionShort = "Rocker (blue)";
displayName = $STR_EPOCH_SKINS_VAN;
descriptionShort = $STR_EPOCH_SKINS_VAN_DESC;
};
class Skin_Rocker4_DZ: SkinBase {
scope = public;
displayName = "Bruce";
descriptionShort = "Rocker (green)";
displayName = $STR_EPOCH_SKINS_BRUCE;
descriptionShort = $STR_EPOCH_SKINS_BRUCE_DESC;
};
class Skin_Bandit1_DZ: SkinBase {
scope = public;
displayName = "Bandit Outfit";
descriptionShort = "Bandit Outfit";
displayName = $STR_EPOCH_SKINS_BANDITOUTFIT;
descriptionShort = $STR_EPOCH_SKINS_BANDITOUTFIT;
};
class Skin_Bandit2_DZ: SkinBase {
scope = public;
displayName = "Bandit Camo";
descriptionShort = "Bandit Camo Outfit";
displayName = $STR_EPOCH_SKINS_BANDITCAMO;
descriptionShort = $STR_EPOCH_SKINS_BANDITCAMO_DESC;
};
class Skin_GUE_Soldier_MG_DZ: SkinBase {
scope = public;
displayName = "Bandit Gunner";
descriptionShort = "Bandit Gunner Outfit";
displayName = $STR_EPOCH_SKINS_BANDITGUNNER;
descriptionShort = $STR_EPOCH_SKINS_BANDITGUNNER_DESC;
};
class Skin_GUE_Soldier_Sniper_DZ: SkinBase {
scope = public;
displayName = "Bandit Sniper";
descriptionShort = "Bandit Sniper Outfit";
displayName = $STR_EPOCH_SKINS_BANDITSNIPER;
descriptionShort = $STR_EPOCH_SKINS_BANDITSNIPER_DESC;
};
class Skin_GUE_Soldier_Crew_DZ: SkinBase {
scope = public;
displayName = "Bandit Baklava";
descriptionShort = "Bandit Baklava Outfit";
displayName = $STR_EPOCH_SKINS_BANDITBAKLAVA;
descriptionShort = $STR_EPOCH_SKINS_BANDITBAKLAVA_DESC;
};
class Skin_GUE_Soldier_CO_DZ: SkinBase {
scope = public;
displayName = "Bandit Mask";
descriptionShort = "Bandit Mask Outfit";
displayName = $STR_EPOCH_SKINS_BANDITMASK;
descriptionShort = $STR_EPOCH_SKINS_BANDITMASK_DESC;
};
class Skin_GUE_Soldier_2_DZ: SkinBase {
scope = public;
displayName = "Bandit Hat";
descriptionShort = "Bandit Hat with Baklava";
displayName = $STR_EPOCH_SKINS_BANDITHAT;
descriptionShort = $STR_EPOCH_SKINS_BANDITHAT_DESC;
};
class Skin_BanditW1_DZ: SkinBase {
scope = public;
displayName = "Bandit Annie";
descriptionShort = "Bandit wrap blue top with brown pants.";
displayName = $STR_EPOCH_SKINS_BANDITANNIE;
descriptionShort = $STR_EPOCH_SKINS_BANDITANNIE_DESC;
};
class Skin_BanditW2_DZ: SkinBase {
scope = public;
displayName = "Bandit Jane";
descriptionShort = "Bandit wrap grey top with brown camo pants.";
displayName = $STR_EPOCH_SKINS_BANDITJANE;
descriptionShort = $STR_EPOCH_SKINS_BANDITJANE_DESC;
};
class Skin_SurvivorW3_DZ: SkinBase {
scope = public;
displayName = "Jane";
descriptionShort = "Grey top with brown camo pants.";
displayName = $STR_EPOCH_SKINS_JANE;
descriptionShort = $STR_EPOCH_SKINS_JANE_DESC;
};
class Skin_SurvivorW2_DZ: SkinBase {
scope = public;
displayName = "Annie";
descriptionShort = "Civilian (female)";
displayName = $STR_EPOCH_SKINS_ANNIE;
descriptionShort = $STR_EPOCH_SKINS_ANNIE_DESC;
};
class Skin_SurvivorWpink_DZ: SkinBase {
scope = public;
displayName = "Melly (female)";
descriptionShort = "Purple top with blue pants.";
displayName = $STR_EPOCH_SKINS_MELLY;
descriptionShort = $STR_EPOCH_SKINS_MELLY_DESC;
};
/*
class Skin_SurvivorWsequisha_DZ: SkinBase {
@@ -132,117 +132,117 @@ class Skin_SurvivorWsequishaD_DZ: SkinBase {
*/
class Skin_SurvivorWcombat_DZ: SkinBase {
scope = public;
displayName = "Alejandria";
descriptionShort = "Blue camo top with brown camo pants.";
displayName = $STR_EPOCH_SKINS_ALEJANDRIA;
descriptionShort = $STR_EPOCH_SKINS_ALEJANDRIA_DESC;
};
class Skin_SurvivorWdesert_DZ: SkinBase {
scope = public;
displayName = "Savannah";
descriptionShort = "White top with brown pants.";
displayName = $STR_EPOCH_SKINS_SAVANNAH;
descriptionShort = $STR_EPOCH_SKINS_SAVANNAH_DESC;
};
class Skin_SurvivorWurban_DZ: SkinBase {
scope = public;
displayName = "Sophia";
descriptionShort = "Maroon top with grey pants.";
displayName = $STR_EPOCH_SKINS_SOPHIA;
descriptionShort = $STR_EPOCH_SKINS_SOPHIA_DESC;
};
class Skin_TK_INS_Warlord_EP1_DZ: SkinBase {
scope = public;
displayName = "Takistani Warlord";
descriptionShort = "Takistani Warlord";
displayName = $STR_EPOCH_SKINS_TAKISTANIWARLORD;
descriptionShort = $STR_EPOCH_SKINS_TAKISTANIWARLORD;
};
class Skin_TK_INS_Soldier_EP1_DZ: SkinBase {
scope = public;
displayName = "Takistani Soldier";
descriptionShort = "Takistani Soldier";
displayName = $STR_EPOCH_SKINS_TAKISTANISOLDIER;
descriptionShort = $STR_EPOCH_SKINS_TAKISTANISOLDIER;
};
class Skin_CZ_Special_Forces_GL_DES_EP1_DZ: SkinBase {
scope = public;
displayName = "Special Forces";
descriptionShort = "Special Forces";
displayName = $STR_EPOCH_SKINS_SPECIALFORCES;
descriptionShort = $STR_EPOCH_SKINS_SPECIALFORCES;
};
class Skin_Drake_Light_DZ: SkinBase {
scope = public;
displayName = "Desert Camo";
descriptionShort = "Desert Camo";
displayName = $STR_EPOCH_SKINS_DESERTCAMO;
descriptionShort = $STR_EPOCH_SKINS_DESERTCAMO;
};
class Skin_Soldier_Bodyguard_AA12_PMC_DZ: SkinBase {
scope = public;
displayName = "Bodyguard";
descriptionShort = "Bodyguard";
displayName = $STR_EPOCH_SKINS_BODYGUARD;
descriptionShort = $STR_EPOCH_SKINS_BODYGUARD;
};
class Skin_FR_OHara_DZ: SkinBase {
scope = public;
displayName = "Jungle Camo";
descriptionShort = "Jungle Camo";
displayName = $STR_EPOCH_SKINS_JUNGLECAMO;
descriptionShort = $STR_EPOCH_SKINS_JUNGLECAMO;
};
class Skin_FR_Rodriguez_DZ: SkinBase {
scope = public;
displayName = "Gunner Outfit";
descriptionShort = "Gunner Outfit";
displayName = $STR_EPOCH_SKINS_GUNNEROUTFIT;
descriptionShort = $STR_EPOCH_SKINS_GUNNEROUTFIT;
};
class Skin_CZ_Soldier_Sniper_EP1_DZ: SkinBase {
scope = public;
displayName = "Desert Ghillie";
descriptionShort = "Desert Ghillie";
displayName = $STR_EPOCH_SKINS_DESERTGHILLIE;
descriptionShort = $STR_EPOCH_SKINS_DESERTGHILLIE;
};
class Skin_Graves_Light_DZ: SkinBase {
scope = public;
displayName = "Urban Camo";
descriptionShort = "Urban Camo";
displayName = $STR_EPOCH_SKINS_URBANCAMO;
descriptionShort = $STR_EPOCH_SKINS_URBANCAMO;
};
class Skin_Soldier_Sniper_PMC_DZ: SkinBase {
scope = public;
displayName = "Marksman";
descriptionShort = "Marksman";
displayName = $STR_EPOCH_SKINS_MARKSMAN;
descriptionShort = $STR_EPOCH_SKINS_MARKSMAN;
};
class Skin_Soldier_TL_PMC_DZ: SkinBase {
scope = public;
displayName = "Team Leader";
descriptionShort = "Team Leader";
displayName = $STR_EPOCH_SKINS_TEAMLEADER;
descriptionShort = $STR_EPOCH_SKINS_TEAMLEADER;
};
// new
class Skin_TK_Special_Forces_MG_EP1_DZ: SkinBase {
scope = public;
displayName = "Smuggler";
descriptionShort = "Smuggler";
displayName = $STR_EPOCH_SKINS_SMUGGLER;
descriptionShort = $STR_EPOCH_SKINS_SMUGGLER;
};
class Skin_TK_Soldier_Sniper_EP1_DZ: SkinBase {
scope = public;
displayName = "Desert Sniper";
descriptionShort = "Desert Sniper";
displayName = $STR_EPOCH_SKINS_DESERTSNIPER;
descriptionShort = $STR_EPOCH_SKINS_DESERTSNIPER;
};
class Skin_TK_Commander_EP1_DZ: SkinBase {
scope = public;
displayName = "General";
descriptionShort = "General";
displayName = $STR_EPOCH_SKINS_GENERAL;
descriptionShort = $STR_EPOCH_SKINS_GENERAL;
};
class Skin_RU_Soldier_Crew_DZ: SkinBase {
scope = public;
displayName = "Crewman";
descriptionShort = "Crewman";
displayName = $STR_EPOCH_SKINS_CREWMAN;
descriptionShort = $STR_EPOCH_SKINS_CREWMAN;
};
class Skin_INS_Lopotev_DZ: SkinBase {
scope = public;
displayName = "Boss";
descriptionShort = "Team Leader";
displayName = $STR_EPOCH_SKINS_BOSS;
descriptionShort = $STR_EPOCH_SKINS_BOSS_DESC;
};
class Skin_INS_Soldier_AR_DZ: SkinBase {
scope = public;
displayName = "Cooper";
descriptionShort = "Cooper";
displayName = $STR_EPOCH_SKINS_COOPER;
descriptionShort = $STR_EPOCH_SKINS_COOPER;
};
class Skin_INS_Soldier_CO_DZ: SkinBase {
scope = public;
displayName = "Travis";
descriptionShort = "Travis";
displayName = $STR_EPOCH_SKINS_TRAVIS;
descriptionShort = $STR_EPOCH_SKINS_TRAVIS;
};
class Skin_INS_Bardak_DZ: SkinBase {
scope = public;
displayName = "Paulo";
descriptionShort = "Paulo";
displayName = $STR_EPOCH_SKINS_PAULO;
descriptionShort = $STR_EPOCH_SKINS_PAULO;
};
class Skin_INS_Worker2_DZ: SkinBase {
scope = public;
displayName = "Steve";
descriptionShort = "Steve";
displayName = $STR_EPOCH_SKINS_STEVE;
descriptionShort = $STR_EPOCH_SKINS_STEVE;
};

8
SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/AluminumBar.hpp
View File

@@ -2,20 +2,20 @@ class ItemAluminumBar: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Aluminum";
displayName = $STR_EPOCH_ALUMINUM;
model = "\z\addons\dayz_epoch\models\aluminum_bar.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_alum_bar_CA.paa";
descriptionShort = "Aluminum Bar";
descriptionShort = $STR_EPOCH_ALUMINUM_DESC;
};
class ItemAluminumBar10oz: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "10oz Aluminum";
displayName = $STR_EPOCH_10OZALUMINUM;
model = "\z\addons\dayz_epoch\models\aluminum_bar.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_alum_bar_10oz_CA.paa";
descriptionShort = "10oz Aluminum Bar";
descriptionShort = $STR_EPOCH_10OZALUMINUM_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_211;

4
SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/BronzeBar.hpp
View File

@@ -2,8 +2,8 @@ class ItemBronzeBar: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Bronze";
displayName = $STR_EPOCH_BRONZE;
model = "\z\addons\dayz_epoch\models\bronze_bar.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_bar_bronze_CA.paa";
descriptionShort = "Bronze Bar";
descriptionShort = $STR_EPOCH_BRONZE_DESC;
};

8
SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/CopperBar.hpp
View File

@@ -2,10 +2,10 @@ class ItemCopperBar: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Copper";
displayName = $STR_EPOCH_COPPER;
model = "\z\addons\dayz_epoch\models\copper_bar.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_copper_bar_CA.paa";
descriptionShort = "Copper Bar";
descriptionShort = $STR_EPOCH_COPPER_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210;
@@ -21,10 +21,10 @@ class ItemCopperBar10oz: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "10oz Copper";
displayName = $STR_EPOCH_10OZCOPPER;
model = "\z\addons\dayz_epoch\models\copper_bar_10oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_copper_bar_10oz_CA.paa";
descriptionShort = "10oz Copper Bar";
descriptionShort = $STR_EPOCH_10OZCOPPER_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_211;

40
SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/GoldBar.hpp
View File

@@ -3,10 +3,10 @@ class ItemGoldBar: CA_Magazine {
count = 1;
worth = 100;
type = 256;
displayName = "Gold";
displayName = $STR_EPOCH_GOLD;
model = "\z\addons\dayz_epoch\models\ItemGoldBar1oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
descriptionShort = "Gold Bar";
descriptionShort = $STR_EPOCH_GOLD_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -32,10 +32,10 @@ class ItemGoldBar2oz: CA_Magazine {
count = 1;
worth = 200;
type = 256;
displayName = "2oz Gold";
displayName = $STR_EPOCH_2OZGOLD;
model = "\z\addons\dayz_epoch\models\ItemGoldBar2oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
descriptionShort = "2 x 1oz Gold Bar";
descriptionShort = $STR_EPOCH_2OZGOLD_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -70,10 +70,10 @@ class ItemGoldBar3oz: CA_Magazine {
count = 1;
worth = 300;
type = 256;
displayName = "3oz Gold";
displayName = $STR_EPOCH_3OZGOLD;
model = "\z\addons\dayz_epoch\models\ItemGoldBar3oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
descriptionShort = "3 x 1oz Gold Bar";
descriptionShort = $STR_EPOCH_3OZGOLD_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -116,10 +116,10 @@ class ItemGoldBar4oz: CA_Magazine {
count = 1;
worth = 400;
type = 256;
displayName = "4oz Gold";
displayName = $STR_EPOCH_4OZGOLD;
model = "\z\addons\dayz_epoch\models\ItemGoldBar4oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
descriptionShort = "4 x 1oz Gold Bar";
descriptionShort = $STR_EPOCH_4OZGOLD_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -162,10 +162,10 @@ class ItemGoldBar5oz: CA_Magazine {
count = 1;
worth = 500;
type = 256;
displayName = "5oz Gold";
displayName = $STR_EPOCH_5OZGOLD;
model = "\z\addons\dayz_epoch\models\ItemGoldBar5oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
descriptionShort = "5 x 1oz Gold Bar";
descriptionShort = $STR_EPOCH_5OZGOLD_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -208,10 +208,10 @@ class ItemGoldBar6oz: CA_Magazine {
count = 1;
worth = 600;
type = 256;
displayName = "6oz Gold";
displayName = $STR_EPOCH_6OZGOLD;
model = "\z\addons\dayz_epoch\models\ItemGoldBar6oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
descriptionShort = "6 x 1oz Gold Bar";
descriptionShort = $STR_EPOCH_6OZGOLD_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -254,10 +254,10 @@ class ItemGoldBar7oz: CA_Magazine {
count = 1;
worth = 700;
type = 256;
displayName = "7oz Gold";
displayName = $STR_EPOCH_7OZGOLD;
model = "\z\addons\dayz_epoch\models\ItemGoldBar7oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
descriptionShort = "7 x 1oz Gold Bar";
descriptionShort = $STR_EPOCH_7OZGOLD_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -300,10 +300,10 @@ class ItemGoldBar8oz: CA_Magazine {
count = 1;
worth = 800;
type = 256;
displayName = "8oz Gold";
displayName = $STR_EPOCH_8OZGOLD;
model = "\z\addons\dayz_epoch\models\ItemGoldBar8oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
descriptionShort = "8 x 1oz Gold Bar";
descriptionShort = $STR_EPOCH_8OZGOLD_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -346,10 +346,10 @@ class ItemGoldBar9oz: CA_Magazine {
count = 1;
worth = 900;
type = 256;
displayName = "9oz Gold";
displayName = $STR_EPOCH_9OZGOLD;
model = "\z\addons\dayz_epoch\models\ItemGoldBar9oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
descriptionShort = "9 x 1oz Gold Bar";
descriptionShort = $STR_EPOCH_9OZGOLD_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -384,10 +384,10 @@ class ItemGoldBar10oz: CA_Magazine {
count = 1;
worth = 1000;
type = 256;
displayName = "10oz Gold";
displayName = $STR_EPOCH_10OZGOLD;
model = "\z\addons\dayz_epoch\models\ItemGoldBar10oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_10oz_CA.paa";
descriptionShort = "10 x 1oz Gold Bar";
descriptionShort = $STR_EPOCH_10OZGOLD_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_211_1;

40
SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/SilverBar.hpp
View File

@@ -3,10 +3,10 @@ class ItemSilverBar: CA_Magazine {
count = 1;
worth = 1;
type = 256;
displayName = "Silver";
displayName = $STR_EPOCH_SILVER;
model = "\z\addons\dayz_epoch\models\ItemSilverBar1oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
descriptionShort = "Silver Bar";
descriptionShort = $STR_EPOCH_SILVER_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -32,10 +32,10 @@ class ItemSilverBar2oz: CA_Magazine {
count = 1;
worth = 2;
type = 256;
displayName = "2oz Silver";
displayName = $STR_EPOCH_2OZSILVER;
model = "\z\addons\dayz_epoch\models\ItemSilverBar2oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
descriptionShort = "2 x 1oz Silver Bar";
descriptionShort = $STR_EPOCH_2OZSILVER_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -70,10 +70,10 @@ class ItemSilverBar3oz: CA_Magazine {
count = 1;
worth = 3;
type = 256;
displayName = "3oz Silver";
displayName = $STR_EPOCH_3OZSILVER;
model = "\z\addons\dayz_epoch\models\ItemSilverBar3oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
descriptionShort = "3 x 1oz Silver Bar";
descriptionShort = $STR_EPOCH_3OZSILVER_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -116,10 +116,10 @@ class ItemSilverBar4oz: CA_Magazine {
count = 1;
worth = 4;
type = 256;
displayName = "4oz Silver";
displayName = $STR_EPOCH_4OZSILVER;
model = "\z\addons\dayz_epoch\models\ItemSilverBar4oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
descriptionShort = "4 x 1oz Silver Bar";
descriptionShort = $STR_EPOCH_4OZSILVER_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -162,10 +162,10 @@ class ItemSilverBar5oz: CA_Magazine {
count = 1;
worth = 5;
type = 256;
displayName = "5oz Silver";
displayName = $STR_EPOCH_5OZSILVER;
model = "\z\addons\dayz_epoch\models\ItemSilverBar5oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
descriptionShort = "5 x 1oz Silver Bar";
descriptionShort = $STR_EPOCH_5OZSILVER_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -208,10 +208,10 @@ class ItemSilverBar6oz: CA_Magazine {
count = 1;
worth = 6;
type = 256;
displayName = "6oz Silver";
displayName = $STR_EPOCH_6OZSILVER;
model = "\z\addons\dayz_epoch\models\ItemSilverBar6oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
descriptionShort = "6 x 1oz Silver Bar";
descriptionShort = $STR_EPOCH_6OZSILVER_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -254,10 +254,10 @@ class ItemSilverBar7oz: CA_Magazine {
count = 1;
worth = 7;
type = 256;
displayName = "7oz Silver";
displayName = $STR_EPOCH_7OZSILVER;
model = "\z\addons\dayz_epoch\models\ItemSilverBar7oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
descriptionShort = "7 x 1oz Silver Bar";
descriptionShort = $STR_EPOCH_7OZSILVER_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -300,10 +300,10 @@ class ItemSilverBar8oz: CA_Magazine {
count = 1;
worth = 8;
type = 256;
displayName = "8oz Silver";
displayName = $STR_EPOCH_8OZSILVER;
model = "\z\addons\dayz_epoch\models\ItemSilverBar8oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
descriptionShort = "8 x 1oz Silver Bar";
descriptionShort = $STR_EPOCH_8OZSILVER_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -346,10 +346,10 @@ class ItemSilverBar9oz: CA_Magazine {
count = 1;
worth = 9;
type = 256;
displayName = "9oz Silver";
displayName = $STR_EPOCH_9OZSILVER;
model = "\z\addons\dayz_epoch\models\ItemSilverBar9oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa";
descriptionShort = "9 x 1oz Silver Bar";
descriptionShort = $STR_EPOCH_9OZSILVER_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_210_1;
@@ -384,10 +384,10 @@ class ItemSilverBar10oz: CA_Magazine {
count = 1;
worth = 10;
type = 256;
displayName = "10oz Silver";
displayName = $STR_EPOCH_10OZSILVER;
model = "\z\addons\dayz_epoch\models\ItemSilverBar10oz.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_Silver_bar_10oz_CA.paa";
descriptionShort = "10 x 1oz Silver Bar";
descriptionShort = $STR_EPOCH_10OZSILVER_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_211_1;

8
SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/TinBar.hpp
View File

@@ -2,20 +2,20 @@ class ItemTinBar: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Tin";
displayName = $STR_EPOCH_TIN;
model = "\z\addons\dayz_epoch\models\tin_bar.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_tin_bar_CA.paa";
descriptionShort = "Tin Bar";
descriptionShort = $STR_EPOCH_TIN_DESC;
};
class ItemTinBar10oz: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "10oz Tin";
displayName = $STR_EPOCH_10OZTIN;
model = "\z\addons\dayz_epoch\models\tin_bar.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_tin_bar_10oz_CA.paa";
descriptionShort = "10oz Tin Bar";
descriptionShort = $STR_EPOCH_10OZTIN_DESC;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_211;

2
SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp
View File

@@ -284,7 +284,7 @@ class ItemPlotDeed: CA_Magazine {
sfx = "document";
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLOTDEED_ACTION; //move to crafting in stringtable
text = $STR_EPOCH_PLOTDEED_ACTION;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {"workshop"};
requiretools[] = {"ItemToolbox"};

92
SQF/dayz_code/Configs/CfgMagazines/DZE/ModularBuilding.hpp
View File

@@ -2,8 +2,8 @@ class metal_floor_kit: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Metal Floor";
descriptionShort = "Metal Floor";
displayName = $STR_EPOCH_METALFLOOR;
descriptionShort = $STR_EPOCH_METALFLOOR;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
weight = 325;
@@ -21,8 +21,8 @@ class cinder_wall_kit: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Cinder Block Wall";
descriptionShort = "Half height cinder block wall";
displayName = $STR_EPOCH_CINDERBLOCKWALL;
descriptionShort = $STR_EPOCH_CINDERBLOCKWALL_DESC;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
weight = 325;
@@ -39,8 +39,8 @@ class cinder_door_kit: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Block Doorway";
descriptionShort = "Cinder block doorway";
displayName = $STR_EPOCH_BLOCKDOORWAY;
descriptionShort = $STR_EPOCH_BLOCKDOORWAY_DESC;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
weight = 325;
@@ -57,8 +57,8 @@ class cinder_garage_kit: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Block Garage Doorway";
descriptionShort = "Cinder block garage doorway";
displayName = $STR_EPOCH_BLOCKGARAGEDOORWAY;
descriptionShort = $STR_EPOCH_BLOCKGARAGEDOORWAY_DESC;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
weight = 325;
@@ -76,10 +76,10 @@ class ItemWoodFloor: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Floor/Ceiling";
displayName = $STR_EPOCH_FLOORCEILING;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wood Floor can also be used as a ceiling.";
descriptionShort = $STR_EPOCH_FLOORCEILING_DESC;
weight = 25;
class ItemActions {
class Build {
@@ -94,10 +94,10 @@ class ItemWoodFloorHalf: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Floor/Ceiling 1/2";
displayName = $STR_EPOCH_FLOORCEILINGHALF;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wood Floor can also be used as a ceiling.";
descriptionShort = $STR_EPOCH_FLOORCEILING_DESC;
weight = 15;
class ItemActions {
class Build {
@@ -121,10 +121,10 @@ class ItemWoodFloorQuarter: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Floor/Ceiling 1/4";
displayName = $STR_EPOCH_FLOORCEILINGQUARTER;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wood Floor can also be used as a ceiling.";
descriptionShort = $STR_EPOCH_FLOORCEILING_DESC;
weight = 10;
class ItemActions {
class Build {
@@ -149,10 +149,10 @@ class ItemWoodStairs: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Wood Stairs";
displayName = $STR_EPOCH_WOODSTAIRS;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wood stairs";
descriptionShort = $STR_EPOCH_WOODSTAIRS;
weight = 25;
class ItemActions {
class Build {
@@ -176,10 +176,10 @@ class ItemWoodStairsSupport: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Wood Stairs w/ supports";
displayName = $STR_EPOCH_WOODSTAIRSWITHSUPPORTS;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wood stairs with supports";
descriptionShort = $STR_EPOCH_WOODSTAIRSWITHSUPPORTS_DESC;
weight = 30;
class ItemActions {
class Build {
@@ -195,10 +195,10 @@ class ItemWoodLadder: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Wood Ladder";
displayName = $STR_EPOCH_WOODLADDER;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wood Ladder";
descriptionShort = $STR_EPOCH_WOODLADDER;
weight = 25;
class ItemActions {
class Build {
@@ -214,10 +214,10 @@ class ItemWoodWall: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Wood Wall";
displayName = $STR_EPOCH_WOODWALL;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wall constucted out of plywood and lumber.";
descriptionShort = $STR_EPOCH_WOODWALL_DESC;
weight = 25;
class ItemActions {
class Build {
@@ -256,10 +256,10 @@ class ItemWoodWallThird: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Wood Wall 1/3";
displayName = $STR_EPOCH_WOODWALLTHIRDPART;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Third wall constucted out of plywood and lumber.";
descriptionShort = $STR_EPOCH_WOODWALLTHIRDPART_DESC;
weight = 7;
class ItemActions {
class Build {
@@ -282,10 +282,10 @@ class ItemWoodWallWindow: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Wall w/ Window";
displayName = $STR_EPOCH_WALLWITHWINDOW;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wall with Window constucted out of plywood and lumber.";
descriptionShort = $STR_EPOCH_WALLWITHWINDOW_DESC;
weight = 25;
class ItemActions {
class Build {
@@ -301,10 +301,10 @@ class ItemWoodWallDoor: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Wall w/ Doorway";
displayName = $STR_EPOCH_WALLWITHDOORWAY;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wall with doorway constucted out of plywood and lumber.";
descriptionShort = $STR_EPOCH_WALLWITHDOORWAY_DESC;
weight = 25;
class ItemActions {
class Build {
@@ -327,10 +327,10 @@ class ItemWoodWallWithDoor: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Wall w/ Door";
displayName = $STR_EPOCH_WALLWITHDOOR;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wall with door constucted out of plywood and lumber.";
descriptionShort = $STR_EPOCH_WALLWITHDOOR_DESC;
weight = 25;
class ItemActions {
class Build {
@@ -353,10 +353,10 @@ class ItemWoodWallWithDoorLocked: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Wall w/ Door Locked";
displayName = $STR_EPOCH_WALLWITHDOORLOCKED;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wall with door constucted out of plywood and lumber.";
descriptionShort = $STR_EPOCH_WALLWITHDOORLOCKED_DESC;
weight = 30;
class ItemActions {
class Build {
@@ -372,10 +372,10 @@ class ItemWoodWallGarageDoor: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Wood Garage Door";
displayName = $STR_EPOCH_WOODGARAGEDOOR;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Garage door constucted out of plywood and lumber.";
descriptionShort = $STR_EPOCH_WOODGARAGEDOOR_DESC;
weight = 25;
class ItemActions {
class Build {
@@ -398,10 +398,10 @@ class ItemWoodWallGarageDoorLocked: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Wood Garage Door Locked";
displayName = $STR_EPOCH_WOODGARAGEDOORLOCKED;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Garage door with combination lock.";
descriptionShort = $STR_EPOCH_WOODGARAGEDOORLOCKED_DESC;
weight = 25;
class ItemActions {
class Build {
@@ -417,10 +417,10 @@ class ItemWoodWallLg: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Large Wood Wall";
displayName = $STR_EPOCH_LARGEWOODWALL;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Large wall constucted out of plywood and lumber.";
descriptionShort = $STR_EPOCH_LARGEWOODWALL_DESC;
weight = 25;
class ItemActions {
class Build {
@@ -459,10 +459,10 @@ class ItemWoodWallWindowLg: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Large Wall w/ Window";
displayName = $STR_EPOCH_LARGEWALLWITHWINDOW;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Large wall with doorway constucted out of plywood and lumber..";
descriptionShort = $STR_EPOCH_LARGEWALLWITHWINDOW_DESC;
weight = 30;
class ItemActions {
class Build {
@@ -478,10 +478,10 @@ class ItemWoodWallDoorLg: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Large Wall w/ Doorway";
displayName = $STR_EPOCH_LARGEWALLWITHDOORWAY;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Large wall with doorway constucted out of plywood and lumber.";
descriptionShort = $STR_EPOCH_LARGEWALLWITHDOORWAY_DESC;
weight = 30;
class ItemActions {
class Build {
@@ -504,10 +504,10 @@ class ItemWoodWallWithDoorLg: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Large Wall w/ Door";
displayName = $STR_EPOCH_LARGEWALLWITHDOOR;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wall with door constucted out of plywood and lumber.";
descriptionShort = $STR_EPOCH_LARGEWALLWITHDOOR_DESC;
weight = 30;
class ItemActions {
class Build {
@@ -530,10 +530,10 @@ class ItemWoodWallWithDoorLgLocked: CA_Magazine {
scope = public;
count = 1;
type = 256;
displayName = "Large Wall w/ Door Locked";
displayName = $STR_EPOCH_LARGEWALLWITHDOORLOCKED;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
descriptionShort = "Wall with combination lock door constucted out of plywood and lumber.";
descriptionShort = $STR_EPOCH_LARGEWALLWITHDOORLOCKED_DESC;
weight = 35;
class ItemActions {
class Build {

2
SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp
View File

@@ -459,7 +459,7 @@ class AdvancedTrading
};
class RscText_AT_InfoLabel: ZSC_RscText
{
idc = -1;
idc = 7488;
text = $STR_EPOCH_TRADE_DETAILS;
x = 0.60 * safezoneW + safezoneX;
y = 0.38 * safezoneH + safezoneY;

22
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_allowBuying.sqf
View File

@@ -13,7 +13,7 @@ _sidearmToBuy = _this select 4;
_primaryToBuy = _this select 5;
_vehiclesToBuy = _this select 6;
if (_vehiclesToBuy > 1) exitWith {systemChat "You can only purchase one vehicle at a time."; false;};
if (_vehiclesToBuy > 1) exitWith {systemChat localize "STR_EPOCH_TRADE_ONE_VEHICLE"; false;};
if (_vehiclesToBuy > 0) then {
_toolsToBuy = _toolsToBuy + _vehiclesToBuy;
};
@@ -64,17 +64,17 @@ if(_selection == 2) then{ //gear
if( _allowedPrimary >= _primaryToBuy && _allowedSidearm >= _sidearmToBuy && _allowedTools >= _toolsToBuy)then{
_check1 = true;
}else{
systemChat format["You can only buy %1 primary, %2 sidearm and %3 tools in your gear.", _allowedPrimary, _allowedSidearm , _allowedTools];
systemChat format[localize "STR_EPOCH_TRADE_GEAR_FULL", _allowedPrimary, _allowedSidearm , _allowedTools];
};
if( _allowedMags >= _toBuyMags)then{
_check2 = true;
}else{
systemChat format["You can only buy %1 magazines in your gear.",_allowedMags];
systemChat format[localize "STR_EPOCH_TRADE_MAGS_FULL",_allowedMags];
};
if( _allowedBackpacks >= _toBuyBags)then{
_check3 = true;
}else{
systemChat format["You can only buy %1 backpacks in your gear.",_allowedBackpacks];
systemChat format[localize "STR_EPOCH_TRADE_BAG_FULL",_allowedBackpacks];
};
if(_check1 && _check2 && _check3)then{
@@ -139,17 +139,17 @@ if(_selection == 1) then{ //vehicle
if( _allowedWeapons >= ( _toBuyWeaps + _toolsToBuy ) )then{
_check1 = true;
}else{
systemChat format["You can only buy %1 weapons in your vehicle.", _allowedWeapons];
systemChat format[localize "STR_EPOCH_TRADE_VEHICLE_WEPS", _allowedWeapons];
};
if( _allowedMags >= _toBuyMags)then{
_check2 = true;
}else{
systemChat format["You can only buy %1 magazines in your vehicle.", _allowedMags];
systemChat format[localize "STR_EPOCH_TRADE_VEHICLE_MAGS", _allowedMags];
};
if( _allowedBackpacks >= _toBuyBags)then{
_check3 = true;
}else{
systemChat format["You can only buy %1 backpacks in your vehicle.", _allowedBackpacks];
systemChat format[localize "STR_EPOCH_TRADE_VEHICLE_BAGS", _allowedBackpacks];
};
if(_check1 && _check2 && _check3)then{
@@ -225,7 +225,7 @@ if(_selection == 0) then{ //backpack
_totalSpace = _alreadyInBackpack + _totalNewSpace;
}else {
systemChat format["You need a backpack.", _allowedMags];
systemChat format[localize "STR_EPOCH_TRADE_NEED_BAG", _allowedMags];
};
_check1 = false;
@@ -236,17 +236,17 @@ if(_selection == 0) then{ //backpack
if( _allowedWeapons >= _toBuyWeaps)then{
_check1 = true;
} else {
systemChat format["Only %1 weapons fit in the backpack.", _allowedMags];
systemChat format[localize "STR_EPOCH_TRADE_BAG_WEPS", _allowedWeapons];
};
if( _allowedMags >= _toBuyMags)then{
_check2 = true;
} else {
systemChat format["Only %1 mags fit in the backpack." , _allowedWeapons];
systemChat format[localize "STR_EPOCH_TRADE_BAG_MAGS", _allowedMags];
};
if( _allowedBackpacks >= _toBuyBags)then{
_check3 = true;
} else {
systemChat format["Only %1 bags fit in the backpack." , _allowedBackpacks ];
systemChat format[localize "STR_EPOCH_TRADE_BAG_BAGS", _allowedBackpacks ];
};
if( _totalSpace <= _allowedMags)then{

32
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_buyItems.sqf
View File

@@ -130,21 +130,21 @@ if(_enoughMoney) then {
publicVariableServer "PVDZE_veh_Publish2";
_keySelected;
};
systemChat format["Starting trade."];
systemChat localize "STR_EPOCH_PLAYER_105";
closeDialog 2;
if(Z_SellingFrom == 0) then { //backpack
_backpack = unitBackpack player;
systemChat format["Adding %1 items in backpack",count (Z_BuyingArray)];
systemChat format[localize "STR_EPOCH_TRADE_IN_BACKPACK",count (Z_BuyingArray)];
{
if( _x select 1 == "trade_weapons")then{
_backpack addWeaponCargoGlobal [_x select 0, _x select 9];
diag_log format ["%1 x %2 added", _x select 0, _x select 9];
diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9];
};
if( _x select 1 == "trade_items")then{
_backpack addMagazineCargoGlobal [_x select 0, _x select 9];
diag_log format ["%1 x %2 added", _x select 0, _x select 9];
diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9];
};
if((_x select 1) in ["trade_any_vehicle", "trade_any_vehicle_free", "trade_any_vehicle_old", "trade_any_bicycle", "trade_any_bicycle_old", "trade_any_boat", "trade_any_boat_old"])then{
_item2Add = [(_x select 0), (_x select 1)] call _buyVehicle;
@@ -161,15 +161,15 @@ if(_enoughMoney) then {
systemChat format["Adding %1 items in %2",count (Z_BuyingArray), typeOf Z_vehicle];
if( _x select 1 == "trade_weapons")then{
Z_vehicle addWeaponCargoGlobal [_x select 0, _x select 9];
diag_log format ["%1 x %2 added", _x select 0, _x select 9];
diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9];
};
if( _x select 1 == "trade_items")then{
Z_vehicle addMagazineCargoGlobal [_x select 0, _x select 9];
diag_log format ["%1 x %2 added", _x select 0, _x select 9];
diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9];
};
if( _x select 1 == "trade_backpacks")then{
Z_vehicle addBackpackCargoGlobal [_x select 0, _x select 9];
diag_log format ["%1 x %2 added", _x select 0, _x select 9];
diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9];
};
if((_x select 1) in ["trade_any_vehicle", "trade_any_vehicle_free", "trade_any_vehicle_old", "trade_any_bicycle", "trade_any_bicycle_old", "trade_any_boat", "trade_any_boat_old"])then{
_item2Add = [(_x select 0), (_x select 1)] call _buyVehicle;
@@ -188,7 +188,7 @@ if(_enoughMoney) then {
_count = 0;
while{ _count < (_x select 9)}do{
player addWeapon (_x select 0);
diag_log format ["%1 added", _x select 0];
diag_log format [localize "STR_EPOCH_TRADE_ADDED", _x select 0];
_count = _count + 1;
};
};
@@ -196,7 +196,7 @@ if(_enoughMoney) then {
_count = 0;
while{ _count < (_x select 9)} do {
player addMagazine (_x select 0);
diag_log format ["%1 added", _x select 0];
diag_log format [localize "STR_EPOCH_TRADE_ADDED", _x select 0];
_count = _count + 1;
};
};
@@ -215,25 +215,25 @@ if(_enoughMoney) then {
if (!Z_SingleCurrency) then {
_success = [player,_priceToBuy, _moneyInfo] call Z_payDefault;
if (_success) then {
systemChat format["Trade successfull, payed %1 worth of items.", _priceToBuy];
systemChat format[localize "STR_EPOCH_TRADE_SUCCESS", _priceToBuy];
} else {
systemchat "DEBUG: Something went wrong in the pay process. Please report this issue.";
systemchat localize "STR_EPOCH_TRADE_DEBUG";
};
} else {
_success = [player,_priceToBuy] call SC_fnc_removeCoins;
if (_success) then {
systemChat format["Trade successfull, payed %1 %2.", _priceToBuy, CurrencyName];
systemChat format[localize "STR_EPOCH_TRADE_SUCCESS_COINS", _priceToBuy, CurrencyName];
} else {
systemchat "DEBUG: Something went wrong in the pay process. Please report this issue.";
systemchat localize "STR_EPOCH_TRADE_DEBUG";
};
};
} else {
systemChat "You could not buy these items because the container lacks space to hold them.";
systemChat localize "STR_EPOCH_TRADE_CONTAINER_FULL";
};
}else{
if( Z_SingleCurrency) then {
systemChat format["You need %1 %2 to buy all these items.",_priceToBuy,CurrencyName];
systemChat format[localize "STR_EPOCH_TRADE_NEED_COINS",_priceToBuy,CurrencyName];
} else {
systemChat format["You need more money to buy all these items."];
systemChat localize "STR_EPOCH_TRADE_NEED_MONEY";
};
};

4
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkCloseVehicle.sqf
View File

@@ -10,8 +10,8 @@ _list = nearestObjects [(getPosATL player), ["AllVehicles"], Z_VehicleDistance];
_result = false;
if(!isNull _vehicle)then{
Z_vehicle = _vehicle;
systemChat format["Selected %1",typeOf Z_vehicle];
systemChat format[localize "STR_EPOCH_TRADE_SELECTED",typeOf Z_vehicle];
_result = true;
[format["Buying in %1.", typeOf Z_vehicle]] call Z_filleTradeTitle;
[format[localize "STR_EPOCH_BUYING_IN", typeOf Z_vehicle]] call Z_filleTradeTitle;
};
_result

6
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf
View File

@@ -46,9 +46,9 @@ _formattedText = format [
"<t color='#33BFFF'>%11: </t><t color='#ffffff'>%3</t><br />" +
"<t color='#33BFFF'>%12: </t><t color='#ffffff'>%5 %7</t><br />" +
"<t color='#33BFFF'>%13: </t><t color='#ffffff'>%6 %4</t><br />" +
"<t color='#33BFFF'>Mags: </t><t color='#ffffff'>%8</t><br />" +
"<t color='#33BFFF'>Weaps:</t><t color='#ffffff'>%9</t><br />"
, _picture, _display, _class, _buyCurrency , _sellPrice, _buyPrice, _sellCurrency, _transportMaxWeapons,_transportMaxMagazines, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291"
"<t color='#33BFFF'>%14: </t><t color='#ffffff'>%8</t><br />" +
"<t color='#33BFFF'>%15: </t><t color='#ffffff'>%9</t><br />"
, _picture, _display, _class, _buyCurrency , _sellPrice, _buyPrice, _sellCurrency, _transportMaxWeapons,_transportMaxMagazines, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", localize "STR_EPOCH_MAGS", localize "STR_EPOCH_WEPS"
];
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_ITEMINFO) ctrlSetStructuredText parseText _formattedText;

16
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf
View File

@@ -54,10 +54,10 @@ if (Z_SingleCurrency) then {
"<t color='#33BFFF'>%11: </t><t color='#ffffff'>%3</t><br />" +
"<t color='#33BFFF'>%12: </t><t color='#ffffff'>%5 %7</t><br />" +
"<t color='#33BFFF'>%13: </t><t color='#ffffff'>%6 %7</t><br />" +
"<t color='#33BFFF'>Mags: </t><t color='#ffffff'>%9</t><br />" +
"<t color='#33BFFF'>Weaps: </t><t color='#ffffff'>%8</t><br />" +
"<t color='#33BFFF'>Backs: </t><t color='#ffffff'>%4</t><br />"
, _picture, _display, _class, _transportmaxBackpacks, _sellPrice, _buyPrice, CurrencyName, _transportMaxWeapons,_transportMaxMagazines, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291"
"<t color='#33BFFF'>%14: </t><t color='#ffffff'>%9</t><br />" +
"<t color='#33BFFF'>%15: </t><t color='#ffffff'>%8</t><br />" +
"<t color='#33BFFF'>%16: </t><t color='#ffffff'>%4</t><br />"
, _picture, _display, _class, _transportmaxBackpacks, _sellPrice, _buyPrice, CurrencyName, _transportMaxWeapons,_transportMaxMagazines, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", localize "STR_EPOCH_MAGS", localize "STR_EPOCH_WEPS", localize "STR_EPOCH_BAGS"
];
@@ -73,10 +73,10 @@ if (Z_SingleCurrency) then {
"<t color='#33BFFF'>%14: </t><t color='#ffffff'>%3</t><br />" +
"<t color='#33BFFF'>%15: </t><t color='#ffffff'>%5 <img image='%11' /> %10</t><br />" +
"<t color='#33BFFF'>%16: </t><t color='#ffffff'>%6 <img image='%12' /> %7</t><br />" +
"<t color='#33BFFF'>Mags: </t><t color='#ffffff'>%8</t><br />" +
"<t color='#33BFFF'>Weaps: </t><t color='#ffffff'>%9</t><br />" +
"<t color='#33BFFF'>Backs: </t><t color='#ffffff'>%4</t><br />"
, _picture, _display, _class, _transportmaxBackpacks, _sellPrice, _buyPrice, _buyCurrency, _transportMaxWeapons,_transportMaxMagazines, _sellCurrency, _picSell,_picBuy, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291"
"<t color='#33BFFF'>%17: </t><t color='#ffffff'>%8</t><br />" +
"<t color='#33BFFF'>%18: </t><t color='#ffffff'>%9</t><br />" +
"<t color='#33BFFF'>%19: </t><t color='#ffffff'>%4</t><br />"
, _picture, _display, _class, _transportmaxBackpacks, _sellPrice, _buyPrice, _buyCurrency, _transportMaxWeapons,_transportMaxMagazines, _sellCurrency, _picSell,_picBuy, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", localize "STR_EPOCH_MAGS", localize "STR_EPOCH_WEPS", localize "STR_EPOCH_BAGS"
];

8
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf
View File

@@ -44,8 +44,8 @@ if (Z_SingleCurrency) then {
"<t color='#33BFFF'>%9: </t><t color='#ffffff'>%3</t><br />" +
"<t color='#33BFFF'>%10: </t><t color='#ffffff'>%5 %7</t><br />" +
"<t color='#33BFFF'>%11: </t><t color='#ffffff'>%6 %7</t><br />" +
"<t color='#33BFFF'>Mags: </t><br /><t color='#ffffff' size='0.5'>%4</t>"
, _picture, _display, _class, _magText, _sellPrice, _buyPrice, CurrencyName, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291"
"<t color='#33BFFF'>%12: </t><br /><t color='#ffffff' size='0.5'>%4</t>"
, _picture, _display, _class, _magText, _sellPrice, _buyPrice, CurrencyName, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", localize "STR_EPOCH_MAGS"
];
}else {
_picSell = getText (configFile >> 'CfgMagazines' >> _sellCurrency >> 'picture');
@@ -59,8 +59,8 @@ if (Z_SingleCurrency) then {
"<t color='#33BFFF'>%12: </t><t color='#ffffff'>%3</t><br />" +
"<t color='#33BFFF'>%13: </t><t color='#ffffff'>%5 <img image='%9' /> %7</t><br />" +
"<t color='#33BFFF'>%14: </t><t color='#ffffff'>%6 <img image='%10' /> %8</t><br />" +
"<t color='#33BFFF'>Mags: </t><br /><t color='#ffffff' size='0.5'>%4</t>"
, _picture, _display, _class, _magText, _sellPrice, _buyPrice, _sellCurrency, _buyCurrency, _picSell, _picBuy, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291"
"<t color='#33BFFF'>%15: </t><br /><t color='#ffffff' size='0.5'>%4</t>"
, _picture, _display, _class, _magText, _sellPrice, _buyPrice, _sellCurrency, _buyCurrency, _picSell, _picBuy, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", localize "STR_EPOCH_MAGS"
];
};

6
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getGearItems.sqf
View File

@@ -21,10 +21,10 @@ if (!isNil '_pic' && _pic == "") then {
};
_formattedText = format [
"<t size='1' align='center' color='#ffffff'> Gear </t>"
, _pic
"<t size='1' align='center' color='#ffffff'> %2 </t>"
, _pic, localize "STR_UI_GEAR"
];
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_CONTAINERINFO) ctrlSetStructuredText parseText _formattedText;
[_weaps,_mags,"your gear"] call Z_checkArrayInConfig;
[_weaps,_mags,localize "STR_EPOCH_YOUR_GEAR"] call Z_checkArrayInConfig;

2
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getItemConfig.sqf
View File

@@ -22,6 +22,6 @@ switch (true) do {
[_item] call Z_displayVehicleInfo;
};
default {
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_ITEMINFO) ctrlSetStructuredText parseText "<t color='#ffffff'>No info found</t>";
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_ITEMINFO) ctrlSetStructuredText (parseText format["<t color='#ffffff'>%1</t>",localize "STR_EPOCH_TRADE_NO_INFO"]);
}
};

6
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getVehicleItems.sqf
View File

@@ -18,7 +18,7 @@ _list = nearestObjects [(getPosATL player), ["AllVehicles"], Z_VehicleDistance];
}count _list;
if (!isNull _vehicle) then {
systemChat format["Selected %1",typeOf _vehicle];
systemChat format[localize "STR_EPOCH_TRADE_SELECTED",typeOf _vehicle];
_pic = getText (configFile >> 'CfgVehicles' >> (typeOf _vehicle) >> 'picture');
_formattedText = format [
@@ -56,9 +56,9 @@ if (!isNull _vehicle) then {
[_normalWeaps,_normalMags, typeOf _vehicle] call Z_checkArrayInConfig;
}else{
_ctrltext = format["Get in driver seat first!"];
_ctrltext = localize "STR_EPOCH_PLAYER_245";
ctrlSetText [Z_AT_TRADERLINE2, _ctrltext];
_ctrltext = format["I do not see any vehicle."];
_ctrltext = localize "STR_EPOCH_TRADE_NO_VEHICLE";
ctrlSetText [Z_AT_TRADERLINE1, _ctrltext];
};

11
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf
View File

@@ -86,7 +86,7 @@ if(_index > -1)then{
systemChat format[localize "str_epoch_player_182",_textPartIn]; _returnInfo = [];
};
} else {
systemChat format[localize "str_epoch_player_245"]; _returnInfo = [];
systemChat localize "str_epoch_player_245"; _returnInfo = [];
};
};
_returnInfo;
@@ -209,14 +209,15 @@ if(_index > -1)then{
if(typeName _money == "SCALAR") then {
if (Z_SingleCurrency) then {
_success = [player,_money] call SC_fnc_addCoins;
systemChat format["Trade successfull, received %1 %2", _money , CurrencyName];
systemChat format[localize "STR_EPOCH_TRADE_SUCCESS_CHANGE", _money , CurrencyName];
} else {
_success = [_money, 0] call Z_returnChange;
systemChat format["Trade successfull."];
systemChat localize "STR_EPOCH_TRADE_SUCCESSFUL";
};
}else{
systemChat format["Money is not a number. Something went wrong."];
systemChat localize "STR_EPOCH_TRADE_DEBUG";
diag_log "Money is not a number. Something went wrong.";
};
}else{
systemChat format["No Items to sell"];
systemChat localize "STR_EPOCH_TRADE_NO_ITEMS";
};

3
SQF/dayz_code/actions/AdvancedTrading/init.sqf
View File

@@ -3,7 +3,7 @@ disableSerialization;
Z_traderData = (_this select 3); // gets the trader data ( e.g menu_Functionary1 )
if( isNil "Z_traderData" || count (Z_traderData) == 0)exitWith{
"Something went wrong selecting the trader." call dayz_rollingMessages;
localize "STR_EPOCH_TRADE_ERROR" call dayz_rollingMessages;
};
if(DZE_ActionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; };
@@ -106,5 +106,6 @@ createDialog "AdvancedTrading";
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_REMOVEALLSELLITEMBUTTON) ctrlSetText " << ";
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_REMOVEBUYITEMBUTTON) ctrlSetText " < ";
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_REMOVEALLBUYITEMBUTTON) ctrlSetText " << ";
(findDisplay Z_AT_DIALOGWINDOW displayCtrl 7488) ctrlSetText " " + localize "STR_EPOCH_TRADE_DETAILS";
call Z_ChangeBuySell;

8
SQF/dayz_code/actions/player_heliLift.sqf
View File

@@ -10,7 +10,7 @@ s_player_heli_lift = -1;
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
if (_onLadder) exitWith {localize "str_player_21" call dayz_rollingMessages;};
if (vehicle player != player) exitWith {"You can't perform this action while in a vehicle" call dayz_rollingMessages;};
if (vehicle player != player) exitWith {localize "STR_EPOCH_PLAYER_318" call dayz_rollingMessages;};
_liftUseTime = 6;
_dis=10;
@@ -88,17 +88,17 @@ if(_finished) then {
if(_moved) then {
player switchMove "";
player playActionNow "stop";
"The lift heli moved too much from the vehicle that was being lifted!" call dayz_rollingMessages; //display text at bottom center of screen on interrupt
localize "STR_EPOCH_PLAYER_319" call dayz_rollingMessages; //display text at bottom center of screen on interrupt
} else {
if((typeName _attached == "OBJECT") || (typeName _hasAttached == "OBJECT")) then {
player switchMove "";
player playActionNow "stop";
"Another vehicle was attached or the vehicle was attached to another heli!" call dayz_rollingMessages;
localize "STR_EPOCH_PLAYER_320" call dayz_rollingMessages;
} else {
r_interrupt = false;
player switchMove "";
player playActionNow "stop";
"You have interrupted lifting a vehicle!" call dayz_rollingMessages;
localize "STR_EPOCH_PLAYER_321" call dayz_rollingMessages;
};
};
};

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

@@ -211,7 +211,7 @@ if (isPlayer cursorTarget) then {
};
if (_unit isKindOf "Man") then {
// should only fire if cursor target is man and not vehicle
_charID = _unit getVariable ["CharacterID", 0];
_charID = _unit getVariable ["CharacterID", "0"];
if (DZE_plotforLife) then {
_charID = [_unit] call FNC_GetPlayerUID;
};

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

@@ -15,7 +15,7 @@ if ((vehicle player) == player) then {
if (DZE_BackpackAntiTheft) then {
_friendlies = player getVariable ["friendlies",[]];
_rcharID = _cTarget getVariable ["CharacterID","0"];
if (!canbuild && {_cTarget isKindOf "Man"} && {alive _cTarget} && {!((typeOf _cTarget) in serverTraders)} && {!(_rcharID in _friendlies)} && {(player distance _cTarget) < 12}) then {
if (!canbuild && {_cTarget isKindOf "Man"} && {alive _cTarget} && {isPlayer _cTarget} && {!(_rcharID in _friendlies)} && {(player distance _cTarget) < 12}) then {
localize "STR_EPOCH_PLAYER_316" call dayz_rollingMessages;
_display closeDisplay 1;
};

22
SQF/dayz_code/compile/fn_selfActions.sqf
View File

@@ -156,7 +156,7 @@ if (DZE_HeliLift) then {
if (_inVehicle && {_vehicle isKindOf "Air"} && {(([_vehicle] call FNC_getPos) select 2) < 30} && {speed _vehicle < 5} && {typeName _hasAttached == "OBJECT"}) then {
if (s_player_heli_detach < 0) then {
dayz_myLiftVehicle = _vehicle;
s_player_heli_detach = dayz_myLiftVehicle addAction ["Detach Vehicle","\z\addons\dayz_code\actions\player_heliDetach.sqf",[dayz_myLiftVehicle,_hasAttached],2,false,true];
s_player_heli_detach = dayz_myLiftVehicle addAction [localize "STR_EPOCH_ACTIONS_DETACHVEHICLE","\z\addons\dayz_code\actions\player_heliDetach.sqf",[dayz_myLiftVehicle,_hasAttached],2,false,true];
};
} else {
dayz_myLiftVehicle removeAction s_player_heli_detach;
@@ -570,7 +570,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
// open Gate
if (_isGate && _isClosed && _isUnlocked && _canDo) then {
if (s_player_openGate < 0) then {
s_player_openGate = player addAction ["Open Gate", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Open"], 1, true, true];
s_player_openGate = player addAction [localize "STR_BLD_ACTIONS_OPENGATE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Open"], 1, true, true];
};
} else {
player removeAction s_player_openGate;
@@ -579,7 +579,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
// Close Gate
if (_isGate && _isOpen && _isUnlocked && _canDo) then {
if (s_player_CloseGate < 0) then {
s_player_CloseGate = player addAction ["Close Gate", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Close"], 1, true, true];
s_player_CloseGate = player addAction [localize "STR_BLD_ACTIONS_CLOSEGATE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Close"], 1, true, true];
};
} else {
player removeAction s_player_CloseGate;
@@ -588,7 +588,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
// Set
if ((_isHouse or _isLockableGate) && (_ownerPID == (getPlayerUID player)) && !_isUnlocked && _isClosed && _canDo) then {
if (s_player_setCode < 0) then {
s_player_setCode = player addAction ["Set Lock Code", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Set"], 1, true, true];
s_player_setCode = player addAction [localize "STR_BLD_ACTIONS_SETLOCKCODE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Set"], 1, true, true];
};
} else {
player removeAction s_player_setCode;
@@ -597,7 +597,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
//Lock Build point
if ((_isFence or _isGate) && (_ownerPID == (getPlayerUID player)) && !_ownerBuildLock && _canDo) then {
if (s_player_BuildLock < 0) then {
s_player_BuildLock = player addAction ["Lock Build", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"BuildLock"], 1, true, true];
s_player_BuildLock = player addAction [localize "STR_BLD_ACTIONS_LOCKBUILD", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"BuildLock"], 1, true, true];
};
} else {
player removeAction s_player_BuildLock;
@@ -606,7 +606,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
//UnLock Build point
if ((_isFence or _isGate) && (_ownerPID == (getPlayerUID player)) && _ownerBuildLock && _canDo) then {
if (s_player_BuildUnLock < 0) then {
s_player_BuildUnLock = player addAction ["UnLock Build", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"BuildUnLock"], 1, true, true];
s_player_BuildUnLock = player addAction [localize "STR_BLD_ACTIONS_UNLOCKBUILD", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"BuildUnLock"], 1, true, true];
};
} else {
player removeAction s_player_BuildUnLock;
@@ -615,7 +615,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
// Unlock Gate/House
if ((_isHouse or _isLockableGate) && !_isUnlocked && _isClosed && _canDo) then {
if (s_player_unlockhouse < 0) then {
s_player_unlockhouse = player addAction ["Unlock Gate", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Unlock"], 1, true, true];
s_player_unlockhouse = player addAction [localize "STR_BLD_ACTIONS_UNLOCKGATE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Unlock"], 1, true, true];
};
} else {
player removeAction s_player_unlockhouse;
@@ -624,7 +624,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
// Lock Gate/House
if ((_isHouse or _isLockableGate) && _isUnlocked && _isClosed && _canDo) then {
if (s_player_lockhouse < 0) then {
s_player_lockhouse = player addAction ["Lock Gate", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Lock"], 1, true, true];
s_player_lockhouse = player addAction [localize "STR_BLD_ACTIONS_LOCKGATE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Lock"], 1, true, true];
};
} else {
player removeAction s_player_lockhouse;
@@ -633,7 +633,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
//Break In
if ((_isHouse or _isLockableGate) && (_ownerPID != (getPlayerUID player)) && !_isUnlocked && _canDo) then {
if (s_player_breakinhouse < 0) then {
s_player_breakinhouse = player addAction ["Break In", "\z\addons\dayz_code\actions\player_breakin.sqf",cursorTarget, 1, true, true];
s_player_breakinhouse = player addAction [localize "STR_BLD_ACTIONS_BREAKIN", "\z\addons\dayz_code\actions\player_breakin.sqf",cursorTarget, 1, true, true];
};
} else {
player removeAction s_player_breakinhouse;
@@ -647,7 +647,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
If ((_isowner select 0) || (_isowner select 1)) then {
s_player_plot_take_ownership = player addAction ["Take plot items ownership", "\z\addons\dayz_code\actions\A_Plot_for_Life\plot_take_ownership.sqf", "", 1, false];
};
s_player_plotManagement = player addAction ["<t color='#0059FF'>Manage Plot</t>", "\z\addons\dayz_code\actions\plotManagement\initPlotManagement.sqf", [], 5, false];
s_player_plotManagement = player addAction [format["<t color='#0059FF'>%1</t>",localize "STR_EPOCH_ACTIONS_MANAGEPLOT"], "\z\addons\dayz_code\actions\plotManagement\initPlotManagement.sqf", [], 5, false];
};
} else {
if (s_player_maintain_area < 0) then {
@@ -724,7 +724,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
_attached = _cursorTarget getVariable["attached",false];
if (_found && {_allowTow} && {_canDo} && {!(locked _cursorTarget)} && {!_isPZombie} && {typeName _attached != "OBJECT"}) then {
if (s_player_heli_lift < 0) then {
s_player_heli_lift = player addAction ["Attach to Heli", "\z\addons\dayz_code\actions\player_heliLift.sqf",[_liftHeli,_cursorTarget], -10, false, true];
s_player_heli_lift = player addAction [localize "STR_EPOCH_ACTIONS_ATTACHTOHELI", "\z\addons\dayz_code\actions\player_heliLift.sqf",[_liftHeli,_cursorTarget], -10, false, true];
};
} else {
player removeAction s_player_heli_lift;

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

@@ -172,6 +172,3 @@ if (dayz_temperature_override) then { _difference = 0; if (dayz_temperatur < 37)
//Change Temperatur Should be moved in a own Function to allow adding of Items which increase the Temp like "hot tea"
dayz_temperatur = (((dayz_temperatur + _difference) max dayz_temperaturmin) min dayz_temperaturmax);
//systemChat format["%1 - %2",dayz_temperatur,_difference];

1652
SQF/dayz_code/stringtable.xml
View File

File diff suppressed because it is too large Load Diff

5
SQF/dayz_code/system/player_spawn_2.sqf
View File

@@ -360,15 +360,14 @@ while {1 == 1} do {
_startcombattimer = player getVariable["startcombattimer", 0];
if (_startcombattimer == 1 || _PlayerNearby) then {
player setVariable["combattimeout", diag_tickTime + 30, true]; // Global used to punish combat log in server_onPlayerDisconnect
player setVariable["combattimeout", diag_tickTime + 30, false];
player setVariable["startcombattimer", 0, false];
} else {
if (_ZedsNearby && !_isPZombie) then {
player setVariable["combattimeout", diag_tickTime + 10, true]; // Global used to punish combat log in server_onPlayerDisconnect
player setVariable["combattimeout", diag_tickTime + 10, false];
player setVariable["startcombattimer", 0, false];
};
};
//setGroupIconsVisible [false,false];
//clearGroupIcons group player;

68
SQF/dayz_server/compile/server_onPlayerDisconnect.sqf
View File

@@ -5,13 +5,13 @@ _playerName = _this select 1;
_playerObj = nil;
_playerPos = [];
//Search all players for the object that matches our playerUID
//Lets search all playerable units looking for the objects that matches our playerUID
{
_puid = [_x] call FNC_GetPlayerUID;
if (_puid == _playerUID) exitWith {_playerObj = _x; _playerPos = getPosATL _playerObj;};
} count playableUnits;
if (_puid == _playerUID) exitWith { _playerObj = _x; _playerPos = getPosATL _playerObj;};
} forEach playableUnits;
//If for some reason the playerObj does not exist, exit the disconnect system.
//If for some reason the playerOBj does not exist lets exit the disconnect system.
if (isNil "_playerObj") exitWith {
diag_log format["%1: nil player object, _this:%2", __FILE__, _this];
};
@@ -19,65 +19,83 @@ if (isNil "_playerObj") exitWith {
_puid = [_playerObj] call FNC_GetPlayerUID;
diag_log format["get: %1 (%2), sent: %3 (%4)",typeName _puid, _puid, typeName _playerUID, _playerUID];
//If the playerObj exists run all sync systems
_characterID = _playerObj getVariable ["characterID", "?"];
_lastDamage = _playerObj getVariable ["noatlf4",0];
_sepsis = _playerObj getVariable ["USEC_Sepsis",false];
//If the the playerObj exists lets run all sync systems
_characterID = _playerObj getVariable["characterID", "?"];
_lastDamage = _playerObj getVariable["noatlf4",0];
_Sepsis = _playerObj getVariable["USEC_Sepsis",false];
_lastDamage = round(diag_ticktime - _lastDamage);
//Readded Logout debug info.
diag_log format["Player UID#%1 CID#%2 %3 as %4, logged off at %5%6",
getPlayerUID _playerObj, _characterID, _playerObj call fa_plr2str, typeOf _playerObj,
_playerPos call fa_coor2str,
if ((_lastDamage > 5 && (_lastDamage < 30)) && {(alive _playerObj) && (_playerObj distance (getMarkerpos "respawn_west") >= 2000)}) then {" while in combat ("+str(_lastDamage)+" seconds left)"} else {""}
(getPosATL _playerObj) call fa_coor2str,
if ((_lastDamage > 5 AND (_lastDamage < 30)) AND ((alive _playerObj) AND (_playerObj distance (getMarkerpos "respawn_west") >= 2000))) then {" while in combat ("+str(_lastDamage)+" seconds left)"} else {""}
];
//Login processing do not sync
if (_playerUID in dayz_ghostPlayers) exitwith {
diag_log format["ERROR: Cannot Sync Character [%1,%2] Still processing login",_name,_playerUID];
//Lets remove the object.
if (!isNull _playerObj) then {
_myGroup = group _playerObj;
deleteGroup _myGroup;
};
};
//Make sure we know the ID of the object before we try and sync any info to the DB
if (_characterID != "?") exitWith {
//If the player has sepsis before logging off give them infected status.
if (_sepsis) then {_playerObj setVariable ["USEC_infected",true,true];};
if (_characterID != "?") exitwith {
//If the player has sepsis before logging off lets give them infected status.
if (_Sepsis) then {
_playerObj setVariable["USEC_infected",true,true];
};
//Record Player Login/LogOut
[_playerUID,_characterID,2] call dayz_recordLogin;
//If the player object is inside a vehicle eject the player.
if (vehicle _playerObj != _playerObj) then {_playerObj action ["eject",vehicle _playerObj];};
//if the player object is inside a vehicle lets eject the player
if (vehicle _playerObj != _playerObj) then {
_playerObj action ["eject", vehicle _playerObj];
};
//Punish combat log
_timeout = _playerObj getVariable["combattimeout",0];
if (_timeout >= diag_tickTime) then {
if ((_lastDamage > 5 && {_lastDamage < 30}) && {alive _playerObj && (_playerObj distance (getMarkerpos "respawn_west") >= 2000)}) then {
_playerObj setVariable ["NORRN_unconscious",true,true]; // Set status to unconscious
_playerObj setVariable ["unconsciousTime",150,true]; // Set knock out timer to 150 seconds
//_playerObj setVariable ["USEC_injured",true]; // Set status to bleeding
//_playerObj setVariable ["USEC_BloodQty",3000]; // Set blood to 3000
diag_log format["PLAYER COMBAT LOGGED: %1(%4) (with %2s combat time remaining) at location %3",_playerName,(_timeout - diag_tickTime),_playerPos,_playerUID];
diag_log format["PLAYER COMBAT LOGGED: %1(%4) (with %2s combat time remaining) at location %3",_playerName,_lastDamage,_playerPos,_playerUID];
_message = format["PLAYER COMBAT LOGGED: %1",_playerName];
[nil, nil, rTitleText, _message, "PLAIN"] call RE; // Message whole server
};
//If player object is alive sync and remove the body. If ghosting is active add the player id to the array.
//if player object is alive lets sync the player and remove the body and if ghosting is active add the player id to the array
if (alive _playerObj) then {
[_playerObj,nil,true] call server_playerSync;
if (dayz_enableGhosting) then {
//diag_log format["GhostPlayers: %1, ActivePlayers: %2",dayz_ghostPlayers,dayz_activePlayers];
if !(_playerUID in dayz_ghostPlayers) then {
if (!(_playerUID in dayz_ghostPlayers)) then {
dayz_ghostPlayers set [count dayz_ghostPlayers, _playerUID];
dayz_activePlayers set [count dayz_activePlayers, [_playerUID,diag_ticktime]];
//diag_log format["playerID %1 added to ghost list",_playerUID];
};
};
};
//Scan the area near the player logout position and save all objects.
{[_x,"gear"] call server_updateObject} count (nearestObjects [_playerPos,DayZ_GearedObjects,10]);
//Lets scan the area near the player logout position and save all objects.
{ [_x,"gear"] call server_updateObject } foreach (nearestObjects [_playerPos, DayZ_GearedObjects, 10]);
};
if (isNull _playerObj) then {diag_log "server_onPlayerDisconnect called with Null player object";};
if (isNull _playerObj) then { diag_log("Player Object does not esist"); };
//Remove the object.
//Lets remove the object.
if (!isNull _playerObj) then {
_myGroup = group _playerObj;
deleteVehicle _playerObj;
deleteGroup _myGroup;
};

6
SQF/dayz_server/compile/server_playerSync.sqf
View File

@@ -3,7 +3,6 @@ private ["_characterID","_temp","_currentWpn","_magazines","_force","_isNewPos",
_character = _this select 0;
_magazines = _this select 1;
_Achievements = _character getVariable "Achievements";
_characterID = _character getVariable ["characterID","0"];
_force = true;
_charPos = getPosATL _character;
@@ -24,10 +23,7 @@ if (_characterID == "0") exitWith {
diag_log ("ERROR: Cannot Sync Character " + _name + " as no characterID");
};
if (isNil {_Achievements}) exitWith {
diag_log ("ERROR: Cannot Sync Achievements " + _name + " has no default Achievements");
_Achievements = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
};
_Achievements = [];
/*
//No longer used