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

Localization changes/additions. (#1787)

Browse Source 
* Localization changes/additions.

Fixes a few localizations, extends range for removing camo nets from
toolbox by 10m, I have found that 5m is just not enough.

* Toolbox change

Update camonet removal to 10m instead of 5m

* Safe zone no building near/blacklisted buildings no building near

Adds a check in dze_buildChecks to disallow building within a certain
distance of a safezone or a blacklisted object name.

* typo

fix typo

* Safezone/blacklisted changes

As per requests.

* Rework

Rework

* Remove unused variables

as per subject

* Misc changes

Fix unprivated var in calcfreespace
Made single currency buy/sell reporting more englishery
Localization cleanup of extra spaces

* rework

rework
This commit is contained in:
oiad
2016-11-05 05:08:47 +13:00
committed by ebaydayz
parent dd2a21a867
commit 497b065663
17 changed files with 425 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp
View File

@@ -21,7 +21,7 @@ class SkinBase : CA_Magazine
class tearClothes
{
text = "Tear Clothes";
text = $str_tear_clothes;
script = "spawn player_tearClothes;";
};
class Crafting {

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

@@ -356,7 +356,6 @@ class ItemNewspaper: CA_Magazine {
class Obituaries {
text = $STR_EPOCH_TORNNEWSPAPER_ACTION;
script = "spawn player_deathBoard;";
};
};
};

3
SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp
View File

@@ -949,7 +949,6 @@ class PartPlywoodPack: CA_Magazine
output[] = {{"PartWoodPlywood",3}};
input[] = {{"PartPlywoodPack",1}};
};
};
};
class PartWoodLumber: CA_Magazine
@@ -1061,7 +1060,6 @@ class PartWoodPlywood: CA_Magazine
requiretools[] = {"ItemToolbox"};
output[] = {{"workbench_kit",1}};
input[] = {{"PartWoodPlywood",1},{"PartWoodLumber",2}};
};
class Crafting1
{
@@ -1099,7 +1097,6 @@ class PartWoodPlywood: CA_Magazine
output[] = {{"PartPlywoodPack",1}};
input[] = {{"PartWoodPlywood",3}};
};
};
};
class ItemSledgeHead : CA_Magazine

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

@@ -131,7 +131,6 @@ class ItemWoodFloorHalf: CA_Magazine {
requiretools[] = {"ItemToolbox"};
output[] = {{"ItemWoodFloor",1}};
input[] = {{"ItemWoodFloorHalf",2}};
};
};
};
@@ -158,7 +157,6 @@ class ItemWoodFloorQuarter: CA_Magazine {
requiretools[] = {"ItemToolbox"};
output[] = {{"ItemWoodFloorHalf",1}};
input[] = {{"ItemWoodFloorQuarter",2}};
};
};
};
@@ -186,7 +184,6 @@ class ItemWoodStairs: CA_Magazine {
requiretools[] = {"ItemToolbox"};
output[] = {{"ItemWoodStairsSupport",1}};
input[] = {{"ItemWoodStairs",1},{"PartWoodLumber",2}};
};
};
};

3
SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp
View File

@@ -75,9 +75,6 @@ class ItemSandbag : CA_Magazine
};
};
// EPOCH ADDITIONS
class BagFenceRound_DZ_kit : CA_Magazine {

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

@@ -76,8 +76,6 @@ class ItemDomeTent : CA_Magazine
};
};
// EPOCH ADDITION
class ItemDesertTent : CA_Magazine

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

@@ -71,8 +71,6 @@ class bloodBagOPOS : bloodBagBase
descriptionShort = $STR_BLD_desc_bloodBagOPOS;
};
//Whole blood bags -- Can only be obtained by taking blood from another player.
class wholeBloodBagBase : bloodBagBase
{

2
SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp
View File

@@ -1,6 +1,6 @@
class LockboxStorageLocked: Land_A_tent {
vehicleClass = "Survival";
displayName = "Locked Lockbox";
displayName = $STR_EPOCH_LOCKBOX_LOCKED;
model = "\z\addons\dayz_epoch\models\lockbox.p3d";
destrType = "DestructNo";
armor = 800;

2
SQF/dayz_code/Configs/CfgWeapons/Tools/Chainsaw.hpp
View File

@@ -79,7 +79,7 @@
showToPlayer = 1;
//reloadTime = 0.0708762;
reloadTime = 0.12;
displayName = "Gas";
displayName = $STR_EPOCH_CHAINSAW_GAS;
};
aiDispersionCoefY = 21;
aiDispersionCoefX = 21;

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

@@ -35,6 +35,6 @@ class ItemShovelBroken : ItemCore
model = "\z\addons\dayz_communityassets\models\shovel.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_shovel_ca.paa";
displayName = "Broken Shovel";
descriptionShort = $STR_EQUIP_DESC_1b;
displayName = $STR_EQUIP_NAME_1b_BROKEN;
descriptionShort = $STR_EQUIP_DESC_1b_BROKEN;
};

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

@@ -10,7 +10,7 @@ class ItemToolbox : ItemCore
class RemoveNet
{
text= $STR_EQUIP_TOOLBOX_ACTION_1;
script=";[['DesertCamoNet_DZ','ForestCamoNet_DZ','DesertLargeCamoNet_DZ','ForestLargeCamoNet_DZ'],5,'str_epoch_player_8'] call player_removeNearby;";
script=";[['DesertCamoNet_DZ','ForestCamoNet_DZ','DesertLargeCamoNet_DZ','ForestLargeCamoNet_DZ'],10,'str_epoch_player_8'] call player_removeNearby;";
};
};

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

@@ -1,4 +1,4 @@
private ["_object","_mags","_weaps","_normalMags","_normalWeaps","_kinds","_kinds2","_kinds3","_amounts","_amounts2","_amounts3",
private ["_object","_mags","_weaps","_normalMags","_normalWeaps","_normalBags","_kinds","_kinds2","_kinds3","_amounts","_amounts2","_amounts3",
"_counter","_allowedMags","_allowedWeapons","_allowedBackpacks","_currentPrim","_currentSec","_currentTool",
"_parentClasses","_alreadyInBackpack","_totalNewSpace","_primaryToBuy","_sidearmToBuy","_toolsToBuy",
"_toBuyTotalMags","_totalSpace","_bags","_totalBagSlots","_type","_isBackpack","_notTools"];

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

@@ -18,9 +18,9 @@ _Z_logTrade = {
// Log to client RPT
if (Z_SingleCurrency) then {
if (_buyOrSell == "buy") then {
diag_log format["%5: Purchased %4x %1 into %7 at %2 for %3x%6",_className,inTraderCity,_price,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
diag_log format["%5: Purchased %4x %1 into %7 at %2 for %3 %6",_className,inTraderCity,_price,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
} else {
diag_log format["%5: Sold %4x %1 from %7 at %2 for %3x%6",_className,inTraderCity,_price,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
diag_log format["%5: Sold %4x %1 from %7 at %2 for %3 %6",_className,inTraderCity,_price,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
};
} else {
if (_buyOrSell == "buy") then {

21
SQF/dayz_code/compile/dze_buildChecks.sqf
View File

@@ -1,5 +1,5 @@
//Checks if item is near a plot, if the player is plot owner or friendly, if there are too many items, and if the player has required tools
private ["_requireplot","_distance","_canBuild","_friendlies","_nearestPole","_ownerID","_pos","_item","_classname","_isPole","_isLandFireDZ","_findNearestPoles","_findNearestPole","_IsNearPlot","_buildables","_center","_toolCheck","_plotcheck","_buildcheck","_isfriendly","_isowner","_require"];
private ["_requireplot","_distance","_canBuild","_friendlies","_nearestPole","_ownerID","_pos","_item","_classname","_isPole","_isLandFireDZ","_IsNearPlot","_buildables","_center","_toolCheck","_plotcheck","_buildcheck","_isfriendly","_isowner","_require","_text","_near"];
_pos = _this select 0;
_item = _this select 1;
@@ -45,7 +45,7 @@ if (_IsNearPlot == 0) then {
};
} else {
_friendlies = player getVariable ["friendlyTo",[]];
if(_ownerID in _friendlies) then {
if (_ownerID in _friendlies) then {
_canBuild = true;
};
};
@@ -67,6 +67,23 @@ _buildables = DZE_maintainClasses + DZE_LockableStorage + ["DZ_buildables","DZ_s
_center = if (isNull _nearestPole) then {_pos} else {_nearestPole};
if ((count (nearestObjects [_center,_buildables,_distance])) >= DZE_BuildingLimit) exitWith {dayz_actionInProgress = false; format[localize "str_epoch_player_41",_distance] call dayz_rollingMessages; [false, _isPole];};
_text = getText (configFile >> 'CfgMagazines' >> _item >> 'displayName');
if (((count DZE_SafeZoneNoBuildItems) > 0) && {_classname in DZE_SafeZoneNoBuildItems}) then {
{
if ((player distance (_x select 0)) < DZE_SafeZoneNoBuildDistance) exitWith { _canBuild = false; };
} forEach DZE_safeZonePosArray;
};
if !(_canBuild) exitWith { dayz_actionInProgress = false; format [localize "STR_EPOCH_PLAYER_166",_text,DZE_SafeZoneNoBuildDistance] call dayz_rollingMessages; [false, _isPole]; };
if ((count DZE_NoBuildNear) > 0) then {
_near = (nearestObjects [_pos,DZE_NoBuildNear,DZE_NoBuildNearDistance]);
if ((count _near) > 0) then { _canBuild = false; };
};
if !(_canBuild) exitWith { dayz_actionInProgress = false; format [localize "STR_EPOCH_PLAYER_167",_text,DZE_NoBuildNearDistance,typeOf (_near select 0)] call dayz_rollingMessages; [false, _isPole]; };
if (_toolCheck) then {
_require = getArray (configFile >> "cfgMagazines" >> _item >> "ItemActions" >> "Build" >> "require");
_classname = getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "create");

4
SQF/dayz_code/configVariables.sqf
View File

@@ -39,6 +39,10 @@ MaxAmmoBoxes = 3; // Max number of random Supply_Crate_DZE to spawn around the m
MaxMineVeins = 50; // Max number of random mine veins to spawn around the map
timezoneswitch = 0; // Changes murderMenu times with this offset in hours.
DZE_SafeZonePosArray = []; //Prevent players in safeZones from being killed if their vehicle is destroyed. Format is [[[3D POS], RADIUS],[[3D POS], RADIUS]]; Ex. DZE_SafeZonePosArray = [[[6325.6772,7807.7412,0],150],[[4063.4226,11664.19,0],150]];
DZE_SafeZoneNoBuildItems = []; // Array of object class names not allowed to build near the safe zones listed above. i.e ["VaultStorageLocked","LockboxStorageLocked","Plastic_Pole_EP1_DZ"] etc.
DZE_SafeZoneNoBuildDistance = 150; // Distance from safe zones listed above to disallow building near.
DZE_NoBuildNearDistance = 150; // Distance from blacklisted objects to disallow building near.
DZE_NoBuildNear = []; //Array of object class names that are blacklisted to build near. i.e ["Land_Mil_ControlTower","Land_SS_hangar"] etc.
DZE_GemOccurance = [["ItemTopaz",10], ["ItemObsidian",8], ["ItemSapphire",6], ["ItemAmethyst",4], ["ItemEmerald",3], ["ItemCitrine",2], ["ItemRuby",1]]; //Sets how rare each gem is in the order shown when mining (whole numbers only)
DZE_GodModeBaseExclude = []; //Array of object class names excluded from the god mode bases feature
DZE_salvageLocked = true; //Enable or disable salvaging of locked vehicles, useful for stopping griefing on locked vehicles.

761
SQF/dayz_code/stringtable.xml
View File

File diff suppressed because it is too large Load Diff

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

@@ -22,7 +22,7 @@ if (count _this > 7) then {
_return = true;
};
if (typeName _price == "SCALAR") then { _price = format ["%1x%2",_price,_currency]; } else { _price = format ["%1",_price]; };
if (typeName _price == "SCALAR") then { _price = format ["%1 %2",_price,_currency]; } else { _price = format ["%1",_price]; };
if (_buyorsell == 0) then { //Buy
diag_log format["%8: %1 (%2) purchased %6x %3 into %7 at %4 for %5", _name, _playerUID, _classname, _traderCity, _price, _quantity,_container,localize "STR_EPOCH_PLAYER_289"];