Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/Giallustio/master' into Ad…
Browse files Browse the repository at this point in the history 
…d-Taliban_civil

# Conflicts:
#	=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf
#	=BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bleeding_1.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bleeding_2.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bleeding_3.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bloss_1.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bloss_2.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_bloss_3.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/core/img/rsc/i_unc.paa
#	=BTC=co@30_Hearts_and_Minds.Altis/mission.sqm
  • Loading branch information
@Vdauphin
Vdauphin committed Feb 21, 2016
2 parents 3e3af3e + 9f25e4a commit 1a06b25
Show file tree
Hide file tree
Showing 26 changed files with 274 additions and 168 deletions.
65 changes: 34 additions & 31 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,39 @@
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 = paramsArray select 24;
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;
_p_civ = (paramsArray select 26);
_p_civ = (paramsArray select 27);
//btc_acre_mod = isClass(configFile >> "cfgPatches" >> "acre_main");
//btc_tfr_mod = isClass(configFile >> "cfgPatches" >> "task_force_radio");

Expand All @@ -51,7 +54,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 Down Expand Up @@ -83,8 +86,8 @@ if (isServer) then {
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 @@ -151,7 +154,7 @@ switch (true) do {
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
121 changes: 64 additions & 57 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,183 +6,190 @@ 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;
};
class btc_p_civ {
//paramsArray[26]
//paramsArray[27]
title = "Civil type:";
values[]={0,1};
texts[]={"Civilian (A3)","Afghan (@Ericj_Taliban)"};
Expand Down
Loading

0 comments on commit 1a06b25

Please sign in to comment.