Make UI toggleable between three options

Admin can choose vanilla, classic epoch or classic epoch dark.

dayz_hungerThirst was replaced with dayz_NutritionSystem
This commit is contained in:
ebaydayz
2016-03-29 19:54:19 -04:00
parent 71b975b05e
commit 91f9b3e33b
122 changed files with 977 additions and 1165 deletions

View File

@@ -54,7 +54,7 @@ if(_IsNearVehicle >= 1) then {
_finished = false;
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -9,7 +9,7 @@ s_player_fillgen = 1;
// Use target from addaction
_vehicle = _this select 3;
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -6,7 +6,7 @@ _isOk = count (_location isFlatEmpty [0.5,0,0,4,0,false,player]) > 0;
if (_isOk) then {
_dir = getDir player;
_classname = "Land_Fire";
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
uiSleep 6;
dayz_hasFire = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];

View File

@@ -26,7 +26,7 @@ _qty = count _fuelCans;
cutText [format[(localize "str_siphon_preparing"),_displayName], "PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";
// Play sound && alert zombies

View File

@@ -463,7 +463,7 @@ if (_hasrequireditem) then {
while {_isOk} do { //publish phase
[10,10] call dayz_HungerThirst;
["Working",0,[100,15,10,0]] call dayz_NutritionSystem;
player playActionNow "Medic"; //animation
//alert zombies

View File

@@ -412,7 +412,7 @@ if (_hasrequireditem) then {
while {_isOk} do {
[10,10] call dayz_HungerThirst;
["Working",0,[100,15,10,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
_dis=20;

View File

@@ -84,7 +84,7 @@ if ((count _upgrade) > 0) then {
_newclassname = _upgrade select 0;
_refund = _upgrade select 1;
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
[player,20,true,(getPosATL player)] spawn player_alertZombies;

View File

@@ -48,7 +48,7 @@ _proceed = true;
} forEach _requirements;
if (_proceed) then {
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
[player,20,true,(getPosATL player)] spawn player_alertZombies;

View File

@@ -1,8 +1,6 @@
/*
Created by Alby exclusively for DayZMod.
Please request permission to use/alter from Alby.
Included in Epoch with permission by @ebaydayz
*/
private ["_items","_counts","_config","_isRecipe","_item","_index","_amount","_count","_entry","_input","_array"];

View File

@@ -25,7 +25,7 @@ call gear_ui_init;
// require one tin bar per key
_hasTinBar = "ItemTinBar" in magazines player;
if (!_hasTinBar) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_59","PLAIN DOWN"]};
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
[player,"repair",0,false] call dayz_zombieSpeak;

View File

@@ -124,7 +124,7 @@ if (_canDo) then {
cutText [localize "str_epoch_player_62","PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
[player,_sfx,0,false] call dayz_zombieSpeak;

View File

@@ -1,8 +1,6 @@
/*
Created by Alby exclusively for DayZMod.
Please request permission to use/alter from Alby.
Included in Epoch with permission by @ebaydayz
*/
private["_config","_input","_output","_required","_failChance","_hasInput","_availabeSpace"];

View File

@@ -52,7 +52,7 @@ if (count(_findNearestTree) >= 1) then {
_proceed = false;
while {_isOk} do {
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
[player,20,true,(getPosATL player)] spawn player_alertZombies;

View File

@@ -35,7 +35,7 @@ _classname = "WeaponHolder";
//return empty crate to inventory
player addMagazine "bulk_empty";
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// Change to optional wait to complete
player playActionNow "Medic";
uiSleep 6;

View File

@@ -98,7 +98,7 @@ if ((count _upgrade) > 0) then {
} forEach _requirements;
if (_proceed) then {
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
[player,20,true,(getPosATL player)] spawn player_alertZombies;

View File

@@ -92,7 +92,7 @@ while {_isOk} do {
_isOk = false;
_proceed = false;
};
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
_dis=20;
[player,_dis,true,(getPosATL player)] spawn player_alertZombies;

View File

@@ -9,7 +9,7 @@ s_player_fillgen = 1;
// Use target from addaction
_vehicle = _this select 3;
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -39,7 +39,7 @@ if(_IsNearVehicle >= 1) then {
_finished = false;
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -28,7 +28,7 @@ if(_inTow) then {
_finished = false;
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -23,7 +23,7 @@ if(_buy_o_sell == "sell") then {
cutText [localize "str_epoch_player_105","PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -29,7 +29,7 @@ if (_qty >= _qty_in) then {
cutText [localize "str_epoch_player_105","PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -27,7 +27,7 @@ if(_buy_o_sell == "sell") then {
cutText [localize "str_epoch_player_105","PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -34,7 +34,7 @@ if (_qty >= _qty_in) then {
cutText [localize "str_epoch_player_105","PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -27,7 +27,7 @@ if(_buy_o_sell == "sell") then {
cutText [localize "str_epoch_player_105","PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -27,7 +27,7 @@ if(_buy_o_sell == "sell") then {
cutText [localize "str_epoch_player_105","PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -38,7 +38,7 @@ if (_qty >= _qty_in) then {
cutText [localize "str_epoch_player_105","PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -26,7 +26,7 @@ cutText [localize "str_epoch_player_105","PLAIN DOWN"];
// force animation
player playActionNow "Medic";
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
r_interrupt = false;
_animState = animationState player;

View File

@@ -32,7 +32,7 @@ if (_qty >= _qty_in) then {
cutText [localize "str_epoch_player_105","PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -61,7 +61,7 @@ while {r_autoTrade} do {
cutText [localize "str_epoch_player_105","PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
//_dis=20;

View File

@@ -51,7 +51,7 @@ for "_x" from 1 to _total_trades do {
} else {
cutText [format[(localize "str_epoch_player_187"),_tradeCounter,_total_trades] , "PLAIN DOWN"];
};
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
//_dis=20;

View File

@@ -41,7 +41,7 @@ for "_x" from 1 to _total_trades do {
} else {
cutText [format[(localize "str_epoch_player_187"),_tradeCounter,_total_trades] , "PLAIN DOWN"];
};
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
player playActionNow "Medic";
r_interrupt = false;

View File

@@ -77,7 +77,7 @@ cutText [localize "str_epoch_player_105","PLAIN DOWN"];
// force animation
player playActionNow "Medic";
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
r_interrupt = false;
_animState = animationState player;

View File

@@ -28,7 +28,7 @@ if (_qty >= _qty_in) then {
cutText [localize "str_epoch_player_105","PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
["Working",0,[3,2,8,0]] call dayz_NutritionSystem;
// force animation
player playActionNow "Medic";

View File

@@ -120,7 +120,7 @@ if(!_cancel) then {
//call dayz_forceSave;
_dir = round(direction player);
[1,1] call dayz_HungerThirst;
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
//wait a bit
player playActionNow "Medic";
uiSleep 1;