Update to 2.34.0.23

Warthunder-Open-Source-Foundation · Mar 5, 2024 · 4005f32 · 4005f32
1 parent d8e64d2
commit 4005f32
Show file tree

Hide file tree

Showing 909 changed files with 204,081 additions and 68,861 deletions.
diff --git a/battle_rating/all.csv b/battle_rating/all.csv
diff --git a/battle_rating/all.json b/battle_rating/all.json
diff --git a/battle_rating/wpcost.blkx b/battle_rating/wpcost.blkx
diff --git a/bombs/all.json b/bombs/all.json
@@ -397,7 +397,7 @@
   },
   {
     "name": "de_sd10a",
-    "weight": 7.0,
+    "weight": 10.0,
     "explosive_mass": 0.75,
     "explosive_type": "tnt",
     "explosive_equiv": 1.0,
@@ -1349,6 +1349,15 @@
     "can_kill_npc_tank": true,
     "can_kill_npc_ship": true
   },
+  {
+    "name": "su_fab100_default",
+    "weight": 103.5,
+    "explosive_mass": 36.02,
+    "explosive_type": "tnt",
+    "explosive_equiv": 36.0,
+    "can_kill_npc_tank": true,
+    "can_kill_npc_ship": false
+  },
   {
     "name": "su_fab100x",
     "weight": 103.5,
@@ -1457,6 +1466,15 @@
     "can_kill_npc_tank": true,
     "can_kill_npc_ship": true
   },
+  {
+    "name": "su_fab50_default",
+    "weight": 49.76,
+    "explosive_mass": 26.35,
+    "explosive_type": "tnt",
+    "explosive_equiv": 26.0,
+    "can_kill_npc_tank": false,
+    "can_kill_npc_ship": false
+  },
   {
     "name": "su_fab50x",
     "weight": 49.76,
@@ -2062,10 +2080,10 @@
   },
   {
     "name": "uk_4000lb_hc_mk4_bomb",
-    "weight": 1782.6,
-    "explosive_mass": 1339.9,
-    "explosive_type": "amatol",
-    "explosive_equiv": 1340.0,
+    "weight": 1835.2,
+    "explosive_mass": 1392.52,
+    "explosive_type": "rdx_tnt",
+    "explosive_equiv": 1782.0,
     "can_kill_npc_tank": false,
     "can_kill_npc_ship": false
   },

diff --git a/bombs/index/bomb_it_bas.blkx b/bombs/index/bomb_it_bas.blkx
@@ -27,7 +27,7 @@
     "explosiveType": "torpex",
     "explosiveMass": 70.0,
     "bombType": "he_bomb",
-    "bombName": "bomb_bas",
+    "bulletName": "bomb_bas",
     "dragCx": 0.07,
     "caliber": 0.305,
     "length": 1.0,
@@ -85,7 +85,7 @@
       200.0,
       1000.0
     ],
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "explodeHitPower": 400.0,
     "explodeArmorPower": 100.0,
     "explodeRadius": [

diff --git a/bombs/index/bomb_mark36_srboc_launcher.blkx b/bombs/index/bomb_mark36_srboc_launcher.blkx
@@ -8,6 +8,7 @@
   "sound": "grenade_launcher",
   "sound_inside": "grenade_launcher_interior",
   "isBulletBelt": false,
+  "startFx": "muzzle_smoke_screen",
   "helicopterGroup": 2,
   "reloadTime": 8.0,
   "allowHumanReload": true,
@@ -67,7 +68,6 @@
     "waterExplosionEffect": "hit_39_58mm_water",
     "fireEffect": "",
     "smokeEffect": "",
-    "startFx": "",
     "smokeShell": true,
     "smokeFx": "smokescreen_big",
     "smokeExplosionFx": "smoke_shell_explosion",

diff --git a/bombs/index/bomb_uk_107mm_17.blkx b/bombs/index/bomb_uk_107mm_17.blkx
@@ -28,7 +28,7 @@
     "explosiveType": "tnt",
     "explosiveMass": 2.0,
     "bombType": "he_bomb",
-    "bombName": "107mm_he_mk2",
+    "bulletName": "107mm_he_mk2",
     "dragCx": 0.07,
     "caliber": 0.107,
     "length": 0.54,

diff --git a/bombs/index/bomb_uk_hedgehog.blkx b/bombs/index/bomb_uk_hedgehog.blkx
@@ -27,7 +27,7 @@
     "explosiveType": "torpex",
     "explosiveMass": 15.9,
     "bombType": "he_bomb",
-    "bombName": "an_m64a1",
+    "bulletName": "an_m64a1",
     "dragCx": 0.07,
     "caliber": 0.018,
     "length": 1.0,
@@ -85,7 +85,7 @@
       200.0,
       1000.0
     ],
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "explodeHitPower": 400.0,
     "explodeArmorPower": 100.0,
     "explodeRadius": [

diff --git a/bombs/index/bomb_uk_limbo.blkx b/bombs/index/bomb_uk_limbo.blkx
@@ -27,7 +27,7 @@
     "explosiveType": "minol",
     "explosiveMass": 94.0,
     "bombType": "he_bomb",
-    "bombName": "an_m64a1",
+    "bulletName": "an_m64a1",
     "dragCx": 0.07,
     "caliber": 0.305,
     "length": 1.0,
@@ -85,7 +85,7 @@
       200.0,
       1000.0
     ],
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "explodeHitPower": 400.0,
     "explodeArmorPower": 100.0,
     "explodeRadius": [

diff --git a/bombs/index/bomb_uk_mk4.blkx b/bombs/index/bomb_uk_mk4.blkx
@@ -26,7 +26,7 @@
     "explosiveType": "amatol",
     "explosiveMass": 70.8,
     "bombType": "he_bomb",
-    "bombName": "an_m64a1",
+    "bulletName": "an_m64a1",
     "dragCx": 0.07,
     "caliber": 0.36,
     "length": 1.0,
@@ -84,7 +84,7 @@
       200.0,
       1000.0
     ],
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "explodeHitPower": 400.0,
     "explodeArmorPower": 100.0,
     "explodeRadius": [

diff --git a/bombs/index/bomb_us_t37.blkx b/bombs/index/bomb_us_t37.blkx
@@ -26,7 +26,7 @@
     "explosiveType": "torpex",
     "explosiveMass": 15.9,
     "bombType": "he_bomb",
-    "bombName": "an_m64a1",
+    "bulletName": "an_m64a1",
     "dragCx": 0.07,
     "caliber": 0.183,
     "length": 1.0,
@@ -84,7 +84,7 @@
       200.0,
       1000.0
     ],
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "explodeHitPower": 400.0,
     "explodeArmorPower": 100.0,
     "explodeRadius": [

diff --git a/bombs/index/bomb_ussr_82mm_o_832.blkx b/bombs/index/bomb_ussr_82mm_o_832.blkx
@@ -28,7 +28,7 @@
     "explosiveType": "tnt",
     "explosiveMass": 0.4,
     "bombType": "he_bomb",
-    "bombName": "82mm_o_832_he",
+    "bulletName": "82mm_o_832_he",
     "dragCx": 0.07,
     "caliber": 0.82,
     "length": 0.32,

diff --git a/bombs/index/bomb_ussr_mbu600.blkx b/bombs/index/bomb_ussr_mbu600.blkx
@@ -27,7 +27,7 @@
     "explosiveType": "tnt",
     "explosiveMass": 14.4,
     "bombType": "he_bomb",
-    "bombName": "an_m64a1",
+    "bulletName": "an_m64a1",
     "dragCx": 0.07,
     "caliber": 0.018,
     "length": 1.0,
@@ -85,7 +85,7 @@
       200.0,
       1000.0
     ],
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "explodeHitPower": 400.0,
     "explodeArmorPower": 100.0,
     "explodeRadius": [

diff --git a/bombs/index/bomb_ussr_rbm.blkx b/bombs/index/bomb_ussr_rbm.blkx
@@ -27,7 +27,7 @@
     "explosiveType": "amatol",
     "explosiveMass": 70.8,
     "bombType": "he_bomb",
-    "bombName": "an_m64a1",
+    "bulletName": "an_m64a1",
     "dragCx": 0.07,
     "caliber": 0.36,
     "length": 1.0,
@@ -85,7 +85,7 @@
       200.0,
       1000.0
     ],
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "explodeHitPower": 400.0,
     "explodeArmorPower": 100.0,
     "explodeRadius": [

diff --git a/bombs/index/china_250kg_mk_82.blkx b/bombs/index/china_250kg_mk_82.blkx
@@ -9,7 +9,7 @@
     "antiShipBomb": true
   },
   "bomb": {
-    "bombName": "an_mk_82_ldgp",
+    "bulletName": "china_250kg_mk_82",
     "mass": 216.5,
     "mass_lbs": 476.19,
     "caliber": 0.273,
@@ -35,7 +35,7 @@
     "explodeOnRendinst": true,
     "explosiveType": "tnt",
     "explosiveMass": 91.4,
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "hitPowerMult": 1.0,
     "nearHitPower": [
       1.0,

diff --git a/bombs/index/cn_gp_250_3.blkx b/bombs/index/cn_gp_250_3.blkx
@@ -9,7 +9,7 @@
     "antiShipBomb": true
   },
   "bomb": {
-    "bombName": "fab250_43",
+    "bulletName": "cn_gp_250_3",
     "mass": 216.5,
     "caliber": 0.32,
     "length": 1.766,
@@ -34,7 +34,7 @@
     "explodeOnRendinst": true,
     "explosiveType": "tnt",
     "explosiveMass": 91.4,
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "hitPowerMult": 1.0,
     "nearHitPower": [
       1.0,

diff --git a/bombs/index/cn_gp_250_3_default.blkx b/bombs/index/cn_gp_250_3_default.blkx
@@ -9,7 +9,7 @@
     "antiShipBomb": true
   },
   "bomb": {
-    "bombName": "fab250_43",
+    "bulletName": "cn_gp_250_3",
     "mass": 216.5,
     "caliber": 0.32,
     "length": 1.766,
@@ -34,7 +34,7 @@
     "explodeOnRendinst": true,
     "explosiveType": "tnt",
     "explosiveMass": 91.4,
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "hitPowerMult": 1.0,
     "nearHitPower": [
       1.0,

diff --git a/bombs/index/cn_gp_250_4.blkx b/bombs/index/cn_gp_250_4.blkx
@@ -11,7 +11,7 @@
     "antiShipBomb": true
   },
   "bomb": {
-    "bombName": "an_mk_82_ldgp",
+    "bulletName": "cn_gp_250_4",
     "mass": 240.0,
     "mass_lbs": 529.1,
     "caliber": 0.273,
@@ -43,7 +43,7 @@
     "explodeOnRendinst": true,
     "explosiveType": "tnt",
     "explosiveMass": 91.4,
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "hitPowerMult": 1.0,
     "nearHitPower": [
       1.0,

diff --git a/bombs/index/cn_gp_500_3.blkx b/bombs/index/cn_gp_500_3.blkx
@@ -9,7 +9,7 @@
     "antiShipBomb": true
   },
   "bomb": {
-    "bombName": "fab500sv_39",
+    "bulletName": "cn_gp_500_3",
     "mass": 469.0,
     "caliber": 0.45,
     "length": 2.4,
@@ -34,7 +34,7 @@
     "explodeOnRendinst": true,
     "explosiveType": "tnt",
     "explosiveMass": 218.6,
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "hitPowerMult": 1.0,
     "nearHitPower": [
       1.0,

diff --git a/bombs/index/cn_gp_500_4.blkx b/bombs/index/cn_gp_500_4.blkx
@@ -11,7 +11,7 @@
     "antiShipBomb": true
   },
   "bomb": {
-    "bombName": "500_4",
+    "bulletName": "cn_gp_500_4",
     "mass": 508.3,
     "caliber": 0.45,
     "dragCx": 0.097,
@@ -42,7 +42,7 @@
     "explodeOnRendinst": true,
     "explosiveType": "tnt",
     "explosiveMass": 325.0,
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "hitPowerMult": 1.0,
     "nearHitPower": [
       1.0,

diff --git a/bombs/index/cn_ls_1000j.blkx b/bombs/index/cn_ls_1000j.blkx
@@ -8,7 +8,7 @@
   "mesh_deployed": "ch_lgb_tg_1000_deployed",
   "tags": {},
   "bomb": {
-    "bombName": "cn_ls_1000j",
+    "bulletName": "cn_ls_1000j",
     "mass": 1090.0,
     "caliber": 0.377,
     "CxK": 1.775,
@@ -45,7 +45,7 @@
     "guidanceType": "laser",
     "isHasLaserChannel": true,
     "timeLife": 105.0,
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "hitPowerMult": 1.0,
     "nearHitPower": [
       1.0,

diff --git a/bombs/index/cn_ls_500j.blkx b/bombs/index/cn_ls_500j.blkx
@@ -8,7 +8,7 @@
   "mesh": "ch_lgb_ls_500j",
   "tags": {},
   "bomb": {
-    "bombName": "cn_ls_500j_bomb",
+    "bulletName": "cn_ls_500j",
     "mass": 570.0,
     "caliber": 0.377,
     "dragCx": 0.0257,
@@ -49,7 +49,7 @@
       5.0
     ],
     "timeLife": 60.0,
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "hitPowerMult": 1.0,
     "nearHitPower": [
       1.0,

diff --git a/bombs/index/cn_ts_250.blkx b/bombs/index/cn_ts_250.blkx
@@ -8,7 +8,7 @@
   "mesh": "ch_lgb_tg250",
   "tags": {},
   "bomb": {
-    "bombName": "cn_ts_250_bomb",
+    "bulletName": "cn_ts_250",
     "mass": 260.0,
     "caliber": 0.299,
     "dragCx": 0.0257,
@@ -49,7 +49,7 @@
       5.0
     ],
     "timeLife": 80.0,
-    "explodeTreshold": 1E-05,
+    "explodeTreshold": 0.00001,
     "hitPowerMult": 1.0,
     "nearHitPower": [
       1.0,