Commit Graph

58 Commits

Author SHA1 Message Date
Dystopian
96f81f1c9b
Interaction - Add actions based on animations (#6144)
* Add actions based on animations

* Add setting

* Add ability to set items for users

* Add actions for 1.82 changes

Add actions for backpacks, canisters, entrench tool.
Move items and backpack to WeaponHolder.

* Add RHS 0.4.6 ZIL spare

* Update to new standards

* Handle RHS BTR retread system

* Make init faster: move condition to configClasses

* Fix CUP fake anims

* Refactor

* Rework

* Rename init function

* Decrease number of classes to init

* Fix merge mistake

* Apply suggestions from code review

* Updated code for current mod structure

* Multiple fixes & tweaks

- Made anim setting require a mission restart
- Handle more types of items that can be spawned
- Prioritise adding items to inventory and only drop on ground if no inventory space
- Add more position checks to make certain no valid position are present before stopping
- If 1 item was spawned in, it's considered as success
- Disable RHS' wheel replacement only if ace_repair is loaded

* Update CfgVehicles.hpp

* cache config lookup at preStart

* Fix error

* Add text config entry for progress bar title

* Restructure interactions, improved some locations & added interaction to some missing vehicles

* Reverted preInit change

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-08-10 23:29:50 -05:00
Dystopian
7c65f8503d
Refuel - Add enable setting (#7613)
* Add enable setting

* Exclude man class init

* Fix multiplayer terrain pump fuel sync

* Add terrain pumps positions

* Add vanilla fuel cargo restoring before destroying

* Add Livonia positions by bux

* Fix terrain pumps destruction

* Improve settings init

* Fix double settings category

* Check enabled var in public functions

* Fix fnc_makeSource

* Handle recent CUP Terrains changes

* Update includes

* Fix issues introduced in #9133

* Change warning

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

* Optimisations and cleanup

- Use hashmaps wherever possible
- Reduced pump search radius by ~30%
- Sorted pumps alphabetically and sorted positions by "smallest" first, for consistency

* Add init debug trace

* compileScript in dev

* yoda conditions & DFUNC macro

* Wait until CBA settings are ready

* Update Chernarus 2020 and add more maps configs

* Remove vanilla fuel cargo restoring before destroying

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-05-23 21:47:19 +02: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
BrettMayson
a40b0d48f2
HEMTT v10 Compatibility (#9105)
* HEMTT v10 Compatibility

* Update addons/field_rations/CfgUIGrids.hpp

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

* fix PabstMirror review

* optionals

* End empty macro definitions with semi-colon (HEMTT v0.10)

* Adapt to HEMTT v0.10.0-a14

* Revert End empty macro definitions with semi-colon

* Disable old HEMTT build step in CI

* Add missing include and fix macro usage and include casings

* End empty macro definitions with semi-colon (HEMTT v0.10)

* Update addons/disarming/functions/fnc_showItemsInListbox.sqf

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

* cleanup test code

* arty - keep style same as before

* fix fire screams

* Update script_component.hpp

* Keep old hemtt/workflow/sqfc

* Update arma.yml

* Update arma.yml

* Update CfgUIGrids.hpp

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-02-01 23:28:55 -06:00
Björn Dahlgren
553dabe60e
Refuel - Fix warnings when building with latest pboProject (#9099)
* Fix inconsistent trailing semicolon for macro MACRO_NOZZLE_ACTIONS

* Remove usage of access from refuel hose class
2022-12-02 16:25:09 -06:00
Ozan Eğitmen
f3c66e83b4
Refuel - Add Progress Bar Duration Setting (#8971)
* Refuel: Allow changing progress bars' duration

* Clarify Turkish progressDuration_DisplayName

* Update addons/refuel/functions/fnc_moduleRefuelSettings.sqf

* Change progressDuration setting's type to TIME

* Update progressDuration setting display name, add description too

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-08-17 13:25:37 +02:00
Samuel Deutsch
7a64ccb7a5
Refuel - Improved fuel hose texture (#8983)
* Added custom fuel hose

* Fixed indentation

* Added model config for hose

* Added model config for hose
2022-08-17 13:00:54 +02:00
PabstMirror
93b7722716
General - Cleanup CfgPatches unit/weapon arrays (#8524)
* General - Cleanup CfgPatches unit/weapon arrays
add test tool
fix refuel pump
fix flashlight pistol transport type
fix iDAB reammo box

* Update config.cpp
2021-10-15 13:48:33 -05:00
BaerMitUmlaut
e07d2ae5d5
Make refuel nozzle unbreakable (#7957) 2020-10-21 10:37:14 -05:00
mharis001
d38dd1d67f
Add support for ED-1D and ED-1E drones (#7778) 2020-06-29 10:43:05 -05:00
mharis001
f3f57c6a38 Cleanup unused priority entry for interact menu actions (#6372) 2018-05-30 16:48:19 -05:00
PabstMirror
53bd784380 Remove refuel capability from IDAB water truck (#5783) 2017-11-17 14:48:56 +01: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
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
Dystopian
e874f6a343 Fix SDV refueling (#5546) 2017-09-23 01:01:19 +02:00
PabstMirror
d4cd0f2286 Add support for orange drone (UAV_06) (#5494)
* Add support for orange drone (UAV_06)

- Remove cargo from orange drones (and apex heli drone)
- Allow battery replacement on orange drone

* ops
2017-09-10 15:38:10 -05:00
Dystopian
559a498e6d Add fast mouse actions to refuel, add refuel eden attributes (#5418)
* Add fast mouse actions to refuel

* nobody seen that

* Add interaction condition and refuel on ladder

* Add car hit, fix change weapon on uncon

* Replace objNull with nil in setVar, unify var names

* Delete *ConnectNozzle functions

* Delete reset* functions

* Add public function and eden attributes

* Remove static actions from RHS compat

* Remove statusEffect_set on respawn

* Fix dual menu, add deprecating message

* Optimize fnc_takeNozzle

* Cleanup
2017-09-10 14:43:03 -05:00
jonpas
84061cb593 Add support for Tanoa and Malden Fuel Pumps, Flexible Tanks and Fuel Canister (#5353)
* Add support for Tanoan fuel pumps, Flexible Tanks and Fuel Canister (as jerry can)

* Add to Land_FuelStation_01_pump_malevil_F

* Add Malden/Jets to required addons

* REQUIRED_VERSION 1.72
2017-07-10 21:41:37 +02:00
PabstMirror
afe862324e Refuel - Add setting for hose length (#5224) 2017-05-31 11:30:48 -05:00
Tim Beswick
3b7a3047cd Refuel for non-AllVehicle objects (#5151)
* Enabled refuel for non-AllVehicles objects. Un-magic'd refuel progress timer.

* Changed helper attach position to centre of object. Offset applied when rope attached.

* Made fully compatible with non-thingX simulation types. Removed destruction effects of helper object.

* Using arma model. Removed ACE_Actions from helper object.

* Correct use of hideObjectGlobal

* Remove actions, cargo, repair on helper

* Switched helper to be setVar'd on the nozzle object
2017-05-29 13:48:02 -05:00
PabstMirror
f69148bdc0 Disable rearm,refuel on dead vehicles (#5158) 2017-05-13 17:36:53 -05:00
Dystopian
cc3b669fcd Fix missing refuel menu on static fuel stations (#4533)
* fix static fuel stations

* Directly compile menus and remove XEH from buildings
2016-12-14 12:48:00 -06:00
jonpas
5922aad91c Fix 3rd party air and sea vehicle fuel capacity (#4554)
* Fix fuel capacity for air vehicles

* Sea vehicles as well, minor empty classes cleanup
2016-10-18 20:21:28 +02:00
jonpas
2034234940 Refuel nozzle taking, disconnecting, connecting and returning interaction fixes (#4337)
* Prevent taking or disconnecting a nozzle if already carrying one

* Fix multiple nozzle connect actions, Fix returning nozzle into a vehicle being refueled
2016-09-05 20:23:28 +02:00
Ozan Eğitmen
8f80cd59c8 Use GVAR where applicable 2016-07-20 07:15:18 +03:00
PabstMirror
6c732bf789 Fix action name, put actions on base class 2016-07-05 00:22:47 -05:00
PabstMirror
ea140f63a5 Refuel - Simplify Actions, Fix Van_01 config 2016-07-03 15:17:00 -05:00
PabstMirror
598c3dc181 Fix 1.60 UBC (slingloads) 2016-05-30 17:11:06 -05:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
commy2
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
Thomas Kooi
508f6a16ae Merge pull request #3162 from acemod/Refuel_Fuelbladders
Refuel - Add refuel actions to fuel bladder objects
2016-02-04 19:57:50 +01:00
Githawk
4d403d21aa Fixes
Moved models into data
fixed vehicle attach for certain angles
2016-02-02 15:45:57 +01:00
Githawk
5e103ba398 Added nozzle
Added code for nozzle object
Params and private update
2016-02-02 15:03:06 +01:00
VKing
195f0a6874 GVAR it 2016-01-14 20:07:53 +01:00
VKing
1da2b69de4 Make fuel bladders work 2016-01-14 20:07:32 +01:00
VKing
7158a89de9 Start 2016-01-14 18:48:16 +01:00
VKing
74435ba777 Style guide formatting 2016-01-14 18:47:51 +01:00
Githawk
d16417a00b Changed scope on nozzle 2015-12-22 17:49:58 +01:00
Githawk
ebb28177b1 More fixes to make jerryCan work 2015-12-21 17:54:52 +01:00
PabstMirror
4aeeefdfe8 Fix UBC and increase Heli_04 Pod interaction distance 2015-11-26 11:47:25 -06:00
IngoKauffmann
f9266764fb Moved module to ACE_Logistics 2015-11-24 21:33:38 +01:00
IngoKauffmann
d4c708e731 Missing ; 2015-11-24 17:33:33 +01:00
IngoKauffmann
931c6830fc Added reset
It's now possible to reset a fuel truck by console command:
[fuel_truck] call ace_refuel_fnc_reset
2015-11-23 19:28:51 +01:00
IngoKauffmann
8b53b4f0d0 Fixes
Moved macros to function
Fixed MP bugs
Changed class history of nozzle
2015-08-22 13:34:24 +02:00
IngoKauffmann
22576f938e Added dropping and progress bars 2015-08-21 22:43:45 +02:00
IngoKauffmann
f44060c6a0 Cleanup and improvements 2015-08-20 22:10:26 +02:00
IngoKauffmann
f852eb5f4b Moved compatibility stuff 2015-08-18 23:48:25 +02:00
IngoKauffmann
cdd0c4c013 Next few things
Clean up
Removed MP issues
Added macros for reused code
Added death handling
Added unconscious handling
Added fueling restart
2015-08-18 23:18:32 +02:00
IngoKauffmann
f54beb5c86 Many things
Added correct hooks for fuel trucks
Added code for finding closest hook
Cleanup
2015-08-18 00:42:35 +02:00
jonpas
9ad8718762 Added canCheckFuel for check fuel condition, removed extra spaces 2015-08-17 01:57:05 +02:00