Commit Graph

35 Commits

Author SHA1 Message Date
Tim Beswick
c9f1719f5a Hot Resupply (#5639)
Allow rearm, refuel and pylons to function while vehicle engine is running
2017-10-25 23:13:44 -05:00
PabstMirror
2a8e758390 Allow loading fuel canister (#5493)
Fix #5438
- Also block cargo action when being used
2017-09-16 11:36:42 +02: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
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
PabstMirror
afe862324e Refuel - Add setting for hose length (#5224) 2017-05-31 11:30:48 -05: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
541349efef Fix refuel not respecting time acceleration and pause (#4140)
* Fix refuel not respecting time acceleration and pause

* Make lastTickMissionTime local
2016-07-24 20:11:35 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01: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
Thomas Kooi
ddd8187b19 Merge pull request #3534 from GitHawk/refuel_isEngineOn
Disallow refueling with running engine
2016-03-08 19:20:28 +01:00
jonpas
9463b05218 targetEvent -> objectEvent 2016-03-05 18:16:09 +01:00
jonpas
589ca27b60 Fix missing comma 2016-03-05 18:02:21 +01:00
jonpas
015a60e6c4 Increase fuel update to 1s 2016-03-05 17:44:03 +01:00
jonpas
401d457a46 Replace execRemoteFnc with global/targetEvent in refuel 2016-03-05 17:41:47 +01:00
GitHawk
0b3abd55d3 Disallow refueling with running engine 2016-03-04 13:59:14 +01:00
Githawk
c8e8a17111 Fixes
- Fixed `isEngineOn` returning true on static objects
- Fixed `fnc_readFuelCounter` for objects with infinite fuel
2016-02-26 16:35:34 +01:00
Glowbal
f1ce133d32 Merge branch 'release'
Conflicts:
	addons/refuel/functions/fnc_connectNozzle.sqf
2016-02-04 20:34:32 +01:00
Githawk
5e103ba398 Added nozzle
Added code for nozzle object
Params and private update
2016-02-02 15:03:06 +01:00
jonpas
33f91b2ee7 Remove duplicated line caused by merge 2016-01-01 03:52:37 +01:00
jonpas
ebf1321c0b Merge branch 'release' into fixFuelHoseExceededAfterDisconnect 2016-01-01 03:51:44 +01:00
Githawk
ebb28177b1 More fixes to make jerryCan work 2015-12-21 17:54:52 +01:00
jonpas
4c2d92d360 Negate fuel hose connected condition 2015-12-12 15:12:50 +01:00
jonpas
e5f64bcdc1 Fix refuel PFH not exiting on nozzle disconnect 2015-12-11 22:45:28 +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
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
2816e8863a Minor fixes 2015-08-18 16:09:59 +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
IngoKauffmann
67091a7aeb Added real fuel amounts
Some are best guesses though
2015-08-15 16:49:57 +02:00
IngoKauffmann
de500fb80b First batch of fixes 2015-08-14 03:18:54 +02:00
IngoKauffmann
7d75f9cd2c Initial draft 2015-08-13 19:33:55 +02:00