+ Added variable pricing to traders. Stock under 5 will be sold at the
buy price and over 50 will be bought at the sell price.
+ Fixed trades not forcing a gear save and added more forced gear saves.
+ Added test for time based UID for purchased vehicles.
+ Reduced humanity gained by using a blood bag to 100 down from 250.
+ Added 5 minute penalty knockout for combat loggers.
+ Added prevention to logging out in a trader city. fixes #171
+ Changed cargo check to only show on alive vehicles. Fixes #176
+ Potential fix for gunner on armored SUV. Fixes #172
+ Fixes for refueling and repairing that was broken by 1.7.61
+ Removed taming of dogs for now. fixes #162
This commit is contained in:
vbawol
2013-03-03 13:41:35 -06:00
parent 598cb62a26
commit 320046779b
32 changed files with 266 additions and 87 deletions

View File

@@ -18,7 +18,15 @@ if (vehicle _object != _object) then {
if (59 in _playerIDtoarray) exitWith { };
if ((_timeout - time) > 0) then {
diag_log format["COMBAT LOGGED: %1 (%2)", _playerName,_timeout];
_object setVariable["NORRN_unconscious",true, true];
_object setVariable["unconsciousTime",300,true];
diag_log format["SET UNCONCIOUSNESS: %1", _playerName];
//_message = format["PLAYER COMBAT LOGGED: %1 (%2)",_playerName, _killerName, _weapon];
//[nil, nil, rspawn, [_object, _message], { (_this select 0) globalChat (_this select 1) }] call RE;
};
diag_log format["DISCONNECT: %1 (%2) Object: %3, _characterID: %4", _playerName,_playerID,_object,_characterID];
@@ -29,7 +37,7 @@ if (!isNull _object) then {
{ [_x,"gear"] call server_updateObject } foreach
(nearestObjects [getPosATL _object, ["Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage"], 10]);
if (alive _object) then {
//[_object,(magazines _object),true,(unitBackpack _object)] call server_playerSync;
//[_object,(magazines _object),true,true] call server_playerSync;
[_object,[],true] call server_playerSync;
_myGroup = group _object;
deleteVehicle _object;

View File

@@ -20,6 +20,7 @@ private["_character","_magazines","_force","_characterID","_charPos","_isInVehic
_character = _this select 0;
_magazines = _this select 1;
//_force = _this select 2;
_forceGear = _this select 3;
_force = true;
@@ -94,10 +95,10 @@ if (_characterID != "0") then {
};
_character setVariable ["posForceUpdate",false,true];
};
if (_isNewGear) then {
if (_isNewGear or _forceGear) then {
//diag_log ("gear..."); sleep 0.05;
_playerGear = [weapons _character,_magazines];
//diag_log ("playerGear: " +str(_playerGear));
//diag_log ("playerGear: " +str(_playerGear));
_backpack = unitBackpack _character;
_playerBackp = [typeOf _backpack,getWeaponCargo _backpack,getMagazineCargo _backpack];
};

View File

@@ -14,9 +14,10 @@ diag_log ("PUBLISH: Attempt " + str(_object));
_dir = _worldspace select 0;
_location = _worldspace select 1;
//Generate UID
_uid = _worldspace call dayz_objectUID2;
// _uid = format["%1%2",dayZ_instance,_uid];
//Generate UID test using time
// _uid = str( round (dateToNumber date)) + str(round time);
_uid = _worldspace call dayz_objectUID3;
//_uid = format["%1%2",(round time),_uid];
if (_spawnDMG) then {
_fuel = 0;