Commit Graph

28 Commits

Author SHA1 Message Date
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
d034324e88 More trivial code cleanup (#6859)
* Added a3 include pboprefix

* Add defineDIKCodes header

* defineDIKCodes include case correct

* Use ui_f dikcodes

* Fix fnc_checkfiles macro and dll condition

* Incorrect macro usage in fnc_getVehiclePos

* Incorrect macro usage in fnc_getVehiclePosComplex

* Add defineResincl ui_f include

* Remove include guard from defineResincl

* Incorrect macro usage in fnc_handleMouseButton

* Incorrect macro usage in fnc_setMarkerJIP

* Semicolon after include

* Add defineResinclDesign ui_f include

* Incorrect macro usage fnc_rearmSuccessLocal

* Incorrect macro usage fnc_rearmSuccessLocal

* Stray backslash in fnc_camshake

* Incorrect macro usage in fnc_startNozzleInHandsPFH

* Incorrect amcro usage in fnc_tag

* Incorrect macro usage in fnc_moduleGlobalSetSkill

* Reenable linux checkFiles

* Non-captialized requiredAddons

* Non-captialized requiredAddons
2019-03-21 08:52:32 -05:00
e7bc2e9d62 remove deprecated code for 3.8.0 (#4457)
* remove deprecated scroll wheel event handler

* remove deprecated ace hash functions

* remove deprecated execNextFrame

* remove deprecated insertionSort

* remove deprecated getConfigType

* remove deprecated binocularMagazine

* remove deprecated wait(Until)AndExecute

* remove old ass and deprecated alternative syntax setHitPointDamage

* remove deprecated event handlers (#4459)

* remove deprecated event handlers#

* remove ACE_newEvents

* Remove old ACE PlayerEventHandler wrappers
2016-09-24 22:31:10 +02:00
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
694503c01b Fix medical events 2016-06-03 20:57:21 +02:00
fa2cf55156 Fix medical related events 2016-06-03 20:22:34 +02:00
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
95573ee711 Stringtable URL (#3855)
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
2016-06-01 23:45:51 +02:00
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
4f515ec4e1 QGVAR captives, interaction 2016-05-25 20:23:53 +02:00
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
54b71cc7ba integrate captivity modules with 3DEN 2016-02-20 13:36:53 +01:00
1c26f6c9f5 Captives - Module to set handcuffing
also add player check for GVAR(requireSurrender) in canApplyHandcuffes
2015-10-23 14:17:31 -05:00
5dc94487c5 Module Settings for Captivity
Setting for handcuffing own team, and allowing surrender.
2015-06-02 20:50:27 -05:00
4dab0b73d5 add conditions on post init 2015-03-15 09:26:16 +01:00
6d534e8846 #130 - Surrender Module Prototype 2015-02-07 15:20:51 -06:00
98564fae68 Surrendering 2015-02-06 15:54:26 -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
11cd426b87 Redo XEH 2015-02-04 00:35:51 -06:00
4156143ecf Captives Progress 2015-02-03 00:42:34 -06:00
982f3b230a Captives First Pass 2015-02-02 20:04:50 -06:00
3865598095 AGM_Captives 2015-02-02 19:48:33 -06:00