Merge new MultiPlayerSetup and autojoin

This commit is contained in:
ebaydayz
2016-03-30 17:01:28 -04:00
parent 77e760fe73
commit 69091965a1
19 changed files with 669 additions and 2367 deletions

View File

@@ -20,8 +20,9 @@ class Bag_Base_EP1 : ReammoBox_EP1 {
class DZ_Patrol_Pack_EP1: Bag_Base_EP1
{
scope = public;
displayName = $STR_EPOCH_PACK_PATROL;
scope = 2;
displayName = $STR_BACKPACK_NAME_PATROL;
descriptionShort = $STR_BACKPACK_DESC_PATROL;
picture = "\ca\weapons_e\data\icons\backpack_US_ASSAULT_COYOTE_CA.paa";
icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
mapsize = 2;
@@ -36,8 +37,9 @@ class DZ_Patrol_Pack_EP1: Bag_Base_EP1
class DZ_Assault_Pack_EP1: Bag_Base_EP1
{
scope = public;
displayName = $STR_EPOCH_PACK_ASSAULT;
scope = 2;
displayName = $STR_BACKPACK_NAME_ACU;
descriptionShort = $STR_BACKPACK_DESC_ACU;
picture = "\ca\weapons_e\data\icons\backpack_US_ASSAULT_CA.paa";
icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
mapSize = 2;
@@ -47,29 +49,31 @@ class DZ_Assault_Pack_EP1: Bag_Base_EP1
class eventHandlers
{
init="[(_this select 0),'CfgVehicles','DZ_Assault_Pack_EP1'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';";
};
};
};
class DZ_Czech_Vest_Puch: Bag_Base_EP1
{
displayname = $STR_EPOCH_PACK_POUCH;
displayname = $STR_BACKPACK_NAME_VEST;
descriptionShort = $STR_BACKPACK_DESC_VEST;
icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
mapsize = 2;
model = "\ca\weapons_e\AmmoBoxes\backpack_acr_small.p3d";
picture = "\ca\weapons_e\data\icons\backpack_ACR_small_CA.paa";
scope = public;
scope = 2;
transportmaxmagazines = 12;
transportmaxweapons = 0;
class eventHandlers
{
init="[(_this select 0),'CfgVehicles','DZ_Czech_Vest_Puch'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';";
};
};
};
class DZ_ALICE_Pack_EP1: Bag_Base_EP1
{
scope = public;
displayName = $STR_EPOCH_PACK_ALICE;
scope = 2;
displayName = $STR_BACKPACK_NAME_ALICE;
descriptionShort = $STR_BACKPACK_DESC_ALICE;
picture = "\ca\weapons_e\data\icons\backpack_TK_ALICE_CA.paa";
icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
mapsize = 2;
@@ -79,13 +83,14 @@ class DZ_ALICE_Pack_EP1: Bag_Base_EP1
class eventHandlers
{
init="[(_this select 0),'CfgVehicles','DZ_ALICE_Pack_EP1'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';";
};
};
};
class DZ_TK_Assault_Pack_EP1 : Bag_Base_EP1
{
scope = public;
displayName = $STR_EPOCH_PACK_ACU;
scope = 2;
displayName = $STR_BACKPACK_NAME_SURVACU;
descriptionShort = $STR_BACKPACK_DESC_SURVACU;
mapSize = 2;
picture = "\ca\weapons_e\data\icons\backpack_CIVIL_ASSAULT_CA.paa";
icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
@@ -95,15 +100,16 @@ class DZ_TK_Assault_Pack_EP1 : Bag_Base_EP1
class eventHandlers
{
init="[(_this select 0),'CfgVehicles','DZ_TK_Assault_Pack_EP1'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';";
};
};
};
class DZ_British_ACU : Bag_Base_EP1
{
scope = public;
displayName = $STR_EPOCH_PACK_BAP;
scope = 2;
displayName = $STR_BACKPACK_NAME_BRITISH;
descriptionShort = $STR_BACKPACK_DESC_BRITISH;
mapSize = 2;
model = "\ca\weapons_baf\Backpack_Small_BAF";\
model = "\ca\weapons_baf\Backpack_Small_BAF";
picture = "\ca\weapons_baf\data\UI\backpack_BAF_CA.paa";
icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
transportMaxWeapons = 3;
@@ -111,13 +117,14 @@ class DZ_British_ACU : Bag_Base_EP1
class eventHandlers
{
init="[(_this select 0),'CfgVehicles','DZ_British_ACU'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';";
};
};
};
class DZ_CivilBackpack_EP1: Bag_Base_EP1
{
scope = public;
displayName = $STR_EPOCH_PACK_CZECH;
scope = 2;
displayName = $STR_BACKPACK_NAME_CZECH;
descriptionShort = $STR_BACKPACK_DESC_CZECH;
picture = "\ca\weapons_e\data\icons\backpack_ACR_CA.paa";
icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
mapsize = 2;
@@ -127,13 +134,14 @@ class DZ_CivilBackpack_EP1: Bag_Base_EP1
class eventHandlers
{
init="[(_this select 0),'CfgVehicles','DZ_CivilBackpack_EP1'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';";
};
};
};
class DZ_Backpack_EP1: Bag_Base_EP1
{
scope = public;
displayName = $STR_EPOCH_PACK_COYOTE;
scope = 2;
displayName = $STR_BACKPACK_NAME_COYOTE;
descriptionShort = $STR_BACKPACK_DESC_COYOTE;
picture = "\ca\weapons_e\data\icons\backpack_US_CA.paa";
icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
mapsize = 2;

View File

@@ -1,3 +1,4 @@
class Man;
class CAManBase: Man
{

View File

@@ -1,17 +1,4 @@
class WeaponHolderBase: ReammoBox {
scope = private;
accuracy = 1000;
vehicleClass = "Survival";
displayName = "Weapon";
memoryPointSupply = "collect";
supplyRadius = 3;
transportMaxWeapons = 0;
transportMaxMagazines = 0;
transportMaxBackpacks = 0;
transportAmmo = 0;
transportRepair = 0;
transportFuel = 0;
};
class WeaponHolderBase;
class WoodenArrowF : WeaponHolderBase {
scope = public;
displayName = $STR_ITEMWOODENARROW_CODE_NAME;
@@ -24,7 +11,7 @@ class WoodenArrowF : WeaponHolderBase {
};
class WeaponHolder_ItemCrowbar: WeaponHolderBase
{
scope = public;
scope=2;
displayName=$STR_EQUIP_NAME_CROWBAR;
model="\dayz_equip\models\crowbar.p3d";
class eventHandlers
@@ -35,7 +22,7 @@ class WeaponHolder_ItemCrowbar: WeaponHolderBase
/*
class WeaponHolder_MeleeBaseBallBat: WeaponHolderBase
{
scope = public;
scope=2;
displayName=$STR_EQUIP_NAME_BASEBALLBAT;
model="\z\addons\dayz_communityassets\models\baseball_bat.p3d";
class eventHandlers
@@ -45,7 +32,7 @@ class WeaponHolder_MeleeBaseBallBat: WeaponHolderBase
};
class WeaponHolder_MeleeBatBarbed: WeaponHolderBase
{
scope = public;
scope=2;
displayName=$STR_CRAFT_NAME_BaseBallBatBarbed;
model="\z\addons\dayz_communityassets\models\baseball_bat.p3d";
class eventHandlers
@@ -55,7 +42,7 @@ class WeaponHolder_MeleeBatBarbed: WeaponHolderBase
};
class WeaponHolder_MeleeBaseBallBatNails: WeaponHolderBase
{
scope = public;
scope=2;
displayName=$STR_CRAFT_NAME_NailedBaseballBat;
model="\z\addons\dayz_communityassets\models\baseball_bat_nails.p3d";
class eventHandlers
@@ -66,7 +53,7 @@ class WeaponHolder_MeleeBaseBallBatNails: WeaponHolderBase
*/
class WeaponHolder_MeleeMachete: WeaponHolderBase
{
scope = public;
scope=2;
displayName=$STR_EQUIP_NAME_MACHETE;
model="\z\addons\dayz_communityassets\models\machete.p3d";
class eventHandlers

View File

@@ -1,43 +1,43 @@
//Prevent SVI hack using BattleFieldClearance & al.
class Logic;
class BattleFieldClearance: Logic
{
vehicleClass = "Modules";
class Eventhandlers
{
init = "if (isServer) then { diag_log(""WARNING, b4ttlefieldclearance attack from player PID#""+str(owner this)); deleteVehicle this;};";
};
};
class HighCommandSubordinate: Logic
{
vehicleClass = "Modules";
class Eventhandlers
{
init = "if (isServer) then { diag_log(""WARNING, HighCommand5ubordinate attack from player PID#""+str(owner this)); deleteVehicle this;};";
};
};
class FirstAidSystem: Logic
{
vehicleClass = "Modules";
class Eventhandlers
{
init = "if (isServer) then { diag_log(""WARNING, First4idSystem attack from player PID#""+str(owner this)); deleteVehicle this;};";
};
};
class AlternativeInjurySimulation: Logic
{
vehicleClass = "Modules";
class Eventhandlers
{
init = "if (isServer) then { diag_log(""WARNING, 4lternativeInjurySimulation attack from player PID#""+str(owner this)); deleteVehicle this;};";
};
};
class FunctionsManager : Logic {
vehicleClass = "Modules";
class Eventhandlers
{
init = "diag_log format ['PRELOAD_ Functions\init %1', [_this, BIS_functions_mainscope]];if (isnil 'BIS_functions_mainscope') then { BIS_functions_mainscope = _this select 0; if (isServer) then {_this execVM 'ca\modules\functions\main.sqf'};} else {_this spawn { diag_log format ['PRELOAD_ Functions\init ERROR: deleting redundant FM! %1', [_this, (_this select 0), BIS_functions_mainscope]]; _mygrp = group (_this select 0); deleteVehicle (_this select 0); deleteGroup _mygrp;};};if (isnil 'RE') then {diag_log 'MPframework inited';[] execVM '\ca\Modules\MP\data\scripts\MPframework.sqf'};";
};
};
//Prevent SVI hack using BattleFieldClearance & al.
class Logic;
class BattleFieldClearance: Logic
{
vehicleClass = "Modules";
class Eventhandlers
{
init = "if (isServer) then { diag_log(""WARNING, b4ttlefieldclearance attack from player PID#""+str(owner this)); deleteVehicle this;};";
};
};
class HighCommandSubordinate: Logic
{
vehicleClass = "Modules";
class Eventhandlers
{
init = "if (isServer) then { diag_log(""WARNING, HighCommand5ubordinate attack from player PID#""+str(owner this)); deleteVehicle this;};";
};
};
class FirstAidSystem: Logic
{
vehicleClass = "Modules";
class Eventhandlers
{
init = "if (isServer) then { diag_log(""WARNING, First4idSystem attack from player PID#""+str(owner this)); deleteVehicle this;};";
};
};
class AlternativeInjurySimulation: Logic
{
vehicleClass = "Modules";
class Eventhandlers
{
init = "if (isServer) then { diag_log(""WARNING, 4lternativeInjurySimulation attack from player PID#""+str(owner this)); deleteVehicle this;};";
};
};
class FunctionsManager : Logic {
vehicleClass = "Modules";
class Eventhandlers
{
init = "diag_log format ['PRELOAD_ Functions\init %1', [_this, BIS_functions_mainscope]];if (isnil 'BIS_functions_mainscope') then { BIS_functions_mainscope = _this select 0; if (isServer) then {_this execVM 'ca\modules\functions\main.sqf'};} else {_this spawn { diag_log format ['PRELOAD_ Functions\init ERROR: deleting redundant FM! %1', [_this, (_this select 0), BIS_functions_mainscope]]; _mygrp = group (_this select 0); deleteVehicle (_this select 0); deleteGroup _mygrp;};};if (isnil 'RE') then {diag_log 'MPframework inited';[] execVM '\ca\Modules\MP\data\scripts\MPframework.sqf'};";
};
};