Commit Graph

9624 Commits

Author SHA1 Message Date
Arcanum
fe16b72837 Fix AI can get to CA from injured 2017-06-18 12:43:39 +02:00
Arcanum
f86420c0d7 Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite-kill-ai 2017-06-18 12:30:03 +02:00
Zakant
bdea0fcdba [Medical Rewrite] Adding respawn compatibility (#5020)
* Added respawn transition

* Removed respawn transition from statemachine and added manual transition comment

* Changed transiton to manual. Added easy way to get current status as well

* Updated event reference

* Fixed manualTransition call

* Minor headers changes
2017-06-17 18:28:16 -05:00
Zakant
b5f6169341 Remove legacy code (#4960) 2017-06-17 14:01:59 -05:00
PabstMirror
bec55114fa Add load,unload and radial actions (#5270)
- Add radial actions
- Revert back to using 'ACE_isUnconscious'
2017-06-15 14:35:33 -05:00
PabstMirror
356a8f640a Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/functions/fnc_actionCheckBloodPressure.sqf
	addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
	addons/medical/functions/fnc_actionCheckPulse.sqf
	addons/medical/functions/fnc_actionCheckPulseLocal.sqf
	addons/medical/functions/fnc_actionDiagnose.sqf
	addons/medical/functions/fnc_actionRemoveTourniquet.sqf
	addons/medical/functions/fnc_addHeartRateAdjustment.sqf
	addons/medical/functions/fnc_addToInjuredCollection.sqf
	addons/medical/functions/fnc_addUnconsciousCondition.sqf
	addons/medical/functions/fnc_addVitalLoop.sqf
	addons/medical/functions/fnc_canTreat.sqf
	addons/medical/functions/fnc_copyDeadBody.sqf
	addons/medical/functions/fnc_createLitter.sqf
	addons/medical/functions/fnc_determineIfFatal.sqf
	addons/medical/functions/fnc_getBloodLoss.sqf
	addons/medical/functions/fnc_getBloodPressure.sqf
	addons/medical/functions/fnc_getBloodVolumeChange.sqf
	addons/medical/functions/fnc_getCardiacOutput.sqf
	addons/medical/functions/fnc_getHeartRateChange.sqf
	addons/medical/functions/fnc_getTriageStatus.sqf
	addons/medical/functions/fnc_getUnconsciousCondition.sqf
	addons/medical/functions/fnc_handleBandageOpening.sqf
	addons/medical/functions/fnc_handleCollisionDamage.sqf
	addons/medical/functions/fnc_handleDamage.sqf
	addons/medical/functions/fnc_handleDamage_advanced.sqf
	addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf
	addons/medical/functions/fnc_handleDamage_airway.sqf
	addons/medical/functions/fnc_handleDamage_caching.sqf
	addons/medical/functions/fnc_handleDamage_fractures.sqf
	addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
	addons/medical/functions/fnc_handleDamage_wounds.sqf
	addons/medical/functions/fnc_handleDamage_woundsOld.sqf
	addons/medical/functions/fnc_hasMedicalEnabled.sqf
	addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf
	addons/medical/functions/fnc_isInStableCondition.sqf
	addons/medical/functions/fnc_isMedicalVehicle.sqf
	addons/medical/functions/fnc_itemCheck.sqf
	addons/medical/functions/fnc_medicationEffectLoop.sqf
	addons/medical/functions/fnc_modifyMedicalAction.sqf
	addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf
	addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
	addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf
	addons/medical/functions/fnc_moduleReviveSettings.sqf
	addons/medical/functions/fnc_parseConfigForInjuries.sqf
	addons/medical/functions/fnc_playInjuredSound.sqf
	addons/medical/functions/fnc_reviveStateLoop.sqf
	addons/medical/functions/fnc_selectionNameToNumber.sqf
	addons/medical/functions/fnc_setDead.sqf
	addons/medical/functions/fnc_setHitPointDamage.sqf
	addons/medical/functions/fnc_setStructuralDamage.sqf
	addons/medical/functions/fnc_setUnconscious.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
	addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
	addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
	addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
	addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
	addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
	addons/medical/functions/fnc_treatmentBasic_epipen.sqf
	addons/medical/functions/fnc_treatmentBasic_morphine.sqf
	addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
	addons/medical/functions/fnc_treatmentIV.sqf
	addons/medical/functions/fnc_treatmentIVLocal.sqf
	addons/medical/functions/fnc_treatmentTourniquet.sqf
	addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
	addons/medical/functions/fnc_useItem.sqf
	addons/medical/functions/fnc_vitalLoop.sqf
	addons/medical_blood/functions/fnc_hit.sqf
	addons/medical_treatment/functions/fnc_hasItem.sqf
	addons/medical_treatment/functions/fnc_useItems.sqf
2017-06-10 10:21:18 -05:00
SilentSpike
a53f68a347 Use getUnitTrait for medics, engineers and EOD (#5246) 2017-06-10 11:41:01 +01:00
Phyma
48b9a61497 Fix Large IED defuse distance (#5261)
* Fix for large-ied bug because underwater thing have changed

* Added size of IED in config and determine defuse range

* Added typo

* Added help text to wiki about defusing

* Better English

* Increased the defusal range on large bombs make it similar to small ieds

* Add wiki doc
2017-06-09 12:52:55 -05:00
jonpas
33e4e6cd11 Remove maximum distance of attach to vehicle action (#5262)
* Remove maximum distance of attachi to vehicle action

* Readd max distance, 10 meters to allow usage with big vehicles but also end placement system if too far
2017-06-09 14:54:58 +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
PabstMirror
382028e662 Fix updating body part visuals (#5141) 2017-06-08 13:50:38 -05:00
Ozan Eğitmen
225d15dcca Add Ability to Change Repair Times of Vehicles (#5205)
* Add ability to change repair time based on vehicle

* Much better

* Unary command not function

* Allow changing of track or wheel object per vehicle

* Lot more complicated than I thought
2017-06-08 13:31:25 -05:00
Phyma
55df8bca53 Repair specialist rename, fixes #3186 (#5248)
* Changed name

* Fixed Enginner only german and removed big letters

* Added docs + PR fixes #3186

* Removed other languages

* Fixed request and added comment

* Replace all usage of term "Specialist"
2017-06-08 12:10:35 -05:00
PabstMirror
d1f4b90714 Fix minor debug that got left in (#5260) 2017-06-08 11:55:19 -05:00
PabstMirror
f35f80ee82 Rearm - Pylon Support and Dynamically Add Supply Actions (#5183)
* Dynamic Add

* Support 1.70 Pylon Loadouts

* Properly handle old compat pbos - Update RHS Compat

* Re-add documentation

* cleanup headers (note from other pr)

* Cleanup

* Fix var spelling
2017-06-08 11:47:52 -05:00
PabstMirror
1be9e7ca30 Merge pull request #5182 from acemod/GitHawk-rearm_supply
Rearm - Limited Supply (Fix Merge Conflcits)
2017-06-08 11:45:12 -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
b3fa074c38 Disable dragging on big AA Turrets (#5251) 2017-06-06 01:39:49 -05:00
Ľuboš Lendáč
b91e892710 Merge branch 'medical-rewrite' into medical-rewrite-kill-ai 2017-06-05 22:54:03 +02:00
PabstMirror
f715edabc9 Fix debug 2017-06-05 12:30:54 -05:00
PabstMirror
25a28778cb Tweak randomness for wound bleeding and pain (#5113)
* Tweak randomness for wound bleeding and pain

* Scale damage to bodyPartDamage on multi part wounds
2017-06-05 11:51:53 -05:00
PabstMirror
f98b268419 Split setUnconscious func, add spontaneousWakeUpChance setting (#5114) 2017-06-05 11:42:46 -05:00
PabstMirror
f369ffaa04 Med rw handle fire damage (#5100)
* Bundle fire damage into bigger chunks

Redo #4223

* Use same values

* Decrease combine cuttoff to 0.1
2017-06-05 11:42:00 -05:00
Phyma
606c6d18a6 Added Pylon weapon as a valid weapon (#5250) 2017-06-05 11:15:55 -05:00
Phyma
cec82be93b Raise lower carry object (#5234)
* Fix to move items up and down

* Fixed private

* Fixed public bug

* Inserted Pabst solution

* Remove extra space

* Fixed request + added author

* Fixed to correct comment

* Tweeked comment again
2017-06-04 12:46:49 -05:00
PabstMirror
8bb92cee6f Fix weapon select grenade count wehn using advThrow (#5244) 2017-06-04 10:07:35 -05:00
PabstMirror
48680d1123 Cleanup unused hellfire vic stringtable (#5245) 2017-06-03 23:39:03 -05:00
Andrea Verano
0affa14a1b Italian Translation Update (#5243)
Added Italian translation for:
-cargo
-hellfire
-nlaw
-quickmount
-refuel
-zeus
2017-06-03 22:27:51 -05:00
PabstMirror
c9b26fa3e5 Fix being unable to throw last mag (#5242) 2017-06-03 21:39:52 -05:00
PabstMirror
ddccfe563b Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/functions/fnc_determineIfFatal.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
2017-06-03 12:37:28 -05:00
SilentSpike
b3889d9d7e Fix accidental numerical change (#5235) 2017-06-02 19:56:24 -05:00
Rebel
bf4b49a213 Fix spectator icons and camera jitter (#5067)
* Use `Visual` commands for icons and external camera position
2017-06-03 01:38:29 +01:00
PabstMirror
3898202091 Hellfire missiles (#4679)
* Hellfire

* Cleanup dev macros

* Cleanup some debug

* Add base interaction node for firemode actions

* Handle bad data in attack profile variable

* Skip ammo checks (returns bad data on added weaps)

* Add mags sizes for apache

* Add Hellfire Wiki Doc

* Cleanup doc

* Add pylon support

* Add support for pilot controlled weapons

* Add label to pylon mags

* Cleanup vehicle configs, autoAdd laser des, fix ineractions for driver
2017-06-02 16:51:38 -05:00
PabstMirror
49374feb2a NLAW - Predicted Line Of Sight Guidance and Overfly Attack Mode (#4791)
* NLAW Prototype

* Make AI Compatible

* Add Overfly Top Attack Mode

* Limit Max Deflection

* Base prediction on AI skill

* Generic cycle attack profile key for missile guidance

* Add hint for weapons without huds

* Configure for attack cycle key

* Finish OTA ammo effects

* Cleanup

* Arm at 20m

* Disable Debug

* No models for short lived sub-ammos

* Fix Korean strings

* Change AI randomization to use skillFinal

* Add wiki doc for nlaw

* Cleanup

* Cleanup

* Cleanup
2017-06-02 16:51:20 -05:00
James Kingsley
4872e186cd Vehicle quick mount (#4931)
* Add quickmount files from ACEX

* Rename to ACE3, Streamline, Use clientInit

* Rename functions to ACE3, Fix crew getting

* Fix enabled text

* Fix texts

* Remove spaces

* Rework seat search
2017-06-02 16:51:07 -05:00
Phyma
288f956316 Open glass and CUP doors (#5226)
* Fixed glassdoor

Fixed so glassdoor now works with ace slow open.

* Made it more pretty with new file

Made it more pretty with new file

* Tidy up a bit

* Removed white space

* Replace tabs with spaces

Replace tabs with spaces

* Simplified and added comments

* Changes + was stupid was commit

Changes to go with code guidlines and extra check if door is empty

* Tabs to spaces

* Small fixes + Fixed so CUP houses now works

Fixed so CUP houses now works

* Remove todo

* Fixed requested changes

* Removed whitespaces
2017-06-02 16:50:53 -05:00
SilentSpike
ae69118fba Implement new cook off SFX (#5179)
* Implement new cook off SFX with variants
* Add hybrid V to authors
2017-06-02 22:20:36 +01:00
Cuel
5b9c70a738 Fix zeus RC units using player damage treshold (#5219)
* Fix zeus RC units using player damage treshold

Closes #5218

* add pabstmirrors suggestion

use gvar
2017-06-02 11:21:57 -05:00
PabstMirror
2712a1ed8a Remove submuntion ammo changes to A-10 (#5231)
* Remove changes to Aircraft cannons

* keep ammo changes, i guess
2017-06-01 20:48:35 -05:00
PabstMirror
7bccf2f6be Fix IVs not showing in patient display (#5230)
Fix #5192 for 3.10
2017-06-01 10:28:47 -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
SilentSpike
cbe06e5bc7 Fix zeus interaction locality (#5214)
- The `setUnitPos`, `setFormation`, `setSpeedMode` and `setBehaviour` commands require local arguments
- The waypoint equivalents require server execution
- Add conditions to only show interactions when the appropriate things are selected
2017-05-31 22:21:44 +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
SchmittAkaSmallfly
d90f15ac7d Lower minimum speed limiter speed to 5 km/h (#5065)
* Update fnc_speedLimiter.sqf

* No minimum speed needed anymore

Minimum speed limit of 10 km/h was needed in the past due to engine limitations. Multiple user tests have shown that the minimum speed is not needed anymore. The new minimum of 0 km/h allows for example setting walking speed for vehicles (<10 km/h).

* Change minimum required speed for speed limiter to 3 km/h

To avoid problems with negative speeds (driving backwards) and zero speed, the current change switches from 10 km/h minimum speed to 3 km/h minimum speed. This seems to be the optimal solution to allow all relevant speeds including walking speed.

* Changed minimum required speed to 5 km/h

Officially the minimum required speed is 10 km/h in the master. Lower minimum needed to set car speed to walking speed of accompanying soldiers. Problems have been reported with 3 kmh/ using cars like ATVs.  Thus the new commit is set to 5 km/h minimum speed. Not tested with ATVs yet.
2017-05-31 15:45:02 -05:00
pokertour
38f691034e French translation missing (#5217)
* French translation for the two last entries

* French translation for the last entrie

* French Translation for the first entrie

* correct the spelling error
2017-05-31 20:53:41 +02:00
PabstMirror
bdab342548 Handle escape menu with toggle iteractMenu (#5144)
* Handle escape menu with toggle iteractMenu

* Work on non-cursor menu

* Close cursor menu if open when switching

* Update fnc_handleEscapeMenu.sqf
2017-05-31 11:41:53 -05:00
PabstMirror
e6a291bc3b Remove unit from laser pointer list if laser removed (#5190) 2017-05-31 11:31:10 -05:00
PabstMirror
afe862324e Refuel - Add setting for hose length (#5224) 2017-05-31 11:30:48 -05:00
PabstMirror
4ad73446a6 Cleanup aircraft (#5197) 2017-05-31 11:30:29 -05: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