diff --git a/addons/compat_vanilla/$PBOPREFIX$ b/addons/compat_vanilla/$PBOPREFIX$ new file mode 100644 index 00000000..933b2984 --- /dev/null +++ b/addons/compat_vanilla/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ttt\addons\compat_vanilla \ No newline at end of file diff --git a/addons/compat_vanilla_ammo/CfgAmmo.hpp b/addons/compat_vanilla/CfgAmmo.hpp similarity index 100% rename from addons/compat_vanilla_ammo/CfgAmmo.hpp rename to addons/compat_vanilla/CfgAmmo.hpp diff --git a/addons/compat_vanilla_vehicles/CfgVehicles.hpp b/addons/compat_vanilla/CfgVehicles.hpp similarity index 100% rename from addons/compat_vanilla_vehicles/CfgVehicles.hpp rename to addons/compat_vanilla/CfgVehicles.hpp diff --git a/addons/compat_vanilla_weapons/CfgWeapons.hpp b/addons/compat_vanilla/CfgWeapons.hpp similarity index 100% rename from addons/compat_vanilla_weapons/CfgWeapons.hpp rename to addons/compat_vanilla/CfgWeapons.hpp diff --git a/addons/compat_vanilla_vehicles/config.cpp b/addons/compat_vanilla/config.cpp similarity index 82% rename from addons/compat_vanilla_vehicles/config.cpp rename to addons/compat_vanilla/config.cpp index f5aa4e1f..327b56ce 100644 --- a/addons/compat_vanilla_vehicles/config.cpp +++ b/addons/compat_vanilla/config.cpp @@ -5,19 +5,21 @@ class CfgPatches { // Meta information for editor name = COMPONENT_NAME; author = ECSTRING(main,TacticalTrainingTeam); - authors[] = {"PabstMirror", "AACO", "Andx"}; url = ECSTRING(main,URL); + authors[] = {"[A] Willard", "dedmen", "[A] Fusselwurm", "Andx", "PabstMirror", "AACO",}; // Minimum compatible version. When the game's version is lower, pop-up warning will appear when launching the game. Note: was disabled on purpose some time late into Arma 2: OA. requiredVersion = REQUIRED_VERSION; // Required addons, used for setting load order. (CfgPatches classname NOT PBO filename!) // When any of the addons are missing, a pop-up warning will appear when launching the game. requiredAddons[] = { - "ttt_common", "A3_Air_F_Heli_Heli_Transport_03", "A3_Air_F_Heli_Heli_Transport_02", - "acre_main", - "A3_Supplies_F_Enoch_Bags"}; + "A3_Supplies_F_Enoch_Bags", + "A3_Weapons_F_Acc", + "A3_Weapons_F_Mark_Acc", + "ttt_common" + }; // List of objects (CfgVehicles classes) contained in the addon. Important also for Zeus content (units and groups) unlocking. units[] = {}; // List of weapons (CfgWeapons classes) contained in the addon. @@ -29,4 +31,6 @@ class CfgPatches { }; }; +#include "CfgWeapons.hpp" #include "CfgVehicles.hpp" +#include "CfgAmmo.hpp" \ No newline at end of file diff --git a/addons/compat_vanilla/readme.md b/addons/compat_vanilla/readme.md new file mode 100644 index 00000000..5268279d --- /dev/null +++ b/addons/compat_vanilla/readme.md @@ -0,0 +1,32 @@ +# Compat Vanilla + +## NVG + +Fügt ausgewählten Vanilla Zielfernrohren ein intergriertes Nachtsichtgerät hinzu: + +- Nightforce NXS (`optic_LRPS`) +- MOS (`optic_sos`) +- Burris XTR II (`optic_DMS`) +- US Optics MR10 (`optic_AMS`) +- KAHLES Helia (`optic_khs`) + +## Rucksäcke + +Erhöht die Tragekapazität der Vanilla Funkrucksäcke damit zwei ACRE 117F rein passen und noch etwas Platz ist. + +## Hubschrauber + +Erlaubt dem Vanilla Chinook and EH302 (IDAP/FIA Transport Hubschrauber) auf dem Wasser zu schwimmen. + +Betroffene Classnames: + +- `Heli_Transport_03_base_F` +- `Heli_Transport_02_base_F` + +## No 40mm Smoke Bounce + +Verhindert das Vanilla 40mm Rauchgranaten über den Boden springen. Erhöht die Intensität von UGL und Mörser Flares. + +## Maintainers + +- Andx diff --git a/addons/compat_vanilla_ammo/script_component.hpp b/addons/compat_vanilla/script_component.hpp similarity index 51% rename from addons/compat_vanilla_ammo/script_component.hpp rename to addons/compat_vanilla/script_component.hpp index 5ae86fc5..721b8e31 100644 --- a/addons/compat_vanilla_ammo/script_component.hpp +++ b/addons/compat_vanilla/script_component.hpp @@ -1,5 +1,5 @@ -#define COMPONENT compat_vanilla_ammo -#define COMPONENT_BEAUTIFIED Compat Vanilla Ammo +#define COMPONENT compat_vanilla +#define COMPONENT_BEAUTIFIED Compat Vanilla #include "\z\ttt\addons\main\script_mod.hpp" #include "\z\ttt\addons\main\script_macros.hpp" \ No newline at end of file diff --git a/addons/compat_vanilla_weapons/stringtable.xml b/addons/compat_vanilla/stringtable.xml similarity index 73% rename from addons/compat_vanilla_weapons/stringtable.xml rename to addons/compat_vanilla/stringtable.xml index 459799e9..ed95f6b3 100644 --- a/addons/compat_vanilla_weapons/stringtable.xml +++ b/addons/compat_vanilla/stringtable.xml @@ -1,23 +1,23 @@ - - + + Burris XTR II<br />magnification: 2x-4x<br />NightVision Burris XTR II<br />Vergrößerung: 2x-4x<br />Nachtsicht - + KAHLES Helia<br />Magnification: 4,2x-9,6x<br />NightVision KAHLES Helia<br />Vergrößerung: 4,2x-9,6x<br />Nachtsicht - + Marksman Optical Sights<br />Magnification: 2,5x-5x<br />NightVision Marksman Optical Sights<br />Vergrößerung: 2,5x-5x<br />Nachtsicht - + Nightforce NXS<br />Magnification: 5,6x-22,7x Nightforce NXS<br />Vergrößerung: 5,6x-22,7x - + US Optics MR 10<br />Magnification:2,9x-8,8x<br />NightVision US Optics MR 10<br />Vergrößerung:2,9x-8,8x<br />Nachtsicht diff --git a/addons/compat_vanilla_ammo/$PBOPREFIX$ b/addons/compat_vanilla_ammo/$PBOPREFIX$ deleted file mode 100644 index ba08b75e..00000000 --- a/addons/compat_vanilla_ammo/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\ttt\addons\compat_vanilla_ammo \ No newline at end of file diff --git a/addons/compat_vanilla_ammo/config.cpp b/addons/compat_vanilla_ammo/config.cpp deleted file mode 100644 index 0fbec480..00000000 --- a/addons/compat_vanilla_ammo/config.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - // Meta information for editor - name = COMPONENT_NAME; - author = ECSTRING(main,TacticalTrainingTeam); - authors[] = {"[A] Willard", "dedmen", "[A] Fusselwurm", "Andx"}; - url = ECSTRING(main,URL); - - // Minimum compatible version. When the game's version is lower, pop-up warning will appear when launching the game. Note: was disabled on purpose some time late into Arma 2: OA. - requiredVersion = REQUIRED_VERSION; - // Required addons, used for setting load order. (CfgPatches classname NOT PBO filename!) - // When any of the addons are missing, a pop-up warning will appear when launching the game. - requiredAddons[] = { "ttt_common", "A3_Data_F", "A3_Weapons_F"}; - // List of objects (CfgVehicles classes) contained in the addon. Important also for Zeus content (units and groups) unlocking. - units[] = {}; - // List of weapons (CfgWeapons classes) contained in the addon. - weapons[] = {}; - - // Optional. If this is 1, if any of requiredAddons[] entry is missing in your game the entire config will be ignored and return no error (but in rpt) so useful to make a compat Mod (Since Arma 3 2.14) - skipWhenMissingDependencies = 1; - VERSION_CONFIG; - }; -}; - -#include "CfgAmmo.hpp" \ No newline at end of file diff --git a/addons/compat_vanilla_ammo/readme.md b/addons/compat_vanilla_ammo/readme.md deleted file mode 100644 index 6c2df6a9..00000000 --- a/addons/compat_vanilla_ammo/readme.md +++ /dev/null @@ -1,7 +0,0 @@ -# Vanilla No 40mm Smoke Bounce - -Verhindert das Vanilla 40mm Rauchgranaten über den Boden springen. Erhöht die Intensität von UGL und Mörser Flares. - -## Maintainers - -- Andx diff --git a/addons/compat_vanilla_vehicles/$PBOPREFIX$ b/addons/compat_vanilla_vehicles/$PBOPREFIX$ deleted file mode 100644 index 2d1a5108..00000000 --- a/addons/compat_vanilla_vehicles/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\ttt\addons\compat_vanilla_vehicles \ No newline at end of file diff --git a/addons/compat_vanilla_vehicles/readme.md b/addons/compat_vanilla_vehicles/readme.md deleted file mode 100644 index e3b41d7b..00000000 --- a/addons/compat_vanilla_vehicles/readme.md +++ /dev/null @@ -1,18 +0,0 @@ -# Vanilla Vehicles - -## Rucksäcke - -Erhöht die Tragekapazität der Vanilla Funkrucksäcke damit zwei ACRE 117F rein passen und noch etwas Platz ist. - -## Hubschrauber - -Erlaubt dem Vanilla Chinook and EH302 (IDAP/FIA Transport Hubschrauber) auf dem Wasser zu schwimmen. - -Betroffene Classnames: - -- `Heli_Transport_03_base_F` -- `Heli_Transport_02_base_F` - -## Maintainers - -- Andx diff --git a/addons/compat_vanilla_vehicles/script_component.hpp b/addons/compat_vanilla_vehicles/script_component.hpp deleted file mode 100644 index fd1ff055..00000000 --- a/addons/compat_vanilla_vehicles/script_component.hpp +++ /dev/null @@ -1,5 +0,0 @@ -#define COMPONENT compat_vanilla_vehicles -#define COMPONENT_BEAUTIFIED Comapt Vanilla CfgVehicles -#include "\z\ttt\addons\main\script_mod.hpp" - -#include "\z\ttt\addons\main\script_macros.hpp" \ No newline at end of file diff --git a/addons/compat_vanilla_weapons/$PBOPREFIX$ b/addons/compat_vanilla_weapons/$PBOPREFIX$ deleted file mode 100644 index 2719c457..00000000 --- a/addons/compat_vanilla_weapons/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\ttt\addons\compat_vanilla_weapons \ No newline at end of file diff --git a/addons/compat_vanilla_weapons/config.cpp b/addons/compat_vanilla_weapons/config.cpp deleted file mode 100644 index 9f7eee6a..00000000 --- a/addons/compat_vanilla_weapons/config.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - // Meta information for editor - name = COMPONENT_NAME; - author = ECSTRING(main,TacticalTrainingTeam); - url = ECSTRING(main,URL); - - // Minimum compatible version. When the game's version is lower, pop-up warning will appear when launching the game. Note: was disabled on purpose some time late into Arma 2: OA. - requiredVersion = REQUIRED_VERSION; - // Required addons, used for setting load order. (CfgPatches classname NOT PBO filename!) - // When any of the addons are missing, a pop-up warning will appear when launching the game. - requiredAddons[] = {"A3_Weapons_F_Acc", "A3_Weapons_F_Mark_Acc", "ttt_common"}; - // List of objects (CfgVehicles classes) contained in the addon. Important also for Zeus content (units and groups) unlocking. - units[] = {}; - // List of weapons (CfgWeapons classes) contained in the addon. - weapons[] = {}; - - // Optional. If this is 1, if any of requiredAddons[] entry is missing in your game the entire config will be ignored and return no error (but in rpt) so useful to make a compat Mod (Since Arma 3 2.14) - skipWhenMissingDependencies = 1; - VERSION_CONFIG; - }; -}; - -#include "CfgWeapons.hpp" \ No newline at end of file diff --git a/addons/compat_vanilla_weapons/readme.md b/addons/compat_vanilla_weapons/readme.md deleted file mode 100644 index 29bda0a6..00000000 --- a/addons/compat_vanilla_weapons/readme.md +++ /dev/null @@ -1,15 +0,0 @@ -# Vanilla Zielfernrohre - -## NVG - -Fügt ausgewählten Vanilla Zielfernrohren ein intergriertes Nachtsichtgerät hinzu: - -- Nightforce NXS (`optic_LRPS`) -- MOS (`optic_sos`) -- Burris XTR II (`optic_DMS`) -- US Optics MR10 (`optic_AMS`) -- KAHLES Helia (`optic_khs`) - -## Maintainers - -- Andx diff --git a/addons/compat_vanilla_weapons/script_component.hpp b/addons/compat_vanilla_weapons/script_component.hpp deleted file mode 100644 index 72e0139c..00000000 --- a/addons/compat_vanilla_weapons/script_component.hpp +++ /dev/null @@ -1,5 +0,0 @@ -#define COMPONENT compat_vanilla_weapons -#define COMPONENT_BEAUTIFIED Comapt Vanilla Weapons -#include "\z\ttt\addons\main\script_mod.hpp" - -#include "\z\ttt\addons\main\script_macros.hpp" \ No newline at end of file