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

0.66

Browse Source
This commit is contained in:
A Clark
2013-01-15 09:25:23 -06:00
parent b893b72b72
commit 2735183a45
11 changed files with 997 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MPMissions/DayZ_Epoch_11.Chernarus/description.ext
View File

@@ -5,7 +5,7 @@ OnLoadIntro = "Welcome to Chernarus";
OnLoadIntroTime = False; OnLoadIntroTime = False;
OnLoadMissionTime = False; OnLoadMissionTime = False;
disabledAI = true; disabledAI = true;
disableChannels[]={0,2,6}; disableChannels[]={0,1,2};
enableItemsDropping = 0; enableItemsDropping = 0;
class Header class Header

79
MPMissions/DayZ_Epoch_11.Chernarus/init.sqf
View File

@@ -23,9 +23,9 @@ enableRadio false;
spawnShoremode = 1; // Default = 1 (on shore) spawnShoremode = 1; // Default = 1 (on shore)
spawnArea= 1500; // Default = 1500 spawnArea= 1500; // Default = 1500
MaxHeliCrashes= 5; // Default = 5 MaxHeliCrashes= 5; // Default = 5
MaxVehicleLimit = 75; // Default = 50 MaxVehicleLimit = 200; // Default = 50
MaxDynamicDebris = 200; // Default = 100 MaxDynamicDebris = 500; // Default = 100
dayz_MapArea = 12000; // Default = 10000 dayz_MapArea = 15000; // Default = 10000
dayz_maxLocalZombies = 40; // Default = 40 dayz_maxLocalZombies = 40; // Default = 40
// DayZ Epoch TRADERS // DayZ Epoch TRADERS
@@ -68,17 +68,22 @@ if (isServer) then {
// TODO: Still Needs major overhaul current method is not ideal // TODO: Still Needs major overhaul current method is not ideal
AllowedVehiclesList = [ "Old_moto_TK_Civ_EP1", AllowedVehiclesList = [ "Old_moto_TK_Civ_EP1",
"MMT_Civ", "MMT_Civ",
"Old_bike_TK_INS_EP1",
"ATV_US_EP1", "ATV_US_EP1",
"hilux1_civil_3_open_EP1", "hilux1_civil_3_open_EP1",
"datsun1_civil_3_open", "datsun1_civil_3_open",
"Pickup_PK_TK_GUE_EP1", "Pickup_PK_TK_GUE_EP1",
"Octavia_ACR",
"VWGolf",
"Lada1", "Lada1",
"Skoda", "Skoda",
"car_sedan", "car_sedan",
"Volha_1_TK_CIV_EP1", "Volha_1_TK_CIV_EP1",
"VolhaLimo_TK_CIV_EP1",
"UAZ_Unarmed_TK_EP1", "UAZ_Unarmed_TK_EP1",
"Ikarus", "Ikarus",
"SUV_TK_CIV_EP1", "SUV_TK_CIV_EP1",
"SUV_Green",
"UH1H_DZ", "UH1H_DZ",
"Mi17_Civilian", "Mi17_Civilian",
"LandRover_CZ_EP1", "LandRover_CZ_EP1",
@@ -86,23 +91,31 @@ if (isServer) then {
"ArmoredSUV_PMC", "ArmoredSUV_PMC",
"PBX", "PBX",
"RHIB", "RHIB",
"Fishing_Boat",
"M113Ambul_UN_EP1", "M113Ambul_UN_EP1",
"KamazRefuel", "KamazRefuel",
"UralRefuel_TK_EP1",
"tractor",
"CSJ_GyroP"]; "CSJ_GyroP"];
AllowedVehiclesChance = [ 0.25, // "Old_moto_TK_Civ_EP1", AllowedVehiclesChance = [ 0.25, // "Old_moto_TK_Civ_EP1",
0.55, // "MMT_Civ" 0.55, // "MMT_Civ"
0.55, // Old_bike_TK_INS_EP1
0.45, // "ATV_US_EP1", 0.45, // "ATV_US_EP1",
0.55, // "hilux1_civil_3_open_EP1", 0.55, // "hilux1_civil_3_open_EP1",
0.25, // "datsun1_civil_3_open", 0.25, // "datsun1_civil_3_open",
0.40, // "Pickup_PK_TK_GUE_EP1", 0.20, // "Pickup_PK_TK_GUE_EP1",
0.20, // Octavia_ACR
0.20, // VWGolf
0.25, // "Lada1", 0.25, // "Lada1",
0.25, // "Skoda", 0.25, // "Skoda",
0.2, // "car_sedan", 0.2, // "car_sedan",
0.2, // "Volha_1_TK_CIV_EP1", 0.2, // "Volha_1_TK_CIV_EP1",
0.05, // "VolhaLimo_TK_CIV_EP1"
0.15, // "UAZ_Unarmed_TK_EP1" 0.15, // "UAZ_Unarmed_TK_EP1"
0.01, // "Ikarus" 0.01, // "Ikarus"
0.1, // "SUV_TK_CIV_EP1" 0.1, // "SUV_TK_CIV_EP1"
0.1, // "SUV_Green",
0.05, // "UH1H_DZ" 0.05, // "UH1H_DZ"
0.09, // "Mi17_Civilian" 0.09, // "Mi17_Civilian"
0.11, // "LandRover_CZ_EP1" 0.11, // "LandRover_CZ_EP1"
@@ -110,38 +123,50 @@ if (isServer) then {
0.05, // "ArmoredSUV_PMC" 0.05, // "ArmoredSUV_PMC"
0.15, // "PBX" 0.15, // "PBX"
0.01, // "RHIB" 0.01, // "RHIB"
0.1, // "Fishing_Boat",
0.01, // "M113Ambul_UN_EP1" 0.01, // "M113Ambul_UN_EP1"
0.01, // "KamazRefuel" 0.01, // "KamazRefuel"
0.01, // UralRefuel_TK_EP1
0.1, // "tractor"
0.1]; // "CSJ_GyroP" 0.1]; // "CSJ_GyroP"
AllowedVehiclesLimit = [ 2, // "Old_moto_TK_Civ_EP1", AllowedVehiclesLimit = [ 5, // "Old_moto_TK_Civ_EP1",
5, // "MMT_Civ" 10, // "MMT_Civ"
2, // "ATV_US_EP1", 10, // Old_bike_TK_INS_EP1
2, // "hilux1_civil_3_open_EP1", 5, // "ATV_US_EP1",
2, // "datsun1_civil_3_open", 5, // "hilux1_civil_3_open_EP1",
1, // "Pickup_PK_TK_GUE_EP1", 5, // "datsun1_civil_3_open",
2, // "Lada1", 3, // "Pickup_PK_TK_GUE_EP1",
2, // "Skoda", 2, // "Octavia_ACR"
2, // "car_sedan", 2, // VWGolf
2, // "Volha_1_TK_CIV_EP1", 3, // "Lada1",
2, // "UAZ_Unarmed_TK_EP1" 3, // "Skoda",
1, // "Ikarus" 3, // "car_sedan",
1, // "SUV_TK_CIV_EP1" 3, // "Volha_1_TK_CIV_EP1",
1, // "UH1H_DZ" 1, // "VolhaLimo_TK_CIV_EP1"
1, // "Mi17_Civilian" 3, // "UAZ_Unarmed_TK_EP1"
2, // "Ikarus"
4, // "SUV_TK_CIV_EP1"
2, // "SUV_Green",
2, // "UH1H_DZ"
2, // "Mi17_Civilian"
2, // "LandRover_CZ_EP1" 2, // "LandRover_CZ_EP1"
2, // "HMMWV_Ambulance" 3, // "HMMWV_Ambulance"
1, // "ArmoredSUV_PMC" 2, // "ArmoredSUV_PMC"
2, // "PBX" 5, // "PBX"
1, // "RHIB" 2, // "RHIB"
1, // "M113Ambul_UN_EP1" 4, // "Fishing_Boat",
1, // "KamazRefuel" 3, // "M113Ambul_UN_EP1"
3]; // "CSJ_GyroP" 2, // "KamazRefuel"
2, // UralRefuel_TK_EP1
1, // "tractor"
5]; // "CSJ_GyroP"
hiveInUse = true; hiveInUse = true;
_serverMonitor = [] execVM "\z\addons\dayz_code\system\server_monitor.sqf";
// Add trader citys // Add trader citys
_nil = [] execVM "mission.sqf"; _nil = [] execVM "mission.sqf";
_serverMonitor = [] execVM "\z\addons\dayz_code\system\server_monitor.sqf";
}; };
if (!isDedicated) then { if (!isDedicated) then {

949
MPMissions/DayZ_Epoch_11.Chernarus/mission.sqf
View File

File diff suppressed because it is too large Load Diff

3
MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm
View File

@@ -13,7 +13,8 @@ class Mission
"ca_modules_functions", "ca_modules_functions",
"glt_m300t", "glt_m300t",
"sigisolda", "sigisolda",
"suv_col" "suv_col",
"csj_gyroac"
}; };
addOnsAuto[]= addOnsAuto[]=
{ {

6
dayz_code/actions/player_tagFriendly.sqf
View File

@@ -14,9 +14,9 @@ _caller setVariable ["friendlies", _friendlies, true];
_rfriendlies = _target getVariable ["friendlies", []]; _rfriendlies = _target getVariable ["friendlies", []];
if (!(_callerID in _rfriendlies)) then { if ((isNull _rfriendlies) or !(_callerID in _rfriendlies)) then {
// caller // caller
titleText [format["You have tagged %1 as friendly. Waiting for %2 to accept that.",(name _target),(name _target)]]; titleText [format["You have tagged %1 as friendly. Waiting for %1 to accept that.",(name _target)]];
// target // target
[_caller,_target,"loc",rTITLETEXT,format["%1 wants to tag you as friendly. To accept, tag %2 as friendly.", (name _caller),(name _caller)],"PLAIN DOWN"] call RE; [_caller,_target,"loc",rTITLETEXT,format["%1 wants to tag you as friendly. To accept, tag %1 as friendly.", (name _caller)],"PLAIN DOWN"] call RE;
}; };

6
dayz_code/compile/fn_selfActions.sqf
View File

@@ -313,7 +313,7 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
// [_trader_id, _category, ]; // [_trader_id, _category, ];
_buy = player addAction ["Sidearm", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[11,"Sidearm"], 99, true, false, "",""]; _buy = player addAction ["Sidearm", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[11,"Sidearm"], 99, true, false, "",""];
_buy1 = player addAction ["Rifle", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[12,"Rifle"], 97, true, false, "",""]; _buy1 = player addAction ["Rifle", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[12,"Rifle"], 97, true, false, "",""];
_buy2 = player addAction ["Shotgun", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[13,"Shotgun"], 95, true, false, "",""]; _buy2 = player addAction ["Shotgun and Crossbow", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[13,"Shotgun"], 95, true, false, "",""];
_buy3 = player addAction ["Assault Rifle", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[14,"Assault Rifle"], 93, true, false, "",""]; _buy3 = player addAction ["Assault Rifle", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[14,"Assault Rifle"], 93, true, false, "",""];
_buy4 = player addAction ["Machine Gun", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[15,"Machine Gun"], 91, true, false, "",""]; _buy4 = player addAction ["Machine Gun", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[15,"Machine Gun"], 91, true, false, "",""];
_buy5 = player addAction ["Sniper Rifle", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[16,"Sniper Rifle"], 89, true, false, "",""]; _buy5 = player addAction ["Sniper Rifle", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[16,"Sniper Rifle"], 89, true, false, "",""];
@@ -365,7 +365,7 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
// [_trader_id, _category, ]; // [_trader_id, _category, ];
_buy1 = player addAction ["Sidearm Ammo", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[1,"Sidearm Ammo"], 99, true, false, "",""]; _buy1 = player addAction ["Sidearm Ammo", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[1,"Sidearm Ammo"], 99, true, false, "",""];
_buy = player addAction ["Rifle Ammo", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[2,"Rifle Ammo"], 98, true, false, "",""]; _buy = player addAction ["Rifle Ammo", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[2,"Rifle Ammo"], 98, true, false, "",""];
_buy2 = player addAction ["Shotgun Ammo", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[3,"Shotgun Ammo"], 97, true, false, "",""]; _buy2 = player addAction ["Shotgun and Crossbow Ammo", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[3,"Shotgun Ammo"], 97, true, false, "",""];
_buy3 = player addAction ["Assault Rifle Ammo", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[4,"Assault Rifle Ammo"], 96, true, false, "",""]; _buy3 = player addAction ["Assault Rifle Ammo", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[4,"Assault Rifle Ammo"], 96, true, false, "",""];
_buy4 = player addAction ["Machine Gun Ammo", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[5,"Machine Gun Ammo"], 95, true, false, "",""]; _buy4 = player addAction ["Machine Gun Ammo", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[5,"Machine Gun Ammo"], 95, true, false, "",""];
_buy5 = player addAction ["Sniper Rifle Ammo", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[6,"Sniper Rifle Ammo"], 94, true, false, "",""]; _buy5 = player addAction ["Sniper Rifle Ammo", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[6,"Sniper Rifle Ammo"], 94, true, false, "",""];
@@ -391,9 +391,11 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
// [_trader_id, _category, ]; // [_trader_id, _category, ];
_buy = player addAction ["Boats Unarmed", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[49,"Boats Unarmed"], 97, true, false, "",""]; _buy = player addAction ["Boats Unarmed", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[49,"Boats Unarmed"], 97, true, false, "",""];
_buy1 = player addAction ["Boats Armed", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[499,"Boats Armed"], 96, true, false, "",""]; _buy1 = player addAction ["Boats Armed", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[499,"Boats Armed"], 96, true, false, "",""];
_buy2 = player addAction ["Wholesale", "\z\addons\dayz_code\actions\buy_or_sell.sqf",[999,"Wholesale"], 95, true, false, "",""];
s_player_parts set [count s_player_parts,_buy]; s_player_parts set [count s_player_parts,_buy];
s_player_parts set [count s_player_parts,_buy1]; s_player_parts set [count s_player_parts,_buy1];
s_player_parts set [count s_player_parts,_buy2];
s_player_parts_crtl = 1; s_player_parts_crtl = 1;
}; };

2
dayz_code/system/player_monitor.fsm
View File

@@ -1087,7 +1087,7 @@ class FSM
"_world = toUpper(worldName); //toUpper(getText (configFile >> ""CfgWorlds"" >> (worldName) >> ""description""));" \n "_world = toUpper(worldName); //toUpper(getText (configFile >> ""CfgWorlds"" >> (worldName) >> ""description""));" \n
"_nearestCity = (nearestLocations [getPos player, [""NameCityCapital"",""NameCity"",""NameVillage"",""NameLocal""],1000] select 0);" \n "_nearestCity = (nearestLocations [getPos player, [""NameCityCapital"",""NameCity"",""NameVillage"",""NameLocal""],1000] select 0);" \n
"_town = ""Wilderness"";" \n "_town = ""Wilderness"";" \n
"if (!isNull _nearestCity) then {_town = text _nearestCity};" \n "if (!isNil _nearestCity) then {_town = text _nearestCity};" \n
"" \n "" \n
"_strTime = call curTimeStr;" \n "_strTime = call curTimeStr;" \n
"_strDate = date;" \n "_strDate = date;" \n

17
dayz_server/compile/server_publishVehicle.sqf
View File

@@ -73,6 +73,7 @@ _key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, _da
diag_log ("HIVE: WRITE: "+ str(_key)); diag_log ("HIVE: WRITE: "+ str(_key));
_key call server_hiveWrite; _key call server_hiveWrite;
/*
_done = false; _done = false;
_retry = 0; _retry = 0;
// TODO: Needs major overhaul // TODO: Needs major overhaul
@@ -96,18 +97,18 @@ while {_retry < 99} do {
_retry = _retry + 1; _retry = _retry + 1;
}; };
}; };
if(!_done) exitWith { deleteVehicle _object; diag_log("CUSTOM: failed to get id for : " + str(_uid)); }; if(!_done) exitWith { deleteVehicle _object; diag_log("CUSTOM: failed to get id for : " + str(_uid)); };
*/
// disable marker later // disable marker later
//_marker = createMarker [str(_location) , _location]; _marker = createMarker [str(_location) , _location];
//_marker setMarkerShape "ICON"; _marker setMarkerShape "ICON";
//_marker setMarkerType "DOT"; _marker setMarkerType "DOT";
//_marker setMarkerText (typeOf _object); _marker setMarkerText (typeOf _object);
//_marker setMarkerColor "ColorBlue"; _marker setMarkerColor "ColorBlue";
// not needed yet // try this instead of commented out ID code above
// _object setVariable ["ObjectUID", _uid, true]; _object setVariable ["ObjectUID", _uid, true];
_object setVariable ["lastUpdate",time]; _object setVariable ["lastUpdate",time];
_object setVariable ["CharacterID", _characterID, true]; _object setVariable ["CharacterID", _characterID, true];

6
dayz_server/init/server_functions.sqf
View File

@@ -204,14 +204,14 @@ spawn_vehicles = {
_qty = {_x == _vehicle} count serverVehicleCounter; _qty = {_x == _vehicle} count serverVehicleCounter;
// If under limit allow to proceed // If under limit allow to proceed
if(_qty < _velimit) then { if(_qty <= _velimit) then {
_isOverLimit = false; _isOverLimit = false;
}; };
// TODO add counter to stop after X attempts // counter to stop after 5 attempts
_counter = _counter + 1; _counter = _counter + 1;
if(_counter > 5) then { if(_counter >= 5) then {
_isOverLimit = false; _isOverLimit = false;
_isAbort = true; _isAbort = true;
}; };

2
dayz_server/system/server_monitor.sqf
View File

@@ -169,7 +169,7 @@ diag_log "HIVE: Starting";
_totalvehicles = _totalvehicles + 1; _totalvehicles = _totalvehicles + 1;
// total each vehicle // total each vehicle
serverVehicleCounter set [count _serverVehicleCounter,_type]; serverVehicleCounter set [count serverVehicleCounter,_type];
}; };