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

Plot for life fixes and typo fixes (#1707)

Browse Source 
This fixes the issues I was having with APFL, Basically when downgrading
a locked door the ownerPUID was not getting transferred across so it was
getting a 0 PUID set on it once downgraded so you would then lose access
if there was no plot pole.

Now it correctly gets set and instead of doing 2 PVDZE_Obj_Swaps I am
using an if and else statement.

player_upgrade was also not sending the ownerID into the worldspace
field, this seems to differ from the original APFL script. I also added
in code so that if APFL was enabled and uid is 0 we claim the item with
players UID.

This fixes a typo @ebaydayz introduced to spam the .RPT on startup also
for the shotgun and a typo in the credits.
This commit is contained in:
oiad
2016-07-17 05:25:14 +12:00
committed by ebaydayz
parent c9960e1ec3
commit 41c9fde480
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp
View File

@@ -9,7 +9,7 @@ class MR43_DZ : Rifle
magazines[] =
{
2Rnd_12Gauge_Buck;
2Rnd_12Gauge_Buck,
2Rnd_12Gauge_Slug
};
@@ -46,4 +46,4 @@ class MR43_DZ : Rifle
recoil = "recoil_single_primary_9outof10";
recoilProne = "recoil_single_primary_prone_8outof10";
};
};
};

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

@@ -433,10 +433,11 @@ if (_canBuild select 0) then {
};
_tmpbuilt setVariable ["CharacterID",_combination,true];
PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],[]];
if (DZE_permanentPlot) then {
_tmpbuilt setVariable ["ownerPUID",_playerUID,true];
PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location,_playerUID],_classname];
} else {
PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],[]];
};
publicVariableServer "PVDZ_obj_Publish";
@@ -452,9 +453,10 @@ if (_canBuild select 0) then {
if(_tmpbuilt isKindOf "Land_Fire_DZ") then {
_tmpbuilt spawn player_fireMonitor;
} else {
PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],[]];
if (DZE_permanentPlot) then {
PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location,_playerUID],_classname];
} else {
PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],[]];
};
publicVariableServer "PVDZ_obj_Publish";
};
@@ -481,4 +483,4 @@ if (_canBuild select 0) then {
};
};
DZE_ActionInProgress = false;
DZE_ActionInProgress = false;

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

@@ -103,12 +103,14 @@ if ((count _upgrade) > 0) then {
// Set location
_object setPosATL _location;
format[localize "str_epoch_player_142",_text] call dayz_rollingMessages;
PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location, _vector],_classname,_obj,player];
if (DZE_permanentPlot) then {
_ownerID = _obj getVariable["ownerPUID","0"];
_object setVariable ["ownerPUID",_ownerID,true];
PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location,_playerUID, _vector],_classname,_obj,player];
} else {
PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location, _vector],_classname,_obj,player];
};
publicVariableServer "PVDZE_obj_Swap";

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

@@ -110,10 +110,6 @@ if ((count _upgrade) > 0) then {
// Set location
_object setPosATL _location;
if (DZE_permanentPlot) then {
_ownerID = _obj getVariable["ownerPUID","0"];
_object setVariable ["ownerPUID",_ownerID,true];
};
if (_lockable == 3) then {
@@ -128,8 +124,14 @@ if ((count _upgrade) > 0) then {
} else {
format[localize "str_epoch_player_159",_text] call dayz_rollingMessages;
};
PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location, _vector],_classname,_obj,player];
if (DZE_permanentPlot) then {
_ownerID = _obj getVariable["ownerPUID","0"];
if (_ownerID == "0") then { _ownerID = [player] call FNC_GetPlayerUID; }; //APFL is on but UID is 0 so we will claim it to record the ownership.
_object setVariable ["ownerPUID",_ownerID,true];
PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location,_ownerID,_vector],_classname,_obj,player];
} else {
PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location,_vector],_classname,_obj,player];
};
publicVariableServer "PVDZE_obj_Swap";
player reveal _object;
@@ -150,4 +152,4 @@ if ((count _upgrade) > 0) then {
};
DZE_ActionInProgress = false;
s_player_upgrade_build = -1;
s_player_upgrade_build = -1;

2
SQF/dayz_code/credits.txt
View File

@@ -75,7 +75,7 @@ feature.
* [Nick Chow] (https://github.com/Purplish)
* bittedanke (https://github.com/bittedanke) - fixing a problem with chances.
* ebaydayz (https://github.com/ebaydayz)
* xyberviri (https://github.com/xyberviri) - ((action_open_backpack_0.ogg - action_open_backpack_4.ogg), (action_open_inventory_0.ogg - action_open_inventory_4.ogg)) Licesne Info - https://github.com/DayZMod/DayZ/issues/696
* xyberviri (https://github.com/xyberviri) - ((action_open_backpack_0.ogg - action_open_backpack_4.ogg), (action_open_inventory_0.ogg - action_open_inventory_4.ogg)) License Info - https://github.com/DayZMod/DayZ/issues/696
------------------------
Art Work