W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-17 09:10:27 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move Repair and Salvage back to fn_selfActions

Browse Source 
Partial revert of: 3aad4b6

Unfortunately this will not support loading external vehicle addons
(with custom UserActions) which we can not include in Epoch. Child
UserActions overwrite inherited UserActions.
This commit is contained in:
ebaydayz
2016-11-23 13:34:22 -05:00
parent edb622d8bd
commit ec6b5eb679
19 changed files with 72 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/Configs/CfgVehicles/Bikes/MMT_Civ.hpp
View File

@@ -3,9 +3,9 @@ class MMT_Civ: MMT_base {
typicalCargo[] = {};
class TransportMagazines {};
class TransportWeapons {};
class UserActions
/*class UserActions
{
class Repair {ACTION_REPAIR; radius = 4;};
delete Salvage;
};
};*/
};

8
SQF/dayz_code/Configs/CfgVehicles/Bikes/Old_bike.hpp
View File

@@ -3,11 +3,11 @@ class Old_bike_TK_CIV_EP1: Old_bike_base_EP1 {
typicalCargo[] = {};
class TransportMagazines {};
class TransportWeapons {};
class UserActions
/*class UserActions
{
class Repair {ACTION_REPAIR; radius = 4;};
delete Salvage;
};
};*/
};
class Old_bike_TK_INS_EP1: Old_bike_base_EP1 {
@@ -15,9 +15,9 @@ class Old_bike_TK_INS_EP1: Old_bike_base_EP1 {
typicalCargo[] = {};
class TransportMagazines {};
class TransportWeapons {};
class UserActions
/*class UserActions
{
class Repair {ACTION_REPAIR; radius = 4;};
delete Salvage;
};
};*/
};

4
SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp
View File

@@ -5,11 +5,11 @@
//class DefaultEventhandlers;
class Ship : AllVehicles
{
class UserActions
/*class UserActions
{
class Repair {ACTION_REPAIR; radius = 8;};
class Salvage {ACTION_SALVAGE; radius = 8;};
};
};*/
transportMaxMagazines = 2000;
transportMaxWeapons = 200;
transportMaxBackpacks = 40;

13
SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
View File

@@ -137,11 +137,12 @@ class CfgVehicles {
class ViewOptics;
};
};
class UserActions
//Won't support loading external vehicle addons (with custom UserActions) which we can not include in Epoch. Child UserActions overwrite inherited UserActions.
/*class UserActions
{
class Repair {ACTION_REPAIR; radius = 8;};
class Salvage {ACTION_SALVAGE; radius = 8;};
};
};*/
};
class Plane: Air
{
@@ -155,8 +156,8 @@ class CfgVehicles {
class AnimationSources;
class UserActions
{
class Repair {ACTION_REPAIR; radius = 8;};
class Salvage {ACTION_SALVAGE; radius = 8;};
//class Repair {ACTION_REPAIR; radius = 8;};
//class Salvage {ACTION_SALVAGE; radius = 8;};
class PushPlane {ACTION_PUSH;};
};
};
@@ -191,11 +192,11 @@ class CfgVehicles {
brightness = 0.5;
};
};
class UserActions
/*class UserActions
{
class Repair {ACTION_REPAIR; radius = 4;};
class Salvage {ACTION_SALVAGE; radius = 4;};
};
};*/
};
class Car: LandVehicle {
class HitPoints

8
SQF/dayz_code/Configs/CfgVehicles/DZE/CSJ_GyroAC.hpp
View File

@@ -112,8 +112,8 @@ class CSJ_GyroP: Plane
condition = "(Count (Crew this)==0) and ((getpos this select 2) <1) and (!isengineon this)";
statement = "this exec ""\CSJ_GyroAC\scripts\CSJ_moveGyro.sqs"" ";
};
class Repair {ACTION_REPAIR; radius = 4;};
class Salvage {ACTION_SALVAGE; radius = 4;};
//class Repair {ACTION_REPAIR; radius = 4;};
//class Salvage {ACTION_SALVAGE; radius = 4;};
};
class DefaultEventhandlers;
class EventHandlers: DefaultEventhandlers
@@ -223,8 +223,8 @@ class CSJ_GyroC: Helicopter
class Reflectors{};
class AnimationSources: AnimationSources{};
class UserActions {
class Repair {ACTION_REPAIR; radius = 4;};
class Salvage {ACTION_SALVAGE; radius = 4;};
//class Repair {ACTION_REPAIR; radius = 4;};
//class Salvage {ACTION_SALVAGE; radius = 4;};
};
class DefaultEventhandlers;
class EventHandlers: DefaultEventhandlers

2
SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp
View File

@@ -483,7 +483,7 @@ class M240Nest_DZ: USMC_WarfareBMGNest_M240
transportMaxBackpacks = 1;
constructioncount = 10;
removeoutput[] = {{"m240_nest_kit",1}};
class UserActions {delete Repair; delete Salvage;};
//class UserActions {delete Repair; delete Salvage;};
};
class Land_covering_hut_EP1;
class CanvasHut_DZ: Land_covering_hut_EP1

4
SQF/dayz_code/Configs/CfgVehicles/Helicopter/CH53.hpp
View File

@@ -33,7 +33,7 @@ class CH53_DZE : USEC_ch53_E {
init = "MonitorVM = [_this select 0] execvm '\usec_ch53\scripts\ch53_monitor.sqf';MonitorSFXVM = [_this select 0] execvm '\usec_ch53\scripts\ch53_monitorSFX.sqf';";
killed = "_this spawn BIS_Effects_EH_Killed;";
};
class UserActions {
/*class UserActions {
class Repair {ACTION_REPAIR; radius = 8;};
class Salvage {ACTION_SALVAGE; radius = 8;};
class RampOpen {
@@ -110,5 +110,5 @@ class CH53_DZE : USEC_ch53_E {
condition = "((this animationPhase 'cargo' == 0) OR (this animationPhase 'cargo2' == 0));";
statement = "[this] execvm ""\usec_ch53\scripts\ch53_cargodrop.sqf"";";
};
};
};*/
};

4
SQF/dayz_code/Configs/CfgVehicles/Helicopter/MI17.hpp
View File

@@ -295,8 +295,8 @@ class Mi171Sh_CZ_EP1_DZ: Mi17_base {
};
class UserActions {
class Repair {ACTION_REPAIR; radius = 8;};
class Salvage {ACTION_SALVAGE; radius = 8;};
//class Repair {ACTION_REPAIR; radius = 8;};
//class Salvage {ACTION_SALVAGE; radius = 8;};
class HUDoff {
displayName = $STR_AM_HUDON;
displayNameDefault = $STR_AM_HUDON;

4
SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1Y.hpp
View File

@@ -89,8 +89,8 @@ class UH1Y_DZ: UH1_Base {
};
};*/
class UserActions {
class Repair {ACTION_REPAIR; radius = 8;};
class Salvage {ACTION_SALVAGE; radius = 8;};
//class Repair {ACTION_REPAIR; radius = 8;};
//class Salvage {ACTION_SALVAGE; radius = 8;};
class HUDoff {
displayName = $STR_AM_HUDON;
displayNameDefault = $STR_AM_HUDON;

4
SQF/dayz_code/Configs/CfgVehicles/Plane/MV22.hpp
View File

@@ -16,8 +16,8 @@ class MV22_DZ : MV22 {
fuelCapacity = 6513;
class UserActions
{
class Repair {ACTION_REPAIR; radius = 8;};
class Salvage {ACTION_SALVAGE; radius = 8;};
//class Repair {ACTION_REPAIR; radius = 8;};
//class Salvage {ACTION_SALVAGE; radius = 8;};
class PushPlane {ACTION_PUSH;};
};
};

1
SQF/dayz_code/Configs/CfgVehicles/Zeds/Zeds.hpp
View File

@@ -74,6 +74,7 @@ class zZombie_Base : Zed_Base {
condition = "(['Butcher',this] call userActionConditions)";
statement = "this spawn player_butcher;";
};
delete StudyBody;
};
class HitPoints {