diff --git a/.gitignore b/.gitignore index 6c89d6e..9078e2b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,9 @@ releases/* keys/* z/* a3/* -.hemtt/local +a3 +.hemtt/loal +.hemttout *.cache *.pbo texHeaders.bin diff --git a/hemtt.toml b/.hemtt/project.toml similarity index 71% rename from hemtt.toml rename to .hemtt/project.toml index 133d343..57b9250 100644 --- a/hemtt.toml +++ b/.hemtt/project.toml @@ -1,10 +1,13 @@ name = "WFAR" +mainprefix = "z" prefix = "wfar" author = "Walthzer/Shark" check = [ "!binarizer_link" ] -files = [ + +[files] +include = [ "*.dll", "*.so", "mod.cpp", @@ -43,4 +46,18 @@ steps_windows = [ "if not exist z\\wfar mkdir z\\wfar", "if not exist z\\wfar\\addons mklink /j z\\wfar\\addons addons", "if not exist a3 mklink /j a3 N:\\Arma3Pdrive\\a3" +] + +# Launched with `hemtt launch ace +[hemtt.launch.wfar_slim] +workshop = [ + "463939057", # ACE3's Workshop ID + "1779063631", # ZEN's ID + "450814997", # CBA's ID +] + +# Launched with `hemtt launch ace +[hemtt.launch.wfar] +presets = [ + "WFAR9", # .html presets from .hemtt/presets/ ] \ No newline at end of file diff --git a/addons/continuity/functions/fnc_handleContinuityButton.sqf b/addons/continuity/functions/fnc_handleContinuityButton.sqf index 73b15ad..92ada40 100644 --- a/addons/continuity/functions/fnc_handleContinuityButton.sqf +++ b/addons/continuity/functions/fnc_handleContinuityButton.sqf @@ -16,7 +16,7 @@ */ disableSerialization; params ["_control"]; -TRACE_0("handleContinuityButton",_control); +TRACE_1("handleContinuityButton",_control); if (call BIS_fnc_admin > 0) exitWith {}; if ((toLower (vehicleVarName player)) in ["overseer", "zeus"]) exitWith {}; diff --git a/addons/continuity/functions/fnc_openLoadMenu.sqf b/addons/continuity/functions/fnc_openLoadMenu.sqf index 4ff0da1..cd4b6fb 100644 --- a/addons/continuity/functions/fnc_openLoadMenu.sqf +++ b/addons/continuity/functions/fnc_openLoadMenu.sqf @@ -16,6 +16,6 @@ */ disableSerialization; params ["_parentDisplay"]; -TRACE_0("openLoadMenu",_parentDisplay); +TRACE_1("openLoadMenu",_parentDisplay); _display = _parentDisplay createDisplay "wfar_DisplayContinuityLoad"; diff --git a/addons/continuity/functions/fnc_openSaveMenu.sqf b/addons/continuity/functions/fnc_openSaveMenu.sqf index c6075c4..a56e5b8 100644 --- a/addons/continuity/functions/fnc_openSaveMenu.sqf +++ b/addons/continuity/functions/fnc_openSaveMenu.sqf @@ -16,6 +16,6 @@ */ disableSerialization; params ["_parentDisplay"]; -TRACE_0("openSaveMenu",_parentDisplay); +TRACE_1("openSaveMenu",_parentDisplay); _display = _parentDisplay createDisplay "wfar_DisplayContinuitySave"; diff --git a/addons/continuity/script_component.hpp b/addons/continuity/script_component.hpp index 00af4ac..3456498 100644 --- a/addons/continuity/script_component.hpp +++ b/addons/continuity/script_component.hpp @@ -23,12 +23,12 @@ #define DUMMY_POSITION [-1000, -1000, 0] #define IDC_BTN_CONFIGURE 25030 -#define POS_X(N) ((N) * GUI_GRID_W + GUI_GRID_CENTER_X) -#define POS_Y(N) ((N) * GUI_GRID_H + GUI_GRID_CENTER_Y) -#define POS_W(N) ((N) * GUI_GRID_W) -#define POS_H(N) ((N) * GUI_GRID_H) +#define POS_X(N) QUOTE(((N) * GUI_GRID_W + GUI_GRID_CENTER_X)) +#define POS_Y(N) QUOTE(((N) * GUI_GRID_H + GUI_GRID_CENTER_Y)) +#define POS_W(N) QUOTE(((N) * GUI_GRID_W)) +#define POS_H(N) QUOTE(((N) * GUI_GRID_H)) -#define POS_X_LOW(N) ((N) * GUI_GRID_W + GUI_GRID_X) -#define POS_Y_LOW(N) ((N) * GUI_GRID_H + GUI_GRID_Y) +#define POS_X_LOW(N) QUOTE(((N) * GUI_GRID_W + GUI_GRID_X)) +#define POS_Y_LOW(N) QUOTE(((N) * GUI_GRID_H + GUI_GRID_Y)) #define REGEX_STRING "{[^}]*}" \ No newline at end of file diff --git a/addons/extension/functions/fnc_getReportablePlayerState.sqf b/addons/extension/functions/fnc_getReportablePlayerState.sqf index fef6c9e..451f428 100644 --- a/addons/extension/functions/fnc_getReportablePlayerState.sqf +++ b/addons/extension/functions/fnc_getReportablePlayerState.sqf @@ -15,7 +15,7 @@ * Public: [No] */ params ["_unit"]; -TRACE_1("reportableState"._unit); +TRACE_1("reportableState",_unit); private _vehicleName = ""; /*--Roles-- diff --git a/addons/extension/functions/fnc_markPlayerDeath.sqf b/addons/extension/functions/fnc_markPlayerDeath.sqf index a6fe533..1a3f584 100644 --- a/addons/extension/functions/fnc_markPlayerDeath.sqf +++ b/addons/extension/functions/fnc_markPlayerDeath.sqf @@ -16,7 +16,7 @@ * Public: [No] */ params ["_unit", "_corpse"]; -TRACE_2("markDeath"._unit,_corpse); +TRACE_2("markDeath",_unit,_corpse); if !(_unit == player) exitWith {}; diff --git a/addons/fortify/ACEX_Fortify_Presets.hpp b/addons/fortify/ACEX_Fortify_Presets.hpp index 46f1277..9ea6168 100644 --- a/addons/fortify/ACEX_Fortify_Presets.hpp +++ b/addons/fortify/ACEX_Fortify_Presets.hpp @@ -4,11 +4,11 @@ #define QMPRESET(year, version) QPRESET(MAIN,year,version) #define ADDClASS(classname, buildTime) {classname, buildTime} -#define MADDCLASS(classname, buildTime, people) {classname, 10, buildTime, people} +#define MADDCLASS(classname, buildTime, people) {classname, 10, "Multi", buildTime, people} class ACEX_Fortify_Presets { - class MPRESET(2021,A) { - displayName = QMPRESET(2021,A); + class MPRESET(2024,A) { + displayName = QMPRESET(2024,A); objects[] = { //Normal Fortify behaviour ADDClASS("Land_BagFence_Short_F",5), diff --git a/addons/fortify/CfgWFARContinuity.hpp b/addons/fortify/CfgWFARContinuity.hpp index 9453606..0a009ab 100644 --- a/addons/fortify/CfgWFARContinuity.hpp +++ b/addons/fortify/CfgWFARContinuity.hpp @@ -5,5 +5,5 @@ class CfgWFARContinuity { load=QUOTE(FUNC(loadFortify)); save=QUOTE(FUNC(saveFortify)); }; - } + }; }; \ No newline at end of file diff --git a/addons/fortify/Dialogs.hpp b/addons/fortify/Dialogs.hpp index ca71470..80d9aad 100644 --- a/addons/fortify/Dialogs.hpp +++ b/addons/fortify/Dialogs.hpp @@ -25,8 +25,8 @@ class RscDisplayAttributes { class GVAR(RscToggleSupplies): RscDisplayAttributes { - onLoad = QUOTE([ARR_3('onLoad', _this, QQGVAR(RscToggleSupplies))] call ace_zeus_fnc_zeusAttributes); - onUnload = QUOTE([ARR_3('onUnload', _this, QQGVAR(RscToggleSupplies))] call ace_zeus_fnc_zeusAttributes); + onLoad = QUOTE([ARR_3('onLoad',_this,QQGVAR(RscToggleSupplies))] call ace_zeus_fnc_zeusAttributes); + onUnload = QUOTE([ARR_3('onUnload',_this,QQGVAR(RscToggleSupplies))] call ace_zeus_fnc_zeusAttributes); class Controls: Controls { class Background: Background {}; @@ -88,8 +88,8 @@ class GVAR(RscToggleSupplies): RscDisplayAttributes { class GVAR(RscGlobalSupplyRange): RscDisplayAttributes { - onLoad = QUOTE([ARR_3('onLoad', _this, QQGVAR(RscGlobalSupplyRange))] call ace_zeus_fnc_zeusAttributes); - onUnload = QUOTE([ARR_3('onUnload', _this, QQGVAR(RscGlobalSupplyRange))] call ace_zeus_fnc_zeusAttributes); + onLoad = QUOTE([ARR_3('onLoad',_this,QQGVAR(RscGlobalSupplyRange))] call ace_zeus_fnc_zeusAttributes); + onUnload = QUOTE([ARR_3('onUnload',_this,QQGVAR(RscGlobalSupplyRange))] call ace_zeus_fnc_zeusAttributes); class Controls: Controls { class Background: Background {}; @@ -134,21 +134,21 @@ class GVAR(RscGlobalSupplyRange): RscDisplayAttributes { }; }; class GVAR(buildersWaiting_dialog) { - idd = WAITING_DIALOG_IDD; + idd = QUOTE(WAITING_DIALOG_IDD); access = 0; movingEnable = 0; onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(waitDialogOpen)),true)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrWaitToolBox)),(_this select 0) displayCtrl 1)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrlWaitPicture)),(_this select 0) displayCtrl 2)];); onUnload = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(waitDialogOpen)),false)]); - enableSimulation = true; + enableSimulation = 1; class ControlsBackground { class Background: RscText { colorBackground[] = {0, 0, 0, 0.9}; - x = GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W; - y = GUI_GRID_CENTER_Y + 7.1 * GUI_GRID_CENTER_H; - w = 19.9 * GUI_GRID_CENTER_W; - h = 10 * GUI_GRID_CENTER_H; + x = QUOTE(GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W); + y = QUOTE(GUI_GRID_CENTER_Y + 7.1 * GUI_GRID_CENTER_H); + w = QUOTE(GUI_GRID_CENTER_W * 19.9); + h = QUOTE(GUI_GRID_CENTER_H * 10); }; class top_strip: RscText { @@ -157,10 +157,10 @@ class GVAR(buildersWaiting_dialog) { text = "Building Statistics"; colorText[] = {IGUI_TEXT_RGB, 0.8}; colorBackground[] = {GUI_BCG_DARK_RGB, 0.8}; - x = GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W; - y = GUI_GRID_CENTER_Y + 6 * GUI_GRID_CENTER_H; - w = 20 * GUI_GRID_CENTER_W; - h = 1 * GUI_GRID_CENTER_H; + x = QUOTE(GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W); + y = QUOTE(GUI_GRID_CENTER_Y + 6 * GUI_GRID_CENTER_H); + w = QUOTE(GUI_GRID_CENTER_W * 20); + h = QUOTE(GUI_GRID_CENTER_H); }; class buildingStats: RscToolbox { @@ -175,10 +175,10 @@ class GVAR(buildersWaiting_dialog) { colorDisable[] = {0,0,0,0}; colorSelectedBg[] = {0,0,0,0}; strings[] = {"", "", ""}; - x = GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W; - y = GUI_GRID_CENTER_Y + 7.2 * GUI_GRID_CENTER_H; - w = 20 * GUI_GRID_CENTER_W; - h = 1 * GUI_GRID_CENTER_H; + x = QUOTE(GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W); + y = QUOTE(GUI_GRID_CENTER_Y + 7.2 * GUI_GRID_CENTER_H); + w = QUOTE(GUI_GRID_CENTER_W * 20); + h = QUOTE(GUI_GRID_CENTER_H); }; class buildingImage: RscPicture { @@ -186,10 +186,10 @@ class GVAR(buildersWaiting_dialog) { shadow = 0; style = 48; text = ""; - x = GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W; - y = GUI_GRID_CENTER_Y + 8.3 * GUI_GRID_CENTER_H; - w = 19.9 * GUI_GRID_CENTER_W; - h = 9 * GUI_GRID_CENTER_H; + x = QUOTE(GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W); + y = QUOTE(GUI_GRID_CENTER_Y + 8.3 * GUI_GRID_CENTER_H); + w = QUOTE(GUI_GRID_CENTER_W * 19.9); + h = QUOTE(GUI_GRID_CENTER_H * 9); }; }; /* class objects diff --git a/addons/fortify/XEH_postInit.sqf b/addons/fortify/XEH_postInit.sqf index a57f413..1512a3d 100644 --- a/addons/fortify/XEH_postInit.sqf +++ b/addons/fortify/XEH_postInit.sqf @@ -110,11 +110,11 @@ if (!hasInterface) exitWith {}; if (_supplierIndex > -1) then { true } else { - WFAR_NOTIFY_1(WFAR_WARNING, "Too Far From Supplies!"); + WFAR_NOTIFY_1(WFAR_WARNING,"Too Far From Supplies!"); false }; } else { - WFAR_NOTIFY_2(WFAR_ERROR, "You are not worthy", "to wield the power of Thor!"); + WFAR_NOTIFY_2(WFAR_ERROR,"You are not worthy","to wield the power of Thor!"); false } }] call ACE_fortify_fnc_addDeployHandler; \ No newline at end of file diff --git a/addons/fortify/functions/fnc_doBuildSiteCheck.sqf b/addons/fortify/functions/fnc_doBuildSiteCheck.sqf index 78da9e7..04a86a3 100644 --- a/addons/fortify/functions/fnc_doBuildSiteCheck.sqf +++ b/addons/fortify/functions/fnc_doBuildSiteCheck.sqf @@ -24,7 +24,7 @@ private _preset = missionNamespace getVariable [format["ace_fortify_objects_%1", private _index = _preset findIf {(_x select 0) isEqualTo (typeOf _object)}; private _presetKey = format["ace_fortify_objects_%1", _side]; if (_index > -1) then { - (_preset select _index) params ["_class", "_fortifyBuildTime", ["_buildTime", 0], ["_requiredBuilders", 0]]; + (_preset select _index) params ["_class", "_fortifyBuildTime", ["_category", ""], ["_buildTime", 0], ["_requiredBuilders", 0]]; TRACE_2("retrieved from preset",_buildTime,_requiredBuilders); diff --git a/addons/fortify/functions/fnc_getObjectBounding2D.sqf b/addons/fortify/functions/fnc_getObjectBounding2D.sqf index a782f65..d310a1b 100644 --- a/addons/fortify/functions/fnc_getObjectBounding2D.sqf +++ b/addons/fortify/functions/fnc_getObjectBounding2D.sqf @@ -15,7 +15,7 @@ * Public: No */ params ["_object"]; -TRACE_1("getObjectBoundingRectangle", _object); +TRACE_1("getObjectBoundingRectangle",_object); (3 boundingBoxReal _object) params ["_pBottom", "_pTop"]; diff --git a/addons/fortify/functions/fnc_ui_globalSupplyRange.sqf b/addons/fortify/functions/fnc_ui_globalSupplyRange.sqf index ae29452..b58957c 100644 --- a/addons/fortify/functions/fnc_ui_globalSupplyRange.sqf +++ b/addons/fortify/functions/fnc_ui_globalSupplyRange.sqf @@ -22,7 +22,7 @@ private _ctrlButtonOK = _display displayCtrl 1; //IDC_OK private _module = missionNamespace getVariable [QUOTE(BIS_fnc_initCuratorAttributes_target), objNull]; TRACE_1("Module",_module); -_controlGroup ctrlRemoveAllEventHandlers "setFocus"; +_controlGroup ctrlRemoveAllEventHandlers "SetFocus"; (_display displayCtrl 300002) ctrlSetText (str GVAR(globalSupplyRange)); diff --git a/addons/fortify/functions/fnc_ui_toggleSupplies.sqf b/addons/fortify/functions/fnc_ui_toggleSupplies.sqf index 90276a7..58888a7 100644 --- a/addons/fortify/functions/fnc_ui_toggleSupplies.sqf +++ b/addons/fortify/functions/fnc_ui_toggleSupplies.sqf @@ -22,7 +22,7 @@ private _ctrlButtonOK = _display displayCtrl 1; //IDC_OK private _module = missionNamespace getVariable [QUOTE(BIS_fnc_initCuratorAttributes_target), objNull]; TRACE_1("Module",_module); -_controlGroup ctrlRemoveAllEventHandlers "setFocus"; +_controlGroup ctrlRemoveAllEventHandlers "SetFocus"; // Validate module target private _object = attachedTo _module; diff --git a/addons/fortify/script_component.hpp b/addons/fortify/script_component.hpp index ae42dda..08c2f58 100644 --- a/addons/fortify/script_component.hpp +++ b/addons/fortify/script_component.hpp @@ -30,7 +30,7 @@ // UI grid -> From ACE Zeus #define SIZEX ((safeZoneW / safeZoneH) min 1.2) #define SIZEY (SIZEX / 1.2) -#define W_PART(num) (num * (SIZEX / 40)) -#define H_PART(num) (num * (SIZEY / 25)) -#define X_PART(num) (W_PART(num) + (safeZoneX + (safeZoneW - SIZEX) / 2)) -#define Y_PART(num) (H_PART(num) + (safeZoneY + (safeZoneH - SIZEY) / 2)) \ No newline at end of file +#define W_PART(num) QUOTE((num * (SIZEX / 40))) +#define H_PART(num) QUOTE((num * (SIZEY / 25))) +#define X_PART(num) QUOTE((W_PART(num) + (safeZoneX + (safeZoneW - SIZEX) / 2))) +#define Y_PART(num) QUOTE((H_PART(num) + (safeZoneY + (safeZoneH - SIZEY) / 2))) \ No newline at end of file diff --git a/addons/groundTypeConfigFixes/$PBOPREFIX$ b/addons/groundTypeConfigFixes/$PBOPREFIX$ deleted file mode 100644 index 86e2441..0000000 --- a/addons/groundTypeConfigFixes/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -\z\wfar\addons\groundTypeConfigFixes \ No newline at end of file diff --git a/addons/insignia/Dialogs.hpp b/addons/insignia/Dialogs.hpp deleted file mode 100644 index 24dc96c..0000000 --- a/addons/insignia/Dialogs.hpp +++ /dev/null @@ -1,21 +0,0 @@ -class RscHTML; - -class GVAR(htmlDialog) { - idd = -1; - access = 0; - onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(dialog),_this select 0)]); - movingEnable = 1; - enableSimulation = true; - class ControlsBackground - { - class Html: RscHTML - { - idc = 1; - filename = "http://walthzer69.wixsite.com/waltex/_functions/insigniaAccesValidation"; - x = 0; - y = 0; - w = 0; - h = 0; - }; - }; -}; \ No newline at end of file diff --git a/addons/insignia/config.cpp b/addons/insignia/config.cpp index 8547291..84ca6e4 100644 --- a/addons/insignia/config.cpp +++ b/addons/insignia/config.cpp @@ -18,4 +18,3 @@ class CfgPatches #include "CfgUnitInsignia.hpp" #include "CfgCommands.hpp" #include "scripted\restrictedInsignia.hpp" -#include "Dialogs.hpp" diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index 8040fc3..65afc47 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -5,11 +5,11 @@ #define WFAR_WARNING ([1, 1, 0, 1]) #define WFAR_ERROR ([1, 0, 0, 1]) -#define WFAR_MACRO_NOTIFY(arg) [arg, true] call CBA_fnc_notify -#define WFAR_CSNOTIFY_1(colour, size, one) WFAR_MACRO_NOTIFY([ARR_3(one, size, colour)]) -#define WFAR_CSNOTIFY_2(colour, size, one, two) WFAR_MACRO_NOTIFY(ARR_2([ARR_3(one, size, colour)], [ARR_3(two, size, colour)])) -#define WFAR_CSNOTIFY_3(colour, size, one, three) WFAR_MACRO_NOTIFY(ARR_3([ARR_3(one, size, colour)], [ARR_3(two, size, colour)], [ARR_3(three, size, colour)])) - -#define WFAR_NOTIFY_1(colour, one) WFAR_CSNOTIFY_1(colour, 1, one) -#define WFAR_NOTIFY_2(colour, one, two) WFAR_CSNOTIFY_2(colour, 1, one, two) -#define WFAR_NOTIFY_3(colour, one, two, three) WFAR_CSNOTIFY_3(colour, 1, one, two, three) \ No newline at end of file +#define WFAR_MACRO_NOTIFY(arg) [arg,true] call CBA_fnc_notify +#define WFAR_CSNOTIFY_1(colour, size, one) WFAR_MACRO_NOTIFY([ARR_3(one,size,colour)]) +#define WFAR_CSNOTIFY_2(colour, size, one, two) WFAR_MACRO_NOTIFY(ARR_2([ARR_3(one,size,colour)],[ARR_3(two,size,colour)])) +#define WFAR_CSNOTIFY_3(colour, size, one, three) WFAR_MACRO_NOTIFY(ARR_3([ARR_3(one,size,colour)], [ARR_3(two,size,colour)], [ARR_3(three,size,colour)])) + +#define WFAR_NOTIFY_1(colour, one) WFAR_CSNOTIFY_1(colour,1,one) +#define WFAR_NOTIFY_2(colour, one, two) WFAR_CSNOTIFY_2(colour,1,one,two) +#define WFAR_NOTIFY_3(colour, one, two, three) WFAR_CSNOTIFY_3(colour,1,one,two,three) \ No newline at end of file diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index bf9f1ed..0fb3e33 100644 --- a/addons/main/script_mod.hpp +++ b/addons/main/script_mod.hpp @@ -11,7 +11,7 @@ #define WFAR_TAG WFAR // MINIMAL required version for the Mod. Components can specify others.. -#define REQUIRED_VERSION 1.56 +#define REQUIRED_VERSION 2.14 #ifdef COMPONENT_BEAUTIFIED #define COMPONENT_NAME QUOTE(wfar - COMPONENT_BEAUTIFIED) diff --git a/addons/misc_config/$PBOPREFIX$ b/addons/misc_config/$PBOPREFIX$ new file mode 100644 index 0000000..015f150 --- /dev/null +++ b/addons/misc_config/$PBOPREFIX$ @@ -0,0 +1 @@ +z\wfar\addons\misc_config \ No newline at end of file diff --git a/addons/groundTypeConfigFixes/config.cpp b/addons/misc_config/config.cpp similarity index 80% rename from addons/groundTypeConfigFixes/config.cpp rename to addons/misc_config/config.cpp index 03273a2..cca8b13 100644 --- a/addons/groundTypeConfigFixes/config.cpp +++ b/addons/misc_config/config.cpp @@ -2,13 +2,13 @@ class CfgPatches { - class WASHM_wfar_groundTypeConfigFixes + class wfar_misc_config { name="WHITE FOX ASSAULT REGIMENT data"; author="Walthzer/Shark"; url="https://whitefoxassaultreg.wixsite.com/wfar"; requiredVersion=1.0; - requiredaddons[]={"A3_Data_F", "ace_csw"}; + requiredaddons[]={"A3_Data_F"}; units[]={}; weapons[]={}; }; diff --git a/addons/groundTypeConfigFixes/script_component.hpp b/addons/misc_config/script_component.hpp similarity index 84% rename from addons/groundTypeConfigFixes/script_component.hpp rename to addons/misc_config/script_component.hpp index bf28a47..3fe16e5 100644 --- a/addons/groundTypeConfigFixes/script_component.hpp +++ b/addons/misc_config/script_component.hpp @@ -1,5 +1,5 @@ -#define COMPONENT fixes -#define COMPONENT_BEAUTIFIED Ground_Type_Fixes +#define COMPONENT misc_config +#define COMPONENT_BEAUTIFIED Misc_Config #include "\z\wfar\addons\main\script_mod.hpp" // #define DEBUG_MODE_FULL diff --git a/addons/scrapyard_ikarus/CfgVehicles.hpp b/addons/scrapyard_ikarus/CfgVehicles.hpp index e656b15..fc4270e 100644 --- a/addons/scrapyard_ikarus/CfgVehicles.hpp +++ b/addons/scrapyard_ikarus/CfgVehicles.hpp @@ -56,7 +56,7 @@ class CfgVehicles class WFAR_Ikarus_base: Truck_01_base_F { - weapons[]={TruckHorn2}; + weapons[]={"TruckHorn2"}; side = -1; scope = 0; //model="z\wfar\addons\scrapyard_ikarus\ikarus\WFAR_Ikarus.p3d"; @@ -80,19 +80,19 @@ class CfgVehicles ace_vehicle_damage_detonationDuringFireProb = 0.0; hasDriver=1; - driverAction = Ikarus_Driver; /// what action is going the driver take inside the vehicle. Non-existent action makes the vehicle inaccessible + driverAction = "Ikarus_Driver"; /// what action is going the driver take inside the vehicle. Non-existent action makes the vehicle inaccessible cargoAction[] = { - Truck_Cargo01,Truck_Cargo01,Truck_Cargo02,Truck_Cargo02, - Truck_Cargo01,Truck_Cargo01,Truck_Cargo01,Truck_Cargo01, - Truck_Cargo02,Truck_Cargo02,Truck_Cargo02,Truck_Cargo02, - Truck_Cargo03,Truck_Cargo03,Truck_Cargo03,Truck_Cargo03, - Truck_Cargo04,Truck_Cargo04,Truck_Cargo04, - Ikarus_Cargo,Ikarus_Cargo,Ikarus_Cargo,Ikarus_Cargo + "Truck_Cargo01","Truck_Cargo01","Truck_Cargo02","Truck_Cargo02", + "Truck_Cargo01","Truck_Cargo01","Truck_Cargo01","Truck_Cargo01", + "Truck_Cargo02","Truck_Cargo02","Truck_Cargo02","Truck_Cargo02", + "Truck_Cargo03","Truck_Cargo03","Truck_Cargo03","Truck_Cargo03", + "Truck_Cargo04","Truck_Cargo04","Truck_Cargo04", + "Ikarus_Cargo","Ikarus_Cargo","Ikarus_Cargo","Ikarus_Cargo" }; - getInAction = GetInLow; /// how does driver look while getting in - getOutAction = GetOutLow; /// and out - cargoGetInAction[] = {"GetInLow"}; /// and the same for the rest, if the array has fewer members than the count of crew, the last one is used for the rest + getInAction = "GetInLow"; /// how does driver look while getting in + getOutAction = "GetOutLow"; /// and out + cargoGetInAction[] = {"GetInLow"}; /// and the same for the rest, if the array has fewer members than the count of crew, the last one is used for the rest cargoGetOutAction[] = {"GetOutLow"}; /// that means all use the same in this case transportSoldier = 23; @@ -482,11 +482,11 @@ class CfgVehicles LODOpticsIn= 1; LODOpticsOut= 1; }; - ADDTURRET(KneelingTurret_, 02, "Right Second Gunner", 102) - ADDTURRET(KneelingTurret_, 03, "Right Third Gunner", 103) - ADDTURRET(KneelingTurret_, 04, "Right Fourth Gunner", 104) - ADDTURRET(KneelingTurret_, 05, "Right Fifth Gunner", 105) - ADDTURRET(KneelingTurret_, 06, "Right Fifth Gunner", 106) + ADDTURRET(KneelingTurret_,02,"Right Second Gunner",102) + ADDTURRET(KneelingTurret_,03,"Right Third Gunner",103) + ADDTURRET(KneelingTurret_,04,"Right Fourth Gunner",104) + ADDTURRET(KneelingTurret_,05,"Right Fifth Gunner",105) + ADDTURRET(KneelingTurret_,06,"Right Fifth Gunner",106) class RearStandingTurret_01: KneelingTurret_01 { @@ -510,11 +510,11 @@ class CfgVehicles maxTurn=25; minTurn=-25; }; - ADDTURRET(StandingTurret_, 02, "Left Second Gunner", 206) - ADDTURRET(StandingTurret_, 03, "Left Third Gunner", 205) - ADDTURRET(StandingTurret_, 04, "Left Fourth Gunner", 204) - ADDTURRET(StandingTurret_, 05, "Left Fifth Gunner", 203) - ADDTURRET(StandingTurret_, 06, "Left Sixth Gunner", 202) + ADDTURRET(StandingTurret_,02,"Left Second Gunner",206) + ADDTURRET(StandingTurret_,03,"Left Third Gunner",205) + ADDTURRET(StandingTurret_,04,"Left Fourth Gunner",204) + ADDTURRET(StandingTurret_,05,"Left Fifth Gunner",203) + ADDTURRET(StandingTurret_,06,"Left Sixth Gunner",202) }; class PlateInfos @@ -535,14 +535,14 @@ class CfgVehicles { scope=2; scopeCurator=2; - crew = "UK3CB_ADG_O_ENG_ISL";// + crew = "cfp_o_is_crewman";// side=EAST; faction="WFAR_OPFOR"; editorSubcategory="EdSubcat_APCs"; displayName="Armoured Bus"; - class Library {libTextDesc = "ISIS APC";}; + class Library {libTextDesc = "Islamic State APC";}; }; @@ -550,8 +550,8 @@ class CfgVehicles { scope=2; scopeCurator=2; - crew = "UK3CB_ADG_O_ENG_ISL"; - ffvCrewWeighted[] = {"UK3CB_ADG_O_MG_ISL", 0.8, "UK3CB_ADG_O_GL_ISL", 0.2}; + crew = "cfp_o_is_crewman"; + ffvCrewWeighted[] = {"cfp_o_is_machinegunner", 0.75, "cfp_o_is_grenadier", 0.15}; side=EAST; faction="WFAR_OPFOR"; diff --git a/addons/scrapyard_ikarus/ikarus/Sounds.hpp b/addons/scrapyard_ikarus/ikarus/Sounds.hpp index 2ed943a..d108faa 100644 --- a/addons/scrapyard_ikarus/ikarus/Sounds.hpp +++ b/addons/scrapyard_ikarus/ikarus/Sounds.hpp @@ -1,32 +1,32 @@ insideSoundCoef = 0.9; - soundGear[]={"",db-85,1}; - soundGetIn[]={"z\wfar\addons\scrapyard_ikarus\ikarus\sounds\ext-bus-getout-1",db-0,1}; - soundGetOut[]={"z\wfar\addons\scrapyard_ikarus\ikarus\sounds\int-bus-getout-1",db-0,1, 40}; - soundEngineOnInt[] = {"a3\sounds_f\vehicles\soft\truck_01\int_start", db-5, 1.0}; - soundEngineOnExt[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_start", db-5, 1.0, 280}; - soundEngineOffInt[] ={"a3\sounds_f\vehicles\soft\truck_01\int_stop", db-5, 1.0}; - soundEngineOffExt[] ={"a3\sounds_f\vehicles\soft\truck_01\ext_stop", db-5, 1.0, 280}; + soundGear[]={"","db-85",1}; + soundGetIn[]={"z\wfar\addons\scrapyard_ikarus\ikarus\sounds\ext-bus-getout-1","db-0",1}; + soundGetOut[]={"z\wfar\addons\scrapyard_ikarus\ikarus\sounds\int-bus-getout-1","db-0",1, 40}; + soundEngineOnInt[] = {"a3\sounds_f\vehicles\soft\truck_01\int_start", "db-5", 1.0}; + soundEngineOnExt[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_start", "db-5", 1.0, 280}; + soundEngineOffInt[] ={"a3\sounds_f\vehicles\soft\truck_01\int_stop", "db-5", 1.0}; + soundEngineOffExt[] ={"a3\sounds_f\vehicles\soft\truck_01\ext_stop", "db-5", 1.0, 280}; /* ---- CRASHES START ---- */ - buildCrash0[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_1", db0, 1,200}; - buildCrash1[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_2", db0, 1,200}; - buildCrash2[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_3", db0, 1,200}; - buildCrash3[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_4", db0, 1,200}; - soundBuildingCrash[]={buildCrash0, 0.25, buildCrash1, 0.25, buildCrash2, 0.25, buildCrash3, 0.25}; + buildCrash0[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_1", "db0",1,200}; + buildCrash1[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_2", "db0",1,200}; + buildCrash2[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_3", "db0",1,200}; + buildCrash3[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_4", "db0",1,200}; + soundBuildingCrash[]={"buildCrash0", 0.25, "buildCrash1", 0.25, "buildCrash2", 0.25, "buildCrash3", 0.25}; - WoodCrash0[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_wood_ext_1", db0, 1,200}; - WoodCrash1[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_wood_ext_1", db0, 1,200}; - WoodCrash2[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_wood_ext_1", db0, 1,200}; - WoodCrash3[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_wood_ext_1", db0, 1,200}; - soundWoodCrash[]={woodCrash0, 0.25, woodCrash1, 0.25, woodCrash2, 0.25, woodCrash3, 0.25}; + WoodCrash0[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_wood_ext_1", "db0",1,200}; + WoodCrash1[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_wood_ext_1", "db0",1,200}; + WoodCrash2[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_wood_ext_1", "db0",1,200}; + WoodCrash3[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_wood_ext_1", "db0",1,200}; + soundWoodCrash[]={"woodCrash0", 0.25, "woodCrash1", 0.25, "woodCrash2", 0.25, "woodCrash3", 0.25}; - armorCrash0[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_1", db0, 1,200}; - armorCrash1[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_2", db0, 1,200}; - armorCrash2[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_3", db0, 1,200}; - armorCrash3[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_4", db0, 1,200}; - soundArmorCrash[]={ArmorCrash0, 0.25, ArmorCrash1, 0.25, ArmorCrash2, 0.25, ArmorCrash3, 0.25}; + armorCrash0[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_1", "db0",1,200}; + armorCrash1[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_2", "db0",1,200}; + armorCrash2[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_3", "db0",1,200}; + armorCrash3[]={"a3\Sounds_F\vehicles\crashes\cars\cars_coll_big_default_ext_4", "db0",1,200}; + soundArmorCrash[]={"ArmorCrash0", 0.25, "ArmorCrash1", 0.25, "ArmorCrash2", 0.25, "ArmorCrash3", 0.25}; /* ---- CRASHES END ---- */ @@ -36,90 +36,90 @@ class Idle_ext { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_00", db-13, 1, 150}; - frequency = 0.9 + HZ_IDLE*0.2; - volume = engineOn*camPos*VOLUME_IDLE; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_00", "db-13", 1, 150}; + frequency = QUOTE(0.9 + HZ_IDLE*0.2); + volume = QUOTE(engineOn*camPos*VOLUME_IDLE); }; class Engine { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_01", db-11,1, 200}; - frequency = 0.8 + HZ_RPM1*0.2; - volume = engineOn*camPos*VOLUME_RPM1; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_01", "db-11",1, 200}; + frequency = QUOTE(0.8 + HZ_RPM1*0.2); + volume = QUOTE(engineOn*camPos*VOLUME_RPM1); }; class Engine1_ext { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_02", db-9,1, 240}; - frequency = 0.8 + HZ_RPM2*0.2; - volume = engineOn*camPos*VOLUME_RPM2; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_02", "db-9",1, 240}; + frequency = QUOTE(0.8 + HZ_RPM2*0.2); + volume = QUOTE(engineOn*camPos*VOLUME_RPM2); }; class Engine2_ext { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_03", db-8,1, 280}; - frequency = 0.8 + HZ_RPM3*0.2; - volume = engineOn*camPos*VOLUME_RPM3; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_03", "db-8",1, 280}; + frequency = QUOTE(0.8 + HZ_RPM3*0.2); + volume = QUOTE(engineOn*camPos*VOLUME_RPM3); }; class Engine3_ext { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_04", db-7,1, 320}; - frequency = 0.8 + HZ_RPM4*0.2; - volume = engineOn*camPos*VOLUME_RPM4; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_04", "db-7",1, 320}; + frequency = QUOTE(0.8 + HZ_RPM4*0.2); + volume = QUOTE(engineOn*camPos*VOLUME_RPM4); }; class Engine4_ext { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_05", db-6,1, 360}; - frequency = 0.8 + HZ_RPM5*0.2; - volume = engineOn*camPos*VOLUME_RPM5; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_05", "db-6",1, 360}; + frequency = QUOTE(0.8 + HZ_RPM5*0.2); + volume = QUOTE(engineOn*camPos*VOLUME_RPM5); }; class Engine5_ext { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_06", db-5,1, 420}; - frequency = 0.95 + HZ_RPM6*0.15; - volume = engineOn*camPos*VOLUME_RPM6; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_engine_06", "db-5",1, 420}; + frequency = QUOTE(0.95 + HZ_RPM6*0.15); + volume = QUOTE(engineOn*camPos*VOLUME_RPM6); }; /* hatchback external sounds with gas */ class IdleThrust { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_00", db-6,1, 200}; - frequency = 0.9 + HZ_IDLE*0.2; - volume = engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_IDLE; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_00", "db-6",1, 200}; + frequency = QUOTE(0.9 + HZ_IDLE*0.2); + volume = QUOTE(engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_IDLE); }; class EngineThrust { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_01", db-5,1, 250}; - frequency = 0.8 + HZ_RPM1*0.2; - volume = engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM1; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_01", "db-5",1, 250}; + frequency = QUOTE(0.8 + HZ_RPM1*0.2); + volume = QUOTE(engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM1); }; class Engine1_Thrust_ext { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_02", db-4,1, 280}; - frequency = 0.8 + HZ_RPM2*0.2; - volume = engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM2; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_02", "db-4",1, 280}; + frequency = QUOTE(0.8 + HZ_RPM2*0.2); + volume = QUOTE(engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM2); }; class Engine2_Thrust_ext { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_03", db-3,1, 320}; - frequency = 0.8 + HZ_RPM3*0.2; - volume = engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM3; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_03", "db-3",1, 320}; + frequency = QUOTE(0.8 + HZ_RPM3*0.2); + volume = QUOTE(engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM3); }; class Engine3_Thrust_ext { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_04", db-2,1, 360}; - frequency = 0.8 + HZ_RPM4*0.2; - volume = engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM4; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_04", "db-2",1, 360}; + frequency = QUOTE(0.8 + HZ_RPM4*0.2); + volume = QUOTE(engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM4); }; class Engine4_Thrust_ext { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_05", db0,1, 400}; - frequency = 0.8 + HZ_RPM5*0.3; - volume = engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM5; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_05", "db0", 1, 400}; + frequency = QUOTE(0.8 + HZ_RPM5*0.3); + volume = QUOTE(engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM5); }; class Engine5_Thrust_ext { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_06", db2,1, 450}; - frequency = 0.9 + HZ_RPM6*0.2; - volume = engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM6; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\ext_exhaust_06", "db2", 1, 450}; + frequency = QUOTE(0.9 + HZ_RPM6*0.2); + volume = QUOTE(engineOn*camPos*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM6); }; /* end external sounds with gas */ @@ -128,95 +128,95 @@ class Idle_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_00", db-15, 1}; - frequency = 0.9 + HZ_IDLE*0.2; - volume = engineOn*(1-camPos)*VOLUME_IDLE; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_00", "db-15", 1}; + frequency = QUOTE(0.9 + HZ_IDLE*0.2); + volume = QUOTE(engineOn*(1-camPos)*VOLUME_IDLE); }; class Engine_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_01", db-14,1 }; - frequency = 0.8 + HZ_RPM1*0.2; - volume = engineOn*(1-camPos)*VOLUME_RPM1; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_01", "db-14",1 }; + frequency = QUOTE(0.8 + HZ_RPM1*0.2); + volume = QUOTE(engineOn*(1-camPos)*VOLUME_RPM1); }; class Engine1_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_02", db-12,1 }; - frequency = 0.8 + HZ_RPM2*0.2; - volume = engineOn*(1-camPos)*VOLUME_RPM2; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_02", "db-12",1 }; + frequency = QUOTE(0.8 + HZ_RPM2*0.2); + volume = QUOTE(engineOn*(1-camPos)*VOLUME_RPM2); }; class Engine2_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_03", db-11,1 }; - frequency = 0.8 + HZ_RPM3*0.2; - volume = engineOn*(1-camPos)*VOLUME_RPM3; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_03", "db-11",1 }; + frequency = QUOTE(0.8 + HZ_RPM3*0.2); + volume = QUOTE(engineOn*(1-camPos)*VOLUME_RPM3); }; class Engine3_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_04", db-10,1 }; - frequency = 0.8 + HZ_RPM4*0.2; - volume = engineOn*(1-camPos)*VOLUME_RPM4; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_04", "db-10",1 }; + frequency = QUOTE(0.8 + HZ_RPM4*0.2); + volume = QUOTE(engineOn*(1-camPos)*VOLUME_RPM4); }; class Engine4_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_05", db-9,1 }; - frequency = 0.8 + HZ_RPM5*0.2; - volume = engineOn*(1-camPos)*VOLUME_RPM5; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_05", "db-9",1 }; + frequency = QUOTE(0.8 + HZ_RPM5*0.2); + volume = QUOTE(engineOn*(1-camPos)*VOLUME_RPM5); }; class Engine5_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_06", db-6,1 }; - frequency = 0.95 + HZ_RPM6*0.15; - volume = engineOn*(1-camPos)*VOLUME_RPM6; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_engine_06", "db-6",1 }; + frequency = QUOTE(0.95 + HZ_RPM6*0.15); + volume = QUOTE(engineOn*(1-camPos)*VOLUME_RPM6); }; /* hatchback internal sounds with gas */ class IdleThrust_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_00", db-10,1 }; - frequency = 0.9 + HZ_IDLE*0.2; - volume = engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_IDLE; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_00", "db-10",1 }; + frequency = QUOTE(0.9 + HZ_IDLE*0.2); + volume = QUOTE(engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_IDLE); }; class EngineThrust_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_01", db-9,1 }; - frequency = 0.8 + HZ_RPM1*0.2; - volume = engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM1; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_01", "db-9",1 }; + frequency = QUOTE(0.8 + HZ_RPM1*0.2); + volume = QUOTE(engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM1); }; class Engine1_Thrust_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_02", db-8,1 }; - frequency = 0.8 + HZ_RPM2*0.2; - volume = engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM2; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_02", "db-8",1 }; + frequency = QUOTE(0.8 + HZ_RPM2*0.2); + volume = QUOTE(engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM2); }; class Engine2_Thrust_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_03", db-7,1 }; - frequency = 0.8 + HZ_RPM3*0.2; - volume = engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM3; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_03", "db-7",1 }; + frequency = QUOTE(0.8 + HZ_RPM3*0.2); + volume = QUOTE(engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM3); }; class Engine3_Thrust_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_04", db-6,1 }; - frequency = 0.8 + HZ_RPM4*0.2; - volume = engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM4; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_04", "db-6",1 }; + frequency = QUOTE(0.8 + HZ_RPM4*0.2); + volume = QUOTE(engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM4); }; class Engine4_Thrust_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_05", db-5,1 }; - frequency = 0.8 + HZ_RPM5*0.3; - volume = engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM5; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_05", "db-5",1 }; + frequency = QUOTE(0.8 + HZ_RPM5*0.3); + volume = QUOTE(engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM5); }; class Engine5_Thrust_int { - sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_06", db-4,1 }; - frequency = 0.9 + HZ_RPM6*0.2; - volume = engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM6; + sound[] = {"a3\sounds_f\vehicles\soft\truck_01\int_exhaust_06", "db-4",1 }; + frequency = QUOTE(0.9 + HZ_RPM6*0.2); + volume = QUOTE(engineOn*(1-camPos)*(0.4+(0.6*FACTOR(thrust,0.1,1)))*VOLUME_RPM6); }; class Movement { - sound = "soundEnviron"; - frequency = "1"; + sound = "soundEnviron"; + frequency = "1"; volume = "0"; }; @@ -226,43 +226,43 @@ class TiresRockOut { - sound[] = {"a3\Sounds_F\vehicles\soft\tires\ext_tires_dirt_soft_1", db-6, 1.0, 60}; + sound[] = {"a3\Sounds_F\vehicles\soft\tires\ext_tires_dirt_soft_1", "db-6", 1.0, 60}; frequency = "1"; volume = "camPos*rock*(speed factor[2, 20])"; }; class TiresSandOut { - sound[] = {"a3\Sounds_F\vehicles\soft\tires\ext-tires-sand1", db-6, 1.0, 60}; + sound[] = {"a3\Sounds_F\vehicles\soft\tires\ext-tires-sand1", "db-6", 1.0, 60}; frequency = "1"; volume = "camPos*sand*(speed factor[2, 20])"; }; class TiresGrassOut { - sound[] = {"a3\Sounds_F\vehicles\soft\tires\ext_tires_dirt_soft_2", db-6, 1.0, 60}; + sound[] = {"a3\Sounds_F\vehicles\soft\tires\ext_tires_dirt_soft_2", "db-6", 1.0, 60}; frequency = "1"; volume = "camPos*grass*(speed factor[2, 20])"; }; class TiresMudOut { - sound[] = {"a3\Sounds_F\vehicles\soft\tires\ext-tires-mud2", db-6, 1.0, 60}; + sound[] = {"a3\Sounds_F\vehicles\soft\tires\ext-tires-mud2", "db-6", 1.0, 60}; frequency = "1"; volume = "camPos*mud*(speed factor[2, 20])"; }; class TiresGravelOut { - sound[] = {"a3\Sounds_F\vehicles\soft\tires\ext_tires_gravel_1", db-6, 1.0, 60}; + sound[] = {"a3\Sounds_F\vehicles\soft\tires\ext_tires_gravel_1", "db-6", 1.0, 60}; frequency = "1"; volume = "camPos*gravel*(speed factor[2, 20])"; }; class TiresAsphaltOut { - sound[] = {"a3\Sounds_F\vehicles\soft\tires\ext_tires_asfalt_2", db-6, 1.0, 60}; + sound[] = {"a3\Sounds_F\vehicles\soft\tires\ext_tires_asfalt_2", "db-6", 1.0, 60}; frequency = "1"; volume = "camPos*asphalt*(speed factor[2, 20])"; }; class NoiseOut { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\noise_ext_car_3", db-8, 1.0, 90}; + sound[] = {"a3\Sounds_F\vehicles\soft\noises\noise_ext_car_3", "db-8", 1.0, 90}; frequency = "1"; volume = "camPos*(damper0 max 0.02)*(speed factor[0, 8])"; }; @@ -273,43 +273,43 @@ class TiresRockIn { - sound[] = {"a3\Sounds_F\vehicles\soft\tires\int_tires_dirt_soft_1", db-6, 1.0}; + sound[] = {"a3\Sounds_F\vehicles\soft\tires\int_tires_dirt_soft_1", "db-6", 1.0}; frequency = "1"; volume = "(1-camPos)*rock*(speed factor[2, 20])"; }; class TiresSandIn { - sound[] = {"a3\Sounds_F\vehicles\soft\tires\int-tires-sand2", db-6, 1.0}; + sound[] = {"a3\Sounds_F\vehicles\soft\tires\int-tires-sand2", "db-6", 1.0}; frequency = "1"; volume = "(1-camPos)*sand*(speed factor[2, 20])"; }; class TiresGrassIn { - sound[] = {"a3\Sounds_F\vehicles\soft\tires\int_tires_dirt_soft_2", db-6, 1.0}; + sound[] = {"a3\Sounds_F\vehicles\soft\tires\int_tires_dirt_soft_2", "db-6", 1.0}; frequency = "1"; volume = "(1-camPos)*grass*(speed factor[2, 20])"; }; class TiresMudIn { - sound[] = {"a3\Sounds_F\vehicles\soft\tires\int-tires-mud2", db-6, 1.0}; + sound[] = {"a3\Sounds_F\vehicles\soft\tires\int-tires-mud2", "db-6", 1.0}; frequency = "1"; volume = "(1-camPos)*mud*(speed factor[2, 20])"; }; class TiresGravelIn { - sound[] = {"a3\Sounds_F\vehicles\soft\tires\int_tires_gravel_1", db-6, 1.0}; + sound[] = {"a3\Sounds_F\vehicles\soft\tires\int_tires_gravel_1", "db-6", 1.0}; frequency = "1"; volume = "(1-camPos)*gravel*(speed factor[2, 20])"; }; class TiresAsphaltIn { - sound[] = {"a3\Sounds_F\vehicles\soft\tires\int_tires_asfalt_2", db-6, 1.0}; + sound[] = {"a3\Sounds_F\vehicles\soft\tires\int_tires_asfalt_2", "db-6", 1.0}; frequency = "1"; volume = "(1-camPos)*asphalt*(speed factor[2, 20])"; }; class NoiseIn { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\noise_int_car_3", db-12, 1.0}; + sound[] = {"a3\Sounds_F\vehicles\soft\noises\noise_int_car_3", "db-12", 1.0}; frequency = "1"; volume = "(damper0 max 0.1)*(speed factor[0, 8])*(1-camPos)"; //Definition of inside sounds }; @@ -322,29 +322,29 @@ class breaking_ext_road { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_04", db-3, 1, 80}; - frequency = 1; - volume = engineOn*camPos*asphalt*(LongSlipDrive Factor[-0.1, -0.4])*(Speed Factor[2, 15]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_04", "db-3", 1, 80}; + frequency = QUOTE(1); + volume = "(engineOn*camPos*asphalt*(LongSlipDrive Factor[-0.1, -0.4])*(Speed Factor[2, 15]))"; }; class acceleration_ext_road { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_02", db-3, 1, 80}; - frequency = 1; - volume = engineOn*camPos*asphalt*(LongSlipDrive Factor[0.1, 0.4])*(Speed Factor[15, 2]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_02", "db-3", 1, 80}; + frequency = QUOTE(1); + volume = "(engineOn*camPos*asphalt*(LongSlipDrive Factor[0.1, 0.4])*(Speed Factor[15, 2]))"; }; class turn_left_ext_road { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_02", db-3, 1, 80}; - frequency = 1; - volume = engineOn*camPos*asphalt*(latSlipDrive Factor[0.1, 0.4])*(Speed Factor[2, 15]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_02", "db-3", 1, 80}; + frequency = QUOTE(1); + volume = "(engineOn*camPos*asphalt*(latSlipDrive Factor[0.1, 0.4])*(Speed Factor[2, 15]))"; }; class turn_right_ext_road { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_02", db-3, 1, 80}; - frequency = 1; - volume = engineOn*camPos*asphalt*(latSlipDrive Factor[-0.1, -0.4])*(Speed Factor[2, 15]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_02", "db-3", 1, 80}; + frequency = QUOTE(1); + volume = "(engineOn*camPos*asphalt*(latSlipDrive Factor[-0.1, -0.4])*(Speed Factor[2, 15]))"; }; /*-----------------------------------------------------------------*/ @@ -353,27 +353,27 @@ class breaking_ext_dirt { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_14_dirt_breaking", db-3, 1, 60}; - frequency = 1; - volume = engineOn*camPos*(1-asphalt)*(LongSlipDrive Factor[-0.1, -0.4])*(Speed Factor[1, 15]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_14_dirt_breaking", "db-3", 1, 60}; + frequency = QUOTE(1); + volume = "(engineOn*camPos*(1-asphalt)*(LongSlipDrive Factor[-0.1, -0.4])*(Speed Factor[1, 15]))"; }; class acceleration_ext_dirt { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_16_dirt_acceleration", db-3, 1, 60}; - frequency = 1; - volume = engineOn*camPos*(1-asphalt)*(LongSlipDrive Factor[0.1, 0.4])*(Speed Factor[15, 1]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_16_dirt_acceleration", "db-3", 1, 60}; + frequency = QUOTE(1); + volume = "(engineOn*camPos*(1-asphalt)*(LongSlipDrive Factor[0.1, 0.4])*(Speed Factor[15, 1]))"; }; class turn_left_ext_dirt { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_18_dirt", db-3, 1, 60}; - frequency = 1; - volume = engineOn*camPos*(1-asphalt)*(latSlipDrive Factor[0.1, 0.4])*(Speed Factor[1, 15]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_18_dirt", "db-3", 1, 60}; + frequency = QUOTE(1); + volume = "(engineOn*camPos*(1-asphalt)*(latSlipDrive Factor[0.1, 0.4])*(Speed Factor[1, 15]))"; }; class turn_right_ext_dirt { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_18_dirt", db-3, 1, 60}; - frequency = 1; - volume = engineOn*camPos*(1-asphalt)*(latSlipDrive Factor[-0.1, -0.4])*(Speed Factor[1, 15]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_18_dirt", "db-3", 1, 60}; + frequency = QUOTE(1); + volume = "(engineOn*camPos*(1-asphalt)*(latSlipDrive Factor[-0.1, -0.4])*(Speed Factor[1, 15]))"; }; @@ -383,27 +383,27 @@ class breaking_int_road { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_04_int", db-10, 1}; - frequency = 1; - volume = engineOn*asphalt*(1-camPos)*(LongSlipDrive Factor[-0.1, -0.4])*(Speed Factor[2, 15]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_04_int", "db-10", 1}; + frequency = QUOTE(1); + volume = "(engineOn*asphalt*(1-camPos)*(LongSlipDrive Factor[-0.1, -0.4])*(Speed Factor[2, 15]))"; }; class acceleration_int_road { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_02_int", db-10, 1}; - frequency = 1; - volume = engineOn*asphalt*(1-camPos)*(LongSlipDrive Factor[0.1, 0.4])*(Speed Factor[15, 2]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_02_int", "db-10", 1}; + frequency = QUOTE(1); + volume = "(engineOn*asphalt*(1-camPos)*(LongSlipDrive Factor[0.1, 0.4])*(Speed Factor[15, 2]))"; }; class turn_left_int_road { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_02_int", db-10, 1}; - frequency = 1; - volume = engineOn*asphalt*(1-camPos)*(latSlipDrive Factor[0.1, 0.4])*(Speed Factor[2, 15]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_02_int", "db-10", 1}; + frequency = QUOTE(1); + volume = "(engineOn*asphalt*(1-camPos)*(latSlipDrive Factor[0.1, 0.4])*(Speed Factor[2, 15]))"; }; class turn_right_int_road { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_02_int", db-10, 1}; - frequency = 1; - volume = engineOn*asphalt*(1-camPos)*(latSlipDrive Factor[-0.1, -0.4])*(Speed Factor[2, 15]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_loop_02_int", "db-10", 1}; + frequency = QUOTE(1); + volume = "(engineOn*asphalt*(1-camPos)*(latSlipDrive Factor[-0.1, -0.4])*(Speed Factor[2, 15]))"; }; /*--------------------------------------------------------------------------------------------*/ @@ -411,26 +411,26 @@ /*--------------------------------------------------------------------------------------------*/ class breaking_int_dirt { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_14_dirt_breaking_int", db-10, 1}; - frequency = 1; - volume = engineOn*(1-asphalt)*(1-camPos)*(LongSlipDrive Factor[-01, -0.4])*(Speed Factor[2, 15]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_14_dirt_breaking_int", "db-10", 1}; + frequency = QUOTE(1); + volume = "(engineOn*(1-asphalt)*(1-camPos)*(LongSlipDrive Factor[-01, -0.4])*(Speed Factor[2, 15]))"; }; class acceleration_int_dirt { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_16_dirt_acceleration_int", db-10, 1}; - frequency = 1; - volume = engineOn*(1-asphalt)*(1-camPos)*(LongSlipDrive Factor[0.1, 0.4])*(Speed Factor[15, 2]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_16_dirt_acceleration_int", "db-10", 1}; + frequency = QUOTE(1); + volume = "(engineOn*(1-asphalt)*(1-camPos)*(LongSlipDrive Factor[0.1, 0.4])*(Speed Factor[15, 2]))"; }; class turn_left_int_dirt { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_18_dirt_int", db-10, 1}; - frequency = 1; - volume = engineOn*(1-asphalt)*(1-camPos)*(latSlipDrive Factor[0.1, 0.4])*(Speed Factor[2, 15]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_18_dirt_int", "db-10", 1}; + frequency = QUOTE(1); + volume = "(engineOn*(1-asphalt)*(1-camPos)*(latSlipDrive Factor[0.1, 0.4])*(Speed Factor[2, 15]))"; }; class turn_right_int_dirt { - sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_18_dirt_int", db-10, 1}; - frequency = 1; - volume = engineOn*(1-asphalt)*(1-camPos)*(latSlipDrive Factor[-0.1, -0.4])*(Speed Factor[2, 15]); + sound[] = {"a3\Sounds_F\vehicles\soft\noises\slipping_tires_18_dirt_int", "db-10", 1}; + frequency = QUOTE(1); + volume = "(engineOn*(1-asphalt)*(1-camPos)*(latSlipDrive Factor[-0.1, -0.4])*(Speed Factor[2, 15]))"; }; }; \ No newline at end of file diff --git a/addons/scrapyard_people/CfgMoves.hpp b/addons/scrapyard_people/CfgMoves.hpp index faab666..d2ce985 100644 --- a/addons/scrapyard_people/CfgMoves.hpp +++ b/addons/scrapyard_people/CfgMoves.hpp @@ -14,33 +14,33 @@ class CfgMovesMaleSdr: CfgMovesBasic class Crew; class KIA_Ikarus_Driver: DefaultDie { - actions = DeadActions; + actions = "DeadActions"; file="z\wfar\addons\scrapyard_people\anim\KIA_Ikarus_driver.rtm"; speed = 0.5; looped=0; terminal = 1; soundEnabled=0; - connectTo[] = {DeadState,0.1}; + connectTo[] = {"DeadState",0.1}; }; class Ikarus_Driver: Crew { file="z\wfar\addons\scrapyard_people\anim\Ikarus_driver.rtm"; - interpolateTo[]={KIA_Ikarus_Driver,1}; + interpolateTo[]={"KIA_Ikarus_Driver",1}; }; class KIA_Ikarus_Cargo: DefaultDie { - actions = DeadActions; + actions = "DeadActions"; file="z\wfar\addons\scrapyard_people\anim\KIA_Ikarus_Cargo.rtm"; speed = 0.5; looped=0; terminal = 1; soundEnabled=0; - connectTo[] = {DeadState,0.1}; + connectTo[] = {"DeadState",0.1}; }; class Ikarus_Cargo: Crew { file="z\wfar\addons\scrapyard_people\anim\Ikarus_Cargo.rtm"; - interpolateTo[]={KIA_Ikarus_Cargo,1}; + interpolateTo[]={"KIA_Ikarus_Cargo",1}; }; }; }; \ No newline at end of file diff --git a/addons/scrapyard_people/script_component.hpp b/addons/scrapyard_people/script_component.hpp index 8b3ec52..9de72a5 100644 --- a/addons/scrapyard_people/script_component.hpp +++ b/addons/scrapyard_people/script_component.hpp @@ -1,5 +1,5 @@ #define COMPONENT scrapyard_people -#define COMPONENT_BEAUTIFIED Blank +#define COMPONENT_BEAUTIFIED Scrapyard_People #include "\z\wfar\addons\main\script_mod.hpp" // #define DEBUG_MODE_FULL