W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-04 15:22:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch

Browse Source
This commit is contained in:
Skaronator
2014-02-11 12:10:46 +01:00
parent 361a0f9a1d 3678ab6642
commit 6bea4a7974
30 changed files with 39 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGE LOG 1.0.4.2.txt
View File

@@ -1,7 +1,9 @@
[ADDED] BTR90 HQ ride in back option. @Fank [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 <NULL> kill messages from vehicles. @icomrade [FIXED] second attempt at fixing <NULL> 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] 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] Fixed error in expression when removing buildings. @Fank
[FIXED] Was possible to fill a mixed gas with an empty jerry can. @Fank [FIXED] Was possible to fill a mixed gas with an empty jerry can. @Fank

18
SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp
View File

@@ -1,7 +1,7 @@
class ItemWaterbottle1oz : ItemWaterbottle { class ItemWaterbottle1oz : ItemWaterbottle {
displayName = "Water Bottle (1oz)"; displayName = "Water Bottle (1oz)";
descriptionShort = "Watter Bottle with 1oz of water"; 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; wateroz = 1;
class ItemActions { class ItemActions {
class Fill { class Fill {
@@ -13,7 +13,7 @@ class ItemWaterbottle1oz : ItemWaterbottle {
class ItemWaterbottle2oz : ItemWaterbottle { class ItemWaterbottle2oz : ItemWaterbottle {
displayName = "Water Bottle (2oz)"; displayName = "Water Bottle (2oz)";
descriptionShort = "Watter Bottle with 2oz of water"; 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; wateroz = 2;
class ItemActions { class ItemActions {
class Fill { class Fill {
@@ -25,7 +25,7 @@ class ItemWaterbottle2oz : ItemWaterbottle {
class ItemWaterbottle3oz : ItemWaterbottle { class ItemWaterbottle3oz : ItemWaterbottle {
displayName = "Water Bottle (3oz)"; displayName = "Water Bottle (3oz)";
descriptionShort = "Watter Bottle with 3oz of water"; 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; wateroz = 3;
class ItemActions { class ItemActions {
class Fill { class Fill {
@@ -37,7 +37,7 @@ class ItemWaterbottle3oz : ItemWaterbottle {
class ItemWaterbottle4oz : ItemWaterbottle { class ItemWaterbottle4oz : ItemWaterbottle {
displayName = "Water Bottle (4oz)"; displayName = "Water Bottle (4oz)";
descriptionShort = "Watter Bottle with 4oz of water"; 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; wateroz = 4;
class ItemActions { class ItemActions {
class Fill { class Fill {
@@ -49,7 +49,7 @@ class ItemWaterbottle4oz : ItemWaterbottle {
class ItemWaterbottle5oz : ItemWaterbottle { class ItemWaterbottle5oz : ItemWaterbottle {
displayName = "Water Bottle (5oz)"; displayName = "Water Bottle (5oz)";
descriptionShort = "Watter Bottle with 5oz of water"; 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; wateroz = 5;
class ItemActions { class ItemActions {
class Fill { class Fill {
@@ -61,7 +61,7 @@ class ItemWaterbottle5oz : ItemWaterbottle {
class ItemWaterbottle6oz : ItemWaterbottle { class ItemWaterbottle6oz : ItemWaterbottle {
displayName = "Water Bottle (6oz)"; displayName = "Water Bottle (6oz)";
descriptionShort = "Watter Bottle with 6oz of water"; 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; wateroz = 6;
class ItemActions { class ItemActions {
class Fill { class Fill {
@@ -73,7 +73,7 @@ class ItemWaterbottle6oz : ItemWaterbottle {
class ItemWaterbottle7oz : ItemWaterbottle { class ItemWaterbottle7oz : ItemWaterbottle {
displayName = "Water Bottle (7oz)"; displayName = "Water Bottle (7oz)";
descriptionShort = "Watter Bottle with 7oz of water"; 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; wateroz = 7;
class ItemActions { class ItemActions {
class Fill { class Fill {
@@ -85,7 +85,7 @@ class ItemWaterbottle7oz : ItemWaterbottle {
class ItemWaterbottle8oz : ItemWaterbottle { class ItemWaterbottle8oz : ItemWaterbottle {
displayName = "Water Bottle (8oz)"; displayName = "Water Bottle (8oz)";
descriptionShort = "Watter Bottle with 8oz of water"; 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; wateroz = 8;
class ItemActions { class ItemActions {
class Fill { class Fill {
@@ -97,7 +97,7 @@ class ItemWaterbottle8oz : ItemWaterbottle {
class ItemWaterbottle9oz : ItemWaterbottle { class ItemWaterbottle9oz : ItemWaterbottle {
displayName = "Water Bottle (9oz)"; displayName = "Water Bottle (9oz)";
descriptionShort = "Watter Bottle with 9oz of water"; 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; wateroz = 9;
class ItemActions { class ItemActions {
class Fill { class Fill {

2
SQF/dayz_code/Configs/rscTitles.hpp
View File

@@ -166,7 +166,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version class DAYZ_Version : CA_Version
{ {
idc = -1; idc = -1;
text = "DayZ Epoch 1.0.4.1"; text = "DayZ Epoch 1.0.4.2";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
}; };
delete CA_TitleMainMenu; delete CA_TitleMainMenu;

4
SQF/dayz_code/actions/player_craftItem.sqf
View File

@@ -218,8 +218,6 @@ if (_canDo) then {
player addMagazine _itemOut; player addMagazine _itemOut;
}; };
_tradeComplete = _tradeComplete+1;
_textCreate = getText(configFile >> "CfgMagazines" >> _itemOut >> "displayName"); _textCreate = getText(configFile >> "CfgMagazines" >> _itemOut >> "displayName");
// Add crafted item // Add crafted item
@@ -228,6 +226,8 @@ if (_canDo) then {
sleep 1; sleep 1;
} forEach _selectedRecipeOutput; } forEach _selectedRecipeOutput;
_tradeComplete = _tradeComplete+1;
}; };
} else { } else {

4
SQF/dayz_code/actions/trade_any_vehicle_free.sqf
View File

@@ -136,8 +136,8 @@ if (_finished) then {
_location = (getPosATL _veh); _location = (getPosATL _veh);
//["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,0]] call callRpcProcedure; //["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,true,0]] call callRpcProcedure;
PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,0,_activatingPlayer]; PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,true,0,_activatingPlayer];
publicVariableServer "PVDZE_veh_Publish2"; publicVariableServer "PVDZE_veh_Publish2";
}; };

1
SQF/dayz_code/compile/fn_damageActions.sqf
View File

@@ -95,7 +95,6 @@ if (!isNull _menClose and _hasPatient and !r_drag_sqf and !r_action and !_inVehi
//Allow player to bandage //Allow player to bandage
if(_injured and _hasBandage) then { if(_injured and _hasBandage) then {
r_action = true; 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, "", ""]; _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]; r_player_actions set [count r_player_actions,_action];
}; };

5
SQF/dayz_code/compile/player_death.sqf
View File

@@ -113,16 +113,11 @@ if (count _array > 0) then {
}; };
terminate dayz_musicH; terminate dayz_musicH;
terminate dayz_lootCheck;
terminate dayz_slowCheck; terminate dayz_slowCheck;
terminate dayz_animalCheck; terminate dayz_animalCheck;
terminate dayz_monitor1; terminate dayz_monitor1;
terminate dayz_medicalH; terminate dayz_medicalH;
terminate dayz_gui; terminate dayz_gui;
terminate dayz_zedCheck;
terminate dayz_locationCheck;
terminate dayz_combatCheck;
terminate dayz_friendliesCheck;
//Reset (just in case) //Reset (just in case)
//deleteVehicle dayz_playerTrigger; //deleteVehicle dayz_playerTrigger;

2
SQF/dayz_code/config.cpp
View File

@@ -41,7 +41,7 @@ class CfgMods
hidePicture = 0; hidePicture = 0;
hideName = 0; hideName = 0;
action = "http://www.dayzepoch.com"; action = "http://www.dayzepoch.com";
version = "1.0.4.1"; version = "1.0.4.2";
hiveVersion = 0.96; //0.93 hiveVersion = 0.96; //0.93
}; };
}; };

53
SQF/dayz_code/medical/load_wounded.sqf
View File

@@ -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;

2
SQF/mod.cpp
View File

@@ -1,5 +1,5 @@
dir = "@DayZ_Epoch"; dir = "@DayZ_Epoch";
name = "DayZ Epoch 1.0.4.1"; name = "DayZ Epoch 1.0.4.2";
actionName = "Website"; actionName = "Website";
picture = "dayz_logo_ca.paa"; picture = "dayz_logo_ca.paa";
action = "http://www.dayzepoch.com"; action = "http://www.dayzepoch.com";

1
Server Files/Battleye/scripts.txt
View File

@@ -1,4 +1,5 @@
//new //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 "addBackpackCargoGlobal" !"_holder addbackpackcargoGlobal \[_x,\(_objWpnQty select _countr\)\];"
1 HelicopterExplo !"_expl=createVehicle \[\"HelicopterExploSmall\",\(getPosATL _v\),\[\],0,\"CAN_COLLIDE\"\];" 1 HelicopterExplo !"_expl=createVehicle \[\"HelicopterExploSmall\",\(getPosATL _v\),\[\],0,\"CAN_COLLIDE\"\];"
5 "Logic" !"\"Logic\" createVehicleLocal" !"sideLogic" !"BIS_MPF_clientJIPlogic" !"_humanity_logic" 5 "Logic" !"\"Logic\" createVehicleLocal" !"sideLogic" !"BIS_MPF_clientJIPlogic" !"_humanity_logic"

2
Server Files/Config-Examples/instance_11_Chernarus/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_12_duala/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_13_tavi/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_15_namalsk/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_16_panthera/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_18_sahrani/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_19_poda/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_1_takistan/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_20_fapovo/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_21_caribou/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_24_Napf/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_25_sauerland/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_2_utes/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_3_shapur_baf/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 24; maxPlayers = 24;

2
Server Files/Config-Examples/instance_4_zargabad/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_6_Dingor/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_7_Lingor/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;

2
Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg
View File

@@ -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 = ""; password = "";
passwordAdmin = "changeme"; passwordAdmin = "changeme";
maxPlayers = 50; maxPlayers = 50;