Normalize leftovers

This commit is contained in:
jonpas 2016-06-09 14:28:31 +02:00
parent b97ba4990d
commit f1ae73967d
12 changed files with 100 additions and 100 deletions

View File

@ -6,8 +6,8 @@ class CfgPatches {
weapons[] = {}; weapons[] = {};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_main"}; requiredAddons[] = {"ace_main"};
author = "Bohemia Interactive"; author = "Bohemia Interactive";
url = ECSTRING(main,URL); url = ECSTRING(main,URL);
VERSION_CONFIG; VERSION_CONFIG;
}; };
}; };

View File

@ -44,6 +44,6 @@ if (typeName _text != "TEXT") then {
_text = parseText format ["<t align='center'>%1</t>", _text]; _text = parseText format ["<t align='center'>%1</t>", _text];
}; };
_text = composeText [parseText format ["<img size='2' align='center' color='%2' image='%1'/>", _image, _imageColor call BIS_fnc_colorRGBtoHTML], lineBreak, _text]; _text = composeText [parseText format ["<img size='2' align='center' color='%2' image='%1'/>", _image, _imageColor call BIS_fnc_colorRGBtoHTML], lineBreak, _text];
[_text, _size] call FUNC(displayTextStructured); [_text, _size] call FUNC(displayTextStructured);

View File

@ -1,19 +1,19 @@
#include "script_component.hpp" #include "script_component.hpp"
class CfgPatches { class CfgPatches {
class ADDON { class ADDON {
units[] = {QGVAR(moduleSettings)}; units[] = {QGVAR(moduleSettings)};
weapons[] = {}; weapons[] = {};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"}; requiredAddons[] = {"ace_common"};
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
authors[] = {"Drill"}; authors[] = {"Drill"};
url = ECSTRING(main,URL); url = ECSTRING(main,URL);
VERSION_CONFIG; VERSION_CONFIG;
}; };
}; };
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"

View File

@ -1,17 +1,17 @@
#include "script_component.hpp" #include "script_component.hpp"
class CfgPatches { class CfgPatches {
class ADDON { class ADDON {
units[] = {}; units[] = {};
weapons[] = {}; weapons[] = {};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"}; requiredAddons[] = {"ace_common"};
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
authors[] = {"Nou"}; authors[] = {"Nou"};
url = ECSTRING(main,URL); url = ECSTRING(main,URL);
VERSION_CONFIG; VERSION_CONFIG;
}; };
}; };
#include "CfgEventhandlers.hpp" #include "CfgEventhandlers.hpp"
#include "CfgAmmo.hpp" #include "CfgAmmo.hpp"
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"

View File

@ -226,15 +226,15 @@ class CfgWeapons {
class ItemInfo: ItemInfo { class ItemInfo: ItemInfo {
class OpticsModes: OpticsModes { class OpticsModes: OpticsModes {
class Snip: Snip { class Snip: Snip {
modelOptics[] = {QPATHTOF(models\ace_optics_reticle90.p3d),QPATHTOF(models\ace_optics_reticle90.p3d)}; modelOptics[] = {QPATHTOF(models\ace_optics_reticle90.p3d),QPATHTOF(models\ace_optics_reticle90.p3d)};
useModelOptics = 1; useModelOptics = 1;
opticsZoomInit = 0.0116; opticsZoomInit = 0.0116;
opticsZoomMax = 0.0464; opticsZoomMax = 0.0464;
opticsZoomMin = 0.0116; opticsZoomMin = 0.0116;
discreteFOV[] = {0.0464, 0.0116}; discreteFOV[] = {0.0464, 0.0116};
opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1","ACE_OpticsRadBlur1"}; opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1","ACE_OpticsRadBlur1"};
opticsDisablePeripherialVision = 0; opticsDisablePeripherialVision = 0;
}; };
class Iron: Iron {}; class Iron: Iron {};
}; };

View File

@ -2,7 +2,7 @@ class CfgWeapons {
class ACE_ItemCore; class ACE_ItemCore;
class InventoryItem_Base_F; class InventoryItem_Base_F;
class ACE_SpareBarrel: ACE_ItemCore { class ACE_SpareBarrel: ACE_ItemCore {
displayname = CSTRING(SpareBarrelName); displayname = CSTRING(SpareBarrelName);
descriptionshort = CSTRING(SpareBarrelDescription); descriptionshort = CSTRING(SpareBarrelDescription);
//model = ""; //model = "";
@ -13,7 +13,7 @@ class CfgWeapons {
}; };
}; };
class RifleCore; class RifleCore;
class Rifle: RifleCore { class Rifle: RifleCore {
//Mean Rounds Between Stoppages (this will be scaled based on the barrel temp) //Mean Rounds Between Stoppages (this will be scaled based on the barrel temp)
GVAR(mrbs) = 3000; GVAR(mrbs) = 3000;

View File

@ -8,7 +8,7 @@ class CfgPatches {
requiredAddons[] = {"ACE_Advanced_Ballistics"}; requiredAddons[] = {"ACE_Advanced_Ballistics"};
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
authors[] = {"Ruthberg"}; authors[] = {"Ruthberg"};
url = ECSTRING(main,URL); url = ECSTRING(main,URL);
VERSION_CONFIG; VERSION_CONFIG;
}; };
}; };
@ -16,4 +16,4 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "RscTitles.hpp" #include "RscTitles.hpp"

View File

@ -7,10 +7,10 @@ class CfgWeapons {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
scope = 2; scope = 2;
displayName = CSTRING(sandbagEmpty_displayName); displayName = CSTRING(sandbagEmpty_displayName);
model = QPATHTOF(data\ace_sandbag_m.p3d); model = QPATHTOF(data\ace_sandbag_m.p3d);
picture = QPATHTOF(data\m_sandbag_ca.paa); picture = QPATHTOF(data\m_sandbag_ca.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: InventoryItem_Base_F {
mass = 8; mass = 8;
}; };
}; };
@ -19,10 +19,10 @@ class CfgWeapons {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
scope = 2; scope = 2;
displayName = CSTRING(sandbag_displayName); displayName = CSTRING(sandbag_displayName);
model = QPATHTOF(data\ace_sandbag_build.p3d); model = QPATHTOF(data\ace_sandbag_build.p3d);
picture = QPATHTOF(data\m_sandbag_ca.paa); picture = QPATHTOF(data\m_sandbag_ca.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: InventoryItem_Base_F {
mass = 160; mass = 160;
}; };
}; };

View File

@ -7,10 +7,10 @@ class CfgWeapons {
scope = 2; scope = 2;
displayName = CSTRING(DisplayName); displayName = CSTRING(DisplayName);
descriptionShort = ""; descriptionShort = "";
picture = QPATHTOF(UI\w_spottingscope_ca.paa); picture = QPATHTOF(UI\w_spottingscope_ca.paa);
model = QPATHTOF(data\ace_spottingscope.p3d); model = QPATHTOF(data\ace_spottingscope.p3d);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: InventoryItem_Base_F {
mass = 40; mass = 40;
}; };
}; };

View File

@ -14,22 +14,22 @@ class CfgVehicles {
class ACE_TagRed: ACE_TagBlack { class ACE_TagRed: ACE_TagBlack {
displayName = CSTRING(TagRed); displayName = CSTRING(TagRed);
condition = QUOTE(('ACE_SpraypaintRed' in items ACE_player) && {[] call FUNC(checkTaggable)}); condition = QUOTE(('ACE_SpraypaintRed' in items ACE_player) && {[] call FUNC(checkTaggable)});
statement = QUOTE([ARR_2(ACE_player,'red' call FUNC(getTexture))] call FUNC(tag)); statement = QUOTE([ARR_2(ACE_player,'red' call FUNC(getTexture))] call FUNC(tag));
icon = QPATHTOF(UI\icons\iconTaggingRed.paa); icon = QPATHTOF(UI\icons\iconTaggingRed.paa);
}; };
class ACE_TagGreen: ACE_TagBlack { class ACE_TagGreen: ACE_TagBlack {
displayName = CSTRING(TagGreen); displayName = CSTRING(TagGreen);
condition = QUOTE(('ACE_SpraypaintGreen' in items ACE_player) && {[] call FUNC(checkTaggable)}); condition = QUOTE(('ACE_SpraypaintGreen' in items ACE_player) && {[] call FUNC(checkTaggable)});
statement = QUOTE([ARR_2(ACE_player,'green' call FUNC(getTexture))] call FUNC(tag)); statement = QUOTE([ARR_2(ACE_player,'green' call FUNC(getTexture))] call FUNC(tag));
icon = QPATHTOF(UI\icons\iconTaggingGreen.paa); icon = QPATHTOF(UI\icons\iconTaggingGreen.paa);
}; };
class ACE_TagBlue: ACE_TagBlack { class ACE_TagBlue: ACE_TagBlack {
displayName = CSTRING(TagBlue); displayName = CSTRING(TagBlue);
condition = QUOTE(('ACE_SpraypaintBlue' in items ACE_player) && {[] call FUNC(checkTaggable)}); condition = QUOTE(('ACE_SpraypaintBlue' in items ACE_player) && {[] call FUNC(checkTaggable)});
statement = QUOTE([ARR_2(ACE_player,'blue' call FUNC(getTexture))] call FUNC(tag)); statement = QUOTE([ARR_2(ACE_player,'blue' call FUNC(getTexture))] call FUNC(tag));
icon = QPATHTOF(UI\icons\iconTaggingBlue.paa); icon = QPATHTOF(UI\icons\iconTaggingBlue.paa);
}; };
}; };
}; };
}; };

View File

@ -7,10 +7,10 @@ class CfgWeapons {
scope = 2; scope = 2;
displayName = CSTRING(DisplayName); displayName = CSTRING(DisplayName);
descriptionShort = ""; descriptionShort = "";
model = QPATHTOF(data\w_sniper_tripod.p3d); model = QPATHTOF(data\w_sniper_tripod.p3d);
picture = QPATHTOF(UI\w_sniper_tripod_ca.paa); picture = QPATHTOF(UI\w_sniper_tripod_ca.paa);
class ItemInfo: InventoryItem_Base_F { class ItemInfo: InventoryItem_Base_F {
mass = 40; mass = 40;
}; };
}; };

View File

@ -1,180 +1,180 @@
#define ANYWHERE 0 #define ANYWHERE 0
#define GROUND_ONLY 1 #define GROUND_ONLY 1
#define VEHICLE_ONLY 2 #define VEHICLE_ONLY 2
class ACE_UI { class ACE_UI {
class weaponName { class weaponName {
idd = 300; idd = 300;
elements[] = {118}; elements[] = {118};
location = GROUND_ONLY; location = GROUND_ONLY;
class conditions {}; class conditions {};
}; };
class weaponNameBackground { class weaponNameBackground {
idd = 300; idd = 300;
elements[] = {1001, 1008}; elements[] = {1001, 1008};
location = GROUND_ONLY; location = GROUND_ONLY;
class conditions {}; class conditions {};
}; };
class firingMode { class firingMode {
idd = 300; idd = 300;
elements[] = {187, 1203}; elements[] = {187, 1203};
location = GROUND_ONLY; location = GROUND_ONLY;
class conditions {}; class conditions {};
}; };
class ammoType { class ammoType {
idd = 300; idd = 300;
elements[] = {155}; elements[] = {155};
location = GROUND_ONLY; location = GROUND_ONLY;
class conditions {}; class conditions {};
}; };
class ammoCount { class ammoCount {
idd = 300; idd = 300;
elements[] = {184}; elements[] = {184};
location = GROUND_ONLY; location = GROUND_ONLY;
class conditions {}; class conditions {};
}; };
class magCount { class magCount {
idd = 300; idd = 300;
elements[] = {185}; elements[] = {185};
location = GROUND_ONLY; location = GROUND_ONLY;
class conditions {}; class conditions {};
}; };
class throwableName { class throwableName {
idd = 300; idd = 300;
elements[] = {152}; elements[] = {152};
location = GROUND_ONLY; location = GROUND_ONLY;
class conditions {}; class conditions {};
}; };
class throwableCount { class throwableCount {
idd = 300; idd = 300;
elements[] = {151}; elements[] = {151};
location = GROUND_ONLY; location = GROUND_ONLY;
class conditions {}; class conditions {};
}; };
class zeroing { class zeroing {
idd = 300; idd = 300;
elements[] = {168}; elements[] = {168};
location = GROUND_ONLY; location = GROUND_ONLY;
class conditions {}; class conditions {};
}; };
class weaponLowerInfoBackground { class weaponLowerInfoBackground {
idd = 300; idd = 300;
elements[] = {1202}; elements[] = {1202};
location = GROUND_ONLY; location = GROUND_ONLY;
class conditions {}; class conditions {};
}; };
class staminaBar { class staminaBar {
idd = 305; idd = 305;
elements[] = {193}; elements[] = {193};
location = GROUND_ONLY; location = GROUND_ONLY;
class conditions {}; class conditions {};
}; };
class stance { class stance {
idd = 303; idd = 303;
elements[] = {188, 1201}; elements[] = {188, 1201};
location = GROUND_ONLY; location = GROUND_ONLY;
class conditions {}; class conditions {};
}; };
class gunnerWeaponName { class gunnerWeaponName {
idd = 300; idd = 300;
elements[] = {118}; elements[] = {118};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class gunnerWeaponNameBackground { class gunnerWeaponNameBackground {
idd = 300; idd = 300;
elements[] = {1001, 1008}; elements[] = {1001, 1008};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class gunnerFiringMode { class gunnerFiringMode {
idd = 300; idd = 300;
elements[] = {187, 1203}; elements[] = {187, 1203};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class gunnerAmmoType { class gunnerAmmoType {
idd = 300; idd = 300;
elements[] = {155}; elements[] = {155};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class gunnerAmmoCount { class gunnerAmmoCount {
idd = 300; idd = 300;
elements[] = {184}; elements[] = {184};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class gunnerMagCount { class gunnerMagCount {
idd = 300; idd = 300;
elements[] = {185}; elements[] = {185};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class gunnerLaunchableName { class gunnerLaunchableName {
idd = 300; idd = 300;
elements[] = {152}; elements[] = {152};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class gunnerLaunchableCount { class gunnerLaunchableCount {
idd = 300; idd = 300;
elements[] = {151}; elements[] = {151};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class gunnerZeroing { class gunnerZeroing {
idd = 300; idd = 300;
elements[] = {168}; elements[] = {168};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class gunnerWeaponLowerInfoBackground { class gunnerWeaponLowerInfoBackground {
idd = 300; idd = 300;
elements[] = {1202}; elements[] = {1202};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class vehicleName { class vehicleName {
idd = 300; idd = 300;
elements[] = {120}; elements[] = {120};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class vehicleNameBackground { class vehicleNameBackground {
idd = 300; idd = 300;
elements[] = {1000, 1013}; elements[] = {1000, 1013};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class vehicleFuelBar { class vehicleFuelBar {
idd = 300; idd = 300;
elements[] = {113, 1202}; elements[] = {113, 1202};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class vehicleSpeed { class vehicleSpeed {
idd = 300; idd = 300;
elements[] = {121, 1004, 1006}; elements[] = {121, 1004, 1006};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class vehicleAltitude { class vehicleAltitude {
idd = 300; idd = 300;
elements[] = {122, 1005, 1014}; elements[] = {122, 1005, 1014};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class vehicleDamage { class vehicleDamage {
idd = 300; idd = 300;
elements[] = {111}; elements[] = {111};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
class vehicleInfoBackground { class vehicleInfoBackground {
idd = 300; idd = 300;
elements[] = {1200}; elements[] = {1200};
location = VEHICLE_ONLY; location = VEHICLE_ONLY;
class conditions {}; class conditions {};
}; };
}; };