Remove some unused files

This commit is contained in:
ebaydayz
2016-03-20 13:28:49 -04:00
parent 9ce5a20417
commit 15a38afd82
33 changed files with 158 additions and 350 deletions

View File

@@ -2,18 +2,20 @@
written by Bohemia Interactive
modified with permission by DayZ Mod Team
*/
disableSerialization;
private ["_control","_display","_temp","_event","_data","_x","_stopTheKey","_keyLeft","_i","_index","_size","_indices","_lbcontrol"];
private ["_key","_keyRight","_keyTop","_keyBottom","_secondColumn","_activateControl","_output","_doFilter"];
private ["_event","_data","_display","_control","_primaryWeaponControl","_IDCsArray","_lbIDC","_lbColumn","_sum"];
/*
IGUI_GEAR_filterPrimaryWeapon = (_activeFilter select 0);
IGUI_GEAR_filterSecondaryWeapon = (_activeFilter select 1);
IGUI_GEAR_filterAmmo = (_activeFilter select 2);
IGUI_GEAR_filterBinocular = (_activeFilter select 3);
IGUI_GEAR_filterInventory = (_activeFilter select 4);
IGUI_GEAR_filterPistols = (_activeFilter select 5);
IGUI_GEAR_filterPistolAmmo = (_activeFilter select 6); */
IGUI_GEAR_filterPrimaryWeapon = (_activeFilter select 0);
IGUI_GEAR_filterSecondaryWeapon = (_activeFilter select 1);
IGUI_GEAR_filterAmmo = (_activeFilter select 2);
IGUI_GEAR_filterBinocular = (_activeFilter select 3);
IGUI_GEAR_filterInventory = (_activeFilter select 4);
IGUI_GEAR_filterPistols = (_activeFilter select 5);
IGUI_GEAR_filterPistolAmmo = (_activeFilter select 6);
*/
_doFilter = false;
@@ -27,11 +29,11 @@ _filterSets = [
];
_icons = [
"\ca\ui\data\igui_buyUnit_filter_1_ca.paa",
"\ca\ui\data\igui_buyUnit_filter_2_ca.paa",
"\ca\ui\data\igui_buyUnit_filter_3_ca.paa",
"\ca\ui\data\igui_buyUnit_filter_4_ca.paa",
"\ca\ui\data\igui_buyUnit_filter_5_ca.paa"
"\ca\ui\data\igui_buyUnit_filter_1_ca.paa",
"\ca\ui\data\igui_buyUnit_filter_2_ca.paa",
"\ca\ui\data\igui_buyUnit_filter_3_ca.paa",
"\ca\ui\data\igui_buyUnit_filter_4_ca.paa",
"\ca\ui\data\igui_buyUnit_filter_5_ca.paa"
];
_event = _this select 1;
@@ -39,6 +41,7 @@ _data = _this select 0;
//diag_log [diag_ticktime, __FILE__, _this];
_display = nil;
/*-------------------------------------------*/
if (typeName(_data select 0) == "DISPLAY") then {
_display = (_data select 0);
@@ -49,6 +52,7 @@ if (typeName(_data select 0) == "CONTROL") then {
_display = ctrlParent _control;
};
/*-------------------------------------------*/
_lbSelectedItem = {
private ["_index","_selectedItem","_n"];
@@ -67,7 +71,7 @@ _lbSelectedItem = {
};
_arrowsEnable = {
private ["_index","_selectedItemCountLeft"];
private ["_index"];
_lbcontrol = _display displayctrl _lbIDC;
@@ -93,7 +97,6 @@ _isMagazine = {
_return
};
_IDCsArray = [
[107],
[121],
@@ -118,8 +121,6 @@ _IDCsArray = [
[107],
[107]
];
/*
_showAllIDCs = {
private ["_slotArray","_j","_i"];
@@ -128,37 +129,37 @@ _showAllIDCs = {
for [{_j=0},{_j<count(_slotArray)}, {_j = _j + 1} ] do {
_primaryWeaponControl = _display displayctrl (_slotArray select _j);
_primaryWeaponControl ctrlSetFade 0.5;
_primaryWeaponControl ctrlCommit 0.0;
//_primaryWeaponControl ctrlSetFade 0.5;
//_primaryWeaponControl ctrlCommit 0.0;
};
};
};
*/
_higlightIDCs = {
private ["_slotArray","_j","_i"];
for [{_i=0},{_i<count(_IDCsArray)}, {_i = _i + 1} ] do {
_slotArray = _IDCsArray select _i;
private ["_slotArray","_j","_i"];
for [{_i=0},{_i<count(_IDCsArray)}, {_i = _i + 1} ] do {
_slotArray = _IDCsArray select _i;
for [{_j=0},{_j<count(_slotArray)}, {_j = _j + 1} ] do {
if (_selectedItemSlotIDCs find (_slotArray select _j)>-1 ) then {
_itemSlot = _display displayctrl (_slotArray select _j);
//_itemSlot ctrlSetFade 0.0;
//_itemSlot ctrlCommit 0.3;
} else {
_itemSlot = _display displayctrl (_slotArray select _j);
//_itemSlot ctrlSetFade 0.5;
//_itemSlot ctrlCommit 0.3;
for [{_j=0},{_j<count(_slotArray)}, {_j = _j + 1} ] do {
if (_selectedItemSlotIDCs find (_slotArray select _j)>-1 ) then {
_itemSlot = _display displayctrl (_slotArray select _j);
//_itemSlot ctrlSetFade 0.0;
//_itemSlot ctrlCommit 0.3;
} else {
_itemSlot = _display displayctrl (_slotArray select _j);
//_itemSlot ctrlSetFade 0.5;
//_itemSlot ctrlCommit 0.3;
};
};
};
};
/* for [{_i=0},{_i<count(_selectedItemSlotIDCs)}, {_i = _i + 1} ] do
{
_slotControl = _display displayctrl (_selectedItemSlotIDCs select _i);
_slotControl ctrlSetFade 0;
_slotControl ctrlCommit 0.3;
}; */
/*
for [{_i=0},{_i<count(_selectedItemSlotIDCs)}, {_i = _i + 1} ] do {
_slotControl = _display displayctrl (_selectedItemSlotIDCs select _i);
_slotControl ctrlSetFade 0;
_slotControl ctrlCommit 0.3;
};
*/
};
_returnSlotIDCs = {
_flags = (_this select 0);
@@ -180,24 +181,17 @@ _returnSlotIDCs = {
};
/*
_isPrimaryWeapon = {
_flags = (_this select 0);
if ( (_flags select 0) == 1) then {
true;
} else {
false;
};
_flags = (_this select 0);
(_flags select 0) == 1
};
_isSecondaryWeapon = {
_flags = (_this select 0);
if ( (_flags select 0) == 1) then {
true;
} else {
false;
};
_flags = (_this select 0);
(_flags select 0) == 1
};
*/
_itemSlot = {
private ["_item", "_return"];
_item = _this select 0;
@@ -215,9 +209,11 @@ _itemSlot = {
};
_highlightIDCs = {
_hlIDCs = _this select 0;
//for [{_i=0},{_i<count(_hlIDCs)}, {_i = _i + 1} ] do {
//};
_hlIDCs = _this select 0;
/*
for [{_i=0},{_i<count(_hlIDCs)}, {_i = _i + 1} ] do {
// what is it????
};*/
};
_returnBitArray = {
@@ -251,16 +247,16 @@ _highlightGearSlots ={
};
/*
_weaponsLBSetFocus = {
_lbcontrol = _display displayctrl _lbIDC;
/** Temporary disabled to prevent bug news:hov5k4$f6f$1@new-server.localdomain **/
//ctrlSetFocus _lbcontrol;
}; */
_lbcontrol = _display displayctrl _lbIDC;
//Temporary disabled to prevent bug news:hov5k4$f6f$1@new-server.localdomain
//ctrlSetFocus _lbcontrol;
};*/
_setFilterIcon = {
_ctrlIcon = _display displayctrl 148;
_ctrlIcon ctrlSetText (_icons select IGUI_GEAR_activeFilter);
};
_keyActions = {
_keyLeft = [203,327700,327686];
_keyRight = [205,327696,327687];
@@ -288,6 +284,7 @@ _keyActions = {
};*/
};
//_bitArray = [0,0,0,0,0 ,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
/*
#define WeaponNoSlot 0 // dummy weapons
@@ -323,7 +320,6 @@ _highlightFilterIcons = {
_control ctrlSetTextColor [1,1,1,1];
};
_matchesFilter = {
private ["_itemValue","_itemBitArray"];
_output = false;
@@ -411,7 +407,7 @@ _itemPicture = {
};
_itemDescription = {
private ["_inputItem","_return"];
private ["_inputItem","_return"];
_inputItem = _this select 0;
_return = "";
@@ -484,23 +480,23 @@ _updateOnBack = {
_output = true;
_lbIDC = 105;
switch _event do {
case "initDialog": {
//[] call _showAllIDCs;
};
case "onLoad": {
//[] call _weaponsLBSetFocus;
[] call _arrowsEnable;
[] call _displayItemIcon;
[] call _displayItemName;
[] call _displayItemDescription;
//[] call _showAllIDCs;
//[] call _arrowsEnable;
//[] call _highlightGearSlots;
};
//used for buyUnits
case "initDialog": {
//[] call _showAllIDCs;
};
case "onLoad": {
//[] call _weaponsLBSetFocus;
[] call _arrowsEnable;
[] call _displayItemIcon;
[] call _displayItemName;
[] call _displayItemDescription;
//[] call _showAllIDCs;
//[] call _arrowsEnable;
//[] call _highlightGearSlots;
};
//used for buyUnits
case "filter": {
IGUI_GEAR_activeFilter = IGUI_GEAR_activeFilter + 1;
@@ -511,7 +507,7 @@ switch _event do {
_doFilter = true;
};
//changing IGUI_GEAR_activeFilter, but not filter picture (used for buyGear)
//changing IGUI_GEAR_activeFilter, but not filter picture (used for buyGear)
case "filterNotSet": {
IGUI_GEAR_activeFilter = IGUI_GEAR_activeFilter + 1;
@@ -521,7 +517,7 @@ switch _event do {
//_doFilter = true;
};
case "filter_left": {
IGUI_GEAR_activeFilter = IGUI_GEAR_activeFilter - 1;
@@ -531,35 +527,37 @@ switch _event do {
_doFilter = true;
};
case "onFocus": {
//[] call _weaponsLBSetFocus;
//[] call _arrowsEnable;
};
case "onKeyDown": {
[] call _keyActions;
};
case "onLBSelChanged": {
[] call _displayItemIcon;
[] call _displayItemName;
[] call _displayItemDescription;
//[] call _arrowsEnable;
[] call _highlightGearSlots;
};
case "onKillFocus": {
//[] call _weaponsLBSetFocus;
};
default {};
case "onFocus": {
//[] call _weaponsLBSetFocus;
//[] call _arrowsEnable;
};
case "onKeyDown": {
[] call _keyActions;
};
case "onLBSelChanged": {
[] call _updateOnBack;
[] call _displayItemIcon;
[] call _displayItemName;
[] call _displayItemDescription;
//[] call _arrowsEnable;
[] call _highlightGearSlots;
};
case "onKillFocus": {
//[] call _weaponsLBSetFocus;
};
default {};
};
/* Filter removed, moving to engine */
if _doFilter then {
(_filterSets select IGUI_GEAR_activeFilter) call _setFilterGlobals;
// [] call _filterItems;
// [] call _setFilterIcon;
(_filterSets select IGUI_GEAR_activeFilter) call _setFilterGlobals;
//[] call _filterItems;
//[] call _setFilterIcon;
};
_output;
_output

View File

@@ -1,7 +0,0 @@
/*if (isServer) then {
waitUntil{dayz_preloadFinished};
};
_id = [] execFSM "\z\addons\dayz_code\system\player_monitor.fsm";*/
if (DZE_R3F_WEIGHT) then {
_void = [] execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";
};

View File

@@ -1,83 +0,0 @@
// moved to dayz_code/system/scheduler/sched_playerActions.sqf
// moved to dayz_code/system/scheduler/sched_spawncheck.sqf
// moved to dayz_code/system/scheduler/sched_newDay.sqf
/*
private ["_handle","_cursor","_delMe","_first","_town","_day","_world","_nearestCity"];
_timer = diag_tickTime;
_timer1 = diag_tickTime;
_spawnCheck = diag_tickTime;
_timer2 = diag_Ticktime;
_NewDay = diag_tickTime;
while {true} do {
//add player actions
if ((diag_tickTime - _timer2) > 0.5) then {
[] call fnc_usec_damageActions;
[] call fnc_usec_selfActions;
_timer2 = diag_Ticktime;
};
if ((diag_tickTime - _timer) > 300) then {
//Other Counters
dayz_currentGlobalAnimals = count entities "CAAnimalBase";
dayz_currentGlobalZombies = count entities "zZombie_Base";
//Animals
[] spawn player_animalCheck;
_timer = diag_tickTime;
};
if ((diag_tickTime - _timer1) > 60) then {
_position = [player] call FNC_GetPos;
//Current amounts
dayz_spawnZombies = {alive _x AND local _x} count (_position nearEntities ["zZombie_Base",200]);
dayz_CurrentNearByZombies = {alive _x} count (_position nearEntities ["zZombie_Base",200]);
dayz_currentWeaponHolders = count (_position nearObjects ["ReammoBox",100]);
_timer1 = diag_tickTime;
};
//spawning system
if ((diag_tickTime - _spawnCheck) > 14) then {
["both"] spawn player_spawnCheck;
_spawnCheck = diag_tickTime;
};
//Check if new day
if ((diag_tickTime - _NewDay) > 5) then {
private "_day";
_day = round(360 * (dateToNumber date));
if(dayz_currentDay != _day) then {
dayz_sunRise = call world_sunRise;
dayz_currentDay = _day;
};
_NewDay = diag_tickTime;
_world = toUpper(worldName); //toUpper(getText (configFile >> "CfgWorlds" >> (worldName) >> "description"));
_nearestCity = nearestLocations [([player] call FNC_GetPos), ["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
uiSleep 0.001;
};
*/

View File

@@ -5,6 +5,7 @@ _messTimer = 0;
_lastTemp = dayz_temperatur;
_debug = getMarkerpos "respawn_west";
_isPZombie = player isKindOf "PZombie_VB";
_radTimer = 0;
_timer = diag_tickTime;
_timer1 = diag_tickTime;
@@ -16,16 +17,12 @@ _timer30 = diag_Ticktime;
_timer150 = diag_ticktime;
_forceHumanity = false;
_runonce = false;
_timerMonitor = diag_ticktime;
player setVariable ["temperature",dayz_temperatur,true];
player setVariable["friendlies",DZE_Friends,true];
dayz_myLoad = (((count dayz_myBackpackMags) * 0.2) + (count dayz_myBackpackWpns)) + (((count dayz_myMagazines) * 0.1) + (count dayz_myWeapons * 0.5));
[player,0] call player_humanityChange;
//player addMagazine "Hatchet_swing";
@@ -36,8 +33,6 @@ while {1 == 1} do {
//Initialize
_refObj = vehicle player;
_factor = 0.6;
_inVehicle = (_refObj != player);
_size = (sizeOf typeOf _refObj) * 0.6;
_vel = velocity player;
_speed = round((_vel distance [0,0,0]) * 3.5);
@@ -48,7 +43,7 @@ while {1 == 1} do {
player setUnitRank "PRIVATE";
};
dayz_myLoad = (((count dayz_myBackpackMags) * 0.2) + (count dayz_myBackpackWpns)) + (((count dayz_myMagazines) * 0.1) + (count dayz_myWeapons * 0.5));
dayz_myLoad = (((count dayz_myBackpackMags) * 0.2) + (count dayz_myBackpackWpns)) + (((count dayz_myMagazines) * 0.1) + (count dayz_myWeapons * 0.5));
//reset position
_randomSpot = true;
@@ -168,7 +163,7 @@ dayz_myLoad = (((count dayz_myBackpackMags) * 0.2) + (count dayz_myBackpackWpns)
if (diag_ticktime - dayz_panicCooldown < 120) then {
_hunger = _hunger * 2;
};
dayz_hunger = dayz_hunger + (_hunger / 60); //60 Updated to 80
dayz_hunger = dayz_hunger + (_hunger / 70); //60 Updated to 80
dayz_hunger = (dayz_hunger min SleepFood) max 0;
if (dayz_hunger >= SleepFood) then {
@@ -182,10 +177,7 @@ dayz_myLoad = (((count dayz_myBackpackMags) * 0.2) + (count dayz_myBackpackWpns)
if (_refObj == player) then {
_thirst = (_speed + 4) * 3;
};
if (!_inVehicle) then {
_thirst = (_speed + 4) * 3;
};
dayz_thirst = dayz_thirst + (_thirst / 85) * (dayz_temperatur / dayz_temperaturnormal); //TeeChange Temperatur effects added Max Effects: -25% and + 16.6% waterloss
dayz_thirst = dayz_thirst + (_thirst / 60) * (dayz_temperatur / dayz_temperaturnormal); //TeeChange Temperatur effects added Max Effects: -25% and + 16.6% waterloss
dayz_thirst = (dayz_thirst min SleepWater) max 0;
if (dayz_thirst >= SleepWater) then {
@@ -225,7 +217,7 @@ dayz_myLoad = (((count dayz_myBackpackMags) * 0.2) + (count dayz_myBackpackWpns)
// Infectionriskstart
if (dayz_temperatur < ((80 / 100) * (dayz_temperaturnormal - dayz_temperaturmin) + dayz_temperaturmin)) then { //TeeChange
private "_listTalk";
_listTalk = _mylastPos nearEntities ["CAManBase",8]; //
_listTalk = _mylastPos nearEntities ["CAManBase",12];
{
if (_x getVariable["USEC_infected",false]) then {
_rnd = (random 1) * (((dayz_temperaturnormal - dayz_temperatur) * (100 /(dayz_temperaturnormal - dayz_temperaturmin)))/ 50); //TeeChange
@@ -267,15 +259,15 @@ dayz_myLoad = (((count dayz_myBackpackMags) * 0.2) + (count dayz_myBackpackWpns)
_radsound = "radzone1";
_bloodloss = 10;
if(_radTimer > 5 && _radTimer < 10) then {
if (_radTimer > 5 && _radTimer < 10) then {
_radsound = "radzone2";
_bloodloss = 20;
};
if(_radTimer > 10) then {
if (_radTimer > 10) then {
_radsound = "radzone3";
_bloodloss = 30;
};
if(_radTimer > 15) then {
if (_radTimer > 15) then {
_radsound = "radzone4";
_bloodloss = 50;
};

View File

@@ -1,2 +0,0 @@
//waitUntil{!isnil "bis_fnc_init"};
//execVM "\z\addons\dayz_server\system\server_monitor.sqf";