Skip to content

Commit

Permalink
Updated 1.8 to 1.8.0.2
Browse files Browse the repository at this point in the history
Fixed issues with kill messages
fixed issues with messaging

Signed-off-by: thevisad <thevisad@gmail.com>
  • Loading branch information
thevisad committed Oct 11, 2013
1 parent dadbb54 commit 5f6e8a9
Show file tree
Hide file tree
Showing 31 changed files with 990 additions and 2,219 deletions.
2 changes: 1 addition & 1 deletion RealityCPWorlds.cfg
@@ -1,4 +1,4 @@
Chernarus,chernarus,1771
Chernarus,chernarus,18
Lingor,lingor,1771
DayZ+,dayzplus,1744
DayZ2017,dayz2017.chernarus,1744
Expand Down
1 change: 1 addition & 0 deletions clean.cmd
@@ -0,0 +1 @@
perl build.pl --clean
5 changes: 1 addition & 4 deletions missions/mission18/killmsgs/init.sqf
@@ -1,12 +1,9 @@
startLoadingScreen ["","RscDisplayLoadCustom"];
cutText ["","BLACK OUT"];
enableSaving [false, false];

//Server Settings
dayZ_instance = 1; // The instance
//dayZ_serverName = "UK1337"; // Servername (country code + server number)
dayz_antihack = 0; // DayZ Antihack / 1 = enabled // 0 = disabled
dayz_REsec = 0; // DayZ RE Security / 1 = enabled // 0 = disabled
enableRadio true; // false = radio off

//Game Settings
dayz_spawnselection = 0; // DayZ Spawnselection / 1 = enabled // 0 = disabled, No current spawn limits.
Expand Down
7 changes: 2 additions & 5 deletions missions/mission18/messaging/init.sqf
@@ -1,16 +1,13 @@
startLoadingScreen ["","RscDisplayLoadCustom"];
cutText ["","BLACK OUT"];
enableSaving [false, false];

//Server Settings
dayZ_instance = 1; // The instance
//dayZ_serverName = "UK1337"; // Servername (country code + server number)
dayz_antihack = 0; // DayZ Antihack / 1 = enabled // 0 = disabled
dayz_REsec = 0; // DayZ RE Security / 1 = enabled // 0 = disabled
enableRadio true; // false = radio off

//Game Settings
dayz_spawnselection = 0; // DayZ Spawnselection / 1 = enabled // 0 = disabled, No current spawn limits.
dayz_spawnCrashSite_clutterCutter = 0; // Helicrash Settings / 0 = loot hidden in grass // 1 = loot lifted // 2 = no grass around the Helicrash
dayz_spawnInfectedSite_clutterCutter = 0; // Infected Base Settings / 0 = loot hidden in grass // 1 = loot lifted // 2 = no grass around the infected base

#include "\z\addons\dayz_code\system\mission\init.sqf"
#include "\z\addons\dayz_code\system\mission\init.sqf"
6 changes: 5 additions & 1 deletion missions/mission18/world/chernarus/description.ext
Expand Up @@ -5,7 +5,7 @@ OnLoadIntro = "Welcome to Chernarus";
OnLoadIntroTime = False;
OnLoadMissionTime = False;
disabledAI = true;
disableChannels[] = {0,2,6};
disableChannels[] = {2,6};
enableItemsDropping = 0;
onPauseScript = "";
briefing = 0;
Expand All @@ -20,4 +20,8 @@ class Header
maxPlayers = 100; //Max # of players the mission supports
};

aiKills = 1;
diagRadio = 1;
diagHit = 1;

#include "\z\addons\dayz_code\system\mission\description.sqf"
11 changes: 4 additions & 7 deletions missions/mission18/world/chernarus/init.sqf
@@ -1,16 +1,13 @@
startLoadingScreen ["","RscDisplayLoadCustom"];
cutText ["","BLACK OUT"];
enableSaving [false, false];

//Server Settings
dayZ_instance = 1; // The instance
//dayZ_serverName = "UK1337"; // Servername (country code + server number)
dayz_antihack = 0; // DayZ Antihack / 1 = enabled // 0 = disabled
dayz_REsec = 0; // DayZ RE Security / 1 = enabled // 0 = disabled
dayz_antihack = 1; // DayZ Antihack / 1 = enabled // 0 = disabled
dayz_REsec = 1; // DayZ RE Security / 1 = enabled // 0 = disabled
enableRadio false; // false = radio off

//Game Settings
dayz_spawnselection = 0; // DayZ Spawnselection / 1 = enabled // 0 = disabled, No current spawn limits.
dayz_spawnCrashSite_clutterCutter = 0; // Helicrash Settings / 0 = loot hidden in grass // 1 = loot lifted // 2 = no grass around the Helicrash
dayz_spawnInfectedSite_clutterCutter = 0; // Infected Base Settings / 0 = loot hidden in grass // 1 = loot lifted // 2 = no grass around the infected base

#include "\z\addons\dayz_code\system\mission\init.sqf"
#include "\z\addons\dayz_code\system\mission\init.sqf"
Expand Up @@ -14,24 +14,23 @@ server_onPlayerDisconnect = compile preprocessFileLineNumbers "\z\addons\dayz_se
server_updateObject = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_updateObject.sqf";
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_publishBld = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishBuilding.sqf"; //Creates the building in DB
server_deleteObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_deleteObj.sqf"; //Removes the object from the DB
server_playerSync = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerSync.sqf";
zombie_findOwner = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\zombie_findOwner.sqf";
server_updateNearbyObjects = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_updateNearbyObjects.sqf";
server_spawnCrashSite = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_spawnCrashSite.sqf";
fnc_plyrHit = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\fnc_plyrHit.sqf";
server_sendToClient = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_sendToClient.sqf";
server_Wildgenerate = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\zombie_Wildgenerate.sqf";
server_plantSpawner = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_plantSpawner.sqf";

//Get instance name (e.g. dayz_1.chernarus)
fnc_instanceName = {
"dayz_" + str(dayz_instance) + "." + worldName
};
spawnComposition = compile preprocessFileLineNumbers "ca\modules\dyno\data\scripts\objectMapper.sqf"; //"\z\addons\dayz_code\compile\object_mapper.sqf";
fn_bases = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\fn_bases.sqf";

// vehicle_handleInteract = {
// private["_object"];
// _object = _this select 0;
// if (_object in needUpdate_objects) then {
// needUpdate_objects = needUpdate_objects - [_object];
// };
// [_object, "all",true] call server_updateObject;
// };

vehicle_handleServerKilled = {
private["_unit","_killer"];
_unit = _this select 0;
Expand All @@ -40,18 +39,23 @@ vehicle_handleServerKilled = {
[_unit, "killed"] call server_updateObject;

_unit removeAllMPEventHandlers "MPKilled";
_unit removeAllMPEventHandlers "mphit";
_unit removeAllMPEventHandlers "mprespawn";
_unit removeAllEventHandlers "FiredNear";
_unit removeAllEventHandlers "Killed";
_unit removeAllEventHandlers "HandleDamage";
_unit removeAllEventHandlers "GetIn";
_unit removeAllEventHandlers "GetOut";
_unit removeAllEventHandlers "Fired";
_unit removeAllEventHandlers "Local";
};

check_publishobject = {
private["_allowed","_allowedObjects","_object"];
private ["_allowed","_allowedObjects","_object","_playername"];

_object = _this select 0;
_playername = _this select 1;
_allowedObjects = ["TentStorage", "Hedgehog_DZ", "Sandbag1_DZ", "TrapBear", "Wire_cat1", "StashSmall", "StashMedium"];
_allowedObjects = ["TentStorage", "Hedgehog_DZ", "Sandbag1_DZ", "BearTrap_DZ", "Wire_cat1", "StashSmall", "StashMedium", "DomeTentStorage", "CamoNet_DZ", "Trap_Cans", "TrapTripwireFlare", "TrapBearTrapSmoke", "TrapTripwireGrenade", "TrapTripwireSmoke", "TrapBearTrapFlare"];
_allowed = false;

#ifdef OBJECT_DEBUG
Expand All @@ -65,16 +69,16 @@ check_publishobject = {
_allowed = true;
};

_allowed
_allowed;
};

//event Handlers
eh_localCleanup = {
private ["_object"];
_object = _this select 0;

private ["_object","_type","_unit"];
_object = _this select 0;
_object addEventHandler ["local", {
if(_this select 1) then {
private["_type","_unit"];
_unit = _this select 0;
_type = typeOf _unit;
_myGroupUnit = group _unit;
Expand All @@ -92,9 +96,7 @@ eh_localCleanup = {
deleteVehicle _unit;
deleteGroup _myGroupUnit;
_unit = nil;
#ifdef SERVER_DEBUG
diag_log ("CLEANUP: DELETED A " + str(_type) );
#endif
};
}];
};
Expand All @@ -113,25 +115,9 @@ server_hiveReadWrite = {
_data = "HiveExt" callExtension _key;
//diag_log ("READ/WRITE: " +str(_data));
_resultArray = call compile format ["%1",_data];
_resultArray
_resultArray;
};

// server_characterSync = {
// private ["_characterID","_playerPos","_playerGear","_playerBackp","_medical","_currentState","_currentModel","_key"];
// _characterID = _this select 0;
// _playerPos = _this select 1;
// _playerGear = _this select 2;
// _playerBackp = _this select 3;
// _medical = _this select 4;
// _currentState = _this select 5;
// _currentModel = _this select 6;
//
// _key = format["CHILD:201:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:",_characterID,_playerPos,_playerGear,_playerBackp,_medical,false,false,0,0,0,0,_currentState,0,0,_currentModel,0];
// //diag_log ("HIVE: WRITE: "+ str(_key) + " / " + _characterID);
// _key call server_hiveWrite;
// };

//onPlayerConnected "[_uid,_name] spawn server_onPlayerConnect;";
onPlayerDisconnected "[_uid,_name] call server_onPlayerDisconnect;";

server_getDiff = {
Expand All @@ -149,7 +135,7 @@ server_getDiff = {
_result = _vNew - _vOld;
_object setVariable[(_variable + "_CHK"),_vNew];
};
_result
_result;
};

server_getDiff2 = {
Expand All @@ -160,18 +146,9 @@ server_getDiff2 = {
_vOld = _object getVariable[(_variable + "_CHK"),_vNew];
_result = _vNew - _vOld;
_object setVariable[(_variable + "_CHK"),_vNew];
_result
_result;
};

// dayz_objectUID = {
// private["_position","_dir","_key","_object"];
// _object = _this;
// _position = getPosATL _object;
// _dir = direction _object;
// _key = [_dir,_position] call dayz_objectUID2;
// _key
// };

dayz_objectUID2 = {
private["_position","_dir","_key"];
_dir = _this select 0;
Expand All @@ -183,7 +160,7 @@ dayz_objectUID2 = {
_key = _key + str(round(_x));
} forEach _position;
_key = _key + str(round(_dir));
_key
_key;
};

dayz_recordLogin = {
Expand Down

0 comments on commit 5f6e8a9

Please sign in to comment.