diff --git a/SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp b/SQF/dayz_code/Configs/CfgPlayerStats/p_cover.hpp
similarity index 100%
rename from SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp
rename to SQF/dayz_code/Configs/CfgPlayerStats/p_cover.hpp
diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp
index a3f025910..416ff52d6 100644
--- a/SQF/dayz_code/Configs/rscTitles.hpp
+++ b/SQF/dayz_code/Configs/rscTitles.hpp
@@ -25,7 +25,7 @@ class RscHTML;
class RscDisplayEmpty;
#include "CfgPlayerStats\defines.hpp"
-#include "CfgPlayerStats\p__cover.hpp"
+#include "CfgPlayerStats\p_cover.hpp"
#include "CfgPlayerStats\p_journal_humanity.hpp"
#include "CfgPlayerStats\p_humanity_art.hpp"
#include "CfgPlayerStats\p_zombies_killed.hpp"
diff --git a/SQF/dayz_code/actions/plotManagement/maintain_area.sqf b/SQF/dayz_code/actions/maintain_area.sqf
similarity index 91%
rename from SQF/dayz_code/actions/plotManagement/maintain_area.sqf
rename to SQF/dayz_code/actions/maintain_area.sqf
index e607de9f2..9be3708d9 100644
--- a/SQF/dayz_code/actions/plotManagement/maintain_area.sqf
+++ b/SQF/dayz_code/actions/maintain_area.sqf
@@ -1,3 +1,22 @@
+/*
+
+Examples for config variable DZE_maintainCurrencyRate:
+
+Now that we have gem based currency, maintaining is priced via a "worth".
+
+If you want the price per item to be 1 gold, DZE_maintainCurrencyRate needs to be 100.
+600 items * 100 would be worth 6 briefcases or 60k coins on a single currency server.
+600 items * 150 would be worth 9 briefcases or 90k coins on a single currency server.
+
+1 10oz silver = 10 worth
+1 gold = 100 worth
+1 10oz gold = 1,000 worth
+1 briefcase = 10,000 worth
+
+Please see configVariables.sqf for the value of gems (DZE_GemWorthArray) and their relevant worth.
+
+*/
+
private ["_objectID","_objectUID","_target","_objects","_requirements","_count","_objects_filtered","_ctrl","_itemText","_type","_amount","_success","_wealth","_message1","_message2","_option"];
disableSerialization;
@@ -22,7 +41,7 @@ _req = {
private ["_count","_amount","_itemText"];
_count = _this;
- _amount = _count * 100;
+ _amount = _count * DZE_maintainCurrencyRate;
_itemText = if (Z_SingleCurrency) then { CurrencyName } else { _amount call z_calcDefaultCurrencyNoImg };
[_amount,_itemText]
diff --git a/SQF/dayz_code/actions/object_pickup.sqf b/SQF/dayz_code/actions/object_pickup.sqf
index 6f2dcf291..41b5d12de 100644
--- a/SQF/dayz_code/actions/object_pickup.sqf
+++ b/SQF/dayz_code/actions/object_pickup.sqf
@@ -45,7 +45,7 @@ if (_classname isKindOf "Bag_Base_EP1") exitWith {
_PlayerNear = {isPlayer _x} count ((getPosATL _holder) nearEntities ["CAManBase", 10]) > 1;
if (_PlayerNear) exitWith {localize "str_pickup_limit_4" call dayz_rollingMessages;};
- diag_log("Picked up a bag: " + _classname);
+ //diag_log("Picked up a bag: " + _classname);
_hasBag = unitBackpack player;
@@ -88,4 +88,4 @@ _wpn = primaryWeapon player;
_ismelee = (getNumber (configFile >> "CfgWeapons" >> _wpn >> "melee") == 1);
if (_ismelee) then {
call dayz_meleeMagazineCheck;
-};
\ No newline at end of file
+};
diff --git a/SQF/dayz_code/actions/player_wearClothes.sqf b/SQF/dayz_code/actions/player_wearClothes.sqf
index 1bde3b5e5..973dfc428 100644
--- a/SQF/dayz_code/actions/player_wearClothes.sqf
+++ b/SQF/dayz_code/actions/player_wearClothes.sqf
@@ -1,4 +1,4 @@
-if (dayz_lastClothesChange + 5 > diag_tickTime) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
+if (dayz_lastClothesChange + 5 > diag_tickTime) exitWith {format [localize "str_player_clotheslimit",dayz_lastClothesChange + 5 - diag_tickTime] call dayz_rollingMessages;};
dayz_lastClothesChange = diag_tickTime;
if (_this in DZE_RestrictSkins) exitWith { format[localize "str_epoch_player_315",_this] call dayz_rollingMessages; };
diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf
index 0f13c2a7f..51f59b72f 100644
--- a/SQF/dayz_code/compile/fn_selfActions.sqf
+++ b/SQF/dayz_code/compile/fn_selfActions.sqf
@@ -672,9 +672,9 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
};
} else {
if (s_player_maintain_area < 0) then {
- s_player_maintain_area = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_MAINTAREA"], "\z\addons\dayz_code\actions\plotManagement\maintain_area.sqf", "maintain", 5, false];
- s_player_maintain_area_force = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_FORCE_MAINTAREA"], "\z\addons\dayz_code\actions\plotManagement\maintain_area.sqf", "force", 5, false];
- s_player_maintain_area_preview = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_MAINTPREV"], "\z\addons\dayz_code\actions\plotManagement\maintain_area.sqf", "preview", 5, false];
+ s_player_maintain_area = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_MAINTAREA"], "\z\addons\dayz_code\actions\maintain_area.sqf", "maintain", 5, false];
+ s_player_maintain_area_force = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_FORCE_MAINTAREA"], "\z\addons\dayz_code\actions\maintain_area.sqf", "force", 5, false];
+ s_player_maintain_area_preview = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_MAINTPREV"], "\z\addons\dayz_code\actions\maintain_area.sqf", "preview", 5, false];
};
};
if (s_player_plot_boundary < 0 && (_allowed or (_hasAccess select 1))) then {
diff --git a/SQF/dayz_code/compile/object_setHit.sqf b/SQF/dayz_code/compile/object_setHit.sqf
index 4c820fc85..28b50922e 100644
--- a/SQF/dayz_code/compile/object_setHit.sqf
+++ b/SQF/dayz_code/compile/object_setHit.sqf
@@ -10,7 +10,7 @@ if (_selection != "") then {
_unit setVariable [_strH,(_dam + _damage)];
if (_selection in USEC_MinorWounds) then {
_unit setHit[_selection,(_dam + _damage)];
- diag_log(format["%1: %2 setHit %3 %4", __FILE__, _unit, _selection, (_dam + _damage)]);
+ //diag_log(format["%1: %2 setHit %3 %4", __FILE__, _unit, _selection, (_dam + _damage)]);
};
};
-_damage
\ No newline at end of file
+_damage
diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf
index dc1e441ff..b7ba0d8c2 100644
--- a/SQF/dayz_code/compile/player_switchModel.sqf
+++ b/SQF/dayz_code/compile/player_switchModel.sqf
@@ -178,11 +178,11 @@ if (!isNil "_newBackpackType" && {_newBackpackType != ""}) then {
if (gear_done) then {disableUserInput false;disableUserInput false;disableUserInput false;disableUserInput false;};
//Debug Message
-diag_log "Swichtable Unit Created. Equipment:";
-diag_log format["Weapons: %1",weapons _newUnit];
-diag_log format["Magazines: %1",magazines _newUnit];
-diag_log format["Backpack weapons: %1",getWeaponCargo unitBackpack _newUnit];
-diag_log format["Backpack magazines: %1",getMagazineCargo unitBackpack _newUnit];
+//diag_log "Swichtable Unit Created. Equipment:";
+//diag_log format["Weapons: %1",weapons _newUnit];
+//diag_log format["Magazines: %1",magazines _newUnit];
+//diag_log format["Backpack weapons: %1",getWeaponCargo unitBackpack _newUnit];
+//diag_log format["Backpack magazines: %1",getMagazineCargo unitBackpack _newUnit];
//Clear and delete old Unit
removeAllWeapons _oldUnit;
@@ -203,4 +203,4 @@ player setVariable ["BIS_noCoreConversations",true];
// publicVariable _playerObjName;
call dayz_meleeMagazineCheck;
-{player reveal _x} count (nearestObjects [getPosATL player,["AllVehicles","WeaponHolder","Land_A_tent","BuiltItems","ModularItems","DZE_Base_Object"],75]);
\ No newline at end of file
+{player reveal _x} count (nearestObjects [getPosATL player,["AllVehicles","WeaponHolder","Land_A_tent","BuiltItems","ModularItems","DZE_Base_Object"],75]);
diff --git a/SQF/dayz_code/configVariables.sqf b/SQF/dayz_code/configVariables.sqf
index fdc21cd6d..ada22c2c7 100644
--- a/SQF/dayz_code/configVariables.sqf
+++ b/SQF/dayz_code/configVariables.sqf
@@ -64,6 +64,7 @@ DZE_plotManagementMustBeClose = true; //Players must be within 10m of pole to be
DZE_PlotManagementAdmins = []; //Array of admin PlayerUIDs enclosed in quotations, UIDs in this list are able to access every pole's management menu and delete or build any buildable with a pole nearby
DZE_MaxPlotFriends = 6; //Maximum number of friends allowed on a plot pole.
DZE_PlotOwnership = true; //allows plot owner to take ownership of buildables (excluding lockable items) near a plot pole. Useful for servers that allow base capturing so the new owner can modify/delete/upgrade existing structures
+DZE_maintainCurrencyRate = 100; //The currency rate of what maintaining an item will be, for instance: at 100, 10 items will have a worth of 1000 (1 10oz gold or 1k coins) see actions/maintain_area.sqf for more examples.
// Snap Build and Build Vectors
DZE_modularBuild = true; // Enable Snap Building by @raymix and Build Vectors by @strikerforce.
@@ -97,4 +98,4 @@ dayz_requireRadio = false; // Require players to have a radio on their toolbelt
Variables that are map specific or frequently changed should be included in init.sqf by default
with a corresponding if(isNil)then{}; in variables.sqf.
-*/
\ No newline at end of file
+*/
diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf
index 8abd23c26..37ef35e1f 100644
--- a/SQF/dayz_code/init/compiles.sqf
+++ b/SQF/dayz_code/init/compiles.sqf
@@ -197,7 +197,7 @@ if (!isDedicated) then {
PlotRemoveFriend = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotRemoveFriend.sqf";
PlotObjects = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotObjects.sqf";
PlotPreview = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotToggleMarkers.sqf";
- MaintainPlot = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\maintain_area.sqf";
+ MaintainPlot = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\maintain_area.sqf";
DoorGetFriends = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\doorGetFriends.sqf";
DoorNearbyHumans = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\doorNearbyHumans.sqf";
DoorAddFriend = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\doorManagement\doorAddFriend.sqf";
@@ -939,4 +939,4 @@ dayz_engineSwitch = {
PVDZ_send = [_vehicle,"SetEngineState",[_vehicle,_state]];
publicVariableServer "PVDZ_send";
};
-};
\ No newline at end of file
+};
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 755bb172d..c0e10db2f 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -6885,7 +6885,7 @@
Installation abgeschlossen, bitte warten...
- Date and Time not Synced Disconnect.
+ Date and Time not Synced, Disconnect and try again.
Datum und Zeit sind nicht synchronisiert. Verbindung wird getrennt!
Дата и время не синхронизированы. Отключение.
Fecha y Hora no sincronizada. Desconectando.
@@ -6940,7 +6940,7 @@
Charakterdaten vom Server erhalten
- Player Already Dead, disconnect and try again!
+ Player is already dead, disconnect and try again!
Игрок уже мертв! Отключитесь и попробуйте снова!
Vous êtes déjà mort, essayez encore!
Hráč je mrtev, odhlašte se a zkuste znovu!
@@ -7025,7 +7025,6 @@
You have finished collecting wood.
Вы закончили рубку дров.
Du hast erfolgreich Holz gesammelt.
- You have finished collecting wood.
Vous avez terminé de faire du bois.
Nasekali jste dřevo.
@@ -7131,7 +7130,6 @@
%1 kann nicht auf den Rücken genommen werden.
-
%1 must be in your main inventory to %2 it.
%1 muss sich in deinem Inventar befinden, um es zu %2.
Чтобы %2, (%1) должен находиться в основном инвентаре.
@@ -7297,6 +7295,9 @@
Attendez la fin de l'action en cours avant d'en commencer une autre!
Než začnete dělat něco jiného, musíte dokončit aktuální akci.
+
+ You must wait another %1 seconds before attempting to change clothes.
+
You have successfully loaded %1 ammunition.
Du hast erfolgreich %1 Mal Munition nachgeladen.
@@ -13561,14 +13562,14 @@
Označil si cíl za přítele. Čeká se na přijetí.
- Unable to change clothes while wearing backpack.
+ You are unable to change clothes while wearing backpack.
Kleider können nicht gewechselt werden, solange ein Rucksack getragen wird.
Нельзя переодеться с рюкзаком на спине.
Impossible de changer ses vêtements lorsque vous portez un sac à dos.
Nemůžete si změnit oblečení, pokud nosíte batoh.
- Unable to change clothes while carrying a filled chainsaw.
+ You are unable to change clothes while carrying a filled chainsaw.
Kleider können nicht gewechselt werden, solange eine gefüllte Motorsäge in den Händen gehalten wird.
Нельзя переодеваться, держа заправленную бензопилу.
Impossible de changer ses vêtements lorsque vous avez une tronçonneuse en main.