diff --git a/MPMissions/DayZ_Epoch_11.Chernarus/description.ext b/MPMissions/DayZ_Epoch_11.Chernarus/description.ext index da54edde2..2f361c10a 100644 --- a/MPMissions/DayZ_Epoch_11.Chernarus/description.ext +++ b/MPMissions/DayZ_Epoch_11.Chernarus/description.ext @@ -1,12 +1,14 @@ respawn = "BASE"; respawndelay = 5; -onLoadMission= "DayZ_Epoch Chernarus"; -OnLoadIntro = "Welcome to Chernarus"; +onLoadMission= "DayZ Epoch Chernarus"; +OnLoadIntro = "Welcome to DayZ Epoch Chernarus"; OnLoadIntroTime = False; OnLoadMissionTime = False; disabledAI = true; -disableChannels[]={0,1,2}; +disableChannels[]={0,1,2,6}; enableItemsDropping = 0; +onPauseScript = "onpause.sqf"; +loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa"; class Header { diff --git a/MPMissions/DayZ_Epoch_11.Chernarus/dynamic_vehicle.sqf b/MPMissions/DayZ_Epoch_11.Chernarus/dynamic_vehicle.sqf new file mode 100644 index 000000000..a9a43f2af --- /dev/null +++ b/MPMissions/DayZ_Epoch_11.Chernarus/dynamic_vehicle.sqf @@ -0,0 +1,122 @@ +AllowedVehiclesList = [ + "Old_moto_TK_Civ_EP1", + "MMT_Civ", + "Old_bike_TK_INS_EP1", + "ATV_US_EP1", + "hilux1_civil_3_open_EP1", + "datsun1_civil_3_open", + "Pickup_PK_TK_GUE_EP1", + "Octavia_ACR", + "VWGolf", + "Lada1", + "Skoda", + "car_sedan", + "Volha_1_TK_CIV_EP1", + "VolhaLimo_TK_CIV_EP1", + "UAZ_Unarmed_TK_EP1", + "Ikarus", + "SUV_TK_CIV_EP1", + "SUV_Green", + "SUV_Yellow", + "SUV_White", + "SUV_Silver", + "SUV_Red", + "SUV_Pink", + "SUV_Orange", + "SUV_Charcoal", + "SUV_Blue", + "UH1H_DZ", + "Mi17_Civilian", + "LandRover_CZ_EP1", + "HMMWV_Ambulance", + "ArmoredSUV_PMC", + "PBX", + "RHIB", + "Fishing_Boat", + "M113Ambul_UN_EP1", + "KamazRefuel", + "UralRefuel_TK_EP1", + "tractor", + "CSJ_GyroP"]; + +AllowedVehiclesChance = [ + 0.25, // "Old_moto_TK_Civ_EP1", + 0.55, // "MMT_Civ" + 0.55, // Old_bike_TK_INS_EP1 + 0.45, // "ATV_US_EP1", + 0.55, // "hilux1_civil_3_open_EP1", + 0.25, // "datsun1_civil_3_open", + 0.20, // "Pickup_PK_TK_GUE_EP1", + 0.20, // Octavia_ACR + 0.20, // VWGolf + 0.25, // "Lada1", + 0.25, // "Skoda", + 0.2, // "car_sedan", + 0.2, // "Volha_1_TK_CIV_EP1", + 0.05, // "VolhaLimo_TK_CIV_EP1" + 0.15, // "UAZ_Unarmed_TK_EP1" + 0.01, // "Ikarus" + 0.1, // "SUV_TK_CIV_EP1" + 0.1, // "SUV_Green", + 0.1, // "SUV_Yellow", + 0.1, // "SUV_White", + 0.1, // "SUV_Silver", + 0.1, // "SUV_Red", + 0.1, // "SUV_Pink", + 0.1, // "SUV_Orange", + 0.1, // "SUV_Charcoal", + 0.1, // "SUV_Blue", + 0.05, // "UH1H_DZ" + 0.09, // "Mi17_Civilian" + 0.11, // "LandRover_CZ_EP1" + 0.11, // "HMMWV_Ambulance" + 0.05, // "ArmoredSUV_PMC" + 0.15, // "PBX" + 0.01, // "RHIB" + 0.1, // "Fishing_Boat", + 0.01, // "M113Ambul_UN_EP1" + 0.01, // "KamazRefuel" + 0.01, // UralRefuel_TK_EP1 + 0.1, // "tractor" + 0.1]; // "CSJ_GyroP" + +AllowedVehiclesLimit = [ + 5, // "Old_moto_TK_Civ_EP1", + 10, // "MMT_Civ" + 10, // Old_bike_TK_INS_EP1 + 5, // "ATV_US_EP1", + 5, // "hilux1_civil_3_open_EP1", + 5, // "datsun1_civil_3_open", + 3, // "Pickup_PK_TK_GUE_EP1", + 2, // "Octavia_ACR" + 2, // "VWGolf" + 3, // "Lada1", + 3, // "Skoda", + 3, // "car_sedan", + 3, // "Volha_1_TK_CIV_EP1", + 1, // "VolhaLimo_TK_CIV_EP1" + 3, // "UAZ_Unarmed_TK_EP1" + 2, // "Ikarus" + 4, // "SUV_TK_CIV_EP1" + 2, // "SUV_Green", + 1, // "SUV_Yellow", + 1, // "SUV_White", + 1, // "SUV_Silver", + 1, // "SUV_Red", + 1, // "SUV_Pink", + 1, // "SUV_Orange", + 1, // "SUV_Charcoal", + 1, // "SUV_Blue", + 2, // "UH1H_DZ" + 2, // "Mi17_Civilian" + 2, // "LandRover_CZ_EP1" + 3, // "HMMWV_Ambulance" + 2, // "ArmoredSUV_PMC" + 5, // "PBX" + 2, // "RHIB" + 4, // "Fishing_Boat", + 3, // "M113Ambul_UN_EP1" + 2, // "KamazRefuel" + 2, // UralRefuel_TK_EP1 + 1, // "tractor" + 5]; // "CSJ_GyroP" \ No newline at end of file diff --git a/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index e81278c35..8f056cad7 100644 --- a/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -6,9 +6,7 @@ cutText ["","BLACK OUT"]; enableSaving [false, false]; //REALLY IMPORTANT VALUES -dayZ_hivePipe1 = "\\.\pipe\dayz"; //The named pipe -dayZ_instance = 11; //The instance -hiveInUse = true; +dayZ_instance = 11; //The instance dayzHiveRequest = []; initialized = false; dayz_previousID = 0; @@ -27,135 +25,6 @@ MaxDynamicDebris = 500; // Default = 100 dayz_MapArea = 14000; // Default = 10000 dayz_maxLocalZombies = 40; // Default = 40 -// DayZ Epoch TRADERS -serverTraders = [ - "TK_CIV_Takistani04_EP1", - "CIV_EuroMan01_EP1", - "Rocker4", - "Woodlander3", - "Woodlander1", - "RU_WorkWoman1", - "RU_WorkWoman5", - "CIV_EuroMan02_EP1", - "RU_Citizen3", - "Worker3", - "Profiteer4", - "Dr_Hladik_EP1", - "Doctor", - "RU_Functionary1", - "RU_Villager3" -]; - -// Weapons Traders -menu_CIV_EuroMan01_EP1 = [ - [["Sidearm",11],["Rifle",12],["Shotgun",13],["Assault Rifle",14],["Machine Gun",15],["Sniper Rifle",16]], - [], - "friendly" -]; -menu_Rocker4 = [ - [["Sidearm",1111],["Rifle",1212],["Shotgun",1313],["Assault Rifle",1414],["Machine Gun",1515],["Sniper Rifle",1616]], - [], - "friendly" -]; - -// Parts Traders -menu_Woodlander3 = [ - [["Car Parts",21],["Building Supplies",22]], - [], - "friendly" -]; -menu_Woodlander1 = [ - [["Car Parts",2121],["Building Supplies",2222]], - [], - "friendly" -]; - -// Can Traders -menu_RU_WorkWoman1 = [ - [["Food and Drinks",51],["Backpacks",52],["Toolbelt",53],["Clothes",54]], - [ - ["ItemCopperBar","ItemSodaEmpty",1,3,"buy","Empty Soda Cans","Copper Bar",103], - ["ItemCopperBar","TrashTinCan",1,3,"buy","Empty Tin Cans","Copper Bar",102], - ["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101] - ], - "friendly" -]; -menu_RU_WorkWoman5 = [ - [["Food and Drinks",5151],["Backpacks",5252],["Toolbelt",5353],["Clothes",5454]], - [ - ["ItemCopperBar","ItemSodaEmpty",1,3,"buy","Empty Soda Cans","Copper Bar",103], - ["ItemCopperBar","TrashTinCan",1,3,"buy","Empty Tin Cans","Copper Bar",102], - ["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101] - ], - "friendly" -]; -// Ammo Traders -menu_CIV_EuroMan02_EP1 = [ - [["Sidearm Ammo",1],["Rifle Ammo",2],["Shotgun and Crossbow Ammo",3],["Assault Rifle Ammo",4],["Machine Gun Ammo",5],["Sniper Rifle Ammo",6]], - [], - "friendly" -]; -menu_RU_Citizen3 = [ - [["Sidearm Ammo",1001],["Rifle Ammo",2002],["Shotgun and Crossbow Ammo",3003],["Assault Rifle Ammo",4004],["Machine Gun Ammo",5005],["Sniper Rifle Ammo",6006]], - [], - "friendly" -]; -// Auto Traders -menu_Worker3 = [ - [["Cars",41],["Trucks Unarmed",42],["SUV",466],["Buses and Vans",467],["Offroad",43],["Helicopter Unarmed",44],["Military Unarmed",45]], - [], - "friendly" -]; -menu_Profiteer4 = [ - [["Trucks Armed",422],["Utility",46],["Helicopter Armed",444],["Military Armed",455],["Fuel Trucks",47],["Heavy Armor Unarmed",48]], - [], - "friendly" -]; - -// Doctors -menu_Dr_Hladik_EP1 = [ - [["Medical Supplies",31],["Chem-lites/Flares",32],["Smoke Grenades",33]], - [["FoodBioMeat","ItemZombieParts",1,1,"buy","Zombie Parts","Bio Meat",101]], - "friendly" -]; -menu_Doctor = [ - [["Medical Supplies",3131],["Chem-lites/Flares",3232],["Smoke Grenades",3333]], - [["FoodBioMeat","ItemZombieParts",1,1,"buy","Zombie Parts","Bio Meat",101]], - "friendly" -]; - -// Metals Traders -menu_RU_Functionary1 = [ - [["Vaults",411]], - [ - ["ItemSilverBar","ItemCopperBar",1,6,"buy","Copper","Silver",99], - ["ItemCopperBar","ItemSilverBar",6,1,"buy","Silver","Copper",98], - ["ItemGoldBar","ItemSilverBar",1,6,"buy","Silver","Gold",97], - ["ItemSilverBar","ItemGoldBar",6,1,"buy","Gold","Silver",96] - ], - "neutral" -]; - -// Boat Traders -menu_RU_Villager3 = [ - [["Boats Unarmed",49],["Boats Armed",499]], - [ - ["ItemJerrycanEmpty","ItemCopperBar",1,1,"buy","Copper Bar","Empty Jerrycan",101], - ["ItemGenerator","ItemGoldBar",1,3,"buy","Gold Bars","Portable Generator",100] - ], - "neutral" -]; - -menu_TK_CIV_Takistani04_EP1 = [ - [["Explosives",23]], - [], - "neutral" -]; - -// ["friendly"] must have more than -2000 humanity, -// ["neutral"] can have any ammount of humanity -// ["hostile"] must have lower than -2000 -// OLD ["Wholesale",999] //Load in compiled functions call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; //Initilize the Variables (IMPORTANT: Must happen very early) @@ -165,6 +34,8 @@ progressLoadingScreen 0.2; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; //Functions used by CLIENT for medical progressLoadingScreen 0.4; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; //Compile regular functions +progressLoadingScreen 0.5; +call compile preprocessFileLineNumbers "server_traders.sqf"; //Compile trader configs progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; @@ -182,129 +53,7 @@ if ((!isServer) && (player != player)) then }; if (isServer) then { - - // TODO: Still Needs major overhaul current method is not ideal - AllowedVehiclesList = [ "Old_moto_TK_Civ_EP1", - "MMT_Civ", - "Old_bike_TK_INS_EP1", - "ATV_US_EP1", - "hilux1_civil_3_open_EP1", - "datsun1_civil_3_open", - "Pickup_PK_TK_GUE_EP1", - "Octavia_ACR", - "VWGolf", - "Lada1", - "Skoda", - "car_sedan", - "Volha_1_TK_CIV_EP1", - "VolhaLimo_TK_CIV_EP1", - "UAZ_Unarmed_TK_EP1", - "Ikarus", - "SUV_TK_CIV_EP1", - "SUV_Green", - "SUV_Yellow", - "SUV_White", - "SUV_Silver", - "SUV_Red", - "SUV_Pink", - "SUV_Orange", - "SUV_Charcoal", - "SUV_Blue", - "UH1H_DZ", - "Mi17_Civilian", - "LandRover_CZ_EP1", - "HMMWV_Ambulance", - "ArmoredSUV_PMC", - "PBX", - "RHIB", - "Fishing_Boat", - "M113Ambul_UN_EP1", - "KamazRefuel", - "UralRefuel_TK_EP1", - "tractor", - "CSJ_GyroP"]; - - AllowedVehiclesChance = [ 0.25, // "Old_moto_TK_Civ_EP1", - 0.55, // "MMT_Civ" - 0.55, // Old_bike_TK_INS_EP1 - 0.45, // "ATV_US_EP1", - 0.55, // "hilux1_civil_3_open_EP1", - 0.25, // "datsun1_civil_3_open", - 0.20, // "Pickup_PK_TK_GUE_EP1", - 0.20, // Octavia_ACR - 0.20, // VWGolf - 0.25, // "Lada1", - 0.25, // "Skoda", - 0.2, // "car_sedan", - 0.2, // "Volha_1_TK_CIV_EP1", - 0.05, // "VolhaLimo_TK_CIV_EP1" - 0.15, // "UAZ_Unarmed_TK_EP1" - 0.01, // "Ikarus" - 0.1, // "SUV_TK_CIV_EP1" - 0.1, // "SUV_Green", - 0.1, // "SUV_Yellow", - 0.1, // "SUV_White", - 0.1, // "SUV_Silver", - 0.1, // "SUV_Red", - 0.1, // "SUV_Pink", - 0.1, // "SUV_Orange", - 0.1, // "SUV_Charcoal", - 0.1, // "SUV_Blue", - 0.05, // "UH1H_DZ" - 0.09, // "Mi17_Civilian" - 0.11, // "LandRover_CZ_EP1" - 0.11, // "HMMWV_Ambulance" - 0.05, // "ArmoredSUV_PMC" - 0.15, // "PBX" - 0.01, // "RHIB" - 0.1, // "Fishing_Boat", - 0.01, // "M113Ambul_UN_EP1" - 0.01, // "KamazRefuel" - 0.01, // UralRefuel_TK_EP1 - 0.1, // "tractor" - 0.1]; // "CSJ_GyroP" - - AllowedVehiclesLimit = [ 5, // "Old_moto_TK_Civ_EP1", - 10, // "MMT_Civ" - 10, // Old_bike_TK_INS_EP1 - 5, // "ATV_US_EP1", - 5, // "hilux1_civil_3_open_EP1", - 5, // "datsun1_civil_3_open", - 3, // "Pickup_PK_TK_GUE_EP1", - 2, // "Octavia_ACR" - 2, // "VWGolf" - 3, // "Lada1", - 3, // "Skoda", - 3, // "car_sedan", - 3, // "Volha_1_TK_CIV_EP1", - 1, // "VolhaLimo_TK_CIV_EP1" - 3, // "UAZ_Unarmed_TK_EP1" - 2, // "Ikarus" - 4, // "SUV_TK_CIV_EP1" - 2, // "SUV_Green", - 1, // "SUV_Yellow", - 1, // "SUV_White", - 1, // "SUV_Silver", - 1, // "SUV_Red", - 1, // "SUV_Pink", - 1, // "SUV_Orange", - 1, // "SUV_Charcoal", - 1, // "SUV_Blue", - 2, // "UH1H_DZ" - 2, // "Mi17_Civilian" - 2, // "LandRover_CZ_EP1" - 3, // "HMMWV_Ambulance" - 2, // "ArmoredSUV_PMC" - 5, // "PBX" - 2, // "RHIB" - 4, // "Fishing_Boat", - 3, // "M113Ambul_UN_EP1" - 2, // "KamazRefuel" - 2, // UralRefuel_TK_EP1 - 1, // "tractor" - 5]; // "CSJ_GyroP" - - hiveInUse = true; + call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs // Add trader citys _nil = [] execVM "mission.sqf"; diff --git a/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm b/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm index c7846dbb8..5693bc59f 100644 --- a/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm +++ b/MPMissions/DayZ_Epoch_11.Chernarus/mission.sqm @@ -31,8 +31,8 @@ class Mission randomSeed=11171215; class Intel { - briefingName="DayZ_Epoch Chernarus"; - briefingDescription="DayZ_Epoch Chernarus Private Server"; + briefingName="DayZ Epoch Chernarus"; + briefingDescription="DayZ Epoch Chernarus Private Server"; startWeather=0.067362607; forecastWeather=0.52341133; year=2008; diff --git a/MPMissions/DayZ_Epoch_11.Chernarus/onpause.sqf b/MPMissions/DayZ_Epoch_11.Chernarus/onpause.sqf new file mode 100644 index 000000000..0c1a52824 --- /dev/null +++ b/MPMissions/DayZ_Epoch_11.Chernarus/onpause.sqf @@ -0,0 +1,34 @@ +private["_display","_btnRespawn","_btnAbort","_timeOut","_timeMax"]; +disableSerialization; +_display = _this select 0; +_btnRespawn = _display displayCtrl 1010; +_btnAbort = _display displayCtrl 104; +_btnRespawn ctrlEnable false; +_btnAbort ctrlEnable false; +_timeOut = 0; +_timeMax = 30; + +while {!isNull _display} do { + switch true do { + case ({isPlayer _x} count (player nearEntities ["AllVehicles", 6]) > 1) : { + _btnAbort ctrlEnable false; + cutText ["Cannot Abort near another player!", "PLAIN DOWN"]; + }; + case (_timeOut < _timeMax && count (player nearEntities ["zZombie_Base", 50]) > 0) : { + _btnAbort ctrlEnable false; + cutText [format ["Can Abort in %1", (_timeMax - _timeOut)], "PLAIN DOWN"]; + _timeOut = _timeOut + 1; + + }; + case (player getVariable["combattimeout", 0] >= time) : { + _btnAbort ctrlEnable false; + cutText ["Cannot Abort while in combat!", "PLAIN DOWN"]; + }; + default { + _btnAbort ctrlEnable true; + cutText ["", "PLAIN DOWN"]; + }; + }; + sleep 1; +}; +cutText ["", "PLAIN DOWN"]; \ No newline at end of file diff --git a/MPMissions/DayZ_Epoch_11.Chernarus/server_traders.sqf b/MPMissions/DayZ_Epoch_11.Chernarus/server_traders.sqf new file mode 100644 index 000000000..6c0548f4b --- /dev/null +++ b/MPMissions/DayZ_Epoch_11.Chernarus/server_traders.sqf @@ -0,0 +1,130 @@ +// DayZ Epoch TRADERS +serverTraders = [ + "TK_CIV_Takistani04_EP1", + "CIV_EuroMan01_EP1", + "Rocker4", + "Woodlander3", + "Woodlander1", + "RU_WorkWoman1", + "RU_WorkWoman5", + "CIV_EuroMan02_EP1", + "RU_Citizen3", + "Worker3", + "Profiteer4", + "Dr_Hladik_EP1", + "Doctor", + "RU_Functionary1", + "RU_Villager3" +]; + +// Weapons Traders +menu_CIV_EuroMan01_EP1 = [ + [["Sidearm",11],["Rifle",12],["Shotgun",13],["Assault Rifle",14],["Machine Gun",15],["Sniper Rifle",16]], + [], + "friendly" +]; +menu_Rocker4 = [ + [["Sidearm",1111],["Rifle",1212],["Shotgun",1313],["Assault Rifle",1414],["Machine Gun",1515],["Sniper Rifle",1616]], + [], + "friendly" +]; + +// Parts Traders +menu_Woodlander3 = [ + [["Car Parts",21],["Building Supplies",22]], + [], + "friendly" +]; +menu_Woodlander1 = [ + [["Car Parts",2121],["Building Supplies",2222]], + [], + "friendly" +]; + +// Can Traders +menu_RU_WorkWoman1 = [ + [["Food and Drinks",51],["Backpacks",52],["Toolbelt",53],["Clothes",54]], + [ + ["ItemCopperBar","ItemSodaEmpty",1,3,"buy","Empty Soda Cans","Copper Bar",103], + ["ItemCopperBar","TrashTinCan",1,3,"buy","Empty Tin Cans","Copper Bar",102], + ["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101] + ], + "friendly" +]; +menu_RU_WorkWoman5 = [ + [["Food and Drinks",5151],["Backpacks",5252],["Toolbelt",5353],["Clothes",5454]], + [ + ["ItemCopperBar","ItemSodaEmpty",1,3,"buy","Empty Soda Cans","Copper Bar",103], + ["ItemCopperBar","TrashTinCan",1,3,"buy","Empty Tin Cans","Copper Bar",102], + ["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101] + ], + "friendly" +]; +// Ammo Traders +menu_CIV_EuroMan02_EP1 = [ + [["Sidearm Ammo",1],["Rifle Ammo",2],["Shotgun and Crossbow Ammo",3],["Assault Rifle Ammo",4],["Machine Gun Ammo",5],["Sniper Rifle Ammo",6]], + [], + "friendly" +]; +menu_RU_Citizen3 = [ + [["Sidearm Ammo",1001],["Rifle Ammo",2002],["Shotgun and Crossbow Ammo",3003],["Assault Rifle Ammo",4004],["Machine Gun Ammo",5005],["Sniper Rifle Ammo",6006]], + [], + "friendly" +]; +// Auto Traders +menu_Worker3 = [ + [["Cars",41],["Trucks Unarmed",42],["SUV",466],["Buses and Vans",467],["Offroad",43],["Helicopter Unarmed",44],["Military Unarmed",45]], + [], + "friendly" +]; +menu_Profiteer4 = [ + [["Trucks Armed",422],["Utility",46],["Helicopter Armed",444],["Military Armed",455],["Fuel Trucks",47],["Heavy Armor Unarmed",48]], + [], + "friendly" +]; + +// Doctors +menu_Dr_Hladik_EP1 = [ + [["Medical Supplies",31],["Chem-lites/Flares",32],["Smoke Grenades",33]], + [["FoodBioMeat","ItemZombieParts",1,1,"buy","Zombie Parts","Bio Meat",101]], + "friendly" +]; +menu_Doctor = [ + [["Medical Supplies",3131],["Chem-lites/Flares",3232],["Smoke Grenades",3333]], + [["FoodBioMeat","ItemZombieParts",1,1,"buy","Zombie Parts","Bio Meat",101]], + "friendly" +]; + +// Metals Traders +menu_RU_Functionary1 = [ + [["Vaults",411]], + [ + ["ItemSilverBar","ItemCopperBar",1,6,"buy","Copper","Silver",99], + ["ItemCopperBar","ItemSilverBar",6,1,"buy","Silver","Copper",98], + ["ItemGoldBar","ItemSilverBar",1,6,"buy","Silver","Gold",97], + ["ItemSilverBar","ItemGoldBar",6,1,"buy","Gold","Silver",96] + ], + "neutral" +]; + +// Boat Traders +menu_RU_Villager3 = [ + [["Boats Unarmed",49],["Boats Armed",499]], + [ + ["ItemJerrycanEmpty","ItemCopperBar",1,1,"buy","Copper Bar","Empty Jerrycan",101], + ["ItemGenerator","ItemGoldBar",1,3,"buy","Gold Bars","Portable Generator",100] + ], + "neutral" +]; + +menu_TK_CIV_Takistani04_EP1 = [ + [["Explosives",23]], + [], + "neutral" +]; + +// ["friendly"] must have more than -2000 humanity, +// ["neutral"] can have any ammount of humanity +// ["hostile"] must have lower than -2000 +// OLD ["Wholesale",999] + diff --git a/dayz_code/compile/fn_damageHandler.sqf b/dayz_code/compile/fn_damageHandler.sqf index 5f50d8317..024f0a749 100644 --- a/dayz_code/compile/fn_damageHandler.sqf +++ b/dayz_code/compile/fn_damageHandler.sqf @@ -4,7 +4,7 @@ scriptName "Functions\misc\fn_damageHandler.sqf"; - Function - [unit, selectionName, damage, source, projectile] call fnc_usec_damageHandler; ************************************************************/ -private["_unit","_humanityHit","_myKills","_isBandit","_hit","_damage","_isPlayer","_unconscious","_wound","_isHit","_isInjured","_type","_hitPain","_inPain","_isDead","_isCardiac","_killerID","_evType","_recordable","_inVehicle","_isHeadHit","_isMinor","_scale","_canHitFree"]; +private["_unit","_humanityHit","_myKills","_isBandit","_hit","_damage","_isPlayer","_unconscious","_wound","_isHit","_isInjured","_type","_hitPain","_inPain","_isDead","_isCardiac","_killerID","_evType","_recordable","_isHeadHit","_isMinor","_scale","_canHitFree"]; _unit = _this select 0; _hit = _this select 1; _damage = _this select 2; @@ -14,13 +14,12 @@ _ammo = _this select 4; _type = [_damage,_ammo] call fnc_usec_damageType; _isMinor = (_hit in USEC_MinorWounds); _isHeadHit = (_hit == "head_hit"); -_inVehicle = (vehicle _unit != _unit); _evType = ""; _recordable = false; _isPlayer = (isPlayer _source); _humanityHit = 0; _myKills = 0; -_sourceZombie = _source isKindOf "zZombie_base"; +_unitIsPlayer = _unit == player; //Publish Damage //player sidechat format["Processed damage for %1",_unit]; @@ -43,7 +42,7 @@ if (_isPlayer) then { }; */ -if (_unit == player) then { +if (_unitIsPlayer) then { if (_hit == "") then { if ((_source != player) and _isPlayer) then { //Enable aggressor Actions @@ -81,7 +80,7 @@ if (_damage > 0.4) then { case 1: {_scale = _scale + 200}; case 2: {_scale = _scale + 200}; }; - if (_unit == player) then { + if (_unitIsPlayer) then { //Cause blood loss //Log Damage //diag_log ("DAMAGE: player hit by " + typeOf _source + " in " + _hit + " with " + _ammo + " for " + str(_damage) + " scaled " + str(_damage * _scale)); @@ -106,13 +105,13 @@ if (_hit in USEC_MinorWounds) then { }; -if (_unit == player) then { +if (_unitIsPlayer) then { //incombat _unit setVariable["startcombattimer", 1, false]; }; if (_damage > 0.1) then { - if (_unit == player) then { + if (_unitIsPlayer) then { //shake the cam, frighten them! //player sidechat format["Processed bullet hit for %1 (should only be for me!)",_unit]; 1 call fnc_usec_bulletHit; @@ -127,7 +126,7 @@ if (_damage > 0.4) then { //0.25 */ _wound = _hit call fnc_usec_damageGetWound; _isHit = _unit getVariable[_wound,false]; - if (_unit == player) then { + if (_unitIsPlayer) then { _rndPain = (random 10); _rndInfection = (random 500); _hitPain = (_rndPain < _damage); @@ -138,13 +137,13 @@ if (_damage > 0.4) then { //0.25 //player sidechat format["HitPain: %1, HitInfection %2 (Damage: %3)",_rndPain,_rndInfection,_damage]; //r_player_infected if (_isHit) then { //Make hit worse - if (_unit == player) then { + if (_unitIsPlayer) then { r_player_blood = r_player_blood - 50; }; }; if (_hitInfection) then { //Set Infection if not already - if (_unit == player) then { + if (_unitIsPlayer) then { r_player_infected = true; player setVariable["USEC_infected",true,true]; }; @@ -152,7 +151,7 @@ if (_damage > 0.4) then { //0.25 }; if (_hitPain) then { //Set Pain if not already - if (_unit == player) then { + if (_unitIsPlayer) then { r_player_inpain = true; player setVariable["USEC_inPain",true,true]; }; @@ -172,7 +171,7 @@ if (_damage > 0.4) then { //0.25 _isInjured = _unit getVariable["USEC_injured",false]; if (!_isInjured) then { _unit setVariable["USEC_injured",true,true]; - if ((_unit == player) and (_ammo != "zombie")) then { + if ((_unitIsPlayer) and (_ammo != "zombie")) then { dayz_sourceBleeding = _source; }; }; @@ -181,7 +180,7 @@ if (_damage > 0.4) then { //0.25 if (!_lowBlood) then { _unit setVariable["USEC_lowBlood",true,true]; }; - if (_unit == player) then { + if (_unitIsPlayer) then { r_player_injured = true; }; }; @@ -191,13 +190,13 @@ if (_type == 1) then { /* BALISTIC DAMAGE */ - if ((_damage > 0.01) and (_unit == player)) then { + if ((_damage > 0.01) and (_unitIsPlayer)) then { //affect the player [20,45] call fnc_usec_pitchWhine; //Visual , Sound }; if (_damage > 4) then { //serious ballistic damage - if (_unit == player) then { + if (_unitIsPlayer) then { _id = [_source,"explosion"] spawn player_death; }; } else { @@ -216,7 +215,7 @@ if (_type == 2) then { */ if (_damage > 4) then { //serious ballistic damage - if (_unit == player) then { + if (_unitIsPlayer) then { _id = [_source,"shotheavy"] spawn player_death; }; } else { diff --git a/dayz_code/compile/fn_inString.sqf b/dayz_code/compile/fn_inString.sqf index 6411d5d18..e704e97ac 100644 --- a/dayz_code/compile/fn_inString.sqf +++ b/dayz_code/compile/fn_inString.sqf @@ -25,4 +25,4 @@ if (_needleLen <= _haystackLen) then { }; }; }; -_found; +_found diff --git a/dayz_code/config.cpp b/dayz_code/config.cpp index 1605e34cc..52cbf34bb 100644 --- a/dayz_code/config.cpp +++ b/dayz_code/config.cpp @@ -33,7 +33,7 @@ class CfgMods hidePicture = 0; hideName = 0; action = "http://www.dayepoch.com"; - version = "0.8"; + version = "0.81"; hiveVersion = 0.96; //0.93 }; }; diff --git a/dayz_code/init/compiles.sqf b/dayz_code/init/compiles.sqf index d592feb81..8e3fb094c 100644 --- a/dayz_code/init/compiles.sqf +++ b/dayz_code/init/compiles.sqf @@ -224,13 +224,20 @@ if (!isDedicated) then { private ["_dikCode", "_handled"]; _dikCode = _this select 1; _handled = false; + DoRE = ({isPlayer _x} count (player nearEntities ["AllVehicles",500]) > 1); if (_dikCode in (actionKeys "GetOver")) then { - if (animationState player in ["amovpercmrunslowwrfldf","amovpercmrunsraswrfldf","amovpercmevaslowwrfldf","amovpercmevasraswrfldf"]) then { + if (canRoll && animationState player in ["amovpercmrunslowwrfldf","amovpercmrunsraswrfldf","amovpercmevaslowwrfldf","amovpercmevasraswrfldf"]) then { + canRoll = false; null = [] spawn { - //Needed for sync with others + if (DoRE) then { [nil, player, rSWITCHMOVE,"ActsPercMrunSlowWrflDf_FlipFlopPara"] call RE; + } else { + player switchMove "ActsPercMrunSlowWrflDf_FlipFlopPara"; + }; sleep 0.3; player setVelocity [(velocity player select 0) + 1.5 * sin direction player, (velocity player select 1) + 1.5 * cos direction player, (velocity player select 2) + 4]; + sleep 1; + canRoll = true; }; _handled = true; }; diff --git a/dayz_code/init/variables.sqf b/dayz_code/init/variables.sqf index ebf85fc0c..8880de3ed 100644 --- a/dayz_code/init/variables.sqf +++ b/dayz_code/init/variables.sqf @@ -34,6 +34,7 @@ pz_priest = "pz_priest"; dayz_combatLog = ""; +canRoll = true; //Hunting Variables diff --git a/dayz_code/rscTitles.hpp b/dayz_code/rscTitles.hpp index ddb2657ba..d98f0f52d 100644 --- a/dayz_code/rscTitles.hpp +++ b/dayz_code/rscTitles.hpp @@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay class DAYZ_Version : CA_Version { idc = -1; - text = "DayZ Epoch 0.8 (1.7.5.M1D25)"; + text = "DayZ Epoch 0.81 (1.7.5.M1D25)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; }; class CA_TitleMainMenu; diff --git a/dayz_code/stringtable.xml b/dayz_code/stringtable.xml index 2688c409d..596c740be 100644 --- a/dayz_code/stringtable.xml +++ b/dayz_code/stringtable.xml @@ -274,7 +274,7 @@ Костер убран. La fogata fue removida Het kampvuur is verwijderd - Le feu de camp a été retiré.Le feu de camp a été retiré. %1 has been gutted, %2 meat steaks now on the carcass @@ -625,7 +625,7 @@ обезвоживания deshidratacion uitdroging - une déshydratationune déshydratation starvation