0.69 + 1.7.5.M1D15

This commit is contained in:
vbawol
2013-01-18 12:25:49 -06:00
parent 662d62d781
commit 4cab61bf63
81 changed files with 1061 additions and 532 deletions

View File

@@ -285,11 +285,9 @@ class FSM
" _temp = round(player getVariable [""temperature"",100]);" \n
" _currentState = [_currentWpn,_currentAnim,_temp];" \n
" " \n
" //dayzCharDisco = [dayz_characterID,_playerPos,[weapons player,_magazineArray],[typeOf (unitbackpack player),getWeaponCargo (unitbackpack player),getMagazineCargo (unitbackpack player)],_medical,_currentState,_currentModel];" \n
" //[""dayzCharDisco"",[dayz_characterID,_playerPos,[weapons player,_magazineArray],[typeOf (unitbackpack player),getWeaponCargo (unitbackpack player),getMagazineCargo (unitbackpack player)],_medical,_currentState,_currentModel]] call callRpcProcedure;" \n
" //diag_log str(dayzCharDisco); " \n
"" \n
" //publicVariableServer ""dayzCharDisco"";" \n
" // remove isServer from player space" \n
" dayz_lastSave = time;" \n
" dayz_Magazines = [];" \n
"};"/*%FSM</ACTION""">*/;
@@ -425,12 +423,9 @@ class FSM
"" \n
"_msg = [];" \n
"" \n
"dayzLogin = [_playerUID,player];" \n
"[""dayzLogin"",[_playerUID,player]] call callRpcProcedure;" \n
"dayzPlayerLogin = [];" \n
"publicVariableServer ""dayzLogin"";" \n
"if (isServer) then {" \n
" dayzLogin call server_playerLogin;" \n
"};"/*%FSM</STATEINIT""">*/;
""/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links
{
@@ -651,9 +646,7 @@ class FSM
"};" \n
"" \n
"dayzPlayerLogin2 = [];" \n
"dayzLogin2 = [_charID,player,_playerUID];" \n
"publicVariableServer ""dayzLogin2"";" \n
"// remove isServer from player space" \n
"[""dayzLogin2"",[_charID,player,_playerUID]] call callRpcProcedure;" \n
"" \n
"dayz_loadScreenMsg = ""Requesting Character data from server"";" \n
"progressLoadingScreen 0.8;" \n
@@ -1096,15 +1089,9 @@ class FSM
"" \n
"dayz_animalCheck = [] spawn player_spawn_1;" \n
"" \n
"dayz_lootCheck = [] spawn {" \n
"dayz_spawnCheck = [] spawn {" \n
" while {true} do {" \n
" [""Loot""] call player_spawnCheck;" \n
" sleep 10;" \n
" };" \n
"};" \n
"dayz_zedCheck = [] spawn {" \n
" while {true} do {" \n
" [""Zeds""] call player_spawnCheck; " \n
" [""both""] call player_spawnCheck;" \n
" sleep 8;" \n
" };" \n
"};" \n
@@ -1154,8 +1141,8 @@ class FSM
init = /*%FSM<STATEINIT""">*/"dayzGearSave = true;" \n
"dayz_myPosition = getPosATL player;" \n
"" \n
"dayzLoginRecord = [_playerUID,_charID,0];" \n
"publicVariableServer ""dayzLoginRecord"";"/*%FSM</STATEINIT""">*/;
"[""dayzLoginRecord"",[_playerUID,_charID,0]] call callRpcProcedure;" \n
""/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links
{

View File

@@ -106,7 +106,7 @@ while {true} do {
//Has infection?
if (r_player_infected) then {
[player,"cough",8,false] call dayz_zombieSpeak;
[player,"cough",8,true] call dayz_zombieSpeak;
};
//Record Check
@@ -176,8 +176,9 @@ while {true} do {
//If has infection reduce blood
if (r_player_infected) then {
if (r_player_blood > 6000) then {
if (r_player_blood > 3000) then {
r_player_blood = r_player_blood - 3;
player setVariable["USEC_BloodQty",r_player_blood];
};
};
@@ -219,8 +220,7 @@ while {true} do {
if ((time - dayz_damageCounter) > 180) then {
if (!r_player_unconscious) then {
dayz_canDisconnect = true;
dayzDiscoRem = getPlayerUID player;
publicVariableServer "dayzDiscoRem";
["dayzDiscoRem",getPlayerUID player] call callRpcProcedure;
//Ensure Control is hidden
_display = uiNamespace getVariable 'DAYZ_GUI_display';
@@ -233,11 +233,8 @@ while {true} do {
//Save Checker
if (dayz_unsaved) then {
if ((time - dayz_lastSave) > _saveTime) then {
dayzPlayerSave = [player,dayz_Magazines,false];
publicVariableServer "dayzPlayerSave";
if (isServer) then {
dayzPlayerSave call server_playerSync;
};
["dayzPlayerSave",[player,dayz_Magazines,false]] call callRpcProcedure;
dayz_lastSave = time;
dayz_Magazines = [];
};