diff --git a/addons/flags/CfgEventHandlers.hpp b/addons/flags/CfgEventHandlers.hpp deleted file mode 100644 index b468b9e..0000000 --- a/addons/flags/CfgEventHandlers.hpp +++ /dev/null @@ -1,23 +0,0 @@ -class Extended_PreStart_EventHandlers { - class ADDON { - init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); - }; -}; - -class Extended_PreInit_EventHandlers { - class ADDON { - init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); - }; -}; - -class Extended_PostInit_EventHandlers { - class ADDON { - init = QUOTE(call COMPILE_SCRIPT(XEH_postInit)); - }; -}; - -class Extended_DisplayLoad_EventHandlers { - class RscDisplayMission { - ADDON = QUOTE(_this call COMPILE_SCRIPT(XEH_missionDisplayLoad)); - }; -}; diff --git a/addons/flags/CfgVehicles.hpp b/addons/flags/CfgVehicles.hpp deleted file mode 100644 index 7de5023..0000000 --- a/addons/flags/CfgVehicles.hpp +++ /dev/null @@ -1,21 +0,0 @@ -class CfgVehicles { - class Man; - class CAManBase: Man { - class ACE_SelfActions { - class ACE_Equipment { - class ADDON { - displayName = CSTRING(ActionCategory); - insertChildren = QUOTE(_this call FUNC(getActions)); - icon = QPATHTOF(data\icons\place\white_place_icon.paa); - - class GVAR(furlFlag) { - displayName = CSTRING(Furl); - condition = QUOTE(_player call FUNC(carriesFlag)); - statement = QUOTE(_player call FUNC(furlFlag)); - icon = QPATHTOF(data\icons\carry\white_furl_icon.paa); - }; - }; - }; - }; - }; -}; diff --git a/addons/flags/CfgWeapons.hpp b/addons/flags/CfgWeapons.hpp index ce4cb6d..6aa41eb 100644 --- a/addons/flags/CfgWeapons.hpp +++ b/addons/flags/CfgWeapons.hpp @@ -1,78 +1,99 @@ class CfgWeapons { - class CBA_MiscItem; class CBA_MiscItem_ItemInfo; - class GVAR(white): CBA_MiscItem { - scope = 2; - author = CSTRING(Authors); - descriptionShort = CSTRING(Description); - descriptionUse = CSTRING(Description); + class ace_flags_white; + class GVAR(white): ace_flags_white { + scope = 1; + scopeCurator = 0; + scopeArsenal = 0; + author = ECSTRING(main,authors); - displayName = CSTRING(White); - picture = QPATHTOF(data\pictures\white_item.paa); + class ItemInfo: CBA_MiscItem_ItemInfo { + mass = 3; + }; + }; - GVAR(texture) = "\a3\data_f\flags\flag_white_co.paa"; - GVAR(actionIconPlace) = QPATHTOF(data\icons\place\white_place_icon.paa); - GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\white_carry_icon.paa); + class ace_flags_red; + class GVAR(red): ace_flags_red { + scope = 1; + scopeCurator = 0; + scopeArsenal = 0; + author = ECSTRING(main,authors); class ItemInfo: CBA_MiscItem_ItemInfo { mass = 3; }; }; - class GVAR(red): GVAR(white) { - displayName = CSTRING(Red); - picture = QPATHTOF(data\pictures\red_item.paa); - GVAR(texture) = "\a3\data_f\flags\flag_red_co.paa"; - GVAR(actionIconPlace) = QPATHTOF(data\icons\place\red_place_icon.paa); - GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\red_carry_icon.paa); - }; - class GVAR(blue): GVAR(white) { - displayName = CSTRING(Blue); - picture = QPATHTOF(data\pictures\blue_item.paa); + class ace_flags_blue; + class GVAR(blue): ace_flags_blue { + scope = 1; + scopeCurator = 0; + scopeArsenal = 0; + author = ECSTRING(main,authors); - GVAR(texture) = "\a3\data_f\flags\Flag_blue_co.paa"; - GVAR(actionIconPlace) = QPATHTOF(data\icons\place\blue_place_icon.paa); - GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\blue_carry_icon.paa); + class ItemInfo: CBA_MiscItem_ItemInfo { + mass = 3; + }; }; - class GVAR(green): GVAR(white) { - displayName = CSTRING(Green); - picture = QPATHTOF(data\pictures\green_item.paa); - GVAR(texture) = "\a3\data_f\flags\flag_green_co.paa"; - GVAR(actionIconPlace) = QPATHTOF(data\icons\place\green_place_icon.paa); - GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\green_carry_icon.paa); + class ace_flags_green; + class GVAR(green): ace_flags_green { + scope = 1; + scopeCurator = 0; + scopeArsenal = 0; + author = ECSTRING(main,authors); + + class ItemInfo: CBA_MiscItem_ItemInfo { + mass = 3; + }; }; - class GVAR(yellow): GVAR(white) { - displayName = CSTRING(Yellow); - picture = QPATHTOF(data\pictures\yellow_item.paa); - GVAR(texture) = QPATHTOF(data\flag_yellow_co.paa); - GVAR(actionIconPlace) = QPATHTOF(data\icons\place\yellow_place_icon.paa); - GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\yellow_carry_icon.paa); + class ace_flags_yellow; + class GVAR(yellow): ace_flags_yellow { + scope = 1; + scopeCurator = 0; + scopeArsenal = 0; + author = ECSTRING(main,authors); + + class ItemInfo: CBA_MiscItem_ItemInfo { + mass = 3; + }; }; - class GVAR(orange): GVAR(white) { - displayName = CSTRING(Orange); - picture = QPATHTOF(data\pictures\orange_item.paa); - GVAR(texture) = QPATHTOF(data\flag_orange_co.paa); - GVAR(actionIconPlace) = QPATHTOF(data\icons\place\orange_place_icon.paa); - GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\orange_carry_icon.paa); + class ace_flags_orange; + class GVAR(orange): ace_flags_orange { + scope = 1; + scopeCurator = 0; + scopeArsenal = 0; + author = ECSTRING(main,authors); + + class ItemInfo: CBA_MiscItem_ItemInfo { + mass = 3; + }; }; - class GVAR(purple): GVAR(white) { - displayName = CSTRING(Purple); - picture = QPATHTOF(data\pictures\purple_item.paa); - GVAR(texture) = QPATHTOF(data\flag_purple_co.paa); - GVAR(actionIconPlace) = QPATHTOF(data\icons\place\purple_place_icon.paa); - GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\purple_carry_icon.paa); + class ace_flags_purple; + class GVAR(purple): ace_flags_purple { + scope = 1; + scopeCurator = 0; + scopeArsenal = 0; + author = ECSTRING(main,authors); + + class ItemInfo: CBA_MiscItem_ItemInfo { + mass = 3; + }; }; - class GVAR(black): GVAR(white) { - displayName = CSTRING(Black); - picture = QPATHTOF(data\pictures\black_item.paa); - GVAR(texture) = QPATHTOF(data\flag_black_co.paa); - GVAR(actionIconPlace) = QPATHTOF(data\icons\place\black_place_icon.paa); - GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\black_carry_icon.paa); + class ace_flags_black; + class GVAR(black): ace_flags_black { + scope = 1; + scopeCurator = 0; + scopeArsenal = 0; + author = ECSTRING(main,authors); + + class ItemInfo: CBA_MiscItem_ItemInfo { + mass = 3; + }; }; }; diff --git a/addons/flags/README.md b/addons/flags/README.md new file mode 100644 index 0000000..52180f9 --- /dev/null +++ b/addons/flags/README.md @@ -0,0 +1 @@ +Flags have been moved to ACE 3.19.0! This component is only here for backwards compatibility. diff --git a/addons/flags/XEH_PREP.hpp b/addons/flags/XEH_PREP.hpp deleted file mode 100644 index 0ddfcdd..0000000 --- a/addons/flags/XEH_PREP.hpp +++ /dev/null @@ -1,8 +0,0 @@ -PREP(carriesFlag); -PREP(carryFlag); -PREP(furlFlag); -PREP(getActions); -PREP(getFlags); -PREP(handleScrollWheel); -PREP(pickupFlag); -PREP(placeFlag); diff --git a/addons/flags/XEH_missionDisplayLoad.sqf b/addons/flags/XEH_missionDisplayLoad.sqf deleted file mode 100644 index e276b73..0000000 --- a/addons/flags/XEH_missionDisplayLoad.sqf +++ /dev/null @@ -1,17 +0,0 @@ -#include "script_component.hpp" - -CHECK(!hasInterface); - -params ["_display"]; - -_display displayAddEventHandler ["MouseZChanged", { - params ["", "_scroll"]; - [_scroll] call FUNC(handleScrollWheel); -}]; - -_display displayAddEventHandler ["MouseButtonDown", { - params ["", "_button"]; - if (GVAR(isPlacing) isNotEqualTo PLACE_WAITING) exitWith {false}; - if (_button isNotEqualTo 1) exitWith {false}; // 1 = Left mouse button - GVAR(isPlacing) = PLACE_CANCEL; -}]; diff --git a/addons/flags/XEH_postInit.sqf b/addons/flags/XEH_postInit.sqf deleted file mode 100644 index 8cfa0e8..0000000 --- a/addons/flags/XEH_postInit.sqf +++ /dev/null @@ -1,40 +0,0 @@ -#include "script_component.hpp" - -CHECK(!hasInterface); - -GVAR(isPlacing) = PLACE_CANCEL; -["ace_interactMenuOpened", {GVAR(isPlacing) = PLACE_CANCEL;}] call CBA_fnc_addEventHandler; - -[QGVAR(flagPlaced), { - params ["_unit", "_item", "_flag"]; - - (GVAR(flagItemCache) get _item) params ["_flagName"]; - - private _pickupFlag = [ - QGVAR(pickup), - format [LLSTRING(Pickup), _flagName], - QPATHTOF(data\icons\place\white_pickup_icon.paa), - { - params ["_flag", "_unit", "_item"]; - [_unit, _item, _flag] call FUNC(pickupFlag); - }, - {true}, - {}, - _item, - [0, -0.45, 0.75], - 2 - ] call ace_interact_menu_fnc_createAction; - [_flag, 0, [], _pickupFlag] call ace_interact_menu_fnc_addActionToObject; -}] call CBA_fnc_addEventHandler; - -private _cfgWeapons = configFile >> "CfgWeapons"; -private _flagItems = (call (uiNamespace getVariable [QGVAR(allFlagItems), {[]}])) apply {_cfgWeapons >> _x}; -{ - private _name = configName _x; - private _displayName = getText (_x >> "displayName"); - private _texture = getText (_x >> QGVAR(texture)); - private _actionIconPlace = getText (_x >> QGVAR(actionIconPlace)); - private _actionIconCarry = getText (_x >> QGVAR(actionIconCarry)); - - GVAR(flagItemCache) set [_name, [_displayName, _texture, _actionIconPlace, _actionIconCarry]]; -} forEach _flagItems; diff --git a/addons/flags/XEH_preInit.sqf b/addons/flags/XEH_preInit.sqf deleted file mode 100644 index 8b0f742..0000000 --- a/addons/flags/XEH_preInit.sqf +++ /dev/null @@ -1,13 +0,0 @@ -#include "script_component.hpp" - -ADDON = false; - -PREP_RECOMPILE_START; -#include "XEH_PREP.hpp" -PREP_RECOMPILE_END; - -#include "initSettings.hpp" - -GVAR(flagItemCache) = createHashMap; - -ADDON = true; diff --git a/addons/flags/XEH_preStart.sqf b/addons/flags/XEH_preStart.sqf deleted file mode 100644 index c70b253..0000000 --- a/addons/flags/XEH_preStart.sqf +++ /dev/null @@ -1,6 +0,0 @@ -#include "script_component.hpp" - -#include "XEH_PREP.hpp" - -private _flagItems = (configProperties [configFile >> "CfgWeapons", QUOTE(isClass _x && {isText (_x >> QQGVAR(texture))}), true]) apply {configName _x}; -uiNamespace setVariable [QGVAR(allFlagItems), compileFinal str _flagItems]; diff --git a/addons/flags/config.cpp b/addons/flags/config.cpp index fb01163..53633a3 100644 --- a/addons/flags/config.cpp +++ b/addons/flags/config.cpp @@ -15,7 +15,7 @@ class CfgPatches { QGVAR(black) }; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_common", "ace_interact_menu", "ace_interaction"}; + requiredAddons[] = {"mts_main", "ace_flags"}; author = ECSTRING(main,authors); authors[] = {"Timi007"}; url = ECSTRING(main,URL); @@ -23,6 +23,4 @@ class CfgPatches { }; }; -#include "CfgEventHandlers.hpp" -#include "CfgVehicles.hpp" #include "CfgWeapons.hpp" diff --git a/addons/flags/data/flag_black_co.paa b/addons/flags/data/flag_black_co.paa deleted file mode 100644 index 4a9ead5..0000000 Binary files a/addons/flags/data/flag_black_co.paa and /dev/null differ diff --git a/addons/flags/data/flag_orange_co.paa b/addons/flags/data/flag_orange_co.paa deleted file mode 100644 index 2398005..0000000 Binary files a/addons/flags/data/flag_orange_co.paa and /dev/null differ diff --git a/addons/flags/data/flag_purple_co.paa b/addons/flags/data/flag_purple_co.paa deleted file mode 100644 index 4aaf635..0000000 Binary files a/addons/flags/data/flag_purple_co.paa and /dev/null differ diff --git a/addons/flags/data/flag_yellow_co.paa b/addons/flags/data/flag_yellow_co.paa deleted file mode 100644 index 758ca60..0000000 Binary files a/addons/flags/data/flag_yellow_co.paa and /dev/null differ diff --git a/addons/flags/data/icons/carry/black_carry_icon.paa b/addons/flags/data/icons/carry/black_carry_icon.paa deleted file mode 100644 index 3cd6671..0000000 Binary files a/addons/flags/data/icons/carry/black_carry_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/carry/blue_carry_icon.paa b/addons/flags/data/icons/carry/blue_carry_icon.paa deleted file mode 100644 index 3e70a5e..0000000 Binary files a/addons/flags/data/icons/carry/blue_carry_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/carry/green_carry_icon.paa b/addons/flags/data/icons/carry/green_carry_icon.paa deleted file mode 100644 index 9a362a0..0000000 Binary files a/addons/flags/data/icons/carry/green_carry_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/carry/orange_carry_icon.paa b/addons/flags/data/icons/carry/orange_carry_icon.paa deleted file mode 100644 index 67e1ef3..0000000 Binary files a/addons/flags/data/icons/carry/orange_carry_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/carry/purple_carry_icon.paa b/addons/flags/data/icons/carry/purple_carry_icon.paa deleted file mode 100644 index 944677f..0000000 Binary files a/addons/flags/data/icons/carry/purple_carry_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/carry/red_carry_icon.paa b/addons/flags/data/icons/carry/red_carry_icon.paa deleted file mode 100644 index 72629cb..0000000 Binary files a/addons/flags/data/icons/carry/red_carry_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/carry/white_carry_icon.paa b/addons/flags/data/icons/carry/white_carry_icon.paa deleted file mode 100644 index 9949907..0000000 Binary files a/addons/flags/data/icons/carry/white_carry_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/carry/white_furl_icon.paa b/addons/flags/data/icons/carry/white_furl_icon.paa deleted file mode 100644 index 0688e0a..0000000 Binary files a/addons/flags/data/icons/carry/white_furl_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/carry/yellow_carry_icon.paa b/addons/flags/data/icons/carry/yellow_carry_icon.paa deleted file mode 100644 index 3791cd1..0000000 Binary files a/addons/flags/data/icons/carry/yellow_carry_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/place/black_place_icon.paa b/addons/flags/data/icons/place/black_place_icon.paa deleted file mode 100644 index 6b7a359..0000000 Binary files a/addons/flags/data/icons/place/black_place_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/place/blue_place_icon.paa b/addons/flags/data/icons/place/blue_place_icon.paa deleted file mode 100644 index 0d2a4b7..0000000 Binary files a/addons/flags/data/icons/place/blue_place_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/place/green_place_icon.paa b/addons/flags/data/icons/place/green_place_icon.paa deleted file mode 100644 index d63d577..0000000 Binary files a/addons/flags/data/icons/place/green_place_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/place/orange_place_icon.paa b/addons/flags/data/icons/place/orange_place_icon.paa deleted file mode 100644 index 1851439..0000000 Binary files a/addons/flags/data/icons/place/orange_place_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/place/purple_place_icon.paa b/addons/flags/data/icons/place/purple_place_icon.paa deleted file mode 100644 index 371fff0..0000000 Binary files a/addons/flags/data/icons/place/purple_place_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/place/red_place_icon.paa b/addons/flags/data/icons/place/red_place_icon.paa deleted file mode 100644 index bb2ad11..0000000 Binary files a/addons/flags/data/icons/place/red_place_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/place/white_pickup_icon.paa b/addons/flags/data/icons/place/white_pickup_icon.paa deleted file mode 100644 index 271beea..0000000 Binary files a/addons/flags/data/icons/place/white_pickup_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/place/white_place_icon.paa b/addons/flags/data/icons/place/white_place_icon.paa deleted file mode 100644 index f679716..0000000 Binary files a/addons/flags/data/icons/place/white_place_icon.paa and /dev/null differ diff --git a/addons/flags/data/icons/place/yellow_place_icon.paa b/addons/flags/data/icons/place/yellow_place_icon.paa deleted file mode 100644 index b51711e..0000000 Binary files a/addons/flags/data/icons/place/yellow_place_icon.paa and /dev/null differ diff --git a/addons/flags/data/pictures/black_item.paa b/addons/flags/data/pictures/black_item.paa deleted file mode 100644 index fe2b818..0000000 Binary files a/addons/flags/data/pictures/black_item.paa and /dev/null differ diff --git a/addons/flags/data/pictures/blue_item.paa b/addons/flags/data/pictures/blue_item.paa deleted file mode 100644 index 9bb3312..0000000 Binary files a/addons/flags/data/pictures/blue_item.paa and /dev/null differ diff --git a/addons/flags/data/pictures/green_item.paa b/addons/flags/data/pictures/green_item.paa deleted file mode 100644 index eb8e2f9..0000000 Binary files a/addons/flags/data/pictures/green_item.paa and /dev/null differ diff --git a/addons/flags/data/pictures/orange_item.paa b/addons/flags/data/pictures/orange_item.paa deleted file mode 100644 index 665fb8d..0000000 Binary files a/addons/flags/data/pictures/orange_item.paa and /dev/null differ diff --git a/addons/flags/data/pictures/purple_item.paa b/addons/flags/data/pictures/purple_item.paa deleted file mode 100644 index 70a7539..0000000 Binary files a/addons/flags/data/pictures/purple_item.paa and /dev/null differ diff --git a/addons/flags/data/pictures/red_item.paa b/addons/flags/data/pictures/red_item.paa deleted file mode 100644 index 9b5fafa..0000000 Binary files a/addons/flags/data/pictures/red_item.paa and /dev/null differ diff --git a/addons/flags/data/pictures/white_item.paa b/addons/flags/data/pictures/white_item.paa deleted file mode 100644 index e0353f2..0000000 Binary files a/addons/flags/data/pictures/white_item.paa and /dev/null differ diff --git a/addons/flags/data/pictures/yellow_item.paa b/addons/flags/data/pictures/yellow_item.paa deleted file mode 100644 index 8343dc0..0000000 Binary files a/addons/flags/data/pictures/yellow_item.paa and /dev/null differ diff --git a/addons/flags/functions/fnc_carriesFlag.sqf b/addons/flags/functions/fnc_carriesFlag.sqf deleted file mode 100644 index 4b3a82d..0000000 --- a/addons/flags/functions/fnc_carriesFlag.sqf +++ /dev/null @@ -1,22 +0,0 @@ -#include "script_component.hpp" -/** - * Author: Timi007 - * - * Description: - * Checks if the unit is carrying a flag. - * - * Parameter(s): - * 0: OBJECT - Unit. - * - * Returns: - * BOOLEAN - True if unit is carrying a flag; otherwise flase. - * - * Example: - * [player] call mts_flags_fnc_carriesFlag - * - */ - -params ["_unit"]; - -(_unit getVariable [QGVAR(carryingFlag), ""] isNotEqualTo "") && -{(getForcedFlagTexture _unit) isNotEqualTo ""} diff --git a/addons/flags/functions/fnc_carryFlag.sqf b/addons/flags/functions/fnc_carryFlag.sqf deleted file mode 100644 index c0b6451..0000000 --- a/addons/flags/functions/fnc_carryFlag.sqf +++ /dev/null @@ -1,27 +0,0 @@ -#include "script_component.hpp" -/** - * Author: Timi007 - * - * Description: - * Attaches flag to the back of the unit and removes his flag item. - * - * Parameter(s): - * 0: OBJECT - Unit. - * 1: STRING - Flag item. - * - * Returns: - * Nothing. - * - * Example: - * [player, "mts_flags_white"] call mts_flags_fnc_carryFlag - * - */ - -params ["_unit", "_item"]; -TRACE_2("Carry flag",_unit,_item); - -(GVAR(flagItemCache) get _item) params ["", "_texture"]; -_unit forceFlagTexture _texture; - -_unit setVariable [QGVAR(carryingFlag), _item, true]; -_unit removeItem _item; diff --git a/addons/flags/functions/fnc_furlFlag.sqf b/addons/flags/functions/fnc_furlFlag.sqf deleted file mode 100644 index 8b66fe4..0000000 --- a/addons/flags/functions/fnc_furlFlag.sqf +++ /dev/null @@ -1,27 +0,0 @@ -#include "script_component.hpp" -/** - * Author: Timi007 - * - * Description: - * Stops carrying flag and adds flag item back to unit. - * - * Parameter(s): - * 0: OBJECT - Unit. - * - * Returns: - * Nothing. - * - * Example: - * [player] call mts_flags_fnc_furlFlag - * - */ - -params ["_unit"]; - -// Stop carrying flag and add flag item to unit. -_item = _unit getVariable [QGVAR(carryingFlag), ""]; -_unit setVariable [QGVAR(carryingFlag), nil, true]; - -_unit forceFlagTexture ""; // Remove flag - -[_unit, _item] call ace_common_fnc_addToInventory; diff --git a/addons/flags/functions/fnc_getActions.sqf b/addons/flags/functions/fnc_getActions.sqf deleted file mode 100644 index 34d1a29..0000000 --- a/addons/flags/functions/fnc_getActions.sqf +++ /dev/null @@ -1,63 +0,0 @@ -#include "script_component.hpp" -/** - * Author: Timi007 - * - * Description: - * Gets the child actions for placing and carring flags. - * - * Parameter(s): - * 0: OBJECT - Player. - * - * Returns: - * ARRAY - Actions. - * - * Example: - * [player] call mts_flags_fnc_getActions - * - */ - -params ["_player"]; - -private _actions = []; - -{ - (GVAR(flagItemCache) get _x) params ["_flagName", "_texture", "_actionIconPlace", "_actionIconCarry"]; - - // Place flag - _actions pushBack [ - [ - "place_" + _x, - format [LLSTRING(Place), _flagName], - _actionIconPlace, - { - params ["_player", "", "_item"]; - [_player, _item] call FUNC(placeFlag); - }, - {GVAR(enablePlacing)}, - {}, - _x - ] call ace_interact_menu_fnc_createAction, - [], - _player - ]; - - // Carry flag - _actions pushBack [ - [ - "carry_" + _x, - format [LLSTRING(Carry), _flagName], - _actionIconCarry, - { - params ["_player", "", "_item"]; - [_player, _item] call FUNC(carryFlag); - }, - {GVAR(enableCarrying) && {!([_this select 0] call FUNC(carriesFlag))}}, // Should not carry flag already - {}, - _x - ] call ace_interact_menu_fnc_createAction, - [], - _player - ]; -} forEach ([_player] call FUNC(getFlags)); - -_actions diff --git a/addons/flags/functions/fnc_getFlags.sqf b/addons/flags/functions/fnc_getFlags.sqf deleted file mode 100644 index f22405a..0000000 --- a/addons/flags/functions/fnc_getFlags.sqf +++ /dev/null @@ -1,21 +0,0 @@ -#include "script_component.hpp" -/** - * Author: Timi007 - * - * Description: - * Get the placeable and carryable flags in the unit's inventory. - * - * Parameter(s): - * 0: OBJECT - Unit - * - * Returns: - * ARRAY - Flag items. - * - * Example: - * [player] call mts_flags_fnc_getFlags - * - */ - -params ["_unit"]; - -(_unit call ace_common_fnc_uniqueItems) arrayIntersect keys GVAR(flagItemCache) diff --git a/addons/flags/functions/fnc_handleScrollWheel.sqf b/addons/flags/functions/fnc_handleScrollWheel.sqf deleted file mode 100644 index 1b2f995..0000000 --- a/addons/flags/functions/fnc_handleScrollWheel.sqf +++ /dev/null @@ -1,31 +0,0 @@ -#include "script_component.hpp" -/** - * Author: Timi007 - * - * Description: - * Handles the flag object height. - * - * Parameter(s): - * 0: NUMBER - Scroll amount - * - * Returns: - * BOOLEAN - Handled - * - * Example: - * [5] call mts_flags_fnc_handleScrollWheel - * - */ - -params [["_scrollAmount", 0, [0]]]; - -if (GVAR(isPlacing) isNotEqualTo PLACE_WAITING) exitWith { - false -}; - -// Move object height 10cm per scroll -GVAR(objectHeight) = GVAR(objectHeight) + (_scrollAmount * 0.1); - -// Clamp height between MIN_HEIGHT and MAX_HEIGHT -GVAR(objectHeight) = (MIN_HEIGHT max (GVAR(objectHeight) min MAX_HEIGHT)); - -true diff --git a/addons/flags/functions/fnc_pickupFlag.sqf b/addons/flags/functions/fnc_pickupFlag.sqf deleted file mode 100644 index a87923d..0000000 --- a/addons/flags/functions/fnc_pickupFlag.sqf +++ /dev/null @@ -1,31 +0,0 @@ -#include "script_component.hpp" -/** - * Author: Timi007 - * - * Description: - * Picks up flag and adds item to unit. - * - * Parameter(s): - * 0: OBJECT - Unit. - * 1: STRING - Flag item. - * 2: OBJECT - Flag pole (gets deleted later). - * - * Returns: - * Nothing. - * - * Example: - * [player, "mts_flags_white", my_flag] call mts_flags_fnc_pickupFlag - * - */ - -params ["_unit", "_item", "_flag"]; -TRACE_3("Flag pickup",_unit,_item,_flag); - -[_unit, "PutDown"] call ace_common_fnc_doGesture; - -[{ - params ["_unit", "_item", "_flag"]; - - [_unit, _item] call ace_common_fnc_addToInventory; - deleteVehicle _flag; -}, [_unit, _item, _flag], 0.7] call CBA_fnc_waitAndExecute; diff --git a/addons/flags/functions/fnc_placeFlag.sqf b/addons/flags/functions/fnc_placeFlag.sqf deleted file mode 100644 index 18cd474..0000000 --- a/addons/flags/functions/fnc_placeFlag.sqf +++ /dev/null @@ -1,81 +0,0 @@ -#include "script_component.hpp" -/** - * Author: Timi007 - * - * Description: - * Starts the placing process of the flag for the player. - * Flags can be placed with the special flag items. - * - * Parameter(s): - * 0: OBJECT - Player. - * 1: STRING - Flag item. - * - * Returns: - * Nothing. - * - * Example: - * [player, "mts_flags_white"] call mts_flags_fnc_placeFlag - * - */ - -params ["_player", "_item"]; -TRACE_2("Placing flag",_player,_item); - -private _flag = "FlagChecked_F" createVehicle [0, 0, 0]; - -// Set flag start height -GVAR(objectHeight) = MIN_HEIGHT; - -GVAR(isPlacing) = PLACE_WAITING; - -(GVAR(flagItemCache) get _item) params ["_flagName", "_texture"]; - -_flag setFlagTexture _texture; - -// Add info dialog for the player which show the controls -private _placeFlagText = format [LLSTRING(Place), _flagName]; -[_placeFlagText, LLSTRING(Cancel), LLSTRING(AdjustHeight)] call ace_interaction_fnc_showMouseHint; - -private _mouseClickID = [_player, "DefaultAction", { - GVAR(isPlacing) isEqualTo PLACE_WAITING -}, { - GVAR(isPlacing) = PLACE_APPROVE -}] call ace_common_fnc_addActionEventHandler; - -[{ // Start of PFH - params ["_args", "_handle"]; - _args params ["_player", "_item", "_flag", "_mouseClickID"]; - - if (isNull _flag || {!([_player, _flag] call ace_common_fnc_canInteractWith)}) then { - GVAR(isPlacing) = PLACE_CANCEL; - }; - - if (GVAR(isPlacing) isNotEqualTo PLACE_WAITING) exitWith { - [_handle] call CBA_fnc_removePerFrameHandler; - call ace_interaction_fnc_hideMouseHint; - [_player, "DefaultAction", _mouseClickID] call ace_common_fnc_removeActionEventHandler; - - if (GVAR(isPlacing) isEqualTo PLACE_APPROVE) then { - // End position of the flag - - GVAR(isPlacing) = PLACE_CANCEL; - - [_player, "PutDown"] call ace_common_fnc_doGesture; - - _player removeItem _item; - - private _jipID = [QGVAR(flagPlaced), [_player, _item, _flag]] call CBA_fnc_globalEventJIP; - [_jipID, _flag] call CBA_fnc_removeGlobalEventJIP; - } else { - // Action is canceled - deleteVehicle _flag; - }; - }; - - private _pos = ((eyePos _player) vectorAdd ((getCameraViewDirection _player) vectorMultiply FLAG_PLACING_DISTANCE)); - // Adjust height of flag with the scroll wheel - _pos set [2, ((getPosWorld _player) select 2) + GVAR(objectHeight)]; - - _flag setPosWorld _pos; - _flag setDir (getDir _player); -}, 0, [_player, _item, _flag, _mouseClickID]] call CBA_fnc_addPerFrameHandler; diff --git a/addons/flags/functions/script_component.hpp b/addons/flags/functions/script_component.hpp deleted file mode 100644 index 4aec1f6..0000000 --- a/addons/flags/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\z\mts_enhanced\addons\flags\script_component.hpp" diff --git a/addons/flags/initSettings.hpp b/addons/flags/initSettings.hpp deleted file mode 100644 index bfe56ef..0000000 --- a/addons/flags/initSettings.hpp +++ /dev/null @@ -1,17 +0,0 @@ -private _category = [LELSTRING(main,category), LLSTRING(SettingCategory)]; - -[ - QGVAR(enablePlacing), "CHECKBOX", - [LSTRING(AllowPlacingFlags), LSTRING(AllowPlacingFlagsTooltip)], - _category, - true, - 0 -] call CBA_fnc_addSetting; - -[ - QGVAR(enableCarrying), "CHECKBOX", - [LSTRING(AllowCarryingFlags), LSTRING(AllowCarryingFlagsTooltip)], - _category, - true, - 0 -] call CBA_fnc_addSetting; diff --git a/addons/flags/script_component.hpp b/addons/flags/script_component.hpp index 0c332d5..c80d90d 100644 --- a/addons/flags/script_component.hpp +++ b/addons/flags/script_component.hpp @@ -15,12 +15,3 @@ #endif #include "\z\mts_enhanced\addons\main\script_macros.hpp" - -#define PLACE_WAITING -1 -#define PLACE_CANCEL 0 -#define PLACE_APPROVE 1 - -#define MIN_HEIGHT -0.5 -#define MAX_HEIGHT 2 - -#define FLAG_PLACING_DISTANCE 2 diff --git a/addons/flags/stringtable.xml b/addons/flags/stringtable.xml deleted file mode 100644 index 056f4b8..0000000 --- a/addons/flags/stringtable.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - Timi007 - Timi007 - - - - - Flags - Flaggen - - - Allow placing flags - Erlaube Flaggen zu platzieren - - - Adds the actions to place flags when the corresponding item is in the inventory. - Fügt Aktionen zum Platzieren von Flaggen hinzu, wenn das jeweilige Item im Inventar ist. - - - Allow carrying flags - Erlaube Flaggen zu tragen - - - Adds the actions to carry flags when the corresponding item is in the inventory. - Fügt Aktionen zum Tragen von Flaggen hinzu, wenn das jeweilige Item im Inventar ist. - - - - - Flag (White) - Flagge (Weiß) - - - Flag (Red) - Flagge (Rot) - - - Flag (Blue) - Flagge (Blau) - - - Flag (Green) - Flagge (Grün) - - - Flag (Yellow) - Flagge (Gelb) - - - Flag (Orange) - Flagge (Orange) - - - Flag (Purple) - Flagge (Violett) - - - Flag (Black) - Flagge (Schwarz) - - - Can be carried or placed. Flags are used to mark a specific point in terrain or units. - Kann getragen oder platziert werden. Flaggen werden zur Kennzeichnung von bestimmten Geländepunkte oder Einheiten eingesetzt. - - - - - Flags - Flaggen - - - Carry %1 - %1 tragen - - - Furl Flag - Flagge einrollen - - - Place %1 - %1 platzieren - - - Pickup %1 - %1 aufnehmen - - - Cancel - Abbrechen - - - Adjust height - Höhe anpassen - - - -