W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 12:12:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

0.791

Browse Source
This commit is contained in:
vbawol
2013-01-25 20:28:26 -06:00
parent aaa01cb0dd
commit fbb55f318c
16 changed files with 547 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
dayz_code/CfgWeapons.hpp
View File

@@ -1,26 +1,5 @@
class CfgWeapons {
class ItemCore;
class ItemMap1: ItemCore {
descriptionshort = "Map";
displayname = "Map";
picture = "\z\addons\dayz_communityassets\icons\gear_picture_map_01_ca.paa";
scope = 2;
simulation = "ItemMap";
};
class ItemMap2: ItemCore {
descriptionshort = "Map";
displayname = "Map";
picture = "\z\addons\dayz_communityassets\icons\gear_picture_map_02_ca.paa";
scope = 2;
simulation = "ItemMap";
};
class ItemMap3: ItemCore {
descriptionshort = "Map";
displayname = "Map";
picture = "\z\addons\dayz_communityassets\icons\gear_picture_map_03_ca.paa";
scope = 2;
simulation = "ItemMap";
};
class ItemMap_Debug: ItemCore {
descriptionshort = "Debug Map - Admin use only";
displayname = "Map";
@@ -31,46 +10,4 @@ class CfgWeapons {
libtextdesc = "Debug Map - Admin use only";
};
};
class ItemMatchboxWet : ItemCore {
scope = public;
displayName = $STR_EQUIP_CODE_NAME_3;
//model = "\dayz_equip\models\matchbox_gear.p3d";
//picture = "\z\addons\dayz_communityassets\pictures\equip_matchbox_wet_CA.paa";
model = "\dayz_equip\models\matchbox_gear.p3d";
picture = "\dayz_equip\textures\equip_matchbox_ca.paa";
descriptionShort = $STR_EQUIP_CODE_DESC_3;
};
class ItemMatchboxEmpty : ItemCore {
scope = public;
displayName = "Empty Match Box";
//model = "\dayz_equip\models\matchbox_gear.p3d";
//picture = "\z\addons\dayz_communityassets\pictures\equip_matchbox_Empty_CA.paa";
model = "\dayz_equip\models\matchbox_gear.p3d";
picture = "\dayz_equip\textures\equip_matchbox_ca.paa";
descriptionShort = $STR_EQUIP_CODE_DESC_3;
};
class ItemBrokeHatchet : ItemCore {
scope = public;
displayName = $STR_EQUIP_CODE_NAME_41;
model = "\dayz_equip\models\hatchet.p3d";
picture = "\dayz_equip\textures\equip_hatchet_CA.paa";
descriptionShort = $STR_EQUIP_CODE_DESC_41;
class ItemActions {
class Toolbelt {
text = "Remove from Toolbelt";
script = "spawn player_addToolbelt;";
use[] = {"ItemBrokeHatchet"};
output[] = {"MeleeHatchet"};
};
};
};
class ItemKnifeBlunt : ItemCore {
scope = public;
displayName = $STR_EQUIP_CODE_NAME_4;
model = "\dayz_equip\models\knife_gear.p3d";
picture = "\dayz_equip\textures\equip_knife_ca.paa";
descriptionShort = $STR_EQUIP_CODE_DESC_4;
};
};

7
dayz_code/actions/cook.sqf
View File

@@ -3,10 +3,11 @@ private["_hasFoodMeat","_hasFoodTin","_item","_wait"];
player removeAction s_player_cook;
s_player_cook = -1;
_qty = {_x == "FoodSteakRaw"} count magazines player;
//_qty = {_x == "FoodSteakRaw"} count magazines player;
_wait = 5 - _qty;
if ("FoodSteakRaw" in magazines player) then {
_qty = {_x == "FoodSteakRaw"} count magazines player;
player playActionNow "Medic";
[player,"cook",0,false] call dayz_zombieSpeak;
_id = [player,70,true,(getPosATL player)] spawn player_alertZombies;
@@ -23,6 +24,7 @@ if ("FoodSteakRaw" in magazines player) then {
//FoodmuttonRaw > FoodmuttonCooked
if ("FoodmuttonRaw" in magazines player) then {
_qty = {_x == "FoodmuttonRaw"} count magazines player;
player playActionNow "Medic";
[player,"cook",0,false] call dayz_zombieSpeak;
_id = [player,70,true,(getPosATL player)] spawn player_alertZombies;
@@ -39,6 +41,7 @@ if ("FoodmuttonRaw" in magazines player) then {
//FoodchickenRaw > FoodchickenCooked
if ("FoodchickenRaw" in magazines player) then {
_qty = {_x == "FoodchickenRaw"} count magazines player;
player playActionNow "Medic";
[player,"cook",0,false] call dayz_zombieSpeak;
_id = [player,70,true,(getPosATL player)] spawn player_alertZombies;
@@ -55,6 +58,7 @@ if ("FoodchickenRaw" in magazines player) then {
//FoodrabbitRaw > FoodBaconCooked
if ("FoodrabbitRaw" in magazines player) then {
_qty = {_x == "FoodrabbitRaw"} count magazines player;
player playActionNow "Medic";
[player,"cook",0,false] call dayz_zombieSpeak;
_id = [player,70,true,(getPosATL player)] spawn player_alertZombies;
@@ -71,6 +75,7 @@ if ("FoodrabbitRaw" in magazines player) then {
//FoodbaconRaw > FoodRabbitCooked
if ("FoodbaconRaw" in magazines player) then {
_qty = {_x == "FoodbaconRaw"} count magazines player;
player playActionNow "Medic";
[player,"cook",0,false] call dayz_zombieSpeak;
_id = [player,70,true,(getPosATL player)] spawn player_alertZombies;

10
dayz_code/actions/gather_meat.sqf
View File

@@ -18,7 +18,6 @@ if ((_hasKnife or _hasKnifeBlunt) and !_hasHarvested) then {
player playActionNow "Medic";
[player,"gut",0,false] call dayz_zombieSpeak;
_item setVariable["meatHarvested",true,true];
_item setVariable ["timerawmeatHarvested",time,false];
_qty = 2;
if (_isListed) then {
@@ -29,7 +28,14 @@ if ((_hasKnife or _hasKnifeBlunt) and !_hasHarvested) then {
_id = [player,50,true,(getPosATL player)] spawn player_alertZombies;
["dayzGutBody",[_item,_qty]] call callRpcProcedure;
_array = [_item,_qty];
if (local _item) then {
_array spawn local_gutObject;
} else {
dayzGutBody = _array;
publicVariable "dayzGutBody";
};
sleep 6;
_string = format[localize "str_success_gutted_animal",_text,_qty];

7
dayz_code/actions/gather_zparts.sqf
View File

@@ -25,7 +25,12 @@ if ((_hasKnife or _hasKnifeBlunt) and !_hasHarvested) then {
_array = [_item,_qty];
["dayzGutBodyZ",[_item,_qty]] call callRpcProcedure;
if (local _item) then {
_array spawn local_gutObjectZ;
} else {
dayzGutBody = _array;
publicVariable "dayzGutBodyZ";
};
sleep 6;
_string = format["Successfully Gutted Zombie",_text,_qty];

30
dayz_code/cfgLoot.hpp
View File

@@ -4,21 +4,15 @@ class CfgLoot {
"TrashTinCan",
"TrashJackDaniels",
"ItemSodaEmpty",
"ItemMatchboxEmpty",
"ItemMatchboxWet"
},
{
1,
0.1,
0.5,
0.2,
0.2
0.5
}
};
civilian[] = {
{
"ItemMatchboxEmpty",
"ItemMatchboxWet",
"TrashTinCan",
"TrashJackDaniels",
"ItemSodaEmpty",
@@ -37,8 +31,6 @@ class CfgLoot {
"FoodBioMeat"
},
{
0.05,
0.05,
0.09,
0.09,
0.09,
@@ -85,10 +77,6 @@ class CfgLoot {
};
generic[] = {
{
"ItemMatchboxEmpty",
"ItemMatchboxWet",
"ItemKnifeBlunt",
"ItemBrokeHatchet",
"TrashTinCan",
"ItemSodaEmpty",
"ItemSodaCoke",
@@ -118,10 +106,6 @@ class CfgLoot {
"ItemHeatPack"
},
{
0.06,
0.06,
0.06,
0.06,
0.06,
0.06,
0.06,
@@ -307,8 +291,6 @@ class CfgLoot {
};
worker[] = {
{
"ItemMatchboxEmpty",
"ItemMatchboxWet",
"TrashTinCan",
"TrashJackDaniels",
"ItemSodaEmpty",
@@ -318,18 +300,12 @@ class CfgLoot {
"FoodCanSardines",
"FoodCanFrankBeans",
"FoodCanPasta",
"8Rnd_9x18_Makarov",
"7Rnd_45ACP_1911",
"2Rnd_shotgun_74Slug",
"2Rnd_shotgun_74Pellets",
"ItemBandage",
"ItemPainkiller",
"ItemToolbox",
"ItemEtool"
},
{
0.05,
0.05,
0.09,
0.09,
0.09,
@@ -339,10 +315,6 @@ class CfgLoot {
0.05,
0.05,
0.05,
0.07,
0.05,
0.05,
0.05,
0.06,
0.06,
0.01,

12
dayz_code/compile/fn_selfActions.sqf
View File

@@ -13,7 +13,13 @@ _classbag = typeOf _bag;
_isWater = (surfaceIsWater (position player)) or dayz_isSwimming;
_hasAntiB = "ItemAntibiotic" in magazines player;
_hasFuelE = "ItemJerrycanEmpty" in magazines player;
_hasRawMeat = "FoodSteakRaw" in magazines player;
//RawFood
_hasRawMeat = _hasSteakRaw or _hasmuttonRaw or _hasrabbitRaw or _hasbaconRaw;
_hasSteakRaw = "FoodSteakRaw" in magazines player;
_hasmuttonRaw = "FoodmuttonRaw" in magazines player;
_haschickenRaw = "FoodchickenRaw" in magazines player;
_hasrabbitRaw = "FoodrabbitRaw" in magazines player;
_hasbaconRaw = "FoodbaconRaw" in magazines player;
_hasKnife = "ItemKnife" in items player;
_hasToolbox = "ItemToolbox" in items player;
//_hasTent = "ItemTent" in items player;
@@ -164,7 +170,7 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
};
};
//Fireplace Actions check
if(inflamed cursorTarget and _hasRawMeat and _canDo) then {
if(inflamed cursorTarget and (_hasSteakRaw or _hasmuttonRaw or _hasrabbitRaw or _hasbaconRaw) and _canDo) then {
if (s_player_cook < 0) then {
s_player_cook = player addAction [localize "str_actions_self_05", "\z\addons\dayz_code\actions\cook.sqf",cursorTarget, 3, true, true, "", ""];
};
@@ -705,7 +711,7 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
};
//Dog
if (_isDog and _isAlive and _hasRawMeat and _canDo and _ownerID == "0" and player getVariable ["dogID", 0] == 0) then {
if (_isDog and _isAlive and (_hasRawMeat) and _canDo and _ownerID == "0" and player getVariable ["dogID", 0] == 0) then {
if (s_player_tamedog < 0) then {
s_player_tamedog = player addAction [localize "str_actions_tamedog", "\z\addons\dayz_code\actions\tame_dog.sqf", cursorTarget, 1, false, true, "", ""];
};

28
dayz_code/compile/local_gutObject.sqf Normal file
View File

@@ -0,0 +1,28 @@
private["_item","_qty","_type","_meat","_loop"];
_item = _this select 0;
_qty = _this select 1;
_type = typeOf _item;
_meat = 0;
_loop = true;
_rawfoodtype = getText (configFile >> "CfgSurvival" >> "Meat" >> _type >> "rawfoodtype");
if (local _item) then {
for "_x" from 1 to _qty do {
_item addMagazine _rawfoodtype;
};
sleep 2;
_timer = time;
while {_loop} do {
_meat = count magazines _item;
if (_meat == 0) then {_loop = false};
if ((time - _timer) > 300) then {_loop = false};
sleep 1;
};
["dayzHideBody",_item] call broadcastRpcCallAll;
sleep 10;
deleteVehicle _item;
} else {
_ehLoc = "client";
if (isServer) then { _ehLoc = "server"; };
diag_log format["gutObject EH on %1 item not local ! Type: %2",_ehLoc,str(_item)];
};

24
dayz_code/compile/local_gutObjectZ.sqf Normal file
View File

@@ -0,0 +1,24 @@
private["_item","_qty","_type","_meat","_loop"];
_item = _this select 0;
_qty = _this select 1;
_type = typeOf _item;
_meat = 0;
_loop = true;
if (local _item) then {
_item addMagazine "ItemZombieParts";
sleep 2;
_timer = time;
while {_loop} do {
_meat = count magazines _item;
if (_meat == 0) then {_loop = false};
if ((time - _timer) > 300) then {_loop = false};
sleep 1;
};
["dayzHideBodyZ",_item] call broadcastRpcCallAll;
sleep 10;
deleteVehicle _item;
} else {
_ehLoc = "client";
if (isServer) then { _ehLoc = "server"; };
diag_log format["gutObject EH on %1 item not local ! Type: %2",_ehLoc,str(_item)];
};

2
dayz_code/config.cpp
View File

@@ -33,7 +33,7 @@ class CfgMods
hidePicture = 0;
hideName = 0;
action = "http://www.dayepoch.com";
version = "0.78";
version = "0.791";
hiveVersion = 0.96; //0.93
};
};

65
dayz_code/init/compiles.sqf
View File

@@ -61,12 +61,6 @@ if (!isDedicated) then {
zombie_loiter = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_loiter.sqf"; //Server compile, used for loiter behaviour
zombie_generate = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_generate.sqf"; //Server compile, used for loiter behaviour
//Wild
//wild_spawnZombies = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\wild_spawnZombies.sqf";
//Maps
//fnc_MapEventHandler = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fnc_MapEventHandler.sqf";
//
dog_findTargetAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\dog_findTargetAgent.sqf";
@@ -225,61 +219,6 @@ if (!isDedicated) then {
_success
};
dayz_disableRespawn = {
private["_display","_btnRespawn"];
if(r_fracture_legs) exitWith {};
disableSerialization;
waitUntil {
_display = findDisplay 49;
!isNull _display;
};
_btnRespawn = _display displayCtrl 1010;
_btnRespawn ctrlEnable false;
};
abort_enable = 0 spawn {};
dayz_disableAbort = {
private["_display","_btnAbort","_combattimeout","_zAround"];
_combattimeout = player getVariable["combattimeout",0];
_zAround = (count (player nearEntities ["zZombie_Base",50]) > 0);
if (_zAround || _combattimeout > time) then {
disableSerialization;
waitUntil {
_display = findDisplay 49;
!isNull _display;
};
_btnAbort = _display displayCtrl 104;
_btnAbort ctrlEnable false;
if (_zAround && _combattimeout <= time) then {
if (!scriptDone abort_enable) then {
terminate abort_enable;
sleep 0.5;
};
abort_enable = [] spawn {
private["_timeOut","_timeMax","_display","_btnAbort"];
_timeOut = 0;
_timeMax = 30;
disableSerialization;
while {_timeOut <= _timeMax} do {
scopeName "loop";
_display = findDisplay 49;
if (!isNull _display) then {
if (_timeOut == _timeMax) then {
_btnAbort = _display displayCtrl 104;
_btnAbort ctrlEnable true;
};
cutText [format ["You can Abort in %1",(_timeMax - _timeOut)], "PLAIN DOWN"];
} else {
breakOut "loop";
};
_timeOut = _timeOut + 1;
sleep 1;
};
cutText ["", "PLAIN DOWN"];
};
};
};
};
dayz_spaceInterrupt = {
private ["_dikCode", "_handled"];
@@ -334,12 +273,12 @@ if (!isDedicated) then {
if ((_dikCode == 0x38 or _dikCode == 0xB8) and (time - dayz_lastCheckBit > 10)) then {
call dayz_forceSave;
};
*/
if (_dikCode in actionKeys "IngamePause") then {
call dayz_forceSave;
_id = [] spawn dayz_disableRespawn;
_id = [] spawn dayz_disableAbort;
};
*/
_handled
};
@@ -462,6 +401,8 @@ if (!isDedicated) then {
fnc_isInsideBuilding = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_isInsideBuilding.sqf"; //_isInside = [_unit,_building] call fnc_isInsideBuilding;
dayz_zombieSpeak = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_speak.sqf"; //Used to generate random speech for a unit
vehicle_getHitpoints = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\vehicle_getHitpoints.sqf";
local_gutObject = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_gutObject.sqf"; //Generated on the server (or local to unit) when gutting an object
local_gutObjectZ = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_gutObjectZ.sqf"; //Generated on the server (or local to unit) when gutting an object
local_zombieDamage = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_damageHandlerZ.sqf"; //Generated by the client who created a zombie to track damage
local_setFuel = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_setFuel.sqf"; //Generated when someone refuels a vehicle
local_eventKill = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_eventKill.sqf"; //Generated when something is killed

2
dayz_code/init/publicEH.sqf
View File

@@ -53,6 +53,8 @@ registerBroadcastRpc = {
["dayzSetFuel", { (_this select 1) call local_setFuel; } ] call registerBroadcastRpc;
["dayzSetFix", { (_this select 1) call object_setFixServer; } ] call registerBroadcastRpc;
["dayzSetDate", { setDate (_this select 1); } ] call registerBroadcastRpc;
["dayzGutBody", { (_this select 1) call local_gutObject; } ] call registerBroadcastRpc;
["dayzGutBodyZ", { (_this select 1) call local_gutObjectZ; } ] call registerBroadcastRpc;
//EHs that setVariable "medForceUpdate" need to run on the server too
["usecMorphine", { (_this select 1) call player_medMorphine; } ] call registerBroadcastRpc;
["usecBandage", { (_this select 1) call player_medBandage; } ] call registerBroadcastRpc;

2
dayz_code/rscTitles.hpp
View File

@@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version
{
idc = -1;
text = "DayZ Epoch 0.78 (1.7.5.M1D21)";
text = "DayZ Epoch 0.79 (1.7.5.M1D25)";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
};
class CA_TitleMainMenu;

475
dayz_code/stringtable.xml
View File

File diff suppressed because it is too large Load Diff

2
dayz_server/compile/server_onPlayerDisconnect.sqf
View File

@@ -29,7 +29,7 @@ if (!isNull _object) then {
{ [_x,"gear"] call server_updateObject } foreach
(nearestObjects [getPosATL _object, ["Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage"], 10]);
if (alive _object) then {
[_object,(magazines _object),true] call server_playerSync;
[_object,(magazines _object),true,(unitBackpack _object)] call server_playerSync;
_myGroup = group _object;
deleteVehicle _object;
deleteGroup _myGroup;

2
dayz_server/init/publicEH_server.sqf
View File

@@ -18,9 +18,7 @@ registerServerRpc = {
//["dayzPlayerMorph", { (_this select 1) call server_playerMorph; } ] call registerServerRpc;
["dayzLoginRecord", { (_this select 1) call dayz_recordLogin; } ] call registerServerRpc;
["dayzCharDisco", { (_this select 1) call server_characterSync; } ] call registerServerRpc;
["dayzGutBody", { (_this select 1) spawn server_gutObject; } ] call registerServerRpc;
// DayZ Epoch Custom
["dayzGutBodyZ", { (_this select 1) spawn server_gutObjectZ; } ] call registerServerRpc;
["dayzPublishVeh", { (_this select 1) spawn server_publishVeh; } ] call registerServerRpc;
["dayzTradeObject", { (_this select 1) spawn server_tradeObj; } ] call registerServerRpc;
["dayzTraderMenu", { (_this select 1) spawn server_traders; } ] call registerServerRpc;

2
dayz_server/init/server_functions.sqf
View File

@@ -14,8 +14,6 @@ server_updateObject = compile preprocessFileLineNumbers "\z\addons\dayz_server\
server_playerDied = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDied.sqf";
server_publishObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishObject.sqf"; //Creates the object in DB
server_deleteObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_deleteObj.sqf"; //Removes the object from the DB
server_gutObject = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_gutObject.sqf"; //Generated on the server when gutting an object
server_gutObjectZ = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_gutObjectZ.sqf"; //Generated on the server when gutting an object
server_publishVeh = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle.sqf"; // Custom to add vehicles
server_tradeObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_tradeObject.sqf";
server_traders = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_traders.sqf";