From 438d68d50fca73559fe89323e1e1f398e42553f0 Mon Sep 17 00:00:00 2001 From: chexit Date: Fri, 30 Oct 2026 14:30:39 +0300 Subject: [PATCH] Replays show SAMs and the world as it was at raid time, film clock for exports; clouds and fog polish; shared texture generator, new missile bodies, octagonal wheels, tracked sides, charred wrecks (#55 part 1) (fork patch 33) Co-Authored-By: Claude Opus 5.5 --- .../airdef/blockstates/buk_chassis_burnt.json | 7 + .../airdef/blockstates/buk_rails_burnt.json | 7 + .../airdef/blockstates/buk_turret_burnt.json | 7 + .../airdef/blockstates/depot_burnt.json | 7 + .../airdef/blockstates/ew_truck_burnt.json | 7 + .../airdef/blockstates/gepard_guns_burnt.json | 7 + .../airdef/blockstates/gepard_hull_burnt.json | 7 + .../blockstates/gepard_turret_burnt.json | 7 + .../blockstates/irist_chassis_burnt.json | 7 + .../airdef/blockstates/irist_tubes_burnt.json | 7 + .../blockstates/nasams_launcher_burnt.json | 7 + .../blockstates/nasams_trailer_burnt.json | 7 + .../blockstates/p1sun_launcher_burnt.json | 7 + .../blockstates/pantsir_pack_burnt.json | 7 + .../blockstates/pantsir_truck_burnt.json | 7 + .../blockstates/pantsir_turret_burnt.json | 7 + .../blockstates/patriot_launcher_burnt.json | 7 + .../blockstates/patriot_trailer_burnt.json | 7 + .../airdef/blockstates/radar_truck_burnt.json | 7 + .../blockstates/s400_chassis_burnt.json | 7 + .../airdef/blockstates/s400_tubes_burnt.json | 7 + .../blockstates/s500_chassis_burnt.json | 7 + .../airdef/blockstates/s500_tubes_burnt.json | 7 + .../airdef/blockstates/searchlight_burnt.json | 7 + .../blockstates/searchlight_head_burnt.json | 7 + .../airdef/blockstates/tor_chassis_burnt.json | 7 + .../airdef/blockstates/tor_turret_burnt.json | 7 + .../airdef/blockstates/tzm_truck_burnt.json | 7 + airdef-mod/assets/airdef/lang/en_us.json | 28 + airdef-mod/assets/airdef/lang/ru_ru.json | 28 + .../airdef/models/block/amraam_missile.json | 1359 ++++++-- .../airdef/models/block/buk_chassis.json | 402 ++- .../models/block/buk_chassis_burnt.json | 843 +++++ .../assets/airdef/models/block/buk_rails.json | 9 +- .../airdef/models/block/buk_rails_burnt.json | 897 +++++ .../airdef/models/block/buk_turret.json | 18 +- .../airdef/models/block/buk_turret_burnt.json | 216 ++ .../assets/airdef/models/block/depot.json | 2 +- .../airdef/models/block/depot_burnt.json | 488 +++ .../assets/airdef/models/block/ew_truck.json | 943 +++++- .../airdef/models/block/ew_truck_burnt.json | 1380 ++++++++ .../assets/airdef/models/block/flare.json | 14 +- .../airdef/models/block/gepard_dish.json | 16 +- .../airdef/models/block/gepard_guns.json | 28 +- .../models/block/gepard_guns_burnt.json | 351 ++ .../airdef/models/block/gepard_hull.json | 42 +- .../models/block/gepard_hull_burnt.json | 560 +++ .../airdef/models/block/gepard_turret.json | 11 +- .../models/block/gepard_turret_burnt.json | 284 ++ .../assets/airdef/models/block/geran3.json | 27 +- .../airdef/models/block/irist_chassis.json | 872 ++++- .../models/block/irist_chassis_burnt.json | 1653 +++++++++ .../airdef/models/block/irist_missile.json | 1403 ++++++-- .../airdef/models/block/irist_tubes.json | 4 +- .../models/block/irist_tubes_burnt.json | 691 ++++ .../assets/airdef/models/block/iskander.json | 1533 +++++++-- .../assets/airdef/models/block/kalibr.json | 1311 ++++++-- .../assets/airdef/models/block/kh101.json | 27 +- .../assets/airdef/models/block/kh22.json | 14 +- .../assets/airdef/models/block/kinzhal.json | 1376 ++++++-- .../assets/airdef/models/block/lancet.json | 14 +- .../assets/airdef/models/block/m48n6.json | 1723 ++++++++-- .../assets/airdef/models/block/m57e6.json | 1151 ++++++- .../assets/airdef/models/block/m77n6.json | 1259 +++++-- .../airdef/models/block/nasams_launcher.json | 4 +- .../models/block/nasams_launcher_burnt.json | 555 +++ .../airdef/models/block/nasams_trailer.json | 438 ++- .../models/block/nasams_trailer_burnt.json | 798 +++++ .../airdef/models/block/p1sun_launcher.json | 4 +- .../models/block/p1sun_launcher_burnt.json | 690 ++++ .../assets/airdef/models/block/pac3.json | 1092 ++++-- .../airdef/models/block/pantsir_pack.json | 72 +- .../models/block/pantsir_pack_burnt.json | 558 +++ .../airdef/models/block/pantsir_truck.json | 888 ++++- .../models/block/pantsir_truck_burnt.json | 1584 +++++++++ .../models/block/pantsir_turret_burnt.json | 283 ++ .../airdef/models/block/patriot_launcher.json | 4 +- .../models/block/patriot_launcher_burnt.json | 556 +++ .../airdef/models/block/patriot_radar.json | 235 +- .../airdef/models/block/patriot_trailer.json | 439 ++- .../models/block/patriot_trailer_burnt.json | 867 +++++ .../airdef/models/block/patriot_truck.json | 702 +++- .../airdef/models/block/radar_trailer.json | 447 ++- .../airdef/models/block/radar_truck.json | 872 ++++- .../models/block/radar_truck_burnt.json | 1721 ++++++++++ .../airdef/models/block/s400_chassis.json | 872 ++++- .../models/block/s400_chassis_burnt.json | 1653 +++++++++ .../airdef/models/block/s400_tubes.json | 4 +- .../airdef/models/block/s400_tubes_burnt.json | 419 +++ .../airdef/models/block/s500_chassis.json | 872 ++++- .../models/block/s500_chassis_burnt.json | 1653 +++++++++ .../airdef/models/block/s500_tubes.json | 4 +- .../airdef/models/block/s500_tubes_burnt.json | 283 ++ .../models/block/searchlight_burnt.json | 145 + .../models/block/searchlight_head_burnt.json | 146 + .../airdef/models/block/tor_chassis.json | 402 ++- .../models/block/tor_chassis_burnt.json | 775 +++++ .../airdef/models/block/tor_turret.json | 17 +- .../airdef/models/block/tor_turret_burnt.json | 625 ++++ .../assets/airdef/models/block/tzm_truck.json | 870 ++++- .../airdef/models/block/tzm_truck_burnt.json | 1723 ++++++++++ .../assets/airdef/models/block/zircon.json | 1296 +++++-- .../airdef/textures/block/bare_antenna.png | Bin 0 -> 986 bytes .../airdef/textures/block/bare_barrel.png | Bin 0 -> 1000 bytes .../airdef/textures/block/bare_barrel_b.png | Bin 0 -> 1530 bytes .../airdef/textures/block/bare_dish.png | Bin 0 -> 995 bytes .../airdef/textures/block/bare_lamp.png | Bin 0 -> 1261 bytes .../airdef/textures/block/bare_lamp_b.png | Bin 0 -> 1527 bytes .../airdef/textures/block/bare_nozzle.png | Bin 0 -> 999 bytes .../airdef/textures/block/bare_nozzle_b.png | Bin 0 -> 1487 bytes .../airdef/textures/block/booster_b.png | Bin 0 -> 432 bytes .../assets/airdef/textures/block/canister.png | Bin 371 -> 1311 bytes .../airdef/textures/block/canister_b.png | Bin 0 -> 1594 bytes .../textures/block/canister_front_b.png | Bin 0 -> 461 bytes .../airdef/textures/block/concrete_b.png | Bin 0 -> 492 bytes .../assets/airdef/textures/block/crate_b.png | Bin 0 -> 461 bytes .../airdef/textures/block/dark_metal.png | Bin 372 -> 1276 bytes .../airdef/textures/block/dark_metal_b.png | Bin 0 -> 1545 bytes .../airdef/textures/block/flecktarn.png | Bin 2209 -> 9663 bytes .../airdef/textures/block/flecktarn_b.png | Bin 0 -> 7042 bytes .../airdef/textures/block/flecktarn_s13.png | Bin 0 -> 10127 bytes .../airdef/textures/block/flecktarn_s13_b.png | Bin 0 -> 7458 bytes .../airdef/textures/block/flecktarn_s21.png | Bin 0 -> 10242 bytes .../airdef/textures/block/flecktarn_s21_b.png | Bin 0 -> 7404 bytes .../airdef/textures/block/flecktarn_s23.png | Bin 0 -> 10743 bytes .../airdef/textures/block/flecktarn_s23_b.png | Bin 0 -> 7879 bytes .../airdef/textures/block/flecktarn_s31.png | Bin 0 -> 10243 bytes .../airdef/textures/block/flecktarn_s31_b.png | Bin 0 -> 7499 bytes .../assets/airdef/textures/block/geran.png | Bin 369 -> 1263 bytes .../airdef/textures/block/glass_cab.png | Bin 0 -> 1617 bytes .../airdef/textures/block/glass_cab_b.png | Bin 0 -> 1567 bytes .../airdef/textures/block/glow_ember.png | Bin 0 -> 94 bytes .../assets/airdef/textures/block/hub.png | Bin 0 -> 781 bytes .../assets/airdef/textures/block/hub_b.png | Bin 0 -> 1419 bytes .../assets/airdef/textures/block/kh101.png | Bin 393 -> 1315 bytes .../assets/airdef/textures/block/lamp_b.png | Bin 0 -> 325 bytes .../assets/airdef/textures/block/lancet.png | Bin 373 -> 1316 bytes .../assets/airdef/textures/block/metal.png | Bin 362 -> 1322 bytes .../assets/airdef/textures/block/metal_b.png | Bin 0 -> 1614 bytes .../airdef/textures/block/missile_grey.png | Bin 367 -> 1295 bytes .../airdef/textures/block/missile_ru_b.png | Bin 0 -> 493 bytes .../airdef/textures/block/nato_green.png | Bin 1917 -> 8209 bytes .../airdef/textures/block/nato_green_b.png | Bin 0 -> 6211 bytes .../airdef/textures/block/nato_green_s21.png | Bin 0 -> 8261 bytes .../textures/block/nato_green_s21_b.png | Bin 0 -> 6014 bytes .../airdef/textures/block/nato_green_s22.png | Bin 0 -> 8406 bytes .../textures/block/nato_green_s22_b.png | Bin 0 -> 6095 bytes .../airdef/textures/block/nato_green_s23.png | Bin 0 -> 8413 bytes .../textures/block/nato_green_s23_b.png | Bin 0 -> 6268 bytes .../airdef/textures/block/nato_green_s31.png | Bin 0 -> 7787 bytes .../textures/block/nato_green_s31_b.png | Bin 0 -> 6080 bytes .../assets/airdef/textures/block/nato_tan.png | Bin 1833 -> 7977 bytes .../airdef/textures/block/radar_big.png | Bin 442 -> 1087 bytes .../airdef/textures/block/radar_face.png | Bin 413 -> 1009 bytes .../airdef/textures/block/radar_face_b.png | Bin 0 -> 1596 bytes .../assets/airdef/textures/block/rm_dark.png | Bin 0 -> 1038 bytes .../airdef/textures/block/rm_dark_t.png | Bin 0 -> 1018 bytes .../assets/airdef/textures/block/rm_grey.png | Bin 0 -> 1008 bytes .../airdef/textures/block/rm_grey_t.png | Bin 0 -> 995 bytes .../assets/airdef/textures/block/rm_khaki.png | Bin 0 -> 1085 bytes .../airdef/textures/block/rm_khaki_t.png | Bin 0 -> 1072 bytes .../assets/airdef/textures/block/rm_pac3.png | Bin 0 -> 1040 bytes .../airdef/textures/block/rm_pac3_t.png | Bin 0 -> 959 bytes .../assets/airdef/textures/block/rm_ru.png | Bin 0 -> 1008 bytes .../assets/airdef/textures/block/rm_ru_t.png | Bin 0 -> 950 bytes .../assets/airdef/textures/block/rm_white.png | Bin 0 -> 1088 bytes .../airdef/textures/block/rm_white_t.png | Bin 0 -> 1024 bytes .../assets/airdef/textures/block/ru_green.png | Bin 2084 -> 8967 bytes .../airdef/textures/block/ru_green_b.png | Bin 0 -> 6534 bytes .../airdef/textures/block/ru_green_s12.png | Bin 0 -> 8924 bytes .../airdef/textures/block/ru_green_s12_b.png | Bin 0 -> 6546 bytes .../airdef/textures/block/ru_green_s13.png | Bin 0 -> 8863 bytes .../airdef/textures/block/ru_green_s13_b.png | Bin 0 -> 6431 bytes .../airdef/textures/block/ru_green_s21.png | Bin 0 -> 8699 bytes .../airdef/textures/block/ru_green_s21_b.png | Bin 0 -> 6439 bytes .../airdef/textures/block/ru_green_s22.png | Bin 0 -> 9081 bytes .../airdef/textures/block/ru_green_s22_b.png | Bin 0 -> 6797 bytes .../airdef/textures/block/ru_green_s23.png | Bin 0 -> 9209 bytes .../airdef/textures/block/ru_green_s23_b.png | Bin 0 -> 6913 bytes .../airdef/textures/block/ru_green_s31.png | Bin 0 -> 8816 bytes .../airdef/textures/block/ru_green_s31_b.png | Bin 0 -> 6575 bytes .../assets/airdef/textures/block/ru_khaki.png | Bin 1803 -> 7990 bytes .../airdef/textures/block/ru_khaki_b.png | Bin 0 -> 6371 bytes .../airdef/textures/block/ru_khaki_s13.png | Bin 0 -> 8347 bytes .../airdef/textures/block/ru_khaki_s13_b.png | Bin 0 -> 6519 bytes .../airdef/textures/block/ru_khaki_s21.png | Bin 0 -> 8329 bytes .../airdef/textures/block/ru_khaki_s21_b.png | Bin 0 -> 6434 bytes .../airdef/textures/block/ru_khaki_s22.png | Bin 0 -> 8329 bytes .../airdef/textures/block/ru_khaki_s22_b.png | Bin 0 -> 6539 bytes .../airdef/textures/block/ru_khaki_s23.png | Bin 0 -> 8334 bytes .../airdef/textures/block/ru_khaki_s23_b.png | Bin 0 -> 6637 bytes .../airdef/textures/block/ru_khaki_s31.png | Bin 0 -> 8328 bytes .../airdef/textures/block/ru_khaki_s31_b.png | Bin 0 -> 6670 bytes .../assets/airdef/textures/block/shahed.png | Bin 394 -> 1322 bytes .../assets/airdef/textures/block/tire.png | Bin 324 -> 1473 bytes .../assets/airdef/textures/block/tire_b.png | Bin 0 -> 1646 bytes .../assets/airdef/textures/block/track.png | Bin 320 -> 1081 bytes .../assets/airdef/textures/block/track_b.png | Bin 0 -> 1476 bytes .../airdef/textures/block/track_side.png | Bin 0 -> 1231 bytes .../airdef/textures/block/track_side_s31.png | Bin 0 -> 1365 bytes .../textures/block/track_side_s31_b.png | Bin 0 -> 1676 bytes .../assets/airdef/textures/block/tube_b.png | Bin 0 -> 469 bytes .../airdef/textures/block/tube_cap_b.png | Bin 0 -> 416 bytes .../assets/airdef/textures/block/tubes6_b.png | Bin 0 -> 496 bytes airdef-mod/src/lib.rs | 43 +- airdef-mod/src/sim/damage.rs | 11 +- airdef-mod/src/sim/mod.rs | 3 + airdef-mod/src/sim/record.rs | 246 +- airdef-mod/src/sim/units.rs | 51 +- docs/HD-RENDERER.md | 12 +- ...ork-world-models-client-particles-so.patch | 2 +- ...izon-mod-report-particles-and-sounds.patch | 2 +- ...-fork-full-screen-post-pass-for-mods.patch | 2 +- ...far-models-as-scaled-impostors-past-.patch | 2 +- ...er.set-views-draws-the-world-from-ot.patch | 2 +- ...er-tick-and-per-event-AirDef-plans-r.patch | 2 +- ...-up-to-1920x1080-full-screen-replays.patch | 2 +- ...ant-terrain-tiles-fog-measured-from-.patch | 2 +- ...id-so-mods-keep-state-per-world-API-.patch | 2 +- ...d-trial-runs-behind-feature-full-so-.patch | 2 +- ...ffer-pass-per-pixel-mod-point-lights.patch | 2 +- ...e-2-sun-and-moon-shadow-cascades-the.patch | 2 +- ...ached-until-a-resize-or-a-new-source.patch | 2 +- ...-per-16x16-tile-surface-and-halo-lis.patch | 2 +- ...pass-in-the-F3-timing-list-half-reso.patch | 2 +- ...only-sun-facing-quads-and-skip-burie.patch | 2 +- ...es-render.model-id-model-generation-.patch | 2 +- ...aling-HORIZON_HD_SCALE-world-G-buffe.patch | 2 +- ...-pass-colour-normal-depth-the-floor-.patch | 2 +- ...lla-texture-on-the-surface-the-biome.patch | 2 +- ...-a-physical-atmosphere-Rayleigh-Mie-.patch | 2 +- ...r-blue-a-little-clearer-ripples-a-li.patch | 2 +- ...sunsets-Rec.-2020-atmosphere-sun-tin.patch | 2 +- ...es-for-simulations-render.query-rays.patch | 2 +- ...vel-from-the-world-not-from-rain-geo.patch | 2 +- ...dules-gfx-hd-one-Rust-file-and-one-W.patch | 2 +- ...scales-that-divide-the-camera-s-6553.patch | 2 +- ...oke-and-missile-trails-with-clear-tu.patch | 2 +- ...ited-by-depth-so-terrain-and-vehicle.patch | 2 +- ...rails-drawn-at-least-as-wide-as-a-gr.patch | 2 +- ...main-view-API-level-15-renders-the-s.patch | 2 +- ...mods-render.set-spot-lights-API-leve.patch | 2 +- ...g-polish-cloud-panorama-cirrus-terra.patch | 2994 +++++++++++++++++ tools/gen_models.py | 264 +- tools/gen_tex.py | 331 ++ 245 files changed, 45962 insertions(+), 3798 deletions(-) create mode 100644 airdef-mod/assets/airdef/blockstates/buk_chassis_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/buk_rails_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/buk_turret_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/depot_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/ew_truck_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/gepard_guns_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/gepard_hull_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/gepard_turret_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/irist_chassis_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/irist_tubes_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/nasams_launcher_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/nasams_trailer_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/p1sun_launcher_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/pantsir_pack_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/pantsir_truck_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/pantsir_turret_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/patriot_launcher_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/patriot_trailer_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/radar_truck_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/s400_chassis_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/s400_tubes_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/s500_chassis_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/s500_tubes_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/searchlight_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/searchlight_head_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/tor_chassis_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/tor_turret_burnt.json create mode 100644 airdef-mod/assets/airdef/blockstates/tzm_truck_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/buk_chassis_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/buk_rails_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/buk_turret_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/depot_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/ew_truck_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/gepard_guns_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/gepard_hull_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/gepard_turret_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/irist_chassis_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/irist_tubes_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/nasams_launcher_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/nasams_trailer_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/p1sun_launcher_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/pantsir_pack_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/pantsir_truck_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/pantsir_turret_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/patriot_launcher_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/patriot_trailer_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/radar_truck_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/s400_chassis_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/s400_tubes_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/s500_chassis_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/s500_tubes_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/searchlight_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/searchlight_head_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/tor_chassis_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/tor_turret_burnt.json create mode 100644 airdef-mod/assets/airdef/models/block/tzm_truck_burnt.json create mode 100644 airdef-mod/assets/airdef/textures/block/bare_antenna.png create mode 100644 airdef-mod/assets/airdef/textures/block/bare_barrel.png create mode 100644 airdef-mod/assets/airdef/textures/block/bare_barrel_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/bare_dish.png create mode 100644 airdef-mod/assets/airdef/textures/block/bare_lamp.png create mode 100644 airdef-mod/assets/airdef/textures/block/bare_lamp_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/bare_nozzle.png create mode 100644 airdef-mod/assets/airdef/textures/block/bare_nozzle_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/booster_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/canister_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/canister_front_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/concrete_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/crate_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/dark_metal_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/flecktarn_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/flecktarn_s13.png create mode 100644 airdef-mod/assets/airdef/textures/block/flecktarn_s13_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/flecktarn_s21.png create mode 100644 airdef-mod/assets/airdef/textures/block/flecktarn_s21_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/flecktarn_s23.png create mode 100644 airdef-mod/assets/airdef/textures/block/flecktarn_s23_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/flecktarn_s31.png create mode 100644 airdef-mod/assets/airdef/textures/block/flecktarn_s31_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/glass_cab.png create mode 100644 airdef-mod/assets/airdef/textures/block/glass_cab_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/glow_ember.png create mode 100644 airdef-mod/assets/airdef/textures/block/hub.png create mode 100644 airdef-mod/assets/airdef/textures/block/hub_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/lamp_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/metal_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/missile_ru_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/nato_green_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/nato_green_s21.png create mode 100644 airdef-mod/assets/airdef/textures/block/nato_green_s21_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/nato_green_s22.png create mode 100644 airdef-mod/assets/airdef/textures/block/nato_green_s22_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/nato_green_s23.png create mode 100644 airdef-mod/assets/airdef/textures/block/nato_green_s23_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/nato_green_s31.png create mode 100644 airdef-mod/assets/airdef/textures/block/nato_green_s31_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/radar_face_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/rm_dark.png create mode 100644 airdef-mod/assets/airdef/textures/block/rm_dark_t.png create mode 100644 airdef-mod/assets/airdef/textures/block/rm_grey.png create mode 100644 airdef-mod/assets/airdef/textures/block/rm_grey_t.png create mode 100644 airdef-mod/assets/airdef/textures/block/rm_khaki.png create mode 100644 airdef-mod/assets/airdef/textures/block/rm_khaki_t.png create mode 100644 airdef-mod/assets/airdef/textures/block/rm_pac3.png create mode 100644 airdef-mod/assets/airdef/textures/block/rm_pac3_t.png create mode 100644 airdef-mod/assets/airdef/textures/block/rm_ru.png create mode 100644 airdef-mod/assets/airdef/textures/block/rm_ru_t.png create mode 100644 airdef-mod/assets/airdef/textures/block/rm_white.png create mode 100644 airdef-mod/assets/airdef/textures/block/rm_white_t.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_s12.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_s12_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_s13.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_s13_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_s21.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_s21_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_s22.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_s22_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_s23.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_s23_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_s31.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_green_s31_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_khaki_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_khaki_s13.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_khaki_s13_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_khaki_s21.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_khaki_s21_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_khaki_s22.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_khaki_s22_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_khaki_s23.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_khaki_s23_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_khaki_s31.png create mode 100644 airdef-mod/assets/airdef/textures/block/ru_khaki_s31_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/tire_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/track_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/track_side.png create mode 100644 airdef-mod/assets/airdef/textures/block/track_side_s31.png create mode 100644 airdef-mod/assets/airdef/textures/block/track_side_s31_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/tube_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/tube_cap_b.png create mode 100644 airdef-mod/assets/airdef/textures/block/tubes6_b.png create mode 100644 horizon-patches/0033-HD-clouds-and-fog-polish-cloud-panorama-cirrus-terra.patch create mode 100644 tools/gen_tex.py diff --git a/airdef-mod/assets/airdef/blockstates/buk_chassis_burnt.json b/airdef-mod/assets/airdef/blockstates/buk_chassis_burnt.json new file mode 100644 index 0000000..4ae6750 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/buk_chassis_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/buk_chassis_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/buk_rails_burnt.json b/airdef-mod/assets/airdef/blockstates/buk_rails_burnt.json new file mode 100644 index 0000000..b532f9f --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/buk_rails_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/buk_rails_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/buk_turret_burnt.json b/airdef-mod/assets/airdef/blockstates/buk_turret_burnt.json new file mode 100644 index 0000000..09c2cd4 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/buk_turret_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/buk_turret_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/depot_burnt.json b/airdef-mod/assets/airdef/blockstates/depot_burnt.json new file mode 100644 index 0000000..952e856 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/depot_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/depot_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/ew_truck_burnt.json b/airdef-mod/assets/airdef/blockstates/ew_truck_burnt.json new file mode 100644 index 0000000..8ec69c3 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/ew_truck_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/ew_truck_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/gepard_guns_burnt.json b/airdef-mod/assets/airdef/blockstates/gepard_guns_burnt.json new file mode 100644 index 0000000..32bb4f8 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/gepard_guns_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/gepard_guns_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/gepard_hull_burnt.json b/airdef-mod/assets/airdef/blockstates/gepard_hull_burnt.json new file mode 100644 index 0000000..64d5413 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/gepard_hull_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/gepard_hull_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/gepard_turret_burnt.json b/airdef-mod/assets/airdef/blockstates/gepard_turret_burnt.json new file mode 100644 index 0000000..435a873 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/gepard_turret_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/gepard_turret_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/irist_chassis_burnt.json b/airdef-mod/assets/airdef/blockstates/irist_chassis_burnt.json new file mode 100644 index 0000000..e42523d --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/irist_chassis_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/irist_chassis_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/irist_tubes_burnt.json b/airdef-mod/assets/airdef/blockstates/irist_tubes_burnt.json new file mode 100644 index 0000000..26f8604 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/irist_tubes_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/irist_tubes_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/nasams_launcher_burnt.json b/airdef-mod/assets/airdef/blockstates/nasams_launcher_burnt.json new file mode 100644 index 0000000..ab6d8d2 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/nasams_launcher_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/nasams_launcher_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/nasams_trailer_burnt.json b/airdef-mod/assets/airdef/blockstates/nasams_trailer_burnt.json new file mode 100644 index 0000000..126c42a --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/nasams_trailer_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/nasams_trailer_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/p1sun_launcher_burnt.json b/airdef-mod/assets/airdef/blockstates/p1sun_launcher_burnt.json new file mode 100644 index 0000000..70ee874 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/p1sun_launcher_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/p1sun_launcher_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/pantsir_pack_burnt.json b/airdef-mod/assets/airdef/blockstates/pantsir_pack_burnt.json new file mode 100644 index 0000000..8712c9c --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/pantsir_pack_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/pantsir_pack_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/pantsir_truck_burnt.json b/airdef-mod/assets/airdef/blockstates/pantsir_truck_burnt.json new file mode 100644 index 0000000..0d9093e --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/pantsir_truck_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/pantsir_truck_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/pantsir_turret_burnt.json b/airdef-mod/assets/airdef/blockstates/pantsir_turret_burnt.json new file mode 100644 index 0000000..e849863 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/pantsir_turret_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/pantsir_turret_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/patriot_launcher_burnt.json b/airdef-mod/assets/airdef/blockstates/patriot_launcher_burnt.json new file mode 100644 index 0000000..b300387 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/patriot_launcher_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/patriot_launcher_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/patriot_trailer_burnt.json b/airdef-mod/assets/airdef/blockstates/patriot_trailer_burnt.json new file mode 100644 index 0000000..e240c55 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/patriot_trailer_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/patriot_trailer_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/radar_truck_burnt.json b/airdef-mod/assets/airdef/blockstates/radar_truck_burnt.json new file mode 100644 index 0000000..5806623 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/radar_truck_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/radar_truck_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/s400_chassis_burnt.json b/airdef-mod/assets/airdef/blockstates/s400_chassis_burnt.json new file mode 100644 index 0000000..de0b384 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/s400_chassis_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/s400_chassis_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/s400_tubes_burnt.json b/airdef-mod/assets/airdef/blockstates/s400_tubes_burnt.json new file mode 100644 index 0000000..1baf821 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/s400_tubes_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/s400_tubes_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/s500_chassis_burnt.json b/airdef-mod/assets/airdef/blockstates/s500_chassis_burnt.json new file mode 100644 index 0000000..fa5f9d4 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/s500_chassis_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/s500_chassis_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/s500_tubes_burnt.json b/airdef-mod/assets/airdef/blockstates/s500_tubes_burnt.json new file mode 100644 index 0000000..f283f89 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/s500_tubes_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/s500_tubes_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/searchlight_burnt.json b/airdef-mod/assets/airdef/blockstates/searchlight_burnt.json new file mode 100644 index 0000000..c1e21a5 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/searchlight_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/searchlight_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/searchlight_head_burnt.json b/airdef-mod/assets/airdef/blockstates/searchlight_head_burnt.json new file mode 100644 index 0000000..17c082a --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/searchlight_head_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/searchlight_head_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/tor_chassis_burnt.json b/airdef-mod/assets/airdef/blockstates/tor_chassis_burnt.json new file mode 100644 index 0000000..69c6bc7 --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/tor_chassis_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/tor_chassis_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/tor_turret_burnt.json b/airdef-mod/assets/airdef/blockstates/tor_turret_burnt.json new file mode 100644 index 0000000..8175c1c --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/tor_turret_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/tor_turret_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/blockstates/tzm_truck_burnt.json b/airdef-mod/assets/airdef/blockstates/tzm_truck_burnt.json new file mode 100644 index 0000000..22ed36a --- /dev/null +++ b/airdef-mod/assets/airdef/blockstates/tzm_truck_burnt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "airdef:block/tzm_truck_burnt" + } + } +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/lang/en_us.json b/airdef-mod/assets/airdef/lang/en_us.json index 76141c3..3c4944d 100644 --- a/airdef-mod/assets/airdef/lang/en_us.json +++ b/airdef-mod/assets/airdef/lang/en_us.json @@ -61,6 +61,34 @@ "block.airdef.beam": "Луч прожектора", "block.airdef.flare": "Осветительная ракета", "block.airdef.reentry": "Боевой блок", + "block.airdef.patriot_trailer_burnt": "Полуприцеп (остов)", + "block.airdef.patriot_launcher_burnt": "ПУ M903 (остов)", + "block.airdef.gepard_hull_burnt": "Корпус Гепарда (остов)", + "block.airdef.gepard_turret_burnt": "Башня Гепарда (остов)", + "block.airdef.gepard_guns_burnt": "Пушки Гепарда (остов)", + "block.airdef.pantsir_truck_burnt": "Шасси Панциря (остов)", + "block.airdef.pantsir_turret_burnt": "Модуль Панциря (остов)", + "block.airdef.pantsir_pack_burnt": "Ракеты и пушки Панциря (остов)", + "block.airdef.s400_chassis_burnt": "Шасси С-400 (остов)", + "block.airdef.s400_tubes_burnt": "ТПК 48Н6 (остов)", + "block.airdef.s500_chassis_burnt": "Шасси С-500 (остов)", + "block.airdef.s500_tubes_burnt": "ТПК 77Н6 (остов)", + "block.airdef.irist_chassis_burnt": "Шасси IRIS-T SLM (остов)", + "block.airdef.irist_tubes_burnt": "Пакет IRIS-T (остов)", + "block.airdef.nasams_trailer_burnt": "Прицеп NASAMS (остов)", + "block.airdef.nasams_launcher_burnt": "Пусковая NASAMS (остов)", + "block.airdef.buk_chassis_burnt": "Шасси Бука (остов)", + "block.airdef.buk_turret_burnt": "Башня Бука (остов)", + "block.airdef.buk_rails_burnt": "Ракеты Бука (остов)", + "block.airdef.tor_chassis_burnt": "Шасси Тора (остов)", + "block.airdef.tor_turret_burnt": "Башня Тора (остов)", + "block.airdef.p1sun_launcher_burnt": "Пусковая P1-SUN (остов)", + "block.airdef.radar_truck_burnt": "Шасси РЛС (остов)", + "block.airdef.depot_burnt": "Склад боеприпасов (остов)", + "block.airdef.tzm_truck_burnt": "Транспортно-заряжающая машина (остов)", + "block.airdef.ew_truck_burnt": "Станция РЭБ (остов)", + "block.airdef.searchlight_burnt": "Прожектор (остов)", + "block.airdef.searchlight_head_burnt": "Голова прожектора (остов)", "item.airdef.designator": "Целеуказатель", "item.airdef.launch_shahed": "Пуск: Шахед-136", "item.airdef.launch_geran3": "Пуск: Герань-3", diff --git a/airdef-mod/assets/airdef/lang/ru_ru.json b/airdef-mod/assets/airdef/lang/ru_ru.json index 76141c3..3c4944d 100644 --- a/airdef-mod/assets/airdef/lang/ru_ru.json +++ b/airdef-mod/assets/airdef/lang/ru_ru.json @@ -61,6 +61,34 @@ "block.airdef.beam": "Луч прожектора", "block.airdef.flare": "Осветительная ракета", "block.airdef.reentry": "Боевой блок", + "block.airdef.patriot_trailer_burnt": "Полуприцеп (остов)", + "block.airdef.patriot_launcher_burnt": "ПУ M903 (остов)", + "block.airdef.gepard_hull_burnt": "Корпус Гепарда (остов)", + "block.airdef.gepard_turret_burnt": "Башня Гепарда (остов)", + "block.airdef.gepard_guns_burnt": "Пушки Гепарда (остов)", + "block.airdef.pantsir_truck_burnt": "Шасси Панциря (остов)", + "block.airdef.pantsir_turret_burnt": "Модуль Панциря (остов)", + "block.airdef.pantsir_pack_burnt": "Ракеты и пушки Панциря (остов)", + "block.airdef.s400_chassis_burnt": "Шасси С-400 (остов)", + "block.airdef.s400_tubes_burnt": "ТПК 48Н6 (остов)", + "block.airdef.s500_chassis_burnt": "Шасси С-500 (остов)", + "block.airdef.s500_tubes_burnt": "ТПК 77Н6 (остов)", + "block.airdef.irist_chassis_burnt": "Шасси IRIS-T SLM (остов)", + "block.airdef.irist_tubes_burnt": "Пакет IRIS-T (остов)", + "block.airdef.nasams_trailer_burnt": "Прицеп NASAMS (остов)", + "block.airdef.nasams_launcher_burnt": "Пусковая NASAMS (остов)", + "block.airdef.buk_chassis_burnt": "Шасси Бука (остов)", + "block.airdef.buk_turret_burnt": "Башня Бука (остов)", + "block.airdef.buk_rails_burnt": "Ракеты Бука (остов)", + "block.airdef.tor_chassis_burnt": "Шасси Тора (остов)", + "block.airdef.tor_turret_burnt": "Башня Тора (остов)", + "block.airdef.p1sun_launcher_burnt": "Пусковая P1-SUN (остов)", + "block.airdef.radar_truck_burnt": "Шасси РЛС (остов)", + "block.airdef.depot_burnt": "Склад боеприпасов (остов)", + "block.airdef.tzm_truck_burnt": "Транспортно-заряжающая машина (остов)", + "block.airdef.ew_truck_burnt": "Станция РЭБ (остов)", + "block.airdef.searchlight_burnt": "Прожектор (остов)", + "block.airdef.searchlight_head_burnt": "Голова прожектора (остов)", "item.airdef.designator": "Целеуказатель", "item.airdef.launch_shahed": "Пуск: Шахед-136", "item.airdef.launch_geran3": "Пуск: Герань-3", diff --git a/airdef-mod/assets/airdef/models/block/amraam_missile.json b/airdef-mod/assets/airdef/models/block/amraam_missile.json index 133d941..5571f67 100644 --- a/airdef-mod/assets/airdef/models/block/amraam_missile.json +++ b/airdef-mod/assets/airdef/models/block/amraam_missile.json @@ -2,20 +2,23 @@ "ambientocclusion": false, "textures": { "nose_dark": "airdef:block/nose_dark", + "rm_white": "airdef:block/rm_white", + "rm_white_t": "airdef:block/rm_white_t", "white": "airdef:block/white", - "nozzle": "airdef:block/nozzle", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", "particle": "airdef:block/nose_dark" }, "elements": [ { "from": [ - 7.333333333333333, - 7.333333333333333, + 7.294558312447602, + 7.294558312447602, -16.0 ], "to": [ - 8.666666666666666, - 8.666666666666666, + 8.705441687552398, + 8.705441687552398, -13.666666666666666 ], "faces": { @@ -23,8 +26,8 @@ "uv": [ 0, 0, - 1.333333333333333, - 1.333333333333333 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#nose_dark" }, @@ -32,8 +35,8 @@ "uv": [ 0, 0, - 1.333333333333333, - 1.333333333333333 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#nose_dark" }, @@ -42,7 +45,7 @@ 0, 0, 2.333333333333334, - 1.333333333333333 + 1.4108833751047953 ], "texture": "#nose_dark" }, @@ -51,7 +54,7 @@ 0, 0, 2.333333333333334, - 1.333333333333333 + 1.4108833751047953 ], "texture": "#nose_dark" }, @@ -59,7 +62,7 @@ "uv": [ 0, 0, - 1.333333333333333, + 1.4108833751047953, 2.333333333333334 ], "texture": "#nose_dark" @@ -68,7 +71,7 @@ "uv": [ 0, 0, - 1.333333333333333, + 1.4108833751047953, 2.333333333333334 ], "texture": "#nose_dark" @@ -77,22 +80,22 @@ }, { "from": [ - 7.0, - 7.0, - -13.666666666666666 + 7.294558312447602, + 7.294558312447602, + -15.97 ], "to": [ - 9.0, - 9.0, - -11.333333333333332 + 8.705441687552398, + 8.705441687552398, + -13.696666666666665 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#nose_dark" }, @@ -100,8 +103,85 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 1.4108833751047953 + ], + "texture": "#nose_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.273333333333335, + 1.4108833751047953 + ], + "texture": "#nose_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.273333333333335, + 1.4108833751047953 + ], + "texture": "#nose_dark" + }, + "up": { + "uv": [ + 0, + 0, + 1.4108833751047953, + 2.273333333333335 + ], + "texture": "#nose_dark" + }, + "down": { + "uv": [ + 0, + 0, + 1.4108833751047953, + 2.273333333333335 + ], + "texture": "#nose_dark" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -14.833333333333332 + ] + } + }, + { + "from": [ + 6.8507775398726425, + 6.8507775398726425, + -13.666666666666666 + ], + "to": [ + 9.149222460127358, + 9.149222460127358, + -11.333333333333332 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "south": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.298444920254716 ], "texture": "#nose_dark" }, @@ -110,7 +190,7 @@ 0, 0, 2.333333333333334, - 2.0 + 2.298444920254716 ], "texture": "#nose_dark" }, @@ -119,7 +199,7 @@ 0, 0, 2.333333333333334, - 2.0 + 2.298444920254716 ], "texture": "#nose_dark" }, @@ -127,7 +207,7 @@ "uv": [ 0, 0, - 2.0, + 2.298444920254716, 2.333333333333334 ], "texture": "#nose_dark" @@ -136,7 +216,7 @@ "uv": [ 0, 0, - 2.0, + 2.298444920254716, 2.333333333333334 ], "texture": "#nose_dark" @@ -145,13 +225,90 @@ }, { "from": [ - 6.666666666666666, - 6.666666666666666, + 6.8507775398726425, + 6.8507775398726425, + -13.636666666666667 + ], + "to": [ + 9.149222460127358, + 9.149222460127358, + -11.363333333333332 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "south": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "up": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.273333333333335 + ], + "texture": "#nose_dark" + }, + "down": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.273333333333335 + ], + "texture": "#nose_dark" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -12.5 + ] + } + }, + { + "from": [ + 6.517798430927714, + 6.517798430927714, -11.333333333333332 ], "to": [ - 9.333333333333334, - 9.333333333333334, + 9.482201569072286, + 9.482201569072286, -9.0 ], "faces": { @@ -159,8 +316,8 @@ "uv": [ 0, 0, - 2.666666666666668, - 2.666666666666668 + 2.964403138144572, + 2.964403138144572 ], "texture": "#nose_dark" }, @@ -168,8 +325,8 @@ "uv": [ 0, 0, - 2.666666666666668, - 2.666666666666668 + 2.964403138144572, + 2.964403138144572 ], "texture": "#nose_dark" }, @@ -178,7 +335,7 @@ 0, 0, 2.333333333333332, - 2.666666666666668 + 2.964403138144572 ], "texture": "#nose_dark" }, @@ -187,7 +344,7 @@ 0, 0, 2.333333333333332, - 2.666666666666668 + 2.964403138144572 ], "texture": "#nose_dark" }, @@ -195,7 +352,7 @@ "uv": [ 0, 0, - 2.666666666666668, + 2.964403138144572, 2.333333333333332 ], "texture": "#nose_dark" @@ -204,7 +361,7 @@ "uv": [ 0, 0, - 2.666666666666668, + 2.964403138144572, 2.333333333333332 ], "texture": "#nose_dark" @@ -213,90 +370,244 @@ }, { "from": [ - 6.5, - 6.5, + 6.517798430927714, + 6.517798430927714, + -11.303333333333333 + ], + "to": [ + 9.482201569072286, + 9.482201569072286, + -9.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "south": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "up": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.2733333333333334 + ], + "texture": "#nose_dark" + }, + "down": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.2733333333333334 + ], + "texture": "#nose_dark" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -10.166666666666666 + ] + } + }, + { + "from": [ + 6.4293700000000005, + 6.4293700000000005, -9.0 ], "to": [ - 9.5, - 9.5, - 26.0 + 9.57063, + 9.57063, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 3.0 + 3.141259999999999, + 3.141259999999999 ], - "texture": "#white" + "texture": "#rm_white" }, "south": { "uv": [ 0, 0, - 3.0, - 3.0 + 3.141259999999999, + 3.141259999999999 ], - "texture": "#white" + "texture": "#rm_white" }, "east": { "uv": [ 0, 0, 16, - 3.0 + 3.141259999999999 ], - "texture": "#white" + "texture": "#rm_white" }, "west": { "uv": [ 0, 0, 16, - 3.0 + 3.141259999999999 ], - "texture": "#white" + "texture": "#rm_white" }, "up": { "uv": [ 0, 0, - 3.0, + 3.141259999999999, 16 ], - "texture": "#white" + "texture": "#rm_white_t" }, "down": { "uv": [ 0, 0, - 3.0, + 3.141259999999999, 16 ], - "texture": "#white" + "texture": "#rm_white_t" } } }, { "from": [ - 1.0, - 7.6, + 6.4293700000000005, + 6.4293700000000005, + -8.97 + ], + "to": [ + 9.57063, + 9.57063, + 23.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "south": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "up": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_white_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_white_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 7.499999999999999 + ] + } + }, + { + "from": [ + 9.53, + 7.65, 2.0 ], "to": [ - 6.5, - 8.4, - 9.0 + 12.555, + 8.35, + 8.0 ], "faces": { "north": { "uv": [ 0, 0, - 5.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], "texture": "#white" }, @@ -304,8 +615,8 @@ "uv": [ 0, 0, - 5.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], "texture": "#white" }, @@ -313,8 +624,8 @@ "uv": [ 0, 0, - 7.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -322,8 +633,8 @@ "uv": [ 0, 0, - 7.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -331,8 +642,8 @@ "uv": [ 0, 0, - 5.5, - 7.0 + 3.0250000000000004, + 6.0 ], "texture": "#white" }, @@ -340,8 +651,8 @@ "uv": [ 0, 0, - 5.5, - 7.0 + 3.0250000000000004, + 6.0 ], "texture": "#white" } @@ -349,22 +660,22 @@ }, { "from": [ - 9.5, - 7.6, + 3.4450000000000003, + 7.65, 2.0 ], "to": [ - 15.0, - 8.4, - 9.0 + 6.470000000000001, + 8.35, + 8.0 ], "faces": { "north": { "uv": [ 0, 0, - 5.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], "texture": "#white" }, @@ -372,8 +683,8 @@ "uv": [ 0, 0, - 5.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], "texture": "#white" }, @@ -381,8 +692,8 @@ "uv": [ 0, 0, - 7.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -390,8 +701,8 @@ "uv": [ 0, 0, - 7.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -399,8 +710,8 @@ "uv": [ 0, 0, - 5.5, - 7.0 + 3.0250000000000004, + 6.0 ], "texture": "#white" }, @@ -408,8 +719,8 @@ "uv": [ 0, 0, - 5.5, - 7.0 + 3.0250000000000004, + 6.0 ], "texture": "#white" } @@ -417,22 +728,158 @@ }, { "from": [ - 7.6, - 1.0, + 12.555, + 7.65, + 5.5 + ], + "to": [ + 15.030000000000001, + 8.35, + 8.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 0.6999999999999993 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 0.6999999999999993 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 0.9699999999999989, + 7.65, + 5.5 + ], + "to": [ + 3.4450000000000003, + 8.35, + 8.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 0.6999999999999993 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 0.6999999999999993 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 2.4750000000000014, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 9.53, 2.0 ], "to": [ - 8.4, - 6.5, - 9.0 + 8.35, + 12.555, + 8.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 5.5 + 0.6999999999999993, + 3.0250000000000004 ], "texture": "#white" }, @@ -440,8 +887,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 5.5 + 0.6999999999999993, + 3.0250000000000004 ], "texture": "#white" }, @@ -449,8 +896,8 @@ "uv": [ 0, 0, - 7.0, - 5.5 + 6.0, + 3.0250000000000004 ], "texture": "#white" }, @@ -458,8 +905,8 @@ "uv": [ 0, 0, - 7.0, - 5.5 + 6.0, + 3.0250000000000004 ], "texture": "#white" }, @@ -467,8 +914,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 7.0 + 0.6999999999999993, + 6.0 ], "texture": "#white" }, @@ -476,8 +923,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 7.0 + 0.6999999999999993, + 6.0 ], "texture": "#white" } @@ -485,22 +932,90 @@ }, { "from": [ - 7.6, - 9.5, + 7.65, + 12.555, + 5.5 + ], + "to": [ + 8.35, + 15.03, + 8.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.4749999999999996 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.4749999999999996 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 3.4449999999999994, 2.0 ], "to": [ - 8.4, - 15.0, - 9.0 + 8.35, + 6.47, + 8.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 5.5 + 0.6999999999999993, + 3.0250000000000004 ], "texture": "#white" }, @@ -508,8 +1023,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 5.5 + 0.6999999999999993, + 3.0250000000000004 ], "texture": "#white" }, @@ -517,8 +1032,8 @@ "uv": [ 0, 0, - 7.0, - 5.5 + 6.0, + 3.0250000000000004 ], "texture": "#white" }, @@ -526,8 +1041,8 @@ "uv": [ 0, 0, - 7.0, - 5.5 + 6.0, + 3.0250000000000004 ], "texture": "#white" }, @@ -535,8 +1050,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 7.0 + 0.6999999999999993, + 6.0 ], "texture": "#white" }, @@ -544,8 +1059,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 7.0 + 0.6999999999999993, + 6.0 ], "texture": "#white" } @@ -553,22 +1068,90 @@ }, { "from": [ - 4.0, - 7.6, + 7.65, + 0.9699999999999998, + 5.5 + ], + "to": [ + 8.35, + 3.4449999999999994, + 8.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.4749999999999996 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.4749999999999996 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 9.53, + 7.65, 19.0 ], "to": [ - 6.5, - 8.4, - 25.0 + 11.620000000000001, + 8.35, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 2.5, - 0.8000000000000007 + 2.0900000000000016, + 0.6999999999999993 ], "texture": "#white" }, @@ -576,8 +1159,8 @@ "uv": [ 0, 0, - 2.5, - 0.8000000000000007 + 2.0900000000000016, + 0.6999999999999993 ], "texture": "#white" }, @@ -585,8 +1168,8 @@ "uv": [ 0, 0, - 6.0, - 0.8000000000000007 + 5.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -594,8 +1177,8 @@ "uv": [ 0, 0, - 6.0, - 0.8000000000000007 + 5.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -603,8 +1186,8 @@ "uv": [ 0, 0, - 2.5, - 6.0 + 2.0900000000000016, + 5.0 ], "texture": "#white" }, @@ -612,8 +1195,8 @@ "uv": [ 0, 0, - 2.5, - 6.0 + 2.0900000000000016, + 5.0 ], "texture": "#white" } @@ -621,22 +1204,22 @@ }, { "from": [ - 9.5, - 7.6, + 4.379999999999999, + 7.65, 19.0 ], "to": [ - 12.0, - 8.4, - 25.0 + 6.470000000000001, + 8.35, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 2.5, - 0.8000000000000007 + 2.0900000000000016, + 0.6999999999999993 ], "texture": "#white" }, @@ -644,8 +1227,8 @@ "uv": [ 0, 0, - 2.5, - 0.8000000000000007 + 2.0900000000000016, + 0.6999999999999993 ], "texture": "#white" }, @@ -653,8 +1236,8 @@ "uv": [ 0, 0, - 6.0, - 0.8000000000000007 + 5.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -662,8 +1245,8 @@ "uv": [ 0, 0, - 6.0, - 0.8000000000000007 + 5.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -671,8 +1254,8 @@ "uv": [ 0, 0, - 2.5, - 6.0 + 2.0900000000000016, + 5.0 ], "texture": "#white" }, @@ -680,8 +1263,8 @@ "uv": [ 0, 0, - 2.5, - 6.0 + 2.0900000000000016, + 5.0 ], "texture": "#white" } @@ -689,22 +1272,158 @@ }, { "from": [ - 7.6, - 4.0, + 11.620000000000001, + 7.65, + 21.5 + ], + "to": [ + 13.33, + 8.35, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.709999999999999, + 0.6999999999999993 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 1.709999999999999, + 0.6999999999999993 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 1.709999999999999, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 1.709999999999999, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 2.67, + 7.65, + 21.5 + ], + "to": [ + 4.379999999999999, + 8.35, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.709999999999999, + 0.6999999999999993 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 1.709999999999999, + 0.6999999999999993 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 1.709999999999999, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 1.709999999999999, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 9.53, 19.0 ], "to": [ - 8.4, - 6.5, - 25.0 + 8.35, + 11.62, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 2.5 + 0.6999999999999993, + 2.09 ], "texture": "#white" }, @@ -712,8 +1431,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 2.5 + 0.6999999999999993, + 2.09 ], "texture": "#white" }, @@ -721,8 +1440,8 @@ "uv": [ 0, 0, - 6.0, - 2.5 + 5.0, + 2.09 ], "texture": "#white" }, @@ -730,8 +1449,8 @@ "uv": [ 0, 0, - 6.0, - 2.5 + 5.0, + 2.09 ], "texture": "#white" }, @@ -739,8 +1458,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 6.0 + 0.6999999999999993, + 5.0 ], "texture": "#white" }, @@ -748,8 +1467,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 6.0 + 0.6999999999999993, + 5.0 ], "texture": "#white" } @@ -757,22 +1476,90 @@ }, { "from": [ - 7.6, - 9.5, + 7.65, + 11.62, + 21.5 + ], + "to": [ + 8.35, + 13.329999999999998, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.709999999999999 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.709999999999999 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 1.709999999999999 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 1.709999999999999 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 4.38, 19.0 ], "to": [ - 8.4, - 12.0, - 25.0 + 8.35, + 6.47, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 2.5 + 0.6999999999999993, + 2.09 ], "texture": "#white" }, @@ -780,8 +1567,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 2.5 + 0.6999999999999993, + 2.09 ], "texture": "#white" }, @@ -789,8 +1576,8 @@ "uv": [ 0, 0, - 6.0, - 2.5 + 5.0, + 2.09 ], "texture": "#white" }, @@ -798,8 +1585,8 @@ "uv": [ 0, 0, - 6.0, - 2.5 + 5.0, + 2.09 ], "texture": "#white" }, @@ -807,8 +1594,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 6.0 + 0.6999999999999993, + 5.0 ], "texture": "#white" }, @@ -816,8 +1603,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 6.0 + 0.6999999999999993, + 5.0 ], "texture": "#white" } @@ -825,69 +1612,205 @@ }, { "from": [ - 7.0, - 7.0, - 26.0 + 7.65, + 2.67, + 21.5 ], "to": [ - 9.0, - 9.0, - 28.0 + 8.35, + 4.38, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.6999999999999993, + 1.71 ], - "texture": "#nozzle" + "texture": "#white" }, "south": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.6999999999999993, + 1.71 ], - "texture": "#nozzle" + "texture": "#white" }, "east": { "uv": [ 0, 0, - 2.0, - 2.0 + 2.5, + 1.71 ], - "texture": "#nozzle" + "texture": "#white" }, "west": { "uv": [ 0, 0, - 2.0, - 2.0 + 2.5, + 1.71 ], - "texture": "#nozzle" + "texture": "#white" }, "up": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.6999999999999993, + 2.5 ], - "texture": "#nozzle" + "texture": "#white" }, "down": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.6999999999999993, + 2.5 ], - "texture": "#nozzle" + "texture": "#white" + } + } + }, + { + "from": [ + 6.64, + 6.64, + 24.0 + ], + "to": [ + 9.36, + 9.36, + 25.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 7.0649999999999995, + 7.0649999999999995, + 25.6 + ], + "to": [ + 8.935, + 8.935, + 25.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.870000000000001, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 1.870000000000001, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 1.870000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 1.870000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" } } } diff --git a/airdef-mod/assets/airdef/models/block/buk_chassis.json b/airdef-mod/assets/airdef/models/block/buk_chassis.json index 782529a..d19fa97 100644 --- a/airdef-mod/assets/airdef/models/block/buk_chassis.json +++ b/airdef-mod/assets/airdef/models/block/buk_chassis.json @@ -1,10 +1,17 @@ { "ambientocclusion": false, "textures": { + "ru_green_s21": "airdef:block/ru_green_s21", + "ru_green_s31": "airdef:block/ru_green_s31", + "ru_green_s23": "airdef:block/ru_green_s23", "ru_green": "airdef:block/ru_green", "dark_metal": "airdef:block/dark_metal", + "bare_nozzle": "airdef:block/bare_nozzle", "track": "airdef:block/track", - "particle": "airdef:block/ru_green" + "track_side_s31": "airdef:block/track_side_s31", + "ru_green_s13": "airdef:block/ru_green_s13", + "bare_lamp": "airdef:block/bare_lamp", + "particle": "airdef:block/ru_green_s21" }, "elements": [ { @@ -26,7 +33,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -35,7 +42,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -44,7 +51,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "west": { "uv": [ @@ -53,7 +60,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "up": { "uv": [ @@ -62,7 +69,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" }, "down": { "uv": [ @@ -71,7 +78,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" } } }, @@ -94,7 +101,7 @@ 16, 6.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -103,7 +110,7 @@ 16, 6.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -130,7 +137,7 @@ 16, 2.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "down": { "uv": [ @@ -139,10 +146,87 @@ 16, 2.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" } } }, + { + "from": [ + -9.0, + 10.0, + -15.0 + ], + "to": [ + 25.0, + 14.0, + -12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_green" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_green" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_green_s21" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_green_s21" + } + }, + "rotation": { + "angle": -22.5, + "axis": "x", + "origin": [ + 8.0, + 12.0, + -13.5 + ] + } + }, { "from": [ -8.0, @@ -211,6 +295,142 @@ } } }, + { + "from": [ + -5.0, + 15.2, + 24.0 + ], + "to": [ + 21.0, + 15.8, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + -1.0, + 15.0, + -10.0 + ], + "to": [ + 9.0, + 16.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal" + } + } + }, { "from": [ -14.0, @@ -248,7 +468,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "west": { "uv": [ @@ -257,7 +477,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "up": { "uv": [ @@ -316,7 +536,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "west": { "uv": [ @@ -325,7 +545,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "up": { "uv": [ @@ -384,7 +604,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "west": { "uv": [ @@ -393,7 +613,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "up": { "uv": [ @@ -402,7 +622,7 @@ 4.5, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s13" }, "down": { "uv": [ @@ -411,7 +631,7 @@ 4.5, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s13" } } }, @@ -452,7 +672,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "west": { "uv": [ @@ -461,7 +681,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "up": { "uv": [ @@ -470,7 +690,7 @@ 4.5, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s13" }, "down": { "uv": [ @@ -479,7 +699,143 @@ 4.5, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s13" + } + } + }, + { + "from": [ + -4.0, + 11.0, + -16.0 + ], + "to": [ + -1.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" + } + } + }, + { + "from": [ + 17.0, + 11.0, + -16.0 + ], + "to": [ + 20.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" } } } diff --git a/airdef-mod/assets/airdef/models/block/buk_chassis_burnt.json b/airdef-mod/assets/airdef/models/block/buk_chassis_burnt.json new file mode 100644 index 0000000..d32f71e --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/buk_chassis_burnt.json @@ -0,0 +1,843 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_green_s21_b": "airdef:block/ru_green_s21_b", + "ru_green_s31_b": "airdef:block/ru_green_s31_b", + "ru_green_s23_b": "airdef:block/ru_green_s23_b", + "ru_green_b": "airdef:block/ru_green_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "bare_nozzle_b": "airdef:block/bare_nozzle_b", + "track_b": "airdef:block/track_b", + "track_side_s31_b": "airdef:block/track_side_s31_b", + "ru_green_s13_b": "airdef:block/ru_green_s13_b", + "bare_lamp_b": "airdef:block/bare_lamp_b", + "particle": "airdef:block/ru_green_s21_b" + }, + "elements": [ + { + "from": [ + -10.0, + 4.0, + -14.0 + ], + "to": [ + 26.0, + 15.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + } + } + }, + { + "from": [ + -10.0, + 4.0, + -16.0 + ], + "to": [ + 26.0, + 10.0, + -14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_s21_b" + } + } + }, + { + "from": [ + -9.0, + 10.0, + -15.0 + ], + "to": [ + 25.0, + 14.0, + -12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_green_s21_b" + } + }, + "rotation": { + "angle": -22.5, + "axis": "x", + "origin": [ + 8.0, + 12.0, + -13.5 + ] + } + }, + { + "from": [ + -8.0, + 15.0, + 22.0 + ], + "to": [ + 24.0, + 16.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -5.0, + 15.2, + 24.0 + ], + "to": [ + 21.0, + 15.8, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle_b" + } + } + }, + { + "from": [ + -1.0, + 15.0, + -10.0 + ], + "to": [ + 9.0, + 16.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -14.0, + 0.0, + -15.0 + ], + "to": [ + -10.0, + 9.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + } + } + }, + { + "from": [ + 26.0, + 0.0, + -15.0 + ], + "to": [ + 30.0, + 9.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + } + } + }, + { + "from": [ + -14.5, + 5.0, + -15.0 + ], + "to": [ + -10.0, + 10.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_green_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_green_s13_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_green_s13_b" + } + } + }, + { + "from": [ + 26.0, + 5.0, + -15.0 + ], + "to": [ + 30.5, + 10.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_green_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_green_s13_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_green_s13_b" + } + } + }, + { + "from": [ + -4.0, + 11.0, + -16.0 + ], + "to": [ + -1.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp_b" + } + } + }, + { + "from": [ + 17.0, + 11.0, + -16.0 + ], + "to": [ + 20.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/buk_rails.json b/airdef-mod/assets/airdef/models/block/buk_rails.json index 9460036..a5c717b 100644 --- a/airdef-mod/assets/airdef/models/block/buk_rails.json +++ b/airdef-mod/assets/airdef/models/block/buk_rails.json @@ -4,6 +4,7 @@ "missile_ru": "airdef:block/missile_ru", "booster": "airdef:block/booster", "dark_metal": "airdef:block/dark_metal", + "ru_green_s31": "airdef:block/ru_green_s31", "ru_green": "airdef:block/ru_green", "particle": "airdef:block/missile_ru" }, @@ -843,7 +844,7 @@ 16, 2.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "south": { "uv": [ @@ -852,7 +853,7 @@ 16, 2.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "east": { "uv": [ @@ -879,7 +880,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "down": { "uv": [ @@ -888,7 +889,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" } } } diff --git a/airdef-mod/assets/airdef/models/block/buk_rails_burnt.json b/airdef-mod/assets/airdef/models/block/buk_rails_burnt.json new file mode 100644 index 0000000..a5311a8 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/buk_rails_burnt.json @@ -0,0 +1,897 @@ +{ + "ambientocclusion": false, + "textures": { + "missile_ru_b": "airdef:block/missile_ru_b", + "booster_b": "airdef:block/booster_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "ru_green_s31_b": "airdef:block/ru_green_s31_b", + "ru_green_b": "airdef:block/ru_green_b", + "particle": "airdef:block/missile_ru_b" + }, + "elements": [ + { + "from": [ + -10.5, + 4.0, + -16.0 + ], + "to": [ + -7.5, + 7.0, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + } + } + }, + { + "from": [ + -10.8, + 3.5, + 20.0 + ], + "to": [ + -7.2, + 7.5, + 27.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.6000000000000005, + 4.0 + ], + "texture": "#booster_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.6000000000000005, + 4.0 + ], + "texture": "#booster_b" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.6000000000000005, + 7.0 + ], + "texture": "#booster_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.6000000000000005, + 7.0 + ], + "texture": "#booster_b" + } + } + }, + { + "from": [ + -9.5, + 2.0, + -6.0 + ], + "to": [ + -8.5, + 4.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -4.5, + 4.0, + -16.0 + ], + "to": [ + -1.5, + 7.0, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + } + } + }, + { + "from": [ + -4.8, + 3.5, + 20.0 + ], + "to": [ + -1.2, + 7.5, + 27.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5999999999999996, + 4.0 + ], + "texture": "#booster_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5999999999999996, + 4.0 + ], + "texture": "#booster_b" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5999999999999996, + 7.0 + ], + "texture": "#booster_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5999999999999996, + 7.0 + ], + "texture": "#booster_b" + } + } + }, + { + "from": [ + -3.5, + 2.0, + -6.0 + ], + "to": [ + -2.5, + 4.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 11.5, + 4.0, + -16.0 + ], + "to": [ + 14.5, + 7.0, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + } + } + }, + { + "from": [ + 11.2, + 3.5, + 20.0 + ], + "to": [ + 14.8, + 7.5, + 27.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#booster_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#booster_b" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 7.0 + ], + "texture": "#booster_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 7.0 + ], + "texture": "#booster_b" + } + } + }, + { + "from": [ + 12.5, + 2.0, + -6.0 + ], + "to": [ + 13.5, + 4.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 17.5, + 4.0, + -16.0 + ], + "to": [ + 20.5, + 7.0, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#missile_ru_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#missile_ru_b" + } + } + }, + { + "from": [ + 17.2, + 3.5, + 20.0 + ], + "to": [ + 20.8, + 7.5, + 27.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#booster_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#booster_b" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 4.0 + ], + "texture": "#booster_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 7.0 + ], + "texture": "#booster_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 7.0 + ], + "texture": "#booster_b" + } + } + }, + { + "from": [ + 18.5, + 2.0, + -6.0 + ], + "to": [ + 19.5, + 4.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -12.0, + 0.0, + -2.0 + ], + "to": [ + 28.0, + 2.0, + 14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_s31_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_s31_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s31_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s31_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/buk_turret.json b/airdef-mod/assets/airdef/models/block/buk_turret.json index 899dc57..2431d96 100644 --- a/airdef-mod/assets/airdef/models/block/buk_turret.json +++ b/airdef-mod/assets/airdef/models/block/buk_turret.json @@ -1,9 +1,11 @@ { "ambientocclusion": false, "textures": { - "ru_green": "airdef:block/ru_green", + "ru_green_s21": "airdef:block/ru_green_s21", + "ru_green_s22": "airdef:block/ru_green_s22", "radar_face": "airdef:block/radar_face", - "particle": "airdef:block/ru_green" + "ru_green": "airdef:block/ru_green", + "particle": "airdef:block/ru_green_s21" }, "elements": [ { @@ -25,7 +27,7 @@ 16, 9.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -34,7 +36,7 @@ 16, 9.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -43,7 +45,7 @@ 16, 9.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "west": { "uv": [ @@ -52,7 +54,7 @@ 16, 9.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "up": { "uv": [ @@ -61,7 +63,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s22" }, "down": { "uv": [ @@ -70,7 +72,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s22" } } }, diff --git a/airdef-mod/assets/airdef/models/block/buk_turret_burnt.json b/airdef-mod/assets/airdef/models/block/buk_turret_burnt.json new file mode 100644 index 0000000..521e5ff --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/buk_turret_burnt.json @@ -0,0 +1,216 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_green_s21_b": "airdef:block/ru_green_s21_b", + "ru_green_s22_b": "airdef:block/ru_green_s22_b", + "radar_face_b": "airdef:block/radar_face_b", + "ru_green_b": "airdef:block/ru_green_b", + "particle": "airdef:block/ru_green_s21_b" + }, + "elements": [ + { + "from": [ + -4.0, + 0.0, + -4.0 + ], + "to": [ + 20.0, + 9.0, + 20.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#ru_green_s21_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#ru_green_s21_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s22_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s22_b" + } + } + }, + { + "from": [ + 1.0, + 2.0, + -10.0 + ], + "to": [ + 15.0, + 14.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 14.0, + 12.0 + ], + "texture": "#radar_face_b" + }, + "south": { + "uv": [ + 0, + 0, + 14.0, + 12.0 + ], + "texture": "#radar_face_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 12.0 + ], + "texture": "#radar_face_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 12.0 + ], + "texture": "#radar_face_b" + }, + "up": { + "uv": [ + 0, + 0, + 14.0, + 6.0 + ], + "texture": "#radar_face_b" + }, + "down": { + "uv": [ + 0, + 0, + 14.0, + 6.0 + ], + "texture": "#radar_face_b" + } + } + }, + { + "from": [ + -2.0, + 9.0, + 6.0 + ], + "to": [ + 18.0, + 11.0, + 18.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 2.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 2.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#ru_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#ru_green_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/depot.json b/airdef-mod/assets/airdef/models/block/depot.json index 45fb40c..515d4fb 100644 --- a/airdef-mod/assets/airdef/models/block/depot.json +++ b/airdef-mod/assets/airdef/models/block/depot.json @@ -3,8 +3,8 @@ "textures": { "concrete": "airdef:block/concrete", "crate": "airdef:block/crate", - "tube": "airdef:block/tube", "tube_cap": "airdef:block/tube_cap", + "tube": "airdef:block/tube", "particle": "airdef:block/concrete" }, "elements": [ diff --git a/airdef-mod/assets/airdef/models/block/depot_burnt.json b/airdef-mod/assets/airdef/models/block/depot_burnt.json new file mode 100644 index 0000000..ba73159 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/depot_burnt.json @@ -0,0 +1,488 @@ +{ + "ambientocclusion": false, + "textures": { + "concrete_b": "airdef:block/concrete_b", + "crate_b": "airdef:block/crate_b", + "tube_cap_b": "airdef:block/tube_cap_b", + "tube_b": "airdef:block/tube_b", + "particle": "airdef:block/concrete_b" + }, + "elements": [ + { + "from": [ + -14.0, + 0.0, + -14.0 + ], + "to": [ + 30.0, + 2.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#concrete_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#concrete_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#concrete_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#concrete_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#concrete_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#concrete_b" + } + } + }, + { + "from": [ + -12.0, + 2.0, + -12.0 + ], + "to": [ + 0.0, + 10.0, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "south": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "up": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#crate_b" + }, + "down": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#crate_b" + } + } + }, + { + "from": [ + -12.0, + 2.0, + 4.0 + ], + "to": [ + 0.0, + 10.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "south": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "up": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#crate_b" + }, + "down": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#crate_b" + } + } + }, + { + "from": [ + 4.0, + 2.0, + -12.0 + ], + "to": [ + 16.0, + 10.0, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "south": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 8.0 + ], + "texture": "#crate_b" + }, + "up": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#crate_b" + }, + "down": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#crate_b" + } + } + }, + { + "from": [ + 6.0, + 2.0, + 6.0 + ], + "to": [ + 28.0, + 7.0, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 5.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 5.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 6.0, + 7.0, + 6.0 + ], + "to": [ + 28.0, + 12.0, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 5.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 5.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 6.0, + 12.0, + 6.0 + ], + "to": [ + 28.0, + 17.0, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 5.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 5.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#tube_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/ew_truck.json b/airdef-mod/assets/airdef/models/block/ew_truck.json index 2f98565..53f9296 100644 --- a/airdef-mod/assets/airdef/models/block/ew_truck.json +++ b/airdef-mod/assets/airdef/models/block/ew_truck.json @@ -1,11 +1,16 @@ { "ambientocclusion": false, "textures": { + "ru_khaki_s21": "airdef:block/ru_khaki_s21", + "ru_khaki_s31": "airdef:block/ru_khaki_s31", + "ru_khaki_s23": "airdef:block/ru_khaki_s23", + "glass_cab": "airdef:block/glass_cab", "ru_khaki": "airdef:block/ru_khaki", - "glass": "airdef:block/glass", - "antenna": "airdef:block/antenna", + "ru_khaki_s22": "airdef:block/ru_khaki_s22", + "bare_antenna": "airdef:block/bare_antenna", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_khaki" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_khaki_s21" }, "elements": [ { @@ -27,7 +32,7 @@ 16, 4.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -36,7 +41,7 @@ 16, 4.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -45,7 +50,7 @@ 16, 4.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "west": { "uv": [ @@ -54,7 +59,7 @@ 16, 4.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "up": { "uv": [ @@ -63,7 +68,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" }, "down": { "uv": [ @@ -72,7 +77,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" } } }, @@ -95,7 +100,7 @@ 16, 10.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -104,7 +109,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -131,7 +136,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "down": { "uv": [ @@ -140,7 +145,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" } } }, @@ -163,7 +168,7 @@ 16, 13.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -172,7 +177,7 @@ 16, 13.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -181,7 +186,7 @@ 16, 13.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "west": { "uv": [ @@ -190,7 +195,7 @@ 16, 13.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "up": { "uv": [ @@ -199,7 +204,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s22" }, "down": { "uv": [ @@ -208,7 +213,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s22" } } }, @@ -231,7 +236,7 @@ 2.0, 10.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "south": { "uv": [ @@ -240,7 +245,7 @@ 2.0, 10.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "east": { "uv": [ @@ -249,7 +254,7 @@ 2.0, 10.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "west": { "uv": [ @@ -258,7 +263,7 @@ 2.0, 10.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "up": { "uv": [ @@ -267,7 +272,7 @@ 2.0, 2.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "down": { "uv": [ @@ -276,7 +281,7 @@ 2.0, 2.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" } } }, @@ -299,7 +304,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "south": { "uv": [ @@ -308,7 +313,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "east": { "uv": [ @@ -317,7 +322,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "west": { "uv": [ @@ -326,7 +331,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "up": { "uv": [ @@ -335,7 +340,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "down": { "uv": [ @@ -344,7 +349,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" } } }, @@ -367,7 +372,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "south": { "uv": [ @@ -376,7 +381,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "east": { "uv": [ @@ -385,7 +390,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "west": { "uv": [ @@ -394,7 +399,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "up": { "uv": [ @@ -403,7 +408,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "down": { "uv": [ @@ -412,7 +417,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" } } }, @@ -435,7 +440,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "south": { "uv": [ @@ -444,7 +449,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "east": { "uv": [ @@ -453,7 +458,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "west": { "uv": [ @@ -462,7 +467,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "up": { "uv": [ @@ -471,7 +476,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "down": { "uv": [ @@ -480,7 +485,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" } } }, @@ -503,7 +508,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "south": { "uv": [ @@ -512,7 +517,7 @@ 11.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "east": { "uv": [ @@ -521,7 +526,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "west": { "uv": [ @@ -530,7 +535,7 @@ 4.0, 3.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "up": { "uv": [ @@ -539,7 +544,7 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "down": { "uv": [ @@ -548,20 +553,20 @@ 11.0, 4.0 ], - "texture": "#antenna" + "texture": "#bare_antenna" } } }, { "from": [ -9.0, - 0.0, - -12.0 + 0.3424499999999995, + -12.65755 ], "to": [ -5.5, - 9.0, - -5.0 + 8.65755, + -4.3424499999999995 ], "faces": { "north": { @@ -569,7 +574,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -578,7 +583,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -586,26 +591,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -614,7 +619,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -623,13 +628,13 @@ { "from": [ 21.5, - 0.0, - -12.0 + 0.3424499999999995, + -12.65755 ], "to": [ 25.0, - 9.0, - -5.0 + 8.65755, + -4.3424499999999995 ], "faces": { "north": { @@ -637,7 +642,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -646,7 +651,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -654,26 +659,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -682,22 +687,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -12.65755 + ], + "to": [ + -5.53, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -8.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -12.65755 + ], + "to": [ + 24.97, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -8.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -3.0 + 0.3424499999999995, + -3.6575500000000005 ], "to": [ -5.5, - 9.0, - 4.0 + 8.65755, + 4.6575500000000005 ], "faces": { "north": { @@ -705,7 +864,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -714,7 +873,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -722,26 +881,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -750,7 +909,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -759,13 +918,13 @@ { "from": [ 21.5, - 0.0, - -3.0 + 0.3424499999999995, + -3.6575500000000005 ], "to": [ 25.0, - 9.0, - 4.0 + 8.65755, + 4.6575500000000005 ], "faces": { "north": { @@ -773,7 +932,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -782,7 +941,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -790,26 +949,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -818,22 +977,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 0.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 0.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 16.0 + 0.3424499999999995, + 15.34245 ], "to": [ -5.5, - 9.0, - 23.0 + 8.65755, + 23.65755 ], "faces": { "north": { @@ -841,7 +1154,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -850,7 +1163,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -858,26 +1171,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -886,7 +1199,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -895,13 +1208,13 @@ { "from": [ 21.5, - 0.0, - 16.0 + 0.3424499999999995, + 15.34245 ], "to": [ 25.0, - 9.0, - 23.0 + 8.65755, + 23.65755 ], "faces": { "north": { @@ -909,7 +1222,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -918,7 +1231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -926,26 +1239,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -954,22 +1267,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.53, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 24.97, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 19.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 24.0 + 0.3424499999999995, + 23.34245 ], "to": [ -5.5, - 9.0, - 31.0 + 8.65755, + 31.65755 ], "faces": { "north": { @@ -977,7 +1444,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -986,7 +1453,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -994,26 +1461,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1022,7 +1489,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -1031,13 +1498,13 @@ { "from": [ 21.5, - 0.0, - 24.0 + 0.3424499999999995, + 23.34245 ], "to": [ 25.0, - 9.0, - 31.0 + 8.65755, + 31.65755 ], "faces": { "north": { @@ -1045,7 +1512,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1054,7 +1521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1062,26 +1529,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1090,11 +1557,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.53, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 27.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 24.97, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 27.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/ew_truck_burnt.json b/airdef-mod/assets/airdef/models/block/ew_truck_burnt.json new file mode 100644 index 0000000..123c91d --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/ew_truck_burnt.json @@ -0,0 +1,1380 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_khaki_s21_b": "airdef:block/ru_khaki_s21_b", + "ru_khaki_s31_b": "airdef:block/ru_khaki_s31_b", + "ru_khaki_s23_b": "airdef:block/ru_khaki_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "ru_khaki_b": "airdef:block/ru_khaki_b", + "ru_khaki_s22_b": "airdef:block/ru_khaki_s22_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/ru_khaki_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + } + } + }, + { + "from": [ + -6.0, + 9.0, + -16.0 + ], + "to": [ + 22.0, + 19.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + } + } + }, + { + "from": [ + -5.0, + 9.0, + -4.0 + ], + "to": [ + 21.0, + 22.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s22_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s22_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -12.65755 + ], + "to": [ + -5.5, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -12.65755 + ], + "to": [ + 25.0, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -12.65755 + ], + "to": [ + -5.53, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -8.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -12.65755 + ], + "to": [ + 24.97, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -8.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 0.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 0.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.5, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 25.0, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.53, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 24.97, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.5, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 25.0, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.53, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 27.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 24.97, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 27.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/flare.json b/airdef-mod/assets/airdef/models/block/flare.json index 4a2311f..a70d416 100644 --- a/airdef-mod/assets/airdef/models/block/flare.json +++ b/airdef-mod/assets/airdef/models/block/flare.json @@ -2,7 +2,7 @@ "ambientocclusion": false, "textures": { "lamp": "airdef:block/lamp", - "antenna": "airdef:block/antenna", + "bare_antenna": "airdef:block/bare_antenna", "particle": "airdef:block/lamp" }, "elements": [ @@ -93,7 +93,7 @@ 0.8000000000000007, 6.5 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "south": { "uv": [ @@ -102,7 +102,7 @@ 0.8000000000000007, 6.5 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "east": { "uv": [ @@ -111,7 +111,7 @@ 0.8000000000000007, 6.5 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "west": { "uv": [ @@ -120,7 +120,7 @@ 0.8000000000000007, 6.5 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "up": { "uv": [ @@ -129,7 +129,7 @@ 0.8000000000000007, 0.8000000000000007 ], - "texture": "#antenna" + "texture": "#bare_antenna" }, "down": { "uv": [ @@ -138,7 +138,7 @@ 0.8000000000000007, 0.8000000000000007 ], - "texture": "#antenna" + "texture": "#bare_antenna" } } } diff --git a/airdef-mod/assets/airdef/models/block/gepard_dish.json b/airdef-mod/assets/airdef/models/block/gepard_dish.json index 8118c34..b8b0554 100644 --- a/airdef-mod/assets/airdef/models/block/gepard_dish.json +++ b/airdef-mod/assets/airdef/models/block/gepard_dish.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "dish": "airdef:block/dish", + "bare_dish": "airdef:block/bare_dish", "metal": "airdef:block/metal", - "particle": "airdef:block/dish" + "particle": "airdef:block/bare_dish" }, "elements": [ { @@ -25,7 +25,7 @@ 16, 8.0 ], - "texture": "#dish" + "texture": "#bare_dish" }, "south": { "uv": [ @@ -34,7 +34,7 @@ 16, 8.0 ], - "texture": "#dish" + "texture": "#bare_dish" }, "east": { "uv": [ @@ -43,7 +43,7 @@ 2.0, 8.0 ], - "texture": "#dish" + "texture": "#bare_dish" }, "west": { "uv": [ @@ -52,7 +52,7 @@ 2.0, 8.0 ], - "texture": "#dish" + "texture": "#bare_dish" }, "up": { "uv": [ @@ -61,7 +61,7 @@ 16, 2.0 ], - "texture": "#dish" + "texture": "#bare_dish" }, "down": { "uv": [ @@ -70,7 +70,7 @@ 16, 2.0 ], - "texture": "#dish" + "texture": "#bare_dish" } } }, diff --git a/airdef-mod/assets/airdef/models/block/gepard_guns.json b/airdef-mod/assets/airdef/models/block/gepard_guns.json index 995be88..a62e408 100644 --- a/airdef-mod/assets/airdef/models/block/gepard_guns.json +++ b/airdef-mod/assets/airdef/models/block/gepard_guns.json @@ -1,10 +1,10 @@ { "ambientocclusion": false, "textures": { - "barrel": "airdef:block/barrel", + "bare_barrel": "airdef:block/bare_barrel", "flecktarn": "airdef:block/flecktarn", "dark_metal": "airdef:block/dark_metal", - "particle": "airdef:block/barrel" + "particle": "airdef:block/bare_barrel" }, "elements": [ { @@ -26,7 +26,7 @@ 2.5, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "south": { "uv": [ @@ -35,7 +35,7 @@ 2.5, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "east": { "uv": [ @@ -44,7 +44,7 @@ 16, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "west": { "uv": [ @@ -53,7 +53,7 @@ 16, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "up": { "uv": [ @@ -62,7 +62,7 @@ 2.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "down": { "uv": [ @@ -71,7 +71,7 @@ 2.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" } } }, @@ -94,7 +94,7 @@ 2.5, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "south": { "uv": [ @@ -103,7 +103,7 @@ 2.5, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "east": { "uv": [ @@ -112,7 +112,7 @@ 16, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "west": { "uv": [ @@ -121,7 +121,7 @@ 16, 2.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "up": { "uv": [ @@ -130,7 +130,7 @@ 2.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "down": { "uv": [ @@ -139,7 +139,7 @@ 2.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" } } }, diff --git a/airdef-mod/assets/airdef/models/block/gepard_guns_burnt.json b/airdef-mod/assets/airdef/models/block/gepard_guns_burnt.json new file mode 100644 index 0000000..e2d3531 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/gepard_guns_burnt.json @@ -0,0 +1,351 @@ +{ + "ambientocclusion": false, + "textures": { + "bare_barrel_b": "airdef:block/bare_barrel_b", + "flecktarn_b": "airdef:block/flecktarn_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/bare_barrel_b" + }, + "elements": [ + { + "from": [ + -8.0, + 5.0, + -16.0 + ], + "to": [ + -5.5, + 7.5, + 12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.5, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.5, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.5, + 16 + ], + "texture": "#bare_barrel_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.5, + 16 + ], + "texture": "#bare_barrel_b" + } + } + }, + { + "from": [ + 21.5, + 5.0, + -16.0 + ], + "to": [ + 24.0, + 7.5, + 12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.5, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.5, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.5 + ], + "texture": "#bare_barrel_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.5, + 16 + ], + "texture": "#bare_barrel_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.5, + 16 + ], + "texture": "#bare_barrel_b" + } + } + }, + { + "from": [ + -9.0, + 3.5, + 2.0 + ], + "to": [ + -4.0, + 9.0, + 14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "south": { + "uv": [ + 0, + 0, + 5.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "up": { + "uv": [ + 0, + 0, + 5.0, + 12.0 + ], + "texture": "#flecktarn_b" + }, + "down": { + "uv": [ + 0, + 0, + 5.0, + 12.0 + ], + "texture": "#flecktarn_b" + } + } + }, + { + "from": [ + 20.0, + 3.5, + 2.0 + ], + "to": [ + 25.0, + 9.0, + 14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "south": { + "uv": [ + 0, + 0, + 5.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 5.5 + ], + "texture": "#flecktarn_b" + }, + "up": { + "uv": [ + 0, + 0, + 5.0, + 12.0 + ], + "texture": "#flecktarn_b" + }, + "down": { + "uv": [ + 0, + 0, + 5.0, + 12.0 + ], + "texture": "#flecktarn_b" + } + } + }, + { + "from": [ + -8.5, + 4.5, + -16.0 + ], + "to": [ + -5.0, + 8.0, + -13.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 3.5 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 3.5 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 3.5 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 3.5 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 3.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/gepard_hull.json b/airdef-mod/assets/airdef/models/block/gepard_hull.json index 7c5d646..8df7024 100644 --- a/airdef-mod/assets/airdef/models/block/gepard_hull.json +++ b/airdef-mod/assets/airdef/models/block/gepard_hull.json @@ -1,11 +1,15 @@ { "ambientocclusion": false, "textures": { + "flecktarn_s21": "airdef:block/flecktarn_s21", + "flecktarn_s31": "airdef:block/flecktarn_s31", + "flecktarn_s23": "airdef:block/flecktarn_s23", "flecktarn": "airdef:block/flecktarn", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "track": "airdef:block/track", - "particle": "airdef:block/flecktarn" + "flecktarn_s13": "airdef:block/flecktarn_s13", + "particle": "airdef:block/flecktarn_s21" }, "elements": [ { @@ -27,7 +31,7 @@ 16, 13.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "south": { "uv": [ @@ -36,7 +40,7 @@ 16, 13.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "east": { "uv": [ @@ -45,7 +49,7 @@ 16, 13.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s31" }, "west": { "uv": [ @@ -54,7 +58,7 @@ 16, 13.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s31" }, "up": { "uv": [ @@ -63,7 +67,7 @@ 16, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s23" }, "down": { "uv": [ @@ -72,7 +76,7 @@ 16, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s23" } } }, @@ -95,7 +99,7 @@ 16, 8.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "south": { "uv": [ @@ -104,7 +108,7 @@ 16, 8.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "east": { "uv": [ @@ -131,7 +135,7 @@ 16, 4.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "down": { "uv": [ @@ -140,7 +144,7 @@ 16, 4.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" } } }, @@ -453,7 +457,7 @@ 16, 5.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s31" }, "west": { "uv": [ @@ -462,7 +466,7 @@ 16, 5.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s31" }, "up": { "uv": [ @@ -471,7 +475,7 @@ 4.5, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s13" }, "down": { "uv": [ @@ -480,7 +484,7 @@ 4.5, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s13" } } }, @@ -521,7 +525,7 @@ 16, 5.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s31" }, "west": { "uv": [ @@ -530,7 +534,7 @@ 16, 5.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s31" }, "up": { "uv": [ @@ -539,7 +543,7 @@ 4.5, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s13" }, "down": { "uv": [ @@ -548,7 +552,7 @@ 4.5, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s13" } } } diff --git a/airdef-mod/assets/airdef/models/block/gepard_hull_burnt.json b/airdef-mod/assets/airdef/models/block/gepard_hull_burnt.json new file mode 100644 index 0000000..b871dda --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/gepard_hull_burnt.json @@ -0,0 +1,560 @@ +{ + "ambientocclusion": false, + "textures": { + "flecktarn_s21_b": "airdef:block/flecktarn_s21_b", + "flecktarn_s31_b": "airdef:block/flecktarn_s31_b", + "flecktarn_s23_b": "airdef:block/flecktarn_s23_b", + "flecktarn_b": "airdef:block/flecktarn_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "track_b": "airdef:block/track_b", + "flecktarn_s13_b": "airdef:block/flecktarn_s13_b", + "particle": "airdef:block/flecktarn_s21_b" + }, + "elements": [ + { + "from": [ + -10.0, + 4.0, + -12.0 + ], + "to": [ + 26.0, + 17.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#flecktarn_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#flecktarn_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#flecktarn_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#flecktarn_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#flecktarn_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#flecktarn_s23_b" + } + } + }, + { + "from": [ + -10.0, + 4.0, + -16.0 + ], + "to": [ + 26.0, + 12.0, + -12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 8.0 + ], + "texture": "#flecktarn_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 8.0 + ], + "texture": "#flecktarn_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 8.0 + ], + "texture": "#flecktarn_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 8.0 + ], + "texture": "#flecktarn_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#flecktarn_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#flecktarn_s21_b" + } + } + }, + { + "from": [ + -8.0, + 17.0, + 18.0 + ], + "to": [ + 24.0, + 18.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -6.0, + 17.0, + -10.0 + ], + "to": [ + 4.0, + 18.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -14.0, + 0.0, + -14.0 + ], + "to": [ + -10.0, + 10.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 10.0 + ], + "texture": "#track_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 10.0 + ], + "texture": "#track_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#track_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#track_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + } + } + }, + { + "from": [ + 26.0, + 0.0, + -14.0 + ], + "to": [ + 30.0, + 10.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 10.0 + ], + "texture": "#track_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 10.0 + ], + "texture": "#track_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#track_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#track_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + } + } + }, + { + "from": [ + -14.5, + 6.0, + -14.0 + ], + "to": [ + -10.0, + 11.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#flecktarn_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#flecktarn_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#flecktarn_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#flecktarn_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#flecktarn_s13_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#flecktarn_s13_b" + } + } + }, + { + "from": [ + 26.0, + 6.0, + -14.0 + ], + "to": [ + 30.5, + 11.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#flecktarn_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#flecktarn_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#flecktarn_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#flecktarn_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#flecktarn_s13_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#flecktarn_s13_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/gepard_turret.json b/airdef-mod/assets/airdef/models/block/gepard_turret.json index 818d214..424bc78 100644 --- a/airdef-mod/assets/airdef/models/block/gepard_turret.json +++ b/airdef-mod/assets/airdef/models/block/gepard_turret.json @@ -1,10 +1,11 @@ { "ambientocclusion": false, "textures": { + "flecktarn_s21": "airdef:block/flecktarn_s21", "flecktarn": "airdef:block/flecktarn", "radar_face": "airdef:block/radar_face", "metal": "airdef:block/metal", - "particle": "airdef:block/flecktarn" + "particle": "airdef:block/flecktarn_s21" }, "elements": [ { @@ -26,7 +27,7 @@ 16, 12.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "south": { "uv": [ @@ -35,7 +36,7 @@ 16, 12.0 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "east": { "uv": [ @@ -62,7 +63,7 @@ 16, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" }, "down": { "uv": [ @@ -71,7 +72,7 @@ 16, 16 ], - "texture": "#flecktarn" + "texture": "#flecktarn_s21" } } }, diff --git a/airdef-mod/assets/airdef/models/block/gepard_turret_burnt.json b/airdef-mod/assets/airdef/models/block/gepard_turret_burnt.json new file mode 100644 index 0000000..0648f9d --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/gepard_turret_burnt.json @@ -0,0 +1,284 @@ +{ + "ambientocclusion": false, + "textures": { + "flecktarn_s21_b": "airdef:block/flecktarn_s21_b", + "flecktarn_b": "airdef:block/flecktarn_b", + "radar_face_b": "airdef:block/radar_face_b", + "metal_b": "airdef:block/metal_b", + "particle": "airdef:block/flecktarn_s21_b" + }, + "elements": [ + { + "from": [ + -4.0, + 0.0, + -6.0 + ], + "to": [ + 20.0, + 12.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#flecktarn_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#flecktarn_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#flecktarn_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#flecktarn_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#flecktarn_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#flecktarn_s21_b" + } + } + }, + { + "from": [ + -2.0, + 12.0, + -2.0 + ], + "to": [ + 18.0, + 14.0, + 14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#flecktarn_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#flecktarn_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#flecktarn_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#flecktarn_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#flecktarn_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#flecktarn_b" + } + } + }, + { + "from": [ + 3.0, + 4.0, + -10.0 + ], + "to": [ + 13.0, + 12.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 8.0 + ], + "texture": "#radar_face_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 8.0 + ], + "texture": "#radar_face_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 8.0 + ], + "texture": "#radar_face_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 8.0 + ], + "texture": "#radar_face_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 4.0 + ], + "texture": "#radar_face_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 4.0 + ], + "texture": "#radar_face_b" + } + } + }, + { + "from": [ + 7.0, + 14.0, + 10.0 + ], + "to": [ + 9.0, + 18.0, + 12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 2.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 2.0 + ], + "texture": "#metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/geran3.json b/airdef-mod/assets/airdef/models/block/geran3.json index 22d0981..1b66363 100644 --- a/airdef-mod/assets/airdef/models/block/geran3.json +++ b/airdef-mod/assets/airdef/models/block/geran3.json @@ -3,8 +3,7 @@ "textures": { "geran": "airdef:block/geran", "geran_engine": "airdef:block/geran_engine", - "intake": "airdef:block/intake", - "nozzle": "airdef:block/nozzle", + "bare_nozzle": "airdef:block/bare_nozzle", "particle": "airdef:block/geran" }, "elements": [ @@ -1047,7 +1046,7 @@ 6.0, 4.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "south": { "uv": [ @@ -1056,7 +1055,7 @@ 6.0, 4.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "east": { "uv": [ @@ -1065,7 +1064,7 @@ 1.0, 4.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "west": { "uv": [ @@ -1074,7 +1073,7 @@ 1.0, 4.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "up": { "uv": [ @@ -1083,7 +1082,7 @@ 6.0, 1.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "down": { "uv": [ @@ -1092,7 +1091,7 @@ 6.0, 1.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" } } }, @@ -1115,7 +1114,7 @@ 5.0, 4.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "south": { "uv": [ @@ -1124,7 +1123,7 @@ 5.0, 4.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "east": { "uv": [ @@ -1133,7 +1132,7 @@ 2.0, 4.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "west": { "uv": [ @@ -1142,7 +1141,7 @@ 2.0, 4.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "up": { "uv": [ @@ -1151,7 +1150,7 @@ 5.0, 2.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "down": { "uv": [ @@ -1160,7 +1159,7 @@ 5.0, 2.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" } } } diff --git a/airdef-mod/assets/airdef/models/block/irist_chassis.json b/airdef-mod/assets/airdef/models/block/irist_chassis.json index a2bcf5e..caa06d3 100644 --- a/airdef-mod/assets/airdef/models/block/irist_chassis.json +++ b/airdef-mod/assets/airdef/models/block/irist_chassis.json @@ -1,12 +1,16 @@ { "ambientocclusion": false, "textures": { + "nato_green_s21": "airdef:block/nato_green_s21", + "nato_green_s31": "airdef:block/nato_green_s31", + "nato_green_s23": "airdef:block/nato_green_s23", + "glass_cab": "airdef:block/glass_cab", "nato_green": "airdef:block/nato_green", - "glass": "airdef:block/glass", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/nato_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/nato_green_s21" }, "elements": [ { @@ -28,7 +32,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -37,7 +41,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -46,7 +50,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s31" }, "west": { "uv": [ @@ -55,7 +59,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s31" }, "up": { "uv": [ @@ -64,7 +68,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s23" }, "down": { "uv": [ @@ -73,7 +77,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s23" } } }, @@ -96,7 +100,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -164,7 +168,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -300,7 +304,7 @@ 16, 3.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -309,7 +313,7 @@ 16, 3.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -336,7 +340,7 @@ 16, 10.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "down": { "uv": [ @@ -345,7 +349,7 @@ 16, 10.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" } } }, @@ -556,13 +560,13 @@ { "from": [ -9.0, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ -5.5, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -570,7 +574,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -579,7 +583,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -587,26 +591,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -615,7 +619,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -624,13 +628,13 @@ { "from": [ 21.5, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ 25.0, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -638,7 +642,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -647,7 +651,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -655,26 +659,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -683,22 +687,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ -5.5, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -706,7 +864,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -715,7 +873,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -723,26 +881,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -751,7 +909,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -760,13 +918,13 @@ { "from": [ 21.5, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ 25.0, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -774,7 +932,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -783,7 +941,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -791,26 +949,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -819,22 +977,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ -5.5, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -842,7 +1154,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -851,7 +1163,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -859,26 +1171,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -887,7 +1199,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -896,13 +1208,13 @@ { "from": [ 21.5, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ 25.0, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -910,7 +1222,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -919,7 +1231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -927,26 +1239,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -955,22 +1267,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ -5.5, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -978,7 +1444,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -987,7 +1453,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -995,26 +1461,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1023,7 +1489,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -1032,13 +1498,13 @@ { "from": [ 21.5, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ 25.0, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -1046,7 +1512,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1055,7 +1521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1063,26 +1529,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1091,11 +1557,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/irist_chassis_burnt.json b/airdef-mod/assets/airdef/models/block/irist_chassis_burnt.json new file mode 100644 index 0000000..e056272 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/irist_chassis_burnt.json @@ -0,0 +1,1653 @@ +{ + "ambientocclusion": false, + "textures": { + "nato_green_s21_b": "airdef:block/nato_green_s21_b", + "nato_green_s31_b": "airdef:block/nato_green_s31_b", + "nato_green_s23_b": "airdef:block/nato_green_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "nato_green_b": "airdef:block/nato_green_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/nato_green_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 10.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#nato_green_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#nato_green_s23_b" + } + } + }, + { + "from": [ + -6.0, + 10.0, + -16.0 + ], + "to": [ + 3.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + } + } + }, + { + "from": [ + 13.0, + 10.0, + -16.0 + ], + "to": [ + 22.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#nato_green_b" + } + } + }, + { + "from": [ + 3.0, + 10.0, + -16.0 + ], + "to": [ + 13.0, + 15.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -5.0, + 10.0, + -6.0 + ], + "to": [ + 21.0, + 13.0, + 4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#nato_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#nato_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#nato_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#nato_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#nato_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#nato_green_s21_b" + } + } + }, + { + "from": [ + -3.0, + 10.0, + 26.0 + ], + "to": [ + 19.0, + 14.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -8.0, + 0.0, + 28.0 + ], + "to": [ + -6.0, + 6.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.5, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 25.0, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.5, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 25.0, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.5, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 25.0, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/irist_missile.json b/airdef-mod/assets/airdef/models/block/irist_missile.json index e468964..e7cb5ca 100644 --- a/airdef-mod/assets/airdef/models/block/irist_missile.json +++ b/airdef-mod/assets/airdef/models/block/irist_missile.json @@ -2,29 +2,32 @@ "ambientocclusion": false, "textures": { "white": "airdef:block/white", + "rm_white": "airdef:block/rm_white", + "rm_white_t": "airdef:block/rm_white_t", "missile_grey": "airdef:block/missile_grey", - "nozzle": "airdef:block/nozzle", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", "particle": "airdef:block/white" }, "elements": [ { "from": [ - 7.333333333333333, - 7.333333333333333, + 7.294558312447602, + 7.294558312447602, -16.0 ], "to": [ - 8.666666666666666, - 8.666666666666666, - -14.0 + 8.705441687552398, + 8.705441687552398, + -13.666666666666666 ], "faces": { "north": { "uv": [ 0, 0, - 1.333333333333333, - 1.333333333333333 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#white" }, @@ -32,8 +35,8 @@ "uv": [ 0, 0, - 1.333333333333333, - 1.333333333333333 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#white" }, @@ -41,8 +44,8 @@ "uv": [ 0, 0, - 2.0, - 1.333333333333333 + 2.333333333333334, + 1.4108833751047953 ], "texture": "#white" }, @@ -50,8 +53,8 @@ "uv": [ 0, 0, - 2.0, - 1.333333333333333 + 2.333333333333334, + 1.4108833751047953 ], "texture": "#white" }, @@ -59,8 +62,8 @@ "uv": [ 0, 0, - 1.333333333333333, - 2.0 + 1.4108833751047953, + 2.333333333333334 ], "texture": "#white" }, @@ -68,8 +71,8 @@ "uv": [ 0, 0, - 1.333333333333333, - 2.0 + 1.4108833751047953, + 2.333333333333334 ], "texture": "#white" } @@ -77,22 +80,22 @@ }, { "from": [ - 7.0, - 7.0, - -14.0 + 7.294558312447602, + 7.294558312447602, + -15.97 ], "to": [ - 9.0, - 9.0, - -12.0 + 8.705441687552398, + 8.705441687552398, + -13.696666666666665 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#white" }, @@ -100,8 +103,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 1.4108833751047953 ], "texture": "#white" }, @@ -109,8 +112,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 2.273333333333335, + 1.4108833751047953 ], "texture": "#white" }, @@ -118,8 +121,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 2.273333333333335, + 1.4108833751047953 ], "texture": "#white" }, @@ -127,8 +130,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 2.273333333333335 ], "texture": "#white" }, @@ -136,31 +139,40 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 2.273333333333335 ], "texture": "#white" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -14.833333333333332 + ] } }, { "from": [ - 6.666666666666666, - 6.666666666666666, - -12.0 + 6.8507775398726425, + 6.8507775398726425, + -13.666666666666666 ], "to": [ - 9.333333333333334, - 9.333333333333334, - -10.0 + 9.149222460127358, + 9.149222460127358, + -11.333333333333332 ], "faces": { "north": { "uv": [ 0, 0, - 2.666666666666668, - 2.666666666666668 + 2.298444920254716, + 2.298444920254716 ], "texture": "#white" }, @@ -168,8 +180,8 @@ "uv": [ 0, 0, - 2.666666666666668, - 2.666666666666668 + 2.298444920254716, + 2.298444920254716 ], "texture": "#white" }, @@ -177,8 +189,8 @@ "uv": [ 0, 0, - 2.0, - 2.666666666666668 + 2.333333333333334, + 2.298444920254716 ], "texture": "#white" }, @@ -186,8 +198,8 @@ "uv": [ 0, 0, - 2.0, - 2.666666666666668 + 2.333333333333334, + 2.298444920254716 ], "texture": "#white" }, @@ -195,8 +207,8 @@ "uv": [ 0, 0, - 2.666666666666668, - 2.0 + 2.298444920254716, + 2.333333333333334 ], "texture": "#white" }, @@ -204,8 +216,8 @@ "uv": [ 0, 0, - 2.666666666666668, - 2.0 + 2.298444920254716, + 2.333333333333334 ], "texture": "#white" } @@ -213,22 +225,22 @@ }, { "from": [ - 6.5, - 6.5, - -10.0 + 6.8507775398726425, + 6.8507775398726425, + -13.636666666666667 ], "to": [ - 9.5, - 9.5, - 24.0 + 9.149222460127358, + 9.149222460127358, + -11.363333333333332 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 3.0 + 2.298444920254716, + 2.298444920254716 ], "texture": "#white" }, @@ -236,67 +248,366 @@ "uv": [ 0, 0, - 3.0, - 3.0 + 2.298444920254716, + 2.298444920254716 ], "texture": "#white" }, + "east": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.298444920254716 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.298444920254716 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.273333333333335 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.273333333333335 + ], + "texture": "#white" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -12.5 + ] + } + }, + { + "from": [ + 6.517798430927714, + 6.517798430927714, + -11.333333333333332 + ], + "to": [ + 9.482201569072286, + 9.482201569072286, + -9.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.333333333333332, + 2.964403138144572 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.333333333333332, + 2.964403138144572 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.333333333333332 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.333333333333332 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 6.517798430927714, + 6.517798430927714, + -11.303333333333333 + ], + "to": [ + 9.482201569072286, + 9.482201569072286, + -9.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.964403138144572 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.964403138144572 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.2733333333333334 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.2733333333333334 + ], + "texture": "#white" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -10.166666666666666 + ] + } + }, + { + "from": [ + 6.4293700000000005, + 6.4293700000000005, + -9.0 + ], + "to": [ + 9.57063, + 9.57063, + 22.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "south": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_white" + }, "east": { "uv": [ 0, 0, 16, - 3.0 + 3.141259999999999 ], - "texture": "#white" + "texture": "#rm_white" }, "west": { "uv": [ 0, 0, 16, - 3.0 + 3.141259999999999 ], - "texture": "#white" + "texture": "#rm_white" }, "up": { "uv": [ 0, 0, - 3.0, + 3.141259999999999, 16 ], - "texture": "#white" + "texture": "#rm_white_t" }, "down": { "uv": [ 0, 0, - 3.0, + 3.141259999999999, 16 ], - "texture": "#white" + "texture": "#rm_white_t" } } }, { "from": [ - 3.0, - 7.6, - -9.0 + 6.4293700000000005, + 6.4293700000000005, + -8.97 ], "to": [ - 6.5, - 8.4, - -5.0 + 9.57063, + 9.57063, + 21.97 ], "faces": { "north": { "uv": [ 0, 0, - 3.5, - 0.8000000000000007 + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "south": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_white" + }, + "up": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_white_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_white_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 6.499999999999999 + ] + } + }, + { + "from": [ + 9.53, + 7.65, + -8.0 + ], + "to": [ + 11.51, + 8.35, + -5.5 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.9800000000000004, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -304,8 +615,8 @@ "uv": [ 0, 0, - 3.5, - 0.8000000000000007 + 1.9800000000000004, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -313,8 +624,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 2.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -322,8 +633,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 2.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -331,8 +642,8 @@ "uv": [ 0, 0, - 3.5, - 4.0 + 1.9800000000000004, + 2.5 ], "texture": "#missile_grey" }, @@ -340,8 +651,8 @@ "uv": [ 0, 0, - 3.5, - 4.0 + 1.9800000000000004, + 2.5 ], "texture": "#missile_grey" } @@ -349,22 +660,22 @@ }, { "from": [ - 9.5, - 7.6, - -9.0 + 4.49, + 7.65, + -8.0 ], "to": [ - 13.0, - 8.4, - -5.0 + 6.470000000000001, + 8.35, + -5.5 ], "faces": { "north": { "uv": [ 0, 0, - 3.5, - 0.8000000000000007 + 1.9800000000000004, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -372,8 +683,8 @@ "uv": [ 0, 0, - 3.5, - 0.8000000000000007 + 1.9800000000000004, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -381,8 +692,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 2.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -390,8 +701,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 2.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -399,8 +710,8 @@ "uv": [ 0, 0, - 3.5, - 4.0 + 1.9800000000000004, + 2.5 ], "texture": "#missile_grey" }, @@ -408,8 +719,8 @@ "uv": [ 0, 0, - 3.5, - 4.0 + 1.9800000000000004, + 2.5 ], "texture": "#missile_grey" } @@ -417,22 +728,22 @@ }, { "from": [ - 7.6, - 3.0, - -9.0 + 11.51, + 7.65, + -7.0 ], "to": [ - 8.4, - 6.5, - -5.0 + 13.129999999999999, + 8.35, + -5.5 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 3.5 + 1.6199999999999992, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -440,8 +751,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 3.5 + 1.6199999999999992, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -449,8 +760,8 @@ "uv": [ 0, 0, - 4.0, - 3.5 + 1.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -458,8 +769,8 @@ "uv": [ 0, 0, - 4.0, - 3.5 + 1.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -467,8 +778,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.0 + 1.6199999999999992, + 1.5 ], "texture": "#missile_grey" }, @@ -476,8 +787,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.0 + 1.6199999999999992, + 1.5 ], "texture": "#missile_grey" } @@ -485,22 +796,22 @@ }, { "from": [ - 7.6, - 9.5, - -9.0 + 2.870000000000001, + 7.65, + -7.0 ], "to": [ - 8.4, - 13.0, - -5.0 + 4.49, + 8.35, + -5.5 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 3.5 + 1.6199999999999992, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -508,8 +819,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 3.5 + 1.6199999999999992, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -517,8 +828,8 @@ "uv": [ 0, 0, - 4.0, - 3.5 + 1.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -526,8 +837,8 @@ "uv": [ 0, 0, - 4.0, - 3.5 + 1.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -535,8 +846,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.0 + 1.6199999999999992, + 1.5 ], "texture": "#missile_grey" }, @@ -544,8 +855,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.0 + 1.6199999999999992, + 1.5 ], "texture": "#missile_grey" } @@ -553,22 +864,294 @@ }, { "from": [ - 2.0, - 7.6, - 18.0 + 7.65, + 9.53, + -8.0 ], "to": [ - 6.5, - 8.4, - 26.0 + 8.35, + 11.51, + -5.5 ], "faces": { "north": { "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 0.6999999999999993, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 11.51, + -7.0 + ], + "to": [ + 8.35, + 13.129999999999999, + -5.5 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.6199999999999992 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.6199999999999992 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.5, + 1.6199999999999992 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.5, + 1.6199999999999992 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 4.489999999999999, + -8.0 + ], + "to": [ + 8.35, + 6.47, + -5.5 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 1.9800000000000004 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 2.8699999999999997, + -7.0 + ], + "to": [ + 8.35, + 4.489999999999999, + -5.5 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.6199999999999997 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.6199999999999997 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.5, + 1.6199999999999997 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.5, + 1.6199999999999997 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 9.53, + 7.65, + 16.0 + ], + "to": [ + 12.280000000000001, + 8.35, + 22.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#white" }, @@ -576,8 +1159,8 @@ "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#white" }, @@ -585,8 +1168,8 @@ "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -594,8 +1177,8 @@ "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -603,8 +1186,8 @@ "uv": [ 0, 0, - 4.5, - 8.0 + 2.7500000000000018, + 6.0 ], "texture": "#white" }, @@ -612,8 +1195,8 @@ "uv": [ 0, 0, - 4.5, - 8.0 + 2.7500000000000018, + 6.0 ], "texture": "#white" } @@ -621,22 +1204,22 @@ }, { "from": [ - 9.5, - 7.6, - 18.0 + 3.719999999999999, + 7.65, + 16.0 ], "to": [ - 14.0, - 8.4, - 26.0 + 6.470000000000001, + 8.35, + 22.0 ], "faces": { "north": { "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#white" }, @@ -644,8 +1227,8 @@ "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#white" }, @@ -653,8 +1236,8 @@ "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -662,8 +1245,8 @@ "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], "texture": "#white" }, @@ -671,8 +1254,8 @@ "uv": [ 0, 0, - 4.5, - 8.0 + 2.7500000000000018, + 6.0 ], "texture": "#white" }, @@ -680,8 +1263,8 @@ "uv": [ 0, 0, - 4.5, - 8.0 + 2.7500000000000018, + 6.0 ], "texture": "#white" } @@ -689,22 +1272,22 @@ }, { "from": [ - 7.6, - 2.0, - 18.0 + 12.280000000000001, + 7.65, + 19.5 ], "to": [ - 8.4, - 6.5, - 26.0 + 14.530000000000001, + 8.35, + 22.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 4.5 + 2.25, + 0.6999999999999993 ], "texture": "#white" }, @@ -712,8 +1295,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.5 + 2.25, + 0.6999999999999993 ], "texture": "#white" }, @@ -721,8 +1304,8 @@ "uv": [ 0, 0, - 8.0, - 4.5 + 2.5, + 0.6999999999999993 ], "texture": "#white" }, @@ -730,8 +1313,8 @@ "uv": [ 0, 0, - 8.0, - 4.5 + 2.5, + 0.6999999999999993 ], "texture": "#white" }, @@ -739,8 +1322,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 8.0 + 2.25, + 2.5 ], "texture": "#white" }, @@ -748,8 +1331,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 8.0 + 2.25, + 2.5 ], "texture": "#white" } @@ -757,22 +1340,22 @@ }, { "from": [ - 7.6, - 9.5, - 18.0 + 1.4699999999999989, + 7.65, + 19.5 ], "to": [ - 8.4, - 14.0, - 26.0 + 3.719999999999999, + 8.35, + 22.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 4.5 + 2.25, + 0.6999999999999993 ], "texture": "#white" }, @@ -780,8 +1363,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.5 + 2.25, + 0.6999999999999993 ], "texture": "#white" }, @@ -789,8 +1372,8 @@ "uv": [ 0, 0, - 8.0, - 4.5 + 2.5, + 0.6999999999999993 ], "texture": "#white" }, @@ -798,8 +1381,8 @@ "uv": [ 0, 0, - 8.0, - 4.5 + 2.5, + 0.6999999999999993 ], "texture": "#white" }, @@ -807,8 +1390,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 8.0 + 2.25, + 2.5 ], "texture": "#white" }, @@ -816,8 +1399,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 8.0 + 2.25, + 2.5 ], "texture": "#white" } @@ -825,69 +1408,409 @@ }, { "from": [ - 7.0, - 7.0, - 24.0 + 7.65, + 9.53, + 16.0 ], "to": [ - 9.0, - 9.0, - 28.0 + 8.35, + 12.28, + 22.0 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.6999999999999993, + 2.75 ], - "texture": "#nozzle" + "texture": "#white" }, "south": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.6999999999999993, + 2.75 ], - "texture": "#nozzle" + "texture": "#white" }, "east": { "uv": [ 0, 0, - 4.0, - 2.0 + 6.0, + 2.75 ], - "texture": "#nozzle" + "texture": "#white" }, "west": { "uv": [ 0, 0, - 4.0, - 2.0 + 6.0, + 2.75 ], - "texture": "#nozzle" + "texture": "#white" }, "up": { "uv": [ 0, 0, - 2.0, - 4.0 + 0.6999999999999993, + 6.0 ], - "texture": "#nozzle" + "texture": "#white" }, "down": { "uv": [ 0, 0, - 2.0, - 4.0 + 0.6999999999999993, + 6.0 ], - "texture": "#nozzle" + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 12.28, + 19.5 + ], + "to": [ + 8.35, + 14.53, + 22.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.25 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.25 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 3.7199999999999998, + 16.0 + ], + "to": [ + 8.35, + 6.47, + 22.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 2.75 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 2.75 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 6.0 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 6.0 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 7.65, + 1.4699999999999998, + 19.5 + ], + "to": [ + 8.35, + 3.7199999999999998, + 22.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#white" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#white" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.25 + ], + "texture": "#white" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.25 + ], + "texture": "#white" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#white" + } + } + }, + { + "from": [ + 6.64, + 6.64, + 22.0 + ], + "to": [ + 9.36, + 9.36, + 23.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 7.0649999999999995, + 7.0649999999999995, + 23.6 + ], + "to": [ + 8.935, + 8.935, + 23.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.870000000000001, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 1.870000000000001, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 1.870000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 1.870000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" } } } diff --git a/airdef-mod/assets/airdef/models/block/irist_tubes.json b/airdef-mod/assets/airdef/models/block/irist_tubes.json index 973850b..77aa982 100644 --- a/airdef-mod/assets/airdef/models/block/irist_tubes.json +++ b/airdef-mod/assets/airdef/models/block/irist_tubes.json @@ -1,10 +1,10 @@ { "ambientocclusion": false, "textures": { - "canister": "airdef:block/canister", "tube_cap": "airdef:block/tube_cap", + "canister": "airdef:block/canister", "dark_metal": "airdef:block/dark_metal", - "particle": "airdef:block/canister" + "particle": "airdef:block/tube_cap" }, "elements": [ { diff --git a/airdef-mod/assets/airdef/models/block/irist_tubes_burnt.json b/airdef-mod/assets/airdef/models/block/irist_tubes_burnt.json new file mode 100644 index 0000000..a08e2d7 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/irist_tubes_burnt.json @@ -0,0 +1,691 @@ +{ + "ambientocclusion": false, + "textures": { + "tube_cap_b": "airdef:block/tube_cap_b", + "canister_b": "airdef:block/canister_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/tube_cap_b" + }, + "elements": [ + { + "from": [ + -1.5, + 0.0, + -16.0 + ], + "to": [ + 2.5, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + -1.5, + 5.0, + -16.0 + ], + "to": [ + 2.5, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 3.5, + 0.0, + -16.0 + ], + "to": [ + 7.5, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 3.5, + 5.0, + -16.0 + ], + "to": [ + 7.5, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 8.5, + 0.0, + -16.0 + ], + "to": [ + 12.5, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 8.5, + 5.0, + -16.0 + ], + "to": [ + 12.5, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 13.5, + 0.0, + -16.0 + ], + "to": [ + 17.5, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 13.5, + 5.0, + -16.0 + ], + "to": [ + 17.5, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + -2.5, + 0.0, + 26.0 + ], + "to": [ + 18.5, + 9.0, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -2.5, + 0.0, + -2.0 + ], + "to": [ + 18.5, + 9.0, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/iskander.json b/airdef-mod/assets/airdef/models/block/iskander.json index d58530d..09e9766 100644 --- a/airdef-mod/assets/airdef/models/block/iskander.json +++ b/airdef-mod/assets/airdef/models/block/iskander.json @@ -1,438 +1,1048 @@ { "ambientocclusion": false, "textures": { - "ru_khaki": "airdef:block/ru_khaki", + "rm_khaki": "airdef:block/rm_khaki", + "rm_khaki_t": "airdef:block/rm_khaki_t", "dark_metal": "airdef:block/dark_metal", - "nozzle": "airdef:block/nozzle", - "particle": "airdef:block/ru_khaki" + "ru_khaki": "airdef:block/ru_khaki", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", + "particle": "airdef:block/rm_khaki" }, "elements": [ { "from": [ - 6.975, - 6.975, + 6.979652271070121, + 6.979652271070121, -16.0 ], "to": [ - 9.025, - 9.025, - -14.0 + 9.02034772892988, + 9.02034772892988, + -14.166666666666666 ], "faces": { "north": { "uv": [ 0, 0, - 2.0500000000000007, - 2.0500000000000007 + 2.0406954578597585, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "south": { "uv": [ 0, 0, - 2.0500000000000007, - 2.0500000000000007 + 2.0406954578597585, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "east": { "uv": [ 0, 0, - 2.0, - 2.0500000000000007 + 1.833333333333334, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "west": { "uv": [ 0, 0, - 2.0, - 2.0500000000000007 + 1.833333333333334, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "up": { "uv": [ 0, 0, - 2.0500000000000007, - 2.0 + 2.0406954578597585, + 1.833333333333334 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" }, "down": { "uv": [ 0, 0, - 2.0500000000000007, - 2.0 + 2.0406954578597585, + 1.833333333333334 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" } } }, { "from": [ - 6.425, - 6.425, - -14.0 + 6.979652271070121, + 6.979652271070121, + -15.97 ], "to": [ - 9.575, - 9.575, - -12.0 + 9.02034772892988, + 9.02034772892988, + -14.196666666666665 ], "faces": { "north": { "uv": [ 0, 0, - 3.1499999999999995, - 3.1499999999999995 + 2.0406954578597585, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "south": { "uv": [ 0, 0, - 3.1499999999999995, - 3.1499999999999995 + 2.0406954578597585, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "east": { "uv": [ 0, 0, - 2.0, - 3.1499999999999995 + 1.7733333333333352, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "west": { "uv": [ 0, 0, - 2.0, - 3.1499999999999995 + 1.7733333333333352, + 2.0406954578597585 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "up": { "uv": [ 0, 0, - 3.1499999999999995, - 2.0 + 2.0406954578597585, + 1.7733333333333352 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" }, "down": { "uv": [ 0, 0, - 3.1499999999999995, - 2.0 + 2.0406954578597585, + 1.7733333333333352 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -15.083333333333332 + ] } }, { "from": [ - 5.875, - 5.875, - -12.0 + 6.33776972935263, + 6.33776972935263, + -14.166666666666666 ], "to": [ - 10.125, - 10.125, - -10.0 + 9.66223027064737, + 9.66223027064737, + -12.333333333333334 ], "faces": { "north": { "uv": [ 0, 0, - 4.25, - 4.25 + 3.324460541294741, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "south": { "uv": [ 0, 0, - 4.25, - 4.25 + 3.324460541294741, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "east": { "uv": [ 0, 0, - 2.0, - 4.25 + 1.8333333333333321, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "west": { "uv": [ 0, 0, - 2.0, - 4.25 + 1.8333333333333321, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "up": { "uv": [ 0, 0, - 4.25, - 2.0 + 3.324460541294741, + 1.8333333333333321 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" }, "down": { "uv": [ 0, 0, - 4.25, - 2.0 + 3.324460541294741, + 1.8333333333333321 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" } } }, { "from": [ - 5.325, - 5.325, - -10.0 + 6.33776972935263, + 6.33776972935263, + -14.136666666666667 ], "to": [ - 10.675, - 10.675, - -8.0 + 9.66223027064737, + 9.66223027064737, + -12.363333333333333 ], "faces": { "north": { "uv": [ 0, 0, - 5.3500000000000005, - 5.3500000000000005 + 3.324460541294741, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "south": { "uv": [ 0, 0, - 5.3500000000000005, - 5.3500000000000005 + 3.324460541294741, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "east": { "uv": [ 0, 0, - 2.0, - 5.3500000000000005 + 1.7733333333333334, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "west": { "uv": [ 0, 0, - 2.0, - 5.3500000000000005 + 1.7733333333333334, + 3.324460541294741 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "up": { "uv": [ 0, 0, - 5.3500000000000005, - 2.0 + 3.324460541294741, + 1.7733333333333334 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" }, "down": { "uv": [ 0, 0, - 5.3500000000000005, - 2.0 + 3.324460541294741, + 1.7733333333333334 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -13.25 + ] } }, { "from": [ - 4.775, - 4.775, - -8.0 + 5.856150222612298, + 5.856150222612298, + -12.333333333333334 ], "to": [ - 11.225, - 11.225, - -6.0 + 10.143849777387702, + 10.143849777387702, + -10.5 ], "faces": { "north": { "uv": [ 0, 0, - 6.449999999999999, - 6.449999999999999 + 4.287699554775404, + 4.287699554775404 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "south": { "uv": [ 0, 0, - 6.449999999999999, - 6.449999999999999 + 4.287699554775404, + 4.287699554775404 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "east": { "uv": [ 0, 0, - 2.0, - 6.449999999999999 + 1.833333333333334, + 4.287699554775404 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "west": { "uv": [ 0, 0, - 2.0, - 6.449999999999999 + 1.833333333333334, + 4.287699554775404 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "up": { "uv": [ 0, 0, - 6.449999999999999, - 2.0 + 4.287699554775404, + 1.833333333333334 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" }, "down": { "uv": [ 0, 0, - 6.449999999999999, - 2.0 + 4.287699554775404, + 1.833333333333334 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" } } }, { "from": [ - 4.5, - 4.5, - -6.0 + 5.856150222612298, + 5.856150222612298, + -12.303333333333335 ], "to": [ - 11.5, - 11.5, - 30.0 + 10.143849777387702, + 10.143849777387702, + -10.53 ], "faces": { "north": { "uv": [ 0, 0, - 7.0, - 7.0 + 4.287699554775404, + 4.287699554775404 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "south": { "uv": [ 0, 0, - 7.0, - 7.0 + 4.287699554775404, + 4.287699554775404 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.7733333333333352, + 4.287699554775404 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.7733333333333352, + 4.287699554775404 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 4.287699554775404, + 1.7733333333333352 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.287699554775404, + 1.7733333333333352 + ], + "texture": "#rm_khaki_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -11.416666666666668 + ] + } + }, + { + "from": [ + 5.450498754885794, + 5.450498754885794, + -10.5 + ], + "to": [ + 10.549501245114206, + 10.549501245114206, + -8.666666666666668 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.099002490228411, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 5.099002490228411, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.8333333333333321, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.8333333333333321, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 5.099002490228411, + 1.8333333333333321 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 5.099002490228411, + 1.8333333333333321 + ], + "texture": "#rm_khaki_t" + } + } + }, + { + "from": [ + 5.450498754885794, + 5.450498754885794, + -10.47 + ], + "to": [ + 10.549501245114206, + 10.549501245114206, + -8.696666666666667 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.099002490228411, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 5.099002490228411, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.7733333333333334, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.7733333333333334, + 5.099002490228411 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 5.099002490228411, + 1.7733333333333334 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 5.099002490228411, + 1.7733333333333334 + ], + "texture": "#rm_khaki_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -9.583333333333334 + ] + } + }, + { + "from": [ + 5.091975226050024, + 5.091975226050024, + -8.666666666666668 + ], + "to": [ + 10.908024773949975, + 10.908024773949975, + -6.833333333333334 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.816049547899952, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 5.816049547899952, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.833333333333334, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.833333333333334, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 5.816049547899952, + 1.833333333333334 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 5.816049547899952, + 1.833333333333334 + ], + "texture": "#rm_khaki_t" + } + } + }, + { + "from": [ + 5.091975226050024, + 5.091975226050024, + -8.636666666666668 + ], + "to": [ + 10.908024773949975, + 10.908024773949975, + -6.863333333333334 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.816049547899952, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 5.816049547899952, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.7733333333333343, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.7733333333333343, + 5.816049547899952 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 5.816049547899952, + 1.7733333333333343 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 5.816049547899952, + 1.7733333333333343 + ], + "texture": "#rm_khaki_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -7.750000000000002 + ] + } + }, + { + "from": [ + 4.766480749821159, + 4.766480749821159, + -6.833333333333334 + ], + "to": [ + 11.23351925017884, + 11.23351925017884, + -5.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.467038500357681, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 6.467038500357681, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.833333333333334, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.833333333333334, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 6.467038500357681, + 1.833333333333334 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 6.467038500357681, + 1.833333333333334 + ], + "texture": "#rm_khaki_t" + } + } + }, + { + "from": [ + 4.766480749821159, + 4.766480749821159, + -6.803333333333334 + ], + "to": [ + 11.23351925017884, + 11.23351925017884, + -5.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.467038500357681, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 6.467038500357681, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 1.7733333333333334, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 1.7733333333333334, + 6.467038500357681 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 6.467038500357681, + 1.7733333333333334 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 6.467038500357681, + 1.7733333333333334 + ], + "texture": "#rm_khaki_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -5.916666666666667 + ] + } + }, + { + "from": [ + 4.673959999999999, + 4.673959999999999, + -5.0 + ], + "to": [ + 11.32604, + 11.32604, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.6520800000000015, + 6.6520800000000015 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 6.6520800000000015, + 6.6520800000000015 + ], + "texture": "#rm_khaki" }, "east": { "uv": [ 0, 0, 16, - 7.0 + 6.6520800000000015 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "west": { "uv": [ 0, 0, 16, - 7.0 + 6.6520800000000015 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki" }, "up": { "uv": [ 0, 0, - 7.0, + 6.6520800000000015, 16 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" }, "down": { "uv": [ 0, 0, - 7.0, + 6.6520800000000015, 16 ], - "texture": "#ru_khaki" + "texture": "#rm_khaki_t" } } }, { "from": [ - 4.4, - 4.4, + 4.673959999999999, + 4.673959999999999, + -4.97 + ], + "to": [ + 11.32604, + 11.32604, + 27.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.6520800000000015, + 6.6520800000000015 + ], + "texture": "#rm_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 6.6520800000000015, + 6.6520800000000015 + ], + "texture": "#rm_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 6.6520800000000015 + ], + "texture": "#rm_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 6.6520800000000015 + ], + "texture": "#rm_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 6.6520800000000015, + 16 + ], + "texture": "#rm_khaki_t" + }, + "down": { + "uv": [ + 0, + 0, + 6.6520800000000015, + 16 + ], + "texture": "#rm_khaki_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 11.5 + ] + } + }, + { + "from": [ + 4.48918, + 4.48918, + 3.0 + ], + "to": [ + 11.510819999999999, + 11.510819999999999, 4.0 ], - "to": [ - 11.6, - 11.6, - 5.0 - ], "faces": { "north": { "uv": [ 0, 0, - 7.199999999999999, - 7.199999999999999 + 7.021639999999999, + 7.021639999999999 ], "texture": "#dark_metal" }, @@ -440,8 +1050,8 @@ "uv": [ 0, 0, - 7.199999999999999, - 7.199999999999999 + 7.021639999999999, + 7.021639999999999 ], "texture": "#dark_metal" }, @@ -450,7 +1060,7 @@ 0, 0, 1.0, - 7.199999999999999 + 7.021639999999999 ], "texture": "#dark_metal" }, @@ -459,7 +1069,7 @@ 0, 0, 1.0, - 7.199999999999999 + 7.021639999999999 ], "texture": "#dark_metal" }, @@ -467,7 +1077,7 @@ "uv": [ 0, 0, - 7.199999999999999, + 7.021639999999999, 1.0 ], "texture": "#dark_metal" @@ -476,7 +1086,7 @@ "uv": [ 0, 0, - 7.199999999999999, + 7.021639999999999, 1.0 ], "texture": "#dark_metal" @@ -485,90 +1095,99 @@ }, { "from": [ - 5.0, - 5.0, - 30.0 + 4.48918, + 4.48918, + 3.03 ], "to": [ - 11.0, - 11.0, - 32.0 + 11.510819999999999, + 11.510819999999999, + 3.97 ], "faces": { "north": { "uv": [ 0, 0, - 6.0, - 6.0 + 7.021639999999999, + 7.021639999999999 ], - "texture": "#nozzle" + "texture": "#dark_metal" }, "south": { "uv": [ 0, 0, - 6.0, - 6.0 + 7.021639999999999, + 7.021639999999999 ], - "texture": "#nozzle" + "texture": "#dark_metal" }, "east": { "uv": [ 0, 0, - 2.0, - 6.0 + 0.9400000000000004, + 7.021639999999999 ], - "texture": "#nozzle" + "texture": "#dark_metal" }, "west": { "uv": [ 0, 0, - 2.0, - 6.0 + 0.9400000000000004, + 7.021639999999999 ], - "texture": "#nozzle" + "texture": "#dark_metal" }, "up": { "uv": [ 0, 0, - 6.0, - 2.0 + 7.021639999999999, + 0.9400000000000004 ], - "texture": "#nozzle" + "texture": "#dark_metal" }, "down": { "uv": [ 0, 0, - 6.0, - 2.0 + 7.021639999999999, + 0.9400000000000004 ], - "texture": "#nozzle" + "texture": "#dark_metal" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 3.5 + ] } }, { "from": [ - 1.0, - 7.5, - 24.0 + 11.24, + 7.55, + 23.0 ], "to": [ - 4.5, - 8.5, - 30.0 + 14.815000000000001, + 8.45, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.5, - 1.0 + 3.575000000000001, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -576,8 +1195,8 @@ "uv": [ 0, 0, - 3.5, - 1.0 + 3.575000000000001, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -585,8 +1204,8 @@ "uv": [ 0, 0, - 6.0, - 1.0 + 5.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -594,8 +1213,8 @@ "uv": [ 0, 0, - 6.0, - 1.0 + 5.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -603,8 +1222,8 @@ "uv": [ 0, 0, - 3.5, - 6.0 + 3.575000000000001, + 5.0 ], "texture": "#ru_khaki" }, @@ -612,8 +1231,8 @@ "uv": [ 0, 0, - 3.5, - 6.0 + 3.575000000000001, + 5.0 ], "texture": "#ru_khaki" } @@ -621,22 +1240,22 @@ }, { "from": [ - 11.5, - 7.5, - 24.0 + 1.1849999999999987, + 7.55, + 23.0 ], "to": [ - 15.0, - 8.5, - 30.0 + 4.76, + 8.45, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.5, - 1.0 + 3.575000000000001, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -644,8 +1263,8 @@ "uv": [ 0, 0, - 3.5, - 1.0 + 3.575000000000001, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -653,8 +1272,8 @@ "uv": [ 0, 0, - 6.0, - 1.0 + 5.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -662,8 +1281,8 @@ "uv": [ 0, 0, - 6.0, - 1.0 + 5.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -671,8 +1290,8 @@ "uv": [ 0, 0, - 3.5, - 6.0 + 3.575000000000001, + 5.0 ], "texture": "#ru_khaki" }, @@ -680,8 +1299,8 @@ "uv": [ 0, 0, - 3.5, - 6.0 + 3.575000000000001, + 5.0 ], "texture": "#ru_khaki" } @@ -689,22 +1308,22 @@ }, { "from": [ - 7.5, - 1.0, - 24.0 + 14.815000000000001, + 7.55, + 25.0 ], "to": [ - 8.5, - 4.5, - 30.0 + 17.740000000000002, + 8.45, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 1.0, - 3.5 + 2.9250000000000007, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -712,8 +1331,8 @@ "uv": [ 0, 0, - 1.0, - 3.5 + 2.9250000000000007, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -721,8 +1340,8 @@ "uv": [ 0, 0, - 6.0, - 3.5 + 3.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -730,8 +1349,8 @@ "uv": [ 0, 0, - 6.0, - 3.5 + 3.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -739,8 +1358,8 @@ "uv": [ 0, 0, - 1.0, - 6.0 + 2.9250000000000007, + 3.0 ], "texture": "#ru_khaki" }, @@ -748,8 +1367,8 @@ "uv": [ 0, 0, - 1.0, - 6.0 + 2.9250000000000007, + 3.0 ], "texture": "#ru_khaki" } @@ -757,22 +1376,22 @@ }, { "from": [ - 7.5, - 11.5, - 24.0 + -1.740000000000002, + 7.55, + 25.0 ], "to": [ - 8.5, - 15.0, - 30.0 + 1.1849999999999987, + 8.45, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 1.0, - 3.5 + 2.9250000000000007, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -780,8 +1399,8 @@ "uv": [ 0, 0, - 1.0, - 3.5 + 2.9250000000000007, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -789,8 +1408,8 @@ "uv": [ 0, 0, - 6.0, - 3.5 + 3.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -798,8 +1417,8 @@ "uv": [ 0, 0, - 6.0, - 3.5 + 3.0, + 0.8999999999999995 ], "texture": "#ru_khaki" }, @@ -807,8 +1426,8 @@ "uv": [ 0, 0, - 1.0, - 6.0 + 2.9250000000000007, + 3.0 ], "texture": "#ru_khaki" }, @@ -816,12 +1435,420 @@ "uv": [ 0, 0, - 1.0, - 6.0 + 2.9250000000000007, + 3.0 ], "texture": "#ru_khaki" } } + }, + { + "from": [ + 7.55, + 11.24, + 23.0 + ], + "to": [ + 8.45, + 14.815000000000001, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.575000000000001 + ], + "texture": "#ru_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.575000000000001 + ], + "texture": "#ru_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 5.0, + 3.575000000000001 + ], + "texture": "#ru_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 5.0, + 3.575000000000001 + ], + "texture": "#ru_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 5.0 + ], + "texture": "#ru_khaki" + }, + "down": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 5.0 + ], + "texture": "#ru_khaki" + } + } + }, + { + "from": [ + 7.55, + 14.815000000000001, + 25.0 + ], + "to": [ + 8.45, + 17.740000000000002, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 2.9250000000000007 + ], + "texture": "#ru_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 2.9250000000000007 + ], + "texture": "#ru_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.9250000000000007 + ], + "texture": "#ru_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.9250000000000007 + ], + "texture": "#ru_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.0 + ], + "texture": "#ru_khaki" + }, + "down": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.0 + ], + "texture": "#ru_khaki" + } + } + }, + { + "from": [ + 7.55, + 1.1849999999999996, + 23.0 + ], + "to": [ + 8.45, + 4.76, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.575 + ], + "texture": "#ru_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.575 + ], + "texture": "#ru_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 5.0, + 3.575 + ], + "texture": "#ru_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 5.0, + 3.575 + ], + "texture": "#ru_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 5.0 + ], + "texture": "#ru_khaki" + }, + "down": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 5.0 + ], + "texture": "#ru_khaki" + } + } + }, + { + "from": [ + 7.55, + -1.7400000000000002, + 25.0 + ], + "to": [ + 8.45, + 1.1849999999999996, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 2.925 + ], + "texture": "#ru_khaki" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 2.925 + ], + "texture": "#ru_khaki" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.925 + ], + "texture": "#ru_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.925 + ], + "texture": "#ru_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.0 + ], + "texture": "#ru_khaki" + }, + "down": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.0 + ], + "texture": "#ru_khaki" + } + } + }, + { + "from": [ + 5.279999999999999, + 5.279999999999999, + 28.0 + ], + "to": [ + 10.72, + 10.72, + 29.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.440000000000001, + 5.440000000000001 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 5.440000000000001, + 5.440000000000001 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 5.440000000000001 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 5.440000000000001 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 5.440000000000001, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 5.440000000000001, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 6.13, + 6.13, + 29.6 + ], + "to": [ + 9.870000000000001, + 9.870000000000001, + 29.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.740000000000001, + 3.740000000000001 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 3.740000000000001, + 3.740000000000001 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 3.740000000000001 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 3.740000000000001 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 3.740000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 3.740000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + } + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/kalibr.json b/airdef-mod/assets/airdef/models/block/kalibr.json index b483de9..cf33b62 100644 --- a/airdef-mod/assets/airdef/models/block/kalibr.json +++ b/airdef-mod/assets/airdef/models/block/kalibr.json @@ -2,28 +2,32 @@ "ambientocclusion": false, "textures": { "missile_grey": "airdef:block/missile_grey", + "rm_grey": "airdef:block/rm_grey", + "rm_grey_t": "airdef:block/rm_grey_t", "dark_metal": "airdef:block/dark_metal", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", "particle": "airdef:block/missile_grey" }, "elements": [ { "from": [ - 7.0, - 7.0, + 7.220675060123435, + 7.220675060123435, -16.0 ], "to": [ - 9.0, - 9.0, - -14.333333333333334 + 8.779324939876565, + 8.779324939876565, + -14.25 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.5586498797531299, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -31,8 +35,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 1.5586498797531299, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -40,8 +44,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 2.0 + 1.75, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -49,8 +53,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 2.0 + 1.75, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -58,8 +62,8 @@ "uv": [ 0, 0, - 2.0, - 1.666666666666666 + 1.5586498797531299, + 1.75 ], "texture": "#missile_grey" }, @@ -67,8 +71,8 @@ "uv": [ 0, 0, - 2.0, - 1.666666666666666 + 1.5586498797531299, + 1.75 ], "texture": "#missile_grey" } @@ -76,22 +80,22 @@ }, { "from": [ - 6.5, - 6.5, - -14.333333333333334 + 7.220675060123435, + 7.220675060123435, + -15.97 ], "to": [ - 9.5, - 9.5, - -12.666666666666666 + 8.779324939876565, + 8.779324939876565, + -14.28 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 3.0 + 1.5586498797531299, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -99,8 +103,8 @@ "uv": [ 0, 0, - 3.0, - 3.0 + 1.5586498797531299, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -108,8 +112,8 @@ "uv": [ 0, 0, - 1.6666666666666679, - 3.0 + 1.6900000000000013, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -117,8 +121,8 @@ "uv": [ 0, 0, - 1.6666666666666679, - 3.0 + 1.6900000000000013, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -126,8 +130,8 @@ "uv": [ 0, 0, - 3.0, - 1.6666666666666679 + 1.5586498797531299, + 1.6900000000000013 ], "texture": "#missile_grey" }, @@ -135,31 +139,40 @@ "uv": [ 0, 0, - 3.0, - 1.6666666666666679 + 1.5586498797531299, + 1.6900000000000013 ], "texture": "#missile_grey" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -15.125 + ] } }, { "from": [ - 6.0, - 6.0, - -12.666666666666666 + 6.730415652424811, + 6.730415652424811, + -14.25 ], "to": [ - 10.0, - 10.0, - -11.0 + 9.26958434757519, + 9.26958434757519, + -12.5 ], "faces": { "north": { "uv": [ 0, 0, - 4.0, - 4.0 + 2.539168695150379, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -167,8 +180,8 @@ "uv": [ 0, 0, - 4.0, - 4.0 + 2.539168695150379, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -176,8 +189,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 4.0 + 1.75, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -185,8 +198,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 4.0 + 1.75, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -194,8 +207,8 @@ "uv": [ 0, 0, - 4.0, - 1.666666666666666 + 2.539168695150379, + 1.75 ], "texture": "#missile_grey" }, @@ -203,8 +216,8 @@ "uv": [ 0, 0, - 4.0, - 1.666666666666666 + 2.539168695150379, + 1.75 ], "texture": "#missile_grey" } @@ -212,22 +225,22 @@ }, { "from": [ - 5.75, - 5.75, - -11.0 + 6.730415652424811, + 6.730415652424811, + -14.22 ], "to": [ - 10.25, - 10.25, - 30.0 + 9.26958434757519, + 9.26958434757519, + -12.53 ], "faces": { "north": { "uv": [ 0, 0, - 4.5, - 4.5 + 2.539168695150379, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -235,49 +248,493 @@ "uv": [ 0, 0, - 4.5, - 4.5 + 2.539168695150379, + 2.539168695150379 ], "texture": "#missile_grey" }, + "east": { + "uv": [ + 0, + 0, + 1.6900000000000013, + 2.539168695150379 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.6900000000000013, + 2.539168695150379 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 2.539168695150379, + 1.6900000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 2.539168695150379, + 1.6900000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -13.375 + ] + } + }, + { + "from": [ + 6.362562534814173, + 6.362562534814173, + -12.5 + ], + "to": [ + 9.637437465185826, + 9.637437465185826, + -10.75 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.274874930371653, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 3.274874930371653, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.75, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.75, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 3.274874930371653, + 1.75 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 3.274874930371653, + 1.75 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 6.362562534814173, + 6.362562534814173, + -12.47 + ], + "to": [ + 9.637437465185826, + 9.637437465185826, + -10.78 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.274874930371653, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 3.274874930371653, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.6900000000000013, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.6900000000000013, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 3.274874930371653, + 1.6900000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 3.274874930371653, + 1.6900000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -11.625 + ] + } + }, + { + "from": [ + 6.052732565350377, + 6.052732565350377, + -10.75 + ], + "to": [ + 9.947267434649623, + 9.947267434649623, + -9.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.894534869299246, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 3.894534869299246, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.75, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.75, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 3.894534869299246, + 1.75 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 3.894534869299246, + 1.75 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 6.052732565350377, + 6.052732565350377, + -10.72 + ], + "to": [ + 9.947267434649623, + 9.947267434649623, + -9.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.894534869299246, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 3.894534869299246, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.6900000000000013, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.6900000000000013, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 3.894534869299246, + 1.6900000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 3.894534869299246, + 1.6900000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -9.875 + ] + } + }, + { + "from": [ + 5.96742, + 5.96742, + -9.0 + ], + "to": [ + 10.03258, + 10.03258, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "south": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, "east": { "uv": [ 0, 0, 16, - 4.5 + 4.06516 ], - "texture": "#missile_grey" + "texture": "#rm_grey" }, "west": { "uv": [ 0, 0, 16, - 4.5 + 4.06516 ], - "texture": "#missile_grey" + "texture": "#rm_grey" }, "up": { "uv": [ 0, 0, - 4.5, + 4.06516, 16 ], - "texture": "#missile_grey" + "texture": "#rm_grey_t" }, "down": { "uv": [ 0, 0, - 4.5, + 4.06516, 16 ], - "texture": "#missile_grey" + "texture": "#rm_grey_t" } } }, + { + "from": [ + 5.96742, + 5.96742, + -8.97 + ], + "to": [ + 10.03258, + 10.03258, + 27.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "south": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.06516 + ], + "texture": "#rm_grey" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.06516 + ], + "texture": "#rm_grey" + }, + "up": { + "uv": [ + 0, + 0, + 4.06516, + 16 + ], + "texture": "#rm_grey_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.06516, + 16 + ], + "texture": "#rm_grey_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 9.5 + ] + } + }, { "from": [ -6.0, @@ -348,22 +805,90 @@ }, { "from": [ - 7.6, - 10.25, - 25.0 + 7.2, + 3.2, + 17.0 ], "to": [ - 8.4, - 14.0, - 30.0 + 8.8, + 5.4, + 26.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 3.75 + 1.6000000000000005, + 2.2 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 1.6000000000000005, + 2.2 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 2.2 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 2.2 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 1.6000000000000005, + 9.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 1.6000000000000005, + 9.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 9.98, + 7.65, + 23.0 + ], + "to": [ + 12.455, + 8.35, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.4749999999999996, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -371,8 +896,8 @@ "uv": [ 0, 0, - 0.8000000000000007, - 3.75 + 2.4749999999999996, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -381,7 +906,7 @@ 0, 0, 5.0, - 3.75 + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -390,7 +915,7 @@ 0, 0, 5.0, - 3.75 + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -398,7 +923,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 2.4749999999999996, 5.0 ], "texture": "#missile_grey" @@ -407,7 +932,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 2.4749999999999996, 5.0 ], "texture": "#missile_grey" @@ -416,90 +941,22 @@ }, { "from": [ - 6.5, - 3.0, - 18.0 + 3.545, + 7.65, + 23.0 ], "to": [ - 9.5, - 5.75, - 26.0 + 6.02, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 2.75 - ], - "texture": "#dark_metal" - }, - "south": { - "uv": [ - 0, - 0, - 3.0, - 2.75 - ], - "texture": "#dark_metal" - }, - "east": { - "uv": [ - 0, - 0, - 8.0, - 2.75 - ], - "texture": "#dark_metal" - }, - "west": { - "uv": [ - 0, - 0, - 8.0, - 2.75 - ], - "texture": "#dark_metal" - }, - "up": { - "uv": [ - 0, - 0, - 3.0, - 8.0 - ], - "texture": "#dark_metal" - }, - "down": { - "uv": [ - 0, - 0, - 3.0, - 8.0 - ], - "texture": "#dark_metal" - } - } - }, - { - "from": [ - 2.0, - 7.6, - 26.0 - ], - "to": [ - 5.75, - 8.4, - 30.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 3.75, - 0.8000000000000007 + 2.4749999999999996, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -507,8 +964,8 @@ "uv": [ 0, 0, - 3.75, - 0.8000000000000007 + 2.4749999999999996, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -516,8 +973,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 5.0, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -525,8 +982,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 5.0, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -534,8 +991,8 @@ "uv": [ 0, 0, - 3.75, - 4.0 + 2.4749999999999996, + 5.0 ], "texture": "#missile_grey" }, @@ -543,8 +1000,8 @@ "uv": [ 0, 0, - 3.75, - 4.0 + 2.4749999999999996, + 5.0 ], "texture": "#missile_grey" } @@ -552,22 +1009,22 @@ }, { "from": [ - 10.25, - 7.6, - 26.0 + 12.455, + 7.65, + 25.5 ], "to": [ - 14.0, - 8.4, - 30.0 + 14.48, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.75, - 0.8000000000000007 + 2.0250000000000004, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -575,8 +1032,8 @@ "uv": [ 0, 0, - 3.75, - 0.8000000000000007 + 2.0250000000000004, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -584,8 +1041,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 2.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -593,8 +1050,8 @@ "uv": [ 0, 0, - 4.0, - 0.8000000000000007 + 2.5, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -602,8 +1059,8 @@ "uv": [ 0, 0, - 3.75, - 4.0 + 2.0250000000000004, + 2.5 ], "texture": "#missile_grey" }, @@ -611,12 +1068,488 @@ "uv": [ 0, 0, - 3.75, - 4.0 + 2.0250000000000004, + 2.5 ], "texture": "#missile_grey" } } + }, + { + "from": [ + 1.5199999999999996, + 7.65, + 25.5 + ], + "to": [ + 3.545, + 8.35, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0250000000000004, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 2.0250000000000004, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 2.0250000000000004, + 2.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 2.0250000000000004, + 2.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 9.98, + 23.0 + ], + "to": [ + 8.35, + 12.455, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 5.0, + 2.4749999999999996 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 5.0, + 2.4749999999999996 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 5.0 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 5.0 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 12.455, + 25.5 + ], + "to": [ + 8.35, + 14.48, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.0250000000000004 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.0250000000000004 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.0250000000000004 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.0250000000000004 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 3.5449999999999995, + 23.0 + ], + "to": [ + 8.35, + 6.02, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.475 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.475 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 5.0, + 2.475 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 5.0, + 2.475 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 5.0 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 5.0 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 1.5199999999999996, + 25.5 + ], + "to": [ + 8.35, + 3.5449999999999995, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.025 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.025 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.025 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.025 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 6.4, + 6.4, + 28.0 + ], + "to": [ + 9.6, + 9.6, + 29.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.1999999999999993, + 3.1999999999999993 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 3.1999999999999993, + 3.1999999999999993 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 3.1999999999999993 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 3.1999999999999993 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 3.1999999999999993, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 3.1999999999999993, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 6.9, + 6.9, + 29.6 + ], + "to": [ + 9.1, + 9.1, + 29.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.1999999999999993, + 2.1999999999999993 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 2.1999999999999993, + 2.1999999999999993 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 2.1999999999999993 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 2.1999999999999993 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 2.1999999999999993, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 2.1999999999999993, + 0.29999999999999716 + ], + "texture": "#glow_ember" + } + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/kh101.json b/airdef-mod/assets/airdef/models/block/kh101.json index cba3536..17015be 100644 --- a/airdef-mod/assets/airdef/models/block/kh101.json +++ b/airdef-mod/assets/airdef/models/block/kh101.json @@ -4,8 +4,7 @@ "kh101": "airdef:block/kh101", "kh101_belly": "airdef:block/kh101_belly", "dark_metal": "airdef:block/dark_metal", - "intake": "airdef:block/intake", - "nozzle": "airdef:block/nozzle", + "bare_nozzle": "airdef:block/bare_nozzle", "particle": "airdef:block/kh101" }, "elements": [ @@ -776,7 +775,7 @@ 3.0, 2.5 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "south": { "uv": [ @@ -785,7 +784,7 @@ 3.0, 2.5 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "east": { "uv": [ @@ -794,7 +793,7 @@ 1.0, 2.5 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "west": { "uv": [ @@ -803,7 +802,7 @@ 1.0, 2.5 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "up": { "uv": [ @@ -812,7 +811,7 @@ 3.0, 1.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "down": { "uv": [ @@ -821,7 +820,7 @@ 3.0, 1.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" } } }, @@ -844,7 +843,7 @@ 3.0, 2.5 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "south": { "uv": [ @@ -853,7 +852,7 @@ 3.0, 2.5 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "east": { "uv": [ @@ -862,7 +861,7 @@ 1.5, 2.5 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "west": { "uv": [ @@ -871,7 +870,7 @@ 1.5, 2.5 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "up": { "uv": [ @@ -880,7 +879,7 @@ 3.0, 1.5 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "down": { "uv": [ @@ -889,7 +888,7 @@ 3.0, 1.5 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" } } } diff --git a/airdef-mod/assets/airdef/models/block/kh22.json b/airdef-mod/assets/airdef/models/block/kh22.json index 14f9443..2f01e8b 100644 --- a/airdef-mod/assets/airdef/models/block/kh22.json +++ b/airdef-mod/assets/airdef/models/block/kh22.json @@ -2,7 +2,7 @@ "ambientocclusion": false, "textures": { "missile_ru": "airdef:block/missile_ru", - "nozzle": "airdef:block/nozzle", + "bare_nozzle": "airdef:block/bare_nozzle", "particle": "airdef:block/missile_ru" }, "elements": [ @@ -501,7 +501,7 @@ 5.0, 5.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "south": { "uv": [ @@ -510,7 +510,7 @@ 5.0, 5.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "east": { "uv": [ @@ -519,7 +519,7 @@ 2.0, 5.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "west": { "uv": [ @@ -528,7 +528,7 @@ 2.0, 5.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "up": { "uv": [ @@ -537,7 +537,7 @@ 5.0, 2.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" }, "down": { "uv": [ @@ -546,7 +546,7 @@ 5.0, 2.0 ], - "texture": "#nozzle" + "texture": "#bare_nozzle" } } }, diff --git a/airdef-mod/assets/airdef/models/block/kinzhal.json b/airdef-mod/assets/airdef/models/block/kinzhal.json index d10b956..7f85a84 100644 --- a/airdef-mod/assets/airdef/models/block/kinzhal.json +++ b/airdef-mod/assets/airdef/models/block/kinzhal.json @@ -1,21 +1,23 @@ { "ambientocclusion": false, "textures": { - "missile_grey": "airdef:block/missile_grey", + "rm_dark": "airdef:block/rm_dark", + "rm_dark_t": "airdef:block/rm_dark_t", "dark_metal": "airdef:block/dark_metal", - "nozzle": "airdef:block/nozzle", - "particle": "airdef:block/missile_grey" + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", + "particle": "airdef:block/rm_dark" }, "elements": [ { "from": [ - 6.9375, - 6.9375, + 6.934694169941659, + 6.934694169941659, -16.0 ], "to": [ - 9.0625, - 9.0625, + 9.06530583005834, + 9.06530583005834, -14.0 ], "faces": { @@ -23,67 +25,144 @@ "uv": [ 0, 0, - 2.125, - 2.125 + 2.1306116601166813, + 2.1306116601166813 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 2.125, - 2.125 + 2.1306116601166813, + 2.1306116601166813 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.0, - 2.125 + 2.1306116601166813 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.0, - 2.125 + 2.1306116601166813 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 2.125, + 2.1306116601166813, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 2.125, + 2.1306116601166813, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" } } }, { "from": [ - 6.3125, - 6.3125, + 6.934694169941659, + 6.934694169941659, + -15.97 + ], + "to": [ + 9.06530583005834, + 9.06530583005834, + -14.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.1306116601166813, + 2.1306116601166813 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 2.1306116601166813, + 2.1306116601166813 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 2.1306116601166813 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 2.1306116601166813 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 2.1306116601166813, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 2.1306116601166813, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -15.0 + ] + } + }, + { + "from": [ + 6.264529289365638, + 6.264529289365638, -14.0 ], "to": [ - 9.6875, - 9.6875, + 9.735470710634363, + 9.735470710634363, -12.0 ], "faces": { @@ -91,67 +170,144 @@ "uv": [ 0, 0, - 3.375, - 3.375 + 3.4709414212687255, + 3.4709414212687255 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 3.375, - 3.375 + 3.4709414212687255, + 3.4709414212687255 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.0, - 3.375 + 3.4709414212687255 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.0, - 3.375 + 3.4709414212687255 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 3.375, + 3.4709414212687255, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 3.375, + 3.4709414212687255, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" } } }, { "from": [ - 5.6875, - 5.6875, + 6.264529289365638, + 6.264529289365638, + -13.97 + ], + "to": [ + 9.735470710634363, + 9.735470710634363, + -12.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4709414212687255, + 3.4709414212687255 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 3.4709414212687255, + 3.4709414212687255 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 3.4709414212687255 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 3.4709414212687255 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 3.4709414212687255, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.4709414212687255, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -13.0 + ] + } + }, + { + "from": [ + 5.761688881283975, + 5.761688881283975, -12.0 ], "to": [ - 10.3125, - 10.3125, + 10.238311118716025, + 10.238311118716025, -10.0 ], "faces": { @@ -159,67 +315,144 @@ "uv": [ 0, 0, - 4.625, - 4.625 + 4.47662223743205, + 4.47662223743205 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 4.625, - 4.625 + 4.47662223743205, + 4.47662223743205 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.0, - 4.625 + 4.47662223743205 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.0, - 4.625 + 4.47662223743205 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 4.625, + 4.47662223743205, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 4.625, + 4.47662223743205, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" } } }, { "from": [ - 5.0625, - 5.0625, + 5.761688881283975, + 5.761688881283975, + -11.97 + ], + "to": [ + 10.238311118716025, + 10.238311118716025, + -10.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.47662223743205, + 4.47662223743205 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 4.47662223743205, + 4.47662223743205 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 4.47662223743205 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 4.47662223743205 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 4.47662223743205, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.47662223743205, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -11.0 + ] + } + }, + { + "from": [ + 5.33816378166525, + 5.33816378166525, -10.0 ], "to": [ - 10.9375, - 10.9375, + 10.66183621833475, + 10.66183621833475, -8.0 ], "faces": { @@ -227,280 +460,443 @@ "uv": [ 0, 0, - 5.875, - 5.875 + 5.323672436669501, + 5.323672436669501 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 5.875, - 5.875 + 5.323672436669501, + 5.323672436669501 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.0, - 5.875 + 5.323672436669501 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.0, - 5.875 + 5.323672436669501 ], - "texture": "#missile_grey" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 5.875, + 5.323672436669501, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 5.875, + 5.323672436669501, 2.0 ], - "texture": "#missile_grey" + "texture": "#rm_dark_t" } } }, { "from": [ - 4.75, - 4.75, + 5.33816378166525, + 5.33816378166525, + -9.97 + ], + "to": [ + 10.66183621833475, + 10.66183621833475, + -8.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 5.323672436669501, + 5.323672436669501 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 5.323672436669501, + 5.323672436669501 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 5.323672436669501 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 5.323672436669501 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 5.323672436669501, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 5.323672436669501, + 1.9400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -9.0 + ] + } + }, + { + "from": [ + 4.963843150910867, + 4.963843150910867, -8.0 ], "to": [ - 11.25, - 11.25, - 30.0 + 11.036156849089133, + 11.036156849089133, + -6.0 ], "faces": { "north": { "uv": [ 0, 0, - 6.5, - 6.5 + 6.072313698178267, + 6.072313698178267 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 6.5, - 6.5 + 6.072313698178267, + 6.072313698178267 ], - "texture": "#dark_metal" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 6.5 - ], - "texture": "#dark_metal" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 6.5 - ], - "texture": "#dark_metal" - }, - "up": { - "uv": [ - 0, - 0, - 6.5, - 16 - ], - "texture": "#dark_metal" - }, - "down": { - "uv": [ - 0, - 0, - 6.5, - 16 - ], - "texture": "#dark_metal" - } - } - }, - { - "from": [ - 4.6, - 4.6, - -4.0 - ], - "to": [ - 11.4, - 11.4, - -3.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 6.800000000000001, - 6.800000000000001 - ], - "texture": "#missile_grey" - }, - "south": { - "uv": [ - 0, - 0, - 6.800000000000001, - 6.800000000000001 - ], - "texture": "#missile_grey" - }, - "east": { - "uv": [ - 0, - 0, - 1.0, - 6.800000000000001 - ], - "texture": "#missile_grey" - }, - "west": { - "uv": [ - 0, - 0, - 1.0, - 6.800000000000001 - ], - "texture": "#missile_grey" - }, - "up": { - "uv": [ - 0, - 0, - 6.800000000000001, - 1.0 - ], - "texture": "#missile_grey" - }, - "down": { - "uv": [ - 0, - 0, - 6.800000000000001, - 1.0 - ], - "texture": "#missile_grey" - } - } - }, - { - "from": [ - 5.5, - 5.5, - 30.0 - ], - "to": [ - 10.5, - 10.5, - 32.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 5.0, - 5.0 - ], - "texture": "#nozzle" - }, - "south": { - "uv": [ - 0, - 0, - 5.0, - 5.0 - ], - "texture": "#nozzle" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.0, - 5.0 + 6.072313698178267 ], - "texture": "#nozzle" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.0, - 5.0 + 6.072313698178267 ], - "texture": "#nozzle" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 5.0, + 6.072313698178267, 2.0 ], - "texture": "#nozzle" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 5.0, + 6.072313698178267, 2.0 ], - "texture": "#nozzle" + "texture": "#rm_dark_t" } } }, { "from": [ - 0.0, - 7.6, - 22.0 + 4.963843150910867, + 4.963843150910867, + -7.97 ], "to": [ - 4.75, - 8.4, - 30.0 + 11.036156849089133, + 11.036156849089133, + -6.03 ], "faces": { "north": { "uv": [ 0, 0, - 4.75, - 0.8000000000000007 + 6.072313698178267, + 6.072313698178267 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 6.072313698178267, + 6.072313698178267 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 1.9399999999999995, + 6.072313698178267 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 1.9399999999999995, + 6.072313698178267 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 6.072313698178267, + 1.9399999999999995 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 6.072313698178267, + 1.9399999999999995 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -7.0 + ] + } + }, + { + "from": [ + 4.85874, + 4.85874, + -6.0 + ], + "to": [ + 11.141259999999999, + 11.141259999999999, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.282519999999999, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 6.282519999999999, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 6.282519999999999, + 16 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 6.282519999999999, + 16 + ], + "texture": "#rm_dark_t" + } + } + }, + { + "from": [ + 4.85874, + 4.85874, + -5.97 + ], + "to": [ + 11.141259999999999, + 11.141259999999999, + 27.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.282519999999999, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 6.282519999999999, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 6.282519999999999 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 6.282519999999999, + 16 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 6.282519999999999, + 16 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 11.0 + ] + } + }, + { + "from": [ + 11.06, + 7.55, + 20.0 + ], + "to": [ + 15.46, + 8.45, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.4, + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -508,8 +904,8 @@ "uv": [ 0, 0, - 4.75, - 0.8000000000000007 + 4.4, + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -518,7 +914,7 @@ 0, 0, 8.0, - 0.8000000000000007 + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -527,7 +923,7 @@ 0, 0, 8.0, - 0.8000000000000007 + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -535,7 +931,7 @@ "uv": [ 0, 0, - 4.75, + 4.4, 8.0 ], "texture": "#dark_metal" @@ -544,7 +940,7 @@ "uv": [ 0, 0, - 4.75, + 4.4, 8.0 ], "texture": "#dark_metal" @@ -553,22 +949,22 @@ }, { "from": [ - 11.25, - 7.6, - 22.0 + 0.5399999999999991, + 7.55, + 20.0 ], "to": [ - 16.0, - 8.4, - 30.0 + 4.9399999999999995, + 8.45, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 4.75, - 0.8000000000000007 + 4.4, + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -576,8 +972,8 @@ "uv": [ 0, 0, - 4.75, - 0.8000000000000007 + 4.4, + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -586,7 +982,7 @@ 0, 0, 8.0, - 0.8000000000000007 + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -595,7 +991,7 @@ 0, 0, 8.0, - 0.8000000000000007 + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -603,7 +999,7 @@ "uv": [ 0, 0, - 4.75, + 4.4, 8.0 ], "texture": "#dark_metal" @@ -612,7 +1008,7 @@ "uv": [ 0, 0, - 4.75, + 4.4, 8.0 ], "texture": "#dark_metal" @@ -621,22 +1017,22 @@ }, { "from": [ - 7.6, - 0.0, - 22.0 + 15.46, + 7.55, + 24.0 ], "to": [ - 8.4, - 4.75, - 30.0 + 19.060000000000002, + 8.45, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 4.75 + 3.6000000000000014, + 0.8999999999999995 ], "texture": "#dark_metal" }, @@ -644,8 +1040,144 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.75 + 3.6000000000000014, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + -3.0600000000000023, + 7.55, + 24.0 + ], + "to": [ + 0.5399999999999991, + 8.45, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 0.8999999999999995 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 3.6000000000000014, + 4.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 7.55, + 11.06, + 20.0 + ], + "to": [ + 8.45, + 15.46, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.4 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.4 ], "texture": "#dark_metal" }, @@ -654,7 +1186,7 @@ 0, 0, 8.0, - 4.75 + 4.4 ], "texture": "#dark_metal" }, @@ -663,7 +1195,7 @@ 0, 0, 8.0, - 4.75 + 4.4 ], "texture": "#dark_metal" }, @@ -671,7 +1203,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.8999999999999995, 8.0 ], "texture": "#dark_metal" @@ -680,7 +1212,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.8999999999999995, 8.0 ], "texture": "#dark_metal" @@ -689,22 +1221,22 @@ }, { "from": [ - 7.6, - 11.25, - 22.0 + 7.55, + 15.46, + 24.0 ], "to": [ - 8.4, - 16.0, - 30.0 + 8.45, + 19.060000000000002, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 4.75 + 0.8999999999999995, + 3.6000000000000014 ], "texture": "#dark_metal" }, @@ -712,8 +1244,76 @@ "uv": [ 0, 0, - 0.8000000000000007, - 4.75 + 0.8999999999999995, + 3.6000000000000014 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 3.6000000000000014 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 3.6000000000000014 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 7.55, + 0.5399999999999991, + 20.0 + ], + "to": [ + 8.45, + 4.9399999999999995, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.4 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.4 ], "texture": "#dark_metal" }, @@ -722,7 +1322,7 @@ 0, 0, 8.0, - 4.75 + 4.4 ], "texture": "#dark_metal" }, @@ -731,7 +1331,7 @@ 0, 0, 8.0, - 4.75 + 4.4 ], "texture": "#dark_metal" }, @@ -739,7 +1339,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.8999999999999995, 8.0 ], "texture": "#dark_metal" @@ -748,12 +1348,216 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.8999999999999995, 8.0 ], "texture": "#dark_metal" } } + }, + { + "from": [ + 7.55, + -3.0600000000000005, + 24.0 + ], + "to": [ + 8.45, + 0.5399999999999991, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.5999999999999996 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 3.5999999999999996 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 3.5999999999999996 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 3.5999999999999996 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 0.8999999999999995, + 4.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 5.6, + 5.6, + 28.0 + ], + "to": [ + 10.4, + 10.4, + 29.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.800000000000001, + 4.800000000000001 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 4.800000000000001, + 4.800000000000001 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 4.800000000000001 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 4.800000000000001 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 4.800000000000001, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 4.800000000000001, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 6.35, + 6.35, + 29.6 + ], + "to": [ + 9.65, + 9.65, + 29.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.3000000000000007, + 3.3000000000000007 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 3.3000000000000007, + 3.3000000000000007 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 3.3000000000000007 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 3.3000000000000007 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 3.3000000000000007, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 3.3000000000000007, + 0.29999999999999716 + ], + "texture": "#glow_ember" + } + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/lancet.json b/airdef-mod/assets/airdef/models/block/lancet.json index b6a3f9b..68bacdf 100644 --- a/airdef-mod/assets/airdef/models/block/lancet.json +++ b/airdef-mod/assets/airdef/models/block/lancet.json @@ -2,7 +2,7 @@ "ambientocclusion": false, "textures": { "lancet": "airdef:block/lancet", - "intake": "airdef:block/intake", + "bare_nozzle": "airdef:block/bare_nozzle", "dark_metal": "airdef:block/dark_metal", "particle": "airdef:block/lancet" }, @@ -298,7 +298,7 @@ 2.3999999999999995, 1.4000000000000004 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "south": { "uv": [ @@ -307,7 +307,7 @@ 2.3999999999999995, 1.4000000000000004 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "east": { "uv": [ @@ -316,7 +316,7 @@ 4.0, 1.4000000000000004 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "west": { "uv": [ @@ -325,7 +325,7 @@ 4.0, 1.4000000000000004 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "up": { "uv": [ @@ -334,7 +334,7 @@ 2.3999999999999995, 4.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "down": { "uv": [ @@ -343,7 +343,7 @@ 2.3999999999999995, 4.0 ], - "texture": "#intake" + "texture": "#bare_nozzle" } } }, diff --git a/airdef-mod/assets/airdef/models/block/m48n6.json b/airdef-mod/assets/airdef/models/block/m48n6.json index 75b6cca..cb19548 100644 --- a/airdef-mod/assets/airdef/models/block/m48n6.json +++ b/airdef-mod/assets/airdef/models/block/m48n6.json @@ -2,28 +2,31 @@ "ambientocclusion": false, "textures": { "missile_ru": "airdef:block/missile_ru", - "nozzle": "airdef:block/nozzle", + "rm_ru": "airdef:block/rm_ru", + "rm_ru_t": "airdef:block/rm_ru_t", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", "particle": "airdef:block/missile_ru" }, "elements": [ { "from": [ - 7.291666666666667, - 7.291666666666667, + 7.211565172735556, + 7.211565172735556, -16.0 ], "to": [ - 8.708333333333334, - 8.708333333333334, - -14.333333333333334 + 8.788434827264444, + 8.788434827264444, + -13.666666666666666 ], "faces": { "north": { "uv": [ 0, 0, - 1.416666666666667, - 1.416666666666667 + 1.5768696545288883, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -31,8 +34,8 @@ "uv": [ 0, 0, - 1.416666666666667, - 1.416666666666667 + 1.5768696545288883, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -40,8 +43,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 1.416666666666667 + 2.333333333333334, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -49,8 +52,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 1.416666666666667 + 2.333333333333334, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -58,8 +61,8 @@ "uv": [ 0, 0, - 1.416666666666667, - 1.666666666666666 + 1.5768696545288883, + 2.333333333333334 ], "texture": "#missile_ru" }, @@ -67,8 +70,8 @@ "uv": [ 0, 0, - 1.416666666666667, - 1.666666666666666 + 1.5768696545288883, + 2.333333333333334 ], "texture": "#missile_ru" } @@ -76,22 +79,22 @@ }, { "from": [ - 6.875, - 6.875, - -14.333333333333334 + 7.211565172735556, + 7.211565172735556, + -15.97 ], "to": [ - 9.125, - 9.125, - -12.666666666666666 + 8.788434827264444, + 8.788434827264444, + -13.696666666666665 ], "faces": { "north": { "uv": [ 0, 0, - 2.25, - 2.25 + 1.5768696545288883, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -99,8 +102,8 @@ "uv": [ 0, 0, - 2.25, - 2.25 + 1.5768696545288883, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -108,8 +111,8 @@ "uv": [ 0, 0, - 1.6666666666666679, - 2.25 + 2.273333333333335, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -117,8 +120,8 @@ "uv": [ 0, 0, - 1.6666666666666679, - 2.25 + 2.273333333333335, + 1.5768696545288883 ], "texture": "#missile_ru" }, @@ -126,8 +129,8 @@ "uv": [ 0, 0, - 2.25, - 1.6666666666666679 + 1.5768696545288883, + 2.273333333333335 ], "texture": "#missile_ru" }, @@ -135,31 +138,40 @@ "uv": [ 0, 0, - 2.25, - 1.6666666666666679 + 1.5768696545288883, + 2.273333333333335 ], "texture": "#missile_ru" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -14.833333333333332 + ] } }, { "from": [ - 6.458333333333333, - 6.458333333333333, - -12.666666666666666 + 6.715574897504718, + 6.715574897504718, + -13.666666666666666 ], "to": [ - 9.541666666666666, - 9.541666666666666, - -11.0 + 9.284425102495282, + 9.284425102495282, + -11.333333333333332 ], "faces": { "north": { "uv": [ 0, 0, - 3.083333333333333, - 3.083333333333333 + 2.5688502049905644, + 2.5688502049905644 ], "texture": "#missile_ru" }, @@ -167,8 +179,8 @@ "uv": [ 0, 0, - 3.083333333333333, - 3.083333333333333 + 2.5688502049905644, + 2.5688502049905644 ], "texture": "#missile_ru" }, @@ -176,8 +188,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 3.083333333333333 + 2.333333333333334, + 2.5688502049905644 ], "texture": "#missile_ru" }, @@ -185,8 +197,8 @@ "uv": [ 0, 0, - 1.666666666666666, - 3.083333333333333 + 2.333333333333334, + 2.5688502049905644 ], "texture": "#missile_ru" }, @@ -194,8 +206,8 @@ "uv": [ 0, 0, - 3.083333333333333, - 1.666666666666666 + 2.5688502049905644, + 2.333333333333334 ], "texture": "#missile_ru" }, @@ -203,8 +215,8 @@ "uv": [ 0, 0, - 3.083333333333333, - 1.666666666666666 + 2.5688502049905644, + 2.333333333333334 ], "texture": "#missile_ru" } @@ -212,22 +224,22 @@ }, { "from": [ - 6.25, - 6.25, - -11.0 + 6.715574897504718, + 6.715574897504718, + -13.636666666666667 ], "to": [ - 9.75, - 9.75, - 28.0 + 9.284425102495282, + 9.284425102495282, + -11.363333333333332 ], "faces": { "north": { "uv": [ 0, 0, - 3.5, - 3.5 + 2.5688502049905644, + 2.5688502049905644 ], "texture": "#missile_ru" }, @@ -235,26 +247,393 @@ "uv": [ 0, 0, - 3.5, - 3.5 + 2.5688502049905644, + 2.5688502049905644 ], "texture": "#missile_ru" }, + "east": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.5688502049905644 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.5688502049905644 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 2.5688502049905644, + 2.273333333333335 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 2.5688502049905644, + 2.273333333333335 + ], + "texture": "#missile_ru" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -12.5 + ] + } + }, + { + "from": [ + 6.343421775742739, + 6.343421775742739, + -11.333333333333332 + ], + "to": [ + 9.656578224257261, + 9.656578224257261, + -9.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.333333333333332, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.333333333333332, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 2.333333333333332 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 2.333333333333332 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 6.343421775742739, + 6.343421775742739, + -11.303333333333333 + ], + "to": [ + 9.656578224257261, + 9.656578224257261, + -9.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 3.3131564485145226 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 2.2733333333333334 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 3.3131564485145226, + 2.2733333333333334 + ], + "texture": "#missile_ru" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -10.166666666666666 + ] + } + }, + { + "from": [ + 6.2445900000000005, + 6.2445900000000005, + -9.0 + ], + "to": [ + 9.75541, + 9.75541, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.510819999999999, + 3.510819999999999 + ], + "texture": "#rm_ru" + }, + "south": { + "uv": [ + 0, + 0, + 3.510819999999999, + 3.510819999999999 + ], + "texture": "#rm_ru" + }, "east": { "uv": [ 0, 0, 16, - 3.5 + 3.510819999999999 ], - "texture": "#missile_ru" + "texture": "#rm_ru" }, "west": { "uv": [ 0, 0, 16, - 3.5 + 3.510819999999999 + ], + "texture": "#rm_ru" + }, + "up": { + "uv": [ + 0, + 0, + 3.510819999999999, + 16 + ], + "texture": "#rm_ru_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.510819999999999, + 16 + ], + "texture": "#rm_ru_t" + } + } + }, + { + "from": [ + 6.2445900000000005, + 6.2445900000000005, + -8.97 + ], + "to": [ + 9.75541, + 9.75541, + 25.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.510819999999999, + 3.510819999999999 + ], + "texture": "#rm_ru" + }, + "south": { + "uv": [ + 0, + 0, + 3.510819999999999, + 3.510819999999999 + ], + "texture": "#rm_ru" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.510819999999999 + ], + "texture": "#rm_ru" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.510819999999999 + ], + "texture": "#rm_ru" + }, + "up": { + "uv": [ + 0, + 0, + 3.510819999999999, + 16 + ], + "texture": "#rm_ru_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.510819999999999, + 16 + ], + "texture": "#rm_ru_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 8.5 + ] + } + }, + { + "from": [ + 9.71, + 7.65, + 18.0 + ], + "to": [ + 13.120000000000001, + 8.35, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.41, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 3.41, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 0.6999999999999993 ], "texture": "#missile_ru" }, @@ -262,8 +641,8 @@ "uv": [ 0, 0, - 3.5, - 16 + 3.41, + 8.0 ], "texture": "#missile_ru" }, @@ -271,8 +650,8 @@ "uv": [ 0, 0, - 3.5, - 16 + 3.41, + 8.0 ], "texture": "#missile_ru" } @@ -280,135 +659,1019 @@ }, { "from": [ - 6.5, - 6.5, - 28.0 + 2.879999999999999, + 7.65, + 18.0 ], "to": [ - 9.5, - 9.5, - 30.0 + 6.289999999999999, + 8.35, + 26.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 3.0 + 3.41, + 0.6999999999999993 ], - "texture": "#nozzle" + "texture": "#missile_ru" }, "south": { + "uv": [ + 0, + 0, + 3.41, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 3.41, + 8.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 3.41, + 8.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 13.120000000000001, + 7.65, + 22.0 + ], + "to": [ + 15.91, + 8.35, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.789999999999999, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 2.789999999999999, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 2.789999999999999, + 4.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 2.789999999999999, + 4.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 0.08999999999999986, + 7.65, + 22.0 + ], + "to": [ + 2.879999999999999, + 8.35, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.789999999999999, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 2.789999999999999, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 2.789999999999999, + 4.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 2.789999999999999, + 4.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 9.71, + 18.0 + ], + "to": [ + 8.35, + 13.120000000000001, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.41 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.41 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 3.41 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 3.41 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 8.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 8.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 13.120000000000001, + 22.0 + ], + "to": [ + 8.35, + 15.91, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.789999999999999 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.789999999999999 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 2.789999999999999 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 2.789999999999999 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 2.8799999999999994, + 18.0 + ], + "to": [ + 8.35, + 6.29, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.4100000000000006 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.4100000000000006 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 3.4100000000000006 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 3.4100000000000006 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 8.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 8.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 0.08999999999999986, + 22.0 + ], + "to": [ + 8.35, + 2.8799999999999994, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.7899999999999996 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.7899999999999996 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 2.7899999999999996 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 2.7899999999999996 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 9.71, + 7.65, + -6.0 + ], + "to": [ + 11.085, + 8.35, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.375, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 1.375, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { "uv": [ 0, 0, 3.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 1.375, 3.0 ], - "texture": "#nozzle" + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 1.375, + 3.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 4.914999999999999, + 7.65, + -6.0 + ], + "to": [ + 6.289999999999999, + 8.35, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.375, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 1.375, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 1.375, + 3.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 1.375, + 3.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 11.085, + 7.65, + -5.0 + ], + "to": [ + 12.21, + 8.35, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.125, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 1.125, + 0.6999999999999993 + ], + "texture": "#missile_ru" }, "east": { "uv": [ 0, 0, 2.0, - 3.0 + 0.6999999999999993 ], - "texture": "#nozzle" + "texture": "#missile_ru" }, "west": { "uv": [ 0, 0, 2.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 1.125, + 2.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 1.125, + 2.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 3.789999999999999, + 7.65, + -5.0 + ], + "to": [ + 4.914999999999999, + 8.35, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.125, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 1.125, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 0.6999999999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 1.125, + 2.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 1.125, + 2.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 9.71, + -6.0 + ], + "to": [ + 8.35, + 11.085, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.375 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.375 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 1.375 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 1.375 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, 3.0 ], - "texture": "#nozzle" + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 11.085, + -5.0 + ], + "to": [ + 8.35, + 12.21, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.125 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.125 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 1.125 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 1.125 + ], + "texture": "#missile_ru" }, "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 4.915, + -6.0 + ], + "to": [ + 8.35, + 6.29, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.375 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.375 + ], + "texture": "#missile_ru" + }, + "east": { "uv": [ 0, 0, 3.0, - 2.0 + 1.375 ], - "texture": "#nozzle" + "texture": "#missile_ru" }, - "down": { + "west": { "uv": [ 0, 0, 3.0, + 1.375 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 7.65, + 3.79, + -5.0 + ], + "to": [ + 8.35, + 4.915, + -3.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.125 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 1.125 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 1.125 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 1.125 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, 2.0 ], - "texture": "#nozzle" - } - } - }, - { - "from": [ - 1.5, - 7.7, - 20.0 - ], - "to": [ - 6.25, - 8.3, - 28.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 4.75, - 0.6000000000000005 - ], - "texture": "#missile_ru" - }, - "south": { - "uv": [ - 0, - 0, - 4.75, - 0.6000000000000005 - ], - "texture": "#missile_ru" - }, - "east": { - "uv": [ - 0, - 0, - 8.0, - 0.6000000000000005 - ], - "texture": "#missile_ru" - }, - "west": { - "uv": [ - 0, - 0, - 8.0, - 0.6000000000000005 - ], - "texture": "#missile_ru" - }, - "up": { - "uv": [ - 0, - 0, - 4.75, - 8.0 - ], "texture": "#missile_ru" }, "down": { "uv": [ 0, 0, - 4.75, - 8.0 + 0.6999999999999993, + 2.0 ], "texture": "#missile_ru" } @@ -416,205 +1679,137 @@ }, { "from": [ - 9.75, - 7.7, - 20.0 + 6.48, + 6.48, + 26.0 ], "to": [ - 14.5, - 8.3, - 28.0 + 9.52, + 9.52, + 27.6 ], "faces": { "north": { "uv": [ 0, 0, - 4.75, - 0.6000000000000005 + 3.039999999999999, + 3.039999999999999 ], - "texture": "#missile_ru" + "texture": "#bare_nozzle" }, "south": { "uv": [ 0, 0, - 4.75, - 0.6000000000000005 + 3.039999999999999, + 3.039999999999999 ], - "texture": "#missile_ru" + "texture": "#bare_nozzle" }, "east": { "uv": [ 0, 0, - 8.0, - 0.6000000000000005 + 1.6000000000000014, + 3.039999999999999 ], - "texture": "#missile_ru" + "texture": "#bare_nozzle" }, "west": { "uv": [ 0, 0, - 8.0, - 0.6000000000000005 + 1.6000000000000014, + 3.039999999999999 ], - "texture": "#missile_ru" + "texture": "#bare_nozzle" }, "up": { "uv": [ 0, 0, - 4.75, - 8.0 + 3.039999999999999, + 1.6000000000000014 ], - "texture": "#missile_ru" + "texture": "#bare_nozzle" }, "down": { "uv": [ 0, 0, - 4.75, - 8.0 + 3.039999999999999, + 1.6000000000000014 ], - "texture": "#missile_ru" + "texture": "#bare_nozzle" } } }, { "from": [ - 7.7, - 1.5, - 20.0 + 6.955, + 6.955, + 27.6 ], "to": [ - 8.3, - 6.25, - 28.0 + 9.045, + 9.045, + 27.9 ], "faces": { "north": { "uv": [ 0, 0, - 0.6000000000000005, - 4.75 + 2.09, + 2.09 ], - "texture": "#missile_ru" + "texture": "#glow_ember" }, "south": { "uv": [ 0, 0, - 0.6000000000000005, - 4.75 + 2.09, + 2.09 ], - "texture": "#missile_ru" + "texture": "#glow_ember" }, "east": { "uv": [ 0, 0, - 8.0, - 4.75 + 0.29999999999999716, + 2.09 ], - "texture": "#missile_ru" + "texture": "#glow_ember" }, "west": { "uv": [ 0, 0, - 8.0, - 4.75 + 0.29999999999999716, + 2.09 ], - "texture": "#missile_ru" + "texture": "#glow_ember" }, "up": { "uv": [ 0, 0, - 0.6000000000000005, - 8.0 + 2.09, + 0.29999999999999716 ], - "texture": "#missile_ru" + "texture": "#glow_ember" }, "down": { "uv": [ 0, 0, - 0.6000000000000005, - 8.0 + 2.09, + 0.29999999999999716 ], - "texture": "#missile_ru" - } - } - }, - { - "from": [ - 7.7, - 9.75, - 20.0 - ], - "to": [ - 8.3, - 14.5, - 28.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 0.6000000000000005, - 4.75 - ], - "texture": "#missile_ru" - }, - "south": { - "uv": [ - 0, - 0, - 0.6000000000000005, - 4.75 - ], - "texture": "#missile_ru" - }, - "east": { - "uv": [ - 0, - 0, - 8.0, - 4.75 - ], - "texture": "#missile_ru" - }, - "west": { - "uv": [ - 0, - 0, - 8.0, - 4.75 - ], - "texture": "#missile_ru" - }, - "up": { - "uv": [ - 0, - 0, - 0.6000000000000005, - 8.0 - ], - "texture": "#missile_ru" - }, - "down": { - "uv": [ - 0, - 0, - 0.6000000000000005, - 8.0 - ], - "texture": "#missile_ru" + "texture": "#glow_ember" } } } diff --git a/airdef-mod/assets/airdef/models/block/m57e6.json b/airdef-mod/assets/airdef/models/block/m57e6.json index 95ec2c4..0493806 100644 --- a/airdef-mod/assets/airdef/models/block/m57e6.json +++ b/airdef-mod/assets/airdef/models/block/m57e6.json @@ -2,28 +2,32 @@ "ambientocclusion": false, "textures": { "missile_ru": "airdef:block/missile_ru", + "rm_ru": "airdef:block/rm_ru", + "rm_ru_t": "airdef:block/rm_ru_t", "booster": "airdef:block/booster", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", "particle": "airdef:block/missile_ru" }, "elements": [ { "from": [ - 7.5625, - 7.5625, + 7.502041161727719, + 7.502041161727719, -16.0 ], "to": [ - 8.4375, - 8.4375, - -14.0 + 8.49795883827228, + 8.49795883827228, + -13.666666666666666 ], "faces": { "north": { "uv": [ 0, 0, - 0.875, - 0.875 + 0.9959176765445612, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -31,8 +35,8 @@ "uv": [ 0, 0, - 0.875, - 0.875 + 0.9959176765445612, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -40,8 +44,8 @@ "uv": [ 0, 0, - 2.0, - 0.875 + 2.333333333333334, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -49,8 +53,8 @@ "uv": [ 0, 0, - 2.0, - 0.875 + 2.333333333333334, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -58,8 +62,8 @@ "uv": [ 0, 0, - 0.875, - 2.0 + 0.9959176765445612, + 2.333333333333334 ], "texture": "#missile_ru" }, @@ -67,8 +71,8 @@ "uv": [ 0, 0, - 0.875, - 2.0 + 0.9959176765445612, + 2.333333333333334 ], "texture": "#missile_ru" } @@ -76,22 +80,22 @@ }, { "from": [ - 7.1875, - 7.1875, - -14.0 + 7.502041161727719, + 7.502041161727719, + -15.97 ], "to": [ - 8.8125, - 8.8125, - -12.0 + 8.49795883827228, + 8.49795883827228, + -13.696666666666665 ], "faces": { "north": { "uv": [ 0, 0, - 1.625, - 1.625 + 0.9959176765445612, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -99,8 +103,8 @@ "uv": [ 0, 0, - 1.625, - 1.625 + 0.9959176765445612, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -108,8 +112,8 @@ "uv": [ 0, 0, - 2.0, - 1.625 + 2.273333333333335, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -117,8 +121,8 @@ "uv": [ 0, 0, - 2.0, - 1.625 + 2.273333333333335, + 0.9959176765445612 ], "texture": "#missile_ru" }, @@ -126,8 +130,8 @@ "uv": [ 0, 0, - 1.625, - 2.0 + 0.9959176765445612, + 2.273333333333335 ], "texture": "#missile_ru" }, @@ -135,8 +139,85 @@ "uv": [ 0, 0, - 1.625, - 2.0 + 0.9959176765445612, + 2.273333333333335 + ], + "texture": "#missile_ru" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -14.833333333333332 + ] + } + }, + { + "from": [ + 7.188784145792454, + 7.188784145792454, + -13.666666666666666 + ], + "to": [ + 8.811215854207546, + 8.811215854207546, + -11.333333333333332 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.333333333333334, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.333333333333334, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 2.333333333333334 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 2.333333333333334 ], "texture": "#missile_ru" } @@ -144,13 +225,235 @@ }, { "from": [ - 7.0, - 7.0, - -12.0 + 7.188784145792454, + 7.188784145792454, + -13.636666666666667 ], "to": [ - 9.0, - 9.0, + 8.811215854207546, + 8.811215854207546, + -11.363333333333332 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.273333333333335, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.273333333333335, + 1.6224317084150925 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 2.273333333333335 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 1.6224317084150925, + 2.273333333333335 + ], + "texture": "#missile_ru" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -12.5 + ] + } + }, + { + "from": [ + 6.95374006889015, + 6.95374006889015, + -11.333333333333332 + ], + "to": [ + 9.04625993110985, + 9.04625993110985, + -9.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.333333333333332, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.333333333333332, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.333333333333332 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.333333333333332 + ], + "texture": "#missile_ru" + } + } + }, + { + "from": [ + 6.95374006889015, + 6.95374006889015, + -11.303333333333333 + ], + "to": [ + 9.04625993110985, + 9.04625993110985, + -9.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.0925198622196994 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.2733333333333334 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 2.0925198622196994, + 2.2733333333333334 + ], + "texture": "#missile_ru" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -10.166666666666666 + ] + } + }, + { + "from": [ + 6.89132, + 6.89132, + -9.0 + ], + "to": [ + 9.10868, + 9.10868, 4.0 ], "faces": { @@ -158,8 +461,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 2.2173599999999993, + 2.2173599999999993 ], "texture": "#missile_ru" }, @@ -167,8 +470,8 @@ "uv": [ 0, 0, - 2.0, - 2.0 + 2.2173599999999993, + 2.2173599999999993 ], "texture": "#missile_ru" }, @@ -176,8 +479,8 @@ "uv": [ 0, 0, - 16, - 2.0 + 13.0, + 2.2173599999999993 ], "texture": "#missile_ru" }, @@ -185,8 +488,8 @@ "uv": [ 0, 0, - 16, - 2.0 + 13.0, + 2.2173599999999993 ], "texture": "#missile_ru" }, @@ -194,8 +497,8 @@ "uv": [ 0, 0, - 2.0, - 16 + 2.2173599999999993, + 13.0 ], "texture": "#missile_ru" }, @@ -203,8 +506,8 @@ "uv": [ 0, 0, - 2.0, - 16 + 2.2173599999999993, + 13.0 ], "texture": "#missile_ru" } @@ -212,90 +515,244 @@ }, { "from": [ - 6.4, - 6.4, + 6.89132, + 6.89132, + -8.97 + ], + "to": [ + 9.10868, + 9.10868, + 3.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.2173599999999993, + 2.2173599999999993 + ], + "texture": "#missile_ru" + }, + "south": { + "uv": [ + 0, + 0, + 2.2173599999999993, + 2.2173599999999993 + ], + "texture": "#missile_ru" + }, + "east": { + "uv": [ + 0, + 0, + 12.940000000000001, + 2.2173599999999993 + ], + "texture": "#missile_ru" + }, + "west": { + "uv": [ + 0, + 0, + 12.940000000000001, + 2.2173599999999993 + ], + "texture": "#missile_ru" + }, + "up": { + "uv": [ + 0, + 0, + 2.2173599999999993, + 12.940000000000001 + ], + "texture": "#missile_ru" + }, + "down": { + "uv": [ + 0, + 0, + 2.2173599999999993, + 12.940000000000001 + ], + "texture": "#missile_ru" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -2.5 + ] + } + }, + { + "from": [ + 6.4293700000000005, + 6.4293700000000005, 4.0 ], "to": [ - 9.6, - 9.6, - 28.0 + 9.57063, + 9.57063, + 25.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.1999999999999993, - 3.1999999999999993 + 3.141259999999999, + 3.141259999999999 ], - "texture": "#booster" + "texture": "#rm_ru" }, "south": { "uv": [ 0, 0, - 3.1999999999999993, - 3.1999999999999993 + 3.141259999999999, + 3.141259999999999 ], - "texture": "#booster" + "texture": "#rm_ru" }, "east": { "uv": [ 0, 0, 16, - 3.1999999999999993 + 3.141259999999999 ], - "texture": "#booster" + "texture": "#rm_ru" }, "west": { "uv": [ 0, 0, 16, - 3.1999999999999993 + 3.141259999999999 ], - "texture": "#booster" + "texture": "#rm_ru" }, "up": { "uv": [ 0, 0, - 3.1999999999999993, + 3.141259999999999, 16 ], - "texture": "#booster" + "texture": "#rm_ru_t" }, "down": { "uv": [ 0, 0, - 3.1999999999999993, + 3.141259999999999, 16 ], - "texture": "#booster" + "texture": "#rm_ru_t" } } }, { "from": [ - 3.5, - 7.7, - 22.0 + 6.4293700000000005, + 6.4293700000000005, + 4.03 ], "to": [ - 6.4, - 8.3, - 28.0 + 9.57063, + 9.57063, + 24.97 ], "faces": { "north": { "uv": [ 0, 0, - 2.9000000000000004, - 0.6000000000000005 + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_ru" + }, + "south": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_ru" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_ru" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_ru" + }, + "up": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_ru_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_ru_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 14.5 + ] + } + }, + { + "from": [ + 9.53, + 7.65, + 18.0 + ], + "to": [ + 12.280000000000001, + 8.35, + 25.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#booster" }, @@ -303,8 +760,8 @@ "uv": [ 0, 0, - 2.9000000000000004, - 0.6000000000000005 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#booster" }, @@ -312,8 +769,8 @@ "uv": [ 0, 0, - 6.0, - 0.6000000000000005 + 7.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -321,8 +778,8 @@ "uv": [ 0, 0, - 6.0, - 0.6000000000000005 + 7.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -330,8 +787,8 @@ "uv": [ 0, 0, - 2.9000000000000004, - 6.0 + 2.7500000000000018, + 7.0 ], "texture": "#booster" }, @@ -339,8 +796,8 @@ "uv": [ 0, 0, - 2.9000000000000004, - 6.0 + 2.7500000000000018, + 7.0 ], "texture": "#booster" } @@ -348,22 +805,22 @@ }, { "from": [ - 9.6, - 7.7, - 22.0 + 3.719999999999999, + 7.65, + 18.0 ], "to": [ - 12.5, - 8.3, - 28.0 + 6.470000000000001, + 8.35, + 25.0 ], "faces": { "north": { "uv": [ 0, 0, - 2.9000000000000004, - 0.6000000000000005 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#booster" }, @@ -371,8 +828,8 @@ "uv": [ 0, 0, - 2.9000000000000004, - 0.6000000000000005 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#booster" }, @@ -380,8 +837,8 @@ "uv": [ 0, 0, - 6.0, - 0.6000000000000005 + 7.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -389,8 +846,8 @@ "uv": [ 0, 0, - 6.0, - 0.6000000000000005 + 7.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -398,8 +855,8 @@ "uv": [ 0, 0, - 2.9000000000000004, - 6.0 + 2.7500000000000018, + 7.0 ], "texture": "#booster" }, @@ -407,8 +864,8 @@ "uv": [ 0, 0, - 2.9000000000000004, - 6.0 + 2.7500000000000018, + 7.0 ], "texture": "#booster" } @@ -416,22 +873,22 @@ }, { "from": [ - 7.7, - 3.5, - 22.0 + 12.280000000000001, + 7.65, + 21.0 ], "to": [ - 8.3, - 6.4, - 28.0 + 14.530000000000001, + 8.35, + 25.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.6000000000000005, - 2.9000000000000004 + 2.25, + 0.6999999999999993 ], "texture": "#booster" }, @@ -439,8 +896,8 @@ "uv": [ 0, 0, - 0.6000000000000005, - 2.9000000000000004 + 2.25, + 0.6999999999999993 ], "texture": "#booster" }, @@ -448,8 +905,8 @@ "uv": [ 0, 0, - 6.0, - 2.9000000000000004 + 4.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -457,8 +914,8 @@ "uv": [ 0, 0, - 6.0, - 2.9000000000000004 + 4.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -466,8 +923,8 @@ "uv": [ 0, 0, - 0.6000000000000005, - 6.0 + 2.25, + 4.0 ], "texture": "#booster" }, @@ -475,8 +932,8 @@ "uv": [ 0, 0, - 0.6000000000000005, - 6.0 + 2.25, + 4.0 ], "texture": "#booster" } @@ -484,22 +941,22 @@ }, { "from": [ - 7.7, - 9.6, - 22.0 + 1.4699999999999989, + 7.65, + 21.0 ], "to": [ - 8.3, - 12.5, - 28.0 + 3.719999999999999, + 8.35, + 25.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.6000000000000005, - 2.9000000000000004 + 2.25, + 0.6999999999999993 ], "texture": "#booster" }, @@ -507,8 +964,8 @@ "uv": [ 0, 0, - 0.6000000000000005, - 2.9000000000000004 + 2.25, + 0.6999999999999993 ], "texture": "#booster" }, @@ -516,8 +973,8 @@ "uv": [ 0, 0, - 6.0, - 2.9000000000000004 + 4.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -525,8 +982,8 @@ "uv": [ 0, 0, - 6.0, - 2.9000000000000004 + 4.0, + 0.6999999999999993 ], "texture": "#booster" }, @@ -534,8 +991,8 @@ "uv": [ 0, 0, - 0.6000000000000005, - 6.0 + 2.25, + 4.0 ], "texture": "#booster" }, @@ -543,12 +1000,420 @@ "uv": [ 0, 0, - 0.6000000000000005, - 6.0 + 2.25, + 4.0 ], "texture": "#booster" } } + }, + { + "from": [ + 7.65, + 9.53, + 18.0 + ], + "to": [ + 8.35, + 12.28, + 25.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#booster" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#booster" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 2.75 + ], + "texture": "#booster" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 2.75 + ], + "texture": "#booster" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 7.0 + ], + "texture": "#booster" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 7.0 + ], + "texture": "#booster" + } + } + }, + { + "from": [ + 7.65, + 12.28, + 21.0 + ], + "to": [ + 8.35, + 14.53, + 25.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#booster" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#booster" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 2.25 + ], + "texture": "#booster" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 2.25 + ], + "texture": "#booster" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#booster" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#booster" + } + } + }, + { + "from": [ + 7.65, + 3.7199999999999998, + 18.0 + ], + "to": [ + 8.35, + 6.47, + 25.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#booster" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#booster" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 2.75 + ], + "texture": "#booster" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 2.75 + ], + "texture": "#booster" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 7.0 + ], + "texture": "#booster" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 7.0 + ], + "texture": "#booster" + } + } + }, + { + "from": [ + 7.65, + 1.4699999999999998, + 21.0 + ], + "to": [ + 8.35, + 3.7199999999999998, + 25.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#booster" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.25 + ], + "texture": "#booster" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 2.25 + ], + "texture": "#booster" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 2.25 + ], + "texture": "#booster" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#booster" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 4.0 + ], + "texture": "#booster" + } + } + }, + { + "from": [ + 6.64, + 6.64, + 25.0 + ], + "to": [ + 9.36, + 9.36, + 26.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 2.7199999999999998 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 2.7199999999999998, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 7.0649999999999995, + 7.0649999999999995, + 26.6 + ], + "to": [ + 8.935, + 8.935, + 26.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.870000000000001, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 1.870000000000001, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 1.870000000000001 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 1.870000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 1.870000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + } + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/m77n6.json b/airdef-mod/assets/airdef/models/block/m77n6.json index 662ae24..911c4cf 100644 --- a/airdef-mod/assets/airdef/models/block/m77n6.json +++ b/airdef-mod/assets/airdef/models/block/m77n6.json @@ -2,20 +2,23 @@ "ambientocclusion": false, "textures": { "missile_grey": "airdef:block/missile_grey", + "rm_grey": "airdef:block/rm_grey", + "rm_grey_t": "airdef:block/rm_grey_t", "booster": "airdef:block/booster", - "nozzle": "airdef:block/nozzle", + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", "particle": "airdef:block/missile_grey" }, "elements": [ { "from": [ - 7.25, - 7.25, + 7.220675060123435, + 7.220675060123435, -16.0 ], "to": [ - 8.75, - 8.75, + 8.779324939876565, + 8.779324939876565, -14.0 ], "faces": { @@ -23,8 +26,8 @@ "uv": [ 0, 0, - 1.5, - 1.5 + 1.5586498797531299, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -32,8 +35,8 @@ "uv": [ 0, 0, - 1.5, - 1.5 + 1.5586498797531299, + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -42,7 +45,7 @@ 0, 0, 2.0, - 1.5 + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -51,7 +54,7 @@ 0, 0, 2.0, - 1.5 + 1.5586498797531299 ], "texture": "#missile_grey" }, @@ -59,7 +62,7 @@ "uv": [ 0, 0, - 1.5, + 1.5586498797531299, 2.0 ], "texture": "#missile_grey" @@ -68,7 +71,7 @@ "uv": [ 0, 0, - 1.5, + 1.5586498797531299, 2.0 ], "texture": "#missile_grey" @@ -77,13 +80,90 @@ }, { "from": [ - 6.75, - 6.75, + 7.220675060123435, + 7.220675060123435, + -15.97 + ], + "to": [ + 8.779324939876565, + 8.779324939876565, + -14.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.5586498797531299, + 1.5586498797531299 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 1.5586498797531299, + 1.5586498797531299 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 1.5586498797531299 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 1.5586498797531299 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 1.5586498797531299, + 1.9400000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 1.5586498797531299, + 1.9400000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -15.0 + ] + } + }, + { + "from": [ + 6.730415652424811, + 6.730415652424811, -14.0 ], "to": [ - 9.25, - 9.25, + 9.26958434757519, + 9.26958434757519, -12.0 ], "faces": { @@ -91,8 +171,8 @@ "uv": [ 0, 0, - 2.5, - 2.5 + 2.539168695150379, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -100,8 +180,8 @@ "uv": [ 0, 0, - 2.5, - 2.5 + 2.539168695150379, + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -110,7 +190,7 @@ 0, 0, 2.0, - 2.5 + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -119,7 +199,7 @@ 0, 0, 2.0, - 2.5 + 2.539168695150379 ], "texture": "#missile_grey" }, @@ -127,7 +207,7 @@ "uv": [ 0, 0, - 2.5, + 2.539168695150379, 2.0 ], "texture": "#missile_grey" @@ -136,7 +216,7 @@ "uv": [ 0, 0, - 2.5, + 2.539168695150379, 2.0 ], "texture": "#missile_grey" @@ -145,13 +225,90 @@ }, { "from": [ - 6.25, - 6.25, + 6.730415652424811, + 6.730415652424811, + -13.97 + ], + "to": [ + 9.26958434757519, + 9.26958434757519, + -12.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.539168695150379, + 2.539168695150379 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 2.539168695150379, + 2.539168695150379 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 2.539168695150379 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 2.539168695150379 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 2.539168695150379, + 1.9400000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 2.539168695150379, + 1.9400000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -13.0 + ] + } + }, + { + "from": [ + 6.362562534814173, + 6.362562534814173, -12.0 ], "to": [ - 9.75, - 9.75, + 9.637437465185826, + 9.637437465185826, -10.0 ], "faces": { @@ -159,8 +316,8 @@ "uv": [ 0, 0, - 3.5, - 3.5 + 3.274874930371653, + 3.274874930371653 ], "texture": "#missile_grey" }, @@ -168,8 +325,8 @@ "uv": [ 0, 0, - 3.5, - 3.5 + 3.274874930371653, + 3.274874930371653 ], "texture": "#missile_grey" }, @@ -178,7 +335,7 @@ 0, 0, 2.0, - 3.5 + 3.274874930371653 ], "texture": "#missile_grey" }, @@ -187,7 +344,7 @@ 0, 0, 2.0, - 3.5 + 3.274874930371653 ], "texture": "#missile_grey" }, @@ -195,7 +352,7 @@ "uv": [ 0, 0, - 3.5, + 3.274874930371653, 2.0 ], "texture": "#missile_grey" @@ -204,7 +361,7 @@ "uv": [ 0, 0, - 3.5, + 3.274874930371653, 2.0 ], "texture": "#missile_grey" @@ -213,22 +370,99 @@ }, { "from": [ - 6.0, - 6.0, + 6.362562534814173, + 6.362562534814173, + -11.97 + ], + "to": [ + 9.637437465185826, + 9.637437465185826, + -10.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.274874930371653, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 3.274874930371653, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 3.274874930371653 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 3.274874930371653, + 1.9400000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 3.274874930371653, + 1.9400000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -11.0 + ] + } + }, + { + "from": [ + 6.052732565350377, + 6.052732565350377, -10.0 ], "to": [ - 10.0, - 10.0, - 30.0 + 9.947267434649623, + 9.947267434649623, + -8.0 ], "faces": { "north": { "uv": [ 0, 0, - 4.0, - 4.0 + 3.894534869299246, + 3.894534869299246 ], "texture": "#missile_grey" }, @@ -236,8 +470,8 @@ "uv": [ 0, 0, - 4.0, - 4.0 + 3.894534869299246, + 3.894534869299246 ], "texture": "#missile_grey" }, @@ -245,8 +479,8 @@ "uv": [ 0, 0, - 16, - 4.0 + 2.0, + 3.894534869299246 ], "texture": "#missile_grey" }, @@ -254,8 +488,8 @@ "uv": [ 0, 0, - 16, - 4.0 + 2.0, + 3.894534869299246 ], "texture": "#missile_grey" }, @@ -263,8 +497,8 @@ "uv": [ 0, 0, - 4.0, - 16 + 3.894534869299246, + 2.0 ], "texture": "#missile_grey" }, @@ -272,8 +506,8 @@ "uv": [ 0, 0, - 4.0, - 16 + 3.894534869299246, + 2.0 ], "texture": "#missile_grey" } @@ -281,22 +515,244 @@ }, { "from": [ - 6.0, - 6.0, + 6.052732565350377, + 6.052732565350377, + -9.97 + ], + "to": [ + 9.947267434649623, + 9.947267434649623, + -8.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.894534869299246, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 3.894534869299246, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 1.9400000000000013, + 3.894534869299246 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 3.894534869299246, + 1.9400000000000013 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 3.894534869299246, + 1.9400000000000013 + ], + "texture": "#missile_grey" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -9.0 + ] + } + }, + { + "from": [ + 5.96742, + 5.96742, + -8.0 + ], + "to": [ + 10.03258, + 10.03258, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "south": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.06516 + ], + "texture": "#rm_grey" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.06516 + ], + "texture": "#rm_grey" + }, + "up": { + "uv": [ + 0, + 0, + 4.06516, + 16 + ], + "texture": "#rm_grey_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.06516, + 16 + ], + "texture": "#rm_grey_t" + } + } + }, + { + "from": [ + 5.96742, + 5.96742, + -7.97 + ], + "to": [ + 10.03258, + 10.03258, + 27.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "south": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#rm_grey" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.06516 + ], + "texture": "#rm_grey" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.06516 + ], + "texture": "#rm_grey" + }, + "up": { + "uv": [ + 0, + 0, + 4.06516, + 16 + ], + "texture": "#rm_grey_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.06516, + 16 + ], + "texture": "#rm_grey_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 10.0 + ] + } + }, + { + "from": [ + 5.78264, + 5.78264, 4.0 ], "to": [ - 10.0, - 10.0, - 5.0 + 10.21736, + 10.21736, + 6.0 ], "faces": { "north": { "uv": [ 0, 0, - 4.0, - 4.0 + 4.4347199999999996, + 4.4347199999999996 ], "texture": "#booster" }, @@ -304,135 +760,144 @@ "uv": [ 0, 0, - 4.0, - 4.0 + 4.4347199999999996, + 4.4347199999999996 ], "texture": "#booster" }, - "east": { - "uv": [ - 0, - 0, - 1.0, - 4.0 - ], - "texture": "#booster" - }, - "west": { - "uv": [ - 0, - 0, - 1.0, - 4.0 - ], - "texture": "#booster" - }, - "up": { - "uv": [ - 0, - 0, - 4.0, - 1.0 - ], - "texture": "#booster" - }, - "down": { - "uv": [ - 0, - 0, - 4.0, - 1.0 - ], - "texture": "#booster" - } - } - }, - { - "from": [ - 6.5, - 6.5, - 30.0 - ], - "to": [ - 9.5, - 9.5, - 32.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 3.0, - 3.0 - ], - "texture": "#nozzle" - }, - "south": { - "uv": [ - 0, - 0, - 3.0, - 3.0 - ], - "texture": "#nozzle" - }, "east": { "uv": [ 0, 0, 2.0, - 3.0 + 4.4347199999999996 ], - "texture": "#nozzle" + "texture": "#booster" }, "west": { "uv": [ 0, 0, 2.0, - 3.0 + 4.4347199999999996 ], - "texture": "#nozzle" + "texture": "#booster" }, "up": { "uv": [ 0, 0, - 3.0, + 4.4347199999999996, 2.0 ], - "texture": "#nozzle" + "texture": "#booster" }, "down": { "uv": [ 0, 0, - 3.0, + 4.4347199999999996, 2.0 ], - "texture": "#nozzle" + "texture": "#booster" } } }, { "from": [ - 3.0, - 7.7, - 24.0 + 5.78264, + 5.78264, + 4.03 ], "to": [ - 6.0, - 8.3, - 30.0 + 10.21736, + 10.21736, + 5.97 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 0.6000000000000005 + 4.4347199999999996, + 4.4347199999999996 + ], + "texture": "#booster" + }, + "south": { + "uv": [ + 0, + 0, + 4.4347199999999996, + 4.4347199999999996 + ], + "texture": "#booster" + }, + "east": { + "uv": [ + 0, + 0, + 1.9399999999999995, + 4.4347199999999996 + ], + "texture": "#booster" + }, + "west": { + "uv": [ + 0, + 0, + 1.9399999999999995, + 4.4347199999999996 + ], + "texture": "#booster" + }, + "up": { + "uv": [ + 0, + 0, + 4.4347199999999996, + 1.9399999999999995 + ], + "texture": "#booster" + }, + "down": { + "uv": [ + 0, + 0, + 4.4347199999999996, + 1.9399999999999995 + ], + "texture": "#booster" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 5.0 + ] + } + }, + { + "from": [ + 9.98, + 7.65, + 22.0 + ], + "to": [ + 12.84, + 8.35, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.8599999999999994, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -440,8 +905,8 @@ "uv": [ 0, 0, - 3.0, - 0.6000000000000005 + 2.8599999999999994, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -450,7 +915,7 @@ 0, 0, 6.0, - 0.6000000000000005 + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -459,7 +924,7 @@ 0, 0, 6.0, - 0.6000000000000005 + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -467,7 +932,7 @@ "uv": [ 0, 0, - 3.0, + 2.8599999999999994, 6.0 ], "texture": "#missile_grey" @@ -476,7 +941,7 @@ "uv": [ 0, 0, - 3.0, + 2.8599999999999994, 6.0 ], "texture": "#missile_grey" @@ -485,22 +950,22 @@ }, { "from": [ - 10.0, - 7.7, - 24.0 + 3.16, + 7.65, + 22.0 ], "to": [ - 13.0, - 8.3, - 30.0 + 6.02, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 0.6000000000000005 + 2.8599999999999994, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -508,8 +973,8 @@ "uv": [ 0, 0, - 3.0, - 0.6000000000000005 + 2.8599999999999994, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -518,7 +983,7 @@ 0, 0, 6.0, - 0.6000000000000005 + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -527,7 +992,7 @@ 0, 0, 6.0, - 0.6000000000000005 + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -535,7 +1000,7 @@ "uv": [ 0, 0, - 3.0, + 2.8599999999999994, 6.0 ], "texture": "#missile_grey" @@ -544,7 +1009,7 @@ "uv": [ 0, 0, - 3.0, + 2.8599999999999994, 6.0 ], "texture": "#missile_grey" @@ -553,22 +1018,22 @@ }, { "from": [ - 7.7, - 3.0, - 24.0 + 12.84, + 7.65, + 25.0 ], "to": [ - 8.3, - 6.0, - 30.0 + 15.18, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.6000000000000005, - 3.0 + 2.34, + 0.6999999999999993 ], "texture": "#missile_grey" }, @@ -576,17 +1041,153 @@ "uv": [ 0, 0, - 0.6000000000000005, + 2.34, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 2.34, 3.0 ], "texture": "#missile_grey" }, + "down": { + "uv": [ + 0, + 0, + 2.34, + 3.0 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 0.8200000000000003, + 7.65, + 25.0 + ], + "to": [ + 3.16, + 8.35, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.34, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 2.34, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 2.34, + 3.0 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 2.34, + 3.0 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 9.98, + 22.0 + ], + "to": [ + 8.35, + 12.84, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.8599999999999994 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.8599999999999994 + ], + "texture": "#missile_grey" + }, "east": { "uv": [ 0, 0, 6.0, - 3.0 + 2.8599999999999994 ], "texture": "#missile_grey" }, @@ -595,7 +1196,7 @@ 0, 0, 6.0, - 3.0 + 2.8599999999999994 ], "texture": "#missile_grey" }, @@ -603,7 +1204,7 @@ "uv": [ 0, 0, - 0.6000000000000005, + 0.6999999999999993, 6.0 ], "texture": "#missile_grey" @@ -612,7 +1213,7 @@ "uv": [ 0, 0, - 0.6000000000000005, + 0.6999999999999993, 6.0 ], "texture": "#missile_grey" @@ -621,22 +1222,22 @@ }, { "from": [ - 7.7, - 10.0, - 24.0 + 7.65, + 12.84, + 25.0 ], "to": [ - 8.3, - 13.0, - 30.0 + 8.35, + 15.18, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.6000000000000005, - 3.0 + 0.6999999999999993, + 2.34 ], "texture": "#missile_grey" }, @@ -644,17 +1245,85 @@ "uv": [ 0, 0, - 0.6000000000000005, + 0.6999999999999993, + 2.34 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.34 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.34 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, 3.0 ], "texture": "#missile_grey" }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 7.65, + 3.1599999999999993, + 22.0 + ], + "to": [ + 8.35, + 6.02, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.8600000000000003 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.8600000000000003 + ], + "texture": "#missile_grey" + }, "east": { "uv": [ 0, 0, 6.0, - 3.0 + 2.8600000000000003 ], "texture": "#missile_grey" }, @@ -663,7 +1332,7 @@ 0, 0, 6.0, - 3.0 + 2.8600000000000003 ], "texture": "#missile_grey" }, @@ -671,7 +1340,7 @@ "uv": [ 0, 0, - 0.6000000000000005, + 0.6999999999999993, 6.0 ], "texture": "#missile_grey" @@ -680,12 +1349,216 @@ "uv": [ 0, 0, - 0.6000000000000005, + 0.6999999999999993, 6.0 ], "texture": "#missile_grey" } } + }, + { + "from": [ + 7.65, + 0.8199999999999994, + 25.0 + ], + "to": [ + 8.35, + 3.1599999999999993, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.34 + ], + "texture": "#missile_grey" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.34 + ], + "texture": "#missile_grey" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.34 + ], + "texture": "#missile_grey" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.34 + ], + "texture": "#missile_grey" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#missile_grey" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#missile_grey" + } + } + }, + { + "from": [ + 6.24, + 6.24, + 28.0 + ], + "to": [ + 9.76, + 9.76, + 29.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5199999999999996, + 3.5199999999999996 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 3.5199999999999996, + 3.5199999999999996 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 3.5199999999999996 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 3.5199999999999996 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 3.5199999999999996, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 3.5199999999999996, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 6.79, + 6.79, + 29.6 + ], + "to": [ + 9.21, + 9.21, + 29.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.420000000000001, + 2.420000000000001 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 2.420000000000001, + 2.420000000000001 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 2.420000000000001 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 2.420000000000001 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 2.420000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 2.420000000000001, + 0.29999999999999716 + ], + "texture": "#glow_ember" + } + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/nasams_launcher.json b/airdef-mod/assets/airdef/models/block/nasams_launcher.json index 845cd0e..362338c 100644 --- a/airdef-mod/assets/airdef/models/block/nasams_launcher.json +++ b/airdef-mod/assets/airdef/models/block/nasams_launcher.json @@ -1,10 +1,10 @@ { "ambientocclusion": false, "textures": { - "canister": "airdef:block/canister", "tube_cap": "airdef:block/tube_cap", + "canister": "airdef:block/canister", "dark_metal": "airdef:block/dark_metal", - "particle": "airdef:block/canister" + "particle": "airdef:block/tube_cap" }, "elements": [ { diff --git a/airdef-mod/assets/airdef/models/block/nasams_launcher_burnt.json b/airdef-mod/assets/airdef/models/block/nasams_launcher_burnt.json new file mode 100644 index 0000000..795504a --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/nasams_launcher_burnt.json @@ -0,0 +1,555 @@ +{ + "ambientocclusion": false, + "textures": { + "tube_cap_b": "airdef:block/tube_cap_b", + "canister_b": "airdef:block/canister_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/tube_cap_b" + }, + "elements": [ + { + "from": [ + 1.0, + 0.0, + -16.0 + ], + "to": [ + 5.0, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 1.0, + 5.0, + -16.0 + ], + "to": [ + 5.0, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 6.0, + 0.0, + -16.0 + ], + "to": [ + 10.0, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 6.0, + 5.0, + -16.0 + ], + "to": [ + 10.0, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 11.0, + 0.0, + -16.0 + ], + "to": [ + 15.0, + 4.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 11.0, + 5.0, + -16.0 + ], + "to": [ + 15.0, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + 0.0, + 0.0, + 26.0 + ], + "to": [ + 16.0, + 9.0, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 0.0, + 0.0, + -2.0 + ], + "to": [ + 16.0, + 9.0, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/nasams_trailer.json b/airdef-mod/assets/airdef/models/block/nasams_trailer.json index d7b1b84..9709636 100644 --- a/airdef-mod/assets/airdef/models/block/nasams_trailer.json +++ b/airdef-mod/assets/airdef/models/block/nasams_trailer.json @@ -1,11 +1,13 @@ { "ambientocclusion": false, "textures": { - "nato_green": "airdef:block/nato_green", + "nato_green_s21": "airdef:block/nato_green_s21", + "nato_green_s22": "airdef:block/nato_green_s22", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/nato_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/nato_green_s21" }, "elements": [ { @@ -27,7 +29,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -36,7 +38,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -45,7 +47,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "west": { "uv": [ @@ -54,7 +56,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "up": { "uv": [ @@ -63,7 +65,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s22" }, "down": { "uv": [ @@ -72,7 +74,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s22" } } }, @@ -215,13 +217,13 @@ { "from": [ -9.0, - 0.0, - 4.0 + 0.3424499999999995, + 3.3424499999999995 ], "to": [ -5.5, - 9.0, - 11.0 + 8.65755, + 11.65755 ], "faces": { "north": { @@ -229,7 +231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -238,7 +240,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -246,26 +248,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -274,7 +276,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -283,13 +285,13 @@ { "from": [ 21.5, - 0.0, - 4.0 + 0.3424499999999995, + 3.3424499999999995 ], "to": [ 25.0, - 9.0, - 11.0 + 8.65755, + 11.65755 ], "faces": { "north": { @@ -297,7 +299,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -306,7 +308,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -314,26 +316,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -342,22 +344,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 3.3424499999999995 + ], + "to": [ + -5.53, + 8.65755, + 11.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 7.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 3.3424499999999995 + ], + "to": [ + 24.97, + 8.65755, + 11.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 7.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 14.0 + 0.3424499999999995, + 13.34245 ], "to": [ -5.5, - 9.0, - 21.0 + 8.65755, + 21.65755 ], "faces": { "north": { @@ -365,7 +521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -374,7 +530,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -382,26 +538,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -410,7 +566,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -419,13 +575,13 @@ { "from": [ 21.5, - 0.0, - 14.0 + 0.3424499999999995, + 13.34245 ], "to": [ 25.0, - 9.0, - 21.0 + 8.65755, + 21.65755 ], "faces": { "north": { @@ -433,7 +589,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -442,7 +598,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -450,26 +606,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -478,11 +634,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 13.34245 + ], + "to": [ + -5.53, + 8.65755, + 21.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 17.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 13.34245 + ], + "to": [ + 24.97, + 8.65755, + 21.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 17.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/nasams_trailer_burnt.json b/airdef-mod/assets/airdef/models/block/nasams_trailer_burnt.json new file mode 100644 index 0000000..0ede9e4 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/nasams_trailer_burnt.json @@ -0,0 +1,798 @@ +{ + "ambientocclusion": false, + "textures": { + "nato_green_s21_b": "airdef:block/nato_green_s21_b", + "nato_green_s22_b": "airdef:block/nato_green_s22_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/nato_green_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -10.0 + ], + "to": [ + 22.0, + 9.0, + 26.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#nato_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#nato_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#nato_green_s21_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#nato_green_s21_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#nato_green_s22_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#nato_green_s22_b" + } + } + }, + { + "from": [ + -4.0, + 9.0, + 10.0 + ], + "to": [ + 20.0, + 13.0, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 14.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 14.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 14.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 14.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 6.0, + 3.0, + -16.0 + ], + "to": [ + 10.0, + 6.0, + -10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 3.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 3.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 3.3424499999999995 + ], + "to": [ + -5.5, + 8.65755, + 11.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 3.3424499999999995 + ], + "to": [ + 25.0, + 8.65755, + 11.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 3.3424499999999995 + ], + "to": [ + -5.53, + 8.65755, + 11.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 7.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 3.3424499999999995 + ], + "to": [ + 24.97, + 8.65755, + 11.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 7.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 13.34245 + ], + "to": [ + -5.5, + 8.65755, + 21.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 13.34245 + ], + "to": [ + 25.0, + 8.65755, + 21.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 13.34245 + ], + "to": [ + -5.53, + 8.65755, + 21.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 17.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 13.34245 + ], + "to": [ + 24.97, + 8.65755, + 21.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 17.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/p1sun_launcher.json b/airdef-mod/assets/airdef/models/block/p1sun_launcher.json index 1c97559..ab59635 100644 --- a/airdef-mod/assets/airdef/models/block/p1sun_launcher.json +++ b/airdef-mod/assets/airdef/models/block/p1sun_launcher.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "dark_metal": "airdef:block/dark_metal", "tube_cap": "airdef:block/tube_cap", - "particle": "airdef:block/dark_metal" + "dark_metal": "airdef:block/dark_metal", + "particle": "airdef:block/tube_cap" }, "elements": [ { diff --git a/airdef-mod/assets/airdef/models/block/p1sun_launcher_burnt.json b/airdef-mod/assets/airdef/models/block/p1sun_launcher_burnt.json new file mode 100644 index 0000000..9c4ab98 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/p1sun_launcher_burnt.json @@ -0,0 +1,690 @@ +{ + "ambientocclusion": false, + "textures": { + "tube_cap_b": "airdef:block/tube_cap_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/tube_cap_b" + }, + "elements": [ + { + "from": [ + 0.5, + 0.0, + -16.0 + ], + "to": [ + 3.5, + 3.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 0.5, + 4.0, + -16.0 + ], + "to": [ + 3.5, + 7.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 4.5, + 0.0, + -16.0 + ], + "to": [ + 7.5, + 3.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 4.5, + 4.0, + -16.0 + ], + "to": [ + 7.5, + 7.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 8.5, + 0.0, + -16.0 + ], + "to": [ + 11.5, + 3.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 8.5, + 4.0, + -16.0 + ], + "to": [ + 11.5, + 7.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 12.5, + 0.0, + -16.0 + ], + "to": [ + 15.5, + 3.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 12.5, + 4.0, + -16.0 + ], + "to": [ + 15.5, + 7.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -0.5, + 0.0, + 26.0 + ], + "to": [ + 16.5, + 7.0, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -0.5, + 0.0, + -2.0 + ], + "to": [ + 16.5, + 7.0, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/pac3.json b/airdef-mod/assets/airdef/models/block/pac3.json index bcb9d36..542aee1 100644 --- a/airdef-mod/assets/airdef/models/block/pac3.json +++ b/airdef-mod/assets/airdef/models/block/pac3.json @@ -1,301 +1,759 @@ { "ambientocclusion": false, "textures": { + "nose_dark": "airdef:block/nose_dark", + "rm_pac3": "airdef:block/rm_pac3", + "rm_pac3_t": "airdef:block/rm_pac3_t", + "dark_metal": "airdef:block/dark_metal", "missile": "airdef:block/missile", - "nozzle": "airdef:block/nozzle", - "particle": "airdef:block/missile" + "bare_nozzle": "airdef:block/bare_nozzle", + "glow_ember": "airdef:block/glow_ember", + "particle": "airdef:block/nose_dark" }, "elements": [ { "from": [ - 7.333333333333333, - 7.333333333333333, + 7.294558312447602, + 7.294558312447602, -16.0 ], "to": [ - 8.666666666666666, - 8.666666666666666, - -14.333333333333334 + 8.705441687552398, + 8.705441687552398, + -13.666666666666666 ], "faces": { "north": { "uv": [ 0, 0, - 1.333333333333333, - 1.333333333333333 + 1.4108833751047953, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "south": { "uv": [ 0, 0, - 1.333333333333333, - 1.333333333333333 + 1.4108833751047953, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "east": { "uv": [ 0, 0, - 1.666666666666666, - 1.333333333333333 + 2.333333333333334, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "west": { "uv": [ 0, 0, - 1.666666666666666, - 1.333333333333333 + 2.333333333333334, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "up": { "uv": [ 0, 0, - 1.333333333333333, - 1.666666666666666 + 1.4108833751047953, + 2.333333333333334 ], - "texture": "#missile" + "texture": "#nose_dark" }, "down": { "uv": [ 0, 0, - 1.333333333333333, - 1.666666666666666 + 1.4108833751047953, + 2.333333333333334 ], - "texture": "#missile" + "texture": "#nose_dark" } } }, { "from": [ - 7.0, - 7.0, - -14.333333333333334 + 7.294558312447602, + 7.294558312447602, + -15.97 ], "to": [ - 9.0, - 9.0, - -12.666666666666666 + 8.705441687552398, + 8.705441687552398, + -13.696666666666665 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "south": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.4108833751047953, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "east": { "uv": [ 0, 0, - 1.6666666666666679, - 2.0 + 2.273333333333335, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "west": { "uv": [ 0, 0, - 1.6666666666666679, - 2.0 + 2.273333333333335, + 1.4108833751047953 ], - "texture": "#missile" + "texture": "#nose_dark" }, "up": { "uv": [ 0, 0, - 2.0, - 1.6666666666666679 + 1.4108833751047953, + 2.273333333333335 ], - "texture": "#missile" + "texture": "#nose_dark" }, "down": { "uv": [ 0, 0, - 2.0, - 1.6666666666666679 + 1.4108833751047953, + 2.273333333333335 ], - "texture": "#missile" + "texture": "#nose_dark" } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -14.833333333333332 + ] } }, { "from": [ - 6.666666666666666, - 6.666666666666666, - -12.666666666666666 + 6.8507775398726425, + 6.8507775398726425, + -13.666666666666666 ], "to": [ - 9.333333333333334, - 9.333333333333334, - -11.0 + 9.149222460127358, + 9.149222460127358, + -11.333333333333332 ], "faces": { "north": { "uv": [ 0, 0, - 2.666666666666668, - 2.666666666666668 + 2.298444920254716, + 2.298444920254716 ], - "texture": "#missile" + "texture": "#nose_dark" }, "south": { "uv": [ 0, 0, - 2.666666666666668, - 2.666666666666668 + 2.298444920254716, + 2.298444920254716 ], - "texture": "#missile" + "texture": "#nose_dark" }, "east": { "uv": [ 0, 0, - 1.666666666666666, - 2.666666666666668 + 2.333333333333334, + 2.298444920254716 ], - "texture": "#missile" + "texture": "#nose_dark" }, "west": { "uv": [ 0, 0, - 1.666666666666666, - 2.666666666666668 + 2.333333333333334, + 2.298444920254716 ], - "texture": "#missile" + "texture": "#nose_dark" }, "up": { "uv": [ 0, 0, - 2.666666666666668, - 1.666666666666666 + 2.298444920254716, + 2.333333333333334 ], - "texture": "#missile" + "texture": "#nose_dark" }, "down": { "uv": [ 0, 0, - 2.666666666666668, - 1.666666666666666 + 2.298444920254716, + 2.333333333333334 ], - "texture": "#missile" + "texture": "#nose_dark" } } }, { "from": [ - 6.5, - 6.5, - -11.0 + 6.8507775398726425, + 6.8507775398726425, + -13.636666666666667 ], "to": [ - 9.5, - 9.5, - 26.0 + 9.149222460127358, + 9.149222460127358, + -11.363333333333332 ], "faces": { "north": { "uv": [ 0, 0, - 3.0, - 3.0 + 2.298444920254716, + 2.298444920254716 ], - "texture": "#missile" + "texture": "#nose_dark" }, "south": { "uv": [ 0, 0, - 3.0, - 3.0 + 2.298444920254716, + 2.298444920254716 ], - "texture": "#missile" + "texture": "#nose_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.273333333333335, + 2.298444920254716 + ], + "texture": "#nose_dark" + }, + "up": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.273333333333335 + ], + "texture": "#nose_dark" + }, + "down": { + "uv": [ + 0, + 0, + 2.298444920254716, + 2.273333333333335 + ], + "texture": "#nose_dark" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -12.5 + ] + } + }, + { + "from": [ + 6.517798430927714, + 6.517798430927714, + -11.333333333333332 + ], + "to": [ + 9.482201569072286, + 9.482201569072286, + -9.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "south": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.333333333333332, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.333333333333332, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "up": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.333333333333332 + ], + "texture": "#nose_dark" + }, + "down": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.333333333333332 + ], + "texture": "#nose_dark" + } + } + }, + { + "from": [ + 6.517798430927714, + 6.517798430927714, + -11.303333333333333 + ], + "to": [ + 9.482201569072286, + 9.482201569072286, + -9.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "south": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.2733333333333334, + 2.964403138144572 + ], + "texture": "#nose_dark" + }, + "up": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.2733333333333334 + ], + "texture": "#nose_dark" + }, + "down": { + "uv": [ + 0, + 0, + 2.964403138144572, + 2.2733333333333334 + ], + "texture": "#nose_dark" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -10.166666666666666 + ] + } + }, + { + "from": [ + 6.4293700000000005, + 6.4293700000000005, + -9.0 + ], + "to": [ + 9.57063, + 9.57063, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_pac3" + }, + "south": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_pac3" }, "east": { "uv": [ 0, 0, 16, - 3.0 + 3.141259999999999 ], - "texture": "#missile" + "texture": "#rm_pac3" }, "west": { "uv": [ 0, 0, 16, - 3.0 + 3.141259999999999 ], - "texture": "#missile" + "texture": "#rm_pac3" }, "up": { "uv": [ 0, 0, - 3.0, + 3.141259999999999, 16 ], - "texture": "#missile" + "texture": "#rm_pac3_t" }, "down": { "uv": [ 0, 0, - 3.0, + 3.141259999999999, 16 ], - "texture": "#missile" + "texture": "#rm_pac3_t" } } }, { "from": [ - 1.5, - 7.6, - 20.0 + 6.4293700000000005, + 6.4293700000000005, + -8.97 ], "to": [ - 6.5, - 8.4, - 26.0 + 9.57063, + 9.57063, + 23.97 ], "faces": { "north": { "uv": [ 0, 0, - 5.0, - 0.8000000000000007 + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_pac3" + }, + "south": { + "uv": [ + 0, + 0, + 3.141259999999999, + 3.141259999999999 + ], + "texture": "#rm_pac3" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_pac3" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.141259999999999 + ], + "texture": "#rm_pac3" + }, + "up": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_pac3_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.141259999999999, + 16 + ], + "texture": "#rm_pac3_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 7.499999999999999 + ] + } + }, + { + "from": [ + 5.96742, + 5.96742, + -8.0 + ], + "to": [ + 10.03258, + 10.03258, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 4.06516 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 4.06516 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 4.06516, + 1.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 4.06516, + 1.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 5.96742, + 5.96742, + -7.97 + ], + "to": [ + 10.03258, + 10.03258, + -7.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 4.06516, + 4.06516 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 0.9399999999999995, + 4.06516 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 0.9399999999999995, + 4.06516 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 4.06516, + 0.9399999999999995 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 4.06516, + 0.9399999999999995 + ], + "texture": "#dark_metal" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -7.5 + ] + } + }, + { + "from": [ + 9.53, + 7.65, + 18.0 + ], + "to": [ + 12.280000000000001, + 8.35, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#missile" }, @@ -303,8 +761,8 @@ "uv": [ 0, 0, - 5.0, - 0.8000000000000007 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#missile" }, @@ -313,7 +771,7 @@ 0, 0, 6.0, - 0.8000000000000007 + 0.6999999999999993 ], "texture": "#missile" }, @@ -322,7 +780,7 @@ 0, 0, 6.0, - 0.8000000000000007 + 0.6999999999999993 ], "texture": "#missile" }, @@ -330,7 +788,7 @@ "uv": [ 0, 0, - 5.0, + 2.7500000000000018, 6.0 ], "texture": "#missile" @@ -339,7 +797,7 @@ "uv": [ 0, 0, - 5.0, + 2.7500000000000018, 6.0 ], "texture": "#missile" @@ -348,22 +806,22 @@ }, { "from": [ - 9.5, - 7.6, - 20.0 + 3.719999999999999, + 7.65, + 18.0 ], "to": [ - 14.5, - 8.4, - 26.0 + 6.470000000000001, + 8.35, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 5.0, - 0.8000000000000007 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#missile" }, @@ -371,8 +829,8 @@ "uv": [ 0, 0, - 5.0, - 0.8000000000000007 + 2.7500000000000018, + 0.6999999999999993 ], "texture": "#missile" }, @@ -381,7 +839,7 @@ 0, 0, 6.0, - 0.8000000000000007 + 0.6999999999999993 ], "texture": "#missile" }, @@ -390,7 +848,7 @@ 0, 0, 6.0, - 0.8000000000000007 + 0.6999999999999993 ], "texture": "#missile" }, @@ -398,7 +856,7 @@ "uv": [ 0, 0, - 5.0, + 2.7500000000000018, 6.0 ], "texture": "#missile" @@ -407,7 +865,7 @@ "uv": [ 0, 0, - 5.0, + 2.7500000000000018, 6.0 ], "texture": "#missile" @@ -416,22 +874,22 @@ }, { "from": [ - 7.6, - 1.5, - 20.0 + 12.280000000000001, + 7.65, + 21.5 ], "to": [ - 8.4, - 6.5, - 26.0 + 14.530000000000001, + 8.35, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 5.0 + 2.25, + 0.6999999999999993 ], "texture": "#missile" }, @@ -439,8 +897,144 @@ "uv": [ 0, 0, - 0.8000000000000007, - 5.0 + 2.25, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "up": { + "uv": [ + 0, + 0, + 2.25, + 2.5 + ], + "texture": "#missile" + }, + "down": { + "uv": [ + 0, + 0, + 2.25, + 2.5 + ], + "texture": "#missile" + } + } + }, + { + "from": [ + 1.4699999999999989, + 7.65, + 21.5 + ], + "to": [ + 3.719999999999999, + 8.35, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.25, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "south": { + "uv": [ + 0, + 0, + 2.25, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 0.6999999999999993 + ], + "texture": "#missile" + }, + "up": { + "uv": [ + 0, + 0, + 2.25, + 2.5 + ], + "texture": "#missile" + }, + "down": { + "uv": [ + 0, + 0, + 2.25, + 2.5 + ], + "texture": "#missile" + } + } + }, + { + "from": [ + 7.65, + 9.53, + 18.0 + ], + "to": [ + 8.35, + 12.28, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#missile" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 ], "texture": "#missile" }, @@ -449,7 +1043,7 @@ 0, 0, 6.0, - 5.0 + 2.75 ], "texture": "#missile" }, @@ -458,7 +1052,7 @@ 0, 0, 6.0, - 5.0 + 2.75 ], "texture": "#missile" }, @@ -466,7 +1060,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.6999999999999993, 6.0 ], "texture": "#missile" @@ -475,7 +1069,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.6999999999999993, 6.0 ], "texture": "#missile" @@ -484,22 +1078,22 @@ }, { "from": [ - 7.6, - 9.5, - 20.0 + 7.65, + 12.28, + 21.5 ], "to": [ - 8.4, - 14.5, - 26.0 + 8.35, + 14.53, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 5.0 + 0.6999999999999993, + 2.25 ], "texture": "#missile" }, @@ -507,8 +1101,76 @@ "uv": [ 0, 0, - 0.8000000000000007, - 5.0 + 0.6999999999999993, + 2.25 + ], + "texture": "#missile" + }, + "east": { + "uv": [ + 0, + 0, + 2.5, + 2.25 + ], + "texture": "#missile" + }, + "west": { + "uv": [ + 0, + 0, + 2.5, + 2.25 + ], + "texture": "#missile" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.5 + ], + "texture": "#missile" + } + } + }, + { + "from": [ + 7.65, + 3.7199999999999998, + 18.0 + ], + "to": [ + 8.35, + 6.47, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 + ], + "texture": "#missile" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.75 ], "texture": "#missile" }, @@ -517,7 +1179,7 @@ 0, 0, 6.0, - 5.0 + 2.75 ], "texture": "#missile" }, @@ -526,7 +1188,7 @@ 0, 0, 6.0, - 5.0 + 2.75 ], "texture": "#missile" }, @@ -534,7 +1196,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.6999999999999993, 6.0 ], "texture": "#missile" @@ -543,7 +1205,7 @@ "uv": [ 0, 0, - 0.8000000000000007, + 0.6999999999999993, 6.0 ], "texture": "#missile" @@ -552,22 +1214,22 @@ }, { "from": [ - 4.5, - 7.7, - -6.0 + 7.65, + 1.4699999999999998, + 21.5 ], "to": [ - 6.5, - 8.3, - -2.0 + 8.35, + 3.7199999999999998, + 24.0 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 0.6000000000000005 + 0.6999999999999993, + 2.25 ], "texture": "#missile" }, @@ -575,8 +1237,8 @@ "uv": [ 0, 0, - 2.0, - 0.6000000000000005 + 0.6999999999999993, + 2.25 ], "texture": "#missile" }, @@ -584,8 +1246,8 @@ "uv": [ 0, 0, - 4.0, - 0.6000000000000005 + 2.5, + 2.25 ], "texture": "#missile" }, @@ -593,8 +1255,8 @@ "uv": [ 0, 0, - 4.0, - 0.6000000000000005 + 2.5, + 2.25 ], "texture": "#missile" }, @@ -602,8 +1264,8 @@ "uv": [ 0, 0, - 2.0, - 4.0 + 0.6999999999999993, + 2.5 ], "texture": "#missile" }, @@ -611,8 +1273,8 @@ "uv": [ 0, 0, - 2.0, - 4.0 + 0.6999999999999993, + 2.5 ], "texture": "#missile" } @@ -620,137 +1282,137 @@ }, { "from": [ - 9.5, - 7.7, - -6.0 + 6.64, + 6.64, + 24.0 ], "to": [ - 11.5, - 8.3, - -2.0 + 9.36, + 9.36, + 25.6 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 0.6000000000000005 + 2.7199999999999998, + 2.7199999999999998 ], - "texture": "#missile" + "texture": "#bare_nozzle" }, "south": { "uv": [ 0, 0, - 2.0, - 0.6000000000000005 + 2.7199999999999998, + 2.7199999999999998 ], - "texture": "#missile" + "texture": "#bare_nozzle" }, "east": { "uv": [ 0, 0, - 4.0, - 0.6000000000000005 + 1.6000000000000014, + 2.7199999999999998 ], - "texture": "#missile" + "texture": "#bare_nozzle" }, "west": { "uv": [ 0, 0, - 4.0, - 0.6000000000000005 + 1.6000000000000014, + 2.7199999999999998 ], - "texture": "#missile" + "texture": "#bare_nozzle" }, "up": { "uv": [ 0, 0, - 2.0, - 4.0 + 2.7199999999999998, + 1.6000000000000014 ], - "texture": "#missile" + "texture": "#bare_nozzle" }, "down": { "uv": [ 0, 0, - 2.0, - 4.0 + 2.7199999999999998, + 1.6000000000000014 ], - "texture": "#missile" + "texture": "#bare_nozzle" } } }, { "from": [ - 7.0, - 7.0, - 26.0 + 7.0649999999999995, + 7.0649999999999995, + 25.6 ], "to": [ - 9.0, - 9.0, - 28.0 + 8.935, + 8.935, + 25.9 ], "faces": { "north": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.870000000000001, + 1.870000000000001 ], - "texture": "#nozzle" + "texture": "#glow_ember" }, "south": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.870000000000001, + 1.870000000000001 ], - "texture": "#nozzle" + "texture": "#glow_ember" }, "east": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.29999999999999716, + 1.870000000000001 ], - "texture": "#nozzle" + "texture": "#glow_ember" }, "west": { "uv": [ 0, 0, - 2.0, - 2.0 + 0.29999999999999716, + 1.870000000000001 ], - "texture": "#nozzle" + "texture": "#glow_ember" }, "up": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.870000000000001, + 0.29999999999999716 ], - "texture": "#nozzle" + "texture": "#glow_ember" }, "down": { "uv": [ 0, 0, - 2.0, - 2.0 + 1.870000000000001, + 0.29999999999999716 ], - "texture": "#nozzle" + "texture": "#glow_ember" } } } diff --git a/airdef-mod/assets/airdef/models/block/pantsir_pack.json b/airdef-mod/assets/airdef/models/block/pantsir_pack.json index 86474cd..512ee26 100644 --- a/airdef-mod/assets/airdef/models/block/pantsir_pack.json +++ b/airdef-mod/assets/airdef/models/block/pantsir_pack.json @@ -1,11 +1,13 @@ { "ambientocclusion": false, "textures": { - "ru_green": "airdef:block/ru_green", "tubes6": "airdef:block/tubes6", - "barrel": "airdef:block/barrel", + "ru_green": "airdef:block/ru_green", + "ru_green_s21": "airdef:block/ru_green_s21", + "ru_green_s12": "airdef:block/ru_green_s12", + "bare_barrel": "airdef:block/bare_barrel", "dark_metal": "airdef:block/dark_metal", - "particle": "airdef:block/ru_green" + "particle": "airdef:block/tubes6" }, "elements": [ { @@ -45,7 +47,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "west": { "uv": [ @@ -54,7 +56,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "up": { "uv": [ @@ -63,7 +65,7 @@ 8.0, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s12" }, "down": { "uv": [ @@ -72,7 +74,7 @@ 8.0, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s12" } } }, @@ -113,7 +115,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "west": { "uv": [ @@ -122,7 +124,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "up": { "uv": [ @@ -131,7 +133,7 @@ 8.0, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s12" }, "down": { "uv": [ @@ -140,7 +142,7 @@ 8.0, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s12" } } }, @@ -163,7 +165,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "south": { "uv": [ @@ -172,7 +174,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "east": { "uv": [ @@ -181,7 +183,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "west": { "uv": [ @@ -190,7 +192,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "up": { "uv": [ @@ -199,7 +201,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "down": { "uv": [ @@ -208,7 +210,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" } } }, @@ -231,7 +233,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "south": { "uv": [ @@ -240,7 +242,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "east": { "uv": [ @@ -249,7 +251,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "west": { "uv": [ @@ -258,7 +260,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "up": { "uv": [ @@ -267,7 +269,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "down": { "uv": [ @@ -276,7 +278,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" } } }, @@ -299,7 +301,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "south": { "uv": [ @@ -308,7 +310,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "east": { "uv": [ @@ -317,7 +319,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "west": { "uv": [ @@ -326,7 +328,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "up": { "uv": [ @@ -335,7 +337,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "down": { "uv": [ @@ -344,7 +346,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" } } }, @@ -367,7 +369,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "south": { "uv": [ @@ -376,7 +378,7 @@ 1.5, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "east": { "uv": [ @@ -385,7 +387,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "west": { "uv": [ @@ -394,7 +396,7 @@ 16, 1.5 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "up": { "uv": [ @@ -403,7 +405,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" }, "down": { "uv": [ @@ -412,7 +414,7 @@ 1.5, 16 ], - "texture": "#barrel" + "texture": "#bare_barrel" } } }, diff --git a/airdef-mod/assets/airdef/models/block/pantsir_pack_burnt.json b/airdef-mod/assets/airdef/models/block/pantsir_pack_burnt.json new file mode 100644 index 0000000..df62e78 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/pantsir_pack_burnt.json @@ -0,0 +1,558 @@ +{ + "ambientocclusion": false, + "textures": { + "tubes6_b": "airdef:block/tubes6_b", + "ru_green_b": "airdef:block/ru_green_b", + "ru_green_s21_b": "airdef:block/ru_green_s21_b", + "ru_green_s12_b": "airdef:block/ru_green_s12_b", + "bare_barrel_b": "airdef:block/bare_barrel_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/tubes6_b" + }, + "elements": [ + { + "from": [ + -11.0, + 2.0, + -16.0 + ], + "to": [ + -3.0, + 12.0, + 12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 8.0, + 10.0 + ], + "texture": "#tubes6_b" + }, + "south": { + "uv": [ + 0, + 0, + 8.0, + 10.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "up": { + "uv": [ + 0, + 0, + 8.0, + 16 + ], + "texture": "#ru_green_s12_b" + }, + "down": { + "uv": [ + 0, + 0, + 8.0, + 16 + ], + "texture": "#ru_green_s12_b" + } + } + }, + { + "from": [ + 19.0, + 2.0, + -16.0 + ], + "to": [ + 27.0, + 12.0, + 12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 8.0, + 10.0 + ], + "texture": "#tubes6_b" + }, + "south": { + "uv": [ + 0, + 0, + 8.0, + 10.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "up": { + "uv": [ + 0, + 0, + 8.0, + 16 + ], + "texture": "#ru_green_s12_b" + }, + "down": { + "uv": [ + 0, + 0, + 8.0, + 16 + ], + "texture": "#ru_green_s12_b" + } + } + }, + { + "from": [ + -9.5, + 12.5, + -16.0 + ], + "to": [ + -8.0, + 14.0, + 6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + } + } + }, + { + "from": [ + 24.0, + 12.5, + -16.0 + ], + "to": [ + 25.5, + 14.0, + 6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + } + } + }, + { + "from": [ + -6.5, + 12.5, + -16.0 + ], + "to": [ + -5.0, + 14.0, + 6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + } + } + }, + { + "from": [ + 21.0, + 12.5, + -16.0 + ], + "to": [ + 22.5, + 14.0, + 6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.5, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 1.5 + ], + "texture": "#bare_barrel_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.5, + 16 + ], + "texture": "#bare_barrel_b" + } + } + }, + { + "from": [ + -10.0, + 12.0, + 2.0 + ], + "to": [ + -4.0, + 15.0, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 6.0, + 8.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 6.0, + 8.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 20.0, + 12.0, + 2.0 + ], + "to": [ + 26.0, + 15.0, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 6.0, + 8.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 6.0, + 8.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/pantsir_truck.json b/airdef-mod/assets/airdef/models/block/pantsir_truck.json index 941791c..e68a20f 100644 --- a/airdef-mod/assets/airdef/models/block/pantsir_truck.json +++ b/airdef-mod/assets/airdef/models/block/pantsir_truck.json @@ -1,11 +1,15 @@ { "ambientocclusion": false, "textures": { + "ru_green_s21": "airdef:block/ru_green_s21", + "ru_green_s31": "airdef:block/ru_green_s31", + "ru_green_s23": "airdef:block/ru_green_s23", + "glass_cab": "airdef:block/glass_cab", "ru_green": "airdef:block/ru_green", - "glass": "airdef:block/glass", "dark_metal": "airdef:block/dark_metal", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_green_s21" }, "elements": [ { @@ -27,7 +31,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -36,7 +40,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -45,7 +49,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "west": { "uv": [ @@ -54,7 +58,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "up": { "uv": [ @@ -63,7 +67,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" }, "down": { "uv": [ @@ -72,7 +76,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" } } }, @@ -95,7 +99,7 @@ 16, 12.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -104,7 +108,7 @@ 16, 12.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -131,7 +135,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "down": { "uv": [ @@ -140,7 +144,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" } } }, @@ -163,7 +167,7 @@ 16, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -172,7 +176,7 @@ 16, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "east": { "uv": [ @@ -181,7 +185,7 @@ 0.25, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "west": { "uv": [ @@ -190,7 +194,7 @@ 0.25, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "up": { "uv": [ @@ -199,7 +203,7 @@ 16, 0.25 ], - "texture": "#glass" + "texture": "#glass_cab" }, "down": { "uv": [ @@ -208,7 +212,7 @@ 16, 0.25 ], - "texture": "#glass" + "texture": "#glass_cab" } } }, @@ -231,7 +235,7 @@ 16, 9.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -240,7 +244,7 @@ 16, 9.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -267,7 +271,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "down": { "uv": [ @@ -276,7 +280,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" } } }, @@ -419,13 +423,13 @@ { "from": [ -9.0, - 0.0, - -13.0 + 0.3424499999999995, + -13.65755 ], "to": [ -5.5, - 9.0, - -6.0 + 8.65755, + -5.3424499999999995 ], "faces": { "north": { @@ -433,7 +437,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -442,7 +446,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -450,26 +454,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -478,7 +482,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -487,13 +491,13 @@ { "from": [ 21.5, - 0.0, - -13.0 + 0.3424499999999995, + -13.65755 ], "to": [ 25.0, - 9.0, - -6.0 + 8.65755, + -5.3424499999999995 ], "faces": { "north": { @@ -501,7 +505,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -510,7 +514,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -518,26 +522,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -546,22 +550,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -13.65755 + ], + "to": [ + -5.53, + 8.65755, + -5.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -9.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -13.65755 + ], + "to": [ + 24.97, + 8.65755, + -5.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -9.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -4.0 + 0.3424499999999995, + -4.6575500000000005 ], "to": [ -5.5, - 9.0, - 3.0 + 8.65755, + 3.6575500000000005 ], "faces": { "north": { @@ -569,7 +727,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -578,7 +736,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -586,26 +744,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -614,7 +772,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -623,13 +781,13 @@ { "from": [ 21.5, - 0.0, - -4.0 + 0.3424499999999995, + -4.6575500000000005 ], "to": [ 25.0, - 9.0, - 3.0 + 8.65755, + 3.6575500000000005 ], "faces": { "north": { @@ -637,7 +795,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -646,7 +804,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -654,26 +812,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -682,22 +840,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -4.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 3.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -0.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -4.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 3.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -0.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 16.0 + 0.3424499999999995, + 15.34245 ], "to": [ -5.5, - 9.0, - 23.0 + 8.65755, + 23.65755 ], "faces": { "north": { @@ -705,7 +1017,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -714,7 +1026,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -722,26 +1034,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -750,7 +1062,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -759,13 +1071,13 @@ { "from": [ 21.5, - 0.0, - 16.0 + 0.3424499999999995, + 15.34245 ], "to": [ 25.0, - 9.0, - 23.0 + 8.65755, + 23.65755 ], "faces": { "north": { @@ -773,7 +1085,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -782,7 +1094,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -790,26 +1102,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -818,22 +1130,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.53, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 24.97, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 19.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 24.0 + 0.3424499999999995, + 23.34245 ], "to": [ -5.5, - 9.0, - 31.0 + 8.65755, + 31.65755 ], "faces": { "north": { @@ -841,7 +1307,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -850,7 +1316,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -858,26 +1324,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -886,7 +1352,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -895,13 +1361,13 @@ { "from": [ 21.5, - 0.0, - 24.0 + 0.3424499999999995, + 23.34245 ], "to": [ 25.0, - 9.0, - 31.0 + 8.65755, + 31.65755 ], "faces": { "north": { @@ -909,7 +1375,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -918,7 +1384,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -926,26 +1392,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -954,11 +1420,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.53, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 27.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 24.97, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 27.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/pantsir_truck_burnt.json b/airdef-mod/assets/airdef/models/block/pantsir_truck_burnt.json new file mode 100644 index 0000000..53e470e --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/pantsir_truck_burnt.json @@ -0,0 +1,1584 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_green_s21_b": "airdef:block/ru_green_s21_b", + "ru_green_s31_b": "airdef:block/ru_green_s31_b", + "ru_green_s23_b": "airdef:block/ru_green_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "ru_green_b": "airdef:block/ru_green_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/ru_green_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + } + } + }, + { + "from": [ + -6.0, + 9.0, + -16.0 + ], + "to": [ + 22.0, + 21.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 12.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 12.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 12.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + } + } + }, + { + "from": [ + -5.0, + 13.0, + -16.0 + ], + "to": [ + 21.0, + 20.0, + -15.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#glass_cab_b" + }, + "east": { + "uv": [ + 0, + 0, + 0.25, + 7.0 + ], + "texture": "#glass_cab_b" + }, + "west": { + "uv": [ + 0, + 0, + 0.25, + 7.0 + ], + "texture": "#glass_cab_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 0.25 + ], + "texture": "#glass_cab_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 0.25 + ], + "texture": "#glass_cab_b" + } + } + }, + { + "from": [ + -5.0, + 9.0, + -5.0 + ], + "to": [ + 21.0, + 18.0, + 6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 11.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 11.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s21_b" + } + } + }, + { + "from": [ + -4.0, + 9.0, + 8.0 + ], + "to": [ + 20.0, + 12.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -6.5, + 3.0, + 26.0 + ], + "to": [ + 22.5, + 6.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -13.65755 + ], + "to": [ + -5.5, + 8.65755, + -5.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -13.65755 + ], + "to": [ + 25.0, + 8.65755, + -5.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -13.65755 + ], + "to": [ + -5.53, + 8.65755, + -5.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -9.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -13.65755 + ], + "to": [ + 24.97, + 8.65755, + -5.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -9.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -4.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 3.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -4.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 3.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -4.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 3.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -0.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -4.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 3.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -0.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.5, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 25.0, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.53, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 24.97, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.5, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 25.0, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.53, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 27.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 24.97, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 27.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/pantsir_turret_burnt.json b/airdef-mod/assets/airdef/models/block/pantsir_turret_burnt.json new file mode 100644 index 0000000..e0c51b3 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/pantsir_turret_burnt.json @@ -0,0 +1,283 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_green_b": "airdef:block/ru_green_b", + "radar_face_b": "airdef:block/radar_face_b", + "metal_b": "airdef:block/metal_b", + "particle": "airdef:block/ru_green_b" + }, + "elements": [ + { + "from": [ + -2.0, + 0.0, + -6.0 + ], + "to": [ + 18.0, + 10.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_b" + } + } + }, + { + "from": [ + 1.0, + 1.0, + -11.0 + ], + "to": [ + 15.0, + 11.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 14.0, + 10.0 + ], + "texture": "#radar_face_b" + }, + "south": { + "uv": [ + 0, + 0, + 14.0, + 10.0 + ], + "texture": "#radar_face_b" + }, + "east": { + "uv": [ + 0, + 0, + 5.0, + 10.0 + ], + "texture": "#radar_face_b" + }, + "west": { + "uv": [ + 0, + 0, + 5.0, + 10.0 + ], + "texture": "#radar_face_b" + }, + "up": { + "uv": [ + 0, + 0, + 14.0, + 5.0 + ], + "texture": "#radar_face_b" + }, + "down": { + "uv": [ + 0, + 0, + 14.0, + 5.0 + ], + "texture": "#radar_face_b" + } + } + }, + { + "from": [ + 7.0, + 10.0, + 4.0 + ], + "to": [ + 9.0, + 17.0, + 6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 7.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 2.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 2.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + 0.0, + 10.0, + 8.0 + ], + "to": [ + 16.0, + 12.0, + 16.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.0, + 2.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.0, + 2.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 8.0 + ], + "texture": "#ru_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 8.0 + ], + "texture": "#ru_green_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/patriot_launcher.json b/airdef-mod/assets/airdef/models/block/patriot_launcher.json index bee8164..913f925 100644 --- a/airdef-mod/assets/airdef/models/block/patriot_launcher.json +++ b/airdef-mod/assets/airdef/models/block/patriot_launcher.json @@ -1,11 +1,11 @@ { "ambientocclusion": false, "textures": { - "canister": "airdef:block/canister", "canister_front": "airdef:block/canister_front", + "canister": "airdef:block/canister", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", - "particle": "airdef:block/canister" + "particle": "airdef:block/canister_front" }, "elements": [ { diff --git a/airdef-mod/assets/airdef/models/block/patriot_launcher_burnt.json b/airdef-mod/assets/airdef/models/block/patriot_launcher_burnt.json new file mode 100644 index 0000000..b917458 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/patriot_launcher_burnt.json @@ -0,0 +1,556 @@ +{ + "ambientocclusion": false, + "textures": { + "canister_front_b": "airdef:block/canister_front_b", + "canister_b": "airdef:block/canister_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "particle": "airdef:block/canister_front_b" + }, + "elements": [ + { + "from": [ + -6.0, + 1.0, + -14.0 + ], + "to": [ + 22.0, + 19.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#canister_front_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#canister_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#canister_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#canister_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#canister_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#canister_b" + } + } + }, + { + "from": [ + -6.5, + 9.5, + -14.0 + ], + "to": [ + 22.5, + 10.5, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 7.5, + 1.0, + -14.0 + ], + "to": [ + 8.5, + 19.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 1.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -7.0, + 0.0, + 24.0 + ], + "to": [ + 23.0, + 2.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 2.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 2.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -8.0, + 2.0, + -10.0 + ], + "to": [ + -6.0, + 17.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + 22.0, + 2.0, + -10.0 + ], + "to": [ + 24.0, + 17.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -8.0, + 2.0, + 20.0 + ], + "to": [ + -6.0, + 17.0, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + 22.0, + 2.0, + 20.0 + ], + "to": [ + 24.0, + 17.0, + 24.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 15.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 4.0 + ], + "texture": "#metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/patriot_radar.json b/airdef-mod/assets/airdef/models/block/patriot_radar.json index 262252f..69278c2 100644 --- a/airdef-mod/assets/airdef/models/block/patriot_radar.json +++ b/airdef-mod/assets/airdef/models/block/patriot_radar.json @@ -1,11 +1,14 @@ { "ambientocclusion": false, "textures": { + "nato_green_s21": "airdef:block/nato_green_s21", + "nato_green_s22": "airdef:block/nato_green_s22", "nato_green": "airdef:block/nato_green", "radar_face": "airdef:block/radar_face", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/nato_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/nato_green_s21" }, "elements": [ { @@ -27,7 +30,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -36,7 +39,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -45,7 +48,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "west": { "uv": [ @@ -54,7 +57,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "up": { "uv": [ @@ -63,7 +66,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s22" }, "down": { "uv": [ @@ -72,7 +75,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s22" } } }, @@ -95,7 +98,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -104,7 +107,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -131,7 +134,7 @@ 16, 14.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "down": { "uv": [ @@ -140,7 +143,7 @@ 16, 14.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" } } }, @@ -283,13 +286,13 @@ { "from": [ -9.0, - 0.0, - 14.0 + 0.35006000000000004, + 13.750060000000001 ], "to": [ -5.5, - 9.0, - 22.0 + 8.84994, + 22.24994 ], "faces": { "north": { @@ -297,7 +300,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -306,7 +309,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -314,26 +317,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -342,7 +345,7 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } @@ -351,13 +354,13 @@ { "from": [ 21.5, - 0.0, - 14.0 + 0.35006000000000004, + 13.750060000000001 ], "to": [ 25.0, - 9.0, - 22.0 + 8.84994, + 22.24994 ], "faces": { "north": { @@ -365,7 +368,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -374,7 +377,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -382,26 +385,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -410,11 +413,165 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + -5.53, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.6, + 18.0 + ] + } + }, + { + "from": [ + 21.53, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + 24.97, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.6, + 18.0 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/patriot_trailer.json b/airdef-mod/assets/airdef/models/block/patriot_trailer.json index d92a5bc..7260bce 100644 --- a/airdef-mod/assets/airdef/models/block/patriot_trailer.json +++ b/airdef-mod/assets/airdef/models/block/patriot_trailer.json @@ -1,11 +1,14 @@ { "ambientocclusion": false, "textures": { - "nato_green": "airdef:block/nato_green", + "nato_green_s21": "airdef:block/nato_green_s21", + "nato_green_s31": "airdef:block/nato_green_s31", + "nato_green_s23": "airdef:block/nato_green_s23", "metal": "airdef:block/metal", "dark_metal": "airdef:block/dark_metal", "tire": "airdef:block/tire", - "particle": "airdef:block/nato_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/nato_green_s21" }, "elements": [ { @@ -27,7 +30,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -36,7 +39,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -45,7 +48,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s31" }, "west": { "uv": [ @@ -54,7 +57,7 @@ 16, 5.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s31" }, "up": { "uv": [ @@ -63,7 +66,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s23" }, "down": { "uv": [ @@ -72,7 +75,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s23" } } }, @@ -215,13 +218,13 @@ { "from": [ -10.0, - 0.0, - 14.0 + 0.35006000000000004, + 13.750060000000001 ], "to": [ -6.5, - 9.0, - 22.0 + 8.84994, + 22.24994 ], "faces": { "north": { @@ -229,7 +232,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -238,7 +241,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -246,26 +249,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -274,7 +277,7 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } @@ -283,13 +286,13 @@ { "from": [ 22.5, - 0.0, - 14.0 + 0.35006000000000004, + 13.750060000000001 ], "to": [ 26.0, - 9.0, - 22.0 + 8.84994, + 22.24994 ], "faces": { "north": { @@ -297,7 +300,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -306,7 +309,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -314,26 +317,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -342,22 +345,176 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } } }, + { + "from": [ + -9.97, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + -6.53, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -8.25, + 4.6, + 18.0 + ] + } + }, + { + "from": [ + 22.53, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + 25.97, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 24.25, + 4.6, + 18.0 + ] + } + }, { "from": [ -10.0, - 0.0, - 23.0 + 0.35006000000000004, + 22.75006 ], "to": [ -6.5, - 9.0, - 31.0 + 8.84994, + 31.24994 ], "faces": { "north": { @@ -365,7 +522,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -374,7 +531,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -382,26 +539,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -410,7 +567,7 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } @@ -419,13 +576,13 @@ { "from": [ 22.5, - 0.0, - 23.0 + 0.35006000000000004, + 22.75006 ], "to": [ 26.0, - 9.0, - 31.0 + 8.84994, + 31.24994 ], "faces": { "north": { @@ -433,7 +590,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -442,7 +599,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -450,26 +607,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -478,12 +635,166 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } } }, + { + "from": [ + -9.97, + 0.35006000000000004, + 22.75006 + ], + "to": [ + -6.53, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -8.25, + 4.6, + 27.0 + ] + } + }, + { + "from": [ + 22.53, + 0.35006000000000004, + 22.75006 + ], + "to": [ + 25.97, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 24.25, + 4.6, + 27.0 + ] + } + }, { "from": [ -9.0, diff --git a/airdef-mod/assets/airdef/models/block/patriot_trailer_burnt.json b/airdef-mod/assets/airdef/models/block/patriot_trailer_burnt.json new file mode 100644 index 0000000..2b9d852 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/patriot_trailer_burnt.json @@ -0,0 +1,867 @@ +{ + "ambientocclusion": false, + "textures": { + "nato_green_s21_b": "airdef:block/nato_green_s21_b", + "nato_green_s31_b": "airdef:block/nato_green_s31_b", + "nato_green_s23_b": "airdef:block/nato_green_s23_b", + "metal_b": "airdef:block/metal_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/nato_green_s21_b" + }, + "elements": [ + { + "from": [ + -7.0, + 6.0, + -16.0 + ], + "to": [ + 23.0, + 11.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#nato_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#nato_green_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#nato_green_s23_b" + } + } + }, + { + "from": [ + -1.0, + 11.0, + 14.0 + ], + "to": [ + 17.0, + 16.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -8.0, + 3.0, + -16.0 + ], + "to": [ + 24.0, + 7.0, + -12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -10.0, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + -6.5, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 22.5, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + 26.0, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -9.97, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + -6.53, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -8.25, + 4.6, + 18.0 + ] + } + }, + { + "from": [ + 22.53, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + 25.97, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 24.25, + 4.6, + 18.0 + ] + } + }, + { + "from": [ + -10.0, + 0.35006000000000004, + 22.75006 + ], + "to": [ + -6.5, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 22.5, + 0.35006000000000004, + 22.75006 + ], + "to": [ + 26.0, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.499879999999997 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -9.97, + 0.35006000000000004, + 22.75006 + ], + "to": [ + -6.53, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -8.25, + 4.6, + 27.0 + ] + } + }, + { + "from": [ + 22.53, + 0.35006000000000004, + 22.75006 + ], + "to": [ + 25.97, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 24.25, + 4.6, + 27.0 + ] + } + }, + { + "from": [ + -9.0, + 0.0, + -6.0 + ], + "to": [ + -7.0, + 6.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 2.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 2.0 + ], + "texture": "#metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/patriot_truck.json b/airdef-mod/assets/airdef/models/block/patriot_truck.json index 842c12b..b547e5b 100644 --- a/airdef-mod/assets/airdef/models/block/patriot_truck.json +++ b/airdef-mod/assets/airdef/models/block/patriot_truck.json @@ -1,12 +1,16 @@ { "ambientocclusion": false, "textures": { + "nato_green_s21": "airdef:block/nato_green_s21", + "nato_green_s31": "airdef:block/nato_green_s31", + "nato_green_s23": "airdef:block/nato_green_s23", "nato_green": "airdef:block/nato_green", - "glass": "airdef:block/glass", + "glass_cab": "airdef:block/glass_cab", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/nato_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/nato_green_s21" }, "elements": [ { @@ -28,7 +32,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -37,7 +41,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -46,7 +50,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s31" }, "west": { "uv": [ @@ -55,7 +59,7 @@ 16, 4.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s31" }, "up": { "uv": [ @@ -64,7 +68,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s23" }, "down": { "uv": [ @@ -73,7 +77,7 @@ 16, 16 ], - "texture": "#nato_green" + "texture": "#nato_green_s23" } } }, @@ -96,7 +100,7 @@ 16, 15.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -105,7 +109,7 @@ 16, 15.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -132,7 +136,7 @@ 16, 14.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "down": { "uv": [ @@ -141,7 +145,7 @@ 16, 14.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" } } }, @@ -164,7 +168,7 @@ 16, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -173,7 +177,7 @@ 16, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "east": { "uv": [ @@ -182,7 +186,7 @@ 1.0, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "west": { "uv": [ @@ -191,7 +195,7 @@ 1.0, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "up": { "uv": [ @@ -200,7 +204,7 @@ 16, 1.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "down": { "uv": [ @@ -209,7 +213,7 @@ 16, 1.0 ], - "texture": "#glass" + "texture": "#glass_cab" } } }, @@ -232,7 +236,7 @@ 0.25, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -241,7 +245,7 @@ 0.25, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "east": { "uv": [ @@ -250,7 +254,7 @@ 9.0, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "west": { "uv": [ @@ -259,7 +263,7 @@ 9.0, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "up": { "uv": [ @@ -268,7 +272,7 @@ 0.25, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "down": { "uv": [ @@ -277,7 +281,7 @@ 0.25, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" } } }, @@ -300,7 +304,7 @@ 0.25, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -309,7 +313,7 @@ 0.25, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "east": { "uv": [ @@ -318,7 +322,7 @@ 9.0, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "west": { "uv": [ @@ -327,7 +331,7 @@ 9.0, 7.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "up": { "uv": [ @@ -336,7 +340,7 @@ 0.25, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "down": { "uv": [ @@ -345,7 +349,7 @@ 0.25, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" } } }, @@ -368,7 +372,7 @@ 16, 6.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "south": { "uv": [ @@ -377,7 +381,7 @@ 16, 6.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "east": { "uv": [ @@ -404,7 +408,7 @@ 16, 14.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" }, "down": { "uv": [ @@ -413,7 +417,7 @@ 16, 14.0 ], - "texture": "#nato_green" + "texture": "#nato_green_s21" } } }, @@ -556,13 +560,13 @@ { "from": [ -9.0, - 0.0, - -12.0 + 0.35006000000000004, + -12.249939999999999 ], "to": [ -5.5, - 9.0, - -4.0 + 8.84994, + -3.7500600000000004 ], "faces": { "north": { @@ -570,7 +574,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -579,7 +583,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -587,26 +591,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -615,7 +619,7 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } @@ -624,13 +628,13 @@ { "from": [ 21.5, - 0.0, - -12.0 + 0.35006000000000004, + -12.249939999999999 ], "to": [ 25.0, - 9.0, - -4.0 + 8.84994, + -3.7500600000000004 ], "faces": { "north": { @@ -638,7 +642,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -647,7 +651,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -655,26 +659,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -683,22 +687,176 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.35006000000000004, + -12.249939999999999 + ], + "to": [ + -5.53, + 8.84994, + -3.7500600000000004 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.6, + -8.0 + ] + } + }, + { + "from": [ + 21.53, + 0.35006000000000004, + -12.249939999999999 + ], + "to": [ + 24.97, + 8.84994, + -3.7500600000000004 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.6, + -8.0 + ] + } + }, { "from": [ -9.0, - 0.0, - 14.0 + 0.35006000000000004, + 13.750060000000001 ], "to": [ -5.5, - 9.0, - 22.0 + 8.84994, + 22.24994 ], "faces": { "north": { @@ -706,7 +864,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -715,7 +873,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -723,26 +881,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -751,7 +909,7 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } @@ -760,13 +918,13 @@ { "from": [ 21.5, - 0.0, - 14.0 + 0.35006000000000004, + 13.750060000000001 ], "to": [ 25.0, - 9.0, - 22.0 + 8.84994, + 22.24994 ], "faces": { "north": { @@ -774,7 +932,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -783,7 +941,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -791,26 +949,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -819,22 +977,176 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + -5.53, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.6, + 18.0 + ] + } + }, + { + "from": [ + 21.53, + 0.35006000000000004, + 13.750060000000001 + ], + "to": [ + 24.97, + 8.84994, + 22.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.6, + 18.0 + ] + } + }, { "from": [ -9.0, - 0.0, - 23.0 + 0.35006000000000004, + 22.75006 ], "to": [ -5.5, - 9.0, - 31.0 + 8.84994, + 31.24994 ], "faces": { "north": { @@ -842,7 +1154,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -851,7 +1163,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -859,26 +1171,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -887,7 +1199,7 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } @@ -896,13 +1208,13 @@ { "from": [ 21.5, - 0.0, - 23.0 + 0.35006000000000004, + 22.75006 ], "to": [ 25.0, - 9.0, - 31.0 + 8.84994, + 31.24994 ], "faces": { "north": { @@ -910,7 +1222,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -919,7 +1231,7 @@ 0, 0, 3.5, - 9.0 + 8.499880000000001 ], "texture": "#tire" }, @@ -927,26 +1239,26 @@ "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 8.0, - 9.0 + 8.499879999999997, + 8.499880000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" }, @@ -955,11 +1267,165 @@ 0, 0, 3.5, - 8.0 + 8.499879999999997 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.35006000000000004, + 22.75006 + ], + "to": [ + -5.53, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.6, + 27.0 + ] + } + }, + { + "from": [ + 21.53, + 0.35006000000000004, + 22.75006 + ], + "to": [ + 24.97, + 8.84994, + 31.24994 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499880000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.499879999999997, + 8.499880000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.499879999999997 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.6, + 27.0 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/radar_trailer.json b/airdef-mod/assets/airdef/models/block/radar_trailer.json index a4ee3f6..926e353 100644 --- a/airdef-mod/assets/airdef/models/block/radar_trailer.json +++ b/airdef-mod/assets/airdef/models/block/radar_trailer.json @@ -1,10 +1,13 @@ { "ambientocclusion": false, "textures": { - "ru_khaki": "airdef:block/ru_khaki", + "ru_khaki_s21": "airdef:block/ru_khaki_s21", + "ru_khaki_s22": "airdef:block/ru_khaki_s22", "dark_metal": "airdef:block/dark_metal", + "ru_khaki": "airdef:block/ru_khaki", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_khaki" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_khaki_s21" }, "elements": [ { @@ -26,7 +29,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -35,7 +38,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -44,7 +47,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "west": { "uv": [ @@ -53,7 +56,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "up": { "uv": [ @@ -62,7 +65,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s22" }, "down": { "uv": [ @@ -71,7 +74,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s22" } } }, @@ -162,7 +165,7 @@ 16, 8.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -171,7 +174,7 @@ 16, 8.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -198,7 +201,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "down": { "uv": [ @@ -207,20 +210,20 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" } } }, { "from": [ -9.0, - 0.0, - -9.0 + 0.3424499999999995, + -9.65755 ], "to": [ -5.5, - 9.0, - -2.0 + 8.65755, + -1.3424499999999995 ], "faces": { "north": { @@ -228,7 +231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -237,7 +240,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -245,26 +248,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -273,7 +276,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -282,13 +285,13 @@ { "from": [ 21.5, - 0.0, - -9.0 + 0.3424499999999995, + -9.65755 ], "to": [ 25.0, - 9.0, - -2.0 + 8.65755, + -1.3424499999999995 ], "faces": { "north": { @@ -296,7 +299,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -305,7 +308,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -313,26 +316,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -341,22 +344,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -9.65755 + ], + "to": [ + -5.53, + 8.65755, + -1.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -5.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -9.65755 + ], + "to": [ + 24.97, + 8.65755, + -1.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -5.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 17.0 + 0.3424499999999995, + 16.34245 ], "to": [ -5.5, - 9.0, - 24.0 + 8.65755, + 24.65755 ], "faces": { "north": { @@ -364,7 +521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -373,7 +530,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -381,26 +538,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -409,7 +566,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -418,13 +575,13 @@ { "from": [ 21.5, - 0.0, - 17.0 + 0.3424499999999995, + 16.34245 ], "to": [ 25.0, - 9.0, - 24.0 + 8.65755, + 24.65755 ], "faces": { "north": { @@ -432,7 +589,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -441,7 +598,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -449,26 +606,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -477,11 +634,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 16.34245 + ], + "to": [ + -5.53, + 8.65755, + 24.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 20.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 16.34245 + ], + "to": [ + 24.97, + 8.65755, + 24.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 20.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/radar_truck.json b/airdef-mod/assets/airdef/models/block/radar_truck.json index be4f125..7e763a3 100644 --- a/airdef-mod/assets/airdef/models/block/radar_truck.json +++ b/airdef-mod/assets/airdef/models/block/radar_truck.json @@ -1,12 +1,16 @@ { "ambientocclusion": false, "textures": { + "ru_khaki_s21": "airdef:block/ru_khaki_s21", + "ru_khaki_s31": "airdef:block/ru_khaki_s31", + "ru_khaki_s23": "airdef:block/ru_khaki_s23", + "glass_cab": "airdef:block/glass_cab", "ru_khaki": "airdef:block/ru_khaki", - "glass": "airdef:block/glass", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_khaki" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_khaki_s21" }, "elements": [ { @@ -28,7 +32,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -37,7 +41,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -46,7 +50,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "west": { "uv": [ @@ -55,7 +59,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "up": { "uv": [ @@ -64,7 +68,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" }, "down": { "uv": [ @@ -73,7 +77,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" } } }, @@ -96,7 +100,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -164,7 +168,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -300,7 +304,7 @@ 16, 3.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -309,7 +313,7 @@ 16, 3.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -336,7 +340,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "down": { "uv": [ @@ -345,7 +349,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" } } }, @@ -556,13 +560,13 @@ { "from": [ -9.0, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ -5.5, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -570,7 +574,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -579,7 +583,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -587,26 +591,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -615,7 +619,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -624,13 +628,13 @@ { "from": [ 21.5, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ 25.0, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -638,7 +642,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -647,7 +651,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -655,26 +659,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -683,22 +687,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ -5.5, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -706,7 +864,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -715,7 +873,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -723,26 +881,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -751,7 +909,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -760,13 +918,13 @@ { "from": [ 21.5, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ 25.0, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -774,7 +932,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -783,7 +941,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -791,26 +949,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -819,22 +977,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ -5.5, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -842,7 +1154,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -851,7 +1163,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -859,26 +1171,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -887,7 +1199,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -896,13 +1208,13 @@ { "from": [ 21.5, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ 25.0, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -910,7 +1222,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -919,7 +1231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -927,26 +1239,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -955,22 +1267,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ -5.5, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -978,7 +1444,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -987,7 +1453,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -995,26 +1461,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1023,7 +1489,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -1032,13 +1498,13 @@ { "from": [ 21.5, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ 25.0, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -1046,7 +1512,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1055,7 +1521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1063,26 +1529,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1091,11 +1557,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/radar_truck_burnt.json b/airdef-mod/assets/airdef/models/block/radar_truck_burnt.json new file mode 100644 index 0000000..646f18f --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/radar_truck_burnt.json @@ -0,0 +1,1721 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_khaki_s21_b": "airdef:block/ru_khaki_s21_b", + "ru_khaki_s31_b": "airdef:block/ru_khaki_s31_b", + "ru_khaki_s23_b": "airdef:block/ru_khaki_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "ru_khaki_b": "airdef:block/ru_khaki_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/ru_khaki_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 10.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + } + } + }, + { + "from": [ + -6.0, + 10.0, + -16.0 + ], + "to": [ + 3.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + } + } + }, + { + "from": [ + 13.0, + 10.0, + -16.0 + ], + "to": [ + 22.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + } + } + }, + { + "from": [ + 3.0, + 10.0, + -16.0 + ], + "to": [ + 13.0, + 15.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -5.0, + 10.0, + -6.0 + ], + "to": [ + 21.0, + 13.0, + 4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + } + } + }, + { + "from": [ + -3.0, + 10.0, + 26.0 + ], + "to": [ + 19.0, + 14.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -8.0, + 0.0, + 28.0 + ], + "to": [ + -6.0, + 6.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + 22.0, + 0.0, + 28.0 + ], + "to": [ + 24.0, + 6.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.5, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 25.0, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.5, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 25.0, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.5, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 25.0, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/s400_chassis.json b/airdef-mod/assets/airdef/models/block/s400_chassis.json index 4db2d1e..dfb3714 100644 --- a/airdef-mod/assets/airdef/models/block/s400_chassis.json +++ b/airdef-mod/assets/airdef/models/block/s400_chassis.json @@ -1,12 +1,16 @@ { "ambientocclusion": false, "textures": { + "ru_green_s21": "airdef:block/ru_green_s21", + "ru_green_s31": "airdef:block/ru_green_s31", + "ru_green_s23": "airdef:block/ru_green_s23", + "glass_cab": "airdef:block/glass_cab", "ru_green": "airdef:block/ru_green", - "glass": "airdef:block/glass", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_green_s21" }, "elements": [ { @@ -28,7 +32,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -37,7 +41,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -46,7 +50,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "west": { "uv": [ @@ -55,7 +59,7 @@ 16, 5.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "up": { "uv": [ @@ -64,7 +68,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" }, "down": { "uv": [ @@ -73,7 +77,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" } } }, @@ -96,7 +100,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -164,7 +168,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -300,7 +304,7 @@ 16, 3.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -309,7 +313,7 @@ 16, 3.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -336,7 +340,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "down": { "uv": [ @@ -345,7 +349,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" } } }, @@ -556,13 +560,13 @@ { "from": [ -9.0, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ -5.5, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -570,7 +574,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -579,7 +583,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -587,26 +591,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -615,7 +619,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -624,13 +628,13 @@ { "from": [ 21.5, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ 25.0, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -638,7 +642,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -647,7 +651,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -655,26 +659,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -683,22 +687,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ -5.5, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -706,7 +864,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -715,7 +873,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -723,26 +881,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -751,7 +909,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -760,13 +918,13 @@ { "from": [ 21.5, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ 25.0, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -774,7 +932,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -783,7 +941,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -791,26 +949,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -819,22 +977,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ -5.5, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -842,7 +1154,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -851,7 +1163,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -859,26 +1171,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -887,7 +1199,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -896,13 +1208,13 @@ { "from": [ 21.5, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ 25.0, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -910,7 +1222,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -919,7 +1231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -927,26 +1239,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -955,22 +1267,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ -5.5, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -978,7 +1444,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -987,7 +1453,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -995,26 +1461,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1023,7 +1489,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -1032,13 +1498,13 @@ { "from": [ 21.5, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ 25.0, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -1046,7 +1512,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1055,7 +1521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1063,26 +1529,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1091,11 +1557,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/s400_chassis_burnt.json b/airdef-mod/assets/airdef/models/block/s400_chassis_burnt.json new file mode 100644 index 0000000..4898804 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/s400_chassis_burnt.json @@ -0,0 +1,1653 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_green_s21_b": "airdef:block/ru_green_s21_b", + "ru_green_s31_b": "airdef:block/ru_green_s31_b", + "ru_green_s23_b": "airdef:block/ru_green_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "ru_green_b": "airdef:block/ru_green_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/ru_green_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 10.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + } + } + }, + { + "from": [ + -6.0, + 10.0, + -16.0 + ], + "to": [ + 3.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + } + } + }, + { + "from": [ + 13.0, + 10.0, + -16.0 + ], + "to": [ + 22.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_green_b" + } + } + }, + { + "from": [ + 3.0, + 10.0, + -16.0 + ], + "to": [ + 13.0, + 15.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -5.0, + 10.0, + -6.0 + ], + "to": [ + 21.0, + 13.0, + 4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + } + } + }, + { + "from": [ + -3.0, + 10.0, + 26.0 + ], + "to": [ + 19.0, + 14.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 22.0, + 0.0, + 28.0 + ], + "to": [ + 24.0, + 6.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.5, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 25.0, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.5, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 25.0, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.5, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 25.0, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/s400_tubes.json b/airdef-mod/assets/airdef/models/block/s400_tubes.json index 1ed8ce3..b962ee8 100644 --- a/airdef-mod/assets/airdef/models/block/s400_tubes.json +++ b/airdef-mod/assets/airdef/models/block/s400_tubes.json @@ -1,10 +1,10 @@ { "ambientocclusion": false, "textures": { - "tube": "airdef:block/tube", "tube_cap": "airdef:block/tube_cap", + "tube": "airdef:block/tube", "dark_metal": "airdef:block/dark_metal", - "particle": "airdef:block/tube" + "particle": "airdef:block/tube_cap" }, "elements": [ { diff --git a/airdef-mod/assets/airdef/models/block/s400_tubes_burnt.json b/airdef-mod/assets/airdef/models/block/s400_tubes_burnt.json new file mode 100644 index 0000000..2bc876f --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/s400_tubes_burnt.json @@ -0,0 +1,419 @@ +{ + "ambientocclusion": false, + "textures": { + "tube_cap_b": "airdef:block/tube_cap_b", + "tube_b": "airdef:block/tube_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/tube_cap_b" + }, + "elements": [ + { + "from": [ + 0.5, + 0.0, + -16.0 + ], + "to": [ + 7.5, + 7.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 0.5, + 8.0, + -16.0 + ], + "to": [ + 7.5, + 15.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 8.5, + 0.0, + -16.0 + ], + "to": [ + 15.5, + 7.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 8.5, + 8.0, + -16.0 + ], + "to": [ + 15.5, + 15.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 7.0, + 7.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 7.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + -0.5, + 0.0, + 26.0 + ], + "to": [ + 16.5, + 15.0, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -0.5, + 0.0, + -2.0 + ], + "to": [ + 16.5, + 15.0, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 15.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/s500_chassis.json b/airdef-mod/assets/airdef/models/block/s500_chassis.json index be4f125..7e763a3 100644 --- a/airdef-mod/assets/airdef/models/block/s500_chassis.json +++ b/airdef-mod/assets/airdef/models/block/s500_chassis.json @@ -1,12 +1,16 @@ { "ambientocclusion": false, "textures": { + "ru_khaki_s21": "airdef:block/ru_khaki_s21", + "ru_khaki_s31": "airdef:block/ru_khaki_s31", + "ru_khaki_s23": "airdef:block/ru_khaki_s23", + "glass_cab": "airdef:block/glass_cab", "ru_khaki": "airdef:block/ru_khaki", - "glass": "airdef:block/glass", "dark_metal": "airdef:block/dark_metal", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_khaki" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_khaki_s21" }, "elements": [ { @@ -28,7 +32,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -37,7 +41,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -46,7 +50,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "west": { "uv": [ @@ -55,7 +59,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "up": { "uv": [ @@ -64,7 +68,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" }, "down": { "uv": [ @@ -73,7 +77,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" } } }, @@ -96,7 +100,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -164,7 +168,7 @@ 9.0, 9.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -300,7 +304,7 @@ 16, 3.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -309,7 +313,7 @@ 16, 3.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -336,7 +340,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "down": { "uv": [ @@ -345,7 +349,7 @@ 16, 10.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" } } }, @@ -556,13 +560,13 @@ { "from": [ -9.0, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ -5.5, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -570,7 +574,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -579,7 +583,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -587,26 +591,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -615,7 +619,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -624,13 +628,13 @@ { "from": [ 21.5, - 0.0, - -14.0 + 0.3424499999999995, + -14.65755 ], "to": [ 25.0, - 9.0, - -7.0 + 8.65755, + -6.3424499999999995 ], "faces": { "north": { @@ -638,7 +642,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -647,7 +651,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -655,26 +659,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -683,22 +687,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ -5.5, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -706,7 +864,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -715,7 +873,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -723,26 +881,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -751,7 +909,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -760,13 +918,13 @@ { "from": [ 21.5, - 0.0, - -5.0 + 0.3424499999999995, + -5.6575500000000005 ], "to": [ 25.0, - 9.0, - 2.0 + 8.65755, + 2.6575500000000005 ], "faces": { "north": { @@ -774,7 +932,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -783,7 +941,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -791,26 +949,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -819,22 +977,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ -5.5, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -842,7 +1154,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -851,7 +1163,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -859,26 +1171,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -887,7 +1199,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -896,13 +1208,13 @@ { "from": [ 21.5, - 0.0, - 13.0 + 0.3424499999999995, + 12.34245 ], "to": [ 25.0, - 9.0, - 20.0 + 8.65755, + 20.65755 ], "faces": { "north": { @@ -910,7 +1222,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -919,7 +1231,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -927,26 +1239,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -955,22 +1267,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ -5.5, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -978,7 +1444,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -987,7 +1453,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -995,26 +1461,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1023,7 +1489,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -1032,13 +1498,13 @@ { "from": [ 21.5, - 0.0, - 22.0 + 0.3424499999999995, + 21.34245 ], "to": [ 25.0, - 9.0, - 29.0 + 8.65755, + 29.65755 ], "faces": { "north": { @@ -1046,7 +1512,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1055,7 +1521,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1063,26 +1529,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1091,11 +1557,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/s500_chassis_burnt.json b/airdef-mod/assets/airdef/models/block/s500_chassis_burnt.json new file mode 100644 index 0000000..e4a06d5 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/s500_chassis_burnt.json @@ -0,0 +1,1653 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_khaki_s21_b": "airdef:block/ru_khaki_s21_b", + "ru_khaki_s31_b": "airdef:block/ru_khaki_s31_b", + "ru_khaki_s23_b": "airdef:block/ru_khaki_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "ru_khaki_b": "airdef:block/ru_khaki_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "metal_b": "airdef:block/metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/ru_khaki_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 10.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + } + } + }, + { + "from": [ + -6.0, + 10.0, + -16.0 + ], + "to": [ + 3.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + } + } + }, + { + "from": [ + 13.0, + 10.0, + -16.0 + ], + "to": [ + 22.0, + 19.0, + -7.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "east": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#ru_khaki_b" + } + } + }, + { + "from": [ + 3.0, + 10.0, + -16.0 + ], + "to": [ + 13.0, + 15.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 5.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -5.0, + 10.0, + -6.0 + ], + "to": [ + 21.0, + 13.0, + 4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 3.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_khaki_s21_b" + } + } + }, + { + "from": [ + -3.0, + 10.0, + 26.0 + ], + "to": [ + 19.0, + 14.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -8.0, + 0.0, + 28.0 + ], + "to": [ + -6.0, + 6.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 6.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 2.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.5, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 25.0, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -14.65755 + ], + "to": [ + -5.53, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -14.65755 + ], + "to": [ + 24.97, + 8.65755, + -6.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -10.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -5.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 2.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -1.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.5, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 25.0, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 12.34245 + ], + "to": [ + -5.53, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 12.34245 + ], + "to": [ + 24.97, + 8.65755, + 20.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 16.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.5, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 25.0, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 21.34245 + ], + "to": [ + -5.53, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 25.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 21.34245 + ], + "to": [ + 24.97, + 8.65755, + 29.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 25.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/s500_tubes.json b/airdef-mod/assets/airdef/models/block/s500_tubes.json index 964fbf5..f626dcd 100644 --- a/airdef-mod/assets/airdef/models/block/s500_tubes.json +++ b/airdef-mod/assets/airdef/models/block/s500_tubes.json @@ -1,10 +1,10 @@ { "ambientocclusion": false, "textures": { - "tube": "airdef:block/tube", "tube_cap": "airdef:block/tube_cap", + "tube": "airdef:block/tube", "dark_metal": "airdef:block/dark_metal", - "particle": "airdef:block/tube" + "particle": "airdef:block/tube_cap" }, "elements": [ { diff --git a/airdef-mod/assets/airdef/models/block/s500_tubes_burnt.json b/airdef-mod/assets/airdef/models/block/s500_tubes_burnt.json new file mode 100644 index 0000000..3208fab --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/s500_tubes_burnt.json @@ -0,0 +1,283 @@ +{ + "ambientocclusion": false, + "textures": { + "tube_cap_b": "airdef:block/tube_cap_b", + "tube_b": "airdef:block/tube_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/tube_cap_b" + }, + "elements": [ + { + "from": [ + -2.0, + 0.0, + -16.0 + ], + "to": [ + 7.5, + 9.5, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.5, + 9.5 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.5, + 9.5 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.5, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.5, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 8.5, + 0.0, + -16.0 + ], + "to": [ + 18.0, + 9.5, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.5, + 9.5 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.5, + 9.5 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.5, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.5, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + -3.0, + 0.0, + 26.0 + ], + "to": [ + 19.0, + 9.5, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -3.0, + 0.0, + -2.0 + ], + "to": [ + 19.0, + 9.5, + 0.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 9.5 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/searchlight_burnt.json b/airdef-mod/assets/airdef/models/block/searchlight_burnt.json new file mode 100644 index 0000000..0f29afc --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/searchlight_burnt.json @@ -0,0 +1,145 @@ +{ + "ambientocclusion": false, + "textures": { + "dark_metal_b": "airdef:block/dark_metal_b", + "particle": "airdef:block/dark_metal_b" + }, + "elements": [ + { + "from": [ + 2.0, + 0.0, + 2.0 + ], + "to": [ + 14.0, + 3.0, + 14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 12.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 12.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 12.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 12.0, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 12.0, + 12.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 6.0, + 3.0, + 6.0 + ], + "to": [ + 10.0, + 12.0, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 4.0 + ], + "texture": "#dark_metal_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/searchlight_head_burnt.json b/airdef-mod/assets/airdef/models/block/searchlight_head_burnt.json new file mode 100644 index 0000000..90b3557 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/searchlight_head_burnt.json @@ -0,0 +1,146 @@ +{ + "ambientocclusion": false, + "textures": { + "dark_metal_b": "airdef:block/dark_metal_b", + "lamp_b": "airdef:block/lamp_b", + "particle": "airdef:block/dark_metal_b" + }, + "elements": [ + { + "from": [ + 3.0, + 3.0, + -2.0 + ], + "to": [ + 13.0, + 13.0, + 14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + 3.5, + 3.5, + -2.5 + ], + "to": [ + 12.5, + 12.5, + -2.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#lamp_b" + }, + "south": { + "uv": [ + 0, + 0, + 9.0, + 9.0 + ], + "texture": "#lamp_b" + }, + "east": { + "uv": [ + 0, + 0, + 0.5, + 9.0 + ], + "texture": "#lamp_b" + }, + "west": { + "uv": [ + 0, + 0, + 0.5, + 9.0 + ], + "texture": "#lamp_b" + }, + "up": { + "uv": [ + 0, + 0, + 9.0, + 0.5 + ], + "texture": "#lamp_b" + }, + "down": { + "uv": [ + 0, + 0, + 9.0, + 0.5 + ], + "texture": "#lamp_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/tor_chassis.json b/airdef-mod/assets/airdef/models/block/tor_chassis.json index 9cfe4b9..768a715 100644 --- a/airdef-mod/assets/airdef/models/block/tor_chassis.json +++ b/airdef-mod/assets/airdef/models/block/tor_chassis.json @@ -1,10 +1,17 @@ { "ambientocclusion": false, "textures": { + "ru_khaki_s21": "airdef:block/ru_khaki_s21", + "ru_khaki_s31": "airdef:block/ru_khaki_s31", + "ru_khaki_s23": "airdef:block/ru_khaki_s23", "ru_khaki": "airdef:block/ru_khaki", "dark_metal": "airdef:block/dark_metal", + "bare_nozzle": "airdef:block/bare_nozzle", "track": "airdef:block/track", - "particle": "airdef:block/ru_khaki" + "track_side_s31": "airdef:block/track_side_s31", + "ru_khaki_s13": "airdef:block/ru_khaki_s13", + "bare_lamp": "airdef:block/bare_lamp", + "particle": "airdef:block/ru_khaki_s21" }, "elements": [ { @@ -26,7 +33,7 @@ 16, 11.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -35,7 +42,7 @@ 16, 11.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -44,7 +51,7 @@ 16, 11.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "west": { "uv": [ @@ -53,7 +60,7 @@ 16, 11.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "up": { "uv": [ @@ -62,7 +69,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" }, "down": { "uv": [ @@ -71,7 +78,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s23" } } }, @@ -94,7 +101,7 @@ 16, 6.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -103,7 +110,7 @@ 16, 6.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -130,7 +137,7 @@ 16, 2.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "down": { "uv": [ @@ -139,10 +146,87 @@ 16, 2.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" } } }, + { + "from": [ + -9.0, + 10.0, + -15.0 + ], + "to": [ + 25.0, + 14.0, + -12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s21" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s21" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_khaki" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_khaki" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21" + } + }, + "rotation": { + "angle": -22.5, + "axis": "x", + "origin": [ + 8.0, + 12.0, + -13.5 + ] + } + }, { "from": [ -8.0, @@ -211,6 +295,142 @@ } } }, + { + "from": [ + -5.0, + 15.2, + 24.0 + ], + "to": [ + 21.0, + 15.8, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + -1.0, + 15.0, + -10.0 + ], + "to": [ + 9.0, + 16.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal" + } + } + }, { "from": [ -14.0, @@ -248,7 +468,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "west": { "uv": [ @@ -257,7 +477,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "up": { "uv": [ @@ -316,7 +536,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "west": { "uv": [ @@ -325,7 +545,7 @@ 16, 9.0 ], - "texture": "#track" + "texture": "#track_side_s31" }, "up": { "uv": [ @@ -384,7 +604,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "west": { "uv": [ @@ -393,7 +613,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "up": { "uv": [ @@ -402,7 +622,7 @@ 4.5, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s13" }, "down": { "uv": [ @@ -411,7 +631,7 @@ 4.5, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s13" } } }, @@ -452,7 +672,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "west": { "uv": [ @@ -461,7 +681,7 @@ 16, 5.0 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s31" }, "up": { "uv": [ @@ -470,7 +690,7 @@ 4.5, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s13" }, "down": { "uv": [ @@ -479,7 +699,143 @@ 4.5, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s13" + } + } + }, + { + "from": [ + -4.0, + 11.0, + -16.0 + ], + "to": [ + -1.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" + } + } + }, + { + "from": [ + 17.0, + 11.0, + -16.0 + ], + "to": [ + 20.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp" } } } diff --git a/airdef-mod/assets/airdef/models/block/tor_chassis_burnt.json b/airdef-mod/assets/airdef/models/block/tor_chassis_burnt.json new file mode 100644 index 0000000..b609b71 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/tor_chassis_burnt.json @@ -0,0 +1,775 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_khaki_s21_b": "airdef:block/ru_khaki_s21_b", + "ru_khaki_s31_b": "airdef:block/ru_khaki_s31_b", + "ru_khaki_s23_b": "airdef:block/ru_khaki_s23_b", + "ru_khaki_b": "airdef:block/ru_khaki_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "bare_nozzle_b": "airdef:block/bare_nozzle_b", + "track_b": "airdef:block/track_b", + "track_side_s31_b": "airdef:block/track_side_s31_b", + "ru_khaki_s13_b": "airdef:block/ru_khaki_s13_b", + "bare_lamp_b": "airdef:block/bare_lamp_b", + "particle": "airdef:block/ru_khaki_s21_b" + }, + "elements": [ + { + "from": [ + -10.0, + 4.0, + -14.0 + ], + "to": [ + 26.0, + 15.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s23_b" + } + } + }, + { + "from": [ + -10.0, + 4.0, + -16.0 + ], + "to": [ + 26.0, + 10.0, + -14.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 2.0, + 6.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 2.0 + ], + "texture": "#ru_khaki_s21_b" + } + } + }, + { + "from": [ + -9.0, + 10.0, + -15.0 + ], + "to": [ + 25.0, + 14.0, + -12.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_khaki_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 4.0 + ], + "texture": "#ru_khaki_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#ru_khaki_s21_b" + } + }, + "rotation": { + "angle": -22.5, + "axis": "x", + "origin": [ + 8.0, + 12.0, + -13.5 + ] + } + }, + { + "from": [ + -8.0, + 15.0, + 22.0 + ], + "to": [ + 24.0, + 16.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -5.0, + 15.2, + 24.0 + ], + "to": [ + 21.0, + 15.8, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "east": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "west": { + "uv": [ + 0, + 0, + 7.0, + 0.6000000000000014 + ], + "texture": "#bare_nozzle_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 7.0 + ], + "texture": "#bare_nozzle_b" + } + } + }, + { + "from": [ + -1.0, + 15.0, + -10.0 + ], + "to": [ + 9.0, + 16.0, + -4.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 10.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 10.0, + 6.0 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -14.0, + 0.0, + -15.0 + ], + "to": [ + -10.0, + 9.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + } + } + }, + { + "from": [ + 26.0, + 0.0, + -15.0 + ], + "to": [ + 30.0, + 9.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 9.0 + ], + "texture": "#track_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 9.0 + ], + "texture": "#track_side_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 16 + ], + "texture": "#track_b" + } + } + }, + { + "from": [ + -14.5, + 5.0, + -15.0 + ], + "to": [ + -10.0, + 10.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_khaki_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_khaki_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_khaki_s13_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_khaki_s13_b" + } + } + }, + { + "from": [ + 26.0, + 5.0, + -15.0 + ], + "to": [ + 30.5, + 10.0, + 31.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_khaki_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.5, + 5.0 + ], + "texture": "#ru_khaki_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#ru_khaki_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_khaki_s13_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.5, + 16 + ], + "texture": "#ru_khaki_s13_b" + } + } + }, + { + "from": [ + 17.0, + 11.0, + -16.0 + ], + "to": [ + 20.0, + 13.0, + -15.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "east": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "west": { + "uv": [ + 0, + 0, + 1.0, + 2.0 + ], + "texture": "#bare_lamp_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 1.0 + ], + "texture": "#bare_lamp_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/tor_turret.json b/airdef-mod/assets/airdef/models/block/tor_turret.json index f73b657..c3bd5db 100644 --- a/airdef-mod/assets/airdef/models/block/tor_turret.json +++ b/airdef-mod/assets/airdef/models/block/tor_turret.json @@ -1,11 +1,12 @@ { "ambientocclusion": false, "textures": { - "ru_khaki": "airdef:block/ru_khaki", + "ru_khaki_s21": "airdef:block/ru_khaki_s21", + "ru_khaki_s22": "airdef:block/ru_khaki_s22", "radar_face": "airdef:block/radar_face", "dark_metal": "airdef:block/dark_metal", "tube_cap": "airdef:block/tube_cap", - "particle": "airdef:block/ru_khaki" + "particle": "airdef:block/ru_khaki_s21" }, "elements": [ { @@ -27,7 +28,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "south": { "uv": [ @@ -36,7 +37,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "east": { "uv": [ @@ -45,7 +46,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "west": { "uv": [ @@ -54,7 +55,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s21" }, "up": { "uv": [ @@ -63,7 +64,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s22" }, "down": { "uv": [ @@ -72,7 +73,7 @@ 16, 16 ], - "texture": "#ru_khaki" + "texture": "#ru_khaki_s22" } } }, diff --git a/airdef-mod/assets/airdef/models/block/tor_turret_burnt.json b/airdef-mod/assets/airdef/models/block/tor_turret_burnt.json new file mode 100644 index 0000000..0f681c4 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/tor_turret_burnt.json @@ -0,0 +1,625 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_khaki_s21_b": "airdef:block/ru_khaki_s21_b", + "ru_khaki_s22_b": "airdef:block/ru_khaki_s22_b", + "radar_face_b": "airdef:block/radar_face_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "tube_cap_b": "airdef:block/tube_cap_b", + "particle": "airdef:block/ru_khaki_s21_b" + }, + "elements": [ + { + "from": [ + -4.0, + 0.0, + -6.0 + ], + "to": [ + 20.0, + 16.0, + 22.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s21_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s21_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s22_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_khaki_s22_b" + } + } + }, + { + "from": [ + -2.0, + 2.0, + -11.0 + ], + "to": [ + 18.0, + 15.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#radar_face_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 13.0 + ], + "texture": "#radar_face_b" + }, + "east": { + "uv": [ + 0, + 0, + 5.0, + 13.0 + ], + "texture": "#radar_face_b" + }, + "west": { + "uv": [ + 0, + 0, + 5.0, + 13.0 + ], + "texture": "#radar_face_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#radar_face_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 5.0 + ], + "texture": "#radar_face_b" + } + } + }, + { + "from": [ + -3.0, + 16.0, + 2.0 + ], + "to": [ + 19.0, + 17.0, + 20.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 1.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -1.0, + 16.5, + 4.0 + ], + "to": [ + 3.0, + 17.5, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + } + } + }, + { + "from": [ + -1.0, + 16.5, + 12.0 + ], + "to": [ + 3.0, + 17.5, + 18.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + } + } + }, + { + "from": [ + 4.0, + 16.5, + 4.0 + ], + "to": [ + 8.0, + 17.5, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + } + } + }, + { + "from": [ + 4.0, + 16.5, + 12.0 + ], + "to": [ + 8.0, + 17.5, + 18.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + } + } + }, + { + "from": [ + 9.0, + 16.5, + 4.0 + ], + "to": [ + 13.0, + 17.5, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + } + } + }, + { + "from": [ + 14.0, + 16.5, + 4.0 + ], + "to": [ + 18.0, + 17.5, + 10.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 4.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 1.0 + ], + "texture": "#tube_cap_b" + }, + "up": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "down": { + "uv": [ + 0, + 0, + 4.0, + 6.0 + ], + "texture": "#tube_cap_b" + } + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/tzm_truck.json b/airdef-mod/assets/airdef/models/block/tzm_truck.json index 44db33e..b911c51 100644 --- a/airdef-mod/assets/airdef/models/block/tzm_truck.json +++ b/airdef-mod/assets/airdef/models/block/tzm_truck.json @@ -1,14 +1,18 @@ { "ambientocclusion": false, "textures": { + "ru_green_s21": "airdef:block/ru_green_s21", + "ru_green_s31": "airdef:block/ru_green_s31", + "ru_green_s23": "airdef:block/ru_green_s23", + "glass_cab": "airdef:block/glass_cab", "ru_green": "airdef:block/ru_green", - "glass": "airdef:block/glass", "dark_metal": "airdef:block/dark_metal", - "tube": "airdef:block/tube", "tube_cap": "airdef:block/tube_cap", + "tube": "airdef:block/tube", "metal": "airdef:block/metal", "tire": "airdef:block/tire", - "particle": "airdef:block/ru_green" + "hub": "airdef:block/hub", + "particle": "airdef:block/ru_green_s21" }, "elements": [ { @@ -30,7 +34,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "south": { "uv": [ @@ -39,7 +43,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -48,7 +52,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "west": { "uv": [ @@ -57,7 +61,7 @@ 16, 4.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s31" }, "up": { "uv": [ @@ -66,7 +70,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" }, "down": { "uv": [ @@ -75,7 +79,7 @@ 16, 16 ], - "texture": "#ru_green" + "texture": "#ru_green_s23" } } }, @@ -98,7 +102,7 @@ 16, 11.0 ], - "texture": "#glass" + "texture": "#glass_cab" }, "south": { "uv": [ @@ -107,7 +111,7 @@ 16, 11.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "east": { "uv": [ @@ -134,7 +138,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" }, "down": { "uv": [ @@ -143,7 +147,7 @@ 16, 10.0 ], - "texture": "#ru_green" + "texture": "#ru_green_s21" } } }, @@ -558,13 +562,13 @@ { "from": [ -9.0, - 0.0, - -12.0 + 0.3424499999999995, + -12.65755 ], "to": [ -5.5, - 9.0, - -5.0 + 8.65755, + -4.3424499999999995 ], "faces": { "north": { @@ -572,7 +576,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -581,7 +585,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -589,26 +593,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -617,7 +621,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -626,13 +630,13 @@ { "from": [ 21.5, - 0.0, - -12.0 + 0.3424499999999995, + -12.65755 ], "to": [ 25.0, - 9.0, - -5.0 + 8.65755, + -4.3424499999999995 ], "faces": { "north": { @@ -640,7 +644,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -649,7 +653,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -657,26 +661,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -685,22 +689,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -12.65755 + ], + "to": [ + -5.53, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -8.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -12.65755 + ], + "to": [ + 24.97, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -8.5 + ] + } + }, { "from": [ -9.0, - 0.0, - -3.0 + 0.3424499999999995, + -3.6575500000000005 ], "to": [ -5.5, - 9.0, - 4.0 + 8.65755, + 4.6575500000000005 ], "faces": { "north": { @@ -708,7 +866,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -717,7 +875,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -725,26 +883,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -753,7 +911,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -762,13 +920,13 @@ { "from": [ 21.5, - 0.0, - -3.0 + 0.3424499999999995, + -3.6575500000000005 ], "to": [ 25.0, - 9.0, - 4.0 + 8.65755, + 4.6575500000000005 ], "faces": { "north": { @@ -776,7 +934,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -785,7 +943,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -793,26 +951,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -821,22 +979,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 0.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 0.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 16.0 + 0.3424499999999995, + 15.34245 ], "to": [ -5.5, - 9.0, - 23.0 + 8.65755, + 23.65755 ], "faces": { "north": { @@ -844,7 +1156,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -853,7 +1165,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -861,26 +1173,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -889,7 +1201,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -898,13 +1210,13 @@ { "from": [ 21.5, - 0.0, - 16.0 + 0.3424499999999995, + 15.34245 ], "to": [ 25.0, - 9.0, - 23.0 + 8.65755, + 23.65755 ], "faces": { "north": { @@ -912,7 +1224,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -921,7 +1233,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -929,26 +1241,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -957,22 +1269,176 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } }, + { + "from": [ + -8.97, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.53, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 24.97, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 19.5 + ] + } + }, { "from": [ -9.0, - 0.0, - 24.0 + 0.3424499999999995, + 23.34245 ], "to": [ -5.5, - 9.0, - 31.0 + 8.65755, + 31.65755 ], "faces": { "north": { @@ -980,7 +1446,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -989,7 +1455,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -997,26 +1463,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1025,7 +1491,7 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } @@ -1034,13 +1500,13 @@ { "from": [ 21.5, - 0.0, - 24.0 + 0.3424499999999995, + 23.34245 ], "to": [ 25.0, - 9.0, - 31.0 + 8.65755, + 31.65755 ], "faces": { "north": { @@ -1048,7 +1514,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1057,7 +1523,7 @@ 0, 0, 3.5, - 9.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1065,26 +1531,26 @@ "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "west": { "uv": [ 0, 0, - 7.0, - 9.0 + 8.315100000000001, + 8.315100000000001 ], - "texture": "#tire" + "texture": "#hub" }, "up": { "uv": [ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" }, @@ -1093,11 +1559,165 @@ 0, 0, 3.5, - 7.0 + 8.315100000000001 ], "texture": "#tire" } } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.53, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 27.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 24.97, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 27.5 + ] + } } ] } \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/tzm_truck_burnt.json b/airdef-mod/assets/airdef/models/block/tzm_truck_burnt.json new file mode 100644 index 0000000..cc6cb33 --- /dev/null +++ b/airdef-mod/assets/airdef/models/block/tzm_truck_burnt.json @@ -0,0 +1,1723 @@ +{ + "ambientocclusion": false, + "textures": { + "ru_green_s21_b": "airdef:block/ru_green_s21_b", + "ru_green_s31_b": "airdef:block/ru_green_s31_b", + "ru_green_s23_b": "airdef:block/ru_green_s23_b", + "glass_cab_b": "airdef:block/glass_cab_b", + "ru_green_b": "airdef:block/ru_green_b", + "dark_metal_b": "airdef:block/dark_metal_b", + "tube_cap_b": "airdef:block/tube_cap_b", + "tube_b": "airdef:block/tube_b", + "metal_b": "airdef:block/metal_b", + "tire_b": "airdef:block/tire_b", + "hub_b": "airdef:block/hub_b", + "particle": "airdef:block/ru_green_s21_b" + }, + "elements": [ + { + "from": [ + -6.0, + 5.0, + -16.0 + ], + "to": [ + 22.0, + 9.0, + 32.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s31_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.0 + ], + "texture": "#ru_green_s31_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#ru_green_s23_b" + } + } + }, + { + "from": [ + -6.0, + 9.0, + -16.0 + ], + "to": [ + 22.0, + 20.0, + -6.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#glass_cab_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 11.0 + ], + "texture": "#ru_green_s21_b" + }, + "east": { + "uv": [ + 0, + 0, + 10.0, + 11.0 + ], + "texture": "#ru_green_b" + }, + "west": { + "uv": [ + 0, + 0, + 10.0, + 11.0 + ], + "texture": "#ru_green_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 10.0 + ], + "texture": "#ru_green_s21_b" + } + } + }, + { + "from": [ + -4.0, + 9.0, + -2.0 + ], + "to": [ + 20.0, + 12.0, + 30.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 3.0 + ], + "texture": "#dark_metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#dark_metal_b" + } + } + }, + { + "from": [ + -3.0, + 12.0, + -1.0 + ], + "to": [ + 3.0, + 18.0, + 29.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 6.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 6.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 6.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 5.0, + 12.0, + -1.0 + ], + "to": [ + 11.0, + 18.0, + 29.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 6.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 6.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 6.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 13.0, + 12.0, + -1.0 + ], + "to": [ + 19.0, + 18.0, + 29.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "south": { + "uv": [ + 0, + 0, + 6.0, + 6.0 + ], + "texture": "#tube_cap_b" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#tube_b" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 6.0 + ], + "texture": "#tube_b" + }, + "up": { + "uv": [ + 0, + 0, + 6.0, + 16 + ], + "texture": "#tube_b" + }, + "down": { + "uv": [ + 0, + 0, + 6.0, + 16 + ], + "texture": "#tube_b" + } + } + }, + { + "from": [ + 18.0, + 12.0, + -4.0 + ], + "to": [ + 21.0, + 26.0, + -1.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0, + 14.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.0, + 14.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 14.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 14.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + 6.0, + 24.0, + -4.0 + ], + "to": [ + 21.0, + 26.0, + -1.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 15.0, + 2.0 + ], + "texture": "#metal_b" + }, + "south": { + "uv": [ + 0, + 0, + 15.0, + 2.0 + ], + "texture": "#metal_b" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#metal_b" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.0 + ], + "texture": "#metal_b" + }, + "up": { + "uv": [ + 0, + 0, + 15.0, + 3.0 + ], + "texture": "#metal_b" + }, + "down": { + "uv": [ + 0, + 0, + 15.0, + 3.0 + ], + "texture": "#metal_b" + } + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -12.65755 + ], + "to": [ + -5.5, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -12.65755 + ], + "to": [ + 25.0, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -12.65755 + ], + "to": [ + -5.53, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + -8.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -12.65755 + ], + "to": [ + 24.97, + 8.65755, + -4.3424499999999995 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + -8.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + -5.5, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + 25.0, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + -5.53, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 0.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + -3.6575500000000005 + ], + "to": [ + 24.97, + 8.65755, + 4.6575500000000005 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 0.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.5, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 25.0, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 15.34245 + ], + "to": [ + -5.53, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 15.34245 + ], + "to": [ + 24.97, + 8.65755, + 23.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 19.5 + ] + } + }, + { + "from": [ + -9.0, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.5, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + 21.5, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 25.0, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.5, + 8.315100000000001 + ], + "texture": "#tire_b" + } + } + }, + { + "from": [ + -8.97, + 0.3424499999999995, + 23.34245 + ], + "to": [ + -5.53, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4400000000000004, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + -7.25, + 4.5, + 27.5 + ] + } + }, + { + "from": [ + 21.53, + 0.3424499999999995, + 23.34245 + ], + "to": [ + 24.97, + 8.65755, + 31.65755 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "south": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "east": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "west": { + "uv": [ + 0, + 0, + 8.315100000000001, + 8.315100000000001 + ], + "texture": "#hub_b" + }, + "up": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + }, + "down": { + "uv": [ + 0, + 0, + 3.4399999999999977, + 8.315100000000001 + ], + "texture": "#tire_b" + } + }, + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 23.25, + 4.5, + 27.5 + ] + } + } + ] +} \ No newline at end of file diff --git a/airdef-mod/assets/airdef/models/block/zircon.json b/airdef-mod/assets/airdef/models/block/zircon.json index 7fe2b57..970c1ed 100644 --- a/airdef-mod/assets/airdef/models/block/zircon.json +++ b/airdef-mod/assets/airdef/models/block/zircon.json @@ -1,22 +1,23 @@ { "ambientocclusion": false, "textures": { + "rm_dark": "airdef:block/rm_dark", + "rm_dark_t": "airdef:block/rm_dark_t", + "bare_nozzle": "airdef:block/bare_nozzle", "dark_metal": "airdef:block/dark_metal", - "kh101": "airdef:block/kh101", - "intake": "airdef:block/intake", - "nozzle": "airdef:block/nozzle", - "particle": "airdef:block/dark_metal" + "glow_ember": "airdef:block/glow_ember", + "particle": "airdef:block/rm_dark" }, "elements": [ { "from": [ - 7.25, - 7.3125, + 7.078979616509515, + 7.078979616509515, -16.0 ], "to": [ - 8.75, - 8.6875, + 8.921020383490486, + 8.921020383490486, -13.5 ], "faces": { @@ -24,67 +25,144 @@ "uv": [ 0, 0, - 1.5, - 1.375 + 1.842040766980971, + 1.842040766980971 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 1.5, - 1.375 + 1.842040766980971, + 1.842040766980971 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.5, - 1.375 + 1.842040766980971 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.5, - 1.375 + 1.842040766980971 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 1.5, + 1.842040766980971, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 1.5, + 1.842040766980971, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" } } }, { "from": [ - 6.75, - 6.9375, + 7.078979616509515, + 7.078979616509515, + -15.97 + ], + "to": [ + 8.921020383490486, + 8.921020383490486, + -13.53 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 1.842040766980971, + 1.842040766980971 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 1.842040766980971, + 1.842040766980971 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.4400000000000013, + 1.842040766980971 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.4400000000000013, + 1.842040766980971 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 1.842040766980971, + 2.4400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 1.842040766980971, + 2.4400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -14.75 + ] + } + }, + { + "from": [ + 6.499582134683867, + 6.499582134683867, -13.5 ], "to": [ - 9.25, - 9.0625, + 9.500417865316132, + 9.500417865316132, -11.0 ], "faces": { @@ -92,67 +170,144 @@ "uv": [ 0, 0, - 2.5, - 2.125 + 3.0008357306322653, + 3.0008357306322653 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 2.5, - 2.125 + 3.0008357306322653, + 3.0008357306322653 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.5, - 2.125 + 3.0008357306322653 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.5, - 2.125 + 3.0008357306322653 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 2.5, + 3.0008357306322653, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 2.5, + 3.0008357306322653, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" } } }, { "from": [ - 6.25, - 6.5625, + 6.499582134683867, + 6.499582134683867, + -13.47 + ], + "to": [ + 9.500417865316132, + 9.500417865316132, + -11.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.0008357306322653, + 3.0008357306322653 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 3.0008357306322653, + 3.0008357306322653 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.4400000000000013, + 3.0008357306322653 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.4400000000000013, + 3.0008357306322653 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 3.0008357306322653, + 2.4400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.0008357306322653, + 2.4400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -12.25 + ] + } + }, + { + "from": [ + 6.064846632053114, + 6.064846632053114, -11.0 ], "to": [ - 9.75, - 9.4375, + 9.935153367946887, + 9.935153367946887, -8.5 ], "faces": { @@ -160,67 +315,144 @@ "uv": [ 0, 0, - 3.5, - 2.875 + 3.870306735893773, + 3.870306735893773 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 3.5, - 2.875 + 3.870306735893773, + 3.870306735893773 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.5, - 2.875 + 3.870306735893773 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.5, - 2.875 + 3.870306735893773 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 3.5, + 3.870306735893773, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 3.5, + 3.870306735893773, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" } } }, { "from": [ - 5.75, - 6.1875, + 6.064846632053114, + 6.064846632053114, + -10.97 + ], + "to": [ + 9.935153367946887, + 9.935153367946887, + -8.53 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.870306735893773, + 3.870306735893773 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 3.870306735893773, + 3.870306735893773 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.4400000000000013, + 3.870306735893773 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.4400000000000013, + 3.870306735893773 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 3.870306735893773, + 2.4400000000000013 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 3.870306735893773, + 2.4400000000000013 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -9.75 + ] + } + }, + { + "from": [ + 5.698683940868628, + 5.698683940868628, -8.5 ], "to": [ - 10.25, - 9.8125, + 10.301316059131372, + 10.301316059131372, -6.0 ], "faces": { @@ -228,135 +460,289 @@ "uv": [ 0, 0, - 4.5, - 3.625 + 4.602632118262743, + 4.602632118262743 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 4.5, - 3.625 + 4.602632118262743, + 4.602632118262743 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 2.5, - 3.625 + 4.602632118262743 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 2.5, - 3.625 + 4.602632118262743 ], - "texture": "#dark_metal" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 4.5, + 4.602632118262743, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 4.5, + 4.602632118262743, 2.5 ], - "texture": "#dark_metal" + "texture": "#rm_dark_t" } } }, { "from": [ - 5.5, - 6.0, + 5.698683940868628, + 5.698683940868628, + -8.47 + ], + "to": [ + 10.301316059131372, + 10.301316059131372, + -6.03 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.602632118262743, + 4.602632118262743 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 4.602632118262743, + 4.602632118262743 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 2.4400000000000004, + 4.602632118262743 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 2.4400000000000004, + 4.602632118262743 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 4.602632118262743, + 2.4400000000000004 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.602632118262743, + 2.4400000000000004 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + -7.25 + ] + } + }, + { + "from": [ + 5.59786, + 5.59786, -6.0 ], "to": [ - 10.5, - 10.0, - 30.0 + 10.40214, + 10.40214, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 5.0, - 4.0 + 4.804279999999999, + 4.804279999999999 ], - "texture": "#kh101" + "texture": "#rm_dark" }, "south": { "uv": [ 0, 0, - 5.0, - 4.0 + 4.804279999999999, + 4.804279999999999 ], - "texture": "#kh101" + "texture": "#rm_dark" }, "east": { "uv": [ 0, 0, 16, - 4.0 + 4.804279999999999 ], - "texture": "#kh101" + "texture": "#rm_dark" }, "west": { "uv": [ 0, 0, 16, - 4.0 + 4.804279999999999 ], - "texture": "#kh101" + "texture": "#rm_dark" }, "up": { "uv": [ 0, 0, - 5.0, + 4.804279999999999, 16 ], - "texture": "#kh101" + "texture": "#rm_dark_t" }, "down": { "uv": [ 0, 0, - 5.0, + 4.804279999999999, 16 ], - "texture": "#kh101" + "texture": "#rm_dark_t" } } }, { "from": [ - 6.0, - 3.5, + 5.59786, + 5.59786, + -5.97 + ], + "to": [ + 10.40214, + 10.40214, + 27.97 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4.804279999999999, + 4.804279999999999 + ], + "texture": "#rm_dark" + }, + "south": { + "uv": [ + 0, + 0, + 4.804279999999999, + 4.804279999999999 + ], + "texture": "#rm_dark" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 4.804279999999999 + ], + "texture": "#rm_dark" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4.804279999999999 + ], + "texture": "#rm_dark" + }, + "up": { + "uv": [ + 0, + 0, + 4.804279999999999, + 16 + ], + "texture": "#rm_dark_t" + }, + "down": { + "uv": [ + 0, + 0, + 4.804279999999999, + 16 + ], + "texture": "#rm_dark_t" + } + }, + "rotation": { + "angle": 45, + "axis": "z", + "origin": [ + 8.0, + 8.0, + 11.0 + ] + } + }, + { + "from": [ + 6.2, + 3.4, 0.0 ], "to": [ - 10.0, - 6.0, + 9.8, + 5.2, 24.0 ], "faces": { @@ -364,327 +750,735 @@ "uv": [ 0, 0, - 4.0, - 2.5 + 3.6000000000000005, + 1.8000000000000003 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "south": { "uv": [ 0, 0, - 4.0, - 2.5 + 3.6000000000000005, + 1.8000000000000003 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "east": { "uv": [ 0, 0, 16, - 2.5 + 1.8000000000000003 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "west": { "uv": [ 0, 0, 16, - 2.5 + 1.8000000000000003 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "up": { "uv": [ 0, 0, - 4.0, + 3.6000000000000005, 16 ], - "texture": "#intake" + "texture": "#bare_nozzle" }, "down": { "uv": [ 0, 0, - 4.0, + 3.6000000000000005, 16 ], - "texture": "#intake" + "texture": "#bare_nozzle" } } }, { "from": [ - 5.5, - 6.0, - 30.0 - ], - "to": [ - 10.5, - 10.0, - 32.0 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 5.0, - 4.0 - ], - "texture": "#nozzle" - }, - "south": { - "uv": [ - 0, - 0, - 5.0, - 4.0 - ], - "texture": "#nozzle" - }, - "east": { - "uv": [ - 0, - 0, - 2.0, - 4.0 - ], - "texture": "#nozzle" - }, - "west": { - "uv": [ - 0, - 0, - 2.0, - 4.0 - ], - "texture": "#nozzle" - }, - "up": { - "uv": [ - 0, - 0, - 5.0, - 2.0 - ], - "texture": "#nozzle" - }, - "down": { - "uv": [ - 0, - 0, - 5.0, - 2.0 - ], - "texture": "#nozzle" - } - } - }, - { - "from": [ - 1.0, - 7.6, + 10.34, + 7.65, 22.0 ], "to": [ - 5.5, - 8.4, - 30.0 + 13.365, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "south": { "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "east": { "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "west": { "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "up": { "uv": [ 0, 0, - 4.5, - 8.0 + 3.0250000000000004, + 6.0 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "down": { "uv": [ 0, 0, - 4.5, - 8.0 + 3.0250000000000004, + 6.0 ], - "texture": "#kh101" + "texture": "#dark_metal" } } }, { "from": [ - 10.5, - 7.6, + 2.635, + 7.65, 22.0 ], "to": [ - 15.0, - 8.4, - 30.0 + 5.66, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "south": { "uv": [ 0, 0, - 4.5, - 0.8000000000000007 + 3.0250000000000004, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "east": { "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "west": { "uv": [ 0, 0, - 8.0, - 0.8000000000000007 + 6.0, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "up": { "uv": [ 0, 0, - 4.5, - 8.0 + 3.0250000000000004, + 6.0 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "down": { "uv": [ 0, 0, - 4.5, - 8.0 + 3.0250000000000004, + 6.0 ], - "texture": "#kh101" + "texture": "#dark_metal" } } }, { "from": [ - 7.6, - 10.0, - 22.0 + 13.365, + 7.65, + 25.0 ], "to": [ - 8.4, - 14.0, - 30.0 + 15.84, + 8.35, + 28.0 ], "faces": { "north": { "uv": [ 0, 0, - 0.8000000000000007, - 4.0 + 2.4749999999999996, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "south": { "uv": [ 0, 0, - 0.8000000000000007, - 4.0 + 2.4749999999999996, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "east": { "uv": [ 0, 0, - 8.0, - 4.0 + 3.0, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "west": { "uv": [ 0, 0, - 8.0, - 4.0 + 3.0, + 0.6999999999999993 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "up": { "uv": [ 0, 0, - 0.8000000000000007, - 8.0 + 2.4749999999999996, + 3.0 ], - "texture": "#kh101" + "texture": "#dark_metal" }, "down": { "uv": [ 0, 0, - 0.8000000000000007, - 8.0 + 2.4749999999999996, + 3.0 ], - "texture": "#kh101" + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 0.16000000000000014, + 7.65, + 25.0 + ], + "to": [ + 2.635, + 8.35, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.4749999999999996, + 0.6999999999999993 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 2.4749999999999996, + 0.6999999999999993 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 0.6999999999999993 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 2.4749999999999996, + 3.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 2.4749999999999996, + 3.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 7.65, + 10.34, + 22.0 + ], + "to": [ + 8.35, + 13.365, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 6.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 6.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 7.65, + 13.365, + 25.0 + ], + "to": [ + 8.35, + 15.84, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 7.65, + 2.635, + 22.0 + ], + "to": [ + 8.35, + 5.66, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 6.0, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 6.0, + 3.0250000000000004 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 6.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 6.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 7.65, + 0.16000000000000014, + 25.0 + ], + "to": [ + 8.35, + 2.635, + 28.0 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "south": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "east": { + "uv": [ + 0, + 0, + 3.0, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "west": { + "uv": [ + 0, + 0, + 3.0, + 2.4749999999999996 + ], + "texture": "#dark_metal" + }, + "up": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#dark_metal" + }, + "down": { + "uv": [ + 0, + 0, + 0.6999999999999993, + 3.0 + ], + "texture": "#dark_metal" + } + } + }, + { + "from": [ + 6.08, + 6.08, + 28.0 + ], + "to": [ + 9.92, + 9.92, + 29.6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 3.84, + 3.84 + ], + "texture": "#bare_nozzle" + }, + "south": { + "uv": [ + 0, + 0, + 3.84, + 3.84 + ], + "texture": "#bare_nozzle" + }, + "east": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 3.84 + ], + "texture": "#bare_nozzle" + }, + "west": { + "uv": [ + 0, + 0, + 1.6000000000000014, + 3.84 + ], + "texture": "#bare_nozzle" + }, + "up": { + "uv": [ + 0, + 0, + 3.84, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + }, + "down": { + "uv": [ + 0, + 0, + 3.84, + 1.6000000000000014 + ], + "texture": "#bare_nozzle" + } + } + }, + { + "from": [ + 6.68, + 6.68, + 29.6 + ], + "to": [ + 9.32, + 9.32, + 29.9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2.6400000000000006, + 2.6400000000000006 + ], + "texture": "#glow_ember" + }, + "south": { + "uv": [ + 0, + 0, + 2.6400000000000006, + 2.6400000000000006 + ], + "texture": "#glow_ember" + }, + "east": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 2.6400000000000006 + ], + "texture": "#glow_ember" + }, + "west": { + "uv": [ + 0, + 0, + 0.29999999999999716, + 2.6400000000000006 + ], + "texture": "#glow_ember" + }, + "up": { + "uv": [ + 0, + 0, + 2.6400000000000006, + 0.29999999999999716 + ], + "texture": "#glow_ember" + }, + "down": { + "uv": [ + 0, + 0, + 2.6400000000000006, + 0.29999999999999716 + ], + "texture": "#glow_ember" } } } diff --git a/airdef-mod/assets/airdef/textures/block/bare_antenna.png b/airdef-mod/assets/airdef/textures/block/bare_antenna.png new file mode 100644 index 0000000000000000000000000000000000000000..6a359a225665c46fc37856a1f4a3e510833d2fba GIT binary patch literal 986 zcmV<0110>4P)3j7 zG)yLw;dnd_<2VjKKR?6G%}t%p!acw4G%JxF%S|Wx2(leyhUN&`~AMjU~P#fco>2A_xBBY3&S%E;d{o;oohM7 ze4cm>vef_t5>Gy$40Ny${0o2k76U4 zFT^XJ;Nl;t+uf3G0*6wNF*J zLh`19kXxurC!C3cG02!LeYBbn*wdFV2Esj6ZYB}zIyJ{5fDnKTaAQ1VMDroXJmI4J zOD5*?`9*SJKpJJ^xLa_~56LN`=I?flFqemihvD<{^Xh@bLWCliT=0d(2T)%@7{WRy zXt5BKPN&m`Kwnx2`S|#_;BMvi8Uh4hb@~zh{QTSua#Eq}>FH_MY&I>K ztenJl$z|^4<>e2N6_UXi3>8H!NS zUqnq{CMnMYwGqUTdXPn+;d1ReET&cGOi$O2KP1#>_gq2dlmh=-xi`jp8VcZZ5Ha67 zT^ogTVdz=g|7E$4aTr)0A0Pi*G+Y_^PoVJ+ zL5{RU()|yn^daTjvZ=Z5rC$51xDO~FOvK&a<2ep+b+_W^FbX7g%_Y;TAE2VfSqG#} zE>{gXWrih8=9hLJpbUl1V93Hhluoq%H_f*q*7`u|uXZu;Ki-v0q|VocTmS$707*qo IM6N<$f>a~d;Q#;t literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/bare_barrel.png b/airdef-mod/assets/airdef/textures/block/bare_barrel.png new file mode 100644 index 0000000000000000000000000000000000000000..7f7a99abce9f841cdbab7bd0d8113c26b2de031f GIT binary patch literal 1000 zcmV>P)cqs|p2oRu0G2xEy%J6!JRAqhJojSegC&8l>hYH8I=JXjndd9p`y!f1@ZfbQLIR9pqf#^II}#0a<5tgEZ5!T9+2IK0Ks zguUX%o@XK3N=XYP-I9X5(0EYr@$oUhd3JU-a*ML;8;sdE7zr`*0pBRU-$*uEv5B>u zPz-WOo4o_5?h9_c&>gjI2*Sy!8;sv=+-kMji%9k!9v=Gp_4W1GcQbP3c%n9H)&#up z`E zb#6VsZ*Fe(Jjw6f-CgHrv=R|JL`3tQMn)uAEhw#Et01E)5RNCQ4$9Bzv!|9vB$yq& z3aDGRUY8Yv$hVxFamXkvbpfl69%q~%cZi-$pbh_yTkaWLbHX*HICo?3p>2@7(N0qosh)jQ}|B5JG6z4!F58NNYHqZoWU2d0fh;e8@fz%g2z8 zy7729aDyMqqQJbaI|oZ&VBTbVk@n_t6>oO<fBl=;1NTE)o?kGGFy*6JD3S}Bmexs~y9FcX(WiFr-tKv|Y5 zXlBy7sqyg6S`y&L-?rhL!`)SdBq}B2>CTC=$TnpTV1x7#F5g5v_{{2goIA|sYIgfZ z!5-XRle_GBcxS!!k7(I6SAstS2~Y7m+RP17I*KJ-ZykL%fd7Qb~hO@Yw_JlQ@LOzrphpJOzQ-orccIlqr8 z>aA}lK9FPOH0-#3aC8Q(aW84IJa(hevt0Qa)qlSI=qgOK0s>9mZKM( zMyKsjQ_}qKD+P%dM#rOuwwL=2henqU!mxR8iV*s(0EPEToX4sqigc^PcV7(gbmufN zpp-?l7Ux3cHOMwr`?7xfZ-c#4hOdSng`r>l`EiOH<33)0I8z8LJWLRm!NB+3wdlD3 ze%U=s-#&Hb-ui`PwXGv{y1i4rRT=T8OkvLjVW^{{@gb3fPN^aEcw1xo$@YoRYEEc$ z9@m^R%yIxs$QBr-6CTm|OXqyd(}4GJE_k)3V=O=0ox*z!9m!~NdDq<(fR^c(7Ynh1 zWm?m&&~UQ{hSoNwdLd5!#sH0X&aFu%!D>L{3S3So7&}hiA1ACLWgE0?@D8gkobl zor&Z%aTBXX`lf;Rky+4sAapV5Wl0^ScV3*wB;z{7Qkm+v1LmnZ>K>B~1i^r(yJxaz zwH}g1)vir6cPeu(fGg_hGMUCV$7_`kla|MqqWV#T@fZo50LscNm|;b z+3h@UMNa(*D3fPKyC>(32_waArv2J@h@B57od&>Wv_{$s0aaN_=k#7uGH^6kCl<>9 z@T^X~UJq4OrSNL&K%3XhWcP1fk$no$majG@Et{G@klB?{AGcPA7*qx3F@nq?Jukg_ z!AqQy*i6m0WJU`y0QbMXEQb!g#`^krC`@1M%~CRBI%ab#a1{j}-d+<^lijtIO1dh$ zQ~2xjsVl=+zD;1CPnDK=0xZ-~WDq=kI0$3!Rt4GNROnSa|%P z4>#nFfWP1D%ih+T{j4^$5oGk84l2Hz$o%?9 zp(Za8`*2DJ(L%!T6_e3Sv9?&9u>GyK``tc28;jdNzuHk|N5?>2iNjoFCZ)Ii7 zus=5}JubFti4h3+jOo=(y zQ5!Myf@TV{zOOG=BA8DY=Kn$#EYT6jHlt@V&GNDO!C@N9d!aie^V|}?#aA0UnoZWx z88oB{6im?xnyjc;_Ra2K&&Tol<5Wob?h4WV&2xD_V3*oI*+qj`Zm=<956~&q+V888 z*!LH>)K~hy4z*w4xE7;;L)vn4mRt&2z_d0E+0jVjk&EnDDb?h1Pi7LTaBvnd85F45 g;zii_Z`xq`4>fDdl%Q?4SpWb407*qoM6N<$f=w~=O#lD@ literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/bare_dish.png b/airdef-mod/assets/airdef/textures/block/bare_dish.png new file mode 100644 index 0000000000000000000000000000000000000000..d91157596164a442dc15961106745350799c7843 GIT binary patch literal 995 zcmV<9104K`P)UP_%?cS<#R)7B9?ptfq=jZ3N zTCJvx{eIt{ndg^ze(Uvm%vsO-<>lqXI5|0)Jmz_x9v>g4udlD^;NW1K&DiaBQ_F!Y z9v>fffqBP}Y{;QJ`NllY7@g<)`+FChvnXI+MjW*4{IV8@8Xvq!6e1+^2*}(AGxBsa zP@3;}oTt4<7qZux;8EW393^;>frmL5?=c#Pyv`5UDzrJ@A;<=Y6Hn@4LWxq|dBPDC z!7HNYh;pvWG{LYCue15=>}(iN37GNv`Z|<4#5l0oY<@t9obHHmWdZB*{_^rNEYCg+ zz+gPf84L&SJk1wJ34b2Iia>ip^H$xybDCe#9c`F?(W zzA(&robmSdHonK;%xj%6F(Et=Z&;5I76|A4{r$o?!bw(;J**+iX^lZwS64qAX%Xg3 zAPe&I#uO|=ka2i;IE;3Ia@uB%Y<}fMqgiF zFXYyGkP_X~Fq`lmp;!vrBN*)R?o>i>&N8w$3hW%R3~}qJpjz$F8JeS`qeXQ?SoQ`A zN3s?j6L(-wAzGK}Wnxi4oPvJmEYSde)_@CcxLS?~?7k~ge&9!lfCZc*CFV_J_1%rY!H3HnN)KFy2 zJhD9YFYiz*r>7(I&R1}SaBjbhd`t6TJ@?9i zZEK6{$+^@L3>$5H`(5D(t*aG`22Y4;G9k#o#Y7zhKZ4IN#C>OdeS6G~@Lv2pDRb#NL>ObOk{S-pw RZz2Ey002ovPDHLkV1mq8-mm}w literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/bare_lamp.png b/airdef-mod/assets/airdef/textures/block/bare_lamp.png new file mode 100644 index 0000000000000000000000000000000000000000..4e68dffb399ae3b1a335deaa528a21b7878b8661 GIT binary patch literal 1261 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 V^*gh&FS-B#002ovPDHLkV1g>=;Pe0h literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/bare_nozzle_b.png b/airdef-mod/assets/airdef/textures/block/bare_nozzle_b.png new file mode 100644 index 0000000000000000000000000000000000000000..354ea9ef1abb83d355a32bff56023d81a8db7d45 GIT binary patch literal 1487 zcmV;=1u*)FP)3iQh?7CZL0|0~&;NW2Gw;u<9_CJ0+isP@3rz{uHlrLL_%JX(h-@tsnkWuG& znAY<;6Xl6Ulm5nv$0r@3CAS8v7|$wE=F2RqP%SE+U*09C4y3FdA##p|%lz;hg|rb% zd}9po&hZ-EF5a1EV<+(bBxXb2Bcf39r0L|mLJR!)>W~jPzh1z5RdDHsEUW9~q9&(3 z=aacq?)IP^P4jd(gEI~YBC1R>9WT7N(Te>y1bdE{p&*Dx*hM5ML|?ZDo!lnE0hi(B zoktz2{~7Y_*Ll1%!%ifA-G?_2F@#z^2=;!5Yz(ZHrm$#Uez{9 zD9B$FdvhaVR}mFzI_B~IF~iRXdWRwiGjra#xR=a%IU(R?zlHm|pII+@(^ws9&>ula z_of@sLw(}H>v^38Ea2j13mY7^15Os10?IRl+K^2yV-V8o*K5g4=4r%un!B{I5~tpNoe9*; zN7;a0>n#a()ap7@;Mx8x`nUxZJ6KIGbg;0R$9286$x!s%>a=6DGiCE|ZLOq(ZNLs+ z{?4y!<8hPhyBVrQK39~6#`6?YI2lm@l3O&)mKJ8WMbM14lyS*hNbdc(LaSAvcZSB~ zzAGy!j8pqK1$H``+yYRNr&wT#JE~Hq5qow{gfyjY*3A1)hKp}tlD^-~)3@91Zt-f# zQccL8kAz5pn7Mp&-7{x+T$zpK9+Iy$Unz^C;M+;1qIfTnkJ9Reb>*vbct2jKQf6n# zBQg09f|@f@f-;$A(k{(+bHh`DBC2>+4k!vQHGz}Fly8%7OdLr{WMWYVOAwYG~PI-|C6L(4GRKX)q2re$+<`JG(h-FVR`xpGhG zZ+5W%Ws<;kA(;%o`;#h~mk{4xmF&s&fH;Bqo-8o(<;6;F&wTFQwQVf73+n}jnL_8+ zJi91!4FPYCB{*>a`)<$=H+s#KK<%#saV1hNM#yhOGHSnE6(wGO9^>-4byTPSvLq?7 z))J1KN+HedpGn%GBzxy>WOZRxr4>P;Gxut@R~o83eshF7SGu^evk|K&X1P`#rFU5M zGD?wfHYG30eivA?1M(t7lBar#%FJf-7=X;5lXn2cY6sQn#6m3=R7Gi{WE2bF5Xiec zULI93p%C0J4j1f-^c1c@;py?>j!wquU3x0nW&F{r1KET3ad`aU6dz7%XqDDzv=^`Q z1xl)1sJ%E8$nXBp0}cPM(siodb&-0P}mH9_ zl(bvM*uj-eB48}V>CpWd%g~zI$dL? p^S(L$;;3T6@&5K3(`rZO@E<_!K50_v+))4k002ovPDHLkV1jM5;kf_+ literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/booster_b.png b/airdef-mod/assets/airdef/textures/block/booster_b.png new file mode 100644 index 0000000000000000000000000000000000000000..e39ad4eca35c05176902210631e57024e7c5bdab GIT binary patch literal 432 zcmV;h0Z;ykP)2e4tBYcT3lZHuEr=77i0zY23@;dMN!%vXMGR(=zGltpD7CIPUsOnSrH(lH>l{ZuR-(I72tN; zpNbQ{h9rk)WNp{o*H0w?`~WwK#7My|K0R<~#urxN&Eq>-eB1t+zpFLRrso5q zbWFzk^s(Lzjjn@`dfZLb0TVsEm~@v-@ZcW&1-3)w?+?Qa_s^e2vWjA{-XS4~*00H+ a-24MZ7OE37vtwxh0000pLLP)np;e1y}})A0TM9b$~3X`0Y=U6Il6!^6X{TrN$X zcePrDqobp+-ENC6zei7O+t!Rqp~j=pC{$HtW4&i*XSPve$<%di8&RTpIknkrY_A^4 zX%9MOlre_&TXrgWsRcIZ)x#!5r3k*hz6=4$-QC@V`}_NX8hg+I0+N?g`m(N9PRMC< z;^gFH&oE;-AVGZ>i-kcvolZ^W^Yb$tA0OM;qopyAev<-F!vP-6SL9PaFf1WO-A@m> zl=q;tUau`mBG#PtjK^d9YL9gLnxf96H+sl5d3kwR;L+S>^bBZ63x_gcK--JZe52dL*kgePu(h) zj3siMk3N?ai-ew^pL2Vrh_w0T<;9dqx!;4+9$KwEJUo=ZaK!Q+>K6ud6J>>)*!deuLDqM$xRL}I(XEDy#!sR?!wncCB%L@ii~=kvKu zUR+#+_xJZAfFiw8GMml9WHQ-<6h%19!&n3+B9feuPE{3h!%juVkkfH@m2gRTi zcw;abMyPP2Ll$MU6+ys)I4b8U%=IeOk`WUrczt~>3@2d_@keXF^|Y7V_Ro6X1&nWQ zZuVH#*pY}~G1$(-2((%U5vrWllPoCUP`@r7A0KV)tI+{AOGP-$Fqf*#d<}CEH8RY@ zf+&|B&Ix}{fVBE_4LX%?At{sq2S*<+(nXDUk^xDL|6{}*QhKI8PYNwZPbes$qV@P| zmgjyiPY~1udDr*+{Jc2pk8Bw?w1J1yikHfT+kuY)gL*kX=nm?H)aXpXAobzfxq^!Q zMZc{qhl0%Wxnvd4yYKo z{oz%LzRr0GT?kE^iVV0khhS5uBJ4sJrjuz{d@hPn6#9-Rcgk&w9`tasAkftA#r=-Ms}Vv45T)ukS|87J8DZMzGh8m9Sj$i<9Q)9mNY-&j*bt+|!z zA<=AF&&b&RRN)*>$m);34}y?q*eb@vVu^hAFAIs+Gh9K3j5;APrRG5{6>4hR@pxo< z%D&!p4~J9dv>{5NUcp8Gs@Mvb4^-`K*wwn@r+lW|>!PyDNc?+cPt~qA%qTUYdH(lE z>Bgo7p?vFAo~*j#&@Ld#SyRh!ZPDvON**O=r)3JFv3!-+zI062 zAu2M?Yzj{WR{l%QF#q-Ncj|(+3nP(9=KY&rbW_d{t1vC{lzTa$wa}#Xbol6?N<}I8 zYO~&?A}d+Xt>Wf(+pXn{F3?(&Q}M^|e%8}d;mh;f9mipJ4+tlR$MZbz>?D&l@HcK* z7JH+h*8|Rd-z|v_L9&2l#fBsSfT&}Y;K_slQHDN+#MnO*NOw^bW(C9&T-UX+1qYtQ z;i*;C1qvbD3DsQgYUVwKzVH7W)lYs#-*w&pdjRM+Kkq?%ux*=B=A(hq&l!fn-jRqD zNu~#$3&Ch65dCFY+J7}wdYJ&hDqy=2W3&J*5n0D^w1(-ZqJqFNIm4q-OQ99T@}?vj zD>4YgR#jyTO@gY6>O9ZJq-mO)1wQ0yrC|vpYog|_O%rVral}Ln=^3)|e*yGs@<4Q^ R*WdsE002ovPDHLkV1joBrcM9= diff --git a/airdef-mod/assets/airdef/textures/block/canister_b.png b/airdef-mod/assets/airdef/textures/block/canister_b.png new file mode 100644 index 0000000000000000000000000000000000000000..afb4e1d2f4dda09589445deb9baa9ceae6565190 GIT binary patch literal 1594 zcmV-A2F3Y_P)Fr6t`4LDmtH9R!xJ>;0e$KnJfflJ&e3#+iiV}2Bf+;09HxP9L`ErIT zZE_9>ruF5uak1W>X)eYN56?0h?~5hl@d)$zyr}fmW?R-hdbg;`=8T+jSy%qrIT;9T z8~A2*RNZs7h~l26fpZRhjA%jwuN$Qld5*^ZC0WmZoWq^1F`gbr#6?2(nb$RXpm)AT zP2(NdHJJ|W2k!6GdAWp#6*o)t%Av>addNP;u zyDYd7FlPL4)iB^N>tycHVb8Ir>~T#E0m;+~IOCs8_F|vALe*G)OdN zouy>PWK_XgLLFrdhlsoylS*g!;tI|c-P8%vC57yCd1s2yYqE$omJn0|*&K_dO;Z)M z!wny=-$y<=5XsPZ$^;`qB-|}J(NdC_H|`cS#W7 z?63!^%42U5*dhrCM+eS(wZc51*+%~;rP%WhvxS7=XkLF6W#ClY+aS*KoSqC$%Yuwl zycZLtqNbJ^u2;ec{f5Js@9|N@{zl*z1mLG9J>Y@eRpAi|QBDarFA_NO(!PPoL4g%Q zwUPm+DHL6g#y2cea^EdqfBRroIfNit;T&aw$MGU#W9;$ly~q#29SpCJ$&bVO;+z(k zh@3UvN-8^Jhl6=4DQW3gP@m`^F>Lz+u+j$jHehRwWX5=S*yHfST&VcjNfJx7+8M5B zJ&}-wo-f|v-b7-*a{+iTqwtYMnkcl@V6Qi)371wpF03{ctN?Coui^NGFt3-b9Y*b_ zxRCAS&3HFe!r|VA0Z%0FUGhR;Ib+c!PO-&8w2-w$^`&b`9Pi-Gb(~^OT+G?9gnG&4 zk7;?okCEO}s)@VJU0ekRyih>P1ZMAr8@$wXS|qXD;g%qC2t-)662=5hwKULGqT-ii z=|{P5`CkWlwOSxX0&aJAJ4+o9aGBQ*&T1C)F)^@0>v3~k$p>xp@`RywoQ6p<{@RHHfX$m8Y*G+ZUM z{y0VOTPi5Va&S1HXOi=dEvLEBs1+_K0JAcoK+zt84dGD88siiuJ<^0pNU-Bgf7+Op zK;|pQ(UV6c-$yI0Y@l(LH9}`%MONh`g$=k}NA)9@eWZZtsV*Z>e5WgFP6NC?6&fzk zQC7TjZM~$={TI}%WG=G?exujnAk0OVBr9}2X5p5Sir;@RT`t}L{#q>4?44^DrJfHE z{mUOG#kE7=8C5U3o`Fr)wxdw-HRv;>ANY?!^h%S|7)iUd+?aC%lM}wVzM(l^D>1$A zI{kLgbyu2H_LP0~IV%r*It;-yM}mWRsOEQfCwzbR`h?$Gy*KMpOxT|^_--p;`kBY} z$cm7mPPFp}*52!QOSN26Q92pmr zO;6iE5PjpW?ULGF7etzzP!JO0h{T~kpufL8_W}}^mR402J0$ViVbRQbH?bomo)xxOZ2*j-PysKId@lQL03eq5bAn$Km)RD5-d8?4ffc^d!=tTb8FgG z7TXv=R7QyK9d)UPj9XSTL7mEj2g zpL94vSr%b<{hpHqm89&$_Puu-G8>_g-oU-XUO&sPrFw=_5(H|!00000NkvXXu0mjf DQES(I literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/concrete_b.png b/airdef-mod/assets/airdef/textures/block/concrete_b.png new file mode 100644 index 0000000000000000000000000000000000000000..9653a0f4944bb0b8f0970698b30c27c859cd8119 GIT binary patch literal 492 zcmVs`N@ zdGF0cK7BmNcxPRFKH#2Gn(nT@|KT1Xz@n<&OrWaMK5j?E5V2TzOcV%m-jNUh^Jicj z$Ju)@*v={WUHrBJM4Z|~uQ04w!CjEp`#GP?vtg`woYxf*#Gn|{md`0?g06pbQxb(@ zo6~fTUd3R5ieTI(1XU)CB3Rd!%mPY89`P^)gb-+IyzdoNG+l{QG>E&9GcvgrH>j!@M+~xYbzgiI*j|-sF5FXL65_o@uI=pj13eBJ*s87@N)qdk z-#2YT?fd&J!}u>TW|sW+*M?f{({}^i9|pf8hAnoyNwOQg`MF{ByWfwju%o+LwNOzs iO literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/crate_b.png b/airdef-mod/assets/airdef/textures/block/crate_b.png new file mode 100644 index 0000000000000000000000000000000000000000..6c52930a4b27bbc88e10b2cb132a7e18098ee789 GIT binary patch literal 461 zcmV;;0W$uHP)2GgxG{MR0aufq) zc4{;Jx2*&(Uloq_Ezk4HLDzfu@CuN(kG_Xd$>73y>~)e@e#dA^AbG{h;+w>9a=4HraYNeTE zS{&F6_oHI@6dW9??^$#tYi-U|AId^+cobz7`hf^L+ z3sq4fOMq4&`1WS#5h=cQk&871; zbcvoO^Q8+!J_0YEpaM!A-EOKsfB*EG&88e2 z9F(r>%67XgP1BUNZOhl!S2;U7i+P^9u48^So9)b1RaN@FFAVm6e}9KQbgfpaa(a4N z9PDSUdz!bmxAS7)5*sWrWV~`Cwzbw>q9_Ns&NbiyJO%149km%Mp^Vq9JrV`R&I8{a(m^XB+ z<+q{Mn7{?BA=V({o3(-(ofy!8#t`vlGcum#aye}hpx)tC-fv-I)aaNRJ4AWt)M(CQ z&YMQ90rS2u%Y}%SyfKzR899MP1Pr}l%T>yAd3iZ0x6k$3VpN_v1YMEiu`UFS?DqC{ zib&0$+{>bM!|UtoL_8SaL9qpCcuk#qiGo0LT3GY+^fZB~EfziE8v}uEEEE(O6+M+y z1fgLKnNFi*LApjq>iq?Jfl&<_9YCqn8Zc^n6I#1PPO-BxiD?fT4NR4hI#37|!-mjk zHe^9&z`UXL-*nJL==jY>Ly-}V-1`oY!vRofo_83Dg>E;I`&hyCT{WnwoA zS?_cGAfuBqfgzs`uQH)a>{i8`Qzi`5P?3i;654oO}+(@&x+ixw%vZW2qNDb91#JpW9Hd#=Ti){ zhB6bBYcmTPAwlNW+mB>$3q8u?;(V^(-`_{E$p^nF+8_H7#6k9YLD`RFb8&I8)0>8t zIXD}6refFL+}s4X{oeN5-|z45!6o~E`F(wTT^f&Ab0h0Xqxm|PuVv5A&yx`Va_95j zFnKp#S}f{(keS-rA6~^gFyeQ*o{3r@Uaw3W!0+zvrmnEx9j?v#B4YUz<9&8|Iu&Hs z?Glgx^6%V+c%)%l*!|nh_rwpjZ#RCg$`a+4!K-kRUyAGtY*x2`7*}{PHraU}6l*7fMfTluL z%244Ek*;i@aMDB_1n@4_wq0L33X$m5Y_3W@t4q^vhumPO<>29h*)-FgFb*7)u$ld( zM6pF)J3Jdfjs}}CnyiZ_B1KVBgqv8uSS-r=YhC)TFAZq=whvTQ|HJoDT!gPr{}*;` z>9;L?7m3NUh@$ zD#5hvHWUsX4&a%H=oRRBJM14U?9zBYeAnbH3Mx*l;U;VN0~`?`1*0c;5x3v5nqBKb z6#v@wCFE5#bk{&+b)?FB0P=V*m#dvyaHdmowpxA0LM|NxD2nRm-XISQQL9EG8%jnU m>-F#t3G%THOVYI-aRX;j!!h0000x6{6m$ksH?cL38g zSqQ^x7~w$0KswYF`YpznLXuj^{ZaafG;xy;P=eYeNs;l}Ir>N-gh2Smnk zbZ3Nj$aD{ERaN=p<#KU!In49?{=_0Wv`DxI9B||_Q6QwCG@K;_cNPHx2q^_QfJn%s zg8=|Ef(?NH5D|DS>}AkrG!Y5JD;=X1Md3i$AY@@r{(TPa_xqpr$Tkdv7X={=RbFRR zysm546qj0fx9s&vt>TP9-H_(3>pH)y8`LiFkmtESuw)d=XZ0bVpxDc@d=8ZuNC6`e zpcRq2z`KSFFb$alke37}&42*7144^A1MnU)HqAVrIpaX#G@0nnh#(|lQv3yFu;5dY2W?%jpFE|_Co>orctkb; zhWYr-7?z_?S2<)^hAZoxh74UfSZOf8iP&$x7{NQX2>(t>R6fJ$yu^9|RF#V=nFklI z+9Z!FYXzJO1_Ibw?clHDX)wT;NNj8^nAWRF$XUuHTu?8XQlBnbtp(Dk@T^Zm;Cgwa-rG^4*9LWmyVtf>Ht_@#bU{2!s(z?Ksuz z`G<*JAQO5I0C3+z!{2=U*4a){hY3JFaed!B&ny#?2Yz^RD8e-ZRB5tDzc~cq8^yfCwWGO8S4lWG zHu`Kpv`Ayb%nn(e3tE%dX>1A6@zemjcClCl&xj#aRq?*aOgznX!y_kxi&m@&&r{{>F_KVsszE6da9NzPD2J`9Ui5vN~(~6;bs&B-hVo7AdKRh*$g*_McjV)RvJ{Q zCChB=5qiYE-BGNF##kiw5P!Zr!tV9}lX(^6N9nfz_#gnsH{+OS;}|<Df&=~ODBtZz~rmiwz;-*Kdv+ zq4;b$V=tv8Se2iPqPAiMo}t=O2?k6;Pi<3L3$V4mgcoD!Uh=yqh}WtbTpt@w+V>Ng za?ob)pllIZ)ZMVgTs_IQmlhBmN?2JClxn5yi6>6^dVNd06m(oIb>%wKy$|y|5+J}?lVwYyNQxRP$%@_XII$h4;!0P4NLPRBPyMU9-03)plXl0B z2aOgrP_iXCl*D-eF>t~RynD~owf4n>=}uKY7V3e(!@cM1vxl|UURV9~fBkyaTElw} zV+>MCnB9%2QjM$&I4J!6`D;Ks+uskw*tHJvAnO%h#=2%SgF|bs3fm>TI41n%oKS z&cX0s$oSijZy_SVX}iDij=^RskG0(z{k;W7cXv<*hYz#vd7j&yBJ8#Y0M^0ctM>wp;`k$M*wuhRO+l_s&J=!XiWq zg&NQWvI&^+HEtKBY>2Or6p%6^G*q&vkbo4BVe#PZ7KTQ9x2x2T(t0;UtPiruN_D79?2#gdujwp zm58)KY{O)OXcOkfhUK37UhaAF4kkxvTBLI#OD%&?T3DkIf`!r<*(ek$BS+wG-?=V} zo@+M-NI4=#3+FYU0!*p7R%nxC^SmanzqGiHg**4LvT`5RS}ZO|c zd*~2!%=pU}4&pD*9z*gP-#;~roJ%+x0F{BLpt6CbcUK9A9v#Bc(kfiZ)fm+Bu?*(} zRG?=m%nT3gpFHo)`^`;_Vs>^2Vm&fMFvnX<5o3d%c2Y!6*6A_ zlN0-KUKEAoix3lRVGv@*!s2~A@%W>-@aYA_I-_L*vMQhukhR8kPdB>mZ=onN-h0pn z+8dZ19m9jQ9W38$L#K?8B9e7z>44fN-1y=?=8yMCj&QNS^~L+hJXF(0I~uf{g>6?z zwg6%qx0mi>d~~o$=usQloY4x&27~~(mPhagA!!ue!q!Q$vr+*`dl;Y5qT{3pV>5E7 zQOR`z-uT%CZ0yvybAJoNYg?G!1x^n3;!IZ$p6hGj)Ib;P^<_NWKLp##@YWz`))|H0 zuD4OFZh&s(BRwhrmB#Jct58PcnP(prZ&gSz!J}eGsf1TwdJ-us#AFe4X zn4+S!h}r{=xh-Kfcued@sQ><-Pi4#GtrAjQ;_hG}uJP_KuOcQ5%@cAKrVhwCA~*|V zg)#;B1UfyU(&Em_XC!Ex`RX7J3=Jal1}ed13nTSCN(KirxlSldOExKGDmFFTh$)y? z81D(6ZtNiCgjDUKYj6PDJ2h0cxcP7Q;G)9hqkXWp#Hs#n*;u74KDze+npY|niYnsS zks+j1NkaD(9mSz&dBkL(zWePHneLyWksIF)6^j*my1VyXdGY20WNm=Nf@fIEnyk#2 zqT!T+$t+J=PGWkr#87`fVw;NxGD9e4D8tj^y;#zCQoIvQqL6aNojPL5mNcn^!<}|p z+?v-wO6cqD#m4q7EO_5YXW+##RXVvAn0C0HY@k&p4#G<1G3hM6T;7Bd?}^CbAsWXg zdSR=seni9uq^N{J)h`~v1@NRNhkLQM!UYF}STLi((*2pwl$8V(Qijq2I$Jz{VhoGh z>lhpAgRTdV4Gj}vV8MivUBFt=+Q%Mz_3wJDw=CwXN({{~EQ~_6(}va=F)7sBTj=TQ zM^SV)Ac@Hd8b|vbbTmkrHIN(R8)I7`IfXeDBnjSn5TT+2xSpuQYp>l4uxoXNmWtR4 zT#SY#YAYh+2_Y$LxT1m z3}RJB*sNe&LKU{bb<+?mQ#A7Vw{IXRFWzUA!gH@4#nfg+cnS}LzHW!x_coy;!=#4W ziP)-Z7{kLzD3gLIdQoswbxTSj_rNs}{`zy+V0bjJSxf1vp`fFMc7(M+%oZL5p0=#>NH)2b;{zb>6wV26&6f znISALJix?MFD9Y_+Cb?dZg(}k$&?SsKI6yl-{5LlgrRakBK9#AEH}#!^1btY2f*;g zotGoN)(N3vcrcGS=z?gVjf@g0(RfJ!)%B{z+U7PM)$AxVl4D9QaIeSUou6NUHZ`JU z8Zi>LK5G;zLg|QGx7TrKZUhq>9(CTu>Ojwa|G*ayh_C6X(LHFLFmrH7zSr9U*#<;b zC({yRZQk3)U{5dp`t-aUUQii2cqFCa2+1FAg!r1;dl!_%=421U2bRGU0PPTR669qx zPpTwBg3%Tx1ibyzPZ3yElE&{gwy`wO!cwaX_xqd1=#_6DL(WaoQXwH*2b)<#7% zr%FsbIU&`7i^yzKmmbK1A3nVozHu0y@yE~kh}r@#zxE`Ko|we=STDvl+b}vnWBYzYFcO!~8$N)_ZSUl~PLNP;yO~z%60Ay}jRh*GVG^Ht^DTg@TP9V0l3r zVQFaz)0;cUbQ8KQd%C^;pyM6See)6AUbq3}Dx}6gHs3k1`N#X=i0V|7>alR^CSptBfM=a|sExr--n|CP6@LG_TUcG)!I>8h z%f|T{Sl>nV5v9_o68j~On2Gp2mbzOA6)Q;#cY6zr?Y7}r@&gUzg@e!?YjTq}y9iw~ zQbk*4jBiz#Za0hPqRX;G-2x7r7{Pa+ong&DEFFGuat?Ek4B@#~jv}`*1_w$Q100y0 z*xzucKjA3FkLGf(rPj_b($#HutCrJ=pXl0R=Ql8zZ_Y*1aeXqLjd!wo ztOz7GMgPlu&098w#poZ8rO-&Cho-Hy1jy1SuyV|e1}gLv*6$M-`r*DPtJG(N0MzSQt^Z{h<&Yvw+q z;IxO%%ykJjmmdg-yWMhF?s2e@0HGBTl7sb8ep%EJ$yuC!LXuj?P@U|~ufKi&1`{_N zES~%Jaq%jC_S~DS=N_c}3<(@xqtqp;L;&T4L#P=J%HqR~ZRC*Pm4;DmL|wqf#6l+b z^4=4P805-8v&J(s)(WS;b!>kjj1zwF;7&w#234-5Ig0GQJn6R#m%JoJw#_{K_3d2@ z4>wq1woa&1h94O~vC&4-5e{5b^ZSmsJX|H-dgC%2+d;>T0dM~55}x?laFfvkaRbX& zY`Q{Nw3$B?@aNAS#7Aq}s9Edt4!aKdxs$d$qabII4K9AZj+>u;0T>6ZjYcd3lG891 ziA#@(%|9SQVQyzbt;X`XRr+gibL1H8swNS%CT7RIovG{Ou86QL}- zN#J*D8>m|~vgL2twiyKG7geDwD^xXb>yu@a!f7Vdb%L5cG?@+A8J>?~?> zYB{1kIDm3%OA<|GGOXu`c|`WwHj`9Dwk>S;w6I#WaqjJl=rFtPmo-TRRQ!mxx_iBp9%4KV;W&(rU)$b^%MuFO)|DW96Hu7@dFIQrNyu3or{kcdavR##B9 z#=);lz~l_02+x5l*LDE*DunAQ!U=g z8Fl6G!Z+skV|!?4r(utR#!{CRNZV;}XjuOLkE(;!xbpcu^z}Myt!-g_X${xDSR;fL zw8!6PORS$zs(^~d^8#n!RfJJQtIdh0TH(p(kK&{AH=&e=<=(#gr;lXD1KA3K5Fx49 znr4Gd_lF5i2YvnjUJEzZgwvykcNe|b*xbSN+#oi#+Y-+V%Jq9*K6`Yg8#}sbk~$^u z#EBEQc=6)CL1}=M+nd4-vV^s|d$GB`jpNh3_~Q0PV+4>sXR}9sjg(v>ONJBE1JaLN zU0!c;7i$88U5F%-u%@BJ=Eg=i`4iTKyc~J?n$3C+m{u9F*3o<`1trA<$~1}N!LPg zm$n;TTO1e~#me zf_tTgb=wKa?g;Nz8ih=xOT?|CkP+#j0Y_(1oy|Xt^M!m^-@%E;r*QT90$jhwV{_xp z$n9>0<@=k$;5a7H1@7p?X~+GNYSF`Rj8|NY^-kKf4{o{6@oBQ zP8(>lNo0D!CP?Azi2;;V8-!e>&lw(HKRy6mD`=ObIuJol1kMNxl2RP+R9Niok*1@W znrIXcZJPN(K*~c#=peYa-@1;XQV6+%E**Ni1BM0%aC2o9Mpa0m5ZAQ2Lh=?t8KhuQ zW)Dv)+?anCYD|W_U&W>!)Rb@p9jx9-Ru6Cf)}2i( zTv$Ph4h|JUZYE4!eHumCjjh#9%pIMA=Ts?YEL>Q_$(LvM*_{s5?zGE7TKe2uP$wchD?=IbEjcS0cbD{wtT6NF5PZnEad`~|fgcAy&cHs;inRqB zyo}m>JHVC&OkJbOOlvhb>7rK$My@X5f0DB%W~dPy~~BoS9E z-@Y$KpnLOl$JT4aGULDwc0`+W{KZa;uA33a8h`1xJ= zJnbW+xn{hC5He6Ok7VQ)CrHfTF`=fiAy~i13x{Nv?U~qJwFqFm!80ULBa39uSQGlMfffP^Ww2zWVe5 zk;XmTH@x$UODH6|EfU&Lsler=@!9!X__LD-5h+{SQRp6Zs8wV9DwSvz3ahJ|cxrMS zpBF9s>h({dTp`>d#ZU`frSvnmmRAu;xP*XbM!In3%seGt_~(x<;)iGEp(r)+xG3TY&hH6>sV!p7^Q6Vunj|BD$`mzJ?O+*#K4R{`9A5wBXNbp3 zObiXmOp!DksXP@4hck5BU~z3lcu6wIlaoUz{VrQ5gj}PlnHXDuCON@ss0AqkJva-%a~=SF6Z%}+wlNRNEq*ImL_5#`?G^DIdR z5JxBbg;{D_jm^zA5~V&Np|`&qEl!vS&i2+Oc^C;>wn3I1B&xo4=8-IFjT*28GrpB5 zRViU?en47SPitpjq_2f~H=w((wNGF?JfNfpT)+4L$<^rX>cht7wosFgfAxUe?Bb`3 zVq~2hQu2**L^a5g+ySi;g$-_C>Qm1=j`Qz-E~hgvrqDMygn8#=Z7kh^y~&;`r{j@Jg%wVqV%#5e(xC6Xaap)~ zas|)5at!Bweg$W~*hEuKLKJq9jbB(zfn7rU|2UPm$AP~9Dtw-a}x(swZGB9^RZT;x z_6-z7u9OO~3`Pfa=*UcFJaWjWDHuS+pPxA_AV?P;zAEwY+I^6JWbX2Hg6^^+dpX_L z1EmXil9Fi25Teuu3p=Z@lM@Z*CyTVl7JZUVtwZ;3tz5;N1s|-r=@{W7~TT~|^I`SLedwxvhZ=|)@y0TNC{5=JhV_?_Q0r?n0|Dq5pc5WEfTWQB#^<3_`8p;$VfhrKcGQ# zM53+$Jn^OrB@2=&k5p6FD6uRY1%=i%*!>!)f`>ppJt%PTCq}WbT)>&ogh|Nw%1}4HdZs}3CA_Zi+ilJj zDd{tqdxRo|gz|um95fzgTb$%J&du~$5N1MGUuY?Oql}L^5mI`rqx1rHPgetvA*-Yi62XKL9 zjxe}@;ha2JOic{p4ktNfhAKqwjZiUqNyapknW2ZGz*nC<4tI5ts$J0)Qy|F)Em$R3 zQV-4y?dy>`Ane%}kL*9mw%-fP%}fy^3aQABv350z>_ki)_!tU7#jZtc8M%0)kmWRE3kFgsU~`f*o2T zOP_hN3mU7{&)>>|n0 z(OtDvp3V%S>E4*a2~SuGn_h#gHFK4#JOL_{kND|_ccmc`EMfypWpMk#2F8yLA#)JZ zTf&n@=igTfxxvC93k!CHrhZ zvu3MWASw5M=EXUL7{vf1!^0w{lZ`md$Mhsmc#6ZA0hO72`K%z7kMi^fCLSGz3m%X44G0F< z>g_@IgI#%cXsz6Pwkgv9b5ooyLj@x$N<~*G8d(|3j^^ovwlK348L&}dITTqsGdL|# zvcN=8@^R{=gJOVz!REoF&Kz-Z>0YDNMZ|Mwp23yNSMl2qZs6qEBRK!o6+Crz4%YFh z&&CK0N&fxV?k++uaBpV~qXWZer3fEtL9ZDO|MJO#fDX;_tLRM}fRvKqXC5DfmasLL zoak@7i^+GdmFG*JdHzttmFr5x&eRAAQ^P~zmkIdl*~9Yi1hc2*vx1CMf*oxUZIk?R zpk@d-f9`rCfY_th_;d)rs0ZMc$H#{8qyO<1K74;cO4~T}&ZA{i!GpQ0ghEkfg`6K-xn;XbD8;`{Y zn@wo#weQ?xU=sX`|8!QmK`!`%bJt)Zr7ys<&(GleJJ)gYg?ZFfzyS{U9LrI}KYz5? z^bbT|nn;aLc2f0`@brs^v9Z1(=xm^uqckEfP70cC@Z6i%z-pOkl)aPI**A}~7!9@t zBpb;+P-nzG;6Hw47O!7jKxtbzb)*lDgHgg{(su^<#V5IhRRSf4Te z=m4fiM`R6LBiAGGuN2hRzja(3v!S;BFzauW1baGPLS+r~l5p4?UT|ab5LG*)=(4y| zQ(&x{r#47Sb@yRscSo*6@YK`W3|IMDxlNuyLRE+lQsEMh?9qglYrZEN#lH}$!UA1g zJ=kPrLBiZ~d;-xeOe-LBBn)6>XZgah*!85odj z%Jprxl%bX7ZHdv5>3+=9TSh1F(feN@lceP-Q<6_b7PUNl8q{?O_GgRROTK|MeNSEb z*!Y;N_v)8-o5_@@TpA*WjT%E{;~p@7YzWsb-$R$}k%zeK=5`y-?P6z9VQg}^u^uv#QbOa1z{FPEm8%%nRl6?6hcbGVz8|7>e-W3fG~>?c^5;PQn^HltleLS*p;eW{)zk|@~}t~y1ie27KOh^Fk^xl^lmxn->>lw1BazGgs$RqK_<@~`O-<&95nal#6rSlePi z2n1H~v@tdVg+bQjTX^It3fg)zP_9NVGMaHBv(dD7-2$jV*O;4EZF}0j39}e2xBL^n zW@Ov@_D^IBkH``4TYQKUa@9a=P&I|}El4yJnwKrm8tg(R|8~DOXhrblbf+i$T$8ICALF%HxKNC>Nt;TO`14Twh2u zA&yR^!}&kmJ#w%FU6?7)LRn^hKxxG^8c8{{4*0Gkr*XLj z;rnQ8(AWGHB07HT9%Gcf?<1EUcp{dBLXBk!>8|`=rf36v>W|B=j4hzF<=D}6YG}8-?zW{Q7jO~n0@#VJIM&=8 z-34^#z-Ug-EMqD>d0>AvVDH0+?7cIxM=G5XPe+{Z@LDi{!3FwxU(pF!GZzc`WdK|8 zyur9HOw6?*Lfbn_){#?BZ(wgfs(WgDN9i&y7f#F^Lvh5J<%|0f zUox)O7&VdovLTV@Y(BnG9k*Lsj|2mPSL{0gZqX5xrKrrTL~_aWQh;nEiJ=l?onqg; zhb(NOFOJd&Tyl)jP;`%SBX;39c6@JDa{1DCFiS)wmDY0V=#ka7*@YVE^FW@#XLl!F zn1QyIG-ejPVU|16q)=TTVcFh*z4sKOao`lGXtHuBr)u8kq8Ov927AA(qMJw8S3ROt zOhJ6>_C54W59m0T45K%h3yX>Sv!2D{`_QAK7*&l^A@gYOvfpqcb30@{1rZlT+2&mkFR<{zXl17R=y*v2}P{+`l(}wR|To{ zhh~r{m$g|o7$hDBO`NMLR05c6@!h~I6>OK8>464)g;@vlq%dHtXG}d>5E`Z9nZlPB?$i<)`h?Dzlp;g&6iJauQ)Ii; zNb$>PZgH}l5ekzjweT33tQ?Fnqo$6c17*m>Fc1Vysk|-P68-9j5H;g+4PLu zLw1@m7Zx3;TqxS0%7C^@)LiUqGcxmdc+ zp`Fp3IJLp?XV%azvnUZYDpD9RDJQ5}nWmjgN(53cq?`6MOCYBZ}EZ&1~I| zSKmCz`HwDO=83t5H{L$Ist2n<(#p8yYKpeWxhZWkqtNf!ddM3u9_GD&e1nXI;z&(P z8CFw3XNy%%W3@C1h4Pt8-#*~TGl#K#B<7`15h#jVfofx1I~BEwTGjAFjZmgL|rn0`d6|u5q>7!FW&V;mj+~tUPXG z-0t&0JBY~Il;^nKEXVoe>C8~)!Bjjd8*J{#W{&#J?|xQxPetOvpFa2!6DO=2@L>eg zW3whE&)K(6uavauxE*2y5s@K=Y&?2IB9lE>*YoZtSHUEb?yyN3ROBaTPb?>*HusCr z^Y34*2hzf<4iTLmz?a&Nb>H*X_r9!31$K#ncARS`@|V6h7F8X1>E>)nd$kwmoX>`PNBr)d}%MufBBv9 z^9llkt*w^7?@MjY5-5rSk7o(it3=N*dJe~*ZXW6!!w~l#pZRl>B=vI%cq4Zcc`ZwD znfz=@=;H01s>$iGL0KX%a+m-xMJdAI@p+!h#d(c42eBMGYzF?OPT;&C7jKN*5rJG= zf8)j&eS4 zT5$O#dfRP`XA8e`9Dn`tsM0tq432+{mh!&W>-Z(L+YNtV)gR!~Z%@!{M0UP*qif=b z+-j)uA_VTdT^z4<=Xfr=<8IvTcEm(EdQ2ORD18tIT8!92j#NYPSq+kaf4D;{dm!y)W(0NjR4qbhSjb)6O+YP zJLukA>Zmh2Y)ANck;$U&et+h#eSH|q6~ZvUZ+1H3V>lk2E&a7<|9U4Qn%r!t1|ewt_?drggFi1iT&O-R!L(0 zR~2na6y6s&Q*iURb)l`FDFDB)5-7x&N=zoY%Wk4oh^cHyeXV|a@38U}v0cO$r#e{* zp)O4~nZVFxX^7hpt2++BI#Uc%76qaxL@w%Vuv#W^SffQJ8lWBPj#AX?G)Gb9e&U@* zLxdszLF|~gLe~_DP1UwGFICMt9knYCm3n>uYkFvhi{ZQN2#Z{IT)-5ufv%vYPBz5& zSYq#86r%1<&RJ2^?y7>~0;t-pR^(?x*He!y;xnw!^RmP`OR=tjA9qx<5g`&$@KW}K zh=HUQD7l+iW^K=XUu~FQk9uf>_b){PZhoHI#fSrwDf#m)eE5}oC=j!P7 zwh&lY%t`S$MSKdr2x)ok-~Z-Z!w zB0Kd3%tKJ>LjHcbMid3OIcSRSD6FY+K6zdsH`FneEO*{HHokmtxsQ*ZOvH4mUDns2 zuF`d{tT4CQ9YF|kY~dGGUp&Wqhiwr~S`=!N64ex2=*|at`{h3NIuZWuz02Y_Ymh*$ zw-#h)1ZYwC0(R`g7`ypy*fbJp_@^co;N?!_S4_2cA$8EuV?KPPk6~{c!(Io&-WG=4 zj{Gs7@v)yn;I;TaEPcY!-UoC#vQ_rnNZoy>fK_>Po$>deMdQss1DRX$W_{&={F7{h8`MA@PYp#Q=yEplH(T1An8pR$#(>-#QliyR$1|?|!#~ z*9L9eeYQmZ!Y)Qhfks2&=r-{rvVW5rDxe$v-=iSc=pu5X{#$cu(>@s!Dng3xX6YP71{H7v3IZRctxQ%cM*c) zZ%-zbCfeQJ>a_6oZc}o6UgPfZ!iVo`ZujF@@(JGM>A7x_<2Rhf^1me`iWP3;P@Nno zi3XY8&7_CBU(eXw@kgr)aPS^St3vEc;j2Nf(^Q{86|Cj*@4mW&TsSO++Kl^me;8Fr z)~3uFls8lFxDg>u(hZGuLlQZ=-WO>!T|AIy6|N`>A$HX{c-(Kj>9A2vV3Ss=uB#}` z`VVn>DqR;b&SneDmMIp?4Cl)fXR|rZrgQw)=T9Y^xg?8=_a5Ko_d(6ZySgrWXQ7|d)qBs*lyu>ukTjy#Q$o zsUuTao3X0;>kzefNXjO)O74>VJr{eXU1w=71gCRBNt#qdivj-h=1chNgP+l7w5d5_ zzMqVleCctV7X>D}%oN$?D2rvXVY+|3ap+^d8-Ka~BmVt^Yxv^n1aDpL<9Mt*2l2(Q zzlEsLXn=oyXASW6G{*qdf|WoS>w;H4cD_-_&4(v&o#Cpj8ED zE;i`XB^^^9O!f)VR6YXvPh!Oj>g|Bq~xLmj?so2L&)mUR5HDHMl#p zSx23GS*=s~tm$+vCcspEMFH5nq|OC!Fw{{9|7^H4226)3ZBB?MNwvqKCKtL~Zr!IQ z*c;v6i;)y1zC2S@=K#=XGV>10-Grx5#ho(~@9R8MV7!y$eQD$3a6SL18R%lU#`}ka zzXnBaaOe2EqT#Fx-Z@(Qlf@eR$0y(6!|Mm~c^Kq4I-BG6fuh(bO;hozPF?FHl~dWg z3|~lk^u_1o!rP~kuggNYFvHlc#S5yeyCPNezrS3d)g({1IXdk&mMd0#s_)W-`Gu0K z4zqN(T6m*x@x9H--oMllcE}BC3fU}T5sv@)_8D$n?BE$O2+uJAe*bb85o4#^DAhb) z)I!u!Ln2u@slUBI;Yz`>hOK!{6vbFBv@#S1%qdlq;y6UI*0}syzim~w#FKN47@bbb z7C$n?kyTx54qExq`#2%cu`0PysWbdq2J@z;lw93Nb8K&3<~I{`0UH`zST(C)OcTCEU-2AyV0ZcgHri@VxyE3aVl3ub`d zjhB{ds4%|lv|XQg{}Q-+Oqz}C4|UX_Xe;=sk7S*Qkha@R8|&5N_+Pi(LhO<=tHMSK zBaZ&EHYW?Ok&9}JCB})x@lHrJ(NCsx%@=6HqW(rGG4aAS32~0ltG7>Bs{FmqwYu`A z0Hys7KKq6Ip}{St-{cP)A*PJc)-T z)N!(zGrE$vV{UJVtsC(LVv=Qno~`zB{Q2?JI!-G*du{q23URe$RH~@8Tl;M^nN%6o zZ1eI<7v+wDO;!|r>Fhi*v^uUu6MfI9aqG&CZ>sqCt7ET6?;UL8@6T7F_P*Q&I>aVk z?XrZe3p`pAx*B1E<=TSuN(5F_#e9+s|FRR~&hY}bE?N_E8nDiA?_?z=dv)MULL&#k z*wcBnK|;G7Zut##p*Ro~v0JBXw_T(oGcENcSz#l%1?y>)Ra&oVo0MY zi>)D76DU2FX7SB9r}p?|`o+p+yxnfXG3T7>wL^#U)LCgfK3i#3#}i5(uxP~LUzTVQ zv|e!*HfY6Nt@{ZbpFdyA&eH^X%~0;e-*)hdUiy=(Vu7P192c=;qC1@7m(+ z*Hr(&*bWiPpJ^!6X*6QWNNtPR+wt+ZlD`%D7f;6GaHK`XWqqZ=XD3TUVTHszesygpp8Ok>Y2LpfM{X^hy-#o*J-rwiiwoSvT2#b?ho?+1MVI&l_-rV){I1HtJ zM(;;IBw2Z2gz%8iTpF~u*lAKt&y!I$b9BC{j;x$Oy@{5D^i_?){T8{>v6QQ9W0aHp zJ6DF-?KW{bTgxlQ^YgVx?)Iy@_}f>YoDY%9P(F2y%2yUWKoa#Sj3k-*SjK&ks6mbr}qyd)eHJ;2Sl@9MTn-c3s*`jPnQAF8cZZ z`TkSv_J|8AEmxl$Fsmi)q<}$G&fx)5;@;CS-hHJ~{iL>dFIx9PettZaG}evJo{Vto z%1{X^|WKNvm#R)`hy5`jlu-j=%Eayn`)M5}z&(ZOPkZAmz)9sxR{{TMjO zHW0BNOk08ENZyGHiA{v zHrSG~F5HFCMdI+cI>4v48ssv^$0Rcx(5P!!30&xDJwQQ}%`yDMZCQ&Y_$a`5mE!6? z%|Ivhkgd6Pfn=B|KBm=@-~<6ui};#RAkMFou4GR17PNr4%Mx;kQh(qs-ljT8Z5Gcz-puBvn8|=Q<)*5U$WN0(R$!1K2$)PB3TeFR)syfx{+Zhc4|B8m1H{ z?!%5TQcl}oTtRppA!xR&H?~NO=bVktH`J}otj~r+6+(o!b}A}egb>%LWpV|h3Et=h zxZZa?=p{y@sW>&&BsGH%e!K5cBnu_v_BDG{UXjOTnJsAMl|x=FR`TBQ{BE%G%UPpi zs-$T;j3ji%Y|a*kt_9wR^s>{;t9=D09N$kC*y(mGF9>WAz0o&B1RBg|0{MR9DF7$& zT76zwcB9VE7Ge4M_I?|8k6l#I<6BZOR^r3iRlQT4j?Tekf+PYeW`xWT-8h=7seV7U zt@)ef30<`Cj;ieuU+K-Skx(Eux4`3SzljN*Ey=_J8xgO*=8r*?EQk=Jjh zxjtl(XLxHz;j=cLvf#QUU0__xt$igyZyjh+MDFWYo_cM-_plmt-6BnZrSOl1FNr^$ zW!3L)@lssX++w4&#|F$S@!6``84gN^%ljIcyqS=&WUeg@6O8d`hUI+a+vNUGtG0YS zE99vW{>IKsCOJfgh3!c#EgHP_LT4EVAF2=mu;J4B4Mw0FJ?&57;xZc<{xQjr<|U>{ zhMQK%9Afh_=ap!e+njsH`m6$@65Ds2z^OfP99J6LZiYxqgaa#8-c+2S&p}JHX*XV> z3_g3l#=~hQi+6(iZBM~SRYuT+iHqm=_bg$;vByRWmfA)WOrD)$HJ%DTu%OqMCPtT> z0UgIc+d)4>?Q~sUq5+~^Z2?TKfJ!YRh0YFjowgp&#b0-^3#6L6<_hWktrbW4o`39jsD_=3WV43F(YVT@Sb=FZ z1tqPMImShZ(exZix-G>B=jC1gzdPvqE^>kyW&-6j!z3#Z*>)D^6IBj;5=5_a|9K(} zlN^T~gQJClEUR1+qMQdH{oQM7T6~@t_;H!zwO)$|rE{k+^1R0H-Uh`*Vk>9b}rg6n1HD zPIhxo4m$b;eGMx?w9z`gI!|)R9KZc#F7f}%6!QF{itCi<># zC%HVD*RW+fH%QNOn0GGkiHABkphGh#*9pEpQL>Sv-_QocihI{pv^)Bk8dFj_zRWry z1utZ9A~6kKsMTuOOtHjlzV?D}KEN%W*Sdd7=M-WGnb6wIC?$Ke^+Cxn?fER2yg*GT zQOdf8Jfc%#i#15wsO^T*`>L7|U#WU0Co?>rCb-Ocj?<+INhj;DhGVU4QG_Wx%WN-Hp#opvv@7j3BV6o+*tZQ& z8^eaPs>{QtIdaMKd8Ik-SW24)!pC23UM6K$Vz<}QE>spMY-*}cs_J!~o~t&IJ)~B2 zJK6=tu*%5vhs#~*Cv^Nj1yQ3q<^Lr$&G5OS6gyFg3sH%SEp5Sf4|0H!hBj9?O4%;V zHdu@L%d3DG?aGqY*cS%9x;9W7=`92Xp2c;-dfz_aaP6=w)t*a(rc{$?>l{-#55f&L zBZKiGk)}+ZPl}%S-&0{WdNb$mH&`&$Z|^-@_)L<-tjjfcmU|jS`krcy6_Kbx7~rRc zc7&WKg%F$U-{W(F%*W-?S4biBAkFAmp9Mw;x-cc(HTh9Ew{#c}uhku)eNscL)= zu+vr7c_wuRTMM8sCKJ39ZDGDluv}--c~(g8t@QZE7tGE~RMt*^{yS#=bn|_YC5O))KXM*O4Eb zSVJC{3*#79;;M<7Pl;6ABR40+%j{9+wW3gpt5wBE!HqtTXc_LhJGXE7SipjgTjhX& zXp2vPuhxk;2iei7?j{#6DkU_E1lO8$t42p@f-Jb$Ocu}I$RP9DBr_WgE>2TheE^d8 z)ZV@@4nF`mrCWTYV@b+5S)D#SZ{ g5pYuR^5N+&iB4~h&dvMs?6@{>gt9bX>c1P47RY{1}s~~k|oRV4_N-c{Ka1^8NnCa zV32_xsGc&bDu>7z-#py;o@4EEGYfE(LJ<}D-hKC;v-jF-uf2}?#;<(IU^GU7sT&-} z?l_lys__ILT4e96yzHmBd|ql*HRLlU|u<5Ku8I~w~s*LCer$KH>z-|v18 z8_o4BBW&cg4rjv%Ty5`9o^KQStX3-~lL>WQ+v|8wzkKldjRbX#qYX)3(x9kJWiNId z2N-#=@o3~x8;waby2m|UJzwCshWncxMmZ=|^1(;veEh>391Ok-x(4kSTokpVQN{rp zrYAj~esJ>nBGit;i2^cHkc1J&56JQi2TiZnBTduKA6mY%tVG`WgFnASI|^k$qj6+2 zwdQXP7{`F)@~?jNA@9E4En3qwcxhJHKa46EddQt(l)`f$YGfJY!xTl}P&JAoQs~-Y z*Z3rhjM?qhJ|rlH(~$L|}}LHh9`)yUFo^vq^{d9u8!w=yYN-SCPrGdh(d^ zQ?c9RY${nvZG%%%V6`ah0(!C=O7=n)&y}skQ3~y9?r(Se#@COSdM+prtu;CbSTu&4 zyyVr3Ij^4GVYGw9iKOS<{f6saL@)@+);USw(;0-MWr4(Y|DeakgDF>6bDXoTjYNlr zlcR~<@#8GF5qxl%kZ&5gL4>Qo(F*VUaK!7M%qZjo9mP=o|7JxN$jt{Ry<>9J<^Fzy z)3^k2#MP^N;=UmWdUofAhcS5c4r4yY07s(q-~OlX82KgJmuLxBW!P;>lrhY%w|2Kp)24wz z)&#L34m*qw6OwLdKTLM>9U!Iqicg>2;~8iaOoky}g2^m;8f0mh~B6&IrpJ~e(2 zQsyP4<8Ytt=uIY6Rn;!QfBd80Fmi!in$w9x(zFD}@HgMTl(JxfML*@6kIN zS^zW>U4QV0ziwV%FHoK)@+0!1!U*{J9?O?oHtWnn(bKOS+jvv5@@U*Z+XaxtkP8)A z&88@EEfm+}bw#5cW|uo0quFk12Hk+ozG!iycJOg{|D!|u0Q1!b<<#_(F3W9Yb2J(H z3|)sX33y;!YUQ-|<{2CftGXc$5^iT(ZdZGBZMa-)nI898-tKH9G)e&2K}&@)HK%6* z-LS`#(*di<#mjBYHBh-!O>S?-(E+!gt;o~dzR|n#N^5OD)K#+GSssyneM{ zJ=^hXzxkBd7~VXe(bO)u6{b=IO~pnF+QX(6Fw{~PE&9hj#dpuAII`8XL$R%?{K7_F zXXsmm9)~Wk-mEzt_jvW<-Y)K6t?umd;kmZ7N~&~69$%jJSyd$m$7AmARwR=yogies z+LG2aAKz!}HVt7|^KuQjD(QAY)RQM?Mo5a}xLjA^@zrmgae28STNR{vj??&-QOS-; zxKB>{1b#!W(()`Ka-7@MYtk)SvE8?!tWRlR4OKZ?dTQY>x(A01-?b!0U zE(CNHFIO9!FlMpIIGA=g^A%y3AOPX&Mp%xm-BKQBWzEm8ccjb0*8g`bQ_@xFj0N6< zK4H(XEO!2CL!KFufuY|WvfS)>^kj}#E))i405*e7?r4k;Lj?3hrYu}&eC23w0MK0YW#;a>8*Cl8)g`?QY z^=~#f#$lbUNxUA5b;k5Cwu>T|^Z4ljUSmjVjaLgkNUd{NQ}gQ6Ew46vlx`nha4H)6 zHZojo`1<1!>t$|v$ShP8Rm%Gh&MkOrty>U$hvHdL+tM;$?b$C&T*neF;v}>?E%Y)k zYReRLozd;}$#x~9QA{U^`QLx~iM=t$srlkZ$Bd_4E@umzrp4^@x5Pv+W0w}>xh$B_ z$oAjMETcCV*#6-i-Ti!Lm9p;(Yr}l8wv|di#zF)#9r zp6A*3%RNa+?PV3aea^1Zq^`^CZpT9SiO^vb$vEaK(+;O;X{&@p$LZ0KbXnP4xnAro z#y5_k(~H<`E1F`@ey6ybZBW1c`(HE4b;yc>&8i?!hNe-B4tlIE_uMUZsK(gRGCoLf zT#xBNhu4=k42OM|`y6U1BsIp7Vp|i(F=<-Zkl*hMvR%r4RnWK|u4zc3#9~g^R49DD z^>kuO;N@;lZ+b|s%;%))AkWyZEB^S$Hy8;?$?;m#n|4^uGPEa6T7}jglf#6sesF|x z6^>C1i^it%n@!1I|MZ5&gHBHo`CS(C3?(J?H@^23V;V)@RcK{MaBzDOmoFETl1B=* z>w^Bc&uY10(h2E~BG%cSqmu*jA}7yEn{!ed5Y+)?&t zPbuoq9(@F zrM1I4b_kUsc3eUMClqt1p{HDG&nE~14u*ycOPvju%Z!h&GmO*F>BnprB~@23o^&i( za($nIhHf15 zRW!!o|NeZ&>v_uYk}HAfT#U#}f>*)`wC3Bt z`Tpk*F5kAsOG?Et%lVoh^6c|%HXBBxQL95}jVEnkSyt4Q=zk}sqkr6>lxFT zL>7}p5#_=mYDycmMNv@=rSvN9S4)P|DSlP4m+EtPn6%&(it1u0b`|MLT3KxQF{vx5NRxV&CSPD$DH(c19K?;Z2Q7jw~5_~6SYw$FIlk1XK* z;^WI!)zR>zIkcaD+YQ*4(xfQrj!T*~Y_gP%kb2-r5}|6%i=trUhd8Q2WY)k}xW*-v zR-vkKjN$)$BADdbMUoJywKQ654vzYGk!YTfdoI2RB7y;FmfIWZCJ{gQ>sL0E*7H4f z%d4hcaRcY?k1X|F-tLJ85PDr!i>>`PL8Qqf=J83Fsxi`3+YicI!}Gtp<>0Wx&CRZr zz$7Px>1h}qb}UXD9t}vVJr5on^Xhs=wkRo$G&v66IUW)Rt_^wDsqvEm*P9gwDDuF! zq{q=Eo&`clSGZd3X>?8Ix$J820?%?0<<|@cLpIygQhW8?-}%T$@ltMq(h_DZVAU49 zJRDtfceUprbgkMV_kK2sX+oHcM{F)vG_D~z88A*|u^T+dQV zx=s%xX*Vs^7El$|Gdz%MrKEypj!Rb7^!l1^r%&ZK_H#wDV-g8<^r*uwtIg&uLsL|~ z?P2-imya=y!?>uK_`a35-t4wSjV3vad2^qUUu}7<6ldeE-Q88kv*07mRURnD9gm40 zkcY0V-C-1v)()$cj64*+*7QdmioIcY+@afz*zMlRh$w}8fL_=eHhewk!I&XOP*&44K(eJd{{>3!r7n_Xx+bxdk zvU;<#np~q57t&AE2In9m?znuIL|lo`f@aeceDUlEPc%GZ$n%QSfuHSid{^PhFhdKK z^{q@f9`v}o*>HH=|GezU_u_76dl11aM-(HiZ5l^|h)!Se{_!D5RWllIXIC<1Ax({v z6wsDS@9Tyi2}87sj)b<$`t_cpr-AMF^Q_^fEZLU@bx#0m%RHA!ki%r`anbcTFkNP8 z$-#U5cF3VL<57ookyAL5-#$OdOWc9a&{4RVL5THwvEy=?ve{Sd0|;J7s0ygKaD3Xg zWzl2>k75tC+uI0`_WPMATv<&el+2a{34etvgPp9hYP2gYy>K06@OGVqk6&J*v}ZfA zM#@+txz{R0mD3>d!f8L??4-jeiP=UzSt`?&jO*7c!j5kjty<^Qxcs76a6avFHjX%! z`J4=LwBn73C0+|=BheTl|8qILdb6=9Q>em9RUalHi891~Kv6dYzSEAmq?T8jn<%pH z%@W1^&4&BbaQ9+GV&GQfJfWPTAsEH!C}A{6h($AuAQmi<@@Y(~2Ylz(-?w_7Omt>9 zYqVuog18RD!-VNU@AL4gnwqFF^a78AI6>_y&c_LF7JJ?}Z3GFcd$Y{=_R|TMv%*qi zp~}*@JeYQPJc{kCfh@C)&fQJQi&e_L+_A1*{G?@gQro9NW5a$L1}I-MFB-a&z8#pn z`#O6tWqcrbpop~QiL@se_QG8phyBfl%s^bjdY@xd&bS|0&{yC4ov)d*X=Ihv(sk{? zF>DMYPf**V*2cD~hT4LSOky0z)ZD%)@zIx^Zci`C|7!UMZT@+^aHjstdScQP;(SsqwG*d z%8pHwwgYE=BjsCjcsSCdb=j-MpoP`)|Fkb?|gB>^HpYv%EiMY z-t)@0Qf1jLRO8wK=gmB05r>4eCTMC@*f8HaJbN+6wUU@%s@L`sUSsLBb{qP=KHH7V z8>F7dW7`f3w{dA48Nx`*tZ`jQ=eLt*D}5PyLx;ePSj|&AvG%I6pxbv_8A|?>%7^CY zSXQXP#4ek<;s+n!*qgU1Rx3;s_dJ>=CWu^4dLhk$;__z4s;sO;CVqlv&t8y@J2nCa zq0hJz(Kw<4yZq>Wi_uHlZ3?UhQNuUBc+N0X?0g45@LA5cHr(@l-FAa0g21KQ?-Tj9 zEoC%HC^i+J-lozXy}i43_Rz{?l17U0v`4yI6NLds=hAx^)cL~`BS0ZKyM(J}4BFF- z$9)b?y4>BZZRp7--QRC_@Mtl zVbO}7VP%nr()G~$Ju7L7YIxF(xXujQ)s{}^aym{(UB#;`{d}gW1la%EAN;Cl47{0V zTrD=dn&&oDma|s)m`o#-=QEu~Opg1Xmn{)RJr#3*Eexz=zcNf7cSzR-`*mSMUe`i% zUCs{@^2FtMnBaRba$N?V&(&gYZ~l6o@_L!^;NjRB93m9o`e2GH^F`4l0*4=`c{?wR zV_OxnEXDBxdoP_hAc;bL{)=07%Zvjrpmq!or!ieomO8Pe^o{HCe7z*<^yx%CrL@m~ z_@BRP0$EMZMaH0`x-C0aSryU1aVf2$>5w}vKm5tH)%|Lf5=UKbUu>D2v?{NpK%Ny$ zkH<9gHS?xns5}l&`YiI?im9(ZnX})>lH2awdWFPZBVjCp$i?B5z=x!4xLg*zUZfly ziRnQTB{9XmWLp*VI)P1rWazM4)qD_#{KfNoYR^(mYxS|pmC>9^*;Mf4$uU*B;AA|( zDGSR5yvto?sinN>RJ;J<@DN(u4p}S>4n;_8)0o~cW|tL&jtm$ACJz%X9*zioA5S#> zw*w6>x=gc**OzxZzgn{2l*EfYoo+}JDeBr-ZZ8ocCJI>yJeevPJ{lza_rH8;qeBYh z_1zv%6sjt<_#`5#(lrm>J0R%oF3HQJU$X zi}zN$f9Dn0Z*!ji?8cT<8Lr4Q=ImiRA$m8Ic_+zjw_7WV`$b{33Gww@u2UWlVqVF7 zLgtKVY0S)K1&p_PQb;(31JwL=T@ryN7gm@UN19#^fxcx@)E<-4^R21D-$Kb7(-ln zB&AHMTLQH4eJjcJ9q}f5P+AU8hl&qR2P|vN{btYPsDttxc6G&2WGW#`O^x~&zxOq> zD+IOM{1wAg8)6xK{8W8N1dl#J7WAFd0Y{q)ABf$W;J z*N!7b2*uf#rc8#?GRJ>kgOy^w-m({=vXWRU39EqXb;f47w`mYa*%jB9gr0GE|4E;N zNz98+mt5cH#GQzPi-<-U-tTtk%fLfEvw>x)EtnfAqj|;1U_C;U!GwagG4om@p|WIU zlyvaE;;^~TEizl$YDdI|Vq2l5o12@~`EeGpUF7`bEVqNu+5LjEX@|)d4!9V_yjo>E z9LJW*%Dmtv3O|>t-}UbDQ%37TabLb#5ridp1w_Wc3atgIZ&@nf>>9wqx7)Y+Gi3Y90$0D+qjpRCw{&0deiVXsd9_G+ zc-XNOOw!|g+_7TkoBf_;R@upr0H<`9lYWQAdPi9noSvRCyOU|SkNV)39!iO|HCY}( z!c4|hB8f{TNGJE`>6B3v^5*5t_V%-Vg%>r%Vb3-t(ms!Rv7Nh#AwzV!wmVaHA>`&n zM3JYogAU!`xh+A8O5p>teGd2O4&_GN&$ldgm8HU>O-=`~RdmLa0khj>>jgAe5y#po z?fAQ;$%CT~gF$SKSt5*x2O+Hk{*jAab z{70t9t>snP*7JUs(`mxNVV6ab(s(Wx#<%-mjk5A4DWOViGD?D)7x~uKcWH6u^Q5sl z8+Y*fA)UQp6g5_7*zKg=E2KqAdOo>wc=76*Zof;ORkp|R#)lm%cP;PMEbn#}c*X}^ z>jilB@jXWeJsMMyDThy%sht%r?&U@cvarw9-JJ7bhvQIMX2_-?om0;`ylpuXdzxU3 zcnfDKKl#x$jdYnZtQQKt*>khn@ucUn-RQ$)>Dptamm- zWu^5ry8RqKj2Jr(qskyAWKp&JrpEIfLeV+vnp}mJLk#;d2M1$2ZIUnb&wux8=I%Zv z+vV)-YS!r5y)073SCqvK}$JNa5c6M@P3DF?ra5CWjeo0^E zidSoVRTCPQlQ8CN(k1f^pJh3hZx%$|fX9Ky%_6lvLg`-L>qnMaZ@UiTPJm7n)hC@J# zo^J|Nkr8ji#ij7p6_?8`#i5WO*;T`6(xKZQGEPLDb$PSdv0d+o;x663$0!cDxEON1 z&#ZR%(2p#Z$cdI+tu67{h6-t@MOzS%Y<(1pPVD2`DRt{Wlc;wQtGI%~i^GzkI^!(ZF)_?KWpqX>k#5e~b$HL`0eWnkjPFKXf%RVoy z;PJ=be`Oh~Or->l8rv*k!7&-ToDDnHEG>2aXe_wUp{`19mbu;aK;`rgJJxXdh4U`2 z-!v4Fhx*>X|F+p@8D(x5L@ugS%;#c8-f%MLSfoA~Cj8B(bK7L-O5vH>=A`e(ESDLl z2N7j$Kpl3Kbxw@t&Oujq98?02F$GiIaeBu7h)`(s5QL)X>Pw%D6x#`V?atr<&tFHL{awMTbs%cC5A z{_(Z7@$0(fB{J2rlD!pZB_b;FoiuQo<6dN)B(k$I(HaK6RiN)=0Tx$cNRsP1+-p&6 zI`;QX?Al?Y9a>QFwfDyS;Ilg%J3zJ2W^+u;cq^v7snMR=DJ1hb?Q0QnScP%Nr#02Zsq^47c5t43)sfeChH!#-H6)!_IgfDG8o_tBdZI@BEFrxY94(sW_r-4 zENc6qGA8p1O&lmb78-0FpRJ%N{9MLm+j&lUzhSK#!o*`Z81eXt&`wRK+acYjw)qjd zZQEd}@N!&5%nai3vF&S%-huBki9B{i&EdFfbwBaBvreq=S`;;JZGTSNAlPXc{$PHzJ7*TT`~BQ_EoxtE>n)ajYC}UE_Jd zHY>==l5MWZly4iBql1n;_O`IhPI!8&1wKq7mQ}@zv?j6wY>NR|+8$T4=SuCtOl{91 zw$Cf#rN)$oP?X$2Tab!UGKO-JZ|nNS#bxI}VQ@O~@8I^4;4*mTwPQ4n3c*^;@ZI-(W>b`MvGv47JGZ68hE+ z{x-R7C#%R6Ohp|s(rdsr@!4Ll`QaxE+vfVFJs&786=|sCrvU2pGKWv^I2?2+WD<1P zXE=#T#g!8IR-#dTJvM z0;xQuxV#+(@_K2sbh}Wg3*K>`fBOCj^?Ge<`9dm%?N((c8|&>kIv8^^TX8eXZHq1k zBRY}G@I>@KV^6p)q;U&ehMhj^<=Xlf?Q_1xBCo1TqK>G)hCD3@BN;t)*yR=DZbY{y z%&m2Sr4-z(#73(qwPw`yN$ZloeZH`O^y%HkPItP2M@Kg{3hJzole5;8C=}Qp%CNIS zQEueWM2YWs6r~)zZrI?nUWv#e80!#tq6I*I5YQoEnO1hpE%%_kijRKj)VfEvX+>|? zPO*bfbcuo>7Qs}aO|f0eT+^kl3%m2OL0T~B;^NqjP!2~)djhL*72#FxA-GhkP~RfM~A$8E>fJNkhIZn363pPk~6h+iir~Jx`y{YIJZ{$AAJ7>Mn+w4 z1r*ug!NJ=T>vhfWV8C>mu-(5XF76ZN`Is$nh|?M`VTS{@}&T+F^w>i8%477jiU+tsx;C3@O%|_PD&` z@p7Ho8a=<=;rJDC+{Fvp!;tctK(E(@wHCHA@>+9&yp8uR9Y_ngP#$qhL z4Wa;#4-5JIw^4?e&je7p&06;iV*&)B-Y>ee)UUVjWWoe?Cbm89FdporBh4TDD*I2-rJT7+}>YV zEe%_Xs;uh2spX<5o5OoE;76<;J_rJIJ00Xjfh;f34fMcVCkA>W+T3)S)f$eX2yq0w zbN+a}h1pd>46kriq_ z(=-*Si8UCf9RLA;H5Omo-^R@|$5c25_`e^X$wLbYONfcG3UTT0F=a%rvo#%4Fx7!w-PK+$e(d%*Fx?)O= z`?kO^4%Ds15eyc(5nf*&AfiUfQcYhj4gz@~OkQuEnx)^$!Azhrz_|(6U*0^4+Yff+ z_p+>xxI=A4-W6<^lg-j*-71O#WoZ!v27kM8QZ2z+Jbtn* zce(w{-M@}YYAwtFSze+OyR#YK+(JhzsJ(A<>-?IfX-UFyCimbl6^&*YAFkTz_d9JN z;=M~N^^Lx~zYSY4miXkT0aE-oQ}^N_Xa(VW@#D zU?2-{by0n~c?R&~K7(nAQv-D=3g_WrhJtR~(z`!!C*eH(je0xof0pjvzD=bZHU% z81EG)kp#s!ig4|C?9!o?cp$=mHby&@i{Ju-dwVn48}|~$AtK2N0g9?b97d?B5(VF5 z2GCTfzU}u*jkPfcFX7?6SecV)Aw`~IeqkUl^AO&Z>R;SH)aHZDvHX5!xi8O&!Vo=1 zY6^`9GP(zA19>(zpJs))3Nwhck;IOpUdBDsN;JyT#JM+W_}z;u_~)G$c=y7xTBHU3 z@$+-!p@zjE2w?tlamDVXDgZ7@ZZPQ7<}W~pA=Lm$6xR~g$ZVJtB$8fTN;FfnP}{#Y zr(!jsQEOOP=+@glyV4hw_~pGVlzA6k`n?XqAVjyTp^_I$TI9h^AO{vH zR~1(0dpNf`kWJ5a4-hfZd#wZk27{hlCs+l*_9(;hoccV?^UM1?pgz52@lYRJS`*jv z>5gk_>kudU`uActz>j+c_*d8qkfwzw?ZRS%^d26jczC!e@n-vAChpBMNourK5U3ym z3q(9nhyZV|_3D(8X1N^P`ytVkY)JfDg|fQP6`P?yGHCN)Pq#<)CPE1lR{a@)=4)%P zb&!fQwnj729v4$7OogDLs|1LM*jn(}AHE+MOiF{x3n9MS(G(lS0m3-J%hEV&<^2M& zj=z8Z6o0iaDx}7f5G0rjt|-FKNVSNBlIT@2Oz; zIsp!U_&X24hr|wo(l_}-e-^9qo@XsOQ6%QB-rs;9u5n%=34pw^SfCeLV7(K_4-ZPb z5Hj#G_Xh^OBzDgY@yU>15OUW?=a z@4vpL@Ymgh2lQ!%XyAYD?;kNW*}niAgTQHn$EArMy^!~`5(|9cT_+I60%Jr$*N!LH zO*J;`%u2j=MpNpE%*Cg`;PboNBJg1t;8;g(>B+2=8i&tSE9Jgu#R3-*@iNh_lQ=6( zDzeW&(aJZG!;ef$qCGLEr$+#XU)@e3Ii2oQ*Y@JCAz~XL;`3aQA`fF)by$Kmh3v%z z;D9>}41PQ)1rHDqZFD1y3xX?Gd`X?4L2WK+SrdR${TPpVCKh?KOjCMQ;e#vdk|HAl z3_kF!^GmhQ-M;TOLBPRkk!D<3gw&=pJ+CQhEn#KnR-R`PWSC7TM8*<6^u|gLKkVj6 z;z-jZ)1@mZM1%fUR;GMb7~oVt#PgKa;R9HJ)s7J?&<_m`3f;%rLSH`o-fPQv_I$4f zbyBWZR;pCS1}Zu)3;gM_W|}{}zNSjB0Wc_1Nk;@glj#iO=?s%uDz1>Hg(yla#2uci z*GVwwY5Hl-qW`DQG0^n;UEJCjif>+D>DKNhR}x%hOtTecDRBn`){dqrR$|@wa%?f1 zW!T>zV>x8-Djf-9vCxgh4XG6WLqH?|M?jqdJ1L-8d&J}wVtjsgOP)X5JUjTQAEm1>0)=bCt`hfwGlOvgB*($HC-Dso%yESIPK;4r3T;HQq9RE@G0GB2ZEhYo=~uY7Hp1)wlhU#pCf!!rhC zF4A`*t?P59U;25-EYX~wV9Te`@kEu-)MKh1x}^{FBuoOn`p$)QOKG2-3qfo^Y5o22 zSWH`BBvS`~=X;Yn@88`XOJ0@ok`j&e5Y!&E;2%72IbZREYISR*mQ|P7j<;jXkt$AD zV};_HEr5O}k=RpPU%;}wfEa8;Qy(emi8MVYQF(6D-GF$|*2?VZVMG z^WX-zHs%+TG zy*!vnwB+WPn>F&sdc6g%FYC<+ku#C1f_Q0W@X$T=z2iNt4@jo)hrFWzusVU#dh}Xu zoY_aRNgT`HSxH1!NhrQ1|?uKT#5iP?%1~lT;aR_rt@U87klDA$inG61;Wp zm~5aQ0w4dngI=5n#%8^Ke}9IvQoeLT(uw(+5hfu^pji!r|4&ZTOkR;dk|Xc2~Z z?aUI+Ibq&;xUIm5F@%ClBFy!>j`Y-^H|RO)O`tGq2_P-YnuWGySzF`c;y~^v^mmJ{ z>-Uw=;d@fVIv&6{B{GKi6=|`;hnLtdAOJ`;>hm(`rKwtn)h>&3Iqb}oWOzBvwD@7Y zV+_vBv1Chd;p8GlStY@h>&m%hZ2t1HE}(eJjFdb941KiH!b>VqAwwItY}hFyf@2D1 ztq}7t71=3mw@p*-#j{+%{k@rEe;RbC|2hGHKIhs=K6tdH>D7@$YQB{(5RB$m{*Zc7 zjBWABPtT?D3+hUbsH}A-g=VgzbDALB&RJssrO}GC7baSmxm4;8P+#BDBKb>Zts+&r ztSva*JBu;R0MBM6&X7R$-K?t%p`fB~w#Wo)g!H==v?uV9goWy%N?r5>aI70((C=WS zA7Oi12xe#gfBt-5d{24A0z-b@E3m52^?y6t%)G{FMV2~I7)!H{$dV9&611|6l}4+Q zvfef%UPMi~-E%(9Ps(T5J9Mv6IgiGoVO0PM*qqn#&FApT;a6NdsR|l=G(CLjo(zG>mXhxyUQwTilpRcUrYZ(@RV3 zL*(Hj0Smc6=jwv+nD57~(a8tWyqbQ0fFLrsH?dePNqp#in6|2d)tzF3`NUvv=HP56 z!n2gA&0t3cFf>k_o9|#VwNjR|xA4E;J;D1|*73UvV4y5;Em=-; zNQXracYP_T<^J7%A?(c?OX_D_zZ`lqHdyPJIzakoykKv_(NaWs@*XXv8^bzA+G7zp z7)xO{cR*%XgkLIo!+WwPSQNCt!hJ>&AziK^Wq`;B12zj-*WbFhTyuUDh)*BV7>OfX znO9BFTE5%K#n-s8tkB@XXnlC7vE;MIQ@p)CkSb6yxKd&0u*>VnPy(RJVmzJV-4jFn zYjY;=EiDY|@f<2-<~r4^N0{^F0Iq_n@(OVhVw$HC<;nF^hzx`=Ti{WPCSwX^nsyds zPM=yM3X(T(oIUnxa~EGf+--^(02c>M%Zo99Cd-4}Sm|iyu)uCsiC?qPK`J!q=;#VJ zGMll`DRE(;r!1`r@XO9vf|PG@kvii>Y08;%MbSQE3tM)M?NMvhpdE!q%%3v(;PQHH z&3scoucJG3P5E0OH4xF%v{GuPySA+>rQ|`(90__KjRo72HHz`eSkvN0M_HIY1CyH( zpw(3D_mSbv2xS929OZ5d$H?K^Kun&faeJe;() z^mBBPCrw6@&Cv{f4puYd07erVD1y5a;12|3uDSXBUXBGfi@+ep`>LzCi4gj8Yr>4U zh%I$8$Y1}qC$-J(2fHv)fP6|m(~66{KCg{ap6;9NRPGf~i+6S%Qaaodpujck#n_q5 zn$nW|pb(EP;JDE@>zEm8g_goD4NpmUO4f$t2!?E5y8xG$LZ#2o4_d<#z)y!3mxruO zE4K$#LdVSyb-Eq7H#Mo)UWHeecC85g&BJ|E1r?g>P=+ur$wvRw_}l&E2HJ9H9nj31$>W6|A}Kc))EN0 zbmycvj0_Hm_*h|aRL#-Y5;cv%g@vv(LirO9d-&$z9&%|jQCMt-7T{=5Ug)fV-*&gx z#f@c-!8izfpl?zuQUmn$^`%640a^*SH5t#~hirTxV@hL_gKohtmJV!a>T9>{G_J7H z)JS=ER3WDZ*%4yuG!6;+U9x$=HB16*jR=4mhKG6m{9;f3WxSyO=cB1a-Y|-_Rc2hr zl~|j!I=eJ(k&^a@Z_iNZCN=GnG@+$kJKho4DoijZS3Am22>Bu9vXu^%bc9OI0V#*j zwvjew@kD?}WZ+08A8Dbm7Xl(SCPe?NTll$-u?lJ6#XGHIxC(QdaRl^m-r zneAgmC*2sG#UV&>qlMsPs%K^>KtEtXEWo^dcMN>|BExQGWrCBaQKv}gE^ZjZ6P(s! zuHQovMHmixD5Xut&Xx89$vSgCVp%eu;HFt~hIF+oQusLsG8Px-Yaj5ixIM`9kDp(N z*>R(3s=dBbgII|rm$-^Z-4ElZAK>ByXZ^X#!Bc0|7> zsF)jcWW$ou*t{qTTw6+T=b*xj5|?~yv=v@98)E=s>x)PCLgMmMsq|X{DS{IYFsUmx zWv(8gX}Sp)SQho%FrW3_rPZb#=B{Hpqe0`t;8`>YNtz%WdMc7WK{rHCGQ{|8beqr`OzB8{S;nPI+0^@5)7}KqT$C@>#e7Nl4B;t;Hc3 zBtbnmvNT<)N0T|0%JG;^m~!!;d^S5#%-iX~p_r-6BRIhH?N&2}|0=i=j<1D&C zB}qofeFs4LjDf-SD8=ys>vJ_njE2Xk3aB+fgJp>~k2Smj>jV>Dcbr6$UiQ>1Pa>zqSwAw25#S!z)gg}6^y6gU(vLf3zuo3Fo>vMXae2A@4S zID!xAFJsj7T~p$+X5iT*tX5V~5qUqi3)-dnR0JJV8FUXI*Io4W==2JdVP zb=cBD-KB0Q8fP)YJu%e|`#l_67-(D1-QSl^Qkytb`NcC1UODqLMmPaUurFL^g@cSA zTwNE^f?B0;Jh&md!rPG#X!4L|3mvH?Dr286#=_!IAS=@(U4omGf#?>`t{Q5EZKp-4 z=Y+^qtNM9gN9g_9&-63gBb%OVrxU7ktY*;f$v44B)Ns^yIOx|y7cATemIG3i9S)9wzeM}kiHHCj*`OWwbUFp&4&qZ?-t1i z!R6NCt+U63N8sX&@1sLEHRgO(h*nOA8iQ+R7Nt4D_2J1rveL>Vi!^eDgN#M%GA1Jf z)ZT7@%~bKfxR@Khf>R{p6<5d^L*`;XP{OBBqR?WyQYPdqD~-WlI9osn3h&3IPwpCbLhr#=_+rYo|mHQor^0H)PCK| zMOa12ugDQ9m$I+j{V^uvDV787*;gJGE1dv2-R>2Zgi2#;UWO#BOpP4nPPkE0+0#je zEX^_Ob%k_b>x#jIQe#_cGvgNz5-joSGGvTNiny<<)xnaLn9yWR*Li8!L6l~g>nGTn zsFiTKjo<2&DfLh__VuHEX?wGE|JSn%I5QvX9589~RRvHr)Xoar-JQyFC@fkj`3eeY zN?b!_va8Ln>N&?_Pm;@gbp1>%0b0P5srod7BGXn^nxxHI>xOvB!6)CRx0M7tA9N`c zO4r9>U+~az-n+Phf?vmDU10Rfk_V%i%o+I4OJ1)k_Z>!q8_SB?63z?edQX`Uts0Di61n=6AD8RfW?-mcx3UsHUe}N+~j?BEm==gp#2M0U#7}hCO8CDNMf$jKl?CTn9R0bbB4_?~TM|@1|Ph=r_)qVGnW$44QNc3TUGf$iGo{Ud@SL zDxma-{f;yv1)IAM6UAtwLA4WUjSHDH*NcsQHKygIrw1|a?ejDG@@PE4!om=Xi$hE#?K-gL>KVTa2J2*D g&b?)%OU=Oe|7?NGVm8Ds{r~^~07*qoM6N<$g3fwptpET3 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_s21.png b/airdef-mod/assets/airdef/textures/block/flecktarn_s21.png new file mode 100644 index 0000000000000000000000000000000000000000..97fe19e0451a05ba7758d947906f13e067ae91e1 GIT binary patch literal 10242 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 z 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_s23_b.png b/airdef-mod/assets/airdef/textures/block/flecktarn_s23_b.png new file mode 100644 index 0000000000000000000000000000000000000000..84b787e76d56c0ad7eae80274967e2f43faa2ecb GIT binary patch literal 7879 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_s31.png b/airdef-mod/assets/airdef/textures/block/flecktarn_s31.png new file mode 100644 index 0000000000000000000000000000000000000000..a35722bcb5a4328015cb8ab668b50e8015d5731c GIT binary patch literal 10243 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 JPDHLkV1l7?aEAZ@ literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/flecktarn_s31_b.png b/airdef-mod/assets/airdef/textures/block/flecktarn_s31_b.png new file mode 100644 index 0000000000000000000000000000000000000000..ad4e0f52c63730ee286b8543ebc9fa1dbf79589d GIT binary patch literal 7499 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 literal 369 zcmV-%0gnEOP)jvP*S}TYod+#NHgB-^ZW3W*S$+GMQ zz(CTz?_xx2HH1!x0YnoO&|#?SI<|xkA&8U8$hxiqCKaFV@Xhml15DEtXXD@?IL~td zD2n2%BQym7bIJh(DgbwgRSp1T3_4*v{8d#6i2e6>&~@FPey<$RE;A|HN)|GXVZ diff --git a/airdef-mod/assets/airdef/textures/block/glass_cab.png b/airdef-mod/assets/airdef/textures/block/glass_cab.png new file mode 100644 index 0000000000000000000000000000000000000000..5b7496cca4ab81872bf6d6b0de340f4e3c50e40c GIT binary patch literal 1617 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/kh101.png b/airdef-mod/assets/airdef/textures/block/kh101.png index 0641a311339b63dbad89273febcb76af938b30b8..a195884c16f4c1e07cc9204d25d40d29702842a5 100644 GIT binary patch literal 1315 zcmV+;1>E|HP)z1P496ym^VAy)n^EQF5nwp_I{U)8fNt)i@ z|NOgMuh&*pm917QWANR!t^NG`*zxhPZ8jVKz1?no4f$TL=MQVV`~AMJ^IKyu7}(d> zmt)j*?R$}B2rubJ(=>K;bYyWL%o;<=QGhbOd8d^8jU3-RtZBdSF$N4C&HMg15jSZF zOhy2P2k@3W6W19s0y);Brw-+l+{pk`r;36)86W~@PgE3@fWw@yq?q-an;Z8w^T>Dz z0O9#re7QmdaT#x(XqXgXJwO1n7TqdYc>sBZ?B(TU&%4!Pu_zYS%cZs3_X0MX&FuB{ z)fGw3-IkKCJv=<@aYbvAJ3l|Sx3@Pxz;e0V3oUYP#M#+dnf(5&Y;t_!U_A5r+*ro| zv0lb~e0stE-|+Cq;>XBbyoH@pvx{ z#VL8{u#(E)gjMQjdNAhs`MI2g4HTtVVns#~me#FKDdouN#2@c}O2!b*;=Mr^TLf`) zbe-I*z96E-Sn5<@AQ!zLf;&!cmnEeNR+UxMYB7|{L)^q1C*v{^(=PV;m@&vk!>GIPo)4M zEZ~?gI*)Mh$Jz)nDJjipsXNwdFY`GaAzI(Pft#s}!@rJvo!_}zQvM0g z#;T^tu~mbKS0+MJ*Gt>1b20ff{^evs4nkq)y3NdAuXi1@bjdFFb4n&_=!{h^Qv3@; Z*Z+T_XqhH^XKnxh002ovPDHLkV1hUUl0N_d literal 393 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 T#Ei6D00000NkvXXu0mjfA+Drt diff --git a/airdef-mod/assets/airdef/textures/block/metal.png b/airdef-mod/assets/airdef/textures/block/metal.png index acf9a3489572a738b652f4fc569bbde14508c44b..8ee44f1a58edbee64c53fe488b0ab8c78dff385e 100644 GIT binary patch literal 1322 zcmV+_1=aeAP)Nkla2;5QayG~2ZViG}7 z6p26vNx*zQxAAyv*Votf{QR6~Wi)i+lfil~dD>g8R?aJ0oQ#HQUGDdLtLxfdvZFLRpJUl!&O<9)7lihA-i^U?z5xsb|um92^BQac$_DU^IPELAWW37zPT7+WM zBO|m2YJyjW5I!kEhG_V&*>o?$skHMEJxVt^T_p&bkcX-{i-@buUa8HtVk4qXuSj$}{#64s%(+7sbVX6Yc z3~J@u+gmRwL?mzZpX`m*0j)D1`T&WH0`>_Vaw0m~a~a1CC}wL+F4hq~Vo8#cu$rly z=yhydAe}=@d{Kk|N)#ickS0POfIp%Xn^Qa=sD==>yw}quOhOSr7Q;ZOprsRPk8-9$ za0JKx{pTg2OKIjnbKG1c0Hr8m9lg_9^dJTz@nj_w<-xHS@;t^a3I-XN)#>#A=H{kX z(?Q@Ef{Sgu5Fw${c6e)iQb*@^C-o%qI zo&}&2nSqmI7Ui0yD567ep@h>xXCe9i>);_g2#a;hnGiGl^77J=QOH1rDw#}Yy^iQc zt5q^$;^3_miH2rG3|Xs@#q(c?(hb$n^qy86n-!xxJ3C9lVxPxT2~?iM@`fI?!0Hez{rNck`uEGO zqB`$Ad{tGagwZTUYTk_sv7@x&H9PhX+H!Kj9qNqJKHZh!dYVR-DY2BRtSZoBjSZe;#nwBl7hdS~2ANp{$4tg5T@e!W_D$hMtK=`H_We6#8N zhXjj^aD`cJty^2WwcG9PgXZmnMsw^PMP695S-YHif8afYZoOQYFwsx4JqKp9x&8R* zlgBy>M>Dm$S}tuop4iE7*!#4Kmrup|%a>nlvG^;=5Zz|Iw#j5_!_la#`69E)be^il zt4gs^0xHf$QCihjosBBBw(&SBFY2nc(RgIn*FV|a*FQb!cH8YC=~}zLzjr#9(R3c~ z{qoVZY){f%W&7dYhNGby=LWbZs(-KR#uc5M44jd>0c}`lY~SB|pIej{Hzzr?S3YH3 z@^X-U{`|B3v0D23w~d<9p{-MPd|)cmHK&gbzHm6n4)=M@TvE8>d--{@>RL6muJ?C$ gUsGs1qr1xc4*U$FNgj#6IRF3v07*qoM6N<$f)c-m*Z=?k literal 362 zcmV-w0hRuVP)K$;nA_GG=e@AGiCXbzSHBzPI!{|ev1c*q%}$hdEFD{E{eju^s@2Y z13)+cRaF@XfVLnq3NSb4=wW)fXV0)AjJm)>is=SQJc@|K2z1NrVmup=@>tU}Mn)03 z1kV#YfKltxWfCzq&$IcuuHy(A&7-h(kN^I&V4O=(bqgNMC%Q%TR=4X#O8@`>07*qo IM6N<$f}LQVi2wiq diff --git a/airdef-mod/assets/airdef/textures/block/metal_b.png b/airdef-mod/assets/airdef/textures/block/metal_b.png new file mode 100644 index 0000000000000000000000000000000000000000..ae08c22ef0b99c81e5f23bd0c3282b86102505ed GIT binary patch literal 1614 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 FV1kb~hz$S$ literal 367 zcmV-#0g(QQP)w+(#ApxhVix zp63srnRy}sfCx}wSr#kH()--^-F;#yAs$kLgOH5AZJRT|1{i>%D7+Y;v>teXLrer9 zMlg`h42W?9Sl9IffZnJkogS$`f`B!+bjUD>B#h(u;v@)lt6o5WZDfXC0`QOZ2e zPAeTGHo`_U7h0qhVs6`4g8F0@1oTKV;1P2{(s@N~f%WJ!@lch-M$^|SHBe^&vVIrn z*y!n}kx#%{xid(=DCkEe$Pr6tfKvmK;L}4`HBI9=RAxSE{SzS_5PP3NbeaGF N002ovPDHLkV1hXKpzr_y diff --git a/airdef-mod/assets/airdef/textures/block/missile_ru_b.png b/airdef-mod/assets/airdef/textures/block/missile_ru_b.png new file mode 100644 index 0000000000000000000000000000000000000000..9ab6a9bef031cca24ebd7364ffbcc15de28bca01 GIT binary patch literal 493 zcmVh_Yj8-xC(gu^I}*v|8i<w*G}%ZZI#U~+P@K|(@#b|d~C3~zRB?nX04Zsfz}N-#;{pE zpc`$Bv{e!SZF}T7M4FgesO|GJFdL?c^^Tz4iN)jjC|X=Mo5DmIN!}sY4CtEG8_Rea ze2_j=PO^O7EnT7Uc>mold^lv=lFdhNYl%d zT~7vf literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/nato_green.png b/airdef-mod/assets/airdef/textures/block/nato_green.png index 8109d9a0d5f56d96299bd7c928986dba2eed02fa..541d3fa49bc1ad25fa2c242adbf18216a7bed208 100644 GIT binary patch literal 8209 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 D#d&zl literal 1917 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s21.png b/airdef-mod/assets/airdef/textures/block/nato_green_s21.png new file mode 100644 index 0000000000000000000000000000000000000000..c068e479e4a2405f0a1220270a57cbc0fead1799 GIT binary patch literal 8261 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s21_b.png b/airdef-mod/assets/airdef/textures/block/nato_green_s21_b.png new file mode 100644 index 0000000000000000000000000000000000000000..27646dcb38fd1bf6ef7504385d2adf96e483c69d GIT binary patch literal 6014 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s22.png b/airdef-mod/assets/airdef/textures/block/nato_green_s22.png new file mode 100644 index 0000000000000000000000000000000000000000..b13673145afa7f83342db763174dcc4b6af46ad2 GIT binary patch literal 8406 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s22_b.png b/airdef-mod/assets/airdef/textures/block/nato_green_s22_b.png new file mode 100644 index 0000000000000000000000000000000000000000..79b54ee8693569d7ee1f10b3efbb7ac6df7c051e GIT binary patch literal 6095 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 V-KLdk?-c+5002ovPDHLkV1l@`dffm3 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s23.png b/airdef-mod/assets/airdef/textures/block/nato_green_s23.png new file mode 100644 index 0000000000000000000000000000000000000000..d9fe2f440db324c3b2d2644090aa3d7ad7c98da0 GIT binary patch literal 8413 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/nato_green_s23_b.png b/airdef-mod/assets/airdef/textures/block/nato_green_s23_b.png new file mode 100644 index 0000000000000000000000000000000000000000..ed04c779ef98e0f9f7d370516026e884284f331c GIT binary patch literal 6268 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 literal 1833 zcmV+^2iEwBP)>C6Tl+9Q-97*A{`Z{u{qKIAQc75BDT;y+0>+qpFUyjq zX^;_P~3B_?76SKr7g>Sf8OtZ67nM2Y}+Z~rK-6Ps2P zJLmEuRVHIX$%bX067w1)%yx+NTodp$@wbUKZCaPpH z=4`WV+h%z?8jbp$%SXA35}6buG9T+iIVz}Kjj)DPtA$E!EozOcw|dvnq&5NBr3PO+tBVG=8hXdSo)TJPw(E-Mmw z4VfY!!(0CiBahZ%LX$pV3}BPiMm`8 zC@9NBYJE1SA2Y6?8E>ypl$?Ox<`#{#V+ri4XvQ-#t65I-N960e?sG`iiWBmz38x_v8O@bKA7qF! zRVsqwOjc4QLKA7MWu;xx`m+)mDiVXbD=A4?r)4SMWQc>}gsklyaIYuTQ(2(3EO5z! z>Dq*Yljn>~!Pe!iJTC?XZc&=+`8BM%_Ra9fH<4GTWs{<#c(ay8iIUIIiOZ{(`bDB# zb|*uWiVk&N6Hr5_SueUoMv+xVtP+n*4l`MVM7i)l_H>XZ>YNNED~+$btD`D2)G6N; z!5j`H8}U>#RGuY{A}Dte6eDtpQ^Uj>@_>wCX&xMYn+<9F#W8hM?B;LsK@(4&<)aFS zV$E*#epvHz4HH<6J$vzzF1;dH!|Vmv&@h>-_w(YcmaA0-3YQoZWok%`YKh9cHZO%$ z9TJ)S*_?(JlE=j{VX>gCJC0^Ady>*n<|-KON|QsLwT6d76Ht}tyCzspWalX)pKL|v zTS9B_v0$?K);Wq-{e_l~LZgYL4M`WNlY)REqhT64ym9G5cIxT;znB!+-dM|X65cnP zS4Ko@Sj$lBTZu(?t_Tf@N)t)sl|8l3?{0p-533@pRITMLdJ6fdMrAic;!vfEjKZ!m zDzAqT%_n6<?rc#jcb_S{Oac^EG<9#;95@}LzWwoiiSXUJtQ6_ zBR!aCDT*Wa9z3S=hC&V`OG7Y`(sb0413o}!OaA=T6K?NaW%i$!5E@LZAhm34te$IB zau?nh8doAy<9h$%;XhcmLN+5z1Bn(hve=NQTSJOa)EHJ$U}xid93Op$cah}B)J4cA zn&;0>FwtQAh>fj_=jvZ~sP(N$t7Up??^;IfPY?ffhNN+HLS9|Kmmbq3imMxMVPlXI zz!VWe#DxV;jy_(R$(YnENU`JD$qOcHm-?=zxgd9W*QC^L_xYnkMrO&!@9$+){_wYN zu(2iB$S4$qm5BM|x4%r-D2E|lwGC!8qLPNca9}+#wIqo~T@cD8#*Wxszt}UQCY?er zg?@aKcCZFFcIUP3@1SngJD_fd25L`{s zBsyDjWjgJXPwHRCkj`aJOI7njjca}=iiNyvtZ%Y^a*DAYZ=fipueTJzW2O9@r|}J2 z7boYASV~e_p8CfmC*b3!&_+@l@MF(Mx8CV#UK2J`u~O}o$!f2Be)60$L2NB++ZTFx zwfAc;(8i?vF5|QNk1=D9O92-Ok~4(P^2aY9VWT6oo;$auefaFKmusV$tgo>(-D3CZ z+Bw+te4r;FrRe$LJg>X=@DRq4aw!f*LhMMDlx3vpD!SnCEPI;HRiFlxdX;W9Mnl$< zZz{9De~80iT)DxOL(NPDBO-qdHi0Kto5X&7FfnUlFKDzV6ys=z8 zN)E%8tW8L3Rokp)v^Fep=IYjVU*ETGZf8ATJou+%D3u9BpJ=V2>H;n!*!3vN-~0aq X5tdt5ubq_^00000NkvXXu0mjfaIbVZ diff --git a/airdef-mod/assets/airdef/textures/block/radar_big.png b/airdef-mod/assets/airdef/textures/block/radar_big.png index 9055fb8e3f3e99352d91d206d6b3b2d981daece3..94b52da8e3166acc1131c845ae600e6a21c960b5 100644 GIT binary patch literal 1087 zcmV-F1i<@=P)}ge-iBOc9sz!yXH0ExdR?KUrArPx=F_TItOH_Bw1B;?^Sv6 z{l9M?%KZZK0YoB zB5-nYQa(OD%5u3ZudlCVe}BKcy}iZe+uPfMeX&@CjWx9Q_xG~5w^y#Oughw+8s|NO zo;}$4qI|aY_)a$U-MTzIJ(X_#qdY%9mu_OH|6E! zCFW_&vwr9{<^KM@{M`02?l)&)A3FE<)jsrb4lN>}2i!<6xIJS$I668CZ}B>NPfvtS zPfuelW6$A_HCIZ1oR+B01VI@0Wsq3vE#wb%}rp$2r!4;d=mlpGo}|$tXpOexOv6GS&c+ja|{;9 zIiBblJvkR65t(g2VueB||9FXZ`5KayT(S6A}7 zQ3qgws3t!ml}3)ihzt-5bC!q=TegD{8fSQJFkrcCED+Uw<+C{@=QMH_7-=lnv7}*S zs2G7YvM2hspRwmx7F4XnMN~p>JZAztCsf>C6f>W7fc>(9`Hb|tySp)hnL)IX1>6vY z+Ie1i4|-|C485;+2_iwKU&>bc!C0;|<(hsu^;^8}A`4zY_BdOQp;wLN&J z-m3#*Ol_Iqpacf`@L;Fm>yfYFVYi+r9leSe5o&fkuaVmIS!q3=NKGP8{&)4j<-gwZ zSzT};&u9Ek>;J9;bqswY0`Z~o(w6IiIYu&Dz<{r%Ovp6>I-*X{a;-7e1LhW#gHpBL zdSJxJ&~n(`22svf)?}?$M|=yw0Brljg5$<>Ih;9sbH+DH>@|(19NGP;k%WRInEK%j%RwFb!4oNS_J%_5d-Dx>w)uG z9WdkZ>>dBi^Lf4Suip(*9T|0i9Ey6IxdH-UW;;D+AV8_tz(Zg*@|%;&6dG=Di+bz38N{#X(D zI{EJV`v6b$pjN?^&#ccC6OofWRy^v85einwwx*;()m#(OveMDi@>~aM%fB1ck6c@_ zHt#nI;w6477%Ic(L4KZxURwsO^NjNkP*dd^)1$~S_Xkv9Rf^bWv;P19002ovPDHLk FV1m{G6ZHT9 literal 442 zcmV;r0Y(0aP)%{--fU6);-#_$>_@tyW2LK{4{a-PH)G;;OR2O7;U*+8rE*N zEv4k&>-E|~2!6(6)Yf(Fb>t%mBw^5MwVVN-I7J|1crL4c^!D-B`1bL_84%3TR;!hJ z(8v=nio!iHKs-0wbOxCup3B5Jiy3DqgUm%VaL}8F^Hi3lYan##kZV8_Oz}p8`E=ny z5GWQhOrSg+f4dh$X}}o^ch6Tz?-v5!LYE%Wz%PZ+FplcXn<(UsRaH5X&d`S`m!v*S zi3b=+WeS9vv!IY~7-(O_D8fLU325$mtJKf;L3`6op(u(*10iV6|BaX?<$EySybTTT zAdr;GOaZ!hOvo^HLGNF#eeo%BRX6_&nrQE}k=h645joO{fDqL=-%QP4c@~d2-lrgi k86T+ph~;W)BJ$eAUv=J`rww1JQUCw|07*qoM6N<$f|s_;@&Et; diff --git a/airdef-mod/assets/airdef/textures/block/radar_face.png b/airdef-mod/assets/airdef/textures/block/radar_face.png index e01c2ddf8a67af90bcc37c9c887e8100dc57ccf7..e088599574cdb45fa37798fcd92f83bc9e1c9981 100644 GIT binary patch literal 1009 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 z zm7=;O!5D^UNL05pW`B|*^+INhP{z}|s{dFp<=762vcTG4z@6_n1@>Ofkrlu^$?^Pk zQft5!b=*?yg)v0q66HdlcVa>2Ufy&zTL=ak?+L}E2IX(E#w>a|W<`Z%&#gtI1o#eX url^&!hWJ_{l!~jsAE#!6+djzo!2bX*xh%{vmP*wC0000Z*OnQFbw7X{=UxTJ8flUrOszO^O19RcUKOd|4@GY?e{vK&KW}{Iqd4{s=jAI zzSC)}OUpRIb2#f5V?5v4M`IotRROHXGmUq?(;|$y^a$lWmggDE*^_ycLK(NLZA#6) zYB5<1ge`qot>&s#z8gRC`6Xu2P|PRz6B;*esFNm*0RQ2I5|0~hZ`kZ z8=j#Yhz*7+n^=HQ!*+CZH1Q+6fK*YY=Lx<}J3c<1@Twy2fgBQ{Jp#Z98YUfzm@6EL z5*QNs*VosLs1Gux7TM<(2(hpVp}jH=F-H_@L74pmlZo#LfmmiTC>SYRh5?T6evirA z*#BV2fPmA}(+L-Bor#36L4&nsy%Ug;?G>wBGaS8DH0K5~AKy+`WI;L+;e$a614qN* za5VAk3amyLho<%E*x`x-pb4)=;K4dVu-|OrIb=OmIin)6zrSB|c=7;+1jzFK;_!Jn`s1&9NJ2FVq;n8x zIpe`2c#`&bZ(dgZIhmyEiWWZ0Gm}7%@18z=GO1|3Kadla5zWeF?9rpm^5>Vo>)6fB z&HwHxf{fBi6xfeIY=kO_RO_u6O1a$gbQvEV_rTLzvCOx??t;_T0GD>qp|`TWP?hVd z)MTTdPC#Tt--yV99`k+_uL$-v+o5GBT?s*hZshvV>#Ly^tnOLnKNjrn?oQB2TU%Re zkR#kF7Rya$p8+vj23~Y|-;1e`);tV`SXhBj4qjhh|K`>ND(t1?4<^Pkf6*L<{jJ!3 z%>n1<=k42>&lj6^At?{daSX&sm6a&t*uuuy&0&V6zO4En^T7%YzR~Dsp`d6xr~Glu7*4_U-N`H0Nk`}w&3sO z36c_V@B3jCN2V2NE?achDF_zrE-o%61WQZNvNcAbuZ;8gd=hd#xFw~c3G=|s2=Q~# zCm)A11WlD?&II=l&}c~Qjy{Rl+GUxug_Zs@eZ>Q1N6rfGt<$+Grw!%Idw zvX4C;&vn~wTz~kuetv!qRaJ#XqY+lCRamdr>C+gk=0xI!Zf|eH`T2Ps^L73&LY9w7 zX1u$*%NvVHEySii4@t;!xeSxZB=yCEVBf&|<(w#CydzI!zTRE)8f zOvx=V=2&@>N-*PPn=P_D5kGWra8L^uUvwlC^?JR~@Ap&R6VkJo_^X})DbE2w>wABHKRi7>WzV{YB!4^}|Er4iCN`810zgEy zLOc=G0g?$p5z1z2H7|hEKcA|Cy|j5gxR#quaH%JYBP3&f8bXc@)IW;hwc&7BOYjWE z)uzrp`KV>w3V@K|4n+Pj&gY;6;q9EnD@z`{;FeKB95i^yOO`dREE$g%G0IO$jYl@X zE#QGeuq#9YvKf3*0&n`M_`h?7`AW+Y9UUEo*=&}TLw-%M)n>7~w#-uN zzE^}NlapJCr6j0($8XmD?{~)JC12q8dQV6Pr4oc7=KVCq?X>Is;mC` ztGZ_A!{;xX^?KcbYHa8TYxl?FPQ2chCNCOHT`}Q#m(SI7ujqK~BbyA0>$`)OLjh`QphMlrb_k3?xCi-USfKXrNSk zOZxVkPN$;?cobrdEQfJLV0hvHHUYPNYyq*vzbA~u83-tz1|9Oth1IUgr-G4v6(jDeSS!Y6oc~hQbNR!KdL{8a^8*(>{&6#kb zCj?O>_c)wDndNdhx(DnoCmj$-Dvr{RDqxjntSubyU7mZK#RzS!Vy-0=@0**O@|)(O e)G|OT^M3#=IG|h>H`vtx00000? ze*SY#)#T&nuZx$LmoBUC`|`V3EXu<-|IO#~@?YN9*4Db`=jWB*c|x0K7>2?h9h1qV z?1e7$`5v+n0r{{Jm_nG}2!bZR2+ubQS{&fp3&+A=48Zez@Se>uhZyBH5-(Vxw-JsQ z|AjvMJVc?#n=C>^cy@Ppt1{?pAc`=4Z*Q;cq1?)l@AQ^ml(HFOh^EtN`9I1ql01{s z>=jS?zR;6CjKWyb0pI54=BtsHmp|T;_#f8r?fcJaX)JR^IAjiW_Rh}Es*vO3<54Am zAD*IU7=BAjP64>{i&B>lfPx7?o}ZtO zB4A^P1oQxwvPNd!OBuq*!Vti=D!fq&AKsES_YZ>+*{PQ6>+9EEGFNwV=OS#b0`IjE zAl&c}L83tFvSzbcP4#ehcQ^9d4TnYT<7wUx4-YH-?d|QTNm-uXi3U1KC*0rP?;al? zM@@!^n8`+k##L~7dRo2q{J`VZ0UI$qJUmopcQ6>-%MG%VlampRyBnR4!9>YDJv~+Q zgPp<1C(kIwqZXhMcyV#@TNO|t0M${!c&Db6VcXYtc6Pd}tE(Dzy!0RmWBNdg9gkvW zN!l}2VVp4JhG2jm9smr_7_^1DPI&NcyZg5_@7^Em{x$b7o!xfZ+uPmE&CSSS!r0yy99oup!>Wdp zwQ9JP)}M{EUf*VXRCjFyJ`XRqXBrKBzC*O9>ni(YnLmiR0b!-9Aj{JcTwoZUuELXX z;K&X}Dy3)w4;dQ(sxcH}F`~Va`OJu%l4=X{r4i&4k!tbsn$~tmyvvg_pAD*AZ`nJ1 zW$OW!Z?Smn=s0%<7T#I`)3rUaJ1TV~8xYP}`^{=Qr6cH@F}Siq3?a%%>n|wFsZ*He R@7VwV002ovPDHLkV1nIM=raHS literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/rm_khaki.png b/airdef-mod/assets/airdef/textures/block/rm_khaki.png new file mode 100644 index 0000000000000000000000000000000000000000..f6d0521c05517efdd80b453caa57bcc34211e7ae GIT binary patch literal 1085 zcmV-D1j74?P)%ES;7EY+3*3m6z4 zK^`+^9r%uGHseVq_q_IN?Z??O^!~$}Ubov#=jZ2XbaXUn-s|;JqtQsayT6jg;^LFM zr=jz@uJio%_BQWdTwJ8_@$o#rxw%PiUoNGOpSJT{qpGU%)t>H;jg8&yb-Ud>5iu8s zhK7<4tvMeV87cSuOkXjV;(m^@T1#QhxnGH?3yi|CbZTlUTYq_ZnF&D&#e@I`Fnq1M zT7#N+Xgug-V8gx?4qUafuIL1U9VK4`v9``1bv0 zvD%SEIEIRE#R6+YBxbIN<_LBxJq|!lOrJlSD*?$l3W}Dy838BO21GCi9Tdx2Td;}- zWpNEd0gGU)*B9P-p9x5~B^nD0Py76h^;i{Qb>$SW;uAB2`&ntX00oF{jlI1enTZPl z-abb6!RWE1%;B!qZeXbm$rf0}<(LT`)j)|7(14JPI6OQoLP09lof^#{cIz2l(cGT| z75kpX(2)1+kvSzZx|XLd!1I|Rf_tFBIxkADyj;hbBRn%R(;tM5`wKc89v-Gd_MzZW zFT#n5i9Vml;6fpkfKGP~4i5e)(6|>)g}b`CdLSIj9F=yv{U8QV!UNiQ`#JO4bJByu z2QlJI{Jy)w{f*0_V5g}(g56JEP@K@eKKEF_>R8-7z;Q{HQ{leoI78oaD?F;*1^C<3 zYZT2)g>`d@af|9^>wkJ*?g3C zc6QS2Y%6VTeMu`TFVg1b=d`@Ml-KL)@6!JMex?zvc!<~b*WE1KW5o?YmcF&hr4Bls zPHHxr1tyJl`%nJ1TCMz@oSe*G(P*gFYkqoqnrTHR#`ANt>393=!TSR5v$L~uzb3s9 zDr?aC=%`aPcE!BPMfi31aceU3iCGhW*;O7G{-QxVKfjRuwz09E_tw^4=k@C9t3G80 zrEu(k2xt^82yh64n1b5pVTlhHLuh!j;YLuv20ePUN3p&Hp+~C=Mo6sj`l$iIT`2Bw z^KdcBYslh%kBYa`-qFO@Q^Mm*3KCu)yoaa=K!1|G!DPrS{z!q4`x$i9l)8(&csXL_ ze}Q+eXclXCteC(Vdpt3vDfQSwSt?^ez8B#3x1ZtvZaiav)*Ggc4oRTdbRFN)LLPxB`RM%Q+7Zw{0?*XG#K723M0DohOoSyl||8_+M=;s`<*gv}B zG4-NbP0pR)yhsdc$8^WrDz#)VcgFt5#!GN)-!R}W#y3yEyU6xa00000NkvXXu0mjf D6{;Iu literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/rm_khaki_t.png b/airdef-mod/assets/airdef/textures/block/rm_khaki_t.png new file mode 100644 index 0000000000000000000000000000000000000000..9a2930925d901dc0978c8e4ba0eec487c556cb4d GIT binary patch literal 1072 zcmV-01kd}4P)j2on<%6&c8t4CEt+_lQsgYDu~NFr-w@;#_C&NSXge9tPkLPQ{axlZw?P z5-bdY(NWU-`T2Qhx7%5{76@RxE9NW?4-aP;U4bmc3p{g1U)mEgjYgw_rlaVz=+H_b zaL6EV15lv7!NI}gZK-Bn-@JUV%Z{Of%69#^xNJ2ZEPBxfif}Y=6 zE(4E2BF30$qbF4vZxQP0mOH(Kh^EXJ7W}T9P{J3twtj{Gu^NpBq1E~w_V?TO;){13 z&dogz+uJ|>NzmrzW`3WYo%?qK=I0;fEC+Tnz1Qo8g@u_MQ{bn`XlYOU)6>n+Y&KJZ z0zGo!(Y_~lG5}%fVuy!^X_F+Q-pjt=rG+6I8y~Y*YiqB<-rio~rwS-xv$L~oS%Svk^1kn_6k{Z8 zef>k;UtL|UIN_Dz=v|$~6gT2d!vU_cJNmrv;j*~+EQQf?1saUjZ;ZjYh-G*$W*0#G z2+i2oSPGXLqJ7VSm6aD2<3ZEgxO7NX?e&}GM1|*!TAy+rYjVN|k$8rNhEf>u)<-c2 z;-q-dSNGQGR(pE|GGL?hJTyByJK10l6||nb{vOraJ(ljNdwJW1#fQ<+(NSgedY*VW z`*|E49ZfHKst??x7}&`TH?~ zv@aPYiaCV6tIYQV^HMBtG|)Jm=Z2RY_Xd!o0{og+`}*m9B{1K<{|rx`{O$kuS)adb zh1r?u@US_4?d&d@HQkEKy`&s6A_Ma&j`m zN*8mXIxlZc7*JmGTo*KT1j9hwRi1jP>$%q?4{?>}WsmpXPi`<1Tu&NCo@C{BftC*> z3G#MIwtMS#J|AG^6`$}$1eGn=GuLD1tymt(3$KzgpEz^lioB?2M!(g1PL%P}liGIg zo$sb3#27t6woW#C=W;`U(-C1}Vhqas@&awyus}55ygQvvC1Gy+qS5=*)Ku8r-MyAC zT53AS$H&)@E59wu5XF&^k;?FKrDgj(Jv~h`1I6w=vjEz1D1mYw!+e_QpPB~*Tprv~ qhphC7#^bYq&pp2bI9g0kh4l}`v1G_KaP)7OHRmsf zPCEbJx9U2ls;jG8M@Qc$6EYfR5V{>TGQ=z%UI4i{rK`Gy;%QHWv;KkN_%@B%fD)Vcz8&$XrUKvvaqmFH`PME zagFAxs;xQnX)SZ~RiE}QJwiwEe;0alb5oHQ&2vuk^Yaxs8-pwYVcgqOIk^b+0W?P; zZJ??Jj_&U6uCz5LvgSaTgJMEnWlf&YOclY}41ww|)JUrkw*cTJ%V!7MsC`CYa44WJTMB5Gv7jAU$XzN^lx zc6Lo+K&9L5S9Jc>_}tuFbv~5lWMB%M)v1S7fD{IBE(-P@4$uE{MEvFU_O>dGVs3js zg7}Ck`)Exy!PvahS#Y}j{5!oU!8pgko5NTF^V~0E;n#^~DMCXfLpWgMu0wQ39sicOsx@8rrawqYpSD zrx#@$DgR;z1?fjoihI7x$i5KtK4E)%yDZ+_-7U_uv$IqB)z+NBU{D!}7gDr;G*JN< zZRhbm7HsNH3py#MjQ|iGb(Wm6k82*Oa%~-fQyVFTem@0Vcql>)C?-8T{5H|g#>VTK zkU-h>^>ym?dg=cDzJY}MeHPtUS63w=(HbfG^XuD^kN{2z$^QPQ$6Iu4QHe<&9o-RW zL${x8zwu&pgb{BeH*=m{0Vwqv1>(F71_O2MX8sHu3#^q1%;c6f4>u$!$#4RRqiO90tC1p#LGyf*ITM+W<|dk zUE{4Qnd*D=zMz2Lbj}cpoSmIiyAmbY#G@&j$7B~X6%CC95uB1dG7a@8xhje zHc%ZO|EdbXz^td-#l_jbJzAFipf$lJz6H+DPaAImNABJqPmkx7l=@~!Az$+c2B>Iz zn&rX9BV-&yKF*C3);og^cMcYNuIEoL&zNSJBIX0UjN`jNzVR0khDnZ+A|Vj~0000< KMNUMnLSTX`(DqvZ literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/rm_pac3_t.png b/airdef-mod/assets/airdef/textures/block/rm_pac3_t.png new file mode 100644 index 0000000000000000000000000000000000000000..6b0d56ab044a9c6012225773c60a67f348e6d4e9 GIT binary patch literal 959 zcmV;w13>(VP)5Qe+QBk@>(ak3yApC?BE0S7@@M;rvn<{-I1R&2;?crGFb$H)d@d!p+2YyK%a z+fdSIW_qgY@z2B+`rt9`Ro6XWb*6f`- za_qAG#$&wp4izk7fL?6mJIWE@l_HCEj8wvrY+$$B{p<28Q4wC5qUC@+5NEr9Q)3Bq znkzm}?AqMi43o*^ML~>9xn((*!#kVJvM`Mg!pQ-WNsU1$0?V=t4d%Cx`*YMKrzPn)kTdGEi(_5wo>C|kLJg!iZNPSTT2ew_jbDzhQnW3PP7mpP|J{z0IAly@$`DV ztYCkCzmcRS%X_=NzMe{y%E{+TRbA9r40L#5mOnl|Hu6J_(wGu+^<3*7xmu2k-thuI zOj!8z^wfY|J7d4!&x#HY4|9G{Zq`HY?*|zHJLPLY^W1kXLSv-m=)Lpn z8gF$ZS5=HLCl+3-5N$lhgK`hAdWx|q@kX(p8WBqQfPjCERqzpayi|DEhhrLZeKy{5 zG#V{66MsDWLq-ku#wmHDcX!`~ySv+ljCgzdBb^0}#loi;esinpgE#Rrih_P=Lz_Ah)JbdeR>~W zlOpo~mI6Jf=s>AI6@+HhBn7|!QPGo@~B=3r$|l1uZ}2As0X|$zAnlbaL`B93OuO|AXSy)z{khcs<|!fT5M5gA54x zlG7Fs{Ef3GF6y3K&~Zy=LN;k1(8)&UKqDN`zF_0n((vm4gm~980_%x=f^HFKO)9Mz hH3a#i(QxUc{R4+9MGI?U6A1tS002ovPDHLkV1gxE&87eV literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/rm_ru.png b/airdef-mod/assets/airdef/textures/block/rm_ru.png new file mode 100644 index 0000000000000000000000000000000000000000..bf483067a8be369ebd0bb5c83e014ee11961ffbf GIT binary patch literal 1008 zcmVSM_$z&QIt4em~vc-=`nj?~=x=uV2cy#_H;7y1BVYIp;K+&C+x_ zO~c`^tk383GQYL4lSU_>%iPk^Qo6glD^JN^US6hNua~}WY!!VkN5^GequcGKT;5VD ziWnG|fQ-wK<~p5D`RQ9q0L8$#hRf>7(6{8Yw>W?>M)}r|G8DKXJZIfy0UmWZNcL+j zgTw_vs5v%Bse9`l#>mBYmmxw#HM@tt834X60E5Axtib^XRC4<0kOqL=xks=6MKYOS zM67w%@TjV)GKbR09S7&YV@g=hOnBZHnvJ*2s3*;bwmNlJRA-}#xhFDsF&Wn(=V-F-Y~Rg7+LZ`04WJN4BW^xhZrt{aiA zWqvK+-h7{qN1tjg)xAFF`da?&&1TX4`efAXoGDZ`yo-i81u+HWG&Uw=JPnGjU)vkk z@-`O73Kmo1z&!;NpU9tIdwUDjGow5n6-QnwmU-uf{GvjX{QCA35doeXE5TcTrz|^2 zwbt16-1D{pQ0|;LhCc#ell_yaJ)2Y)jnfd*)b^iad3m|vMD}*;o*=-vrG+}cSZ2|| z5nNkaTd0cH*VnZp!wBn=^ks43s*Z~S(Q z;6+QJ2bS60IdlGg=gds`@zaM*aZjC2r`T-nKFhK!Zf|ensDBzo%r{L_OsCWI&3cj6 zJw=j(toS{;IExZo5dwC0cH%!h5`J@Y6Gsfwd+$Y6{F={N2D>aDaljo72)(|(ZZU=s ziuHOOjle6EXbtm|>1CQ1uSPu>iW43ct>wFX-+%cK!+$`Xza{w9@$s|x%5UdiHVUc2 zt8nSv)4;ojRm6X-0aRM6Z>3Y@cyT@ae(R9DERwjw$&5<9xGPts=7{R-+q+5<-jtc#9&hsJ!OA z#}Ji(a>DA1yb+-cED%~ZMsvgAFeyAdJbaV_qLvICU7SS_;;}}U!2@+KWrWXpTOl=L zFdo@p$(vEYBfRsRA;dk6$Ted~6P}))o~HGK!JyT^s2Cy;Bd@){^HkS$F`LaEh2M=K zmw4eG`Q89|hsDrT>P^!;TG;FL+8c)D-g|luK+(y`NqRpzI@$_Ae=pUDJPm}$n-24$ zy}i9+xm>pTg&T#JUKOO4Ds!g-<>#A`*Ssszf~%{m1Wd;csP+h`3Q#7jsDDgnla@iH zs=%8^?t#dWPj~c`V2rotymvSl-MO;g@Bh)=@b#NPdVlx!p(i{=B?l5(u7gjsZ3E(8 z3~O({n9c91rUfqBaKMzy;JuSK9Yz-TsYY|Df!wEIJQ*iG-;l_&_~?FqSRn<$x6eFh z-WACo9%x7fU<39WnTC7U-EJcpOZ4bfb;+l^yg)kRn=7Ol3rEoZqB=W%0+ z+O~Uy^Q)7Je?FfVp{lADv-kb{T<{c+|I7LEdq8e@`QIMPpL;wnzm7g{@(qbF=Eo`V zXhXT2j9U%IZ$W;<7jX(g-tO*h+|b|;-gx}1M?auHV95CLXF@;5I$r#4k%L+Ca8eX? zqRav1{aYSmy*DE6hz>C5pgBn8n%}N52E8G_{WzlauFGeB(R8o#<|Q6&PLLn(nfDv> YZ<-Gh<5kQD?*IS*07*qoM6N<$f+u3m>;M1& literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/rm_white.png b/airdef-mod/assets/airdef/textures/block/rm_white.png new file mode 100644 index 0000000000000000000000000000000000000000..a4177af3a37b74083c48235ae3e858884f5b96f6 GIT binary patch literal 1088 zcmV-G1i$-s@5QW>r2#^3zu=nIB2(pTlZ8qT+$vKi!fZzt%FdXV~h<3+cQz;@8y6QpW-BWz;rs4h(0Ka!V;Bqup{lAdnM^`imSH-b2F7eQ zi@%LVBmQdd=4KVf<53umMxo#Dhwbg{aDRWF_U!M!2udgRPI8tDgAtibwAYlQNmndW-#&AGU zLIwlq;9XJCyW}Msf7$HA4dEqT$skeCe06m-Ie;F?3bY>99Ej#bwm^{&H_mqy>6h=C z%PYN025`_L=gGtpv=L{^EOoqbJfc&>R&ZqT@A{`i_U2pE9$3n0Ap zWZc?PG_Pv(=^GU@-&5z6#3MwYmK=?V?+zRa03su*eNR}*ndrqNBplAQE6*E{%X+N? z(m}bbMk+n)Ddqnt@Gj<_p_q3X3dZtALmA3zAJ9~g3=HoH-pP)SkK_F4=qSFQoSek> z!^6V`+PqO=2+-sK&Xk^Pj?9Jgk^_`?ISjBDBRB`ue$K=QEIaKGuBuioDtXKHE|=$u zcSI=A<6vX7E-!!0r1H*`#hYUzOO}( zge<9V_sUyrEnM?C^*>&b?f+-iwdep)VD^Sg!HEb+iS zM!?G|FUMLU6h9jbzsEL!sB zlmo@6XaY>^19Z83c(cj>mU+oRTTX|!W~cZ1`cHB~`ScehM||C(X84bg`@i@${zlOISX+G)6>(0H(>*Ng&gd8*I-{1 ztnmH~HTVN@>-=J|Ncf{gF~2S1@9hZ>CpE|ho#KD!Fq&x z$gq4moy0ltVVq>47~Dx`WWa?e59{1h$5%tfp#WZBFax-VhKJfChk?wiT#-WpTfHD% zUS1}pqtU1pDU5f8`JDaIC1Yb6qL2+L#Y#hvanvjN~lFdvt-OP&4x4At5S6{eC}r?m6v{@eRRFXy=v_ z5C|}$VuFXBjtFvmudc4r`}z5K>TY;QBw#s_$eR`W3vnPXtMmCh^m@I29V@G95xc4i zM@My7E~l+^=ZPESPM|9q>Np=99K-_Qb%1okYUhBmKuX!;jK?Tn^L9*Ri`8nrT`Z=p z+$9T~?GBAc#i0WZB7qa0$~i&H&1RhhIqAUPiwRigUTSZCaluQkpkx~mM%hZC{Ho*% zAZU)G-;faOQS>&9@#2ivk!XlgE>A7BW3A`Cz`LG9!g#GUGtlMoDq+ngJeK8Z$AruA zbRv0fqxkr^7sM%VJk9}+NNh^9MbG>D`}_FB6Ga4%2%j^YaBFQoZ(4gCQeg6oD09p` z?D}=Py%x?W_V!J=#jAa7+!ecl72!)a6xdmoq1&xvI2jbGeRl`1n4U3Soc#K)bJ2*i zvyU&X<)hK3FdqL3*Vo^|TaRM7R3U0w#KKDNkQ$^_ej(9Qd3la$ uh-F~s5P*G7IQPVr`QI)adhN!|?dcCZ3$yz;mOYLD0000 zX>T59mfd-_s^TV!i@1u~hNQtBtlM=RE$xi}f}ec>#(P`My=pa-Vb0Iro-2e`&Q?n~_U_@(QVB zz&a@Fp%XBFejd3*6gVU(ARSZUn^} zDUGZ$N=jH*ID@urzWyW0HVr7C^Mp}@phRz%+7g)n4ji`Z~xY_|m8>9l5 z1RR9}j8B|~sgERDU?OxhIJ0m{c7Nyb0gO(F*}>+FAnTn_!6N5`1OuHT=FZIEr=7=W zy8}#5Ph)CoN*0h4XB6j-K^G2iYHAAp zAWMWKbWqm9=7N}&gmgv+=zb?OcU4Ek;J`ghGF(QSk^5xXtBhI)1YPy;xp)p;*U2XF zixHstv(g3%2{~C5rJ=im+GZriEYH+&K%+PW+rcW%E2Gpc7;QQ`Im;a^N>(sA!ZP|& zMlI7RFr|{IcUD0s1yi`V9*LoAGjy#G5<{4`R49oDgCS~ADT7u!s2Vb8?%dh6c?6RX zy+LCVY_`yb`)?7HgCf4T7P=I47C1dME|J5XAHEm~g&U;0h#czvsFe(BEFv@-7$oPw zIIZgrUI$p70|Pj%QIY{n1}cq8In-Ryio0Nu7-o!b?rye-j4Y#|2o&7T0<@@M;So|o zihyb=Xhf8hv371*q6&e)ngyR$=I7v?6A!l1SbAn8Cb&!WEgE>ibu)@tpjS+A`yg~g|itY0wr2Fov^XKDZ7nIfe>el zmw|ilac|=xwl{Ww;t?$nlR-)vCMy9!8!R&6#}s&P(OEAM%j+=;xPW}|TE-aISKhsZ z>mPlGVwJ2Kl7lV^KY#neC~UU39zhw4g)>w5=9?QBAD@$OEs7~kBZml6X{5xo1$5eB zb$J?_4|d?PhF1nUwTRKlajP`*g+bKyKEZNl(lNugmVn}n;+J&*7I z@I5@!pJc*}6e3PdO=JGd)M(tp5wHx2uRgnlpTBk)U;TC+FTQb320olMPKrOD1dd^{ zoY=_~9lrB5K0Yp}JA~YYv!~_n8xQwze)06^S`Y5;BIJyc4*Z_Qc;|FMxqK0SNGv6S4L8DPbk9J=v*l#}CfGfb~ zpWJ~98Q*?(8$5nsT8qNb@ZvjX<;{}k0U0PKCuhi7+3{gjhxBrEbR?gtDuyQTyZ8Tu zmtVh#otqD30r=UkKD>jM-aao2I;5uMAY?SE#!=hC5aXC#j~8Hw=)&(8FDwP%}9Kn>QcflRs?3njpyk zOl}ae#YN+A85S3`L2(%+L`0{Mc}96d$FSD0febFAGD&vPSdGvB?~nNAUn7Xzi5=&!iR)n68`Cf zb;<2qDW5G~|J6(Q_&0w*ZCV5{I_7lQ{qUoUQ~{ENQWin3x$8F*F?2;hLGpHCu(EJ)+?mBCX8m zN`uxW)GEOl2U2BM0i7wZ(D?YvZT$1c8;BKQHsF8$`yKqBk8aA&2kX%420A7D{x_fV z01G=aN+AmBRziUt!#|SQ6*=2Ugiu7tizxzb;6tK9w zh{#1&6*_bF* ze*O9-MAe`>1|+X6m;*`-u%4l9k&Hr>ORp3yC(a#CGSJ|REJ)5yWJ6sD2L-SH?aKmK zqVP<@=H})oWKTu{caafresvBjOLH)m$2TAbV0C^TF<2}wFOGn8`26slQB+kG)YV@s z7EKmL)=x>CwM<0RpXFX?Wb$+>J5#VQJBA}~uzaf54jj_W^&KS60_5dJKCdbIY(j~g zeG%P|3$=nEl}OoCl;nLy*_=p%sK6lJ!gw==y(cZ6IX8tTIKkbAvwIv314s_)Zur|U z(a=U@l|%{h*bLVhK5wV>EMgT=h>EGeHXMvbp#71#$~}lt1n8J>dZNM4F3gLxr8hu| zyZJCuv7$I~WFmE;C_o|ooJdg7KrwBR2gwXMk%W{K3J1%`IX>T+ga?PHs|iexJ6u>? zLW)`zblav;D09M`?64pM(;L$8z$5%oz+rcQ)2C1W#d}97cK6W}sH(p?A;J-$py5mu z0--GzCgAxuE=t%jM{oI~KRYTpV0mo@fBN(`a&1u(4UPhp$qF+fNq((S#f;1h5xEOB zoDPWmJb^GKIIB@QEtsLk2*M5Cx;h8KeG@ZcZLtz9Zl#0K&JVhj$VnR9#Nl6@L4FNsC5C_(-noQt zK3<2;UM8xYhEJhStHnqZ5dM>`(D2M9PCUSp*K2|w#Zr+}+|bzY3C?N6z};7vTv|l8 zz9r{=cnxfHm>?(5Ne^R_zsF;+JAnZMCWOHIqu{^1c1_X|T?K|B{j^vT8f6hO6qaZ<2aA><^Im1!$B3AW96 z;o>6Js5g9qtu-hi4)1KCavXF!a&(4s%<*vY919m{PI7>T__;wm1~l^NVl=8kIm_LTNEKJok3#OGqaqsJrqS8@*&FBO`}GfR!W90V9JKfU zB<1BwjEX?OwRP_Sb{W5Z`=Zzjrn0!X^AJTRj6tFE%mx`&TNK|yn_i#XyY~PwRYG%Z zD)3aZCE~)${OA}Af@kaY4)!)O3h!r9Z@mfNC#K~FC<(>W@F0#mh6Ot3(FC4biB7g|g_ckA*kYwqA)s-dO{`x-5 zv_`QBri)_C(6OSI;OHW`aGahj!?3{Sh+++@SlZ&Lj z4v^^mdDbK7K6Q9|Wli|Tzin;6HX4)zmDY$I(={!#46azLG)ypPt%qf_2c9XKidG{N zFKUlFVrsMkYy+}>@xdK9UEn4Jc3@mV8;Jwrs>2tLTGwKe(c&^HK|8WPdI_EEz{A^* zuzYD6CDpLTBSZ}f+IN?i5sCV+h?zbFL0DlD6?}+5c5-%^E$Dz)GE>uu^&X=}X&RW6 z@WK6`U}#zrpJ-<)jbxRKn^rsxR+SUF9AIeTmJEG675o?v@nZ`3QFplM`+Pa1yXzm_ z#JHVBMcbU9#?W+%<_+NJ{!)?ADy|W7Kuw!m2cR{Gl&d5*uBOulMR}bK?yo-pLWQa_ z0*H#@fEA-E!_v~?KxwXPh2k8lMz}Fta-#M;rB!h-4yYRLWCs^B-dS1bDQGH~TRRQI zBh56J0IP^c5sKN()^Mb{HbS3FDFaCuOpF^J{vfr1-@X48A~Gr|8ufTUAZb|IQXMR_ z0T+aFFDrC`=&a$2LK2@o!*;9}By8T^6G7Bf5wZ2+JoB9DTq7#_c}~Kd6&@a&(gmp` z1f>Nkb2O;LPvm=9cB2NVu(#jA_ztS0ZfH;_#iK^5B9viWBE!@UkzzV2A;h@2!jO{qC?ESuN!cYDE=7!nfl40%L>;Lf;eD>jW0ltd-KL^A_Jn?e=_}Nl>sUesW;Ta(%;MKEpQp}L+ zFp5G#O^=^PgmSKAJn0e^h)ZCdp||KN-J;756?KcJo0P!9E^YBIcX|FKCd|+Za)djOIu>_RLF5q;);brJGWy=BWP2`WPK#c}9qd6k}_JiDnY} z`v+3e64e;BC`Fz*rcgPs$F!LR*P^*xecABp>YQAc@Gml1_2n@kO{^Hf;7NCgiE0wY z24ogs2&gQk(gv3eVL`&+?$J|Zs!OAgk1{MhFu|0bA&yTrk`g1asT#w>?OhqK43GGt z0Xtbw3BjN*$T#=z;5q7*T|f&x;b3^4X+G*hjMbCKkuYUw#Un~e(cpK=xW0RPy9UOT*-2qONd|ph_J{=$J z)pE{b$w*_YH)x!mn~>}^IKL?*JUw_SYH)dFaU_EHx0~NSfZg5M6UU~?EP=DO#yXXO zQvu1;NS%k;_oDMXIy5X6#R^Zi4-p9l&Y?a^$aO}fp5O?bh6^1xsV|8qpsFH%{nsx@ zzkoVSP!^~YE4u|Xv4(ZY+KbIioFN-+#z<8yqgP0oj!w9G(GDSYn4X>-S@cKyE$ZMY| z6TDNxtBDnCXdpp(@11AGG^HG-x(lwaK+~WkyW|;UlSH9v^Z|+?85-2eL$S<7&hG2J zIm2;tj2I@0)Hx>@RpUYoxOH5^Fmm+z7k76MY65`AMH(*FV8IW{*0RuHtO&Z(8Az17>^& z&G(jwz!co|ULXszbdfz*nl%9W2{b^8rFAU_SDBU!7;VuoE=gVREOE;@eDC`@#ZZYF z(t786{c_SN8Wg0a)h7O16~x4Fnt3~k4^V5fV_wGF&c>u#ihx2~Y2_B+hv;clb zYowRqL~oGrn-E3?5?$(o7hbsx!!SX@Gp}5L%LWa3KT%AxXhKUI2o0mNz;L@-rsgDA zV04g@be$EHq(W&|5?ZQAWZEPPCS>RM#^0+Bw@t){4|b1TT1FeaN$QA@KJ35aQta*fN~8{CxD8C#o=dki2IKQ?j(KZ6T1WD32oI)m@Npo_z< zAcwEN*z9$-4Bm=g*O6>?3ZORUO^SnR2#kG)7#UgCOk;#=HZd@5v7~0j17y!m%r$kY z6gr2ZE5BY}nt@Ikj_wcfKlEvnxKv7%?h*PCJX&1%s5IyNV|x-_4xhv0RnfK z6Xe(dY;8Ur9fzTEJrs9`qORS#_ZUW5XhpT>Ez zEsgLD#}69H;6K~wgP%F5VEc<-UB;Im-0h1sB}%vx!O878!XIv|!v%-HK0H-P)1h-- z!n}FlZ z&?S;))q;*CJE=5L(lQs5I05h9dIHsSV&*#CO0QuJ7IXMJ9t$=^vfP*9i^JGh-^Va` zl(gsg^YZdCiCe+*f3<>dKU?oxIN6ycTA;(VpI^c^zq{L;x~hSvC&vNzbxn}ZFyEK1 zmik}`zQ=_e@lWsHM5r@zP(oUM_BR(%d^|Qt6W+XV1|Mxc7Ac#J!aK_|bS;FAXOj^_ z!lxTMsH!XlnkZc&3bA5SrG{Z&Acsref!octyJLsR&=lp4YlEL%yNdNYKaO1NfhzO= zo12?Z&%V6GX1U`g*Iu1btkKBeE>WpT${CExs^FPtFXOwfZV4Xn9fcv@OCIDvuw?cm z!(>$T>1l5Hlze{1D4f0eEbe~$U61yL^+GzmTKav650Cv3W~WXgwMQ%B#eZWW21Es=@ezx3O9UlaS;z5Jm>-O=f8ZWu(n^A z1f^?&qJbgPhj&t}67>=?(S$FDn3$S|KL}!0(s|LLNRJ>Vtd0WIc!d~)pf(Fa;@gu! zzOW{3Zz;-}_XSc#e}|NpgJ!*6;r8AWEYHos1&Suls&AK-P%IfYcK3xDGE&$WO-G4L zRqBgmAY!*?%uP?quCts+HF&b3HNt?OcK3w>3&P7jaz*J2TIf26*{Di`PKbX*T|207 zg#D*a5nDDRa!d(TV-Wpu6Y`TzilHe|78~S_+F?z)M~(KvGAqmeS9$Nx@dG-|ETwFlpGXv5VPlJxxB1)4Z z6(-MWN?zPw<|~03k}^f_&k5?&sB!!qyI8mp0A5==gWIL=6fvexZ8;ZQWY3fD`w{qz zgYncQtoWj5iUKsOQPLv}^l{nDlwnA9l}9m^D6o(!sT8wlYS@aZm|`ec$k~sZ9Hfh& z>6??KklbPZGP}DhRB7?%>XJlN=cyejoh`bk#4V;VLdvYjLaV-GTh(tc?sJaTk!Pp$hMLfv*gp; zn|O0|1x{OOtD$ns#-k;s`RW)adKW1fmf;i>qmG7U$(TEeXmt&%spX5{hm?HCG5dP! zsF72)BkJQwW~-JF=b0@B#2zuGOu||Q)=zi>mTfAIyAdcei!?2;vr3a%s8)2pJc^L} z78z03BtI-MdDiDDtZzPosw+58`5buErE0*g^;DRJ1rb9tBDp-x|=`jOq z&SHaF!?05=)Ck&&{tluLGYO{vU9PO0eR<%a;TTCE`h34IJB5~MD|P+jG}$9n35jLw zNRmSJ#(5aD)ZhsCWMi`zGs z3Q{W^x;{kn%X2s)r=S8uo7v03(m;WeG@PhuY{otIBpqi3Ee>v{#pSguhfCt_(c2Yz zcdP`FT}Dh@nZej>g-b6j36h>azl6mzvv~34XT;cKjj#|s!*g%S>Z<1nNTN%mkqD+%L}w1%B~wR*>oj&%L^W=U+XC`IT9$t)7yw5&C-U zx=JFD@_4@^Yil#|Tmf59SYcuxC9_GOB;{^rg^CX{pkU?9X)!w%mZvelFxNY|Jkx#g zx%dC++K7A00w<3~|D=Zit>z;1$8m$SmjZ|1$sD;k6fXRkRW0#5BL4OLoA~G7{(zQI zLs_X5)ZhQN*NXUK^x{pgn1-MG+)A+Mf9C7y(>=`2&h@T}j8x*XFPa|f>_K^Ph1a+4 zV|8JEWKs^V&7XEq1%P_gjgB7A!!kIluS4w20pd?KVMtgX$-wTEk-Y=5sRhgCiu5EPW7 zm#FYBzrQ1ft*O~THin}edX5Q&s2!X<&Lbnf@!@R=Po@GQ@*h82$2VWx#UDSpg>OII z#>Gn)B>0C18jfoUB3b(Z99Lsl3X_1~V=X*`y#&2~{~_*e?m#C8%Wf|6hZy7mD;;Yw zQ;6iO?6UEiOJZ%o^DjLwkG`=D*Hj8ycOT*Wh4Z6g$FND#JnbXygbs>6A~iqzNu-sz z2XuM6&hp?FZFiD3&+B~i$(_F9LaIq-#^-GK0kSd6=IMfe`NvOio;jXA5ldL|ep1qY zC5GNSD!QTK!k?uZoJWVLpA{rwVI)6Z9%;3~OJ_QtJtF1i^8;4Z!aO+0>({@RGP}!O zo;+i>*sYtlMqntd@609yW0|eO9ae_d&fLFVqXDm@$pk=+avKQs1b_vAdw?Qj8BgJfA^DTjhOxfFZ#`T z^k7f;1WD9H)8Oeo3pd2LVb|$$e$O76oyiFT5FPskj@xb6twFNFTrPNE(H3~hD_KYYFc-2h|FI1YANC`ZlEJ0FW@Pm}YpK+z%41q$rL=^tWXRk$x4^65;C zXd_gx*hRst(%jzVwf!X_Z*9;x{^vaO}%8Qg!c+do2EGQRr!dniZYVi3sY*e%EB z4k=)%eaD002ovPDHLkV1m)n;uQb@ literal 2084 zcmV+<2;29GP)x_&YkJ>A%S2t7}2zVKtpPL^ame5ny5efgE8^X(uAnR#HcY) zf*2D-g8{XL&U8Ajb|^l$bI(5eVb-}_*9&KI=bW?mUhnUE9P^{^zEF}+SfAJq5n~MA zds0fnbBqz^964u7DZ`rl>bf5GthLA`dveK|(965foW}6t%eypnCY4OFksMmS_4H{> zQ?RiSW(KA;YjsUkRf7O!DgxyF_Rih;nh2Oqr^C7`CFev@c^1L)eBQS7b;Fex#`Gji z?=dOk>r7mVbg{;p5D9g`wa^$SxzP9hAY^;@4#a|`##_tb-FsLZnZU~O^57-8^!#7{ zcmvnhbg9D`_)95#?b74C_`4n4C{rkSJL2olouw3qucwGgm;$~pgu20)Ft@ar3Y&ZI z6O1*G3Z~S!#2dHM=WZ%D>re*A;W#pRy&Y#ad8w(a0jvFzaRfZVn8 zqn@@njZQOMCvlJt*DP9eydDK zIboTBErc*2Tr7*p;j50S6w*{&7>6*}0?W(GgD|-?BSffJEe41Z2fH7D@3{8<5p5sI z2`-G+CEmDTh<3;rKM)FmB3c*-)A6YjgPZ03@cj=tv;5%jE|<_~%5CPvmiNOsQC!Xp znUV}NElbltbQwP~yt2QGPlhvRPtbKeRtbcmT%v%WTi=Cg(=?oX=o7=5uFDxwdNnol zwqYgCQc*%Ed-7{s#`KBk1nZ6|g~mD@GtUj_D+KZ&u9HiY5rHCDg=vwIbz!V7KHD_3 zi1(mwX0&ovcnWPN*;NGj9mQBoapaOXwQ*tywVb!&Mj?{BC?Nu5QZ-4iXhQkEEOTbNaHE% zixqFcfmoF~g120Kqk3X4Z zaYQbGan6JUE+)2Y8VFQV&3DZfx!+7Mb`4!Gr7Cc18u;9^XXZjwX}vV=vMwQ5=_>rK zJ`4a_i4~>SBm1#fkaw=qq)qSjJSQHZ?#ffnYj{PT)#*hGkTBOU zXb8j;a#z6lWet?-kQ&}FpusJU7$L8{WFMOL6eor`A5wxNhw3bMnM0ZOTjt zG_J)JM~FRn)Z($3Hn*%9!yO8n;|Jy?)Wk@rB+k&&(AvxcXP5ZbJDH`&9^~l8gg6ac zy!_Z4I|{JFqoZL$etzQw(PpH>IAbZDp{oL|OH87}cez5q*%lchW@#hWX&SPTDY$U; zH`}Df;49DJ+i@7LKXq*Q{FlZbDKuJs#emi2Ww!U}?+oXxDuHctsRNhSoi8>0?E28gi9*>Dt>QA1JnClmw(b z_R6Jm99NDy^~2a4q+|I+2~GxDa22+j5Std~TZ|1d1+uk&$icyf^WjAlQf0JPoIdw3 z&z^b+6D+^_{SBI!`1Q4Su_cpI%cPTZ&7KQSJu+wX#w-7nS!+Okj3d7B+&N;GSgIq} z`qbEx}szwI$2>^;r1XtJm?aCWa1c3n{{tuY4N1%>MucDn|r=6hp26 O0000 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�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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s12.png b/airdef-mod/assets/airdef/textures/block/ru_green_s12.png new file mode 100644 index 0000000000000000000000000000000000000000..540499a4894a1f20af1e8442f0c7c189f415ccd7 GIT binary patch literal 8924 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 Ef-Rt|>;M1& literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s13.png b/airdef-mod/assets/airdef/textures/block/ru_green_s13.png new file mode 100644 index 0000000000000000000000000000000000000000..2b7e616f07a44b3ac0404761f661ec82c3a38b37 GIT binary patch literal 8863 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s13_b.png b/airdef-mod/assets/airdef/textures/block/ru_green_s13_b.png new file mode 100644 index 0000000000000000000000000000000000000000..1a3ed9b933cbfbb3a69c616d61071ecad589d326 GIT binary patch literal 6431 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s21.png b/airdef-mod/assets/airdef/textures/block/ru_green_s21.png new file mode 100644 index 0000000000000000000000000000000000000000..65467b2809ef0de5c98c6d0e269460274c8d46d4 GIT binary patch literal 8699 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s21_b.png b/airdef-mod/assets/airdef/textures/block/ru_green_s21_b.png new file mode 100644 index 0000000000000000000000000000000000000000..a0db750094b0855aeae437ec0347d951b6ef28c9 GIT binary patch literal 6439 zcmV+?8QA8DP)7NklY7eVUp?HVvZ}aa92?5AjK-6k;wYjhGJZ{dJ#NLg zerxj#{m*xg`TN!7IlmS|hAde+D5YQ6j*6OUTl4iOj$mS5`LcB5|=;S4%OQ?Qt z>h1z`1DG+9p{jJ!#d{QVm|Cz-sElebu#RI4eeqzMzkl-mQyuA4JIrOS>q{wNnCnZB zU}=$wDS?QA%erI`j?b5deOZW`{PN;}9vqD6!pe->4MW?V|e{0Xr{Jj2SWZz3oEO;OzQ}#Q?mxrXd?_?fF5=t;Z+2YqCg)G@h$5GZ@7L zSeor+R6F8zO;uG>0gg15>Z)Oe;I2ws3I?!^5hmPR>vt)!M0d6)rwEMWh~g-wq9~~> zE4s1-wRFojqMnbBYi9V{t34hcb1Lyk5>ukYGjEKc7@T%`{dio_D>Dfb-%6=`V4cRZ z&OR!+FY|)3IHsl|DtOn$80n+fy{3XF<9a(H*a21hW75!aKc=0DQ&!iZ9mjUoki;?d zdMSUuzc&_h6*4^=k;e$)np1|it$IEkn%DoT6qd3PTYrJnN1SU`C!-GAtRsP!Q;bd4Xpy2@8RR5a(hAD6X%>2-bX(NWH>Q`^G>(P=Sm zD(_RcBES#f&CP&#Tsl81MiAHF6&l-6QI`DV-R%i&%*38}G&opo5e#41H2mV*hUm)& z+nt4c`C!Md=gp;zioHY1ih@4><%NfScVFb;(&^p~zQYwc8MB5S9!}`daY4hLq4zfC z=-tsQSyJfQ5{uoGzv&jptJ>cdq|(ddF&!KnQ$8uF1l(oxY3R&+kCx|qbZt#kVtJq{ zWyqUPh#58^f+vU~PjuMM&$#Z!(8;)!ulu(5USD@ap)o} zv&dPi18NhL1$Zy>l6$~ogvNMfCS}Q*Ph8CQnhWC>s$#CzCp*nk>#2in-c z!F@P`CA!sG*$}Eieav+5;93$z0!G|@tQn%oMh*8IQpwGu-$II1dIO5Mg&`f!rGQtt}dF zZNXmNbQq?hr~{^H+7Vss7{JQ$vAD9PuIT&y7FG7Ll;^@yi@bEYD-2d}$f)7FSKF1UgR$cut~d|rq_(gox>V$|?C!3LQ_bpFnCkmT?~*KLO8*%ANR zh~NL?^>Z}nrPNDeUJqUf^BW7VC7ek9^Xdu@cvLj7Q}p4htMt`F(SKC~5FI&2Kbrts z%d~U-jG?bCBu1nM!($D{6(M9*D2p9M_^a?0V?#AWTH?SjC{z|1RHD!(`v>&(vlITj z;tbm3C%g1eF0q8(y0}7LJ=kG_^Rn-NgV5>E#A1#y8`Dh%d@ zxflW1I&@`dd08^!pf;G{?9x2%NIy$xeX+-*{Nu-GK6nx%*U(_la|E}$3ueQDS1vh% z4FCv&dMYcHogsemY|kT7xV|r*9MRIk921Gi6m#V;>~8#`DyF35tQdVvbpMY%UIJ_Y zh?mL4fFzE1T>&NlQ9z4$0TV#X(c^E|)@gHfh6Y(eZ(bPE+Twt(e{_A_PYk$wWjLT$ zX2E3HbsuqPK&bfuoz}f8@e=4XwBn*w?07%RoC|HSzCKsfg_k7!eSC4*GbYin@xhaQ zN|SI$lRR(17Fl}r%p5)2AJb?^WCj`BzTEobL_$<;Sd{u<5c%4o z;BD>i5vmm@tr7%odgC3@Y5fkl7Z`t4DC*8 zdh&FazTI`0!x~zc?-H+E>GzU=v6iwVqeq7Ym5fUQC`*qgwHcjex_l-s8 zuiYK=z5QbBGe{Q~`ph&Su5@<5?>k31i|Rjq-VzVdSSRw9l1O(FoKRWE{1Nx7YM{A_ z35U%<_J@hc;M3dWiH?yXU#L>m)NB{Vc_ALiMSdJQCn*(d6osxt7~KL5u~V(VQ&ALA z?}ov$OO|G{oK1IHxn^w{_KUa}|sU;HYt_Zic`e4t1=9#t8p^`?Ex-xLbtiZ#bKUZjjbf3nL=4 zv9aotbJ%61z_^RG^fZ@6lp5XXT7%FPUwdgHu=tejlTT+)92f#J^it&#sM9S@x{{}^ zSJ7sN_CTUklAw05Em-%>)gEt_;)_7rA9k1IA4#n@<5|H*s=wbV8Sh14d0?G}L`) zi1wO@Q{AaMnu=oqCjvqQ4p(JE22AkawM)2%v+Rn3h{^xgz|^pGFpQpRz$X4Nx7$8* z#qVw;YiT^rB_HT=iPPbP&)FIPvH?9j7`OR=>9%+DlFlrOe+7w*5}b&Vkv~7!pGZOk zv2}f=2sCj?t}*}>#(e;G7)X%mbUVS-_bb77>XgVdD+m>%L$Fg zg%}8+L5>(Z{PTf_hblaIJDw&{#wX(M!*&blub?lQo;2gq1013d8$lVFxe-m}{H^8e zswPfroCCT6S}$bSh=K{>A*j*;U{b=vRE>9Uh#))G4_KkHRMe#;P!N-_x`@g^6>v?# znOc8+4-ZB<%}U~AG?M5t!nmC6YUfVEhzn7hx)tDWSklwUhk!Xa*>Rz37N;!Y0ZqQu zrASa&G*n3Hwd>Dyi#cOtsicOoMDPMy7&fzOL#UgV{MhXL4Cft*0Ihvo>1Yy$fBNGy z`uO_D1BFk2dgf_PbYKmGf7>3@h2;Uw&qIV{%-0ta`u+ffinK_Q(-8}mQfhMQEcr?p;kI}KnPB7=Zf}j9?n}GFk9@(S7biTWG5|ZwhbWHfte;BU;EEn*-4Q$PAG*qwvJy4IMo6I4N{1Lv z1XUt!dej!S@Ae8xk_60_Syxj-y{4jmUGi%q6H)qRx8OrYBr=PlV0MCd1{s0C`;(xl zRyGwMMPvP3TY&fF8M?4KUtdC{iRaeADl(0!S|;}}ffCWB~5+#gY|-{urqb$$N( zl!Kw7s9ANe<$};6Lo;gPal-0~CV;H&?S^_Q*<0`G6csYZalGofps9wy3j=`0FS(b9G0o0-ei!J2pHp_Jjd^RX<7-ll`?^BOV ze+`b%AWGVR#9J64H(i(g)pe& zTdO^XRWz+0(N-1HuP|Q3nqABKOsHVvIAm&bA7;W41zWo z2)4kzYYRw+iGKfVQrg*{P}8*jel#4=^Mky@c(G@Z$27=M{(fB3g_YJtqW`BqZPAsb z8H!Lvp?@K>e9DL;!H6!-OA#cJpK*fFSqMVT{^Qryxzy#Y)r`)~#WbJATrBbNs4rtS zs%8EhGD3wHoWLPa18*~pf4aIO> zhM4fs03!bn2#hla+{ZgS4i=4f)c)Z4-HDXXfwLQfh;ZzO*B~9 zKvB`w!7<|t&IC0Ly*QL~9V*1oU?4&I@7pIXZ(z7QCkE_B@=+V~3>VM#+W7uS-q7>P z&?u7hH$GQ7AJ83saPc)GCy#4(Ojf}^gkBoW)5EP}4O(e)byl*>O+)hwGxW4* z$ecU3-qwUQmd^R&fwnz$k=-bh1JO5EGFqD-(DS1S=jTH|{n2`xIQ_%zz;7=FwZT1s zA=m-b0^?e^0V?wAiRA;>(Tu|YM#j>-qsAvZE+MP8_0K^R@t0`FIa!PqoN z-|b)bSgMlNHp`jaX{)KbV(EDq(Okbrvu75G%A5wnc_JK8_(Dl3jtYyVut>GKx^Rdv zO5`AEIv<#fyRR?AG~*tBdJ<%ztfe_l!HJDHa%Yj=Jx{Ioi~HNG##({)c;}F##v-q1 ze$iE-kwBj|o#iqp97!So;0TQZE!XFaa;!At(jJl#hag1P+d;vLId^`Y0TXomtV_Fl zEM;1?xiK#W8qaa?=4ux?h3E1H`Yeo}2X77Ph8*!|u+V64EVf0BKE0r#<=*Z++NaE) zCL`m6Fx3?xGV;@SArK8^KTdO9Ijn|ks2tNP$PQISLv>O6WQZQp=;E1pC-TTuKy5+1 zQmQcy+%?=F-jU<*$8ZkfC%i+z=X@|CQ5eHoXLw{FJ^l(-z$Zd3Xo+GvnoOKc>dG_R zjtAtPiEgJ^GUT`ny9R=QJAh1OT0=2sNW?aICImdy_6-~3He&VNoNy&s!~nq#$%!@Q(eS^OM)ccIwO|Qp%Xq!CNwh?B0~lZ#uc+ko3wn3`>#~MAx-*g>EzS6$-!%*BiDB3eT$M7-z_KD^1!W*ehgH z5YPYjA361t2zAsB)`q@8^jeHySm_~yg6Bn^qauN?SMD%Xil(eLV1e7Fjebnu?{^a| zm@)08R2C&eXl-Xu>guNb@lcMwlnx~xb3Dx@p#lhx^7u6Cs;w4FNIG9y5`vzI`vHRF z;#$;&_nVtT-;Z6PB|d*=+Ypqu4CW*d$zMtZNk2vXf8@c<6G=6>)+Q5B#2&{96F;rs zta>i;Ry)&r0ZSV_!zFw=CS0#nxDfpWX?Ec|F7(paoq4oU;2R#%BFMI^J&5fcfZ%-( z&j$j-cmMGo6TLW;-wsq+M(39Xv@o0Ti_-@DvRujvi*I~lRMa92rowEKBuKh3tHvwp z?zSos7j{}p4-e$W z4_N%S4_Dpey|62mCA zBBk1S5-#KGFeG4~g~TH|<5L*nlw@VwY>aaH+s8-#3UIt|T%s`sN>N0=zpQx2z}e?} z1>L$Zq}z}7=+>sxA!3D3#_~%N4vHLgiHkI)W%SxYM2`cbVdBi7&j}b+ z9JV)Zxflo6VZ=33jnjnBC0SbZOvBAoR23!XXA}0rzaI;jfR5;orn(MGxb6ktx?%<= z0a%nKP^4Bbrq6!f;t~FNf16Wl?Cv~3Z^uV~jKyI7x~XWG^=P<~&}@ohwazICOG|q! z)=-kgROJ;LZeJ0G`#2S7cKW3 z!dtEr&U5bZ!If24H(Uni|J_4NEF1IUyn!)2cSB9Gp&`R%#|0cePgjrhe7l+ zND;5KO__`F3t_nyT@xj!1;g&(j8C~L-K3+2r1%Um!V8>4_9f0@Z?wch%P0ByrJ*~I z_UOIK%j`C1dp$ay$O*K98iA>Qety7p{m&2BHvDqj9+PWP4FaTVa}KtE|QN z9u#Kk8I0#gTPQ`?#PDFW9lnjoIHBOE(?O5MV(}jx%gt002ovPDHLkV1ld7 BV!;3a literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s22.png b/airdef-mod/assets/airdef/textures/block/ru_green_s22.png new file mode 100644 index 0000000000000000000000000000000000000000..7b02402b10213482a1f9da857b03b8d393f4549d GIT binary patch literal 9081 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s22_b.png b/airdef-mod/assets/airdef/textures/block/ru_green_s22_b.png new file mode 100644 index 0000000000000000000000000000000000000000..4600d564c160ee11866d45df8a4cc45f67b5f92e GIT binary patch literal 6797 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 vpJ#HZyG}=+C<#W{U5X=s>z`wP)2)1W15-3U{ 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 Hu0mjfYCL2Z literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/ru_green_s31.png b/airdef-mod/assets/airdef/textures/block/ru_green_s31.png new file mode 100644 index 0000000000000000000000000000000000000000..d838f8bef179cd092891289fb8cd58b672a3757e GIT binary patch literal 8816 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 diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_b.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_b.png new file mode 100644 index 0000000000000000000000000000000000000000..c3e886c3215fe3a1f70b6b94f378caa9e32affc5 GIT binary patch literal 6371 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s13_b.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s13_b.png new file mode 100644 index 0000000000000000000000000000000000000000..92718af289fbf912727f941bb814a98de8b675fc GIT binary patch literal 6519 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�qvGeK5ox+id$v$^t|BsVqF%G8yZ!Ncho4%WHSTJrhrKUreJxAy*s+GB6LOm?uWgK zV}j>ra(Z!8C$6=QlS>eUtpPsShj?wq7aYT~;Il8V5{ZN>&gX9we@?N{Aa^axmK{MCSYeqP4=8jzdwQrZ!B5 zgQ|)Cv77m4><_jt}&54!}rJmQ7s7DFWju zl7c3mpGR`i^FnPviMiQen(9)I&$7z44^nt7F**yT2A8{apGKaNImNt#rHi3*h!uz!qDv8hw*BCfKu2Vn1{OinVuQtO2F#WJG8(#xc(q%xi34Vt*o zm`5fxz7oUZKTRZ9?XLw%!##RkiV=vqMZr0Lo&c->Sd(iF8paFb5el9~tgg;UL;LM7hv6>@C3c4>&l_fO*sUx z5Ox=JJ5ec$|NLfJtE_5L|Cb+bTpPlY-}ochuiB))qZa~#vtUDhMe{`kb$An;^@pbQ`@YiQLA zjU+az;gCB|J>@icAw(0@#+93<#1fZ2EuF!lK?Hop=f!kRO1QewB8M870A+Re(FKcp_-+$M$BIB}DL}mo= zgi6a3Am(J?G5{F6kLNF*nIOXyuF8TXK%x1EL~-=GJ&6r+=silfS%J$lp7N&Q#RFuS z8+>Cm5)bFmViJ^i@z$^bYzCQIYAS}q5wr1|(9E5p400AI;4=AUW0~2KJYW@JryTsj1d7{COPj@>d6pE# z^Qa~TR{$?qk|vbDX;)T$!{x-PcWh4hy{t7vR(u6w7rG92`t+(2UbHC6SLSPx)7OI$ z7cSXoEQ#zLn${Kl%Xu~y1<}l_^YX5ct?csI1pzg>o4^`}hvHhFo{Kwl>FfecWuBgH z?6(*a)gA>qK?(7a>yT%AWhQ!vf;&uauk;-4Ds)D?;no@e7*U2Yc^rn%@!kM0{$M2X zWo7g#0{li7(o=cC-XVh`RZ?)C5DBv63Hp2Q^c*W$h}q?7%m#0Ws5||ZC|7WdTgW9T z;ILIA;#1dBh*g$sT|VMNUasO7Bv?m?Nc8!&0r~z8*YE0jGIcr(@XV|(5zy)R*=gE* z*{A#a$m!>7>Z}ep)({KJig~H!H5l^r-o>S$1kH3_nMFm3rw^tbJsAc7N>Ev*!gO9y zo0v+3eBdfGXf@cVmPrLZ2l?d6_s zGiz#;2Ek5W)43U0!QOVCVeRr%#^trvA7mQc&P-2<{!sZ(^OQ)gm{mXk7wdxJ6cIFs zOs;PXYj)>7tN_yED2FrCa%!&2ugaELPJ2fsivl;3Ps9e77kP1L&=YJX*%7HYV`Kh4 z`dsbhw7Dg)l(WnUr`d%6>I~d#8UKj&h@6rX3ad743Gt?>CGEbEH1(wy5yf$NHs!1@D@wHMK z*!}xoQTieoW-LIUE{Ykf<2Gvo<{Bh5SZtM}?CHUGFolc~8m((UsJtCKYX@J@SEv+E d!i>fh{|8X@FX=Y5EVuvw002ovPDHLkV1kEYa)ST> literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s21.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s21.png new file mode 100644 index 0000000000000000000000000000000000000000..b1a17f2c79158595338ff584101d8316fd54840f GIT binary patch literal 8329 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≧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 Y4-*r#rz&D?&;S4c07*qoM6N<$g0sRIhX4Qo literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s23_b.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s23_b.png new file mode 100644 index 0000000000000000000000000000000000000000..4533859c65d9aacff2637cb95dce334799a3afc8 GIT binary patch literal 6637 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 literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/ru_khaki_s31.png b/airdef-mod/assets/airdef/textures/block/ru_khaki_s31.png new file mode 100644 index 0000000000000000000000000000000000000000..b603f325e3d408a8b3144b5ff036d6698f552023 GIT binary patch literal 8328 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 SC$T{Q0000$^6 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 YAJu1Ip^sP{Q~&?~07*qoM6N<$f**4J^#A|> literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/shahed.png b/airdef-mod/assets/airdef/textures/block/shahed.png index 8b22425f20087a5f5acb9ffe08a315eb6e656aef..a0e7b5fd0df6ec297d07e7b7f7b1cf0f74992114 100644 GIT binary patch literal 1322 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 bR%8DGgm>1-hFL7l00000NkvXXu0mjfxH;l= literal 324 zcmV-K0lWT*P)p66Q`dFrx~|ms zeR`h9?@B4Ib8^m~Zf5Q)=XrV%!2pI~@IZ6`+yf?vhxmfQk8LVNnF*!>oSYA6e<*%% zJj|U<)6_yivTfTu8!yG)KR_s-mhee;F6v7Zf$i;>{14ck0HFRf!0I*bhipWX!Ttfw W+Z&0~fLpx)0000o7DY;vQq7UR>G11zvr=sJF z?_-~0iCHAYNj!eUKaY)|BzI1f8(0`M1i;sqPot_TIeO#auDn-CCX%eW%xq`ImQ{ta ztmM+g#VLV?{|GmQKHlpgO$cQXpf4-J3Zz+zVpPB+M$UY7X$hxi8AgN6r~6o#&T;+0 z4vHuYr3+7*rY-~yHO9s7#a0)Msv-(>T)lM0dy0%9ugZbVrw8)4dpN4kINvL4Ls+sn zPE_#MeqRVg)V$Y;htO*g^bL$R=2(a}pT0tt)?8|kd}XN)`T!*AduB|6q8tTisgUk` zcjXKi8m?Q9c7@42Lt(?w2uYF%oEjD~Um3o&*Ta=_9o&EZO70e=#ZkX63cY+fb&f=N zkik}HG#UW~LdCz^FW=x<_YkEM#4}}CNGQnO5*DLTfh1|eTFoGTwP^U;dc|J)eKXIacgm;4v${VVhWK<^89F)e z!ECcmJ!eR4B;VcLIU3V=XS-J$B%VdgKVHxPnEAOm+wb=S%w#y%#f2$6=)MljCww%d znKv*PYS!cpW`t%9?@9)_v>S~^Vn-f5Z?~GL%1WN6Nh0+iix8A01hW=@9}EI9nZI#8 z@Tu>~SJP@dTWBOJBT2~Tw;pvxzOPzrf{Da8f+tj{G_9?&8b7|%7QnEajImcb){jC8 z>#4zDAbZvTJ|}G@|M{L?W|`!Qz~e9Zy}!sa{(O?8VnN~W0un|qlXvG#i4I1%x{#yQ zY6YYljf|)|qPVK+iv9_*cteK((4(Y zc2p7B{l5KlSp<^{Ki%6>R08aEdXh7`w;}Z?nO@T_$_{r=&CgrbYTnHAJY+$hH!vLN zq{Qc6e7q2#^Syp}aERN_Uxy4jH=W_pe?5G8W?I@i3zj!-V|Nhlk_Vz|ND>~Od3>oP zy0kdzV4k3iXUD3cYs-^@(s>pR03Xe3JEmf9XaukGkm5R9xFU= z#OQwxh64ZNm%Z2BiQ+T z7^DP;8*wM7!>7#G#;5ZnNWwYGd2My6sfEEXDthtv?$GrJosO77R7ygvF6J6T&W+Bi zjTeJ=kLhlnBr#b()|V&1VMywLuk)@Qm!RGo6G#)?Ar z1=orxiFUc1QZ`kCn%Q^}EjN_=2JUyM%00aA+mrj z9uJ#?@Xa=E7WMq|$Hg3f2jVhHh}ojpsQR>od+6IxLr-{q{!*|b!pj} zDRjI;gC{~8De{Go)1Fl2!=YCLKzO^|8vGoTg2>^tQbMY*8N5Tt8;&_S+R%@Av5?;k z+F_f2eq2^a9b9^@7%NQdW6AJ(HnM|US^3O zb~`Z^Lqu@{nD2VMO5gYTPN~;TVO;+9HmsVxV6(XkoQ8WW8>Bnl?kTLuIXVYN0qgcY z@cM2cv=Lw2A> zcr0MuQ#rs)ssKACLmS7TZs%i^Fl@O|%%8ts-tKg~BGER!EWUa=g~qmR@9X{RcSYGn zfh>hL9#3n%m2c8yDe{qHDf5|-jUuH0LPXffFFl!)lUI5-A@+-T#bh{I{~#q?BVXQ! zjp*1^qI?zsI}!7UK1-peEl`LEE5*k`Oedvx6KXn^y+??^dWedIwV|CRr4%B|tzXc3 zH7BAd;X2psxv%<8s+i#NKk2gBk!}EY!Co@jym%TVB&gUHPG7vYd+mReF@<5M-vxV_ z4&Ge~a+@lQHt(}Hr57WMDBG>u`dzT+#p+yLl7H7K z$sTI2>ntf0{hZsQX!WCNpYdH#A+2GhaE2&Fpw*M)6s1!S$70-QbuRQ*aYE#*K5^)> z%td5u0*AyE0+eOe3>$~5ewCF1FF>|ZCXtXf+2q6IbiuXY(t%Dq5Hg!Bg}1LSN`X4Z za&il8LfUPFgvEYpDLoQoE~|i9syMG7pJI~#JXXSj${a5C00000NkvXXu0mjfi6#pp literal 320 zcmV-G0l)rDjmefK@_=&#?=TSxzBsmzqsb7**u7u9Q}_pBy2^^w S{syoB0000{U=_o8>l)>@ER)>a5Nr?XG6d&|fa2(8N?uY$%hW&QC ze6g$raASnav@@v7l3%2IPvY*dB$ zzP`~x-4#gU8Im}G6xyzl_=IN)#!yro{oM2X}4((T;lg$gk35hbB5R{NO(b|9rkO_9L zwb81u&VL;YEa-BL=V`koFXa1by=)SdUb|e+qeqjd*Xwq+#tu0Td&{E(<*AnU6hLL# z>D8%zSRySMn3DrsTg~OaIGI8;ml{+aW?4m1=-geaVei1V!`~Dc+hYk~l}uDjXO(HY z&8Voo?Hc#r`7xdx`ev^#c4UaPE}P)LQd-PoMB5#SR)wpqHiM$4b7tDT+Eym;vOHiA z%TsZdR5bb~LD4Nzx_!BHKIDQZ#Ljv>tJBQCcQ7f)`0{3tjEJaDO0$OP$CyFD+7{J|b6;JxX91n}Ue`5_|=Sp6V-%OH)FwbTw)$WT(t!sK8 z-y)Jxl-s3SO0klKBE#mRR4N&bHyb+a_`nw@zRCM`TQHf0>^#bpTkdRLN;Nc_OA=?{ zjG)qG`f=Zw827as*bdp&bpS*aM#K?t0N`OTYU7t7hR;kRL6Uds1xuJK_2 zzW?>G@Pby8@_M^&#&7%?o{w@{*1cN6vHJRrDU|2WP%4;Dn6c+MxV6IlRS{$4vKhTv zt>`1LO(1~Lh#v`9n1XZ1R87e(z7v#b-kve^pKml!%aoZ036P8s)v9Dp14kxPsxoQc zLVGB+)}h*Kjbe^UwN`Nup#KV5zNR=y;fFCE{(ea1I!B+mC|e3qFt?&8Fhl&3pknn&uHgFCY5&FPTPDJy?XtpJ$i7*et!O&egE{nz5MkLd;IWQd;aow zd;0jhfv^4ge(~y!J$ZC@;OpGJob&V)*ROxoO(qjttyWgowQV+=;W?YlY_V9_cs#bV zvojlwMz&tBhjsC_PwSF5olb4JTn_ur(^DKD&%5n*Yh_vbuj@MhRaIq8(^ydy{u3YK zDIqB(U*{b@-)-9-$b!c^eB?sxO%f`F+JsSy#mX+G4;S#y4mj7Yed+RK6vjgsU9x~B zGDIG|f4{WL(!B?F{U>_&?$nh^2WX%Jr;DSb8yz252l0M-y12CB^XTODn*j-w<1~7p z(Av}IP@b=W1YyQm_r54BX;W_1|E0HY|Mut2n_mZ`jiiH=q(Y*ENqn$KVfdIg=TW|2 z%K!ad9LPi$W$PMMDoT>iNvZ@w;pK{ApnwS@Pn!Qq`Tha+y?5Uj5=yNccCs8-AZ1aG;#sNH@VO(x@^#Cehjy10@qj+|J)pxJD4u%_0n zkPRIz3uE5iC11$qd;DD9pCN@qJRQhyINgqXk5lR2Dl5s+Ss^PU;A5ORVaXuDA_E5t z3<@m3=g9!ULDo^qfB{1A`Mz`e8yBi|o;r^b+X2L1Drm!3b|Mj)s!M zE(h}KSLd`>A!g4o59A(bqh^Es(vkJ>njRfUam{l|$noSnGIble4vk`hS;?lcNeL&9 z)Ie85`l#yMBgg>WGwr$ie@`@S+#*G00qvOXU?>9)I=x$v?;vu)d5SW1j@|D(j} zM9Id}gX75@VTG@A-i9}8-&f)pMl=oO6A|RSPRT}fZK#V_NpRy(8y&Nwznr*i#qd+8*Xjdg(^9^~SSd%As7;B&^d5%$!X6T_Z zK;7alz|#C*O=LNWc0E3_J{0KcuFCLQ``z=sODib6-VHvL%RxR}$2RL|xxfk@zy-9t zM^vJ$;JG8f7>_6|kaB}cXX@#OVSF!FIvf!$tERD%WbuCA!$q>e^I9fpQe|Zo6RcmO zG!zo7(1;z^tY>=>9T2p9uJ8)!75BLndjbjM0-`H*Pk6f35srFPyEjTy!5xVgec#_( tVj2i=Ci04^a_N0in(y`EXdOn^^$#&8>1(Fxv8ez6002ovPDHLkV1iviWr+X) literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/track_side_s31.png b/airdef-mod/assets/airdef/textures/block/track_side_s31.png new file mode 100644 index 0000000000000000000000000000000000000000..ef5015b9ec5f743228ec97f2d6d4420f0effa185 GIT binary patch literal 1365 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 LNkvXXu0mjfUrpWP literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/tube_cap_b.png b/airdef-mod/assets/airdef/textures/block/tube_cap_b.png new file mode 100644 index 0000000000000000000000000000000000000000..6a1d26461e5ba8836d7e41c7486cc1d5fab58c1d GIT binary patch literal 416 zcmV;R0bl-!P){?lWSfa!=TbxV=Od#Kq z!%&-rEMM*k#L>_Sm6cU#0P+cH68E~G=i2XxE+J=mi;K`*_|@T_NeMs@C}jDnrT#r6 zCQz!K5xnkPM;U{zM+px?jYal$5cMKHM_JeKSX7QkK{)bw%3OlsA1FeA=Mj`G0Vnc5 zdq_02W^8)CeTAZ`kX}Z=?p%3(H+FHY``BzYW}?V54{^{DG%*_A#w$lNStK!L^L+oH zKm0U_@UpILUx+~0C`2f#8dqs-=CgT*hPM^x@O4q*KKAiivgskZy%`yWT_N#LPX>Ew z7i|xW&&cd7HhpK literal 0 HcmV?d00001 diff --git a/airdef-mod/assets/airdef/textures/block/tubes6_b.png b/airdef-mod/assets/airdef/textures/block/tubes6_b.png new file mode 100644 index 0000000000000000000000000000000000000000..f07d84c25507a6d6d6f46901d04e9f4bf587a1f7 GIT binary patch literal 496 zcmVw9#q`OAX-dS=f2P}Zc|uG@=NQDFE?6!~T--jHCP!6K6l*Js z+IYj^XPwVi=KSOAw5^SfZ^^g82i#9f55TO8#k#%h^-|0BKa9?lBsoCvrU?3dZ(Nq8 z_C%Jji?Ijfo#j2lmQ}!?vhp5y^>pYq-4!E8OjX!z<2{y@WsVX^B$cD_%=C+&L0>T+ znb}W&eTK`eA{dp?Rp8BJz|d-9EYprr9a~juuM8Fyz6s71jbo_QCO;4g^SYF+x@ z7>#nB%^ZA>?6cd0!AI-{$+E8Lh>f#DYuxxthFQ5a?DFmz{Vc_Pbo%*ygw5t3lEfjF zaII?fx^v%3<2`xg-~68X6x>0ObeebuvEzbl&~2vRV, /// The world drawn beyond the render distance (replays and cameras see far off). far: bool, + /// The game's log of block changes (`render.world-log-start`): a replay shows the world as + /// it was at its moment, not the holes the raid left (None where the game has no such log). + block_log: Option, + /// A replay's time view was set (so it is cleared when the replay ends). + time_view: bool, /// The unit the move remote picked (its id), waiting for where to go. moving: Option, /// The HD lighting preset (the engine's lights, bloom, tone mapping). @@ -930,6 +935,34 @@ impl AirDef { render::set_far_terrain(far); } + /// The world's blocks as they were at the replay's moment `t` of raid `rec` (the holes the raid + /// made are not there yet); `show: false` puts the world back. + fn show_world_at(&mut self, rec: u32, t: f64, show: bool) { + let view = (|| { + let id = self.block_log.filter(|_| show)?; + let tick = self.sim.replay(rec)?.world_tick(t)?; + Some((id, tick)) + })(); + if view.is_some() || self.time_view { + render::set_world_time_view(view); + self.time_view = view.is_some(); + } + } + + /// Tells in the chat how far back the block log lets a replay of raid `rec` show the world. + fn say_block_log(&self, rec: &sim::record::Recording) { + let range = self.block_log.and_then(render::world_log_range); + let first = rec.first_tick(); + match (range, first) { + (None, _) => say("Журнал блоков недоступен: в повторе мир такой, как сейчас (воронки уже на месте)"), + (Some((earliest, _)), Some(first)) if earliest > first => say(&format!( + "Журнал блоков начался позже налёта (на {} с): воронки до того уже в мире, он показан с самого раннего известного момента", + (earliest - first) / 20 + )), + _ => {} + } + } + /// Plays the last recorded raid: "map", "full", "reel" or (with `event`) a clip. fn start_replay(&mut self, what: &str, event: Option) -> Result<(), String> { let n = self.sim.replays.len(); @@ -949,6 +982,7 @@ impl AirDef { } _ => replay::Mode::Map, }; + self.say_block_log(rec); self.replay = Some(replay::Player::new(rec.number, mode, &self.sim)); self.grid = false; input::claim_wheel(true); @@ -965,6 +999,7 @@ impl AirDef { self.set_effects(shader, hd); } self.replay = None; + self.show_world_at(0, 0.0, false); render::set_time_override(None); render::set_main_view(None); input::claim_wheel(false); @@ -986,6 +1021,7 @@ impl AirDef { }; let rec = &self.sim.replays[n - 1]; let f = film::Film::build(rec, which).ok_or("В этом налёте нечего показать")?; + self.say_block_log(rec); let mut player = replay::Player::new(rec.number, replay::Mode::Film(Box::new(f)), &self.sim); if let Some(o) = export { player.wait = true; @@ -1312,6 +1348,8 @@ impl Mod for AirDef { grid_ids: Vec::new(), wave: wave::WaveConfig::default(), replay: None, + block_log: None, + time_view: false, export: None, film_prev: None, smoke: Default::default(), @@ -1343,12 +1381,14 @@ impl Mod for AirDef { let _ = input::register_key("rp_exit", "Повтор: выход", "key.keyboard.backspace"); input::claim_items(&ITEMS.map(String::from)); render::set_post(include_str!("../shaders/effects.wgsl")); + me.block_log = Some(render::world_log_start()); me.sim.shader = true; me.apply_far(); Ok((me, Registration::new().command("airdef").on_tick())) } - fn tick(&mut self, _tick: u64) { + fn tick(&mut self, tick: u64) { + self.sim.engine_tick = tick; let Some(p) = player() else { return }; // Each world keeps its own systems, objects and settings: loaded when it opens. let world = game::world_id(); @@ -1485,6 +1525,7 @@ impl Mod for AirDef { render::set_main_view(r.filming().then(|| r.view_id())); // The sky of the raid, not of now (None for a raid whose clock was unknown). render::set_time_override(r.day_time(&self.sim)); + self.show_world_at(r.rec, r.time(), r.filming()); self.monitor_shown = true; } else if self.grid { let stale = self.grid_ids.iter().any(|id| !self.sim.sams.iter().any(|s| s.id == *id)); diff --git a/airdef-mod/src/sim/damage.rs b/airdef-mod/src/sim/damage.rs index 7a67d1d..7e5c2c5 100644 --- a/airdef-mod/src/sim/damage.rs +++ b/airdef-mod/src/sim/damage.rs @@ -477,10 +477,11 @@ impl Sim { self.fires.extinguish(); n } +} - /// A wreck: the hull sunk and turned, the launcher or turret thrown down beside it. - pub(super) fn draw_wreck(&self, i: usize, out: &mut Out) { - let sam = &self.sams[i]; +/// A wreck: the hull sunk and turned, the launcher or turret thrown down beside it (a live system's, or a replay's ghost). +pub(super) fn draw_wreck_of(sam: &Sam, out: &mut Out) { + { let s = sam.kind.spec().scale; let tilt = DQuat::from_rotation_y(sam.heading) * DQuat::from_rotation_z(0.12) * DQuat::from_rotation_x(-0.06); let hull = sam.pos + DVec3::Y * (0.5 * s - 0.35); @@ -488,9 +489,9 @@ impl Sim { let thrown = DQuat::from_rotation_y(sam.heading + 1.1) * DQuat::from_rotation_z(1.2); let parts = &sam.kind.spec().parts; let (body, part) = (parts.body, parts.launcher.or(parts.pack)); - out.model(sam.id, body, hull, tilt, s, false); + out.model(sam.id, super::units::wreck(body), hull, tilt, s, false); if let Some(part) = part { - out.model(sam.id + 1, part, sam.pos + side + DVec3::Y * 0.4 * s, thrown, s, false); + out.model(sam.id + 1, super::units::wreck(part), sam.pos + side + DVec3::Y * 0.4 * s, thrown, s, false); } } } diff --git a/airdef-mod/src/sim/mod.rs b/airdef-mod/src/sim/mod.rs index 3c1124c..ae507c8 100644 --- a/airdef-mod/src/sim/mod.rs +++ b/airdef-mod/src/sim/mod.rs @@ -1395,6 +1395,8 @@ pub struct Sim { next: u32, pub rng: Rng, pub tick: u64, + /// The game's tick number (the one `tick` is called with), for a recording to know the world's time by. + pub engine_tick: u64, pub kills: u32, pub hits: u32, /// Drones that struck the land or a building short of their aim. @@ -1460,6 +1462,7 @@ impl Sim { next: 1, rng: Rng::new(seed), tick: 0, + engine_tick: 0, kills: 0, hits: 0, crashes: 0, diff --git a/airdef-mod/src/sim/record.rs b/airdef-mod/src/sim/record.rs index ccf69cf..a0e0da6 100644 --- a/airdef-mod/src/sim/record.rs +++ b/airdef-mod/src/sim/record.rs @@ -5,6 +5,95 @@ //! has been clear a while; the last few are kept. use super::*; +/// A system's pose at a moment of a recording. +#[derive(Clone, Copy, PartialEq, Debug)] +pub struct SamKey { + /// The recording's tick. + pub at: u32, + /// Relative to the recording's origin. + pos: [f32; 3], + heading: f32, + /// Where the launcher or turret points. + yaw: f32, + pitch: f32, + /// The antenna's turn. + dish: f32, +} + +impl SamKey { + fn of(sam: &Sam, origin: DVec3, at: u32) -> Self { + let p = sam.pos - origin; + SamKey { + at, + pos: [p.x as f32, p.y as f32, p.z as f32], + heading: sam.heading as f32, + yaw: sam.yaw as f32, + pitch: sam.pitch as f32, + dish: sam.dish as f32, + } + } + /// The same pose (to within what could be seen). + fn same(&self, o: &SamKey) -> bool { + let near = |a: f32, b: f32, e: f32| (a - b).abs() < e; + (0..3).all(|i| near(self.pos[i], o.pos[i], 0.01)) + && near(self.heading, o.heading, 0.002) + && near(self.yaw, o.yaw, 0.002) + && near(self.pitch, o.pitch, 0.002) + && near(self.dish, o.dish, 0.002) + } +} + +/// A system through a recording: its poses (a new one only when it changed, with the +/// stillness before it marked), and when it was lost. +pub struct SamTrack { + pub id: u32, + pub kind: SamKind, + pub keys: Vec, + /// The recording's tick it was destroyed. + pub lost: Option, +} + +/// `a` turned toward `b` by `f` the short way round. +fn turn(a: f32, b: f32, f: f32) -> f32 { + let tau = std::f32::consts::TAU; + let d = (b - a + std::f32::consts::PI).rem_euclid(tau) - std::f32::consts::PI; + a + d * f +} + +impl SamTrack { + /// The pose at `t` (the recording's ticks, fractional); None before the system was first seen. + pub fn pose(&self, t: f64) -> Option { + let first = self.keys.first()?; + if t < first.at as f64 { + return None; + } + let i = self.keys.partition_point(|k| k.at as f64 <= t).saturating_sub(1); + let a = self.keys[i]; + let Some(b) = self.keys.get(i + 1) else { return Some(a) }; + let f = ((t - a.at as f64) / (b.at - a.at).max(1) as f64).clamp(0.0, 1.0) as f32; + let l = |x: f32, y: f32| x + (y - x) * f; + Some(SamKey { + at: a.at, + pos: [l(a.pos[0], b.pos[0]), l(a.pos[1], b.pos[1]), l(a.pos[2], b.pos[2])], + heading: turn(a.heading, b.heading, f), + yaw: turn(a.yaw, b.yaw, f), + pitch: l(a.pitch, b.pitch), + dish: turn(a.dish, b.dish, f), + }) + } + /// The system as it stood at `t`, as a ghost to draw with the ids from `id`. + pub fn ghost(&self, origin: DVec3, t: f64, id: u32) -> Option { + let k = self.pose(t)?; + let pos = origin + DVec3::new(k.pos[0] as f64, k.pos[1] as f64, k.pos[2] as f64); + let mut sam = Sam::new(id, self.kind, pos, k.heading as f64); + sam.yaw = k.yaw as f64; + sam.pitch = k.pitch as f64; + sam.dish = k.dish as f64; + sam.health = if self.lost.is_some_and(|l| t >= l as f64) { 0.0 } else { 1.0 }; + Some(sam) + } +} + /// Ticks between a track's points. pub const STEP: u32 = 2; /// The longest recording (10 minutes) and how many are kept. @@ -114,6 +203,13 @@ pub struct Recording { /// The systems and objects as they stood: (id, kind, where). pub sams: Vec<(u32, SamKind, DVec3)>, pub objects: Vec, + /// Every system's poses through the raid (the drawing of a replay: where it stood, which way + /// it pointed, whether it was still whole). + pub sam_tracks: Vec, + sam_index: HashMap, + /// The game's tick number as sampled with the clock: (recording tick, game tick). A replay + /// shows the world's blocks as of this time. + ticks: Vec<(u32, u64)>, /// The world clock's time of day as (recording tick, day ticks), sampled on every /// `TIME_STEP`-th tick the clock was known: replays show the sky of the raid, not the current /// one. A tick the clock was unknown has no sample (a gap), so a late start or a lost clock @@ -261,10 +357,51 @@ impl Recording { tally: Tally::default(), sams: sim.sams.iter().map(|s| (s.id, s.kind, s.pos)).collect(), objects: sim.targets.clone(), + sam_tracks: Vec::new(), + sam_index: HashMap::new(), + ticks: Vec::new(), times: Vec::new(), quiet: 0, } } + /// Notes the systems' poses at the recording's tick `now`: a pose only when it changed, with + /// the pose it held marked before it so a replay doesn't glide through the stillness. + fn note_sams(&mut self, sams: &[Sam], now: u32) { + for sam in sams { + let key = SamKey::of(sam, self.origin, now); + let i = *self.sam_index.entry(sam.id).or_insert_with(|| { + self.sam_tracks.push(SamTrack { id: sam.id, kind: sam.kind, keys: Vec::new(), lost: None }); + self.sam_tracks.len() - 1 + }); + let track = &mut self.sam_tracks[i]; + match track.keys.last().copied() { + None => track.keys.push(key), + Some(last) if last.same(&key) => {} + Some(last) => { + if last.at + STEP < now { + track.keys.push(SamKey { at: now - STEP, ..last }); + } + track.keys.push(key); + } + } + } + } + /// The game's tick at the recording's tick `t` (fractional), if it was known: the samples run + /// on at the pace of the ticks between them (a pause or a gap is a step). + pub fn world_tick(&self, t: f64) -> Option { + let t = t.max(0.0); + let i = self.ticks.partition_point(|s| s.0 as f64 <= t).checked_sub(1).or(if self.ticks.is_empty() { None } else { Some(0) })?; + let (ta, a) = self.ticks[i]; + let ahead = (t - ta as f64).max(0.0); + Some(match self.ticks.get(i + 1) { + Some(&(tb, b)) if b >= a && b - a <= 2 * (tb - ta).max(1) as u64 => a + (ahead.min((tb - ta) as f64) * (b - a) as f64 / (tb - ta).max(1) as f64) as u64, + _ => a + ahead as u64, + }) + } + /// The game tick the recording began at. + pub fn first_tick(&self) -> Option { + self.ticks.first().map(|s| s.1) + } fn point(&mut self, id: u32, what: What, pos: DVec3) { let rel = pos - self.origin; let q = [rel.x as f32, rel.y as f32, rel.z as f32]; @@ -337,6 +474,11 @@ impl Sim { { r.tracks[i].fell = Some(at); } + if let EventKind::SamLost { sam, .. } = kind + && let Some(&i) = r.sam_index.get(&sam) + { + r.sam_tracks[i].lost.get_or_insert(at); + } r.events.push(Event { at, pos, kind }); } } @@ -355,12 +497,15 @@ impl Sim { self.rec = Some(Recording::new(self.recordings, self)); } let Some(r) = &mut self.rec else { return }; - if r.len % TIME_STEP == 0 - && let Some(dt) = self.day_time - { - r.times.push((r.len, dt)); + if r.len % TIME_STEP == 0 { + if let Some(dt) = self.day_time { + r.times.push((r.len, dt)); + } + r.ticks.push((r.len, self.engine_tick)); } if r.len % STEP == 0 { + let now = r.len; + r.note_sams(&self.sams, now); for d in &self.drones { r.point(d.id, What::Drone(d.kind), d.pos); } @@ -434,6 +579,14 @@ impl Sim { } } } + // The air-defence systems as they stood: where, which way, the launcher or turret where it + // pointed, a wreck once lost. + let mut rng = Rng(1); + for (k, st) in rec.sam_tracks.iter().enumerate() { + if let Some(ghost) = st.ghost(rec.origin, t, base + 0x0040_0000 + k as u32 * PARTS) { + units::draw_sam_model(&ghost, &mut rng, out); + } + } // Fires: what the events left burning (the flames dim and the smoke thickens with time), // out when their life ends. for f in replay_fires(rec, t) { @@ -471,3 +624,88 @@ impl Sim { } } } + +#[cfg(test)] +mod tests { + use super::*; + + fn sam_at(x: f64, heading: f64, yaw: f64) -> Sam { + let mut s = Sam::new(7, SamKind::S400, DVec3::new(x, 64.0, 0.0), heading); + s.yaw = yaw; + s + } + + fn recording() -> Recording { + Recording { + number: 1, + origin: DVec3::ZERO, + len: 0, + tracks: Vec::new(), + index: HashMap::new(), + events: Vec::new(), + tally: Tally::default(), + sams: Vec::new(), + objects: Vec::new(), + sam_tracks: Vec::new(), + sam_index: HashMap::new(), + ticks: Vec::new(), + times: Vec::new(), + quiet: 0, + } + } + + #[test] + fn a_system_keeps_its_pose_through_stillness_and_moves_when_it_moved() { + let mut r = recording(); + // Still for 20 ticks, then the turret swings and the vehicle drives. + for now in (0..=20).step_by(STEP as usize) { + r.note_sams(&[sam_at(0.0, 0.0, 0.0)], now); + } + assert_eq!(r.sam_tracks[0].keys.len(), 1, "stillness is one key"); + r.note_sams(&[sam_at(4.0, 0.0, 1.0)], 22); + let t = &r.sam_tracks[0]; + let pose = |tick: f64| t.pose(tick).unwrap(); + // Held at the old pose until just before the change, not gliding over the stillness. + assert!(pose(10.0).pos[0].abs() < 1e-6 && pose(10.0).yaw.abs() < 1e-6); + assert!(pose(20.0).pos[0].abs() < 1e-6); + // Half way through the move. + assert!((pose(21.0).pos[0] - 2.0).abs() < 1e-4 && (pose(21.0).yaw - 0.5).abs() < 1e-4); + assert!((pose(100.0).pos[0] - 4.0).abs() < 1e-6); + } + + #[test] + fn a_system_first_seen_later_is_not_drawn_before() { + let mut r = recording(); + r.note_sams(&[sam_at(0.0, 0.0, 0.0)], 40); + assert!(r.sam_tracks[0].pose(10.0).is_none()); + assert!(r.sam_tracks[0].pose(40.0).is_some()); + } + + #[test] + fn angles_turn_the_short_way_and_a_lost_system_is_a_wreck() { + let mut r = recording(); + r.note_sams(&[sam_at(0.0, 0.0, 6.2)], 0); + r.note_sams(&[sam_at(0.0, 0.0, 0.1)], 2); + let t = &mut r.sam_tracks[0]; + let mid = t.pose(1.0).unwrap().yaw; + assert!(!(0.2..6.0).contains(&mid), "through zero, not back round: {mid}"); + assert!(t.ghost(DVec3::ZERO, 1.0, 0).unwrap().alive()); + t.lost = Some(30); + assert!(t.ghost(DVec3::ZERO, 29.0, 0).unwrap().alive()); + assert!(!t.ghost(DVec3::ZERO, 31.0, 0).unwrap().alive()); + } + + #[test] + fn the_games_tick_is_known_through_the_recording() { + let mut r = recording(); + assert_eq!(r.world_tick(5.0), None); + r.ticks = vec![(0, 1000), (20, 1020), (40, 1040), (60, 1100)]; + assert_eq!(r.first_tick(), Some(1000)); + assert_eq!(r.world_tick(0.0), Some(1000)); + assert_eq!(r.world_tick(10.0), Some(1010)); + assert_eq!(r.world_tick(30.0), Some(1030)); + // A jump of the game's ticks between samples (the recording paused or a gap) is a step. + assert_eq!(r.world_tick(50.0), Some(1040 + 10)); + assert_eq!(r.world_tick(70.0), Some(1100 + 10)); + } +} diff --git a/airdef-mod/src/sim/units.rs b/airdef-mod/src/sim/units.rs index 810816d..b6c33fa 100644 --- a/airdef-mod/src/sim/units.rs +++ b/airdef-mod/src/sim/units.rs @@ -631,11 +631,16 @@ impl Sam { impl Sim { /// Draws unit `i`: its vehicle, its launcher or turret where it points, its antennas turning. pub(super) fn draw_sam(&mut self, i: usize, out: &mut Out) { - if !self.sams[i].alive() { - self.draw_wreck(i, out); - return; - } - let sam = &self.sams[i]; + draw_sam_model(&self.sams[i], &mut self.rng, out); + } +} + +/// Draws a system as it stands (a live one, or a replay's ghost built from the recording). +pub(super) fn draw_sam_model(sam: &Sam, rng: &mut Rng, out: &mut Out) { + if !sam.alive() { + damage::draw_wreck_of(sam, out); + return; + } let spec = sam.kind.spec(); let parts = &spec.parts; let base = sam.base(); @@ -709,9 +714,43 @@ impl Sim { _ => &[], }; for (n, b) in barrels.iter().enumerate() { - let r = rot * DQuat::from_rotation_z(self.rng.f() * TAU); + let r = rot * DQuat::from_rotation_z(rng.f() * TAU); out.model(id + 12 + n as u32, "airdef:flash", mount + rot * *b * s, r, 0.9, true); } } } + +/// The charred variant of a part's model, for wrecks (tools/gen_models.py `WRECKS`); a part without one keeps its model. +pub(super) fn wreck(model: &'static str) -> &'static str { + match model { + "airdef:patriot_trailer" => "airdef:patriot_trailer_burnt", + "airdef:patriot_launcher" => "airdef:patriot_launcher_burnt", + "airdef:gepard_hull" => "airdef:gepard_hull_burnt", + "airdef:gepard_turret" => "airdef:gepard_turret_burnt", + "airdef:gepard_guns" => "airdef:gepard_guns_burnt", + "airdef:pantsir_truck" => "airdef:pantsir_truck_burnt", + "airdef:pantsir_turret" => "airdef:pantsir_turret_burnt", + "airdef:pantsir_pack" => "airdef:pantsir_pack_burnt", + "airdef:s400_chassis" => "airdef:s400_chassis_burnt", + "airdef:s400_tubes" => "airdef:s400_tubes_burnt", + "airdef:s500_chassis" => "airdef:s500_chassis_burnt", + "airdef:s500_tubes" => "airdef:s500_tubes_burnt", + "airdef:irist_chassis" => "airdef:irist_chassis_burnt", + "airdef:irist_tubes" => "airdef:irist_tubes_burnt", + "airdef:nasams_trailer" => "airdef:nasams_trailer_burnt", + "airdef:nasams_launcher" => "airdef:nasams_launcher_burnt", + "airdef:buk_chassis" => "airdef:buk_chassis_burnt", + "airdef:buk_turret" => "airdef:buk_turret_burnt", + "airdef:buk_rails" => "airdef:buk_rails_burnt", + "airdef:tor_chassis" => "airdef:tor_chassis_burnt", + "airdef:tor_turret" => "airdef:tor_turret_burnt", + "airdef:p1sun_launcher" => "airdef:p1sun_launcher_burnt", + "airdef:radar_truck" => "airdef:radar_truck_burnt", + "airdef:depot" => "airdef:depot_burnt", + "airdef:tzm_truck" => "airdef:tzm_truck_burnt", + "airdef:ew_truck" => "airdef:ew_truck_burnt", + "airdef:searchlight" => "airdef:searchlight_burnt", + "airdef:searchlight_head" => "airdef:searchlight_head_burnt", + other => other, + } } diff --git a/docs/HD-RENDERER.md b/docs/HD-RENDERER.md index 5fbe758..4fbc24d 100644 --- a/docs/HD-RENDERER.md +++ b/docs/HD-RENDERER.md @@ -226,6 +226,7 @@ HORIZON_HD_TAA=0 --out run-home-bench/out/taa-off` — A/B; `--baseline run-home | #45: `gfx/hd.rs` разделён на модуль `gfx/hd/` (по файлу на проход: `shadows`, `gbuffer`, `ao`, `sky`, `volumes`, `lighting`+`tiles`, `water`, `taa`, `bloom`, `tonemap`, `frame`), WGSL вынесен в `.wgsl` (`include_str!`, общая прелюдия), у каждого прохода своя структура ресурсов/пайплайнов; контракты цвета, глубины, альф и времени записаны в `hd/mod.rs` и в начале файлов проходов; тесты привязок и размера `HdFrame`. Вид не менялся (сверка `tools/hd_bench.py`) | готово | в рабочем дереве форка | | #39: веер восхода `vanilla_sunrise_weight` отсекается до цикла по 16 треугольникам выше горизонта (знак x стороны солнца и наклон ≤ α/3; проверено перебором 200 тыс. лучей без пропусков); `hd lighting` на рассвете 5.3 → 3.3 мс (M-серия, 2560×1440) | готово | в рабочем дереве форка | +| Облака в воде, перистые, туман по рельефу, лучи, тень облаков при низком солнце, дальний дым (768 блоков) | готово, в рабочем дереве форка; тайминги не сняты чисто | не закоммичено | | Материалы и блики (план 5): G-буфер `levels.zw` = шероховатость, металличность; GGX-блик солнца с Френелем и отражение неба (`sky_along`/`atmosphere_sky`) в `shade_surface`; мокрые поверхности и лужи в дождь (`HdFrame.surface`); `HORIZON_HD_SPECULAR=0` — выкл. | готово | в рабочем дереве форка | | Ветер (план 7): листва и растения качаются в вершинной стадии террейна (`Globals.hd_wind`, `hd_materials`), те же смещения в тенях; `HORIZON_HD_WIND=0` — выкл. | готово | в рабочем дереве форка | | #67: облака марш идут до ближайшей поверхности (`fs_cloud` читает глубину мира, вторая цель — длина луча, история отбрасывается при другой длине); `fs_light` кладёт облака на все пиксели (`cloud_at`: 4 текселя с весом по близости длины луча), под туман и над поверхностью, для воды — в `air`; луч внутри слоя вдоль горизонта больше не пропускается | готово; проверено только пустой полигон (нет гор/техники в слое, снимки `scratchpad/c*.png`), бюджет GPU на Mac не мерился | в рабочем дереве форка | @@ -249,7 +250,7 @@ HORIZON_HD_TAA=0 --out run-home-bench/out/taa-off` — A/B; `--baseline run-home 3. **Небо и атмосфера** — СДЕЛАНО (патч 22, см. «Небо и свет» ниже). Исходное ТЗ: рассеяние Рэлея/Ми (предвычисленная LUT пропускания и небесного цвета в маленькой текстуре), солнце/луна дисками, звёзды из ванили; туман и лучи берут цвет из той же модели. Учесть дождь (`weather`), закат, Незер/Энд (там — ванильное небо). -4. **Объёмные облака** — СДЕЛАНО (патч 24, см. «Закат, облака и туман»). Осталось: перистые/высококучевые слои Photon, облака в отражении воды. +4. **Объёмные облака** — СДЕЛАНО (патч 24, см. «Закат, облака и туман»). Перистые и облака в воде сделаны (см. «Облака, перистые, туман по рельефу»). 5. **Блики и материалы** — СДЕЛАНО (см. «Материалы, мокрое, ветер»). Исходное ТЗ: specular солнца для металла техники (маска по оверлею/альбедо или атрибут модели из мода), мокрые поверхности и лужи в дождь. 6. **PCSS** (мягкость тени по расстоянию до тенеотбрасывателя) и цветные тени через стекло/листву. @@ -308,8 +309,15 @@ HORIZON_HD_TAA=0 --out run-home-bench/out/taa-off` — A/B; `--baseline run-home - **Туман (25).** `fs_fog`: 18 шагов, плотность `fog_sigma` (высотная дымка от y=62, масштаб 42; утренний туман — пока солнце на «утренней» стороне и низко; пятна из 3D-шума; дождь; затухание ниже y≈28–58, чтобы не светить в пещерах), свет — Photon-смесь двух HG, «вечернее свечение» ×1…3. Старые 14 шагов лучей остаются при `HORIZON_HD_VOLFOG=0`; ореолы вокруг источников мода — всегда. - **Тайминги.** Метки Metal (`HORIZON_SHADER_PACK_TIMING=1`, Hills, 2560×1440): `hd clouds` ≈ 6 мс (завышено: метка ловит ожидание соседних проходов), `hd cloud shadows` 0.2–3 (шум), `hd fog` ≈ 1.3. По среднему кадру GPU «оба выкл → оба вкл»: +0.2…3.7 мс (замеры шумные: рядом шла чужая игра на том же GPU). Как удешевить: у облаков — длина шага (14) и потолок шагов (26) в `fs_cloud`, 3 шага света, 4 октавы, облака в четверть разрешения; у тумана — `FOG_STEPS`. - **Разработка шейдеров.** `HORIZON_HD_SHADER_DIR=<папка>`: каждый HD-шейдер читается из `<папка>/<метка>.wgsl` (записывается из встроенного, если файла нет; это тело без прелюдии, она добавляется всегда) — правки видны после перезапуска игры без пересборки; готовое переносится в `gfx/hd/*.wgsl` вручную. -- **Слабые места.** Облака не отражаются в воде (SSR берёт небо без облаков); не закрывают далёкую землю выше слоя (только небо); карта теней облаков ±1200 блоков и почти не работает при солнце ниже ~10°; туман не знает рельефа (только высоту над y=62); нет перистых облаков; на быстром повороте камеры история облаков отбрасывается (кратковременный шум). +- **Слабые места (после доработки облаков и тумана).** Облака не закрывают далёкую землю выше слоя (только небо); карта теней облаков теперь центрируется на проекции камеры вдоль солнца (работает и при низком солнце, гаснет плавно при высоте солнца 0.03..0.2), но текстель карты ~9 блоков; перистые облака и панорама — без тени на землю; туман знает рельеф только в 512 блоках вокруг камеры (карта 8-блоковых клеток, деревья считаются минимумом из 4 проб); история облаков на быстром повороте держится сильнее (порог расхождения шире), но на краю экрана свежие пиксели остаются шумными; тайминги Metal в этой работе не сняты чисто (на машине шли другие игры, load average 65). +## Облака, перистые, туман по рельефу, дальний дым (доработка) + +- **Облака в отражениях.** Проход `hd cloud sky` (`fs_cloud_sky` в `cloud.wgsl`): панорама облаков 256×64 (`Rgba16Float`, азимут от +x по кругу × v = √(высота/(π/2))), марш кучевых «lite» (14 шагов, 2 шага света, без тоннелей дыма) + перистые, смешивается с прошлым кадром (0.8, без репроекции: история в мировых направлениях). Пинг-понг идёт тем же `flip`, что у облаков. Читает её `sky_with_clouds` (`pano_funcs.wgsl`, маркер `//PANO`): привязка 21 в `fs_light` (отражение неба на мокром/металле) и 12 в композите воды (`sky_along`). Групп воды теперь две (по `flip`). +- **Перистые.** `cirrus()` в `cloud.wgsl`: плоский слой на 900 блоков (`CIRRUS_ABOVE` над основанием кучевых), 2D-шум (каналы `noise2`, вытянут вдоль ветра, масштабы делят 65536), без марша света: прямой свет = цвет солнца облаков × (0.5 + 3·HG(0.7)) плюс небо; на закате цвет берётся из `cloud_sun`; дымка по расстоянию, гаснет у горизонта; дождь повышает покрытие (`cloud_cam.z`) и затемняет небесную долю. Складывается за кучевыми (`behind`), только на небо. У кучевых при дожде темнее небесный свет. +- **Туман по рельефу.** `gfx/hd/ground.rs`: карта 64×64 клетки по 8 блоков (`Rg16Float`: высота земли, глубина котловины = среднее в ±48 блоков минус высота), тороидальная (индекс = клетка mod 64, sampler Repeat, uv = мир/512). CPU обновляет по 256 клеток за кадр (4 пробы `world_surface`, минимум), при телепорте — всю карту; размытие и загрузка — раз в 4 кадра при изменениях. Данные: `Frame::hd_ground` (замыкание, `game.rs`). `fog_sigma`: утренний туман льнёт к земле и заполняет котловину до 75% глубины, немного дневной дымки в долинах, затухание ниже земли (g−14..g−3) вместо абсолютного y 28–58. Привязка 9 тумана. +- **Лучи.** `FOG_SUN` 1.1→1.35 (у дыма осталось 1.1) и плотность ×(1…1.9) при низком солнце (`low_sun`); в лесу Hills утром лучи заметны. +- **Дальний дым (#54).** Второй каскад сетки дыма: те же 128×64×128 клеток по 12 блоков (`FAR_CELL`): 768 блоков по горизонтали (192 вниз, 576 вверх), трубки не тоньше 7.2 блока, до 6144 сегментов (`FAR_MAX_SEGMENTS`); ближний — как раньше (192 блока, 3072). Проход `hd smoke grid far`; привязка 10 тумана; `HdFrame.smoke_far`, `smoke.w` = «дальняя сетка не пуста». В `fog.wgsl` два марша (`march_smoke(..., far)`): ближний до 200 блоков, дальний (шаг 12, до 72 шагов) до 800; вес ближнего — `smoke_near_cover` (плавно 1→0 на последних 8 клетках), дальнего — остаток: сумма 1, шва нет; дальний гаснет на последних 6 клетках. Игра (`mod_models.rs: mod_smoke`) шлёт сегменты до 900 блоков и до 8192. Не проверено глазами: полёт дронов на 700 блоков (`/airdef wave shahed 8 700` за время ожидания трасс не показал). ## Заметки по исправлениям #35–#41 (преемнику) - **Цели света.** `fs_light` пишет две цели: `lit` и `air` (`Rgba16Float`). Альфа `lit`: 1 — обычный пиксель, 0.5 — вода (в `lit` дно без воздуха, в `air` рассеяние воздуха до поверхности и пропускание в альфе), 0.6 — прозрачное перед водой (в `lit` сцена как нарисована, в `air.rgb` освещённое дно). Привязка 11 композита воды — `air`. diff --git a/horizon-patches/0001-Mod-API-AirDef-fork-world-models-client-particles-so.patch b/horizon-patches/0001-Mod-API-AirDef-fork-world-models-client-particles-so.patch index 6765fac..5b276bf 100644 --- a/horizon-patches/0001-Mod-API-AirDef-fork-world-models-client-particles-so.patch +++ b/horizon-patches/0001-Mod-API-AirDef-fork-world-models-client-particles-so.patch @@ -1,7 +1,7 @@ From 3de7a6875140a107e28563cc44489b55f5794517 Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 12:37:45 +0300 -Subject: [PATCH 01/32] Mod API (AirDef fork): world models, client particles, +Subject: [PATCH 01/33] Mod API (AirDef fork): world models, client particles, sounds, ground heights render.set-models draws block models with an interpolated pose per id; diff --git a/horizon-patches/0002-cargo-horizon-mod-report-particles-and-sounds.patch b/horizon-patches/0002-cargo-horizon-mod-report-particles-and-sounds.patch index 55f6f13..8f53dab 100644 --- a/horizon-patches/0002-cargo-horizon-mod-report-particles-and-sounds.patch +++ b/horizon-patches/0002-cargo-horizon-mod-report-particles-and-sounds.patch @@ -1,7 +1,7 @@ From a6d64e6415bf618539af464e521091e72b72d72f Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 12:39:45 +0300 -Subject: [PATCH 02/32] cargo-horizon-mod: report particles and sounds +Subject: [PATCH 02/33] cargo-horizon-mod: report particles and sounds Co-Authored-By: Claude Opus 5.5 --- diff --git a/horizon-patches/0003-Mod-API-AirDef-fork-full-screen-post-pass-for-mods.patch b/horizon-patches/0003-Mod-API-AirDef-fork-full-screen-post-pass-for-mods.patch index eef1670..77d5da7 100644 --- a/horizon-patches/0003-Mod-API-AirDef-fork-full-screen-post-pass-for-mods.patch +++ b/horizon-patches/0003-Mod-API-AirDef-fork-full-screen-post-pass-for-mods.patch @@ -1,7 +1,7 @@ From ee79b3562feebe51959a01f1585a9e85bd53ccb5 Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 13:33:10 +0300 -Subject: [PATCH 03/32] Mod API (AirDef fork): full-screen post pass for mods +Subject: [PATCH 03/33] Mod API (AirDef fork): full-screen post pass for mods render.set-post compiles a mod's WGSL after a prelude (camera matrices, time, 256 vec4 of params, the world's colour and depth) and runs it after diff --git a/horizon-patches/0004-Mod-models-draw-far-models-as-scaled-impostors-past-.patch b/horizon-patches/0004-Mod-models-draw-far-models-as-scaled-impostors-past-.patch index 1172587..1e4d5ca 100644 --- a/horizon-patches/0004-Mod-models-draw-far-models-as-scaled-impostors-past-.patch +++ b/horizon-patches/0004-Mod-models-draw-far-models-as-scaled-impostors-past-.patch @@ -1,7 +1,7 @@ From 2b137dbbedd540daeebc7f5e387847aeb56a1355 Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 22:09:30 +0300 -Subject: [PATCH 04/32] Mod models: draw far models as scaled impostors past +Subject: [PATCH 04/33] Mod models: draw far models as scaled impostors past the far plane, cull at 4096 --- diff --git a/horizon-patches/0005-Mod-cameras-render.set-views-draws-the-world-from-ot.patch b/horizon-patches/0005-Mod-cameras-render.set-views-draws-the-world-from-ot.patch index af0c93f..55a80df 100644 --- a/horizon-patches/0005-Mod-cameras-render.set-views-draws-the-world-from-ot.patch +++ b/horizon-patches/0005-Mod-cameras-render.set-views-draws-the-world-from-ot.patch @@ -1,7 +1,7 @@ From c8ebca6e0af68630e65211844b34d25c5b985c03 Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 22:31:00 +0300 -Subject: [PATCH 05/32] Mod cameras: render.set-views draws the world from +Subject: [PATCH 05/33] Mod cameras: render.set-views draws the world from other points into pictures that HUD view shapes show (API level 9) Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0006-Mods-more-fuel-per-tick-and-per-event-AirDef-plans-r.patch b/horizon-patches/0006-Mods-more-fuel-per-tick-and-per-event-AirDef-plans-r.patch index b914c48..a77c4e9 100644 --- a/horizon-patches/0006-Mods-more-fuel-per-tick-and-per-event-AirDef-plans-r.patch +++ b/horizon-patches/0006-Mods-more-fuel-per-tick-and-per-event-AirDef-plans-r.patch @@ -1,7 +1,7 @@ From 8d2261fc4f8072c32e454139cfea7a8c0cd9d664 Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 23:08:21 +0300 -Subject: [PATCH 06/32] Mods: more fuel per tick and per event (AirDef plans +Subject: [PATCH 06/33] Mods: more fuel per tick and per event (AirDef plans raids) Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0007-Mod-cameras-up-to-1920x1080-full-screen-replays.patch b/horizon-patches/0007-Mod-cameras-up-to-1920x1080-full-screen-replays.patch index 5952089..f2c2611 100644 --- a/horizon-patches/0007-Mod-cameras-up-to-1920x1080-full-screen-replays.patch +++ b/horizon-patches/0007-Mod-cameras-up-to-1920x1080-full-screen-replays.patch @@ -1,7 +1,7 @@ From 6c548de34def8e4a624d734243418090798bd16a Mon Sep 17 00:00:00 2001 From: chexit Date: Wed, 28 Oct 2026 23:25:29 +0300 -Subject: [PATCH 07/32] Mod cameras up to 1920x1080 (full-screen replays) +Subject: [PATCH 07/33] Mod cameras up to 1920x1080 (full-screen replays) Co-Authored-By: Claude Opus 5.5 --- diff --git a/horizon-patches/0008-Mod-cameras-distant-terrain-tiles-fog-measured-from-.patch b/horizon-patches/0008-Mod-cameras-distant-terrain-tiles-fog-measured-from-.patch index 6ebc193..e1f1715 100644 --- a/horizon-patches/0008-Mod-cameras-distant-terrain-tiles-fog-measured-from-.patch +++ b/horizon-patches/0008-Mod-cameras-distant-terrain-tiles-fog-measured-from-.patch @@ -1,7 +1,7 @@ From 9b9e93269d67401cc620567a884d5ce97f68d76e Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 11:15:11 +0300 -Subject: [PATCH 08/32] Mod cameras: distant terrain tiles, fog measured from +Subject: [PATCH 08/33] Mod cameras: distant terrain tiles, fog measured from the camera, no impostors while one is shown Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0009-Mods-game.world-id-so-mods-keep-state-per-world-API-.patch b/horizon-patches/0009-Mods-game.world-id-so-mods-keep-state-per-world-API-.patch index 9884387..b2e050f 100644 --- a/horizon-patches/0009-Mods-game.world-id-so-mods-keep-state-per-world-API-.patch +++ b/horizon-patches/0009-Mods-game.world-id-so-mods-keep-state-per-world-API-.patch @@ -1,7 +1,7 @@ From 065d9fa02966238a5bd9ff460392a1a809db0b11 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 11:25:45 +0300 -Subject: [PATCH 09/32] Mods: game.world-id, so mods keep state per world (API +Subject: [PATCH 09/33] Mods: game.world-id, so mods keep state per world (API level 9) Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0010-cargo-horizon-mod-trial-runs-behind-feature-full-so-.patch b/horizon-patches/0010-cargo-horizon-mod-trial-runs-behind-feature-full-so-.patch index ddb8df6..400a78f 100644 --- a/horizon-patches/0010-cargo-horizon-mod-trial-runs-behind-feature-full-so-.patch +++ b/horizon-patches/0010-cargo-horizon-mod-trial-runs-behind-feature-full-so-.patch @@ -1,7 +1,7 @@ From 1bf28135fd9a31f837323dc3a8d81ed73343d816 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 12:01:08 +0300 -Subject: [PATCH 10/32] cargo-horizon-mod: trial runs behind feature full, so a +Subject: [PATCH 10/33] cargo-horizon-mod: trial runs behind feature full, so a packing-only tool skips wasmtime Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0011-HD-lighting-G-buffer-pass-per-pixel-mod-point-lights.patch b/horizon-patches/0011-HD-lighting-G-buffer-pass-per-pixel-mod-point-lights.patch index 239dd31..61fbb5b 100644 --- a/horizon-patches/0011-HD-lighting-G-buffer-pass-per-pixel-mod-point-lights.patch +++ b/horizon-patches/0011-HD-lighting-G-buffer-pass-per-pixel-mod-point-lights.patch @@ -1,7 +1,7 @@ From 0a56f5616df4699588cbcc529d4720661baa810f Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 13:18:43 +0300 -Subject: [PATCH 11/32] HD lighting: G-buffer pass, per-pixel mod point lights +Subject: [PATCH 11/33] HD lighting: G-buffer pass, per-pixel mod point lights in HDR, bloom and tone curve; render.set-lights and render.set-lighting (API level 10) diff --git a/horizon-patches/0012-HD-lighting-stage-2-sun-and-moon-shadow-cascades-the.patch b/horizon-patches/0012-HD-lighting-stage-2-sun-and-moon-shadow-cascades-the.patch index 0c66c6e..52cae11 100644 --- a/horizon-patches/0012-HD-lighting-stage-2-sun-and-moon-shadow-cascades-the.patch +++ b/horizon-patches/0012-HD-lighting-stage-2-sun-and-moon-shadow-cascades-the.patch @@ -1,7 +1,7 @@ From 9ebf0031fe9ba6b7f02afb26e4fd3a1ba4ddb0d0 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 13:59:43 +0300 -Subject: [PATCH 12/32] HD lighting stage 2: sun and moon shadow cascades, the +Subject: [PATCH 12/33] HD lighting stage 2: sun and moon shadow cascades, the world relit (sun by face angle and shadow, sky and block light through the lightmap), light shafts and halos, fog over it again, a light colour grade diff --git a/horizon-patches/0013-HD-bind-groups-cached-until-a-resize-or-a-new-source.patch b/horizon-patches/0013-HD-bind-groups-cached-until-a-resize-or-a-new-source.patch index e943874..962bd6e 100644 --- a/horizon-patches/0013-HD-bind-groups-cached-until-a-resize-or-a-new-source.patch +++ b/horizon-patches/0013-HD-bind-groups-cached-until-a-resize-or-a-new-source.patch @@ -1,7 +1,7 @@ From 7a5a38f68923aec62f10bfa0df50b436474ed612 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 16:19:53 +0300 -Subject: [PATCH 13/32] HD: bind groups cached until a resize or a new source, +Subject: [PATCH 13/33] HD: bind groups cached until a resize or a new source, shadow passes draw only the entities that cast shadows Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0014-HD-lights-culled-per-16x16-tile-surface-and-halo-lis.patch b/horizon-patches/0014-HD-lights-culled-per-16x16-tile-surface-and-halo-lis.patch index 81283f3..0509ea3 100644 --- a/horizon-patches/0014-HD-lights-culled-per-16x16-tile-surface-and-halo-lis.patch +++ b/horizon-patches/0014-HD-lights-culled-per-16x16-tile-surface-and-halo-lis.patch @@ -1,7 +1,7 @@ From 8020811e57d4b5a9ea1cd72d30ce859dc5095d35 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 16:25:44 +0300 -Subject: [PATCH 14/32] HD: lights culled per 16x16 tile (surface and halo +Subject: [PATCH 14/33] HD: lights culled per 16x16 tile (surface and halo lists built on the CPU), a naga test for the lighting shaders Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0015-HD-GPU-time-per-pass-in-the-F3-timing-list-half-reso.patch b/horizon-patches/0015-HD-GPU-time-per-pass-in-the-F3-timing-list-half-reso.patch index 3ac7a76..c36b974 100644 --- a/horizon-patches/0015-HD-GPU-time-per-pass-in-the-F3-timing-list-half-reso.patch +++ b/horizon-patches/0015-HD-GPU-time-per-pass-in-the-F3-timing-list-half-reso.patch @@ -1,7 +1,7 @@ From 72d3fddfea329e578162656151350f0aa2efd323 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 16:43:36 +0300 -Subject: [PATCH 15/32] HD: GPU time per pass in the F3 timing list, +Subject: [PATCH 15/33] HD: GPU time per pass in the F3 timing list, half-resolution GTAO with a depth-aware blur Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0016-HD-shadows-draw-only-sun-facing-quads-and-skip-burie.patch b/horizon-patches/0016-HD-shadows-draw-only-sun-facing-quads-and-skip-burie.patch index f2e96d9..2448519 100644 --- a/horizon-patches/0016-HD-shadows-draw-only-sun-facing-quads-and-skip-burie.patch +++ b/horizon-patches/0016-HD-shadows-draw-only-sun-facing-quads-and-skip-burie.patch @@ -1,7 +1,7 @@ From 1fd83a821bf270879d8ece5aa583f200ed920d89 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 17:02:02 +0300 -Subject: [PATCH 16/32] HD: shadows draw only sun-facing quads and skip buried +Subject: [PATCH 16/33] HD: shadows draw only sun-facing quads and skip buried sections, the far cascade every second frame; TAA (Halton jitter, reprojection by depth, YCoCg variance clipping) before bloom diff --git a/horizon-patches/0017-Mods-model-handles-render.model-id-model-generation-.patch b/horizon-patches/0017-Mods-model-handles-render.model-id-model-generation-.patch index 22a77f5..5521ce7 100644 --- a/horizon-patches/0017-Mods-model-handles-render.model-id-model-generation-.patch +++ b/horizon-patches/0017-Mods-model-handles-render.model-id-model-generation-.patch @@ -1,7 +1,7 @@ From 1502d359d599228fe0f44ce6b99a3fded2ac5ea0 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 17:02:02 +0300 -Subject: [PATCH 17/32] Mods: model handles (render.model-id, model-generation, +Subject: [PATCH 17/33] Mods: model handles (render.model-id, model-generation, set-models-by-id; API level 11) so mods send no model names each tick; clear-post and set-lighting documented diff --git a/horizon-patches/0018-HD-temporal-upscaling-HORIZON_HD_SCALE-world-G-buffe.patch b/horizon-patches/0018-HD-temporal-upscaling-HORIZON_HD_SCALE-world-G-buffe.patch index 3ff7869..4844f67 100644 --- a/horizon-patches/0018-HD-temporal-upscaling-HORIZON_HD_SCALE-world-G-buffe.patch +++ b/horizon-patches/0018-HD-temporal-upscaling-HORIZON_HD_SCALE-world-G-buffe.patch @@ -1,7 +1,7 @@ From 0f9d99b8ad3e4b72e621d84c2396cf1d3d2b7a33 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 17:19:57 +0300 -Subject: [PATCH 18/32] HD: temporal upscaling (HORIZON_HD_SCALE: world, +Subject: [PATCH 18/33] HD: temporal upscaling (HORIZON_HD_SCALE: world, G-buffer and lighting at a lower size, rebuilt to the window in the TAA pass); fix flickering shadows near the player (the near cascade lost its sections on frames the far one was held, the held far matrix ignored the diff --git a/horizon-patches/0019-HD-water-its-own-pass-colour-normal-depth-the-floor-.patch b/horizon-patches/0019-HD-water-its-own-pass-colour-normal-depth-the-floor-.patch index c21fc56..e00f60d 100644 --- a/horizon-patches/0019-HD-water-its-own-pass-colour-normal-depth-the-floor-.patch +++ b/horizon-patches/0019-HD-water-its-own-pass-colour-normal-depth-the-floor-.patch @@ -1,7 +1,7 @@ From 38250c4392e27d5700842ca6ee47291dd1831b72 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 17:47:52 +0300 -Subject: [PATCH 19/32] HD water: its own pass (colour, normal, depth), the +Subject: [PATCH 19/33] HD water: its own pass (colour, normal, depth), the floor under it lit, a composite with world-space waves, refraction with depth absorption in the biome colour, screen-space reflections, Fresnel and a shadowed sun glint (HORIZON_HD_WATER=0 to switch off) diff --git a/horizon-patches/0020-HD-water-no-vanilla-texture-on-the-surface-the-biome.patch b/horizon-patches/0020-HD-water-no-vanilla-texture-on-the-surface-the-biome.patch index a439723..73711b0 100644 --- a/horizon-patches/0020-HD-water-no-vanilla-texture-on-the-surface-the-biome.patch +++ b/horizon-patches/0020-HD-water-no-vanilla-texture-on-the-surface-the-biome.patch @@ -1,7 +1,7 @@ From dbc6f8a6e9c2eeabe1de15f1794013c90be7faa5 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 17:56:04 +0300 -Subject: [PATCH 20/32] HD water: no vanilla texture on the surface (the biome +Subject: [PATCH 20/33] HD water: no vanilla texture on the surface (the biome colour only), a darker, deeper colour Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0021-HD-sky-and-light-a-physical-atmosphere-Rayleigh-Mie-.patch b/horizon-patches/0021-HD-sky-and-light-a-physical-atmosphere-Rayleigh-Mie-.patch index 8e292e4..1d87f5e 100644 --- a/horizon-patches/0021-HD-sky-and-light-a-physical-atmosphere-Rayleigh-Mie-.patch +++ b/horizon-patches/0021-HD-sky-and-light-a-physical-atmosphere-Rayleigh-Mie-.patch @@ -1,7 +1,7 @@ From 13e74537dd6e63482e3613e0e416de1158944dfe Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 18:38:19 +0300 -Subject: [PATCH 21/32] HD sky and light: a physical atmosphere (Rayleigh, Mie, +Subject: [PATCH 21/33] HD sky and light: a physical atmosphere (Rayleigh, Mie, ozone; constants and transmittance after Photon, MIT) for the sky, haze, fog and water reflections; warmer sunlight from the atmosphere's transmittance, a gentle sky-coloured ambient, soft PCSS-lite shadows near the player, a haze diff --git a/horizon-patches/0022-HD-water-a-darker-blue-a-little-clearer-ripples-a-li.patch b/horizon-patches/0022-HD-water-a-darker-blue-a-little-clearer-ripples-a-li.patch index 851e6ca..db5c49c 100644 --- a/horizon-patches/0022-HD-water-a-darker-blue-a-little-clearer-ripples-a-li.patch +++ b/horizon-patches/0022-HD-water-a-darker-blue-a-little-clearer-ripples-a-li.patch @@ -1,7 +1,7 @@ From 6277e051a89c2537570982f6ef275887193c05cf Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 19:02:16 +0300 -Subject: [PATCH 22/32] HD water: a darker blue, a little clearer, ripples a +Subject: [PATCH 22/33] HD water: a darker blue, a little clearer, ripples a little higher Co-Authored-By: Claude Opus 5.5 diff --git a/horizon-patches/0023-HD-Photon-style-sunsets-Rec.-2020-atmosphere-sun-tin.patch b/horizon-patches/0023-HD-Photon-style-sunsets-Rec.-2020-atmosphere-sun-tin.patch index 3e988e3..86b01bd 100644 --- a/horizon-patches/0023-HD-Photon-style-sunsets-Rec.-2020-atmosphere-sun-tin.patch +++ b/horizon-patches/0023-HD-Photon-style-sunsets-Rec.-2020-atmosphere-sun-tin.patch @@ -1,7 +1,7 @@ From 982265d21bb9d74ec0040db03feb5a55762286ad Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 21:41:48 +0300 -Subject: [PATCH 23/32] HD: Photon-style sunsets (Rec. 2020 atmosphere, sun +Subject: [PATCH 23/33] HD: Photon-style sunsets (Rec. 2020 atmosphere, sun tint, blue hour; MIT), volumetric clouds with ground shadows instead of vanilla's in HD, volumetric fog with sun shafts and morning mist (HORIZON_HD_CLOUDS=0, HORIZON_HD_VOLFOG=0) diff --git a/horizon-patches/0024-Mods-world-queries-for-simulations-render.query-rays.patch b/horizon-patches/0024-Mods-world-queries-for-simulations-render.query-rays.patch index e581726..af1757d 100644 --- a/horizon-patches/0024-Mods-world-queries-for-simulations-render.query-rays.patch +++ b/horizon-patches/0024-Mods-world-queries-for-simulations-render.query-rays.patch @@ -1,7 +1,7 @@ From 24971b3c67d8c87673eb2e0d204cedf8a2f46d1c Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 21:43:22 +0300 -Subject: [PATCH 24/32] Mods: world queries for simulations (render.query-rays, +Subject: [PATCH 24/33] Mods: world queries for simulations (render.query-rays, query-sections, world-changes; API level 12): block-exact rays and section occupancy by collision, sight or sound, answered next tick within budgets, and a log of changed sections diff --git a/horizon-patches/0025-HD-fixes-rain-level-from-the-world-not-from-rain-geo.patch b/horizon-patches/0025-HD-fixes-rain-level-from-the-world-not-from-rain-geo.patch index 95364bf..49e71b2 100644 --- a/horizon-patches/0025-HD-fixes-rain-level-from-the-world-not-from-rain-geo.patch +++ b/horizon-patches/0025-HD-fixes-rain-level-from-the-world-not-from-rain-geo.patch @@ -1,7 +1,7 @@ From fdec4960983bdff82f3793460f9a5234f0cd3f49 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 22:56:15 +0300 -Subject: [PATCH 25/32] HD fixes: rain level from the world not from rain +Subject: [PATCH 25/33] HD fixes: rain level from the world not from rain geometry (#41), TAA history on the jittered grid (#38), vanilla cloud tint without a depth heuristic (#35), air fog once over water (#37), translucent things in front of HD water (#36), cheaper sunrise fan (#39), halos in thick diff --git a/horizon-patches/0026-HD-split-into-modules-gfx-hd-one-Rust-file-and-one-W.patch b/horizon-patches/0026-HD-split-into-modules-gfx-hd-one-Rust-file-and-one-W.patch index 9632aac..615f5c4 100644 --- a/horizon-patches/0026-HD-split-into-modules-gfx-hd-one-Rust-file-and-one-W.patch +++ b/horizon-patches/0026-HD-split-into-modules-gfx-hd-one-Rust-file-and-one-W.patch @@ -1,7 +1,7 @@ From 21391afb26f49505d6cdaf454a6355cd4e747503 Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 23:19:53 +0300 -Subject: [PATCH 26/32] HD split into modules (gfx/hd/: one Rust file and one +Subject: [PATCH 26/33] HD split into modules (gfx/hd/: one Rust file and one WGSL file per pass, a shared prelude), contracts for colour, depth, alpha, time and coordinates written down, tests that the frame layout and bindings match between Rust and WGSL (#45) diff --git a/horizon-patches/0027-HD-clouds-noise-scales-that-divide-the-camera-s-6553.patch b/horizon-patches/0027-HD-clouds-noise-scales-that-divide-the-camera-s-6553.patch index d3ee3a8..825c131 100644 --- a/horizon-patches/0027-HD-clouds-noise-scales-that-divide-the-camera-s-6553.patch +++ b/horizon-patches/0027-HD-clouds-noise-scales-that-divide-the-camera-s-6553.patch @@ -1,7 +1,7 @@ From 8d4cadbf8534309ac847d34e229f6d764770475d Mon Sep 17 00:00:00 2001 From: chexit Date: Thu, 29 Oct 2026 23:22:19 +0300 -Subject: [PATCH 27/32] HD clouds: noise scales that divide the camera's +Subject: [PATCH 27/33] HD clouds: noise scales that divide the camera's 65536-block wrap, so the clouds and their shadows no longer jump at x or z = 0 diff --git a/horizon-patches/0028-HD-volumetric-smoke-and-missile-trails-with-clear-tu.patch b/horizon-patches/0028-HD-volumetric-smoke-and-missile-trails-with-clear-tu.patch index 2c5bcc3..8c5788a 100644 --- a/horizon-patches/0028-HD-volumetric-smoke-and-missile-trails-with-clear-tu.patch +++ b/horizon-patches/0028-HD-volumetric-smoke-and-missile-trails-with-clear-tu.patch @@ -1,7 +1,7 @@ From 0fb59c782abf269fe555faa3241b31acf41e26d7 Mon Sep 17 00:00:00 2001 From: chexit Date: Fri, 30 Oct 2026 03:17:11 +0300 -Subject: [PATCH 28/32] HD: volumetric smoke and missile trails with clear +Subject: [PATCH 28/33] HD: volumetric smoke and missile trails with clear tunnels through fog and cloud (render.set-smoke, API level 14; #54); sun speculars by material, wet surfaces and puddles in rain, wind in foliage (HORIZON_HD_SPECULAR=0, HORIZON_HD_WIND=0, HORIZON_HD_SMOKE=0); HD shaders diff --git a/horizon-patches/0029-HD-clouds-composited-by-depth-so-terrain-and-vehicle.patch b/horizon-patches/0029-HD-clouds-composited-by-depth-so-terrain-and-vehicle.patch index 6f9ce07..1d504ea 100644 --- a/horizon-patches/0029-HD-clouds-composited-by-depth-so-terrain-and-vehicle.patch +++ b/horizon-patches/0029-HD-clouds-composited-by-depth-so-terrain-and-vehicle.patch @@ -1,7 +1,7 @@ From e4bc29da45d0d38244c6eb2ba3ffb9ab853540c0 Mon Sep 17 00:00:00 2001 From: chexit Date: Fri, 30 Oct 2026 03:26:09 +0300 -Subject: [PATCH 29/32] HD clouds composited by depth so terrain and vehicles +Subject: [PATCH 29/33] HD clouds composited by depth so terrain and vehicles inside or behind the layer are hidden and those in front stay in front (#67); world-anchored noise everywhere (cloud detail by height above the layer, fog, smoke and puddle scales dividing the wrap) (#68); the replay's time is visual diff --git a/horizon-patches/0030-HD-smoke-young-trails-drawn-at-least-as-wide-as-a-gr.patch b/horizon-patches/0030-HD-smoke-young-trails-drawn-at-least-as-wide-as-a-gr.patch index 88b1dd3..32d5d26 100644 --- a/horizon-patches/0030-HD-smoke-young-trails-drawn-at-least-as-wide-as-a-gr.patch +++ b/horizon-patches/0030-HD-smoke-young-trails-drawn-at-least-as-wide-as-a-gr.patch @@ -1,7 +1,7 @@ From 20f699796afb12b600236a4e8859cd97430f86f0 Mon Sep 17 00:00:00 2001 From: chexit Date: Fri, 30 Oct 2026 03:44:45 +0300 -Subject: [PATCH 30/32] HD smoke: young trails drawn at least as wide as a grid +Subject: [PATCH 30/33] HD smoke: young trails drawn at least as wide as a grid cell (density scaled to keep the mass), gentler bulges, so a trail is a smooth ribbon and not a chain of puffs diff --git a/horizon-patches/0031-Mods-render.set-main-view-API-level-15-renders-the-s.patch b/horizon-patches/0031-Mods-render.set-main-view-API-level-15-renders-the-s.patch index fceb1a0..8cc313b 100644 --- a/horizon-patches/0031-Mods-render.set-main-view-API-level-15-renders-the-s.patch +++ b/horizon-patches/0031-Mods-render.set-main-view-API-level-15-renders-the-s.patch @@ -1,7 +1,7 @@ From 35ffbaa26dd91855c8b93446646ba8c58448d3d0 Mon Sep 17 00:00:00 2001 From: chexit Date: Fri, 30 Oct 2026 03:59:41 +0300 -Subject: [PATCH 31/32] Mods: render.set-main-view (API level 15) renders the +Subject: [PATCH 31/33] Mods: render.set-main-view (API level 15) renders the screen's world from a mod camera with the full pipeline, so replays get HD and the post effects; small mod views get the post pass with their own camera diff --git a/horizon-patches/0032-Spot-lights-for-mods-render.set-spot-lights-API-leve.patch b/horizon-patches/0032-Spot-lights-for-mods-render.set-spot-lights-API-leve.patch index 380ad81..4131676 100644 --- a/horizon-patches/0032-Spot-lights-for-mods-render.set-spot-lights-API-leve.patch +++ b/horizon-patches/0032-Spot-lights-for-mods-render.set-spot-lights-API-leve.patch @@ -1,7 +1,7 @@ From 27e24527550942695164dd3a769a42a659e797ca Mon Sep 17 00:00:00 2001 From: chexit Date: Fri, 30 Oct 2026 09:28:05 +0300 -Subject: [PATCH 32/32] Spot lights for mods (render.set-spot-lights, API level +Subject: [PATCH 32/33] Spot lights for mods (render.set-spot-lights, API level 16): surfaces lit in the cone, a volumetric beam stopped by depth (#60); film capture (render.capture-*, set-film-quality, API level 17): fixed-step clock, frames piped to ffmpeg or PNGs, offline audio, no chat in the frames (#58); diff --git a/horizon-patches/0033-HD-clouds-and-fog-polish-cloud-panorama-cirrus-terra.patch b/horizon-patches/0033-HD-clouds-and-fog-polish-cloud-panorama-cirrus-terra.patch new file mode 100644 index 0000000..c220c10 --- /dev/null +++ b/horizon-patches/0033-HD-clouds-and-fog-polish-cloud-panorama-cirrus-terra.patch @@ -0,0 +1,2994 @@ +From 615f5c3fa7c19a9895f8972a88333c6f250ad78a Mon Sep 17 00:00:00 2001 +From: chexit +Date: Fri, 30 Oct 2026 14:30:39 +0300 +Subject: [PATCH 33/33] HD clouds and fog polish: cloud panorama, cirrus, + terrain-aware fog, far smoke cascade; replay world log and film clock; + material overlays by sprite name + +Co-Authored-By: Claude Opus 5.5 +--- + crates/horizon-client/src/film_clock.rs | 45 +++ + crates/horizon-client/src/game.rs | 11 + + crates/horizon-client/src/game/film.rs | 17 + + crates/horizon-client/src/game/mod_models.rs | 42 +- + crates/horizon-client/src/game/mods.rs | 60 +++ + crates/horizon-client/src/gfx.rs | 5 + + .../src/gfx/THIRD_PARTY_PHOTON.md | 2 +- + crates/horizon-client/src/gfx/hd/cloud.wgsl | 233 +++++++---- + .../src/gfx/hd/cloud_shadow.wgsl | 17 +- + crates/horizon-client/src/gfx/hd/fog.wgsl | 86 +++- + crates/horizon-client/src/gfx/hd/frame.rs | 4 +- + crates/horizon-client/src/gfx/hd/ground.rs | 208 ++++++++++ + crates/horizon-client/src/gfx/hd/light.wgsl | 26 +- + crates/horizon-client/src/gfx/hd/lighting.rs | 4 +- + crates/horizon-client/src/gfx/hd/materials.rs | 2 +- + crates/horizon-client/src/gfx/hd/mod.rs | 18 +- + .../horizon-client/src/gfx/hd/pano_funcs.wgsl | 18 + + crates/horizon-client/src/gfx/hd/prelude.wgsl | 1 + + crates/horizon-client/src/gfx/hd/sky.rs | 3 + + crates/horizon-client/src/gfx/hd/smoke.rs | 304 +++++++++----- + .../horizon-client/src/gfx/hd/smoke_grid.wgsl | 6 +- + .../src/gfx/hd/smoke_sample.wgsl | 29 ++ + crates/horizon-client/src/gfx/hd/volumes.rs | 144 ++++++- + crates/horizon-client/src/gfx/hd/water.rs | 21 +- + crates/horizon-client/src/gfx/hd/water.wgsl | 3 +- + crates/horizon-client/src/gfx/mod_post.rs | 2 +- + crates/horizon-client/src/gfx/native_post.rs | 2 +- + .../horizon-client/src/gfx/pack_uniforms.rs | 2 +- + crates/horizon-client/src/lib.rs | 2 + + crates/horizon-client/src/world.rs | 129 ++++-- + crates/horizon-client/src/world_log.rs | 372 ++++++++++++++++++ + crates/horizon-mod-sdk/wit/horizon.wit | 26 ++ + crates/horizon-mods/src/api_level.rs | 9 +- + crates/horizon-mods/src/runtime.rs | 50 +++ + docs/api/mods-reference.md | 4 + + 35 files changed, 1657 insertions(+), 250 deletions(-) + create mode 100644 crates/horizon-client/src/film_clock.rs + create mode 100644 crates/horizon-client/src/gfx/hd/ground.rs + create mode 100644 crates/horizon-client/src/gfx/hd/pano_funcs.wgsl + create mode 100644 crates/horizon-client/src/world_log.rs + +diff --git a/crates/horizon-client/src/film_clock.rs b/crates/horizon-client/src/film_clock.rs +new file mode 100644 +index 000000000..6396e4c1f +--- /dev/null ++++ b/crates/horizon-client/src/film_clock.rs +@@ -0,0 +1,45 @@ ++//! AirDef fork: the clock of animations that run on wall time (clouds, water, wind, post-pass ++//! time, smoothing steps). While a film is captured the game's frames are not real time (each ++//! takes as long as it takes to render, and a 120 fps film has twice the frames of a 60 fps one ++//! in the same film second), so these animations read this clock instead: it stands at the ++//! film's own time, `1 / fps` further each frame, and is the real clock the rest of the time. ++use std::sync::Mutex; ++use std::time::{Duration, Instant}; ++ ++static FILM: Mutex> = Mutex::new(None); ++ ++/// The film's moment (frozen for the frame), or None to run on real time again. ++pub fn set(now: Option) { ++ if let Ok(mut f) = FILM.lock() { ++ *f = now; ++ } ++} ++ ++/// What the animations take as now. ++pub fn now() -> Instant { ++ FILM.lock() ++ .ok() ++ .and_then(|f| *f) ++ .unwrap_or_else(Instant::now) ++} ++ ++/// Time since `start` on this clock. ++pub fn since(start: Instant) -> Duration { ++ now().saturating_duration_since(start) ++} ++ ++#[cfg(test)] ++mod tests { ++ use super::*; ++ ++ #[test] ++ fn film_time_is_the_frames_not_the_wall() { ++ let origin = Instant::now(); ++ set(Some(origin + Duration::from_millis(50))); ++ assert_eq!(since(origin), Duration::from_millis(50)); ++ std::thread::sleep(Duration::from_millis(5)); ++ assert_eq!(since(origin), Duration::from_millis(50)); ++ set(None); ++ assert!(since(origin) >= Duration::from_millis(5)); ++ } ++} +diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs +index bace52193..3f776fd3f 100644 +--- a/crates/horizon-client/src/game.rs ++++ b/crates/horizon-client/src/game.rs +@@ -11881,7 +11881,17 @@ impl Game<'_> { + let hd_lights = self.mod_lights(camera, alpha); + let hd_spots = self.mod_spots(camera, alpha); + let (hd_smoke, hd_smoke_clock) = self.mod_smoke(camera, alpha); ++ // AirDef fork: HD's fog reads the ground's height round the camera. ++ let hd_ground = |x: i32, z: i32| { ++ self.world ++ .world_surface(x, z, |s| self.res.facts().is_air(s)) ++ }; + let frame = Frame { ++ hd_ground: if self.mod_hd().is_some() { ++ Some(&hd_ground) ++ } else { ++ None ++ }, + mod_views: &mod_views, + hd: self.mod_hd(), + hd_lights: &hd_lights, +@@ -14828,6 +14838,7 @@ fn loading_frame(hud: &HudBatch) -> Frame<'_> { + hd_spots: &[], + hd_smoke: &[], + hd_smoke_clock: 0.0, ++ hd_ground: None, + weather: &[], + weather_time: horizon_client::weather::Time::new(0, 0.0), + camera: glam::DVec3::new(0.5, 100.0, 0.5), +diff --git a/crates/horizon-client/src/game/film.rs b/crates/horizon-client/src/game/film.rs +index 8d1995030..2ae449fc5 100644 +--- a/crates/horizon-client/src/game/film.rs ++++ b/crates/horizon-client/src/game/film.rs +@@ -96,6 +96,8 @@ pub(super) struct Film { + view: Option, + /// Audio frames mixed so far. + mixed: u64, ++ /// Where the film's own clock (`film_clock`) began: real time at the first frame. ++ origin: std::time::Instant, + /// Told to stop (cancel or not) and what the writer is finishing. + cancel: bool, + note: String, +@@ -476,6 +478,10 @@ impl Game<'_> { + let n = film.stepped; + film.stepped += 1; + let at = |k: u64| (k * 1_000_000_000 + fps / 2) / fps; ++ // Animations on wall time follow the film's frames, not the machine's speed. ++ horizon_client::film_clock::set(Some( ++ film.origin + Duration::from_nanos(at(n + 1)), ++ )); + Duration::from_nanos(at(n + 1) - at(n)) + } + _ => real, +@@ -535,6 +541,14 @@ impl Game<'_> { + }; + } + } ++ if self ++ .film ++ .film ++ .as_ref() ++ .is_none_or(|f| f.phase != Phase::Recording) ++ { ++ horizon_client::film_clock::set(None); ++ } + // Film quality: a capture needs it; otherwise it is the mods' choice. + let want = self.film.film.is_some() || self.mods_film_quality(); + horizon_client::gfx::set_film_quality(want); +@@ -585,6 +599,7 @@ impl Game<'_> { + thread: None, + view: None, + mixed: 0, ++ origin: std::time::Instant::now(), + cancel: false, + note: String::new(), + }) +@@ -643,6 +658,8 @@ impl Game<'_> { + film.sink = Some(tx); + film.phase = Phase::Recording; + film.stepped = 0; ++ film.origin = std::time::Instant::now(); ++ horizon_client::film_clock::set(Some(film.origin)); + if film.req.audio { + self.audio.film_begin(); + } +diff --git a/crates/horizon-client/src/game/mod_models.rs b/crates/horizon-client/src/game/mod_models.rs +index 9367bb994..78ee8448b 100644 +--- a/crates/horizon-client/src/game/mod_models.rs ++++ b/crates/horizon-client/src/game/mod_models.rs +@@ -53,7 +53,6 @@ const MODEL_GLOW: u32 = 40; + const MODEL_PAINTED: u32 = 41; + /// Bare metal: smooth and fully metallic (entity.wgsl's fs_entity_gbuffer). + #[cfg(feature = "mods")] +-#[allow(dead_code)] + const MODEL_BARE_METAL: u32 = 42; + /// Full brightness: sky and block light 15, as the entity shader packs them. + #[cfg(feature = "mods")] +@@ -330,8 +329,8 @@ impl Game<'_> { + let a = DVec3::new(s.ax, s.ay, s.az) - camera; + let b = DVec3::new(s.bx, s.by, s.bz) - camera; + let near = a.length().min(b.length()); +- // Far past the grid, nothing of it can show. +- if near > 600.0 { ++ // Far past the far grid (768 blocks), nothing of it can show. ++ if near > 900.0 { + return None; + } + let seed = (s.id.wrapping_mul(2_654_435_761) >> 8) as f32 / 16_777_216.0; +@@ -347,7 +346,7 @@ impl Game<'_> { + }) + .collect(); + out.sort_by(|x, y| x.0.total_cmp(&y.0)); +- out.truncate(3072); ++ out.truncate(8192); + ( + out.into_iter().map(|(_, s)| s).collect(), + clock.rem_euclid(86_400.0 * 20.0) as f32 / 20.0, +@@ -399,6 +398,25 @@ impl Game<'_> { + let reach = depth_far * 0.85; + // A mod camera (a replay's, a system's) must see them where they are: no impostors then. + let impostors = self.mods.models.views.is_empty(); ++ // Sprites a model asks a material of by name: `glow_*` glows (40), `bare_*` and `glass_*` ++ // are bare metal / glass (42); the rest is painted (41). Matched by atlas rectangle below. ++ let special: Vec<([f32; 4], u32)> = self ++ .gui ++ .atlas ++ .sprites ++ .iter() ++ .filter_map(|(n, r)| { ++ let f = n.rsplit('/').next()?; ++ let m = if f.starts_with("glow_") { ++ MODEL_GLOW ++ } else if f.starts_with("bare_") || f.starts_with("glass_") { ++ MODEL_BARE_METAL ++ } else { ++ return None; ++ }; ++ Some(([r.u0, r.v0, r.u1, r.v1], m)) ++ }) ++ .collect(); + for p in self.mods.models.poses.values() { + let mut at = p.previous.lerp(p.position, t); + let d = at.distance(camera); +@@ -439,6 +457,22 @@ impl Game<'_> { + for v in &mut out[start..] { + v.layer = if p.glow { MODEL_GLOW } else { MODEL_PAINTED }; + } ++ if !p.glow { ++ // A quad takes its material from the sprite under its centre (the corners may touch a neighbour). ++ for q in out[start..].chunks_mut(4) { ++ let n = q.len() as f32; ++ let u = q.iter().map(|v| v.uv[0]).sum::() / n; ++ let w = q.iter().map(|v| v.uv[1]).sum::() / n; ++ if let Some((_, m)) = special.iter().find(|(r, _)| u > r[0] && u < r[2] && w > r[1] && w < r[3]) { ++ for v in q { ++ v.layer = *m; ++ if *m == MODEL_GLOW { ++ v.light = GLOW; ++ } ++ } ++ } ++ } ++ } + } + } + +diff --git a/crates/horizon-client/src/game/mods.rs b/crates/horizon-client/src/game/mods.rs +index 6623905f0..b4d332f41 100644 +--- a/crates/horizon-client/src/game/mods.rs ++++ b/crates/horizon-client/src/game/mods.rs +@@ -280,6 +280,7 @@ impl Game<'_> { + pub(super) fn sync_mods(&mut self) {} + pub(super) fn tick_mods(&mut self) {} + pub(super) fn mods_frame(&mut self, _elapsed: Duration) {} ++ pub(super) fn sync_world_log(&mut self) {} + pub(super) fn mods_film_requests( + &mut self, + ) -> (Option, Option) { +@@ -716,6 +717,7 @@ impl Game<'_> { + } + pub(super) fn mods_frame(&mut self, elapsed: Duration) { + self.reload_dev_mods(); ++ self.sync_world_log(); + if !self.mods.mods.is_running() { + return; + } +@@ -727,6 +729,64 @@ impl Game<'_> { + self.mods.mods.frame(elapsed.as_secs_f32()); + self.show_mod_output(); + } ++ /// AirDef fork: the block-change log a mod asked for (`render.world-log-start`), what it ++ /// covers, and the mod's view of the world at an earlier tick (`set-world-time-view`), ++ /// moved on a little each frame (all at once while a film is recorded: its frames are not ++ /// real time). Only where the world is a server's copy: with the world run in the frame ++ /// the blocks are the game's own and are never shown other than they are. ++ pub(super) fn sync_world_log(&mut self) { ++ use horizon_client::world_log::WorldLog; ++ self.world.log_tick = self.ticks; ++ let wanted = if self.remote.is_some() { ++ self.mods.mods.world_log_wanted() ++ } else { ++ None ++ }; ++ match wanted { ++ Some(id) => { ++ if self.world.log.as_ref().is_none_or(|l| l.id != id) { ++ self.world.log = Some(WorldLog::new(id, self.ticks)); ++ } ++ } ++ None => { ++ if self.world.log.is_some() { ++ // Every displaced block back, then the log goes. ++ self.world.view_log(None, usize::MAX, None); ++ self.world.log = None; ++ } ++ } ++ } ++ let id = self.world.log.as_ref().map(|l| l.id); ++ let state = self ++ .world ++ .log ++ .as_ref() ++ .map(|l| (l.id, l.earliest(), self.ticks)); ++ self.mods.mods.set_world_log_state(state); ++ let target = self ++ .mods ++ .mods ++ .time_view() ++ .filter(|v| Some(v.0) == id) ++ .map(|v| v.1); ++ let active = self.world.log.as_ref().is_some_and(|l| l.active()); ++ if target.is_some() || active { ++ // The player's own neighbourhood stays as it is: nobody falls through a view. ++ let protect = self.player.as_ref().map(|p| { ++ [ ++ p.position.x.floor() as i32, ++ p.position.y.floor() as i32, ++ p.position.z.floor() as i32, ++ ] ++ }); ++ let budget = if self.film.recording() { ++ usize::MAX ++ } else { ++ 12_000 ++ }; ++ self.world.view_log(target, budget, protect); ++ } ++ } + /// `/command` typed in chat: true when a mod owns it. + pub(super) fn mod_command(&mut self, command: &str) -> bool { + if !self.mods.mods.is_running() { +diff --git a/crates/horizon-client/src/gfx.rs b/crates/horizon-client/src/gfx.rs +index 9482cf0d2..5b221fd7e 100644 +--- a/crates/horizon-client/src/gfx.rs ++++ b/crates/horizon-client/src/gfx.rs +@@ -245,6 +245,8 @@ pub struct Frame<'a> { + /// in seconds. + pub hd_smoke: &'a [HdSmoke], + pub hd_smoke_clock: f32, ++ /// One above the highest block of a world column (for HD's terrain-aware fog), if known. ++ pub hd_ground: Option<&'a (dyn Fn(i32, i32) -> i32 + 'a)>, + pub yaw: f32, + pub pitch: f32, + pub fov_degrees: f32, +@@ -5266,6 +5268,9 @@ impl Renderer { + frame.hd_lights, + frame.hd_smoke_clock, + ); ++ if let Some(top) = frame.hd_ground { ++ hd.write_ground(&self.queue, camera.x, camera.z, top); ++ } + hd.write_spots(frame.hd_spots); + hd.write(&self.queue, &hd_scene, frame.hd_lights, settings); + } +diff --git a/crates/horizon-client/src/gfx/THIRD_PARTY_PHOTON.md b/crates/horizon-client/src/gfx/THIRD_PARTY_PHOTON.md +index fd9f4d029..15838a3f7 100644 +--- a/crates/horizon-client/src/gfx/THIRD_PARTY_PHOTON.md ++++ b/crates/horizon-client/src/gfx/THIRD_PARTY_PHOTON.md +@@ -19,7 +19,7 @@ edge sharpening, Worley erosion, the single and multiple scattering phase functi + the eight-octave multiple-scattering loop, the light march with doubling steps, the transmittance remap, + the aerial perspective), `include/lighting/cloud_shadows.glsl` (the cloud shadow map, here a lookup into a + small map) and `include/fog/air_fog_vl.glsl` (the phase mix of two Henyey-Greenstein lobes, the evening +-glow). The 3D Worley and 2D noise textures are generated on our side; the ray march, the passes, the ++glow). The cirrus layer follows the structure of `include/sky/clouds/cirrus.glsl` (a thin 2D layer at height, noise-driven coverage, forward-scattering phase, no light march), written from that structure, not copied. The 3D Worley and 2D noise textures are generated on our side; the ray march, the passes, the + reprojection and the integration are our own. + + Photon is distributed under the MIT License: +diff --git a/crates/horizon-client/src/gfx/hd/cloud.wgsl b/crates/horizon-client/src/gfx/hd/cloud.wgsl +index b2bdd3080..18aac24f6 100644 +--- a/crates/horizon-client/src/gfx/hd/cloud.wgsl ++++ b/crates/horizon-client/src/gfx/hd/cloud.wgsl +@@ -75,6 +75,143 @@ fn cloud_scatter( + return s * integral; + } + ++// ---- The high cirrus layer: a thin flat sheet of wisps far above the cumulus, no light march. ---- ++ ++// Its height above the cumulus layer's base, and its extinction at full density. ++const CIRRUS_ABOVE: f32 = 707.67; ++const CIRRUS_EXT: f32 = 1.3; ++const CIRRUS_WIND: vec2 = vec2(5.5, 1.2); ++ ++// The density of the cirrus at a point of its plane (world x, z). Stretched along x (the wind), the ++// coverage from a very large field, a warp that bends the streaks, then streaks and fine wisps. ++// Every scale divides 65536 (the camera's wrap). ++fn cirrus_density(cir: vec2) -> f32 { ++ let cov = textureSampleLevel(noise2, repeat_s, vec2(cir.x / 32768.0, cir.y / 16384.0), 0.0).r; ++ let warp = (textureSampleLevel(noise2, repeat_s, vec2(cir.x / 16384.0, cir.y / 8192.0), 0.0).g - 0.5) * 1200.0; ++ let cw = vec2(cir.x, cir.y + warp); ++ let streak = textureSampleLevel(noise2, repeat_s, vec2(cw.x / 8192.0, cw.y / 1024.0), 0.0).b; ++ let wisp = textureSampleLevel(noise2, repeat_s, vec2(cw.x / 4096.0, cw.y / 512.0), 0.0).b; ++ let fine = textureSampleLevel(noise2, repeat_s, vec2(cw.x / 2048.0, cw.y / 256.0), 0.0).a; ++ let n = 0.5 * streak + 0.3 * wisp + 0.2 * fine; ++ // Rain brings more of it. ++ let t = mix(0.64, 0.50, cov) - frame.cloud_cam.z * 0.8; ++ let d = smoothstep(t, t + 0.13, n); ++ return d * sqrt(d); ++} ++ ++// The cirrus along `dir`: light and transmittance (a), lit by the same sun as the cumulus (tinted at ++// sunset), thin enough to need no march. Behind the cumulus, fading out towards the horizon. ++fn cirrus(dir: vec3) -> vec4 { ++ let rel = frame.clouds.x + CIRRUS_ABOVE; ++ if abs(dir.y) < 0.02 { return vec4(0.0, 0.0, 0.0, 1.0); } ++ let t = rel / dir.y; ++ if t <= 0.0 || t > 45000.0 { return vec4(0.0, 0.0, 0.0, 1.0); } ++ let cir = vec2(frame.cloud_cam.x + dir.x * t, frame.cloud_cam.y + dir.z * t) ++ + CIRRUS_WIND * frame.clouds.w; ++ let d = cirrus_density(cir); ++ let fade = smoothstep(0.03, 0.2, abs(dir.y)); ++ let od = d * CIRRUS_EXT * fade; ++ if od < 0.003 { return vec4(0.0, 0.0, 0.0, 1.0); } ++ let overcast = frame.sky_extra.z; ++ let light = frame.cloud_dir.xyz; ++ let cos_theta = dot(dir, light); ++ let sun_light = frame.cloud_sun.rgb * frame.cloud_sun.w * (1.0 - overcast); ++ let zenith = sky_show(textureLoad(sky_lut, vec2(0, 64), 0).rgb); ++ let horizon = sky_show(textureLoad(sky_lut, vec2(1, 64), 0).rgb); ++ let ambient = mix(horizon, zenith, 0.55) * (1.0 - 0.4 * overcast); ++ // A thin sheet scatters forward: bright near the sun, a pale veil elsewhere. ++ let direct = sun_light * (0.5 + 3.0 * hg(cos_theta, 0.7)); ++ let trans = exp(-od); ++ var colour = (1.0 - trans) * (direct + ambient * 0.9) * 1.1; ++ let haze = haze_colour(dir); ++ colour = mix((1.0 - trans) * haze, colour, exp(-t / 16000.0)); ++ return vec4(colour, trans); ++} ++ ++// Cirrus behind a cumulus result (`c`: light, transmittance). ++fn behind(c: vec4, far: vec4) -> vec4 { ++ return vec4(c.rgb + c.a * far.rgb, c.a * far.a); ++} ++ ++struct March { ++ cloud: vec4, ++ hit_t: f32, ++} ++ ++// The cumulus slab along `dir` up to `scene_len`: light and transmittance. `lite` is the cheap ++// version for the sky panorama (fewer steps, a shorter light march, no flying thing's tunnel). ++fn march_cumulus(dir: vec3, scene_len: f32, dither: f32, lite: bool) -> March { ++ var cur = vec4(0.0, 0.0, 0.0, 1.0); ++ var hit_t = 900.0; ++ let y0 = frame.clouds.x; ++ let y1 = y0 + frame.clouds.y; ++ // A level ray stays in the slab if the camera is in it (it never leaves), else misses it. ++ let dy = select(dir.y, select(-1.0e-4, 1.0e-4, dir.y >= 0.0), abs(dir.y) < 1.0e-4); ++ let ta = y0 / dy; ++ let tb = y1 / dy; ++ let lo = max(min(ta, tb), 0.0); ++ let hi = min(max(ta, tb), min(4200.0, scene_len)); ++ if hi > lo { ++ // Film quality (surface.z): half the step length, twice the cap. ++ let fine = frame.surface.z > 0.5 && !lite; ++ let n = select( ++ clamp(i32(ceil((hi - lo) / select(14.0, 7.0, fine))), select(8, 16, fine), select(26, 52, fine)), ++ 14, ++ lite, ++ ); ++ let light_steps = select(3, 2, lite); ++ let step_len = (hi - lo) / f32(n); ++ let light = frame.cloud_dir.xyz; ++ let cos_theta = dot(dir, light); ++ let overcast = frame.sky_extra.z; ++ let ext = CLOUD_EXT * (1.0 - 0.25 * overcast); ++ let sca = ext; ++ let bounced = 0.4 * max(light.y, 0.0) / CPI; ++ var scatter = vec2(0.0); ++ var t_acc = 1.0; ++ var dist_sum = 0.0; ++ var weight_sum = 0.0; ++ for (var i = 0; i < n; i++) { ++ if t_acc < 0.075 { break; } ++ let t = lo + step_len * (f32(i) + dither); ++ let pos = dir * t; ++ var d = cloud_density(pos, 1.0); ++ if d < 0.002 { continue; } ++ d *= 1.0 - smoothstep(0.8, 1.0, t / 4200.0); ++ // A flying thing's tunnel through the cloud. ++ if !lite && frame.smoke.x > 0.5 { d *= 1.0 - smoke_at(smoke_tex, linear, pos).a; } ++ let step_od = d * ext * step_len; ++ let step_t = exp(-step_od); ++ let h = clamp((pos.y - y0) / frame.clouds.y, 0.0, 1.0); ++ let hash = fract(dither * 7.13 + f32(i) * 0.618); ++ let light_od = cloud_light_depth(pos, light, light_steps, hash, 1.0); ++ let sky_od = cloud_light_depth(pos, vec3(0.0, 1.0, 0.0), 1, 1.0 - hash, 0.0); ++ // A guess of the optical depth to the ground from the altitude and this density. ++ let ground_od = mix(d, 1.0, clamp(h * 2.0 - 1.0, 0.0, 1.0)) * h * frame.clouds.y; ++ scatter += cloud_scatter(d, light_od, sky_od, ground_od, ext, sca, step_t, cos_theta, bounced) * t_acc; ++ t_acc *= step_t; ++ dist_sum += t * d; ++ weight_sum += d; ++ } ++ if weight_sum > 0.0 { hit_t = dist_sum / weight_sum; } ++ // The sunlight's colour at this hour (Photon: the light's colour from the transmittance), ++ // the sky's own light from the zenith and the horizon; rain darkens the sky's share too. ++ let sun_light = frame.cloud_sun.rgb * frame.cloud_sun.w * (1.0 - overcast); ++ let zenith = sky_show(textureLoad(sky_lut, vec2(0, 64), 0).rgb); ++ let horizon = sky_show(textureLoad(sky_lut, vec2(1, 64), 0).rgb); ++ let ambient = mix(horizon, zenith, 0.55) * (1.0 - 0.4 * overcast); ++ var colour = scatter.x * sun_light * 3.2 + scatter.y * ambient * 5.0; ++ // The remap of Photon: the transmittance's floor is 0. ++ let trans = linear_step(0.075, 1.0, t_acc); ++ // Aerial perspective: far clouds fade into the haze. ++ let haze = haze_colour(dir); ++ let air = exp(-hit_t / 3600.0); ++ colour = mix((1.0 - trans) * haze, colour, air); ++ cur = vec4(colour, trans); ++ } ++ return March(cur, hit_t); ++} ++ + @fragment + fn fs_cloud(in: FullOut) -> CloudOut { + // The nearest of the four world pixels this texel stands for: the march ends at the surface +@@ -99,72 +236,11 @@ fn fs_cloud(in: FullOut) -> CloudOut { + let ndc = vec4(in.uv.x * 2.0 - 1.0, 1.0 - in.uv.y * 2.0, 0.5, 1.0); + let hh = frame.inverse_view_proj * ndc; + let dir = normalize(hh.xyz / hh.w); +- var cur = vec4(0.0, 0.0, 0.0, 1.0); +- var hit_t = 900.0; +- let y0 = frame.clouds.x; +- let y1 = y0 + frame.clouds.y; +- // A level ray stays in the slab if the camera is in it (it never leaves), else misses it. +- let dy = select(dir.y, select(-1.0e-4, 1.0e-4, dir.y >= 0.0), abs(dir.y) < 1.0e-4); +- { +- let ta = y0 / dy; +- let tb = y1 / dy; +- let lo = max(min(ta, tb), 0.0); +- let hi = min(max(ta, tb), min(4200.0, scene_len)); +- if hi > lo { +- let dither = ign(in.position.xy); +- // Film quality (surface.z): half the step length, twice the cap. +- let fine = frame.surface.z > 0.5; +- let n = clamp(i32(ceil((hi - lo) / select(14.0, 7.0, fine))), select(8, 16, fine), select(26, 52, fine)); +- let step_len = (hi - lo) / f32(n); +- let light = frame.cloud_dir.xyz; +- let cos_theta = dot(dir, light); +- let overcast = frame.sky_extra.z; +- let ext = CLOUD_EXT * (1.0 - 0.25 * overcast); +- let sca = ext; +- let bounced = 0.4 * max(light.y, 0.0) / CPI; +- var scatter = vec2(0.0); +- var t_acc = 1.0; +- var dist_sum = 0.0; +- var weight_sum = 0.0; +- for (var i = 0; i < n; i++) { +- if t_acc < 0.075 { break; } +- let t = lo + step_len * (f32(i) + dither); +- let pos = dir * t; +- var d = cloud_density(pos, 1.0); +- if d < 0.002 { continue; } +- d *= 1.0 - smoothstep(0.8, 1.0, t / 4200.0); +- // A flying thing's tunnel through the cloud. +- if frame.smoke.x > 0.5 { d *= 1.0 - smoke_at(smoke_tex, linear, pos).a; } +- let step_od = d * ext * step_len; +- let step_t = exp(-step_od); +- let h = clamp((pos.y - y0) / frame.clouds.y, 0.0, 1.0); +- let hash = fract(dither * 7.13 + f32(i) * 0.618); +- let light_od = cloud_light_depth(pos, light, 3, hash, 1.0); +- let sky_od = cloud_light_depth(pos, vec3(0.0, 1.0, 0.0), 1, 1.0 - hash, 0.0); +- // A guess of the optical depth to the ground from the altitude and this density. +- let ground_od = mix(d, 1.0, clamp(h * 2.0 - 1.0, 0.0, 1.0)) * h * frame.clouds.y; +- scatter += cloud_scatter(d, light_od, sky_od, ground_od, ext, sca, step_t, cos_theta, bounced) * t_acc; +- t_acc *= step_t; +- dist_sum += t * d; +- weight_sum += d; +- } +- if weight_sum > 0.0 { hit_t = dist_sum / weight_sum; } +- // The sunlight's colour at this hour (Photon: the light's colour from the transmittance), +- // the sky's own light from the zenith and the horizon. +- let sun_light = frame.cloud_sun.rgb * frame.cloud_sun.w * (1.0 - overcast); +- let zenith = sky_show(textureLoad(sky_lut, vec2(0, 64), 0).rgb); +- let horizon = sky_show(textureLoad(sky_lut, vec2(1, 64), 0).rgb); +- let ambient = mix(horizon, zenith, 0.55); +- var colour = scatter.x * sun_light * 3.2 + scatter.y * ambient * 5.0; +- // The remap of Photon: the transmittance's floor is 0. +- let trans = linear_step(0.075, 1.0, t_acc); +- // Aerial perspective: far clouds fade into the haze. +- let haze = haze_colour(dir); +- let air = exp(-hit_t / 3600.0); +- colour = mix((1.0 - trans) * haze, colour, air); +- cur = vec4(colour, trans); +- } +- } ++ let m = march_cumulus(dir, scene_len, ign(in.position.xy), false); ++ var cur = m.cloud; ++ let hit_t = m.hit_t; ++ // The cirrus stands behind everything but the sky. ++ if scene_len >= SKY_LEN * 0.99 { cur = behind(cur, cirrus(dir)); } + var out: CloudOut; + out.dist = vec4(scene_len, 0.0, 0.0, 0.0); + // Reproject the history by where the clouds are (rotation and the camera's step) and blend. +@@ -179,9 +255,11 @@ fn fs_cloud(in: FullOut) -> CloudOut { + let hs = vec2(textureDimensions(history_dist)); + let old_len = textureLoad(history_dist, vec2(huv * hs), 0).x; + let same_len = 1.0 - smoothstep(0.5, 1.0, abs(old_len - scene_len) / (0.1 * min(scene_len, old_len) + 2.0)); +- // Not too much of a history that disagrees by a lot (a gust, a fast turn). ++ // The march's own noise (a dithered, short march) also makes the two differ: only ++ // a clear disagreement (a gust, a fast change) drops the history, so a fast turn ++ // keeps its smoothness instead of showing the noise of fresh samples. + let diff = length(old.rgb - cur.rgb) + abs(old.a - cur.a); +- let keep = 0.9 * (1.0 - smoothstep(0.35, 1.2, diff)) * same_len; ++ let keep = 0.92 * (1.0 - smoothstep(0.7, 1.9, diff)) * same_len; + cur = mix(cur, old, keep); + } + } +@@ -189,3 +267,22 @@ fn fs_cloud(in: FullOut) -> CloudOut { + out.cloud = cur; + return out; + } ++ ++// The sky panorama: the clouds as seen from the camera in every direction above the horizon ++// (azimuth u over the whole circle from +x, elevation v = sqrt(e / (pi / 2))), without the scene. ++// Lite march, blended with last frame's panorama (the history is in world directions, no ++// reprojection). The water's and the wet surfaces' sky reflections read it. ++@fragment ++fn fs_cloud_sky(in: FullOut) -> @location(0) vec4 { ++ let e = CPI * 0.5 * in.uv.y * in.uv.y; ++ let phi = (in.uv.x - 0.5) * 2.0 * CPI; ++ let dir = vec3(cos(e) * cos(phi), sin(e), cos(e) * sin(phi)); ++ let m = march_cumulus(dir, SKY_LEN, ign(in.position.xy), true); ++ var cur = behind(m.cloud, cirrus(dir)); ++ if frame.cloud_cam.w > 0.5 { ++ let old = textureLoad(history, vec2(in.position.xy), 0); ++ let diff = length(old.rgb - cur.rgb) + abs(old.a - cur.a); ++ cur = mix(cur, old, 0.8 * (1.0 - smoothstep(0.6, 1.8, diff))); ++ } ++ return cur; ++} +diff --git a/crates/horizon-client/src/gfx/hd/cloud_shadow.wgsl b/crates/horizon-client/src/gfx/hd/cloud_shadow.wgsl +index 8fca87fba..36cfe66ef 100644 +--- a/crates/horizon-client/src/gfx/hd/cloud_shadow.wgsl ++++ b/crates/horizon-client/src/gfx/hd/cloud_shadow.wgsl +@@ -1,18 +1,19 @@ +- + @fragment + fn fs_cloud_shadow(in: FullOut) -> @location(0) vec4 { +- // A square of the cloud base plane round the camera; a texel holds the optical depth of the +- // sunlight's way through the slab from that point. +- let q = (in.uv - vec2(0.5)) * (2.0 * SHADOW_R); ++ // A square of the cloud base plane, centred where the sunlight through the camera crosses it ++ // (so a low sun, whose shadows fall far from the cloud, still covers the ground round the ++ // camera); a texel holds the optical depth of the sunlight's way through the slab from there. + let light = frame.cloud_dir.xyz; +- let ly = max(light.y, 0.15); ++ let ly = max(light.y, 0.04); ++ let centre = light.xz * (frame.clouds.x / ly); ++ let q = centre + (in.uv - vec2(0.5)) * (2.0 * SHADOW_R); + let base = vec3(q.x, frame.clouds.x + 0.5, q.y); + let len = frame.clouds.y / ly; + var od = 0.0; +- for (var i = 0; i < 4; i++) { +- let t = (f32(i) + 0.5) / 4.0 * len; ++ for (var i = 0; i < 8; i++) { ++ let t = (f32(i) + 0.5) / 8.0 * len; + od += cloud_density(base + light * t, 0.0); + } +- od *= CLOUD_EXT * len / 4.0 * (1.0 - 0.25 * frame.sky_extra.z); ++ od *= CLOUD_EXT * len / 8.0 * (1.0 - 0.25 * frame.sky_extra.z); + return vec4(od, 0.0, 0.0, 1.0); + } +diff --git a/crates/horizon-client/src/gfx/hd/fog.wgsl b/crates/horizon-client/src/gfx/hd/fog.wgsl +index 3fde6e22f..40a81e540 100644 +--- a/crates/horizon-client/src/gfx/hd/fog.wgsl ++++ b/crates/horizon-client/src/gfx/hd/fog.wgsl +@@ -8,6 +8,11 @@ + @group(0) @binding(6) var linear: sampler; + //SKY7 + @group(0) @binding(8) var smoke_tex: texture_2d; ++// The ground's height (r) and basin depth (g) round the camera, 8-block cells, stored toroidally ++// (64 cells = 512 blocks): read with the world x, z over 512 and a repeating sampler. ++@group(0) @binding(9) var ground_tex: texture_2d; ++// The far smoke grid (12-block cells). ++@group(0) @binding(10) var smoke_far_tex: texture_2d; + + //SPOT + +@@ -49,24 +54,42 @@ fn sun_visible(p: vec3) -> f32 { + } + + // The air's extinction per block at a camera-relative point: a haze that thins with height above +-// the sea, a morning mist hugging the ground, rain, patches from a 3D noise that drifts (its scale divides 65536, the wrap of the camera's x, z, so it does not jump at x or z = 0); none +-// deep underground. ++// the sea and pools a little in valleys, a morning mist that follows the ground (it fills a valley ++// up to about its rim, and clings thin to flat ground and ridges), rain, patches from a 3D noise ++// that drifts (its scale divides 65536, the wrap of the camera's x, z, so it does not jump at ++// x or z = 0); none deep under the ground. + fn fog_sigma(p: vec3) -> f32 { + let wy = p.y + frame.vfog.y; ++ let wxz = vec2(p.x + frame.cloud_cam.x, p.z + frame.cloud_cam.y); ++ let gr = textureSampleLevel(ground_tex, repeat_s, wxz / 512.0, 0.0).rg; ++ let ground = gr.x; ++ let valley = smoothstep(3.0, 24.0, gr.y); ++ let above = max(wy - ground, 0.0); + let h = wy - 62.0; + var s = 0.0016 * exp(clamp(-h / 42.0, -6.0, 1.3)); +- s += frame.vfog.z * 0.011 * exp(clamp(-h / 15.0, -6.0, 1.0)); ++ // Valleys hold some haze through the day too. ++ s += 0.0012 * valley * exp(clamp(-above / (10.0 + 0.6 * gr.y), -6.0, 0.0)); ++ // Mist: in a valley it fills up to the rim (three quarters of the way to the average ground) ++ // and fades over a few blocks above; elsewhere it hugs the ground. ++ let rim = ground + 0.75 * gr.y; ++ let fill = exp(clamp(-max(wy - rim, 0.0) / 9.0, -6.0, 0.0)); ++ let hug = exp(clamp(-above / 11.0, -6.0, 0.0)); ++ s += frame.vfog.z * 0.011 * mix(0.55 * hug, 1.35 * fill, valley); + s += frame.sky_extra.z * 0.003; +- let w = vec3(p.x + frame.cloud_cam.x, wy, p.z + frame.cloud_cam.y) +- + vec3(0.5, 0.0, 0.35) * frame.clouds.w; ++ let w = vec3(wxz.x, wy, wxz.y) + vec3(0.5, 0.0, 0.35) * frame.clouds.w; + let n = textureSampleLevel(noise3, repeat_s, w / 128.0, 0.0).b; + let patchy = 0.35 + 1.3 * smoothstep(0.25, 0.75, n); +- // Fade out far below the sea's height: caves keep their own dark air. +- return s * patchy * smoothstep(28.0, 58.0, wy); ++ // Fade out below the ground (caves keep their own dark air); unknown ground reads as the sea. ++ // A low sun shows its shafts better in a little denser air (Photon thickens the fog at dawn and dusk too). ++ let low_sun = (1.0 - smoothstep(0.05, 0.5, frame.sky_sun.y)) * min(frame.sun.w * 3.0, 1.0); ++ return s * patchy * (1.0 + 0.9 * low_sun) * smoothstep(ground - 14.0, ground - 3.0, wy); + } + + const SMOKE_MAX: f32 = 200.0; + const SMOKE_STEP: f32 = 3.5; ++// The far grid's range and its step. ++const SMOKE_FAR_MAX: f32 = 800.0; ++const SMOKE_FAR_STEP: f32 = 12.0; + const SMOKE_WIND: vec2 = vec2(1.6, 1.2); + + fn fire_colour(h: f32) -> vec3 { +@@ -86,17 +109,29 @@ fn smoke_detail(pos: vec3, core: f32) -> f32 { + return core * mix(0.35, 1.45, keep) * mix(0.6, 1.0, smoothstep(0.0, 0.6, core)); + } + +-// The smoke between the camera and `len` along `dir`: light and transmittance (a). +-fn march_smoke(dir: vec3, len: f32, jitter: f32, haze: vec3, cos_v: f32) -> vec4 { +- let lo = frame.smoke_min.xyz; +- let hi = lo + vec3(128.0, 64.0, 128.0) * frame.smoke.y; ++// One cascade of the smoke grid at a point: the near one raw (the cover below weighs it), the far ++// one with its edge fade. ++fn smoke_cell(far: bool, p: vec3) -> vec4 { ++ if far { return smoke_far_at(smoke_far_tex, linear, p); } ++ return smoke_raw(smoke_tex, linear, p, frame.smoke_min.xyz, frame.smoke.y); ++} ++ ++// The smoke of one cascade between the camera and `len` along `dir`: light and transmittance (a). ++// The near cascade weighs a point by `smoke_near_cover`, the far one by what is left, so the seam ++// carries the same smoke either way. ++fn march_smoke(dir: vec3, len: f32, jitter: f32, haze: vec3, cos_v: f32, far: bool) -> vec4 { ++ let cell = select(frame.smoke.y, frame.smoke_far.w, far); ++ let lo = select(frame.smoke_min.xyz, frame.smoke_far.xyz, far); ++ let hi = lo + vec3(128.0, 64.0, 128.0) * cell; ++ let near_on = frame.smoke.x > 0.5; + let inv = vec3(1.0) / select(dir, vec3(1e-5), abs(dir) < vec3(1e-5)); + let t0v = (lo - vec3(0.0)) * inv; + let t1v = (hi - vec3(0.0)) * inv; + let t_in = max(max(min(t0v.x, t1v.x), min(t0v.y, t1v.y)), max(min(t0v.z, t1v.z), 0.0)); + let t_out = min(min(max(t0v.x, t1v.x), max(t0v.y, t1v.y)), min(max(t0v.z, t1v.z), len)); + if t_out <= t_in { return vec4(0.0, 0.0, 0.0, 1.0); } +- let n = clamp(i32(ceil((t_out - t_in) / SMOKE_STEP)), 1, 64); ++ let step_len = select(SMOKE_STEP, SMOKE_FAR_STEP, far); ++ let n = clamp(i32(ceil((t_out - t_in) / step_len)), 1, select(64, 72, far)); + let ds = (t_out - t_in) / f32(n); + let sun = frame.sun.xyz; + let sun_on = frame.sun.w; +@@ -108,9 +143,13 @@ fn march_smoke(dir: vec3, len: f32, jitter: f32, haze: vec3, cos_v: f3 + for (var i = 0; i < n; i++) { + if trans < 0.02 { break; } + let pos = dir * (t_in + (f32(i) + jitter) * ds); +- if smoke_probe(smoke_tex, linear, pos) < 0.003 { continue; } +- let g = smoke_at(smoke_tex, linear, pos); ++ let cover = select(0.0, smoke_near_cover(pos), near_on); ++ let weight = select(cover, 1.0 - cover, far); ++ if weight < 0.003 { continue; } ++ var g = smoke_cell(far, pos); + if g.x < 0.004 { continue; } ++ g *= weight; ++ if g.x < 0.002 { continue; } + let dens = smoke_detail(pos, g.x); + let a = 1.0 - exp(-dens * ds); + let inv_d = 1.0 / max(g.x, 1e-4); +@@ -121,8 +160,9 @@ fn march_smoke(dir: vec3, len: f32, jitter: f32, haze: vec3, cos_v: f3 + var vis = 1.0; + if sun_on > 0.0 { vis = sun_visible(pos); } + var od = 0.0; ++ let lstep = select(4.0, 16.0, far); + for (var k = 0; k < 3; k++) { +- od += smoke_at(smoke_tex, linear, pos + sun * (f32(k) + 0.5 + 0.5 * jitter) * 4.0).x * 4.0; ++ od += smoke_cell(far, pos + sun * (f32(k) + 0.5 + 0.5 * jitter) * lstep).x * lstep; + } + let through = 0.65 * exp(-od * 0.9) + 0.35 * exp(-od * 0.22); + var glow = vec3(0.0); +@@ -136,7 +176,7 @@ fn march_smoke(dir: vec3, len: f32, jitter: f32, haze: vec3, cos_v: f3 + glow += frame.smoke_lights[j * 2 + 1].rgb / (dist * dist + 6.0) * window; + } + let ambient = up_sky * (0.25 + 0.75 * exp(-od * 0.35)) * FOG_AMBIENT; +- var s = albedo * (sun_light * vis * phase * through * FOG_SUN + ambient + glow * 1.5); ++ var s = albedo * (sun_light * vis * phase * through * 1.1 + ambient + glow * 1.5); + s += fire_colour(heat) * heat * heat * 9.0; + light += trans * a * s; + trans *= 1.0 - a; +@@ -209,8 +249,16 @@ fn fs_fog(in: FullOut) -> FogOut { + if frame.vfog.w > 0.5 { + fog = vec4(fog.rgb + spot_beams(dir, select(BEAM_FAR, length(p), d > 0.0), jitter), fog.a); + } +- if frame.smoke.x > 0.5 { +- let sm = march_smoke(dir, select(SMOKE_MAX, min(length(p), SMOKE_MAX), d > 0.0), jitter, haze, cos_v); ++ if frame.smoke.x > 0.5 || frame.smoke.w > 0.5 { ++ let surface = d > 0.0; ++ var sm = vec4(0.0, 0.0, 0.0, 1.0); ++ if frame.smoke.x > 0.5 { ++ sm = march_smoke(dir, select(SMOKE_MAX, min(length(p), SMOKE_MAX), surface), jitter, haze, cos_v, false); ++ } ++ if frame.smoke.w > 0.5 { ++ let far = march_smoke(dir, select(SMOKE_FAR_MAX, min(length(p), SMOKE_FAR_MAX), surface), jitter, haze, cos_v, true); ++ sm = vec4(sm.rgb + sm.a * far.rgb, sm.a * far.a); ++ } + // The smoke is lit by the sun itself and stands in the haze: it is laid over the fog. + fog = vec4(fog.rgb + fog.a * sm.rgb, fog.a * sm.a); + } +@@ -218,7 +266,7 @@ fn fs_fog(in: FullOut) -> FogOut { + return out; + } + +-const FOG_SUN: f32 = 1.1; ++const FOG_SUN: f32 = 1.35; + const FOG_AMBIENT: f32 = 0.9; + fn linear_step(a: f32, b: f32, x: f32) -> f32 { + return clamp((x - a) / (b - a), 0.0, 1.0); +diff --git a/crates/horizon-client/src/gfx/hd/frame.rs b/crates/horizon-client/src/gfx/hd/frame.rs +index 6b06732c3..a98bbd2b9 100644 +--- a/crates/horizon-client/src/gfx/hd/frame.rs ++++ b/crates/horizon-client/src/gfx/hd/frame.rs +@@ -114,10 +114,12 @@ pub(super) struct HdFrame { + /// the specular and the wet look are on. + pub(super) surface: [f32; 4], + /// Smoke (see `smoke.rs`). x: 1 when the smoke grid is drawn; y: the grid's cell size in blocks; +- /// z: the smoke clock in seconds modulo 86400 (the noise rides the wind with it); w: unused. ++ /// z: the smoke clock in seconds modulo 86400 (the noise rides the wind with it); w: 1 when the far grid has smoke (x: the near one has). + pub(super) smoke: [f32; 4], + /// xyz: the grid's minimum corner relative to the camera; w: the number of glow lights. + pub(super) smoke_min: [f32; 4], ++ /// xyz: the far smoke grid's minimum corner relative to the camera; w: its cell size. ++ pub(super) smoke_far: [f32; 4], + /// Up to 16 lights that glow on the smoke: xyz position relative to the camera, w radius; then + /// rgb colour times intensity. + pub(super) smoke_lights: [[f32; 4]; 32], +diff --git a/crates/horizon-client/src/gfx/hd/ground.rs b/crates/horizon-client/src/gfx/hd/ground.rs +new file mode 100644 +index 000000000..29fbf9c6e +--- /dev/null ++++ b/crates/horizon-client/src/gfx/hd/ground.rs +@@ -0,0 +1,208 @@ ++//! AirDef fork: a coarse map of the ground's height round the camera, for the volumetric fog. ++//! ++//! The fog's mist pools in valleys and thins on ridges: it needs to know where the ground is, not ++//! only a sea level. The map is 64 x 64 cells of 8 blocks (512 blocks across, the fog reaches 192), ++//! stored *toroidally* (a world cell lives at index `cell mod 64`, so a repeating sampler reads it ++//! with the world coordinate and nothing is copied when the camera moves). The CPU refreshes a few ++//! hundred cells a frame from the client's own height data (`Frame::hd_ground`), round-robin, so ++//! the cost is bounded; a long jump of the camera refreshes everything at once. ++//! ++//! Contract: ++//! - Writes `view` (`Rg16Float`, 64 x 64): r the ground's height (one above the top block, the ++//! lowest of four samples per cell so trees do not make hills), g the *basin depth*: how far the ++//! cell lies below the average ground within about 48 blocks (0 on flat ground and ridges, up to ++//! 48 in a valley), clamped to 0..48. ++//! - Read by `fs_fog` through a repeating, linear sampler at `world xz / 512` (the camera's x, z ++//! come modulo 65536, which 512 divides). ++//! - Unloaded columns count as sea level (62), the old behaviour of the fog. ++ ++pub const CELLS: usize = 64; ++/// Blocks per cell. ++pub const CELL: i32 = 8; ++pub const FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Rg16Float; ++/// Cells refreshed per frame. ++const BUDGET: usize = 256; ++/// The box blur's radius in cells (48 blocks), and the deepest basin kept. ++const BLUR: i32 = 6; ++const DEEPEST: f32 = 48.0; ++const SEA: f32 = 62.0; ++/// `MIN_Y` of the world: what the height query returns for an unloaded column. ++const UNLOADED: i32 = -64; ++ ++pub struct Ground { ++ tex: wgpu::Texture, ++ pub view: wgpu::TextureView, ++ height: Vec, ++ basin: Vec, ++ cursor: usize, ++ centre: Option<[i32; 2]>, ++ changed: bool, ++ since_blur: u32, ++ scratch: Vec, ++} ++ ++impl Ground { ++ pub fn new(device: &wgpu::Device, queue: &wgpu::Queue) -> Self { ++ let tex = device.create_texture(&wgpu::TextureDescriptor { ++ label: Some("HD ground"), ++ size: wgpu::Extent3d { ++ width: CELLS as u32, ++ height: CELLS as u32, ++ depth_or_array_layers: 1, ++ }, ++ mip_level_count: 1, ++ sample_count: 1, ++ dimension: wgpu::TextureDimension::D2, ++ format: FORMAT, ++ usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, ++ view_formats: &[], ++ }); ++ let view = tex.create_view(&Default::default()); ++ let mut ground = Self { ++ tex, ++ view, ++ height: vec![SEA; CELLS * CELLS], ++ basin: vec![0.0; CELLS * CELLS], ++ cursor: 0, ++ centre: None, ++ changed: false, ++ since_blur: 0, ++ scratch: vec![0; CELLS * CELLS * 2], ++ }; ++ ground.upload(queue); ++ ground ++ } ++ ++ /// Refreshes the next cells for a camera at world (`x`, `z`); `top` gives one above the highest ++ /// non-air block of a column. ++ pub fn update(&mut self, queue: &wgpu::Queue, x: f64, z: f64, top: &dyn Fn(i32, i32) -> i32) { ++ let cell = [ ++ (x.floor() as i32).div_euclid(CELL), ++ (z.floor() as i32).div_euclid(CELL), ++ ]; ++ let jump = self ++ .centre ++ .is_none_or(|c| (c[0] - cell[0]).abs() > 24 || (c[1] - cell[1]).abs() > 24); ++ self.centre = Some(cell); ++ // A jump (a teleport, the first frame) refreshes the whole map now. ++ let count = if jump { CELLS * CELLS } else { BUDGET }; ++ let half = CELLS as i32 / 2; ++ for _ in 0..count { ++ let k = self.cursor; ++ self.cursor = (self.cursor + 1) % (CELLS * CELLS); ++ let (i, j) = ((k % CELLS) as i32, (k / CELLS) as i32); ++ // The world cell of this index that lies in the window round the camera. ++ let wx = cell[0] - half + (i - (cell[0] - half)).rem_euclid(CELLS as i32); ++ let wz = cell[1] - half + (j - (cell[1] - half)).rem_euclid(CELLS as i32); ++ let (bx, bz) = (wx * CELL, wz * CELL); ++ let mut low = i32::MAX; ++ for (dx, dz) in [(1, 1), (5, 2), (2, 5), (6, 6)] { ++ let h = top(bx + dx, bz + dz); ++ if h > UNLOADED { ++ low = low.min(h); ++ } ++ } ++ let h = if low == i32::MAX { SEA } else { low as f32 }; ++ if (self.height[k] - h).abs() > 0.01 { ++ self.height[k] = h; ++ self.changed = true; ++ } ++ } ++ self.since_blur += 1; ++ if self.changed && (jump || self.since_blur >= 4) { ++ self.blur(); ++ self.upload(queue); ++ self.changed = false; ++ self.since_blur = 0; ++ } ++ } ++ ++ /// The basin depth: the mean height within `BLUR` cells (a wrapping box blur, two passes) less the ++ /// cell's own. ++ fn blur(&mut self) { ++ let n = CELLS as i32; ++ let mut tmp = vec![0.0f32; CELLS * CELLS]; ++ let mut out = vec![0.0f32; CELLS * CELLS]; ++ let norm = 1.0 / (2 * BLUR + 1) as f32; ++ for j in 0..n { ++ for i in 0..n { ++ let mut s = 0.0; ++ for d in -BLUR..=BLUR { ++ s += self.height[(j * n + (i + d).rem_euclid(n)) as usize]; ++ } ++ tmp[(j * n + i) as usize] = s * norm; ++ } ++ } ++ for j in 0..n { ++ for i in 0..n { ++ let mut s = 0.0; ++ for d in -BLUR..=BLUR { ++ s += tmp[((j + d).rem_euclid(n) * n + i) as usize]; ++ } ++ out[(j * n + i) as usize] = s * norm; ++ } ++ } ++ for k in 0..CELLS * CELLS { ++ self.basin[k] = (out[k] - self.height[k]).clamp(0.0, DEEPEST); ++ } ++ } ++ ++ fn upload(&mut self, queue: &wgpu::Queue) { ++ for k in 0..CELLS * CELLS { ++ self.scratch[k * 2] = to_half(self.height[k]); ++ self.scratch[k * 2 + 1] = to_half(self.basin[k]); ++ } ++ queue.write_texture( ++ self.tex.as_image_copy(), ++ bytemuck::cast_slice(&self.scratch), ++ wgpu::TexelCopyBufferLayout { ++ offset: 0, ++ bytes_per_row: Some(CELLS as u32 * 4), ++ rows_per_image: Some(CELLS as u32), ++ }, ++ wgpu::Extent3d { ++ width: CELLS as u32, ++ height: CELLS as u32, ++ depth_or_array_layers: 1, ++ }, ++ ); ++ } ++} ++ ++/// An `f32` as IEEE half bits (normal range, rounded down; heights and depths stay below 512). ++fn to_half(v: f32) -> u16 { ++ let v = v.clamp(0.0, 2048.0); ++ if v < 6.2e-5 { ++ return 0; ++ } ++ let bits = v.to_bits(); ++ let exp = ((bits >> 23) as i32 - 127 + 15).clamp(1, 30) as u16; ++ let mant = ((bits >> 13) & 0x3ff) as u16; ++ (exp << 10) | mant ++} ++ ++#[cfg(test)] ++mod tests { ++ use super::*; ++ ++ #[test] ++ fn half_floats_round_trip_closely() { ++ let from_half = |h: u16| { ++ let e = ((h >> 10) & 31) as i32; ++ if e == 0 { ++ 0.0 ++ } else { ++ (1.0 + (h & 0x3ff) as f32 / 1024.0) * 2f32.powi(e - 15) ++ } ++ }; ++ for v in [0.0f32, 1.0, 12.5, 62.0, 143.7, 320.25, 1000.0] { ++ let r = from_half(to_half(v)); ++ assert!((r - v).abs() <= v * 0.001 + 0.001, "{v} -> {r}"); ++ } ++ } ++ ++ #[test] ++ fn the_map_side_divides_the_camera_wrap() { ++ assert_eq!(65536 % (CELLS as u64 * CELL as u64), 0); ++ } ++} +diff --git a/crates/horizon-client/src/gfx/hd/light.wgsl b/crates/horizon-client/src/gfx/hd/light.wgsl +index a9e1fb7f4..bbeb35b86 100644 +--- a/crates/horizon-client/src/gfx/hd/light.wgsl ++++ b/crates/horizon-client/src/gfx/hd/light.wgsl +@@ -32,6 +32,7 @@ struct Light { + @group(0) @binding(19) var cloud_shadow_tex: texture_2d; + // How far each cloud texel's ray was marched (the surface behind it, or SKY_RAY for sky). + @group(0) @binding(20) var cloud_dist_tex: texture_2d; ++//PANO21 + const SKY_RAY: f32 = 20000.0; + const CLOUD_SHADOW_R: f32 = 1200.0; + // The pixel being lit, for the shadow filter's noise. +@@ -158,16 +159,20 @@ fn linear_fog(d: f32, start: f32, end: f32) -> f32 { + fn cloud_shadow(p: vec3) -> f32 { + if frame.clouds.z < 0.5 { return 1.0; } + let l = frame.cloud_dir.xyz; +- if l.y < 0.1 { return 1.0; } +- let t = (frame.clouds.x - p.y) / l.y; ++ // Fades in smoothly with the sun's height (no pop at the low sun's end). ++ let sun_fade = smoothstep(0.03, 0.2, l.y); ++ if sun_fade <= 0.0 { return 1.0; } ++ let t = (frame.clouds.x - p.y) / max(l.y, 0.04); + if t <= 0.0 { return 1.0; } +- let q = p.xz + l.xz * t; +- let uv = q / (2.0 * CLOUD_SHADOW_R) + vec2(0.5); +- if any(uv < vec2(0.0)) || any(uv > vec2(1.0)) { return 1.0; } +- let od = textureSampleLevel(cloud_shadow_tex, linear, uv, 0.0).r; +- // Fade out as the sun gets low (the shadow then falls far from the cloud). +- let fade = smoothstep(0.1, 0.25, l.y); +- return mix(1.0, mix(1.0, exp(-od * 0.9), 0.9), fade); ++ // The map is centred where the sunlight through the camera crosses the cloud base (as the pass). ++ let centre = l.xz * (frame.clouds.x / max(l.y, 0.04)); ++ let uv = (p.xz + l.xz * t - centre) / (2.0 * CLOUD_SHADOW_R) + vec2(0.5); ++ // Fades out over the map's last tenth instead of stopping at its edge. ++ let edge = min(min(uv.x, 1.0 - uv.x), min(uv.y, 1.0 - uv.y)); ++ let edge_fade = smoothstep(0.0, 0.1, edge); ++ if edge_fade <= 0.0 { return 1.0; } ++ let od = textureSampleLevel(cloud_shadow_tex, linear, clamp(uv, vec2(0.0), vec2(1.0)), 0.0).r; ++ return mix(1.0, mix(1.0, exp(-od * 0.9), 0.9), sun_fade * edge_fade); + } + + // The volumetric fog at a full-resolution pixel `dist` away: the four nearest half-resolution +@@ -357,7 +362,8 @@ fn shade_surface(px: vec2, p: vec3, water: bool) -> vec3 { + } + if atmosphere && gloss > 0.12 { + let r = reflect(-v, n); +- let sky = atmosphere_sky(normalize(vec3(r.x, max(r.y, 0.02), r.z))); ++ let rd = normalize(vec3(r.x, max(r.y, 0.02), r.z)); ++ let sky = sky_with_clouds(atmosphere_sky(rd), rd); + let reach = smoothstep(0.35, 0.95, lm.x) * smoothstep(-0.2, 0.15, r.y); + out += sky * fresnel * (gloss * gloss * reach * ao_ambient); + } +diff --git a/crates/horizon-client/src/gfx/hd/lighting.rs b/crates/horizon-client/src/gfx/hd/lighting.rs +index 8c56768f8..23e16abfd 100644 +--- a/crates/horizon-client/src/gfx/hd/lighting.rs ++++ b/crates/horizon-client/src/gfx/hd/lighting.rs +@@ -34,7 +34,7 @@ pub const MAX_LIGHTS: usize = 512; + + pub(super) const LIGHT: &str = include_str!("light.wgsl"); + /// The lighting's group 0, binding by binding (see the contract above). +-pub(super) const LIGHT_BINDINGS: [wgpu::BindingType; 21] = [ ++pub(super) const LIGHT_BINDINGS: [wgpu::BindingType; 22] = [ + UNIFORM, + UNFILTERED, + DEPTH, +@@ -56,6 +56,7 @@ pub(super) const LIGHT_BINDINGS: [wgpu::BindingType; 21] = [ + FLOAT, + FLOAT, + UNFILTERED, ++ FLOAT, + ]; + + /// The outside views and sampler the lighting group reads. +@@ -223,6 +224,7 @@ impl Hd { + wgpu::BindingResource::TextureView(self.volumes.cloud_view()), + wgpu::BindingResource::TextureView(&self.volumes.cloud_shadow), + wgpu::BindingResource::TextureView(self.volumes.cloud_dist_view()), ++ wgpu::BindingResource::TextureView(self.volumes.pano_view()), + ]; + let entries: Vec<_> = resources + .into_iter() +diff --git a/crates/horizon-client/src/gfx/hd/materials.rs b/crates/horizon-client/src/gfx/hd/materials.rs +index 32d080878..4326f23a5 100644 +--- a/crates/horizon-client/src/gfx/hd/materials.rs ++++ b/crates/horizon-client/src/gfx/hd/materials.rs +@@ -200,7 +200,7 @@ pub fn specular_enabled() -> bool { + pub fn wind_seconds() -> f32 { + static START: std::sync::OnceLock = std::sync::OnceLock::new(); + let start = START.get_or_init(std::time::Instant::now); +- (start.elapsed().as_secs_f64() % 600.0) as f32 ++ (crate::film_clock::since(*start).as_secs_f64() % 600.0) as f32 + } + + #[cfg(test)] +diff --git a/crates/horizon-client/src/gfx/hd/mod.rs b/crates/horizon-client/src/gfx/hd/mod.rs +index ccc793e9a..f7a64e7a4 100644 +--- a/crates/horizon-client/src/gfx/hd/mod.rs ++++ b/crates/horizon-client/src/gfx/hd/mod.rs +@@ -63,6 +63,7 @@ mod ao; + mod bloom; + mod frame; + mod gbuffer; ++mod ground; + mod lighting; + mod materials; + mod noise; +@@ -168,6 +169,13 @@ pub(super) fn assemble(body: &str) -> String { + &sky::SKY_FUNCS.replace("SKYBIND", &binding.to_string()), + ); + } ++ // `//PANO`: the cloud panorama (`pano_funcs.wgsl`) at binding n. ++ for binding in (0..32).rev() { ++ body = body.replace( ++ &format!("//PANO{binding}"), ++ &sky::PANO_FUNCS.replace("PANOBIND", &binding.to_string()), ++ ); ++ } + // `//SPOT`: the spot lights' cone functions (`spot.wgsl`), which call the shader's own + // `spot_air(pos)` (the air's extinction per block). + let body = body.replace("//SPOT", SPOT); +@@ -490,7 +498,7 @@ impl Hd { + /// The world is smaller than the output, so TAA upsamples it. + /// How wet the world is: soaks in over ~15 s of rain, dries out over ~2.5 minutes after it. + fn wetness(&mut self, scene: &HdScene) -> f32 { +- let now = std::time::Instant::now(); ++ let now = crate::film_clock::now(); + let dt = now.duration_since(self.wet.1).as_secs_f32().min(1.0); + let target = if scene.sky { + (scene.rain / 0.7).clamp(0.0, 1.0) +@@ -572,7 +580,7 @@ impl Hd { + view_proj: scene.view_proj.to_cols_array_2d(), + water: [ + if self.water.active { 1.0 } else { 0.0 }, +- (self.started.elapsed().as_secs_f64() % 600.0) as f32, ++ (crate::film_clock::since(self.started).as_secs_f64() % 600.0) as f32, + scene.camera_mod[0], + scene.camera_mod[1], + ], +@@ -627,6 +635,7 @@ impl Hd { + ], + smoke: self.smoke.frame.smoke, + smoke_min: self.smoke.frame.min, ++ smoke_far: self.smoke.frame.far, + smoke_lights: self.smoke.frame.lights, + spots: { + let mut all = [[0.0; 4]; 64]; +@@ -908,7 +917,10 @@ mod tests { + sources.iter().any(|s| { + let s = assemble(s); + // The sky snippet's binding number is filled in by `assemble`. +- shown.split("SKYBIND").all(|part| s.contains(part)) ++ shown ++ .split("SKYBIND") ++ .flat_map(|part| part.split("PANOBIND")) ++ .all(|part| s.contains(part)) + }) + }, + "{} is not part of any tested shader", +diff --git a/crates/horizon-client/src/gfx/hd/pano_funcs.wgsl b/crates/horizon-client/src/gfx/hd/pano_funcs.wgsl +new file mode 100644 +index 000000000..d469a1400 +--- /dev/null ++++ b/crates/horizon-client/src/gfx/hd/pano_funcs.wgsl +@@ -0,0 +1,18 @@ ++ ++// The clouds seen from the camera in every direction above the horizon (`cloud_sky` pass): light ++// and transmittance, for reflections of the sky. Azimuth from +x over the whole circle, ++// v = sqrt(elevation / (pi / 2)). ++@group(0) @binding(PANOBIND) var cloud_pano: texture_2d; ++ ++fn cloud_pano_at(dir: vec3) -> vec4 { ++ let u = atan2(dir.z, dir.x) / (2.0 * 3.14159265) + 0.5; ++ let v = sqrt(asin(clamp(dir.y, 0.0, 1.0)) / (3.14159265 * 0.5)); ++ return textureSampleLevel(cloud_pano, linear, vec2(u, v), 0.0); ++} ++ ++// A sky colour with the clouds in front of it (where the volumetric clouds are drawn). ++fn sky_with_clouds(sky: vec3, dir: vec3) -> vec3 { ++ if frame.clouds.z < 0.5 || frame.sky_sun.w < 0.5 { return sky; } ++ let c = cloud_pano_at(dir); ++ return sky * c.a + c.rgb; ++} +diff --git a/crates/horizon-client/src/gfx/hd/prelude.wgsl b/crates/horizon-client/src/gfx/hd/prelude.wgsl +index 7e937a63b..6075cbb0b 100644 +--- a/crates/horizon-client/src/gfx/hd/prelude.wgsl ++++ b/crates/horizon-client/src/gfx/hd/prelude.wgsl +@@ -27,6 +27,7 @@ struct HdFrame { + surface: vec4, + smoke: vec4, + smoke_min: vec4, ++ smoke_far: vec4, + smoke_lights: array, 32>, + spots: array, 64>, + } +diff --git a/crates/horizon-client/src/gfx/hd/sky.rs b/crates/horizon-client/src/gfx/hd/sky.rs +index 7211ffda2..f1c80a766 100644 +--- a/crates/horizon-client/src/gfx/hd/sky.rs ++++ b/crates/horizon-client/src/gfx/hd/sky.rs +@@ -34,6 +34,9 @@ pub(super) const SKY_PASS: &str = include_str!("sky.wgsl"); + /// the binding of the texture; `frame` and the `linear` sampler come before it). + pub(super) const SKY_FUNCS: &str = include_str!("sky_funcs.wgsl"); + ++/// The cloud panorama's readers (`PANOBIND` is its binding), pasted at a `//PANO` marker. ++pub(super) const PANO_FUNCS: &str = include_str!("pano_funcs.wgsl"); ++ + /// The sky pass's group 0: only the frame. + pub(super) const SKY_BINDINGS: [wgpu::BindingType; 1] = [UNIFORM]; + +diff --git a/crates/horizon-client/src/gfx/hd/smoke.rs b/crates/horizon-client/src/gfx/hd/smoke.rs +index c751df4f4..266f5fdef 100644 +--- a/crates/horizon-client/src/gfx/hd/smoke.rs ++++ b/crates/horizon-client/src/gfx/hd/smoke.rs +@@ -18,8 +18,12 @@ + //! `cloud.wgsl` thins the clouds with it. + //! + //! Contract: +-//! - Input segments (`HdSmoke`) are camera-relative, ages and lives in seconds. The grid reaches +-//! `GRID_XZ * CELL / 2` = 192 blocks round the camera horizontally, 48 below and 144 above. ++//! - Input segments (`HdSmoke`) are camera-relative, ages and lives in seconds. Two grids: the near ++//! one reaches `GRID_XZ * CELL / 2` = 192 blocks round the camera horizontally (48 below, 144 above) ++//! in 3-block cells; the far one is the same lattice in 12-block cells (`FAR_CELL`), 768 blocks ++//! (192 below, 576 above), with trails kept 7.2 blocks thick for its cells. The fog blends them ++//! over the near grid's last 8 cells (weights sum to 1: no seam) and fades the far one out over ++//! its last 6; the far grid holds up to `FAR_MAX_SEGMENTS` segments, the nearest first. + //! - The grid atlas is `Rgba16Float`, rewritten every frame the smoke is active (`active`). + //! - Nothing here changes unless the mod sends segments; `HORIZON_HD_SMOKE=0` turns it off (the mod is + //! told, and draws its own smoke). +@@ -41,6 +45,11 @@ const TILES: u32 = 8; + pub const ATLAS: u32 = GRID_XZ * TILES; + pub const ATLAS_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Rgba16Float; + pub const MAX_SEGMENTS: usize = 3072; ++/// The far grid: the same lattice with 4x the cells (12 blocks): trails out to 768 blocks round the ++/// camera (192 below, 576 above), blended with the near one over the near grid's last cells. ++pub const FAR_CELL: f32 = 12.0; ++const FAR_MIN_TUBE: f32 = 7.2; ++pub const FAR_MAX_SEGMENTS: usize = 6144; + /// Brick-list entries: a segment is in every brick its box touches. + const MAX_INDICES: usize = 120_000; + pub const MAX_LIGHTS: usize = 16; +@@ -83,8 +92,8 @@ struct Baked { + seed: [f32; 4], + } + +-/// `fs_smoke_grid`'s group 0: frame, the segments, the brick lists. +-pub(super) const SMOKE_GRID_BINDINGS: [wgpu::BindingType; 3] = [UNIFORM, STORAGE, STORAGE]; ++/// `fs_smoke_grid`'s group 0: frame, the segments, the brick lists, the grid's corner and cell. ++pub(super) const SMOKE_GRID_BINDINGS: [wgpu::BindingType; 4] = [UNIFORM, STORAGE, STORAGE, UNIFORM]; + + pub(super) const SMOKE_GRID: &str = include_str!("smoke_grid.wgsl"); + /// The grid's trilinear lookup, shared by the fog and the clouds. Needs `frame` in scope. +@@ -95,30 +104,40 @@ pub(super) const SMOKE_SAMPLE: &str = include_str!("smoke_sample.wgsl"); + pub(super) struct SmokeFrame { + pub smoke: [f32; 4], + pub min: [f32; 4], ++ /// xyz: the far grid's corner relative to the camera; w: its cell. ++ pub far: [f32; 4], + pub lights: [[f32; 4]; 32], + } + +-pub struct Smoke { +- pub atlas: wgpu::TextureView, ++/// One level of the smoke grid: a 128 x 64 x 128 lattice of cells of its own size, its own baked ++/// segments (a trail is kept at least `min_tube` thick for the cells) and brick lists. ++struct Cascade { ++ cell: f32, ++ min_tube: f32, ++ max_segments: usize, ++ atlas: wgpu::TextureView, + segments: wgpu::Buffer, + bricks: wgpu::Buffer, +- pipeline: wgpu::RenderPipeline, ++ /// xyz: the grid's corner relative to the camera; w: the cell (for `fs_smoke_grid`). ++ grid: wgpu::Buffer, + group: wgpu::BindGroup, +- /// Segments in the grid this frame (0: nothing is drawn). +- pub count: usize, +- pub frame: SmokeFrame, ++ /// Segments in the grid this frame (0: nothing is drawn, the frame says so). ++ count: usize, ++ min: [f32; 3], + baked: Vec, + order: Vec<(f32, usize)>, + bricks_cpu: Vec, +- lights: Vec<(f32, [f32; 4], [f32; 4])>, + } + +-impl Smoke { +- pub fn new(device: &wgpu::Device, frame: &wgpu::Buffer) -> Self { +- let layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor { +- label: Some("HD smoke grid"), +- entries: &entries(&SMOKE_GRID_BINDINGS), +- }); ++impl Cascade { ++ fn new( ++ device: &wgpu::Device, ++ layout: &wgpu::BindGroupLayout, ++ frame: &wgpu::Buffer, ++ cell: f32, ++ min_tube: f32, ++ max_segments: usize, ++ ) -> Self { + let storage = |label, size: usize| { + device.create_buffer(&wgpu::BufferDescriptor { + label: Some(label), +@@ -129,22 +148,18 @@ impl Smoke { + }; + let segments = storage( + "HD smoke segments", +- MAX_SEGMENTS * std::mem::size_of::(), ++ max_segments * std::mem::size_of::(), + ); + let bricks = storage("HD smoke bricks", (BRICKS * 2 + MAX_INDICES) * 4); +- let module = module(device, "HD smoke grid", SMOKE_GRID); +- let pipeline = fullscreen( +- device, +- "HD smoke grid", +- &layout, +- &module, +- "fs_smoke_grid", +- ATLAS_FORMAT, +- None, +- ); ++ let grid = device.create_buffer(&wgpu::BufferDescriptor { ++ label: Some("HD smoke grid corner"), ++ size: 16, ++ usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST, ++ mapped_at_creation: false, ++ }); + let group = device.create_bind_group(&wgpu::BindGroupDescriptor { + label: Some("HD smoke grid"), +- layout: &layout, ++ layout, + entries: &[ + wgpu::BindGroupEntry { + binding: 0, +@@ -158,41 +173,34 @@ impl Smoke { + binding: 2, + resource: bricks.as_entire_binding(), + }, ++ wgpu::BindGroupEntry { ++ binding: 3, ++ resource: grid.as_entire_binding(), ++ }, + ], + }); ++ let atlas = target(device, "HD smoke grid", [ATLAS, ATLAS], ATLAS_FORMAT).view; + Self { +- atlas: target(device, "HD smoke grid", [ATLAS, ATLAS], ATLAS_FORMAT).view, ++ cell, ++ min_tube, ++ max_segments, ++ atlas, + segments, + bricks, +- pipeline, ++ grid, + group, + count: 0, +- frame: SmokeFrame::default(), ++ min: [0.0; 3], + baked: Vec::new(), + order: Vec::new(), + bricks_cpu: Vec::new(), +- lights: Vec::new(), + } + } + +- /// Bakes this frame's segments, bins them into the grid's bricks and uploads them; picks the +- /// lights that glow on the smoke. `clock` is the mod's clock in seconds. +- pub fn prepare( +- &mut self, +- queue: &wgpu::Queue, +- scene: &HdScene, +- smoke: &[HdSmoke], +- lights: &[HdLight], +- clock: f32, +- ) { ++ /// Bakes the segments in reach of this level, bins them into its bricks and uploads them. ++ fn prepare(&mut self, queue: &wgpu::Queue, scene: &HdScene, smoke: &[HdSmoke]) { + self.count = 0; +- self.frame = SmokeFrame::default(); +- if std::env::var_os("HORIZON_HD_SMOKE_LOG").is_some() && !smoke.is_empty() { +- log::info!("HD smoke: {} segments given", smoke.len()); +- } +- if smoke.is_empty() { +- return; +- } ++ let cell = self.cell; + // The grid's corner on the world's lattice, relative to the camera. + let cam = [ + scene.camera_world[0], +@@ -200,21 +208,29 @@ impl Smoke { + scene.camera_world[1], + ]; + let min = [ +- (cam[0] / CELL).floor() * CELL - (GRID_XZ / 2) as f32 * CELL - cam[0], +- (cam[1] / CELL).floor() * CELL - CELLS_BELOW * CELL - cam[1], +- (cam[2] / CELL).floor() * CELL - (GRID_XZ / 2) as f32 * CELL - cam[2], ++ (cam[0] / cell).floor() * cell - (GRID_XZ / 2) as f32 * cell - cam[0], ++ (cam[1] / cell).floor() * cell - CELLS_BELOW * cell - cam[1], ++ (cam[2] / cell).floor() * cell - (GRID_XZ / 2) as f32 * cell - cam[2], + ]; ++ self.min = min; ++ queue.write_buffer( ++ &self.grid, ++ 0, ++ bytemuck::cast_slice(&[min[0], min[1], min[2], cell]), ++ ); + let max = [ +- min[0] + GRID_XZ as f32 * CELL, +- min[1] + GRID_Y as f32 * CELL, +- min[2] + GRID_XZ as f32 * CELL, ++ min[0] + GRID_XZ as f32 * cell, ++ min[1] + GRID_Y as f32 * cell, ++ min[2] + GRID_XZ as f32 * cell, + ]; + // Bake, keep the ones in reach, nearest first. + self.baked.clear(); + self.order.clear(); + for s in smoke { +- let Some(b) = bake(s) else { continue }; +- let reach = b.pa[3].max(b.extra[2]) * 1.3 + CELL; ++ let Some(b) = bake(s, self.min_tube) else { ++ continue; ++ }; ++ let reach = b.pa[3].max(b.extra[2]) * 1.3 + cell; + let lo = [ + b.pa[0].min(b.pb[0]) - reach, + b.pa[1].min(b.pb[1]) - reach, +@@ -243,12 +259,12 @@ impl Smoke { + return; + } + self.order.sort_by(|x, y| x.0.total_cmp(&y.0)); +- self.order.truncate(MAX_SEGMENTS); ++ self.order.truncate(self.max_segments); + // Bricks: count per brick, then fill; the nearest segments first, so a full list drops the + // farthest. + let brick_of = |lo: f32, hi: f32, axis: usize, bricks: u32| -> (i32, i32) { +- let a = ((lo - min[axis]) / (CELL * BRICK as f32)).floor() as i32; +- let b = ((hi - min[axis]) / (CELL * BRICK as f32)).floor() as i32; ++ let a = ((lo - min[axis]) / (cell * BRICK as f32)).floor() as i32; ++ let b = ((hi - min[axis]) / (cell * BRICK as f32)).floor() as i32; + (a.max(0), b.min(bricks as i32 - 1)) + }; + let mut counts = vec![0u32; BRICKS]; +@@ -257,7 +273,7 @@ impl Smoke { + let mut kept: Vec = Vec::with_capacity(self.order.len()); + for &(_, i) in &self.order { + let b = self.baked[i]; +- let reach = b.pa[3].max(b.extra[2]) * 1.3 + CELL; ++ let reach = b.pa[3].max(b.extra[2]) * 1.3 + cell; + let (x0, x1) = brick_of( + b.pa[0].min(b.pb[0]) - reach, + b.pa[0].max(b.pb[0]) + reach, +@@ -321,17 +337,91 @@ impl Smoke { + queue.write_buffer(&self.segments, 0, bytemuck::cast_slice(&kept)); + queue.write_buffer(&self.bricks, 0, bytemuck::cast_slice(&self.bricks_cpu)); + self.count = kept.len(); ++ } ++} ++ ++pub struct Smoke { ++ /// The near grid (3-block cells) and the far one (12-block cells), as the fog reads them. ++ pub atlas: wgpu::TextureView, ++ pub far_atlas: wgpu::TextureView, ++ near: Cascade, ++ far: Cascade, ++ pipeline: wgpu::RenderPipeline, ++ /// Segments in the near grid this frame. ++ pub count: usize, ++ pub frame: SmokeFrame, ++ lights: Vec<(f32, [f32; 4], [f32; 4])>, ++} ++ ++impl Smoke { ++ pub fn new(device: &wgpu::Device, frame: &wgpu::Buffer) -> Self { ++ let layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor { ++ label: Some("HD smoke grid"), ++ entries: &entries(&SMOKE_GRID_BINDINGS), ++ }); ++ let module = module(device, "HD smoke grid", SMOKE_GRID); ++ let pipeline = fullscreen( ++ device, ++ "HD smoke grid", ++ &layout, ++ &module, ++ "fs_smoke_grid", ++ ATLAS_FORMAT, ++ None, ++ ); ++ let near = Cascade::new(device, &layout, frame, CELL, MIN_TUBE, MAX_SEGMENTS); ++ let far = Cascade::new( ++ device, ++ &layout, ++ frame, ++ FAR_CELL, ++ FAR_MIN_TUBE, ++ FAR_MAX_SEGMENTS, ++ ); ++ Self { ++ atlas: near.atlas.clone(), ++ far_atlas: far.atlas.clone(), ++ near, ++ far, ++ pipeline, ++ count: 0, ++ frame: SmokeFrame::default(), ++ lights: Vec::new(), ++ } ++ } ++ ++ /// Bakes this frame's segments into both grids and uploads them; picks the lights that glow on ++ /// the smoke. `clock` is the mod's clock in seconds. ++ pub fn prepare( ++ &mut self, ++ queue: &wgpu::Queue, ++ scene: &HdScene, ++ smoke: &[HdSmoke], ++ lights: &[HdLight], ++ clock: f32, ++ ) { ++ self.count = 0; ++ self.near.count = 0; ++ self.far.count = 0; ++ self.frame = SmokeFrame::default(); ++ if std::env::var_os("HORIZON_HD_SMOKE_LOG").is_some() && !smoke.is_empty() { ++ log::info!("HD smoke: {} segments given", smoke.len()); ++ } ++ if smoke.is_empty() { ++ return; ++ } ++ self.near.prepare(queue, scene, smoke); ++ self.far.prepare(queue, scene, smoke); ++ self.count = self.near.count; ++ if self.near.count == 0 && self.far.count == 0 { ++ return; ++ } + if std::env::var_os("HORIZON_HD_SMOKE_LOG").is_some() { +- let n = &self.baked[0]; + log::info!( +- "HD smoke: {} in, {} baked, {} in the grid; first pa {:?} pb {:?} extra {:?} min {:?}", ++ "HD smoke: {} given, {} in the near grid, {} in the far grid", + smoke.len(), +- self.baked.len(), +- self.count, +- n.pa, +- n.pb, +- n.extra, +- min ++ self.near.count, ++ self.far.count + ); + } + // The lights that glow on the smoke: the brightest near ones. +@@ -347,9 +437,17 @@ impl Smoke { + } + self.lights.sort_by(|a, b| b.0.total_cmp(&a.0)); + self.lights.truncate(MAX_LIGHTS); ++ let (n, f) = (&self.near, &self.far); + let mut out = SmokeFrame { +- smoke: [1.0, CELL, clock.rem_euclid(86_400.0), 0.0], +- min: [min[0], min[1], min[2], self.lights.len() as f32], ++ // x: the near grid has smoke, w: the far one has. ++ smoke: [ ++ if n.count > 0 { 1.0 } else { 0.0 }, ++ CELL, ++ clock.rem_euclid(86_400.0), ++ if f.count > 0 { 1.0 } else { 0.0 }, ++ ], ++ min: [n.min[0], n.min[1], n.min[2], self.lights.len() as f32], ++ far: [f.min[0], f.min[1], f.min[2], FAR_CELL], + lights: [[0.0; 4]; 32], + }; + for (i, (_, pos, color)) in self.lights.iter().enumerate() { +@@ -364,23 +462,40 @@ impl Smoke { + self.frame = out; + } + +- /// Fills the grid from the segments (when there are any). ++ /// Fills the near grid from the segments (when it has any). + pub fn draw( + &self, + encoder: &mut wgpu::CommandEncoder, + stamp: Option>, + ) { +- if self.count == 0 { +- return; ++ if self.near.count > 0 { ++ stamped_pass( ++ encoder, ++ "HD smoke grid", ++ &[&self.near.atlas], ++ &self.pipeline, ++ &self.near.group, ++ stamp, ++ ); ++ } ++ } ++ ++ /// Fills the far grid. ++ pub fn draw_far( ++ &self, ++ encoder: &mut wgpu::CommandEncoder, ++ stamp: Option>, ++ ) { ++ if self.far.count > 0 { ++ stamped_pass( ++ encoder, ++ "HD smoke grid far", ++ &[&self.far.atlas], ++ &self.pipeline, ++ &self.far.group, ++ stamp, ++ ); + } +- stamped_pass( +- encoder, +- "HD smoke grid", +- &[&self.atlas], +- &self.pipeline, +- &self.group, +- stamp, +- ); + } + } + +@@ -389,7 +504,7 @@ fn brick_index(x: u32, y: u32, z: u32) -> usize { + } + + /// A segment at its age: drifted with the wind, risen, grown, thinned, cooled; None once spent. +-fn bake(s: &HdSmoke) -> Option { ++fn bake(s: &HdSmoke, min_tube: f32) -> Option { + let t = s.a[3]; + let life = s.b[3].max(0.05); + if !(t >= 0.0) || t >= life { +@@ -409,8 +524,8 @@ fn bake(s: &HdSmoke) -> Option { + // the same mass per length, so a young trail is a continuous ribbon. + let d = [s.b[0] - s.a[0], s.b[1] - s.a[1], s.b[2] - s.a[2]]; + let tube = d[0] * d[0] + d[1] * d[1] + d[2] * d[2] > 0.25; +- let (radius, density) = if tube && radius < MIN_TUBE { +- (MIN_TUBE, density * radius / MIN_TUBE) ++ let (radius, density) = if tube && radius < min_tube { ++ (min_tube, density * radius / min_tube) + } else { + (radius, density) + }; +@@ -458,23 +573,26 @@ mod tests { + + #[test] + fn a_segment_grows_thins_and_ends() { +- let young = bake(&puff(1.0, 40.0)).unwrap(); +- let old = bake(&puff(30.0, 40.0)).unwrap(); ++ let young = bake(&puff(1.0, 40.0), MIN_TUBE).unwrap(); ++ let old = bake(&puff(30.0, 40.0), MIN_TUBE).unwrap(); + assert!(old.pa[3] > young.pa[3], "grows"); + assert!(old.pb[3] < young.pb[3], "thins"); + assert!( + old.pa[0] > young.pa[0] && old.pa[1] > young.pa[1], + "drifts and rises" + ); +- assert!(bake(&puff(40.0, 40.0)).is_none(), "gone at its life"); +- assert!(bake(&puff(-1.0, 40.0)).is_none(), "not born yet"); ++ assert!( ++ bake(&puff(40.0, 40.0), MIN_TUBE).is_none(), ++ "gone at its life" ++ ); ++ assert!(bake(&puff(-1.0, 40.0), MIN_TUBE).is_none(), "not born yet"); + } + + #[test] + fn the_same_age_bakes_the_same() { + // Showing a frame again (a pause, a seek back to it) gives the same smoke. +- let a = bake(&puff(12.5, 40.0)).unwrap(); +- let b = bake(&puff(12.5, 40.0)).unwrap(); ++ let a = bake(&puff(12.5, 40.0), MIN_TUBE).unwrap(); ++ let b = bake(&puff(12.5, 40.0), MIN_TUBE).unwrap(); + assert_eq!(bytemuck::bytes_of(&a), bytemuck::bytes_of(&b)); + } + +@@ -483,7 +601,7 @@ mod tests { + let mut s = puff(10.0, 40.0); + s.shape[2] = 0.0; + s.motion[1] = 3.0; +- let b = bake(&s).unwrap(); ++ let b = bake(&s, MIN_TUBE).unwrap(); + assert!(b.extra[3] > 0.5 && b.extra[2] >= 3.0); + } + } +diff --git a/crates/horizon-client/src/gfx/hd/smoke_grid.wgsl b/crates/horizon-client/src/gfx/hd/smoke_grid.wgsl +index 0adcd55f6..d44733aeb 100644 +--- a/crates/horizon-client/src/gfx/hd/smoke_grid.wgsl ++++ b/crates/horizon-client/src/gfx/hd/smoke_grid.wgsl +@@ -1,4 +1,4 @@ +-// The smoke grid: one texel of a 1024 x 1024 atlas per cell of a 128 x 64 x 128 lattice (64 slices ++// The smoke grid (two cascades share this shader): one texel of a 1024 x 1024 atlas per cell of a 128 x 64 x 128 lattice (64 slices + // of 128 x 128, 8 to a row). Each cell sums the capsules of its 8-cell brick. + // r density, g soot x density, b heat x density, a clear amount (the largest of the tunnels). + // Segments: 4 vec4 each (see smoke.rs `Baked`); bricks: (start, count) per brick, then the indices. +@@ -6,6 +6,8 @@ + @group(0) @binding(0) var frame: HdFrame; + @group(0) @binding(1) var segs: array>; + @group(0) @binding(2) var bricks: array; ++// xyz: the grid's corner relative to the camera; w: its cell in blocks (one per cascade). ++@group(0) @binding(3) var grid: vec4; + + const BRICKS_XZ: u32 = 16u; + const BRICK_LISTS: u32 = 4096u; +@@ -15,7 +17,7 @@ fn fs_smoke_grid(in: FullOut) -> @location(0) vec4 { + let px = vec2(in.position.xy); + let tile = px / 128u; + let c = vec3(px.x % 128u, tile.y * 8u + tile.x, px.y % 128u); +- let p = frame.smoke_min.xyz + (vec3(c) + vec3(0.5)) * frame.smoke.y; ++ let p = grid.xyz + (vec3(c) + vec3(0.5)) * grid.w; + let b = (c.x >> 3u) + BRICKS_XZ * ((c.z >> 3u) + BRICKS_XZ * (c.y >> 3u)); + let start = bricks[2u * b]; + let count = bricks[2u * b + 1u]; +diff --git a/crates/horizon-client/src/gfx/hd/smoke_sample.wgsl b/crates/horizon-client/src/gfx/hd/smoke_sample.wgsl +index 024a1ac8e..14c7622f7 100644 +--- a/crates/horizon-client/src/gfx/hd/smoke_sample.wgsl ++++ b/crates/horizon-client/src/gfx/hd/smoke_sample.wgsl +@@ -6,6 +6,35 @@ fn smoke_slice(tex: texture_2d, s: sampler, x: f32, z: f32, y: f32) -> vec4 + return textureSampleLevel(tex, s, (tile * 128.0 + vec2(x + 0.5, z + 0.5)) / 1024.0, 0.0); + } + ++// A cascade of the grid read trilinearly: `gmin` its corner relative to the camera, `cell` its cell ++// size. Zero outside, no fade at the edge. ++fn smoke_raw(tex: texture_2d, s: sampler, p: vec3, gmin: vec3, cell: f32) -> vec4 { ++ let g = (p - gmin) / cell - vec3(0.5); ++ if g.x < 0.0 || g.z < 0.0 || g.y < 0.0 || g.x > 127.0 || g.z > 127.0 || g.y > 63.0 { ++ return vec4(0.0); ++ } ++ let y0 = floor(g.y); ++ let y1 = min(y0 + 1.0, 63.0); ++ let a = smoke_slice(tex, s, g.x, g.z, y0); ++ let b = smoke_slice(tex, s, g.x, g.z, y1); ++ return mix(a, b, g.y - y0); ++} ++ ++// The far cascade (12-block cells), fading out over its last 6 cells. ++fn smoke_far_at(tex: texture_2d, s: sampler, p: vec3) -> vec4 { ++ let g = (p - frame.smoke_far.xyz) / frame.smoke_far.w - vec3(0.5); ++ let edge = min(min(g.x, 127.0 - g.x), min(g.z, 127.0 - g.z)); ++ return smoke_raw(tex, s, p, frame.smoke_far.xyz, frame.smoke_far.w) * smoothstep(0.0, 6.0, edge); ++} ++ ++// How much the near grid covers a point: 1 inside, easing to 0 over its last 8 cells on every side ++// (the far grid takes the rest, so the two sum to the smoke once). ++fn smoke_near_cover(p: vec3) -> f32 { ++ let g = (p - frame.smoke_min.xyz) / frame.smoke.y - vec3(0.5); ++ let edge = min(min(min(g.x, 127.0 - g.x), min(g.z, 127.0 - g.z)), min(g.y, 63.0 - g.y)); ++ return smoothstep(0.0, 8.0, edge); ++} ++ + fn smoke_at(tex: texture_2d, s: sampler, p: vec3) -> vec4 { + let g = (p - frame.smoke_min.xyz) / frame.smoke.y - vec3(0.5); + if g.x < 0.0 || g.z < 0.0 || g.y < 0.0 || g.x > 127.0 || g.z > 127.0 || g.y > 63.0 { +diff --git a/crates/horizon-client/src/gfx/hd/volumes.rs b/crates/horizon-client/src/gfx/hd/volumes.rs +index d3b55e2f2..fd88b9ece 100644 +--- a/crates/horizon-client/src/gfx/hd/volumes.rs ++++ b/crates/horizon-client/src/gfx/hd/volumes.rs +@@ -24,6 +24,7 @@ + //! multiple-scattering octaves, the light march with growing steps) and the fog's phase mix and + //! evening glow are ported from Photon by sixthsurge (MIT, see THIRD_PARTY_PHOTON.md), shaders/include/sky/clouds/{common,cumulus}.glsl, shaders/include/lighting/cloud_shadows.glsl and shaders/include/fog/air_fog_vl.glsl at commit 26c2906. + ++use super::ground::Ground; + use super::noise as hd_noise; + use super::{ + DEPTH, FLOAT, Hd, SAMPLER, SHADOW_ARRAY, SHADOW_SAMPLER, UNFILTERED, UNIFORM, entries, +@@ -36,6 +37,8 @@ pub const FOG_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Rgba16Float; + pub const FOG_DIST_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::R16Float; + /// The cloud shadow map's side in texels, and its half size in blocks (the same in `fs_light`). + pub const SHADOW_SIZE: u32 = 256; ++/// The cloud panorama (the sky's clouds in every direction, for reflections): azimuths by elevations. ++pub const PANO_SIZE: [u32; 2] = [256, 64]; + pub const SHADOW_RADIUS: f32 = 1200.0; + /// Vanilla's cloud base height; the volumetric layer stands on it. + pub const CLOUD_BASE: f32 = 192.33; +@@ -89,6 +92,12 @@ pub struct HdVolumes { + /// How far each cloud texel's ray was marched (ping-pong with `clouds`). + cloud_dist: [wgpu::TextureView; 2], + cloud_depth: Option, ++ /// The cloud panorama and its history (ping-pong with `clouds`, the same flip). ++ pano: [wgpu::TextureView; 2], ++ pano_pipeline: wgpu::RenderPipeline, ++ pano_groups: Option<[wgpu::BindGroup; 2]>, ++ /// The ground's height map for the fog (`ground.rs`). ++ pub ground: Ground, + flip: usize, + history_ready: bool, + pub cloud_shadow: wgpu::TextureView, +@@ -123,7 +132,7 @@ pub(super) const CLOUD_SHADOW_BINDINGS: [wgpu::BindingType; 6] = + [UNIFORM, D3, FLOAT, SAMPLER, SAMPLER, FLOAT]; + /// `fs_fog`'s group 0: frame, the world's depth, the shadow cascades and their sampler, 3D noise, + /// repeating and clamped samplers, the sky texture. +-pub(super) const FOG_BINDINGS: [wgpu::BindingType; 9] = [ ++pub(super) const FOG_BINDINGS: [wgpu::BindingType; 11] = [ + UNIFORM, + DEPTH, + SHADOW_ARRAY, +@@ -133,6 +142,8 @@ pub(super) const FOG_BINDINGS: [wgpu::BindingType; 9] = [ + SAMPLER, + FLOAT, + FLOAT, ++ FLOAT, ++ FLOAT, + ]; + + impl HdVolumes { +@@ -256,6 +267,38 @@ impl HdVolumes { + cache: None, + }) + }; ++ let pano_pipeline = { ++ let layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor { ++ label: Some("HD cloud sky"), ++ bind_group_layouts: &[Some(&cloud_layout)], ++ ..Default::default() ++ }); ++ device.create_render_pipeline(&wgpu::RenderPipelineDescriptor { ++ label: Some("HD cloud sky"), ++ layout: Some(&layout), ++ vertex: wgpu::VertexState { ++ module: &cloud_module, ++ entry_point: Some("vs_full"), ++ compilation_options: Default::default(), ++ buffers: &[], ++ }, ++ fragment: Some(wgpu::FragmentState { ++ module: &cloud_module, ++ entry_point: Some("fs_cloud_sky"), ++ compilation_options: Default::default(), ++ targets: &[Some(wgpu::ColorTargetState { ++ format: CLOUD_FORMAT, ++ blend: None, ++ write_mask: wgpu::ColorWrites::ALL, ++ })], ++ }), ++ primitive: Default::default(), ++ depth_stencil: None, ++ multisample: Default::default(), ++ multiview_mask: None, ++ cache: None, ++ }) ++ }; + let shadow_pipeline = fullscreen( + device, + "HD cloud shadows", +@@ -320,6 +363,13 @@ impl HdVolumes { + one("HD cloud distance", [1, 1], FOG_DIST_FORMAT), + ], + cloud_depth: None, ++ pano: [ ++ one("HD cloud sky", PANO_SIZE, CLOUD_FORMAT), ++ one("HD cloud sky", PANO_SIZE, CLOUD_FORMAT), ++ ], ++ pano_pipeline, ++ pano_groups: None, ++ ground: Ground::new(device, queue), + flip: 0, + history_ready: false, + cloud_shadow: one( +@@ -358,6 +408,7 @@ impl HdVolumes { + self.fog_dist = one("HD fog distance", FOG_DIST_FORMAT); + self.history_ready = false; + self.cloud_groups = None; ++ self.pano_groups = None; + self.shadow_group = None; + self.fog_group = None; + } +@@ -380,6 +431,11 @@ impl HdVolumes { + &self.clouds[self.flip] + } + ++ /// The cloud panorama written last: what the reflections read. ++ pub fn pano_view(&self) -> &wgpu::TextureView { ++ &self.pano[self.flip] ++ } ++ + /// The march lengths that go with `cloud_view`. + pub fn cloud_dist_view(&self) -> &wgpu::TextureView { + &self.cloud_dist[self.flip] +@@ -419,6 +475,7 @@ impl HdVolumes { + ) { + if self.cloud_depth.as_ref() != Some(depth) { + self.cloud_groups = None; ++ self.pano_groups = None; + self.cloud_depth = Some(depth.clone()); + } + if self.shadow_group.is_none() { +@@ -475,6 +532,56 @@ impl HdVolumes { + }); + self.cloud_groups = Some(groups); + } ++ if self.pano_groups.is_none() { ++ let layout = self.cloud_layout.clone(); ++ let (n3, n2, clamp, repeat) = ( ++ self.noise3.clone(), ++ self.noise2.clone(), ++ self.clamp.clone(), ++ self.repeat.clone(), ++ ); ++ let pano = self.pano.clone(); ++ let dist = self.cloud_dist[0].clone(); ++ let groups = [0, 1].map(|read| { ++ self.group( ++ device, ++ "HD cloud sky", ++ &layout, ++ &[ ++ wgpu::BindingResource::Buffer(frame.as_entire_buffer_binding()), ++ wgpu::BindingResource::TextureView(&n3), ++ wgpu::BindingResource::TextureView(&n2), ++ wgpu::BindingResource::Sampler(&clamp), ++ wgpu::BindingResource::Sampler(&repeat), ++ wgpu::BindingResource::TextureView(sky_lut), ++ wgpu::BindingResource::TextureView(&pano[read]), ++ wgpu::BindingResource::TextureView(atlas), ++ wgpu::BindingResource::TextureView(depth), ++ wgpu::BindingResource::TextureView(&dist), ++ ], ++ ) ++ }); ++ self.pano_groups = Some(groups); ++ } ++ } ++ ++ /// The cloud panorama (a small texture, every frame, blended with the last). ++ pub fn draw_cloud_sky( ++ &mut self, ++ encoder: &mut wgpu::CommandEncoder, ++ stamp: Option>, ++ ) { ++ if let Some(groups) = &self.pano_groups { ++ let (read, write) = (self.flip, 1 - self.flip); ++ stamped_pass( ++ encoder, ++ "HD cloud sky", ++ &[&self.pano[write]], ++ &self.pano_pipeline, ++ &groups[read], ++ stamp, ++ ); ++ } + } + + /// The cloud shadow map. +@@ -526,10 +633,12 @@ impl HdVolumes { + shadow_array: &wgpu::TextureView, + sky_lut: &wgpu::TextureView, + atlas: &wgpu::TextureView, ++ far_atlas: &wgpu::TextureView, + stamp: Option>, + ) { + if self.fog_group.as_ref().is_none_or(|(v, _)| v != depth) { + let layout = self.fog_layout.clone(); ++ let ground = self.ground.view.clone(); + let (n3, clamp, repeat, cmp) = ( + self.noise3.clone(), + self.clamp.clone(), +@@ -550,6 +659,8 @@ impl HdVolumes { + wgpu::BindingResource::Sampler(&clamp), + wgpu::BindingResource::TextureView(sky_lut), + wgpu::BindingResource::TextureView(atlas), ++ wgpu::BindingResource::TextureView(&ground), ++ wgpu::BindingResource::TextureView(far_atlas), + ], + ); + self.fog_group = Some((depth.clone(), group)); +@@ -568,6 +679,20 @@ impl HdVolumes { + } + + impl Hd { ++ /// Refreshes the fog's ground map for a camera at world (`x`, `z`); `top` is one above a column's ++ /// highest block. A few hundred cells a frame; call before `write`. ++ pub fn write_ground( ++ &mut self, ++ queue: &wgpu::Queue, ++ x: f64, ++ z: f64, ++ top: &dyn Fn(i32, i32) -> i32, ++ ) { ++ if fog_enabled() { ++ self.volumes.ground.update(queue, x, z, top); ++ } ++ } ++ + /// The volumetric clouds (with their shadow map) and the fog, before the lighting reads them. + pub fn volumes( + &mut self, +@@ -585,6 +710,8 @@ impl Hd { + ); + self.volumes + .draw_cloud_shadow(encoder, stamp(&mut self.timing, "hd cloud shadows")); ++ self.volumes ++ .draw_cloud_sky(encoder, stamp(&mut self.timing, "hd cloud sky")); + self.volumes + .draw_clouds(encoder, stamp(&mut self.timing, "hd clouds")); + } else { +@@ -593,6 +720,8 @@ impl Hd { + if self.fog_active { + self.smoke + .draw(encoder, stamp(&mut self.timing, "hd smoke grid")); ++ self.smoke ++ .draw_far(encoder, stamp(&mut self.timing, "hd smoke grid far")); + self.volumes.draw_fog( + device, + encoder, +@@ -601,6 +730,7 @@ impl Hd { + &self.shadows.array, + &self.sky.lut, + &self.smoke.atlas, ++ &self.smoke.far_atlas, + stamp(&mut self.timing, "hd fog"), + ); + } +@@ -636,8 +766,14 @@ mod tests { + #[test] + fn noise_scales_divide_the_camera_wrap() { + let mut found = 0; +- for (name, src) in [("cloud_common", CLOUD_COMMON), ("fog", FOG)] { +- for key in ["w / ", "p3 / "] { ++ for (name, src) in [ ++ ("cloud_common", CLOUD_COMMON), ++ ("cloud", CLOUD), ++ ("fog", FOG), ++ ] { ++ for key in [ ++ "w / ", "p3 / ", "wxz / ", "cir.x / ", "cir.y / ", "cw.x / ", "cw.y / ", ++ ] { + for part in src.split(key).skip(1) { + let num: String = part + .chars() +@@ -654,7 +790,7 @@ mod tests { + } + } + } +- assert!(found >= 8, "found only {found} noise lookups"); ++ assert!(found >= 16, "found only {found} noise lookups"); + } + + /// The cloud noise's height is measured from the layer's base, not from the camera: the same +diff --git a/crates/horizon-client/src/gfx/hd/water.rs b/crates/horizon-client/src/gfx/hd/water.rs +index da972c5f2..403892348 100644 +--- a/crates/horizon-client/src/gfx/hd/water.rs ++++ b/crates/horizon-client/src/gfx/hd/water.rs +@@ -31,7 +31,7 @@ pub const WATER_NORMAL: wgpu::TextureFormat = wgpu::TextureFormat::Rgba8Unorm; + pub(super) const WATER: &str = include_str!("water.wgsl"); + /// The composite's group 0: frame, lit, G-buffer depth, water colour, normal, depth, shadow array + /// and sampler, lightmap, linear sampler, sky texture, air. +-pub(super) const WATER_BINDINGS: [wgpu::BindingType; 12] = [ ++pub(super) const WATER_BINDINGS: [wgpu::BindingType; 13] = [ + UNIFORM, + FLOAT, + DEPTH, +@@ -44,6 +44,7 @@ pub(super) const WATER_BINDINGS: [wgpu::BindingType; 12] = [ + SAMPLER, + FLOAT, + UNFILTERED, ++ FLOAT, + ]; + + /// The water effect is on unless `HORIZON_HD_WATER=0`. +@@ -60,7 +61,8 @@ pub(super) struct Water { + composite: wgpu::TextureView, + layout: wgpu::BindGroupLayout, + pipeline: wgpu::RenderPipeline, +- group: Option<((wgpu::TextureView, wgpu::Sampler), wgpu::BindGroup)>, ++ /// One group per flip of the cloud panorama it reads. ++ group: [Option<((wgpu::TextureView, wgpu::Sampler), wgpu::BindGroup)>; 2], + /// The water effect runs this frame (the scene allows it and there is translucent terrain on + /// screen), and `lit_view` is the composite. + pub(super) active: bool, +@@ -82,7 +84,7 @@ impl Water { + composite: target(device, "HD lit with water", [1, 1], HDR).view, + layout, + pipeline, +- group: None, ++ group: [None, None], + active: false, + composited: false, + } +@@ -94,7 +96,7 @@ impl Water { + self.normal = target(device, "HD water normal", size, WATER_NORMAL).view; + self.depth = target(device, "HD water depth", size, DEPTH_FORMAT).view; + self.composite = target(device, "HD lit with water", size, HDR).view; +- self.group = None; ++ self.group = [None, None]; + } + + /// The nearest water surface's depth (0 where there is none), for the lighting. +@@ -170,7 +172,11 @@ impl Hd { + return; + } + let key = (lightmap.0.clone(), lightmap.1.clone()); +- if self.water.group.as_ref().is_none_or(|(k, _)| *k != key) { ++ let flip = self.volumes.flip_index(); ++ if self.water.group[flip] ++ .as_ref() ++ .is_none_or(|(k, _)| *k != key) ++ { + let group = self.make_group( + device, + "HD water", +@@ -188,11 +194,12 @@ impl Hd { + wgpu::BindingResource::Sampler(&self.sampler), + wgpu::BindingResource::TextureView(&self.sky.lut), + wgpu::BindingResource::TextureView(&self.lighting.air), ++ wgpu::BindingResource::TextureView(self.volumes.pano_view()), + ], + ); +- self.water.group = Some((key, group)); ++ self.water.group[flip] = Some((key, group)); + } +- let Some((_, group)) = &self.water.group else { ++ let Some((_, group)) = &self.water.group[flip] else { + return; + }; + Self::draw( +diff --git a/crates/horizon-client/src/gfx/hd/water.wgsl b/crates/horizon-client/src/gfx/hd/water.wgsl +index a1a30897d..69e295980 100644 +--- a/crates/horizon-client/src/gfx/hd/water.wgsl ++++ b/crates/horizon-client/src/gfx/hd/water.wgsl +@@ -16,6 +16,7 @@ const REFLECT_RANGE: f32 = 96.0; + // What the lighting left beside the lit world: over water the air in front of the surface (scattered + // light, transmittance), in front of the water the lit floor. + @group(0) @binding(11) var air_tex: texture_2d; ++//PANO12 + + fn ign(px: vec2) -> f32 { + let p = px + vec2(5.588238 * frame.params.w); +@@ -131,7 +132,7 @@ fn linear_fog(d: f32, start: f32, end: f32) -> f32 { + fn sky_along(r: vec3, vis: f32) -> vec3 { + var c = frame.fog_color.rgb; + if frame.sky_sun.w > 0.5 { +- c = atmosphere_sky(r); ++ c = sky_with_clouds(atmosphere_sky(r), r); + } else if frame.sky_color.w > 0.5 { + c = mix(frame.fog_color.rgb, frame.sky_color.rgb, smoothstep(0.0, 0.5, r.y)); + } +diff --git a/crates/horizon-client/src/gfx/mod_post.rs b/crates/horizon-client/src/gfx/mod_post.rs +index 3d67ff25b..057878a8e 100644 +--- a/crates/horizon-client/src/gfx/mod_post.rs ++++ b/crates/horizon-client/src/gfx/mod_post.rs +@@ -303,7 +303,7 @@ impl ModPost { + 1.0 / size[1].max(1) as f32, + ], + time: [ +- self.start.elapsed().as_secs_f32() % 3600.0, ++ crate::film_clock::since(self.start).as_secs_f32() % 3600.0, + partial, + sun[1], + 0.0, +diff --git a/crates/horizon-client/src/gfx/native_post.rs b/crates/horizon-client/src/gfx/native_post.rs +index bf4293157..52a63c1b0 100644 +--- a/crates/horizon-client/src/gfx/native_post.rs ++++ b/crates/horizon-client/src/gfx/native_post.rs +@@ -85,7 +85,7 @@ impl NativeFrame { + + /// Writes this frame's inputs, for a world of `size`. + pub fn write(&mut self, queue: &wgpu::Queue, frame: &Frame, size: [u32; 2]) { +- let seconds = self.start.elapsed().as_secs_f32() % 3600.0; ++ let seconds = crate::film_clock::since(self.start).as_secs_f32() % 3600.0; + let inputs = frame_inputs(frame, size, seconds, self.frames); + self.frames = self.frames.wrapping_add(1); + queue.write_buffer(&self.buffer, 0, bytemuck::bytes_of(&inputs)); +diff --git a/crates/horizon-client/src/gfx/pack_uniforms.rs b/crates/horizon-client/src/gfx/pack_uniforms.rs +index 4da492b00..665c0111f 100644 +--- a/crates/horizon-client/src/gfx/pack_uniforms.rs ++++ b/crates/horizon-client/src/gfx/pack_uniforms.rs +@@ -277,7 +277,7 @@ fn smooth(value: f32, target: f32, half_life: f32, dt: f32) -> f32 { + impl FrameUniforms { + /// This frame's values for a render size of `size` pixels. + pub fn update(&mut self, frame: &Frame, inputs: &PackInputs, size: [u32; 2]) { +- let now = std::time::Instant::now(); ++ let now = crate::film_clock::now(); + let dt = self.last.map_or(0.0, |l| (now - l).as_secs_f32()); + self.last = Some(now); + let aspect = size[0] as f32 / size[1].max(1) as f32; +diff --git a/crates/horizon-client/src/lib.rs b/crates/horizon-client/src/lib.rs +index d4ef4c209..58afe409e 100644 +--- a/crates/horizon-client/src/lib.rs ++++ b/crates/horizon-client/src/lib.rs +@@ -63,6 +63,7 @@ pub mod extras; + pub mod extras_hud; + pub mod falling_block; + pub mod fast_hash; ++pub mod film_clock; + pub mod fire_render; + pub mod first_person; + pub mod flatgen; +@@ -181,6 +182,7 @@ pub mod weather; + pub mod widgets; + pub mod win_screen; + pub mod world; ++pub mod world_log; + pub mod world_spawn; + pub mod worldborder; + pub mod zip; +diff --git a/crates/horizon-client/src/world.rs b/crates/horizon-client/src/world.rs +index f2d636ac8..40ecbdf7d 100644 +--- a/crates/horizon-client/src/world.rs ++++ b/crates/horizon-client/src/world.rs +@@ -105,6 +105,10 @@ pub struct World { + /// The sections whose blocks changed since a mod last asked, kept only + /// while a mod watches (`render.world-changes`). + pub mod_changes: ModChanges, ++ /// AirDef fork: the log of block changes a mod asked for (`render.world-log-start`) and the ++ /// game tick the changes are stamped with. ++ pub log: Option, ++ pub log_tick: u64, + } + /// The block changes a mod's cache of the world must hear of. + #[derive(Default)] +@@ -227,6 +231,8 @@ impl World { + pois: Default::default(), + epoch: NEXT_EPOCH.fetch_add(1, std::sync::atomic::Ordering::Relaxed), + mod_changes: ModChanges::default(), ++ log: None, ++ log_tick: 0, + } + } + /// A controlled blockstate scene for the native scene probes: material +@@ -290,14 +296,35 @@ impl World { + /// section borders) for remeshing and the surrounding chunks for relighting. + /// Neighbour updates, drops and block entities belong to the gameplay layer. + pub fn set(&mut self, x: i32, y: i32, z: i32, state: BlockStateId) -> crate::Result<()> { +- let Some(chunk) = self.chunks.get_mut(&(x >> 4, z >> 4)) else { ++ if self.chunks.get(&(x >> 4, z >> 4)).is_none() { + return Err("write outside resident chunks".into()); +- }; ++ } + if y < MIN_Y || y >= MIN_Y + (SECTIONS as i32) * 16 { + return Err("write outside world height".into()); + } +- let previous = Arc::make_mut(chunk).set(x & 15, y, z & 15, state.0); ++ // A mod's view of an earlier time keeps the blocks it shows: a real change is logged and ++ // held back (the state before it is the real one) until the view moves past it. ++ let deferred = self ++ .log ++ .as_ref() ++ .and_then(|l| l.deferred([x, y, z], self.block(x, y, z).0)); ++ let previous = match deferred { ++ Some(real) => real, ++ None => { ++ let chunk = self.chunks.get_mut(&(x >> 4, z >> 4)).expect("checked"); ++ Arc::make_mut(chunk).set(x & 15, y, z & 15, state.0) ++ } ++ }; + if previous != state.0 { ++ if let Some(log) = &mut self.log { ++ log.record( ++ self.log_tick, ++ [x, y, z], ++ previous, ++ state.0, ++ deferred.is_some(), ++ ); ++ } + self.block_entities + .state_changed((x, y, z), previous, state.0); + let watches = |id: u32| self.watched.get(id as usize).copied().unwrap_or(false); +@@ -312,32 +339,90 @@ impl World { + log.push((x, y, z)); + } + self.modified.insert((x >> 4, z >> 4)); +- let sy = (y - MIN_Y) >> 4; +- for dz in -1..=1 { +- for dy in -1..=1 { +- for dx in -1..=1 { +- let (bx, by, bz) = (x + dx, y + dy, z + dz); +- let s = (by - MIN_Y) >> 4; +- if !(0..SECTIONS as i32).contains(&s) { +- continue; +- } +- self.dirty_sections.insert((bx >> 4, s, bz >> 4)); ++ if deferred.is_none() { ++ self.touched(x, y, z, previous, state.0); ++ } ++ } ++ Ok(()) ++ } ++ /// Marks what a written block changes: the sections to remesh (and their neighbours on a ++ /// border) and the light. ++ fn touched(&mut self, x: i32, y: i32, z: i32, previous: u32, state: u32) { ++ for dz in -1..=1 { ++ for dy in -1..=1 { ++ for dx in -1..=1 { ++ let (bx, by, bz) = (x + dx, y + dy, z + dz); ++ let s = (by - MIN_Y) >> 4; ++ if !(0..SECTIONS as i32).contains(&s) { ++ continue; + } ++ self.dirty_sections.insert((bx >> 4, s, bz >> 4)); + } + } +- let _ = sy; +- if self.chunks.get(&(x >> 4, z >> 4)).is_some_and(|c| c.lit) { +- self.light_edits.push(((x, y, z), previous, state.0)); +- } else { +- for dz in -1..=1 { +- for dx in -1..=1 { +- self.dirty_light.insert(((x >> 4) + dx, (z >> 4) + dz)); +- } ++ } ++ if self.chunks.get(&(x >> 4, z >> 4)).is_some_and(|c| c.lit) { ++ self.light_edits.push(((x, y, z), previous, state)); ++ } else { ++ for dz in -1..=1 { ++ for dx in -1..=1 { ++ self.dirty_light.insert(((x >> 4) + dx, (z >> 4) + dz)); + } + } + } +- Ok(()) + } ++ /// A mod's view of the world at an earlier tick (`render.set-world-time-view`): moves it ++ /// toward `target` by at most `budget` changes, leaving alone the blocks around `protect` ++ /// (a block position whose neighbourhood stays as it is: the player's). Only the client's copy of the blocks changes. True when it has got there. ++ pub fn view_log( ++ &mut self, ++ target: Option, ++ budget: usize, ++ protect: Option<[i32; 3]>, ++ ) -> bool { ++ let Some(mut log) = self.log.take() else { ++ return true; ++ }; ++ let keep = |p: [i32; 3]| { ++ protect.is_none_or(|c| { ++ !((p[0] - c[0]).abs() <= 2 ++ && (p[2] - c[2]).abs() <= 2 ++ && (-3..=3).contains(&(p[1] - c[1]))) ++ }) ++ }; ++ let done = log.view(&mut ShownBlocks(self), target, budget, keep); ++ self.log = Some(log); ++ done ++ } ++} ++/// The world as a log's view writes it: only what is drawn changes. ++struct ShownBlocks<'a>(&'a mut World); ++impl crate::world_log::Blocks for ShownBlocks<'_> { ++ fn get(&self, pos: [i32; 3]) -> Option { ++ let w = &*self.0; ++ (w.chunks.get(&(pos[0] >> 4, pos[2] >> 4)).is_some() ++ && (MIN_Y..MIN_Y + (SECTIONS as i32) * 16).contains(&pos[1])) ++ .then(|| w.block(pos[0], pos[1], pos[2]).0) ++ } ++ fn put(&mut self, [x, y, z]: [i32; 3], state: u32) -> bool { ++ let w = &mut *self.0; ++ if !(MIN_Y..MIN_Y + (SECTIONS as i32) * 16).contains(&y) { ++ return false; ++ } ++ let Some(chunk) = w.chunks.get_mut(&(x >> 4, z >> 4)) else { ++ return false; ++ }; ++ let previous = Arc::make_mut(chunk).set(x & 15, y, z & 15, state); ++ if previous != state { ++ w.revision = w.revision.wrapping_add(1); ++ if w.mod_changes.watching { ++ w.mod_changes.note(x, y, z); ++ } ++ w.touched(x, y, z, previous, state); ++ } ++ true ++ } ++} ++impl World { + /// `getHeight(Heightmap.Types.WORLD_SURFACE, x, z)`: one above the highest + /// block that isn't `air`, or `MIN_Y` (also where the chunk isn't loaded). + pub fn world_surface(&self, x: i32, z: i32, air: impl Fn(BlockStateId) -> bool) -> i32 { +diff --git a/crates/horizon-client/src/world_log.rs b/crates/horizon-client/src/world_log.rs +new file mode 100644 +index 000000000..d0c0b1158 +--- /dev/null ++++ b/crates/horizon-client/src/world_log.rs +@@ -0,0 +1,372 @@ ++//! AirDef fork: a bounded log of the block changes the client's world took, and a view of the ++//! world as it stood at an earlier game tick (`render.world-log-start`, `set-world-time-view`). ++//! ++//! The view is a cursor into the log: the world shown is the real one with every change from ++//! the cursor on undone. Moving the cursor back undoes changes (newest first), moving it on ++//! redoes them, a few at a time so a long seek is spread over frames. A change that arrives ++//! while the cursor is behind the end is logged and kept as the block's real state, but not ++//! written (it lies after the view's time): it shows when the cursor passes it, or when the ++//! view ends and every displaced block is put back. Pure over [`Blocks`]; the world is one. ++use std::collections::{HashMap, VecDeque}; ++ ++pub type Pos = [i32; 3]; ++ ++/// Changes a log keeps (about 24 MB): the oldest go first. ++pub const CAP: usize = 1_000_000; ++ ++#[derive(Clone, Copy, Debug, PartialEq, Eq)] ++pub struct Entry { ++ pub tick: u64, ++ pub pos: Pos, ++ pub old: u32, ++ pub new: u32, ++} ++ ++/// The blocks a log shows its view in. ++pub trait Blocks { ++ /// The state at `pos`; None where the chunk is not loaded. ++ fn get(&self, pos: Pos) -> Option; ++ /// Writes a state as a display only (no gameplay, no network); false where it is not loaded. ++ fn put(&mut self, pos: Pos, state: u32) -> bool; ++} ++ ++pub struct WorldLog { ++ pub id: u32, ++ entries: VecDeque, ++ /// The sequence number of `entries[0]`. ++ base: u64, ++ /// Entries from this sequence number on are undone in the world shown. ++ cursor: u64, ++ /// Blocks shown other than they are: their real state. ++ shown: HashMap, ++ cap: usize, ++ /// The tick the log began, and the tick of the newest change it let go. ++ start: u64, ++ lost: Option, ++} ++ ++impl WorldLog { ++ pub fn new(id: u32, tick: u64) -> Self { ++ Self::with_cap(id, tick, CAP) ++ } ++ pub fn with_cap(id: u32, tick: u64, cap: usize) -> Self { ++ Self { ++ id, ++ entries: VecDeque::new(), ++ base: 0, ++ cursor: 0, ++ shown: HashMap::new(), ++ cap: cap.max(1), ++ start: tick, ++ lost: None, ++ } ++ } ++ fn end(&self) -> u64 { ++ self.base + self.entries.len() as u64 ++ } ++ pub fn len(&self) -> usize { ++ self.entries.len() ++ } ++ pub fn is_empty(&self) -> bool { ++ self.entries.is_empty() ++ } ++ /// The earliest tick whose world the log can show. ++ pub fn earliest(&self) -> u64 { ++ self.lost.unwrap_or(self.start) ++ } ++ /// Whether the world shown differs from the real one (a view is on, or blocks wait to be put back). ++ pub fn active(&self) -> bool { ++ self.cursor < self.end() || !self.shown.is_empty() ++ } ++ /// The blocks shown other than they are. ++ pub fn displaced(&self) -> usize { ++ self.shown.len() ++ } ++ /// The first sequence number whose change came after tick `t` (the world at `t` is the real ++ /// one with those undone). ++ fn seq_after(&self, t: u64) -> u64 { ++ let t = t.max(self.earliest()); ++ self.base + self.entries.partition_point(|e| e.tick <= t) as u64 ++ } ++ ++ /// A write of `new` to `pos` is about to happen with `stored` in the world: Some(the real ++ /// state before it) when it must not be written (the view is behind it, or the block is ++ /// displaced), None for an ordinary write (the caller's previous state is the real one). ++ pub fn deferred(&self, pos: Pos, stored: u32) -> Option { ++ (self.cursor < self.end() || self.shown.contains_key(&pos)) ++ .then(|| self.shown.get(&pos).copied().unwrap_or(stored)) ++ } ++ ++ /// Logs a change that happened at `tick` (`deferred`: it was not written, see [`deferred`]). ++ pub fn record(&mut self, tick: u64, pos: Pos, old: u32, new: u32, deferred: bool) { ++ if old == new { ++ return; ++ } ++ // Behind the end the new change is undone too: the cursor stays where it is. ++ let at_end = self.cursor == self.end(); ++ self.entries.push_back(Entry { ++ tick, ++ pos, ++ old, ++ new, ++ }); ++ if at_end && !deferred { ++ self.cursor = self.end(); ++ } ++ if deferred { ++ self.shown.insert(pos, new); ++ if at_end { ++ // Displaced blocks wait for their restoration with the cursor at the end. ++ self.cursor = self.end(); ++ } ++ } ++ while self.entries.len() > self.cap { ++ let gone = self.entries.pop_front().expect("over the cap"); ++ self.base += 1; ++ self.lost = Some(gone.tick); ++ } ++ self.cursor = self.cursor.max(self.base); ++ } ++ ++ /// Moves the view toward the world at `target` (None: the real world), at most `budget` ++ /// changes, leaving alone the blocks `keep` refuses. True when it has got there. ++ pub fn view( ++ &mut self, ++ blocks: &mut impl Blocks, ++ target: Option, ++ budget: usize, ++ keep: impl Fn(Pos) -> bool, ++ ) -> bool { ++ self.cursor = self.cursor.max(self.base); ++ let goal = target.map_or(self.end(), |t| self.seq_after(t)); ++ let mut left = budget; ++ while left > 0 && self.cursor > goal { ++ self.cursor -= 1; ++ let e = self.entries[(self.cursor - self.base) as usize]; ++ self.show(blocks, e.pos, e.old, &keep); ++ left -= 1; ++ } ++ while left > 0 && self.cursor < goal { ++ let e = self.entries[(self.cursor - self.base) as usize]; ++ self.cursor += 1; ++ self.show(blocks, e.pos, e.new, &keep); ++ left -= 1; ++ } ++ if self.cursor == goal && goal == self.end() && !self.shown.is_empty() { ++ // Back at the real world: whatever is still displaced goes back. ++ let rest: Vec<(Pos, u32)> = self ++ .shown ++ .iter() ++ .map(|(p, s)| (*p, *s)) ++ .take(left) ++ .collect(); ++ for (pos, real) in rest { ++ blocks.put(pos, real); ++ self.shown.remove(&pos); ++ } ++ } ++ self.cursor == goal && (goal != self.end() || self.shown.is_empty()) ++ } ++ ++ fn show( ++ &mut self, ++ blocks: &mut impl Blocks, ++ pos: Pos, ++ state: u32, ++ keep: &impl Fn(Pos) -> bool, ++ ) { ++ if !keep(pos) { ++ return; ++ } ++ let real = match self.shown.get(&pos) { ++ Some(&r) => r, ++ // Not loaded: skipped, silently. ++ None => match blocks.get(pos) { ++ Some(s) => s, ++ None => return, ++ }, ++ }; ++ if !blocks.put(pos, state) { ++ self.shown.remove(&pos); ++ } else if state == real { ++ self.shown.remove(&pos); ++ } else { ++ self.shown.insert(pos, real); ++ } ++ } ++} ++ ++#[cfg(test)] ++mod tests { ++ use super::*; ++ ++ /// A world of blocks, some chunks (x >> 4) not loaded. ++ #[derive(Default)] ++ struct W { ++ b: HashMap, ++ unloaded: Vec, ++ } ++ impl W { ++ fn loaded(&self, p: Pos) -> bool { ++ !self.unloaded.contains(&(p[0] >> 4)) ++ } ++ /// A real write, as the world's `set` does it. ++ fn set(&mut self, log: &mut WorldLog, tick: u64, p: Pos, s: u32) { ++ let stored = self.b.get(&p).copied().unwrap_or(0); ++ let deferred = log.deferred(p, stored); ++ let prev = deferred.unwrap_or(stored); ++ if deferred.is_none() { ++ self.b.insert(p, s); ++ } ++ log.record(tick, p, prev, s, deferred.is_some()); ++ } ++ fn shows(&self, p: Pos) -> u32 { ++ self.b.get(&p).copied().unwrap_or(0) ++ } ++ } ++ impl Blocks for W { ++ fn get(&self, p: Pos) -> Option { ++ self.loaded(p).then(|| self.shows(p)) ++ } ++ fn put(&mut self, p: Pos, s: u32) -> bool { ++ self.loaded(p).then(|| self.b.insert(p, s)).is_some() ++ } ++ } ++ ++ fn all(_: Pos) -> bool { ++ true ++ } ++ ++ /// Stone at 1 until a blast at tick 10 digs (0,0,0) and (1,0,0), tick 20 digs (2,0,0), tick 30 places 7 at (0,0,0). ++ fn raid() -> (W, WorldLog) { ++ let mut w = W::default(); ++ let mut log = WorldLog::new(1, 0); ++ for x in 0..3 { ++ w.b.insert([x, 0, 0], 1); ++ } ++ w.set(&mut log, 10, [0, 0, 0], 0); ++ w.set(&mut log, 10, [1, 0, 0], 0); ++ w.set(&mut log, 20, [2, 0, 0], 0); ++ w.set(&mut log, 30, [0, 0, 0], 7); ++ (w, log) ++ } ++ ++ #[test] ++ fn undo_and_redo_show_the_world_at_each_tick() { ++ let (mut w, mut log) = raid(); ++ let at = |w: &W| (w.shows([0, 0, 0]), w.shows([1, 0, 0]), w.shows([2, 0, 0])); ++ assert_eq!(at(&w), (7, 0, 0)); ++ assert!(log.view(&mut w, Some(5), 100, all)); ++ assert_eq!(at(&w), (1, 1, 1)); ++ assert!(log.view(&mut w, Some(10), 100, all)); ++ assert_eq!(at(&w), (0, 0, 1)); ++ assert!(log.view(&mut w, Some(25), 100, all)); ++ assert_eq!(at(&w), (0, 0, 0)); ++ // Back in time and on again, whichever way. ++ assert!(log.view(&mut w, Some(12), 100, all)); ++ assert_eq!(at(&w), (0, 0, 1)); ++ assert!(log.view(&mut w, Some(30), 100, all)); ++ assert_eq!(at(&w), (7, 0, 0)); ++ assert!(!log.active()); ++ } ++ ++ #[test] ++ fn ending_the_view_puts_every_block_back() { ++ let (mut w, mut log) = raid(); ++ log.view(&mut w, Some(0), 100, all); ++ assert!(log.active()); ++ assert_eq!(log.displaced(), 3); ++ assert!(log.view(&mut w, None, 100, all)); ++ assert_eq!( ++ (w.shows([0, 0, 0]), w.shows([1, 0, 0]), w.shows([2, 0, 0])), ++ (7, 0, 0) ++ ); ++ assert!(!log.active()); ++ } ++ ++ #[test] ++ fn a_seek_is_spread_over_budgeted_steps() { ++ let (mut w, mut log) = raid(); ++ let mut steps = 0; ++ while !log.view(&mut w, Some(0), 1, all) { ++ steps += 1; ++ assert!(steps < 10); ++ } ++ assert_eq!(steps, 3); ++ assert_eq!(w.shows([0, 0, 0]), 1); ++ } ++ ++ #[test] ++ fn a_change_that_arrives_during_the_view_waits_for_the_end() { ++ let (mut w, mut log) = raid(); ++ log.view(&mut w, Some(5), 100, all); ++ // A new block at an untouched place and a new state of a displaced one, at tick 40. ++ w.set(&mut log, 40, [5, 0, 0], 9); ++ w.set(&mut log, 40, [0, 0, 0], 8); ++ assert_eq!( ++ w.shows([5, 0, 0]), ++ 0, ++ "not shown while the view is at tick 5" ++ ); ++ assert_eq!(w.shows([0, 0, 0]), 1); ++ // The view moves past it: the real state shows. ++ log.view(&mut w, Some(40), 100, all); ++ assert_eq!(w.shows([5, 0, 0]), 9); ++ assert_eq!(w.shows([0, 0, 0]), 8); ++ // Seeking back hides it again, the end brings it back. ++ log.view(&mut w, Some(5), 100, all); ++ assert_eq!(w.shows([5, 0, 0]), 0); ++ log.view(&mut w, None, 100, all); ++ assert_eq!((w.shows([5, 0, 0]), w.shows([0, 0, 0])), (9, 8)); ++ assert!(!log.active()); ++ } ++ ++ #[test] ++ fn the_cap_drops_the_oldest_and_the_view_starts_from_the_earliest_known() { ++ let mut w = W::default(); ++ let mut log = WorldLog::with_cap(1, 0, 2); ++ for (i, x) in (0..4).enumerate() { ++ w.set(&mut log, 10 * (i as u64 + 1), [x, 0, 0], 1); ++ } ++ assert_eq!(log.len(), 2); ++ assert_eq!(log.earliest(), 20); ++ // Before the earliest shows the earliest: changes at ticks 30 and 40 undone only. ++ assert!(log.view(&mut w, Some(0), 100, all)); ++ assert_eq!( ++ ( ++ w.shows([0, 0, 0]), ++ w.shows([1, 0, 0]), ++ w.shows([2, 0, 0]), ++ w.shows([3, 0, 0]) ++ ), ++ (1, 1, 0, 0) ++ ); ++ assert!(log.view(&mut w, None, 100, all)); ++ assert_eq!(w.shows([3, 0, 0]), 1); ++ } ++ ++ #[test] ++ fn unloaded_chunks_are_skipped_silently() { ++ let mut w = W::default(); ++ let mut log = WorldLog::new(1, 0); ++ w.set(&mut log, 5, [0, 0, 0], 1); ++ w.set(&mut log, 5, [32, 0, 0], 1); ++ w.unloaded.push(2); ++ assert!(log.view(&mut w, Some(0), 100, all)); ++ assert_eq!(w.shows([0, 0, 0]), 0); ++ assert_eq!(log.displaced(), 1); ++ assert!(log.view(&mut w, None, 100, all)); ++ assert_eq!(w.shows([0, 0, 0]), 1); ++ assert!(!log.active()); ++ } ++ ++ #[test] ++ fn blocks_the_game_keeps_are_left_alone() { ++ let (mut w, mut log) = raid(); ++ let keep = |p: Pos| p[0] != 0; ++ log.view(&mut w, Some(0), 100, keep); ++ assert_eq!((w.shows([0, 0, 0]), w.shows([1, 0, 0])), (7, 1)); ++ log.view(&mut w, None, 100, all); ++ assert_eq!(w.shows([0, 0, 0]), 7); ++ } ++} +diff --git a/crates/horizon-mod-sdk/wit/horizon.wit b/crates/horizon-mod-sdk/wit/horizon.wit +index a0cc60c72..a367a666f 100644 +--- a/crates/horizon-mod-sdk/wit/horizon.wit ++++ b/crates/horizon-mod-sdk/wit/horizon.wit +@@ -858,6 +858,32 @@ interface render { + /// Meant for replays and films; false restores the player's settings. A + /// capture turns it on for its duration. + set-film-quality: func(on: bool); ++ /// Starts a log of the world's block changes as the game's client sees ++ /// them (AirDef fork, level 18): each change keeps its position, the ++ /// state before and after, and the game tick (the number `tick` is ++ /// called with). It is bounded (about a million changes): the oldest go ++ /// first. Returns the log's id, which stays the same while it runs (a ++ /// second call returns it). Only the world open now has it: a new world ++ /// (leaving, rejoining) loses it. Not kept when the world runs in the ++ /// game's own frame (`--in-frame`), where `world-log-range` stays none. ++ world-log-start: func() -> u32; ++ /// Ends the log and forgets what it kept (a different id is ignored). ++ world-log-stop: func(id: u32); ++ /// What the log covers, as (the earliest tick whose world it can show, ++ /// the tick it is at now); none for an unknown id, a log of another ++ /// world, or one that has not been taken up yet (the tick after ++ /// `world-log-start`). Asking for a time before the earliest shows the ++ /// earliest. ++ world-log-range: func(id: u32) -> option>; ++ /// Shows the world as it stood at a game tick, (log id, tick), to the ++ /// player's eyes only (AirDef fork, level 18): the changes logged after ++ /// it are undone in the game's own copy of the blocks, a little each ++ /// frame, and redone as the tick moves on; none (or the mod stopping, ++ /// the world changing) puts every block back. The server, the saves, ++ /// the player's own collision and the blocks next to the player are ++ /// untouched, and changes that arrive meanwhile are kept and shown ++ /// when the view ends. Chunks that are not loaded are skipped. ++ set-world-time-view: func(view: option>); + } + + /// What the game calls. Only the hooks `init` asks for are ever called. +diff --git a/crates/horizon-mods/src/api_level.rs b/crates/horizon-mods/src/api_level.rs +index ce4555e32..55920c1da 100644 +--- a/crates/horizon-mods/src/api_level.rs ++++ b/crates/horizon-mods/src/api_level.rs +@@ -7,13 +7,13 @@ + //! version's level so the launcher can tell before it installs. + + /// The newest level this Horizon serves. +-pub const LEVEL: u32 = 17; ++pub const LEVEL: u32 = 18; + + /// Every function the game offers mods, as `interface.function`, with its + /// level. Level 0 is the contract of Horizon 0.2.67 to 0.2.69. A new + /// function takes the next level and raises [`LEVEL`] (the `api_reference` + /// test fails until it is listed here). +-pub const FUNCTIONS: [(&str, u32); 74] = [ ++pub const FUNCTIONS: [(&str, u32); 78] = [ + ("log.write", 0), + ("game.get-player", 0), + ("game.get-clock", 0), +@@ -95,6 +95,11 @@ pub const FUNCTIONS: [(&str, u32); 74] = [ + ("render.capture-stop", 17), + ("render.capture-status", 17), + ("render.set-film-quality", 17), ++ // AirDef fork: a log of block changes and a view of the world as it was. ++ ("render.world-log-start", 18), ++ ("render.world-log-stop", 18), ++ ("render.world-log-range", 18), ++ ("render.set-world-time-view", 18), + ]; + + /// What the game's program carries so the launcher can read its level +diff --git a/crates/horizon-mods/src/runtime.rs b/crates/horizon-mods/src/runtime.rs +index b77e32c43..89fa150d0 100644 +--- a/crates/horizon-mods/src/runtime.rs ++++ b/crates/horizon-mods/src/runtime.rs +@@ -317,8 +317,17 @@ pub struct ModelTable { + capture_state: Option, + /// `render.set-film-quality`. + film_quality: bool, ++ /// `render.world-log-start`: the id of the log a mod asked for, if one runs. ++ world_log: Option, ++ /// What the game says the log covers: (id, earliest tick, tick now). ++ world_log_state: Option<(u32, u64, u64)>, ++ /// `render.set-world-time-view`: (log id, tick). ++ time_view: Option<(u32, u64)>, + } + ++/// The ids of block-change logs: never reused in a run of the game. ++static WORLD_LOG_IDS: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(1); ++ + type ModelSlot = Arc>; + + /// A model as a mod set it: by name, or by a handle of the [`ModelTable`]. +@@ -1383,6 +1392,20 @@ impl Mods { + t.capture_state = Some(state); + } + } ++ /// The block-change log a mod asked for (`render.world-log-start`), if any. ++ pub fn world_log_wanted(&self) -> Option { ++ self.model_table.lock().ok()?.world_log ++ } ++ /// The game's note of what the log covers: (id, earliest tick, tick now), or none. ++ pub fn set_world_log_state(&self, state: Option<(u32, u64, u64)>) { ++ if let Ok(mut t) = self.model_table.lock() { ++ t.world_log_state = state; ++ } ++ } ++ /// The world a mod asked to be shown at a tick (`render.set-world-time-view`): (log id, tick). ++ pub fn time_view(&self) -> Option<(u32, u64)> { ++ self.model_table.lock().ok()?.time_view ++ } + /// Whether a mod asked for the best picture (`render.set-film-quality`). + pub fn film_quality(&self) -> bool { + self.model_table.lock().is_ok_and(|t| t.film_quality) +@@ -2458,6 +2481,33 @@ impl render::Host for State { + message: String::new(), + }) + } ++ fn world_log_start(&mut self) -> u32 { ++ let Ok(mut t) = self.model_table.lock() else { ++ return 0; ++ }; ++ *t.world_log.get_or_insert_with(|| { ++ WORLD_LOG_IDS.fetch_add(1, std::sync::atomic::Ordering::Relaxed) ++ }) ++ } ++ fn world_log_stop(&mut self, id: u32) { ++ if let Ok(mut t) = self.model_table.lock() ++ && t.world_log == Some(id) ++ { ++ t.world_log = None; ++ t.time_view = None; ++ } ++ } ++ fn world_log_range(&mut self, id: u32) -> Option<(u64, u64)> { ++ let t = self.model_table.lock().ok()?; ++ t.world_log_state ++ .filter(|s| s.0 == id && t.world_log == Some(id)) ++ .map(|s| (s.1, s.2)) ++ } ++ fn set_world_time_view(&mut self, view: Option<(u32, u64)>) { ++ if let Ok(mut t) = self.model_table.lock() { ++ t.time_view = view.filter(|v| t.world_log == Some(v.0)); ++ } ++ } + fn set_film_quality(&mut self, on: bool) { + if let Ok(mut t) = self.model_table.lock() { + t.film_quality = on; +diff --git a/docs/api/mods-reference.md b/docs/api/mods-reference.md +index d33e26705..c1dc88f54 100644 +--- a/docs/api/mods-reference.md ++++ b/docs/api/mods-reference.md +@@ -736,6 +736,10 @@ Where a capture is. + | `capture-stop` | `func(cancel: bool)` | Ends the capture: finishes the file, or (`cancel`) throws it away. | + | `capture-status` | `func() -> capture-state` | The capture's state; `done` and `failed` stay until the next start. | + | `set-film-quality` | `func(on: bool)` | Asks for the best picture the renderer can give (AirDef fork, level 17): the HD world at the full size of the window (no resolution scale, so no upscaling), and the volumetric clouds and fog marched with more steps. Meant for replays and films; false restores the player's settings. A capture turns it on for its duration. | ++| `world-log-start` | `func() -> u32` | Starts a log of the world's block changes as the game's client sees them (AirDef fork, level 18): each change keeps its position, the state before and after, and the game tick (the number `tick` is called with). It is bounded (about a million changes): the oldest go first. Returns the log's id, which stays the same while it runs (a second call returns it). Only the world open now has it: a new world (leaving, rejoining) loses it. Not kept when the world runs in the game's own frame (`--in-frame`), where `world-log-range` stays none. | ++| `world-log-stop` | `func(id: u32)` | Ends the log and forgets what it kept (a different id is ignored). | ++| `world-log-range` | `func(id: u32) -> option>` | What the log covers, as (the earliest tick whose world it can show, the tick it is at now); none for an unknown id, a log of another world, or one that has not been taken up yet (the tick after `world-log-start`). Asking for a time before the earliest shows the earliest. | ++| `set-world-time-view` | `func(view: option>)` | Shows the world as it stood at a game tick, (log id, tick), to the player's eyes only (AirDef fork, level 18): the changes logged after it are undone in the game's own copy of the blocks, a little each frame, and redone as the tick moves on; none (or the mod stopping, the world changing) puts every block back. The server, the saves, the player's own collision and the blocks next to the player are untouched, and changes that arrive meanwhile are kept and shown when the view ends. Chunks that are not loaded are skipped. | + + ## `events` + +-- +2.54.0 (Apple Git-157) + diff --git a/tools/gen_models.py b/tools/gen_models.py index 12f453a..b12be5f 100644 --- a/tools/gen_models.py +++ b/tools/gen_models.py @@ -9,11 +9,16 @@ """ import json import os +import sys import random import shutil +import zlib from PIL import Image +import gen_tex as GT + +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) ROOT = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "airdef-mod")) NS = "airdef" @@ -231,6 +236,51 @@ TEXTURES = { } +RINGED = set() + + +def _ring(name, base, bands, seed, text=None): + RINGED.add(name) + TEXTURES[name] = lambda: GT.band_tex(base, bands, seed, text=text) + TEXTURES[name + "_t"] = lambda: GT.band_tex(base, bands, seed, transpose=True, text=text) + + +STRETCH_FN = {} +for _i, _k in enumerate(("nato_green", "flecktarn", "ru_green", "ru_khaki", "nato_tan")): + STRETCH_FN[_k] = (lambda sx, sy, k=_k, i=_i: GT.camo(k, 100 + i, 64, sx, sy)) + TEXTURES[_k] = (lambda k=_k, i=_i: GT.camo(k, 100 + i, 64)) +STRETCH_FN["track_side"] = lambda sx, sy: GT.track_side(7, 32, sx, sy) +TEXTURES.update({ + "track_side": lambda: GT.track_side(7), + "track": lambda: GT.track_tex(8), + "tire": lambda: GT.tire_tex(9), + "hub": lambda: GT.hub_tex(10), + "glass_cab": lambda: GT.glass_tex(11), + "bare_lamp": lambda: GT.glass_tex(12, tint=(200, 205, 190), refl=False), + "bare_barrel": lambda: GT.metal_tex((44, 46, 44), 13), + "bare_nozzle": lambda: GT.metal_tex((66, 58, 52), 14), + "bare_dish": lambda: GT.metal_tex((178, 180, 176), 15), + "bare_antenna": lambda: GT.metal_tex((112, 114, 112), 16), + "glow_ember": lambda: GT.Canvas(16, 1, 1, (255, 170, 80), 17).out(), + "metal": lambda: GT.painted((118, 120, 122), 18), + "dark_metal": lambda: GT.painted((52, 54, 52), 19), + "canister": lambda: GT.painted((92, 102, 74), 20), + "shahed": lambda: GT.painted((92, 96, 98), 21, panel=(20, 10)), + "geran": lambda: GT.painted((28, 28, 31), 22, panel=(20, 10)), + "kh101": lambda: GT.painted((84, 88, 92), 23, panel=(18, 10)), + "lancet": lambda: GT.painted((74, 82, 70), 24), + "missile_grey": lambda: GT.painted((150, 154, 156), 25), + "radar_face": lambda: GT.lattice(26), + "radar_big": lambda: GT.lattice(27, 32, (86, 94, 70), (170, 176, 150)), +}) +_ring("rm_pac3", (228, 228, 222), [(0.12, 2, (30, 30, 30)), (0.78, 1.5, (200, 170, 40)), (0.9, 1, (30, 30, 30))], 30, [(8, 14, 10)]) +_ring("rm_white", (232, 232, 226), [(0.1, 2, (200, 40, 36)), (0.82, 1.5, (40, 40, 44))], 31, [(10, 12, 8)]) +_ring("rm_ru", (226, 228, 222), [(0.15, 2, (170, 40, 36)), (0.55, 1, (40, 40, 40)), (0.85, 2, (170, 40, 36))], 32, [(9, 20, 10)]) +_ring("rm_grey", (148, 152, 154), [(0.2, 1.5, (210, 210, 205)), (0.8, 1.5, (210, 210, 205))], 33, [(6, 14, 12)]) +_ring("rm_khaki", (110, 112, 84), [(0.25, 2, (60, 62, 48)), (0.7, 1.5, (200, 190, 150))], 34, [(8, 18, 8)]) +_ring("rm_dark", (58, 60, 62), [(0.3, 1.5, (150, 150, 146)), (0.85, 1.5, (150, 150, 146))], 35) + + # ---------------------------------------------------------------- модели def el(frm, to, tex, faces=None, rot=None): """Элемент; rot = (ось, угол) — поворот вокруг центра элемента.""" @@ -257,28 +307,70 @@ def face_uv(frm, to, face): return [0, 0, max(0.25, min(16, w)), max(0.25, min(16, h))] -def model(parts): +VARIANTS = {} +TEXMAP = {"barrel": "bare_barrel", "nozzle": "bare_nozzle", "dish": "bare_dish", "antenna": "bare_antenna", + "glass": "glass_cab", "intake": "bare_nozzle"} +STRETCH = {"nato_green", "flecktarn", "ru_green", "ru_khaki", "nato_tan", "track_side"} + + +def _q(v): + return 1 if v < 1.5 else 2 if v < 2.5 else 3 + + +def vname(tex, qx, qy, burnt): + tex = TEXMAP.get(tex, tex) + if burnt and tex.startswith("glow_"): + tex = "bare_nozzle" + n = tex + if tex in STRETCH and (qx > 1 or qy > 1): + n += f"_s{qx}{qy}" + if burnt: + n += "_b" + if n != tex: + VARIANTS[n] = (tex, qx, qy, burnt) + return n + + +def model(parts, burnt=False): for p in parts: for i in range(3): assert -16 <= p["from"][i] <= 32 and -16 <= p["to"][i] <= 32, p textures, elements = {}, [] for p in parts: - textures[p["tex"]] = f"{NS}:block/{p['tex']}" faces = {} for f in ("north", "south", "east", "west", "up", "down"): tex = (p["faces"] or {}).get(f, p["tex"]) + uv = face_uv(p["from"], p["to"], f) + dx, dy, dz = (abs(p["to"][i] - p["from"][i]) for i in range(3)) + w, h = {"north": (dx, dy), "south": (dx, dy), "east": (dz, dy), "west": (dz, dy), + "up": (dx, dz), "down": (dx, dz)}[f] + tex = vname(tex, _q(w / 16), _q(h / 16), burnt) textures[tex] = f"{NS}:block/{tex}" - faces[f] = {"uv": face_uv(p["from"], p["to"], f), "texture": "#" + tex} + faces[f] = {"uv": uv, "texture": "#" + tex} e = {"from": p["from"], "to": p["to"], "faces": faces} if p.get("rot"): axis, angle = p["rot"] origin = [(p["from"][i] + p["to"][i]) / 2 for i in range(3)] e["rotation"] = {"angle": angle, "axis": axis, "origin": origin} elements.append(e) - textures["particle"] = f"{NS}:block/{parts[0]['tex']}" + textures["particle"] = next(iter(textures.values())) return {"ambientocclusion": False, "textures": textures, "elements": elements} +def burnt_parts(parts, seed): + """Остов: часть мелких деталей оторвана, антенны сорваны; текстуры — обгоревшие варианты (см. model(burnt=True)).""" + rnd = random.Random(seed) + out = [] + for i, p in enumerate(parts): + vol = 1.0 + for k in range(3): + vol *= abs(p["to"][k] - p["from"][k]) + if i > 2 and ((vol < 40 and rnd.random() < 0.3) or p["tex"] in ("antenna", "dish")): + continue + out.append(p) + return out + + def taper(tex, z0, z1, w0, w1, h0, h1, steps, y=8.0): """Корпус-веретено лесенкой: ширина w0→w1 и высота h0→h1 вдоль z0→z1.""" out = [] @@ -391,7 +483,7 @@ def patriot_truck(): el((-2, 24, -12), (18, 25, -4), "dark_metal"), el((2, 9, 20), (14, 13, 30), "metal")] for z in (-12, 14, 23): - p += both(el((-9, 0, z), (-5.5, 9, z + 8), "tire")) + p += wheel(-9, -5.5, z + 4) return p @@ -400,7 +492,7 @@ def patriot_trailer(): el((-1, 11, 14), (17, 16, 30), "metal"), el((-8, 3, -16), (24, 7, -12), "dark_metal")] for z in (14, 23): - p += both(el((-10, 0, z), (-6.5, 9, z + 8), "tire")) + p += wheel(-10, -6.5, z + 4) p += both(el((-9, 0, -6), (-7, 6, -4), "metal")) # опоры return p @@ -412,7 +504,7 @@ def patriot_radar(): el((-5, 12, -7), (21, 30, -6), "radar_face"), el((-2, 10, 10), (18, 18, 24), "metal")] for z in (14,): - p += both(el((-9, 0, z), (-5.5, 9, z + 8), "tire")) + p += wheel(-9, -5.5, z + 4) return p @@ -769,6 +861,144 @@ def flare(): return [el((6.5, 6.5, 6.5), (9.5, 9.5, 9.5), "lamp"), el((7.6, 9.5, 7.6), (8.4, 16, 8.4), "antenna")] +# ---------------------------------------------------------------- обновлённая геометрия +def B(x0, y0, z0, x1, y1, z1, tex, faces=None, rot=None): + """Элемент с x относительно центра модели.""" + return el((8 + x0, y0, z0), (8 + x1, y1, z1), tex, faces, rot) + + +def wheel(x0, x1, zc, r=4.6, tex="tire", hub="hub"): + """Колесо-восьмиугольник (квадрат + квадрат под 45 градусов) с диском на боковой грани, обе стороны. + x0..x1 — абсолютные координаты левого колеса; ось колеса лежит на y = r.""" + s = r * 1.8478 + faces = {"east": hub, "west": hub} + a = el((x0, r - s / 2, zc - s / 2), (x1, r + s / 2, zc + s / 2), tex, faces) + b = el((x0 + 0.03, r - s / 2, zc - s / 2), (x1 - 0.03, r + s / 2, zc + s / 2), tex, faces, rot=("x", 45)) + return both(a) + both(b) + + +def wheels(zs, x0=-9, x1=-5.5, tex="tire"): + out = [] + for z in zs: + out += wheel(x0, x1, z + 3.5, 4.5, tex) + return out + + +def tracked(tex): + """Гусеничное шасси (Бук, Тор): корпус, скошенный лоб, гусеницы с катками, решётки МТО, люки.""" + p = [el((-10, 4, -14), (26, 15, 32), tex), + el((-10, 4, -16), (26, 10, -14), tex), + el((-9, 10, -15), (25, 14, -12), tex, rot=("x", -22.5)), # лобовой лист + el((-8, 15, 22), (24, 16, 32), "dark_metal"), + el((-5, 15.2, 24), (21, 15.8, 31), "bare_nozzle"), # решётка МТО + el((-1, 15, -10), (9, 16, -4), "dark_metal")] + p += both(el((-14, 0, -15), (-10, 9, 31), "track", {"west": "track_side", "east": "track_side"})) + p += both(el((-14.5, 5, -15), (-10, 10, 31), tex)) + p += both(el((-4, 11, -16), (-1, 13, -15), "bare_lamp")) + return p + + +def oct_z(z0, z1, r, tex, x=0.0, y=8.0): + """Восьмигранная «труба» вдоль z (квадрат + квадрат под 45 градусов): корпус ракеты.""" + s = r * 1.8478 + f = {"up": tex + "_t", "down": tex + "_t"} if tex in RINGED else None + return [B(x - s / 2, y - s / 2, z0, x + s / 2, y + s / 2, z1, tex, f), + B(x - s / 2, y - s / 2, z0 + 0.03, x + s / 2, y + s / 2, z1 - 0.03, tex, f, rot=("z", 45))] + + +def ogive(z_tip, z_base, rb, tex, steps=4): + out = [] + for i in range(steps): + a = z_tip + (z_base - z_tip) * i / steps + b = z_tip + (z_base - z_tip) * (i + 1) / steps + t = (i + 0.7) / steps + out += oct_z(a, b, max(0.45, rb * min(1.0, t ** 0.55)), tex) + return out + + +def fins4(z0, z1, r, span, tex, sweep=3.0, th=0.7, y=8.0): + """Четыре стреловидных оперения крестом: корневая и концевая части.""" + m, k = r * 0.9, span * 0.55 + p = both(B(m, y - th / 2, z0, m + k, y + th / 2, z1, tex)) + p += both(B(m + k, y - th / 2, z0 + sweep, m + span, y + th / 2, z1, tex)) + for sg in (1, -1): + lo, hi = (y + m, y + m + k) if sg > 0 else (y - m - k, y - m) + p.append(B(-th / 2, lo, z0, th / 2, hi, z1, tex)) + lo, hi = (y + m + k, y + m + span) if sg > 0 else (y - m - span, y - m - k) + p.append(B(-th / 2, lo, z0 + sweep, th / 2, hi, z1, tex)) + return p + + +def nozzle(z, r, y=8.0): + """Сопло с раскалённым срезом (glow_ember — светящийся материал).""" + return [B(-r * .8, y - r * .8, z, r * .8, y + r * .8, z + 1.6, "nozzle"), + B(-r * .55, y - r * .55, z + 1.6, r * .55, y + r * .55, z + 1.9, "glow_ember")] + + +def pac3(): + p = ogive(-16, -9, 1.7, "nose_dark", 3) + oct_z(-9, 24, 1.7, "rm_pac3") + p += oct_z(-8, -7, 2.2, "dark_metal") # кольцо двигателей ориентации + p += fins4(18, 24, 1.7, 5, "missile", 3.5) + nozzle(24, 1.7) + return p + + +def irist_missile(): + p = ogive(-16, -9, 1.7, "white", 3) + oct_z(-9, 22, 1.7, "rm_white") + p += fins4(-8, -5.5, 1.7, 3.6, "missile_grey", 1.0) + fins4(16, 22, 1.7, 5, "white", 3.5) + nozzle(22, 1.7) + return p + + +def amraam_missile(): + p = ogive(-16, -9, 1.7, "nose_dark", 3) + oct_z(-9, 24, 1.7, "rm_white") + p += fins4(2, 8, 1.7, 5.5, "white", 3.5) + fins4(19, 24, 1.7, 3.8, "white", 2.5) + nozzle(24, 1.7) + return p + + +def missile_57e6(): + p = ogive(-16, -9, 1.2, "missile_ru", 3) + oct_z(-9, 4, 1.2, "missile_ru") + oct_z(4, 25, 1.7, "rm_ru") + p += fins4(18, 25, 1.7, 5, "booster", 3.0) + nozzle(25, 1.7) + return p + + +def missile_48n6(): + p = ogive(-16, -9, 1.9, "missile_ru", 3) + oct_z(-9, 26, 1.9, "rm_ru") + p += fins4(18, 26, 1.9, 6.2, "missile_ru", 4.0) + fins4(-6, -3, 1.9, 2.5, "missile_ru", 1.0) + nozzle(26, 1.9) + return p + + +def missile_77n6(): + p = ogive(-16, -8, 2.2, "missile_grey", 4) + oct_z(-8, 28, 2.2, "rm_grey") + p += oct_z(4, 6, 2.4, "booster") + fins4(22, 28, 2.2, 5.2, "missile_grey", 3.0) + nozzle(28, 2.2) + return p + + +def kalibr(): + p = ogive(-16, -9, 2.2, "missile_grey", 4) + oct_z(-9, 28, 2.2, "rm_grey") + p += [B(-14, 7.6, 6, 14, 8.4, 11, "missile_grey"), B(-0.8, 3.2, 17, 0.8, 5.4, 26, "dark_metal")] + p += fins4(23, 28, 2.2, 4.5, "missile_grey", 2.5) + nozzle(28, 2.0) + return p + + +def iskander(): + p = ogive(-16, -5, 3.6, "rm_khaki", 6) + oct_z(-5, 28, 3.6, "rm_khaki") + p += oct_z(3, 4, 3.8, "dark_metal") + fins4(23, 28, 3.6, 6.5, "ru_khaki", 2.0, 0.9) + nozzle(28, 3.4) + return p + + +def kinzhal(): + p = ogive(-16, -6, 3.4, "rm_dark", 5) + oct_z(-6, 28, 3.4, "rm_dark") + p += fins4(20, 28, 3.4, 8.0, "dark_metal", 4.0, 0.9) + nozzle(28, 3.0) + return p + + +def zircon(): + p = ogive(-16, -6, 2.6, "rm_dark", 4) + oct_z(-6, 28, 2.6, "rm_dark") + p += [B(-1.8, 3.4, 0, 1.8, 5.2, 24, "intake")] + p += fins4(22, 28, 2.6, 5.5, "dark_metal", 3.0) + nozzle(28, 2.4) + return p + + + MODELS = { "shahed": (shahed, "Шахед-136"), "shahed_prop": (shahed_prop, "Винт"), @@ -836,6 +1066,12 @@ MODELS = { el((7.5, 7.5, 12), (8.5, 8.5, 32), "flame")], "Боевой блок"), } +WRECKS = ["patriot_trailer", "patriot_launcher", "gepard_hull", "gepard_turret", "gepard_guns", "pantsir_truck", + "pantsir_turret", "pantsir_pack", "s400_chassis", "s400_tubes", "s500_chassis", "s500_tubes", + "irist_chassis", "irist_tubes", "nasams_trailer", "nasams_launcher", "buk_chassis", "buk_turret", + "buk_rails", "tor_chassis", "tor_turret", "p1sun_launcher", "radar_truck", "depot", "tzm_truck", + "ew_truck", "searchlight", "searchlight_head"] + CAM_MODELS = ["shahed", "geran3", "lancet", "gerbera", "kh101", "kalibr", "kh22", "zircon", "iskander", "kinzhal", "reentry"] # Предметы: (id, название, цвет иконки) @@ -903,15 +1139,23 @@ def main(): d = os.path.join(ROOT, "data", NS, "horizon") os.makedirs(os.path.join(a, "textures", "block")) os.makedirs(os.path.join(a, "textures", "item")) - for name, fn in TEXTURES.items(): - fn().save(os.path.join(a, "textures", "block", name + ".png")) lang = {} + for wid in WRECKS: + fn, title = MODELS[wid] + MODELS[wid + "_burnt"] = ((lambda fn=fn, wid=wid: burnt_parts(fn(), zlib.crc32(wid.encode()))), title + " (остов)") for name, (fn, title) in MODELS.items(): - write_json(os.path.join(a, "models", "block", name + ".json"), model(fn())) + write_json(os.path.join(a, "models", "block", name + ".json"), model(fn(), name.endswith("_burnt"))) write_json(os.path.join(a, "blockstates", name + ".json"), {"variants": {"": {"model": f"{NS}:block/{name}"}}}) write_json(os.path.join(d, "block", name + ".json"), {"template": "minecraft:stone", "item": False}) lang[f"block.{NS}.{name}"] = title + for name, fn in TEXTURES.items(): + fn().save(os.path.join(a, "textures", "block", name + ".png")) + for name, (base, qx, qy, burnt) in VARIANTS.items(): + im = STRETCH_FN[base](qx, qy) if (base in STRETCH_FN and (qx > 1 or qy > 1)) else TEXTURES[base]() + if burnt: + im = GT.burn(im, zlib.crc32(name.encode()), "glass" if base.startswith("glass") else "paint") + im.save(os.path.join(a, "textures", "block", name + ".png")) for i, (name, title, color) in enumerate(ITEMS): item_icon(color, i).save(os.path.join(a, "textures", "item", name + ".png")) write_json(os.path.join(a, "models", "item", name + ".json"), diff --git a/tools/gen_tex.py b/tools/gen_tex.py new file mode 100644 index 0000000..7dd2f16 --- /dev/null +++ b/tools/gen_tex.py @@ -0,0 +1,331 @@ +"""Общая палитра и генератор текстур мода AirDef (используется tools/gen_models.py). + +Все текстуры детерминированы (seed). Имя текстуры задаёт материал в HD (см. docs/HD-RENDERER.md, «Материалы»): + bare_* — голый металл / стекло (оверлей 42: гладко, полностью металлично): стволы, сопла, антенны, стёкла `bare_glass*`; + glow_* — светящиеся детали (оверлей 40): жар сопла, лампы; + прочее — крашеный металл (оверлей 41). +Имя `T__b` — обгоревший вариант текстуры T (остовы), `T@x3y1` — вариант для грани, растянутой в 3 раза по u +(в моделях грань длиннее 16 единиц тянет всю текстуру), картина заранее сжата, чтобы пятна камуфляжа не вытягивались. +""" +import random + +from PIL import Image + +# ------------------------------------------------------------------ палитра +PAL = { + "nato_green": [(70, 80, 54), (86, 74, 50), (34, 38, 30)], # NATO: зелёный, коричневый, чёрный + "flecktarn": [(88, 98, 62), (60, 74, 44), (112, 88, 56), (30, 32, 26)], + "ru_green": [(78, 94, 58), (52, 68, 40), (112, 94, 62), (32, 34, 26)], + "ru_khaki": [(112, 112, 82), (88, 92, 62), (64, 66, 46)], + "nato_tan": [(152, 132, 98), (126, 108, 78), (98, 86, 64)], + "olive": (74, 82, 58), + "rubber": (24, 24, 25), + "steel": (120, 122, 126), + "dark": (50, 52, 52), + "white": (236, 236, 230), + "grey": (150, 154, 158), + "red": (180, 40, 36), +} + + +def clamp(v): + return max(0, min(255, int(v))) + + +def col(c, d=0): + return tuple(clamp(v + d) for v in c[:3]) + + +def mix(a, b, t): + return tuple(clamp(a[i] + (b[i] - a[i]) * t) for i in range(3)) + + +class Canvas: + """Полотно в «физических» пикселях: S*sx × S*sy, на выходе — S×S со сжатием (антиалиасинг по BOX).""" + + def __init__(self, S, sx=1, sy=1, base=(0, 0, 0), seed=0): + self.S, self.sx, self.sy = S, sx, sy + self.W, self.H = S * sx, S * sy + self.im = Image.new("RGBA", (self.W, self.H), tuple(base) + (255,)) + self.px = self.im.load() + self.rnd = random.Random(seed) + + def put(self, x, y, c, a=1.0): + if 0 <= x < self.W and 0 <= y < self.H: + if a >= 1: + self.px[x, y] = tuple(c[:3]) + (255,) + else: + o = self.px[x, y] + self.px[x, y] = tuple(clamp(o[i] + (c[i] - o[i]) * a) for i in range(3)) + (255,) + + def noise(self, amp): + r = self.rnd + for y in range(self.H): + for x in range(self.W): + o = self.px[x, y] + d = r.randint(-amp, amp) + self.px[x, y] = (clamp(o[0] + d), clamp(o[1] + d), clamp(o[2] + d), 255) + + def rect(self, x0, y0, x1, y1, c, a=1.0): + for y in range(int(y0), int(y1)): + for x in range(int(x0), int(x1)): + self.put(x, y, c, a) + + def disc(self, cx, cy, r, c, a=1.0): + for y in range(int(cy - r - 1), int(cy + r + 2)): + for x in range(int(cx - r - 1), int(cx + r + 2)): + if (x + 0.5 - cx) ** 2 + (y + 0.5 - cy) ** 2 <= r * r: + self.put(x, y, c, a) + + def ellipse(self, cx, cy, rx, ry, c, wob=0.0): + r = self.rnd + for y in range(int(cy - ry - 2), int(cy + ry + 3)): + for x in range(int(cx - rx - 2), int(cx + rx + 3)): + if ((x - cx) / rx) ** 2 + ((y - cy) / ry) ** 2 <= 1 + r.random() * wob: + self.put(x, y, tuple(clamp(v + r.randint(-4, 4)) for v in c)) + + def panels(self, px_w, px_h, c_line, c_lite, rivets=True): + """Швы листов: сетка с неровными листами, блик под швом и заклёпки по краям.""" + r = self.rnd + y = r.randrange(px_h) + while y < self.H: + x = r.randrange(px_w) + for yy in range(int(y), int(y) + 1): + for xx in range(self.W): + self.put(xx, yy, c_line, 0.55) + self.put(xx, yy + 1, c_lite, 0.3) + y += px_h * (0.8 + r.random() * 0.5) + x = r.randrange(px_w) + while x < self.W: + for yy in range(self.H): + self.put(int(x), yy, c_line, 0.45) + self.put(int(x) + 1, yy, c_lite, 0.25) + x += px_w * (0.8 + r.random() * 0.5) + if rivets: + for _ in range(self.W * self.H // 160): + self.put(r.randrange(self.W), r.randrange(self.H), c_lite, 0.7) + + def dirt(self, amount, c=(30, 24, 18)): + """Подтёки сверху вниз и грязь снизу.""" + r = self.rnd + for _ in range(int(self.W * amount)): + x = r.randrange(self.W) + y0 = r.randrange(self.H) + for k in range(r.randint(3, max(4, self.H // 3))): + self.put(x, y0 + k, c, 0.16 * (1 - k / (self.H // 3 + 4))) + for y in range(self.H): + t = y / self.H + if t > 0.7: + for x in range(self.W): + self.put(x, y, c, (t - 0.7) * 0.5) + + def wear(self, amount, c): + r = self.rnd + for _ in range(int(self.W * self.H * amount)): + self.put(r.randrange(self.W), r.randrange(self.H), c, 0.6) + + def out(self): + im = self.im + if self.sx > 1 or self.sy > 1: + im = im.resize((self.S, self.S), Image.BOX) + return im + + +# ------------------------------------------------------------------ узоры +def painted(base, seed, S=32, sx=1, sy=1, panel=(14, 10), amp=3, dirt=0.1, wear=0.012, rivets=True): + """Крашеный лист: шум, швы, заклёпки, подтёки, сколы.""" + c = Canvas(S, sx, sy, base, seed) + c.noise(amp) + c.panels(panel[0] * 1, panel[1] * 1, col(base, -22), col(base, 16), rivets) + c.dirt(dirt) + c.wear(wear, col(base, 40)) + return c.out() + + +def camo(kind, seed, S=64, sx=1, sy=1): + cols = PAL[kind] + c = Canvas(S, sx, sy, cols[0], seed) + c.noise(3) + r = c.rnd + area = (c.W * c.H) / 1024.0 + if kind == "flecktarn": + for k in range(1, len(cols)): + for _ in range(int(area * 20)): + x, y = r.randrange(c.W), r.randrange(c.H) + c.ellipse(x, y, r.uniform(1.5, 4.5), r.uniform(1.2, 3.2), cols[k], 0.5) + else: + for k in range(1, len(cols)): + for _ in range(int(area * (5 if k == 1 else 3))): + x, y = r.randrange(c.W), r.randrange(c.H) + c.ellipse(x, y, r.uniform(4, 11), r.uniform(2.5, 6), cols[k], 0.35) + c.panels(22, 16, col(cols[0], -34), col(cols[0], 12), True) + c.dirt(0.12) + c.wear(0.006, col(cols[0], 46)) + return c.out() + + +def tire_tex(seed, S=32, sx=1, sy=1): + c = Canvas(S, sx, sy, PAL["rubber"], seed) + c.noise(3) + for x in range(0, c.W, 3): # протектор: ёлочка + for y in range(c.H): + if (y // 3) % 2 == 0: + c.put(x, y, (46, 46, 46), 0.9) + else: + c.put(x + 1, y, (46, 46, 46), 0.7) + for y in range(c.H): + c.put(0, y, (60, 60, 58), 0.8) + c.dirt(0.1, (60, 48, 36)) + return c.out() + + +def hub_tex(seed, S=32): + c = Canvas(S, 1, 1, (70, 72, 70), seed) + c.noise(3) + c.disc(S / 2, S / 2, S * 0.46, (34, 34, 34)) # боковина шины + c.disc(S / 2, S / 2, S * 0.30, (118, 120, 122)) # диск + c.disc(S / 2, S / 2, S * 0.2, (84, 86, 88)) + for k in range(8): + import math + a = k * math.pi / 4 + c.disc(S / 2 + math.cos(a) * S * 0.25, S / 2 + math.sin(a) * S * 0.25, 1, (36, 36, 38)) + c.disc(S / 2, S / 2, 2.4, (50, 52, 54)) + return c.out() + + +def track_tex(seed, S=32, sx=1, sy=1): + """Верх/низ гусеницы: траки поперёк.""" + c = Canvas(S, sx, sy, (36, 36, 34), seed) + c.noise(3) + for y in range(0, c.H, 3): + for x in range(c.W): + c.put(x, y, (78, 76, 70), 0.9) + c.put(x, y + 1, (20, 20, 20), 0.5) + c.dirt(0.1, (70, 58, 44)) + return c.out() + + +def track_side(seed, S=32, sx=1, sy=1): + """Борт гусеничного блока: ленивец, 7 опорных катков, ведущее колесо и траки сверху и снизу.""" + c = Canvas(S, sx, sy, (34, 34, 32), seed) + c.noise(3) + cy = 9 + for i in range(8): + x = 10 + i * (c.W - 20) / 7 + c.disc(x, cy, 6.2, (22, 22, 22)) + c.disc(x, cy, 4.6, (68, 70, 66)) + c.disc(x, cy, 1.8, (36, 38, 36)) + for x in range(0, c.W, 2): + c.put(x, 0, (86, 84, 76)) + c.put(x, 1, (26, 26, 24)) + c.put(x, 17, (86, 84, 76)) + c.dirt(0.15, (74, 60, 46)) + return c.out() + + +def glass_tex(seed, S=32, tint=(36, 56, 74), refl=True): + c = Canvas(S, 1, 1, tint, seed) + c.noise(3) + for y in range(S): # небо отражается сверху вниз + for x in range(S): + t = 1 - y / S + c.put(x, y, (150, 180, 200), 0.28 * t * t) + if refl: + for i in range(S): + c.put(i, S - 1 - i, (190, 210, 224), 0.5) + c.put(min(S - 1, i + 3), S - 1 - i, (170, 196, 212), 0.3) + for i in range(S): # рама + for k in (0, S - 1): + c.put(i, k, (20, 22, 22)) + c.put(k, i, (20, 22, 22)) + return c.out() + + +def metal_tex(base, seed, S=32, brush=True, sx=1, sy=1): + """Голый металл: шлифовка полосами, лёгкие царапины.""" + c = Canvas(S, sx, sy, base, seed) + r = c.rnd + for y in range(c.H): + d = r.randint(-5, 5) + for x in range(c.W): + c.put(x, y, col(base, d + r.randint(-2, 2))) + for _ in range(c.W // 3): + y = r.randrange(c.H) + x0 = r.randrange(c.W) + for k in range(r.randint(3, 9)): + c.put(x0 + k, y, col(base, 32), 0.6) + return c.out() + + +def band_tex(base, bands, seed, S=32, transpose=False, text=None): + """Ракета: полосы по длине (bands: (центр 0..1, ширина px, цвет)), трафарет. Для верха/низа — транспонировано.""" + c = Canvas(S, 1, 1, base, seed) + c.noise(2) + for f, w, cc in bands: + x0 = int(f * S - w / 2) + for x in range(x0, x0 + int(w)): + for y in range(S): + c.put(x, y, cc) + c.panels(12, 99, col(base, -26), col(base, 12), True) + if text: + for (x0, y0, w) in text: # «надпись» — тёмные штрихи + for k in range(0, w, 2): + c.rect(x0 + k, y0, x0 + k + 1, y0 + 3, col(base, -90)) + c.wear(0.01, col(base, 30)) + im = c.out() + return im.transpose(Image.TRANSPOSE) if transpose else im + + +def lattice(seed, S=32, base=(70, 76, 56), dot=(150, 154, 130)): + """Антенное полотно / ФАР: решётка элементов.""" + c = Canvas(S, 1, 1, base, seed) + c.noise(2) + for y in range(1, S - 1, 2): + for x in range(1, S - 1, 2): + c.put(x, y, dot, 0.9) + c.put(x + 1, y, col(base, -26), 0.8) + for k in range(0, S, 8): + for i in range(S): + c.put(k, i, col(base, -30)) + c.put(i, k, col(base, -30)) + return c.out() + + +def ember(seed, S=32): + return Canvas(S, 1, 1, (40, 30, 24), seed).out() + + +def burn(im, seed, kind="paint"): + """Обгоревший вариант: уголь, копоть сверху, ржавые пятна, прогары.""" + S = im.size[0] + r = random.Random(seed) + out = Image.new("RGBA", im.size) + src, dst = im.load(), out.load() + for y in range(S): + for x in range(S): + p = src[x, y] + g = (p[0] * 0.3 + p[1] * 0.5 + p[2] * 0.2) + k = 0.45 if kind != "glass" else 0.15 + c = mix(p, (g * 0.55, g * 0.5, g * 0.46), 0.75) + c = tuple(clamp(c[i] * (0.3 + 0.35 * k) + 6) for i in range(3)) + # копоть: темнее сверху + c = tuple(clamp(v * (0.75 + 0.25 * y / S)) for v in c) + dst[x, y] = c + (255,) + for _ in range(S * S // 28): # ржавые и обожжённые пятна + x, y = r.randrange(S), r.randrange(S) + rad = r.uniform(1, 3) + tone = r.choice([(96, 52, 28), (70, 40, 26), (22, 20, 20), (110, 80, 52)]) + for yy in range(int(y - rad), int(y + rad + 1)): + for xx in range(int(x - rad), int(x + rad + 1)): + if (xx - x) ** 2 + (yy - y) ** 2 <= rad * rad and 0 <= xx < S and 0 <= yy < S: + o = dst[xx, yy] + dst[xx, yy] = tuple(clamp(o[i] + (tone[i] - o[i]) * 0.6) for i in range(3)) + (255,) + if kind == "glass": # трещины + for _ in range(4): + x, y = r.randrange(S), r.randrange(S) + for k in range(r.randint(6, 14)): + x += r.choice([-1, 0, 1]) + y += r.choice([0, 1]) + if 0 <= x < S and 0 <= y < S: + dst[x, y] = (150, 160, 166, 255) + return out