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.24 to 1.25 #1672

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
dbc5836
Add btc_respawn_fnc_addInteraction
Vdauphin May 18, 2024
271fb0a
add stringtable
Vdauphin May 18, 2024
b7c929c
move param
Vdauphin May 18, 2024
82c2a4d
change to btc_fob_fnc_addInteraction
Vdauphin May 18, 2024
73794e9
default setting
Vdauphin May 18, 2024
2e4494e
readd "FOB"
Vdauphin Jun 8, 2024
2f32dd7
tweak syntaxe
Vdauphin Jun 15, 2024
21c5622
use common _condition
Vdauphin Jun 15, 2024
52f1b67
Add timeout
Vdauphin Jun 15, 2024
4ecf389
refine timeout
Vdauphin Jun 16, 2024
d35898a
Append custom suffix to player markers loaded from DB
mrschick Jun 28, 2024
61dcf12
Merge pull request #1624 from bagigi-arma/feature/marker-loading-comp…
Vdauphin Jun 30, 2024
e77a7f8
Merge pull request #1622 from Vdauphin/Add-respawn-ace_int
Vdauphin Jul 20, 2024
5ddf3ea
Fix Heli Pilot being turned non-captive far from players
mrschick Jul 29, 2024
8d0a095
Fix Convoy Officer not disembarking when isolated
mrschick Jul 29, 2024
dd4ea34
Assassination/Hostage Side Mission Improvements
mrschick Jul 29, 2024
24e31a5
Delete Hostage Area on Success
mrschick Jul 29, 2024
94b6a73
No Task AOU for Hostage Rescue and Assassination
mrschick Aug 3, 2024
b9c413b
Revert "Fix Heli Pilot being turned non-captive far from players"
mrschick Aug 6, 2024
83d1c90
Prevent KJW Imposters from resetting pilot captive state
mrschick Aug 6, 2024
c97c69a
Merge pull request #1633 from bagigi-arma/feature/side-mission-improv…
Vdauphin Aug 11, 2024
01ba330
Merge branch 'master' into master_daily
Vdauphin Aug 17, 2024
af2f58b
Add grave
Vdauphin Sep 5, 2024
7f44faa
rename btc_rep_graveS
Vdauphin Sep 5, 2024
158b439
add btc_type_flowersBig
Vdauphin Sep 5, 2024
9177989
add fnc to compile
Vdauphin Sep 5, 2024
97bcf7d
update documentation
Vdauphin Sep 5, 2024
2e498aa
fix position
Vdauphin Sep 8, 2024
2739f88
multiole flower
Vdauphin Sep 8, 2024
b7dd219
test
Vdauphin Sep 10, 2024
bbcb416
Revert "test"
Vdauphin Sep 10, 2024
7085bbd
Reapply "test"
Vdauphin Sep 10, 2024
50e3dbf
fix flower direction
Vdauphin Sep 10, 2024
39d596c
must have one flower
Vdauphin Sep 10, 2024
a0d88c9
fix dedicated
Vdauphin Sep 12, 2024
4dc3b2c
fix position of grave
Vdauphin Sep 12, 2024
3ba089f
fix db
Vdauphin Sep 14, 2024
1f0dc4c
add _medic
Vdauphin Oct 2, 2024
6c379f4
Merge branch 'master' into master_daily
Vdauphin Oct 12, 2024
492aa4f
Merge branch 'master_daily' into Add-Grave
Vdauphin Oct 12, 2024
4019a6b
Merge pull request #1656 from Vdauphin/Add-Grave
Vdauphin Oct 14, 2024
404fff4
Merge branch 'master' into master_daily
Vdauphin Oct 19, 2024
f04da40
add massacre
Vdauphin Oct 26, 2024
da6dabf
track place in body bag
Vdauphin Oct 26, 2024
8aec964
fix fail when leave an other city
Vdauphin Oct 26, 2024
f0dc22a
add some item around
Vdauphin Oct 26, 2024
3450b4f
add comment
Vdauphin Oct 26, 2024
97eb397
add stringtable
Vdauphin Oct 26, 2024
0388d1b
add deadbody processing
Vdauphin Oct 30, 2024
c2d2d9a
add massacre side to side mission list
Vdauphin Nov 1, 2024
9ab36b2
update documentation
Vdauphin Nov 4, 2024
50dbe31
Merge pull request #1668 from Vdauphin/Add-deadbody_processing
Vdauphin Nov 7, 2024
3757e1e
add new items
Vdauphin Nov 10, 2024
2ae1eca
typo
Vdauphin Nov 11, 2024
2db9e77
fix delay of _restingPlace
Vdauphin Nov 16, 2024
b76d511
Merge pull request #1667 from Vdauphin/Add-massacre
Vdauphin Nov 17, 2024
ef247a3
Advanced Chemical Warfare Settings
TomDraal Dec 1, 2024
ade1d28
Update param.hpp to allow 0% Chemical Cache Proba
TomDraal Dec 1, 2024
4b648da
Remove btc_p_chem for consistency
TomDraal Dec 15, 2024
6eb1adc
Update =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/cache/create.sqf
TomDraal Dec 15, 2024
a8c9a60
Update =BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp
TomDraal Dec 15, 2024
2bd691e
Update =BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp
TomDraal Dec 15, 2024
a91cd38
Update =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/load.sqf
TomDraal Dec 15, 2024
944a756
Update =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/load_old.sqf
TomDraal Dec 15, 2024
373ba99
VDauphin's suggestions
TomDraal Dec 15, 2024
76406a8
Update =BTC=co@30_Hearts_and_Minds.Altis/stringtable.xml
TomDraal Dec 18, 2024
4341a99
Update =BTC=co@30_Hearts_and_Minds.Altis/stringtable.xml
TomDraal Dec 18, 2024
a8b975e
Merge pull request #1674 from TomDraal/TomDraal-AdvChem
Vdauphin Dec 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ btc_p_change_weather = ("btc_p_change_weather" call BIS_fnc_getParamValue) isEqu

//<< Respawn options >>
btc_p_respawn_location = "btc_p_respawn_location" call BIS_fnc_getParamValue;
btc_p_respawn_fromFOBToBase = ("btc_p_respawn_fromFOBToBase" call BIS_fnc_getParamValue) isEqualTo 1;
btc_p_respawn_fromOutsideBase = "btc_p_respawn_fromOutsideBase" call BIS_fnc_getParamValue;
btc_p_respawn_fromOutsideTimeout = "btc_p_respawn_fromOutsideTimeout" call BIS_fnc_getParamValue;
btc_p_rallypointTimer = "btc_p_rallypointTimer" call BIS_fnc_getParamValue;
btc_p_respawn_arsenal = ("btc_p_respawn_arsenal" call BIS_fnc_getParamValue) isEqualTo 1;
btc_p_respawn_ticketsAtStart = "btc_p_respawn_ticketsAtStart" call BIS_fnc_getParamValue;
Expand Down Expand Up @@ -83,7 +84,8 @@ btc_p_civ_max_veh = "btc_p_civ_max_veh" call BIS_fnc_getParamValue;

//<< Gameplay options >>
btc_p_sea = ("btc_p_sea" call BIS_fnc_getParamValue) isEqualTo 1;
btc_p_chem = ("btc_p_chem" call BIS_fnc_getParamValue) isEqualTo 1;
btc_p_chem_sides = ("btc_p_chem_sides" call BIS_fnc_getParamValue) isEqualTo 1;
btc_p_chem_cache_probability = ("btc_p_chem_cache_probability" call BIS_fnc_getParamValue)/100;
btc_p_spect = ("btc_p_spect" call BIS_fnc_getParamValue) isEqualTo 1;
btc_p_side_mission_cycle = "btc_p_side_mission_cycle" call BIS_fnc_getParamValue;

Expand Down Expand Up @@ -218,6 +220,7 @@ if (isServer) then {
btc_type_bigbox = ["Box_FIA_Ammo_F", "Box_East_AmmoVeh_F", "CargoNet_01_box_F", "O_CargoNet_01_ammo_F"] + btc_type_Scrapyard;
btc_type_seat = ["Land_WoodenLog_F", "Land_CampingChair_V2_F", "Land_CampingChair_V1_folded_F", "Land_CampingChair_V1_F"];
btc_type_sleepingbag = _allClassSorted select {_x isKindOf "Land_Sleeping_bag_F"};
btc_type_sleepingbag_folded = _allClassSorted select {_x isKindOf "Land_Sleeping_bag_folded_F"};
btc_type_tent = ["Land_TentA_F", "Land_TentDome_F"] + (_allClassSorted select {
_x isKindOf "Land_TentSolar_01_base_F" &&
{!(_x isKindOf "Land_TentSolar_01_folded_base_F")}
Expand All @@ -227,9 +230,9 @@ if (isServer) then {

//Side
btc_side_ID = 0;
btc_side_list = ["supply", "mines", "vehicle", "get_city", "tower", "civtreatment", "checkpoint", "convoy", "rescue", "capture_officer", "hostage", "hack", "kill", "EMP", "removeRubbish"]; // On ground (Side "convoy" and "capture_officer" are not design for map with different islands. Start and end city can be on different islands.)
btc_side_list = ["supply", "mines", "vehicle", "get_city", "tower", "civtreatment", "checkpoint", "convoy", "rescue", "capture_officer", "hostage", "hack", "kill", "EMP", "removeRubbish", "massacre"]; // On ground (Side "convoy" and "capture_officer" are not design for map with different islands. Start and end city can be on different islands.)
if (btc_p_sea) then {btc_side_list append ["civtreatment_boat", "underwater_generator"]}; // On sea
if (btc_p_chem) then {btc_side_list append ["chemicalLeak", "pandemic"]};
if (btc_p_chem_sides) then {btc_side_list append ["chemicalLeak", "pandemic"]};
btc_side_list_use = [];
btc_type_tower = ["Land_Communication_F", "Land_TTowerBig_1_F", "Land_TTowerBig_2_F"];
btc_type_barrel = ["Land_GarbageBarrel_01_F", "Land_BarrelSand_grey_F", "MetalBarrel_burning_F", "Land_BarrelWater_F", "Land_MetalBarrel_F", "Land_MetalBarrel_empty_F"];
Expand Down Expand Up @@ -296,6 +299,8 @@ if (isServer) then {
btc_type_cargoEMP = _allClassSorted select {_x isKindOf "Cargo_EMP_base_F"};
btc_type_antenna = _allClassSorted select {_x isKindOf "OmniDirectionalAntenna_01_base_F"};
btc_type_solarPanel = _allClassSorted select {_x isKindOf "Land_SolarPanel_04_base_F"};
btc_type_sports = (_allClassSorted select {_x isKindOf "SportItems_base_F"}) select {"ball" in _x};
btc_type_bottles = (_allClassSorted select {_x isKindOf "Items_base_F"}) select {"Bottle" in _x and (not ("stack" in _x))};

// The two arrays below are prefixes of buildings and their multiplier.
// They will multiply the values of btc_rep_malus_building_destroyed and btc_rep_malus_building_damaged,
Expand Down Expand Up @@ -413,6 +418,7 @@ btc_fob_structure = "Land_Cargo_HQ_V1_F";
btc_fob_flag = "Flag_NATO_F";
btc_fob_id = 0;
btc_fob_minDistance = 1500;
btc_fob_timeout = 1 * 60;

//IED
btc_type_ieds_ace = ["IEDLandBig_F", "IEDLandSmall_F"];
Expand Down Expand Up @@ -687,6 +693,7 @@ btc_rep_bonus_IEDCleanUp = 10;
btc_rep_bonus_removeTag = 3;
btc_rep_bonus_removeTagLetter = 0.5;
btc_rep_bonus_foodGive = 0.5;
btc_rep_bonus_grave = 5;

btc_rep_malus_civ_hd = - 2;
btc_rep_malus_animal_hd = - 1;
Expand Down
28 changes: 20 additions & 8 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,24 @@ class Params {
texts[]={""};
default = 0;
};
class btc_p_respawn_fromOutsideBase { // Enable respawn menu access from outside the base:
title = __EVAL(format [" %1", localize "STR_BTC_HAM_RESP_OUTSIDEBASE"]);
values[]={0,1,2,3,4,5};
texts[]={$STR_DISABLED, $STR_BTC_HAM_RESP_FOB, $STR_BTC_HAM_RESP_FOBHELO, $STR_BTC_HAM_RESP_FOBHELI, $STR_BTC_HAM_RESP_FOBHELIVEHI, $STR_BTC_HAM_RESP_FOBHELIVEHIPLAYER};
default = 0;
};
class btc_p_respawn_fromOutsideTimeout { // Add a 1 min timeout for accessing the respawn menu for:
title = __EVAL(format [" %1", localize "STR_BTC_HAM_RESP_OUTSIDETIMEOUT"]);
values[]={0,1,2,3,4,5};
texts[]={$STR_DISABLED, $STR_BTC_HAM_RESP_TIMEOUTPLAYER, $STR_BTC_HAM_RESP_TIMEOUTVEHIPLAYER, $STR_BTC_HAM_RESP_TIMEOUTHELIVEHIPLAYER, $STR_BTC_HAM_RESP_TIMEOUTFOBHELOVEHIPLAYER, $STR_BTC_HAM_RESP_TIMEOUTFOBHELIVEHIPLAYER};
default = 0;
};
class btc_p_respawn_location { // Respawn locations available:
title = __EVAL(format [" %1", localize "STR_BTC_HAM_RESP_LOCATION"]);
values[]={0,1,2,3,4};
texts[]={$STR_BTC_HAM_RESP_FOBRALLY, $STR_BTC_HAM_RESP_FOBRALLYHELO, $STR_BTC_HAM_RESP_FOBRALLYHELI, $STR_BTC_HAM_RESP_FOBRALLYHELIVEHI, $STR_BTC_HAM_RESP_FOBRALLYHELIVEHILEADER};
default = 4;
};
class btc_p_respawn_fromFOBToBase { // Allow respawn from FOB to base:
title = __EVAL(format [" %1", localize "STR_BTC_HAM_RESP_FOBTOBASE"]);
values[]={0,1};
texts[]={$STR_DISABLED, $STR_ENABLED};
default = 0;
};
class btc_p_rallypointTimer { // Time before rallypoint self-destruction:
title = __EVAL(format [" %1", localize "STR_BTC_HAM_RESP_RALLYTIMER"]);
values[]={0,5,10,30,60};
Expand Down Expand Up @@ -395,12 +401,18 @@ class Params {
texts[] = {$STR_DISABLED,$STR_ENABLED};
default = 1;
};
class btc_p_chem { // Chemical warfare
title = __EVAL(format [" %1", localize "STR_BTC_HAM_PARAM_GAMEPLAY_CHEM"]);
class btc_p_chem_sides { // Toggle chemical side missions:
title = __EVAL(format [" %1", localize "STR_BTC_HAM_PARAM_GAMEPLAY_CHEM_SIDES"]);
values[] = {0,1};
texts[] = {$STR_DISABLED,$STR_ENABLED};
default = 1;
};
class btc_p_chem_cache_probability { // Chemical weapon cache probability:
title = __EVAL(format [" %1", localize "STR_BTC_HAM_PARAM_GAMEPLAY_CHEM_CACHE_PROBABILITY"]);
values[]={0,10,20,30,40,50,60,70,80,90,100};
texts[]={"0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%"};
default = 50;
};
class btc_p_spect { // Spectrum devices
title = __EVAL(format [" %1", localize "STR_BTC_HAM_PARAM_GAMEPLAY_SPECT"]);
values[] = {0,1};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@ params [

private _array = nearestObjects [_logistic, ["ACE_bodyBagObject", "CAManBase"], 10];
_array = _array select {
alive _x && (
(_x isKindOf "CAManBase" &&
side group _x isEqualTo btc_enemy_side) ||
_x isKindOf "ACE_bodyBagObject"
)
_x isKindOf "CAManBase" ||
_x isKindOf "ACE_bodyBagObject"
};
if (_array isEqualTo []) exitWith {
localize "STR_BTC_HAM_O_BODYBAG_NO" call CBA_fnc_notify;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ private _ticket = 0;
private _UID = _bodyBag getVariable ["btc_UID", ""];
private _players = [];
if (_UID isEqualTo "") then {
if (alive _bodyBag && _bodyBag isKindOf "CAManBase") then {
if (
alive _bodyBag &&
_bodyBag isKindOf "CAManBase" &&
side group _bodyBag isEqualTo btc_enemy_side
) then {
_ticket = btc_body_prisonerTicket;

switch (btc_p_respawn_ticketsFromPrisoners) do {
Expand Down
8 changes: 4 additions & 4 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/cache/create.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Description:
Parameters:
_cache_pos - Position of the cache. [Array]
_p_chem - Allow chemical cache. [Boolean]
_probabilityNotChemical - Probability to not create a chemical cache. [Number]
_probabilityChemical - Probability to create a chemical cache. [Number]

Returns:

Expand All @@ -28,13 +28,13 @@ Author:

params [
["_cache_pos", btc_cache_pos, [[]]],
["_p_chem", btc_p_chem, [true]],
["_probabilityNotChemical", 0.5, [0]]
["_p_chem", btc_p_chem_cache_probability > 0, [true]],
["_probabilityChemical", btc_p_chem_cache_probability, [0]]
];

private _isChem = false;
if (_p_chem) then {
_isChem = random 1 > _probabilityNotChemical;
_isChem = random 1 < _probabilityChemical;
};
private _cacheType = selectRandom (btc_cache_type select 0);
btc_cache_obj = _cacheType createVehicle _cache_pos;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Author:

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

if !(btc_p_chem) exitWith {};
if !(btc_p_chem_sides || (btc_p_chem_cache_probability > 0)) exitWith {};

private _bodyParts = ["head","body","hand_l","hand_r","leg_l","leg_r"];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Author:

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

if !(btc_p_chem) exitWith {};
if !(btc_p_chem_sides || (btc_p_chem_cache_probability > 0)) exitWith {};

params [
["_minDistance", 5, [2]]
Expand Down
5 changes: 5 additions & 0 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/city/activate.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,11 @@ if (_civKilled isNotEqualTo []) then {
[[_city, _civKilled], btc_civ_fnc_createFlower] call btc_delay_fnc_exec;
};

private _grave = _city getVariable ["btc_rep_graves", []];
if (_grave isNotEqualTo []) then {
[[_city, _grave], btc_civ_fnc_createGrave] call btc_delay_fnc_exec;
};

[{
params ["_has_en", "_city", "_cachingRadius"];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ btc_tags_server = btc_tags_server - [objNull];

(_city getVariable ["btc_civ_flowers", []]) call CBA_fnc_deleteEntity;

(_city getVariable ["btc_civ_graves", []]) call CBA_fnc_deleteEntity;

if (btc_debug_log) then {
[format ["count data_units = %1", count _data_units], __FILE__, [false]] call btc_debug_fnc_message;
[format ["count data_animals = %1", count _data_animals], __FILE__, [false]] call btc_debug_fnc_message;
Expand Down
50 changes: 50 additions & 0 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/civ/createGrave.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@

/* ----------------------------------------------------------------------------
Function: btc_civ_fnc_createGrave

Description:
Create graves and add flower bouquets next to them.

Parameters:
_city - City. [Object]
_graves - Array of grave around city. [Array]

Returns:

Examples:
(begin example)
[btc_city_all get 1, [[getPosASL player, getDir player, "ACE_Grave"]]] call btc_civ_fnc_createGrave;
(end)

Author:
Vdauphin

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

params [
["_city", objNull, [objNull]],
["_graves", [], [[]]]
];

_city setVariable [
"btc_civ_graves",
_graves apply {
_x params ["_posASL", "_dir", "_graveType"];

private _grave = createVehicle [_graveType, [0, 0, 0], [], 0, "NONE"];
_grave setPosASL _posASL;
_grave setDir _dir;
_grave setVectorUp surfaceNormal _posASL;

_flowers = [];
for "_i" from 0 to (1 + round random 2) do {
_flowers pushBack createSimpleObject [
selectRandom btc_type_flowers,
[[_posASL vectorAdd [0, 0, 0.2], 0.2, 0.8, _dir, true]] call CBA_fnc_randPosArea
];
(_flowers select _i) setDir random 360;
};

[_flowers, _grave]
}
];
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ Author:
params [
["_group", grpNull, [grpNull]],
["_active_city", objNull, [objNull]],
["_area", btc_patrol_area, [0]],
["_p_chem", btc_p_chem, [false]]
["_area", btc_patrol_area, [0]]
];

if (isNil "btc_civilian_id") then {btc_civilian_id = -1;};
Expand Down
4 changes: 4 additions & 0 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/compile.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ if (isServer) then {
btc_civ_fnc_create_patrol = compileScript ["core\fnc\civ\create_patrol.sqf"];
btc_civ_fnc_evacuate = compileScript ["core\fnc\civ\evacuate.sqf"];
btc_civ_fnc_createFlower = compileScript ["core\fnc\civ\createFlower.sqf"];
btc_civ_fnc_createGrave = compileScript ["core\fnc\civ\createGrave.sqf"];

//DATA
btc_data_fnc_add_group = compileScript ["core\fnc\data\add_group.sqf"];
Expand Down Expand Up @@ -168,6 +169,7 @@ if (isServer) then {
btc_rep_fnc_notify = compileScript ["core\fnc\rep\notify.sqf"];
btc_rep_fnc_killed = compileScript ["core\fnc\rep\killed.sqf"];
btc_rep_fnc_wheelChange = compileScript ["core\fnc\rep\wheelChange.sqf"];
btc_rep_fnc_grave = compileScript ["core\fnc\rep\grave.sqf"];

//RESPAWN
btc_respawn_fnc_addTicket = compileScript ["core\fnc\respawn\addTicket.sqf"];
Expand Down Expand Up @@ -195,6 +197,7 @@ if (isServer) then {
btc_side_fnc_EMP = compileScript ["core\fnc\side\EMP.sqf"];
btc_side_fnc_removeRubbish = compileScript ["core\fnc\side\removeRubbish.sqf"];
btc_side_fnc_pandemic = compileScript ["core\fnc\side\pandemic.sqf"];
btc_side_fnc_massacre = compileScript ["core\fnc\side\massacre.sqf"];

//TAG
btc_tag_fnc_initArea = compileScript ["core\fnc\tag\initArea.sqf"];
Expand Down Expand Up @@ -351,6 +354,7 @@ if (!isDedicated) then {
btc_fob_fnc_rallypointAssemble = compileScript ["core\fnc\fob\rallypointAssemble.sqf"];
btc_fob_fnc_redeploy = compileScript ["core\fnc\fob\redeploy.sqf"];
btc_fob_fnc_redeployCheck = compileScript ["core\fnc\fob\redeployCheck.sqf"];
btc_fob_fnc_addInteraction = compileScript ["core\fnc\fob\addInteraction.sqf"];

//INT
btc_int_fnc_add_actions = compileScript ["core\fnc\int\add_actions.sqf"];
Expand Down
8 changes: 5 additions & 3 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/load.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ private _cities_status = +(profileNamespace getVariable [format ["btc_hm_%1_citi
_x params ["_id", "_initialized", "_spawn_more", "_occupied", "_data_units", "_has_ho", "_ho_units_spawned", "_ieds", "_has_suicider",
["_data_animals", [], [[]]],
["_data_tags", [], [[]]],
["_civKilled", [], [[]]]
["_civKilled", [], [[]]],
["_graves", [], [[]]]
];

private _city = btc_city_all get _id;
Expand All @@ -49,6 +50,7 @@ private _cities_status = +(profileNamespace getVariable [format ["btc_hm_%1_citi
_city setVariable ["data_animals", _data_animals];
_city setVariable ["data_tags", _data_tags];
_city setVariable ["btc_rep_civKilled", _civKilled];
_city setVariable ["btc_rep_graves", _graves];

if (btc_debug) then {
private _marker = _city getVariable ["marker", ""];
Expand Down Expand Up @@ -100,7 +102,7 @@ btc_cache_pos = _cache_pos;
btc_cache_n = _cache_n;
btc_cache_info = _cache_info;

[_cache_pos, btc_p_chem, [1, 0] select _isChem] call btc_cache_fnc_create;
[_cache_pos, btc_p_chem_cache_probability > 0, [1, 0] select _isChem] call btc_cache_fnc_create;
btc_cache_obj setVariable ["btc_cache_unitsSpawned", _cache_unitsSpawned];

btc_cache_markers = [];
Expand Down Expand Up @@ -274,7 +276,7 @@ private _markers_properties = +(profileNamespace getVariable [format ["btc_hm_%1
["_markerChannel", 0, [0]]
];

private _marker = createMarker [format ["_USER_DEFINED #0/%1/%2", _forEachindex, _markerChannel], _markerPos, _markerChannel];
private _marker = createMarker [format ["_USER_DEFINED #0/%1/%2 btc_hm", _forEachindex, _markerChannel], _markerPos, _markerChannel];
_marker setMarkerText _markerText;
_marker setMarkerColor _markerColor;
_marker setMarkerType _markerType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ _object_data params [
["_turretMagazines", [], [[]]],
["_customName", "", [""]],
["_tagTexture", "", [""]],
["_properties", [], [[]]]
["_properties", [], [[]]],
["_playerKiller", "", [""]]
];

private _obj = createVehicle [_type, ASLToATL _pos, [], 0, "CAN_COLLIDE"];
Expand Down Expand Up @@ -76,5 +77,9 @@ if (_properties isNotEqualTo []) then {
([_obj] + _properties) call btc_veh_fnc_propertiesSet;
};

if (_playerKiller isNotEqualTo "") then {
_obj setVariable ["btc_rep_playerKiller", _playerKiller];
};

[_obj] call btc_log_fnc_init;
[_obj, _cargo, _inventory] call btc_db_fnc_loadCargo;
2 changes: 1 addition & 1 deletion =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/load_old.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ btc_cache_pos = _cache_pos;
btc_cache_n = _cache_n;
btc_cache_info = _cache_info;

[_cache_pos, btc_p_chem, [1, 0] select _isChem] call btc_cache_fnc_create;
[_cache_pos, btc_p_chem_cache_probability > 0, [1, 0] select _isChem] call btc_cache_fnc_create;
btc_cache_obj setVariable ["btc_cache_unitsSpawned", _cache_unitsSpawned];

btc_cache_markers = [];
Expand Down
7 changes: 6 additions & 1 deletion =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/loadcargo.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ Author:
["_dogtagDataTaken", [], [[]]],
["_turretMagazines", [], [[]]],
["_customName", "", [""]],
["_properties", [], [[]]]
["_properties", [], [[]]],
["_playerKiller", "", [""]]
];

private _l = createVehicle [_type, getPosATL _obj, [], 0, "CAN_COLLIDE"];
Expand Down Expand Up @@ -66,6 +67,10 @@ Author:
if (_properties isNotEqualTo []) then {
([_l] + _properties) call btc_veh_fnc_propertiesSet;
};

if (_playerKiller isNotEqualTo "") then {
_l setVariable ["btc_rep_playerKiller", _playerKiller];
};
} forEach _cargo;

//set inventory content for weapons, magazines and items
Expand Down
Loading
Loading