Commit Graph

126 Commits

Author SHA1 Message Date
johnb432
a0dd4400e6
Cargo - Fix/Improve FUNC(paradropItem) (#9399)
paradropItem fixes
2023-09-14 17:54:06 -04:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
Kyle Mckay
e47e18001f
Docs - Update my display name everywhere (#9330)
* Update display name in team

* Update display name everywhere

* order

https://youtu.be/VYycQTm2HrM

---------

Co-authored-by: BrettMayson <brett@mayson.io>
2023-08-17 12:02:17 +02:00
Grim
49f4ea23e7
Docs - Add Grim to maintainers (#9223)
* secret handshake?

* fix my name

* new github username
2023-06-19 16:31:17 +03:00
Samuel Deutsch
edf4a70ed6
Refuel - Added ability to refuel fuel sources (#8981)
* Simplify main fuel loop

* Remove unecessary action macro

* Add container refueling

* Fuel counter behaviour is now consistent for both limited and unlimited fuel sources

* Update maxFuel and refuelContainer whenever fueling begins

* Update maxFuel and refuelContainer whenever fueling begins

* Prevent loading of fuel sources into cargo when they have a nozzle connected to them

* Added action to check how much fuel is left in a jerry can

* Prevent jerry cans from being picked up if they have a nozzle connected to them

* Added function to check if a nozzle can be connected to an object

* Prevent fuel sources which have their nozzle deployed from being loaded

* Compute both tank volumes inside of refuel instead of durring turn on

* Didn't mean to delete these

* Allow for user defined fuel capacities

* Handle more edge cases with infinite fuel sources

* Refuel - Prevent fuel sources from being dragged while they're refueling other things

* Refuel - Added flow rate multiplier for refueling fuel sources

* Refuel - Use FUNC instead of DFUNC for nozzle actions

* Refuel - getCapacity should return REFUEL_DISABLED_FUEL instead of 0 when argument is not a fuel source

* Refuel - Correctly reset fuel counter when fueling a new target

* Refuel - Implemented all suggested changes

* Refuel - Added newlines to end of files

* Refuel - Added missing newline at end of XEH_PREP

* Only setFuel once per jerry can creation

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

* Calling getFuel will initialize the fuel source

* Refuel - Add newline to end of file

---------

Co-authored-by: BaerMitUmlaut <baermitumlaut@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-02-16 20:06:11 -06:00
Filip Maciejewski
3872eb0647
Add a way to block auto carry after unload on classes (#9013) 2022-09-01 14:06:24 -05:00
Tim Beswick
2a4355dfb9
Cargo - Add setting for carry after cargo unload (#8997)
* Add setting for carry after cargo unload

* Fix typos

* Contributors

* Don't make setting global

* Update addons/cargo/stringtable.xml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2022-08-20 16:28:16 -05:00
PabstMirror
fa45e8b7cb
Cargo - Limit text length (#8915) 2022-05-17 02:37:26 -05:00
GhostIsSpooky
9e133aa0a5
Cargo - Make player carry/drag item on unload (#8797)
* carry item on unload

* debug off

* fix function header

* ugly nested if blocks instead of superior switch statement

Co-authored-by: jonpas <jonpas33@gmail.com>

* Add delay for server event to finish

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-07 22:45:57 -05:00
Wakbub
f3258cae98
Cargo - Remove the ability to load cooked-off items (#8876) 2022-05-02 18:57:19 -05:00
GhostIsSpooky
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
GhostIsSpooky
1013e1a2cc
Cargo - Improve config and fnc_getNameItem (#8777)
* change macro, block rename statics

* change macro, block rename statics

* revert noRename, improve getName function

* fix derp
2022-01-30 12:12:52 -06:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
PabstMirror
63be48f207
Cargo - Fix undefined object name in paradrop (#8543) 2021-10-17 00:48:31 -05:00
Jasper
257d9536cc
Cargo - Add ability to add custom name to cargo objects (#8023)
* First Push

Added the ability to edit cargo objects (crates/boxes only) names. Either via in-game action on the object it self or via 3den attributes.

Added a single function which spawns the UI to edit the name and also edits it. This is an scripted UI, it could be changed to a config version if wanted, but as I'm not good in UI coding I left it on this simple version mainly for testing.

Added 4 new stringtable entries, 2 for action and 2 for 3den attributes.

* Add extra stringtable

Forgot to add the UI to the stringtable.

* Update fnc_renameObject.sqf

fixing tabs

* Show custom name only behind

Added new function "getNameItem" that will get the items name.
Put the custom name behind the original name between brackets "[...]".

* Added "Hide Rename Action" setting

Also removed an unused _itemClass from postInit.

* Apply suggestions from code review

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update AUTHORS.txt

Added my name

* Applied the sugesstions.

* Fixed function crash

* Moved to dialog.

* Removed unused comment/code

* Update renameMenu.hpp

Fixed tabs to spaces.

* Update renameMenu.hpp

* move rename to common

* Update addons/arsenal/ui/RscAttributes.hpp

* style and use addActionToObject

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 17:42:38 -05:00
Serg Vergun
489fab4cb8
Cargo - Prevent damage to items (created from classnames) on unloading (#8324) 2021-07-23 22:45:36 +02:00
Lupus the Canine
2973ea5814
Cargo - paradrop fixes (#8203)
* Small fixes in ace_cargo

Makes paradropItem and unloadItem invoke event "ace_cargoUnloaded" with parameters _itemObject, _vehicle and "paradrop" or "unload" respectivelty.
paradropItem invoked said event but if item was classname it would send classname to event which is not particularly useful.

* Update XEH_postInit.sqf

Moved event invocation to unloadItem, this provides ability to always pass object to eventhandlers.

* code refactor

refactored according to https://github.com/acemod/ACE3/pull/8203#discussion_r610394484

* Update fnc_paradropItem.sqf

apply new fix

* Revert "Update fnc_paradropItem.sqf"

This reverts commit 3db5cc1910.

* Update fnc_paradropItem.sqf

fixed hint that was broken by previous fixes

* style check

Co-authored-by: commy2 <commy-2@gmx.de>

* style check

Co-authored-by: commy2 <commy-2@gmx.de>

* naming convention

replaced object references called _item with _object.

* Update fnc_paradropItem.sqf

Co-authored-by: commy2 <commy-2@gmx.de>
2021-04-30 22:38:57 -05:00
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