Commit Graph

52 Commits

Author SHA1 Message Date
6ce625a52f Cleanup spaces in config macros (#9621)
* Cleanup spaces in config macros

* remove extra whitespace before call

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-11-05 12:36:00 -06:00
11bc2695f5 Captives - Blindfold captive units (#9361)
* Fixed typo

* Added "Blindfold Captive" interaction

* Changed comment readability as requested

* Better handling of captive goggle replacement

if the capturer's inventory cannot contain the captive's goggles, move them to the captive's inventory, if that also can't fit them, drop them on the ground.

* Removed extra new line

* Make "validBlindfolds" a CBA Setting

* Add remaining localizations

I speak German and Italian fluently and can also infer the proper sentence structure and conjugations in French/Spanish/Portuguese, the other eastern languages are completely foreign to me though and I have to trust Google/DeepL.

* Removed non-verified translations

* Use GVAR(blindfold) config entry

* Remove unused "_state" parameter

* Check if captive isn't already blindfolded before blindfolding

Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>

* Added "remove blindfold" interaction

Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>

* Correct Error Message

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Optimized duplicate code

* Apply suggestion to fix script_component includes

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-09-24 17:45:43 -04:00
68ed19911a General - Change object config lookups to configOf (#8795)
* configOf lookups

* forEach, missed configOf

* revert handcuff distance change

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* optimize condition

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* capitalization

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* use object in getVehicleIcon

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* add return comment

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* remove extra brackets

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* add missing brackets

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* add return comment pt2

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* revert to cursorTarget

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-03-08 21:41:21 -06:00
f3f57c6a38 Cleanup unused priority entry for interact menu actions (#6372) 2018-05-30 16:48:19 -05:00
cd30b09b4f Convert ACE_settings to CBA_settings (#4895)
* Convert ACE_settings to CBA_settings

* Run Modules Globaly, BWC for SetSetting

* Add support for string settings

* ACE_ServerSettings warning

* Add handler for global setting being changed

* Add deprecated and replaced not to Settings Framework doc

* Remove options menu UI, Move Debug and HeadBug Fix to Options in Pause Menu

* Change modules scope to 1

* Disable debug
2017-11-11 20:21:55 +01:00
45a66ccfa1 Medical & Captive Load Menu Overhaul (#5519)
* Add load in child actions to medical & captive

* Add actions with proper structure

* Move vehicles actions code to common function

* Simplify code in config, Fix docs

* Remove unused vars

* Fix header example

* Add _distance param to fnc_nearestVehiclesFreeSeat

* Change docs

* Fix spacing
2017-09-29 22:00:47 +02:00
7fe932803b Add requireSurrender setting for AI - close #5518 (#5522) 2017-09-19 13:21:30 -05:00
e11e102a76 Underwater actions support (#4984)
* Enable majority of actions underwater

* Remove log

* Add logistics_wirecutter support (don't play kneel animations underwater - looks silly)

* Don't perform kneel animations when repairing or medicaling underwater

* Fix interaction menu rendering underwater (was moving based on player eye level due to height max used for large vehicles)

* Fix attach underwater (LIW does not work underwater, LIS does), Add attach scan drawing define

* Remove left-over systemChat

* Remove vehiclelock from Plane, Disallow linking belt underwater, Allow checking ammo when sitting via action (was already possible via keybind), Use param for LIS
2017-08-22 13:30:56 -05:00
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
bux
0e8eb5fac4 Remove obsolete hotkey entries 2015-12-30 11:23:52 +01:00
cfba7c01e8 Merge branch 'master' into settingsErrorChecking
Conflicts:
	addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
1c26f6c9f5 Captives - Module to set handcuffing
also add player check for GVAR(requireSurrender) in canApplyHandcuffes
2015-10-23 14:17:31 -05:00
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
40634318f0 Move RemoveHandcuffs to Main (always blocked by hands) 2015-08-23 23:41:35 -05:00
3425913d27 #2132 - Don't use depreciated Helicopter_F 2015-08-12 23:32:57 -05:00
c7ac190f58 Finalized settings 2015-08-09 00:21:59 +02:00
d53ee1cf85 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into removeFrisk
Conflicts:
	addons/captives/CfgVehicles.hpp
2015-06-13 15:19:52 -03:00
3d5afd7d8f Close #1018 2015-06-13 14:32:18 -03:00
58e5bc3581 Switch unload captive to passenger actions 2015-06-13 00:02:30 -05:00
32ce0aa6fd Macroize all stringtables 2015-06-05 21:02:24 -05:00
b466566104 Switch to new CSTRING 2015-06-04 13:19:05 -05:00
e5edc0345b Merge branch 'master' into captiveModuleSettings
Conflicts:
	addons/captives/CfgVehicles.hpp
2015-06-04 13:15:53 -05:00
701aa7e343 Add New Icons 2015-06-03 00:55:20 -05:00
5dc94487c5 Module Settings for Captivity
Setting for handcuffing own team, and allowing surrender.
2015-06-02 20:50:27 -05:00
541f1010a7 Merge branch 'master' into macroSTR
Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
eefe995a0c Transfer curator functionality from ace_captives 2015-06-01 20:44:50 +01:00
0b0f7274d7 Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
6a821715a0 Stringtable modules
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
ca980379c8 Minor captive cleanup 2015-04-25 16:03:21 -05:00
07dfe52133 Remove Duplicate Mortar Code (inherit from statics)
Before an action added to staticWeapon wouldn't be applied to mk6 mortar
2015-04-03 19:07:13 -05:00
60c50e0daf Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-24 19:12:23 +01:00
20362e8dc9 Cleanup exception names 2015-03-23 15:22:26 -05:00
ba42ec831b second batch of icons 2015-03-23 20:02:35 +01:00
bed312dcee Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
8e0158209c Merge branch 'master' into ace_interactionCleanup 2015-03-01 17:15:24 -03:00
2235f84408 Moved handcuffing/uncuffing to top level actions, as we apparently won't be interacting with hands for anything else for the moment 2015-03-01 00:48:29 -03:00
233647a144 Merge branch 'master' into fixSurrendering 2015-02-24 11:37:28 -06:00
f7d5d615ee allow actions to be defined for different selections 2015-02-19 15:36:27 -03:00
9cdf06383d Back to getIn 2015-02-16 19:20:55 -06:00
dc82e50d72 fix 2015-02-16 18:30:35 -06:00
eee4b256cd More Changes and add EH 2015-02-16 18:03:09 -06:00
6d534e8846 #130 - Surrender Module Prototype 2015-02-07 15:20:51 -06:00
98564fae68 Surrendering 2015-02-06 15:54:26 -06:00
7a3029b9fd replace spawns 2015-02-06 03:38:27 -06:00
82a8fc8ca3 exceptions 2015-02-05 23:11:28 -06:00
122a38a6aa More Refactoring 2015-02-05 16:39:45 -06:00
435b3b8b86 Move Code out of CfgVehicles 2015-02-04 13:16:19 -06:00
24ab11a1e2 More work 2015-02-03 23:56:51 -06:00
4c727fbff5 remoteFncs -> events 2015-02-03 23:13:44 -06:00