Commit Graph

39 Commits

Author SHA1 Message Date
Smith
8731bcc8b5
Cargo - Add alternative unloading item from vehicle cargo (#8827)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-02-07 09:16:18 -03:00
johnb432
d1f0dc5e83
Cargo - Improve various aspects (#9617)
* Update CfgVehicles.hpp

* Cargo cleanup

* Update menu.hpp

* Updated status effect key

* Update fnc_onMenuOpen.sqf

* Update fnc_onMenuOpen.sqf

* fix comment from merge

* nil interaction GVARs on menu close

* fix carry bug

* Fix floating objects in MP

* Updated ace_cargoAdded doc

* Fix progress bar prematurely stopping

* Finer cursor object selection

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-11-17 20:07:28 -03:00
johnb432
cf8c847811
Interaction - Add crew status check for some vehicle interactions (#9637)
* Added check for crew status

If a one or more passenger in a vehicle are conscious, not captive and hostile to the interacting unit, the interactions (passenger, cargo) will not appear.

* Update fnc_canInteractWithVehicleCrew.sqf

* Update fnc_canInteractWithVehicleCrew.sqf
2023-11-11 09:03:32 -03:00
PabstMirror
3c9d7733e8
Medical Treatment - Fix grave digging (#9455) 2023-10-02 11:05:56 -04:00
johnb432
a0dd4400e6
Cargo - Fix/Improve FUNC(paradropItem) (#9399)
paradropItem fixes
2023-09-14 17:54:06 -04: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
Broström.A | Evul
00f35a3dae
Cargo - Add ability to disabled rename on object level (#8740)
* Rename can be disabled on object level

- Added ability to stop renaming on object level

_Needs testing_

* Fixed extra ()

* Forgot one of the )

* Update cargo-framework.md

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-01-30 12:04:39 -06:00
PabstMirror
5468f180f0
Cargo - Add config value to block renaming (#8610) 2021-10-25 18:27:56 -05:00
Brett
a801d0d3c6
Cargo - Add name to bodybags (#8297)
* cargo: labels

* Update XEH_postInit.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-24 13:01:21 -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
Ozan Eğitmen
64decdd189
Cargo - Add Option to Reopen Menu After Unload (#8487)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-10 15:37:16 +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
PabstMirror
21c927195a
Cargo - Re-enable damage on unloaded tanks (#7655) 2020-04-20 17:45:27 +02:00
PabstMirror
ec840a793d
Cargo - Add condition checking durring load/unload (#6821) 2019-02-22 18:54:55 -06:00
Dedmen Miller
af1cf2c7f6 Cargo - Cache cargo vehicle classes (#6806)
* Cache cargo vehicle classes to init

* fix

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Fix initEH being added twice for static weapons
2019-02-17 11:41:05 -06:00
Dystopian
ee7a1f6acb Improve class initialization (#6085) 2018-02-24 12:39:03 -06:00
PabstMirror
a67815d072 Disable damage on cars loaded as cargo (#5402) 2017-08-22 13:27:11 -05: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
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
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
jonpas
30b15ee3d3 Fix quotes in cargo 2016-05-24 19:22:48 +02:00
jonpas
331c3c70cb Verify and fix cargo, nametags, rearm, reload, repair, ui, Convert infoDisplayChanged in common and mk6mortar Rsc's 2016-05-24 18:58:27 +02:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
jonpas
8375694368 Merge pull request #3403 from acemod/fixCargoEventsParams
Reimplement old parameter syntax for (Un)LoadCargo events
2016-02-25 16:01:57 +01:00
jonpas
b2b781957f Reimplement old parameter syntax for (Un)LoadCargo events 2016-02-25 15:35:47 +01:00
jonpas
168ec5344d Fix #3363 lamp unloading bug, Correct cargo menu button classnames 2016-02-23 22:17:36 +01:00
PabstMirror
7a7e0d689a Improve underwater cargo unloading 2016-01-27 14:56:25 -06:00
PabstMirror
17a882fe4d Add findUnloadPosition integration 2016-01-26 18:01:01 -06:00
PabstMirror
3d4fc66bb1 Cargo Cleanup, Add makeLoadable 2016-01-19 14:51:58 -06:00
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
SilentSpike
f65f6e9b72 Add support for virtual cargo
Allows cargo objects to be added via classname and reduces simulation/synchronization overhead. Objects become physical upon unloading and cannot be re-made virtual, only scripts can add such virtual objects.

Also separates the player feedback from the loading/unloading code and adds a progress bar.
2015-09-27 17:34:37 +01:00
jonpas
18f5a2ca94 Renamed cargo events 2015-08-22 16:45:50 +02:00
jonpas
4c86db9505 Added AddCargoItem event and function to add an item by classname 2015-08-18 23:51:30 +02:00
jonpas
e110874800 Added cargo listenable and callable events 2015-08-18 18:48:21 +02:00