diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp
index 5b25f70f718..b6ad5d8832a 100644
--- a/addons/ballistics/CfgAmmo.hpp
+++ b/addons/ballistics/CfgAmmo.hpp
@@ -603,6 +603,17 @@ class CfgAmmo {
ACE_muzzleVelocities[]={510, 550, 596};
ACE_barrelLengths[]={304.8, 406.4, 609.6};
};
+ class B_570x28_Ball: BulletBase {
+ ACE_caliber = 5.7;
+ ACE_bulletLength = 21.6; // http://blog.thejustnation.org/2011/04/5-7x28mm-ammo-review/
+ ACE_bulletMass = 2; // based on the SS190
+ ACE_ballisticCoefficients[] = {0.177}; //http://m.delphiforums.com/autogun/messages/5267/7
+ ACE_velocityBoundaries[] = {};
+ ACE_standardAtmosphere = "ASM"; // 50/50 chance to get it right
+ ACE_dragModel = 7;
+ ACE_muzzleVelocities[] = {716,776};
+ ACE_barrelLengths[] = {264,407};
+ };
class B_19mm_HE: BulletBase {
tracerScale = 1;
};
diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp
index a2a0e0ff1d3..f88fd8e59a3 100644
--- a/addons/ballistics/CfgWeapons.hpp
+++ b/addons/ballistics/CfgWeapons.hpp
@@ -70,6 +70,18 @@ class CfgWeapons {
};
};
+ // P90 (1.86)
+ class SMG_03_TR_BASE: Rifle_Base_F {
+ ACE_barrelTwist = 228.6; // 1:9 inch twist
+ ACE_barrelLength = 407;
+ ACE_twistDirection = 1;
+ modes[] = {"Single"};
+ };
+ class SMG_03C_BASE: SMG_03_TR_BASE {
+ ACE_barrelLength = 264;
+ modes[] = {"Single", "FullAuto"};
+ };
+
// Noreen "Bad News" ULR
class DMR_02_base_F: Rifle_Long_Base_F {
class Single: Mode_SemiAuto {
diff --git a/addons/main/config.cpp b/addons/main/config.cpp
index 1d02625747d..81b5e7ce3dd 100644
--- a/addons/main/config.cpp
+++ b/addons/main/config.cpp
@@ -8,6 +8,7 @@ class CfgPatches {
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {
"A3_Data_F_Tank_Loadorder",
+ "A3_Data_F_Mod_Loadorder",
// CBA
"cba_ui",
"cba_xeh",
diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
index 372be825307..d9e307d3c27 100644
--- a/addons/main/script_mod.hpp
+++ b/addons/main/script_mod.hpp
@@ -9,7 +9,7 @@
#define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD
// MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 1.84
+#define REQUIRED_VERSION 1.86
#define REQUIRED_CBA_VERSION {3,9,0}
#ifdef COMPONENT_BEAUTIFIED
diff --git a/addons/realisticnames/CfgMagazines.hpp b/addons/realisticnames/CfgMagazines.hpp
index bc849477986..bacaed93dc1 100644
--- a/addons/realisticnames/CfgMagazines.hpp
+++ b/addons/realisticnames/CfgMagazines.hpp
@@ -422,6 +422,10 @@ class CfgMagazines {
displayName = CSTRING(SmokeShellYellow_Name);
};
+ class 50Rnd_570x28_SMG_03: CA_Magazine {
+ displayName = CSTRING(P90_Mag_Name);
+ descriptionShort = CSTRING(P90_Mag_DescriptionShort);
+ };
// 1.70 Pylon Magazines (Should Match Weapon Name)
class 2Rnd_Missile_AA_04_F;
diff --git a/addons/realisticnames/CfgWeapons.hpp b/addons/realisticnames/CfgWeapons.hpp
index 259074925fe..af04d903108 100644
--- a/addons/realisticnames/CfgWeapons.hpp
+++ b/addons/realisticnames/CfgWeapons.hpp
@@ -93,6 +93,60 @@ class CfgWeapons {
class arifle_Mk20_GL_plain_F: arifle_Mk20_GL_F {
displayName = CSTRING(arifle_Mk20_GL_plain_Name);
};
+
+ // P90 (1.86)
+ class SMG_03_TR_BASE;
+ class SMG_03_TR_black: SMG_03_TR_BASE {
+ displayName = CSTRING(PS90_TR_Black_Name);
+ };
+ class SMG_03_TR_khaki: SMG_03_TR_black {
+ displayName = CSTRING(PS90_TR_Khaki_Name);
+ };
+ class SMG_03_TR_camo: SMG_03_TR_black {
+ displayName = CSTRING(PS90_TR_Camo_Name);
+ };
+ class SMG_03_TR_hex: SMG_03_TR_BASE {
+ displayName = CSTRING(PS90_TR_Hex_Name);
+ };
+ class SMG_03_black: SMG_03_TR_BASE {
+ displayName = CSTRING(PS90_Black_Name);
+ };
+ class SMG_03_khaki: SMG_03_black {
+ displayName = CSTRING(PS90_Khaki_Name);
+ };
+ class SMG_03_camo: SMG_03_black {
+ displayName = CSTRING(PS90_Camo_Name);
+ };
+ class SMG_03_hex: SMG_03_black {
+ displayName = CSTRING(PS90_Hex_Name);
+ };
+ class SMG_03C_BASE: SMG_03_TR_BASE {};
+ class SMG_03C_TR_black: SMG_03C_BASE {
+ displayName = CSTRING(P90_TR_Black_Name);
+ };
+ class SMG_03C_TR_khaki: SMG_03C_TR_black {
+ displayName = CSTRING(P90_TR_Khaki_Name);
+ };
+ class SMG_03C_TR_camo: SMG_03C_TR_black {
+ displayName = CSTRING(P90_TR_Camo_Name);
+ };
+ class SMG_03C_TR_hex: SMG_03C_TR_black {
+ displayName = CSTRING(P90_TR_Hex_Name);
+ };
+ class SMG_03C_black: SMG_03C_Base {
+ displayName = CSTRING(P90_Black_Name);
+ };
+ class SMG_03C_khaki: SMG_03C_black {
+ displayName = CSTRING(P90_Khaki_Name);
+ };
+ class SMG_03C_camo: SMG_03C_black {
+ displayName = CSTRING(P90_Camo_Name);
+ };
+ class SMG_03C_hex: SMG_03C_black {
+ displayName = CSTRING(P90_Hex_Name);
+ };
+
+
// Vector
class SMG_01_Base;
diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
index d4ff1e8270f..b0c896aecae 100644
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@@ -3552,5 +3552,293 @@
C-More レイルウェイ SMG (緑)
C-More Railway SMG (Verde)
+
+ P90 TR (Black)
+ P90 TR (Černá)
+ P90 TR (Noir)
+ P90 TR (Negro)
+ P90 TR (Чёрный)
+ P90 TR (czarny)
+ P90 TR (Schwarz)
+ P90 TR (Nero)
+ P90 TR (Fekete)
+ P90 TR (Preto)
+ P90 TR (ブラック)
+ P90 TR (黑色)
+ P90 TR (黑色)
+ P90 TR (Black)
+
+
+ P90 TR (Khaki)
+ P90 TR (Khaki)
+ P90 TR (Kaki)
+ P90 TR (Caqui)
+ P90 TR (Хаки)
+ P90 TR (khaki)
+ P90 TR (Khaki)
+ P90 TR (Khaki)
+ P90 TR (Khaki)
+ P90 TR (Caqui)
+ P90 TR (カーキ)
+ P90 TR (沙色)
+ P90 TR (沙色)
+ P90 TR (Khaki)
+
+
+ P90 TR (Camo)
+ P90 TR (Kamufláž)
+ P90 TR (Camo)
+ P90 TR (Camuflaje)
+ P90 TR (Камо)
+ P90 TR (kamuflaż)
+ P90 TR (Camo)
+ P90 TR (Camo)
+ P90 TR (Terepmintás)
+ P90 TR (Camuflagem)
+ P90 TR (カモフラージュ)
+ P90 TR (迷彩)
+ P90 TR (迷彩)
+ P90 TR (Camo)
+
+
+ P90 TR (Hex)
+ P90 TR (Hex)
+ P90 TR (Hex)
+ P90 TR (Hex)
+ P90 TR (Гекс)
+ P90 TR (Hex)
+ P90 TR (hex)
+ P90 TR (Hex)
+ P90 TR (Hex)
+ P90 TR (Hex)
+ P90 TR (ヘックス)
+ P90 TR (數位蜂巢迷彩)
+ P90 TR (数位蜂巢迷彩)
+ P90 TR (Hex)
+
+
+ P90 (Black)
+ P90 (Černá)
+ P90 (Noir)
+ P90 (Negro)
+ P90 (Чёрный)
+ P90 (czarny)
+ P90 (Schwarz)
+ P90 (Nero)
+ P90 (Fekete)
+ P90 (Preto)
+ P90 (ブラック)
+ P90 (黑色)
+ P90 (黑色)
+ P90 (Black)
+
+
+ P90 (Khaki)
+ P90 (Khaki)
+ P90 (Kaki)
+ P90 (Caqui)
+ P90 (Хаки)
+ P90 (khaki)
+ P90 (Khaki)
+ P90 (Khaki)
+ P90 (Khaki)
+ P90 (Caqui)
+ P90 (カーキ)
+ P90 (沙色)
+ P90 (沙色)
+ P90 (Khaki)
+
+
+ P90 (Camo)
+ P90 (Kamufláž)
+ P90 (Camo)
+ P90 (Camuflaje)
+ P90 (Камо)
+ P90 (kamuflaż)
+ P90 (Camo)
+ P90 (Camo)
+ P90 (Terepmintás)
+ P90 (Camuflagem)
+ P90 (カモフラージュ)
+ P90 (迷彩)
+ P90 (迷彩)
+ P90 (Camo)
+
+
+ P90 (Hex)
+ P90 (Hex)
+ P90 (Hex)
+ P90 (Hex)
+ P90 (Гекс)
+ P90 (Hex)
+ P90 (hex)
+ P90 (Hex)
+ P90 (Hex)
+ P90 (Hex)
+ P90 (ヘックス)
+ P90 (數位蜂巢迷彩)
+ P90 (数位蜂巢迷彩)
+ P90 (Hex)
+
+
+ PS90 TR (Black)
+ PS90 TR (Černá)
+ PS90 TR (Noir)
+ PS90 TR (Negro)
+ PS90 TR (Чёрный)
+ PS90 TR (czarny)
+ PS90 TR (Schwarz)
+ PS90 TR (Nero)
+ PS90 TR (Fekete)
+ PS90 TR (Preto)
+ PS90 TR (ブラック)
+ PS90 TR (黑色)
+ PS90 TR (黑色)
+ PS90 TR (Black)
+
+
+ PS90 TR (Khaki)
+ PS90 TR (Khaki)
+ PS90 TR (Kaki)
+ PS90 TR (Caqui)
+ PS90 TR (Хаки)
+ PS90 TR (khaki)
+ PS90 TR (Khaki)
+ PS90 TR (Khaki)
+ PS90 TR (Khaki)
+ PS90 TR (Caqui)
+ PS90 TR (カーキ)
+ PS90 TR (沙色)
+ PS90 TR (沙色)
+ PS90 TR (Khaki)
+
+
+ PS90 TR (Camo)
+ PS90 TR (Kamufláž)
+ PS90 TR (Camo)
+ PS90 TR (Camuflaje)
+ PS90 TR (Камо)
+ PS90 TR (kamuflaż)
+ PS90 TR (Camo)
+ PS90 TR (Camo)
+ PS90 TR (Terepmintás)
+ PS90 TR (Camuflagem)
+ PS90 TR (カモフラージュ)
+ PS90 TR (迷彩)
+ PS90 TR (迷彩)
+ PS90 TR (Camo)
+
+
+ PS90 TR (Hex)
+ PS90 TR (Hex)
+ PS90 TR (Hex)
+ PS90 TR (Hex)
+ PS90 TR (Гекс)
+ PS90 TR (Hex)
+ PS90 TR (hex)
+ PS90 TR (Hex)
+ PS90 TR (Hex)
+ PS90 TR (Hex)
+ PS90 TR (ヘックス)
+ PS90 TR (數位蜂巢迷彩)
+ PS90 TR (数位蜂巢迷彩)
+ PS90 TR (Hex)
+
+
+ PS90 (Black)
+ PS90 (Černá)
+ PS90 (Noir)
+ PS90 (Negro)
+ PS90 (Чёрный)
+ PS90 (czarny)
+ PS90 (Schwarz)
+ PS90 (Nero)
+ PS90 (Fekete)
+ PS90 (Preto)
+ PS90 (ブラック)
+ PS90 (黑色)
+ PS90 (黑色)
+ PS90 (Black)
+
+
+ PS90 (Khaki)
+ PS90 (Khaki)
+ PS90 (Kaki)
+ PS90 (Caqui)
+ PS90 (Хаки)
+ PS90 (khaki)
+ PS90 (Khaki)
+ PS90 (Khaki)
+ PS90 (Khaki)
+ PS90 (Caqui)
+ PS90 (カーキ)
+ PS90 (沙色)
+ PS90 (沙色)
+ PS90 (Khaki)
+
+
+ PS90 (Camo)
+ PS90 (Kamufláž)
+ PS90 (Camo)
+ PS90 (Camuflaje)
+ PS90 (Камо)
+ PS90 (kamuflaż)
+ PS90 (Camo)
+ PS90 (Camo)
+ PS90 (Terepmintás)
+ PS90 (Camuflagem)
+ PS90 (カモフラージュ)
+ PS90 (迷彩)
+ PS90 (迷彩)
+ PS90 (Camo)
+
+
+ PS90 (Hex)
+ PS90 (Hex)
+ PS90 (Hex)
+ PS90 (Hex)
+ PS90 (Гекс)
+ PS90 (Hex)
+ PS90 (hex)
+ PS90 (Hex)
+ PS90 (Hex)
+ PS90 (Hex)
+ PS90 (ヘックス)
+ PS90 (數位蜂巢迷彩)
+ PS90 (数位蜂巢迷彩)
+ PS90 (Hex)
+
+
+ 5.7mm 50Rnd Mag
+ 5,7mm 50-as Tár
+ 5,7mm 50-Patronen-Magazin
+ Cargador de 50 balas SD de 5,7mm
+ Ch. 5,7mm 50Cps
+ Magazynek 5,7mm 50rd
+ 5.7mm 50náb. Zásobník
+ Carregador de 50 projéteis de 5.7mm
+ Caricatore 5.7mm 50Rnd
+ Магазин из 50-ти 5,7 мм
+ 5.7mm 50 発入り弾倉
+ 5.7mm 50發 彈匣
+ 5.7mm 50发 弹匣
+ 5.7mm 50Rnd Mag
+
+
+ Caliber: 5.7mm<br />Rounds: 50<br />Used in: P90
+ Kaliber: 5,7mm<br />Patronen: 50<br />Eingesetzt von: P90
+ Kaliber: 5,7mm<br />Pociski: 50<br />Używany w: P90
+ Calibre : 5,7mm<br />Cartouches : 50<br />Utilisé avec : P90
+ Calibre: 5.7mm<br />Balas: 50<br />Se usa en: P90
+ Калибр: 5,7 мм<br />Патронов: 50<br />Используются с: P90
+ Calibro: 5.7mm<br />Munizioni: 50<br />In uso su: P90
+ Ráže: 5.7mm<br />Nábojů: 50<br />Použití u: P90
+ Calibre: 5.7mm<br />Cartuchos: 50<br />Usado em: P90
+ Kaliber: 5,7mm<br />Lövedékek: 50<br />Használható: P90
+ 口径: 5.7mm<br />装弾数: 50<br />次で使用: P90
+ 口徑: 5.7mm<br />發數: 50<br />使用於: P90
+ 口径: 5.7mm<br />发数: 50<br />使用于: P90
+ 구경: 5.7mm<br />장탄수: 50<br />사용됨: P90
+
diff --git a/optionals/compat_adr_97/$PBOPREFIX$ b/optionals/compat_adr_97/$PBOPREFIX$
deleted file mode 100644
index 55c01af3d50..00000000000
--- a/optionals/compat_adr_97/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-z\ace\addons\compat_adr_90
\ No newline at end of file
diff --git a/optionals/compat_adr_97/CfgAmmo.hpp b/optionals/compat_adr_97/CfgAmmo.hpp
deleted file mode 100644
index 32d4deb0765..00000000000
--- a/optionals/compat_adr_97/CfgAmmo.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-class CfgAmmo {
- class BulletBase;
- class B_570x28_Ball: BulletBase {
- ACE_caliber = 5.7;
- ACE_bulletLength = 21.6; // http://blog.thejustnation.org/2011/04/5-7x28mm-ammo-review/
- ACE_bulletMass = 2; // based on the SS190
- ACE_ballisticCoefficients[] = {0.177}; //http://m.delphiforums.com/autogun/messages/5267/7
- ACE_velocityBoundaries[] = {};
- ACE_standardAtmosphere = "ASM"; // 50/50 chance to get it right
- ACE_dragModel = 7;
- ACE_muzzleVelocities[] = {716,776};
- ACE_barrelLengths[] = {264,407};
- };
-};
diff --git a/optionals/compat_adr_97/CfgMagazines.hpp b/optionals/compat_adr_97/CfgMagazines.hpp
deleted file mode 100644
index fe88f128fda..00000000000
--- a/optionals/compat_adr_97/CfgMagazines.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-class CfgMagazines {
- class CA_Magazine;
- class 50Rnd_570x28_SMG_03: CA_Magazine {
- displayName = CSTRING(P90_Mag_Name);
- descriptionShort = CSTRING(P90_Mag_DescriptionShort);
- };
-};
\ No newline at end of file
diff --git a/optionals/compat_adr_97/CfgWeapons.hpp b/optionals/compat_adr_97/CfgWeapons.hpp
deleted file mode 100644
index 5756ed03947..00000000000
--- a/optionals/compat_adr_97/CfgWeapons.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-class CfgWeapons {
-
- class Rifle_Base_F;
- class SMG_03_TR_BASE: Rifle_Base_F {
- ACE_barrelTwist = 228.6; // 1:9 inch twist
- ACE_barrelLength = 407;
- ACE_twistDirection = 1;
- modes[]= {
- "Single"
- };
- };
- class SMG_03_TR_black: SMG_03_TR_BASE{
- displayName = CSTRING(PS90_TR_Black_Name);
- };
- class SMG_03_TR_khaki: SMG_03_TR_black {
- displayName = CSTRING(PS90_TR_Khaki_Name);
- };
- class SMG_03_TR_camo: SMG_03_TR_black {
- displayName = CSTRING(PS90_TR_Camo_Name);
- };
- class SMG_03_TR_hex: SMG_03_TR_BASE {
- displayName = CSTRING(PS90_TR_Hex_Name);
- };
- class SMG_03_black: SMG_03_TR_BASE {
- displayName = CSTRING(PS90_Black_Name);
- };
- class SMG_03_khaki: SMG_03_black {
- displayName = CSTRING(PS90_Khaki_Name);
- };
- class SMG_03_camo: SMG_03_black {
- displayName = CSTRING(PS90_Camo_Name);
- };
- class SMG_03_hex: SMG_03_black {
- displayName = CSTRING(PS90_Hex_Name);
- };
- class SMG_03C_BASE: SMG_03_TR_BASE {
- ACE_barrelLength = 264;
- modes[]= {
- "Single",
- "FullAuto"
- };
- };
- class SMG_03C_TR_black: SMG_03C_BASE {
- displayName = CSTRING(P90_TR_Black_Name);
- };
- class SMG_03C_TR_khaki: SMG_03C_TR_black {
- displayName = CSTRING(P90_TR_Khaki_Name);
- };
- class SMG_03C_TR_camo: SMG_03C_TR_black {
- displayName = CSTRING(P90_TR_Camo_Name);
- };
- class SMG_03C_TR_hex: SMG_03C_TR_black {
- displayName = CSTRING(P90_TR_Hex_Name);
- };
- class SMG_03C_black: SMG_03C_Base {
- displayName = CSTRING(P90_Black_Name);
- };
- class SMG_03C_khaki: SMG_03C_black {
- displayName = CSTRING(P90_Khaki_Name);
- };
- class SMG_03C_camo: SMG_03C_black {
- displayName = CSTRING(P90_Camo_Name);
- };
- class SMG_03C_hex: SMG_03C_black {
- displayName = CSTRING(P90_Hex_Name);
- };
-};
diff --git a/optionals/compat_adr_97/config.cpp b/optionals/compat_adr_97/config.cpp
deleted file mode 100644
index 84a20ed7812..00000000000
--- a/optionals/compat_adr_97/config.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
- class ADDON {
- name = COMPONENT_NAME;
- units[] = {};
- weapons[] = {};
- requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"A3_Weapons_F_Mod"};
- author = ECSTRING(common,ACETeam);
- authors[] = {"Nic547"};
- url = ECSTRING(main,URL);
- VERSION_CONFIG;
- };
-};
-
-#include "CfgWeapons.hpp"
-#include "CfgAmmo.hpp"
-#include "CfgMagazines.hpp"
diff --git a/optionals/compat_adr_97/meta.cpp b/optionals/compat_adr_97/meta.cpp
deleted file mode 100644
index 8ec81b90ab9..00000000000
--- a/optionals/compat_adr_97/meta.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-protocol = 1;
-publishedid = 773136286;
diff --git a/optionals/compat_adr_97/script_component.hpp b/optionals/compat_adr_97/script_component.hpp
deleted file mode 100644
index 200b189b422..00000000000
--- a/optionals/compat_adr_97/script_component.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#define COMPONENT compat_adr_97
-#define COMPONENT_BEAUTIFIED ADR-97 Compatibility
-
-#include "\z\ace\addons\main\script_mod.hpp"
-
-#include "\z\ace\addons\main\script_macros.hpp"
diff --git a/optionals/compat_adr_97/stringtable.xml b/optionals/compat_adr_97/stringtable.xml
deleted file mode 100644
index 0023fde746a..00000000000
--- a/optionals/compat_adr_97/stringtable.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-
-
-
-
- P90 TR (Black)
- P90 TR (Černá)
- P90 TR (Noir)
- P90 TR (Negro)
- P90 TR (Чёрный)
- P90 TR (czarny)
- P90 TR (Schwarz)
- P90 TR (Nero)
- P90 TR (Fekete)
- P90 TR (Preto)
- P90 TR (ブラック)
- P90 TR (黑色)
- P90 TR (黑色)
- P90 TR (Black)
-
-
- P90 TR (Khaki)
- P90 TR (Khaki)
- P90 TR (Kaki)
- P90 TR (Caqui)
- P90 TR (Хаки)
- P90 TR (khaki)
- P90 TR (Khaki)
- P90 TR (Khaki)
- P90 TR (Khaki)
- P90 TR (Caqui)
- P90 TR (カーキ)
- P90 TR (沙色)
- P90 TR (沙色)
- P90 TR (Khaki)
-
-
- P90 TR (Camo)
- P90 TR (Kamufláž)
- P90 TR (Camo)
- P90 TR (Camuflaje)
- P90 TR (Камо)
- P90 TR (kamuflaż)
- P90 TR (Camo)
- P90 TR (Camo)
- P90 TR (Terepmintás)
- P90 TR (Camuflagem)
- P90 TR (カモフラージュ)
- P90 TR (迷彩)
- P90 TR (迷彩)
- P90 TR (Camo)
-
-
- P90 TR (Hex)
- P90 TR (Hex)
- P90 TR (Hex)
- P90 TR (Hex)
- P90 TR (Гекс)
- P90 TR (Hex)
- P90 TR (hex)
- P90 TR (Hex)
- P90 TR (Hex)
- P90 TR (Hex)
- P90 TR (ヘックス)
- P90 TR (數位蜂巢迷彩)
- P90 TR (数位蜂巢迷彩)
- P90 TR (Hex)
-
-
- P90 (Black)
- P90 (Černá)
- P90 (Noir)
- P90 (Negro)
- P90 (Чёрный)
- P90 (czarny)
- P90 (Schwarz)
- P90 (Nero)
- P90 (Fekete)
- P90 (Preto)
- P90 (ブラック)
- P90 (黑色)
- P90 (黑色)
- P90 (Black)
-
-
- P90 (Khaki)
- P90 (Khaki)
- P90 (Kaki)
- P90 (Caqui)
- P90 (Хаки)
- P90 (khaki)
- P90 (Khaki)
- P90 (Khaki)
- P90 (Khaki)
- P90 (Caqui)
- P90 (カーキ)
- P90 (沙色)
- P90 (沙色)
- P90 (Khaki)
-
-
- P90 (Camo)
- P90 (Kamufláž)
- P90 (Camo)
- P90 (Camuflaje)
- P90 (Камо)
- P90 (kamuflaż)
- P90 (Camo)
- P90 (Camo)
- P90 (Terepmintás)
- P90 (Camuflagem)
- P90 (カモフラージュ)
- P90 (迷彩)
- P90 (迷彩)
- P90 (Camo)
-
-
- P90 (Hex)
- P90 (Hex)
- P90 (Hex)
- P90 (Hex)
- P90 (Гекс)
- P90 (Hex)
- P90 (hex)
- P90 (Hex)
- P90 (Hex)
- P90 (Hex)
- P90 (ヘックス)
- P90 (數位蜂巢迷彩)
- P90 (数位蜂巢迷彩)
- P90 (Hex)
-
-
- PS90 TR (Black)
- PS90 TR (Černá)
- PS90 TR (Noir)
- PS90 TR (Negro)
- PS90 TR (Чёрный)
- PS90 TR (czarny)
- PS90 TR (Schwarz)
- PS90 TR (Nero)
- PS90 TR (Fekete)
- PS90 TR (Preto)
- PS90 TR (ブラック)
- PS90 TR (黑色)
- PS90 TR (黑色)
- PS90 TR (Black)
-
-
- PS90 TR (Khaki)
- PS90 TR (Khaki)
- PS90 TR (Kaki)
- PS90 TR (Caqui)
- PS90 TR (Хаки)
- PS90 TR (khaki)
- PS90 TR (Khaki)
- PS90 TR (Khaki)
- PS90 TR (Khaki)
- PS90 TR (Caqui)
- PS90 TR (カーキ)
- PS90 TR (沙色)
- PS90 TR (沙色)
- PS90 TR (Khaki)
-
-
- PS90 TR (Camo)
- PS90 TR (Kamufláž)
- PS90 TR (Camo)
- PS90 TR (Camuflaje)
- PS90 TR (Камо)
- PS90 TR (kamuflaż)
- PS90 TR (Camo)
- PS90 TR (Camo)
- PS90 TR (Terepmintás)
- PS90 TR (Camuflagem)
- PS90 TR (カモフラージュ)
- PS90 TR (迷彩)
- PS90 TR (迷彩)
- PS90 TR (Camo)
-
-
- PS90 TR (Hex)
- PS90 TR (Hex)
- PS90 TR (Hex)
- PS90 TR (Hex)
- PS90 TR (Гекс)
- PS90 TR (Hex)
- PS90 TR (hex)
- PS90 TR (Hex)
- PS90 TR (Hex)
- PS90 TR (Hex)
- PS90 TR (ヘックス)
- PS90 TR (數位蜂巢迷彩)
- PS90 TR (数位蜂巢迷彩)
- PS90 TR (Hex)
-
-
- PS90 (Black)
- PS90 (Černá)
- PS90 (Noir)
- PS90 (Negro)
- PS90 (Чёрный)
- PS90 (czarny)
- PS90 (Schwarz)
- PS90 (Nero)
- PS90 (Fekete)
- PS90 (Preto)
- PS90 (ブラック)
- PS90 (黑色)
- PS90 (黑色)
- PS90 (Black)
-
-
- PS90 (Khaki)
- PS90 (Khaki)
- PS90 (Kaki)
- PS90 (Caqui)
- PS90 (Хаки)
- PS90 (khaki)
- PS90 (Khaki)
- PS90 (Khaki)
- PS90 (Khaki)
- PS90 (Caqui)
- PS90 (カーキ)
- PS90 (沙色)
- PS90 (沙色)
- PS90 (Khaki)
-
-
- PS90 (Camo)
- PS90 (Kamufláž)
- PS90 (Camo)
- PS90 (Camuflaje)
- PS90 (Камо)
- PS90 (kamuflaż)
- PS90 (Camo)
- PS90 (Camo)
- PS90 (Terepmintás)
- PS90 (Camuflagem)
- PS90 (カモフラージュ)
- PS90 (迷彩)
- PS90 (迷彩)
- PS90 (Camo)
-
-
- PS90 (Hex)
- PS90 (Hex)
- PS90 (Hex)
- PS90 (Hex)
- PS90 (Гекс)
- PS90 (Hex)
- PS90 (hex)
- PS90 (Hex)
- PS90 (Hex)
- PS90 (Hex)
- PS90 (ヘックス)
- PS90 (數位蜂巢迷彩)
- PS90 (数位蜂巢迷彩)
- PS90 (Hex)
-
-
- 5.7mm 50Rnd Mag
- 5,7mm 50-as Tár
- 5,7mm 50-Patronen-Magazin
- Cargador de 50 balas SD de 5,7mm
- Ch. 5,7mm 50Cps
- Magazynek 5,7mm 50rd
- 5.7mm 50náb. Zásobník
- Carregador de 50 projéteis de 5.7mm
- Caricatore 5.7mm 50Rnd
- Магазин из 50-ти 5,7 мм
- 5.7mm 50 発入り弾倉
- 5.7mm 50發 彈匣
- 5.7mm 50发 弹匣
- 5.7mm 50Rnd Mag
-
-
- Caliber: 5.7mm<br />Rounds: 50<br />Used in: P90
- Kaliber: 5,7mm<br />Patronen: 50<br />Eingesetzt von: P90
- Kaliber: 5,7mm<br />Pociski: 50<br />Używany w: P90
- Calibre : 5,7mm<br />Cartouches : 50<br />Utilisé avec : P90
- Calibre: 5.7mm<br />Balas: 50<br />Se usa en: P90
- Калибр: 5,7 мм<br />Патронов: 50<br />Используются с: P90
- Calibro: 5.7mm<br />Munizioni: 50<br />In uso su: P90
- Ráže: 5.7mm<br />Nábojů: 50<br />Použití u: P90
- Calibre: 5.7mm<br />Cartuchos: 50<br />Usado em: P90
- Kaliber: 5,7mm<br />Lövedékek: 50<br />Használható: P90
- 口径: 5.7mm<br />装弾数: 50<br />次で使用: P90
- 口徑: 5.7mm<br />發數: 50<br />使用於: P90
- 口径: 5.7mm<br />发数: 50<br />使用于: P90
- 구경: 5.7mm<br />장탄수: 50<br />사용됨: P90
-
-
-
diff --git a/tools/publish.py b/tools/publish.py
index bd4f4f83894..62317dedc8c 100644
--- a/tools/publish.py
+++ b/tools/publish.py
@@ -98,7 +98,6 @@ def main(argv):
#RHS Compat USA - http://steamcommunity.com/sharedfiles/filedetails/?id=773125288
-
publishFolder(os.path.join(ace_optionals_dir,"@ace_compat_rhs_usf3"), "773125288", changelog_path)
#RHS Compat Russians - http://steamcommunity.com/sharedfiles/filedetails/?id=773131200
@@ -107,9 +106,6 @@ def main(argv):
#RHS Compat GREF - http://steamcommunity.com/sharedfiles/filedetails/?id=884966711
publishFolder(os.path.join(ace_optionals_dir,"@ace_compat_rhs_gref3"), "884966711", changelog_path)
- #ADR97 (p90)- http://steamcommunity.com/sharedfiles/filedetails/?id=773136286
- publishFolder(os.path.join(ace_optionals_dir,"@ace_compat_adr_97"), "773136286", changelog_path)
-
if __name__ == "__main__":