diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp index 02c699d69..510421e61 100644 --- a/SQF/dayz_code/Configs/cfgVehicles.hpp +++ b/SQF/dayz_code/Configs/cfgVehicles.hpp @@ -272,21 +272,9 @@ class CfgVehicles { transportmaxbackpacks = 2; class Turrets {}; }; - class CH_47F_EP1; - class CH_47F_EP1_DZ : CH_47F_EP1 { - accuracy = 1000; - model = "\ca\air_E\CH47\CH_47F"; - scope = 2; - displayName = "CH-47F"; - crew = ""; - typicalCargo[] = {}; - commanderCanSee = 2+16+32; - gunnerCanSee = 2+16+32; - driverCanSee = 2+16+32; - transportMaxWeapons = 10; - transportMaxMagazines = 200; - transportmaxbackpacks = 5; - }; + + #include "CfgVehicles\AIR\CH47.hpp" + class UH60M_EP1; class UH60M_EP1_DZ : UH60M_EP1 { @@ -1491,6 +1479,23 @@ class CfgVehicles { displayName = "Debug Box"; vehicleClass = "Fortifications"; }; + class DebugBoxPlayer_DZ: NonStrategic + { + placement = "vertical"; + scope = 2; + destrType = "DestructNo"; + cost = 100; + model = "\z\addons\dayz_epoch\models\player_box.p3d"; + icon = "\ca\data\data\Unknown_object.paa"; + mapSize = 2; + armor = 2000; + displayName = "Player Debug Box"; + vehicleClass = "Fortifications"; + class Eventhandlers + { + init = "_this call eh_localCleanup;"; + }; + }; class TrapItems: NonStrategic{}; // buildables @@ -1845,7 +1850,7 @@ class CfgVehicles { armor = 500; displayName = "Wood Ramp"; vehicleClass = "Fortifications"; - // GhostPreview = "MetalFloor_Preview_DZ"; + GhostPreview = "WoodRamp_Preview_DZ"; }; class CinderWallHalf_DZ: ModularItems { @@ -2339,6 +2344,20 @@ class CfgVehicles { displayName = "Metal Floor Preview"; vehicleClass = "Fortifications"; }; + class WoodRamp_Preview_DZ: NonStrategic + { + scope = 2; + destrType = "DestructNo"; + cost = 100; + offset[] = {0,1.5,0}; + model="\z\addons\dayz_epoch\models\Wood_Ramp_ghost.p3d"; + icon = "\ca\data\data\Unknown_object.paa"; + mapSize = 2; + armor = 1000; + displayName = "Wood Ramp Preview"; + vehicleClass = "Fortifications"; + + }; class CinderWallHalf_Preview_DZ: NonStrategic { scope = 2; diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf index d8d4b420d..98f27d649 100644 --- a/SQF/dayz_code/actions/player_build.sqf +++ b/SQF/dayz_code/actions/player_build.sqf @@ -316,8 +316,7 @@ if (_hasrequireditem) then { }; cutText [format["%1",_previewCounter], "PLAIN DOWN"]; - _previewCounter = _previewCounter - 1; - + if(_previewCounter <= 0) exitWith { _isOk = false; _cancel = true; @@ -325,6 +324,8 @@ if (_hasrequireditem) then { detach _object; deleteVehicle _object; }; + + _previewCounter = _previewCounter - 1; if((_objHdwnDiff > 5) or (_objHupDiff > 5)) exitWith { _isOk = false; diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 4550ecff6..76a854ef2 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -38,8 +38,8 @@ if (_canPickLight and !dayz_hasLight and !_isPZombie) then { }; if (s_player_showname < 0 and !_isPZombie) then { - s_player_showname = player addAction ["Display Name (Yes)", "\z\addons\dayz_code\actions\display_name.sqf",true, 5, true, false, "",""]; - s_player_showname1 = player addAction ["Display Name (No)", "\z\addons\dayz_code\actions\display_name.sqf",false, 5, true, false, "",""]; + s_player_showname = player addAction ["Display Name (Yes)", "\z\addons\dayz_code\actions\display_name.sqf",true, 0, true, false, "",""]; + s_player_showname1 = player addAction ["Display Name (No)", "\z\addons\dayz_code\actions\display_name.sqf",false, 0, true, false, "",""]; }; if(_isPZombie) then { diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index bbca413f5..a6abf0395 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -288,6 +288,8 @@ r_action_targets = []; r_pitchWhine = false; r_isBandit = false; +DZE_PROTOBOX = objNull; + //ammo routine r_player_actions2 = []; r_action2 = false; @@ -458,7 +460,7 @@ if(isNil "dayz_zedsAttackVehicles") then { }; // update objects -dayz_updateObjects = ["Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage","LockboxStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ"]; +dayz_updateObjects = ["Plane","Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage","LockboxStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ"]; dayz_disallowedVault = ["TentStorage", "BuiltItems","ModularItems","DZE_Base_Object"]; dayz_reveal = ["AllVehicles","WeaponHolder","Land_A_tent","BuiltItems","ModularItems","DZE_Base_Object"]; dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Land_HBarrier3_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","Generator_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","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"]; diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index cc03b057b..f40a82970 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -24,7 +24,7 @@ item19[] = {"ERROR__Wrong_HIVE",2,250,175.000000,500.000000,275.000000,550.00000 item20[] = {"Hive_Ok",4,218,-175.000000,550.000000,-75.000000,600.000000,0.000000,"Hive" \n "Ok"}; item21[] = {"Phase_One",2,250,-75.000000,600.000000,25.000000,650.000000,0.000000,"Phase One"}; item22[] = {"Response",4,218,-175.000000,650.000000,-75.000000,700.000000,0.000000,"Response"}; -item23[] = {"Phase_Two",2,250,-75.000000,700.000000,25.000000,750.000000,0.000000,"Phase Two"}; +item23[] = {"Phase_Two",2,4346,-75.000000,700.000000,25.000000,750.000000,0.000000,"Phase Two"}; item24[] = {"Dead_Player",4,218,50.000000,700.000000,150.000000,750.000000,0.000000,"Dead" \n "Player"}; item25[] = {"ERROR__Player_Already",2,250,175.000000,700.000000,275.000000,750.000000,0.000000,"ERROR:" \n "Player Already" \n "Dead"}; item26[] = {"Alive",4,218,-175.000000,750.000000,-75.000000,800.000000,0.000000,"Alive"}; @@ -43,7 +43,7 @@ item38[] = {"Too_Long",4,218,300.000000,150.000000,400.000000,200.000000,0.00000 item39[] = {"Too_Long",4,218,300.000000,500.000000,400.000000,550.000000,0.000000,"Too" \n "Long"}; item40[] = {"Too_Long",4,218,300.000000,700.000000,400.000000,750.000000,0.000000,"Too" \n "Long"}; item41[] = {"Too_Long",4,218,300.000000,800.000000,400.000000,850.000000,0.000000,"Too" \n "Long"}; -item42[] = {"Enable_Sim",2,4346,-75.000000,-100.000000,25.000000,-50.000000,0.000000,"Enable Sim"}; +item42[] = {"Enable_Sim",2,250,-75.000000,-100.000000,25.000000,-50.000000,0.000000,"Enable Sim"}; item43[] = {"Initialized",4,218,-175.000000,-150.000000,-75.000000,-100.000000,0.000000,"Initialized"}; item44[] = {"New_Character",4,218,-500.000000,375.000000,-400.000000,425.000000,5.000000,"New" \n "Character"}; item45[] = {"Gender_Selection",2,250,-500.000000,500.000000,-400.000000,550.000000,0.000000,"Gender Selection" \n "Dialog"}; @@ -152,8 +152,8 @@ link77[] = {66,59}; link78[] = {67,15}; link79[] = {68,69}; link80[] = {69,20}; -globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-557.366516,843.001587,849.326355,-532.202698,892,880,1}; -window[] = {2,-1,-1,-1,-1,858,78,1450,78,3,910}; +globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-984.835999,1270.470825,2558.711182,333.744934,892,880,1}; +window[] = {2,-1,-1,-1,-1,858,1758,3130,78,3,910}; *//*%FSM*/ class FSM { @@ -767,11 +767,18 @@ class FSM "_setPos = _worldspace select 1;" \n "" \n "if(dayz_paraSpawn and !(player isKindOf ""PZombie_VB"")) then {" \n - " _para = createVehicle [""ParachuteWest"", _setPos, [], 0, ""FLY""]; " \n - " player moveInDriver _para;" \n + " player setPosATL [(_setPos select 0),(_setPos select 1),1000];" \n + " player setDir _setDir;" \n + " [player, 1000] exec ""ca\air2\halo\data\Scripts\HALO_init.sqs"";" \n "} else {" \n - " player setPosATL _setPos;" \n - " player setDir _setDir;" \n + "" \n + " // make protective box" \n + " DZE_PROTOBOX = createVehicle [""DebugBoxPlayer_DZ"", _setPos, [], 0, ""CAN_COLLIDE""];" \n + " DZE_PROTOBOX setDir _setDir;" \n + " DZE_PROTOBOX setPosATL _setPos;" \n + "" \n + " player setDir _setDir;" \n + " player setPosATL _setPos;" \n "};" \n "" \n "{" \n @@ -1110,6 +1117,7 @@ class FSM "if (_currentAnim != """" and !dayz_paraSpawn) then {" \n " [objNull, player, rSwitchMove,_currentAnim] call RE;" \n "};" \n + "" \n "if (_currentWpn != """") then {" \n " player selectWeapon _currentWpn;" \n "} else {" \n @@ -1267,7 +1275,20 @@ class FSM " if (!_fadeFire) then {" \n " nul = [_x,2,0,false,false] spawn BIS_Effects_Burn;" \n " };" \n - "} forEach allMissionObjects ""SpawnableWreck"";"/*%FSM*/; + "} forEach allMissionObjects ""SpawnableWreck"";" \n + "" \n + "// remove box " \n + "[] spawn {" \n + " private [""_counter""];" \n + " _counter = 0;" \n + " while {true} do {" \n + " if ((player getVariable[""combattimeout"", 0] >= time) or (_counter >= 60) or (player distance DZE_PROTOBOX > 2)) exitWith {" \n + " deleteVehicle DZE_PROTOBOX;" \n + " };" \n + " sleep 1;" \n + " _counter = _counter + 1;" \n + " };" \n + "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { diff --git a/SQF/dayz_epoch/models/Garage_door_locked_anim.p3d b/SQF/dayz_epoch/models/Garage_door_locked_anim.p3d index b2290f536..286738a1a 100644 Binary files a/SQF/dayz_epoch/models/Garage_door_locked_anim.p3d and b/SQF/dayz_epoch/models/Garage_door_locked_anim.p3d differ diff --git a/SQF/dayz_epoch/models/Steel_door_locked.p3d b/SQF/dayz_epoch/models/Steel_door_locked.p3d index a60fe12cd..765b07753 100644 Binary files a/SQF/dayz_epoch/models/Steel_door_locked.p3d and b/SQF/dayz_epoch/models/Steel_door_locked.p3d differ diff --git a/SQF/dayz_epoch/models/large_wall_door_locked_anim.p3d b/SQF/dayz_epoch/models/large_wall_door_locked_anim.p3d index 6dbbae254..cc8d9e82a 100644 Binary files a/SQF/dayz_epoch/models/large_wall_door_locked_anim.p3d and b/SQF/dayz_epoch/models/large_wall_door_locked_anim.p3d differ diff --git a/SQF/dayz_epoch/models/player_box.p3d b/SQF/dayz_epoch/models/player_box.p3d new file mode 100644 index 000000000..52e6208c5 Binary files /dev/null and b/SQF/dayz_epoch/models/player_box.p3d differ diff --git a/SQF/dayz_epoch/models/small_wall_door_locked_anim.p3d b/SQF/dayz_epoch/models/small_wall_door_locked_anim.p3d index ef1fc985a..5821c561a 100644 Binary files a/SQF/dayz_epoch/models/small_wall_door_locked_anim.p3d and b/SQF/dayz_epoch/models/small_wall_door_locked_anim.p3d differ diff --git a/SQF/dayz_epoch/models/steel_garage_locked.p3d b/SQF/dayz_epoch/models/steel_garage_locked.p3d index 22ed47f17..f4fc72e81 100644 Binary files a/SQF/dayz_epoch/models/steel_garage_locked.p3d and b/SQF/dayz_epoch/models/steel_garage_locked.p3d differ diff --git a/SQF/dayz_epoch/textures/ammo_supply.rvmat b/SQF/dayz_epoch/textures/ammo_supply.rvmat index 3b78b7e03..02efab055 100644 --- a/SQF/dayz_epoch/textures/ammo_supply.rvmat +++ b/SQF/dayz_epoch/textures/ammo_supply.rvmat @@ -1,9 +1,9 @@ -ambient[]={1,1,1,1}; -diffuse[]={1,1,1,1}; +ambient[]={0.24313726,0.24313726,0.24313726,1}; +diffuse[]={0.24313726,0.24313726,0.24313726,1}; forcedDiffuse[]={0,0,0,0}; emmisive[]={0,0,0,1}; -specular[]={0.40000001,0.40000001,0.40000001,1}; -specularPower=36.5; +specular[]={0.45490196,0.4627451,0.45490196,1}; +specularPower=100; PixelShaderID="Super"; VertexShaderID="Super"; class Stage1 diff --git a/SQF/dayz_server/compile/server_updateObject.sqf b/SQF/dayz_server/compile/server_updateObject.sqf index 3b192eb0b..5afeb1114 100644 --- a/SQF/dayz_server/compile/server_updateObject.sqf +++ b/SQF/dayz_server/compile/server_updateObject.sqf @@ -10,7 +10,7 @@ if(isNull(_object)) exitWith { }; _type = _this select 1; -_parachuteWest = typeOf _object == "ParachuteWest"; +_parachuteWest = ((typeOf _object == "ParachuteWest") or (typeOf _object == "ParachuteC")); _isbuildable = (typeOf _object) in dayz_allowedObjects; _isNotOk = false; _firstTime = false; diff --git a/SQF/dayz_server/system/server_cleanup.fsm b/SQF/dayz_server/system/server_cleanup.fsm index a7ddf2877..b09d2e415 100644 --- a/SQF/dayz_server/system/server_cleanup.fsm +++ b/SQF/dayz_server/system/server_cleanup.fsm @@ -295,7 +295,7 @@ class FSM "" \n "//Check for hackers" \n " {" \n - " if(vehicle _x != _x && !(vehicle _x in _safety) && (isPlayer _x) && (typeOf vehicle _x) != ""ParachuteWest"") then {" \n + " if(vehicle _x != _x && !(vehicle _x in _safety) && (isPlayer _x) && ((typeOf vehicle _x) != ""ParachuteWest"") or (typeOf vehicle _x) != ""ParachuteC"")) then {" \n " diag_log (""CLEANUP: KILLING A HACKER "" + (name _x) + "" "" + str(_x) + "" IN "" + (typeOf vehicle _x));" \n " (vehicle _x) setDamage 1;" \n " _x setDamage 1;" \n diff --git a/SQF/dayz_sfx/config.cpp b/SQF/dayz_sfx/config.cpp index 000e13d3b..87a079cd7 100644 --- a/SQF/dayz_sfx/config.cpp +++ b/SQF/dayz_sfx/config.cpp @@ -51,7 +51,7 @@ class CfgSFX { sounds[] = {"DestrMine1","DestrMine2"}; name = "Mine destruction"; DestrMine1[] = {"\ca\BUILDINGS\sound\building2_destroy", 3.16228, 1, 150, 1, 60, 120, 240}; - DestrMine2[] = {"\dayz_sfx\effects\vein_wreck.ogg", 3.16228, 1, 150, 1, 60, 120, 240}; + DestrMine2[] = {"\dayz_sfx\effects\vein_wreck.ogg", 5, 1, 150, 1, 60, 120, 240}; empty[] = {"", 0, 0, 0, 0, 1, 5, 20}; } }; diff --git a/Server Files/Battleye/createvehicle.txt b/Server Files/Battleye/createvehicle.txt index 6ea55906b..e0828d9c2 100644 --- a/Server Files/Battleye/createvehicle.txt +++ b/Server Files/Battleye/createvehicle.txt @@ -1,6 +1,6 @@ 1 "" !="WeaponHolder" !="TinCan" !="Rabbit" !="Goat01_EP1" !="Goat02_EP1" !="Goat" !="WildBoar" !="Sheep" !="Sheep02_EP1" !="Sheep01_EP1" !="Hen" !="Cock" !="Cow01" !="Cow02" !="Cow03" !="Cow04" !="Cow01_EP1" !="zZombie_Base" !="z_hunter" !="z_teacher" !="z_doctor" !="z_suit1" !="z_suit2" !="z_worker1" !="z_worker2" !="z_worker3" !="z_villager1" !="z_villager2" !="z_villager3" !="z_soldier" !="z_soldier_heavy" !="z_soldier_pilot" !="z_policeman" !="z_priest" !="BoltSteelF" !="Land_Fire_DZ" !="SodaCan" !="JackDaniels" !="RoadFlare" !="ChemRed" !="ChemBlue" !="ChemGreen" !="Survivor1_DZ" !="Survivor2_DZ" !="Survivor3_DZ" !="SurvivorW2_DZ" !="Bandit1_DZ" !="CZ_VestPouch_EP1" !="DZ_Patrol_Pack_EP1" !="DZ_CivilBackpack_EP1" !="DZ_ALICE_Pack_EP1" !="SmokeShell" !="SmokeShellRed" !="SmokeShellGreen" !="MedBox0" !="Camo1_DZ" !="Soldier1_DZ" !="DZ_Backpack_EP1" !="Sniper1_DZ" !="DZ_Assault_Pack_EP1" !="BanditW1_DZ" !="G_40mm_HE" !="dog" !="WeaponHolder_MeleeCrowbar" !="WeaponHolder_ItemHatchet" !="WeaponHolder_PartGeneric" !="WeaponHolder_ItemJerrycan" !="WeaponHolder_PartFueltank" !="WeaponHolder_PartGlass" !="WeaponHolder_PartEngine" !="WeaponHolder_PartWheel" !="WeaponHolder_PartVRotor" !="DZ_Czech_Vest_Puch" !="DZ_British_ACU" !="DZ_TK_Assault_Pack_EP1" 1 "SeaGull" -5 "box" !="MedBox0" !="AmmoBoxSmall_556" !="AmmoBoxSmall_762" !="ItemMatchbox" !="ItemToolbox" !="CardBoardBox" !="FoodBox1" !="FoodBox2" !="FoodBox3" !="LockboxStorageLocked" !="LockboxStorage" !="WeaponHolder_ItemLockbox" +5 "box" !="DebugBoxPlayer_DZ" !="MedBox0" !="AmmoBoxSmall_556" !="AmmoBoxSmall_762" !="ItemMatchbox" !="ItemToolbox" !="CardBoardBox" !="FoodBox1" !="FoodBox2" !="FoodBox3" !="LockboxStorageLocked" !="LockboxStorage" !="WeaponHolder_ItemLockbox" 5 "Mine" 5 "ARTY_" 5 "SADARM_" @@ -45,7 +45,7 @@ 1 "_HE" !="z_soldier_heavy" //!="G_40mm_HE" //keep monitoring to catch obvious abuse 1 "HE_" //keep monitoring to catch obvious abuse 1 "M_" !="G_40mm_HE" //!="40mm_" //keep monitoring to catch obvious abuse -5 "Parachute" !="ParachuteWest" //under monitoring +5 "Parachute" !="ParachuteWest" !="ParachuteC" //under monitoring 1 "dog" //until released not welcome 5 "Land_" !="Land_Fire_DZ" !="Land_HBarrier1_DZ" !="Land_HBarrier1Preview" !="Land_HBarrier3_DZ" !="Land_HBarrier3ePreview" !="Land_fortified_nest_smallPreview" !="Land_DZE_WoodDoor" !="Land_DZE_LargeWoodDoor" !="Land_DZE_GarageWoodDoor" !="Land_DZE_WoodDoorLocked" !="Land_DZE_LargeWoodDoorLocked" !="Land_DZE_GarageWoodDoorLocked" 5 "BBarracks"