From f06a6fb540f432202f20438cacf37ba2c2bf048f Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 10 Feb 2014 09:37:18 -0600 Subject: [PATCH 01/11] unused --- SQF/dayz_code/medical/load_wounded.sqf | 53 -------------------------- 1 file changed, 53 deletions(-) delete mode 100644 SQF/dayz_code/medical/load_wounded.sqf diff --git a/SQF/dayz_code/medical/load_wounded.sqf b/SQF/dayz_code/medical/load_wounded.sqf deleted file mode 100644 index 32c16666b..000000000 --- a/SQF/dayz_code/medical/load_wounded.sqf +++ /dev/null @@ -1,53 +0,0 @@ -// Load_wounded.sqf -// OCTOBER 2010 - norrin - -private ["_wounded","_vcl"]; - -_wounded = _this select 0; - -//if (!local _wounded) exitWith {}; - -r_action = false; - -sleep 1; -_vcl = _wounded getVariable "NORRN_loadVcl"; -_wounded setVariable ["NORRN_unit_dragged", true, true]; - -_wounded assignAsCargo _vcl; -_wounded moveInCargo _vcl; -sleep 1; -//["norrnRALW",_wounded] call broadcastRpcCallAll; - norrnRALW = [_wounded]; - publicVariable "norrnRALW"; - -if (local _wounded) then -{ - waitUntil {!(_wounded getVariable "NORRN_unconscious")|| !alive _wounded || vehicle _wounded == _wounded || (assignedVehicleRole _wounded) select 0 != "Cargo"}; - - if (vehicle _wounded == _wounded || (assignedVehicleRole _wounded) select 0 != "Cargo") exitWith - { - if (_wounded getVariable "NORRN_AIunconscious") then - { - if (vehicle _wounded != _wounded) then - { - unassignVehicle _wounded; - sleep 0.05; - _wounded action ["EJECT", _vcl]; - sleep 1; - }; - //DayZ CE: PublicVariables are removed in DayZ CE -> Could we also do here - Commit by Skaronator - norrinRAlie = _wounded; - publicVariable "norrinRAlie"; - _wounded switchMove "ainjppnemstpsnonwrfldnon"; - _wounded setVariable ["NORRN_unit_dragged", false, true]; - sleep 1; - }; - }; - - if (vehicle _wounded != _wounded && alive _wounded) then - { - _wounded playMove "BasicDriver"; - }; -}; -sleep 0.01; - From a93286033d71a1ccefaeccb983bd37494a2e108f Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 10 Feb 2014 10:55:43 -0600 Subject: [PATCH 02/11] fixes #1084 --- .../CfgMagazines/DZE/ItemWaterbottle.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp index 54e90d91f..ce435df5b 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp @@ -1,7 +1,7 @@ class ItemWaterbottle1oz : ItemWaterbottle { displayName = "Water Bottle (1oz)"; descriptionShort = "Watter Bottle with 1oz of water"; - picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle1oz_ca.paa"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_1oz_ca.paa"; wateroz = 1; class ItemActions { class Fill { @@ -13,7 +13,7 @@ class ItemWaterbottle1oz : ItemWaterbottle { class ItemWaterbottle2oz : ItemWaterbottle { displayName = "Water Bottle (2oz)"; descriptionShort = "Watter Bottle with 2oz of water"; - picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle2oz_ca.paa"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_2oz_ca.paa"; wateroz = 2; class ItemActions { class Fill { @@ -25,7 +25,7 @@ class ItemWaterbottle2oz : ItemWaterbottle { class ItemWaterbottle3oz : ItemWaterbottle { displayName = "Water Bottle (3oz)"; descriptionShort = "Watter Bottle with 3oz of water"; - picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle3oz_ca.paa"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_3oz_ca.paa"; wateroz = 3; class ItemActions { class Fill { @@ -37,7 +37,7 @@ class ItemWaterbottle3oz : ItemWaterbottle { class ItemWaterbottle4oz : ItemWaterbottle { displayName = "Water Bottle (4oz)"; descriptionShort = "Watter Bottle with 4oz of water"; - picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle4oz_ca.paa"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_4oz_ca.paa"; wateroz = 4; class ItemActions { class Fill { @@ -49,7 +49,7 @@ class ItemWaterbottle4oz : ItemWaterbottle { class ItemWaterbottle5oz : ItemWaterbottle { displayName = "Water Bottle (5oz)"; descriptionShort = "Watter Bottle with 5oz of water"; - picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle5oz_ca.paa"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_5oz_ca.paa"; wateroz = 5; class ItemActions { class Fill { @@ -61,7 +61,7 @@ class ItemWaterbottle5oz : ItemWaterbottle { class ItemWaterbottle6oz : ItemWaterbottle { displayName = "Water Bottle (6oz)"; descriptionShort = "Watter Bottle with 6oz of water"; - picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle6oz_ca.paa"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_6oz_ca.paa"; wateroz = 6; class ItemActions { class Fill { @@ -73,7 +73,7 @@ class ItemWaterbottle6oz : ItemWaterbottle { class ItemWaterbottle7oz : ItemWaterbottle { displayName = "Water Bottle (7oz)"; descriptionShort = "Watter Bottle with 7oz of water"; - picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle7oz_ca.paa"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_7oz_ca.paa"; wateroz = 7; class ItemActions { class Fill { @@ -85,7 +85,7 @@ class ItemWaterbottle7oz : ItemWaterbottle { class ItemWaterbottle8oz : ItemWaterbottle { displayName = "Water Bottle (8oz)"; descriptionShort = "Watter Bottle with 8oz of water"; - picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle8oz_ca.paa"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_8oz_ca.paa"; wateroz = 8; class ItemActions { class Fill { @@ -97,7 +97,7 @@ class ItemWaterbottle8oz : ItemWaterbottle { class ItemWaterbottle9oz : ItemWaterbottle { displayName = "Water Bottle (9oz)"; descriptionShort = "Watter Bottle with 9oz of water"; - picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle9oz_ca.paa"; + picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_9oz_ca.paa"; wateroz = 9; class ItemActions { class Fill { From 8f78dd9ba7275fc120c046794d8c4383cf19aefb Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 10 Feb 2014 10:58:26 -0600 Subject: [PATCH 03/11] Update CHANGE LOG 1.0.4.2.txt --- CHANGE LOG 1.0.4.2.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGE LOG 1.0.4.2.txt b/CHANGE LOG 1.0.4.2.txt index 3c4aba61b..7941b175a 100644 --- a/CHANGE LOG 1.0.4.2.txt +++ b/CHANGE LOG 1.0.4.2.txt @@ -1,5 +1,6 @@ [ADDED] BTR90 HQ ride in back option. @Fank +[FIXED] Incremental water bottle had a typo in the picture path. fixes: https://github.com/vbawol/DayZ-Epoch/issues/1084 vbawol@ [FIXED] second attempt at fixing kill messages from vehicles. @icomrade [FIXED] remove setdamage 0 on godmode base objects so they can be maintained. @vbawol [FIXED] Fix server startup issues when using "CA folder fix" on some A2 and A2 free installs. @icomrade From 46812d8ded2fa663c82ca08ecc2bdf38459dde97 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 10 Feb 2014 11:09:46 -0600 Subject: [PATCH 04/11] Trade counter was incorrectly returning number of output items --- SQF/dayz_code/actions/player_craftItem.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/actions/player_craftItem.sqf b/SQF/dayz_code/actions/player_craftItem.sqf index 2a5626221..b14c417fd 100644 --- a/SQF/dayz_code/actions/player_craftItem.sqf +++ b/SQF/dayz_code/actions/player_craftItem.sqf @@ -218,8 +218,6 @@ if (_canDo) then { player addMagazine _itemOut; }; - _tradeComplete = _tradeComplete+1; - _textCreate = getText(configFile >> "CfgMagazines" >> _itemOut >> "displayName"); // Add crafted item @@ -228,6 +226,8 @@ if (_canDo) then { sleep 1; } forEach _selectedRecipeOutput; + + _tradeComplete = _tradeComplete+1; }; } else { From c76830da937becfb3928063a36e9728b0c6712d1 Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 10 Feb 2014 11:12:16 -0600 Subject: [PATCH 05/11] Update CHANGE LOG 1.0.4.2.txt --- CHANGE LOG 1.0.4.2.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGE LOG 1.0.4.2.txt b/CHANGE LOG 1.0.4.2.txt index 7941b175a..cd7f28a25 100644 --- a/CHANGE LOG 1.0.4.2.txt +++ b/CHANGE LOG 1.0.4.2.txt @@ -1,8 +1,9 @@ [ADDED] BTR90 HQ ride in back option. @Fank +[FIXED] Completed trade counter was incorrectly returning output count instead of actual number of trades. @vbawol [FIXED] Incremental water bottle had a typo in the picture path. fixes: https://github.com/vbawol/DayZ-Epoch/issues/1084 vbawol@ [FIXED] second attempt at fixing kill messages from vehicles. @icomrade -[FIXED] remove setdamage 0 on godmode base objects so they can be maintained. @vbawol +[FIXED] remove setdamage 0 on godmode/indestructible base objects so they can be maintained. @vbawol [FIXED] Fix server startup issues when using "CA folder fix" on some A2 and A2 free installs. @icomrade [FIXED] Fixed error in expression when removing buildings. @Fank [FIXED] Was possible to fill a mixed gas with an empty jerry can. @Fank From 126eafb590b09b0f250403729746d2935cf78351 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 10 Feb 2014 11:14:54 -0600 Subject: [PATCH 06/11] change log typo --- CHANGE LOG 1.0.4.2.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGE LOG 1.0.4.2.txt b/CHANGE LOG 1.0.4.2.txt index cd7f28a25..2a8d219f0 100644 --- a/CHANGE LOG 1.0.4.2.txt +++ b/CHANGE LOG 1.0.4.2.txt @@ -1,7 +1,7 @@ [ADDED] BTR90 HQ ride in back option. @Fank [FIXED] Completed trade counter was incorrectly returning output count instead of actual number of trades. @vbawol -[FIXED] Incremental water bottle had a typo in the picture path. fixes: https://github.com/vbawol/DayZ-Epoch/issues/1084 vbawol@ +[FIXED] Incremental water bottle had a typo in the picture path. fixes: https://github.com/vbawol/DayZ-Epoch/issues/1084 @vbawol [FIXED] second attempt at fixing kill messages from vehicles. @icomrade [FIXED] remove setdamage 0 on godmode/indestructible base objects so they can be maintained. @vbawol [FIXED] Fix server startup issues when using "CA folder fix" on some A2 and A2 free installs. @icomrade From 46dae90e9c2fbb57f65520e6ec9ebbf92040db72 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 10 Feb 2014 11:16:50 -0600 Subject: [PATCH 07/11] version bump to 1.0.4.2 --- SQF/dayz_code/Configs/rscTitles.hpp | 2 +- SQF/dayz_code/config.cpp | 2 +- SQF/mod.cpp | 2 +- Server Files/Config-Examples/instance_11_Chernarus/config.cfg | 2 +- Server Files/Config-Examples/instance_12_duala/config.cfg | 2 +- Server Files/Config-Examples/instance_13_tavi/config.cfg | 2 +- Server Files/Config-Examples/instance_15_namalsk/config.cfg | 2 +- Server Files/Config-Examples/instance_16_panthera/config.cfg | 2 +- Server Files/Config-Examples/instance_18_sahrani/config.cfg | 2 +- Server Files/Config-Examples/instance_19_poda/config.cfg | 2 +- Server Files/Config-Examples/instance_1_takistan/config.cfg | 2 +- Server Files/Config-Examples/instance_20_fapovo/config.cfg | 2 +- Server Files/Config-Examples/instance_21_caribou/config.cfg | 2 +- Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg | 2 +- Server Files/Config-Examples/instance_24_Napf/config.cfg | 2 +- Server Files/Config-Examples/instance_25_sauerland/config.cfg | 2 +- Server Files/Config-Examples/instance_2_utes/config.cfg | 2 +- Server Files/Config-Examples/instance_3_shapur_baf/config.cfg | 2 +- Server Files/Config-Examples/instance_4_zargabad/config.cfg | 2 +- Server Files/Config-Examples/instance_6_Dingor/config.cfg | 2 +- Server Files/Config-Examples/instance_7_Lingor/config.cfg | 2 +- .../Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index 0824b4fb0..d55866fc9 100644 --- a/SQF/dayz_code/Configs/rscTitles.hpp +++ b/SQF/dayz_code/Configs/rscTitles.hpp @@ -166,7 +166,7 @@ class RscDisplayMain : RscStandardDisplay class DAYZ_Version : CA_Version { idc = -1; - text = "DayZ Epoch 1.0.4.1"; + text = "DayZ Epoch 1.0.4.2"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; }; delete CA_TitleMainMenu; diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index 317ccddb5..19770ba23 100644 --- a/SQF/dayz_code/config.cpp +++ b/SQF/dayz_code/config.cpp @@ -41,7 +41,7 @@ class CfgMods hidePicture = 0; hideName = 0; action = "http://www.dayzepoch.com"; - version = "1.0.4.1"; + version = "1.0.4.2"; hiveVersion = 0.96; //0.93 }; }; diff --git a/SQF/mod.cpp b/SQF/mod.cpp index 84ab3a079..465b41784 100644 --- a/SQF/mod.cpp +++ b/SQF/mod.cpp @@ -1,5 +1,5 @@ dir = "@DayZ_Epoch"; -name = "DayZ Epoch 1.0.4.1"; +name = "DayZ Epoch 1.0.4.2"; actionName = "Website"; picture = "dayz_logo_ca.paa"; action = "http://www.dayzepoch.com"; \ No newline at end of file diff --git a/Server Files/Config-Examples/instance_11_Chernarus/config.cfg b/Server Files/Config-Examples/instance_11_Chernarus/config.cfg index 618bba2d7..e93466586 100644 --- a/Server Files/Config-Examples/instance_11_Chernarus/config.cfg +++ b/Server Files/Config-Examples/instance_11_Chernarus/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Chernarus Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Chernarus Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_12_duala/config.cfg b/Server Files/Config-Examples/instance_12_duala/config.cfg index 0cdaa0880..2e68b696f 100644 --- a/Server Files/Config-Examples/instance_12_duala/config.cfg +++ b/Server Files/Config-Examples/instance_12_duala/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Isla Duala Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Isla Duala Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_13_tavi/config.cfg b/Server Files/Config-Examples/instance_13_tavi/config.cfg index 57a61e316..95af924ac 100644 --- a/Server Files/Config-Examples/instance_13_tavi/config.cfg +++ b/Server Files/Config-Examples/instance_13_tavi/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Taviana Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Taviana Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_15_namalsk/config.cfg b/Server Files/Config-Examples/instance_15_namalsk/config.cfg index b5eed0b50..9bada391d 100644 --- a/Server Files/Config-Examples/instance_15_namalsk/config.cfg +++ b/Server Files/Config-Examples/instance_15_namalsk/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Namalsk Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Namalsk Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_16_panthera/config.cfg b/Server Files/Config-Examples/instance_16_panthera/config.cfg index 4f495fd07..115bdeced 100644 --- a/Server Files/Config-Examples/instance_16_panthera/config.cfg +++ b/Server Files/Config-Examples/instance_16_panthera/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Panthera Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Panthera Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_18_sahrani/config.cfg b/Server Files/Config-Examples/instance_18_sahrani/config.cfg index 943e7d91e..744d358fa 100644 --- a/Server Files/Config-Examples/instance_18_sahrani/config.cfg +++ b/Server Files/Config-Examples/instance_18_sahrani/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Sahrani Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Sahrani Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_19_poda/config.cfg b/Server Files/Config-Examples/instance_19_poda/config.cfg index 461b83e18..7185ee847 100644 --- a/Server Files/Config-Examples/instance_19_poda/config.cfg +++ b/Server Files/Config-Examples/instance_19_poda/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Podagorsk Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Podagorsk Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_1_takistan/config.cfg b/Server Files/Config-Examples/instance_1_takistan/config.cfg index 4847b61a8..c325c75e5 100644 --- a/Server Files/Config-Examples/instance_1_takistan/config.cfg +++ b/Server Files/Config-Examples/instance_1_takistan/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Takistan Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Takistan Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_20_fapovo/config.cfg b/Server Files/Config-Examples/instance_20_fapovo/config.cfg index 83191e7e7..6af99a59a 100644 --- a/Server Files/Config-Examples/instance_20_fapovo/config.cfg +++ b/Server Files/Config-Examples/instance_20_fapovo/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Fapovo Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Fapovo Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_21_caribou/config.cfg b/Server Files/Config-Examples/instance_21_caribou/config.cfg index 0ad80c592..ec2123c12 100644 --- a/Server Files/Config-Examples/instance_21_caribou/config.cfg +++ b/Server Files/Config-Examples/instance_21_caribou/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Caribou Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Caribou Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg b/Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg index 40e7daa9f..f859e537d 100644 --- a/Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg +++ b/Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch SMD Sahrani Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch SMD Sahrani Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_24_Napf/config.cfg b/Server Files/Config-Examples/instance_24_Napf/config.cfg index 129a004ec..3f6869c02 100644 --- a/Server Files/Config-Examples/instance_24_Napf/config.cfg +++ b/Server Files/Config-Examples/instance_24_Napf/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Napf Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Napf Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_25_sauerland/config.cfg b/Server Files/Config-Examples/instance_25_sauerland/config.cfg index 46402f1c4..dfb7d9265 100644 --- a/Server Files/Config-Examples/instance_25_sauerland/config.cfg +++ b/Server Files/Config-Examples/instance_25_sauerland/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Sauerland Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Sauerland Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_2_utes/config.cfg b/Server Files/Config-Examples/instance_2_utes/config.cfg index 36617091c..b0f99310e 100644 --- a/Server Files/Config-Examples/instance_2_utes/config.cfg +++ b/Server Files/Config-Examples/instance_2_utes/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Utes Server (1.0.4.1/103718/No Traders)"; +hostName = "DayZ Epoch Utes Server (1.0.4.2/103718/No Traders)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_3_shapur_baf/config.cfg b/Server Files/Config-Examples/instance_3_shapur_baf/config.cfg index ce3c52629..425584f9f 100644 --- a/Server Files/Config-Examples/instance_3_shapur_baf/config.cfg +++ b/Server Files/Config-Examples/instance_3_shapur_baf/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Shapur BAF Server (1.0.4.1/103718/No Traders)"; +hostName = "DayZ Epoch Shapur BAF Server (1.0.4.2/103718/No Traders)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 24; diff --git a/Server Files/Config-Examples/instance_4_zargabad/config.cfg b/Server Files/Config-Examples/instance_4_zargabad/config.cfg index 528d6bec5..2b1ab39eb 100644 --- a/Server Files/Config-Examples/instance_4_zargabad/config.cfg +++ b/Server Files/Config-Examples/instance_4_zargabad/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Zargabad Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Zargabad Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_6_Dingor/config.cfg b/Server Files/Config-Examples/instance_6_Dingor/config.cfg index c50e627be..a8a5d74e9 100644 --- a/Server Files/Config-Examples/instance_6_Dingor/config.cfg +++ b/Server Files/Config-Examples/instance_6_Dingor/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Dingor Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Dingor Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_7_Lingor/config.cfg b/Server Files/Config-Examples/instance_7_Lingor/config.cfg index 25c03f99e..398bc88bb 100644 --- a/Server Files/Config-Examples/instance_7_Lingor/config.cfg +++ b/Server Files/Config-Examples/instance_7_Lingor/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Lingor Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch Lingor Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg b/Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg index d41c64e18..536057352 100644 --- a/Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg +++ b/Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.4.1/103718)"; +hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.4.2/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; From 2d9d5feaa8494ed6cd592654dab6a37afd8b8c19 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 10 Feb 2014 14:09:27 -0600 Subject: [PATCH 08/11] Not sure why this was removed @infiStar any reason this was removed? --- Server Files/Battleye/scripts.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Server Files/Battleye/scripts.txt b/Server Files/Battleye/scripts.txt index 81a3d3304..09fb291b7 100644 --- a/Server Files/Battleye/scripts.txt +++ b/Server Files/Battleye/scripts.txt @@ -1,4 +1,5 @@ //new +5 "setDamage" !"player setdamage 0;" !"player setDamage 1;" !"_vehicle setDamage 0; "!"if("""" == typeOf _tree) then {\n_tree setDamage 1;\n};" !"if("""" == typeOf _tree) then {\n_tree setDamage 0.99;\n};" !"if (_ent isKindOf ""Animal"") then {\n_ent setDamage 1;\n" !"if (_ent isKindOf ""Animal"" or _isZombie) then {\n_ent setDamage 1;" 1 "addBackpackCargoGlobal" !"_holder addbackpackcargoGlobal \[_x,\(_objWpnQty select _countr\)\];" 1 HelicopterExplo !"_expl=createVehicle \[\"HelicopterExploSmall\",\(getPosATL _v\),\[\],0,\"CAN_COLLIDE\"\];" 5 "Logic" !"\"Logic\" createVehicleLocal" !"sideLogic" !"BIS_MPF_clientJIPlogic" !"_humanity_logic" From b8f2796fa3305da2ebb54ba3d1ee1508caac910c Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 10 Feb 2014 14:41:47 -0600 Subject: [PATCH 09/11] cleanup --- SQF/dayz_code/compile/fn_damageActions.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/SQF/dayz_code/compile/fn_damageActions.sqf b/SQF/dayz_code/compile/fn_damageActions.sqf index 6e5d7d480..f84777c3a 100644 --- a/SQF/dayz_code/compile/fn_damageActions.sqf +++ b/SQF/dayz_code/compile/fn_damageActions.sqf @@ -95,7 +95,6 @@ if (!isNull _menClose and _hasPatient and !r_drag_sqf and !r_action and !_inVehi //Allow player to bandage if(_injured and _hasBandage) then { r_action = true; - //_unit setdamage 0.8; _action = _unit addAction [localize "str_actions_medical_04", "\z\addons\dayz_code\medical\bandage.sqf",[_unit], 0, true, true, "", ""]; r_player_actions set [count r_player_actions,_action]; }; From fc1829800c7ead2a9cd48ee54cb6baecc2f72783 Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Mon, 10 Feb 2014 22:45:41 +0100 Subject: [PATCH 10/11] Fixed typo --- SQF/dayz_code/actions/trade_any_vehicle_free.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf index 59b434826..850c99d31 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf @@ -136,8 +136,8 @@ if (_finished) then { _location = (getPosATL _veh); - //["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,0]] call callRpcProcedure; - PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,0,_activatingPlayer]; + //["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,true,0]] call callRpcProcedure; + PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,true,0,_activatingPlayer]; publicVariableServer "PVDZE_veh_Publish2"; }; From 7f79bc7bc32879d915320d8903e1a64235505f7c Mon Sep 17 00:00:00 2001 From: icomrade Date: Tue, 11 Feb 2014 00:39:26 -0500 Subject: [PATCH 11/11] Undefined Variable Cleanup --- SQF/dayz_code/compile/player_death.sqf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf index 6aab7d597..04a161bb4 100644 --- a/SQF/dayz_code/compile/player_death.sqf +++ b/SQF/dayz_code/compile/player_death.sqf @@ -113,16 +113,11 @@ if (count _array > 0) then { }; terminate dayz_musicH; -terminate dayz_lootCheck; terminate dayz_slowCheck; terminate dayz_animalCheck; terminate dayz_monitor1; terminate dayz_medicalH; terminate dayz_gui; -terminate dayz_zedCheck; -terminate dayz_locationCheck; -terminate dayz_combatCheck; -terminate dayz_friendliesCheck; //Reset (just in case) //deleteVehicle dayz_playerTrigger;