Merge pull request #1206 from Sandbird/master

Update server_updateObject.sqf
This commit is contained in:
vbawol
2014-04-24 19:37:16 -05:00
2 changed files with 61 additions and 5 deletions

View File

@@ -89,7 +89,7 @@ _object_damage = {
_hit = [_object,_x] call object_getHit;
_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
if (_hit > 0) then {_array set [count _array,[_selection,_hit]]};
_object setHit ["_selection", _hit]
_object setHit ["_selection", _hit];
} forEach _hitpoints;
_key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage];
@@ -109,7 +109,7 @@ _object_killed = {
_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
if (_hit > 0) then {_array set [count _array,[_selection,_hit]]};
_hit = 1;
_object setHit ["_selection", _hit]
_object setHit ["_selection", _hit];
} forEach _hitpoints;
if (_objectID == "0") then {
@@ -137,7 +137,7 @@ _object_repair = {
_hit = [_object,_x] call object_getHit;
_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
if (_hit > 0) then {_array set [count _array,[_selection,_hit]]};
_object setHit ["_selection", _hit]
_object setHit ["_selection", _hit];
} forEach _hitpoints;
_key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage];

View File

@@ -1,4 +1,3 @@
class CfgSounds {
class breath_1 {
name = "";
@@ -355,6 +354,24 @@ class CfgSounds {
class z_chase_14 : z_chase_0 {
sound[] = {"\dayz_sfx\zombie\chase_14.ogg",0.5,1,80};
};
class z_fchase_0 {
name = "";
sound[] = {"\dayz_sfx\zombie\femalezombie_chase_01.ogg",0.5,1,80};
titles[] = {0, ""};
};
class z_fchase_1 : z_fchase_0 {
sound[] = {"\dayz_sfx\zombie\femalezombie_chase_02.ogg",0.5,1,80};
};
class z_fchase_2 : z_fchase_0 {
sound[] = {"\dayz_sfx\zombie\femalezombie_chase_03.ogg",0.5,1,80};
};
class z_fchase_3 : z_fchase_0 {
sound[] = {"\dayz_sfx\zombie\femalezombie_chase_04.ogg",0.5,1,80};
};
class z_fchase_4 : z_fchase_0 {
sound[] = {"\dayz_sfx\zombie\femalezombie_chase_05.ogg",0.5,1,80};
};
class z_spotted_0 {
name = "";
@@ -400,6 +417,24 @@ class CfgSounds {
class z_spotted_13 : z_spotted_0 {
sound[] = {"\dayz_sfx\zombie\spotted_13.ogg",0.8,1,80};
};
class z_fspotted_0 {
name = "";
sound[] = {"\dayz_sfx\zombie\femalezombie_spotted_01.ogg",0.8,1,80};
titles[] = {0, ""};
};
class z_fspotted_1 : z_fspotted_0 {
sound[] = {"\dayz_sfx\zombie\femalezombie_spotted_02.ogg",0.8,1,80};
};
class z_fspotted_2 : z_fspotted_0 {
sound[] = {"\dayz_sfx\zombie\femalezombie_spotted_03.ogg",0.8,1,80};
};
class z_fspotted_3 : z_fspotted_0 {
sound[] = {"\dayz_sfx\zombie\femalezombie_spotted_04.ogg",0.8,1,80};
};
class z_fspotted_4 : z_fspotted_0 {
sound[] = {"\dayz_sfx\zombie\femalezombie_spotted_05.ogg",0.8,1,80};
};
class z_attack_0 {
name = "";
@@ -445,6 +480,27 @@ class CfgSounds {
class z_attack_13 : z_attack_0 {
sound[] = {"\dayz_sfx\zombie\attack_13.ogg",0.5,1,80};
};
class z_attack_13 : z_attack_0 {
sound[] = {"\dayz_sfx\zombie\attack_13.ogg",0.5,1,80};
};
class z_fattack_0 {
name = "";
sound[] = {"\dayz_sfx\zombie\femalezombie_attack_01.ogg",0.5,1,80};
titles[] = {0, ""};
};
class z_fattack_1 : z_fattack_0 {
sound[] = {"\dayz_sfx\zombie\femalezombie_attack_02.ogg",0.5,1,80};
};
class z_fattack_2 : z_fattack_0 {
sound[] = {"\dayz_sfx\zombie\femalezombie_attack_03.ogg",0.5,1,80};
};
class z_fattack_3 : z_fattack_0 {
sound[] = {"\dayz_sfx\zombie\femalezombie_attack_04.ogg",0.5,1,80};
};
class z_fattack_4 : z_fattack_0 {
sound[] = {"\dayz_sfx\zombie\femalezombie_attack_05.ogg",0.5,1,80};
};
class z_hit_0 {
name = "";
@@ -632,4 +688,4 @@ class CfgSounds {
sound[] = {"\dayz_sfx\effects\geiger_level_3.ogg",1,1,10};
titles[] = {};
};
};
};