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

Add: Dismantle a deployed FOB #78

Merged
merged 43 commits into from
Feb 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
9bf7f26
Add check if unit isinstablecondition
Vdauphin Dec 28, 2015
f40f095
Merge pull request #76 from Vdauphin/FIX-DB_worldname
Giallustio Jan 4, 2016
b34fbb4
Merge pull request #74 from Vdauphin/Add-captive-enemies
Giallustio Jan 4, 2016
9f4c670
Change check pain for ace_medical_fnc_isInStableCondition
Vdauphin Jan 4, 2016
fa2866c
Add: Dismantle interaction
Vdauphin Jan 10, 2016
5e051f2
Add: Remove FOB marker and element in array btc_fobs
Vdauphin Jan 10, 2016
800dbcd
Don't add EH killed if unit is in vehicule
Vdauphin Jan 10, 2016
d8dcfaa
FIX: EH getout too much added
Vdauphin Jan 11, 2016
3e426bb
Add: check if is negative
Vdauphin Jan 11, 2016
9097ee6
Reset to https://github.com/Giallustio/HeartsAndMinds/commit/b34fbb46…
Vdauphin Jan 12, 2016
85385bd
FIX: btc_patrol_active is an array of group patrol
Vdauphin Jan 12, 2016
1321efe
FIX: btc_civ_veh_active is an array of traffic veh
Vdauphin Jan 12, 2016
e242120
Rewrite dismantle_s.sqf
Vdauphin Jan 13, 2016
20eeadf
Add: interaction point of the FOB flag to a more accessible position
Vdauphin Jan 13, 2016
d2f79e2
Add: new btc_fobs array implement in DB
Vdauphin Jan 13, 2016
f204309
Remove ace_medical_pain
Vdauphin Jan 16, 2016
0000b29
FIX: not stable condition
Vdauphin Jan 16, 2016
376c32e
Merge remote-tracking branch 'refs/remotes/Giallustio/master' into Ad…
Vdauphin Jan 16, 2016
788d17a
FIX: mission don't detect database
Vdauphin Jan 17, 2016
06a0fb7
Merge pull request #80 from Vdauphin/FIX-bandage_error
Giallustio Jan 27, 2016
e964b3a
Merge pull request #85 from Vdauphin/Side-MedicalAssistance
Giallustio Jan 27, 2016
77f1ac0
Merge pull request #86 from Vdauphin/FIX-not_detect_database
Giallustio Jan 27, 2016
5988a30
del
Giallustio Jan 27, 2016
6410b3b
ace_medical_enableRevive & ace_medical_preventInstaDeath
Giallustio Jan 27, 2016
5e98e17
delay spawn patrols
Giallustio Jan 27, 2016
1211335
moved traffic & patrol
Giallustio Jan 27, 2016
ac2ae75
Merge pull request #83 from Vdauphin/FIX-btc_patrol_active_negative
Giallustio Jan 28, 2016
df97860
Merge branch 'master' of https://github.com/Giallustio/HeartsAndMinds
Giallustio Jan 28, 2016
622b0c0
Merge pull request #84 from Vdauphin/Add-captive-enemies
Giallustio Jan 30, 2016
0603652
FIX: all objects are not loaded by DB if an object is loaded or not a…
Vdauphin Jan 31, 2016
4b90d4c
FIX: load object by DB are not curator enable
Vdauphin Jan 31, 2016
ff465ed
Merge pull request #89 from Vdauphin/FIX-LoadDB_curator
Giallustio Feb 2, 2016
f9fc535
Merge pull request #88 from Vdauphin/FIX-ObjectLoad
Giallustio Feb 19, 2016
0243444
fix ID of city created
Giallustio Feb 19, 2016
e69845c
imported in EDEN
Giallustio Feb 19, 2016
8efdc8d
Added cargo container to DB
Giallustio Feb 19, 2016
aab0923
tweaked civilian and patrols number
Giallustio Feb 19, 2016
5fee675
Added acceleration time and reorganized parameters
Giallustio Feb 20, 2016
92bac00
30 slots
Giallustio Feb 20, 2016
9f25e4a
f
Giallustio Feb 20, 2016
816dfd3
Add: 30 slots migration
Vdauphin Feb 21, 2016
23c4611
Merge remote-tracking branch 'refs/remotes/Giallustio/master' into Ad…
Vdauphin Feb 21, 2016
5d4c8e1
rm conflit
Vdauphin Feb 21, 2016
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
39 changes: 0 additions & 39 deletions =BTC=co@22_Hearts_and_Minds.Altis/core/fnc/fob/dismantle.sqf

This file was deleted.

4 changes: 0 additions & 4 deletions =BTC=co@22_Hearts_and_Minds.Altis/core/fnc/log/create_s.sqf

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,37 @@
btc_version = 1.13; diag_log format ["=BTC= HEARTS AND MINDS VERSION %1",btc_version];

//Param
btc_p_time = (paramsArray select 0);
_p_en = (paramsArray select 1);
btc_p_ied = (paramsArray select 2);
_hideout_n = (paramsArray select 3);
_cache_info_def = (paramsArray select 4);
_cache_info_ratio = (paramsArray select 5);
_info_chance = (paramsArray select 6);
_p_rep = (paramsArray select 7);
btc_p_redeploy = if ((paramsArray select 8) isEqualTo 0) then {false} else {true};
btc_p_set_skill = if ((paramsArray select 9) isEqualTo 0) then {false} else {true};
btc_p_time = (paramsArray select 0);
btc_p_acctime = (paramsArray select 1);
_p_db = if ((paramsArray select 2) isEqualTo 0) then {false} else {true};
_p_en = (paramsArray select 3);
btc_p_ied = (paramsArray select 4);
btc_p_engineer = (paramsArray select 5);
_hideout_n = (paramsArray select 6);
_cache_info_def = (paramsArray select 7);
_cache_info_ratio = (paramsArray select 8);
_info_chance = (paramsArray select 9);
_p_rep = (paramsArray select 10);
btc_p_redeploy = if ((paramsArray select 11) isEqualTo 0) then {false} else {true};
ace_medical_level = paramsArray select 12;
ace_medical_enableAdvancedWounds = if ((paramsArray select 13) isEqualTo 0) then {false} else {true};
ace_medical_maxReviveTime = paramsArray select 14;
btc_p_set_skill = if ((paramsArray select 15) isEqualTo 0) then {false} else {true};
_p_skill = [
(paramsArray select 10)/10,//general
(paramsArray select 11)/10,//aimingAccuracy
(paramsArray select 12)/10,//aimingShake
(paramsArray select 13)/10,//aimingSpeed
(paramsArray select 14)/10,//endurance
(paramsArray select 15)/10,//spotDistance
(paramsArray select 16)/10,//spotTime
(paramsArray select 17)/10,//courage
(paramsArray select 18)/10,//reloadSpeed
(paramsArray select 19)/10//commanding
(paramsArray select 16)/10,//general
(paramsArray select 17)/10,//aimingAccuracy
(paramsArray select 18)/10,//aimingShake
(paramsArray select 19)/10,//aimingSpeed
(paramsArray select 20)/10,//endurance
(paramsArray select 21)/10,//spotDistance
(paramsArray select 22)/10,//spotTime
(paramsArray select 23)/10,//courage
(paramsArray select 24)/10,//reloadSpeed
(paramsArray select 25)/10//commanding
];
btc_p_debug = (paramsArray select 20);
btc_p_engineer = (paramsArray select 21);
_p_db = if ((paramsArray select 22) isEqualTo 0) then {false} else {true};
ace_medical_level = paramsArray select 23;
ace_medical_enableAdvancedWounds = if ((paramsArray select 24) isEqualTo 0) then {false} else {true};
ace_medical_maxReviveTime = paramsArray select 25;
btc_p_debug = (paramsArray select 26);
//MED
if (ace_medical_maxReviveTime > 0) then {ace_medical_enableRevive = 1;ace_medical_preventInstaDeath = true};
ace_medical_enableFor = 1;
//btc_acre_mod = isClass(configFile >> "cfgPatches" >> "acre_main");
//btc_tfr_mod = isClass(configFile >> "cfgPatches" >> "task_force_radio");
Expand All @@ -50,7 +53,7 @@ if (isServer) then {
btc_city_blacklist = [];//NAME FROM CFG

//Civ
btc_civ_veh_active = 0;
btc_civ_veh_active = [];

//Database
btc_db_is_saving = false;
Expand All @@ -74,16 +77,16 @@ if (isServer) then {
btc_ied_suic_spawned = - btc_ied_suic_time;

//FOB
btc_fobs = [];
btc_fobs = [[],[]];


//Log
btc_log_id_repo = 10;
btc_log_cargo_repo = "Land_HBarrierBig_F" createVehicle [- 5000,- 5000,0];

//Patrol
btc_patrol_max = 5;
btc_patrol_active = 0;
btc_patrol_max = 8;
btc_patrol_active = [];
btc_patrol_area = 2500;

//Rep
Expand Down Expand Up @@ -136,7 +139,7 @@ btc_city_type = "Land_Ammobox_rounds_F";
btc_civ_type_units = ["C_man_1","C_man_1_1_F","C_man_1_2_F","C_man_1_3_F","C_man_polo_1_F","C_man_polo_2_F","C_man_polo_3_F","C_man_polo_4_F","C_man_polo_5_F","C_man_polo_6_F"];
btc_civ_type_veh = ["C_Hatchback_01_F","C_SUV_01_F","C_Offroad_01_F","C_Van_01_transport_F","C_Van_01_box_F"];
btc_civ_type_boats = ["C_Rubberboat","C_Boat_Civil_01_F","C_Boat_Civil_01_rescue_F","C_Boat_Civil_01_police_F"];
btc_civ_max_veh = 5;
btc_civ_max_veh = 10;
btc_w_civs = ["V_Rangemaster_belt","arifle_Mk20_F","30Rnd_556x45_Stanag","hgun_ACPC2_F","9Rnd_45ACP_Mag"];

//Cache
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,179 +6,186 @@ class Params {
texts[]={"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24"};
default = 12;
};
class btc_p_en {
class btc_p_acctime {
//paramsArray[1]
title = "Acceleration time multiplier:";
values[]={1,2,3,4,5,6,7,8,9,10,11,12};
texts[]={"1","2","3","4","5","6","7","8","9","10","11","12"};
default = 5;
};
class btc_p_load {
//paramsArray[2]
title = "Load the savegame (if available)";
values[]={0,1};
texts[]={"No","Yes"};
default = 1;
};
class btc_p_en {
//paramsArray[3]
title = "Enemy type:";
values[]={0,1,2,3};
texts[]={"Guerrilla (A3)","CAF","AAF (A3)","RHS Insurgents"};
default = 0;
};
class btc_p_ied {
//paramsArray[2]
//paramsArray[4]
title = "IEDs ratio:";
values[]={0, 0.5, 1, 1.5};
texts[]={"Off","Low","Normal","High"};
default = 1;
};
class btc_p_engineer {
//paramsArray[5]
title = "Everybody can disarm IED with the same chances:";
values[]={0,1};
texts[]={"No","Yes"};
default = 0;
};
class btc_p_hideout_n {
//paramsArray[3]
//paramsArray[6]
title = "Hideout numbers:";
values[]={99,1,2,3,4,5};
texts[]={"Random","1","2","3","4","5"};
default = 3;
default = 5;
};
class btc_p_cache_info_def {
//paramsArray[4]
//paramsArray[7]
title = "Info cache distance:";
values[]={500,1000,1500,2000,2500,3000,3500,4000,5000};
texts[]={"500 m","1000 m","1500 m","2000 m","2500 m","3000 m","3500 m","4000 m","5000 m"};
default = 1000;
};
class btc_p_cache_info_ratio {
//paramsArray[5]
//paramsArray[8]
title = "Cache info ratio:";
values[]={50,100};
texts[]={"50 m","100 m"};
default = 100;
};
class btc_p_info_chance {
//paramsArray[6]
//paramsArray[9]
title = "Intel from dead bodies chance:";
values[]={0,10,20,30,40,50,60,70,80,90,100};
texts[]={"100 %","90 %","80 %","70 %","60 %","50 %","40 %","30 %","20 %","10 %","0 %"};
default = 70;
};
class btc_p_rep {
//paramsArray[7]
//paramsArray[10]
title = "Reputation at start:";
values[]={0, 200, 500, 750};
texts[]={"Very Low","Low","Normal","High"};
default = 200;
};
class btc_p_redeploy {
//paramsArray[8]
//paramsArray[11]
title = "Allow re-deploy?";
values[]={0,1};
texts[]={"No","Yes"};
default = 1;
};
class btc_p_med_level {
//paramsArray[12]
title = "Medical Level";
values[] = {1,2};
texts[] = {"Basic","Advanced"};
default = 1;
};
class btc_p_adv_wounds {
//paramsArray[13]
title = "Advanced Wounds";
values[] = {0,1};
texts[] = {"Off","On"};
default = 1;
};
class btc_p_rev {
//paramsArray[14]
title = "Revive time:";
values[]={0,60,120,180,240,300,600,900,1200,999999};
texts[]={"0","60","120","180","240","300","600","900","1200","999999"};
default = 600;
};
class btc_p_set_skill {
//paramsArray[9]
//paramsArray[15]
title = "Set skill?";
values[]={0,1};
texts[]={"No","Yes"};
default = 1;
};
class btc_p_set_skill_general {
//paramsArray[10]
//paramsArray[16]
title = "Set skill, general";
values[]={0,1,2,3,4,5,6,7,8,9,10,20,30,40,50,60,70,80,90,100};
texts[]={"0","0.1","0.2","0.3","0.4","0.5","0.6","0.7","0.8","0.9","1","2","3","4","5","6","7","8","9","10"};
default = 0;
};
class btc_p_set_skill_aimingAccuracy {
//paramsArray[11]
//paramsArray[17]
title = "Set skill, aimingAccuracy";
values[]={0,1,2,3,4,5,6,7,8,9,10,20,30,40,50,60,70,80,90,100};
texts[]={"0","0.1","0.2","0.3","0.4","0.5","0.6","0.7","0.8","0.9","1","2","3","4","5","6","7","8","9","10"};
default = 1;
};
class btc_p_set_skill_aimingShake {
//paramsArray[12]
//paramsArray[18]
title = "Set skill, aimingShake";
values[]={0,1,2,3,4,5,6,7,8,9,10,20,30,40,50,60,70,80,90,100};
texts[]={"0","0.1","0.2","0.3","0.4","0.5","0.6","0.7","0.8","0.9","1","2","3","4","5","6","7","8","9","10"};
default = 7;
};
class btc_p_set_skill_aimingSpeed {
//paramsArray[13]
//paramsArray[19]
title = "Set skill, aimingSpeed";
values[]={0,1,2,3,4,5,6,7,8,9,10,20,30,40,50,60,70,80,90,100};
texts[]={"0","0.1","0.2","0.3","0.4","0.5","0.6","0.7","0.8","0.9","1","2","3","4","5","6","7","8","9","10"};
default = 2;
};
class btc_p_set_skill_endurance {
//paramsArray[14]
//paramsArray[20]
title = "Set skill, endurance";
values[]={0,1,2,3,4,5,6,7,8,9,10,20,30,40,50,60,70,80,90,100};
texts[]={"0","0.1","0.2","0.3","0.4","0.5","0.6","0.7","0.8","0.9","1","2","3","4","5","6","7","8","9","10"};
default = 7;
};
class btc_p_set_skill_spotDistance {
//paramsArray[15]
//paramsArray[21]
title = "Set skill, spotDistance";
values[]={0,1,2,3,4,5,6,7,8,9,10,20,30,40,50,60,70,80,90,100};
texts[]={"0","0.1","0.2","0.3","0.4","0.5","0.6","0.7","0.8","0.9","1","2","3","4","5","6","7","8","9","10"};
default = 100;
};
class btc_p_set_skill_spotTime {
//paramsArray[16]
//paramsArray[22]
title = "Set skill, spotTime";
values[]={0,1,2,3,4,5,6,7,8,9,10,20,30,40,50,60,70,80,90,100};
texts[]={"0","0.1","0.2","0.3","0.4","0.5","0.6","0.7","0.8","0.9","1","2","3","4","5","6","7","8","9","10"};
default = 100;
};
class btc_p_set_skill_courage {
//paramsArray[17]
//paramsArray[23]
title = "Set skill, courage";
values[]={0,1,2,3,4,5,6,7,8,9,10,20,30,40,50,60,70,80,90,100};
texts[]={"0","0.1","0.2","0.3","0.4","0.5","0.6","0.7","0.8","0.9","1","2","3","4","5","6","7","8","9","10"};
default = 1;
};
class btc_p_set_skill_reloadSpeed {
//paramsArray[18]
//paramsArray[24]
title = "Set skill, reloadSpeed";
values[]={0,1,2,3,4,5,6,7,8,9,10,20,30,40,50,60,70,80,90,100};
texts[]={"0","0.1","0.2","0.3","0.4","0.5","0.6","0.7","0.8","0.9","1","2","3","4","5","6","7","8","9","10"};
default = 20;
};
class btc_p_set_skill_commanding {
//paramsArray[19]
//paramsArray[25]
title = "Set skill, commanding";
values[]={0,1,2,3,4,5,6,7,8,9,10,20,30,40,50,60,70,80,90,100};
texts[]={"0","0.1","0.2","0.3","0.4","0.5","0.6","0.7","0.8","0.9","1","2","3","4","5","6","7","8","9","10"};
default = 80;
};
class btc_p_debug {
//paramsArray[20]
//paramsArray[26]
title = "Debug:";
values[]={0,1,2};
texts[]={"No","Yes", "Log only"};
default = 0;
};
class btc_p_engineer {
//paramsArray[21]
title = "Everybody can disarm IED with the same chances:";
values[]={0,1};
texts[]={"No","Yes"};
default = 0;
};
class btc_p_load {
//paramsArray[22]
title = "Load the savegame (if available)";
values[]={0,1};
texts[]={"No","Yes"};
default = 1;
};
class btc_p_med_level {
//paramsArray[23]
title = "Medical Level";
values[] = {1,2};
texts[] = {"Basic","Advanced"};
default = 1;
};
class btc_p_adv_wounds {
//paramsArray[24]
title = "Advanced Wounds";
values[] = {0,1};
texts[] = {"Off","On"};
default = 1;
};
class btc_p_rev {
//paramsArray[25]
title = "Revive time:";
values[]={0,60,120,180,240,300,600,900,1200,999999};
texts[]={"0","60","120","180","240","300","600","900","1200","999999"};
default = 600;
};
};
Loading