From 64ed9b0d6794007043a8384568db1540d42791e6 Mon Sep 17 00:00:00 2001 From: Katalam Date: Wed, 6 Feb 2019 16:02:26 +0100 Subject: [PATCH] REMOVED: InteractionX --- addons/kat_aceCirculation/config.cpp | 64 +------------- .../functions/fn_interactionX.sqf | 87 ------------------- 2 files changed, 1 insertion(+), 150 deletions(-) delete mode 100644 addons/kat_aceCirculation/functions/fn_interactionX.sqf diff --git a/addons/kat_aceCirculation/config.cpp b/addons/kat_aceCirculation/config.cpp index 6b88684..e543c85 100644 --- a/addons/kat_aceCirculation/config.cpp +++ b/addons/kat_aceCirculation/config.cpp @@ -57,7 +57,6 @@ class CfgFunctions { class handleInit{}; class handleTreatment{}; class init{}; - class interactionX{}; class registerSettings{}; class removeEffect_IV{}; class removeItemfromMag{}; @@ -268,67 +267,6 @@ class cfgVehicles { class Man; class CAManBase: Man { class ACE_Actions { - /*class KAT_C1 { - displayName = "C1"; - condition = "true"; - exceptions[] = {}; - statement = "true"; - position = "-0.15, 0.1, 1.3"; - class KAT_C1_TEST { - displayName = "test"; - distance = 1.50; - condition = "true"; - statement = "true"; - icon = ""; - exceptions[] = {"isNotSwimming"}; - }; - }; - class KAT_TEST { - displayName = "CTest"; - selection = "spine2"; - distance = 1.50; - condition = "true"; - statement = ""; - exceptions[] = {"isNotSwimming"}; - class test2 { - displayName = "test"; - distance = 1.50; - condition = "true"; - statement = "true"; - icon = ""; - exceptions[] = {"isNotSwimming"}; - }; - }; - class KAT_C2 { - displayName = "C2"; - condition = "true"; - exceptions[] = {}; - statement = ""; - icon = ""; - //position = "{[0, 0.2, 1.3]}"; - class test { - displayName = "C3"; - condition = "true"; - exceptions[] = {}; - statement = "true"; - icon = ""; - }; - }; - class KAT_C3 { - displayName = "C3"; - condition = "true"; - exceptions[] = {}; - statement = ""; - icon = ""; - //position[] = {-0.1, 0.2, 1.3}; - class test { - displayName = "C3"; - condition = "true"; - exceptions[] = {}; - statement = "true"; - icon = ""; - }; - };*/ class ACE_Dogtag { condition = "[_player, _target] call ace_dogtags_fnc_canCheckDogtag"; }; @@ -576,7 +514,7 @@ class ACE_Medical_Advanced { }; class Painkillers { // copied from ACE. Just a reminder - painReduce = 1.2; + painReduce = 1.2; // increased from 0.7 timeInSystem = 120; maxDose = 10; inCompatableMedication[] = {}; diff --git a/addons/kat_aceCirculation/functions/fn_interactionX.sqf b/addons/kat_aceCirculation/functions/fn_interactionX.sqf deleted file mode 100644 index 92f062b..0000000 --- a/addons/kat_aceCirculation/functions/fn_interactionX.sqf +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Author: Katalam - * Handle the X Series Defi for the patient. - * - * Arguments: - * 0: Unit - * 1: Target - * - * Return Value: - * None - * - * Example: - * [player, cursorTarget] call kat_aceCirculation_fnc_interactionX; - * - * Public: No - */ - -params ["_player", "_target"]; - -// name, shown name, icon, statement, condition, insert children, arguments, position - -// _player getVariable ["kat_aceCirculation_use", false]; - -[_target, 0, [], - ["KAT_X_codeParent0", "0", "", {}, {true}, {}, [], [0, 0.2, 1.5]] call ace_interact_menu_fnc_createAction -] call ace_interact_menu_fnc_addActionToObject; - -[_target, 0, ["KAT_X_codeParent0"], - ["KAT_X_codeAction0", "0", "", {true}, {true}] call ace_interact_menu_fnc_createAction -] call ace_interact_menu_fnc_addActionToObject; - -[_target, 0, [], - ["KAT_X_codeParent1", "1", "", {}, {true}, {}, [], [-0.1, 0.2, 1.3]] call ace_interact_menu_fnc_createAction -] call ace_interact_menu_fnc_addActionToObject; - -[_target, 0, ["KAT_X_codeParent1"], - ["KAT_X_codeAction1", "1", "", {true}, {true}] call ace_interact_menu_fnc_createAction -] call ace_interact_menu_fnc_addActionToObject; - -[_target, 0, [], - ["KAT_X_codeParent2", "2", "", {}, {true}, {}, [], [-0.15, 0.2, 1.3]] call ace_interact_menu_fnc_createAction -] call ace_interact_menu_fnc_addActionToObject; - -[_target, 0, ["KAT_X_codeParent2"], - ["KAT_X_codeAction2", "2", "", {true}, {true}] call ace_interact_menu_fnc_createAction -] call ace_interact_menu_fnc_addActionToObject; - - - -private _cargo1 = defi; -private _cargo2 = abcd; -private _helper1 = "B_G_Boat_Transport_01_F" createVehicle position _cargo2; -_cargo1 enableRopeAttach true; -_helper1 attachTo [_cargo2, [0, 0.2, 1.5]]; -ropeCreate [_helper1, [0,-0.2,0], _cargo1, [0,0,0]]; - -private _helper3 = "B_G_Boat_Transport_01_F" createVehicle position _cargo2; -_helper3 attachTo [_cargo2, [-0.1, 0.2, 1.3]]; -ropeCreate [_helper3, [0,-0.2,0], _cargo1, [0,0,0]]; - -private _helper4 = "B_G_Boat_Transport_01_F" createVehicle position _cargo2; -_helper4 attachTo [_cargo2, [-0.15, 0.2, 1.3]]; -ropeCreate [_helper4, [0,-0.2,0], _cargo1, [0,0,0]]; - -hideObject _helper1; -hideObject _helper3; -hideObject _helper4; -[_helper1] remoteExec ["hideObjectGlobal", [0, 2] select isDedicated]; -[_helper3] remoteExec ["hideObjectGlobal", [0, 2] select isDedicated]; -[_helper4] remoteExec ["hideObjectGlobal", [0, 2] select isDedicated]; - -//[_helper2, [0,0,0], [0,0,-1]] ropeAttachTo _rope; - -/* -["spine","spine1","spine2","spine3","head","leftshoulder","leftarm","leftarmroll","leftforearm","leftforearmroll","lefthand","rightshoulder","rightarm","rightarmroll", -"rightforearm","rightforearmroll","righthand","pelvis","leftupleg","leftuplegroll","leftleg","leftlegroll","leftfoot","lefttoebase","rightupleg","rightuplegroll","rightleg", -"rightlegroll","rightfoot","righttoebase","weapon","proxy:\a3\characters_f\proxies\weapon.001","proxy:\a3\characters_f\proxies\pistol.001", -"proxy:\a3\characters_f\proxies\binoculars.001","proxy:\a3\characters_f\proxies\launcher.001","launcher","nvg","proxy:\a3\characters_f\proxies\nvg.001", -"proxy:\a3\characters_f\proxies\flag.001","proxy:\a3\characters_f\proxies\equipment.001","proxy:\a3\characters_f\proxies\backpack.001", -"proxy:\a3\characters_f\proxies\pistol_holstered.001","proxy:\a3\characters_f\proxies\head_male.001","proxy:\a3\characters_f\proxies\glasses.001", -"proxy:\a3\characters_f\proxies\headgear.001","proxy:\a3\characters_f\proxies\hair.001","proxy:\a3\characters_f\proxies\backpack2.001", -"proxy:\a3\characters_f\proxies\radio.001","body_proxy","head_proxy","proxy:\a3\characters_f\heads\bysta.001","lefthandindex1","lefthandindex2", -"lefthandindex3","lefthandmiddle1","lefthandmiddle2","lefthandmiddle3","lefthandring","lefthandpinky1","lefthandpinky2","lefthandpinky3","lefthandring1", -"lefthandring2","lefthandring3","lefthandthumb1","lefthandthumb2","lefthandthumb3","righthandindex1","righthandindex2","righthandindex3","righthandmiddle1", -"righthandmiddle2","righthandmiddle3","righthandring","righthandpinky1","righthandpinky2","righthandpinky3","righthandring1","righthandring2","righthandring3", -"righthandthumb1","righthandthumb2","righthandthumb3","injury_body","hl","neck","proxy:\a3\characters_f\proxies\hmd.001","injury_hands","injury_legs","camo", -"camo2","insignia","clan"] */