This commit is contained in:
vbawol
2013-01-23 23:40:41 -06:00
parent 7e3ff79065
commit f312b895a8
15 changed files with 298 additions and 169 deletions

View File

@@ -11,7 +11,12 @@ if (vehicle player != player) exitWith {cutText ["You may not eat while in a veh
_item = _this;
_hasfooditem = _this in magazines player;
_rndInfection = (random 15);
if (_item == "FoodBioMeat") then {
_rndInfection = (random 7);
} else {
_rndInfection = (random 15);
};
_EatInfection = (_rndInfection < 1);
_config = configFile >> "CfgMagazines" >> _item;

View File

@@ -5,21 +5,18 @@ _action = _this select 2;
_caller removeAction _action;
_callerID = _caller getVariable ["characterID", 0];
_targetID = _target getVariable ["characterID", 0];
_callerID = _caller getVariable "characterID";
_targetID = _target getVariable "characterID";
if (_callerID != 0 && _targetID != 0) then {
_friendlies = _caller getVariable ["friendlies", []];
_friendlies set [count _friendlies, _targetID];
_caller setVariable ["friendlies", _friendlies, true];
_friendlies = _caller getVariable ["friendlies", []];
_friendlies set [count _friendlies, _targetID];
_caller setVariable ["friendlies", _friendlies, true];
_rfriendlies = _target getVariable ["friendlies", []];
_rfriendlies = _target getVariable ["friendlies", []];
if ((isNil "_rfriendlies") or !(_callerID in _rfriendlies)) then {
// caller
titleText [format["You have tagged %1 as friendly. Waiting for %1 to accept that.",(name _target)]];
// target
[_caller,_target,"loc",rTITLETEXT,format["%1 wants to tag you as friendly. To accept, tag %1 as friendly.", (name _caller)],"PLAIN DOWN"] call RE;
};
if (!(_callerID in _rfriendlies)) then {
// caller
titleText [format["You have tagged %1 as friendly. Waiting for %1 to accept that.",(name _target)], "PLAIN DOWN"];
// target
[_caller,_target,"loc",rTITLETEXT,format["%1 wants to tag you as friendly. To accept, tag %1 as friendly.", (name _caller)],"PLAIN DOWN"] call RE;
};

View File

@@ -18,21 +18,15 @@ if (!_hasclothesitem) exitWith {cutText [format[(localize "str_player_31"),_text
if (vehicle player != player) exitWith {cutText ["You may not change clothes while in a vehicle", "PLAIN DOWN"]};
// _isFemale = ((typeOf player == "SurvivorW2_DZ")||(typeOf player == "BanditW1_DZ"));
// if (_isFemale) exitWith {cutText ["Currently Female Characters cannot change to this skin. This will change in a future update.", "PLAIN DOWN"]};
_myModel = (typeOf player);
_itemNew = "Skin_" + _myModel;
diag_log ("Debug Clothes: model In: " + str(_itemNew) + " Out: " + str(_item));
if ( (isClass(_config >> _itemNew)) ) then {
if ( (isClass(_config >> _item)) ) then {
// Current sex of player skin
_currentSex = getText (configFile >> "CfgSurvival" >> "Skins" >> _itemNew >> "sex");
// Sex of new skin
_newSex = getText (configFile >> "CfgSurvival" >> "Skins" >> _item >> "sex");