diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index 2285a8566..038760c0b 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -11,7 +11,7 @@ [NEW] Autorun hotkey (0 = Toggle auto run) @ebaydayz [NEW] Snap building (disabled by default), use DZE_modularBuild = true; in your init.sqf to enable. @raymix [NEW] Auto login when a player joins the server, default 10 seconds, requires description.ext update in the mission (disable in description.ext by setting defValueParam1 = 31;) @icomrade -[NEW] Blood types system is disabled by default. Set DZE_UseBloodTypes = true; in init.sqf to enable +[NEW] Blood types system is disabled by default. Set dayz_classicBloodBagSystem = false; in init.sqf to enable [NEW] Bandit heartbeat sound is disabled by default. Set DZE_HeartBeat = true; in init.sqf to enable [NEW] Knife dulling is disabled by default. Set dayz_knifeDulling = true; in init.sqf to enable @ebaydayz [NEW] Match stick counting is disabled by default. Set dayz_matchboxCount = true; in init.sqf to enable @ebaydayz diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMedicalSupplies.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMedicalSupplies.hpp index fcc54adb6..e9e373ded 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMedicalSupplies.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMedicalSupplies.hpp @@ -14,12 +14,7 @@ class Category_541 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class ItemBloodbag { - type = "trade_items"; - buy[] = {4,"ItemSilverBar"}; - sell[] = {2,"ItemSilverBar"}; - }; - /* + // bloodBagONEG is automatically swapped with ItemBloodbag if dayz_classicBloodBagSystem = true; Other typed bags and bloodTester are ignored. class bloodBagONEG { type = "trade_items"; buy[] = {4,"ItemSilverBar"}; @@ -70,7 +65,6 @@ class Category_541 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - */ class ItemEpinephrine { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; diff --git a/SQF/dayz_code/compile/fn_damageActions.sqf b/SQF/dayz_code/compile/fn_damageActions.sqf index 538f9a4c0..9800fb7ab 100644 --- a/SQF/dayz_code/compile/fn_damageActions.sqf +++ b/SQF/dayz_code/compile/fn_damageActions.sqf @@ -198,7 +198,7 @@ if (isPlayer cursorTarget) then { }; //Allow player to transfuse blood if(_lowBlood && _hasBloodBag) then { - _transfuse = if (DZE_UseBloodTypes) then {"\z\addons\dayz_code\medical\transfusion.sqf"} else {"\z\addons\dayz_code\medical\transfusion_NoBloodTypes.sqf"}; + _transfuse = if (dayz_classicBloodBagSystem) then {"\z\addons\dayz_code\medical\transfusion_NoBloodTypes.sqf"} else {"\z\addons\dayz_code\medical\transfusion.sqf"}; r_action = true; _action = _unit addAction [localize "str_actions_medical_08",_transfuse,[_unit], 0, true, true]; r_player_actions set [count r_player_actions,_action]; diff --git a/SQF/dayz_code/compile/player_gearSet.sqf b/SQF/dayz_code/compile/player_gearSet.sqf index 1f2d65de7..f042172a0 100644 --- a/SQF/dayz_code/compile/player_gearSet.sqf +++ b/SQF/dayz_code/compile/player_gearSet.sqf @@ -20,10 +20,10 @@ if (count _inventory > 0) then { }; if (_item == "BoltSteel") then { _item = "WoodenArrow" }; // Convert BoltSteel to WoodenArrow - if (DZE_UseBloodTypes) then { - if (_item == "ItemBloodbag") then { _item = "bloodBagONEG" }; // Convert ItemBloodbag into universal blood type/rh bag - } else { + if (dayz_classicBloodBagSystem) then { if (_item in dayz_typedBags) then { _item = "ItemBloodbag" }; + } else { + if (_item == "ItemBloodbag") then { _item = "bloodBagONEG" }; // Convert ItemBloodbag into universal blood type/rh bag }; //Is item legal? diff --git a/SQF/dayz_code/compile/player_traderMenuConfig.sqf b/SQF/dayz_code/compile/player_traderMenuConfig.sqf index e1d5cf4e7..441742cd9 100644 --- a/SQF/dayz_code/compile/player_traderMenuConfig.sqf +++ b/SQF/dayz_code/compile/player_traderMenuConfig.sqf @@ -12,7 +12,7 @@ TraderCatList = []; TraderItemList = []; TraderDialogLoadItemList = { - private ["_index","_trader_id","_activatingPlayer","_distance","_objclass","_item_list"]; + private ["_index","_trader_id","_activatingPlayer","_distance","_objclass","_item_list","_ignore"]; TraderItemList = []; _index = _this select 0; @@ -51,9 +51,14 @@ TraderDialogLoadItemList = { }; }; + _ignore = false; + if (dayz_classicBloodBagSystem && _class in dayz_typedBags) then { + if (_class == "bloodBagONEG") then {_class = "ItemBloodbag";} else {_ignore = true;}; + }; + _data = [9999,[_class,_typeNum],99999,_buy,_sell,0,_trader_id,_type]; - PVDZE_plr_TradeMenuResult set [count PVDZE_plr_TradeMenuResult, _data]; + if (!_ignore) then {PVDZE_plr_TradeMenuResult set [count PVDZE_plr_TradeMenuResult, _data];}; }; lbClear TraderDialogItemList; diff --git a/SQF/dayz_code/compile/player_traderMenuHive.sqf b/SQF/dayz_code/compile/player_traderMenuHive.sqf index bb7060e15..4eca5687e 100644 --- a/SQF/dayz_code/compile/player_traderMenuHive.sqf +++ b/SQF/dayz_code/compile/player_traderMenuHive.sqf @@ -45,7 +45,7 @@ TraderDialogLoadItemList = { lbClear TraderDialogItemList; _item_list = []; { - private ["_header", "_item", "_name", "_type", "_textPart", "_qty", "_buy", "_bqty", "_bname", "_btype", "_btextCurrency", "_sell", "_sqty", "_sname", "_stype", "_stextCurrency", "_order", "_order", "_afile", "_File", "_count", "_bag", "_bagclass", "_index", "_image"]; + private ["_header", "_item", "_name", "_type", "_textPart", "_qty", "_buy", "_bqty", "_bname", "_btype", "_btextCurrency", "_sell", "_sqty", "_sname", "_stype", "_stextCurrency", "_order", "_order", "_afile", "_File", "_count", "_bag", "_bagclass", "_index", "_image", "_ignore"]; _header = _x select 0; // "TRD" _item = _x select 1; _name = _item select 0; @@ -61,6 +61,12 @@ TraderDialogLoadItemList = { _type = "CfgWeapons"; }; }; + + _ignore = false; + if (dayz_classicBloodBagSystem && _name in dayz_typedBags) then { + if (_name == "bloodBagONEG") then {_name = "ItemBloodbag";} else {_ignore = true;}; + }; + // Display Name of item _textPart = getText(configFile >> _type >> _name >> "displayName"); @@ -142,27 +148,29 @@ TraderDialogLoadItemList = { _count = {_x == _name} count weapons player; }; - _index = lbAdd [TraderDialogItemList, format["%1 (%2)", _textPart, _name]]; + if (!_ignore) then { + _index = lbAdd [TraderDialogItemList, format["%1 (%2)", _textPart, _name]]; - if (_count > 0) then { - lbSetColor [TraderDialogItemList, _index, [0, 1, 0, 1]]; + if (_count > 0) then { + lbSetColor [TraderDialogItemList, _index, [0, 1, 0, 1]]; + }; + + _image = getText(configFile >> _type >> _name >> "picture"); + lbSetPicture [TraderDialogItemList, _index, _image]; + + _item_list set [count _item_list, [ + _name, + _textPart, + _bqty, + _bname, + _btextCurrency, + _sqty, + _sname, + _stextCurrency, + _header, + _File + ]]; }; - - _image = getText(configFile >> _type >> _name >> "picture"); - lbSetPicture [TraderDialogItemList, _index, _image]; - - _item_list set [count _item_list, [ - _name, - _textPart, - _bqty, - _bname, - _btextCurrency, - _sqty, - _sname, - _stextCurrency, - _header, - _File - ]]; } forEach PVDZE_plr_TradeMenuResult; TraderItemList = _item_list; }; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 5e0476f8a..25c4f0b52 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -51,7 +51,7 @@ DayZ_ViralZeds = ["z_new_villager2","z_new_villager3","z_new_villager4","z_new_w DayZ_SafeObjects = ["Base_Fire_DZ","WoodenGate_1","WoodenGate_2","WoodenGate_3","WoodenGate_4","Land_Fire_DZ","TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3","StashMedium4","Wire_cat1","Sandbag1_DZ","Fence_DZ","Generator_DZ","Hedgehog_DZ","BearTrap_DZ","DomeTentStorage","DomeTentStorage0","DomeTentStorage1","DomeTentStorage2","DomeTentStorage3","DomeTentStorage4","CamoNet_DZ","Trap_Cans","TrapTripwireFlare","TrapBearTrapSmoke","TrapTripwireGrenade","TrapTripwireSmoke","TrapBearTrapFlare","TentStorageDomed","VaultStorageLocked","BagFenceRound_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Land_HBarrier5_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","StickFence_DZ","LightPole_DZ","FuelPump_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","SandNest_DZ","DeerStand_DZ","MetalPanel_DZ","WorkBench_DZ","WoodFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","LockboxStorageLocked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodStairsRails_DZ","WoodSmallWallThird_DZ","WoodLadder_DZ","Land_DZE_GarageWoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_WoodDoor","Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallHalf_DZ","CinderWall_DZ","CinderWallDoorway_DZ","CinderWallDoor_DZ","CinderWallDoorLocked_DZ","CinderWallSmallDoorway_DZ","CinderWallDoorSmall_DZ","CinderWallDoorSmallLocked_DZ","MetalFloor_DZ","WoodRamp_DZ","GunRack_DZ","FireBarrel_DZ","WoodCrate_DZ","Scaffolding_DZ","DesertTentStorage","DesertTentStorage0","DesertTentStorage1","DesertTentStorage2","DesertTentStorage3","DesertTentStorage4"]; DayZ_GearedObjects = ["Car","Helicopter","Motorcycle","Ship","TentStorage_base","StashSmall_base","StashMedium_base","Plane","Tank","VaultStorage","LockboxStorage","TentStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ","WoodCrate_DZ","Scaffolding_DZ"]; DayZ_RestingAnims = ["amovpsitmstpsnonwpstdnon_ground","amovpsitmstpsnonwpstdnon_smoking","amovpsitmstpsraswrfldnon_weaponcheck1","amovpsitmstpsraswrfldnon"]; -dayz_typedBags = ["bloodBagANEG","bloodBagAPOS","bloodBagBNEG","bloodBagBPOS","bloodBagABNEG","bloodBagABPOS","bloodBagONEG","bloodBagOPOS","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"]; +dayz_typedBags = ["bloodTester","bloodBagANEG","bloodBagAPOS","bloodBagBNEG","bloodBagBPOS","bloodBagABNEG","bloodBagABPOS","bloodBagONEG","bloodBagOPOS","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"]; dayz_playerAchievements = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]; Dayz_meatraw = @@ -412,7 +412,6 @@ switch (dayz_presets) do { if(isNil "dayz_OpenTarget_TimerTicks") then { dayz_OpenTarget_TimerTicks = 60 * 10; }; if(isNil "dayz_temperature_override") then { dayz_temperature_override = true; }; if(isNil "dayz_nutritionValuesSystem") then { dayz_nutritionValuesSystem = false; }; - //Not implmented yet if(isNil "dayz_classicBloodBagSystem") then { dayz_classicBloodBagSystem = false; }; }; case "Classic": { //Classic @@ -426,7 +425,6 @@ switch (dayz_presets) do { dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked. dayz_temperature_override = true; // Set to true to disable all temperature changes. dayz_nutritionValuesSystem = false; //Enables nutrition system - //Not implmented yet dayz_classicBloodBagSystem = true; //Enables one type of bloodbag }; case "Elite": { //Elite @@ -440,7 +438,6 @@ switch (dayz_presets) do { dayz_OpenTarget_TimerTicks = 60 * 25; //how long can a player be freely attacked for after attacking someone unprovoked. dayz_temperature_override = false; // Set to true to disable all temperature changes. dayz_nutritionValuesSystem = true; //Enables nutrition system - //Not implmented yet dayz_classicBloodBagSystem = false; //Enables one type of bloodbag }; default { //Vanilla @@ -454,7 +451,6 @@ switch (dayz_presets) do { dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked. dayz_temperature_override = false; // Set to true to disable all temperature changes. dayz_nutritionValuesSystem = true; //Enables nutrition system - //Not implmented yet dayz_classicBloodBagSystem = false; //Enables one type of bloodbag }; }; @@ -512,7 +508,6 @@ if (isNil "DZE_selfTransfuse_Values") then {DZE_selfTransfuse_Values = [12000,15 if (isNil "DZE_PlotPole") then {DZE_PlotPole = [30,45];}; DZE_maintainRange = ((DZE_PlotPole select 0)+20); if (isNil "DZE_slowZombies") then {DZE_slowZombies = false;}; -if (isNil "DZE_UseBloodTypes") then {DZE_UseBloodTypes = false;}; if ((toLower worldName) in ["napf","sauerland","tavi"]) then { dayz_minpos = if ((toLower worldName) == "tavi") then {-26000} else {-1000}; dayz_maxpos = 26000; diff --git a/SQF/dayz_code/loot/insertCargo.sqf b/SQF/dayz_code/loot/insertCargo.sqf index 4af900cb5..c470c6841 100644 --- a/SQF/dayz_code/loot/insertCargo.sqf +++ b/SQF/dayz_code/loot/insertCargo.sqf @@ -27,7 +27,10 @@ Author: case Loot_MAGAZINE: { - (_this select 0) addMagazineCargoGlobal [_x select 1, 1]; + private "_item"; + _item = _x select 1; + if (dayz_classicBloodBagSystem && _item in dayz_typedBags) then {_item = "ItemBloodbag";}; + (_this select 0) addMagazineCargoGlobal [_item, 1]; }; case Loot_BACKPACK: diff --git a/SQF/dayz_code/loot/spawn.sqf b/SQF/dayz_code/loot/spawn.sqf index 8c7b8496c..4d64b6fd7 100644 --- a/SQF/dayz_code/loot/spawn.sqf +++ b/SQF/dayz_code/loot/spawn.sqf @@ -75,8 +75,11 @@ switch (_lootInfo select 0) do //Spawn a single magazine case Loot_MAGAZINE: { + private "_item"; + _item = _lootInfo select 1; + if (dayz_classicBloodBagSystem && _item in dayz_typedBags) then {_item = "ItemBloodbag";}; _vehicle = createVehicle ["WeaponHolder", _this select 1, [], 0, "CAN_COLLIDE"]; - _vehicle addMagazineCargoGlobal [_lootInfo select 1, 1]; + _vehicle addMagazineCargoGlobal [_item, 1]; _vehicle setPosATL (_this select 1); INCREMENT_WEAPON_HOLDERS(); }; diff --git a/SQF/dayz_code/medical/fillBloodBag.sqf b/SQF/dayz_code/medical/fillBloodBag.sqf index e73c6eeff..d0bfd3838 100644 --- a/SQF/dayz_code/medical/fillBloodBag.sqf +++ b/SQF/dayz_code/medical/fillBloodBag.sqf @@ -90,7 +90,7 @@ r_interrupt = false; }; if (_complete) then { - if (!DZE_UseBloodTypes) then { + if (dayz_classicBloodBagSystem) then { player addMagazine "ItemBloodbag"; } else { switch (_bloodType) do { diff --git a/SQF/dayz_code/medical/selfbloodbag.sqf b/SQF/dayz_code/medical/selfbloodbag.sqf index 690f43a89..10f19fed8 100644 --- a/SQF/dayz_code/medical/selfbloodbag.sqf +++ b/SQF/dayz_code/medical/selfbloodbag.sqf @@ -8,10 +8,9 @@ _blood = _unit getVariable ["USEC_BloodQty", 0]; _lowBlood = _unit getVariable ["USEC_lowBlood", false]; _injured = _unit getVariable ["USEC_injured", false]; _inPain = _unit getVariable ["USEC_inPain", false]; -//_lastused = _unit getVariable ["LastTransfusion", time]; -_lastused = selfTransfusionTime; -_timeout = DZE_selfTransfuse_Values select 2; -if ((round(time - _lastused)) <= _timeout) exitWith {cutText [format[(localize "str_actions_medical_18"),(_timeout - (round(time - _lastused)))] , "PLAIN DOWN"]}; +_lastused = _unit getVariable ["LastTransfusion", -(DZE_selfTransfuse_Values select 2)]; + +if (round(time - _lastused) <= DZE_selfTransfuse_Values select 2) exitWith {cutText [localize "str_actions_medical_18","PLAIN DOWN"]}; call gear_ui_init; closeDialog 0; @@ -41,9 +40,8 @@ if (_rh) then {_rhVal = "POS";} else {_rhVal = "NEG";}; //No subs for whole blood :( _bloodBagWholeNeeded = "wholeBloodBag" + _bloodType + _rhVal; _haswholebag = _bloodBagWholeNeeded in magazines player; -_hasUniversal = "ItemBloodbag" in magazines player; -if (_haswholebag or (!DZE_UseBloodTypes && _hasUniversal)) then { +if (_haswholebag or (dayz_classicBloodBagSystem && "ItemBloodbag" in magazines player)) then { _wholeBag = true; } else { _badBag = true; @@ -84,7 +82,7 @@ while {r_doLoop and (_i < 12)} do { }; }; } else { - if (_wholeBag) then { _bagToRemove = if (!DZE_UseBloodTypes) then {"ItemBloodbag"} else {_bloodBagWholeNeeded}; }; + if (_wholeBag) then { _bagToRemove = if (dayz_classicBloodBagSystem) then {"ItemBloodbag"} else {_bloodBagWholeNeeded}; }; if (_bagToRemove in magazines player) then { _bagFound = true; }; }; if (!_bagFound) then {_forceClose = true;} else { player removeMagazine _bagToRemove;}; @@ -131,7 +129,7 @@ while {r_doLoop and (_i < 12)} do { if (((_blood >= r_player_bloodTotal) and !_badBag and _bagFound) or (_i == 12)) then { diag_log format ["TRANSFUSION: completed blood transfusion successfully (_i = %1)", _i]; - selfTransfusionTime = time; + _unit setVariable ["LastTransfusion",time]; if (_TransfusionInfection) then {r_player_infected = true; player setVariable["USEC_infected",true,true];}; cutText [localize "str_actions_medical_transfusion_successful", "PLAIN DOWN"]; [player,_unit,"loc",rTITLETEXT,localize "str_actions_medical_transfusion_successful","PLAIN DOWN"] call RE; diff --git a/SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf b/SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf index c2bce0d6e..e15ba490e 100644 --- a/SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf +++ b/SQF/dayz_code/medical/transfusion_NoBloodTypes.sqf @@ -4,7 +4,7 @@ _unit = (_this select 3) select 0; //_lowBlood = _unit getVariable ["USEC_lowBlood", false]; //_injured = _unit getVariable ["USEC_injured", false]; //_inPain = _unit getVariable ["USEC_inPain", false]; -//_lastused = _unit getVariable ["LastTransfusion", time]; +//_lastused = _unit getVariable ["LastTransfusion", -(DZE_selfTransfuse_Values select 2)]; // if (_lastused - time < 60) exitwith {cutText [format[(localize "str_actions_medical_18"),_text] , "PLAIN DOWN"]}; @@ -39,7 +39,7 @@ while {r_doLoop} do { r_doLoop = false; if (_finished) then { - //_unit setVariable["LastTransfusion",time,true]; //reserve for self transfusion + //_unit setVariable["LastTransfusion",time]; //reserve for self transfusion _unit setVariable["USEC_lowBlood",false,true]; _num_removed = ([player,"ItemBloodbag"] call BIS_fnc_invRemove); if(_num_removed == 1) then { diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 6834f45d6..13a78262e 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -673,10 +673,10 @@ class FSM " _countr = 0;" \n " {" \n " if (_x == ""BoltSteel"") then { _x = ""WoodenArrow"" }; // Convert BoltSteel to WoodenArrow" \n - " if (DZE_UseBloodTypes) then {" \n - " if (_item == ""ItemBloodbag"") then { _item = ""bloodBagONEG"" }; // Convert ItemBloodbag into universal blood type/rh bag" \n + " if (dayz_classicBloodBagSystem) then {" \n + " if (_x in dayz_typedBags) then {_x = ""ItemBloodbag""};" \n " } else {" \n - " if (_item in dayz_typedBags) then {_item = ""ItemBloodbag""};" \n + " if (_x == ""ItemBloodbag"") then { _x = ""bloodBagONEG"" }; // Convert ItemBloodbag into universal blood type/rh bag" \n " };" \n " dayz_myBackpack addMagazineCargoGlobal [_x,(_backpackMagQty select _countr)];" \n " _countr = _countr + 1;" \n @@ -1167,7 +1167,6 @@ class FSM "r_player_blood = player getVariable[""USEC_BloodQty"",r_player_bloodTotal];" \n "r_player_bloodtype = player getVariable [""blood_type"", false];" \n "r_player_rh = player getVariable [""rh_factor"", false];" \n - "selfTransfusionTime = time; //time to keep for last self transfusion." \n "" \n "dayz_musicH = [] spawn player_music;" \n "dayz_slowCheck = [] spawn player_spawn_2;" \n diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index 663179251..fa1825d2c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1000; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf index def8761a0..a067f3480 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 100; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 50; // Max number of random vehicles to spawn around the map spawnArea = 1000; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index d8a5b7d96..57a4ec3f2 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index 98590627d..7c3cf3537 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 400; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index 34ef99946..93e3fc032 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 700; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 400; // Max number of random vehicles to spawn around the map spawnArea = 2500; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index 10c598325..c3244a524 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index 9069bb87c..908842713 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index 94b5e61f8..fe565b7cc 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf index c1e1d5eee..a5d842abb 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 250; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 200; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index 1b1e372e5..40a027237 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 150; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 100; // Max number of random vehicles to spawn around the map spawnArea = 1000; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf index a054b59a3..02624c58c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 250; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 200; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index 8c37edf81..3bc98406b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 250; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 200; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf index c0316bf53..e7947c21b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 350; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf index f235aeaef..fbdb10977 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf index 2be28d673..be804ad6c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf index bd35c113e..b4b805780 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 2000; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf index d06bba79e..e92c3a294 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 2000; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf index 44abbbe47..223222768 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 50; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 50; // Max number of random vehicles to spawn around the map spawnArea = 250; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index a84cb6cf0..bd8d677ac 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 300; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 150; // Max number of random vehicles to spawn around the map spawnArea = 500; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf index f8be6e23c..1736b2743 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 50; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 25; // Max number of random vehicles to spawn around the map spawnArea = 500; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index 054ee932c..6a1b056d4 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf index 1b3fcc0ed..32a5332d1 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 100; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 50; // Max number of random vehicles to spawn around the map spawnArea = 500; // Distance around markers to find a safe spawn position diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf index 0168bba35..c36683705 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf @@ -30,7 +30,7 @@ if (dayz_presets == "Custom") then { dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked dayz_nutritionValuesSystem = true; //Enables nutrition system - dayz_classicBloodBagSystem = true; // removes all blood type bloodbags (not implmented yet) + dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag }; //Temp settings @@ -63,7 +63,6 @@ DZE_PlotPole = [30,45]; // Radius owned by plot pole [Regular objects,Other plot DZE_BuildingLimit = 150; // Max number of built objects allowed in DZE_PlotPole radius DZE_SelfTransfuse = false; // Allow players to bloodbag themselves DZE_selfTransfuse_Values = [12000,15,300]; // [blood amount given, infection chance %, cooldown in seconds] -DZE_UseBloodTypes = false; //Enable blood type system and disable classic bloodbags MaxDynamicDebris = 100; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 50; // Max number of random vehicles to spawn around the map spawnArea = 500; // Distance around markers to find a safe spawn position diff --git a/Server Files/SQL/1.0.6_Updates.sql b/Server Files/SQL/1.0.6_Updates.sql index 2f1c0b2b8..09bb5128b 100644 --- a/Server Files/SQL/1.0.6_Updates.sql +++ b/Server Files/SQL/1.0.6_Updates.sql @@ -382,7 +382,7 @@ UPDATE object_data SET Inventory = REPLACE(Inventory, 'Winchester1866', 'Winches -- ---------------------------- --- Run to replace legacy bloodbag with universal type if using DZE_UseBloodTypes = true; +-- Run to replace legacy bloodbag with universal type if using dayz_classicBloodBagSystem = false; -- ---------------------------- -- UPDATE `Traders_DATA` SET `item` = '["bloodBagONEG",1]' WHERE `item` = '["ItemBloodbag",1]'; -- UPDATE character_data SET Backpack = REPLACE(Backpack, 'ItemBloodbag', 'bloodBagONEG') WHERE INSTR(Backpack, 'ItemBloodbag') > 0;