Added variable DZE_ForceNameTagsInTrader

This commit is contained in:
Florian Kinder
2014-02-21 00:53:44 +01:00
parent a3885ac187
commit 4f82e8e380
20 changed files with 230 additions and 170 deletions

View File

@@ -0,0 +1,15 @@
private ["_traderName","_showText"];
_traderName = _this select 0;
_showText = _this select 1;
if (_showText) then {
cutText [format [localize "STR_EPOCH_TRADER_ENTER", _traderName], "PLAIN DOWN"];
};
if (DZE_ForceNameTagsInTrader) then {
player setVariable["DZE_display_name_tmp", (player getVariable "DZE_display_name")];
player setVariable["DZE_display_name", true, true];
};
canbuild = false;
inTraderCity = _traderName;

View File

@@ -0,0 +1,14 @@
private ["_traderName","_showText"];
_traderName = _this select 0;
_showText = _this select 1;
if (_showText) then {
cutText [format [localize "STR_EPOCH_TRADER_LEAVE", _traderName], "PLAIN DOWN"];
};
if (DZE_ForceNameTagsInTrader) then {
player setVariable["DZE_display_name", (player getVariable "DZE_display_name_old"), true];
};
canbuild = true;
inTraderCity = "Any";

View File

@@ -127,6 +127,11 @@ if (!isDedicated) then {
player_hasTools = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_hasTools.sqf";
player_checkItems = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_checkItems.sqf";
player_removeItems = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_removeItems.sqf";
// trader
trader_enter = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\trader_enter.sqf";
trader_leave = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\trader_leave.sqf";
// combination of check and remove items
player_checkAndRemoveItems = {
private ["_items","_b"];

View File

@@ -712,6 +712,9 @@ if(!isDedicated) then {
if(isNil "DZE_ForceNameTagsOff") then {
DZE_ForceNameTagsOff = false;
};
if(isNil "DZE_ForceNameTagsInTrader") then {
DZE_ForceNameTagsInTrader = false;
};
if(isNil "DZE_HaloJump") then {
DZE_HaloJump = true;
};

View File

@@ -6996,6 +6996,26 @@
<!-- <French></French> -->
<!-- <Czech></Czech> -->
</Key>
<Key ID="STR_EPOCH_TRADER_ENTER">
<Original>Now entering %1</Original>
<English>Now entering %1</English>
<German>Du betrittst %1</German>
<!-- <Russian></Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
</Key>
<Key ID="STR_EPOCH_TRADER_LEAVE">
<Original>Now leaving %1</Original>
<English>Now leaving %1</English>
<German>Du verlässt %1</German>
<!-- <Russian></Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch></Dutch> -->
<!-- <French></French> -->
<!-- <Czech></Czech> -->
</Key>
<Key ID="R3F_VERSION_WEIGHTED">
<Original>1.04</Original>
<English>1.04</English>