Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UPDATE: 1.18 to 1.19 #571

Merged
merged 435 commits into from Nov 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
435 commits
Select commit Hold shift + click to select a range
4ad3546
improve code by adding btc_fnc_detachObjects;
Vdauphin May 4, 2018
dc70503
migrate to ACE suicide bomber system
Vdauphin May 4, 2018
144f6a6
tweak suicider create function
Vdauphin May 4, 2018
6ec9d77
Add in command
Vdauphin May 4, 2018
447cf45
Update btc_fnc_delete
Vdauphin May 6, 2018
308f1e0
rmv marker when vehicule are deleted and change color
Vdauphin May 6, 2018
96e1375
Add: debug folder
Vdauphin May 7, 2018
fcd56b6
add log rtp with cba
Vdauphin May 7, 2018
73cc8ae
add systemchat cba
Vdauphin May 7, 2018
6ad27cb
Add: fps graph
Vdauphin May 8, 2018
ddbf150
integrate H&M debug in fps graph
Vdauphin May 8, 2018
809e84c
Optimisation de define.hpp
Vdauphin May 8, 2018
d72f941
fix tab, add SERVER FPS
Vdauphin May 8, 2018
bb407de
Tweak log, more accurate count units
Vdauphin May 8, 2018
dae3cec
tweak debug message
Vdauphin May 9, 2018
be72a7b
Merge pull request #533 from Vdauphin/Add-debug_improvement
Vdauphin May 9, 2018
59b3bdc
Merge branch 'master_daily' into Add-CBA
Vdauphin May 9, 2018
92d77ca
Improve btc_fnc_int_ask_var
Vdauphin May 9, 2018
278aabe
Merge pull request #529 from Vdauphin/Add-CBA
Vdauphin May 9, 2018
30fbcd1
Use function btc_fnc_mil_create_hideout
Vdauphin May 9, 2018
cd5b8bb
Merge pull request #532 from Vdauphin/Add-in
Vdauphin May 9, 2018
39d5ad2
Add: premade lodout depend of type (medic, AA, AT), night or day, typ…
Vdauphin May 10, 2018
3613f4f
Migrate Arsenal function to a proper folder
Vdauphin May 10, 2018
6e0bec5
dedicate function returning trait
Vdauphin May 10, 2018
73935c7
Simplify respawn system
Vdauphin May 11, 2018
041da1d
btc_fnc_int_ask_var can return any variable from server
Vdauphin May 11, 2018
74235a5
add cargo when DB loading and create object
Vdauphin May 12, 2018
b4e7a01
Add log_init to handle objects not handle by ace automatically
Vdauphin May 12, 2018
25e09e0
rmv old function
Vdauphin May 12, 2018
f6c2ebd
Add: DB
Vdauphin May 12, 2018
9c119ce
Now Cargo20 has a usefull size
Vdauphin May 12, 2018
afad568
rmv server_load function
Vdauphin May 13, 2018
a3744fb
FIX: hideout intel
Vdauphin May 13, 2018
d63bc63
Rmv useless dlg ,debug stringtable entry
Vdauphin May 13, 2018
e98af87
Merge pull request #542 from Vdauphin/FIX-Hideout_intel
Vdauphin May 14, 2018
21fd5b5
Merge pull request #536 from Vdauphin/Add-respawn
Vdauphin May 14, 2018
31ff356
FIX: spaces EOL
Vdauphin May 14, 2018
9c87dc7
Merge pull request #539 from Vdauphin/update-ask_var
Vdauphin May 15, 2018
694f927
fix: curator , fix DB
Vdauphin May 15, 2018
6a7b57a
fix tab, fix ACEisengener, magazin and count are automatic
Vdauphin May 15, 2018
c463966
Merge pull request #535 from Vdauphin/Add-extend_create_hideout
Vdauphin May 16, 2018
e30d778
FIX wrong param and fix medic
Vdauphin May 16, 2018
5e30ff0
FIX: wreck are deleted and rmv count command
Vdauphin May 17, 2018
799b4e2
FIX: btc_fnc_delete take only 3 parameters
Vdauphin May 17, 2018
5bef36f
fix tabs
Vdauphin May 17, 2018
aba95d3
FIX: object is not local to player
Vdauphin May 17, 2018
36a2ffd
FIX: distance does not take array of objects
Vdauphin May 17, 2018
2bbbcb7
FIXs FOB, interaction, german localisation
Vdauphin May 18, 2018
e08322f
Merge pull request #545 from Vdauphin/FIX-missing_fnc_set_owner
Vdauphin May 18, 2018
f50c754
Merge pull request #543 from Vdauphin/FIX-wreck_deleted
Vdauphin May 20, 2018
ff8a1d7
Merge pull request #544 from Vdauphin/FIX-hostage_not_cleanup
Vdauphin May 20, 2018
429b32f
Merge pull request #546 from Vdauphin/FIX-ask_var
Vdauphin May 20, 2018
66fa361
Merge branch 'master_daily' into Add-ACE_cargo
Vdauphin May 20, 2018
51f4051
Now btc_fnc_debug_message work outside fnc folder
Vdauphin May 20, 2018
25f0c74
Add: global variable
Vdauphin May 21, 2018
b53c136
Merge pull request #547 from Vdauphin/FIX-btc_fnc_debug_message
Vdauphin May 22, 2018
e728821
Optimize the color selection
Vdauphin May 23, 2018
0213f5d
Add some map support for green
Vdauphin May 24, 2018
8eb241d
Merge pull request #537 from Vdauphin/Add-loadout
Vdauphin May 24, 2018
28f8e6c
FIXs
Vdauphin May 27, 2018
befb7c3
FIX: waypoints [0,0,0] created
Vdauphin May 27, 2018
11d7620
Most patrol spawn alone
Vdauphin May 27, 2018
c33a889
Merge pull request #550 from Vdauphin/FIX-waypoints
Vdauphin May 28, 2018
ff60d4b
FIX: space and ()
Vdauphin May 28, 2018
de780ea
Merge pull request #548 from Vdauphin/FIX-code_guidelines
Vdauphin May 28, 2018
38dbc9f
Merge pull request #551 from Vdauphin/FIX-number_units
Vdauphin May 28, 2018
5894c85
remove container40, "loaded" variable
Vdauphin May 29, 2018
b4071c4
FIX: objects unloading without ace_cargo_size config value
Vdauphin May 30, 2018
5d91dd6
Merge branch 'master_stable' into master_daily
Vdauphin May 30, 2018
c1263de
FIX merging due to btc_fnc_delete
Vdauphin May 30, 2018
9e8d0c1
Use only one function to remove patrol
Vdauphin May 30, 2018
cfdd263
Don't correct position if has a ace_cargo_size config different from -1
Vdauphin May 31, 2018
ac21e02
Debug first
Vdauphin May 31, 2018
ed97531
_veh instead of _group
Vdauphin May 31, 2018
2b0e336
Merge pull request #554 from Vdauphin/Add-enhanced_patrol_eh
Vdauphin May 31, 2018
a399fcd
Merge branch 'master_daily' into Add-ACE_cargo
Vdauphin May 31, 2018
4ca547c
Remove the ACE patch, need ACE 3.13
Vdauphin Jun 1, 2018
cda39d4
Use the fnc create_s to load FOB from DB
Vdauphin Jun 3, 2018
49c2b62
Merge pull request #540 from Vdauphin/Add-ACE_cargo
Vdauphin Jun 7, 2018
973cbdd
use config and aiAmmoUsageFlags
Vdauphin Jun 7, 2018
7b6038f
Add param for autoloadout feature
Vdauphin Jun 8, 2018
865292b
use class for civilian
Vdauphin Jun 10, 2018
3003e8c
use class for civilian
Vdauphin Jun 10, 2018
80b97a5
Add filter weapons
Vdauphin Jun 10, 2018
1b632c2
Merge branch 'master_stable' into master_daily
Vdauphin Jun 11, 2018
e9a7a02
Now ammUsage also check othe magazins of weapons
Vdauphin Jun 11, 2018
2297b6d
add delay for the spawn
Vdauphin Jun 11, 2018
380e1ea
FIX: btc_fnc_arsenal_ammoUsage need to be compile evrywhere
Vdauphin Jun 12, 2018
7fa913a
Merge pull request #557 from Vdauphin/Add-use_onfig_for_class_detection
Vdauphin Jun 12, 2018
7875105
Merge branch 'master_daily' into Add-filter_weapons
Vdauphin Jun 12, 2018
fefa6a5
Filter accordingly to player trait
Vdauphin Jun 12, 2018
2247b91
fix a random word
Vdauphin Jun 12, 2018
6bca237
Now use BIS_fnc_itemType
Vdauphin Jun 13, 2018
59e3441
Merge pull request #556 from Vdauphin/Add-FOB_loading_with_fnc
Vdauphin Jun 13, 2018
50ace95
FIX: syntaxe error where _veh_type is undefine
Vdauphin Jun 13, 2018
df09513
Use findif command
Vdauphin Jun 13, 2018
cdc3e92
Merge pull request #559 from Vdauphin/FIX-call_militia
Vdauphin Jun 15, 2018
2c988a0
Add: sniper and MG
Vdauphin Jun 15, 2018
2a3510d
FIX: basic and advanced medical
Vdauphin Jun 15, 2018
47a3bc4
fix travis
Vdauphin Jun 17, 2018
11c7c33
Use Unsheduled environnement
Vdauphin Jun 23, 2018
03a9548
Work around to prevent CBA_fnc_deleteEntity looping over network
Vdauphin Jun 23, 2018
66b5800
Merge pull request #563 from Vdauphin/Add-sniper_machine_gunner
Vdauphin Jun 23, 2018
00a0042
Cache config and add string in stringtable
Vdauphin Jun 23, 2018
3a5454d
Merge branch 'master_stable' into master_daily
Vdauphin Jun 24, 2018
f488ee6
Merge pull request #558 from Vdauphin/Add-filter_weapons
Vdauphin Jun 25, 2018
8c47cb3
Revert commit since CBA 3.8 is released
Vdauphin Jun 26, 2018
392c3ab
Merge pull request #561 from Vdauphin/Add-findif
Vdauphin Jun 29, 2018
0557181
Merge branch 'master_daily' into FIX-Crash
Vdauphin Jun 29, 2018
b4fa803
Add: dir in function createvehicle and update create_static
Vdauphin Jun 30, 2018
aadc39b
FIX: tabs
Vdauphin Jun 30, 2018
6c6f576
Merge pull request #568 from Vdauphin/Add-dir_mil_createVehicle
Vdauphin Jun 30, 2018
53f93e6
Merge branch 'master_daily' into Param_auto_loadout
Vdauphin Jun 30, 2018
aa2a196
Add: new trait in mission.sqm
Vdauphin Jun 30, 2018
cde0c51
Merge pull request #569 from Vdauphin/Param_auto_loadout
Vdauphin Jun 30, 2018
dd4ea33
use new coding guide line
Vdauphin Jul 1, 2018
915084a
Merge branch 'master_daily' into Add-strategic_map
Vdauphin Jul 1, 2018
a963a56
improve code and add stringtable
Vdauphin Jul 1, 2018
af7432d
fix tabs
Vdauphin Jul 1, 2018
80e721a
use apply and remove _fobs
Vdauphin Jul 1, 2018
f409a4c
Merge pull request #564 from Vdauphin/FIX-Crash
Vdauphin Jul 3, 2018
690cc2d
Merge pull request #238 from Vdauphin/Add-strategic_map
Vdauphin Jul 3, 2018
db180c5
Remove stringtable no more used and dlg
Vdauphin Jul 3, 2018
582b734
Remove core\fnc\fob\lb_change.sqf
Vdauphin Jul 3, 2018
29a34f1
Merge pull request #570 from Vdauphin/Add-clean-up-redeploy
Vdauphin Jul 3, 2018
8bdd760
Clean up the filter
Vdauphin Jul 8, 2018
1cd4842
Use stringtable from Arma 3
Vdauphin Jul 8, 2018
e404c2c
Merge pull request #575 from Vdauphin/Add-clean_up_stringtable
Vdauphin Jul 9, 2018
b2188ac
Merge branch 'master_stable' into master_daily
Vdauphin Jul 11, 2018
1e449a8
Merge pull request #574 from Vdauphin/Add-clean_up_class
Vdauphin Jul 12, 2018
7b70e4e
Rmv setVariable ["btc_patrol", true]; not used
Vdauphin Jul 14, 2018
889c488
split patrol waypoint in different function
Vdauphin Jul 16, 2018
6dcf1c3
Merge pull request #577 from Vdauphin/Add-Celan-up-btc_patrol
Vdauphin Jul 16, 2018
8da9d4f
Migrate traffic to patrol
Vdauphin Jul 21, 2018
ecc726f
FIX: start city become end city
Vdauphin Jul 21, 2018
10b69e5
Tweak comment, remove traffic
Vdauphin Jul 24, 2018
0168f5a
use call instead of spawn
Vdauphin Jul 24, 2018
9b97190
Merge pull request #578 from Vdauphin/Add-improve_patrol
Vdauphin Jul 29, 2018
3a7144f
FIX: hideout and city desactivation are overlapping
Vdauphin Jul 30, 2018
646cb9d
camlcase
Vdauphin Aug 3, 2018
595192e
Add header python function
Vdauphin Aug 4, 2018
d94f564
Add parameters detection
Vdauphin Aug 4, 2018
b323b84
Merge pull request #582 from Vdauphin/FIX-hideout_city_overlap
Vdauphin Aug 5, 2018
7f77a92
Merge branch 'master_daily' into add-call
Vdauphin Aug 5, 2018
72a3e73
Switch from spawn to call
Vdauphin Aug 5, 2018
9b5ed4f
Add: improve params support
Vdauphin Aug 5, 2018
10045e5
Improve the create_group function
Vdauphin Aug 6, 2018
1d39767
[] call to avoit the _this passed as argument
Vdauphin Aug 6, 2018
90580e6
FIX: some wrong type of params
Vdauphin Aug 7, 2018
29f9f59
Merge pull request #584 from Vdauphin/Add-improve_params
Vdauphin Aug 8, 2018
9e79e56
Merge branch 'master_daily' into add-call
Vdauphin Aug 8, 2018
9e81132
Merge pull request #585 from Vdauphin/add-call
Vdauphin Aug 11, 2018
5615062
Merge branch 'master_daily' into Update-create_group
Vdauphin Aug 12, 2018
2ab5321
Merge pull request #586 from Vdauphin/Update-create_group
Vdauphin Aug 12, 2018
7f81087
detect type of parameters
Vdauphin Aug 13, 2018
27a539c
FIX: set markerTextLocal can takes sting or number
Vdauphin Aug 19, 2018
7943b62
FIX: task create error in params
Vdauphin Aug 19, 2018
6ddf918
Improve the global system
Vdauphin Aug 19, 2018
2759d6d
Add: control param support
Vdauphin Aug 19, 2018
ed6e605
Merge pull request #589 from Vdauphin/FIX-params_marker_local
Vdauphin Aug 21, 2018
f3e7f12
Merge pull request #590 from Vdauphin/ADD-create_group
Vdauphin Aug 22, 2018
44a7a8f
Add new params syntaxe
Vdauphin Aug 22, 2018
301186d
Add spawn parmaeters
Vdauphin Aug 22, 2018
e249dc0
Improve the global system
Vdauphin Aug 25, 2018
141555d
Merge pull request #11 from Vdauphin/master_daily
1kuemmel1 Aug 25, 2018
fb80e5f
added missing entries
1kuemmel1 Aug 25, 2018
0c0f7d7
Add parameters for enemies spawn
Vdauphin Aug 25, 2018
8df9405
Merge pull request #593 from 1kuemmel1/FIX-missing_stringtables
Vdauphin Aug 25, 2018
4d747e0
Merge branch 'master' into master_daily
Vdauphin Aug 25, 2018
0d4f76f
Merge branch 'master_daily' into Add-param_to_en_and_civ_spawn
Vdauphin Aug 25, 2018
74cb711
Update documentation accordingly to the new mission parameter
Vdauphin Aug 25, 2018
f4a9ecc
FIX tabs and other params
Vdauphin Aug 25, 2018
8c7b275
Add german stringtable
Vdauphin Aug 26, 2018
11ff63c
FIX tabs and some camlcase
Vdauphin Aug 26, 2018
dc300a7
FIX: lift system
Vdauphin Aug 26, 2018
a259563
Merge pull request #591 from Vdauphin/Add-param_to_en_and_civ_spawn
Vdauphin Aug 26, 2018
844cffa
Merge branch 'master_daily' into Add-new-params-syntaxe
Vdauphin Aug 26, 2018
e089418
FIX spawn error
Vdauphin Aug 27, 2018
368a4ea
Missing default value
Vdauphin Aug 27, 2018
ed00566
wrong default params
Vdauphin Aug 27, 2018
00cc98e
Support also string type of params and FIX dsiplaynull
Vdauphin Aug 27, 2018
5730e25
Merge pull request #592 from Vdauphin/Add-new-params-syntaxe
Vdauphin Aug 28, 2018
75ff087
Merge branch 'master_daily' into Add-header_2
Vdauphin Aug 28, 2018
43bf3bd
Add Header
Vdauphin Aug 29, 2018
700ace8
Merge pull request #581 from Vdauphin/Add-header_2
Vdauphin Aug 31, 2018
277e236
Update documentation accordingly to 1.19 changes
Vdauphin Sep 1, 2018
60c9de4
FIX name changed
Vdauphin Sep 1, 2018
0613e01
tweak doc
Vdauphin Sep 1, 2018
add772a
Merge pull request #598 from Vdauphin/Add-update_doc_to_1.19
Vdauphin Sep 1, 2018
1ea6b25
Wrong private variable
Vdauphin Sep 1, 2018
ae3a217
Merge pull request #599 from Vdauphin/FIX-backward_compatiblity
Vdauphin Sep 1, 2018
8f2a7c1
Merge branch 'master' into master_daily
Vdauphin Sep 3, 2018
f4c1ffe
Add: Authors name
Vdauphin Sep 4, 2018
d88838a
Merge pull request #600 from Vdauphin/Add-Authors
Vdauphin Sep 6, 2018
e29ecae
Add: header to ammoUsage
Vdauphin Sep 6, 2018
9313f93
Add: header to cache
Vdauphin Sep 8, 2018
930c2a4
Merge pull request #601 from Vdauphin/Add-header_arsenal
Vdauphin Sep 8, 2018
4a7a45e
COMMON_ is missing in stringtable
Vdauphin Sep 8, 2018
caee66d
Merge pull request #603 from Vdauphin/FIX-wrong_stringtable
Vdauphin Sep 8, 2018
307b956
Add header to city
Vdauphin Sep 9, 2018
104a555
Merge branch 'master' into master_daily
Vdauphin Sep 10, 2018
9947fcb
Merge pull request #602 from Vdauphin/Add-header-to-cache
Vdauphin Sep 11, 2018
2e55a1e
add header to civ
Vdauphin Sep 18, 2018
dff23b0
Merge branch 'master' into master_daily
Vdauphin Sep 19, 2018
5631348
FIX: remoteExec variant with "code"
Vdauphin Sep 19, 2018
d6cb157
Merge pull request #605 from Vdauphin/FIX-remoteExec-variant-with-code-
Vdauphin Sep 20, 2018
acb72ca
Add header to civ
Vdauphin Sep 21, 2018
94949f5
Merge pull request #604 from Vdauphin/Add-header-city
Vdauphin Sep 21, 2018
891bfc9
Quick clean up
Vdauphin Sep 23, 2018
fbcf522
Merge branch 'master' into master_daily
Vdauphin Oct 2, 2018
88f6bb5
Merge branch 'master' into master_daily
Vdauphin Oct 2, 2018
65fed13
Wrong file name and header : btc_fnc_ied_ied_effects
Vdauphin Oct 3, 2018
947c189
Merge pull request #607 from Vdauphin/Clean_up-comment
Vdauphin Oct 6, 2018
f8e7f59
Fix wrong syntaxe in header: boolean
Vdauphin Oct 7, 2018
addc7e1
Merge pull request #609 from Vdauphin/FIX-header
Vdauphin Oct 8, 2018
be4e986
Clean up redondent string
Vdauphin Oct 9, 2018
f7e3b59
FIX: patrol spawn on small road of durt in Tanoa
Vdauphin Oct 10, 2018
44cba45
use assignedVehicle in case the leader is outside the vehicle
Vdauphin Oct 13, 2018
75db6ed
Mil boat spawn flipped
Vdauphin Oct 13, 2018
6eb7bd2
Also take in param objects
Vdauphin Oct 13, 2018
6aa8786
Merge pull request #610 from Vdauphin/Add-clean_up_stringtable
Vdauphin Oct 14, 2018
9098edb
Extra debug output
Vdauphin Oct 14, 2018
2134044
Add waypoint message on creation and move waypoints close to patrol
Vdauphin Oct 14, 2018
6f21856
FIX: wrong statements
Vdauphin Oct 15, 2018
d5cfa11
FIX: _group is deleted before unit are created inside the group
Vdauphin Oct 27, 2018
5005542
Merge pull request #611 from Vdauphin/FIXerror_param_gethouses
Vdauphin Oct 28, 2018
73d9f7e
Wrong scope
Vdauphin Oct 29, 2018
2e81f22
FIX: delete use too much PFH
Vdauphin Oct 30, 2018
7aa93bf
Use _this to be sure same params are passed
Vdauphin Oct 30, 2018
9d7a54f
Update =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/deleteEntiti…
bux Oct 31, 2018
7c785b0
Merge pull request #612 from Vdauphin/FIX-patrol
Vdauphin Oct 31, 2018
a0397c0
FIX: IED check use too much PFH
Vdauphin Oct 31, 2018
21eb63c
FIX: btc_fnc_ied_fired_near use way too much CBA_fnc_addPerFrameHandler
Vdauphin Oct 31, 2018
38cb00a
FIX: functions IED are using to much PFH
Vdauphin Oct 31, 2018
24b1566
Add comment in header
Vdauphin Oct 31, 2018
2791f77
Better management of objets around IED
Vdauphin Nov 1, 2018
b1a440b
Merge pull request #613 from Vdauphin/FIX-delete_PFE_limit
Vdauphin Nov 2, 2018
2e629fc
Add header
Vdauphin Nov 2, 2018
ead83c1
Addheader in btc_fnc_ied_create
Vdauphin Nov 2, 2018
88b3379
add header in ied fonctions
Vdauphin Nov 2, 2018
e9c930e
Merge pull request #614 from Vdauphin/FIX-checkied_PFH
Vdauphin Nov 3, 2018
415f7ab
wrong header in loadout
Vdauphin Nov 3, 2018
9ca9b9e
Merge pull request #615 from Vdauphin/FIX-fired_near
Vdauphin Nov 4, 2018
49f4108
FIX missing factions
Vdauphin Nov 4, 2018
00803e1
Merge pull request #616 from Vdauphin/FIX-PFH_ied
Vdauphin Nov 5, 2018
16d081e
Merge pull request #620 from Vdauphin/FIX-missing_factions
Vdauphin Nov 6, 2018
99c8d40
Add 1.19
Vdauphin Nov 6, 2018
e05f54a
FIX error, id is not the position in the array
Vdauphin Nov 11, 2018
0b47840
Merge pull request #621 from Vdauphin/FIX-btc_hq
Vdauphin Nov 11, 2018
8209a25
Add master to travis
Vdauphin Nov 11, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions .travis.yml
@@ -0,0 +1,9 @@
branches:
only:
- master_daily
- master
language: python
python:
- '3.5'
script:
- python3 tools/sqf_validator.py
373 changes: 180 additions & 193 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf

Large diffs are not rendered by default.

144 changes: 99 additions & 45 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp

Large diffs are not rendered by default.

Empty file.
40 changes: 20 additions & 20 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/doc.sqf
@@ -1,59 +1,59 @@
private _MainCategory = (localize "STR_BTC_HAM_DOC_TITLE");
private _MainCategory = localize "str_3den_display3den_menubar_helpdoc_text";
player createDiarySubject [_MainCategory, _MainCategory];

//Headless and Data base
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_HEADLESS_TITLE"),(localize "STR_BTC_HAM_DOC_HEADLESS_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "STR_BTC_HAM_DOC_HEADLESS_TITLE", localize "STR_BTC_HAM_DOC_HEADLESS_TEXT"]];

//Wounds
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_WOUNDS_TITLE"),(localize "STR_BTC_HAM_DOC_WOUNDS_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "STR_BTC_HAM_DOC_WOUNDS_TITLE", localize "STR_BTC_HAM_DOC_WOUNDS_TEXT"]];

//Deafness
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_DEAFNESS_TITLE"),(localize "STR_BTC_HAM_DOC_DEAFNESS_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "STR_BTC_HAM_DOC_DEAFNESS_TITLE", localize "STR_BTC_HAM_DOC_DEAFNESS_TEXT"]];

//Vehicles
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_VEHICLES_TITLE"),(localize "STR_BTC_HAM_DOC_VEHICLES_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "str_a3_cfghints_command_vehicles1", localize "STR_BTC_HAM_DOC_VEHICLES_TEXT"]];

//Side Mission
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_SIDEMISSION_TITLE"),(localize "STR_BTC_HAM_DOC_SIDEMISSION_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "STR_BTC_HAM_DOC_SIDEMISSION_TITLE", localize "STR_BTC_HAM_DOC_SIDEMISSION_TEXT"]];

//FOB
player createDiaryRecord [_MainCategory, ["FOB", (localize "STR_BTC_HAM_DOC_FOB_TEXT")]];
player createDiaryRecord [_MainCategory, ["FOB", localize "STR_BTC_HAM_DOC_FOB_TEXT"]];

//Sling loading
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_SLING_TITLE"),(localize "STR_BTC_HAM_DOC_SLING_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "STR_A3_SlingLoad1", localize "STR_BTC_HAM_DOC_SLING_TEXT"]];

//Logistic point
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_LOGISTICP_TITLE"),(localize "STR_BTC_HAM_DOC_LOGISTICP_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "STR_BTC_HAM_MSQM_MRK_LOGPOINT", localize "STR_BTC_HAM_DOC_LOGISTICP_TEXT"]];

//Logistic
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_LOGISTIC_TITLE"),(localize "STR_BTC_HAM_DOC_LOGISTIC_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "STR_BTC_HAM_ACTION_LOC_MAIN", localize "STR_BTC_HAM_DOC_LOGISTIC_TEXT"]];

//Hideout
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_HIDEOUT_TITLE"),(localize "STR_BTC_HAM_DOC_HIDEOUT_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "str_a3_campaign_b_m03_marker02", localize "STR_BTC_HAM_DOC_HIDEOUT_TEXT"]];

//IED
player createDiaryRecord [_MainCategory, ["IED", (localize "STR_BTC_HAM_DOC_IED_TEXT")]];
player createDiaryRecord [_MainCategory, ["IED", localize "STR_BTC_HAM_DOC_IED_TEXT"]];

//Intel
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_INTEL_TITLE"),(localize "STR_BTC_HAM_DOC_INTEL_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "str_a3_mdl_category_intel", localize "STR_BTC_HAM_DOC_INTEL_TEXT"]];

//Reputation
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_REPUTATION_TITLE"),(localize "STR_BTC_HAM_DOC_REPUTATION_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "STR_BTC_HAM_DOC_REPUTATION_TITLE", localize "STR_BTC_HAM_DOC_REPUTATION_TEXT"]];

//Orders
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_ORDERS_TITLE"),(localize "STR_BTC_HAM_DOC_ORDERS_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "str_3den_waypoint_attribute_order_displayname", localize "STR_BTC_HAM_DOC_ORDERS_TEXT"]];

//Traffic
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_TRAFFIC_TITLE"),(localize "STR_BTC_HAM_DOC_TRAFFIC_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "STR_BTC_HAM_DOC_TRAFFIC_TITLE", localize "STR_BTC_HAM_DOC_TRAFFIC_TEXT"]];

//Gear
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_GEAR_TITLE"),(localize "STR_BTC_HAM_DOC_GEAR_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "STR_BTC_HAM_DOC_GEAR_TITLE", localize "STR_BTC_HAM_DOC_GEAR_TEXT"]];

//Interaction
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_INTERACTION_TITLE"),(localize "STR_BTC_HAM_DOC_INTERACTION_TEXT")]];
player createDiaryRecord [_MainCategory, [localize "STR_BTC_HAM_DOC_INTERACTION_TITLE", localize "STR_BTC_HAM_DOC_INTERACTION_TEXT"]];

//Version
player createDiaryRecord [_MainCategory, [(localize "STR_BTC_HAM_DOC_VERSION_TITLE"),
format ["<img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\download_ca.paa' width='20' height='20'/> Version %1.4 <img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\download_ca.paa' width='20' height='20'/>", btc_version]
player createDiaryRecord [_MainCategory, [localize "STR_A3_FM_Welcome4",
format ["<img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\download_ca.paa' width='20' height='20'/> Version %1.0 <img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\download_ca.paa' width='20' height='20'/>", btc_version]
]
];
77 changes: 77 additions & 0 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/arsenal/ammoUsage.sqf
@@ -0,0 +1,77 @@

/* ----------------------------------------------------------------------------
Function: btc_fnc_arsenal_ammoUsage

Description:
Select weapons if:
- is a type of item
- and has a ammo usage allowed
- and is not/is parent to a parent

Parameters:
_weapons - Array of weapopns. [Array]
_itemType_ammo_usageAllowed - Weapons allowed filter: array of item type ("AssaultRifle", "MissileLauncher"...), allowed ammo usage ("128 + 512": ammo against vehicles and armored vehicles) and array to check if weapons are parent to a parent. [Array]

Returns:
Array of selected weapons

Examples:
(begin example)
_weapons_selected = [["launch_RPG7_F"], ["MissileLauncher", "256", []]] call btc_fnc_arsenal_ammoUsage;
(end)

Author:
Vdauphin

---------------------------------------------------------------------------- */

params [
["_weapons", ["launch_RPG7_F"], [[]]],
["_itemType_ammo_usageAllowed", ["MissileLauncher", "256", []], [[]]]
];
_itemType_ammo_usageAllowed params [["_itemType", "MissileLauncher", [""]], ["_ammo_usageAllowed", "256", [""]], ["_parent_array", [], [[]]]];

private _cfgWeapons = configFile >> "CfgWeapons";
private _cfgMagazines = configFile >> "CfgMagazines";
private _cfgAmmo = configFile >> "CfgAmmo";

_weapons select {
private _weapon = _x;
private _magazines = getArray (_cfgWeapons >> _weapon >> "magazines");

private _isAllowed = if (_ammo_usageAllowed isEqualTo "") then {
true
} else {
private _aiAmmoUsage_magazines = _magazines apply {
private _ammo = getText (_cfgMagazines >> _x >> "ammo");

private _aiAmmoUsage = getText (_cfgAmmo >> _ammo >> "aiAmmoUsageFlags");
if (_aiAmmoUsage isEqualTo "") then {
_aiAmmoUsage = str getNumber (_cfgAmmo >> _ammo >> "aiAmmoUsageFlags");
};

_aiAmmoUsage;
};

if (btc_debug_log) then {
if ("" in _aiAmmoUsage_magazines) then {
[format ["Weapons: %1 AiAmmoUsage Magazines: %2", _weapon, _aiAmmoUsage_magazines], __FILE__, [false]] call btc_fnc_debug_message;
};
};

_ammo_usageAllowed in _aiAmmoUsage_magazines
};

private _isParent = if (_parent_array isEqualTo []) then {
true
} else {
_parent_array params ["_not", "_parent_type"];
if (_not) then {
_weapon isKindOf [_parent_type, _cfgWeapons]
} else {
!(_weapon isKindOf [_parent_type, _cfgWeapons])
};
};

(_itemType in (_weapon call BIS_fnc_itemType)) && {_isAllowed} && {_isParent}
};
69 changes: 69 additions & 0 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/arsenal/data.sqf
@@ -0,0 +1,69 @@

/* ----------------------------------------------------------------------------
Function: btc_fnc_arsenal_data

Description:
Add virtual weapons to an object (e.g., ammo box) with restriction. Virtual items can be selected in the BIS/ACE3 Arsenal.

Parameters:
_box - Object to which items will be added. [Object]
_arsenalType - _arsenalType < 3 add BIS Arsenal, _arsenalType > 0 add ACE3 Arsenal. [Number]
_arsenalRestrict - 1 to add to Arsenal _arsenalData, other to restrict Arsenal with _arsenalData. [Number]
_arsenalData - Array of weapons, magazines and items. [Array]

Returns:

Examples:
(begin example)
[btc_gear_object, btc_p_arsenal_Type, btc_p_arsenal_Restrict, btc_custom_arsenal] call btc_fnc_arsenal_data;
(end)

Author:
1kuemmel1

---------------------------------------------------------------------------- */

params [
["_box", objNull, [objNull]],
["_arsenalType", 0, [0]],
["_arsenalRestrict", 0, [0]],
["_arsenalData", [], [[]]]
];
_arsenalData params [["_weapons", [], [[]]], ["_magazines", [], [[]]], ["_items", [], [[]]], ["_backpacks", [], [[]]]];

//BIS Arsenal
if (_arsenalType < 3) then {
if (_arsenalRestrict isEqualTo 1) then {
//add
[_box, _weapons, false, false] call BIS_fnc_addVirtualWeaponCargo;
[_box, _magazines, false, false] call BIS_fnc_addVirtualMagazineCargo;
[_box, _items, false, false] call BIS_fnc_addVirtualItemCargo;
[_box, _backpacks, false, false] call BIS_fnc_addVirtualBackpackCargo;
};

// DO NOT WORK FOR BIS ARSENAL
if (_arsenalRestrict in [2, 3]) then {
//remove
[_box, _weapons, false] call BIS_fnc_removeVirtualWeaponCargo;
[_box, _magazines, false] call BIS_fnc_removeVirtualMagazineCargo;
[_box, _items, false] call BIS_fnc_removeVirtualItemCargo;
[_box, _backpacks, false] call BIS_fnc_removeVirtualBackpackCargo;
};
};

//ACE Arsenal
if (_arsenalType > 0) then {
//add
if (_arsenalRestrict isEqualTo 1) then {
private _aceAdd = [];
{_aceAdd append _x;} forEach [_weapons, _magazines, _items, _backpacks];
[_box, _aceAdd] call ace_arsenal_fnc_addVirtualItems;
};

//remove
if (_arsenalRestrict in [2, 3]) then {
private _aceRemove = [];
{_aceRemove append _x;} forEach [_weapons, _magazines, _items, _backpacks];
[_box, _aceRemove] call ace_arsenal_fnc_removeVirtualItems;
};
};
63 changes: 63 additions & 0 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/arsenal/garage.sqf
@@ -0,0 +1,63 @@

/* ----------------------------------------------------------------------------
Function: btc_fnc_arsenal_garage

Description:
Open virtual Arsenal garage on object position.

Parameters:
_current_garage - Object where the vehicle from garage will spawn. [Object]

Returns:

Examples:
(begin example)
[btc_create_object_point] call btc_fnc_arsenal_garage;
(end)

Author:
Vdauphin

---------------------------------------------------------------------------- */

params [
["_current_garage", objNull, [objNull]]
];

if (count (nearestObjects [_current_garage, ["All"], 5]) > 1) exitWith {
hint localize "STR_BTC_HAM_LOG_BASICS_CLEARAREA"; //Clear the area before create another object!
};

disableSerialization;
uiNamespace setVariable ["current_garage", _current_garage];
private _fullVersion = missionNamespace getVariable ["BIS_fnc_arsenal_fullGarage", false];
if !(isNull (uiNamespace getVariable ["BIS_fnc_arsenal_cam", objNull])) exitwith {
"Garage Viewer is already running" call bis_fnc_logFormat;
};
private _veh = createVehicle ["Land_HelipadEmpty_F", getPos _current_garage, [], 0, "CAN_COLLIDE"];
_veh setPosASL getPosASL _current_garage;
uiNamespace setVariable ["garage_pad", _veh];
missionNamespace setVariable ["BIS_fnc_arsenal_fullGarage", [true, 0, false, [false]] call BIS_fnc_param];
with missionNamespace do {BIS_fnc_garage_center = _veh};

with uiNamespace do {
private _displayMission = [] call (uiNamespace getVariable "bis_fnc_displayMission");
if !(isNull findDisplay 312) then {_displayMission = findDisplay 312;};
_displayMission createDisplay "RscDisplayGarage";
uiNamespace setVariable ["running_garage", true];
waitUntil {sleep 0.25; isNull (uiNamespace getVariable ["BIS_fnc_arsenal_cam", objNull])};
private _logistic_point = uiNamespace getVariable "current_garage";
private _pad = uiNamespace getVariable "garage_pad";
deleteVehicle _pad;
private _veh_list = _logistic_point nearEntities 5;
{
private _type = typeOf _x;
private _pos = getPosASL _x;
private _dir = getDir _x;
private _customization = [_x] call BIS_fnc_getVehicleCustomization;

_x call CBA_fnc_deleteEntity;
[_type, _pos, _dir, _customization] remoteExec ["btc_fnc_log_createVehicle", 2];
[_type] remoteExec ["btc_fnc_eh_veh_init", -2];
} forEach _veh_list;
};