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

FIX: Remove deprecated ACE module/mission parameters #454

Merged
merged 3 commits into from Dec 26, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 9 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf
Expand Up @@ -30,9 +30,6 @@ _info_chance = "btc_p_info_chance" call BIS_fnc_getParamValue;

//<< Medical options >>
btc_p_redeploy = ("btc_p_redeploy" call BIS_fnc_getParamValue) isEqualTo 1;
ace_medical_level = "btc_p_med_level" call BIS_fnc_getParamValue;
ace_medical_enableAdvancedWounds = ("btc_p_adv_wounds" call BIS_fnc_getParamValue) isEqualTo 1;
ace_medical_maxReviveTime = "btc_p_rev" call BIS_fnc_getParamValue;

//<< Skill options >>
btc_p_set_skill = ("btc_p_set_skill" call BIS_fnc_getParamValue) isEqualTo 1;
Expand All @@ -57,17 +54,11 @@ btc_p_side_mission_cycle = ("btc_p_side_mission_cycle" call BIS_fnc_getParamValu

//<< Other options >>
_p_rep = "btc_p_rep" call BIS_fnc_getParamValue;
ace_rearm_level = "btc_p_rearm" call BIS_fnc_getParamValue;
btc_p_garage = ("btc_p_garage" call BIS_fnc_getParamValue) isEqualTo 1;
_p_city_radius = ("btc_p_city_radius" call BIS_fnc_getParamValue) * 100;
btc_p_trigger = if (("btc_p_trigger" call BIS_fnc_getParamValue) isEqualTo 1) then {"this && !btc_db_is_saving && (false in (thisList apply {_x isKindOf 'Plane'})) && (false in (thisList apply {(_x isKindOf 'Helicopter') && (speed _x > 190)}))"} else {"this && !btc_db_is_saving"};
btc_p_debug = "btc_p_debug" call BIS_fnc_getParamValue;

//OPTION must be use for H&M
if (ace_medical_maxReviveTime > 0) then {ace_medical_enableRevive = 1;ace_medical_preventInstaDeath = true};
ace_medical_enableFor = 1;
ace_cargo_enable = false;

//btc_acre_mod = isClass(configFile >> "cfgPatches" >> "acre_main");
//btc_tfr_mod = isClass(configFile >> "cfgPatches" >> "task_force_radio");

Expand Down
24 changes: 0 additions & 24 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp
Expand Up @@ -125,24 +125,6 @@ class Params {
texts[]={"Off","On"};
default = 1;
};
class btc_p_med_level {
title = " Medical Level";
values[] = {1,2};
texts[] = {"Basic","Advanced"};
default = 1;
};
class btc_p_adv_wounds {
title = " Advanced Wounds";
values[] = {0,1};
texts[] = {"Off","On"};
default = 1;
};
class btc_p_rev {
title = " Revive time:";
values[]={0,60,120,180,240,300,600,900,1200,999999};
texts[]={"Off","60","120","180","240","300","600","900","1200","999999"};
default = 600;
};
class btc_p_skill_title {
title = "<< A3 Skill options >>";
values[]={0};
Expand Down Expand Up @@ -257,12 +239,6 @@ class Params {
texts[]={"Very Low","Low","Normal","High"};
default = 200;
};
class btc_p_rearm {
title = " Rearm Level:";
values[]={0,1,2};
texts[]={"Entire vehicle","Entire magazine","Amount based on caliber"};
default = 1;
};
class btc_p_garage {
title = " Activate garage for admin:";
values[]={0,1};
Expand Down
3 changes: 2 additions & 1 deletion =BTC=co@30_Hearts_and_Minds.Altis/description.ext
Expand Up @@ -3,6 +3,7 @@ loadScreen = "core\img\btc.paa";
author = Giallustio;
onLoadName = Hearts and Minds;
onLoadMission = www.blacktemplars.altervista.org;
enabledebugconsole = 1;

#include "core\def\dlg_def.hpp"

Expand Down Expand Up @@ -32,4 +33,4 @@ class RscTitles {

#include "core\def\functions.hpp"

#include "core\fnc\eh\extended_InitPost_EH.hpp"
#include "core\fnc\eh\extended_InitPost_EH.hpp"