Skip to content

Commit

Permalink
Update to 2.36.0.18
Browse files Browse the repository at this point in the history
  • Loading branch information
FlareFlo committed Jun 3, 2024
1 parent 4005f32 commit c9d8de7
Show file tree
Hide file tree
Showing 1,557 changed files with 154,499 additions and 50,894 deletions.
269 changes: 158 additions & 111 deletions battle_rating/all.csv

Large diffs are not rendered by default.

1,211 changes: 1,005 additions & 206 deletions battle_rating/all.json

Large diffs are not rendered by default.

44,579 changes: 34,781 additions & 9,798 deletions battle_rating/wpcost.blkx

Large diffs are not rendered by default.

90 changes: 90 additions & 0 deletions bombs/all.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,24 @@
"can_kill_npc_tank": false,
"can_kill_npc_ship": false
},
{
"name": "br_binc_300",
"weight": 401.4,
"explosive_mass": 358.3,
"explosive_type": "napalm",
"explosive_equiv": 1.0,
"can_kill_npc_tank": false,
"can_kill_npc_ship": false
},
{
"name": "br_lizard_2",
"weight": 277.14,
"explosive_mass": 87.1,
"explosive_type": "comp_h6",
"explosive_equiv": 118.0,
"can_kill_npc_tank": false,
"can_kill_npc_ship": false
},
{
"name": "china_250kg_mk_82",
"weight": 216.5,
Expand Down Expand Up @@ -1097,6 +1115,15 @@
"can_kill_npc_tank": false,
"can_kill_npc_ship": false
},
{
"name": "it_630kg_ap",
"weight": 651.5,
"explosive_mass": 120.0,
"explosive_type": "tnt",
"explosive_equiv": 120.0,
"can_kill_npc_tank": true,
"can_kill_npc_ship": true
},
{
"name": "it_800kg_gp",
"weight": 821.6,
Expand Down Expand Up @@ -1250,6 +1277,42 @@
"can_kill_npc_tank": false,
"can_kill_npc_ship": false
},
{
"name": "nld_100kg",
"weight": 118.0,
"explosive_mass": 50.0,
"explosive_type": "tnt",
"explosive_equiv": 50.0,
"can_kill_npc_tank": true,
"can_kill_npc_ship": true
},
{
"name": "nld_300kg",
"weight": 300.0,
"explosive_mass": 105.0,
"explosive_type": "tnt",
"explosive_equiv": 105.0,
"can_kill_npc_tank": true,
"can_kill_npc_ship": true
},
{
"name": "nld_400kg",
"weight": 400.0,
"explosive_mass": 167.0,
"explosive_type": "tnt",
"explosive_equiv": 167.0,
"can_kill_npc_tank": true,
"can_kill_npc_ship": true
},
{
"name": "nld_50kg",
"weight": 39.0,
"explosive_mass": 10.0,
"explosive_type": "tnt",
"explosive_equiv": 10.0,
"can_kill_npc_tank": false,
"can_kill_npc_ship": false
},
{
"name": "ponybomb500",
"weight": 508.3,
Expand Down Expand Up @@ -1619,6 +1682,15 @@
"can_kill_npc_tank": true,
"can_kill_npc_ship": true
},
{
"name": "su_kab_1500kr",
"weight": 1525.0,
"explosive_mass": 440.0,
"explosive_type": "tgaf_5",
"explosive_equiv": 704.0,
"can_kill_npc_tank": false,
"can_kill_npc_ship": false
},
{
"name": "su_kab_500kr",
"weight": 520.0,
Expand Down Expand Up @@ -2150,6 +2222,24 @@
"can_kill_npc_tank": true,
"can_kill_npc_ship": true
},
{
"name": "uk_500lbs_default",
"weight": 213.1,
"explosive_mass": 65.5,
"explosive_type": "tnt",
"explosive_equiv": 66.0,
"can_kill_npc_tank": true,
"can_kill_npc_ship": true
},
{
"name": "uk_540lb_mc_mk2_retarded",
"weight": 295.0,
"explosive_mass": 97.0,
"explosive_type": "torpex",
"explosive_equiv": 155.0,
"can_kill_npc_tank": true,
"can_kill_npc_ship": true
},
{
"name": "uk_540lbs",
"weight": 213.1,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_de_375mm_erika.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"maxDeltaAngle": 0.5,
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "he_ground",
"secondaryShattersPreset": "ap_rocket",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_it_bas.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"bomb": {
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "bomb_ground",
"secondaryShattersPreset": "ap",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_mark36_srboc_launcher.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"maxDeltaAngleVertical": 2.0,
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "he_small_caliber_ground",
"secondaryShattersPreset": "ap",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_uk_107mm_17.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"bomb": {
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "bomb_ground",
"secondaryShattersPreset": "ap",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_uk_hedgehog.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"bomb": {
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "bomb_ground",
"secondaryShattersPreset": "ap",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_uk_limbo.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"bomb": {
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "bomb_ground",
"secondaryShattersPreset": "ap",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_uk_mk4.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"bomb": {
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "bomb_ground",
"secondaryShattersPreset": "ap",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_us_t37.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"bomb": {
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "bomb_ground",
"secondaryShattersPreset": "ap",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_ussr_82mm_o_832.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"bomb": {
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "bomb_ground",
"secondaryShattersPreset": "ap",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_ussr_mbu600.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"bomb": {
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "bomb_ground",
"secondaryShattersPreset": "ap",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_ussr_rbm.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"bomb": {
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "bomb_ground",
"secondaryShattersPreset": "ap",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_ussr_rgb12.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"maxDeltaAngle": 0.5,
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "he_ground",
"secondaryShattersPreset": "ap_rocket",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_ussr_rgb25.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"maxDeltaAngle": 0.5,
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "he_ground",
"secondaryShattersPreset": "ap_rocket",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_ussr_rgb60.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"maxDeltaAngle": 0.5,
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "he_ground",
"secondaryShattersPreset": "ap_rocket",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
2 changes: 1 addition & 1 deletion bombs/index/bomb_ussr_rku36u.blkx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"maxDeltaAngle": 0.5,
"normalizationPreset": "heat",
"ricochetPreset": "he",
"groundRicochetPreset": "he",
"groundRicochetPreset": "he_ground",
"secondaryShattersPreset": "ap_rocket",
"stabilityThreshold": 0.5,
"stabilityCaliberToArmorThreshold": 5.0,
Expand Down
132 changes: 132 additions & 0 deletions bombs/index/br_binc_300.blkx
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
{
"bombGun": true,
"preset_cost": 100,
"shotFreq": 10.0,
"sound": "weapon.bombgun",
"mesh": "br_binc_300_incendiary",
"bomb": {
"bulletName": "us_blu_1",
"mass": 401.4,
"caliber": 0.47,
"length": 3.757,
"distFromCmToStab": -0.05,
"dragCx": 0.07,
"CxK": 1.8,
"wingAreaMult": 0.2,
"WdK": [
0.125,
0.125,
0.125
],
"aerodynamicAxisAngles": [
5.0,
-5.0,
5.0
],
"explosiveType": "napalm",
"explosiveMass": 358.3,
"useDelayExplosion": false,
"fxGroundDust": "dust_ground_explosions_wave_dirt_med",
"fxGrassDust": "dust_ground_explosions_wave_dirt_med",
"fxSandDust": "dust_ground_explosions_wave_sand_med",
"fxSnowDust": "dust_ground_explosions_wave_snow_med",
"fxConcreteDust": "dust_ground_explosions_wave_concrete_med",
"fxWaterShockWave": "dust_waterwave_big",
"waterExplosionEffect": "explosion_napalm_fireball",
"explosionFx": "explosion_napalm_fireball",
"sound": [
"weapon.bomb_mid",
"weapon.bomb_std"
],
"explosionPatchRadius": 15.0,
"iconType": "napalm_large",
"splash": {
"innerRadius": 7.0,
"outerRadius": 12.0,
"penetration": 24.0,
"damage": 6400.0,
"damageType": "napalm"
},
"fireDamage": {
"velocityMult": 3.5,
"maxFlightTime": 10.0,
"maxFlightDistance": 50.0,
"maxRise": 10.0,
"lifeTime": 30.0,
"penetration": 10.0,
"damage": 10.0,
"damageType": "napalm",
"radius": 7.0,
"fxType": "explosion_napalm_wrackages",
"burnFxType": "explosion_napalm_firespot",
"burnFxSize": 12.0,
"scorchMarginSize": 1.0,
"scorchStrength": 1.0,
"scorchDuration": 10.0,
"emitterCount": 3,
"emitterDispersion": 0.7
},
"DamageParts": {
"body": {
"hp": 100.0,
"armorClass": "tank_structural_steel",
"armorThickness": 15.0,
"explosionArmorQuality": 1.0,
"shatterArmorQuality": 1.0
}
},
"DamageEffects": {
"part": {
"name": "body",
"onHit": [
{
"shellState": "inFlight",
"expl": 1.0
},
{
"shellState": "onUnit",
"damageType": "generic",
"expl": 0.2,
"break": 0.8,
"damage": 3.0,
"fHitCritical": true
},
{
"shellState": "onUnit",
"damageType": "generic",
"expl": 0.5,
"break": 0.5,
"damage": 30.0,
"fHitCritical": true
},
{
"shellState": "onUnit",
"damageType": "explosion",
"expl": 0.8,
"break": 0.2,
"damage": 50.0,
"fHitCritical": true
},
{
"shellState": "onUnit",
"damageType": "cumulative",
"expl": 1.0,
"damage": 100.0,
"fHitCritical": true
}
],
"onKill": [
{
"shellState": "inFlight",
"destruction": 1.0
},
{
"shellState": "onUnit",
"expl": 1.0,
"fHitCritical": true
}
]
}
}
}
}
Loading

0 comments on commit c9d8de7

Please sign in to comment.