Commit Graph

109 Commits

Author SHA1 Message Date
PabstMirror
e8693c8db9
Various - Use configOf command for faster lookup (#8100)
* configOf

* replace some use of CBA_fnc_getObjectConfig
2021-02-18 12:58:08 -06:00
BaerMitUmlaut
4cfe26b842
Disable damage for all cargo objects (#7946) 2020-10-10 18:58:38 +02:00
mharis001
4d769e4b8f
Cargo - Fix loaded cargo not being deleted when vehicle is destroyed (#7851) 2020-08-18 12:42:09 -05:00
PabstMirror
a9a69ac4ff
Headers - Fix function names in examples (#7663) 2020-04-25 08:41:45 +02:00
Rutger "RedBery" Meijering
b3f7de9f0f
Cargo - Fix tankx vehicles receiving water damage when loaded (#7636)
* Adds tankX simulation type to check for water damage fix

* Changes simulationType to variable

* Update addons/cargo/functions/fnc_loadItem.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/cargo/functions/fnc_loadItem.sqf

Co-Authored-By: Dystopian <sddex@ya.ru>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: Dystopian <sddex@ya.ru>
2020-04-14 06:57:11 +02:00
Whigital
2688cdd95f conform isnil checking: cargo 2020-02-12 17:28:10 +01:00
pterolatypus
b3c5a72dae Cargo - setSpace checks for existing cargo (#7133) 2019-12-07 22:10:03 +01:00
PabstMirror
aa41fffdb7
Cargo - Add array to disable paradrop effects (#7016) 2019-07-03 09:58:46 -05:00
PabstMirror
ec840a793d
Cargo - Add condition checking durring load/unload (#6821) 2019-02-22 18:54:55 -06:00
PabstMirror
32ffe3243c
Zeus - Paradrop Cargo (#6743)
* Zeus - Paradrop Cargo Waypoint

* move script component

* cfgpatches, localize, fix getModuleDestination call

* cleanup debug
2019-01-30 18:30:42 -06:00
PabstMirror
6ad28439b0
Cargo - Revert Load Times Normalize (#6638) 2018-10-13 11:59:16 -05:00
mharis001
c95877d823 Cargo - Add load time coefficient setting (#6618)
* Add loadTimeCoefficient setting

* Call settingChanged function

* Normalize load coefficient
2018-10-12 22:37:05 -05:00
PabstMirror
9eba55be21
Cargo - CanLoadItem ignores vehicle height on scripted load (#6629) 2018-10-08 15:23:59 -05:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
Tim Beswick
c0b9a31deb Cargo load ignore interaction distance parameter (#6395)
* Added force parameter to cargo load

* Specifically ignore interaction distance

* Fixed old brackets

* Removed old trace
2018-06-18 15:01:09 -05:00
Vdauphin
f9943658e9 Cargo - Support of object without ace_cargo_size defined in config or -1 config value (#6364)
* Add: Now findUnloadPosition support also cargo object

- use of ace_cargo_fnc_getSizeItem to determine size of item

- prefer the config way instead of manually set size

- This will also take into account object manually added to the cargo system with ace_cargo_fnc_setsize

- use the cargo object for ace_cargo_fnc_unloadItem.

* FIX: old work around

* FIX: error when cargo module is not loaded

* As suggested by @orbis2358

This fix handle the case when cargo module is not loaded for scheduled and unscheduled environnement.

* Use ACE framework to check if module is present

* FIX: EFUNC and isEqualto

- _itemSize here is always number
- here we are in common module (addons/common/functions/fnc_findUnloadPosition) so FUNC is ace_common_fnc

* FIX case where config value is `-1`

- if the config value is -1, get the `ace_cargo_size` from the `ace_cargo_fnc_getSizeItem
-
 https://github.com/acemod/ACE3/issues/6357#issuecomment-393525374
2018-05-31 22:48:19 -05:00
shukari
181d2ef5e1 fix #6237 (#6238) 2018-04-09 22:48:58 -05:00
Dystopian
ee7a1f6acb Improve class initialization (#6085) 2018-02-24 12:39:03 -06:00
SilentSpike
845f3656d4
Remove deprecated functionality for 3.12.0 (#5878)
* Remove deprecated functionality for 3.12.0
* Remove associated deprecated module icon
* Restore a dummy version of old module

This is just to prevent existing missions from breaking due to a missing
object.
2017-12-10 13:38:32 +00:00
commy2
7cfb2b865c Fix enum errors (#5834)
* Fix enum errors

* Update fnc_paradropItem.sqf

* Update fnc_actionPlaceInBodyBag.sqf

* Update fnc_compat_spectatorBI.sqf

* Update ACE_ZeusActions.hpp
2017-12-01 10:34:27 -06:00
Dystopian
fc8a70872f Lock object while loading to cargo + disable disassembling (#5624) 2017-11-29 14:07:30 -06:00
PabstMirror
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
PabstMirror
70c25aacaf cargo - use getInteractionDistance to get better distance (#5697) 2017-11-10 15:28:12 +01:00
jonpas
711e1fc026 Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521)
* Fix Magazine Repack underwater - fix #5513
Also prevent common goKneeling function underwater

* Fix loading patients underwater - fix #5515

* Fix load object underwater

* Fix take nozzle on jerry can underwater

* Fix refuel underwater conditions further

* Use isTouchingGround, Make refuel semi-compatible
 reports false if head is out of the water, we want true even if we are not diving

* Less interact exceptions duplication

* Use animationState to determine if unit is swimming, create common function and use it instead of isTouchingGround

* Fix condition

* Support dragging underwater
No carrying due to animation timing issues and other misc things

* Allow Medical Legs SelfActions underwater

* Fix fixPosition function underwater (use getPosATL instead of getPos)

* Fix fixPosition's slope adjustment for non-gravity objects, Do the same for objects without simulation as well
2017-10-01 13:38:11 -05:00
Ozan Eğitmen
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
jonpas
eb6e8c0b56 Cleanup optional argument headers (#5543) 2017-09-22 17:33:08 +02:00
Ozan Eğitmen
21e9674ab7 Add "Load Into Cargo" Zeus Module (#5528)
* Initial commit

* Finish TODOs

* Remove "<BR/>" from showing up on zeus messages

* Add check for scheduled environment, cargo enabled
2017-09-21 16:19:49 +02:00
Dystopian
357f3a9ceb Add JIP event deleting if vehicle is deleted (#5506) 2017-09-16 22:18:28 +02:00
Ozan Eğitmen
ca580daedd Cargo: Add removeCargoItem Function (#5432)
* Add removeCargoItem function to cargo module

* Fix documentation typos

* Fix header 'public' field

Of course it's a public function, that's the whole point!

* Fix spelling

* Add missing then command

* Work better with objects

* After-test fixes

* Also update wiki

* Overhaul

* Make the event more robust

* Fix logic & shorten docs
2017-09-16 11:21:23 -05:00
PabstMirror
a67815d072 Disable damage on cars loaded as cargo (#5402) 2017-08-22 13:27:11 -05:00
PabstMirror
fde984ad7b Handle ace_cargo_canLoad set to scalar (#5306) 2017-06-23 11:31:19 -05:00
PabstMirror
feee7f5e1e Make array of cargo holders dynamic (#5274) 2017-06-14 15:36:23 +02:00
PabstMirror
847832c118 Fix some event names on wiki (#5254)
* Fix some event names on wiki

* Switch callable events to functions
2017-06-08 14:31:27 -05:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255)
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
2017-06-08 15:31:51 +02:00
SilentSpike
fea2326488 Add cargo eden attributes (#4780)
- Add a ace_cargo_space attribute to vehicles to alter how much cargo they can carry.
- Add an ace_cargo_size attribute to objects to alter how much cargo space they consume.
- Add two public functions `fnc_setSize.sqf` and `fnc_setSpace.sqf` to update the cargo size/space respectively of any given object.
- Deprecate cargo makeLoadable module and public function.
- Added some macros to get the space/size of a config, making code more readable in places.
2017-05-31 23:54:57 +01:00
PabstMirror
00b91bed45 Minor fixes, cleanup, add lint ignore directives (#5176)
- Fix bug in getNumberMagazinesIn (func not used)
- Fix bug in seekerFindLaserSpot (func not used yet)
- Everything else is just cleanup
2017-05-31 22:09:36 +01:00
Dystopian
9f291c86d8 Cargo load menu overhaul (#4871)
* Add submenu with vehicles to cargo load menu

* replace private ARRAY with keyword

* fix ace function macro using

* filter vehicles without cargo

* add Load condition, clean params, fix param reusing

* replace nearEntities with nearestObjects, add macro

* optimize, del magic, replace count with forEach

* del unused functions

* del useless _this parameter
2017-05-31 17:02:24 +02:00
Ozan Eğitmen
ea4a159cd2 Add Paradrop Time Coefficient Setting (#5116)
* Add coef

* Show cargo paradrop time in menu

* Unary command, not a function call

* If drop time is 0 don't show a progress bar

* Add the setting to cargo's editor module

* Swap values

* Remove extra comma

* Move unload message to paradrop event

This way the message will show up on all paradrops, not just immidiate
ones.
2017-05-05 14:02:59 -05:00
Dystopian
83d2183f61 Fix cargo loading to locked vehicle (#5049) 2017-04-01 00:33:36 -05:00
Daniel Jupp
3935299e3c Fix cargo find nearest vehicle (#4592)
* Inital Commit

* read function call change

added object to exclude to function call

* Removed TODO comment
2016-11-12 17:52:17 -06:00
commy2
05d30c5573 convert log macros to cba versions (#4282)
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
2016-10-02 12:55:31 +02:00
PabstMirror
11b6370e8f Fix undefined var in paradrop (#4465) 2016-09-25 21:25:11 +02:00
commy2
7f07d4e4b8 fix broken parachutes, fix #4437 (#4462) 2016-09-25 09:45:55 +02:00
commy2
bfb88efe9a Fix script error in cargo drop function (#4369) 2016-09-10 21:21:09 +02:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323)
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
2016-09-04 16:44:22 +02:00
commy2
9ef24d25ba paradrop crates from helicopter or plane cargo (#2468) 2016-08-27 10:14:54 +02:00
esteldunedain
28c41e0518 Rename cargo events:
- ace_cargoAddedByClass -> ace_cargoAdded
- ace_addCargoByClass -> ace_addCargo
2016-06-24 12:12:19 -03:00
esteldunedain
18f09b9310 Rename events:
- ace_addedHeartRateAdjustment -> ace_heartRateAdjustmentAdded
- ace_cargoAddedByClass -> ace_cargoByClassAdded
- ace_enteredCardiacArrest -> ace_cardiacArrestEntered
- ace_itemAddedToTriageCard -> ace_triageCardItemAdded
- ace_reload_linkedAmmo ->  ace_reload_ammoLinked
- ace_reload_returnedAmmo -> ace_reload_ammoReturned
- ace_treatmentSuccess ->  ace_treatmentSucceded
- ace_common_engineOn -> ace_common_setEngine
- ace_explosives_clientRequestOrientations -> ace_explosives_requestOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_sendOrientations
- ace_interaction_lampTurnOff -> ace_interaction_setLampOff
- ace_interaction_lampTurnOn -> ace_interaction_setLampOn
- ace_overheating_spareBarrelsLoadCoolest -> ace_overheating_loadCoolestSpareBarrel
- ace_overheating_spareBarrelsSendTemperatureHint -> ace_overheating_sendSpareBarrelTemperatureHint
Close #3533
2016-06-24 10:45:13 -03:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00