From 88855ecdbc67dea91107452184c4d6205505a0bd Mon Sep 17 00:00:00 2001
From: Apricot <50947830+Apricot-ale@users.noreply.github.com>
Date: Fri, 21 Jun 2024 03:01:28 +0900
Subject: [PATCH] Compat RF - Improve/Change RF Realistic Name (#10071)
* Update RF Realname Stringtables
Add HEMMT Fire Truck
Change Puma family naming and add missing variation
* typo fix
* Tab to space I hate this
* Update stringtable.xml
Import HEMTT Fire Truck localization from RF
Add "Container" to AMOS. cuz that is not just AMOS...
* Uppercase and add rifle the HERA H6
* add space start of comment
* Add "ASW" to Wildcat AH-11F
For distinction with WY-55(Vanilla Wildcat) and AH-11F (RF Wildcat)
* Remove "Rifle" from H6
Does it really need? Probably not.
---
.../compat_rf_realisticnames/CfgVehicles.hpp | 48 +++++++---
.../compat_rf_realisticnames/stringtable.xml | 91 ++++++++++++-------
2 files changed, 90 insertions(+), 49 deletions(-)
diff --git a/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp b/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp
index 016a569c501..2983525ec87 100644
--- a/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp
+++ b/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp
@@ -19,36 +19,54 @@ class CfgVehicles {
displayName = SUBCSTRING(heli_light_03_unarmed_Name);
};
- class Heli_EC_01A_base_RF;
- class Heli_EC_01A_military_base_RF: Heli_EC_01A_base_RF {
- displayName = SUBCSTRING(ec_01a_military_Name);
- };
-
+ // H240 Transport, Gendarmerie/ION Transport
class Helicopter_Base_H;
class Heli_EC_01_base_RF: Helicopter_Base_H {
displayName = SUBCSTRING(ec_01_base_Name);
};
-
+ // H240C Transport, CIV Transport
class Heli_EC_01_civ_base_RF: Heli_EC_01_base_RF {
- displayName = SUBCSTRING(ec_01_Name);
+ displayName = SUBCSTRING(ec_01_civ_base_Name);
};
-
+ // H235 Transport, CIV Transport Float-less (not used)
+ class Heli_EC_01A_base_RF: Heli_EC_01_base_RF {
+ displayName = SUBCSTRING(ec_01a_base_Name);
+ };
+ // H235C Transport, CIV Transport Float-less
class Heli_EC_01A_civ_base_RF: Heli_EC_01A_base_RF {
- displayName = SUBCSTRING(ec_01a_Name);
+ displayName = SUBCSTRING(ec_01a_civ_base_Name);
};
-
+ // RAI-350M Cougar (Unarmed), IND/UNA Transport Float-less
+ class Heli_EC_01A_military_base_RF: Heli_EC_01A_base_RF {
+ displayName = SUBCSTRING(ec_01a_military_base_Name);
+ };
+ // RAI-360M Cougar, IND/OPF SOCAT Float-less
class Heli_EC_02_base_RF: Heli_EC_01_base_RF {
- displayName = SUBCSTRING(ec_02_Name);
+ displayName = SUBCSTRING(ec_02_base_Name);
};
-
+ // MH-360M Cougar, NATO SOCAT (not used) Float-less
+ class B_Heli_EC_02_RF: Heli_EC_02_base_RF {
+ displayName = SUBCSTRING(ec_02_nato_Name);
+ };
+ // MH-245 Cougar, NATO Combat Type
class Heli_EC_03_base_RF: Heli_EC_01_base_RF {
- displayName = SUBCSTRING(ec_03_Name);
+ displayName = SUBCSTRING(ec_03_base_Name);
};
-
+ // H245 SAR, CIV SAR Type
class Heli_EC_04_base_RF: Heli_EC_01_base_RF {
- displayName = SUBCSTRING(ec_04_Name);
+ displayName = SUBCSTRING(ec_04_base_Name);
+ };
+ // MH-245 Cougar (Unarmed), NATO Transport Type (Maybe SAR?)
+ class Heli_EC_04_military_base_RF: Heli_EC_04_base_RF {
+ displayName = SUBCSTRING(ec_04_military_base_Name);
};
+ // HEMTT
+ class B_Truck_01_fuel_F;
+ class C_Truck_01_water_rf: B_Truck_01_fuel_F {
+ displayName = SUBCSTRING(truck_01_water_Name);
+ };
+
// Typhoon
class O_Truck_03_fuel_F;
class C_Truck_03_water_rf: O_Truck_03_fuel_F {
diff --git a/addons/compat_rf/compat_rf_realisticnames/stringtable.xml b/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
index a31221294cb..e2ccac3c303 100644
--- a/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
+++ b/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
@@ -90,24 +90,24 @@
デザートイーグル Mark XIX L5 (ゴールド)
- Hera H6 (Tan)
- ヘラ H6 (タン)
+ HERA H6 (Tan)
+ HERA H6 (タン)
- Hera H6 (Olive)
- ヘラ H6 (オリーブ)
+ HERA H6 (Olive)
+ HERA H6 (オリーブ)
- Hera H6 (Black)
- ヘラ H6 (ブラック)
+ HERA H6 (Black)
+ HERA H6 (ブラック)
- Hera H6 (Digital)
- ヘラ H6 (AAF迷彩)
+ HERA H6 (Digital)
+ HERA H6 (AAF迷彩)
- Hera H6 (Gold)
- ヘラ H6 (ゴールド)
+ HERA H6 (Gold)
+ HERA H6 (ゴールド)
VS-121 (Black)
@@ -170,40 +170,63 @@
ASh-12 LR (森林迷彩)
- AW159 Wildcat
- AW159 ワイルドキャット
+ AW159 Wildcat ASW
+ AW159 ワイルドキャット ASW
- AW159 Wildcat (Unarmed)
- AW159 ワイルドキャット (非武装)
-
-
- H225M Super Cougar HADR
- H225M シュペル クーガー HADR
+ AW159 Wildcat ASW (Unarmed)
+ AW159 ワイルドキャット ASW (非武装)
- H225M Super Cougar Transport
- H225M シュペル クーガー 輸送
+ H225 Super Puma (Transport)
+ H225 シュペル ピューマ (輸送型)
+
+
+ H225 Super Puma (Civilian)
+ H225 シュペル ピューマ (民生型)
+
+
+ H215 Super Puma (Transport)
+ H215 シュペル ピューマ (輸送型)
-
- H225 Super Puma Transport
- H225 シュペル ピューマ 輸送
+
+ H215 Super Puma (Civilian)
+ H215 シュペル ピューマ (民生型)
-
- H225 Super Puma VIP
- H225 シュペル ピューマ VIP
+
+ H215 Super Puma (Unarmed)
+ H215 シュペル ピューマ (非武装)
+
+
+ H225M Super Cougar SOCAT
+ H225M シュペル クーガー SOCAT
-
+
H225M Super Cougar SOCAT
H225M シュペル クーガー SOCAT
-
- H225M Super Cougar CSAR
- H225M シュペル クーガー CSAR
+
+ H225M Super Cougar
+ H225M シュペル クーガー
-
+
H225 Super Puma SAR
- H225 シュペル ピューマ SAR
+ H225 シュペル ピューマ 捜索救難型
+
+
+ H225M Super Cougar (Unarmed)
+ H225M シュペル クーガー (非武装)
+
+
+ HEMTT Fire Truck
+ HEMTT anti-incendie
+ HEMTT (wersja pożarnicza)
+ HEMTT-Löschfahrzeug
+ HEMTT (camión de bomberos)
+ Пожарная машина HEMTT
+ HEMTT 消防卡车
+ HEMTT contra incêndio
+ HEMTT 消防車
Typhoon Water
@@ -258,8 +281,8 @@
RSG60
- AMOS
- AMOS
+ AMOS Container
+ AMOS コンテナ
Drone40