diff --git a/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm b/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm index eed564457..f82195e58 100644 --- a/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm +++ b/MPMissions/DayZ_Epoch_1.Takistan/mission.sqm @@ -1395,8 +1395,8 @@ class Mission age="UNKNOWN"; name="zone1"; expCond="(player distance zone1) < 75;"; - expActiv="TitleText[""Now entering trader city Khush"",""PLAIN DOWN""]; placevault = false;"; - expDesactiv="TitleText[""Now leaving trader city Khush"",""PLAIN DOWN""]; placevault = true;"; + expActiv="TitleText[""Now entering trader city Khush"",""PLAIN DOWN""]; canbuild = false;"; + expDesactiv="TitleText[""Now leaving trader city Khush"",""PLAIN DOWN""]; canbuild = true;"; class Effects { soundDet="arabian_market_1"; @@ -1411,8 +1411,8 @@ class Mission age="UNKNOWN"; name="zone2"; expCond="(player distance zone2) < 50;"; - expActiv="TitleText[""Now entering trader city Nur"",""PLAIN DOWN""]; placevault = false;"; - expDesactiv="TitleText[""Now leaving trader city Nur"",""PLAIN DOWN""]; placevault = true;"; + expActiv="TitleText[""Now entering trader city Nur"",""PLAIN DOWN""]; canbuild = false;"; + expDesactiv="TitleText[""Now leaving trader city Nur"",""PLAIN DOWN""]; canbuild = true;"; class Effects { soundDet="arabian_market_1"; @@ -1427,8 +1427,8 @@ class Mission age="UNKNOWN"; name="zone3"; expCond="(player distance zone3) < 50;"; - expActiv="TitleText[""Now entering trader city Garm"",""PLAIN DOWN""]; placevault = false;"; - expDesactiv="TitleText[""Now leaving trader city Garm"",""PLAIN DOWN""]; placevault = true;"; + expActiv="TitleText[""Now entering trader city Garm"",""PLAIN DOWN""]; canbuild = false;"; + expDesactiv="TitleText[""Now leaving trader city Garm"",""PLAIN DOWN""]; canbuild = true;"; class Effects { soundDet="arabian_market_1"; diff --git a/MPMissions/DayZ_Epoch_10.Mountains_ACR/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_10.Mountains_ACR/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_10.Mountains_ACR/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_10.Mountains_ACR/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_10.Mountains_ACR/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_10.Mountains_ACR/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_10.Mountains_ACR/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_10.Mountains_ACR/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_10.Mountains_ACR/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_10.Mountains_ACR/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_10.Mountains_ACR/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_10.Mountains_ACR/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm b/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm index a1c07880c..b20ac4266 100644 --- a/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm +++ b/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm @@ -14,8 +14,7 @@ class Mission "glt_m300t", "sigisolda", "suv_col", - "csj_gyroac", - "map_eu" + "csj_gyroac" }; addOnsAuto[]= { @@ -1289,8 +1288,8 @@ class Mission age="UNKNOWN"; name="zonebash"; expCond="(player distance zonebash) < 50;"; - expActiv="TitleText[""Now entering trader city Bash"",""PLAIN DOWN""]; placevault = false;"; - expDesactiv="TitleText[""Now leaving trader city Bash"",""PLAIN DOWN""]; placevault = true;"; + expActiv="TitleText[""Now entering trader city Bash"",""PLAIN DOWN""]; canbuild = false;"; + expDesactiv="TitleText[""Now leaving trader city Bash"",""PLAIN DOWN""]; canbuild = true;"; class Effects { soundDet="arabian_market_1"; @@ -1305,8 +1304,8 @@ class Mission age="UNKNOWN"; name="zoneklen"; expCond="(player distance zoneklen) < 50;"; - expActiv="TitleText[""Now entering trader city Klen"",""PLAIN DOWN""]; placevault = false;"; - expDesactiv="TitleText[""Now leaving trader city Klen"",""PLAIN DOWN""]; placevault = true;"; + expActiv="TitleText[""Now entering trader city Klen"",""PLAIN DOWN""]; canbuild = false;"; + expDesactiv="TitleText[""Now leaving trader city Klen"",""PLAIN DOWN""]; canbuild = true;"; class Effects { soundDet="arabian_market_1"; @@ -1321,8 +1320,8 @@ class Mission age="UNKNOWN"; name="zonestary"; expCond="(player distance zonestary) < 50;"; - expActiv="TitleText[""Now entering trader city Stary"",""PLAIN DOWN""]; placevault = false;"; - expDesactiv="TitleText[""Now leaving trader city Stary"",""PLAIN DOWN""]; placevault = true;"; + expActiv="TitleText[""Now entering trader city Stary"",""PLAIN DOWN""]; canbuild = false;"; + expDesactiv="TitleText[""Now leaving trader city Stary"",""PLAIN DOWN""]; canbuild = true;"; class Effects { soundDet="arabian_market_1"; diff --git a/MPMissions/DayZ_Epoch_12.isladuala/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_12.isladuala/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_12.isladuala/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_12.isladuala/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_12.isladuala/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_12.isladuala/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_12.isladuala/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_12.isladuala/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_12.isladuala/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_12.isladuala/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_12.isladuala/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_12.isladuala/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_13.Tavi/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_13.Tavi/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_13.Tavi/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_13.Tavi/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_13.Tavi/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_13.Tavi/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_13.Tavi/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_13.Tavi/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_13.Tavi/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_13.Tavi/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_13.Tavi/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_13.Tavi/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_15.namalsk/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_15.namalsk/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_15.namalsk/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_15.namalsk/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_15.namalsk/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_15.namalsk/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_15.namalsk/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_15.namalsk/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_15.namalsk/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_15.namalsk/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_15.namalsk/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_15.namalsk/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_16.Panthera2/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_16.Panthera2/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_16.Panthera2/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_16.Panthera2/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_16.Panthera2/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_16.Panthera2/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_16.Panthera2/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_16.Panthera2/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_16.Panthera2/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_16.Panthera2/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_16.Panthera2/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_16.Panthera2/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_2.Utes/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_2.Utes/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_2.Utes/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_2.Utes/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_2.Utes/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_2.Utes/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_2.Utes/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_2.Utes/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_2.Utes/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_2.Utes/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_2.Utes/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_2.Utes/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_3.Shapur_BAF/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_3.Shapur_BAF/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_3.Shapur_BAF/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_3.Shapur_BAF/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_3.Shapur_BAF/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_3.Shapur_BAF/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_3.Shapur_BAF/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_3.Shapur_BAF/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_3.Shapur_BAF/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_3.Shapur_BAF/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_3.Shapur_BAF/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_3.Shapur_BAF/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_4.Zargabad/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_4.Zargabad/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_4.Zargabad/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_4.Zargabad/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_4.Zargabad/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_4.Zargabad/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_4.Zargabad/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_4.Zargabad/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_4.Zargabad/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_4.Zargabad/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_4.Zargabad/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_4.Zargabad/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_6.Dingor/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_6.Dingor/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_6.Dingor/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_6.Dingor/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_6.Dingor/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_6.Dingor/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_6.Dingor/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_6.Dingor/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_6.Dingor/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_6.Dingor/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_6.Dingor/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_6.Dingor/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_7.Lingor/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_7.Lingor/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_7.Lingor/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_7.Lingor/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_7.Lingor/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_7.Lingor/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_7.Lingor/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_7.Lingor/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_7.Lingor/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_7.Lingor/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_7.Lingor/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_7.Lingor/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/DayZ_Epoch_9.Woodland_ACR/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/DayZ_Epoch_9.Woodland_ACR/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/DayZ_Epoch_9.Woodland_ACR/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/DayZ_Epoch_9.Woodland_ACR/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/DayZ_Epoch_9.Woodland_ACR/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/DayZ_Epoch_9.Woodland_ACR/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/DayZ_Epoch_9.Woodland_ACR/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/DayZ_Epoch_9.Woodland_ACR/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/DayZ_Epoch_9.Woodland_ACR/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_9.Woodland_ACR/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/DayZ_Epoch_9.Woodland_ACR/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/DayZ_Epoch_9.Woodland_ACR/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/MPMissions/TEMPLATE/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/MPMissions/TEMPLATE/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 30b79a814..6ab215092 100644 --- a/MPMissions/TEMPLATE/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/MPMissions/TEMPLATE/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -12,8 +12,8 @@ along with this program. If not, see . private ["_level", "_n", "_s"]; -_voil = [] call R3F_TIRED_FNCT_MkVoile; -[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; +//_voil = [] call R3F_TIRED_FNCT_MkVoile; +//[_voil,1] call R3F_TIRED_FNCT_Voile_Noir; _n = 0; _posATL = 0; @@ -85,7 +85,7 @@ while {true} do { R3F_Weight]; #endif - [_voil, _level] call R3F_TIRED_FNCT_Voile_Noir; + [_level] call R3F_TIRED_FNCT_Voile_Noir; if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL and scriptDone R3F_TIRED_Handle_Blackout_Effect and scriptDone R3F_TIRED_Handle_Blur_Effect) then { R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; @@ -126,5 +126,5 @@ while {true} do { _n = _n + 1; }; -[_voil] call R3F_TIRED_FNCT_Effect_Off; +//[_voil] call R3F_TIRED_FNCT_Effect_Off; diff --git a/MPMissions/TEMPLATE/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/MPMissions/TEMPLATE/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index 0d2a1655a..d3e149d2e 100644 --- a/MPMissions/TEMPLATE/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/MPMissions/TEMPLATE/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -14,65 +14,20 @@ FNC_PrintToRPT = { diag_log text _this; }; -R3F_TIRED_FNCT_Wait4Effect = { - private ["_delay","_st"]; - _delay = _this select 0; - _st = time; - while {((time - _st) < _delay) && (alive player)} do - { - sleep 0.100; - }; -}; - -R3F_TIRED_FNCT_Effect_Off = { - private ["_handle"]; - _handle = _this select 0; - _handle ppEffectEnable false; - ppEffectDestroy _handle; - sleep 0.02; -}; - -R3F_TIRED_FNCT_MkVoile = { - private ["_handle"]; - if (ppEffectCommitted "ColorCorrections") then { - _handle = ppEffectCreate ["ColorCorrections", 1515]; - _handle ppEffectEnable true; - _handle; - }else{ - -1; - }; -}; - R3F_TIRED_FNCT_Voile_Noir = { - private ["_handle","_level"]; - _handle = _this select 0; - _level = _this select 1; - _handle ppEffectAdjust [ - _level, - _level, - 0, - [0,0,0,0], - [1.30,1.30,1.30,1.30], - [0,0,0,0] - ]; - _handle ppEffectCommit 0.1; - waituntil{ppEffectCommitted "ColorCorrections";}; + _level = _this select 0; if(_level < R3F_TIRED_SHORTNESS_THRESHOLD ) then{ - enableCamShake true; - addCamShake [5-_level, 1, 2]; - }else{ - enableCamShake false; + playSound "heartbeat_1"; + addCamShake [2, 1, 25]; }; + +}; +R3F_TIRED_FNCT_WarnBeforeBlackout = { + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; - R3F_TIRED_FNCT_DoBlackVanish = { - titleText ["", "BLACK OUT",4]; - player playMoveNow "AmovPpneMstpSrasWrflDnon"; - 0 fadeSound 0; - [R3F_TIRED_UNCONSCIOUSNESS_DURATION] call R3F_TIRED_FNCT_Wait4Effect; - if (alive player) then { - titleText ["", "BLACK IN",4]; - 0 fadeSound 1; - }; + [player,0.1] call fnc_usec_damageUnconscious; + cutText ["You are over burdened.", "PLAIN DOWN"]; }; diff --git a/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index a437c3e50..de7cf44d9 100644 --- a/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -303,6 +303,10 @@ class CfgWeight { weight = 5.6; }; + class BAF_LRR_scoped + { + weight = 5.6; + }; class m107_DZ { weight = 14; @@ -1361,6 +1365,10 @@ class CfgWeight { weight = 1; }; + class Skin_SurvivorWsequisha_DZ + { + weight = 1; + }; class Skin_SurvivorWcombat_DZ { weight = 1; diff --git a/dayz_anim/CfgBanned/CfgAmmo.hpp b/dayz_anim/CfgBanned/CfgAmmo.hpp new file mode 100644 index 000000000..81df5cf16 --- /dev/null +++ b/dayz_anim/CfgBanned/CfgAmmo.hpp @@ -0,0 +1,245 @@ + +class CfgAmmo { + class FakeAmmo; + class MissileCore: FakeAmmo {}; + class BombCore: FakeAmmo {}; + class LaserBombCore: FakeAmmo {}; + class RocketCore: FakeAmmo {}; + class ArtilleryRocketCore: FakeAmmo {}; + //class BulletCore: FakeAmmo {}; + //class ShotgunCore: FakeAmmo {}; + class ShellCore: FakeAmmo {}; + //class GrenadeCore: FakeAmmo {}; + //class TimeBombCore: FakeAmmo {}; + //class PipeBombCore: FakeAmmo {}; + //class MineCore: FakeAmmo {}; + //class FlareCore: FakeAmmo {}; + //class SmokeShellCore: FakeAmmo {}; + //class FakeAmmo: FakeAmmo {}; + //class BulletBase: FakeAmmo {}; + //class FlareBase: FakeAmmo {}; + //class B_9x18_Ball: FakeAmmo {}; + //class B_9x18_SD: FakeAmmo {}; + //class B_9x19_Ball: FakeAmmo {}; + //class B_9x19_SD: FakeAmmo {}; + //class B_45ACP_Ball: FakeAmmo {}; + //class B_545x39_Ball: FakeAmmo {}; + //class B_545x39_SD: FakeAmmo {}; + //class B_556x45_Ball: FakeAmmo {}; + //class B_556x45_SD: FakeAmmo {}; + //class B_9x39_SP5: FakeAmmo {}; + //class B_12Gauge_74Slug: FakeAmmo {}; + //class B_762x39_Ball: FakeAmmo {}; + //class B_762x51_Ball: FakeAmmo {}; + //class B_762x51_3RndBurst: FakeAmmo {}; + //class B_762x51_noTracer: FakeAmmo {}; + //class B_762x54_Ball: FakeAmmo {}; + //class B_762x54_noTracer: FakeAmmo {}; + //class B_77x56_Ball: FakeAmmo {}; + //class B_127x99_Ball: FakeAmmo {}; + //class B_127x99_Ball_noTracer: FakeAmmo {}; + //class B_127x107_Ball: FakeAmmo {}; + //class B_127x108_Ball: FakeAmmo {}; + class B_127x108_APHE: FakeAmmo {}; + class B_145x115_AP: FakeAmmo {}; + class B_20mm_AP: FakeAmmo {}; + class B_20mm_AA: FakeAmmo {}; + class B_23mm_AA: FakeAmmo {}; + class B_23mm_HE: FakeAmmo {}; + class B_23mm_AP: FakeAmmo {}; + class B_23mm_APHE: FakeAmmo {}; + class B_25mm_HE: FakeAmmo {}; + class B_25mm_HEI: FakeAmmo {}; + class B_25mm_APDS: FakeAmmo {}; + class B_30mm_AP: FakeAmmo {}; + class B_30mmA10_AP: FakeAmmo {}; + class B_30mm_HE: FakeAmmo {}; + class B_30mm_AA: FakeAmmo {}; + //class GrenadeBase: FakeAmmo {}; + //class G_30mm_HE: FakeAmmo {}; + //class G_40mm_HE: FakeAmmo {}; + //class F_40mm_White: FakeAmmo {}; + //class F_40mm_Green: FakeAmmo {}; + //class F_40mm_Red: FakeAmmo {}; + //class F_40mm_Yellow: FakeAmmo {}; + class ShellBase: FakeAmmo {}; + class Sh_105_HE: FakeAmmo {}; + class Sh_100_HE: FakeAmmo {}; + class Sh_120_HE: FakeAmmo {}; + class Sh_120_SABOT: FakeAmmo {}; + class Sh_122_HE: FakeAmmo {}; + class Sh_125_HE: FakeAmmo {}; + class Sh_125_SABOT: FakeAmmo {}; + class Sh_85_HE: FakeAmmo {}; + class Sh_85_AP: FakeAmmo {}; + class RocketBase: FakeAmmo {}; + class G_Camel_HE: FakeAmmo {}; + class R_Hydra_HE: FakeAmmo {}; + class R_57mm_HE: FakeAmmo {}; + class R_80mm_HE: FakeAmmo {}; + class R_S8T_AT: FakeAmmo {}; + //class R_M136_AT: FakeAmmo {}; + class R_RPG18_AT: FakeAmmo {}; + class R_PG7V_AT: FakeAmmo {}; + class R_PG7VL_AT: FakeAmmo {}; + class R_PG7VR_AT: FakeAmmo {}; + class R_OG7_AT: FakeAmmo {}; + class R_PG9_AT: FakeAmmo {}; + class R_OG9_HE: FakeAmmo {}; + class R_SMAW_HEDP: FakeAmmo {}; + class R_SMAW_HEAA: FakeAmmo {}; + class R_GRAD: FakeAmmo {}; + class R_MLRS: FakeAmmo {}; + class MissileBase: FakeAmmo {}; + class M_Javelin_AT: FakeAmmo {}; + class M_Stinger_AA: FakeAmmo {}; + class M_Sidewinder_AA: FakeAmmo {}; + class M_Sidewinder_AA_F35: FakeAmmo {}; + class M_Strela_AA: FakeAmmo {}; + class M_Igla_AA: FakeAmmo {}; + class M_AT5_AT: FakeAmmo {}; + class M_AT13_AT: FakeAmmo {}; + class M_TOW_AT: FakeAmmo {}; + class M_TOW2_AT: FakeAmmo {}; + class M_AT10_AT: FakeAmmo {}; + class M_AT11_AT: FakeAmmo {}; + class M_Hellfire_AT: FakeAmmo {}; + class M_Vikhr_AT: FakeAmmo {}; + class M_Maverick_AT: FakeAmmo {}; + class M_R73_AA: FakeAmmo {}; + class M_Ch29_AT: FakeAmmo {}; + class M_AT2_AT: FakeAmmo {}; + class M_AT6_AT: FakeAmmo {}; + class M_AT9_AT: FakeAmmo {}; + class M_9M311_AA: FakeAmmo {}; + class Bo_GBU12_LGB: FakeAmmo {}; + class Bo_GBU12_LGB_F35: FakeAmmo {}; + class Bo_FAB_250: FakeAmmo {}; + class Bo_Mk82: FakeAmmo {}; + /* + class Grenade: FakeAmmo {}; + class GrenadeHand: FakeAmmo {}; + class GrenadeHandTimedWest: FakeAmmo {}; + class GrenadeHandTimedEast: FakeAmmo {}; + class GrenadeHand_stone: FakeAmmo {}; + class SmokeShell: FakeAmmo {}; + class G_40mm_Smoke: FakeAmmo {}; + class G_40mm_SmokeRed: FakeAmmo {}; + class G_40mm_SmokeGreen: FakeAmmo {}; + class G_40mm_SmokeYellow: FakeAmmo {}; + class SmokeShellRed: FakeAmmo {}; + class SmokeShellGreen: FakeAmmo {}; + class SmokeShellYellow: FakeAmmo {}; + class SmokeShellPurple: FakeAmmo {}; + class SmokeShellBlue: FakeAmmo {}; + class SmokeShellOrange: FakeAmmo {}; + class SmokeShellVehicle: FakeAmmo {}; + class FlareCountermeasure: FakeAmmo {}; + */ + //class TimeBomb: FakeAmmo {}; + //class PipeBomb: FakeAmmo {}; + //class Mine: FakeAmmo {}; + //class MineE: FakeAmmo {}; + //class FuelExplosion: FakeAmmo {}; + //class Laserbeam: FakeAmmo {}; + //class HelicopterExploSmall: FakeAmmo {}; + //class HelicopterExploBig: FakeAmmo {}; + //class SmallSecondary: FakeAmmo {}; + //class SmokeLauncherAmmo: FakeAmmo {}; + //class FlareLauncherAmmo: FakeAmmo {}; + class B_30x113mm_M789_HEDP: FakeAmmo {}; + class ARTY_Sh_Base: FakeAmmo {}; + class ARTY_Flare_Small: FakeAmmo {}; + class ARTY_Flare_Medium: FakeAmmo {}; + class ARTY_Sh_Base_NET: FakeAmmo {}; + class ARTY_Sh_105_NET: FakeAmmo {}; + class ARTY_Sh_105_NET_NOFX: FakeAmmo {}; + class ARTY_Sh_105_LASNET: FakeAmmo {}; + class ARTY_Sh_122_NET: FakeAmmo {}; + class ARTY_Sh_122_NET_NOFX: FakeAmmo {}; + class ARTY_Sh_122_LASNET: FakeAmmo {}; + class ARTY_Sh_81_NET: FakeAmmo {}; + class ARTY_Sh_82_NET: FakeAmmo {}; + class ARTY_Sh_120_NET: FakeAmmo {}; + class ARTY_Sh_227_NET: FakeAmmo {}; + class ARTY_Sh_105_HE: FakeAmmo {}; + class ARTY_Sh_105_WP: FakeAmmo {}; + class ARTY_Sh_105_SADARM: FakeAmmo {}; + class ARTY_Sh_105_LASER: FakeAmmo {}; + class ARTY_Sh_105_ILLUM: FakeAmmo {}; + class ARTY_Sh_105_SMOKE: FakeAmmo {}; + class ARTY_Sh_81_HE: FakeAmmo {}; + class ARTY_Sh_81_WP: FakeAmmo {}; + class ARTY_Sh_81_ILLUM: FakeAmmo {}; + class ARTY_R_227mm_HE_Rocket: FakeAmmo {}; + class ARTY_R_227mm_HE: FakeAmmo {}; + class ARTY_Sh_122_HE: FakeAmmo {}; + class ARTY_Sh_122_WP: FakeAmmo {}; + class ARTY_Sh_122_SADARM: FakeAmmo {}; + class ARTY_Sh_122_LASER: FakeAmmo {}; + class ARTY_Sh_122_ILLUM: FakeAmmo {}; + class ARTY_Sh_122_SMOKE: FakeAmmo {}; + class ARTY_SADARM_PROJO: FakeAmmo {}; + class ARTY_SADARM_NET: FakeAmmo {}; + class ARTY_SADARM_BURST: FakeAmmo {}; + class ARTY_SmokeShellWhite: FakeAmmo {}; + class ARTY_Sh_82_HE: FakeAmmo {}; + class ARTY_Sh_82_WP: FakeAmmo {}; + class ARTY_Sh_82_ILLUM: FakeAmmo {}; + class ARTY_R_120mm_HE_Rocket: FakeAmmo {}; + class ARTY_R_120mm_HE: FakeAmmo {}; + class Warfare82mmMortar: FakeAmmo {}; + //class B_86x70_Ball_noTracer: FakeAmmo {}; + //class B_127x99_Ball_noTracer_BAF: FakeAmmo {}; + class M_NLAW_AT: FakeAmmo {}; + class Sh_40_HE: FakeAmmo {}; + class Sh_40_SABOT: FakeAmmo {}; + class M_CRV7_AT: FakeAmmo {}; + class M_CRV7_HEPD: FakeAmmo {}; + class M_CRV7_FAT: FakeAmmo {}; + class BAF_ied_v1: FakeAmmo {}; + class BAF_ied_v2: FakeAmmo {}; + class BAF_ied_v3: FakeAmmo {}; + class BAF_ied_v4: FakeAmmo {}; + //class B_765x17_Ball: FakeAmmo {}; + //class B_762x51_SB_SCAR: FakeAmmo {}; + class Sh_100_HEAT: FakeAmmo {}; + class Sh_105_HESH: FakeAmmo {}; + class Sh_105_APDS: FakeAmmo {}; + class R_MEEWS_HEDP: FakeAmmo {}; + class R_MEEWS_HEAT: FakeAmmo {}; + //class IRStrobeBase: FakeAmmo {}; + //class IRStrobe: FakeAmmo {}; + //class IR_Strobe_Marker: FakeAmmo {}; + //class B_45ACP_noCartridge_Ball: FakeAmmo {}; + //class CMflareAmmo: FakeAmmo {}; + //class CMflare_Chaff_Ammo: FakeAmmo {}; + class ARTY_Sh_120_HE: FakeAmmo {}; + class Sh_81_HE: FakeAmmo {}; + class Sh_81_WP: FakeAmmo {}; + class Sh_81_ILLUM: FakeAmmo {}; + class Sh_82_HE: FakeAmmo {}; + class Sh_82_WP: FakeAmmo {}; + class Sh_82_ILLUM: FakeAmmo {}; + class Sh_122_WP: FakeAmmo {}; + class Sh_122_SADARM: FakeAmmo {}; + class Sh_122_LASER: FakeAmmo {}; + class Sh_122_ILLUM: FakeAmmo {}; + class Sh_122_SMOKE: FakeAmmo {}; + class Sh_105_WP: FakeAmmo {}; + class Sh_105_SADARM: FakeAmmo {}; + class Sh_105_LASER: FakeAmmo {}; + class Sh_105_ILLUM: FakeAmmo {}; + class Sh_105_SMOKE: FakeAmmo {}; + class 120mmHE_M120: FakeAmmo {}; + //class B_303_Ball: FakeAmmo {}; + class M_47_AT_EP1: FakeAmmo {}; + class PMC_ied_v1: FakeAmmo {}; + class PMC_ied_v2: FakeAmmo {}; + class PMC_ied_v3: FakeAmmo {}; + class PMC_ied_v4: FakeAmmo {}; + //class B_12Gauge_Pellets: FakeAmmo {}; + class G_30mm_HE_heli: FakeAmmo {}; + class B_19mm_HE: FakeAmmo {}; + //class B_556x45_Ball_airLock: FakeAmmo {}; +}; diff --git a/dayz_anim/CfgBanned/CfgMagazines.hpp b/dayz_anim/CfgBanned/CfgMagazines.hpp new file mode 100644 index 000000000..eb1f2e13f --- /dev/null +++ b/dayz_anim/CfgBanned/CfgMagazines.hpp @@ -0,0 +1,329 @@ +class CfgMagazines { + class Default; + class FakeMagazine: Default + { + scope = 1; + ammo = "FakeAmmo"; + stopThis = true; + value = 1; + displayName = ""; + model = ""; + picture = ""; + modelSpecial = ""; + useAction = 0; + useActionTitle = ""; + reloadAction = "ManActReloadMagazine"; + count = 0; + type = 256; + initSpeed = 0; + selectionFireAnim = "zasleh"; + nameSound = "magazine"; + maxLeadSpeed = 0; + }; + /* + class 8Rnd_9x18_Makarov: FakeMagazine {}; + class 8Rnd_9x18_MakarovSD: FakeMagazine {}; + class 15Rnd_9x19_M9: FakeMagazine {}; + class 15Rnd_9x19_M9SD: FakeMagazine {}; + class 30Rnd_9x19_MP5SD: FakeMagazine {}; + class 30Rnd_9x19_MP5: FakeMagazine {}; + class 7Rnd_45ACP_1911: FakeMagazine {}; + class 30Rnd_545x39_AK: FakeMagazine {}; + class 30Rnd_545x39_AKSD: FakeMagazine {}; + class 75Rnd_545x39_RPK: FakeMagazine {}; + class 30Rnd_762x39_AK47: FakeMagazine {}; + class 20Rnd_556x45_Stanag: FakeMagazine {}; + class 30Rnd_556x45_Stanag: FakeMagazine {}; + class 30Rnd_556x45_StanagSD: FakeMagazine {}; + class 30Rnd_556x45_G36: FakeMagazine {}; + class 30Rnd_556x45_G36SD: FakeMagazine {}; + class 200Rnd_556x45_M249: FakeMagazine {}; + */ + class 100Rnd_556x45_BetaCMag: FakeMagazine {}; + /* + class 5Rnd_762x51_M24: FakeMagazine {}; + class 100Rnd_762x51_M240: FakeMagazine {}; + class 10Rnd_762x54_SVD: FakeMagazine {}; + class 100Rnd_762x54_PK: FakeMagazine {}; + class 60Rnd_762x54_DT: FakeMagazine {}; + class 64Rnd_9x19_Bizon: FakeMagazine {}; + class 64Rnd_9x19_SD_Bizon: FakeMagazine {}; + class 10Rnd_9x39_SP5_VSS: FakeMagazine {}; + class 20Rnd_9x39_SP5_VSS: FakeMagazine {}; + class 8Rnd_B_Saiga12_74Slug: FakeMagazine {}; + class 8Rnd_B_Beneli_74Slug: FakeMagazine {}; + class 5Rnd_127x108_KSVK: FakeMagazine {}; + class 10Rnd_127x99_m107: FakeMagazine {}; + class 1Rnd_HE_M203: FakeMagazine {}; + class FlareWhite_M203: FakeMagazine {}; + class FlareGreen_M203: FakeMagazine {}; + class FlareRed_M203: FakeMagazine {}; + class FlareYellow_M203: FakeMagazine {}; + class 1Rnd_Smoke_M203: FakeMagazine {}; + class 1Rnd_SmokeRed_M203: FakeMagazine {}; + class 1Rnd_SmokeGreen_M203: FakeMagazine {}; + class 1Rnd_SmokeYellow_M203: FakeMagazine {}; + class 1Rnd_HE_GP25: FakeMagazine {}; + class FlareWhite_GP25: FakeMagazine {}; + class FlareGreen_GP25: FakeMagazine {}; + class FlareRed_GP25: FakeMagazine {}; + class FlareYellow_GP25: FakeMagazine {}; + class 1Rnd_SMOKE_GP25: FakeMagazine {}; + class 1Rnd_SmokeRed_GP25: FakeMagazine {}; + class 1Rnd_SmokeGreen_GP25: FakeMagazine {}; + class 1Rnd_SmokeYellow_GP25: FakeMagazine {}; + class CA_LauncherMagazine: FakeMagazine {}; + class M136: FakeMagazine {}; + */ + class Javelin: FakeMagazine {}; + class AT13: FakeMagazine {}; + class PG7V: FakeMagazine {}; + class PG7VL: FakeMagazine {}; + //class PG7VR: FakeMagazine {}; + class OG7: FakeMagazine {}; + class PG9_AT: FakeMagazine {}; + class OG9_HE: FakeMagazine {}; + class Stinger: FakeMagazine {}; + class 8Rnd_Stinger: FakeMagazine {}; + class 2Rnd_Stinger: FakeMagazine {}; + class Strela: FakeMagazine {}; + class RPG18: FakeMagazine {}; + class SMAW_HEDP: FakeMagazine {}; + class SMAW_HEAA: FakeMagazine {}; + class Igla: FakeMagazine {}; + class 2Rnd_Igla: FakeMagazine {}; + //class SmokeLauncherMag: FakeMagazine {}; + //class FlareLauncherMag: FakeMagazine {}; + class 4000Rnd_762x51_M134: FakeMagazine {}; + class 2000Rnd_762x51_M134: FakeMagazine {}; + class 1200Rnd_762x51_M240: FakeMagazine {}; + class 1500Rnd_762x54_PKT: FakeMagazine {}; + class 2000Rnd_762x54_PKT: FakeMagazine {}; + class 200Rnd_762x54_PKT: FakeMagazine {}; + class 250Rnd_762x54_PKT_T90: FakeMagazine {}; + class 500Rnd_TwinVickers: FakeMagazine {}; + class 100Rnd_127x99_M2: FakeMagazine {}; + class 250Rnd_127x99_M3P: FakeMagazine {}; + class 50Rnd_127x107_DSHKM: FakeMagazine {}; + class 150Rnd_127x107_DSHKM: FakeMagazine {}; + class 150Rnd_127x108_KORD: FakeMagazine {}; + class 50Rnd_127x108_KORD: FakeMagazine {}; + class 1470Rnd_127x108_YakB: FakeMagazine {}; + class 500Rnd_145x115_KPVT: FakeMagazine {}; + class 750Rnd_M197_AH1: FakeMagazine {}; + class 2100Rnd_20mm_M168: FakeMagazine {}; + class 2000Rnd_23mm_AZP85: FakeMagazine {}; + class 40Rnd_23mm_AZP85: FakeMagazine {}; + class 1000Rnd_23mm_2A14_HE: FakeMagazine {}; + class 1000Rnd_23mm_2A14_AP: FakeMagazine {}; + class 520Rnd_23mm_GSh23L: FakeMagazine {}; + class 300Rnd_25mm_GAU12: FakeMagazine {}; + class 210Rnd_25mm_M242_HEI: FakeMagazine {}; + class 210Rnd_25mm_M242_APDS: FakeMagazine {}; + class 29Rnd_30mm_AGS30: FakeMagazine {}; + class 400Rnd_30mm_AGS17: FakeMagazine {}; + class 230Rnd_30mmHE_2A42: FakeMagazine {}; + class 250Rnd_30mmHE_2A42: FakeMagazine {}; + class 150Rnd_30mmHE_2A42: FakeMagazine {}; + class 230Rnd_30mmAP_2A42: FakeMagazine {}; + class 250Rnd_30mmAP_2A42: FakeMagazine {}; + class 150Rnd_30mmAP_2A42: FakeMagazine {}; + class 250Rnd_30mmHE_2A72: FakeMagazine {}; + class 250Rnd_30mmAP_2A72: FakeMagazine {}; + class 1904Rnd_30mmAA_2A38M: FakeMagazine {}; + class 1350Rnd_30mmAP_A10: FakeMagazine {}; + class 180Rnd_30mm_GSh301: FakeMagazine {}; + class 750Rnd_30mm_GSh301: FakeMagazine {}; + class 48Rnd_40mm_MK19: FakeMagazine {}; + class 6Rnd_Grenade_Camel: FakeMagazine {}; + class 30Rnd_105mmHE_M119: FakeMagazine {}; + class 20Rnd_120mmHE_M1A2: FakeMagazine {}; + class 20Rnd_120mmSABOT_M1A2: FakeMagazine {}; + class 30Rnd_122mmHE_D30: FakeMagazine {}; + class 22Rnd_125mmHE_T72: FakeMagazine {}; + class 22Rnd_100mm_HE_2A70: FakeMagazine {}; + class 23Rnd_125mmSABOT_T72: FakeMagazine {}; + class 33Rnd_85mmHE: FakeMagazine {}; + class 10Rnd_85mmAP: FakeMagazine {}; + class 8Rnd_AT5_BMP2: FakeMagazine {}; + class 5Rnd_AT5_BRDM2: FakeMagazine {}; + class 4Rnd_AT9_Mi24P: FakeMagazine {}; + class 4Rnd_AT6_Mi24V: FakeMagazine {}; + class 4Rnd_AT2_Mi24D: FakeMagazine {}; + class 8Rnd_AT10_BMP3: FakeMagazine {}; + class 5Rnd_AT11_T90: FakeMagazine {}; + class 6Rnd_AT13: FakeMagazine {}; + class 6Rnd_TOW_HMMWV: FakeMagazine {}; + class 2Rnd_TOW: FakeMagazine {}; + class 6Rnd_TOW2: FakeMagazine {}; + class 2Rnd_TOW2: FakeMagazine {}; + class 8Rnd_Hellfire: FakeMagazine {}; + class 12Rnd_Vikhr_KA50: FakeMagazine {}; + class 4Rnd_Sidewinder_AV8B: FakeMagazine {}; + class 2Rnd_Sidewinder_F35: FakeMagazine {}; + class 2Rnd_Sidewinder_AH1Z: FakeMagazine {}; + class 14Rnd_FFAR: FakeMagazine {}; + class 28Rnd_FFAR: FakeMagazine {}; + class 38Rnd_FFAR: FakeMagazine {}; + class 40Rnd_80mm: FakeMagazine {}; + class 80Rnd_80mm: FakeMagazine {}; + class 40Rnd_GRAD: FakeMagazine {}; + class 12Rnd_MLRS: FakeMagazine {}; + class 40Rnd_S8T: FakeMagazine {}; + class 80Rnd_S8T: FakeMagazine {}; + class 64Rnd_57mm: FakeMagazine {}; + class 128Rnd_57mm: FakeMagazine {}; + class 192Rnd_57mm: FakeMagazine {}; + class 6Rnd_GBU12_AV8B: FakeMagazine {}; + class 2Rnd_GBU12: FakeMagazine {}; + class 4Rnd_GBU12: FakeMagazine {}; + class 2Rnd_FAB_250: FakeMagazine {}; + class 4Rnd_FAB_250: FakeMagazine {}; + class 6Rnd_Mk82: FakeMagazine {}; + class 3Rnd_Mk82: FakeMagazine {}; + class 4Rnd_R73: FakeMagazine {}; + class 2Rnd_R73: FakeMagazine {}; + class 4Rnd_Ch29: FakeMagazine {}; + class 6Rnd_Ch29: FakeMagazine {}; + class 2Rnd_Maverick_A10: FakeMagazine {}; + class 8Rnd_9M311: FakeMagazine {}; + /* + class TimeBomb: FakeMagazine {}; + class Mine: FakeMagazine {}; + class MineE: FakeMagazine {}; + class PipeBomb: FakeMagazine {}; + class HandGrenade: FakeMagazine {}; + class HandGrenade_Stone: FakeMagazine {}; + class HandGrenade_West: FakeMagazine {}; + class HandGrenade_East: FakeMagazine {}; + class SmokeShell: FakeMagazine {}; + class SmokeShellRed: FakeMagazine {}; + class SmokeShellGreen: FakeMagazine {}; + class SmokeShellYellow: FakeMagazine {}; + class SmokeShellPurple: FakeMagazine {}; + class SmokeShellBlue: FakeMagazine {}; + class SmokeShellOrange: FakeMagazine {}; + class Laserbatteries: FakeMagazine {}; + class 20Rnd_762x51_DMR: FakeMagazine {}; + class 5x_22_LR_17_HMR: FakeMagazine {}; + */ + class 1200Rnd_30x113mm_M789_HEDP: FakeMagazine {}; + class 8Rnd_Sidewinder_AH64: FakeMagazine {}; + class ARTY_30Rnd_105mmHE_M119: FakeMagazine {}; + class ARTY_30Rnd_105mmWP_M119: FakeMagazine {}; + class ARTY_30Rnd_105mmSADARM_M119: FakeMagazine {}; + class ARTY_30Rnd_105mmLASER_M119: FakeMagazine {}; + class ARTY_30Rnd_105mmSMOKE_M119: FakeMagazine {}; + class ARTY_30Rnd_105mmILLUM_M119: FakeMagazine {}; + class ARTY_8Rnd_81mmHE_M252: FakeMagazine {}; + class ARTY_8Rnd_81mmWP_M252: FakeMagazine {}; + class ARTY_8Rnd_81mmILLUM_M252: FakeMagazine {}; + class ARTY_12Rnd_227mmHE_M270: FakeMagazine {}; + class ARTY_30Rnd_122mmHE_D30: FakeMagazine {}; + class ARTY_30Rnd_122mmWP_D30: FakeMagazine {}; + class ARTY_30Rnd_122mmSADARM_D30: FakeMagazine {}; + class ARTY_30Rnd_122mmLASER_D30: FakeMagazine {}; + class ARTY_30Rnd_122mmSMOKE_D30: FakeMagazine {}; + class ARTY_30Rnd_122mmILLUM_D30: FakeMagazine {}; + class ARTY_8Rnd_82mmHE_2B14: FakeMagazine {}; + class ARTY_8Rnd_82mmWP_2B14: FakeMagazine {}; + class ARTY_8Rnd_82mmILLUM_2B14: FakeMagazine {}; + class ARTY_40Rnd_120mmHE_BM21: FakeMagazine {}; + class Warfare30Rnd82mmMortar: FakeMagazine {}; + class 100Rnd_127x99_L2A1: FakeMagazine {}; + //class 5Rnd_127x99_as50: FakeMagazine {}; + //class 5Rnd_86x70_L115A1: FakeMagazine {}; + class NLAW: FakeMagazine {}; + class 200Rnd_556x45_L110A1: FakeMagazine {}; + //class 200Rnd_762x54_GPMG: FakeMagazine {}; + class 32Rnd_40mm_GMG: FakeMagazine {}; + class 12Rnd_CRV7: FakeMagazine {}; + class 38Rnd_CRV7: FakeMagazine {}; + class 6Rnd_CRV7_HEPD: FakeMagazine {}; + class 6Rnd_CRV7_FAT: FakeMagazine {}; + class 1200Rnd_20mm_M621: FakeMagazine {}; + class 200Rnd_40mmHE_FV510: FakeMagazine {}; + class 200Rnd_40mmSABOT_FV510: FakeMagazine {}; + class 2000Rnd_762x51_L94A1: FakeMagazine {}; + //class 200Rnd_762x51_M240: FakeMagazine {}; + class BAF_ied_v1: FakeMagazine {}; + class BAF_ied_v2: FakeMagazine {}; + class BAF_ied_v3: FakeMagazine {}; + class BAF_ied_v4: FakeMagazine {}; + class BAF_L109A1_HE: FakeMagazine {}; + class 21Rnd_100mmHEAT_D10: FakeMagazine {}; + class 6RND_105mm_APDS: FakeMagazine {}; + class 12RND_105mm_HESH: FakeMagazine {}; + class 4Rnd_Hellfire: FakeMagazine {}; + //class 10Rnd_B_765x17_Ball: FakeMagazine {}; + //class 20Rnd_B_765x17_Ball: FakeMagazine {}; + class 4Rnd_Stinger: FakeMagazine {}; + //class 30Rnd_9x19_UZI_SD: FakeMagazine {}; + //class 30Rnd_9x19_UZI: FakeMagazine {}; + //class 6Rnd_45ACP: FakeMagazine {}; + //class 17Rnd_9x19_glock17: FakeMagazine {}; + class MAAWS_HEDP: FakeMagazine {}; + class MAAWS_HEAT: FakeMagazine {}; + /* + class 20Rnd_762x51_B_SCAR: FakeMagazine {}; + class 20Rnd_762x51_SB_SCAR: FakeMagazine {}; + class 30Rnd_762x39_SA58: FakeMagazine {}; + class 100Rnd_556x45_M249: FakeMagazine {}; + class IR_Strobe_Target: FakeMagazine {}; + class IR_Strobe_Marker: FakeMagazine {}; + class IRStrobe: FakeMagazine {}; + class 60Rnd_CMFlareMagazine: FakeMagazine {}; + class 120Rnd_CMFlareMagazine: FakeMagazine {}; + class 240Rnd_CMFlareMagazine: FakeMagazine {}; + class 60Rnd_CMFlare_Chaff_Magazine: FakeMagazine {}; + class 120Rnd_CMFlare_Chaff_Magazine: FakeMagazine {}; + class 240Rnd_CMFlare_Chaff_Magazine: FakeMagazine {}; + class 6Rnd_HE_M203: FakeMagazine {}; + class 6Rnd_FlareWhite_M203: FakeMagazine {}; + class 6Rnd_FlareGreen_M203: FakeMagazine {}; + class 6Rnd_FlareRed_M203: FakeMagazine {}; + class 6Rnd_FlareYellow_M203: FakeMagazine {}; + class 6Rnd_Smoke_M203: FakeMagazine {}; + class 6Rnd_SmokeRed_M203: FakeMagazine {}; + class 6Rnd_SmokeGreen_M203: FakeMagazine {}; + class 6Rnd_SmokeYellow_M203: FakeMagazine {}; + */ + class 24Rnd_120mmHE_M120: FakeMagazine {}; + class 24Rnd_120mmHE_M120_02: FakeMagazine {}; + class 8Rnd_81mmHE_M252: FakeMagazine {}; + class 8Rnd_81mmWP_M252: FakeMagazine {}; + class 8Rnd_81mmILLUM_M252: FakeMagazine {}; + class 8Rnd_82mmHE_2B14: FakeMagazine {}; + class 8Rnd_82mmWP_2B14: FakeMagazine {}; + class 8Rnd_82mmILLUM_2B14: FakeMagazine {}; + class 30Rnd_122mmWP_D30: FakeMagazine {}; + class 30Rnd_122mmSADARM_D30: FakeMagazine {}; + class 30Rnd_122mmLASER_D30: FakeMagazine {}; + class 30Rnd_122mmSMOKE_D30: FakeMagazine {}; + class 30Rnd_122mmILLUM_D30: FakeMagazine {}; + class 30Rnd_105mmWP_M119: FakeMagazine {}; + class 30Rnd_105mmSADARM_M119: FakeMagazine {}; + class 30Rnd_105mmLASER_M119: FakeMagazine {}; + class 30Rnd_105mmSMOKE_M119: FakeMagazine {}; + class 30Rnd_105mmILLUM_M119: FakeMagazine {}; + //class 20Rnd_762x51_FNFAL: FakeMagazine {}; + //class 10x_303: FakeMagazine {}; + class Dragon_EP1: FakeMagazine {}; + class PMC_ied_v1: FakeMagazine {}; + class PMC_ied_v2: FakeMagazine {}; + class PMC_ied_v3: FakeMagazine {}; + class PMC_ied_v4: FakeMagazine {}; + /* + class 8Rnd_B_Saiga12_Pellets: FakeMagazine {}; + class 8Rnd_B_Beneli_Pellets: FakeMagazine {}; + */ + class 20Rnd_B_AA12_Pellets: FakeMagazine {}; + class 20Rnd_B_AA12_74Slug: FakeMagazine {}; + class 20Rnd_B_AA12_HE: FakeMagazine {}; + class 29Rnd_30mm_AGS30_heli: FakeMagazine {}; + class 100Rnd_556x45_BetaCMag_airLock: FakeMagazine {}; + class 14Rnd_57mm: FakeMagazine {}; + class 6Rnd_HE_M203_heli: FakeMagazine {}; + class 150Rnd_23mm_GSh23L: FakeMagazine {}; +}; + diff --git a/dayz_anim/CfgBanned/CfgMarkers.hpp b/dayz_anim/CfgBanned/CfgMarkers.hpp new file mode 100644 index 000000000..80c51ca44 --- /dev/null +++ b/dayz_anim/CfgBanned/CfgMarkers.hpp @@ -0,0 +1,176 @@ +class CfgMarkers { + class Empty; + class Faction_US: Empty {}; + class Faction_USMC: Empty {}; + class Faction_CDF: Empty {}; + class Faction_RU: Empty {}; + class Faction_INS: Empty {}; + class Faction_GUE: Empty {}; + class Faction_USA_EP1: Empty {}; + class Faction_CzechRepublic_EP1: Empty {}; + class Faction_Germany_EP1: Empty {}; + class Faction_TKA_EP1: Empty {}; + class Faction_TKG_EP1: Empty {}; + class Faction_TKM_EP1: Empty {}; + class Faction_NATO_EP1: Empty {}; + class Faction_UNO_EP1: Empty {}; + class Faction_BLUFOR_EP1: Empty {}; + class Faction_OPFOR_EP1: Empty {}; + class Faction_INDFOR_EP1: Empty {}; + class Faction_ION_black_PMC: Empty {}; + class Faction_ION_white_PMC: Empty {}; + class Flag: Empty {}; + class Flag1: Empty {}; + class Dot: Empty {}; + class Destroy: Empty {}; + class Start: Empty {}; + class End: Empty {}; + class Warning: Empty {}; + class Join: Empty {}; + class Pickup: Empty {}; + class Unknown: Empty {}; + class Marker: Empty {}; + class Arrow: Empty {}; + class mil_objective: Empty {}; + class mil_marker: Empty {}; + class mil_flag: Empty {}; + class mil_arrow: Empty {}; + class mil_arrow2: Empty {}; + class mil_ambush: Empty {}; + class mil_destroy: Empty {}; + class mil_start: Empty {}; + class mil_end: Empty {}; + class mil_pickup: Empty {}; + class mil_join: Empty {}; + class mil_warning: Empty {}; + class mil_unknown: Empty {}; + class mil_circle: Empty {}; + class mil_dot: Empty {}; + class mil_box: Empty {}; + class mil_triangle: Empty {}; + class hd_objective: Empty {}; + class hd_flag: Empty {}; + class hd_arrow: Empty {}; + class hd_ambush: Empty {}; + class hd_destroy: Empty {}; + class hd_start: Empty {}; + class hd_end: Empty {}; + class hd_pickup: Empty {}; + class hd_join: Empty {}; + class hd_warning: Empty {}; + class hd_unknown: Empty {}; + class hd_dot: Empty {}; + class Select: Empty {}; + class SC_flag_0_east: Empty {}; + class SC_flag_0_west: Empty {}; + class SC_flag_1_east: Empty {}; + class SC_flag_1_west: Empty {}; + class NATO_base: Empty {}; + class b_empty: Empty {}; + class o_empty: Empty {}; + class n_empty: Empty {}; + class b_unknown: Empty {}; + class o_unknown: Empty {}; + class n_unknown: Empty {}; + class b_inf: Empty {}; + class o_inf: Empty {}; + class n_inf: Empty {}; + class b_motor_inf: Empty {}; + class o_motor_inf: Empty {}; + class n_motor_inf: Empty {}; + class b_mech_inf: Empty {}; + class o_mech_inf: Empty {}; + class n_mech_inf: Empty {}; + class b_armor: Empty {}; + class o_armor: Empty {}; + class n_armor: Empty {}; + class b_recon: Empty {}; + class o_recon: Empty {}; + class n_recon: Empty {}; + class b_air: Empty {}; + class o_air: Empty {}; + class n_air: Empty {}; + class b_plane: Empty {}; + class o_plane: Empty {}; + class n_plane: Empty {}; + class b_uav: Empty {}; + class o_uav: Empty {}; + class n_uav: Empty {}; + class b_med: Empty {}; + class o_med: Empty {}; + class n_med: Empty {}; + class b_art: Empty {}; + class o_art: Empty {}; + class n_art: Empty {}; + class x_art: Empty {}; + class b_mortar: Empty {}; + class o_mortar: Empty {}; + class n_mortar: Empty {}; + class x_mortar: Empty {}; + class b_hq: Empty {}; + class o_hq: Empty {}; + class n_hq: Empty {}; + class b_support: Empty {}; + class o_support: Empty {}; + class n_support: Empty {}; + class b_maint: Empty {}; + class o_maint: Empty {}; + class n_maint: Empty {}; + class b_service: Empty {}; + class o_service: Empty {}; + class n_service: Empty {}; + class group_0: Empty {}; + class group_1: Empty {}; + class group_2: Empty {}; + class group_3: Empty {}; + class group_4: Empty {}; + class group_5: Empty {}; + class group_6: Empty {}; + class group_7: Empty {}; + class group_8: Empty {}; + class group_9: Empty {}; + class group_10: Empty {}; + class group_11: Empty {}; + class waypoint: Empty {}; + class selector_selectable: Empty {}; + class selector_selectedEnemy: Empty {}; + class selector_selectedFriendly: Empty {}; + class selector_selectedMission: Empty {}; + class HQ: Empty {}; + class FOB: Empty {}; + class Airport: Empty {}; + class Heliport: Empty {}; + class Artillery: Empty {}; + class AntiAir: Empty {}; + class City: Empty {}; + class Strongpoint: Empty {}; + class Depot: Empty {}; + class FireMission: Empty {}; + class AirTeam: Empty {}; + class CommandTeam: Empty {}; + class Headquarters: Empty {}; + class HeavyTeam: Empty {}; + class InfantryTeam: Empty {}; + class LightTeam: Empty {}; + class Attack: Empty {}; + class Move: Empty {}; + class Defend: Empty {}; + class Vehicle: Empty {}; + class DestroyedVehicle: Empty {}; + class RepairVehicle: Empty {}; + class SalvageVehicle: Empty {}; + class SupplyVehicle: Empty {}; + class Town: Empty {}; + class Camp: Empty {}; + class Tank: Empty {}; + class Man: Empty {}; + class Air: Empty {}; + class Car: Empty {}; + class Boat: Empty {}; + class TownDefense0Supply4: Empty {}; + class TownDefense1Supply3: Empty {}; + class TownDefense2Supply2: Empty {}; + class TownDefense3Supply1: Empty {}; + class TownDefense4Supply0: Empty {}; + class Faction_BritishArmedForces_BAF: Empty {}; +}; \ No newline at end of file diff --git a/dayz_anim/CfgBanned/CfgVehicles.hpp b/dayz_anim/CfgBanned/CfgVehicles.hpp new file mode 100644 index 000000000..fa51bd1e4 --- /dev/null +++ b/dayz_anim/CfgBanned/CfgVehicles.hpp @@ -0,0 +1,964 @@ +class CfgVehicles { + class All; + class Banned: All + { + stopThis = true; + }; + class M2StaticMG: Banned {}; + class M119: Banned {}; + class DSHKM_Ins: Banned {}; + class DSHKM_CDF: Banned {}; + class DSHKM_Gue: Banned {}; + class AGS_Ins: Banned {}; + class AGS_CDF: Banned {}; + class AGS_RU: Banned {}; + class D30_Ins: Banned {}; + class D30_CDF: Banned {}; + class D30_RU: Banned {}; + class SearchLight: Banned {}; + class SearchLight_INS: Banned {}; + class SearchLight_CDF: Banned {}; + class SearchLight_RUS: Banned {}; + class SearchLight_Gue: Banned {}; + class M252: Banned {}; + class Metis: Banned {}; + class 2b14_82mm: Banned {}; + class 2b14_82mm_CDF: Banned {}; + class 2b14_82mm_INS: Banned {}; + class 2b14_82mm_GUE: Banned {}; + class SPG9_Gue: Banned {}; + class SPG9_CDF: Banned {}; + class SPG9_Ins: Banned {}; + class ZU23_Ins: Banned {}; + class ZU23_CDF: Banned {}; + class ZU23_Gue: Banned {}; + class RHIB: Banned {}; + class RHIB2Turret: Banned {}; + class Zodiac: Banned {}; + //class PBX: Banned {}; + class KORD: Banned {}; + class KORD_high: Banned {}; + class DSHKM_RU: Banned {}; + class USMC_Soldier: Banned {}; + class USMC_Soldier_Light: Banned {}; + class USMC_Soldier2: Banned {}; + class USMC_Soldier_GL: Banned {}; + class USMC_Soldier_Officer: Banned {}; + class USMC_Soldier_SL: Banned {}; + class USMC_Soldier_TL: Banned {}; + class USMC_Soldier_LAT: Banned {}; + class USMC_Soldier_AT: Banned {}; + class USMC_Soldier_HAT: Banned {}; + class USMC_Soldier_AA: Banned {}; + class USMC_Soldier_Medic: Banned {}; + class USMC_Soldier_AR: Banned {}; + class USMC_Soldier_MG: Banned {}; + class USMC_SoldierS_Spotter: Banned {}; + class USMC_SoldierS_Sniper: Banned {}; + class USMC_SoldierS_SniperH: Banned {}; + class USMC_SoldierM_Marksman: Banned {}; + class USMC_SoldierS: Banned {}; + class USMC_SoldierS_Engineer: Banned {}; + class USMC_Soldier_Pilot: Banned {}; + class USMC_Soldier_Crew: Banned {}; + class USMC_LHD_Crew_White: Banned {}; + class USMC_LHD_Crew_Blue: Banned {}; + class USMC_LHD_Crew_Brown: Banned {}; + class USMC_LHD_Crew_Green: Banned {}; + class USMC_LHD_Crew_Red: Banned {}; + class USMC_LHD_Crew_Purple: Banned {}; + class USMC_LHD_Crew_Yellow: Banned {}; + class FR_TL: Banned {}; + class FR_Commander: Banned {}; + class FR_R: Banned {}; + class FR_Marksman: Banned {}; + class FR_Light: Banned {}; + class FR_Corpsman: Banned {}; + class FR_AR: Banned {}; + class FR_GL: Banned {}; + class FR_Sapper: Banned {}; + class FR_AC: Banned {}; + class FR_Miles: Banned {}; + class FR_Cooper: Banned {}; + class FR_Sykes: Banned {}; + class FR_OHara: Banned {}; + class FR_Rodriguez: Banned {}; + class FR_Assault_R: Banned {}; + class FR_Assault_GL: Banned {}; + class RU_Soldier_Base: Banned {}; + class RU_Soldier: Banned {}; + class RU_Soldier2: Banned {}; + class RU_Soldier_GL: Banned {}; + class RU_Soldier_Light: Banned {}; + class RU_Soldier_Officer: Banned {}; + class RU_Soldier_SL: Banned {}; + class RU_Soldier_TL: Banned {}; + class RU_Commander: Banned {}; + class RU_Soldier_MG: Banned {}; + class RU_Soldier_AR: Banned {}; + class RU_Soldier_LAT: Banned {}; + class RU_Soldier_AT: Banned {}; + class RU_Soldier_HAT: Banned {}; + class RU_Soldier_AA: Banned {}; + class RU_Soldier_Sniper: Banned {}; + class RU_Soldier_SniperH: Banned {}; + class RU_Soldier_Spotter: Banned {}; + class RU_Soldier_Marksman: Banned {}; + class RU_Soldier_Medic: Banned {}; + class RU_Soldier_Pilot: Banned {}; + class RU_Soldier_Crew: Banned {}; + class RUS_Soldier_Base: Banned {}; + class RUS_Soldier1: Banned {}; + class RUS_Soldier2: Banned {}; + class RUS_Soldier3: Banned {}; + class RUS_Soldier_GL: Banned {}; + class RUS_Soldier_TL: Banned {}; + class RUS_Commander: Banned {}; + class RUS_Soldier_Marksman: Banned {}; + class RUS_Soldier_Sab: Banned {}; + class MVD_Soldier_Base: Banned {}; + class MVD_Soldier: Banned {}; + class MVD_Soldier_GL: Banned {}; + class MVD_Soldier_TL: Banned {}; + class MVD_Soldier_AT: Banned {}; + class MVD_Soldier_MG: Banned {}; + class MVD_Soldier_Marksman: Banned {}; + class MVD_Soldier_Sniper: Banned {}; + class GUE_Soldier_Base: Banned {}; + class GUE_Soldier_1: Banned {}; + class GUE_Soldier_2: Banned {}; + class GUE_Soldier_3: Banned {}; + class GUE_Soldier_GL: Banned {}; + class GUE_Worker2: Banned {}; + class GUE_Woodlander1: Banned {}; + class GUE_Woodlander2: Banned {}; + class GUE_Woodlander3: Banned {}; + class GUE_Villager3: Banned {}; + class GUE_Villager4: Banned {}; + class GUE_Soldier_CO: Banned {}; + class GUE_Commander: Banned {}; + class GUE_Soldier_AT: Banned {}; + class GUE_Soldier_AA: Banned {}; + class GUE_Soldier_AR: Banned {}; + class GUE_Soldier_MG: Banned {}; + class GUE_Soldier_Sniper: Banned {}; + class GUE_Soldier_Sab: Banned {}; + class GUE_Soldier_Scout: Banned {}; + class GUE_Soldier_Medic: Banned {}; + class GUE_Soldier_Pilot: Banned {}; + class GUE_Soldier_Crew: Banned {}; + class Ins_Soldier_Base: Banned {}; + //class Ins_Soldier_1: Banned {}; + class Ins_Soldier_2: Banned {}; + class Ins_Soldier_GL: Banned {}; + class Ins_Soldier_CO: Banned {}; + class Ins_Commander: Banned {}; + class Ins_Soldier_Medic: Banned {}; + class Ins_Soldier_AR: Banned {}; + class Ins_Soldier_MG: Banned {}; + class Ins_Soldier_AT: Banned {}; + class Ins_Soldier_AA: Banned {}; + class Ins_Soldier_Sniper: Banned {}; + class Ins_Soldier_Sapper: Banned {}; + class Ins_Soldier_Sab: Banned {}; + class Ins_Worker2: Banned {}; + class Ins_Woodlander1: Banned {}; + class Ins_Woodlander2: Banned {}; + class Ins_Woodlander3: Banned {}; + class Ins_Villager3: Banned {}; + class Ins_Villager4: Banned {}; + class Ins_Lopotev: Banned {}; + class Ins_Bardak: Banned {}; + class Ins_Soldier_Pilot: Banned {}; + class Ins_Soldier_Crew: Banned {}; + class CDF_Soldier_Base: Banned {}; + //class CDF_Soldier: Banned {}; + class CDF_Soldier_Light: Banned {}; + class CDF_Soldier_GL: Banned {}; + //class CDF_Soldier_Militia: Banned {}; + class CDF_Soldier_Medic: Banned {}; + class CDF_Soldier_Sniper: Banned {}; + class CDF_Soldier_Spotter: Banned {}; + class CDF_Soldier_Marksman: Banned {}; + class CDF_Soldier_RPG: Banned {}; + class CDF_Soldier_Strela: Banned {}; + //class CDF_Soldier_AR: Banned {}; + class CDF_Soldier_MG: Banned {}; + class CDF_Soldier_TL: Banned {}; + class CDF_Soldier_Officer: Banned {}; + class CDF_Commander: Banned {}; + class CDF_Soldier_Pilot: Banned {}; + class CDF_Soldier_Crew: Banned {}; + class CDF_Soldier_Engineer: Banned {}; + class Citizen2: Banned {}; + //class Citizen3: Banned {}; + class Citizen4: Banned {}; + class RU_Citizen1: Banned {}; + class RU_Citizen2: Banned {}; + class RU_Citizen3: Banned {}; + class RU_Citizen4: Banned {}; + //class Worker1: Banned {}; + class Worker2: Banned {}; + class Worker3: Banned {}; + class Worker4: Banned {}; + class RU_Worker1: Banned {}; + class RU_Worker2: Banned {}; + class RU_Worker3: Banned {}; + class RU_Worker4: Banned {}; + class Profiteer1: Banned {}; + class Profiteer2: Banned {}; + class Profiteer3: Banned {}; + class Profiteer4: Banned {}; + class RU_Profiteer1: Banned {}; + class RU_Profiteer2: Banned {}; + class RU_Profiteer3: Banned {}; + class RU_Profiteer4: Banned {}; + class Rocker1: Banned {}; + class Rocker2: Banned {}; + class Rocker3: Banned {}; + class Rocker4: Banned {}; + class RU_Rocker1: Banned {}; + class RU_Rocker2: Banned {}; + class RU_Rocker3: Banned {}; + class RU_Rocker4: Banned {}; + class Woodlander1: Banned {}; + class Woodlander2: Banned {}; + class Woodlander3: Banned {}; + class Woodlander4: Banned {}; + class RU_Woodlander1: Banned {}; + class RU_Woodlander2: Banned {}; + class RU_Woodlander3: Banned {}; + class RU_Woodlander4: Banned {}; + class Functionary1: Banned {}; + class Functionary2: Banned {}; + class RU_Functionary1: Banned {}; + class RU_Functionary2: Banned {}; + //class Villager1: Banned {}; + class Villager2: Banned {}; + class Villager3: Banned {}; + class Villager4: Banned {}; + class RU_Villager1: Banned {}; + class RU_Villager2: Banned {}; + class RU_Villager3: Banned {}; + class RU_Villager4: Banned {}; + class Priest: Banned {}; + class RU_Priest: Banned {}; + class Doctor: Banned {}; + class RU_Doctor: Banned {}; + class SchoolTeacher: Banned {}; + class RU_SchoolTeacher: Banned {}; + class Assistant: Banned {}; + class RU_Assistant: Banned {}; + class Pilot: Banned {}; + class RU_Pilot: Banned {}; + class Policeman: Banned {}; + class RU_Policeman: Banned {}; + class Secretary1: Banned {}; + class Secretary2: Banned {}; + class Secretary3: Banned {}; + class Secretary4: Banned {}; + class Secretary5: Banned {}; + class RU_Secretary1: Banned {}; + class RU_Secretary2: Banned {}; + class RU_Secretary3: Banned {}; + class RU_Secretary4: Banned {}; + class RU_Secretary5: Banned {}; + class Sportswoman1: Banned {}; + class Sportswoman2: Banned {}; + class Sportswoman3: Banned {}; + class Sportswoman4: Banned {}; + class Sportswoman5: Banned {}; + class RU_Sportswoman1: Banned {}; + class RU_Sportswoman2: Banned {}; + class RU_Sportswoman3: Banned {}; + class RU_Sportswoman4: Banned {}; + class RU_Sportswoman5: Banned {}; + class ValentinaFit: Banned {}; + class ValentinaVictim: Banned {}; + class Madam1: Banned {}; + class Madam2: Banned {}; + class Madam3: Banned {}; + class Madam4: Banned {}; + class Madam5: Banned {}; + class RU_Madam1: Banned {}; + class RU_Madam2: Banned {}; + class RU_Madam3: Banned {}; + class RU_Madam4: Banned {}; + class RU_Madam5: Banned {}; + class Farmwife1: Banned {}; + class Farmwife2: Banned {}; + class Farmwife3: Banned {}; + class Farmwife4: Banned {}; + class Farmwife5: Banned {}; + class RU_Farmwife1: Banned {}; + class RU_Farmwife2: Banned {}; + class RU_Farmwife3: Banned {}; + class RU_Farmwife4: Banned {}; + class RU_Farmwife5: Banned {}; + class Damsel1: Banned {}; + class Damsel2: Banned {}; + class Damsel3: Banned {}; + class Damsel4: Banned {}; + class Damsel5: Banned {}; + class RU_Damsel1: Banned {}; + class RU_Damsel2: Banned {}; + class RU_Damsel3: Banned {}; + class RU_Damsel4: Banned {}; + class RU_Damsel5: Banned {}; + class HouseWife1: Banned {}; + class HouseWife2: Banned {}; + class HouseWife3: Banned {}; + class HouseWife4: Banned {}; + class HouseWife5: Banned {}; + class RU_Housewife1: Banned {}; + class RU_Housewife2: Banned {}; + class RU_Housewife3: Banned {}; + class RU_Housewife4: Banned {}; + class RU_Housewife5: Banned {}; + class Hooker1: Banned {}; + class Hooker2: Banned {}; + class Hooker3: Banned {}; + class Hooker4: Banned {}; + class Hooker5: Banned {}; + class RU_Hooker1: Banned {}; + class RU_Hooker2: Banned {}; + class RU_Hooker3: Banned {}; + class RU_Hooker4: Banned {}; + class RU_Hooker5: Banned {}; + class WorkWoman1: Banned {}; + class WorkWoman2: Banned {}; + class WorkWoman3: Banned {}; + class WorkWoman4: Banned {}; + class WorkWoman5: Banned {}; + class RU_WorkWoman1: Banned {}; + class RU_WorkWoman2: Banned {}; + class RU_WorkWoman3: Banned {}; + class RU_WorkWoman4: Banned {}; + class RU_WorkWoman5: Banned {}; + //class TK_CIV_Takistani01_EP1: Banned {}; + class TK_CIV_Takistani02_EP1: Banned {}; + class TK_CIV_Takistani03_EP1: Banned {}; + class TK_CIV_Takistani04_EP1: Banned {}; + //class TK_CIV_Takistani05_EP1: Banned {}; + class TK_CIV_Takistani06_EP1: Banned {}; + class TK_CIV_Worker01_EP1: Banned {}; + class TK_CIV_Worker02_EP1: Banned {}; + class TK_CIV_Woman01_EP1: Banned {}; + class TK_CIV_Woman02_EP1: Banned {}; + class TK_CIV_Woman03_EP1: Banned {}; + class CIV_EuroWoman01_EP1: Banned {}; + class CIV_EuroWoman02_EP1: Banned {}; + class Dr_Annie_Baker_EP1: Banned {}; + class Rita_Ensler_EP1: Banned {}; + class CIV_EuroMan01_EP1: Banned {}; + class CIV_EuroMan02_EP1: Banned {}; + class Haris_Press_EP1: Banned {}; + class Dr_Hladik_EP1: Banned {}; + class Citizen2_EP1: Banned {}; + class Citizen3_EP1: Banned {}; + class Profiteer2_EP1: Banned {}; + class Functionary1_EP1: Banned {}; + class Functionary2_EP1: Banned {}; + class Pilot_EP1: Banned {}; + //class TK_INS_Soldier_EP1: Banned {}; + class TK_INS_Soldier_AAT_EP1: Banned {}; + class TK_INS_Soldier_2_EP1: Banned {}; + class TK_INS_Soldier_3_EP1: Banned {}; + class TK_INS_Soldier_4_EP1: Banned {}; + class TK_INS_Soldier_AA_EP1: Banned {}; + class TK_INS_Soldier_AT_EP1: Banned {}; + class TK_INS_Soldier_TL_EP1: Banned {}; + class TK_INS_Soldier_Sniper_EP1: Banned {}; + class TK_INS_Soldier_AR_EP1: Banned {}; + class TK_INS_Soldier_MG_EP1: Banned {}; + class TK_INS_Bonesetter_EP1: Banned {}; + class TK_INS_Warlord_EP1: Banned {}; + class TK_GUE_Soldier_EP1: Banned {}; + class TK_GUE_Soldier_AAT_EP1: Banned {}; + class TK_GUE_Soldier_2_EP1: Banned {}; + class TK_GUE_Soldier_3_EP1: Banned {}; + class TK_GUE_Soldier_4_EP1: Banned {}; + class TK_GUE_Soldier_5_EP1: Banned {}; + class TK_GUE_Soldier_AA_EP1: Banned {}; + class TK_GUE_Soldier_AT_EP1: Banned {}; + class TK_GUE_Soldier_HAT_EP1: Banned {}; + class TK_GUE_Soldier_TL_EP1: Banned {}; + class TK_GUE_Soldier_Sniper_EP1: Banned {}; + class TK_GUE_Soldier_AR_EP1: Banned {}; + class TK_GUE_Soldier_MG_EP1: Banned {}; + class TK_GUE_Bonesetter_EP1: Banned {}; + class TK_GUE_Warlord_EP1: Banned {}; + class US_Delta_Force_Undercover_Takistani02_EP1: Banned {}; + class US_Delta_Force_Undercover_Takistani04_EP1: Banned {}; + class US_Delta_Force_Undercover_Takistani05_EP1: Banned {}; + class US_Delta_Force_Undercover_Takistani06_EP1: Banned {}; + class CZ_Soldier_SL_DES_EP1: Banned {}; + //class CZ_Soldier_DES_EP1: Banned {}; + class CZ_Soldier_B_DES_EP1: Banned {}; + class CZ_Soldier_medik_DES_EP1: Banned {}; + class CZ_Soldier_AMG_DES_EP1: Banned {}; + class CZ_Soldier_AT_DES_EP1: Banned {}; + class CZ_Soldier_MG_DES_EP1: Banned {}; + class CZ_Soldier_Office_DES_EP1: Banned {}; + class CZ_Soldier_Light_DES_EP1: Banned {}; + class CZ_Soldier_Pilot_EP1: Banned {}; + class CZ_Soldier_Sniper_EP1: Banned {}; + class CZ_Special_Forces_Scout_DES_EP1: Banned {}; + class CZ_Special_Forces_MG_DES_EP1: Banned {}; + class CZ_Special_Forces_DES_EP1: Banned {}; + class CZ_Special_Forces_TL_DES_EP1: Banned {}; + class CZ_Special_Forces_GL_DES_EP1: Banned {}; + //class US_Soldier_EP1: Banned {}; + class US_Soldier_B_EP1: Banned {}; + class US_Soldier_AMG_EP1: Banned {}; + class US_Soldier_AAR_EP1: Banned {}; + class US_Soldier_AHAT_EP1: Banned {}; + class US_Soldier_AAT_EP1: Banned {}; + class US_Soldier_Light_EP1: Banned {}; + class US_Soldier_GL_EP1: Banned {}; + class US_Soldier_Officer_EP1: Banned {}; + class US_Soldier_SL_EP1: Banned {}; + class US_Soldier_TL_EP1: Banned {}; + class US_Soldier_LAT_EP1: Banned {}; + class US_Soldier_AT_EP1: Banned {}; + class US_Soldier_HAT_EP1: Banned {}; + class US_Soldier_AA_EP1: Banned {}; + class US_Soldier_Medic_EP1: Banned {}; + class US_Soldier_AR_EP1: Banned {}; + class US_Soldier_MG_EP1: Banned {}; + class US_Soldier_Spotter_EP1: Banned {}; + class US_Soldier_Sniper_EP1: Banned {}; + class US_Soldier_Sniper_NV_EP1: Banned {}; + class US_Soldier_SniperH_EP1: Banned {}; + class US_Soldier_Marksman_EP1: Banned {}; + class US_Soldier_Engineer_EP1: Banned {}; + class US_Soldier_Pilot_EP1: Banned {}; + class US_Soldier_Crew_EP1: Banned {}; + class US_Delta_Force_EP1: Banned {}; + class US_Delta_Force_TL_EP1: Banned {}; + class US_Delta_Force_Medic_EP1: Banned {}; + class US_Delta_Force_Assault_EP1: Banned {}; + class US_Delta_Force_SD_EP1: Banned {}; + class US_Delta_Force_MG_EP1: Banned {}; + class US_Delta_Force_AR_EP1: Banned {}; + class US_Delta_Force_Night_EP1: Banned {}; + class US_Delta_Force_Marksman_EP1: Banned {}; + class US_Delta_Force_M14_EP1: Banned {}; + class US_Delta_Force_Air_Controller_EP1: Banned {}; + class US_Pilot_Light_EP1: Banned {}; + class Drake: Banned {}; + class Herrera: Banned {}; + class Pierce: Banned {}; + class Graves: Banned {}; + class Drake_Light: Banned {}; + class Herrera_Light: Banned {}; + class Pierce_Light: Banned {}; + class Graves_Light: Banned {}; + class UN_CDF_Soldier_base_EP1: Banned {}; + class UN_CDF_Soldier_EP1: Banned {}; + class UN_CDF_Soldier_B_EP1: Banned {}; + class UN_CDF_Soldier_AAT_EP1: Banned {}; + class UN_CDF_Soldier_AMG_EP1: Banned {}; + class UN_CDF_Soldier_AT_EP1: Banned {}; + class UN_CDF_Soldier_MG_EP1: Banned {}; + class UN_CDF_Soldier_SL_EP1: Banned {}; + class UN_CDF_Soldier_Officer_EP1: Banned {}; + class UN_CDF_Soldier_Guard_EP1: Banned {}; + class UN_CDF_Soldier_Pilot_EP1: Banned {}; + class UN_CDF_Soldier_Crew_EP1: Banned {}; + class UN_CDF_Soldier_Light_EP1: Banned {}; + class TK_Soldier_EP1: Banned {}; + class TK_Soldier_GL_EP1: Banned {}; + class TK_Soldier_B_EP1: Banned {}; + class TK_Soldier_AAT_EP1: Banned {}; + class TK_Soldier_AMG_EP1: Banned {}; + class TK_Soldier_LAT_EP1: Banned {}; + class TK_Soldier_AT_EP1: Banned {}; + class TK_Soldier_HAT_EP1: Banned {}; + class TK_Soldier_AA_EP1: Banned {}; + class TK_Soldier_Engineer_EP1: Banned {}; + class TK_Soldier_MG_EP1: Banned {}; + class TK_Soldier_AR_EP1: Banned {}; + class TK_Soldier_Medic_EP1: Banned {}; + class TK_Soldier_SL_EP1: Banned {}; + class TK_Soldier_Officer_EP1: Banned {}; + class TK_Soldier_Spotter_EP1: Banned {}; + class TK_Soldier_Sniper_EP1: Banned {}; + class TK_Soldier_SniperH_EP1: Banned {}; + class TK_Soldier_Sniper_Night_EP1: Banned {}; + class TK_Soldier_Night_1_EP1: Banned {}; + class TK_Soldier_Night_2_EP1: Banned {}; + class TK_Soldier_TWS_EP1: Banned {}; + class TK_Soldier_Crew_EP1: Banned {}; + class TK_Soldier_Pilot_EP1: Banned {}; + class TK_Special_Forces_EP1: Banned {}; + class TK_Special_Forces_MG_EP1: Banned {}; + class TK_Aziz_EP1: Banned {}; + class TK_Commander_EP1: Banned {}; + //class GER_Soldier_EP1: Banned {}; + class GER_Soldier_Medic_EP1: Banned {}; + class GER_Soldier_TL_EP1: Banned {}; + class GER_Soldier_Scout_EP1: Banned {}; + class GER_Soldier_MG_EP1: Banned {}; + class InvisibleManW_EP1: Banned {}; + class InvisibleManE_EP1: Banned {}; + class EW_Brown: Banned {}; + class EW_Lev: Banned {}; + class EW_Greg: Banned {}; + class EW_Spec3: Banned {}; + class EW_Spec4: Banned {}; + class EW_Miki: Banned {}; + class EW_Luca: Banned {}; + class M1A1: Banned {}; + class M1A2_TUSK_MG: Banned {}; + class BMP2_INS: Banned {}; + class BMP2_Ambul_INS: Banned {}; + class BMP2_HQ_INS: Banned {}; + class T72_INS: Banned {}; + class T72_RU: Banned {}; + class ZSU_INS: Banned {}; + class BMP2_CDF: Banned {}; + class BMP2_Ambul_CDF: Banned {}; + class BMP2_HQ_CDF: Banned {}; + class T72_CDF: Banned {}; + class ZSU_CDF: Banned {}; + class BMP2_Gue: Banned {}; + class T72_Gue: Banned {}; + class SeaFox: Banned {}; + class SeaFox_AllwaysEnemy: Banned {}; + class USMC_WarfareBMGNest_M240: Banned {}; + class RU_WarfareBMGNest_PK: Banned {}; + class GUE_WarfareBMGNest_PK: Banned {}; + class Ins_WarfareBMGNest_PK: Banned {}; + class CDF_WarfareBMGNest_PK: Banned {}; + class DSHkM_Mini_TriPod: Banned {}; + class DSHkM_Mini_TriPod_CDF: Banned {}; + class M2HD_mini_TriPod: Banned {}; + class MK19_TriPod: Banned {}; + class Stinger_Pod: Banned {}; + class TOW_TriPod: Banned {}; + class Igla_AA_pod_East: Banned {}; + class HMMWV_M2: Banned {}; + class HMMWV_TOW: Banned {}; + class HMMWV_MK19: Banned {}; + class HMMWV: Banned {}; + class UAZ_MG_CDF: Banned {}; + class UAZ_AGS30_CDF: Banned {}; + class UralOpen_CDF: Banned {}; + class UralRepair_CDF: Banned {}; + class UralReammo_CDF: Banned {}; + class UralRefuel_CDF: Banned {}; + class Ural_ZU23_CDF: Banned {}; + class BRDM2_CDF: Banned {}; + class BRDM2_ATGM_CDF: Banned {}; + class GRAD_CDF: Banned {}; + class UAZ_AGS30_RU: Banned {}; + class GRAD_RU: Banned {}; + class UAZ_MG_INS: Banned {}; + class UAZ_AGS30_INS: Banned {}; + class UAZ_INS: Banned {}; + class UAZ_SPG9_INS: Banned {}; + class UralRepair_INS: Banned {}; + class UralReammo_INS: Banned {}; + class UralRefuel_INS: Banned {}; + class Ural_ZU23_INS: Banned {}; + class BRDM2_INS: Banned {}; + class BRDM2_ATGM_INS: Banned {}; + class GRAD_INS: Banned {}; + class BRDM2_Gue: Banned {}; + class BRDM2_HQ_Gue: Banned {}; + class Ural_ZU23_Gue: Banned {}; + class Pickup_PK_GUE: Banned {}; + class Pickup_PK_INS: Banned {}; + class Offroad_DSHKM_Gue: Banned {}; + class Offroad_SPG9_Gue: Banned {}; + class Offroad_DSHKM_INS: Banned {}; + class AH1Z: Banned {}; + class MH60S: Banned {}; + class AV8B2: Banned {}; + class AV8B: Banned {}; + class Mi17_Ins: Banned {}; + class Mi17_CDF: Banned {}; + class Mi17_rockets_RU: Banned {}; + class Mi17_medevac_Ins: Banned {}; + class Mi17_medevac_CDF: Banned {}; + class Mi17_medevac_RU: Banned {}; + class Mi17_Civilian: Banned {}; + class Fort_Nest_M240: Banned {}; + class SeaFox_EP1: Banned {}; + class SeaFox_AllwaysEnemy_EP1: Banned {}; + class 2S6M_Tunguska: Banned {}; + class AAV: Banned {}; + class AAV_cutscene: Banned {}; + class BMP3: Banned {}; + class T34: Banned {}; + class T90: Banned {}; + class MLRS: Banned {}; + class BTR90: Banned {}; + class BTR90_HQ: Banned {}; + class GAZ_Vodnik_HMG: Banned {}; + class GAZ_Vodnik: Banned {}; + class GAZ_Vodnik_MedEvac: Banned {}; + class HMMWV_Armored: Banned {}; + class HMMWV_Ambulance: Banned {}; + class HMMWV_Avenger: Banned {}; + class Kamaz: Banned {}; + class KamazOpen: Banned {}; + class KamazRepair: Banned {}; + class KamazReammo: Banned {}; + class KamazRefuel: Banned {}; + class LAV25: Banned {}; + class LAV25_HQ: Banned {}; + class MMT_USMC: Banned {}; + class MMT_Civ: Banned {}; + class MTVR: Banned {}; + class MtvrReammo: Banned {}; + class MtvrRefuel: Banned {}; + class MtvrRepair: Banned {}; + class TowingTractor: Banned {}; + //class V3S_Civ: Banned {}; + class V3S_Gue: Banned {}; + class UAZ_MG_TK_EP1: Banned {}; + class UAZ_AGS30_TK_EP1: Banned {}; + class Ural_UN_EP1: Banned {}; + class UralRepair_TK_EP1: Banned {}; + class UralReammo_TK_EP1: Banned {}; + class UralRefuel_TK_EP1: Banned {}; + class Ural_ZU23_TK_EP1: Banned {}; + class Ural_ZU23_TK_GUE_EP1: Banned {}; + class UralSupply_TK_EP1: Banned {}; + class UralSalvage_TK_EP1: Banned {}; + class Pickup_PK_TK_GUE_EP1: Banned {}; + class Offroad_DSHKM_TK_GUE_EP1: Banned {}; + class Offroad_SPG9_TK_GUE_EP1: Banned {}; + class HMMWV_DES_EP1: Banned {}; + class HMMWV_MK19_DES_EP1: Banned {}; + class HMMWV_Ambulance_DES_EP1: Banned {}; + class HMMWV_Ambulance_CZ_DES_EP1: Banned {}; + class HMMWV_Avenger_DES_EP1: Banned {}; + class MTVR_DES_EP1: Banned {}; + class MtvrReammo_DES_EP1: Banned {}; + class MtvrRefuel_DES_EP1: Banned {}; + class MtvrRepair_DES_EP1: Banned {}; + class MtvrSupply_DES_EP1: Banned {}; + class MtvrSalvage_DES_EP1: Banned {}; + class GRAD_TK_EP1: Banned {}; + class BRDM2_TK_EP1: Banned {}; + class BRDM2_ATGM_TK_EP1: Banned {}; + class BRDM2_TK_GUE_EP1: Banned {}; + class BRDM2_HQ_TK_GUE_EP1: Banned {}; + class BTR40_MG_TK_GUE_EP1: Banned {}; + class BTR40_TK_GUE_EP1: Banned {}; + class BTR40_MG_TK_INS_EP1: Banned {}; + class BTR40_TK_INS_EP1: Banned {}; + class BTR60_TK_EP1: Banned {}; + class HMMWV_M1035_DES_EP1: Banned {}; + class HMMWV_M1151_M2_CZ_DES_EP1: Banned {}; + class HMMWV_M1151_M2_DES_EP1: Banned {}; + class HMMWV_M998_crows_M2_DES_EP1: Banned {}; + class HMMWV_M998_crows_MK19_DES_EP1: Banned {}; + class HMMWV_M998A2_SOV_DES_EP1: Banned {}; + class HMMWV_TOW_DES_EP1: Banned {}; + class HMMWV_Terminal_EP1: Banned {}; + class LandRover_MG_TK_INS_EP1: Banned {}; + class LandRover_MG_TK_EP1: Banned {}; + class LandRover_Special_CZ_EP1: Banned {}; + class LandRover_SPG9_TK_INS_EP1: Banned {}; + class LandRover_SPG9_TK_EP1: Banned {}; + //class S1203_TK_CIV_EP1: Banned {}; + class S1203_ambulance_EP1: Banned {}; + class MAZ_543_SCUD_TK_EP1: Banned {}; + class M1126_ICV_M2_EP1: Banned {}; + class M1126_ICV_mk19_EP1: Banned {}; + class M1130_CV_EP1: Banned {}; + class M1129_MC_EP1: Banned {}; + class M1135_ATGMV_EP1: Banned {}; + class M1128_MGS_EP1: Banned {}; + class M1133_MEV_EP1: Banned {}; + class SUV_Base_EP1: Banned {}; + class VWGolf: Banned {}; + class SUV_UN_EP1: Banned {}; + class ArmoredSUV_PMC: Banned {}; + class ArmoredSUV_GunNotCommanding_PMC: Banned {}; + class A10: Banned {}; + class AH64D: Banned {}; + class AH64D_Sidewinders: Banned {}; + class Mi24_V: Banned {}; + class Mi24_P: Banned {}; + class Mi24_D: Banned {}; + class C130J: Banned {}; + class Chukar: Banned {}; + class Chukar_AllwaysEnemy: Banned {}; + class F35B: Banned {}; + class Ka52: Banned {}; + class Ka52Black: Banned {}; + class MQ9PredatorB: Banned {}; + class MQ9PredatorB_campaign: Banned {}; + class MV22: Banned {}; + class Pchela1T: Banned {}; + class Su25_CDF: Banned {}; + class Su25_Ins: Banned {}; + class Su39: Banned {}; + //class UH1Wreck: Banned {}; + class UH1Y: Banned {}; + class UH1Y_cutscene: Banned {}; + class Su34: Banned {}; + //class UH60_wreck_EP1: Banned {}; + class WarfareSalvageTruck_USMC: Banned {}; + class WarfareSupplyTruck_USMC: Banned {}; + class WarfareReammoTruck_USMC: Banned {}; + class WarfareSalvageTruck_RU: Banned {}; + class WarfareSupplyTruck_RU: Banned {}; + class WarfareReammoTruck_RU: Banned {}; + class WarfareSalvageTruck_CDF: Banned {}; + class WarfareSupplyTruck_CDF: Banned {}; + class WarfareReammoTruck_CDF: Banned {}; + class WarfareSalvageTruck_INS: Banned {}; + class WarfareSupplyTruck_INS: Banned {}; + class WarfareReammoTruck_INS: Banned {}; + class WarfareSalvageTruck_Gue: Banned {}; + class WarfareSupplyTruck_Gue: Banned {}; + class WarfareReammoTruck_Gue: Banned {}; + class WarfareRepairTruck_Gue: Banned {}; + class Warfare2b14_82mm: Banned {}; + class Warfare2b14_82mm_CDF: Banned {}; + class Warfare2b14_82mm_INS: Banned {}; + class Warfare2b14_82mm_GUE: Banned {}; + class BAF_L2A1_Tripod_D: Banned {}; + class BAF_L2A1_Tripod_W: Banned {}; + class BAF_L2A1_Minitripod_D: Banned {}; + class BAF_L2A1_Minitripod_W: Banned {}; + class BAF_GPMG_Minitripod_D: Banned {}; + class BAF_GPMG_Minitripod_W: Banned {}; + class BAF_GMG_Tripod_D: Banned {}; + class BAF_GMG_Tripod_W: Banned {}; + class WarfareBMGNest_M240_US_EP1: Banned {}; + class M2StaticMG_US_EP1: Banned {}; + class M2HD_mini_TriPod_US_EP1: Banned {}; + class M119_US_EP1: Banned {}; + class SearchLight_US_EP1: Banned {}; + class M252_US_EP1: Banned {}; + class Stinger_Pod_US_EP1: Banned {}; + class MK19_TriPod_US_EP1: Banned {}; + class TOW_TriPod_US_EP1: Banned {}; + class AGS_UN_EP1: Banned {}; + class SearchLight_UN_EP1: Banned {}; + class KORD_UN_EP1: Banned {}; + class KORD_high_UN_EP1: Banned {}; + class DSHKM_TK_GUE_EP1: Banned {}; + class DSHkM_Mini_TriPod_TK_GUE_EP1: Banned {}; + class 2b14_82mm_TK_GUE_EP1: Banned {}; + class SPG9_TK_GUE_EP1: Banned {}; + class ZU23_TK_GUE_EP1: Banned {}; + class WarfareBMGNest_PK_TK_GUE_EP1: Banned {}; + class AGS_TK_GUE_EP1: Banned {}; + class D30_TK_GUE_EP1: Banned {}; + class SearchLight_TK_GUE_EP1: Banned {}; + class DSHKM_TK_INS_EP1: Banned {}; + class DSHkM_Mini_TriPod_TK_INS_EP1: Banned {}; + class 2b14_82mm_TK_INS_EP1: Banned {}; + class SPG9_TK_INS_EP1: Banned {}; + class ZU23_TK_INS_EP1: Banned {}; + class AGS_TK_INS_EP1: Banned {}; + class D30_TK_INS_EP1: Banned {}; + class SearchLight_TK_INS_EP1: Banned {}; + class Igla_AA_pod_TK_EP1: Banned {}; + class AGS_TK_EP1: Banned {}; + class D30_TK_EP1: Banned {}; + class KORD_TK_EP1: Banned {}; + class KORD_high_TK_EP1: Banned {}; + class Metis_TK_EP1: Banned {}; + class 2b14_82mm_TK_EP1: Banned {}; + class SearchLight_TK_EP1: Banned {}; + class ZU23_TK_EP1: Banned {}; + class WarfareBMGNest_PK_TK_EP1: Banned {}; + class AGS_CZ_EP1: Banned {}; + class 2b14_82mm_CZ_EP1: Banned {}; + class DSHKM_CZ_EP1: Banned {}; + class V3S_TK_EP1: Banned {}; + class V3S_Open_TK_EP1: Banned {}; + class V3S_Open_TK_CIV_EP1: Banned {}; + class V3S_TK_GUE_EP1: Banned {}; + class V3S_Refuel_TK_GUE_EP1: Banned {}; + class V3S_Repair_TK_GUE_EP1: Banned {}; + class V3S_Reammo_TK_GUE_EP1: Banned {}; + class V3S_Supply_TK_GUE_EP1: Banned {}; + class V3S_Salvage_TK_GUE_EP1: Banned {}; + class CruiseMissile1: Banned {}; + class CruiseMissile2: Banned {}; + class Mi24_D_TK_EP1: Banned {}; + class Su25_TK_EP1: Banned {}; + class C130J_US_EP1: Banned {}; + class Parachute_US_EP1: Banned {}; + class Parachute_TK_EP1: Banned {}; + class Parachute_TK_GUE_EP1: Banned {}; + class ParachuteBigWest_EP1: Banned {}; + class ParachuteBigEast_EP1: Banned {}; + class ParachuteMediumWest_EP1: Banned {}; + class ParachuteMediumEast_EP1: Banned {}; + class MQ9PredatorB_US_EP1: Banned {}; + class Chukar_EP1: Banned {}; + class Chukar_AllwaysEnemy_EP1: Banned {}; + class AH64D_EP1: Banned {}; + class AH6J_EP1: Banned {}; + class AH6X_EP1: Banned {}; + class MH6J_EP1: Banned {}; + class An2_1_TK_CIV_EP1: Banned {}; + class An2_2_TK_CIV_EP1: Banned {}; + class An2_TK_EP1: Banned {}; + class CH_47F_EP1: Banned {}; + class Steerable_Parachute_EP1: Banned {}; + class Mi17_UN_CDF_EP1: Banned {}; + class Mi171Sh_rockets_CZ_EP1: Banned {}; + class Mi171Sh_CZ_EP1: Banned {}; + class Mi17_TK_EP1: Banned {}; + class UH1H_TK_EP1: Banned {}; + class UH1H_TK_GUE_EP1: Banned {}; + class UH60M_EP1: Banned {}; + class UH60M_MEV_EP1: Banned {}; + class Ka137_PMC: Banned {}; + class Ka137_MG_PMC: Banned {}; + class Ka60_GL_PMC: Banned {}; + class Ka60_PMC: Banned {}; + class CIV_Contractor1_BAF: Banned {}; + class CIV_Contractor2_BAF: Banned {}; + //class BAF_Soldier_MTP: Banned {}; + //class BAF_Soldier_DDPM: Banned {}; + class BAF_Soldier_GL_MTP: Banned {}; + class BAF_Soldier_GL_DDPM: Banned {}; + class BAF_Soldier_N_MTP: Banned {}; + class BAF_Soldier_N_DDPM: Banned {}; + //class BAF_Soldier_L_MTP: Banned {}; + //class BAF_Soldier_L_DDPM: Banned {}; + class BAF_ASoldier_MTP: Banned {}; + class BAF_ASoldier_DDPM: Banned {}; + class BAF_Soldier_AAR_MTP: Banned {}; + class BAF_Soldier_AAR_DDPM: Banned {}; + class BAF_Soldier_AMG_MTP: Banned {}; + class BAF_Soldier_AMG_DDPM: Banned {}; + class BAF_Soldier_AAT_MTP: Banned {}; + class BAF_Soldier_AAT_DDPM: Banned {}; + class BAF_Soldier_AHAT_MTP: Banned {}; + class BAF_Soldier_AHAT_DDPM: Banned {}; + class BAF_Soldier_AAA_MTP: Banned {}; + class BAF_Soldier_AAA_DDPM: Banned {}; + //class BAF_Soldier_Officer_MTP: Banned {}; + //class BAF_Soldier_Officer_DDPM: Banned {}; + class BAF_Soldier_SL_MTP: Banned {}; + class BAF_Soldier_SL_DDPM: Banned {}; + class BAF_Soldier_TL_MTP: Banned {}; + class BAF_Soldier_TL_DDPM: Banned {}; + class BAF_Soldier_AR_MTP: Banned {}; + class BAF_Soldier_AR_DDPM: Banned {}; + class BAF_Soldier_MG_MTP: Banned {}; + class BAF_Soldier_MG_DDPM: Banned {}; + class BAF_Soldier_AT_MTP: Banned {}; + class BAF_Soldier_AT_DDPM: Banned {}; + class BAF_Soldier_HAT_MTP: Banned {}; + class BAF_Soldier_HAT_DDPM: Banned {}; + class BAF_Soldier_AA_MTP: Banned {}; + class BAF_Soldier_AA_DDPM: Banned {}; + class BAF_Soldier_Marksman_MTP: Banned {}; + class BAF_Soldier_Marksman_DDPM: Banned {}; + class BAF_Soldier_scout_MTP: Banned {}; + class BAF_Soldier_scout_DDPM: Banned {}; + //class BAF_Soldier_Sniper_MTP: Banned {}; + //class BAF_Soldier_SniperH_MTP: Banned {}; + //class BAF_Soldier_SniperN_MTP: Banned {}; + class BAF_Soldier_spotter_MTP: Banned {}; + class BAF_Soldier_spotterN_MTP: Banned {}; + class BAF_Pilot_MTP: Banned {}; + class BAF_Pilot_DDPM: Banned {}; + class BAF_crewman_MTP: Banned {}; + class BAF_crewman_DDPM: Banned {}; + class BAF_Soldier_Medic_MTP: Banned {}; + class BAF_Soldier_Medic_DDPM: Banned {}; + class BAF_Soldier_FAC_MTP: Banned {}; + class BAF_Soldier_FAC_DDPM: Banned {}; + class BAF_Soldier_EN_MTP: Banned {}; + class BAF_Soldier_EN_DDPM: Banned {}; + class Soldier_PMC: Banned {}; + class Soldier_M4A3_PMC: Banned {}; + class Soldier_Engineer_PMC: Banned {}; + //class Soldier_Crew_PMC: Banned {}; //Bandit Skin (Head) + class Soldier_Medic_PMC: Banned {}; + class Soldier_TL_PMC: Banned {}; + class Soldier_Pilot_PMC: Banned {}; + class Soldier_MG_PMC: Banned {}; + class Soldier_MG_PKM_PMC: Banned {}; + class Soldier_Sniper_PMC: Banned {}; + class Soldier_Sniper_KSVK_PMC: Banned {}; + class Soldier_GL_PMC: Banned {}; + class Soldier_GL_M16A2_PMC: Banned {}; + class Soldier_Bodyguard_M4_PMC: Banned {}; + class Soldier_Bodyguard_AA12_PMC: Banned {}; + class Soldier_AA_PMC: Banned {}; + class Soldier_AT_PMC: Banned {}; + class Poet_PMC: Banned {}; + class Ry_PMC: Banned {}; + class Reynolds_PMC: Banned {}; + class Tanny_PMC: Banned {}; + class Dixon_PMC: Banned {}; + class BAF_Soldier_GL_W: Banned {}; + class BAF_Soldier_N_W: Banned {}; + class BAF_ASoldier_W: Banned {}; + class BAF_Soldier_AAR_W: Banned {}; + class BAF_Soldier_AMG_W: Banned {}; + class BAF_Soldier_AAT_W: Banned {}; + class BAF_Soldier_AHAT_W: Banned {}; + class BAF_Soldier_AAA_W: Banned {}; + class BAF_Soldier_SL_W: Banned {}; + class BAF_Soldier_TL_W: Banned {}; + class BAF_Soldier_AR_W: Banned {}; + class BAF_Soldier_MG_W: Banned {}; + class BAF_Soldier_AT_W: Banned {}; + class BAF_Soldier_HAT_W: Banned {}; + class BAF_Soldier_AA_W: Banned {}; + class BAF_Soldier_Marksman_W: Banned {}; + class BAF_Soldier_scout_W: Banned {}; + class BAF_Soldier_Sniper_W: Banned {}; + class BAF_Soldier_SniperN_W: Banned {}; + class BAF_Soldier_spotter_W: Banned {}; + class BAF_Soldier_spotterN_W: Banned {}; + class BAF_Pilot_W: Banned {}; + class BAF_creWman_W: Banned {}; + class BAF_Soldier_Medic_W: Banned {}; + class BAF_Soldier_FAC_W: Banned {}; + class BAF_Soldier_EN_W: Banned {}; + class L39_TK_EP1: Banned {}; + class ParachuteMediumWest_noGeometry_PMC: Banned {}; + class BMP2_UN_EP1: Banned {}; + class BMP2_TK_EP1: Banned {}; + class BMP2_HQ_TK_EP1: Banned {}; + class T34_TK_EP1: Banned {}; + class T34_TK_GUE_EP1: Banned {}; + class M1A1_US_DES_EP1: Banned {}; + class M1A2_US_TUSK_MG_EP1: Banned {}; + class MLRS_DES_EP1: Banned {}; + class ZSU_TK_EP1: Banned {}; + class T72_TK_EP1: Banned {}; + class M113Ambul_UN_EP1: Banned {}; + class M113_UN_EP1: Banned {}; + class M113Ambul_TK_EP1: Banned {}; + class M113_TK_EP1: Banned {}; + class M2A2_EP1: Banned {}; + class M2A3_EP1: Banned {}; + class M6_EP1: Banned {}; + class T55_TK_EP1: Banned {}; + class T55_TK_GUE_EP1: Banned {}; + class SUV_PMC_BAF: Banned {}; + class BAF_ATV_D: Banned {}; + //class BAF_Offroad_D: Banned {}; + class BAF_Jackal2_L2A1_D: Banned {}; + class BAF_Jackal2_GMG_D: Banned {}; + class BAF_ATV_W: Banned {}; + //class BAF_Offroad_W: Banned {}; + class BAF_Jackal2_L2A1_W: Banned {}; + class BAF_Jackal2_GMG_W: Banned {}; + class BAF_Apache_AH1_D: Banned {}; + class AW159_Lynx_BAF: Banned {}; + class BAF_Merlin_HC3_D: Banned {}; + class CH_47F_BAF: Banned {}; + class BAF_FV510_D: Banned {}; + class BAF_FV510_W: Banned {}; +}; diff --git a/dayz_anim/CfgBanned/CfgWeapons.hpp b/dayz_anim/CfgBanned/CfgWeapons.hpp new file mode 100644 index 000000000..0d65cd604 --- /dev/null +++ b/dayz_anim/CfgBanned/CfgWeapons.hpp @@ -0,0 +1,364 @@ +class CfgWeapons { + //class Default: FakeWeapon {}; + //class PistolCore: FakeWeapon {}; + //class RifleCore: FakeWeapon {}; + //class MGunCore: FakeWeapon {}; + //class LauncherCore: FakeWeapon {}; + //class GrenadeCore: FakeWeapon {}; + //class CannonCore: FakeWeapon {}; + class RifleCore; + class FakeWeapon: RifleCore + { + scope = 1; + stopThis = true; + type = 0; + cursor = ""; + cursoraim = ""; + sound[] = {}; + magazines[] = {"FakeMagazine"}; + }; + + //class MGun: FakeWeapon {}; + //class Pistol: FakeWeapon {}; + //class M9: FakeWeapon {}; + //class M9SD: FakeWeapon {}; + //class Makarov: FakeWeapon {}; + //class MakarovSD: FakeWeapon {}; + //class GrenadeLauncher: FakeWeapon {}; + //class Rifle: FakeWeapon {}; + //class M16_base: FakeWeapon {}; + //class M16A2: FakeWeapon {}; + //class M16A2GL: FakeWeapon {}; + //class m16a4: FakeWeapon {}; + //class m16a4_acg: FakeWeapon {}; + //class M16A4_GL: FakeWeapon {}; + //class M16A4_ACG_GL: FakeWeapon {}; + //class M24: FakeWeapon {}; + //class M40A3: FakeWeapon {}; + //class M240: FakeWeapon {}; + //class Mk_48: FakeWeapon {}; + //class M249: FakeWeapon {}; + //class M4A1: FakeWeapon {}; + //class M4A1_Aim: FakeWeapon {}; + //class M4A1_Aim_camo: FakeWeapon {}; + //class M4SPR: FakeWeapon {}; + //class M4A1_RCO_GL: FakeWeapon {}; + //class M4A1_AIM_SD_camo: FakeWeapon {}; + //class M4A1_HWS_GL_SD_Camo: FakeWeapon {}; + //class M4A1_HWS_GL: FakeWeapon {}; + //class M4A1_HWS_GL_camo: FakeWeapon {}; + //class MP5SD: FakeWeapon {}; + //class MP5A5: FakeWeapon {}; + //class PK: FakeWeapon {}; + class Pecheneg: FakeWeapon {}; + //class SVD: FakeWeapon {}; + //class SVD_CAMO: FakeWeapon {}; + + //class Launcher: FakeWeapon {}; + class ksvk: FakeWeapon {}; + class M136: FakeWeapon {}; + class Javelin: FakeWeapon {}; + class Stinger: FakeWeapon {}; + class RPG7V: FakeWeapon {}; + class Strela: FakeWeapon {}; + class Igla: FakeWeapon {}; + class MetisLauncher: FakeWeapon {}; + //class Binocular: FakeWeapon {}; + class Laserdesignator: FakeWeapon {}; + class Laserdesignator_mounted: FakeWeapon {}; + //class NVGoggles: FakeWeapon {}; + //class Throw: FakeWeapon {}; + //class HandGunBase: FakeWeapon {}; + //class Put: FakeWeapon {}; + class TimeBomb: FakeWeapon {}; + class Mine: FakeWeapon {}; + class MineE: FakeWeapon {}; + //class PipeBomb: FakeWeapon {}; + //class SmokeLauncher: FakeWeapon {}; + //class FlareLauncher: FakeWeapon {}; + class M134: FakeWeapon {}; + class M134_2: FakeWeapon {}; + class TwinM134: FakeWeapon {}; + //class M240_veh: FakeWeapon {}; + //class M240_veh_2: FakeWeapon {}; + //class M240_veh_MG_Nest: FakeWeapon {}; + class PKT: FakeWeapon {}; + class PKT_MG_Nest: FakeWeapon {}; + class PKT_veh: FakeWeapon {}; + class DT_veh: FakeWeapon {}; + class TwinVickers: FakeWeapon {}; + class M2: FakeWeapon {}; + class M3P: FakeWeapon {}; + class DSHKM: FakeWeapon {}; + class KORD: FakeWeapon {}; + class KPVT: FakeWeapon {}; + class M168: FakeWeapon {}; + class M197: FakeWeapon {}; + class AZP85: FakeWeapon {}; + class 2A14: FakeWeapon {}; + class GAU12: FakeWeapon {}; + class 2A42: FakeWeapon {}; + class 2A72: FakeWeapon {}; + class M242: FakeWeapon {}; + class YakB: FakeWeapon {}; + class GSh23L: FakeWeapon {}; + class GSh302: FakeWeapon {}; + class GAU8: FakeWeapon {}; + class 2A38M: FakeWeapon {}; + class AGS30: FakeWeapon {}; + class AGS17: FakeWeapon {}; + class MK19: FakeWeapon {}; + class M119: FakeWeapon {}; + class M256: FakeWeapon {}; + class D30: FakeWeapon {}; + class D81: FakeWeapon {}; + class ZiS_S_53: FakeWeapon {}; + class 2A46M: FakeWeapon {}; + class RocketPods: FakeWeapon {}; + class FFARLauncher: FakeWeapon {}; + class FFARLauncher_14: FakeWeapon {}; + class CamelGrenades: FakeWeapon {}; + class 57mmLauncher: FakeWeapon {}; + class 57mmLauncher_64: FakeWeapon {}; + class 57mmLauncher_128: FakeWeapon {}; + class 80mmLauncher: FakeWeapon {}; + class S8Launcher: FakeWeapon {}; + class MissileLauncher: FakeWeapon {}; + class SidewinderLaucher: FakeWeapon {}; + class SidewinderLaucher_F35: FakeWeapon {}; + class SidewinderLaucher_AH1Z: FakeWeapon {}; + class AT5Launcher: FakeWeapon {}; + class AT5LauncherSingle: FakeWeapon {}; + class 2A46MRocket: FakeWeapon {}; + class AT10LauncherSingle: FakeWeapon {}; + class AT11LauncherSingle: FakeWeapon {}; + class AT13LauncherSingle: FakeWeapon {}; + class TOWLauncher: FakeWeapon {}; + class TOWLauncherSingle: FakeWeapon {}; + class HellfireLauncher: FakeWeapon {}; + class VikhrLauncher: FakeWeapon {}; + class BombLauncher: FakeWeapon {}; + class BombLauncherF35: FakeWeapon {}; + class BombLauncherA10: FakeWeapon {}; + + //class SEARCHLIGHT: FakeWeapon {}; + //class CarHorn: FakeWeapon {}; + //class BikeHorn: FakeWeapon {}; + //class TruckHorn: FakeWeapon {}; + //class TruckHorn2: FakeWeapon {}; + //class SportCarHorn: FakeWeapon {}; + //class MiniCarHorn: FakeWeapon {}; + + class GSh301: FakeWeapon {}; + class R73Launcher: FakeWeapon {}; + class R73Launcher_2: FakeWeapon {}; + class Ch29Launcher: FakeWeapon {}; + class Ch29Launcher_Su34: FakeWeapon {}; + class 2A70Rocket: FakeWeapon {}; + class 2A70: FakeWeapon {}; + class AT6Launcher: FakeWeapon {}; + class AT9Launcher: FakeWeapon {}; + class AT2Launcher: FakeWeapon {}; + class HeliBombLauncher: FakeWeapon {}; + class AirBombLauncher: FakeWeapon {}; + class Mk82BombLauncher: FakeWeapon {}; + class Mk82BombLauncher_6: FakeWeapon {}; + class StingerLaucher: FakeWeapon {}; + class StingerLauncher_twice: FakeWeapon {}; + class AALauncher_twice: FakeWeapon {}; + class Igla_twice: FakeWeapon {}; + class MaverickLauncher: FakeWeapon {}; + class 9M311Laucher: FakeWeapon {}; + class SPG9: FakeWeapon {}; + class GRAD: FakeWeapon {}; + class MLRS: FakeWeapon {}; + class WeaponExplosive: FakeWeapon {}; + //class ItemCore: FakeWeapon {}; + class Kostey_photos: FakeWeapon {}; + class Kostey_map_case: FakeWeapon {}; + class Kostey_notebook: FakeWeapon {}; + class CDF_dogtags: FakeWeapon {}; + class Moscow_Bombing_File: FakeWeapon {}; + class Cobalt_File: FakeWeapon {}; + //class ItemWatch: FakeWeapon {}; + //class ItemCompass: FakeWeapon {}; + //class ItemGPS: FakeWeapon {}; + //class ItemRadio: FakeWeapon {}; + //class ItemMap: FakeWeapon {}; + class EvPhoto: FakeWeapon {}; + //class EvMap: FakeWeapon {}; + class EvMoscow: FakeWeapon {}; + class EvKobalt: FakeWeapon {}; + class EvMoney: FakeWeapon {}; + class EvDogTags: FakeWeapon {}; + //class AK_BASE: FakeWeapon {}; + //class AKS_BASE: FakeWeapon {}; + //class AK_107_BASE: FakeWeapon {}; + //class AK_47_M: FakeWeapon {}; + //class AK_47_S: FakeWeapon {}; + class AKS_GOLD: FakeWeapon {}; + //class AK_74: FakeWeapon {}; + //class AK_74_GL: FakeWeapon {}; + //class AK_107_kobra: FakeWeapon {}; + //class AK_107_GL_kobra: FakeWeapon {}; + class AK_107_GL_pso: FakeWeapon {}; + //class AK_107_pso: FakeWeapon {}; + //class AKS_74_kobra: FakeWeapon {}; + //class AKS_74_pso: FakeWeapon {}; + //class AKS_74_U: FakeWeapon {}; + class AKS_74_UN_kobra: FakeWeapon {}; + //class RPK_74: FakeWeapon {}; + //class bizon: FakeWeapon {}; + //class bizon_silenced: FakeWeapon {}; + //class Colt1911: FakeWeapon {}; + //class DMR: FakeWeapon {}; + //class M1014: FakeWeapon {}; + class m107: FakeWeapon {}; //old .50cal + class M252: FakeWeapon {}; + class 2B14: FakeWeapon {}; + class Saiga12K: FakeWeapon {}; + class VSS_vintorez: FakeWeapon {}; + class PMC_documents: FakeWeapon {}; + class m8_base: FakeWeapon {}; + class m8_carbine: FakeWeapon {}; + class m8_carbineGL: FakeWeapon {}; + class m8_compact: FakeWeapon {}; + class m8_sharpshooter: FakeWeapon {}; + class m8_SAW: FakeWeapon {}; + //class huntingrifle: FakeWeapon {}; + class RPG18: FakeWeapon {}; + class SMAW: FakeWeapon {}; + //class PKT_2: FakeWeapon {}; + class PKT_3: FakeWeapon {}; + class SidewinderLaucher_AH64: FakeWeapon {}; + class M230: FakeWeapon {}; + + //class BAF_L2A1: FakeWeapon {}; + //class BAF_M240_veh: FakeWeapon {}; + //class BAF_L7A2: FakeWeapon {}; + //class BAF_L94A1: FakeWeapon {}; + //class BAF_static_GMG: FakeWeapon {}; + //class BAF_GMG: FakeWeapon {}; + + class CTWS: FakeWeapon {}; + class CRV7_PG: FakeWeapon {}; + class CRV7_HEPD: FakeWeapon {}; + class CRV7_FAT: FakeWeapon {}; + class M621: FakeWeapon {}; + class BAF_AS50_scoped: FakeWeapon {}; //old .50cal + class BAF_AS50_TWS: FakeWeapon {}; + class BAF_LRR_scoped: FakeWeapon {}; + class BAF_LRR_scoped_W: FakeWeapon {}; + class BAF_NLAW_Launcher: FakeWeapon {}; + class BAF_L17_40mm: FakeWeapon {}; + //class L85A2_base_BAF: FakeWeapon {}; + //class BAF_L85A2_RIS_Holo: FakeWeapon {}; + class BAF_L85A2_UGL_Holo: FakeWeapon {}; + //class BAF_L85A2_RIS_SUSAT: FakeWeapon {}; + class BAF_L85A2_UGL_SUSAT: FakeWeapon {}; + class BAF_L85A2_RIS_ACOG: FakeWeapon {}; + class BAF_L85A2_UGL_ACOG: FakeWeapon {}; + class BAF_L85A2_RIS_CWS: FakeWeapon {}; + class BAF_L86A2_ACOG: FakeWeapon {}; + class BAF_L110A1: FakeWeapon {}; + class BAF_L110A1_Aim: FakeWeapon {}; + class BAF_L7A2_GPMG: FakeWeapon {}; + class BAF_ied_v1: FakeWeapon {}; + class BAF_ied_v2: FakeWeapon {}; + class BAF_ied_v3: FakeWeapon {}; + class BAF_ied_v4: FakeWeapon {}; + class M68: FakeWeapon {}; + class D10: FakeWeapon {}; + class PKTBC: FakeWeapon {}; + class PKTBC_veh: FakeWeapon {}; + class SGMT: FakeWeapon {}; + class HellfireLauncher_AH6: FakeWeapon {}; + class StingerLaucher_4x: FakeWeapon {}; + class CMFlareLauncher: FakeWeapon {}; + //class M242BC: FakeWeapon {}; + //class M240BC_veh: FakeWeapon {}; + class M2BC: FakeWeapon {}; + class MK19BC: FakeWeapon {}; + class M120: FakeWeapon {}; + //class Sa61_EP1: FakeWeapon {}; + //class UZI_EP1: FakeWeapon {}; + class UZI_SD_EP1: FakeWeapon {}; + //class revolver_EP1: FakeWeapon {}; + class revolver_gold_EP1: FakeWeapon {}; + //class glock17_EP1: FakeWeapon {}; + //class M60A4_EP1: FakeWeapon {}; + //class Mk_48_DES_EP1: FakeWeapon {}; + //class M249_EP1: FakeWeapon {}; + class M249_TWS_EP1: FakeWeapon {}; + class M249_m145_EP1: FakeWeapon {}; + //class M24_des_EP1: FakeWeapon {}; + //class SVD_des_EP1: FakeWeapon {}; + //class SVD_NSPU_EP1: FakeWeapon {}; + //class Sa58P_EP1: FakeWeapon {}; + //class Sa58V_EP1: FakeWeapon {}; + //class Sa58V_RCO_EP1: FakeWeapon {}; + //class Sa58V_CCO_EP1: FakeWeapon {}; + //class M4A3_CCO_EP1: FakeWeapon {}; + //class M4A3_RCO_GL_EP1: FakeWeapon {}; + //class Binocular_Vector: FakeWeapon {}; + //class AK_74_GL_kobra: FakeWeapon {}; + //class AKS_74: FakeWeapon {}; + class MK_12: FakeWeapon {}; + class AKS_74_NSPU: FakeWeapon {}; + class AKS_74_GOSHAWK: FakeWeapon {}; + //class FN_FAL: FakeWeapon {}; + //class FN_FAL_ANPVS4: FakeWeapon {}; + //class G36C_camo: FakeWeapon {}; + class G36_C_SD_camo: FakeWeapon {}; + //class G36A_camo: FakeWeapon {}; + //class G36K_camo: FakeWeapon {}; + //class G36C: FakeWeapon {}; + class G36_C_SD_eotech: FakeWeapon {}; + //class G36a: FakeWeapon {}; + //class G36K: FakeWeapon {}; + class MG36: FakeWeapon {}; + class MG36_camo: FakeWeapon {}; + class GrenadeLauncher_EP1: FakeWeapon {}; + class M32_EP1: FakeWeapon {}; + class M79_EP1: FakeWeapon {}; + class Mk13_EP1: FakeWeapon {}; + //class LeeEnfield: FakeWeapon {}; + class m107_TWS_EP1: FakeWeapon {}; + class M110_TWS_EP1: FakeWeapon {}; + class M110_NVG_EP1: FakeWeapon {}; + //class M14_EP1: FakeWeapon {}; + //class m240_scoped_EP1: FakeWeapon {}; + class M47Launcher_EP1: FakeWeapon {}; + class MAAWS: FakeWeapon {}; + class SCAR_Base: FakeWeapon {}; + //class SCAR_L_Base: FakeWeapon {}; + //class SCAR_L_CQC: FakeWeapon {}; + class SCAR_L_CQC_Holo: FakeWeapon {}; + class SCAR_L_STD_Mk4CQT: FakeWeapon {}; + class SCAR_L_STD_EGLM_RCO: FakeWeapon {}; + class SCAR_L_CQC_EGLM_Holo: FakeWeapon {}; + class SCAR_L_STD_EGLM_TWS: FakeWeapon {}; + class SCAR_L_STD_HOLO: FakeWeapon {}; + class SCAR_L_CQC_CCO_SD: FakeWeapon {}; + class SCAR_H_Base: FakeWeapon {}; + class SCAR_H_CQC_CCO: FakeWeapon {}; + class SCAR_H_CQC_CCO_SD: FakeWeapon {}; + class SCAR_H_STD_EGLM_Spect: FakeWeapon {}; + class SCAR_H_LNG_Sniper: FakeWeapon {}; + class SCAR_H_LNG_Sniper_SD: FakeWeapon {}; + class SCAR_H_STD_TWS_SD: FakeWeapon {}; + class PKT_high_AI_dispersion: FakeWeapon {}; + class PKT_high_AI_dispersion_tank: FakeWeapon {}; + class AGS30_heli: FakeWeapon {}; + class M32_heli: FakeWeapon {}; + class AA12_PMC: FakeWeapon {}; + class PMC_AS50_scoped: FakeWeapon {}; + class PMC_AS50_TWS: FakeWeapon {}; + class m8_carbine_pmc: FakeWeapon {}; + class m8_compact_pmc: FakeWeapon {}; + class m8_holo_sd: FakeWeapon {}; + class m8_tws_sd: FakeWeapon {}; + class m8_tws: FakeWeapon {}; + class GSh23L_L39: FakeWeapon {}; + +}; diff --git a/dayz_anim/config.cpp b/dayz_anim/config.cpp index bf2da642d..24c5655bf 100644 --- a/dayz_anim/config.cpp +++ b/dayz_anim/config.cpp @@ -1,3 +1,10 @@ +//Banned Weapons +//#include "CfgBanned\CfgAmmo.hpp" +//#include "CfgBanned\CfgMagazines.hpp" +//#include "CfgBanned\CfgMarkers.hpp" +//#include "CfgBanned\CfgVehicles.hpp" +//#include "CfgBanned\CfgWeapons.hpp" + class CfgPatches { class dayz_anim { units[] = {}; @@ -7,60 +14,432 @@ class CfgPatches { isUpdated = true; }; }; -class CfgMarkers -{ - class Empty; - -}; -class CfgAmmo -{ - class FakeAmmo; - -}; -class CfgMagazines { - class Default; - class FakeMagazine: Default - { - scope = 1; - ammo = "FakeAmmo"; - stopThis = true; - value = 1; - displayName = ""; - model = ""; - picture = ""; - modelSpecial = ""; - useAction = 0; - useActionTitle = ""; - reloadAction = "ManActReloadMagazine"; - count = 0; - type = 256; - initSpeed = 0; - selectionFireAnim = "zasleh"; - nameSound = "magazine"; - maxLeadSpeed = 0; - }; - -}; -class CfgWeapons +class CfgSkeletons { - class RifleCore; - class FakeWeapon: RifleCore - { - scope = 1; - stopThis = true; - type = 0; - cursor = ""; - cursoraim = ""; - sound[] = {}; - magazines[] = {"FakeMagazine"}; + class Default +{ + isDiscrete = 1; + skeletonInherit = ""; + skeletonBones[] = {}; }; -}; -class CfgVehicles { - class All; - class Banned: All + class AnimalSkeleton: Default { - stopThis = true; - }; + isDiscrete = 0; + skeletonInherit = ""; + skeletonBones[] ={}; +}; + class DogSkeleton +{ + isDiscrete = 0; + skeletonInherit = ""; + skeletonBones[] = + { + "Hips","", + "spine","Hips", + "spine1","spine", + "spine2","spine1", + "neck","spine2", + "neck1","neck", + "head","neck1", + "Jaw","head", + "Tongue1","Jaw", + "Tongue2","Tongue1", + "leftArm","spine2", + "leftForeArm","leftArm", + "leftHand","leftForeArm", + "leftFinger","leftHand", + "rightArm","spine2", + "rightForeArm","rightArm", + "rightHand","rightForeArm", + "rightFinger","rightHand", + "tail1","Hips", + "tail2","tail1", + "tail3","tail2", + "leftUpLeg","spine", + "leftLeg","leftUpLeg", + "leftFoot","leftLeg", + "leftToe","leftFoot", + "rightUpLeg","spine", + "rightLeg","rightUpLeg", + "rightFoot","rightLeg", + "rightToe","rightFoot", + "leftEar","head", + "rightEar","head" + }; + pivotsModel = "ca\Animals2\Dog_Skeleton.p3d"; + }; + class BirdSkeleton: AnimalSkeleton + { + skeletonInherit = "AnimalSkeleton"; + skeletonBones[] = + { + "head","neck", + "Hips","spine", + "leftArm","leftShoulder", + "leftForeArm","leftArm", + "leftHand","leftForeArm", + "LeftFingerBase","leftHand", + + "leftFoot","leftLeg", + "leftFootIndex1","leftFoot", + "leftFootMiddle1","leftFoot", + "leftFootRing1","leftFoot", + "leftFootThumb1","leftFoot", + + "leftLeg","leftUpLeg", + "leftShoulder","spine", + + "leftUpLeg","spine", + "neck","spine1", + + "rightArm","rightShoulder", + "rightForeArm","rightArm", + "rightHand","rightForeArm", + "rightFingerBase","RightHand", + + "rightFoot","rightLeg", + "rightFootIndex1","rightFoot", + "rightFootMiddle1","rightFoot", + "rightFootRing1","rightFoot", + "RightFootThumb1","rightFoot", + + "rightLeg","rightUpLeg", + "rightShoulder","spine", + "rightUpLeg","spine", + "spine","", + "spine1","spine", + "tail","Hips", +}; + }; + class CfgMovesButterfly: Default + { + skeletonBones[] = + { + "body", "", + "LBwing", "", + "LTwing", "", + "RBwing", "", + "RTwing", "" + }; + }; + class OFP2_ManSkeleton + { + isDiscrete = 0; + skeletonInherit = ""; + skeletonBones[] = + { + "Pelvis", "", + "Spine", "Pelvis", + "Spine1", "Spine", + "Spine2", "Spine1", + "Spine3", "Spine2", + "Camera", "Pelvis", + "weapon", "Spine1", + "launcher", "Spine1", + + //Head skeleton in hierarchy + "neck", "Spine3", + "neck1", "neck", + "head", "neck1", + "HeadCutScene", "head", + "jaw", "head", + "chin", "head", + "jaw_rf", "head", + "jaw_rm", "head", + "jaw_rs", "head", + "jaw_lf", "head", + "jaw_lm", "head", + "jaw_ls", "head", + "ear_r", "head", + "ear_l", "head", + "lip_lc", "head", + "lip_lwlb", "head", + "lip_lwlf", "head", + "lip_lwm", "head", + "lip_lwrf", "head", + "lip_lwrb", "head", + "lip_rc", "head", + "lip_uprb", "head", + "lip_uprf", "head", + "lip_upm", "head", + "lip_uplf", "head", + "lip_uplb", "head", + "nose_tip", "head", + "nose_r", "head", + "nose_l", "head", + "zig_lt", "head", + "zig_lm", "head", + "zig_lb", "head", + "zig_rt", "head", + "zig_rm", "head", + "zig_rb", "head", + "cheek_r", "head", + "cheek_l", "head", + "eyebrow_lb", "head", + "eyebrow_lm", "head", + "eyebrow_lf", "head", + "corr", "head", + "eyebrow_rf", "head", + "eyebrow_rm", "head", + "eyebrow_rb", "head", + "eye_upr", "head", + "eye_lwr", "head", + "eye_upl", "head", + "eye_lwl", "head", + "cheek_rf", "head", + "cheek_rm", "head", + "cheek_rb", "head", + "cheek_lf", "head", + "cheek_lm", "head", + "cheek_lb", "head", + "forehead_l", "head", + "forehead_m", "head", + "forehead_r", "head", + "l_eye", "head", + "r_eye", "head", + "l_pupila", "head", + "r_pupila", "head", + "neck_t", "head", + "neck_b", "head", + "neck_r", "head", + "neck_l", "head", + "tongue_b", "head", + "tongue_m", "head", + "tongue_f", "head", + + //Left upper side + "LeftShoulder", "Spine3", + "LeftArm", "LeftShoulder", + "LeftArmRoll", "LeftArm", + "LeftForeArm", "LeftArmRoll", + "LeftForeArmRoll", "LeftForeArm", + "LeftHand", "LeftForeArmRoll", + "LeftHandRing", "LeftHand", + "LeftHandRing1", "LeftHandRing", + "LeftHandRing2", "LeftHandRing1", + "LeftHandRing3", "LeftHandRing2", + "LeftHandPinky1", "LeftHandRing", + "LeftHandPinky2", "LeftHandPinky1", + "LeftHandPinky3", "LeftHandPinky2", + "LeftHandMiddle1", "LeftHand", + "LeftHandMiddle2", "LeftHandMiddle1", + "LeftHandMiddle3", "LeftHandMiddle2", + "LeftHandIndex1", "LeftHand", + "LeftHandIndex2", "LeftHandIndex1", + "LeftHandIndex3", "LeftHandIndex2", + "LeftHandThumb1", "LeftHand", + "LeftHandThumb2", "LeftHandThumb1", + "LeftHandThumb3", "LeftHandThumb2", + + //Right upper side + "RightShoulder", "Spine3", + "RightArm", "RightShoulder", + "RightArmRoll", "RightArm", + "RightForeArm", "RightArmRoll", + "RightForeArmRoll", "RightForeArm", + "RightHand", "RightForeArmRoll", + "RightHandRing", "RightHand", + "RightHandRing1", "RightHandRing", + "RightHandRing2", "RightHandRing1", + "RightHandRing3", "RightHandRing2", + "RightHandPinky1", "RightHandRing", + "RightHandPinky2", "RightHandPinky1", + "RightHandPinky3", "RightHandPinky2", + "RightHandMiddle1", "RightHand", + "RightHandMiddle2", "RightHandMiddle1", + "RightHandMiddle3", "RightHandMiddle2", + "RightHandIndex1", "RightHand", + "RightHandIndex2", "RightHandIndex1", + "RightHandIndex3", "RightHandIndex2", + "RightHandThumb1", "RightHand", + "RightHandThumb2", "RightHandThumb1", + "RightHandThumb3", "RightHandThumb2", + + //Left lower side + "LeftUpLeg", "Pelvis", + "LeftUpLegRoll", "LeftUpLeg", + "LeftLeg", "LeftUpLegRoll", + "LeftLegRoll", "LeftLeg", + "LeftFoot", "LeftLegRoll", + "LeftToeBase", "LeftFoot", + + //Right lower side + "RightUpLeg", "Pelvis", + "RightUpLegRoll", "RightUpLeg", + "RightLeg", "RightUpLegRoll", + "RightLegRoll", "RightLeg", + "RightFoot", "RightLegRoll", + "RightToeBase", "RightFoot" + }; + + pivotsModel = ""; + }; + }; + +class CfgModels + { + class Default + { + sectionsInherit = ""; + sections[] = {}; + skeletonName = ""; + }; + class Dog: Default + { + sections[] = {"trup"}; + skeletonName = "DogSkeleton"; + htMin = 60; // Minimum half-cooling time (in seconds) + htMax = 1800; // Maximum half-cooling time (in seconds) + afMax = 30; // Maximum temperature in case the model is alive (in celsius) + mfMax = 0; // Maximum temperature when the model is moving (in celsius) + mFact = 1; // Metabolism factor - number from interval <0, 1> (0 - metabolism has no influence, 1 - metabolism has full influence (no other temperature source will be considered)). + tBody = 37; // Metabolism temperature of the model (in celsius) + }; + class ArmaMan : Default + { + sections[] = + { + "osobnost", + "Head_Injury", + "Body_Injury", + "l_leg_in jury", + "l_arm_injury", + "r_arm_injury", + "r_leg_injury", + "clan", + "clan_sign", + "Camo", + "CamoB" + }; + + skeletonName = "OFP2_ManSkeleton"; + }; + + class zmbStandIdleA : ArmaMan {}; + class zmbStandIdleB : ArmaMan {}; + class zmbStandIdleC_lookAround : ArmaMan {}; + class zmbStandIdleD_sniffingHyped : ArmaMan {}; + class zmbStandIdleE_swinging : ArmaMan {}; + class zmbStandCry1 : ArmaMan {}; + class zmbStandCry2 : ArmaMan {}; + class zmbStandDeath1 : ArmaMan {}; + class zmbStandDeath2 : ArmaMan {}; + class zmbStandDeath3 : ArmaMan {}; + class zmbStandAttack1 : ArmaMan {}; + class zmbStandAttack2bite : ArmaMan {}; + class zmbStandAttack3 : ArmaMan {}; + class zmbStandAttack4 : ArmaMan {}; + class zmbStandAttack5 : ArmaMan {}; + class zmbStandAttack6 : ArmaMan {}; + class zmbStandWalkF1 : ArmaMan {}; + class zmbStandWalkF2 : ArmaMan {}; + class zmbStandRunF1 : ArmaMan {}; + class zmbStandRunF2 : ArmaMan {}; + class zmbStandRunF3 : ArmaMan {}; + class zmbStandHit1_toRunF1 : ArmaMan {}; + class zmbStandHit2 : ArmaMan {}; + class zmbStandHit3_fromBehind : ArmaMan {}; + class zmbStandHit4 : ArmaMan {}; + class zmbBentIdleA : ArmaMan {}; + class zmbBentIdleB_lookAroundSwing : ArmaMan {}; + class zmbBentIdleC_lookAround : ArmaMan {}; + class zmbStand_zmbKneel : ArmaMan {}; + class zmbKneel_zmbStand : ArmaMan {}; + class zmbKneel_idleA : ArmaMan {}; + class zmbKneel_idleB : ArmaMan {}; + class zmbKneel_idleC : ArmaMan {}; + class zmbKneel_idleD : ArmaMan {}; + class zmbKneel_feedA : ArmaMan {}; + class zmbKneel_feedB : ArmaMan {}; + class zmbKneel_feedC : ArmaMan {}; + class zmbKneel_feedD : ArmaMan {}; + class zmbKneel_feedE : ArmaMan {}; + class zmbKneel_deathA : ArmaMan {}; + class zmbKneel_deathB : ArmaMan {}; + class zmbKneelAttack1_toStand : ArmaMan {}; + class zmbKneelAttack2 : ArmaMan {}; + class zmbKneelWalkF : ArmaMan {}; + class zmbKneelWalkB : ArmaMan {}; + class zmbKneeljogF : ArmaMan {}; + class zmbKneelrunF1 : ArmaMan {}; + class zmbKneelrunF2 : ArmaMan {}; + class zmbKneelrunF3 : ArmaMan {}; + class zmbKneelrunFrenzy1 : ArmaMan {}; + class zmbKneelrunFrenzy2 : ArmaMan {}; + class zmbKneelHit1 : ArmaMan {}; + //class zmbKneelHit1 : ArmaMan {}; + class zmbKneelHit2 : ArmaMan {}; + class zombie1_attack : ArmaMan {}; + class zombie1_deathFromWalk : ArmaMan {}; + class zombie1_walk : ArmaMan {}; + class zombie1_jump : ArmaMan {}; + class zombie1_birth : ArmaMan {}; + class zombie2_walk : ArmaMan {}; + class zombie2_birth : ArmaMan {}; + class zombie2_deathFromWalk : ArmaMan {}; + class zombie2_attack : ArmaMan {}; + class zombie2_jump : ArmaMan {}; + class zombie3_attack : ArmaMan {}; + class zombie3_birth : ArmaMan {}; + class zombie3_walk : ArmaMan {}; + class zombie3_jump : ArmaMan {}; + class zmbErcSprint9 : ArmaMan {}; + class zmbErcSprint13 : ArmaMan {}; + class zombie_frenziedCrawl3 : ArmaMan {}; + //class zombie_frenziedCrawl3 : ArmaMan {}; + class zombie_runDeaths6 : ArmaMan {}; + class zombie_stumble3 : ArmaMan {}; + class zombie_walk2sprint2 : ArmaMan {}; + //class zombie_frenziedCrawl3 : ArmaMan {}; + class zombieStand2KneelFeeding : ArmaMan {}; + class KneelFeeding2zombieStand : ArmaMan {}; + class zombie_kneelFeeding2_112_301 : ArmaMan {}; + //class zombie_kneelFeeding2_1054_1275 : ArmaMan {}; + //class zombie_kneelFeeding3_109-308 : ArmaMan {}; + //class zombie_kneelFeeding3_363-574 : ArmaMan {}; + //class zombie_kneelFeeding3_idle_1292-1461 : ArmaMan {}; + //class zombie_kneelFeeding3_idle_1488-1587 : ArmaMan {}; + //class zombie_kneelFeeding2_idle_893-1054 : ArmaMan {}; + //class zombie_kneelFeeding2_idle_893-1054 : ArmaMan {}; + //class zombie_kneelFeeding2_idle_1275-1430 : ArmaMan {}; + //class zombie_standSpasms1Stand_74-112 : ArmaMan {}; + //class zombie_standSpasms1Stand_74-112 : ArmaMan {}; + //class zombie_standSpasms1Stand_113-198 : ArmaMan {}; + //class zombie_standSpasms1Stand_199-327 : ArmaMan {}; + //class zombie_standSpasms1Stand_199-327 : ArmaMan {}; + //class zombie_standSpasms2bentPose_82-134 : ArmaMan {}; + //class zombie_standSpasms2bentPose_135-178 : ArmaMan {}; + //class zombie_standSpasms2bentPose_179-235 : ArmaMan {}; + //class zombie_standSpasms2bentPose_236-293 : ArmaMan {}; + //class zombie_standSpasms2bentPose_294-336 : ArmaMan {}; + //class zombie_standSpasms2bentPose_337-439 : ArmaMan {}; + //class zombie_standSpasms3Stand_83-190 : ArmaMan {}; + //class zombie_standSpasms3Stand_191-314 : ArmaMan {}; + //class zombie_standSpasms3Stand_315-400 : ArmaMan {}; + //class zombie_standSpasms3Stand_315-400 : ArmaMan {}; + //class zombie_standSpasms3Stand_401-478 : ArmaMan {}; + //class zombie_staticAttack3_67-158 : ArmaMan {}; + //class zombie_staticAttack3_67-158 : ArmaMan {}; + //class zombie_staticAttack3_183-274 : ArmaMan {}; + //class zombie_staticAttack3_183-274 : ArmaMan {}; + //class zombie_staticAttack3_441-554 : ArmaMan {}; + //class zombie_staticAttack3_570-707 : ArmaMan {}; + //class zombie_staticAttack3_742-833 : ArmaMan {}; + //class zombie_staticAttack3_855-987 : ArmaMan {}; + //class zombie_sniffing_264-499 : ArmaMan {}; + //class zombie_sniffing_573-809 : ArmaMan {}; + //class zombie_sniffing_573-809 : ArmaMan {}; + class dogBarkOnce: Dog {}; + class dogDownIdle: Dog {}; + class dogDownStand: Dog {}; + class dogDownStill: Dog {}; + class dogGestureHeadL: Dog {}; + class dogGestureHeadR: Dog {}; + class dogGestureIdle1: Dog {}; + class dogGestureIdle2: Dog {}; + class dogGestureSniff: Dog {}; + class dogStandDown: Dog {}; + class dogGestureGrowl: Dog {}; }; diff --git a/dayz_code/CfgWeapons.hpp b/dayz_code/CfgWeapons.hpp index 251178cdd..22b9f3594 100644 --- a/dayz_code/CfgWeapons.hpp +++ b/dayz_code/CfgWeapons.hpp @@ -13,9 +13,9 @@ class CfgWeapons { class ItemKeyKit: ItemCore { scope = 2; displayname = "Keymakers kit"; - model="\dayz_equip\models\keykit.p3d"; + model="\z\addons\dayz_epoch\models\keykit.p3d"; descriptionShort="Kit including the tools required to smelt, mold and shape keys."; - picture="\dayz_equip\textures\equip_keykit_ca.paa"; + picture="\z\addons\dayz_epoch\pictures\equip_keykit_ca.paa"; }; class ItemAnvil: ItemCore { displayname = "Anvil"; @@ -140,8 +140,8 @@ class CfgWeapons { scope=2; autoreload=1; magazineReloadTime=0; - model="\dayz_equip\models\fishing_rod_weaponized.p3d"; - picture="\dayz_equip\textures\equip_fishingpole_CA.paa"; + model="\z\addons\dayz_epoch\models\fishing_rod_weaponized.p3d"; + picture="\z\addons\dayz_epoch\pictures\equip_fishingpole_CA.paa"; displayName="Fishing Pole"; magazines[]= { @@ -178,8 +178,8 @@ class CfgWeapons { { scope=2; displayName="Fishing Pole"; - model="\dayz_equip\models\fishing_rod_loot_item.p3d"; - picture="\dayz_equip\textures\equip_fishingpole_CA.paa"; + model="\z\addons\dayz_epoch\models\fishing_rod_loot_item.p3d"; + picture="\z\addons\dayz_epoch\pictures\equip_fishingpole_CA.paa"; descriptionShort="Fishing Pole: This carbon fiber rod may be old but, she still works like a charm."; class ItemActions { @@ -297,8 +297,8 @@ class CfgWeapons { // Experimental keys class ItemKey: ItemCore { - model = "\dayz_equip\models\key.p3d"; - picture = "\dayz_equip\textures\equip_key_CA.paa"; + model = "\z\addons\dayz_epoch\models\key.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_key_CA.paa"; displayname = "Black Key"; keyid = 0; scope = 2; @@ -317,26 +317,26 @@ class CfgWeapons { }; class ItemKeyGreen: ItemKey { displayname = "Green Key"; - model = "\dayz_equip\models\key_green.p3d"; - picture = "\dayz_equip\textures\equip_key_CA_green.paa"; + model = "\z\addons\dayz_epoch\models\key_green.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_key_CA_green.paa"; scope = 2; }; class ItemKeyBlue: ItemKey { displayname = "Blue Key"; - model = "\dayz_equip\models\key_blue.p3d"; - picture = "\dayz_equip\textures\equip_key_CA_blue.paa"; + model = "\z\addons\dayz_epoch\models\key_blue.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_key_CA_blue.paa"; scope = 2; }; class ItemKeyYellow: ItemKey { displayname = "Yellow Key"; - model = "\dayz_equip\models\key_yellow.p3d"; - picture = "\dayz_equip\textures\equip_key_CA_yellow.paa"; + model = "\z\addons\dayz_epoch\models\key_yellow.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_key_CA_yellow.paa"; scope = 2; }; class ItemKeyRed: ItemKey { displayname = "Red Key"; - model = "\dayz_equip\models\key_red.p3d"; - picture = "\dayz_equip\textures\equip_key_CA_red.paa"; + model = "\z\addons\dayz_epoch\models\key_red.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_key_CA_red.paa"; scope = 2; }; diff --git a/dayz_code/actions/player_build.sqf b/dayz_code/actions/player_build.sqf index 61adbe3a1..7a73c6c75 100644 --- a/dayz_code/actions/player_build.sqf +++ b/dayz_code/actions/player_build.sqf @@ -19,21 +19,38 @@ _item = _this; _classname = getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "create"); _require = getArray (configFile >> "cfgMagazines" >> _this >> "ItemActions" >> "Build" >> "require"); +_needNearby = getArray (configFile >> "cfgMagazines" >> _this >> "ItemActions" >> "Build" >> "needNearby"); + _text = getText (configFile >> "CfgVehicles" >> _classname >> "displayName"); _offset = getArray (configFile >> "CfgVehicles" >> _classname >> "offset"); _isPole = (_classname == "Plastic_Pole_EP1_DZ"); _distance = 30; +_needText = "Plot Pole"; + if(_isPole) then { _distance = 45; }; -// check for near plot -_findNearestPoles = nearestObjects [(vehicle player), ["Plastic_Pole_EP1_DZ"], _distance]; -_findNearestPole = []; -{if (alive _x) then {_findNearestPole set [(count _findNearestPole),_x];};} foreach _findNearestPoles; +if((count _needNearby) == 0) then { + _needNearby = ["Plastic_Pole_EP1_DZ"]; +} else { + if("dayz_fuelpumparray" in _needNearby) then { + _needNearby = dayz_fuelpumparray; + _needText = "Fuel Pump"; + }; + if("dayz_fuelsources" in _needNearby) then { + _needNearby = dayz_fuelsources; + _needText = "Fuel Tanks"; + }; +}; +// check for near plot +_findNearestPoles = nearestObjects [(vehicle player), _needNearby, _distance]; +_findNearestPole = []; + +{if (alive _x) then {_findNearestPole set [(count _findNearestPole),_x];};} foreach _findNearestPoles; _IsNearPlot = count (_findNearestPole); // If item is plot pole and another one exists within 45m @@ -43,41 +60,44 @@ if(_IsNearPlot == 0) then { // Allow building of plot if(_isPole) then { - _canBuildOnPlot = true; + _canBuildOnPlot = true; }; } else { // Since there are plots nearby we check for ownership and then for friend status - _nearestPole = _findNearestPole select 0; + if("Plastic_Pole_EP1_DZ" in _needNearby) then { + _nearestPole = _findNearestPole select 0; - // Find owner - _ownerID = _nearestPole getVariable["CharacterID","0"]; + // Find owner + _ownerID = _nearestPole getVariable["CharacterID","0"]; - // diag_log format["DEBUG BUILDING: %1 = %2", dayz_characterID, _ownerID]; + // diag_log format["DEBUG BUILDING: %1 = %2", dayz_characterID, _ownerID]; - // check if friendly to owner - if(dayz_characterID == _ownerID) then { - // owner can build anything within his plot except other plots - if(!_isPole) then { - _canBuildOnPlot = true; - }; - - } else { - // disallow building plot - if(!_isPole) then { - _friendlies = player getVariable ["friendlyTo",[]]; - // check if friendly to owner - if(_ownerID in _friendlies) then { + // check if friendly to owner + if(dayz_characterID == _ownerID) then { + // owner can build anything within his plot except other plots + if(!_isPole) then { _canBuildOnPlot = true; }; + + } else { + // disallow building plot + if(!_isPole) then { + _friendlies = player getVariable ["friendlyTo",[]]; + // check if friendly to owner + if(_ownerID in _friendlies) then { + _canBuildOnPlot = true; + }; + }; }; + } else { + _canBuildOnPlot = true; }; - }; // _message -if(!_canBuildOnPlot) exitWith { TradeInprogress = false; cutText ["Building requires plot pole within 30m." , "PLAIN DOWN"]; }; +if(!_canBuildOnPlot) exitWith { TradeInprogress = false; cutText [format["Building requires %1 within %2m.",_needText,_distance] , "PLAIN DOWN"]; }; _missing = ""; _hasrequireditem = true; @@ -268,8 +288,10 @@ if (_hasrequireditem) then { } else { r_interrupt = false; - [objNull, player, rSwitchMove,""] call RE; - player playActionNow "stop"; + if (vehicle player == player) then { + [objNull, player, rSwitchMove,""] call RE; + player playActionNow "stop"; + }; deleteVehicle _tmpbuilt; diff --git a/dayz_code/actions/player_chopWood.sqf b/dayz_code/actions/player_chopWood.sqf index 9112e82fd..d76707f89 100644 --- a/dayz_code/actions/player_chopWood.sqf +++ b/dayz_code/actions/player_chopWood.sqf @@ -1,3 +1,8 @@ +/* + DayZ Enhanced ChopWood + Usage: spawn player_chopWood; + Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com. +*/ private ["_isOk","_i","_objName","_objInfo","_lenInfo","_started","_finished","_animState","_isMedic","_proceed","_counter","_itemOut","_countOut","_tree","_distance2d","_distance3d","_trees","_findNearestTree"]; if(TradeInprogress) exitWith { cutText ["Harvest wood already in progress." , "PLAIN DOWN"]; }; @@ -124,8 +129,10 @@ if (count(_findNearestTree) >= 1) then { } else { r_interrupt = false; - [objNull, player, rSwitchMove,""] call RE; - player playActionNow "stop"; + if (vehicle player == player) then { + [objNull, player, rSwitchMove,""] call RE; + player playActionNow "stop"; + }; cutText ["Canceled Harvesting Wood.", "PLAIN DOWN"]; }; diff --git a/dayz_code/actions/salvage.sqf b/dayz_code/actions/salvage.sqf index 9be707b8c..b1b4a21e4 100644 --- a/dayz_code/actions/salvage.sqf +++ b/dayz_code/actions/salvage.sqf @@ -73,8 +73,6 @@ if (_hasToolbox) then { if (_isOK) then { - - //break the part _selection = getText(configFile >> "cfgVehicles" >> _type >> "HitPoints" >> _hitpoint >> "name"); @@ -105,8 +103,10 @@ if (_hasToolbox) then { } else { r_interrupt = false; - [objNull, player, rSwitchMove,""] call RE; - player playActionNow "stop"; + if (vehicle player == player) then { + [objNull, player, rSwitchMove,""] call RE; + player playActionNow "stop"; + }; cutText ["Canceled Salvage.", "PLAIN DOWN"]; }; diff --git a/dayz_code/actions/salvage_vehicle.sqf b/dayz_code/actions/salvage_vehicle.sqf index 4456d2cc3..c1ba11b77 100644 --- a/dayz_code/actions/salvage_vehicle.sqf +++ b/dayz_code/actions/salvage_vehicle.sqf @@ -10,7 +10,7 @@ _vehicle = _this select 3; // _allFixed = true; _hitpoints = _vehicle call vehicle_getHitpoints; - +// diag_log format["DEBUG SALVAGE: %1", _hitpoints]; { _damage = [_vehicle,_x] call object_getHit; _part = "PartGeneric"; @@ -43,7 +43,7 @@ _hitpoints = _vehicle call vehicle_getHitpoints; }; // allow removal of any lightly damaged parts - if (_damage < 1) then { + if (_damage < 1 and _damage > 0) then { // Do not allow removal of engine or fueltanks if( _part == "PartGlass" or _part == "PartWheel" ) then { @@ -56,6 +56,7 @@ _hitpoints = _vehicle call vehicle_getHitpoints; _string = format["Remove%1 (%3 %4)",_cmpt,_color,_percent,"%"]; //Remove - Part _handle = dayz_myCursorTarget addAction [_string, "\z\addons\dayz_code\actions\salvage.sqf",[_vehicle,_part,_x], 0, false, true, "",""]; s_player_repairActions set [count s_player_repairActions,_handle]; + }; }; diff --git a/dayz_code/actions/tame_dog.sqf b/dayz_code/actions/tame_dog.sqf index 9d5fec5de..0150004c8 100644 --- a/dayz_code/actions/tame_dog.sqf +++ b/dayz_code/actions/tame_dog.sqf @@ -1,7 +1,7 @@ /* File: tame_dog.sqf 1.1 Author: Kane "Alby" Stone - Edited by: [VB]AWOL + Expanded to allow all meats as input by: [VB]AWOL - DayZ Epoch Description: Allows a player to tame/domesticate a dog. @@ -20,7 +20,6 @@ _caller = _this select 1; _id = _this select 2; _dog = _this select 3; -// expanded to allow all meats as input _removed = 0; _itemIn = "FoodmeatRaw"; _countIn = 1; diff --git a/dayz_code/actions/trade_any_boat.sqf b/dayz_code/actions/trade_any_boat.sqf index 071d34bff..a540e1ac1 100644 --- a/dayz_code/actions/trade_any_boat.sqf +++ b/dayz_code/actions/trade_any_boat.sqf @@ -62,8 +62,10 @@ if (_qty >= _qty_in) then { if (!_finished) exitWith { r_interrupt = false; - [objNull, player, rSwitchMove,""] call RE; - player playActionNow "stop"; + if (vehicle player == player) then { + [objNull, player, rSwitchMove,""] call RE; + player playActionNow "stop"; + }; cutText ["Canceled Trade." , "PLAIN DOWN"]; }; @@ -73,7 +75,7 @@ if (_qty >= _qty_in) then { if(_buy_o_sell == "buy") then { _qty = {_x == _part_in} count magazines player; } else { - _obj = nearestObjects [(getPosATL player), [_part_in], 20]; + _obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance]; _qty = count _obj; }; @@ -106,6 +108,7 @@ if (_qty >= _qty_in) then { _config = _keySelected; _isOk = [player,_config] call BIS_fnc_invAdd; + waitUntil {!isNil "_isOk"}; if (_isOk and _isKeyOK) then { _removed = ([player,_part_in,_qty_in] call BIS_fnc_invRemove); diff --git a/dayz_code/actions/trade_any_vehicle.sqf b/dayz_code/actions/trade_any_vehicle.sqf index 74c6303a1..1c4a7eb9c 100644 --- a/dayz_code/actions/trade_any_vehicle.sqf +++ b/dayz_code/actions/trade_any_vehicle.sqf @@ -24,7 +24,7 @@ _bos = 0; if(_buy_o_sell == "buy") then { _qty = {_x == _part_in} count magazines player; } else { - _obj = nearestObjects [(getPosATL player), [_part_in], 20]; + _obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance]; _qty = count _obj; _bos = 1; }; @@ -61,8 +61,10 @@ if (_qty >= _qty_in) then { if (!_finished) exitWith { r_interrupt = false; - [objNull, player, rSwitchMove,""] call RE; - player playActionNow "stop"; + if (vehicle player == player) then { + [objNull, player, rSwitchMove,""] call RE; + player playActionNow "stop"; + }; cutText ["Canceled Trade." , "PLAIN DOWN"]; }; @@ -105,6 +107,7 @@ if (_qty >= _qty_in) then { _config = _keySelected; _isOk = [player,_config] call BIS_fnc_invAdd; + waitUntil {!isNil "_isOk"}; if (_isOk and _isKeyOK) then { _removed = ([player,_part_in,_qty_in] call BIS_fnc_invRemove); @@ -186,7 +189,7 @@ if (_qty >= _qty_in) then { cutText [format[("Sold %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; }; } else { - cutText [format[("Cannot sell %1, tires are too damaged."),_textPartOut] , "PLAIN DOWN"]; + cutText [format[("Cannot sell %1, tires are too damaged."),_textPartIn] , "PLAIN DOWN"]; }; }; diff --git a/dayz_code/actions/vault_combination_1.sqf b/dayz_code/actions/vault_combination_1.sqf index cd4acf3ba..8a07f083d 100644 --- a/dayz_code/actions/vault_combination_1.sqf +++ b/dayz_code/actions/vault_combination_1.sqf @@ -1,12 +1,11 @@ private ["_buy","_number"]; dayz_selectedVault = _this select 3; dayz_combination = ""; -_number = 0; {player removeAction _x} forEach s_player_combi;s_player_combi = []; - -for "_x" from 1 to 10 do { - _buy = player addAction [str(_number), "\z\addons\dayz_code\actions\vault_combination_2.sqf",str(_number), 99, true, false, "",""]; - s_player_combi set [count s_player_combi,_buy]; - _number = _number + 1; + +if(!isNull dayz_selectedVault) then { + _ok = createdialog "SafeKeyPad"; }; + +s_player_unlockvault = -1; \ No newline at end of file diff --git a/dayz_code/actions/vault_pitch.sqf b/dayz_code/actions/vault_pitch.sqf index 355e7a60c..62d16848b 100644 --- a/dayz_code/actions/vault_pitch.sqf +++ b/dayz_code/actions/vault_pitch.sqf @@ -48,7 +48,7 @@ _counter = 0; while {_isOk} do { if(_counter == 0) then { - cutText ["Planning consruction stand still 5 seconds to build.", "PLAIN DOWN"]; + cutText ["Planning construction stand still 5 seconds to build.", "PLAIN DOWN"]; sleep 5; _location1 = getPosATL player; sleep 5; @@ -56,7 +56,7 @@ while {_isOk} do { if(_location1 distance _location2 < 0.1) exitWith { - cutText ["Started consruction move within 5 seconds to cancel.", "PLAIN DOWN"]; + cutText ["Started construction move within 5 seconds to cancel.", "PLAIN DOWN"]; _location3 = getPosATL player; sleep 5; _location4 = getPosATL player; @@ -85,7 +85,7 @@ _vault_location = (getPosATL _tmpvault); // Make sure vault is not placed on road. if (isOnRoad _vault_location) then { _isOk = true; diag_log ("surface is road"); }; // Make sure vault is not placed in trader citys -if(!placevault) then { _isOk = true; diag_log ("is trader city"); }; +if(!canbuild) then { _isOk = true; diag_log ("is trader city"); }; //Block Tents in pounds _objectsPond = nearestObjects [_playerPos, [], 10]; diff --git a/dayz_code/compile/fn_selfActions.sqf b/dayz_code/compile/fn_selfActions.sqf index 21011f86c..abde8a2ac 100644 --- a/dayz_code/compile/fn_selfActions.sqf +++ b/dayz_code/compile/fn_selfActions.sqf @@ -40,7 +40,12 @@ if (_canPickLight and !dayz_hasLight and !_isPZombie) then { if(DZEdebug) then { hint str(typeOf cursorTarget); if (s_player_debuglootpos < 0) then { - s_player_debuglootpos = player addAction ["Save to arma2.rpt", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["save"], 99, false, true, "",""]; + s_player_debuglootpos = player addAction ["Save to arma2.rpt", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["start"], 99, false, true, "",""]; + s_player_debuglootpos1 = player addAction ["Raise Z", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["up"], 99, false, true, "",""]; + s_player_debuglootpos2 = player addAction ["Lower Z", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["down"], 99, false, true, "",""]; + s_player_debuglootpos3 = player addAction ["Raise Z", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["up_small"], 99, false, true, "",""]; + s_player_debuglootpos4 = player addAction ["Lower Z", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["down_small"], 99, false, true, "",""]; + Base_Z_height = 0.5; }; }; @@ -130,7 +135,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu _isZombie = _cursorTarget isKindOf "zZombie_base"; _isDestructable = _cursorTarget isKindOf "BuiltItems"; _isWreck = _typeOfCursorTarget in ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"]; - _isRemovable = _typeOfCursorTarget in ["Fence_corrugated_DZ","M240Nest_DZ","ParkBench_DZ","SandNest_DZ"]; + _isRemovable = _typeOfCursorTarget in ["Fence_corrugated_DZ","M240Nest_DZ","ParkBench_DZ","SandNest_DZ","Plastic_Pole_EP1_DZ"]; _isDisallowRepair = _typeOfCursorTarget in ["M240Nest_DZ"]; _isTent = _cursorTarget isKindOf "TentStorage"; @@ -157,7 +162,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu // diag_log ("OWNERID = " + _ownerID + " CHARID = " + dayz_characterID + " " + str(_ownerID == dayz_characterID)); //Allow player to delete objects - if((_isDestructable or _isWreck or (_isRemovable and ("ItemCrowbar" in _itemsPlayer))) and _hasToolbox) then { + if((_isDestructable or _isWreck or (_isRemovable and ("ItemCrowbar" in _itemsPlayer))) and _hasToolbox and _isAlive) then { if (s_player_deleteBuild < 0) then { s_player_deleteBuild = player addAction [format[localize "str_actions_delete",_text], "\z\addons\dayz_code\actions\remove.sqf",_cursorTarget, 1, true, true, "", ""]; }; @@ -167,7 +172,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu }; // Allow Owner to lock and unlock vehicle - if(_isVehicle and !_isMan and _ownerID != "0") then { + if(_isVehicle and _isAlive and !_isMan and _ownerID != "0") then { if (s_player_lockUnlock_crtl < 0) then { _hasKey = _ownerID in _temp_keys; _oldOwner = (_ownerID == dayz_playerUID); @@ -205,7 +210,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu player removeAction s_player_forceSave; s_player_forceSave = -1; }; - */ + if((_isVehicle or _isTent or _isnewstorage) and _isAlive and !_isMan) then { if (s_player_checkGear < 0) then { @@ -215,6 +220,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu player removeAction s_player_checkGear; s_player_checkGear = -1; }; + */ //flip vehicle small vehicles by your self and all other vehicles with help nearby if (_isVehicle and !_canmove and _isAlive and (player distance _cursorTarget >= 2) and (count (crew _cursorTarget))== 0 and ((vectorUp _cursorTarget) select 2) < 0.5) then { diff --git a/dayz_code/compile/player_friendliesCheck.sqf b/dayz_code/compile/player_friendliesCheck.sqf index da6388bd8..28d941f24 100644 --- a/dayz_code/compile/player_friendliesCheck.sqf +++ b/dayz_code/compile/player_friendliesCheck.sqf @@ -1,26 +1,33 @@ -private ["_charID","_friendlies","_rcharID","_rfriendlyTo","_tag","_player","_newTagList","_position","_rfriendlies","_tagList"]; +private ["_charID","_friendlies","_rcharID","_rfriendlyTo","_tag","_player","_newTagList","_position","_rfriendlies","_tagList","_statusNew","_tagColor","_humanity","_status","_everyone"]; _charID = player getVariable ["characterID", "0"]; _friendlies = player getVariable ["friendlies", []]; +_everyone = player getVariable ["everyone", []]; _tagList = player getVariable ["tagList", []]; // create tags { - if (isPlayer _x) then { + if (isPlayer _x and player != _x) then { _rcharID = _x getVariable ["characterID", "0"]; - _rfriendlies = _x getVariable ["friendlies", []]; - _rfriendlyTo = _x getVariable ["friendlyTo", []]; - if ((_rcharID in _friendlies) and (_charID in _rfriendlies)) then { - if (!(_charID in _rfriendlyTo)) then { - _position = [0,0,0]; - _tag = "Sign_sphere10cm_EP1" createVehicleLocal _position; - _tag attachTo [_x,[0,0,0],"lwrist"]; - _tag setVariable ["belongsTo", _rcharID]; - _rfriendlyTo set [count _rfriendlyTo, _charID]; - _x setVariable ["friendlyTo", _rfriendlyTo, true]; - _tagList set [count _tagList, [_x, _tag]]; - player setVariable ["tagList", _tagList]; - titleText [format["You and %1 are now tagged as friendlies.", (name _x)], "PLAIN DOWN"]; - }; + if(!(_rcharID in _everyone)) then { + + // Track who has tags + _everyone set [count _everyone, _rcharID]; + player setVariable ["everyone", _everyone]; + + // Add sphere to everyone + _position = [0,0,0]; + _tag = "Sign_sphere10cm_EP1" createVehicleLocal _position; + _tag attachTo [_x,[0,0,0],"lwrist"]; + _tag setVariable ["belongsTo", _rcharID]; + + // Force white + _tag setobjecttexture [0,"#(argb,8,8,3)color(1,1,1,0.5,ca)"]; + + diag_log format["SETUP ORB FOR: %1", _x]; + + // Maintenance array + _tagList set [count _tagList, [_x, _tag,"white"]]; + player setVariable ["tagList", _tagList]; }; }; } forEach playableUnits; @@ -30,13 +37,68 @@ _newTagList = []; { _player = _x select 0; _tag = _x select 1; + _status = _x select 2; + _statusNew = "white"; + //_tagColor = ""; + _tagColor = "#(argb,8,8,3)color(1,1,1,0.5,ca)"; + // friendly player disconnected if (!(isPlayer _player)) then { deleteVehicle _tag; } else { - _newTagList set [count _newTagList, [_player, _tag]]; + + if (_status != "green") then { + diag_log format["CHECK IF FRIENDLY: %1", _player]; + _rcharID = _player getVariable ["characterID", "0"]; + _rfriendlies = _player getVariable ["friendlies", []]; + _rfriendlyTo = _player getVariable ["friendlyTo", []]; + + if ((_rcharID in _friendlies) and (_charID in _rfriendlies)) then { + if (!(_charID in _rfriendlyTo)) then { + + diag_log format["IS FRIENDLY: %1", _player]; + + _rfriendlyTo set [count _rfriendlyTo, _charID]; + _player setVariable ["friendlyTo", _rfriendlyTo, true]; + titleText [format["You and %1 are now tagged as friendlies.", (name _player)], "PLAIN DOWN"]; + + _statusNew = "green"; + _tagColor = "#(argb,8,8,3)color(0,1,0,0.5,ca)"; + // light green #(argb,8,8,3)color(0.04,0.86,0.1,0.5,ca) + }; + + } else { + + // Get humanity + _humanity = _player getVariable ["humanity",0]; + + if(_humanity < -2000) then { + _statusNew = "red"; + _tagColor = "#(argb,8,8,3)color(1,0,0,0.5,ca)"; + } else { + if(_humanity > 5000) then { + _statusNew = "blue"; + _tagColor = "#(argb,8,8,3)color(0,0,1,0.5,ca)"; + }; + }; + + diag_log format["CHECK HUMANITY: %1 %2", _player, _humanity]; + }; + + + if(_statusNew != _status) then { + diag_log format["STATUS CHANGED: %1 != %2", _statusNew, _status]; + // Set texture based on humanity or friendship status + _tag setobjecttexture [0,_tagColor]; + _status = _statusNew; + }; + + }; + diag_log format["CHECK STATUS: %1 != %2", _statusNew, _status]; + _newTagList set [count _newTagList, [_player, _tag, _status]]; }; } forEach _tagList; -player setVariable ["tagList", _newTagList]; \ No newline at end of file +player setVariable ["tagList", _newTagList]; + diff --git a/dayz_code/compile/player_onPause.sqf b/dayz_code/compile/player_onPause.sqf index a18660537..e7720cecb 100644 --- a/dayz_code/compile/player_onPause.sqf +++ b/dayz_code/compile/player_onPause.sqf @@ -31,7 +31,7 @@ private ["_display","_btnRespawn","_btnAbort","_timeOut","_timeMax"]; cutText [format ["Can Abort in %1", (_timeMax - _timeOut)], "PLAIN DOWN"]; //cutText [format[localize "str_abort_zedsclose",_text, "PLAIN DOWN"]; }; - case (!placevault) : { + case (!canbuild) : { _btnAbort ctrlEnable false; cutText ["Cannot Abort while in a trader city!", "PLAIN DOWN"]; }; diff --git a/dayz_code/compile/player_zombieAttack.sqf b/dayz_code/compile/player_zombieAttack.sqf index de5bc39d0..2f3833a16 100644 --- a/dayz_code/compile/player_zombieAttack.sqf +++ b/dayz_code/compile/player_zombieAttack.sqf @@ -5,7 +5,7 @@ _vehicle = (vehicle player); _targets = _unit getVariable ["targets",[]]; -if (dayz_zedsAttackVehicles and !(_vehicle in _targets)) exitWith {}; +// if (!dayz_zedsAttackVehicles and !(_vehicle in _targets)) exitWith {}; //Do the attack if (r_player_unconscious && _vehicle == player && _type == "zombie") then { diff --git a/dayz_code/compile/spawn_loot.sqf b/dayz_code/compile/spawn_loot.sqf index f02ab71e7..53fca049e 100644 --- a/dayz_code/compile/spawn_loot.sqf +++ b/dayz_code/compile/spawn_loot.sqf @@ -4,8 +4,8 @@ _iClass = _this select 1; _iPos = _this select 2; _radius = _this select 3; -_iPosZ = _iPos select 2; -if( _iPosZ < 0 ) then { _iPos = [_iPos select 0,_iPos select 1,0]; }; +//_iPosZ = _iPos select 2; +//if( _iPosZ < 0 ) then { _iPos = [_iPos select 0,_iPos select 1,0]; }; switch (_iClass) do { default { diff --git a/dayz_code/config.cpp b/dayz_code/config.cpp index 5623f0608..a397c2b42 100644 --- a/dayz_code/config.cpp +++ b/dayz_code/config.cpp @@ -14,13 +14,14 @@ #define EAST 0 // (Russian) #include "basicdefines.hpp" +#include "safegui.hpp" class CfgPatches { class dayz_code { units[] = {}; weapons[] = {}; requiredVersion = 0.1; - requiredAddons[] = {"dayz_equip","dayz_weapons","dayz_sfx","CAMisc3","CABuildingParts","CABuildingParts_Signs","CAStructuresHouse","CAStructuresLand_Ind_Stack_Big","CAStructures_Misc_Powerlines","CAStructures","CABuildings","CABuildings2","Ind_MalyKomin","CAStructures_A_CraneCon","CAStructures_Mil","CAStructures_Nav","CAStructures_Rail","A_Crane_02","A_TVTower","CAStructures_Railway","CAStructuresHouse","CAStructuresHouse_HouseBT","asc_eu_lights"}; + requiredAddons[] = {"dayz_equip","dayz_weapons","dayz_sfx","CAMisc3","CABuildingParts","CABuildingParts_Signs","CAStructuresHouse","CAStructuresLand_Ind_Stack_Big","CAStructures_Misc_Powerlines","CAStructures","CABuildings","CABuildings2","Ind_MalyKomin","CAStructures_A_CraneCon","CAStructures_Mil","CAStructures_Nav","CAStructures_Rail","A_Crane_02","A_TVTower","CAStructures_Railway","CAStructuresHouse","CAStructuresHouse_HouseBT","asc_eu_lights","vilas_pl_cars"}; }; class DZ_DebriefingRemoved { @@ -40,7 +41,7 @@ class CfgMods hidePicture = 0; hideName = 0; action = "http://www.dayzepoch.com"; - version = "1.0.1.1"; + version = "1.0.1.2"; hiveVersion = 0.96; //0.93 }; }; @@ -78,6 +79,19 @@ class CfgAddons }; }; +class CfgActions { + class None; // External class reference + + class Rearm : None { + show = 0; + }; + /* + class TakeBag : None { + show = 0; + }; + */ + +}; class CfgAISkill { aimingaccuracy[] = {0, 0, 1, 1}; aimingshake[] = {0, 0, 1, 1}; @@ -96,6 +110,8 @@ class CfgInGameUI class PeripheralVision { cueColor[] = {0,0,0,0}; + cueFriendlyColor[] = {0,0,0,0}; + cueEnemyColor[] = {0,0,0,0}; }; @@ -381,6 +397,14 @@ class CfgSurvival { sex = "female"; playerModel = "SurvivorWpink_DZ"; }; + class Skin_SurvivorWsequisha_DZ: Default { + sex = "female"; + playerModel = "SurvivorWsequisha_DZ"; + }; + class Skin_SurvivorWsequishaD_DZ: Default { + sex = "female"; + playerModel = "SurvivorWsequishaD_DZ"; + }; class Skin_SurvivorWcombat_DZ: Default { sex = "female"; playerModel = "SurvivorWcombat_DZ"; @@ -487,7 +511,7 @@ class CfgBuildingLoot { lootPos[] = {}; itemType[] = { { "ItemSodaMdew","magazine" }, - { "ItemSodaR4z0r","magazine" }, + { "ItemSodaRbull","magazine" }, { "ItemWatch","generic" }, { "ItemCompass","generic" }, { "ItemMap","weapon" }, @@ -568,7 +592,7 @@ class CfgBuildingLoot { lootPos[] = {}; itemType[] = { { "WeaponHolder_ItemGenerator","object" }, - { "WeaponHolder_ItemFuelBarrel","object" }, + {"ItemFuelBarrel","magazine"}, { "","generic" }, { "","trash" }, { "","military" }, @@ -624,9 +648,10 @@ class CfgBuildingLoot { { "PartWoodPile","magazine" }, { "WeaponHolder_ItemHatchet","object" }, { "MR43","weapon" }, - { "WeaponHolder_ItemFuelBarrel","object" }, + {"ItemFuelBarrel","magazine"}, { "WeaponHolder_ItemMachete", "object"}, - { "ItemFishingPole","weapon" } + { "ItemFishingPole","weapon" }, + { "ItemLightBulb","magazine"} }; itemChance[] = { 0.05, @@ -634,14 +659,15 @@ class CfgBuildingLoot { 0.01, 0.04, 0.03, - 0.22, + 0.21, 0.03, - 0.095, + 0.085, 0.15, 0.06, 0.005, 0.03, - 0.01 + 0.01, + 0.02 }; }; class Supermarket: Default { @@ -651,6 +677,7 @@ class CfgBuildingLoot { zombieChance = 0.3; zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"}; itemType[] = { + { "ItemSodaOrageSherbet","magazine" }, { "ItemWatch","generic" }, { "ItemCompass","generic" }, { "ItemMap","weapon" }, @@ -685,7 +712,8 @@ class CfgBuildingLoot { {"ItemKeyKit","weapon"} }; itemChance[] = { - 0.11, + 0.01, + 0.10, 0.02, 0.04, 0.02, @@ -727,8 +755,8 @@ class CfgBuildingLoot { { "bizon_silenced","weapon" }, { "M14_EP1","weapon" }, { "FN_FAL_ANPVS4","weapon" }, - { "M107_DZ","weapon" }, - { "BAF_AS50_scoped","weapon" }, + { "BAF_LRR_scoped","weapon" }, + { "AK_107_PSO","weapon" }, { "Mk_48_DZ","weapon" }, { "M249_DZ","weapon" }, {"BAF_L85A2_RIS_SUSAT","weapon"}, @@ -961,7 +989,7 @@ class HeliCrash_No50s: Default { { "M24","weapon" }, { "SVD_CAMO","weapon" }, { "M1014","weapon" }, - { "M107_DZ","weapon" }, + { "BAF_LRR_scoped","weapon" }, { "DMR","weapon" }, { "M4A1","weapon" }, { "M14_EP1","weapon" }, @@ -1094,13 +1122,13 @@ class HeliCrash_No50s: Default { zombieClass[] = {"z_priest","z_priest","z_priest"}; }; class Land_HouseV_1I4: Residential { - lootPos[] = {{-0.400146,-3.87695,-2.76879},{-3.67749,-2.52002,-2.76551},{-0.472168,3.19702,-2.72021}}; + lootPos[] = {{-1.77002,-2.64941,-2.05628},{-0.400146,-3.87695,-2.76879},{-3.67749,-2.52002,-2.76551},{-0.472168,3.19702,-2.72021}}; }; class Land_kulna: Residential { lootPos[] = {{0.504395,0.218262,-1.11643},{-0.496582,1.93262,-1.12826}}; }; class Land_Ind_Workshop01_01: Industrial { - lootPos[] = {{0.595215,-2.43115,-1.29412},{1.24365,0.463867,-1.295},{-0.663574,-0.50293,-1.29837}}; + lootPos[] = {{-0.796875,1.24707,-0.836596},{0.595215,-2.43115,-1.29412},{1.24365,0.463867,-1.295},{-0.663574,-0.50293,-1.29837}}; }; class Land_Ind_Garage01: Industrial { lootPos[] = {{-0.580078,-1.49707,-1.23483},{-0.834473,2.75781,-1.22563},{2.47754,-1.12891,-1.23714},{1.31934,1.63086,-1.23228}}; @@ -1134,7 +1162,7 @@ class HeliCrash_No50s: Default { lootPos[] = {{-6.93213,1.0708,-1.20155},{-7.2959,-2.68213,-1.20155},{-3.41406,-4.39307,-1.20155},{-1.28809,-2.57861,-1.20155},{0.903809,-4.35986,-1.20155},{3.1377,-3.40771,-1.20155},{7.53418,-2.69971,-1.20154},{13.9653,-4.50342,-1.20155},{10.2617,0.109863,-1.20155},{10.5869,-3.84375,-1.20155},{7.84521,-0.137207,-1.20154},{3.57471,0.0356445,-1.20154},{-0.370605,5.17676,-1.20155},{4.77783,5.57617,-1.20155},{13.0874,4.35645,-1.20155},{12.9932,6.31689,-1.20155},{7.36328,3.00928,-1.20155},{1.93091,2.17236,-1.20154},{-3.82715,5.3335,-1.20155},{-7.55029,8.54199,-1.20154},{-4.42407,8.96631,-1.20154},{3.72705,8.36084,-1.20155},{9.84033,8.3374,-1.20155},{-2.90918,1.32031,-1.20155}}; }; class Land_A_GeneralStore_01: Supermarket { - lootPos[] = {{-9.38965,-3.30371,-1.20155},{-3.77539,-3.86865,-1.20155},{1.31836,1.46631,-1.20155},{9.01367,3.8457,-1.20155},{13.3008,-1.77832,-1.20155},{9.81055,1.43213,-1.20155},{1.65039,5.14355,-1.20155},{0.753906,-3.69531,-1.20155},{13.3125,-7.65137,-1.20155},{11.168,-3.73682,-1.20155},{8.89453,-8.37402,-1.20155},{-2.04492,-7.58105,-1.20155},{-7.84766,-5.73633,-1.20155},{-8.22461,-7.32422,-1.20155},{3.79004,-5.69336,-1.20155},{-9.38379,4.46191,-1.20155},{-3.5752,4.46533,-1.20155},{-3.33789,0.612793,-1.20155},{10.5918,-9.9458,-1.21082},{0.105469,-9.6084,-1.21082},{-4.86035,-10.4209,-1.21082},{-6.80859,-1.23975,-1.20155},{1.12207,-1.58887,-1.20155}}; + lootPos[] = {{-1.32861,-2.72534,-0.621548},{4.4751,-2.69824,-0.621548},{-5.29688,0.796387,-0.691548},{-4.85498,2.95166,-0.201549},{-9.38965,-3.30371,-1.20155},{-3.77539,-3.86865,-1.20155},{1.31836,1.46631,-1.20155},{9.01367,3.8457,-1.20155},{13.3008,-1.77832,-1.20155},{9.81055,1.43213,-1.20155},{1.65039,5.14355,-1.20155},{0.753906,-3.69531,-1.20155},{13.3125,-7.65137,-1.20155},{11.168,-3.73682,-1.20155},{8.89453,-8.37402,-1.20155},{-2.04492,-7.58105,-1.20155},{-7.84766,-5.73633,-1.20155},{-8.22461,-7.32422,-1.20155},{3.79004,-5.69336,-1.20155},{-9.38379,4.46191,-1.20155},{-3.5752,4.46533,-1.20155},{-3.33789,0.612793,-1.20155},{10.5918,-9.9458,-1.21082},{0.105469,-9.6084,-1.21082},{-4.86035,-10.4209,-1.21082},{-6.80859,-1.23975,-1.20155},{1.12207,-1.58887,-1.20155}}; }; class Land_Farm_Cowshed_a: Farm { lootPos[] = {{-1.06836,-5.92163,-3.08763},{1.69043,-4.91089,-3.08763},{5.8833,-6.15381,-3.08763},{8.83984,-5.60278,-3.08763},{9.74023,-2.48657,-3.08763},{2.88428,-2.34546,-3.08763},{7.88037,2.94214,-3.08763}}; @@ -1147,40 +1175,41 @@ class HeliCrash_No50s: Default { lootPos[] = {{4.93188,-17.0444,-2.63063},{-3.82813,-18.6699,-2.63036},{-4.46387,16.6665,-2.63651},{5.78711,18.9473,-2.6369},{3.9541,4.88428,-2.63446},{-2.99072,-4.16748,-2.63287}}; }; class Land_Hlidac_budka: Residential { - lootPos[] = {{-2.3186,1.5127,-0.78363},{2.02075,0.444336,-0.78363},{-0.460938,1.75879,-0.78363}}; + lootPos[] = {{1.27002,2.29736,-0.113617},{-2.3186,1.5127,-0.78363},{2.02075,0.444336,-0.78363},{-0.460938,1.75879,-0.78363}}; }; class Land_HouseV2_02_Interier: Residential { - lootPos[] = {{7.23096,5.37207,-5.53067},{8.55005,0.754883,-5.53067},{5.20166,-1.54004,-5.53067},{3.34912,1.9707,-5.53067},{-3.62598,3.05371,-5.53067},{-5.4812,-0.0292969,-5.53067},{-5.83325,3.26563,-5.53067},{-5.71045,5.49414,-5.53067}}; + lootPos[] = {{6.46094,1.48608,-4.60568},{7.23096,5.37207,-5.53067},{8.55005,0.754883,-5.53067},{5.20166,-1.54004,-5.53067},{3.34912,1.9707,-5.53067},{-3.62598,3.05371,-5.53067},{-5.4812,-0.0292969,-5.53067},{-5.83325,3.26563,-5.53067},{-5.71045,5.49414,-5.53067}}; }; class Land_a_stationhouse: Military { lootChance = 0.3; - lootPos[] = {{-2.69922,-7.57422,-9.47058},{-0.892578,-5.7168,-9.47058},{-3.2417,-6.61914,-4.6489},{-1.35645,-8.3623,-4.6489},{-1.70801,-7.85449,-0.0437927},{-3.39502,-7.88281,-0.0437927},{-1.396,-7.79883,4.41141},{-1.37939,-5.79102,4.41141},{1.5127,1.96484,-9.47058},{18.9058,-4.06738,-9.47058}}; + lootPos[] = {{9.93115,3.34375,-9.40037},{-2.69922,-7.57422,-9.47058},{-0.892578,-5.7168,-9.47058},{-3.2417,-6.61914,-4.6489},{-1.35645,-8.3623,-4.6489},{-1.70801,-7.85449,-0.0437927},{-3.39502,-7.88281,-0.0437927},{-1.396,-7.79883,4.41141},{-1.37939,-5.79102,4.41141},{1.5127,1.96484,-9.47058},{18.9058,-4.06738,-9.47058}}; }; class Land_Mil_ControlTower: Military { lootChance = 0.4; - lootPos[] = {{10.0703,3.76367,-9.62869},{3.89844,3.43457,-5.46368},{1.75195,5.68164,-5.46368},{6.66113,-0.625488,-1.0687},{2.63965,-0.191406,-1.0687},{6.72266,3.23389,-1.0687}}; + lootPos[] = {{5.51807,-1.72363,-0.378696},{7.55103,1.85889,-0.378696},{10.0703,3.76367,-9.62869},{3.89844,3.43457,-5.46368},{1.75195,5.68164,-5.46368},{6.66113,-0.625488,-1.0687},{2.63965,-0.191406,-1.0687},{6.72266,3.23389,-1.0687}}; }; class Land_SS_hangar: Military { maxRoaming = 3; - lootPos[] = {{11.7344,-17.165,-5.87253},{-11.7158,-18.9541,-5.87253},{-14.2461,23.0439,-5.87253}}; + lootPos[] = {{-0.18457,5.26465,-5.87254},{11.7344,-17.165,-5.87253},{-11.7158,-18.9541,-5.87253},{-14.2461,23.0439,-5.87253}}; }; class Land_A_Pub_01: Residential { zombieChance = 0.2; - lootPos[] = {{1.83398,0.393799,-5.7462},{-1.76514,0.334473,-5.74622},{-6.62207,-6.55371,-5.74622},{-4.63623,-0.100586,-5.74622},{-5.75928,-3.05029,-5.74622},{-2.08203,0.922852,-1.76122},{-4.76514,-5.89087,-1.76122},{-6.94385,-1.9375,-1.76122},{-4.05225,-0.779785,-1.76122},{1.39795,-1.73779,-1.76122},{3.13867,-2.78564,-1.76122},{3.58301,-0.591309,-1.76122},{3.03027,-4.04346,-1.76122},{1.94092,3.18799,-1.76122},{-0.0961914,6.22437,-1.76122},{5.30469,7.55957,-1.76122},{6.72559,-2.72705,-1.76122},{2.56885,-4.6001,-5.74621},{4.06738,5.41406,-5.74622},{0.753418,2.2998,-5.74622}}; + lootPos[] = {{1.25684,5.34863,-5.01622},{1.2041,-1.88574,-4.7562},{-7.50195,-1.42871,-5.28622},{-3.51318,-2.60645,-3.66622},{2.09375,1.03027,-0.101221},{1.85889,6.45996,-1.31122]}, + {1.83398,0.393799,-5.7462},{-1.76514,0.334473,-5.74622},{-6.62207,-6.55371,-5.74622},{-4.63623,-0.100586,-5.74622},{-5.75928,-3.05029,-5.74622},{-2.08203,0.922852,-1.76122},{-4.76514,-5.89087,-1.76122},{-6.94385,-1.9375,-1.76122},{-4.05225,-0.779785,-1.76122},{1.39795,-1.73779,-1.76122},{3.13867,-2.78564,-1.76122},{3.58301,-0.591309,-1.76122},{3.03027,-4.04346,-1.76122},{1.94092,3.18799,-1.76122},{-0.0961914,6.22437,-1.76122},{5.30469,7.55957,-1.76122},{6.72559,-2.72705,-1.76122},{2.56885,-4.6001,-5.74621},{4.06738,5.41406,-5.74622},{0.753418,2.2998,-5.74622}}; }; class Land_HouseB_Tenement: Office { - lootPos[] = {{5.40576,9.89551,-20.7845},{5.99023,14.1689,-20.7845},{12.9609,14.0718,-20.7845},{14.6069,8.92383,-20.7845},{-2.75635,-2.08594,-20.7845}}; + lootPos[] = {{4.02954,12.0869,-18.7345},{7.12988,11.7734,-20.3445},{2.4187,4.88037,-19.8245},{-1.08154,4.7002,-19.8245},{-4.54492,4.87012,-19.8245},{-10.4272,-0.536621,-20.3445},{5.40576,9.89551,-20.7845},{5.99023,14.1689,-20.7845},{12.9609,14.0718,-20.7845},{14.6069,8.92383,-20.7845},{-2.75635,-2.08594,-20.7845}}; }; class Land_A_Hospital: hospital { lootChance = 0.9; - lootPos[] = {{0.807129,-1.16333,-7.33966},{-7.23389,-2.63647,-7.33966},{-16.3687,-2.40381,-7.33966},{-12.2847,-3.19604,-7.33966},{4.40674,-3.50513,-7.33966},{-3.2666,-0.925293,-7.33966},{6.85693,-2.75146,-7.33966},{11.0151,-3.95435,-7.33966},{16.8198,-4.71118,-7.33966},{-1.12793,3.78418,-7.44939},{12.7476,0.142822,3.29184},{10.2661,-1.21558,3.29184}}; + lootPos[] = {{8.30273,-0.921875,-6.89966},{2.32813,-3.57422,-6.36466},{-1.40234,-4.0293,-6.36466},{0.807129,-1.16333,-7.33966},{-7.23389,-2.63647,-7.33966},{-16.3687,-2.40381,-7.33966},{-12.2847,-3.19604,-7.33966},{4.40674,-3.50513,-7.33966},{-3.2666,-0.925293,-7.33966},{6.85693,-2.75146,-7.33966},{11.0151,-3.95435,-7.33966},{16.8198,-4.71118,-7.33966},{-1.12793,3.78418,-7.44939},{12.7476,0.142822,3.29184},{10.2661,-1.21558,3.29184}}; }; class Land_Panelak: Office { lootPos[] = {{-2.76904,-6.26563,0.0714226},{-2.93896,-1.3916,0.0714226},{-5.42065,-3.13184,0.0714226},{-6.81128,-6.15527,0.0714221},{-4.00879,2.53027,0.0714226},{-0.730957,-3.20117,2.77144},{3.979,-7.08936,2.77144},{2.49609,2.93701,2.77144},{6.7373,1.63281,2.77144},{6.38525,-2.3916,2.77144},{6.80615,-5.77295,2.77144},{3.75122,-0.803711,2.77144},{-0.824219,1.86914,1.32865}}; }; class Land_Panelak2: Office { - lootPos[] = {{-0.729492,-3.00635,-2.62859},{-0.764648,1.36279,-1.37137},{-0.30127,3.65039,1.32864},{0.73584,-3.22217,2.71097},{-0.630859,1.84766,4.05244},{3.68921,-7.33545,5.43665},{2.26807,2.94092,5.43665},{6.7002,2.68994,5.43665},{6.87842,-1.45947,5.43665},{6.09619,-5.94824,5.43665},{4.45508,-1.64893,5.43665},{2.76367,0.445801,5.43665}}; + lootPos[] = {{4.90283,1.53857,6.24665},{-0.729492,-3.00635,-2.62859},{-0.764648,1.36279,-1.37137},{-0.30127,3.65039,1.32864},{0.73584,-3.22217,2.71097},{-0.630859,1.84766,4.05244},{3.68921,-7.33545,5.43665},{2.26807,2.94092,5.43665},{6.7002,2.68994,5.43665},{6.87842,-1.45947,5.43665},{6.09619,-5.94824,5.43665},{4.45508,-1.64893,5.43665},{2.76367,0.445801,5.43665}}; }; class Land_Shed_Ind02: Industrial { lootPos[] = {{-2.28174,-5.67236,-4.62599},{4.54529,9.6665,-4.62599},{4.41223,2.64941,-1.27954},{-0.437866,11.6943,-1.27641},{-3.44482,12.2119,-1.27704}}; @@ -1204,7 +1233,7 @@ class HeliCrash_No50s: Default { lootPos[] = {{-11.6309,7.2052,-5.55933},{-12.0674,2.56909,-5.55933},{-4.89355,6.6394,-5.55933},{-3.74121,2.90393,-3.89665},{-12.8672,1.44519,-2.23135},{-12.415,8.1311,-2.23135},{-12.7236,4.11255,-2.23135},{-3.99805,8.9801,-2.23156},{-7.33105,8.44214,-2.23156},{-4.55371,5.22644,-2.23156},{-11.4746,2.92114,1.66661},{-11.0703,8.13818,1.66661},{-4.67578,7.32678,1.62174},{-2.68262,3.44763,3.4243},{-13.1953,-8.95862,3.4243},{-8.80859,-0.443481,0.401226},{-12.1328,-0.149414,0.424298},{-2.03418,6.61414,-5.55933},{0.239258,1.72278,-5.59793},{6.22461,-3.948,-4.61825},{-6.39355,-8.24353,-5.59541},{-10.8496,-6.91211,-5.56572},{-6.77637,-1.73083,-5.56019}}; }; class Land_rail_station_big: Office { - lootPos[] = {{-4.97266,4.55737,-5.04438},{0.458496,4.85229,-5.04438},{2.4624,2.21851,-5.04438},{-1.32373,-2.60571,-5.04438},{-3.29443,-0.121826,-5.04438},{-1.07764,2.36646,-5.04438},{7.46045,-3.41528,-5.04438},{8.93408,3.1189,-5.04438},{-8.16357,-5.12842,-5.04438}}; + lootPos[] = {{1.78076,0.811768,-4.05438},{-4.97266,4.55737,-5.04438},{0.458496,4.85229,-5.04438},{2.4624,2.21851,-5.04438},{-1.32373,-2.60571,-5.04438},{-3.29443,-0.121826,-5.04438},{-1.07764,2.36646,-5.04438},{7.46045,-3.41528,-5.04438},{8.93408,3.1189,-5.04438},{-8.16357,-5.12842,-5.04438}}; }; class Land_Ind_Vysypka: Industrial { lootPos[] = {{0.486084,4.95459,-4.96861},{1.08032,-0.406738,-4.96801},{-0.0354004,-10.8208,-4.96686},{-5.07788,-16.4624,-4.96759},{-6.30298,2.92969,-4.96838},{-6.26685,26.7349,-4.9772},{1.64697,23.4038,-4.97097},{7.14575,3.92529,-4.96972},{4.63599,-12.1621,-4.96971}}; @@ -1218,7 +1247,7 @@ class HeliCrash_No50s: Default { lootPos[] = {{-4.66113,-6.27173,-18.429},{3.31641,-5.77417,-18.429},{-0.20752,-6.48682,-18.429},{-9.72412,-4.88745,-3.78903},{-9.57813,3.55615,-3.78903},{-7.16797,11.0737,-3.78903},{5.07422,11.1838,-3.78903},{9.3208,5.38623,-3.78903},{9.65332,-4.82056,-3.78903},{3.23535,-0.105957,-0.169027},{4.85205,-3.69019,-0.169027},{-0.80127,-7.89087,-0.169027},{-4.4082,-4.91772,-0.169027},{-4.90771,-2.23169,-0.169027}}; }; class Land_A_Office01: Office { - lootPos[] = {{-2.50391,-2.46948,-4.528},{4.23535,-0.336914,-4.528},{4.11133,6.1123,-4.528},{0.242188,6.06299,-4.528},{4.31641,3.74023,-4.528},{5.08887,0.219727,-4.528},{11.6504,-1.5647,-4.528},{14.5811,-4.1123,-4.528},{13.8545,-0.749023,-4.528},{-7.7627,5.59082,-4.528},{1.81152,0.993408,-2.028},{4.93164,4.31982,-2.028},{1.18945,6.07031,-2.028},{2.23145,3.76563,-2.028},{-4.76367,-2.51221,-2.028},{-14.5596,-3.40723,-2.028},{-15.2705,5.92773,-2.028},{-10.9063,6.04175,0.472008},{-6.30762,3.30078,0.472006},{7.6416,6.38696,0.472001},{13.6729,6.5957,0.471999},{13.1924,-2.58691,0.471998},{3.0918,2.4375,6.20491},{-1.45703,-2.28369,6.20491},{-2.12988,4.51587,0.472005},{4.74414,-4.60156,-2.01486},{8.3457,-1.10718,-2.028},{9.94727,-3.74146,-2.028},{7.13867,-2.50732,-2.028},{12.8701,4.70923,-2.028},{15.3721,3.42383,-2.028}}; + lootPos[] = {{0.951172,5.1814,-3.668},{6.68164,5.77954,-3.828},{-4.54492,4.97656,-1.348},{-2.50391,-2.46948,-4.528},{4.23535,-0.336914,-4.528},{4.11133,6.1123,-4.528},{0.242188,6.06299,-4.528},{4.31641,3.74023,-4.528},{5.08887,0.219727,-4.528},{11.6504,-1.5647,-4.528},{14.5811,-4.1123,-4.528},{13.8545,-0.749023,-4.528},{-7.7627,5.59082,-4.528},{1.81152,0.993408,-2.028},{4.93164,4.31982,-2.028},{1.18945,6.07031,-2.028},{2.23145,3.76563,-2.028},{-4.76367,-2.51221,-2.028},{-14.5596,-3.40723,-2.028},{-15.2705,5.92773,-2.028},{-10.9063,6.04175,0.472008},{-6.30762,3.30078,0.472006},{7.6416,6.38696,0.472001},{13.6729,6.5957,0.471999},{13.1924,-2.58691,0.471998},{3.0918,2.4375,6.20491},{-1.45703,-2.28369,6.20491},{-2.12988,4.51587,0.472005},{4.74414,-4.60156,-2.01486},{8.3457,-1.10718,-2.028},{9.94727,-3.74146,-2.028},{7.13867,-2.50732,-2.028},{12.8701,4.70923,-2.028},{15.3721,3.42383,-2.028}}; }; class Land_A_Office02: Office { lootPos[] = {{4.72266,-5.74121,-8.15108},{0.961426,-5.16943,-8.15076}}; @@ -1272,7 +1301,7 @@ class HeliCrash_No50s: Default { lootPos[] = {{0.542969,-3.89453,-0.776679},{0.47998,-0.608398,-0.776638},{0.515381,3.03857,-0.776592}}; }; class Land_HouseV2_04_interier: Residential { - lootPos[] = {{7.49463,5.8374,-5.73902},{7.50989,-0.930176,-5.74176},{1.95532,4.16406,-5.73938},{2.10876,6.60645,-5.7386},{-2.30017,4.22461,-5.73936},{-5.13306,6.74365,-5.73856},{-4.74658,2.68457,-5.73985}}; + lootPos[] = {{-3.65234,6.87573,-5.00152},{4.78516,2.62744,-5.07818},{1.59375,2.69629,-5.06737},{7.49463,5.8374,-5.73902},{7.50989,-0.930176,-5.74176},{1.95532,4.16406,-5.73938},{2.10876,6.60645,-5.7386},{-2.30017,4.22461,-5.73936},{-5.13306,6.74365,-5.73856},{-4.74658,2.68457,-5.73985}}; }; class Land_HouseV2_01A: Residential { lootPos[] = {{-3.52881,-3.16895,-5.60346},{-1.62988,-3.25439,-5.66887}}; @@ -1495,7 +1524,9 @@ class HeliCrash_No50s: Default { { 7.53271,-1.70068,-1.0687 }, { 4.55225,1.64111,2.92148 }, { 10.1292,3.6958,-9.62869 }, - { 0.491943,6.1543,-9.62869}}; + { 0.491943,6.1543,-9.62869}, + { 7.54956,1.74512,-0.378696}, + {5.40234,-1.71289,-0.378696}}; }; class Land_Mil_hangar_EP1: Military { @@ -1808,7 +1839,7 @@ class HeliCrash_No50s: Default { { "M24","weapon" }, { "SVD_CAMO","weapon" }, { "M1014","weapon" }, - { "M107_DZ","weapon" }, + { "BAF_LRR_scoped","weapon" }, { "DMR","weapon" }, { "M4A1","weapon" }, { "M14_EP1","weapon" }, diff --git a/dayz_code/init/compiles.sqf b/dayz_code/init/compiles.sqf index 766eeb871..df2508990 100644 --- a/dayz_code/init/compiles.sqf +++ b/dayz_code/init/compiles.sqf @@ -56,6 +56,7 @@ if (!isDedicated) then { //Objects object_roadFlare = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_roadFlare.sqf"; object_setpitchbank = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_setpitchbank.sqf"; + object_monitorGear = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_monitorGear.sqf"; //Zombies zombie_findTargetAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_findTargetAgent.sqf"; @@ -122,8 +123,9 @@ if (!isDedicated) then { _display = uiNameSpace getVariable "BIS_loadingScreen"; _control1 = _display displayctrl 8400; _control2 = _display displayctrl 102; - // 40 sec timeout - while { _timeOut < 400 && !dayz_clientPreload } do { + // 120 sec timeout + while { _timeOut < 3000 && !dayz_clientPreload && !dayz_authed } do { + if ( isNull _display ) then { waitUntil { !dialog; }; startLoadingScreen ["","RscDisplayLoadCustom"]; @@ -140,13 +142,14 @@ if (!isDedicated) then { sleep 0.1; }; endLoadingScreen; - if ( !dayz_clientPreload ) then { - + /* + if ( !dayz_clientPreload && !dayz_authed ) then { diag_log "DEBUG: loadscreen guard ended with timeout."; disableUserInput false; - 1 cutText ["Something went wrong! disconnect and try again!", "PLAIN"]; + 1 cutText ["Disconnected!", "PLAIN"]; player enableSimulation false; } else { diag_log "DEBUG: loadscreen guard ended."; }; + */ }; dayz_losChance = { private["_agent","_maxDis","_dis","_val","_maxExp","_myExp"]; @@ -434,6 +437,7 @@ if (!isDedicated) then { fnc_vehicleEventHandler = compile preprocessFileLineNumbers "\z\addons\dayz_code\init\vehicle_init.sqf"; //Initialize vehicle fnc_inString = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_inString.sqf"; fnc_isInsideBuilding = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_isInsideBuilding.sqf"; //_isInside = [_unit,_building] call fnc_isInsideBuilding; + fnc_isInsideBuilding2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_isInsideBuilding2.sqf"; //_isInside = [_unit,_building] call fnc_isInsideBuilding; dayz_zombieSpeak = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_speak.sqf"; //Used to generate random speech for a unit vehicle_getHitpoints = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\vehicle_getHitpoints.sqf"; local_gutObject = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_gutObject.sqf"; //Generated on the server (or local to unit) when gutting an object diff --git a/dayz_code/init/variables.sqf b/dayz_code/init/variables.sqf index 01c0115cb..ffdb36f12 100644 --- a/dayz_code/init/variables.sqf +++ b/dayz_code/init/variables.sqf @@ -14,7 +14,7 @@ Camo1_DZ = "Camo1_DZ"; Soldier1_DZ = "Soldier1_DZ"; Rocket_DZ = "Rocket_DZ"; -AllPlayers = ["Survivor2_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","Bandit2_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker1_DZ","Rocker2_DZ","Rocker3_DZ","Rocker4_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","FR_OHara_DZ","FR_Rodriguez_DZ","CZ_Soldier_Sniper_EP1_DZ","Graves_Light_DZ","GUE_Soldier_MG_DZ","GUE_Soldier_Sniper_DZ","GUE_Soldier_Crew_DZ","GUE_Soldier_CO_DZ","GUE_Soldier_2_DZ"]; +AllPlayers = ["Survivor2_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWsequishaD_DZ","SurvivorWsequisha_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","Bandit2_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker1_DZ","Rocker2_DZ","Rocker3_DZ","Rocker4_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Warlord_EP1_DZ","FR_OHara_DZ","FR_Rodriguez_DZ","CZ_Soldier_Sniper_EP1_DZ","Graves_Light_DZ","GUE_Soldier_MG_DZ","GUE_Soldier_Sniper_DZ","GUE_Soldier_Crew_DZ","GUE_Soldier_CO_DZ","GUE_Soldier_2_DZ"]; // AllPlayersVehicles = ["AllVehicles"]+AllPlayers; //Cooking @@ -90,6 +90,8 @@ food_output = [ no_output_drink = ["ItemWaterbottle", "ItemWaterbottleBoiled"]; drink_with_output = [ "ItemSoda", //just to define item for ItemSodaEmpty + "ItemSodaRbull", + "ItemSodaOrageSherbet", "ItemSodaCoke", "ItemSodaPepsi", "ItemSodaMdew", @@ -105,6 +107,8 @@ drink_with_output = [ ]; drink_output = [ "ItemSodaEmpty", + "ItemSodaEmpty", + "ItemSodaEmpty", "ItemSodaCokeEmpty", "ItemSodaPepsiEmpty", "ItemSodaMdewEmpty", @@ -151,7 +155,7 @@ dayz_combination = ""; dayz_combatLog = ""; canRoll = true; -placevault = true; +canbuild = true; //Hunting Variables dayZ_partClasses = [ @@ -370,10 +374,10 @@ dayz_animalDistance = 800; dayz_zSpawnDistance = 1000; if(isNil "dayz_maxLocalZombies") then { - dayz_maxLocalZombies = 40; + dayz_maxLocalZombies = 30; }; if(isNil "dayz_maxGlobalZombiesInit") then { - dayz_maxGlobalZombiesInit = 40; + dayz_maxGlobalZombiesInit = 30; }; if(isNil "dayz_maxGlobalZombiesIncrease") then { dayz_maxGlobalZombiesIncrease = 10; @@ -384,6 +388,9 @@ if(isNil "dayz_maxZeds") then { if(isNil "DZEdebug") then { DZEdebug = false; }; +if(isNil "DZE_TRADER_SPAWNMODE") then { + DZE_TRADER_SPAWNMODE = false; +}; if(isNil "dayz_tameDogs") then { dayz_tameDogs = false; }; @@ -399,12 +406,15 @@ if(isNil "dayz_minpos") then { if(isNil "dayz_maxpos") then { dayz_maxpos = 20000; }; +if(isNil "dayz_canBuildInCity") then { + dayz_canBuildInCity = false; +}; if(isNil "dayz_zedSpawnVehCount") then { dayz_zedSpawnVehCount = dayz_maxLocalZombies / 2; }; if(isNil "dayz_spawnAirCount") then { - dayz_spawnAirCount = 5; + dayz_spawnAirCount = 0; }; if(isNil "dayz_zedsAttackVehicles") then { dayz_zedsAttackVehicles = true; @@ -431,6 +441,15 @@ if(isServer) then { dayz_players = []; dead_bodyCleanup = []; needUpdate_objects = []; + + if(isNil "dayz_fullMoonNights") then { + dayz_fullMoonNights = false; + }; + if(isNil "EpochEvents") then { + EpochEvents = []; + }; + + }; if(!isDedicated) then { @@ -485,6 +504,9 @@ if(!isDedicated) then { dayz_damageCounter = time; dayz_lastSave = time; dayz_isSwimming = true; + dayz_isKneeling = false; + dayz_isCrawling = false; + dayz_PreviousTown = "Wilderness"; dayz_currentDay = 0; dayz_hasLight = false; dayz_surfaceNoise = 0; @@ -499,6 +521,7 @@ if(!isDedicated) then { dayz_playerName = "Unknown"; dayz_sourceBleeding = objNull; dayz_clientPreload = false; + dayz_authed = false; dayz_panicCooldown = 0; dayz_areaAffect = 2; dayz_heartBeat = false; diff --git a/dayz_code/rscTitles.hpp b/dayz_code/rscTitles.hpp index e3e251584..2cba86ac1 100644 --- a/dayz_code/rscTitles.hpp +++ b/dayz_code/rscTitles.hpp @@ -1,6 +1,7 @@ -class RscPicture; -class RscButton; +//class RscPicture; +//class RscButton; class CA_IGUI_Title; +class CA_Title; class RscText; class RscControlsGroup; class RscLineBreak; @@ -148,7 +149,7 @@ class RscDisplayMain : RscStandardDisplay class DAYZ_Version : CA_Version { idc = -1; - text = "DayZ Epoch 1.0.1.1 (1.7.6.1)"; + text = "DayZ Epoch 1.0.1.2 (1.7.6.1)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; }; delete CA_TitleMainMenu; @@ -763,6 +764,113 @@ class RscDisplayGenderSelect }; }; +class RscDisplayMPInterrupt : RscStandardDisplay { + movingEnable = 0; + enableSimulation = 1; + //onLoad = "_dummy = ['Init', _this] execVM '\ca\ui\scripts\pauseLoadinit.sqf'; [(_this select 0)] execVM '\z\addons\dayz_code\compile\player_onPause.sqf';"; _respawn = (_this select 0) displayCtrl 1010); _respawn ctrlEnable false; _abort = (_this select 0) displayCtrl 104); _abort ctrlEnable false; + onLoad = "[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; _dummy = ['Init', _this] execVM '\ca\ui\scripts\pauseLoadinit.sqf';"; + onUnload = "private ['_dummy']; _dummy = ['Unload', _this] execVM '\ca\ui\scripts\pauseOnUnload.sqf';"; + + class controlsBackground { + class Mainback : RscPicture { + idc = 1104; + x = 0.045; + y = 0.17; + w = 0.627451; + h = 0.836601; + text = "\ca\ui\data\ui_background_mp_pause_ca.paa"; + }; + }; + + class controls { + /* + class Title {}; + class B_Players {}; + class B_Options {}; + class B_Abort {}; + class B_Retry {}; + class B_Load {}; + class B_Save {}; + class B_Continue {}; + class B_Diary {}; + */ + + class MissionTitle : RscText { + idc = 120; + x = 0.05; + y = 0.818; + text = ""; + }; + + class DifficultyTitle : RscText { + idc = 121; + x = 0.05; + y = 0.772; + text = ""; + }; + + class Paused_Title : CA_Title { + idc = 523; + x = 0.087; + y = 0.192; + text = $STR_DISP_MAIN_MULTI; + }; + + class CA_B_SAVE : RscShortcutButtonMain { + idc = 103; + y = 0.2537 + 0.101903 * 0; + x = 0.051; + text = $STR_DISP_INT_SAVE; + default = 0; + }; + + class CA_B_Skip : CA_B_SAVE { + idc = 1002; + text = $STR_DISP_INT_SKIP; + }; + + class CA_B_REVERT : CA_B_SAVE { + idc = 119; + y = 0.2537 + 0.101903 * 1; + text = "$str_disp_revert"; + default = 0; + }; + + class CA_B_Respawn : CA_B_SAVE { + idc = 1010; + //onButtonClick = "hint str (_this select 0);"; + onButtonClick = "if ((alive player) && (r_fracture_legs)) then { player SetDamage 1;};"; + y = 0.2537 + 0.101903 * 2; + text = $STR_DISP_INT_RESPAWN; + default = 0; + }; + + class CA_B_Options : CA_B_SAVE { + idc = 101; + y = 0.2537 + 0.101903 * 3; + text = $STR_DISP_INT_OPTIONS; + default = 0; + }; + + class CA_B_Abort : CA_B_SAVE { + idc = 104; + y = 0.2537 + 0.101903 * 4; + onButtonClick = "[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; call dayz_forceSave;"; + text = $STR_DISP_INT_ABORT; + default = 0; + }; + + class ButtonCancel : RscShortcutButton { + idc = 2; + shortcuts[] = {0x00050000 + 1, 0x00050000 + 8}; + default = 1; + x = 0.1605; + y = 0.8617; + text = $STR_DISP_INT_CONTINUE; + }; + }; +}; + class RscDisplayGear { idd = 106; @@ -1491,7 +1599,7 @@ class RscDisplayGear emptyMag2 = "\ca\ui\data\ui_gear_mag2_gs.paa"; emptyHGun = "\ca\ui\data\ui_gear_hgun_gs.paa"; emptyHGunMag = "\ca\ui\data\ui_gear_hgunmag_gs.paa"; - onLoad = "call gear_ui_init;if (isNil('IGUI_GEAR_activeFilter')) then { IGUI_GEAR_activeFilter = 0;}; private ['_dummy']; _dummy = [_this,'initDialog'] call compile preprocessFile '\ca\ui\scripts\handleGear.sqf'; _dummy = [_this,'onLoad'] execVM '\ca\ui\scripts\handleGear.sqf'; _dummy;"; + onLoad = "[] spawn object_monitorGear; call gear_ui_init;if (isNil('IGUI_GEAR_activeFilter')) then { IGUI_GEAR_activeFilter = 0;}; private ['_dummy']; _dummy = [_this,'initDialog'] call compile preprocessFile '\ca\ui\scripts\handleGear.sqf'; _dummy = [_this,'onLoad'] execVM '\ca\ui\scripts\handleGear.sqf'; _dummy;"; class ControlsBackground { class Mainback: RscPicture diff --git a/dayz_code/safegui.hpp b/dayz_code/safegui.hpp new file mode 100644 index 000000000..9c2273a82 --- /dev/null +++ b/dayz_code/safegui.hpp @@ -0,0 +1,363 @@ +/////////////////////////////////////////////////////////////////////////// +/// Styles +/////////////////////////////////////////////////////////////////////////// + +// Control types +#define CT_STATIC 0 +#define CT_BUTTON 1 +#define CT_EDIT 2 +#define CT_SLIDER 3 +#define CT_COMBO 4 +#define CT_LISTBOX 5 +#define CT_TOOLBOX 6 +#define CT_CHECKBOXES 7 +#define CT_PROGRESS 8 +#define CT_HTML 9 +#define CT_STATIC_SKEW 10 +#define CT_ACTIVETEXT 11 +#define CT_TREE 12 +#define CT_STRUCTURED_TEXT 13 +#define CT_CONTEXT_MENU 14 +#define CT_CONTROLS_GROUP 15 +#define CT_SHORTCUTBUTTON 16 +#define CT_XKEYDESC 40 +#define CT_XBUTTON 41 +#define CT_XLISTBOX 42 +#define CT_XSLIDER 43 +#define CT_XCOMBO 44 +#define CT_ANIMATED_TEXTURE 45 +#define CT_OBJECT 80 +#define CT_OBJECT_ZOOM 81 +#define CT_OBJECT_CONTAINER 82 +#define CT_OBJECT_CONT_ANIM 83 +#define CT_LINEBREAK 98 +#define CT_USER 99 +#define CT_MAP 100 +#define CT_MAP_MAIN 101 +#define CT_LISTNBOX 102 + +// Static styles +#define ST_POS 0x0F +#define ST_HPOS 0x03 +#define ST_VPOS 0x0C +#define ST_LEFT 0x00 +#define ST_RIGHT 0x01 +#define ST_CENTER 0x02 +#define ST_DOWN 0x04 +#define ST_UP 0x08 +#define ST_VCENTER 0x0C + +#define ST_TYPE 0xF0 +#define ST_SINGLE 0x00 +#define ST_MULTI 0x10 +#define ST_TITLE_BAR 0x20 +#define ST_PICTURE 0x30 +#define ST_FRAME 0x40 +#define ST_BACKGROUND 0x50 +#define ST_GROUP_BOX 0x60 +#define ST_GROUP_BOX2 0x70 +#define ST_HUD_BACKGROUND 0x80 +#define ST_TILE_PICTURE 0x90 +#define ST_WITH_RECT 0xA0 +#define ST_LINE 0xB0 + +#define ST_SHADOW 0x100 +#define ST_NO_RECT 0x200 +#define ST_KEEP_ASPECT_RATIO 0x800 + +#define ST_TITLE ST_TITLE_BAR + ST_CENTER + +// Slider styles +#define SL_DIR 0x400 +#define SL_VERT 0 +#define SL_HORZ 0x400 + +#define SL_TEXTURES 0x10 + +// progress bar +#define ST_VERTICAL 0x01 +#define ST_HORIZONTAL 0 + +// Listbox styles +#define LB_TEXTURES 0x10 +#define LB_MULTI 0x20 + +// Tree styles +#define TR_SHOWROOT 1 +#define TR_AUTOCOLLAPSE 2 + +// MessageBox styles +#define MB_BUTTON_OK 1 +#define MB_BUTTON_CANCEL 2 +#define MB_BUTTON_USER 4 + + +/////////////////////////////////////////////////////////////////////////// +/// Base Classes +/////////////////////////////////////////////////////////////////////////// +/* +class RscPicture +{ + access = 0; + type = 0; + idc = -1; + style = 48; + colorBackground[] = {0,0,0,0}; + colorText[] = {1,1,1,1}; + font = "TahomaB"; + sizeEx = 0; + lineSpacing = 0; + text = ""; + fixedWidth = 0; + shadow = 0; + x = 0; + y = 0; + w = 0.2; + h = 0.15; +}; +class RscButton +{ + access = 0; + type = 1; + text = ""; + colorText[] = {0.8784,0.8471,0.651,1}; + colorDisabled[] = {0.4,0.4,0.4,1}; + colorBackground[] = {1,0.537,0,0.5}; + colorBackgroundDisabled[] = {0.95,0.95,0.95,1}; + colorBackgroundActive[] = {1,0.537,0,1}; + colorFocused[] = {1,0.537,0,1}; + colorShadow[] = {0.023529,0,0.0313725,1}; + colorBorder[] = {0.023529,0,0.0313725,1}; + soundEnter[] = {"\ca\ui\data\sound\onover",0.09,1}; + soundPush[] = {"\ca\ui\data\sound\new1",0,0}; + soundClick[] = {"\ca\ui\data\sound\onclick",0.07,1}; + soundEscape[] = {"\ca\ui\data\sound\onescape",0.09,1}; + style = 2; + x = 0; + y = 0; + w = 0.095589; + h = 0.039216; + shadow = 2; + font = "Zeppelin33"; + sizeEx = 0.03921; + offsetX = 0.003; + offsetY = 0.003; + offsetPressedX = 0.002; + offsetPressedY = 0.002; + borderSize = 0; +}; +*/ +class RscPicture; +class RscButton; + +class SafeKeyPad +{ + idd = -1; + movingenable = 0; + + class Controls + { + class SafeKeyPadPic: RscPicture + { + idc = -1; + text = "\z\addons\dayz_epoch\pictures\SafeKeyPad.paa"; + x = 0.361701 * safezoneW + safezoneX; + y = 0.255985 * safezoneH + safezoneY; + w = 0.281637 * safezoneW; + h = 0.470087 * safezoneH; + }; + class b1: RscButton + { + idc = -1; + x = 0.444897 * safezoneW + safezoneX; + y = 0.39423 * safezoneH + safezoneY; + w = 0.0283751 * safezoneW; + h = 0.0490667 * safezoneH; + font = "Zeppelin33"; + sizeEx=0.05; + text="1"; + colorText[] = {0,0.6,1,1}; + colorBackground[] = {0,0,0,0}; + colorBackgroundActive[] = {0,0,0,0}; + action = "dayz_combination = dayz_combination + str(1);"; + soundClick[] = {"\dayz_sfx\action\cell\dtmf_1.ogg",0.5,1}; + }; + class b4: RscButton + { + idc = -1; + x = 0.444897 * safezoneW + safezoneX; + y = 0.441239 * safezoneH + safezoneY; + w = 0.0283751 * safezoneW; + h = 0.0490667 * safezoneH; + font = "Zeppelin33"; + sizeEx=0.05; + text="4"; + colorText[] = {0,0.6,1,1}; + colorBackground[] = {0,0,0,0}; + colorBackgroundActive[] = {0,0,0,0}; + action = "dayz_combination = dayz_combination + str(4);"; + soundClick[] = {"\dayz_sfx\action\cell\dtmf_4.ogg",0.5,1}; + }; + class b7: RscButton + { + idc = -1; + x = 0.444897 * safezoneW + safezoneX; + y = 0.488248 * safezoneH + safezoneY; + w = 0.0283751 * safezoneW; + h = 0.0490667 * safezoneH; + font = "Zeppelin33"; + sizeEx=0.05; + text="7"; + colorText[] = {0,0.6,1,1}; + colorBackground[] = {0,0,0,0}; + colorBackgroundActive[] = {0,0,0,0}; + action = "dayz_combination = dayz_combination + str(7);"; + soundClick[] = {"\dayz_sfx\action\cell\dtmf_7.ogg",0.5,1}; + }; + class b2: RscButton + { + idc = -1; + x = 0.487755 * safezoneW + safezoneX; + y = 0.39423 * safezoneH + safezoneY; + w = 0.0283751 * safezoneW; + h = 0.0490667 * safezoneH; + font = "Zeppelin33"; + sizeEx=0.05; + text="2"; + colorText[] = {0,0.6,1,1}; + colorBackground[] = {0,0,0,0}; + colorBackgroundActive[] = {0,0,0,0}; + action = "dayz_combination = dayz_combination + str(2);"; + soundClick[] = {"\dayz_sfx\action\cell\dtmf_2.ogg",0.5,1}; + }; + class b8: RscButton + { + idc = -1; + x = 0.487755 * safezoneW + safezoneX; + y = 0.488248 * safezoneH + safezoneY; + w = 0.0283751 * safezoneW; + h = 0.0490667 * safezoneH; + font = "Zeppelin33"; + sizeEx=0.05; + text="8"; + colorText[] = {0,0.6,1,1}; + colorBackground[] = {0,0,0,0}; + colorBackgroundActive[] = {0,0,0,0}; + action = "dayz_combination = dayz_combination + str(8);"; + soundClick[] = {"\dayz_sfx\action\cell\dtmf_8.ogg",0.5,1}; + }; + class b5: RscButton + { + idc = -1; + x = 0.487755 * safezoneW + safezoneX; + y = 0.441239 * safezoneH + safezoneY; + w = 0.0283751 * safezoneW; + h = 0.0490667 * safezoneH; + font = "Zeppelin33"; + sizeEx=0.05; + text="5"; + colorText[] = {0,0.6,1,1}; + colorBackground[] = {0,0,0,0}; + colorBackgroundActive[] = {0,0,0,0}; + action = "dayz_combination = dayz_combination + str(5);"; + soundClick[] = {"\dayz_sfx\action\cell\dtmf_5.ogg",0.5,1}; + }; + class b3: RscButton + { + idc = -1; + x = 0.530613 * safezoneW + safezoneX; + y = 0.39423 * safezoneH + safezoneY; + w = 0.0283751 * safezoneW; + h = 0.0490667 * safezoneH; + font = "Zeppelin33"; + sizeEx=0.05; + text="3"; + colorText[] = {0,0.6,1,1}; + colorBackground[] = {0,0,0,0}; + colorBackgroundActive[] = {0,0,0,0}; + action = "dayz_combination = dayz_combination + str(3);"; + soundClick[] = {"\dayz_sfx\action\cell\dtmf_3.ogg",0.5,1}; + }; + class b6: RscButton + { + idc = -1; + x = 0.530613 * safezoneW + safezoneX; + y = 0.441239 * safezoneH + safezoneY; + w = 0.0283751 * safezoneW; + h = 0.0490667 * safezoneH; + font = "Zeppelin33"; + sizeEx=0.05; + text="6"; + colorText[] = {0,0.6,1,1}; + colorBackground[] = {0,0,0,0}; + colorBackgroundActive[] = {0,0,0,0}; + action = "dayz_combination = dayz_combination + str(6);"; + soundClick[] = {"\dayz_sfx\action\cell\dtmf_6.ogg",0.5,1}; + }; + class b9: RscButton + { + idc = -1; + x = 0.530613 * safezoneW + safezoneX; + y = 0.488248 * safezoneH + safezoneY; + w = 0.0283751 * safezoneW; + h = 0.0490667 * safezoneH; + font = "Zeppelin33"; + sizeEx=0.05; + text="9"; + colorText[] = {0,0.6,1,1}; + colorBackground[] = {0,0,0,0}; + colorBackgroundActive[] = {0,0,0,0}; + action = "dayz_combination = dayz_combination + str(9);"; + soundClick[] = {"\dayz_sfx\action\cell\dtmf_9.ogg",0.5,1}; + }; + class b0: RscButton + { + idc = -1; + x = 0.487755 * safezoneW + safezoneX; + y = 0.535257 * safezoneH + safezoneY; + w = 0.0283751 * safezoneW; + h = 0.0490667 * safezoneH; + font = "Zeppelin33"; + sizeEx=0.05; + text="0"; + colorText[] = {0,0.6,1,1}; + colorBackground[] = {0,0,0,0}; + colorBackgroundActive[] = {0,0,0,0}; + action = "dayz_combination = dayz_combination + str(0);"; + soundClick[] = {"\dayz_sfx\action\cell\dtmf_9.ogg",0.5,1}; + }; + + class bcancel: RscButton + { + idc = -1; + x = 0.444897 * safezoneW + safezoneX; + y = 0.545257 * safezoneH + safezoneY; + w = 0.0263751 * safezoneW; + h = 0.0440667 * safezoneH; + font = "Zeppelin33"; + sizeEx=0.1; + text="*"; + colorText[] = {1,0.1,0.1,1}; + colorBackground[] = {0,0,0,0}; + colorBackgroundActive[] = {0,0,0,0}; + soundClick[] = {"\dayz_sfx\action\cell\dtmf_star.ogg",0.6,1}; + onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 3000);"; + }; + class benter: RscButton + { + idc = -1; + x = 0.530613 * safezoneW + safezoneX; + y = 0.535257 * safezoneH + safezoneY; + w = 0.0263751 * safezoneW; + h = 0.0440667 * safezoneH; + font = "Zeppelin33Italic"; + sizeEx=0.1; + text="#"; + colorText[] = {0,1,0,1}; + colorBackground[] = {0,0,0,0}; + colorBackgroundActive[] = {0,0,0,0}; + onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 3000); if(!isNull dayz_selectedVault and (typeOf dayz_selectedVault) == ""VaultStorageLocked"") then {dayz_selectedVault spawn player_unlockVault;};"; + soundClick[] = {"\dayz_sfx\action\cell\dtmf_hash.ogg",0.6,1}; + }; + }; +}; \ No newline at end of file diff --git a/dayz_code/stringtable.xml b/dayz_code/stringtable.xml index 9a8d23a14..71cbd3ab0 100644 --- a/dayz_code/stringtable.xml +++ b/dayz_code/stringtable.xml @@ -2472,5 +2472,45 @@ An old-fashioned cut-throat razor with a rounded French point. An old-fashioned cut-throat razor with a rounded French point. + + Red Bull + Red Bull + Red Bull + Red Bull + Red Bull + Red Bull + Red Bull + Red Bull + + + Red Bull is an energy drink sold by Austrian company Red Bull GmbH, + Red Bull is an energy drink sold by Austrian company Red Bull GmbH, + Red Bull is an energy drink sold by Austrian company Red Bull GmbH, + Red Bull is an energy drink sold by Austrian company Red Bull GmbH, + Red Bull is an energy drink sold by Austrian company Red Bull GmbH, + Red Bull is an energy drink sold by Austrian company Red Bull GmbH, + Red Bull is an energy drink sold by Austrian company Red Bull GmbH, + Red Bull is an energy drink sold by Austrian company Red Bull GmbH, + + + Orange Sherbet/Original> + Orange Sherbet + Orange Sherbet + Orange Sherbet + Orange Sherbet + Orange Sherbet + Orange Sherbet + Orange Sherbet + + + Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz. + Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz. + Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz. + Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz. + Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz. + Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz. + Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz. + Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz. + diff --git a/dayz_code/system/player_monitor.fsm b/dayz_code/system/player_monitor.fsm index 6ec76f772..8e9c36a16 100644 --- a/dayz_code/system/player_monitor.fsm +++ b/dayz_code/system/player_monitor.fsm @@ -119,8 +119,8 @@ link59[] = {51,52}; link60[] = {52,29}; link61[] = {53,54}; link62[] = {54,20}; -globals[] = {25.000000,1,0,0,0,640,480,1,85,6316128,1,-452.194977,340.078094,1506.747437,277.117401,566,880,1}; -window[] = {2,-1,-1,-1,-1,760,28,999,0,3,584}; +globals[] = {25.000000,1,0,0,0,640,480,1,85,6316128,1,-452.194977,340.078094,1506.747437,277.117401,565,880,1}; +window[] = {2,-1,-1,-1,-1,806,2041,3012,46,3,583}; *//*%FSM*/ class FSM { @@ -444,7 +444,7 @@ class FSM priority = 0.000000; to="Parse_Login"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"count (dayzPlayerLogin) > 0"/*%FSM*/; + condition=/*%FSM*/"count (dayzPlayerLogin) > 1"/*%FSM*/; action=/*%FSM*/"_msg = dayzPlayerLogin;"/*%FSM*/; }; /*%FSM*/ @@ -455,7 +455,9 @@ class FSM class Parse_Login { name = "Parse_Login"; - init = /*%FSM*/"progressLoadingScreen 0.6;" \n + init = /*%FSM*/"dayz_authed = true;" \n + "" \n + "progressLoadingScreen 0.6;" \n "_charID = _msg select 0;" \n "_inventory = _msg select 1;" \n "_backpack = _msg select 2;" \n @@ -720,43 +722,46 @@ class FSM "dayz_playerUID = _playerUID;" \n "" \n "if ((_isNew) OR (count _inventory == 0)) then {" \n - " //player is new, add initial loadout" \n - " _config = (configFile >> ""CfgSurvival"" >> ""Inventory"" >> ""Default"");" \n - " _mags = getArray (_config >> ""magazines"");" \n - " _wpns = getArray (_config >> ""weapons""); " \n - " _bcpk = getText (_config >> ""backpack"");" \n - " _bcpkWpn = getText (_config >> ""backpackWeapon"");" \n - " if(!isNil ""DefaultMagazines"") then {" \n - " _mags = DefaultMagazines;" \n - " };" \n - " if(!isNil ""DefaultWeapons"") then {" \n - " _wpns = DefaultWeapons;" \n - " };" \n - " if(!isNil ""DefaultBackpack"") then {" \n - " _bcpk = DefaultBackpack;" \n - " };" \n - " if(!isNil ""DefaultBackpackWeapon"") then {" \n - " _bcpkWpn = DefaultBackpackWeapon;" \n - " };" \n - " //Add inventory" \n - " {" \n - " _isOK = isClass(configFile >> ""CfgMagazines"" >> _x);" \n - " if (_isOK) then {" \n - " player addMagazine _x;" \n + " //player is new, add initial loadout only if player is not pzombie" \n + " if(!(player isKindOf ""PZombie_VB"")) then {" \n + " _config = (configFile >> ""CfgSurvival"" >> ""Inventory"" >> ""Default"");" \n + " _mags = getArray (_config >> ""magazines"");" \n + " _wpns = getArray (_config >> ""weapons""); " \n + " _bcpk = getText (_config >> ""backpack"");" \n + " _bcpkWpn = getText (_config >> ""backpackWeapon"");" \n + " if(!isNil ""DefaultMagazines"") then {" \n + " _mags = DefaultMagazines;" \n " };" \n - " } forEach _mags;" \n - " {" \n - " _isOK = isClass(configFile >> ""CfgWeapons"" >> _x);" \n - " if (_isOK) then {" \n - " player addWeapon _x;" \n + " if(!isNil ""DefaultWeapons"") then {" \n + " _wpns = DefaultWeapons;" \n + " };" \n + " if(!isNil ""DefaultBackpack"") then {" \n + " _bcpk = DefaultBackpack;" \n + " };" \n + " if(!isNil ""DefaultBackpackWeapon"") then {" \n + " _bcpkWpn = DefaultBackpackWeapon;" \n + " };" \n + " //Add inventory" \n + " {" \n + " _isOK = isClass(configFile >> ""CfgMagazines"" >> _x);" \n + " if (_isOK) then {" \n + " player addMagazine _x;" \n + " };" \n + " } forEach _mags;" \n + " {" \n + " _isOK = isClass(configFile >> ""CfgWeapons"" >> _x);" \n + " if (_isOK) then {" \n + " player addWeapon _x;" \n + " };" \n + " } forEach _wpns;" \n + " " \n + " if (_bcpk != """") then {" \n + " player addBackpack _bcpk; " \n + " dayz_myBackpack = unitBackpack player;" \n + " };" \n + " if (_bcpkWpn != """") then {" \n + " dayz_myBackpack addWeaponCargoGlobal [_bcpkWpn,1];" \n " };" \n - " } forEach _wpns;" \n - " " \n - " player addBackpack _bcpk; " \n - " dayz_myBackpack = unitBackpack player;" \n - "" \n - " if (_bcpkWpn != """") then {" \n - " dayz_myBackpack addWeaponCargoGlobal [_bcpkWpn,1];" \n " };" \n "};" \n "" \n diff --git a/dayz_code/system/player_spawn_1.sqf b/dayz_code/system/player_spawn_1.sqf index 7032afd1f..4165df1d6 100644 --- a/dayz_code/system/player_spawn_1.sqf +++ b/dayz_code/system/player_spawn_1.sqf @@ -56,6 +56,20 @@ while {true} do { dayz_currentDay = _day; }; + _world = toUpper(worldName); //toUpper(getText (configFile >> "CfgWorlds" >> (worldName) >> "description")); + _nearestCity = nearestLocations [getPos player, ["NameCityCapital","NameCity","NameVillage","NameLocal"],300]; + + if (count _nearestCity > 0) then { + _town = text (_nearestCity select 0); + if(dayz_PreviousTown == "Wilderness") then { + dayz_PreviousTown = _town; + }; + if(_town != dayz_PreviousTown) then { + _first = [_world,_town,""] spawn BIS_fnc_infoText; + }; + dayz_PreviousTown = _town; + }; + //wait sleep 5; }; \ No newline at end of file diff --git a/dayz_epoch/README.TXT b/dayz_epoch/README.TXT new file mode 100644 index 000000000..ccebdad51 --- /dev/null +++ b/dayz_epoch/README.TXT @@ -0,0 +1 @@ +All content in this PBO was made exclusively DayZ Epoch mod. To use/edit/distribute any of the content in this mod please contact vbawol@veteranbastards.com or ptomany@gmail.com \ No newline at end of file diff --git a/dayz_epoch/config.cpp b/dayz_epoch/config.cpp new file mode 100644 index 000000000..1dbaebdf5 --- /dev/null +++ b/dayz_epoch/config.cpp @@ -0,0 +1,8 @@ +class CfgPatches { + class dayz_epoch { + units[] = {}; + weapons[] = {}; + requiredVersion = 0.1; + requiredAddons[] = {"dayz_code"}; + }; +}; \ No newline at end of file diff --git a/dayz_epoch/icons/Readme.txt b/dayz_epoch/icons/Readme.txt new file mode 100644 index 000000000..52b9bb3f3 --- /dev/null +++ b/dayz_epoch/icons/Readme.txt @@ -0,0 +1 @@ +Just a placeholder \ No newline at end of file diff --git a/dayz_epoch/models/aluminum_bar.p3d b/dayz_epoch/models/aluminum_bar.p3d new file mode 100644 index 000000000..6d7fe1eee Binary files /dev/null and b/dayz_epoch/models/aluminum_bar.p3d differ diff --git a/dayz_epoch/models/aluminum_bar_10oz.p3d b/dayz_epoch/models/aluminum_bar_10oz.p3d new file mode 100644 index 000000000..6e9bee59f Binary files /dev/null and b/dayz_epoch/models/aluminum_bar_10oz.p3d differ diff --git a/dayz_epoch/models/briefcase.p3d b/dayz_epoch/models/briefcase.p3d new file mode 100644 index 000000000..9eaff6084 Binary files /dev/null and b/dayz_epoch/models/briefcase.p3d differ diff --git a/dayz_epoch/models/bulb.p3d b/dayz_epoch/models/bulb.p3d new file mode 100644 index 000000000..6b912461d Binary files /dev/null and b/dayz_epoch/models/bulb.p3d differ diff --git a/dayz_epoch/models/burlap.p3d b/dayz_epoch/models/burlap.p3d new file mode 100644 index 000000000..5a9231ebf Binary files /dev/null and b/dayz_epoch/models/burlap.p3d differ diff --git a/dayz_epoch/models/canvas.p3d b/dayz_epoch/models/canvas.p3d new file mode 100644 index 000000000..f2b2940bd Binary files /dev/null and b/dayz_epoch/models/canvas.p3d differ diff --git a/dayz_epoch/models/copper_bar.p3d b/dayz_epoch/models/copper_bar.p3d new file mode 100644 index 000000000..304dba412 Binary files /dev/null and b/dayz_epoch/models/copper_bar.p3d differ diff --git a/dayz_epoch/models/copper_bar_10oz.p3d b/dayz_epoch/models/copper_bar_10oz.p3d new file mode 100644 index 000000000..7f3c15542 Binary files /dev/null and b/dayz_epoch/models/copper_bar_10oz.p3d differ diff --git a/dayz_epoch/models/fishing_rod_loot_item.p3d b/dayz_epoch/models/fishing_rod_loot_item.p3d new file mode 100644 index 000000000..aa2134866 Binary files /dev/null and b/dayz_epoch/models/fishing_rod_loot_item.p3d differ diff --git a/dayz_epoch/models/fishing_rod_weaponized.p3d b/dayz_epoch/models/fishing_rod_weaponized.p3d new file mode 100644 index 000000000..d3c86d44f Binary files /dev/null and b/dayz_epoch/models/fishing_rod_weaponized.p3d differ diff --git a/dayz_epoch/models/gold_bar.p3d b/dayz_epoch/models/gold_bar.p3d new file mode 100644 index 000000000..931b2d8fc Binary files /dev/null and b/dayz_epoch/models/gold_bar.p3d differ diff --git a/dayz_epoch/models/gold_bar_10oz.p3d b/dayz_epoch/models/gold_bar_10oz.p3d new file mode 100644 index 000000000..733869ba2 Binary files /dev/null and b/dayz_epoch/models/gold_bar_10oz.p3d differ diff --git a/dayz_epoch/models/key.p3d b/dayz_epoch/models/key.p3d new file mode 100644 index 000000000..3f546916f Binary files /dev/null and b/dayz_epoch/models/key.p3d differ diff --git a/dayz_epoch/models/key_blue.p3d b/dayz_epoch/models/key_blue.p3d new file mode 100644 index 000000000..4251ae245 Binary files /dev/null and b/dayz_epoch/models/key_blue.p3d differ diff --git a/dayz_epoch/models/key_green.p3d b/dayz_epoch/models/key_green.p3d new file mode 100644 index 000000000..ce11ee762 Binary files /dev/null and b/dayz_epoch/models/key_green.p3d differ diff --git a/dayz_epoch/models/key_red.p3d b/dayz_epoch/models/key_red.p3d new file mode 100644 index 000000000..a0e9bca38 Binary files /dev/null and b/dayz_epoch/models/key_red.p3d differ diff --git a/dayz_epoch/models/key_yellow.p3d b/dayz_epoch/models/key_yellow.p3d new file mode 100644 index 000000000..866fa2f45 Binary files /dev/null and b/dayz_epoch/models/key_yellow.p3d differ diff --git a/dayz_epoch/models/keykit.p3d b/dayz_epoch/models/keykit.p3d new file mode 100644 index 000000000..095d614d3 Binary files /dev/null and b/dayz_epoch/models/keykit.p3d differ diff --git a/dayz_epoch/models/oil_drum_model.p3d b/dayz_epoch/models/oil_drum_model.p3d new file mode 100644 index 000000000..8fbcade69 Binary files /dev/null and b/dayz_epoch/models/oil_drum_model.p3d differ diff --git a/dayz_epoch/models/pipe.p3d b/dayz_epoch/models/pipe.p3d new file mode 100644 index 000000000..d1e7e6f13 Binary files /dev/null and b/dayz_epoch/models/pipe.p3d differ diff --git a/dayz_epoch/models/planks.p3d b/dayz_epoch/models/planks.p3d new file mode 100644 index 000000000..c56105c4c Binary files /dev/null and b/dayz_epoch/models/planks.p3d differ diff --git a/dayz_epoch/models/plywood.p3d b/dayz_epoch/models/plywood.p3d new file mode 100644 index 000000000..da0e3ca76 Binary files /dev/null and b/dayz_epoch/models/plywood.p3d differ diff --git a/dayz_epoch/models/safe.p3d b/dayz_epoch/models/safe.p3d new file mode 100644 index 000000000..5714e9dae Binary files /dev/null and b/dayz_epoch/models/safe.p3d differ diff --git a/dayz_epoch/models/safe_onside.p3d b/dayz_epoch/models/safe_onside.p3d new file mode 100644 index 000000000..47cb1df7d Binary files /dev/null and b/dayz_epoch/models/safe_onside.p3d differ diff --git a/dayz_epoch/models/seabass.p3d b/dayz_epoch/models/seabass.p3d new file mode 100644 index 000000000..beb05c680 Binary files /dev/null and b/dayz_epoch/models/seabass.p3d differ diff --git a/dayz_epoch/models/seabass_cooked.p3d b/dayz_epoch/models/seabass_cooked.p3d new file mode 100644 index 000000000..d1df63a42 Binary files /dev/null and b/dayz_epoch/models/seabass_cooked.p3d differ diff --git a/dayz_epoch/models/silver_bar.p3d b/dayz_epoch/models/silver_bar.p3d new file mode 100644 index 000000000..1054e0aec Binary files /dev/null and b/dayz_epoch/models/silver_bar.p3d differ diff --git a/dayz_epoch/models/silver_bar_10oz.p3d b/dayz_epoch/models/silver_bar_10oz.p3d new file mode 100644 index 000000000..5b3747d4d Binary files /dev/null and b/dayz_epoch/models/silver_bar_10oz.p3d differ diff --git a/dayz_epoch/models/soda_redbull.p3d b/dayz_epoch/models/soda_redbull.p3d new file mode 100644 index 000000000..42072f93f Binary files /dev/null and b/dayz_epoch/models/soda_redbull.p3d differ diff --git a/dayz_epoch/models/soda_sherbet.p3d b/dayz_epoch/models/soda_sherbet.p3d new file mode 100644 index 000000000..a50a40bf0 Binary files /dev/null and b/dayz_epoch/models/soda_sherbet.p3d differ diff --git a/dayz_epoch/models/supply_crate.p3d b/dayz_epoch/models/supply_crate.p3d new file mode 100644 index 000000000..fe92f8050 Binary files /dev/null and b/dayz_epoch/models/supply_crate.p3d differ diff --git a/dayz_epoch/models/tin_bar.p3d b/dayz_epoch/models/tin_bar.p3d new file mode 100644 index 000000000..a42ce4300 Binary files /dev/null and b/dayz_epoch/models/tin_bar.p3d differ diff --git a/dayz_epoch/models/tin_bar_10oz.p3d b/dayz_epoch/models/tin_bar_10oz.p3d new file mode 100644 index 000000000..f07062c1a Binary files /dev/null and b/dayz_epoch/models/tin_bar_10oz.p3d differ diff --git a/dayz_epoch/models/trout.p3d b/dayz_epoch/models/trout.p3d new file mode 100644 index 000000000..c1b36eaad Binary files /dev/null and b/dayz_epoch/models/trout.p3d differ diff --git a/dayz_epoch/models/trout_cooked.p3d b/dayz_epoch/models/trout_cooked.p3d new file mode 100644 index 000000000..a315db8de Binary files /dev/null and b/dayz_epoch/models/trout_cooked.p3d differ diff --git a/dayz_epoch/models/tuna.p3d b/dayz_epoch/models/tuna.p3d new file mode 100644 index 000000000..4dce46217 Binary files /dev/null and b/dayz_epoch/models/tuna.p3d differ diff --git a/dayz_epoch/models/tuna_cooked.p3d b/dayz_epoch/models/tuna_cooked.p3d new file mode 100644 index 000000000..d9b234c69 Binary files /dev/null and b/dayz_epoch/models/tuna_cooked.p3d differ diff --git a/dayz_epoch/pictures/SafeKeyPad.paa b/dayz_epoch/pictures/SafeKeyPad.paa new file mode 100644 index 000000000..707a66a81 Binary files /dev/null and b/dayz_epoch/pictures/SafeKeyPad.paa differ diff --git a/dayz_epoch/pictures/equip_alum_bar_10oz_CA.paa b/dayz_epoch/pictures/equip_alum_bar_10oz_CA.paa new file mode 100644 index 000000000..356b60580 Binary files /dev/null and b/dayz_epoch/pictures/equip_alum_bar_10oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_alum_bar_CA.paa b/dayz_epoch/pictures/equip_alum_bar_CA.paa new file mode 100644 index 000000000..ef73ebcb7 Binary files /dev/null and b/dayz_epoch/pictures/equip_alum_bar_CA.paa differ diff --git a/dayz_epoch/pictures/equip_bar_bronze_ca.paa b/dayz_epoch/pictures/equip_bar_bronze_ca.paa new file mode 100644 index 000000000..6bb796e5e Binary files /dev/null and b/dayz_epoch/pictures/equip_bar_bronze_ca.paa differ diff --git a/dayz_epoch/pictures/equip_biomeat_CA.paa b/dayz_epoch/pictures/equip_biomeat_CA.paa new file mode 100644 index 000000000..0b4648865 Binary files /dev/null and b/dayz_epoch/pictures/equip_biomeat_CA.paa differ diff --git a/dayz_epoch/pictures/equip_briefcase_100oz_CA.paa b/dayz_epoch/pictures/equip_briefcase_100oz_CA.paa new file mode 100644 index 000000000..780136aae Binary files /dev/null and b/dayz_epoch/pictures/equip_briefcase_100oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_briefcase_10oz_CA.paa b/dayz_epoch/pictures/equip_briefcase_10oz_CA.paa new file mode 100644 index 000000000..53c8c6a2e Binary files /dev/null and b/dayz_epoch/pictures/equip_briefcase_10oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_briefcase_20oz_CA.paa b/dayz_epoch/pictures/equip_briefcase_20oz_CA.paa new file mode 100644 index 000000000..263b88fe8 Binary files /dev/null and b/dayz_epoch/pictures/equip_briefcase_20oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_briefcase_30oz_CA.paa b/dayz_epoch/pictures/equip_briefcase_30oz_CA.paa new file mode 100644 index 000000000..15d919c3e Binary files /dev/null and b/dayz_epoch/pictures/equip_briefcase_30oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_briefcase_40oz_CA.paa b/dayz_epoch/pictures/equip_briefcase_40oz_CA.paa new file mode 100644 index 000000000..107739215 Binary files /dev/null and b/dayz_epoch/pictures/equip_briefcase_40oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_briefcase_50oz_CA.paa b/dayz_epoch/pictures/equip_briefcase_50oz_CA.paa new file mode 100644 index 000000000..6cfe995bc Binary files /dev/null and b/dayz_epoch/pictures/equip_briefcase_50oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_briefcase_60oz_CA.paa b/dayz_epoch/pictures/equip_briefcase_60oz_CA.paa new file mode 100644 index 000000000..f0c17b610 Binary files /dev/null and b/dayz_epoch/pictures/equip_briefcase_60oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_briefcase_70oz_CA.paa b/dayz_epoch/pictures/equip_briefcase_70oz_CA.paa new file mode 100644 index 000000000..820eb19d4 Binary files /dev/null and b/dayz_epoch/pictures/equip_briefcase_70oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_briefcase_80oz_CA.paa b/dayz_epoch/pictures/equip_briefcase_80oz_CA.paa new file mode 100644 index 000000000..edc7c0e86 Binary files /dev/null and b/dayz_epoch/pictures/equip_briefcase_80oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_briefcase_90oz_CA.paa b/dayz_epoch/pictures/equip_briefcase_90oz_CA.paa new file mode 100644 index 000000000..b0a5e0594 Binary files /dev/null and b/dayz_epoch/pictures/equip_briefcase_90oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_briefcase_E_CA.paa b/dayz_epoch/pictures/equip_briefcase_E_CA.paa new file mode 100644 index 000000000..fbfcb832c Binary files /dev/null and b/dayz_epoch/pictures/equip_briefcase_E_CA.paa differ diff --git a/dayz_epoch/pictures/equip_bulb_CA.paa b/dayz_epoch/pictures/equip_bulb_CA.paa new file mode 100644 index 000000000..2a6f6cfef Binary files /dev/null and b/dayz_epoch/pictures/equip_bulb_CA.paa differ diff --git a/dayz_epoch/pictures/equip_burlap_ca.paa b/dayz_epoch/pictures/equip_burlap_ca.paa new file mode 100644 index 000000000..489851280 Binary files /dev/null and b/dayz_epoch/pictures/equip_burlap_ca.paa differ diff --git a/dayz_epoch/pictures/equip_canvas_ca.paa b/dayz_epoch/pictures/equip_canvas_ca.paa new file mode 100644 index 000000000..5da96067f Binary files /dev/null and b/dayz_epoch/pictures/equip_canvas_ca.paa differ diff --git a/dayz_epoch/pictures/equip_copper_bar_10oz_CA.paa b/dayz_epoch/pictures/equip_copper_bar_10oz_CA.paa new file mode 100644 index 000000000..4838f2cf4 Binary files /dev/null and b/dayz_epoch/pictures/equip_copper_bar_10oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_copper_bar_CA.paa b/dayz_epoch/pictures/equip_copper_bar_CA.paa new file mode 100644 index 000000000..03245f44e Binary files /dev/null and b/dayz_epoch/pictures/equip_copper_bar_CA.paa differ diff --git a/dayz_epoch/pictures/equip_fishingpole_CA.paa b/dayz_epoch/pictures/equip_fishingpole_CA.paa new file mode 100644 index 000000000..cb1ce430c Binary files /dev/null and b/dayz_epoch/pictures/equip_fishingpole_CA.paa differ diff --git a/dayz_epoch/pictures/equip_gold_bar_10oz_CA.paa b/dayz_epoch/pictures/equip_gold_bar_10oz_CA.paa new file mode 100644 index 000000000..62a6ed50b Binary files /dev/null and b/dayz_epoch/pictures/equip_gold_bar_10oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_gold_bar_CA.paa b/dayz_epoch/pictures/equip_gold_bar_CA.paa new file mode 100644 index 000000000..deac594fb Binary files /dev/null and b/dayz_epoch/pictures/equip_gold_bar_CA.paa differ diff --git a/dayz_epoch/pictures/equip_key_CA.paa b/dayz_epoch/pictures/equip_key_CA.paa new file mode 100644 index 000000000..8c896617b Binary files /dev/null and b/dayz_epoch/pictures/equip_key_CA.paa differ diff --git a/dayz_epoch/pictures/equip_key_CA_blue.paa b/dayz_epoch/pictures/equip_key_CA_blue.paa new file mode 100644 index 000000000..f843eefaa Binary files /dev/null and b/dayz_epoch/pictures/equip_key_CA_blue.paa differ diff --git a/dayz_epoch/pictures/equip_key_CA_green.paa b/dayz_epoch/pictures/equip_key_CA_green.paa new file mode 100644 index 000000000..8c8c71018 Binary files /dev/null and b/dayz_epoch/pictures/equip_key_CA_green.paa differ diff --git a/dayz_epoch/pictures/equip_key_CA_red.paa b/dayz_epoch/pictures/equip_key_CA_red.paa new file mode 100644 index 000000000..0797b06b3 Binary files /dev/null and b/dayz_epoch/pictures/equip_key_CA_red.paa differ diff --git a/dayz_epoch/pictures/equip_key_CA_yellow.paa b/dayz_epoch/pictures/equip_key_CA_yellow.paa new file mode 100644 index 000000000..71cd51d21 Binary files /dev/null and b/dayz_epoch/pictures/equip_key_CA_yellow.paa differ diff --git a/dayz_epoch/pictures/equip_keykit_ca.paa b/dayz_epoch/pictures/equip_keykit_ca.paa new file mode 100644 index 000000000..56e1fd7f1 Binary files /dev/null and b/dayz_epoch/pictures/equip_keykit_ca.paa differ diff --git a/dayz_epoch/pictures/equip_oil_drum_model_ca.paa b/dayz_epoch/pictures/equip_oil_drum_model_ca.paa new file mode 100644 index 000000000..fb6d79ea4 Binary files /dev/null and b/dayz_epoch/pictures/equip_oil_drum_model_ca.paa differ diff --git a/dayz_epoch/pictures/equip_oildrum_e_CA.paa b/dayz_epoch/pictures/equip_oildrum_e_CA.paa new file mode 100644 index 000000000..344281a41 Binary files /dev/null and b/dayz_epoch/pictures/equip_oildrum_e_CA.paa differ diff --git a/dayz_epoch/pictures/equip_pipe_CA.paa b/dayz_epoch/pictures/equip_pipe_CA.paa new file mode 100644 index 000000000..35a3533b4 Binary files /dev/null and b/dayz_epoch/pictures/equip_pipe_CA.paa differ diff --git a/dayz_epoch/pictures/equip_plywood_CA.paa b/dayz_epoch/pictures/equip_plywood_CA.paa new file mode 100644 index 000000000..a9fe85e36 Binary files /dev/null and b/dayz_epoch/pictures/equip_plywood_CA.paa differ diff --git a/dayz_epoch/pictures/equip_rainbowtrout_CA.paa b/dayz_epoch/pictures/equip_rainbowtrout_CA.paa new file mode 100644 index 000000000..407b051f7 Binary files /dev/null and b/dayz_epoch/pictures/equip_rainbowtrout_CA.paa differ diff --git a/dayz_epoch/pictures/equip_safe2_ca.paa b/dayz_epoch/pictures/equip_safe2_ca.paa new file mode 100644 index 000000000..103f93641 Binary files /dev/null and b/dayz_epoch/pictures/equip_safe2_ca.paa differ diff --git a/dayz_epoch/pictures/equip_safe_CA.paa b/dayz_epoch/pictures/equip_safe_CA.paa new file mode 100644 index 000000000..dfc7630b6 Binary files /dev/null and b/dayz_epoch/pictures/equip_safe_CA.paa differ diff --git a/dayz_epoch/pictures/equip_seabass_CA.paa b/dayz_epoch/pictures/equip_seabass_CA.paa new file mode 100644 index 000000000..fbd094814 Binary files /dev/null and b/dayz_epoch/pictures/equip_seabass_CA.paa differ diff --git a/dayz_epoch/pictures/equip_seabass_cooked_CA.paa b/dayz_epoch/pictures/equip_seabass_cooked_CA.paa new file mode 100644 index 000000000..28fff115a Binary files /dev/null and b/dayz_epoch/pictures/equip_seabass_cooked_CA.paa differ diff --git a/dayz_epoch/pictures/equip_silver_bar_10oz_CA.paa b/dayz_epoch/pictures/equip_silver_bar_10oz_CA.paa new file mode 100644 index 000000000..e344e9279 Binary files /dev/null and b/dayz_epoch/pictures/equip_silver_bar_10oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_silver_bar_CA.paa b/dayz_epoch/pictures/equip_silver_bar_CA.paa new file mode 100644 index 000000000..027742f94 Binary files /dev/null and b/dayz_epoch/pictures/equip_silver_bar_CA.paa differ diff --git a/dayz_epoch/pictures/equip_soda_rbull_CA.paa b/dayz_epoch/pictures/equip_soda_rbull_CA.paa new file mode 100644 index 000000000..2b183c433 Binary files /dev/null and b/dayz_epoch/pictures/equip_soda_rbull_CA.paa differ diff --git a/dayz_epoch/pictures/equip_tin_bar_10oz_CA.paa b/dayz_epoch/pictures/equip_tin_bar_10oz_CA.paa new file mode 100644 index 000000000..19742b997 Binary files /dev/null and b/dayz_epoch/pictures/equip_tin_bar_10oz_CA.paa differ diff --git a/dayz_epoch/pictures/equip_tin_bar_CA.paa b/dayz_epoch/pictures/equip_tin_bar_CA.paa new file mode 100644 index 000000000..f427bc30f Binary files /dev/null and b/dayz_epoch/pictures/equip_tin_bar_CA.paa differ diff --git a/dayz_epoch/pictures/equip_trout_CA.paa b/dayz_epoch/pictures/equip_trout_CA.paa new file mode 100644 index 000000000..407b051f7 Binary files /dev/null and b/dayz_epoch/pictures/equip_trout_CA.paa differ diff --git a/dayz_epoch/pictures/equip_trout_cooked_CA.paa b/dayz_epoch/pictures/equip_trout_cooked_CA.paa new file mode 100644 index 000000000..6454e2873 Binary files /dev/null and b/dayz_epoch/pictures/equip_trout_cooked_CA.paa differ diff --git a/dayz_epoch/pictures/equip_tuna_CA.paa b/dayz_epoch/pictures/equip_tuna_CA.paa new file mode 100644 index 000000000..f24a4c07a Binary files /dev/null and b/dayz_epoch/pictures/equip_tuna_CA.paa differ diff --git a/dayz_epoch/pictures/equip_tuna_cooked_CA.paa b/dayz_epoch/pictures/equip_tuna_cooked_CA.paa new file mode 100644 index 000000000..453ba6cc5 Binary files /dev/null and b/dayz_epoch/pictures/equip_tuna_cooked_CA.paa differ diff --git a/dayz_epoch/pictures/equip_wood_planks_CA.paa b/dayz_epoch/pictures/equip_wood_planks_CA.paa new file mode 100644 index 000000000..83ab59f6e Binary files /dev/null and b/dayz_epoch/pictures/equip_wood_planks_CA.paa differ diff --git a/dayz_epoch/pictures/equip_wooden_crate_ca.paa b/dayz_epoch/pictures/equip_wooden_crate_ca.paa new file mode 100644 index 000000000..c8327b8a3 Binary files /dev/null and b/dayz_epoch/pictures/equip_wooden_crate_ca.paa differ diff --git a/dayz_epoch/pictures/soda_orangesherbet_ca.paa b/dayz_epoch/pictures/soda_orangesherbet_ca.paa new file mode 100644 index 000000000..a2112c529 Binary files /dev/null and b/dayz_epoch/pictures/soda_orangesherbet_ca.paa differ diff --git a/dayz_epoch/pictures/soda_rbull_ca.paa b/dayz_epoch/pictures/soda_rbull_ca.paa new file mode 100644 index 000000000..f4a8ad566 Binary files /dev/null and b/dayz_epoch/pictures/soda_rbull_ca.paa differ diff --git a/dayz_epoch/textures/CombatGirl.paa b/dayz_epoch/textures/CombatGirl.paa new file mode 100644 index 000000000..5454ad0b6 Binary files /dev/null and b/dayz_epoch/textures/CombatGirl.paa differ diff --git a/dayz_epoch/textures/DesertGirl.paa b/dayz_epoch/textures/DesertGirl.paa new file mode 100644 index 000000000..2bf4ec014 Binary files /dev/null and b/dayz_epoch/textures/DesertGirl.paa differ diff --git a/dayz_epoch/textures/GirlyGirl.paa b/dayz_epoch/textures/GirlyGirl.paa new file mode 100644 index 000000000..d64c49708 Binary files /dev/null and b/dayz_epoch/textures/GirlyGirl.paa differ diff --git a/dayz_epoch/textures/UrbanGirl.paa b/dayz_epoch/textures/UrbanGirl.paa new file mode 100644 index 000000000..e28f2c0cb Binary files /dev/null and b/dayz_epoch/textures/UrbanGirl.paa differ diff --git a/dayz_epoch/textures/alum_bar1.rvmat b/dayz_epoch/textures/alum_bar1.rvmat new file mode 100644 index 000000000..c222e5d98 --- /dev/null +++ b/dayz_epoch/textures/alum_bar1.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.34,0.36000001,0.41999999,0.27000001}; +diffuse[]={0.34,0.36000001,0.41999999,0.26899999}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.67843139,0.69803923,0.74117649,1}; +specularPower=11.1; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\alum_bar1_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bar_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\bar_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\alum_bar1_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.8,0.0)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/alum_bar10.rvmat b/dayz_epoch/textures/alum_bar10.rvmat new file mode 100644 index 000000000..bb1f7cab8 --- /dev/null +++ b/dayz_epoch/textures/alum_bar10.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.33725491,0.36078432,0.41960785,0.27000001}; +diffuse[]={0.33725491,0.36078432,0.41960785,0.27000001}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.67843139,0.69803923,0.74117649,1}; +specularPower=8.5; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\alum_bar10_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bar_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\bar_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\alum_bar10_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.8,0.0)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/alum_bar10_diffuse.paa b/dayz_epoch/textures/alum_bar10_diffuse.paa new file mode 100644 index 000000000..f9e6b0893 Binary files /dev/null and b/dayz_epoch/textures/alum_bar10_diffuse.paa differ diff --git a/dayz_epoch/textures/alum_bar10_norm.paa b/dayz_epoch/textures/alum_bar10_norm.paa new file mode 100644 index 000000000..1c2cdbc31 Binary files /dev/null and b/dayz_epoch/textures/alum_bar10_norm.paa differ diff --git a/dayz_epoch/textures/alum_bar10_spec.paa b/dayz_epoch/textures/alum_bar10_spec.paa new file mode 100644 index 000000000..ea18b324c Binary files /dev/null and b/dayz_epoch/textures/alum_bar10_spec.paa differ diff --git a/dayz_epoch/textures/alum_bar1_diffuse.paa b/dayz_epoch/textures/alum_bar1_diffuse.paa new file mode 100644 index 000000000..ce87a7032 Binary files /dev/null and b/dayz_epoch/textures/alum_bar1_diffuse.paa differ diff --git a/dayz_epoch/textures/alum_bar1_norm.paa b/dayz_epoch/textures/alum_bar1_norm.paa new file mode 100644 index 000000000..07b6912c4 Binary files /dev/null and b/dayz_epoch/textures/alum_bar1_norm.paa differ diff --git a/dayz_epoch/textures/alum_bar1_spec.paa b/dayz_epoch/textures/alum_bar1_spec.paa new file mode 100644 index 000000000..2e3be1fd1 Binary files /dev/null and b/dayz_epoch/textures/alum_bar1_spec.paa differ diff --git a/dayz_epoch/textures/armourpottedmeat.rvmat b/dayz_epoch/textures/armourpottedmeat.rvmat new file mode 100644 index 000000000..3ce7637a6 --- /dev/null +++ b/dayz_epoch/textures/armourpottedmeat.rvmat @@ -0,0 +1,78 @@ +ambient[]={1,1,1,1}; +diffuse[]={0.50196099,0.50196099,0.50196099,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.101961,0.101961,0.101961,0.88}; +specularPower=450; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\armourpottedmeat_CAN_test1_NOHQ.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)"; + uvSource="tex"; + class uvTransform + { + aside[]={10,0,0}; + up[]={0,10,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\armourpottedmeat_CAN_test1_AS.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\armourpottedmeat_CAN_test1_SMDI.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,128,1)fresnel(4.01,2.86)"; + uvSource="none"; +}; +class Stage7 +{ + texture="ca\data\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/armourpottedmeat_CAN_test1.paa b/dayz_epoch/textures/armourpottedmeat_CAN_test1.paa new file mode 100644 index 000000000..86ef07f82 Binary files /dev/null and b/dayz_epoch/textures/armourpottedmeat_CAN_test1.paa differ diff --git a/dayz_epoch/textures/armourpottedmeat_CAN_test1_AS.paa b/dayz_epoch/textures/armourpottedmeat_CAN_test1_AS.paa new file mode 100644 index 000000000..d662c9213 Binary files /dev/null and b/dayz_epoch/textures/armourpottedmeat_CAN_test1_AS.paa differ diff --git a/dayz_epoch/textures/armourpottedmeat_CAN_test1_CA.paa b/dayz_epoch/textures/armourpottedmeat_CAN_test1_CA.paa new file mode 100644 index 000000000..0b4648865 Binary files /dev/null and b/dayz_epoch/textures/armourpottedmeat_CAN_test1_CA.paa differ diff --git a/dayz_epoch/textures/armourpottedmeat_CAN_test1_NOHQ.paa b/dayz_epoch/textures/armourpottedmeat_CAN_test1_NOHQ.paa new file mode 100644 index 000000000..2d57e7393 Binary files /dev/null and b/dayz_epoch/textures/armourpottedmeat_CAN_test1_NOHQ.paa differ diff --git a/dayz_epoch/textures/armourpottedmeat_CAN_test1_SMDI.paa b/dayz_epoch/textures/armourpottedmeat_CAN_test1_SMDI.paa new file mode 100644 index 000000000..665166c89 Binary files /dev/null and b/dayz_epoch/textures/armourpottedmeat_CAN_test1_SMDI.paa differ diff --git a/dayz_epoch/textures/bar_ao.paa b/dayz_epoch/textures/bar_ao.paa new file mode 100644 index 000000000..f3fa900d8 Binary files /dev/null and b/dayz_epoch/textures/bar_ao.paa differ diff --git a/dayz_epoch/textures/bar_dt.paa b/dayz_epoch/textures/bar_dt.paa new file mode 100644 index 000000000..945e9b67d Binary files /dev/null and b/dayz_epoch/textures/bar_dt.paa differ diff --git a/dayz_epoch/textures/briefcase.rvmat b/dayz_epoch/textures/briefcase.rvmat new file mode 100644 index 000000000..04745541b --- /dev/null +++ b/dayz_epoch/textures/briefcase.rvmat @@ -0,0 +1,78 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.027450981,0.035294119,0.039215688,1}; +specularPower=100; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\briefcase_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\briefcase_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\briefcase_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\briefcase_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.9,0.1)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/briefcase_ao.paa b/dayz_epoch/textures/briefcase_ao.paa new file mode 100644 index 000000000..fa2990a54 Binary files /dev/null and b/dayz_epoch/textures/briefcase_ao.paa differ diff --git a/dayz_epoch/textures/briefcase_diff.paa b/dayz_epoch/textures/briefcase_diff.paa new file mode 100644 index 000000000..4e167492d Binary files /dev/null and b/dayz_epoch/textures/briefcase_diff.paa differ diff --git a/dayz_epoch/textures/briefcase_dt.paa b/dayz_epoch/textures/briefcase_dt.paa new file mode 100644 index 000000000..bd8f3a75c Binary files /dev/null and b/dayz_epoch/textures/briefcase_dt.paa differ diff --git a/dayz_epoch/textures/briefcase_norm.paa b/dayz_epoch/textures/briefcase_norm.paa new file mode 100644 index 000000000..7ac517260 Binary files /dev/null and b/dayz_epoch/textures/briefcase_norm.paa differ diff --git a/dayz_epoch/textures/briefcase_spec.paa b/dayz_epoch/textures/briefcase_spec.paa new file mode 100644 index 000000000..86bb29c94 Binary files /dev/null and b/dayz_epoch/textures/briefcase_spec.paa differ diff --git a/dayz_epoch/textures/bronzebar.rvmat b/dayz_epoch/textures/bronzebar.rvmat new file mode 100644 index 000000000..73b88ff7b --- /dev/null +++ b/dayz_epoch/textures/bronzebar.rvmat @@ -0,0 +1,41 @@ +//////////////////////////////////////////////////////////////////// +//DeRap: Produced from mikero's Dos Tools Dll version 3.97 +//http://dev-heaven.net/projects/list_files/mikero-pbodll +//////////////////////////////////////////////////////////////////// + +#define _ARMA_ + +//Class dayz_equip : textures\bronzebar.rvmat{ +ambient[] = {1.0,1.0,1.0,1.0}; +diffuse[] = {1.0,1.0,1.0,1.0}; +forcedDiffuse[] = {0.0,0.0,0.0,1.0}; +emmisive[] = {0.0,0.0,0.0,1.0}; +specular[] = {0.99498,0.99498,0.99498,1.0}; +specularPower = 100.799995; +PixelShaderID = "NormalMapSpecularMap"; +VertexShaderID = "NormalMap"; +class Stage1 +{ + texture = "z\addons\dayz_epoch\textures\bronzebar_NOHQ.paa"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1.0,0.0,0.0}; + up[] = {0.0,1.0,0.0}; + dir[] = {0.0,0.0,0.0}; + pos[] = {0,0,0}; + }; +}; +class Stage2 +{ + texture = "z\addons\dayz_epoch\textures\bronzebar_SMDI.paa"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1.0,0.0,0.0}; + up[] = {0.0,1.0,0.0}; + dir[] = {0.0,0.0,0.0}; + pos[] = {0,0,0}; + }; +}; +//}; diff --git a/dayz_epoch/textures/bronzebar_AS.paa b/dayz_epoch/textures/bronzebar_AS.paa new file mode 100644 index 000000000..3131ec63d Binary files /dev/null and b/dayz_epoch/textures/bronzebar_AS.paa differ diff --git a/dayz_epoch/textures/bronzebar_NOHQ.paa b/dayz_epoch/textures/bronzebar_NOHQ.paa new file mode 100644 index 000000000..ea971780c Binary files /dev/null and b/dayz_epoch/textures/bronzebar_NOHQ.paa differ diff --git a/dayz_epoch/textures/bronzebar_SMDI.paa b/dayz_epoch/textures/bronzebar_SMDI.paa new file mode 100644 index 000000000..b633abbae Binary files /dev/null and b/dayz_epoch/textures/bronzebar_SMDI.paa differ diff --git a/dayz_epoch/textures/bronzebar_co.paa b/dayz_epoch/textures/bronzebar_co.paa new file mode 100644 index 000000000..510b74dd8 Binary files /dev/null and b/dayz_epoch/textures/bronzebar_co.paa differ diff --git a/dayz_epoch/textures/bulb.rvmat b/dayz_epoch/textures/bulb.rvmat new file mode 100644 index 000000000..8e0fd7137 --- /dev/null +++ b/dayz_epoch/textures/bulb.rvmat @@ -0,0 +1,34 @@ +ambient[]={0.5,0.5,0.5,0.5}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0,0,0,1}; +specularPower=1; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\bulb_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; + Filter="Anizotropic"; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bulb_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; + Filter="Anizotropic"; +}; diff --git a/dayz_epoch/textures/bulb_diffuse.paa b/dayz_epoch/textures/bulb_diffuse.paa new file mode 100644 index 000000000..b52061d03 Binary files /dev/null and b/dayz_epoch/textures/bulb_diffuse.paa differ diff --git a/dayz_epoch/textures/bulb_norm.paa b/dayz_epoch/textures/bulb_norm.paa new file mode 100644 index 000000000..3e45ac584 Binary files /dev/null and b/dayz_epoch/textures/bulb_norm.paa differ diff --git a/dayz_epoch/textures/bulb_spec.paa b/dayz_epoch/textures/bulb_spec.paa new file mode 100644 index 000000000..06e14c739 Binary files /dev/null and b/dayz_epoch/textures/bulb_spec.paa differ diff --git a/dayz_epoch/textures/burlap.rvmat b/dayz_epoch/textures/burlap.rvmat new file mode 100644 index 000000000..7243b3eb3 --- /dev/null +++ b/dayz_epoch/textures/burlap.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.50196081,0.34901962,0.074509807,7.4505806e-008}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\burlap_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\burlap_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/burlap_diffuse.paa b/dayz_epoch/textures/burlap_diffuse.paa new file mode 100644 index 000000000..3612a7615 Binary files /dev/null and b/dayz_epoch/textures/burlap_diffuse.paa differ diff --git a/dayz_epoch/textures/burlap_norm.paa b/dayz_epoch/textures/burlap_norm.paa new file mode 100644 index 000000000..9ca5c775d Binary files /dev/null and b/dayz_epoch/textures/burlap_norm.paa differ diff --git a/dayz_epoch/textures/burlap_spec.paa b/dayz_epoch/textures/burlap_spec.paa new file mode 100644 index 000000000..b819c90bf Binary files /dev/null and b/dayz_epoch/textures/burlap_spec.paa differ diff --git a/dayz_epoch/textures/canvas.rvmat b/dayz_epoch/textures/canvas.rvmat new file mode 100644 index 000000000..be9f137bd --- /dev/null +++ b/dayz_epoch/textures/canvas.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.24313726,0.33333334,0.24705882,0}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\canvas_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\canvas_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/canvas_diffuse.paa b/dayz_epoch/textures/canvas_diffuse.paa new file mode 100644 index 000000000..cfaae360c Binary files /dev/null and b/dayz_epoch/textures/canvas_diffuse.paa differ diff --git a/dayz_epoch/textures/canvas_norm.paa b/dayz_epoch/textures/canvas_norm.paa new file mode 100644 index 000000000..cd568bf4d Binary files /dev/null and b/dayz_epoch/textures/canvas_norm.paa differ diff --git a/dayz_epoch/textures/canvas_spec.paa b/dayz_epoch/textures/canvas_spec.paa new file mode 100644 index 000000000..e87efe27b Binary files /dev/null and b/dayz_epoch/textures/canvas_spec.paa differ diff --git a/dayz_epoch/textures/copper_bar1.rvmat b/dayz_epoch/textures/copper_bar1.rvmat new file mode 100644 index 000000000..70d2ca036 --- /dev/null +++ b/dayz_epoch/textures/copper_bar1.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.53725493,0.26274511,0.14509805,0.2}; +diffuse[]={0.53725493,0.26274511,0.14509805,0.19900002}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.9137255,0.21176471,0.039215688,1}; +specularPower=100; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\copper_bar1_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bar_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\bar_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\copper_bar1_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.8,0.0)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/copper_bar10.rvmat b/dayz_epoch/textures/copper_bar10.rvmat new file mode 100644 index 000000000..ed54fa62f --- /dev/null +++ b/dayz_epoch/textures/copper_bar10.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.54000002,0.25999999,0.15000001,0.2}; +diffuse[]={0.54000002,0.25999999,0.15000001,0.2}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.91000003,0.20999999,0.039999999,1}; +specularPower=100; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\copper_bar10_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bar_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\bar_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\copper_bar10_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.8,0.0)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/copper_bar10_diffuse.paa b/dayz_epoch/textures/copper_bar10_diffuse.paa new file mode 100644 index 000000000..a6703dd51 Binary files /dev/null and b/dayz_epoch/textures/copper_bar10_diffuse.paa differ diff --git a/dayz_epoch/textures/copper_bar10_norm.paa b/dayz_epoch/textures/copper_bar10_norm.paa new file mode 100644 index 000000000..322f9f5c2 Binary files /dev/null and b/dayz_epoch/textures/copper_bar10_norm.paa differ diff --git a/dayz_epoch/textures/copper_bar10_spec.paa b/dayz_epoch/textures/copper_bar10_spec.paa new file mode 100644 index 000000000..cad8bb708 Binary files /dev/null and b/dayz_epoch/textures/copper_bar10_spec.paa differ diff --git a/dayz_epoch/textures/copper_bar1_diffuse.paa b/dayz_epoch/textures/copper_bar1_diffuse.paa new file mode 100644 index 000000000..185caefe1 Binary files /dev/null and b/dayz_epoch/textures/copper_bar1_diffuse.paa differ diff --git a/dayz_epoch/textures/copper_bar1_norm.paa b/dayz_epoch/textures/copper_bar1_norm.paa new file mode 100644 index 000000000..dc4ad7c08 Binary files /dev/null and b/dayz_epoch/textures/copper_bar1_norm.paa differ diff --git a/dayz_epoch/textures/copper_bar1_spec.paa b/dayz_epoch/textures/copper_bar1_spec.paa new file mode 100644 index 000000000..0e29d1177 Binary files /dev/null and b/dayz_epoch/textures/copper_bar1_spec.paa differ diff --git a/dayz_epoch/textures/env_land_co.paa b/dayz_epoch/textures/env_land_co.paa new file mode 100644 index 000000000..dd1b758b6 Binary files /dev/null and b/dayz_epoch/textures/env_land_co.paa differ diff --git a/dayz_epoch/textures/epoch-woodencrate1.paa b/dayz_epoch/textures/epoch-woodencrate1.paa new file mode 100644 index 000000000..f79bdc73f Binary files /dev/null and b/dayz_epoch/textures/epoch-woodencrate1.paa differ diff --git a/dayz_epoch/textures/gDoor.rvmat b/dayz_epoch/textures/gDoor.rvmat new file mode 100644 index 000000000..21f8c867c --- /dev/null +++ b/dayz_epoch/textures/gDoor.rvmat @@ -0,0 +1,34 @@ +ambient[]={1,1,1,0.47}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={1,1,1,0.47999999}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\gDoor_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,1}; + pos[]={0,0,0}; + }; + Filter="Anizotropic"; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\gDoor_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={0,0,0}; + up[]={0,0,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; + Filter="Anizotropic"; +}; diff --git a/dayz_epoch/textures/gDoor_diffuse.paa b/dayz_epoch/textures/gDoor_diffuse.paa new file mode 100644 index 000000000..b7dfbc790 Binary files /dev/null and b/dayz_epoch/textures/gDoor_diffuse.paa differ diff --git a/dayz_epoch/textures/gDoor_norm.paa b/dayz_epoch/textures/gDoor_norm.paa new file mode 100644 index 000000000..df6d0902f Binary files /dev/null and b/dayz_epoch/textures/gDoor_norm.paa differ diff --git a/dayz_epoch/textures/gDoor_spec.paa b/dayz_epoch/textures/gDoor_spec.paa new file mode 100644 index 000000000..13d646e33 Binary files /dev/null and b/dayz_epoch/textures/gDoor_spec.paa differ diff --git a/dayz_epoch/textures/garage_found.rvmat b/dayz_epoch/textures/garage_found.rvmat new file mode 100644 index 000000000..2a0c2281c --- /dev/null +++ b/dayz_epoch/textures/garage_found.rvmat @@ -0,0 +1,34 @@ +ambient[]={0.32941177,0.32156864,0.32156864,0.32299998}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.1254902,0.1254902,0.1254902,0.20999999}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\garage_found_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,1}; + pos[]={0,0,0}; + }; + Filter="Anizotropic"; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\garage_found_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={0,0,0}; + up[]={0,0,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; + Filter="Anizotropic"; +}; diff --git a/dayz_epoch/textures/garage_found_diffuse.paa b/dayz_epoch/textures/garage_found_diffuse.paa new file mode 100644 index 000000000..cab89c61e Binary files /dev/null and b/dayz_epoch/textures/garage_found_diffuse.paa differ diff --git a/dayz_epoch/textures/garage_found_norm.paa b/dayz_epoch/textures/garage_found_norm.paa new file mode 100644 index 000000000..7c8f90abc Binary files /dev/null and b/dayz_epoch/textures/garage_found_norm.paa differ diff --git a/dayz_epoch/textures/garage_found_spec.paa b/dayz_epoch/textures/garage_found_spec.paa new file mode 100644 index 000000000..ed5ad779b Binary files /dev/null and b/dayz_epoch/textures/garage_found_spec.paa differ diff --git a/dayz_epoch/textures/garage_roof.rvmat b/dayz_epoch/textures/garage_roof.rvmat new file mode 100644 index 000000000..f0d90ee48 --- /dev/null +++ b/dayz_epoch/textures/garage_roof.rvmat @@ -0,0 +1,45 @@ +ambient[]={0.74650967,0.74192148,0.74213719,0.97000003}; +diffuse[]={1,1,1,0.92000002}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.3137255,0.27058825,0.21960784,1}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\garage_roof_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,1}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\garage_roof_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={0,0,0}; + up[]={0,0,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; + Filter="Point"; +}; +class Stage3 +{ + texture="#(ai,64,64,1)fresnel(2.68,3.69)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/garage_roof_diffuse.paa b/dayz_epoch/textures/garage_roof_diffuse.paa new file mode 100644 index 000000000..5274d52e5 Binary files /dev/null and b/dayz_epoch/textures/garage_roof_diffuse.paa differ diff --git a/dayz_epoch/textures/garage_roof_norm.paa b/dayz_epoch/textures/garage_roof_norm.paa new file mode 100644 index 000000000..0fdd78179 Binary files /dev/null and b/dayz_epoch/textures/garage_roof_norm.paa differ diff --git a/dayz_epoch/textures/garage_roof_spec.paa b/dayz_epoch/textures/garage_roof_spec.paa new file mode 100644 index 000000000..ee6a940c4 Binary files /dev/null and b/dayz_epoch/textures/garage_roof_spec.paa differ diff --git a/dayz_epoch/textures/garage_walls.rvmat b/dayz_epoch/textures/garage_walls.rvmat new file mode 100644 index 000000000..29ab83272 --- /dev/null +++ b/dayz_epoch/textures/garage_walls.rvmat @@ -0,0 +1,34 @@ +ambient[]={0.24705882,0.14901961,0.13725491,0.47000003}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.074509807,0.062745102,0.050980393,0.477}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\garage_walls_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,1}; + pos[]={0,0,0}; + }; + Filter="Anizotropic"; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\garage_walls_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={0,0,0}; + up[]={0,0,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; + Filter="Anizotropic"; +}; diff --git a/dayz_epoch/textures/garage_walls_diffuse.paa b/dayz_epoch/textures/garage_walls_diffuse.paa new file mode 100644 index 000000000..8c34c9cce Binary files /dev/null and b/dayz_epoch/textures/garage_walls_diffuse.paa differ diff --git a/dayz_epoch/textures/garage_walls_norm.paa b/dayz_epoch/textures/garage_walls_norm.paa new file mode 100644 index 000000000..db97669ad Binary files /dev/null and b/dayz_epoch/textures/garage_walls_norm.paa differ diff --git a/dayz_epoch/textures/garage_walls_spec.paa b/dayz_epoch/textures/garage_walls_spec.paa new file mode 100644 index 000000000..f042241a5 Binary files /dev/null and b/dayz_epoch/textures/garage_walls_spec.paa differ diff --git a/dayz_epoch/textures/gold_bar.rvmat b/dayz_epoch/textures/gold_bar.rvmat new file mode 100644 index 000000000..2f6de9ef2 --- /dev/null +++ b/dayz_epoch/textures/gold_bar.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.41960785,0.33333334,0.094117649,0.19}; +diffuse[]={0.41960785,0.33333334,0.094117649,0.19}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.69803923,0.5529412,0.16078432,1}; +specularPower=100; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\gold_bar_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bar_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={8,0,0}; + up[]={0,8,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\bar_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\gold_bar_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.8,0)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/gold_bar10.rvmat b/dayz_epoch/textures/gold_bar10.rvmat new file mode 100644 index 000000000..0916dff8b --- /dev/null +++ b/dayz_epoch/textures/gold_bar10.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.41960785,0.33333334,0.094117649,0.19}; +diffuse[]={0.41960785,0.33333334,0.094117649,0.19}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.69803923,0.5529412,0.16078432,1}; +specularPower=100; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\gold_bar10_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bar_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={8,0,0}; + up[]={0,8,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\bar_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\gold_bar10_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.8,0)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/gold_bar10_diffuse.paa b/dayz_epoch/textures/gold_bar10_diffuse.paa new file mode 100644 index 000000000..665ce2c82 Binary files /dev/null and b/dayz_epoch/textures/gold_bar10_diffuse.paa differ diff --git a/dayz_epoch/textures/gold_bar10_norm.paa b/dayz_epoch/textures/gold_bar10_norm.paa new file mode 100644 index 000000000..1a035fb14 Binary files /dev/null and b/dayz_epoch/textures/gold_bar10_norm.paa differ diff --git a/dayz_epoch/textures/gold_bar10_spec.paa b/dayz_epoch/textures/gold_bar10_spec.paa new file mode 100644 index 000000000..1a8eca316 Binary files /dev/null and b/dayz_epoch/textures/gold_bar10_spec.paa differ diff --git a/dayz_epoch/textures/gold_bar_diffuse.paa b/dayz_epoch/textures/gold_bar_diffuse.paa new file mode 100644 index 000000000..8725b5918 Binary files /dev/null and b/dayz_epoch/textures/gold_bar_diffuse.paa differ diff --git a/dayz_epoch/textures/gold_bar_norm.paa b/dayz_epoch/textures/gold_bar_norm.paa new file mode 100644 index 000000000..c7c508d6e Binary files /dev/null and b/dayz_epoch/textures/gold_bar_norm.paa differ diff --git a/dayz_epoch/textures/gold_bar_spec.paa b/dayz_epoch/textures/gold_bar_spec.paa new file mode 100644 index 000000000..578fb5179 Binary files /dev/null and b/dayz_epoch/textures/gold_bar_spec.paa differ diff --git a/dayz_epoch/textures/key.rvmat b/dayz_epoch/textures/key.rvmat new file mode 100644 index 000000000..0fd433d1d --- /dev/null +++ b/dayz_epoch/textures/key.rvmat @@ -0,0 +1,34 @@ +ambient[]={0.5,0.5,0.5,0.5}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={1,1,1,0.40000001}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\key_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; + Filter="Anizotropic"; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\key_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; + Filter="Anizotropic"; +}; diff --git a/dayz_epoch/textures/key_diffuse.paa b/dayz_epoch/textures/key_diffuse.paa new file mode 100644 index 000000000..54eedc4e0 Binary files /dev/null and b/dayz_epoch/textures/key_diffuse.paa differ diff --git a/dayz_epoch/textures/key_diffuse_blue.paa b/dayz_epoch/textures/key_diffuse_blue.paa new file mode 100644 index 000000000..54dd8b234 Binary files /dev/null and b/dayz_epoch/textures/key_diffuse_blue.paa differ diff --git a/dayz_epoch/textures/key_diffuse_green.paa b/dayz_epoch/textures/key_diffuse_green.paa new file mode 100644 index 000000000..d79e4ece8 Binary files /dev/null and b/dayz_epoch/textures/key_diffuse_green.paa differ diff --git a/dayz_epoch/textures/key_diffuse_red.paa b/dayz_epoch/textures/key_diffuse_red.paa new file mode 100644 index 000000000..6cc405444 Binary files /dev/null and b/dayz_epoch/textures/key_diffuse_red.paa differ diff --git a/dayz_epoch/textures/key_diffuse_yellow.paa b/dayz_epoch/textures/key_diffuse_yellow.paa new file mode 100644 index 000000000..784933cd0 Binary files /dev/null and b/dayz_epoch/textures/key_diffuse_yellow.paa differ diff --git a/dayz_epoch/textures/key_norm.paa b/dayz_epoch/textures/key_norm.paa new file mode 100644 index 000000000..0f3bf6534 Binary files /dev/null and b/dayz_epoch/textures/key_norm.paa differ diff --git a/dayz_epoch/textures/key_spec.paa b/dayz_epoch/textures/key_spec.paa new file mode 100644 index 000000000..1ca96011d Binary files /dev/null and b/dayz_epoch/textures/key_spec.paa differ diff --git a/dayz_epoch/textures/keykit.rvmat b/dayz_epoch/textures/keykit.rvmat new file mode 100644 index 000000000..06db01d2d --- /dev/null +++ b/dayz_epoch/textures/keykit.rvmat @@ -0,0 +1,45 @@ +ambient[]={0.74650967,0.74192148,0.74213719,0.87}; +diffuse[]={1,1,1,0.92000002}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.34901962,0.4509804,0.68235296,1}; +specularPower=66.599998; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\keykit_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,1}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\keykit_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={0,0,0}; + up[]={0,0,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; + Filter="Point"; +}; +class Stage3 +{ + texture="#(ai,64,64,1)fresnel(2.68,3.69)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/keykit_diffuse.paa b/dayz_epoch/textures/keykit_diffuse.paa new file mode 100644 index 000000000..89559b786 Binary files /dev/null and b/dayz_epoch/textures/keykit_diffuse.paa differ diff --git a/dayz_epoch/textures/keykit_norm.paa b/dayz_epoch/textures/keykit_norm.paa new file mode 100644 index 000000000..6a4d40e27 Binary files /dev/null and b/dayz_epoch/textures/keykit_norm.paa differ diff --git a/dayz_epoch/textures/keykit_spec.paa b/dayz_epoch/textures/keykit_spec.paa new file mode 100644 index 000000000..fa15ad5f6 Binary files /dev/null and b/dayz_epoch/textures/keykit_spec.paa differ diff --git a/dayz_epoch/textures/oil_drum.rvmat b/dayz_epoch/textures/oil_drum.rvmat new file mode 100644 index 000000000..5fadd572e --- /dev/null +++ b/dayz_epoch/textures/oil_drum.rvmat @@ -0,0 +1,78 @@ +ambient[]={1,1,1,1}; +diffuse[]={0.50196099,0.50196099,0.50196099,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.101961,0.101961,0.101961,0.88}; +specularPower=450; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\oil_drum_texture_NOHQ.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)"; + uvSource="tex"; + class uvTransform + { + aside[]={10,0,0}; + up[]={0,10,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\oil_drum_texture_AS.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\oil_drum_texture_SMDI.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,128,1)fresnel(4.01,2.86)"; + uvSource="none"; +}; +class Stage7 +{ + texture="ca\data\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/oil_drum_texture.paa b/dayz_epoch/textures/oil_drum_texture.paa new file mode 100644 index 000000000..22ea177cd Binary files /dev/null and b/dayz_epoch/textures/oil_drum_texture.paa differ diff --git a/dayz_epoch/textures/oil_drum_texture_AS.paa b/dayz_epoch/textures/oil_drum_texture_AS.paa new file mode 100644 index 000000000..4b2b66fe7 Binary files /dev/null and b/dayz_epoch/textures/oil_drum_texture_AS.paa differ diff --git a/dayz_epoch/textures/oil_drum_texture_NOHQ.paa b/dayz_epoch/textures/oil_drum_texture_NOHQ.paa new file mode 100644 index 000000000..f7bebf49a Binary files /dev/null and b/dayz_epoch/textures/oil_drum_texture_NOHQ.paa differ diff --git a/dayz_epoch/textures/oil_drum_texture_SMDI.paa b/dayz_epoch/textures/oil_drum_texture_SMDI.paa new file mode 100644 index 000000000..d653967c0 Binary files /dev/null and b/dayz_epoch/textures/oil_drum_texture_SMDI.paa differ diff --git a/dayz_epoch/textures/oildrum.rvmat b/dayz_epoch/textures/oildrum.rvmat new file mode 100644 index 000000000..60d3d1792 --- /dev/null +++ b/dayz_epoch/textures/oildrum.rvmat @@ -0,0 +1,78 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.28627452,0.32156864,0.1882353,1}; +specularPower=89; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\oildrum_norm_fix.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\oildrum_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\oildrum_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\oildrum_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.8,0.7)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/oildrum_ao.paa b/dayz_epoch/textures/oildrum_ao.paa new file mode 100644 index 000000000..fe2ddd80f Binary files /dev/null and b/dayz_epoch/textures/oildrum_ao.paa differ diff --git a/dayz_epoch/textures/oildrum_diffuse.paa b/dayz_epoch/textures/oildrum_diffuse.paa new file mode 100644 index 000000000..f49f1789e Binary files /dev/null and b/dayz_epoch/textures/oildrum_diffuse.paa differ diff --git a/dayz_epoch/textures/oildrum_dt.paa b/dayz_epoch/textures/oildrum_dt.paa new file mode 100644 index 000000000..3f40572a3 Binary files /dev/null and b/dayz_epoch/textures/oildrum_dt.paa differ diff --git a/dayz_epoch/textures/oildrum_norm.paa b/dayz_epoch/textures/oildrum_norm.paa new file mode 100644 index 000000000..af0a36f20 Binary files /dev/null and b/dayz_epoch/textures/oildrum_norm.paa differ diff --git a/dayz_epoch/textures/oildrum_norm_fix.paa b/dayz_epoch/textures/oildrum_norm_fix.paa new file mode 100644 index 000000000..774f1f6d5 Binary files /dev/null and b/dayz_epoch/textures/oildrum_norm_fix.paa differ diff --git a/dayz_epoch/textures/oildrum_spec.paa b/dayz_epoch/textures/oildrum_spec.paa new file mode 100644 index 000000000..15273f97c Binary files /dev/null and b/dayz_epoch/textures/oildrum_spec.paa differ diff --git a/dayz_epoch/textures/parts_bag.rvmat b/dayz_epoch/textures/parts_bag.rvmat new file mode 100644 index 000000000..aa8e6a127 --- /dev/null +++ b/dayz_epoch/textures/parts_bag.rvmat @@ -0,0 +1,78 @@ +ambient[]={1,1,1,1}; +diffuse[]={0.50196099,0.50196099,0.50196099,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.101961,0.101961,0.101961,0.88}; +specularPower=450; +PixelShaderID="Super"; +VertexShaderID="NormalMapAS"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\parts_bag_texture3c_NOHQ.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)"; + uvSource="tex"; + class uvTransform + { + aside[]={10,0,0}; + up[]={0,10,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\parts_bag_texture3c_AS.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\parts_bag_texture3c_SMDI.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,128,1)fresnel(4.01,2.86)"; + uvSource="none"; +}; +class Stage7 +{ + texture="ca\data\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/parts_bag_texture3c.paa b/dayz_epoch/textures/parts_bag_texture3c.paa new file mode 100644 index 000000000..5f25726d4 Binary files /dev/null and b/dayz_epoch/textures/parts_bag_texture3c.paa differ diff --git a/dayz_epoch/textures/parts_bag_texture3c_AS.paa b/dayz_epoch/textures/parts_bag_texture3c_AS.paa new file mode 100644 index 000000000..e6ee417e2 Binary files /dev/null and b/dayz_epoch/textures/parts_bag_texture3c_AS.paa differ diff --git a/dayz_epoch/textures/parts_bag_texture3c_CA.paa b/dayz_epoch/textures/parts_bag_texture3c_CA.paa new file mode 100644 index 000000000..61e1c3528 Binary files /dev/null and b/dayz_epoch/textures/parts_bag_texture3c_CA.paa differ diff --git a/dayz_epoch/textures/parts_bag_texture3c_NOHQ.paa b/dayz_epoch/textures/parts_bag_texture3c_NOHQ.paa new file mode 100644 index 000000000..0ba47cd8e Binary files /dev/null and b/dayz_epoch/textures/parts_bag_texture3c_NOHQ.paa differ diff --git a/dayz_epoch/textures/parts_bag_texture3c_SMDI.paa b/dayz_epoch/textures/parts_bag_texture3c_SMDI.paa new file mode 100644 index 000000000..076650873 Binary files /dev/null and b/dayz_epoch/textures/parts_bag_texture3c_SMDI.paa differ diff --git a/dayz_epoch/textures/pipe.rvmat b/dayz_epoch/textures/pipe.rvmat new file mode 100644 index 000000000..15f39d3d4 --- /dev/null +++ b/dayz_epoch/textures/pipe.rvmat @@ -0,0 +1,34 @@ +ambient[]={0.5,0.5,0.5,0.5}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={1,1,1,0.40000001}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\pipe_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; + Filter="Anizotropic"; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\pipe_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; + Filter="Anizotropic"; +}; diff --git a/dayz_epoch/textures/pipe_diffuse.paa b/dayz_epoch/textures/pipe_diffuse.paa new file mode 100644 index 000000000..2458d9c42 Binary files /dev/null and b/dayz_epoch/textures/pipe_diffuse.paa differ diff --git a/dayz_epoch/textures/pipe_norm.paa b/dayz_epoch/textures/pipe_norm.paa new file mode 100644 index 000000000..572b59942 Binary files /dev/null and b/dayz_epoch/textures/pipe_norm.paa differ diff --git a/dayz_epoch/textures/pipe_spec.paa b/dayz_epoch/textures/pipe_spec.paa new file mode 100644 index 000000000..8d7b25f47 Binary files /dev/null and b/dayz_epoch/textures/pipe_spec.paa differ diff --git a/dayz_epoch/textures/planks.rvmat b/dayz_epoch/textures/planks.rvmat new file mode 100644 index 000000000..bca27e45d --- /dev/null +++ b/dayz_epoch/textures/planks.rvmat @@ -0,0 +1,28 @@ +ambient[] = {1, 1, 1, 1}; +diffuse[] = {1, 1, 1, 1}; +forcedDiffuse[] = {0, 0, 0, 0}; +emmisive[] = {0, 0, 0, 1}; +specular[] = {0, 0, 0, 1}; +specularPower = 1; +PixelShaderID = "NormalMapSpecularDIMap"; +VertexShaderID = "NormalMap"; +class Stage1 { +texture = "z\addons\dayz_epoch\textures\planks_normal.paa"; +uvSource = "tex"; +class uvTransform { +aside[] = {1, 0, 0}; +up[] = {0, 1, 0}; +dir[] = {0, 0, 0}; +pos[] = {0, 0, 0}; +}; +}; +class Stage2 { +texture = "#(argb,8,8,3)color(1,0,1,1)"; +uvSource = "tex"; +class uvTransform { +aside[] = {1, 0, 0}; +up[] = {0, 1, 0}; +dir[] = {0, 0, 0}; +pos[] = {0, 0, 0}; +}; +}; \ No newline at end of file diff --git a/dayz_epoch/textures/planks_diffuse.paa b/dayz_epoch/textures/planks_diffuse.paa new file mode 100644 index 000000000..579d55395 Binary files /dev/null and b/dayz_epoch/textures/planks_diffuse.paa differ diff --git a/dayz_epoch/textures/planks_normal.paa b/dayz_epoch/textures/planks_normal.paa new file mode 100644 index 000000000..48fcde5d8 Binary files /dev/null and b/dayz_epoch/textures/planks_normal.paa differ diff --git a/dayz_epoch/textures/planks_spec.paa b/dayz_epoch/textures/planks_spec.paa new file mode 100644 index 000000000..c116c9bca Binary files /dev/null and b/dayz_epoch/textures/planks_spec.paa differ diff --git a/dayz_epoch/textures/plywood.paa b/dayz_epoch/textures/plywood.paa new file mode 100644 index 000000000..c4d6e3e91 Binary files /dev/null and b/dayz_epoch/textures/plywood.paa differ diff --git a/dayz_epoch/textures/plywood.rvmat b/dayz_epoch/textures/plywood.rvmat new file mode 100644 index 000000000..d026d083f --- /dev/null +++ b/dayz_epoch/textures/plywood.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0,0,0,1}; +specularPower=1; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\plywood_normal.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\plywood_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/plywood_diffuse.paa b/dayz_epoch/textures/plywood_diffuse.paa new file mode 100644 index 000000000..f9b166c4a Binary files /dev/null and b/dayz_epoch/textures/plywood_diffuse.paa differ diff --git a/dayz_epoch/textures/plywood_normal.paa b/dayz_epoch/textures/plywood_normal.paa new file mode 100644 index 000000000..689f46f8b Binary files /dev/null and b/dayz_epoch/textures/plywood_normal.paa differ diff --git a/dayz_epoch/textures/plywood_spec.paa b/dayz_epoch/textures/plywood_spec.paa new file mode 100644 index 000000000..2064e3ead Binary files /dev/null and b/dayz_epoch/textures/plywood_spec.paa differ diff --git a/dayz_epoch/textures/rod.rvmat b/dayz_epoch/textures/rod.rvmat new file mode 100644 index 000000000..fbdc57549 --- /dev/null +++ b/dayz_epoch/textures/rod.rvmat @@ -0,0 +1,28 @@ +ambient[] = {1, 1, 1, 1}; +diffuse[] = {1, 1, 1, 1}; +forcedDiffuse[] = {0, 0, 0, 0}; +emmisive[] = {0, 0, 0, 1}; +specular[] = {0, 0, 0, 1}; +specularPower = 1; +PixelShaderID = "NormalMapSpecularDIMap"; +VertexShaderID = "NormalMap"; +class Stage1 { +texture = "z\addons\dayz_epoch\textures\rod_normal.paa"; +uvSource = "tex"; +class uvTransform { +aside[] = {1, 0, 0}; +up[] = {0, 1, 0}; +dir[] = {0, 0, 0}; +pos[] = {0, 0, 0}; +}; +}; +class Stage2 { +texture = "#(argb,8,8,3)color(1,0,1,1)"; +uvSource = "tex"; +class uvTransform { +aside[] = {1, 0, 0}; +up[] = {0, 1, 0}; +dir[] = {0, 0, 0}; +pos[] = {0, 0, 0}; +}; +}; \ No newline at end of file diff --git a/dayz_epoch/textures/rod_diffuse.paa b/dayz_epoch/textures/rod_diffuse.paa new file mode 100644 index 000000000..af06e4df6 Binary files /dev/null and b/dayz_epoch/textures/rod_diffuse.paa differ diff --git a/dayz_epoch/textures/rod_normal.paa b/dayz_epoch/textures/rod_normal.paa new file mode 100644 index 000000000..47a5050e2 Binary files /dev/null and b/dayz_epoch/textures/rod_normal.paa differ diff --git a/dayz_epoch/textures/safe_basic.rvmat b/dayz_epoch/textures/safe_basic.rvmat new file mode 100644 index 000000000..7e1aca6d2 --- /dev/null +++ b/dayz_epoch/textures/safe_basic.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.12156863,0.16078432,0.15294118,0.13}; +diffuse[]={0.12156863,0.16078432,0.15294118,0.125}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.14901961,0.18431373,0.21568628,1}; +specularPower=100; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\safe_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bar_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\bar_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\safe_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(2.68,3.69)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/safe_diffuse.paa b/dayz_epoch/textures/safe_diffuse.paa new file mode 100644 index 000000000..fa89a4355 Binary files /dev/null and b/dayz_epoch/textures/safe_diffuse.paa differ diff --git a/dayz_epoch/textures/safe_norm.paa b/dayz_epoch/textures/safe_norm.paa new file mode 100644 index 000000000..199686341 Binary files /dev/null and b/dayz_epoch/textures/safe_norm.paa differ diff --git a/dayz_epoch/textures/safe_pad.rvmat b/dayz_epoch/textures/safe_pad.rvmat new file mode 100644 index 000000000..de0e16e20 --- /dev/null +++ b/dayz_epoch/textures/safe_pad.rvmat @@ -0,0 +1,45 @@ +ambient[]={0.74650967,0.74192148,0.74213719,0.87}; +diffuse[]={1,1,1,0.92000002}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.34901962,0.4509804,0.68235296,1}; +specularPower=66.599998; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\safe_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,1}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\safe_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={0,0,0}; + up[]={0,0,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; + Filter="Point"; +}; +class Stage3 +{ + texture="#(ai,64,64,1)fresnel(2.68,3.69)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/safe_parts.rvmat b/dayz_epoch/textures/safe_parts.rvmat new file mode 100644 index 000000000..d229aca80 --- /dev/null +++ b/dayz_epoch/textures/safe_parts.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.45490196,0.48235294,0.52156866,0.72000003}; +diffuse[]={0.45490196,0.48235294,0.52156866,0.72000003}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.56078434,0.56078434,0.56078434,1}; +specularPower=69.900002; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\safe_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bar_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\bar_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\safe_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.3,0.1)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/safe_spec.paa b/dayz_epoch/textures/safe_spec.paa new file mode 100644 index 000000000..f062ba81e Binary files /dev/null and b/dayz_epoch/textures/safe_spec.paa differ diff --git a/dayz_epoch/textures/seabass.rvmat b/dayz_epoch/textures/seabass.rvmat new file mode 100644 index 000000000..d54b37e7f --- /dev/null +++ b/dayz_epoch/textures/seabass.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,0}; +specular[]={1,0.75686276,0.035294119,0.050000001}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\seabass_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\seabass_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/seabass_cooked.rvmat b/dayz_epoch/textures/seabass_cooked.rvmat new file mode 100644 index 000000000..08332fce6 --- /dev/null +++ b/dayz_epoch/textures/seabass_cooked.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,0}; +specular[]={1,0.75686276,0.035294119,0.050000001}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\seabass_cooked_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\seabass_cooked_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/seabass_cooked_diffuse.paa b/dayz_epoch/textures/seabass_cooked_diffuse.paa new file mode 100644 index 000000000..f5b37d37e Binary files /dev/null and b/dayz_epoch/textures/seabass_cooked_diffuse.paa differ diff --git a/dayz_epoch/textures/seabass_cooked_norm.paa b/dayz_epoch/textures/seabass_cooked_norm.paa new file mode 100644 index 000000000..007b9503c Binary files /dev/null and b/dayz_epoch/textures/seabass_cooked_norm.paa differ diff --git a/dayz_epoch/textures/seabass_cooked_spec.paa b/dayz_epoch/textures/seabass_cooked_spec.paa new file mode 100644 index 000000000..00c081f16 Binary files /dev/null and b/dayz_epoch/textures/seabass_cooked_spec.paa differ diff --git a/dayz_epoch/textures/seabass_diffuse.paa b/dayz_epoch/textures/seabass_diffuse.paa new file mode 100644 index 000000000..39451ab22 Binary files /dev/null and b/dayz_epoch/textures/seabass_diffuse.paa differ diff --git a/dayz_epoch/textures/seabass_norm.paa b/dayz_epoch/textures/seabass_norm.paa new file mode 100644 index 000000000..49bdc0c4e Binary files /dev/null and b/dayz_epoch/textures/seabass_norm.paa differ diff --git a/dayz_epoch/textures/seabass_spec.paa b/dayz_epoch/textures/seabass_spec.paa new file mode 100644 index 000000000..13ea30eca Binary files /dev/null and b/dayz_epoch/textures/seabass_spec.paa differ diff --git a/dayz_epoch/textures/sequishaD_co.paa b/dayz_epoch/textures/sequishaD_co.paa new file mode 100644 index 000000000..7dba1acac Binary files /dev/null and b/dayz_epoch/textures/sequishaD_co.paa differ diff --git a/dayz_epoch/textures/sequisha_co.paa b/dayz_epoch/textures/sequisha_co.paa new file mode 100644 index 000000000..4986c571a Binary files /dev/null and b/dayz_epoch/textures/sequisha_co.paa differ diff --git a/dayz_epoch/textures/silver_bar1.rvmat b/dayz_epoch/textures/silver_bar1.rvmat new file mode 100644 index 000000000..a0d7080d0 --- /dev/null +++ b/dayz_epoch/textures/silver_bar1.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.56862748,0.56862748,0.56862748,0.5}; +diffuse[]={0.56862748,0.56862748,0.56862748,0.505}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.52941179,0.53725493,0.53725493,1}; +specularPower=100; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\silver_bar1_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bar_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\bar_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\silver_bar1_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.8,0.0)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/silver_bar10.rvmat b/dayz_epoch/textures/silver_bar10.rvmat new file mode 100644 index 000000000..d06de560a --- /dev/null +++ b/dayz_epoch/textures/silver_bar10.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.32156864,0.32156864,0.32156864,0.5}; +diffuse[]={0.32156864,0.32156864,0.32156864,0.505}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.37254903,0.37254903,0.37254903,1}; +specularPower=100; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\silver_bar10_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bar_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\bar_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\silver_bar10_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.8,0.0)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/silver_bar10_diffuse.paa b/dayz_epoch/textures/silver_bar10_diffuse.paa new file mode 100644 index 000000000..fc0186dc3 Binary files /dev/null and b/dayz_epoch/textures/silver_bar10_diffuse.paa differ diff --git a/dayz_epoch/textures/silver_bar10_norm.paa b/dayz_epoch/textures/silver_bar10_norm.paa new file mode 100644 index 000000000..61494c6c3 Binary files /dev/null and b/dayz_epoch/textures/silver_bar10_norm.paa differ diff --git a/dayz_epoch/textures/silver_bar10_spec.paa b/dayz_epoch/textures/silver_bar10_spec.paa new file mode 100644 index 000000000..8aa69f13f Binary files /dev/null and b/dayz_epoch/textures/silver_bar10_spec.paa differ diff --git a/dayz_epoch/textures/silver_bar1_diffuse.paa b/dayz_epoch/textures/silver_bar1_diffuse.paa new file mode 100644 index 000000000..0d9b98d13 Binary files /dev/null and b/dayz_epoch/textures/silver_bar1_diffuse.paa differ diff --git a/dayz_epoch/textures/silver_bar1_norm.paa b/dayz_epoch/textures/silver_bar1_norm.paa new file mode 100644 index 000000000..c9c3ffbe5 Binary files /dev/null and b/dayz_epoch/textures/silver_bar1_norm.paa differ diff --git a/dayz_epoch/textures/silver_bar1_spec.paa b/dayz_epoch/textures/silver_bar1_spec.paa new file mode 100644 index 000000000..f67624c5f Binary files /dev/null and b/dayz_epoch/textures/silver_bar1_spec.paa differ diff --git a/dayz_epoch/textures/soda_rbull_co.paa b/dayz_epoch/textures/soda_rbull_co.paa new file mode 100644 index 000000000..f9574a888 Binary files /dev/null and b/dayz_epoch/textures/soda_rbull_co.paa differ diff --git a/dayz_epoch/textures/soda_sherbet.paa b/dayz_epoch/textures/soda_sherbet.paa new file mode 100644 index 000000000..3ed222907 Binary files /dev/null and b/dayz_epoch/textures/soda_sherbet.paa differ diff --git a/dayz_epoch/textures/spindle.rvmat b/dayz_epoch/textures/spindle.rvmat new file mode 100644 index 000000000..224f476df --- /dev/null +++ b/dayz_epoch/textures/spindle.rvmat @@ -0,0 +1,28 @@ +ambient[] = {1, 1, 1, 1}; +diffuse[] = {1, 1, 1, 1}; +forcedDiffuse[] = {0, 0, 0, 0}; +emmisive[] = {0, 0, 0, 1}; +specular[] = {0, 0, 0, 1}; +specularPower = 1; +PixelShaderID = "NormalMapSpecularDIMap"; +VertexShaderID = "NormalMap"; +class Stage1 { +texture = "z\addons\dayz_epoch\textures\spindle_normal.paa"; +uvSource = "tex"; +class uvTransform { +aside[] = {1, 0, 0}; +up[] = {0, 1, 0}; +dir[] = {0, 0, 0}; +pos[] = {0, 0, 0}; +}; +}; +class Stage2 { +texture = "#(argb,8,8,3)color(1,0,1,1)"; +uvSource = "tex"; +class uvTransform { +aside[] = {1, 0, 0}; +up[] = {0, 1, 0}; +dir[] = {0, 0, 0}; +pos[] = {0, 0, 0}; +}; +}; \ No newline at end of file diff --git a/dayz_epoch/textures/spindle_diffuse.paa b/dayz_epoch/textures/spindle_diffuse.paa new file mode 100644 index 000000000..a7483f2f1 Binary files /dev/null and b/dayz_epoch/textures/spindle_diffuse.paa differ diff --git a/dayz_epoch/textures/spindle_normal.paa b/dayz_epoch/textures/spindle_normal.paa new file mode 100644 index 000000000..54d8bd249 Binary files /dev/null and b/dayz_epoch/textures/spindle_normal.paa differ diff --git a/dayz_epoch/textures/tent_personal_co.paa b/dayz_epoch/textures/tent_personal_co.paa new file mode 100644 index 000000000..1485a7b3e Binary files /dev/null and b/dayz_epoch/textures/tent_personal_co.paa differ diff --git a/dayz_epoch/textures/test.rvmat b/dayz_epoch/textures/test.rvmat new file mode 100644 index 000000000..0cc3a8288 --- /dev/null +++ b/dayz_epoch/textures/test.rvmat @@ -0,0 +1,13 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0,0,0,1}; +specularPower=1; +PixelShaderID="Normal"; +VertexShaderID="Basic"; +class Stage0 +{ + texture="#(argb,8,8,3)color(0,0,0,1,CO)"; + uvSource="tex"; +}; diff --git a/dayz_epoch/textures/tin_bar1.rvmat b/dayz_epoch/textures/tin_bar1.rvmat new file mode 100644 index 000000000..79d52f048 --- /dev/null +++ b/dayz_epoch/textures/tin_bar1.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.27450982,0.40784314,0.38431373,0.2}; +diffuse[]={0.27450982,0.40784314,0.38431373,0.19900014}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.36862746,0.51764709,0.48627451,1}; +specularPower=86.099998; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\tin_bar1_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bar_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\bar_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\tin_bar1_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.8,0.0)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/tin_bar10.rvmat b/dayz_epoch/textures/tin_bar10.rvmat new file mode 100644 index 000000000..73fa256fd --- /dev/null +++ b/dayz_epoch/textures/tin_bar10.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.23529412,0.39215687,0.36862746,0.25999999}; +diffuse[]={0.23529412,0.39215687,0.36862746,0.25999999}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.36862746,0.51764709,0.48627451,1}; +specularPower=100; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\tin_bar10_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\bar_dt.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="z\addons\dayz_epoch\textures\bar_ao.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\tin_bar10_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(0.8,0.0)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/dayz_epoch/textures/tin_bar10_diffuse.paa b/dayz_epoch/textures/tin_bar10_diffuse.paa new file mode 100644 index 000000000..90fd89394 Binary files /dev/null and b/dayz_epoch/textures/tin_bar10_diffuse.paa differ diff --git a/dayz_epoch/textures/tin_bar10_norm.paa b/dayz_epoch/textures/tin_bar10_norm.paa new file mode 100644 index 000000000..5498a7e33 Binary files /dev/null and b/dayz_epoch/textures/tin_bar10_norm.paa differ diff --git a/dayz_epoch/textures/tin_bar10_spec.paa b/dayz_epoch/textures/tin_bar10_spec.paa new file mode 100644 index 000000000..77bbc2639 Binary files /dev/null and b/dayz_epoch/textures/tin_bar10_spec.paa differ diff --git a/dayz_epoch/textures/tin_bar1_diffuse.paa b/dayz_epoch/textures/tin_bar1_diffuse.paa new file mode 100644 index 000000000..3294c5e20 Binary files /dev/null and b/dayz_epoch/textures/tin_bar1_diffuse.paa differ diff --git a/dayz_epoch/textures/tin_bar1_norm.paa b/dayz_epoch/textures/tin_bar1_norm.paa new file mode 100644 index 000000000..01c5c8d9b Binary files /dev/null and b/dayz_epoch/textures/tin_bar1_norm.paa differ diff --git a/dayz_epoch/textures/tin_bar1_spec.paa b/dayz_epoch/textures/tin_bar1_spec.paa new file mode 100644 index 000000000..c7770f020 Binary files /dev/null and b/dayz_epoch/textures/tin_bar1_spec.paa differ diff --git a/dayz_epoch/textures/trout.rvmat b/dayz_epoch/textures/trout.rvmat new file mode 100644 index 000000000..5e262f8e7 --- /dev/null +++ b/dayz_epoch/textures/trout.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,0}; +specular[]={0.03200002,0.73399997,2.875,0.050000001}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\trout_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\trout_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/trout_cooked.rvmat b/dayz_epoch/textures/trout_cooked.rvmat new file mode 100644 index 000000000..97ad17d9b --- /dev/null +++ b/dayz_epoch/textures/trout_cooked.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,0}; +specular[]={0.03200002,0.73399997,2.875,0.050000001}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\trout_cooked_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\trout_cooked_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/trout_cooked_diffuse.paa b/dayz_epoch/textures/trout_cooked_diffuse.paa new file mode 100644 index 000000000..98de49bce Binary files /dev/null and b/dayz_epoch/textures/trout_cooked_diffuse.paa differ diff --git a/dayz_epoch/textures/trout_cooked_norm.paa b/dayz_epoch/textures/trout_cooked_norm.paa new file mode 100644 index 000000000..47bd735c3 Binary files /dev/null and b/dayz_epoch/textures/trout_cooked_norm.paa differ diff --git a/dayz_epoch/textures/trout_cooked_spec.paa b/dayz_epoch/textures/trout_cooked_spec.paa new file mode 100644 index 000000000..97bb4fd3c Binary files /dev/null and b/dayz_epoch/textures/trout_cooked_spec.paa differ diff --git a/dayz_epoch/textures/trout_diffuse.paa b/dayz_epoch/textures/trout_diffuse.paa new file mode 100644 index 000000000..4366b2b07 Binary files /dev/null and b/dayz_epoch/textures/trout_diffuse.paa differ diff --git a/dayz_epoch/textures/trout_norm.paa b/dayz_epoch/textures/trout_norm.paa new file mode 100644 index 000000000..8877629df Binary files /dev/null and b/dayz_epoch/textures/trout_norm.paa differ diff --git a/dayz_epoch/textures/trout_spec.paa b/dayz_epoch/textures/trout_spec.paa new file mode 100644 index 000000000..07f071bd4 Binary files /dev/null and b/dayz_epoch/textures/trout_spec.paa differ diff --git a/dayz_epoch/textures/tuna.rvmat b/dayz_epoch/textures/tuna.rvmat new file mode 100644 index 000000000..5e262f8e7 --- /dev/null +++ b/dayz_epoch/textures/tuna.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,0}; +specular[]={0.03200002,0.73399997,2.875,0.050000001}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\trout_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\trout_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/tuna_cooked.rvmat b/dayz_epoch/textures/tuna_cooked.rvmat new file mode 100644 index 000000000..97ad17d9b --- /dev/null +++ b/dayz_epoch/textures/tuna_cooked.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,0}; +specular[]={0.03200002,0.73399997,2.875,0.050000001}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\trout_cooked_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\trout_cooked_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/tuna_cooked_diffuse.paa b/dayz_epoch/textures/tuna_cooked_diffuse.paa new file mode 100644 index 000000000..d6d09daf0 Binary files /dev/null and b/dayz_epoch/textures/tuna_cooked_diffuse.paa differ diff --git a/dayz_epoch/textures/tuna_cooked_norm.paa b/dayz_epoch/textures/tuna_cooked_norm.paa new file mode 100644 index 000000000..4bde4b2ab Binary files /dev/null and b/dayz_epoch/textures/tuna_cooked_norm.paa differ diff --git a/dayz_epoch/textures/tuna_cooked_spec.paa b/dayz_epoch/textures/tuna_cooked_spec.paa new file mode 100644 index 000000000..3e2652680 Binary files /dev/null and b/dayz_epoch/textures/tuna_cooked_spec.paa differ diff --git a/dayz_epoch/textures/tuna_diffuse.paa b/dayz_epoch/textures/tuna_diffuse.paa new file mode 100644 index 000000000..166298e02 Binary files /dev/null and b/dayz_epoch/textures/tuna_diffuse.paa differ diff --git a/dayz_epoch/textures/tuna_norm.paa b/dayz_epoch/textures/tuna_norm.paa new file mode 100644 index 000000000..68d3e0912 Binary files /dev/null and b/dayz_epoch/textures/tuna_norm.paa differ diff --git a/dayz_epoch/textures/tuna_spec.paa b/dayz_epoch/textures/tuna_spec.paa new file mode 100644 index 000000000..cf7014343 Binary files /dev/null and b/dayz_epoch/textures/tuna_spec.paa differ diff --git a/dayz_equip/config.cpp b/dayz_equip/config.cpp index 8fcd21671..729bcef3e 100644 --- a/dayz_equip/config.cpp +++ b/dayz_equip/config.cpp @@ -1009,8 +1009,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Canvas"; - model = "\dayz_equip\models\canvas.p3d"; - picture = "\dayz_equip\textures\equip_canvas_ca.paa"; + model = "\z\addons\dayz_epoch\models\canvas.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_canvas_ca.paa"; descriptionShort = "Canvas Parcel"; class ItemActions { @@ -1067,8 +1067,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Burlap"; - model = "\dayz_equip\models\burlap.p3d"; - picture = "\dayz_equip\textures\equip_burlap_ca.paa"; + model = "\z\addons\dayz_epoch\models\burlap.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_burlap_ca.paa"; descriptionShort = "Burlap: A strong cloth like material used for building sandbags"; class ItemActions { @@ -1245,8 +1245,8 @@ class CfgMagazines class Skin_SurvivorW3_DZ: SkinBase { scope = 2; - displayName = "Camo Pants (female)"; - descriptionShort = "Camo Pants (female)"; + displayName = "Jane"; + descriptionShort = "Grey top with brown camo pants."; }; class Skin_SurvivorW2_DZ: SkinBase { @@ -1257,27 +1257,38 @@ class CfgMagazines class Skin_SurvivorWpink_DZ: SkinBase { scope = 2; - displayName = "Pink (female)"; - descriptionShort = "Pink Clothes (female)"; + displayName = "Melly (female)"; + descriptionShort = "Purple top with blue pants."; + }; + class Skin_SurvivorWsequisha_DZ: SkinBase + { + scope = 2; + displayName = "Maria (female)"; + descriptionShort = "Maria Clothes (female)"; + }; + class Skin_SurvivorWsequishaD_DZ: SkinBase + { + scope = 2; + displayName = "Sequisha (female)"; + descriptionShort = "Sequisha Clothes (female)"; }; - class Skin_SurvivorWcombat_DZ: SkinBase { scope = 2; - displayName = "Camo (female)"; - descriptionShort = "Camo Clothes (female)"; + displayName = "Cammy"; + descriptionShort = "Blue camo top with brown camo pants."; }; class Skin_SurvivorWdesert_DZ: SkinBase { scope = 2; - displayName = "Desert (female)"; - descriptionShort = "Desert Clothes (female)"; + displayName = "Savannah"; + descriptionShort = "White top with brown pants."; }; class Skin_SurvivorWurban_DZ: SkinBase { scope = 2; - displayName = "Urban (female)"; - descriptionShort = "Urban Clothes (female)"; + displayName = "Sophia"; + descriptionShort = "Maroon top with grey pants."; }; @@ -1326,8 +1337,8 @@ class CfgMagazines class Skin_CZ_Soldier_Sniper_EP1_DZ: SkinBase { scope = 2; - displayName = "Desert Guille"; - descriptionShort = "Desert Guille"; + displayName = "Desert Ghillie"; + descriptionShort = "Desert Ghillie"; }; class Skin_Graves_Light_DZ: SkinBase { @@ -1392,9 +1403,9 @@ class CfgMagazines count = 1; type = 256; displayName = "Light Bulb"; - model = "\dayz_equip\models\bulb.p3d"; - picture = "\dayz_equip\textures\equip_bulb_CA.paa"; - descriptionShort = "Lightbulb: Used in part to creat a buildable lamp post. Don't tell me you didn't find this in a barn."; + model = "\z\addons\dayz_epoch\models\bulb.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_bulb_CA.paa"; + descriptionShort = "Lightbulb: Used in part to create a buildable lamp post. Don't tell me you didn't find this in a barn."; class ItemActions { class Crafting { @@ -1454,9 +1465,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Corrugated Fence"; - // TODO model and picture - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = "Corrugated Fence: A buildable object used for fortification purposes."; class ItemActions { class Build { @@ -1500,8 +1510,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Metal Pole"; - model = "\dayz_equip\models\pipe.p3d"; - picture = "\dayz_equip\textures\equip_pipe_CA.paa"; + model = "\z\addons\dayz_epoch\models\pipe.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_pipe_CA.paa"; descriptionShort = "Pole: A few sturdy metal poles used to craft tents and other buildables"; class ItemActions { class Crafting @@ -1582,8 +1592,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Lumber"; - model = "\dayz_equip\models\planks.p3d"; - picture = "\dayz_equip\textures\equip_wood_planks_CA.paa"; + model = "\z\addons\dayz_epoch\models\planks.p3d"; + picture="\z\addons\dayz_epoch\pictures\equip_wood_planks_CA.paa"; descriptionShort = "Lumber: Used for building many structures and can also be used to make plywood."; class ItemActions { class Build { @@ -1622,8 +1632,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Plywood"; - model = "\dayz_equip\models\plywood.p3d"; - picture = "\dayz_equip\textures\equip_plywood_CA.paa"; + model = "\z\addons\dayz_epoch\models\plywood.p3d"; + picture="\z\addons\dayz_epoch\pictures\equip_plywood_CA.paa"; descriptionShort = "Plywood: Used for building many structures."; class ItemActions { class Crafting @@ -1644,8 +1654,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Wooden Shack"; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = "Wooden Shack: A crafted object that holds some items/weapons/backpacks."; class ItemActions { class Build { @@ -1760,16 +1770,445 @@ class CfgMagazines picture = "\dayz_equip\textures\equip_soda_mdew_ca.paa"; descriptionShort = "$STR_EQUIP_NAME_37"; }; - class ItemBriefcase: CA_Magazine + class ItemBriefcase_Base: CA_Magazine { scope = 2; count = 1; type = 256; displayName = "Briefcase"; - // model = "\misc3\briefcase.p3d"; - picture = "\dayz_equip\textures\equip_bar_gold_CA.paa"; - // TODO: Needs picture and model - descriptionShort = "Briefcase full of Gold Bars"; + model = "\z\addons\dayz_epoch\models\briefcase.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_CA.paa"; + }; + class ItemBriefcaseEmpty: ItemBriefcase_Base + { + picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa"; + descriptionShort = "Empty Briefcase"; + class ItemActions + { + class Crafting + { + text = "Add 1 10oz Gold"; + script = "spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase10oz",1}}; + input[] = {{"ItemBriefcaseEmpty",1},{"ItemGoldBar10oz",1}}; + }; + class Crafting1 + { + text = "Remove 1 10oz Gold"; + script = "spawn player_craftItem1;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcaseEmpty",1}}; + input[] = {{"ItemBriefcase10oz",1}}; + }; + }; + }; + class ItemBriefcase10oz: ItemBriefcase_Base + { + picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_10oz_CA.paa"; + descriptionShort = "Briefcase (Contains: 1 x 10oz Gold Bar)"; + class ItemActions + { + class Crafting + { + text = "Add 1 10oz Gold"; + script = "spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase20oz",1}}; + input[] = {{"ItemBriefcase10oz",1},{"ItemGoldBar10oz",1}}; + }; + class Crafting1 + { + text = "Add 9 10oz Gold"; + script = "spawn player_craftItem1;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase100oz",1}}; + input[] = {{"ItemBriefcase10oz",1},{"ItemGoldBar10oz",9}}; + }; + class Crafting2 + { + text = "Remove 1 10oz Gold"; + script = "spawn player_craftItem2;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcaseEmpty",1}}; + input[] = {{"ItemBriefcase10oz",1}}; + }; + }; + + }; + class ItemBriefcase20oz: ItemBriefcase_Base + { + picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_20oz_CA.paa"; + descriptionShort = "Briefcase (Contains: 2 x 10oz Gold Bar)"; + class ItemActions + { + class Crafting + { + text = "Add 1 10oz Gold"; + script = "spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase30oz",1}}; + input[] = {{"ItemBriefcase20oz",1},{"ItemGoldBar10oz",1}}; + }; + class Crafting1 + { + text = "Add 8 10oz Gold"; + script = "spawn player_craftItem1;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase100oz",1}}; + input[] = {{"ItemBriefcase20oz",1},{"ItemGoldBar10oz",8}}; + }; + class Crafting2 + { + text = "Remove 1 10oz Gold"; + script = "spawn player_craftItem2;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase10oz",1}}; + input[] = {{"ItemBriefcase20oz",1}}; + }; + class Crafting3 + { + text = "Empty Case"; + script = "spawn player_craftItem3;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",2},{"ItemBriefcaseEmpty",1}}; + input[] = {{"ItemBriefcase20oz",1}}; + }; + }; + }; + class ItemBriefcase30oz: ItemBriefcase_Base + { + picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_30oz_CA.paa"; + descriptionShort = "Briefcase (Contains: 3 x 10oz Gold Bar)"; + class ItemActions + { + class Crafting + { + text = "Add 1 10oz Gold"; + script = "spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase40oz",1}}; + input[] = {{"ItemBriefcase30oz",1},{"ItemGoldBar10oz",1}}; + }; + class Crafting1 + { + text = "Add 7 10oz Gold"; + script = "spawn player_craftItem1;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase100oz",1}}; + input[] = {{"ItemBriefcase30oz",1},{"ItemGoldBar10oz",7}}; + }; + class Crafting2 + { + text = "Remove 1 10oz Gold"; + script = "spawn player_craftItem2;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase20oz",1}}; + input[] = {{"ItemBriefcase30oz",1}}; + }; + class Crafting3 + { + text = "Empty Case"; + script = "spawn player_craftItem3;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",3},{"ItemBriefcaseEmpty",1}}; + input[] = {{"ItemBriefcase30oz",1}}; + }; + }; + }; + class ItemBriefcase40oz: ItemBriefcase_Base + { + picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_40oz_CA.paa"; + descriptionShort = "Briefcase (Contains: 4 x 10oz Gold Bar)"; + class ItemActions + { + class Crafting + { + text = "Add 1 10oz Gold"; + script = "spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase50oz",1}}; + input[] = {{"ItemBriefcase40oz",1},{"ItemGoldBar10oz",1}}; + }; + class Crafting1 + { + text = "Add 6 10oz Gold"; + script = "spawn player_craftItem1;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase100oz",1}}; + input[] = {{"ItemBriefcase40oz",1},{"ItemGoldBar10oz",6}}; + }; + class Crafting2 + { + text = "Remove 1 10oz Gold"; + script = "spawn player_craftItem2;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase30oz",1}}; + input[] = {{"ItemBriefcase40oz",1}}; + }; + class Crafting3 + { + text = "Empty Case"; + script = "spawn player_craftItem3;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",4},{"ItemBriefcaseEmpty",1}}; + input[] = {{"ItemBriefcase40oz",1}}; + }; + }; + }; + class ItemBriefcase50oz: ItemBriefcase_Base + { + picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_50oz_CA.paa"; + descriptionShort = "Briefcase (Contains: 5 x 10oz Gold Bar)"; + class ItemActions + { + class Crafting + { + text = "Add 1 10oz Gold"; + script = "spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase60oz",1}}; + input[] = {{"ItemBriefcase50oz",1},{"ItemGoldBar10oz",1}}; + }; + class Crafting1 + { + text = "Add 5 10oz Gold"; + script = "spawn player_craftItem1;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase100oz",1}}; + input[] = {{"ItemBriefcase50oz",1},{"ItemGoldBar10oz",5}}; + }; + class Crafting2 + { + text = "Remove 1 10oz Gold"; + script = "spawn player_craftItem2;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase40oz",1}}; + input[] = {{"ItemBriefcase50oz",1}}; + }; + class Crafting3 + { + text = "Empty Case"; + script = "spawn player_craftItem3;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",5},{"ItemBriefcaseEmpty",1}}; + input[] = {{"ItemBriefcase50oz",1}}; + }; + }; + }; + class ItemBriefcase60oz: ItemBriefcase_Base + { + picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_60oz_CA.paa"; + descriptionShort = "Briefcase (Contains: 6 x 10oz Gold Bar)"; + class ItemActions + { + class Crafting + { + text = "Add 1 10oz Gold"; + script = "spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase70oz",1}}; + input[] = {{"ItemBriefcase60oz",1},{"ItemGoldBar10oz",1}}; + }; + class Crafting1 + { + text = "Add 4 10oz Gold"; + script = "spawn player_craftItem1;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase100oz",1}}; + input[] = {{"ItemBriefcase60oz",1},{"ItemGoldBar10oz",4}}; + }; + class Crafting2 + { + text = "Remove 1 10oz Gold"; + script = "spawn player_craftItem2;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase50oz",1}}; + input[] = {{"ItemBriefcase60oz",1}}; + }; + class Crafting3 + { + text = "Empty Case"; + script = "spawn player_craftItem3;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",6},{"ItemBriefcaseEmpty",1}}; + input[] = {{"ItemBriefcase60oz",1}}; + }; + }; + }; + class ItemBriefcase70oz: ItemBriefcase_Base + { + picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_70oz_CA.paa"; + descriptionShort = "Briefcase (Contains: 7 x 10oz Gold Bar)"; + class ItemActions + { + class Crafting + { + text = "Add 1 10oz Gold"; + script = "spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase80oz",1}}; + input[] = {{"ItemBriefcase70oz",1},{"ItemGoldBar10oz",1}}; + }; + class Crafting1 + { + text = "Add 3 10oz Gold"; + script = "spawn player_craftItem1;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase100oz",1}}; + input[] = {{"ItemBriefcase70oz",1},{"ItemGoldBar10oz",3}}; + }; + class Crafting2 + { + text = "Remove 1 10oz Gold"; + script = "spawn player_craftItem2;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase60oz",1}}; + input[] = {{"ItemBriefcase70oz",1}}; + }; + class Crafting3 + { + text = "Empty Case"; + script = "spawn player_craftItem3;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",7},{"ItemBriefcaseEmpty",1}}; + input[] = {{"ItemBriefcase70oz",1}}; + }; + }; + }; + class ItemBriefcase80oz: ItemBriefcase_Base + { + picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_80oz_CA.paa"; + descriptionShort = "Briefcase (Contains: 8 x 10oz Gold Bar)"; + class ItemActions + { + class Crafting + { + text = "Add 1 10oz Gold"; + script = "spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase90oz",1}}; + input[] = {{"ItemBriefcase80oz",1},{"ItemGoldBar10oz",1}}; + }; + class Crafting1 + { + text = "Add 2 10oz Gold"; + script = "spawn player_craftItem1;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase100oz",1}}; + input[] = {{"ItemBriefcase80oz",1},{"ItemGoldBar10oz",2}}; + }; + class Crafting2 + { + text = "Remove 1 10oz Gold"; + script = "spawn player_craftItem2;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase70oz",1}}; + input[] = {{"ItemBriefcase80oz",1}}; + }; + class Crafting3 + { + text = "Empty Case"; + script = "spawn player_craftItem3;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",8},{"ItemBriefcaseEmpty",1}}; + input[] = {{"ItemBriefcase80oz",1}}; + }; + }; + }; + class ItemBriefcase90oz: ItemBriefcase_Base + { + picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_90oz_CA.paa"; + descriptionShort = "Briefcase (Contains: 9 x 10oz Gold Bar)"; + class ItemActions + { + class Crafting + { + text = "Add 1 10oz Gold"; + script = "spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemBriefcase100oz",1}}; + input[] = {{"ItemBriefcase90oz",1},{"ItemGoldBar10oz",1}}; + }; + class Crafting1 + { + text = "Remove 1 10oz Gold"; + script = "spawn player_craftItem1;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase80oz",1}}; + input[] = {{"ItemBriefcase90oz",1}}; + }; + class Crafting2 + { + text = "Empty Case"; + script = "spawn player_craftItem2;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",9},{"ItemBriefcaseEmpty",1}}; + input[] = {{"ItemBriefcase90oz",1}}; + }; + }; + }; + class ItemBriefcase100oz: ItemBriefcase_Base + { + picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_100oz_CA.paa"; + descriptionShort = "Briefcase (Contains: 10 x 10oz Gold Bar)"; + class ItemActions + { + class Crafting + { + text = "Remove 1 10oz Gold"; + script = "spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",1},{"ItemBriefcase90oz",1}}; + input[] = {{"ItemBriefcase100oz",1}}; + }; + class Crafting1 + { + text = "Empty Case"; + script = "spawn player_craftItem1;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",10},{"ItemBriefcaseEmpty",1}}; + input[] = {{"ItemBriefcase100oz",1}}; + }; + }; }; class ItemGoldBar: CA_Magazine { @@ -1777,8 +2216,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Gold"; - model = "\dayz_equip\models\gold_bar.p3d"; - picture = "\dayz_equip\textures\equip_gold_bar_CA.paa"; + model = "\z\addons\dayz_epoch\models\gold_bar.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa"; descriptionShort = "Gold Bar"; class ItemActions { @@ -1800,8 +2239,8 @@ class CfgMagazines count = 1; type = 256; displayName = "10oz Gold"; - model = "\dayz_equip\models\gold_bar_10oz.p3d"; - picture = "\dayz_equip\textures\equip_gold_bar_10oz_CA.paa"; + model = "\z\addons\dayz_epoch\models\gold_bar_10oz.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_10oz_CA.paa"; descriptionShort = "10oz Gold Bar"; class ItemActions { @@ -1822,8 +2261,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Silver"; - model = "\dayz_equip\models\silver_bar.p3d"; - picture = "\dayz_equip\textures\equip_silver_bar_CA.paa"; + model = "\z\addons\dayz_epoch\models\silver_bar.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_CA.paa"; descriptionShort = "Silver Bar"; class ItemActions { @@ -1845,8 +2284,8 @@ class CfgMagazines count = 1; type = 256; displayName = "10oz Silver"; - model = "\dayz_equip\models\silver_bar_10oz.p3d"; - picture = "\dayz_equip\textures\equip_silver_bar_10oz_CA.paa"; + model = "\z\addons\dayz_epoch\models\silver_bar_10oz.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_silver_bar_10oz_CA.paa"; descriptionShort = "10oz Silver Bar"; class ItemActions { @@ -1867,8 +2306,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Copper"; - model = "\dayz_equip\models\copper_bar.p3d"; - picture = "\dayz_equip\textures\equip_copper_bar_CA.paa"; + model = "\z\addons\dayz_epoch\models\copper_bar.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_copper_bar_CA.paa"; descriptionShort = "Copper Bar"; class ItemActions { @@ -1890,8 +2329,8 @@ class CfgMagazines count = 1; type = 256; displayName = "10oz Copper"; - model = "\dayz_equip\models\copper_bar_10oz.p3d"; - picture = "\dayz_equip\textures\equip_copper_bar_10oz_CA.paa"; + model = "\z\addons\dayz_epoch\models\copper_bar_10oz.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_copper_bar_10oz_CA.paa"; descriptionShort = "10oz Copper Bar"; class ItemActions { @@ -1913,8 +2352,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Bronze"; - model = "\dayz_equip\models\bronze_bar.p3d"; - picture = "\dayz_equip\textures\equip_bar_bronze_CA.paa"; + model = "\z\addons\dayz_epoch\models\bronze_bar.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_bar_bronze_CA.paa"; descriptionShort = "Bronze Bar"; }; class ItemAluminumBar: CA_Magazine @@ -1923,8 +2362,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Aluminum"; - model = "\dayz_equip\models\aluminum_bar.p3d"; - picture = "\dayz_equip\textures\equip_alum_bar_CA.paa"; + model = "\z\addons\dayz_epoch\models\aluminum_bar.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_alum_bar_CA.paa"; descriptionShort = "Aluminum Bar"; }; @@ -1934,8 +2373,8 @@ class CfgMagazines count = 1; type = 256; displayName = "10oz Aluminum"; - model = "\dayz_equip\models\aluminum_bar.p3d"; - picture = "\dayz_equip\textures\equip_alum_bar_10oz_CA.paa"; + model = "\z\addons\dayz_epoch\models\aluminum_bar.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_alum_bar_10oz_CA.paa"; descriptionShort = "10oz Aluminum Bar"; class ItemActions { @@ -1956,8 +2395,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Tin"; - model = "\dayz_equip\models\tin_bar.p3d"; - picture = "\dayz_equip\textures\equip_tin_bar_CA.paa"; + model = "\z\addons\dayz_epoch\models\tin_bar.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_tin_bar_CA.paa"; descriptionShort = "Tin Bar"; }; @@ -1967,8 +2406,8 @@ class CfgMagazines count = 1; type = 256; displayName = "10oz Tin"; - model = "\dayz_equip\models\tin_bar.p3d"; - picture = "\dayz_equip\textures\equip_tin_bar_10oz_CA.paa"; + model = "\z\addons\dayz_epoch\models\tin_bar.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_tin_bar_10oz_CA.paa"; descriptionShort = "10oz Tin Bar"; class ItemActions { @@ -1990,8 +2429,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Zombie Parts"; - model = "\dayz_equip\models\zombie_parts_bag_v2.p3d"; - picture = "\dayz_equip\textures\parts_bag_texture3c_CA.paa"; + model = "\z\addons\dayz_epoch\models\zombie_parts_bag_v2.p3d"; + picture = "\z\addons\dayz_epoch\pictures\arts_bag_texture3c_CA.paa"; descriptionShort = "Zombie Parts in a Bag: Trade these for Bio Meat at medic traders."; }; @@ -2094,8 +2533,8 @@ class CfgMagazines // fuelQuantity = 210; type = 256; displayName = "Oil Barrel"; - model = "\dayz_equip\models\oil_drum_model.p3d"; - picture = "\dayz_equip\textures\equip_oil_drum_model_ca.paa"; + model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_oil_drum_model_ca.paa"; descriptionShort = "210 litres of Oil in a Barrel"; }; class ItemFuelBarrel: CA_Magazine @@ -2105,8 +2544,8 @@ class CfgMagazines fuelQuantity = 210; type = 256; displayName = "Fuel Barrel"; - model = "\dayz_equip\models\oil_drum_model.p3d"; - picture = "\dayz_equip\textures\equip_oil_drum_model_ca.paa"; + model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_oil_drum_model_ca.paa"; descriptionShort = "210 litres of fuel per barrel"; }; class ItemFuelBarrelEmpty: ItemFuelBarrel @@ -2116,7 +2555,7 @@ class CfgMagazines fuelQuantity = 0; type = 256; displayName = "Fuel Barrel (Empty)"; - picture = "\dayz_equip\textures\equip_oildrum_e_CA.paa"; + picture = "\z\addons\dayz_epoch\pictures\equip_oildrum_e_CA.paa"; descriptionShort = "210 litres of fuel per barrel (Empty)"; }; class ItemJerrycan: CA_Magazine @@ -2145,36 +2584,49 @@ class CfgMagazines count = 1; type = 256; displayName = "Supply Crate"; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; descriptionShort = "12 x Random Item"; }; - class bulk_NVGoggles: bulk + class bulk_empty: bulk { - descriptionShort = "12 x NV Goggles"; + descriptionShort = "Empty Supply Crate"; class ItemActions { - class CreateMags + class Crafting { - text = "Open %1"; - script = "spawn player_loadCrate;"; - output[] = {"NVGoggles",12,"weapon"}; - // types magazine, weapon, backpack + text = "Make 6 pack of Coke"; + script = "spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {"ItemToolbox"}; + output[] = {{"bulk_ItemSodaCoke",1}}; + input[] = {{"bulk_empty",1},{"ItemSodaCoke",6}}; }; }; - }; - class bulk_DZ_Backpack_EP1: bulk + class bulk_ItemSodaCoke: bulk { - descriptionShort = "4 x DZ_Backpack_EP1"; + descriptionShort = "6 x ItemSodaCoke"; class ItemActions { class CreateMags { text = "Open %1"; script = "spawn player_loadCrate;"; - output[] = {"DZ_Backpack_EP1",4,"backpack"}; - // types magazine, weapon, backpack + output[] = {"ItemSodaCoke",6,"magazine"}; + }; + }; + }; + class bulk_ItemSodaPepsi: bulk + { + descriptionShort = "6 x ItemSodaPepsi"; + class ItemActions + { + class CreateMags + { + text = "Open %1"; + script = "spawn player_loadCrate;"; + output[] = {"ItemSodaPepsi",6,"magazine"}; }; }; }; @@ -2230,45 +2682,6 @@ class CfgMagazines }; }; }; - class bulk_ItemGPS: bulk - { - descriptionShort = "12 x GPS"; - class ItemActions - { - class CreateMags - { - text = "Open %1"; - script = "spawn player_loadCrate;"; - output[] = {"ItemGPS",12,"weapon"}; - }; - }; - }; - class bulk_ItemMap: bulk - { - descriptionShort = "12 x Map"; - class ItemActions - { - class CreateMags - { - text = "Open %1"; - script = "spawn player_loadCrate;"; - output[] = {"ItemMap",12,"weapon"}; - }; - }; - }; - class bulk_ItemEtool: bulk - { - descriptionShort = "12 x E-Tool"; - class ItemActions - { - class CreateMags - { - text = "Open %1"; - script = "spawn player_loadCrate;"; - output[] = {"ItemEtool",12,"weapon"}; - }; - }; - }; class bulk_17Rnd_9x19_glock17: bulk { descriptionShort = "12 x 17Rnd_9x19_glock17"; @@ -2291,8 +2704,8 @@ class CfgMagazines type = 256; displayName = "30 Meter Plot"; descriptionShort = "Plot Pole: A placeable pole that will allow you and your friends to build within a 30m radius. Ownership of plot pole is lost after owners death."; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2311,8 +2724,8 @@ class CfgMagazines type = 256; displayName = "Large Desert Camo Net"; descriptionShort = "Large Camo Netting: A very large buildable object that can be used to cover objects."; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2331,8 +2744,8 @@ class CfgMagazines type = 256; displayName = "Large Forest Camo Net"; descriptionShort = "Large Camo Netting: A very large buildable object that can be used to cover objects."; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2351,8 +2764,8 @@ class CfgMagazines type = 256; displayName = "Desert Camo Net"; descriptionShort = "Camo Netting: A buildable object that can be used to cover objects."; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2380,8 +2793,8 @@ class CfgMagazines type = 256; displayName = "Forest Camo Net"; descriptionShort = "Camo Netting: A buildable object that can be used to cover objects."; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2409,8 +2822,8 @@ class CfgMagazines type = 256; displayName = "Fuel Pump"; descriptionShort = "Fuel Pump"; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2429,8 +2842,8 @@ class CfgMagazines type = 256; displayName = "Light Pole"; descriptionShort = "Light Pole: A buildable object that can be used with a Generator to provide light in times of darkness."; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2449,8 +2862,8 @@ class CfgMagazines type = 256; displayName = "Stick Fence"; descriptionShort = "Stick Fence: A buildable barrier that can be used to keep zombies out of your camp. They are fairly weak and can be ran over easier."; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2469,8 +2882,8 @@ class CfgMagazines type = 256; displayName = "Nice Wooden Shed"; descriptionShort = "Nice Wooden Shed: A crafted object that holds a lot of items/weapons/backpacks and has a door that opens and closes."; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2489,8 +2902,8 @@ class CfgMagazines type = 256; displayName = "Wood Shack"; descriptionShort = "Wood Shack"; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2509,8 +2922,8 @@ class CfgMagazines type = 256; displayName = "M240 Nest"; descriptionShort = "M240 Nest"; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2529,8 +2942,8 @@ class CfgMagazines type = 256; displayName = "Canvas Sun Shade"; descriptionShort = "Sun Shade: A buildable object used to keep the sun off your back."; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2549,8 +2962,8 @@ class CfgMagazines type = 256; displayName = "Wood Bench"; descriptionShort = "Wood Bench"; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2569,8 +2982,8 @@ class CfgMagazines type = 256; displayName = "Rusty Gate"; descriptionShort = "Rusty Gate: A buildable object that can be opened and closed."; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2589,8 +3002,8 @@ class CfgMagazines type = 256; displayName = "Sandbag Nest"; descriptionShort = "Sandbag Nest: A buildable fortification object, can be removed."; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2609,8 +3022,8 @@ class CfgMagazines type = 256; displayName = "Outhouse"; descriptionShort = "Outhouse: A buildable object that you can poop in. Comes pre-stocked with one roll of Toilet Paper."; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2629,8 +3042,8 @@ class CfgMagazines type = 256; displayName = "Storage Shed"; descriptionShort = "Storage Shed: A large buildable object that is non enterable and holds a lot of items/weapons/backpacks"; - model = "\dayz_equip\models\supply_crate.p3d"; - picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; class ItemActions { class Build @@ -2660,6 +3073,28 @@ class CfgMagazines script = "spawn player_build;"; require[] = {"ItemToolbox"}; create = "Generator_DZ"; + needNearby[] = {"dayz_fuelpumparray"}; + }; + }; + }; + class ItemFuelPump: CA_Magazine + { + scope = 2; + count = 1; + type = 256; + displayName = "Fuel Pump"; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; + descriptionShort = "Fuel Pumps can be used to create a refuel station"; + class ItemActions + { + class Build + { + text = "$STR_ACTIONS_BUILD"; + script = "spawn player_build;"; + require[] = {"ItemToolbox"}; + create = "FuelPump_DZ"; + needNearby[] = {"dayz_fuelsources"}; }; }; }; @@ -2670,8 +3105,8 @@ class CfgMagazines count = 1; type = 256; displayName = "Safe"; - model = "\dayz_equip\models\safe2_onside.p3d"; - picture = "\dayz_equip\textures\equip_safe2_ca.paa"; + model = "\z\addons\dayz_epoch\models\safe_onside.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_safe_ca.paa"; descriptionShort = "Personal Safe: A placeable object that is used for very secure storage. WARNING!!! Placing your safe will give you a 4 digit number that is used to open the safe, save that number!"; class ItemActions { @@ -2753,57 +3188,57 @@ class CfgMagazines scope = 2; displayName = "Rainbow Trout"; descriptionShort = "Rainbow Trout: A small fish that can be fairly easy to catch."; - model = "\dayz_equip\models\trout.p3d"; - picture = "\dayz_equip\textures\equip_rainbowtrout_CA.paa"; + model = "\z\addons\dayz_epoch\models\trout.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_rainbowtrout_CA.paa"; bloodRegen = 400; }; class ItemSeaBass : FoodEdible { scope = 2; displayName = "Sea Bass"; descriptionShort = "Sea Bass: A medium sized fish that is fairly rare."; - model = "\dayz_equip\models\seabass.p3d"; - picture = "\dayz_equip\textures\equip_seabass_CA.paa"; + model = "\z\addons\dayz_epoch\models\seabass.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_seabass_CA.paa"; bloodRegen = 800; }; class ItemTuna : FoodEdible { scope = 2; displayName = "Blue Fin Tuna"; descriptionShort = "Blue Fin Tuna: A very large and hard to catch fish. Sushi anyone?"; - model = "\dayz_equip\models\tuna.p3d"; - picture = "\dayz_equip\textures\equip_tuna_CA.paa"; + model = "\z\addons\dayz_epoch\models\tuna.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_tuna_CA.paa"; bloodRegen = 2500; }; class ItemTroutCooked : FoodEdible { scope = 2; displayName = "Rainbow Trout (Cooked)"; descriptionShort = "Rainbow Trout: A small fish that can be fairly easy to catch."; - model = "\dayz_equip\models\trout_cooked.p3d"; - picture = "\dayz_equip\textures\equip_trout_cooked_CA.paa"; + model = "\z\addons\dayz_epoch\models\trout_cooked.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_trout_cooked_CA.paa"; bloodRegen = 800; }; class ItemSeaBassCooked : FoodEdible { scope = 2; displayName = "Sea Bass (Cooked)"; descriptionShort = "Sea Bass: A medium sized fish that is fairly rare."; - model = "\dayz_equip\models\seabass_cooked.p3d"; - picture = "\dayz_equip\textures\equip_seabass_cooked_CA.paa"; + model = "\z\addons\dayz_epoch\models\seabass_cooked.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_seabass_cooked_CA.paa"; bloodRegen = 1600; }; class ItemTunaCooked : FoodEdible { scope = 2; displayName = "Blue Fin Tuna (Cooked)"; descriptionShort = "Blue Fin Tuna: A very large and hard to catch fish. Sushi anyone?"; - model = "\dayz_equip\models\tuna_cooked.p3d"; - picture = "\dayz_equip\textures\equip_tuna_cooked_CA.paa"; + model = "\z\addons\dayz_epoch\models\tuna_cooked.p3d"; + picture = "\z\addons\dayz_epoch\models\equip_tuna_cooked_CA.paa"; bloodRegen = 5000; }; class FoodBioMeat: FoodEdible { scope = 2; displayName = "Bio Meat"; - model = "\dayz_equip\models\biomeat_can.p3d"; - picture = "\dayz_equip\textures\armourpottedmeat_CAN_test1_CA.paa"; - descriptionShort = "Bio Meat: A very good source of blood, and a very high chance of infection. Eat at own risk."; + model = "\z\addons\dayz_epoch\models\biomeat_can.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_biomeat_CA.paa"; + descriptionShort = "Bio Meat: A very good source of nutrition, and a very high chance of infection. Eat at own risk."; bloodRegen = 1600; }; class FoodSteakCooked: FoodEdible @@ -2977,18 +3412,18 @@ class CfgVehicles }; // PLAYER BUILDINGS - class Plastic_Pole_EP1; - class Plastic_Pole_EP1_DZ: Plastic_Pole_EP1 + // class Plastic_Pole_EP1; + class Sign_1L_Noentry_EP1; + class Plastic_Pole_EP1_DZ: Sign_1L_Noentry_EP1 { scope = 2; // destrType = "DestructNo"; offset[] = {0,2.5,0}; displayName = "30m Plot Pole"; vehicleClass = "Fortifications"; + removeoutput[] = {{"30m_plot_kit",1}}; }; - - class USMC_WarfareBMGNest_M240; class M240Nest_DZ: USMC_WarfareBMGNest_M240 { @@ -3391,7 +3826,7 @@ class CfgVehicles { scope = 2; displayName = "Safe"; - model = "\dayz_equip\models\safe2.p3d"; + model = "\z\addons\dayz_epoch\models\safe.p3d"; class eventHandlers { init = "[(_this select 0),'cfgMagazines','ItemVault'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; @@ -3507,26 +3942,6 @@ class CfgVehicles init = "[(_this select 0),'cfgMagazines','PartGlass'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; }; }; - class WeaponHolder_ItemOilBarrel: WeaponHolderBase - { - scope = 2; - displayName = "Oil Barrel"; - model = "\dayz_equip\proxy\oil_drum_model.p3d"; - class eventHandlers - { - init = "[(_this select 0),'cfgMagazines','ItemOilBarrel'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; - }; - }; - class WeaponHolder_ItemFuelBarrel: WeaponHolderBase - { - scope = 2; - displayName = "Fuel Barrel"; - model = "\dayz_equip\proxy\oil_drum_model.p3d"; - class eventHandlers - { - init = "[(_this select 0),'cfgMagazines','ItemFuelBarrel'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; - }; - }; class WeaponHolder_ItemJerrycanEmpty: WeaponHolderBase { scope = 2; @@ -3585,7 +4000,7 @@ class CfgVehicles { vehicleClass = "Survival"; displayName = "Safe"; - model = "\dayz_equip\models\safe2.p3d"; + model = "\z\addons\dayz_epoch\models\safe.p3d"; destrType = "DestructNo"; armor = 800; transportMaxMagazines = 200; @@ -3596,7 +4011,7 @@ class CfgVehicles { vehicleClass = "Survival"; displayName = "Locked Safe"; - model = "\dayz_equip\models\safe2.p3d"; + model = "\z\addons\dayz_epoch\models\safe.p3d"; destrType = "DestructNo"; armor = 800; transportMaxMagazines = 0; diff --git a/dayz_server/compile/server_playerSetup.sqf b/dayz_server/compile/server_playerSetup.sqf index 02666239f..9168e50d9 100644 --- a/dayz_server/compile/server_playerSetup.sqf +++ b/dayz_server/compile/server_playerSetup.sqf @@ -252,7 +252,9 @@ _playerObj setVariable["friendlies",_friendlies,true]; dayzPlayerLogin2 = [_worldspace,_state]; _clientID = owner _playerObj; -_clientID publicVariableClient "dayzPlayerLogin2"; +if(!isNull _playerObj) then { + _clientID publicVariableClient "dayzPlayerLogin2"; +}; //record time started _playerObj setVariable ["lastTime",time]; diff --git a/dayz_server/compile/server_spawnCrashSite.sqf b/dayz_server/compile/server_spawnCrashSite.sqf index 23fd884ad..2eecc2c3a 100644 --- a/dayz_server/compile/server_spawnCrashSite.sqf +++ b/dayz_server/compile/server_spawnCrashSite.sqf @@ -77,7 +77,7 @@ while {true} do { // I don't think this is needed (you can't get "in" a crash), but it was in the original DayZ Crash logic dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_crash]; - _crash setVariable ["ObjectID",1,true]; + _crash setVariable ["ObjectID","1",true]; // Disable simulation server side _crash enableSimulation false; diff --git a/dayz_server/compile/server_spawnEvent.sqf b/dayz_server/compile/server_spawnEvent.sqf new file mode 100644 index 000000000..a1d1342e2 --- /dev/null +++ b/dayz_server/compile/server_spawnEvent.sqf @@ -0,0 +1,52 @@ +/* + DayZ Epoch Event Scheduler + Usage: spawn server_spawnEvents; + Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com. +*/ + +private ["_xaction","_date","_key","_result","_outcome","_proceed","_handle"]; + +diag_log("EPOCH EVENTS INIT"); +EventSchedulerLastTime = ""; + +epoch_eventIsAny = { + private ["_boolReturn","_event","_real"]; + _event = _this select 0; + _real = _this select 1; + _boolReturn = false; + if (typeName _event == "STRING") then { + _boolReturn = (_event == "any"); + } else { + _boolReturn = (_real == _event); + }; + _boolReturn +}; + +while {true} do { + // Find current time from server + _key = "CHILD:307:"; + _result = _key call server_hiveReadWrite; + _outcome = _result select 0; + if(_outcome == "PASS") then { + _date = _result select 1; + if (EventSchedulerLastTime != str(_date)) then { + // diag_log ("EVENTS: Local Time is: " + str(_date)); + { + EventSchedulerLastTime = str(_date); + _proceed = false; + for "_i" from 0 to 4 do { + _proceed = [(_x select _i),(date select _i)] call epoch_eventIsAny; + }; + if(_proceed) then { + _xaction = _x select 5; + // EXECUTE SCRIPT + diag_log ("RUNNING EVENT: " + _xaction + " on " + EventSchedulerLastTime); + _handle = [] execVM "\z\addons\dayz_server\modules\" + _xaction + ".sqf"; + }; + sleep 0.03; + + } forEach EpochEvents; + }; + }; + sleep 5; +}; \ No newline at end of file diff --git a/dayz_server/compile/server_tradeObject.sqf b/dayz_server/compile/server_tradeObject.sqf index 369606fae..47ae21498 100644 --- a/dayz_server/compile/server_tradeObject.sqf +++ b/dayz_server/compile/server_tradeObject.sqf @@ -16,4 +16,6 @@ _result = call compile format ["%1",_data]; _outcome = _result select 0; dayzTradeResult = _outcome; -_clientID publicVariableClient "dayzTradeResult"; \ No newline at end of file +if(!isNull _character) then { + _clientID publicVariableClient "dayzTradeResult"; +}; \ No newline at end of file diff --git a/dayz_server/compile/server_traders.sqf b/dayz_server/compile/server_traders.sqf index ebb347bef..708d2187a 100644 --- a/dayz_server/compile/server_traders.sqf +++ b/dayz_server/compile/server_traders.sqf @@ -35,5 +35,7 @@ if (_status == "ObjectStreamStart") then { diag_log(_retrader); dayzTraderMenuResult = _retrader; -_clientID publicVariableClient "dayzTraderMenuResult"; +if(!isNull _character) then { + _clientID publicVariableClient "dayzTraderMenuResult"; +}; _retrader; \ No newline at end of file diff --git a/dayz_server/init/server_functions.sqf b/dayz_server/init/server_functions.sqf index 54cd18564..fe209a855 100644 --- a/dayz_server/init/server_functions.sqf +++ b/dayz_server/init/server_functions.sqf @@ -23,6 +23,7 @@ zombie_findOwner = compile preprocessFileLineNumbers "\z\addons\dayz_server\co server_updateNearbyObjects = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_updateNearbyObjects.sqf"; server_spawnCrashSite = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_spawnCrashSite.sqf"; server_handleZedSpawn = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_handleZedSpawn.sqf"; +server_spawnEvents = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_spawnEvent.sqf"; fnc_plyrHit = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\fnc_plyrHit.sqf"; server_deaths = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDeaths.sqf"; @@ -340,7 +341,7 @@ spawn_roadblocks = { _veh setpos _position; dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_veh]; - _veh setVariable ["ObjectID",1,true]; + _veh setVariable ["ObjectID","1",true]; _num = round(random 3); _config = configFile >> "CfgBuildingLoot" >> _spawnloot; diff --git a/dayz_server/modules/hello_world.sqf b/dayz_server/modules/hello_world.sqf new file mode 100644 index 000000000..7d15c76fd --- /dev/null +++ b/dayz_server/modules/hello_world.sqf @@ -0,0 +1,3 @@ +// Sample Hello World + +[nil,nil,"per",rTITLETEXT,"Hello World","PLAIN DOWN"] call RE; diff --git a/dayz_server/modules/hello_world2.sqf b/dayz_server/modules/hello_world2.sqf new file mode 100644 index 000000000..20b2c44aa --- /dev/null +++ b/dayz_server/modules/hello_world2.sqf @@ -0,0 +1,3 @@ +// Sample Hello World + +[nil,nil,"per",rTITLETEXT,"Hello World 2","PLAIN DOWN"] call RE; diff --git a/dayz_server/system/server_monitor.sqf b/dayz_server/system/server_monitor.sqf index 33c29c641..518c4383b 100644 --- a/dayz_server/system/server_monitor.sqf +++ b/dayz_server/system/server_monitor.sqf @@ -1,4 +1,4 @@ -private ["_result","_status","_val","_pos","_wsDone","_dir","_block","_isOK","_countr","_objWpnTypes","_objWpnQty","_dam","_selection","_totalvehicles","_object","_idKey","_type","_ownerID","_worldspace","_intentory","_hitPoints","_fuel","_damage","_date","_id","_script","_key","_myArray","_outcome","_vehLimit"]; +private ["_result","_pos","_wsDone","_dir","_block","_isOK","_countr","_objWpnTypes","_objWpnQty","_dam","_selection","_totalvehicles","_object","_idKey","_type","_ownerID","_worldspace","_intentory","_hitPoints","_fuel","_damage","_date","_script","_key","_outcome","_vehLimit","_hiveResponse","_objectCount","_codeCount","_objectArray"]; []execVM "\z\addons\dayz_server\system\s_fps.sqf"; //server monitor FPS (writes each ~181s diag_fps+181s diag_fpsmin*) dayz_versionNo = getText(configFile >> "CfgMods" >> "DayZ" >> "version"); @@ -24,224 +24,39 @@ if (_script != "") then }; }; -serverVehicleCounter = []; - -//Stream in objects - /* STREAM OBJECTS */ - //Send the key - _key = format["CHILD:302:%1:",dayZ_instance]; - _result = _key call server_hiveReadWrite; - - diag_log "HIVE: Request sent"; - - //Process result - _status = _result select 0; - - _myArray = []; - if (_status == "ObjectStreamStart") then { - _val = _result select 1; - //Stream Objects - diag_log ("HIVE: Commence Object Streaming..."); - for "_i" from 1 to _val do { - _result = _key call server_hiveReadWrite; - - _status = _result select 0; - _myArray set [count _myArray,_result]; - //diag_log ("HIVE: Loop "); - }; - //diag_log ("HIVE: Streamed " + str(_val) + " objects"); - }; - - _countr = 0; - _totalvehicles = 0; - { - - //Parse Array - _countr = _countr + 1; - - _idKey = _x select 1; - _type = _x select 2; - _ownerID = _x select 3; - - _worldspace = _x select 4; - _intentory= _x select 5; - _hitPoints= _x select 6; - _fuel = _x select 7; - _damage = _x select 8; - - _dir = 0; - _pos = [0,0,0]; - _wsDone = false; - if (count _worldspace >= 2) then - { - _dir = _worldspace select 0; - if (count (_worldspace select 1) == 3) then { - _pos = _worldspace select 1; - _wsDone = true; - } - }; - if (!_wsDone) then { - if (count _worldspace >= 1) then { _dir = _worldspace select 0; }; - _pos = [getMarkerPos "center",0,4000,10,0,2000,0] call BIS_fnc_findSafePos; - if (count _pos < 3) then { _pos = [_pos select 0,_pos select 1,0]; }; - diag_log ("MOVED OBJ: " + str(_idKey) + " of class " + _type + " to pos: " + str(_pos)); - }; - - if (_damage < 1) then { - diag_log format["OBJ: %1 - %2", _idKey,_type]; - - //Create it - _object = createVehicle [_type, _pos, [], 0, "CAN_COLLIDE"]; - _object setVariable ["lastUpdate",time]; - _object setVariable ["ObjectID", _idKey, true]; - - // fix for leading zero issues on safe codes after restart - if (_object isKindOf "VaultStorageLocked") then { - _codeCount = (count (toArray _ownerID)); - if(_codeCount == 3) then { - _ownerID = format["0%1", _ownerID]; - }; - if(_codeCount == 2) then { - _ownerID = format["00%1", _ownerID]; - }; - if(_codeCount == 1) then { - _ownerID = format["000%1", _ownerID]; - }; - }; - - _object setVariable ["CharacterID", _ownerID, true]; - - clearWeaponCargoGlobal _object; - clearMagazineCargoGlobal _object; - - if ((typeOf _object) in dayz_allowedObjects) then { - _object addMPEventHandler ["MPKilled",{_this call object_handleServerKilled;}]; - // Test disabling simulation server side on buildables only. - _object enableSimulation false; - }; - - _object setdir _dir; - _object setpos _pos; - _object setDamage _damage; - - if (count _intentory > 0) then { - if (_object isKindOf "VaultStorageLocked") then { - // Fill variables with loot - _object setVariable ["WeaponCargo", (_intentory select 0), true]; - _object setVariable ["MagazineCargo", (_intentory select 1), true]; - _object setVariable ["BackpackCargo", (_intentory select 2), true]; - _object setVariable ["OEMPos", _pos, true]; - } else { - - //Add weapons - _objWpnTypes = (_intentory select 0) select 0; - _objWpnQty = (_intentory select 0) select 1; - _countr = 0; - { - if (_x == "Crossbow") then { _x = "Crossbow_DZ" }; // Convert Crossbow to Crossbow_DZ - _isOK = isClass(configFile >> "CfgWeapons" >> _x); - if (_isOK) then { - _block = getNumber(configFile >> "CfgWeapons" >> _x >> "stopThis") == 1; - if (!_block) then { - _object addWeaponCargoGlobal [_x,(_objWpnQty select _countr)]; - }; - }; - _countr = _countr + 1; - } forEach _objWpnTypes; - - //Add Magazines - _objWpnTypes = (_intentory select 1) select 0; - _objWpnQty = (_intentory select 1) select 1; - _countr = 0; - { - if (_x == "BoltSteel") then { _x = "WoodenArrow" }; // Convert BoltSteel to WoodenArrow - _isOK = isClass(configFile >> "CfgMagazines" >> _x); - if (_isOK) then { - _block = getNumber(configFile >> "CfgMagazines" >> _x >> "stopThis") == 1; - if (!_block) then { - _object addMagazineCargoGlobal [_x,(_objWpnQty select _countr)]; - }; - }; - _countr = _countr + 1; - } forEach _objWpnTypes; - - //Add Backpacks - _objWpnTypes = (_intentory select 2) select 0; - _objWpnQty = (_intentory select 2) select 1; - _countr = 0; - { - _isOK = isClass(configFile >> "CfgVehicles" >> _x); - if (_isOK) then { - _block = getNumber(configFile >> "CfgVehicles" >> _x >> "stopThis") == 1; - if (!_block) then { - _object addBackpackCargoGlobal [_x,(_objWpnQty select _countr)]; - }; - }; - _countr = _countr + 1; - } forEach _objWpnTypes; - }; - }; - - if (_object isKindOf "AllVehicles") then { - { - _selection = _x select 0; - _dam = _x select 1; - if (_selection in dayZ_explosiveParts and _dam > 0.8) then {_dam = 0.8}; - [_object,_selection,_dam] call object_setFixServer; - } forEach _hitpoints; - - _object setFuel _fuel; - - if (!((typeOf _object) in dayz_allowedObjects)) then { - - _object setvelocity [0,0,1]; - _object call fnc_vehicleEventHandler; - - if(_ownerID != "0") then { - _object setvehiclelock "locked"; - }; - - _totalvehicles = _totalvehicles + 1; - - // total each vehicle - serverVehicleCounter set [count serverVehicleCounter,_type]; - }; - }; - - //Monitor the object - dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object]; - }; - } forEach _myArray; - - // # END OF STREAMING # +waituntil{isNil "sm_done"}; // prevent server_monitor be called twice (bug during login of the first player) //Set the Time - //Send request - _key = "CHILD:307:"; - _result = _key call server_hiveReadWrite; - _outcome = _result select 0; - if(_outcome == "PASS") then { - _date = _result select 1; - if(isDedicated) then { - //["dayzSetDate",_date] call broadcastRpcCallAll; - setDate _date; - dayzSetDate = _date; - publicVariable "dayzSetDate"; - }; - - diag_log ("HIVE: Local Time set to " + str(_date)); +//Send request +_key = "CHILD:307:"; +_result = _key call server_hiveReadWrite; +_outcome = _result select 0; +if(_outcome == "PASS") then { + _date = _result select 1; + + if(dayz_fullMoonNights) then { + //date setup + _year = _date select 0; + _month = _date select 1; + _day = _date select 2; + _hour = _date select 3; + _minute = _date select 4; + + //Force full moon nights + _date = [2012,6,6,_hour,_minute]; + }; + + if(isDedicated) then { + //["dayzSetDate",_date] call broadcastRpcCallAll; + setDate _date; + dayzSetDate = _date; + publicVariable "dayzSetDate"; }; - - createCenter civilian; - if (isDedicated) then { - endLoadingScreen; - }; -if (isDedicated) then { - _id = [] execFSM "\z\addons\dayz_server\system\server_cleanup.fsm"; + diag_log ("HIVE: Local Time set to " + str(_date)); }; - + // Custom Configs if(isnil "MaxVehicleLimit") then { MaxVehicleLimit = 50; @@ -252,37 +67,228 @@ if(isnil "MaxHeliCrashes") then { if(isnil "MaxDynamicDebris") then { MaxDynamicDebris = 100; }; - // Custon Configs End -// spawn_vehicles -_vehLimit = MaxVehicleLimit - _totalvehicles; -diag_log ("HIVE: Spawning # of Vehicles: " + str(_vehLimit)); -if(_vehLimit > 0) then { - for "_x" from 1 to _vehLimit do { - _id = [] spawn spawn_vehicles; - //waitUntil{scriptDone _id}; +if (isServer and isNil "sm_done") then { + + serverVehicleCounter = []; + _hiveResponse = []; + + for "_i" from 1 to 5 do { + diag_log "HIVE: trying to get objects"; + _key = format["CHILD:302:%1:", dayZ_instance]; + _hiveResponse = _key call server_hiveReadWrite; + if ((((isnil "_hiveResponse") || {(typeName _hiveResponse != "ARRAY")}) || {((typeName (_hiveResponse select 1)) != "SCALAR")}) || {(_hiveResponse select 1 > 2000)}) then { + diag_log ("HIVE: connection problem... HiveExt response:"+str(_hiveResponse)); + _hiveResponse = ["",0]; + } + else { + diag_log ("HIVE: found "+str(_hiveResponse select 1)+" objects" ); + _i = 99; // break + }; }; + + _objectArray = []; + if ((_hiveResponse select 0) == "ObjectStreamStart") then { + _objectCount = _hiveResponse select 1; + diag_log ("HIVE: Commence Object Streaming..."); + for "_i" from 1 to _objectCount do { + _hiveResponse = _key call server_hiveReadWrite; + _objectArray set [_i - 1, _hiveResponse]; + //diag_log (format["HIVE dbg %1 %2", typeName _hiveResponse, _hiveResponse]); + }; + diag_log ("HIVE: got " + str(count _objectArray) + " objects"); + }; + + // # START OF STREAMING # + _countr = 0; + _totalvehicles = 0; + { + //Parse Array + _countr = _countr + 1; + + _idKey = _x select 1; + _type = _x select 2; + _ownerID = _x select 3; + + _worldspace = _x select 4; + _intentory= _x select 5; + _hitPoints= _x select 6; + _fuel = _x select 7; + _damage = _x select 8; + + _dir = 0; + _pos = [0,0,0]; + _wsDone = false; + if (count _worldspace >= 2) then + { + _dir = _worldspace select 0; + if (count (_worldspace select 1) == 3) then { + _pos = _worldspace select 1; + _wsDone = true; + } + }; + if (!_wsDone) then { + if (count _worldspace >= 1) then { _dir = _worldspace select 0; }; + _pos = [getMarkerPos "center",0,4000,10,0,2000,0] call BIS_fnc_findSafePos; + if (count _pos < 3) then { _pos = [_pos select 0,_pos select 1,0]; }; + diag_log ("MOVED OBJ: " + str(_idKey) + " of class " + _type + " to pos: " + str(_pos)); + }; + + if (_damage < 1) then { + diag_log format["OBJ: %1 - %2", _idKey,_type]; + + //Create it + _object = createVehicle [_type, _pos, [], 0, "CAN_COLLIDE"]; + _object setVariable ["lastUpdate",time]; + _object setVariable ["ObjectID", _idKey, true]; + + // fix for leading zero issues on safe codes after restart + if (_object isKindOf "VaultStorageLocked") then { + _codeCount = (count (toArray _ownerID)); + if(_codeCount == 3) then { + _ownerID = format["0%1", _ownerID]; + }; + if(_codeCount == 2) then { + _ownerID = format["00%1", _ownerID]; + }; + if(_codeCount == 1) then { + _ownerID = format["000%1", _ownerID]; + }; + }; + + _object setVariable ["CharacterID", _ownerID, true]; + + clearWeaponCargoGlobal _object; + clearMagazineCargoGlobal _object; + + if ((typeOf _object) in dayz_allowedObjects) then { + _object addMPEventHandler ["MPKilled",{_this call object_handleServerKilled;}]; + // Test disabling simulation server side on buildables only. + _object enableSimulation false; + }; + + _object setdir _dir; + _object setpos _pos; + _object setDamage _damage; + + if (count _intentory > 0) then { + if (_object isKindOf "VaultStorageLocked") then { + // Fill variables with loot + _object setVariable ["WeaponCargo", (_intentory select 0), true]; + _object setVariable ["MagazineCargo", (_intentory select 1), true]; + _object setVariable ["BackpackCargo", (_intentory select 2), true]; + _object setVariable ["OEMPos", _pos, true]; + } else { + + //Add weapons + _objWpnTypes = (_intentory select 0) select 0; + _objWpnQty = (_intentory select 0) select 1; + _countr = 0; + { + if (_x == "Crossbow") then { _x = "Crossbow_DZ" }; // Convert Crossbow to Crossbow_DZ + _isOK = isClass(configFile >> "CfgWeapons" >> _x); + if (_isOK) then { + _block = getNumber(configFile >> "CfgWeapons" >> _x >> "stopThis") == 1; + if (!_block) then { + _object addWeaponCargoGlobal [_x,(_objWpnQty select _countr)]; + }; + }; + _countr = _countr + 1; + } forEach _objWpnTypes; + + //Add Magazines + _objWpnTypes = (_intentory select 1) select 0; + _objWpnQty = (_intentory select 1) select 1; + _countr = 0; + { + if (_x == "BoltSteel") then { _x = "WoodenArrow" }; // Convert BoltSteel to WoodenArrow + _isOK = isClass(configFile >> "CfgMagazines" >> _x); + if (_isOK) then { + _block = getNumber(configFile >> "CfgMagazines" >> _x >> "stopThis") == 1; + if (!_block) then { + _object addMagazineCargoGlobal [_x,(_objWpnQty select _countr)]; + }; + }; + _countr = _countr + 1; + } forEach _objWpnTypes; + + //Add Backpacks + _objWpnTypes = (_intentory select 2) select 0; + _objWpnQty = (_intentory select 2) select 1; + _countr = 0; + { + _isOK = isClass(configFile >> "CfgVehicles" >> _x); + if (_isOK) then { + _block = getNumber(configFile >> "CfgVehicles" >> _x >> "stopThis") == 1; + if (!_block) then { + _object addBackpackCargoGlobal [_x,(_objWpnQty select _countr)]; + }; + }; + _countr = _countr + 1; + } forEach _objWpnTypes; + }; + }; + + if (_object isKindOf "AllVehicles") then { + { + _selection = _x select 0; + _dam = _x select 1; + if (_selection in dayZ_explosiveParts and _dam > 0.8) then {_dam = 0.8}; + [_object,_selection,_dam] call object_setFixServer; + } forEach _hitpoints; + + _object setFuel _fuel; + + if (!((typeOf _object) in dayz_allowedObjects)) then { + + _object setvelocity [0,0,1]; + _object call fnc_vehicleEventHandler; + + if(_ownerID != "0") then { + _object setvehiclelock "locked"; + }; + + _totalvehicles = _totalvehicles + 1; + + // total each vehicle + serverVehicleCounter set [count serverVehicleCounter,_type]; + }; + }; + + //Monitor the object + dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object]; + }; + } forEach _objectArray; + // # END OF STREAMING # + + // spawn_vehicles + _vehLimit = MaxVehicleLimit - _totalvehicles; + diag_log ("HIVE: Spawning # of Vehicles: " + str(_vehLimit)); + if(_vehLimit > 0) then { + for "_x" from 1 to _vehLimit do { + [] spawn spawn_vehicles; + }; + }; + // spawn_roadblocks + diag_log ("HIVE: Spawning # of Debris: " + str(MaxDynamicDebris)); + for "_x" from 1 to MaxDynamicDebris do { + [] spawn spawn_roadblocks; + }; + + if(isnil "dayz_MapArea") then { + dayz_MapArea = 10000; + }; + if(isnil "HeliCrashArea") then { + HeliCrashArea = dayz_MapArea / 2; + }; + + // [_guaranteedLoot, _randomizedLoot, _frequency, _variance, _spawnChance, _spawnMarker, _spawnRadius, _spawnFire, _fadeFire] + nul = [3, 4, (50 * 60), (15 * 60), 0.75, 'center', HeliCrashArea, true, false] spawn server_spawnCrashSite; + + // Epoch Events + nul = [] spawn server_spawnEvents; + + allowConnection = true; + sm_done = true; }; - - -// spawn_roadblocks -diag_log ("HIVE: Spawning # of Debris: " + str(MaxDynamicDebris)); -for "_x" from 1 to MaxDynamicDebris do { - _id = [] spawn spawn_roadblocks; - //waitUntil{scriptDone _id}; -}; - - -allowConnection = true; - -if(isnil "dayz_MapArea") then { - dayz_MapArea = 10000; -}; -if(isnil "HeliCrashArea") then { - HeliCrashArea = dayz_MapArea / 2; -}; - -// [_guaranteedLoot, _randomizedLoot, _frequency, _variance, _spawnChance, _spawnMarker, _spawnRadius, _spawnFire, _fadeFire] -nul = [3, 4, (50 * 60), (15 * 60), 0.75, 'center', HeliCrashArea, true, false] spawn server_spawnCrashSite; - diff --git a/dayz_weapons/config.cpp b/dayz_weapons/config.cpp index 0df615ed4..9a277dd5c 100644 --- a/dayz_weapons/config.cpp +++ b/dayz_weapons/config.cpp @@ -1582,9 +1582,9 @@ class CfgVehicles class FemaleSoldier1_DZ: SurvivorW2_DZ { side = 1; - model = "\dayz_equip\models\female_soldier"; + model = "\z\addons\dayz_epoch\models\female_soldier"; hiddenSelections[] = {"Camo"}; - hiddenSelectionsTextures[] = {"\dayz_equip\textures\female_soldier_body.paa"}; + hiddenSelectionsTextures[] = {"\z\addons\dayz_epoch\textures\female_soldier_body.paa"}; }; */ class BanditW2_DZ: BanditW1_DZ @@ -1600,22 +1600,32 @@ class CfgVehicles class SurvivorWpink_DZ: SurvivorW2_DZ { hiddenSelections[] = {"Camo"}; - hiddenSelectionsTextures[] = {"\dayz_equip\textures\GirlyGirl.paa"}; + hiddenSelectionsTextures[] = {"\z\addons\dayz_epoch\textures\GirlyGirl.paa"}; + }; + class SurvivorWsequisha_DZ: SurvivorW2_DZ + { + hiddenSelections[] = {"Camo"}; + hiddenSelectionsTextures[] = {"\z\addons\dayz_epoch\textures\sequisha_co.paa"}; + }; + class SurvivorWsequishaD_DZ: SurvivorW2_DZ + { + hiddenSelections[] = {"Camo"}; + hiddenSelectionsTextures[] = {"\z\addons\dayz_epoch\textures\sequishaD_co.paa"}; }; class SurvivorWcombat_DZ: SurvivorW2_DZ { hiddenSelections[] = {"Camo"}; - hiddenSelectionsTextures[] = {"\dayz_equip\textures\CombatGirl.paa"}; + hiddenSelectionsTextures[] = {"\z\addons\dayz_epoch\textures\CombatGirl.paa"}; }; class SurvivorWdesert_DZ: SurvivorW2_DZ { hiddenSelections[] = {"Camo"}; - hiddenSelectionsTextures[] = {"\dayz_equip\textures\DesertGirl.paa"}; + hiddenSelectionsTextures[] = {"\z\addons\dayz_epoch\textures\DesertGirl.paa"}; }; class SurvivorWurban_DZ: SurvivorW2_DZ { hiddenSelections[] = {"Camo"}; - hiddenSelectionsTextures[] = {"\dayz_equip\textures\UrbanGirl.paa"}; + hiddenSelectionsTextures[] = {"\z\addons\dayz_epoch\textures\textures\UrbanGirl.paa"}; }; class Citizen1; class PZombie_VB: Citizen1