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

0.992a

Browse Source 
+ Commented out anti-teleport script from 1.7.6.1 it would bug and pop
people into the air when walking on docks.
+ Changes to repair and salvage code to fix #167
+ Changed crafting recipe of H-barrier
["ItemSandbag",3],["ItemWire",1],["ItemTankTrap",1] fixes #153
+ Added more randomization to vehicle spawn location when purchasing, to
prevent duplicate UID's.
+ increased selling vehicle radis to 20m. fixes #168
+ change message when selling a vehicle and it is not within range "No
%1 found within 20 meters.".
+ Added HeliHempty to possible spawn locations for purchased vehicles.
This commit is contained in:
vbawol
2013-03-01 12:19:20 -06:00
parent 1be1707895
commit 598cb62a26
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dayz_code/actions/player_craftItem.sqf
View File

@@ -105,15 +105,15 @@ if (inflamed cursorTarget and _canDo) then {
_recipe_ItemSandbagLarge = [ _recipe_ItemSandbagLarge = [
[ ["ItemSandbagLarge",1] ], [ ["ItemSandbagLarge",1] ],
[ ["ItemSandbag",3],["ItemWire",1] ] [ ["ItemSandbag",3],["ItemWire",1],["ItemTankTrap",1] ]
]; ];
_recipe_FoodChickenNoodle = [["FoodchickenRaw",1],["FoodCanPasta",1],["ItemWaterbottle",1]]; //_recipe_FoodChickenNoodle = [["FoodchickenRaw",1],["FoodCanPasta",1],["ItemWaterbottle",1]];
_recipe_FoodBeefBakedBeans = [["FoodbeefRaw",1],["FoodCanBakedBeans",1]]; //_recipe_FoodBeefBakedBeans = [["FoodbeefRaw",1],["FoodCanBakedBeans",1]];
//Add new item //Add new item
_item = _this; _item = _this;

6
dayz_code/actions/repair.sqf
View File

@@ -33,9 +33,9 @@ if (_section and _hasToolbox) then {
dayzSetFix = [_vehicle,_selection,0]; dayzSetFix = [_vehicle,_selection,0];
publicVariable "dayzSetFix"; publicVariable "dayzSetFix";
//if (local _vehicle) then { if (local _vehicle) then {
dayzSetFix call object_setFixServer; dayzSetFix call object_setFixServer;
//}; };
player playActionNow "Medic"; player playActionNow "Medic";
sleep 1; sleep 1;

6
dayz_code/actions/salvage.sqf
View File

@@ -48,9 +48,9 @@ if (_hasToolbox) then {
dayzSetFix = [_vehicle,_selection,1]; dayzSetFix = [_vehicle,_selection,1];
publicVariable "dayzSetFix"; publicVariable "dayzSetFix";
//if (local _vehicle) then { if (local _vehicle) then {
dayzSetFix call object_setFixServer; dayzSetFix call object_setFixServer;
//} }
player playActionNow "Medic"; player playActionNow "Medic";
sleep 1; sleep 1;

2
dayz_code/actions/sell_db.sqf
View File

@@ -100,7 +100,7 @@ diag_log format["DEBUG Buy: %1", dayzTraderMenuResult];
_count = 1; _count = 1;
}; };
} else { } else {
_count = {(typeOf _x) == _name} count (nearestObjects [player, [_name], 10]); _count = {(typeOf _x) == _name} count (nearestObjects [player, [_name], 20]);
} }
}; };
if(_type == "CfgMagazines") then { if(_type == "CfgMagazines") then {

8
dayz_code/actions/trade_any_boat.sqf
View File

@@ -20,7 +20,7 @@ _bos = 0;
if(_buy_o_sell == "buy") then { if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player; _qty = {_x == _part_in} count magazines player;
} else { } else {
_obj = nearestObjects [(getPosATL player), [_part_in], 10]; _obj = nearestObjects [(getPosATL player), [_part_in], 20];
_qty = count _obj; _qty = count _obj;
_bos = 1; _bos = 1;
}; };
@@ -46,9 +46,9 @@ if (_qty >= _qty_in) then {
player removeMagazine _part_in; player removeMagazine _part_in;
}; };
_dir = 90; _dir = round(random 360);
_location = [(position player),0,20,1,2,20,0] call BIS_fnc_findSafePos; _location = [(position player),0,20,1,2,2000,0] call BIS_fnc_findSafePos;
//place tent (local) //place tent (local)
_veh = createVehicle [_part_out, _location, [], 0, "CAN_COLLIDE"]; _veh = createVehicle [_part_out, _location, [], 0, "CAN_COLLIDE"];
@@ -103,7 +103,7 @@ if (_qty >= _qty_in) then {
} else { } else {
_needed = _qty_in - _qty; _needed = _qty_in - _qty;
cutText [format[("Need %1 More %2"),_needed,_textPartIn] , "PLAIN DOWN"]; cutText [format[("No %1 found within 20 meters."),_needed,_textPartIn] , "PLAIN DOWN"];
}; };
TradeInprogress = false; TradeInprogress = false;

12
dayz_code/actions/trade_any_vehicle.sqf
View File

@@ -20,7 +20,7 @@ _bos = 0;
if(_buy_o_sell == "buy") then { if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player; _qty = {_x == _part_in} count magazines player;
} else { } else {
_obj = nearestObjects [(getPosATL player), [_part_in], 10]; _obj = nearestObjects [(getPosATL player), [_part_in], 20];
_qty = count _obj; _qty = count _obj;
_bos = 1; _bos = 1;
}; };
@@ -47,14 +47,14 @@ if (_qty >= _qty_in) then {
player removeMagazine _part_in; player removeMagazine _part_in;
}; };
_dir = round(random 180); _dir = round(random 360);
_helipad = nearestObjects [player, ["HeliHCivil"], 50]; _helipad = nearestObjects [player, ["HeliHCivil","HeliHempty"], 100];
if(count _helipad > 0) then { if(count _helipad > 0) then {
_location = (getPosATL (_helipad select 0)); _location = [(getPosATL (_helipad select 0)),0,10,1,0,2000,0] call BIS_fnc_findSafePos;
} else { } else {
_location = [(position player),0,20,1,0,20,0] call BIS_fnc_findSafePos; _location = [(position player),0,20,1,0,2000,0] call BIS_fnc_findSafePos;
}; };
//place tent (local) //place tent (local)
@@ -110,7 +110,7 @@ if (_qty >= _qty_in) then {
} else { } else {
_needed = _qty_in - _qty; _needed = _qty_in - _qty;
cutText [format[("Need %1 More %2"),_needed,_textPartIn] , "PLAIN DOWN"]; cutText [format[("No %1 found within 20 meters. "),_needed,_textPartIn] , "PLAIN DOWN"];
}; };
TradeInprogress = false; TradeInprogress = false;

2
dayz_code/config.cpp
View File

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

2
dayz_code/rscTitles.hpp
View File

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

16
dayz_code/stringtable.xml
View File

@@ -497,14 +497,14 @@
<Czech>Spojení navázáno, vytvářím postavu</Czech> <Czech>Spojení navázáno, vytvářím postavu</Czech>
</Key> </Key>
<Key ID="str_player_18"> <Key ID="str_player_18">
<Original>You are running an incorrect version of DAYZ_CODE, please download this file from dayzmod.com/downloads (You are running version %1 and the server is running version %2)</Original> <Original>You are running an incorrect version of DAYZ_CODE, please download this file from dayzepoch.com (You are running version %1 and the server is running version %2)</Original>
<English>You are running an incorrect version of DAYZ_CODE, please download this file from dayzmod.com/downloads (You are running version %1 and the server is running version %2)</English> <English>You are running an incorrect version of DAYZ_CODE, please download this file from dayzepoch.com (You are running version %1 and the server is running version %2)</English>
<German>Sie haben eine falsche Version von DAYZ_CODE, bitte laden Sie sich neuste Version von www.dayzmod.com/downloads runter </German> <German>Sie haben eine falsche Version von DAYZ_CODE, bitte laden Sie sich neuste Version von www.dayzepoch.com runter </German>
<Russian>Вы используете неверную версию DAYZ_CODE. Пожалуйста, скачайте нужный файл с dayzmod.com/downloads (Ваша версия %1, версия на сервере %2)</Russian> <Russian>Вы используете неверную версию DAYZ_CODE. Пожалуйста, скачайте нужный файл с dayzepoch.com (Ваша версия %1, версия на сервере %2)</Russian>
<Spanish>Estás ejecutando una versión incorrecta de DAYZ_CODE, por favor descarga este archivo desde dayzmod.com/downloads (Estas ejecutando la versión %1 y el servidor %2)</Spanish> <Spanish>Estás ejecutando una versión incorrecta de DAYZ_CODE, por favor descarga este archivo desde dayzepoch.com (Estas ejecutando la versión %1 y el servidor %2)</Spanish>
<Dutch>Je gebruikt een incorrecte versie van DAYZ_CODE, download dit bestand alsjeblieft van dayzmod.com/downloads (Je gebruikt versie %1, en de server gebruikt versie %2)</Dutch> <Dutch>Je gebruikt een incorrecte versie van DAYZ_CODE, download dit bestand alsjeblieft van dayzepoch.com (Je gebruikt versie %1, en de server gebruikt versie %2)</Dutch>
<French>Vous utilisez une version incorrecte de DAYZ_CODE, veuillez télécharger ce fichier depuis dayzmod.com/downloads (Vous utilisez la version %1 et le serveur utilise la version %2)</French> <French>Vous utilisez une version incorrecte de DAYZ_CODE, veuillez télécharger ce fichier depuis dayzepoch.com (Vous utilisez la version %1 et le serveur utilise la version %2)</French>
<Czech>Máte nesprávnou verzi DAYZ_CODE, stáhněte si prosím aktuální soubor z dayzmod.com/downloads (Vaše verze je %1 a na serveru běží verze %2)</Czech> <Czech>Máte nesprávnou verzi DAYZ_CODE, stáhněte si prosím aktuální soubor z dayzepoch.com (Vaše verze je %1 a na serveru běží verze %2)</Czech>
</Key> </Key>
<Key ID="str_player_20"> <Key ID="str_player_20">
<Original>You must be near a water-source such as a pond or well to refill your water bottles</Original> <Original>You must be near a water-source such as a pond or well to refill your water bottles</Original>

2
dayz_code/system/player_monitor.fsm
View File

@@ -1136,7 +1136,7 @@ class FSM
" };" \n " };" \n
"};" \n "};" \n
"//Removed for now" \n "//Removed for now" \n
"[] execVM ""\z\addons\dayz_code\system\antihack.sqf"";" \n "//[] execVM ""\z\addons\dayz_code\system\antihack.sqf"";" \n
"" \n "" \n
"// TODO: questionably" \n "// TODO: questionably" \n
"{ _x call fnc_vehicleEventHandler; } forEach vehicles;" \n "{ _x call fnc_vehicleEventHandler; } forEach vehicles;" \n