diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 5a2b115e5..c7d676709 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -1671,38 +1671,53 @@ item.mp_warhead_10_incendiary.name=Größe 10 Brandsprengkopf item.mp_warhead_10_buster.name=Größe 10 Bunkerbrechender Sprengkopf item.mp_warhead_10_nuclear.name=Größe 10 Mikro-Atomsprengkopf "Kleine Krokette" item.mp_warhead_10_nuclear_large.name=Größe 10 Atomsprengkopf "Chernobyl Boris" +item.mp_warhead_10_taint.name=Größe 10 Verseuchter Gefechtskopf item.mp_warhead_15_he.name=Größe 15 HE-Sprengkopf item.mp_warhead_15_incendiary.name=Größe 15 Brandsprengkopf item.mp_warhead_15_nuclear.name=Größe 15 Atomsprengkopf "Tantchen Bertha" item.mp_warhead_15_nuclear_shark.name=Größe 15 Atomsprengkopf "Billigsdorfer Kugelwilli" item.mp_warhead_15_boxcar.name=Größe 15 Güterwagon? item.mp_warhead_15_n2.name=Größe 15 N²-Mine +item.mp_warhead_15_balefire.name=Größe 15 BF-Sprengkopf item.mp_fuselage_10_kerosene.name=Größe 10 Kerosintank -item.mp_fuselage_10_kerosene_camo.name=Größe 10 Kerosintank (Camouflage) -item.mp_fuselage_10_kerosene_desert.name=Größe 10 Kerosintank (Wüstencamouflage) -item.mp_fuselage_10_kerosene_insulation.name=Größe 10 Kerosintank (Oranger Isolator) -item.mp_fuselage_10_kerosene_flames.name=Größe 10 Kerosintank (Krasse Flammen) -item.mp_fuselage_10_kerosene_sleek.name=Größe 10 Kerosintank (IF-R&D) -item.mp_fuselage_10_kerosene_metal.name=Größe 10 Kerosintank (Metall) +item.mp_fuselage_10_kerosene_camo.name=Größe 10 Kerosintank +item.mp_fuselage_10_kerosene_desert.name=Größe 10 Kerosintank +item.mp_fuselage_10_kerosene_sky.name=Größe 10 Kerosintank +item.mp_fuselage_10_kerosene_insulation.name=Größe 10 Kerosintank +item.mp_fuselage_10_kerosene_flames.name=Größe 10 Kerosintank +item.mp_fuselage_10_kerosene_sleek.name=Größe 10 Kerosintank +item.mp_fuselage_10_kerosene_metal.name=Größe 10 Kerosintank +item.mp_fuselage_10_kerosene_taint.name=Größe 10 Kerosintank item.mp_fuselage_10_solid.name=Größe 10 Festbrennstofftank -item.mp_fuselage_10_solid_flames.name=Größe 10 Festbrennstofftank (Krasse Flammen) -item.mp_fuselage_10_solid_insulator.name=Größe 10 Festbrennstofftank (Oranger Isolator) -item.mp_fuselage_10_solid_sleek.name=Größe 10 Festbrennstofftank (IF-R&D) -item.mp_fuselage_10_solid_soviet_glory.name=Größe 10 Festbrennstofftank (Sowjetischer Ruhm) +item.mp_fuselage_10_solid_flames.name=Größe 10 Festbrennstofftank +item.mp_fuselage_10_solid_insulator.name=Größe 10 Festbrennstofftank +item.mp_fuselage_10_solid_sleek.name=Größe 10 Festbrennstofftank +item.mp_fuselage_10_solid_soviet_glory.name=Größe 10 Festbrennstofftank +item.mp_fuselage_10_solid_cathedral.name=Größe 10 Festbrennstofftank +item.mp_fuselage_10_solid_moonlit.name=Größe 10 Festbrennstofftank +item.mp_fuselage_10_solid_battery.name=Größe 10 Festbrennstofftank +item.mp_fuselage_10_solid_duracell.name=Größe 10 Festbrennstofftank item.mp_fuselage_10_xenon.name=Größe 10 Xenontank +item.mp_fuselage_10_xenon_bhole.name=Größe 10 Xenontank item.mp_fuselage_10_long_kerosene.name=Größe 10 Langer Kerosintank -item.mp_fuselage_10_long_kerosene_camo.name=Größe 10 Langer Kerosintank (Camouflage) -item.mp_fuselage_10_long_kerosene_desert.name=Größe 10 Langer Kerosintank (Wüstencamouflage) -item.mp_fuselage_10_long_kerosene_flames.name=Größe 10 Langer Kerosintank (Krasse Flammen) -item.mp_fuselage_10_long_kerosene_insulation.name=Größe 10 Langer Kerosintank (Oranger Isolator) -item.mp_fuselage_10_long_kerosene_sleek.name=Größe 10 Langer Kerosintank (IF-R&D) -item.mp_fuselage_10_long_kerosene_metal.name=Größe 10 Langer Kerosintank (Metall) +item.mp_fuselage_10_long_kerosene_camo.name=Größe 10 Langer Kerosintank +item.mp_fuselage_10_long_kerosene_desert.name=Größe 10 Langer Kerosintank +item.mp_fuselage_10_long_kerosene_sky.name=Größe 10 Langer Kerosintank +item.mp_fuselage_10_long_kerosene_flames.name=Größe 10 Langer Kerosintank +item.mp_fuselage_10_long_kerosene_insulation.name=Größe 10 Langer Kerosintank +item.mp_fuselage_10_long_kerosene_sleek.name=Größe 10 Langer Kerosintank +item.mp_fuselage_10_long_kerosene_metal.name=Größe 10 Langer Kerosintank +item.mp_fuselage_10_long_kerosene_taint.name=Größe 10 Langer Kerosintank +item.mp_fuselage_10_long_kerosene_vap.name=Größe 10 Langer Kerosintank +item.mp_fuselage_10_long_kerosene_dash.name=Größe 10 Langer Kerosintank item.mp_fuselage_10_long_solid.name=Größe 10 Langer Festbrennstofftank -item.mp_fuselage_10_long_solid_flames.name=Größe 10 Langer Festbrennstofftank (Krasse Flammen) -item.mp_fuselage_10_long_solid_insulation.name=Größe 10 Langer Festbrennstofftank (Oranger Isolator) -item.mp_fuselage_10_long_solid_sleek.name=Größe 10 Langer Festbrennstofftank (IF-R&D) -item.mp_fuselage_10_long_solid_soviet_glory.name=Größe 10 Langer Festbrennstofftank (Sowjetischer Ruhm) +item.mp_fuselage_10_long_solid_flames.name=Größe 10 Langer Festbrennstofftank +item.mp_fuselage_10_long_solid_insulation.name=Größe 10 Langer Festbrennstofftank +item.mp_fuselage_10_long_solid_sleek.name=Größe 10 Langer Festbrennstofftank +item.mp_fuselage_10_long_solid_soviet_glory.name=Größe 10 Langer Festbrennstofftank +item.mp_fuselage_10_long_solid_silvermoonlight.name=Größe 10 Langer Festbrennstofftank +item.mp_fuselage_10_long_solid_bullet.name=Größe 10 Langer Festbrennstofftank item.mp_fuselage_10_15_kerosene.name=Größe 10/15 Kerosintank item.mp_fuselage_10_15_solid.name=Größe 10/15 Festbrennstofftank @@ -1710,20 +1725,32 @@ item.mp_fuselage_10_15_hydrogen.name=Größe 10/15 Wasserstofftank item.mp_fuselage_10_15_balefire.name=Größe 10/15 BF-Kraftstofftank item.mp_fuselage_15_kerosene.name=Größe 15 Kerosintank -item.mp_fuselage_15_kerosene_camo.name=Größe 15 Kerosintank (Camouflage) -item.mp_fuselage_15_kerosene_desert.name=Größe 15 Kerosintank (Wüstencamouflage) -item.mp_fuselage_15_kerosene_insulation.name=Größe 15 Kerosintank (Oranger Isolator) -item.mp_fuselage_15_kerosene_metal.name=Größe 15 Kerosintank (Metall) -item.mp_fuselage_15_kerosene_decorated.name=Größe 15 Kerosintank (Dekoriertes Metall) -item.mp_fuselage_15_kerosene_steampunk.name=Größe 15 Kerosintank (Steampunk) -item.mp_fuselage_15_kerosene_polite.name=Größe 15 Kerosintank (Höflich) -item.mp_fuselage_15_kerosene_blackjack.name=Größe 15 Kerosintank (Queen Whiskey) +item.mp_fuselage_15_kerosene_camo.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_desert.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_sky.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_insulation.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_metal.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_decorated.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_steampunk.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_polite.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_blackjack.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_lambda.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_minuteman.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_taint.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_pip.name=Größe 15 Kerosintank +item.mp_fuselage_15_kerosene_yuck.name=Größe 15 Kerosintank item.mp_fuselage_15_solid.name=Größe 15 Festbrennstofftank -item.mp_fuselage_15_solid_insulation.name=Größe 15 Festbrennstofftank (Oranger Isolator) -item.mp_fuselage_15_solid_soviet_glory.name=Größe 15 Festbrennstofftank (Sowjetischer Ruhm) -item.mp_fuselage_15_solid_soviet_stank.name=Größe 15 Festbrennstofftank (Sowjetischer Mief) -item.mp_fuselage_15_solid_desh.name=Größe 15 Festbrennstofftank (Deshverkleidung) +item.mp_fuselage_15_solid_insulation.name=Größe 15 Festbrennstofftank +item.mp_fuselage_15_solid_soviet_glory.name=Größe 15 Festbrennstofftank +item.mp_fuselage_15_solid_soviet_stank.name=Größe 15 Festbrennstofftank +item.mp_fuselage_15_solid_desh.name=Größe 15 Festbrennstofftank +item.mp_fuselage_15_solid_silvermoonlight.name=Größe 15 Festbrennstofftank +item.mp_fuselage_15_solid_faust.name=Größe 15 Festbrennstofftank +item.mp_fuselage_15_solid_snowy.name=Größe 15 Festbrennstofftank +item.mp_fuselage_15_solid_panorama.name=Größe 15 Festbrennstofftank +item.mp_fuselage_15_solid_roses.name=Größe 15 Festbrennstofftank item.mp_fuselage_15_hydrogen.name=Größe 15 Wasserstofftank +item.mp_fuselage_15_hydrogen_cathedral.name=Größe 15 Wasserstofftank item.mp_fuselage_15_balefire.name=Größe 15 BF-Kraftstofftank item.mp_stability_10_flat.name=Größe 10 Flache Flügel @@ -1731,6 +1758,7 @@ item.mp_stability_10_cruise.name=Größe 10 Cruise-Flügel item.mp_stability_10_space.name=Größe 10 Weltraum-Flügel item.mp_stability_15_flat.name=Größe 15 Flache Flügel item.mp_stability_15_thin.name=Größe 15 Dünne Flügel +item.mp_stability_15_soyuz.name=Größe 15 Spitze Flügel item.mp_thruster_10_kerosene.name=Größe 10 Flüssigtriebwerk item.mp_thruster_10_solid.name=Größe 10 Festbrennstofftriebwerk @@ -1745,6 +1773,7 @@ item.mp_thruster_15_hydrogen_dual.name=Größe 15 Wasserstofftriebwerk-Zwilling item.mp_thruster_15_balefire_short.name=Größe 15 BF-Triebwerk mit nuklearem Vorwärmer (Verkürzt) item.mp_thruster_15_balefire.name=Größe 15 BF-Triebwerk mit nuklearem Vorwärmer item.mp_thruster_15_balefire_large.name=Größe 15 BF-Triebwerk mit nuklearem Vorwärmer (Schwerlastdüse) +item.mp_thruster_15_balefire_large_rad.name=Größe 15 BF-Triebwerk mit nuklearem Vorwärmer (Schwerlastdüse) item.missile_skin_camo.name=Raketenskin: Camouflage item.missile_skin_desert.name=Raketenskin: Wüstencamouflage diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 8af1c0342..50d3d4747 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -1669,40 +1669,55 @@ item.mp_c_5.name=Tier 5 Missile Targeting Circuit item.mp_warhead_10_he.name=Size 10 HE Warhead item.mp_warhead_10_incendiary.name=Size 10 Incendiary Warhead item.mp_warhead_10_buster.name=Size 10 Bunker Buster Warhead -item.mp_warhead_10_nuclear.name=Size 10 Micro Nuclear Warhead "Tater Tot" +item.mp_warhead_10_nuclear.name=Size 10 Micro Nuclear Warhead +item.mp_warhead_10_taint.name=Size 10 Tainted Warhead item.mp_warhead_15_he.name=Size 15 HE Warhead item.mp_warhead_15_incendiary.name=Size 15 Incendiary Warhead -item.mp_warhead_10_nuclear_large.name=Size 10 Nuclear Warhead "Chernobyl Boris" -item.mp_warhead_15_nuclear.name=Size 15 Nuclear Warhead "Auntie Bertha" -item.mp_warhead_15_nuclear_shark.name=Size 15 Nuclear Warhead "Discount Bullet Bill" +item.mp_warhead_10_nuclear_large.name=Size 10 Nuclear Warhead +item.mp_warhead_15_nuclear.name=Size 15 Nuclear Warhead +item.mp_warhead_15_nuclear_shark.name=Size 15 Nuclear Warhead item.mp_warhead_15_boxcar.name=Size 15 Boxcar? item.mp_warhead_15_n2.name=Size 15 N² Mine +item.mp_warhead_15_balefire.name=Size 15 BF Warhead item.mp_fuselage_10_kerosene.name=Size 10 Kerosene Fuselage -item.mp_fuselage_10_kerosene_camo.name=Size 10 Kerosene Fuselage (Camo) -item.mp_fuselage_10_kerosene_desert.name=Size 10 Kerosene Fuselage (Desert Camo) -item.mp_fuselage_10_kerosene_insulation.name=Size 10 Kerosene Fuselage (Orange Insulation) -item.mp_fuselage_10_kerosene_flames.name=Size 10 Kerosene Fuselage (Sick Flames) -item.mp_fuselage_10_kerosene_sleek.name=Size 10 Kerosene Fuselage (IF-R&D) -item.mp_fuselage_10_kerosene_metal.name=Size 10 Kerosene Fuselage (Metal) +item.mp_fuselage_10_kerosene_camo.name=Size 10 Kerosene Fuselage +item.mp_fuselage_10_kerosene_desert.name=Size 10 Kerosene Fuselage +item.mp_fuselage_10_kerosene_sky.name=Size 10 Kerosene Fuselage +item.mp_fuselage_10_kerosene_insulation.name=Size 10 Kerosene Fuselage +item.mp_fuselage_10_kerosene_flames.name=Size 10 Kerosene Fuselage +item.mp_fuselage_10_kerosene_sleek.name=Size 10 Kerosene Fuselage +item.mp_fuselage_10_kerosene_metal.name=Size 10 Kerosene Fuselage +item.mp_fuselage_10_kerosene_taint.name=Size 10 Kerosene Fuselage item.mp_fuselage_10_solid.name=Size 10 Solid Fuel Fuselage -item.mp_fuselage_10_solid_flames.name=Size 10 Solid Fuel Fuselage (Sick Flames) -item.mp_fuselage_10_solid_insulation.name=Size 10 Solid Fuel Fuselage (Orange Insulation) -item.mp_fuselage_10_solid_sleek.name=Size 10 Solid Fuel Fuselage (IF-R&D) -item.mp_fuselage_10_solid_soviet_glory.name=Size 10 Solid Fuel Fuselage (Soviet Glory) +item.mp_fuselage_10_solid_flames.name=Size 10 Solid Fuel Fuselage +item.mp_fuselage_10_solid_insulation.name=Size 10 Solid Fuel Fuselage +item.mp_fuselage_10_solid_sleek.name=Size 10 Solid Fuel Fuselage +item.mp_fuselage_10_solid_soviet_glory.name=Size 10 Solid Fuel Fuselage +item.mp_fuselage_10_solid_cathedral.name=Size 10 Solid Fuel Fuselage +item.mp_fuselage_10_solid_moonlit.name=Size 10 Solid Fuel Fuselage +item.mp_fuselage_10_solid_battery.name=Size 10 Solid Fuel Fuselage +item.mp_fuselage_10_solid_duracell.name=Size 10 Solid Fuel Fuselage item.mp_fuselage_10_xenon.name=Size 10 Xenon Fuselage +item.mp_fuselage_10_xenon_bhole.name=Size 10 Xenon Fuselage item.mp_fuselage_10_long_kerosene.name=Size 10 Long Kerosene Fuselage -item.mp_fuselage_10_long_kerosene_camo.name=Size 10 Long Kerosene Fuselage (Camo) -item.mp_fuselage_10_long_kerosene_desert.name=Size 10 Long Kerosene Fuselage (Desert Camo) -item.mp_fuselage_10_long_kerosene_flames.name=Size 10 Long Kerosene Fuselage (Sick Flames) -item.mp_fuselage_10_long_kerosene_insulation.name=Size 10 Long Kerosene Fuselage (Orange Insulation) -item.mp_fuselage_10_long_kerosene_sleek.name=Size 10 Long Kerosene Fuselage (IF-R&D) -item.mp_fuselage_10_long_kerosene_metal.name=Size 10 Long Kerosene Fuselage (Metal) +item.mp_fuselage_10_long_kerosene_camo.name=Size 10 Long Kerosene Fuselage +item.mp_fuselage_10_long_kerosene_desert.name=Size 10 Long Kerosene Fuselage +item.mp_fuselage_10_long_kerosene_sky.name=Size 10 Long Kerosene Fuselage +item.mp_fuselage_10_long_kerosene_flames.name=Size 10 Long Kerosene Fuselage +item.mp_fuselage_10_long_kerosene_insulation.name=Size 10 Long Kerosene Fuselage +item.mp_fuselage_10_long_kerosene_sleek.name=Size 10 Long Kerosene Fuselage +item.mp_fuselage_10_long_kerosene_metal.name=Size 10 Long Kerosene Fuselage +item.mp_fuselage_10_long_kerosene_taint.name=Size 10 Long Kerosene Fuselage +item.mp_fuselage_10_long_kerosene_vap.name=Size 10 Long Kerosene Fuselage +item.mp_fuselage_10_long_kerosene_dash.name=Size 10 Long Kerosene Fuselage item.mp_fuselage_10_long_solid.name=Size 10 Long Solid Fuel Fuselage -item.mp_fuselage_10_long_solid_flames.name=Size 10 Long Solid Fuel Fuselage (Sick Flames) -item.mp_fuselage_10_long_solid_insulation.name=Size 10 Long Solid Fuel Fuselage (Orange Insulation) -item.mp_fuselage_10_long_solid_sleek.name=Size 10 Long Solid Fuel Fuselage (IF-R&D) -item.mp_fuselage_10_long_solid_soviet_glory.name=Size 10 Long Solid Fuselage (Soviet Glory) +item.mp_fuselage_10_long_solid_flames.name=Size 10 Long Solid Fuel Fuselage +item.mp_fuselage_10_long_solid_insulation.name=Size 10 Long Solid Fuel Fuselage +item.mp_fuselage_10_long_solid_sleek.name=Size 10 Long Solid Fuel Fuselage +item.mp_fuselage_10_long_solid_soviet_glory.name=Size 10 Long Solid Fuselage +item.mp_fuselage_10_long_solid_silvermoonlight.name=Size 10 Long Solid Fuselage +item.mp_fuselage_10_long_solid_bullet.name=Size 10 Long Solid Fuselage item.mp_fuselage_10_15_kerosene.name=Size 10/15 Kerosene Fuselage item.mp_fuselage_10_15_solid.name=Size 10/15 Solid Fuel Fuselage @@ -1710,20 +1725,32 @@ item.mp_fuselage_10_15_hydrogen.name=Size 10/15 Hydrogen Fuselage item.mp_fuselage_10_15_balefire.name=Size 10/15 BF Fuselage item.mp_fuselage_15_kerosene.name=Size 15 Kerosene Fuselage -item.mp_fuselage_15_kerosene_camo.name=Size 15 Kerosene Fuselage (Camo) -item.mp_fuselage_15_kerosene_desert.name=Size 15 Kerosene Fuselage (Desert Camo) -item.mp_fuselage_15_kerosene_insulation.name=Size 15 Kerosene Fuselage (Orange Insulation) -item.mp_fuselage_15_kerosene_metal.name=Size 15 Kerosene Fuselage (Metal) -item.mp_fuselage_15_kerosene_decorated.name=Size 15 Kerosene Fuselage (Decorated Metal) -item.mp_fuselage_15_kerosene_steampunk.name=Size 15 Kerosene Fuselage (Steampunk) -item.mp_fuselage_15_kerosene_polite.name=Size 15 Kerosene Fuselage (Polite) -item.mp_fuselage_15_kerosene_blackjack.name=Size 15 Kerosene Fuselage (Queen Whiskey) +item.mp_fuselage_15_kerosene_camo.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_desert.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_sky.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_insulation.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_metal.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_decorated.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_steampunk.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_polite.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_blackjack.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_lambda.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_minuteman.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_taint.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_pip.name=Size 15 Kerosene Fuselage +item.mp_fuselage_15_kerosene_yuck.name=Size 15 Kerosene Fuselage item.mp_fuselage_15_solid.name=Size 15 Solid Fuel Fuselage -item.mp_fuselage_15_solid_insulation.name=Size 15 Solid Fuel Fuselage (Orange Insulation) -item.mp_fuselage_15_solid_soviet_glory.name=Size 15 Solid Fuel Fuselage (Soviet Glory) -item.mp_fuselage_15_solid_soviet_stank.name=Size 15 Solid Fuel Fuselage (Soviet Stank) -item.mp_fuselage_15_solid_desh.name=Size 15 Solid Fuel Fuselage (Desh Plating) +item.mp_fuselage_15_solid_insulation.name=Size 15 Solid Fuel Fuselage +item.mp_fuselage_15_solid_soviet_glory.name=Size 15 Solid Fuel Fuselage +item.mp_fuselage_15_solid_soviet_stank.name=Size 15 Solid Fuel Fuselage +item.mp_fuselage_15_solid_desh.name=Size 15 Solid Fuel Fuselage +item.mp_fuselage_15_solid_silvermoonlight.name=Size 15 Solid Fuel Fuselage +item.mp_fuselage_15_solid_faust.name=Size 15 Solid Fuel Fuselage +item.mp_fuselage_15_solid_snowy.name=Size 15 Solid Fuel Fuselage +item.mp_fuselage_15_solid_panorama.name=Size 15 Solid Fuel Fuselage +item.mp_fuselage_15_solid_roses.name=Size 15 Solid Fuel Fuselage item.mp_fuselage_15_hydrogen.name=Size 15 Hydrogen Fuselage +item.mp_fuselage_15_hydrogen_cathedral.name=Size 15 Hydrogen Fuselage item.mp_fuselage_15_balefire.name=Size 15 BF Fuselage item.mp_stability_10_flat.name=Size 10 Flat Fins @@ -1731,6 +1758,7 @@ item.mp_stability_10_cruise.name=Size 10 Cruise Fins item.mp_stability_10_space.name=Size 10 Space Fins item.mp_stability_15_flat.name=Size 15 Flat Fins item.mp_stability_15_thin.name=Size 15 Thin Fins +item.mp_stability_15_soyuz.name=Size 15 Pointy Fins item.mp_thruster_10_kerosene.name=Size 10 Liquid Fuel Thruster item.mp_thruster_10_solid.name=Size 10 Solid Fuel Thruster @@ -1745,6 +1773,7 @@ item.mp_thruster_15_hydrogen_dual.name=Size 15 Hydrogen Twin Thrusters item.mp_thruster_15_balefire_short.name=Size 15 BF Thruster with Nuclear Preheater (Shortened) item.mp_thruster_15_balefire.name=Size 15 BF Thruster with Nuclear Preheater item.mp_thruster_15_balefire_large.name=Size 15 BF Thruster with Nuclear Preheater (Heavy Duty Nozzle) +item.mp_thruster_15_balefire_large_rad.name=Size 15 BF Thruster with Nuclear Preheater (Heavy Duty Nozzle) item.missile_skin_camo.name=Missile Skin: Camo item.missile_skin_desert.name=Missile Skin: Desert Camo diff --git a/assets/hbm/models/missile_parts/mp_f_15_20_kerosene.obj b/assets/hbm/models/missile_parts/mp_f_15_20_kerosene.obj new file mode 100644 index 000000000..d8a7d87d6 --- /dev/null +++ b/assets/hbm/models/missile_parts/mp_f_15_20_kerosene.obj @@ -0,0 +1,246 @@ +# Blender v2.76 (sub 0) OBJ File: 'mp_f_15_20.blend' +# www.blender.org +o Cylinder +v 0.000000 0.000000 -1.000000 +v 0.000000 12.000000 -1.000000 +v 0.500000 0.000000 -0.866025 +v 0.500000 12.000000 -0.866025 +v 0.866025 0.000000 -0.500000 +v 0.866025 12.000000 -0.500000 +v 1.000000 0.000000 0.000000 +v 1.000000 12.000000 0.000000 +v 0.866025 0.000000 0.500000 +v 0.866025 12.000000 0.500000 +v 0.500000 0.000000 0.866025 +v 0.500000 12.000000 0.866025 +v 0.000000 0.000000 1.000000 +v 0.000000 12.000000 1.000000 +v -0.500000 0.000000 0.866026 +v -0.500000 12.000000 0.866026 +v -0.866025 0.000000 0.500000 +v -0.866025 12.000000 0.500000 +v -1.000000 0.000000 0.000000 +v -1.000000 12.000000 0.000000 +v -0.866026 0.000000 -0.499999 +v -0.866026 12.000000 -0.499999 +v -0.500001 0.000000 -0.866025 +v -0.500001 12.000000 -0.866025 +v 0.000000 13.500000 -0.750000 +v -0.375000 13.500000 -0.649519 +v -0.649519 13.500000 -0.375000 +v -0.750000 13.500000 0.000000 +v -0.649519 13.500000 0.375000 +v -0.375000 13.500000 0.649519 +v -0.000000 13.500000 0.750000 +v 0.375000 13.500000 0.649519 +v 0.649519 13.500000 0.375000 +v 0.750000 13.500000 0.000000 +v 0.649519 13.500000 -0.375000 +v 0.375000 13.500000 -0.649519 +v -0.374999 16.000000 -0.649519 +v 0.000001 16.000000 -0.750000 +v -0.649518 16.000000 -0.375000 +v -0.749999 16.000000 0.000000 +v -0.649518 16.000000 0.375000 +v -0.374999 16.000000 0.649519 +v 0.000001 16.000000 0.750000 +v 0.375001 16.000000 0.649519 +v 0.649520 16.000000 0.375000 +v 0.750001 16.000000 0.000000 +v 0.649521 16.000000 -0.375000 +v 0.375002 16.000000 -0.649519 +vt 0.281250 0.750000 +vt 0.250000 0.750000 +vt 0.250000 0.000000 +vt 0.218750 0.750000 +vt 0.218750 0.000000 +vt 0.187500 0.750000 +vt 0.187500 0.000000 +vt 0.156250 0.750000 +vt 0.156250 0.000000 +vt 0.125000 0.750000 +vt 0.125000 0.000000 +vt 0.093750 0.750000 +vt 0.093750 0.000000 +vt 0.062500 0.750000 +vt 0.062500 0.000000 +vt 0.031250 0.750000 +vt 0.031250 0.000000 +vt -0.000000 0.750000 +vt 0.000062 0.000063 +vt 0.375000 0.750000 +vt 0.343750 0.750000 +vt 0.343750 0.000000 +vt 0.312500 0.750000 +vt 0.281250 0.000000 +vt 0.312500 0.000000 +vt 0.499536 0.062500 +vt 0.375464 0.062500 +vt 0.406482 0.008776 +vt 0.375000 0.843750 +vt 0.343750 0.843750 +vt 0.312500 0.843750 +vt 0.281250 0.843750 +vt 0.250000 0.843750 +vt 0.218750 0.843750 +vt 0.187500 0.843750 +vt 0.156250 0.843750 +vt 0.125000 0.843750 +vt 0.093750 0.843750 +vt 0.062500 0.843750 +vt 0.031250 0.843750 +vt -0.000000 0.843750 +vt 0.031250 1.000000 +vt 0.000000 1.000000 +vt 0.399265 0.211037 +vt 0.399265 0.132713 +vt 0.467095 0.171875 +vt 0.250000 1.000000 +vt 0.218750 1.000000 +vt 0.312500 1.000000 +vt 0.281250 1.000000 +vt 0.156250 1.000000 +vt 0.125000 1.000000 +vt 0.062500 1.000000 +vt 0.343750 1.000000 +vt 0.187500 1.000000 +vt 0.093750 1.000000 +vt 0.375000 1.000000 +vt 0.375000 0.000000 +vt 0.437500 0.000464 +vt 0.468518 0.008776 +vt 0.491224 0.031482 +vt 0.491224 0.093518 +vt 0.468518 0.116224 +vt 0.437500 0.124536 +vt 0.406482 0.116224 +vt 0.383776 0.093518 +vt 0.383776 0.031482 +vt 0.461037 0.194485 +vt 0.444485 0.211037 +vt 0.421875 0.217095 +vt 0.382713 0.194485 +vt 0.376655 0.171875 +vt 0.382713 0.149265 +vt 0.421875 0.126655 +vt 0.444485 0.132713 +vt 0.461037 0.149265 +vn 0.258800 0.000000 -0.965900 +vn 0.707100 0.000000 -0.707100 +vn 0.965900 0.000000 -0.258800 +vn 0.965900 0.000000 0.258800 +vn 0.707100 0.000000 0.707100 +vn 0.258800 0.000000 0.965900 +vn -0.258800 0.000000 0.965900 +vn -0.707100 0.000000 0.707100 +vn -0.965900 0.000000 0.258800 +vn -0.965900 0.000000 -0.258800 +vn -0.258800 0.000000 -0.965900 +vn -0.707100 0.000000 -0.707100 +vn 0.000000 -1.000000 0.000000 +vn -0.953600 0.158900 -0.255500 +vn -0.698100 0.158900 -0.698100 +vn -0.255500 0.158900 -0.953600 +vn 0.255500 0.158900 -0.953600 +vn 0.698100 0.158900 -0.698100 +vn 0.953600 0.158900 -0.255500 +vn 0.953600 0.158900 0.255500 +vn 0.698100 0.158900 0.698100 +vn 0.255500 0.158900 0.953600 +vn -0.255500 0.158900 0.953600 +vn -0.698100 0.158900 0.698100 +vn -0.953600 0.158900 0.255500 +vn 0.000000 1.000000 0.000000 +s off +f 2/1/1 4/2/1 3/3/1 +f 4/2/2 6/4/2 5/5/2 +f 6/4/3 8/6/3 7/7/3 +f 8/6/4 10/8/4 9/9/4 +f 10/8/5 12/10/5 11/11/5 +f 12/10/6 14/12/6 13/13/6 +f 14/12/7 16/14/7 15/15/7 +f 16/14/8 18/16/8 17/17/8 +f 18/16/9 20/18/9 19/19/9 +f 20/20/10 22/21/10 21/22/10 +f 24/23/11 2/1/11 1/24/11 +f 22/21/12 24/23/12 23/25/12 +f 7/26/13 19/27/13 23/28/13 +f 22/21/14 20/20/14 28/29/14 +f 24/23/15 22/21/15 27/30/15 +f 2/1/16 24/23/16 26/31/16 +f 2/1/17 25/32/17 36/33/17 +f 4/2/18 36/33/18 35/34/18 +f 6/4/19 35/34/19 34/35/19 +f 10/8/20 8/6/20 34/35/20 +f 12/10/21 10/8/21 33/36/21 +f 12/10/22 32/37/22 31/38/22 +f 14/12/23 31/38/23 30/39/23 +f 16/14/24 30/39/24 29/40/24 +f 18/16/25 29/40/25 28/41/25 +f 29/40/9 41/42/9 40/43/9 +f 41/44/26 45/45/26 38/46/26 +f 36/33/2 48/47/2 47/48/2 +f 26/31/11 37/49/11 38/50/11 +f 33/36/5 45/51/5 44/52/5 +f 30/39/8 42/53/8 41/42/8 +f 25/32/1 38/50/1 48/47/1 +f 27/30/12 39/54/12 37/49/12 +f 34/35/4 46/55/4 45/51/4 +f 31/38/7 43/56/7 42/53/7 +f 28/29/10 40/57/10 39/54/10 +f 35/34/3 47/48/3 46/55/3 +f 31/38/6 32/37/6 44/52/6 +f 1/24/1 2/1/1 3/3/1 +f 3/3/2 4/2/2 5/5/2 +f 5/5/3 6/4/3 7/7/3 +f 7/7/4 8/6/4 9/9/4 +f 9/9/5 10/8/5 11/11/5 +f 11/11/6 12/10/6 13/13/6 +f 13/13/7 14/12/7 15/15/7 +f 15/15/8 16/14/8 17/17/8 +f 17/17/9 18/16/9 19/19/9 +f 19/58/10 20/20/10 21/22/10 +f 23/25/11 24/23/11 1/24/11 +f 21/22/12 22/21/12 23/25/12 +f 23/28/13 1/59/13 3/60/13 +f 3/60/13 5/61/13 7/26/13 +f 7/26/13 9/62/13 11/63/13 +f 11/63/13 13/64/13 15/65/13 +f 15/65/13 17/66/13 19/27/13 +f 19/27/13 21/67/13 23/28/13 +f 23/28/13 3/60/13 7/26/13 +f 7/26/13 11/63/13 15/65/13 +f 15/65/13 19/27/13 7/26/13 +f 27/30/14 22/21/14 28/29/14 +f 26/31/15 24/23/15 27/30/15 +f 25/32/16 2/1/16 26/31/16 +f 4/2/17 2/1/17 36/33/17 +f 6/4/18 4/2/18 35/34/18 +f 8/6/19 6/4/19 34/35/19 +f 33/36/20 10/8/20 34/35/20 +f 32/37/21 12/10/21 33/36/21 +f 14/12/22 12/10/22 31/38/22 +f 16/14/23 14/12/23 30/39/23 +f 18/16/24 16/14/24 29/40/24 +f 20/18/25 18/16/25 28/41/25 +f 28/41/9 29/40/9 40/43/9 +f 38/46/26 37/68/26 39/69/26 +f 39/69/26 40/70/26 38/46/26 +f 41/44/26 42/71/26 43/72/26 +f 43/72/26 44/73/26 45/45/26 +f 45/45/26 46/74/26 47/75/26 +f 47/75/26 48/76/26 45/45/26 +f 38/46/26 40/70/26 41/44/26 +f 41/44/26 43/72/26 45/45/26 +f 45/45/26 48/76/26 38/46/26 +f 35/34/2 36/33/2 47/48/2 +f 25/32/11 26/31/11 38/50/11 +f 32/37/5 33/36/5 44/52/5 +f 29/40/8 30/39/8 41/42/8 +f 36/33/1 25/32/1 48/47/1 +f 26/31/12 27/30/12 37/49/12 +f 33/36/4 34/35/4 45/51/4 +f 30/39/7 31/38/7 42/53/7 +f 27/30/10 28/29/10 39/54/10 +f 34/35/3 35/34/3 46/55/3 +f 43/56/6 31/38/6 44/52/6 diff --git a/assets/hbm/models/missile_parts/mp_s_15_soyuz.obj b/assets/hbm/models/missile_parts/mp_s_15_soyuz.obj new file mode 100644 index 000000000..60b7a04cc --- /dev/null +++ b/assets/hbm/models/missile_parts/mp_s_15_soyuz.obj @@ -0,0 +1,130 @@ +# Blender v2.76 (sub 0) OBJ File: 'mp_s_15_soyuz.blend' +# www.blender.org +o Cube.001_Cube.002 +v 0.062500 0.125000 -0.750000 +v 0.062500 0.875000 -0.750000 +v -0.062500 0.125000 -0.750000 +v -0.062500 0.875000 -0.750000 +v 0.000000 0.125000 -1.750000 +v -0.062500 0.875000 -0.687500 +v -0.062500 0.125000 -0.687500 +v 0.062500 0.125000 -0.687500 +v 0.062500 0.875000 -0.687500 +v -0.062500 0.125000 0.750000 +v -0.062500 0.875000 0.750000 +v 0.062500 0.125000 0.750000 +v 0.062500 0.875000 0.750000 +v -0.000000 0.125000 1.750000 +v 0.062500 0.875000 0.687500 +v 0.062500 0.125000 0.687500 +v -0.062500 0.125000 0.687500 +v -0.062500 0.875000 0.687500 +v -0.750000 0.125000 -0.062500 +v -0.750000 0.875000 -0.062500 +v -0.750000 0.125000 0.062500 +v -0.750000 0.875000 0.062500 +v -1.750000 0.125000 -0.000000 +v -0.687500 0.875000 0.062500 +v -0.687500 0.125000 0.062500 +v -0.687500 0.125000 -0.062500 +v -0.687500 0.875000 -0.062500 +v 0.750000 0.125000 0.062500 +v 0.750000 0.875000 0.062500 +v 0.750000 0.125000 -0.062500 +v 0.750000 0.875000 -0.062500 +v 1.750000 0.125000 0.000000 +v 0.687500 0.875000 -0.062500 +v 0.687500 0.125000 -0.062500 +v 0.687500 0.125000 0.062500 +v 0.687500 0.875000 0.062500 +vt 0.444444 0.388889 +vt -0.000000 0.361111 +vt 0.444444 0.333333 +vt 0.527778 0.333333 +vt 0.527778 0.000000 +vt 0.972222 -0.000000 +vt 0.444444 0.444444 +vt 0.000000 0.416667 +vt 0.444444 0.000000 +vt 0.000000 0.000000 +vt 0.472222 0.000000 +vt 0.500000 0.000000 +vt 0.500000 0.333333 +vt 0.472222 0.333333 +vt 0.472222 0.388889 +vt 0.472222 0.444444 +vn 0.000000 -1.000000 0.000000 +vn 0.998100 0.000000 -0.062400 +vn 0.000000 0.800000 -0.600000 +vn -0.998100 0.000000 -0.062400 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 -0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.998100 0.000000 0.062400 +vn 0.000000 0.800000 0.600000 +vn 0.998100 0.000000 0.062400 +vn 0.000000 0.000000 -1.000000 +vn -0.062400 0.000000 -0.998100 +vn -0.600000 0.800000 0.000000 +vn -0.062400 0.000000 0.998100 +vn 0.062400 0.000000 0.998100 +vn 0.600000 0.800000 0.000000 +vn 0.062400 0.000000 -0.998100 +s off +f 3/1/1 5/2/1 1/3/1 +f 2/4/2 1/5/2 5/6/2 +f 2/7/3 5/8/3 4/1/3 +f 3/9/4 4/3/4 5/10/4 +f 7/11/5 8/12/5 9/13/5 +f 7/11/6 6/14/6 4/3/6 +f 8/14/1 7/15/1 3/1/1 +f 9/13/7 8/12/7 1/5/7 +f 6/15/8 9/16/8 2/7/8 +f 12/1/1 14/2/1 10/3/1 +f 11/4/9 10/5/9 14/6/9 +f 11/7/10 14/8/10 13/1/10 +f 12/9/11 13/3/11 14/10/11 +f 16/11/12 17/12/12 18/13/12 +f 16/11/7 15/14/7 13/3/7 +f 17/14/1 16/15/1 12/1/1 +f 18/13/6 17/12/6 10/5/6 +f 15/15/8 18/16/8 11/7/8 +f 21/1/1 23/2/1 19/3/1 +f 20/4/13 19/5/13 23/6/13 +f 20/7/14 23/8/14 22/1/14 +f 21/9/15 22/3/15 23/10/15 +f 25/11/7 26/12/7 27/13/7 +f 25/11/5 24/14/5 22/3/5 +f 26/14/1 25/15/1 21/1/1 +f 27/13/12 26/12/12 19/5/12 +f 24/15/8 27/16/8 20/7/8 +f 30/1/1 32/2/1 28/3/1 +f 29/4/16 28/5/16 32/6/16 +f 29/7/17 32/8/17 31/1/17 +f 30/9/18 31/3/18 32/10/18 +f 34/11/6 35/12/6 36/13/6 +f 34/11/12 33/14/12 31/3/12 +f 35/14/1 34/15/1 30/1/1 +f 36/13/5 35/12/5 28/5/5 +f 33/15/8 36/16/8 29/7/8 +f 6/14/5 7/11/5 9/13/5 +f 3/9/6 7/11/6 4/3/6 +f 1/3/1 8/14/1 3/1/1 +f 2/4/7 9/13/7 1/5/7 +f 4/1/8 6/15/8 2/7/8 +f 15/14/12 16/11/12 18/13/12 +f 12/9/7 16/11/7 13/3/7 +f 10/3/1 17/14/1 12/1/1 +f 11/4/6 18/13/6 10/5/6 +f 13/1/8 15/15/8 11/7/8 +f 24/14/7 25/11/7 27/13/7 +f 21/9/5 25/11/5 22/3/5 +f 19/3/1 26/14/1 21/1/1 +f 20/4/12 27/13/12 19/5/12 +f 22/1/8 24/15/8 20/7/8 +f 33/14/6 34/11/6 36/13/6 +f 30/9/12 34/11/12 31/3/12 +f 28/3/1 35/14/1 30/1/1 +f 29/4/5 36/13/5 28/5/5 +f 31/1/8 33/15/8 29/7/8 diff --git a/assets/hbm/models/missile_parts/mp_t_10_kerosene_tec.obj b/assets/hbm/models/missile_parts/mp_t_10_kerosene_tec.obj new file mode 100644 index 000000000..491701170 --- /dev/null +++ b/assets/hbm/models/missile_parts/mp_t_10_kerosene_tec.obj @@ -0,0 +1,768 @@ +# Blender v2.76 (sub 0) OBJ File: 'mp_t_10_kerosene_tec.blend' +# www.blender.org +o Cube.003_Cube.004 +v -0.518545 0.375000 -0.518545 +v -0.518545 0.750000 -0.518545 +v -0.400694 0.375000 -0.567361 +v -0.400694 0.750000 -0.567361 +v -0.282843 0.375000 -0.518545 +v -0.282843 0.750000 -0.518545 +v -0.234027 0.375000 -0.400694 +v -0.234027 0.750000 -0.400694 +v -0.282843 0.375000 -0.282843 +v -0.282843 0.750000 -0.282843 +v -0.400694 0.375000 -0.234027 +v -0.400694 0.750000 -0.234027 +v -0.518545 0.375000 -0.282843 +v -0.518545 0.750000 -0.282843 +v -0.567361 0.375000 -0.400694 +v -0.567361 0.750000 -0.400694 +v -0.234027 0.000000 -0.400694 +v -0.282843 0.000000 -0.282843 +v -0.400694 0.000000 -0.234027 +v -0.518545 0.250000 -0.518545 +v -0.400694 0.250000 -0.567361 +v -0.567361 0.250000 -0.400694 +v -0.338194 1.250000 -0.338194 +v -0.282843 0.125000 -0.518545 +v -0.518545 0.124998 -0.282843 +v 0.518545 0.375000 0.518545 +v 0.518545 0.750000 0.518545 +v 0.400694 0.375000 0.567361 +v 0.400694 0.750000 0.567361 +v 0.282843 0.375000 0.518545 +v 0.282843 0.750000 0.518545 +v 0.234027 0.375000 0.400694 +v 0.234027 0.750000 0.400694 +v 0.282843 0.375000 0.282843 +v 0.282843 0.750000 0.282843 +v 0.400694 0.375000 0.234027 +v 0.400694 0.750000 0.234027 +v 0.518545 0.375000 0.282843 +v 0.518545 0.750000 0.282843 +v 0.567360 0.375000 0.400694 +v 0.567360 0.750000 0.400694 +v 0.234027 0.000000 0.400694 +v 0.282843 0.000000 0.282843 +v 0.400694 0.000000 0.234027 +v 0.518545 0.250000 0.518545 +v 0.400694 0.250000 0.567361 +v 0.567360 0.250000 0.400694 +v 0.338194 1.250000 0.338194 +v 0.282843 0.125000 0.518545 +v 0.518545 0.124998 0.282843 +v -0.518545 0.375000 0.518545 +v -0.518545 0.750000 0.518545 +v -0.567361 0.375000 0.400694 +v -0.567361 0.750000 0.400694 +v -0.518545 0.375000 0.282843 +v -0.518545 0.750000 0.282843 +v -0.400694 0.375000 0.234027 +v -0.400694 0.750000 0.234027 +v -0.282843 0.375000 0.282843 +v -0.282843 0.750000 0.282843 +v -0.234027 0.375000 0.400694 +v -0.234027 0.750000 0.400694 +v -0.282843 0.375000 0.518545 +v -0.282843 0.750000 0.518545 +v -0.400694 0.375000 0.567361 +v -0.400694 0.750000 0.567361 +v -0.400694 0.000000 0.234027 +v -0.282843 0.000000 0.282843 +v -0.234027 0.000000 0.400694 +v -0.518545 0.250000 0.518545 +v -0.567361 0.250000 0.400694 +v -0.400694 0.250000 0.567361 +v -0.338194 1.250000 0.338194 +v -0.518545 0.125000 0.282843 +v -0.282843 0.124998 0.518545 +v 0.518545 0.375000 -0.518545 +v 0.518545 0.750000 -0.518545 +v 0.567361 0.375000 -0.400694 +v 0.567361 0.750000 -0.400694 +v 0.518545 0.375000 -0.282843 +v 0.518545 0.750000 -0.282843 +v 0.400694 0.375000 -0.234027 +v 0.400694 0.750000 -0.234027 +v 0.282843 0.375000 -0.282843 +v 0.282843 0.750000 -0.282843 +v 0.234027 0.375000 -0.400694 +v 0.234027 0.750000 -0.400694 +v 0.282843 0.375000 -0.518545 +v 0.282843 0.750000 -0.518545 +v 0.400694 0.375000 -0.567361 +v 0.400694 0.750000 -0.567361 +v 0.400694 0.000000 -0.234027 +v 0.282843 0.000000 -0.282843 +v 0.234027 0.000000 -0.400694 +v 0.518545 0.250000 -0.518545 +v 0.567361 0.250000 -0.400694 +v 0.400694 0.250000 -0.567361 +v 0.338194 1.250000 -0.338194 +v 0.518545 0.125000 -0.282843 +v 0.282843 0.124998 -0.518545 +v -0.166667 0.000000 0.031250 +v -0.333333 0.250000 0.031250 +v -0.416667 0.000000 0.031250 +v -0.458333 0.250000 0.031250 +v -0.166667 0.000000 -0.031250 +v -0.333333 0.250000 -0.031250 +v -0.416667 0.000000 -0.031250 +v -0.458333 0.250000 -0.031250 +v -0.583333 0.250000 0.031250 +v -0.583333 0.250000 -0.031250 +v -0.583333 0.750000 0.031250 +v -0.583333 0.750000 -0.031250 +v -0.458333 1.125000 0.031250 +v -0.458333 1.125000 -0.031250 +v -0.500000 1.125000 0.031250 +v -0.500000 1.125000 -0.031250 +v 0.166667 0.000000 -0.031250 +v 0.333333 0.250000 -0.031250 +v 0.416667 0.000000 -0.031250 +v 0.458333 0.250000 -0.031250 +v 0.166667 0.000000 0.031250 +v 0.333333 0.250000 0.031250 +v 0.416667 0.000000 0.031250 +v 0.458333 0.250000 0.031250 +v 0.583333 0.250000 -0.031250 +v 0.583333 0.250000 0.031250 +v 0.583333 0.750000 -0.031250 +v 0.583333 0.750000 0.031250 +v 0.458333 1.125000 -0.031250 +v 0.458333 1.125000 0.031250 +v 0.500000 1.125000 -0.031250 +v 0.500000 1.125000 0.031250 +v 0.031250 0.000000 0.166667 +v 0.031250 0.250000 0.333333 +v 0.031250 0.000000 0.416667 +v 0.031250 0.250000 0.458333 +v -0.031250 0.000000 0.166667 +v -0.031250 0.250000 0.333333 +v -0.031250 0.000000 0.416667 +v -0.031250 0.250000 0.458333 +v 0.031250 0.250000 0.583333 +v -0.031250 0.250000 0.583333 +v 0.031250 0.750000 0.583333 +v -0.031250 0.750000 0.583333 +v 0.031250 1.125000 0.458333 +v -0.031250 1.125000 0.458333 +v 0.031250 1.125000 0.500000 +v -0.031250 1.125000 0.500000 +v -0.031250 0.000000 -0.166667 +v -0.031250 0.250000 -0.333333 +v -0.031250 0.000000 -0.416667 +v -0.031250 0.250000 -0.458333 +v 0.031250 0.000000 -0.166667 +v 0.031250 0.250000 -0.333333 +v 0.031250 0.000000 -0.416667 +v 0.031250 0.250000 -0.458333 +v -0.031250 0.250000 -0.583333 +v 0.031250 0.250000 -0.583333 +v -0.031250 0.750000 -0.583333 +v 0.031250 0.750000 -0.583333 +v -0.031250 1.125000 -0.458333 +v 0.031250 1.125000 -0.458333 +v -0.031250 1.125000 -0.500000 +v 0.031250 1.125000 -0.500000 +v -0.000000 0.500000 -0.500000 +v -0.000000 1.250000 -0.500000 +v 0.250000 0.500000 -0.433013 +v 0.250000 1.250000 -0.433013 +v 0.433013 0.500000 -0.250000 +v 0.433013 1.250000 -0.250000 +v 0.500000 0.500000 0.000000 +v 0.500000 1.250000 0.000000 +v 0.433013 0.500000 0.250000 +v 0.433013 1.250000 0.250000 +v 0.250000 0.500000 0.433013 +v 0.250000 1.250000 0.433013 +v 0.000000 0.500000 0.500000 +v 0.000000 1.250000 0.500000 +v -0.250000 0.500000 0.433013 +v -0.250000 1.250000 0.433013 +v -0.433013 0.500000 0.250000 +v -0.433013 1.250000 0.250000 +v -0.500000 0.500000 0.000000 +v -0.500000 1.250000 0.000000 +v -0.433013 0.500000 -0.250000 +v -0.433013 1.250000 -0.250000 +v -0.250000 0.500000 -0.433013 +v -0.250000 1.250000 -0.433013 +v -0.000000 0.750000 -0.425000 +v 0.212500 0.750000 -0.368061 +v 0.368061 0.750000 -0.212500 +v 0.425000 0.750000 0.000000 +v 0.368061 0.750000 0.212500 +v 0.212500 0.750000 0.368061 +v 0.000000 0.750000 0.425000 +v -0.212500 0.750000 0.368061 +v -0.368061 0.750000 0.212500 +v -0.425000 0.750000 0.000000 +v -0.368061 0.750000 -0.212500 +v -0.212500 0.750000 -0.368061 +v -0.000000 0.250000 -0.333333 +v -0.166667 0.250000 -0.288675 +v -0.288675 0.250000 -0.166667 +v -0.333333 0.250000 0.000000 +v -0.288675 0.250000 0.166667 +v -0.166667 0.250000 0.288675 +v -0.000000 0.250000 0.333333 +v 0.166667 0.250000 0.288675 +v 0.288675 0.250000 0.166667 +v 0.333333 0.250000 0.000000 +v 0.288675 0.250000 -0.166666 +v 0.166667 0.250000 -0.288675 +v -0.141667 0.750000 -0.245374 +v -0.000000 0.750000 -0.283333 +v -0.245374 0.750000 -0.141667 +v -0.283333 0.750000 0.000000 +v -0.245374 0.750000 0.141667 +v -0.141667 0.750000 0.245374 +v -0.000000 0.750000 0.283333 +v 0.141667 0.750000 0.245374 +v 0.245374 0.750000 0.141667 +v 0.283333 0.750000 0.000000 +v 0.245374 0.750000 -0.141667 +v 0.141667 0.750000 -0.245374 +v -0.083333 0.625000 -0.144338 +v -0.000000 0.625000 -0.166667 +v -0.144338 0.625000 -0.083333 +v -0.166667 0.625000 0.000000 +v -0.144338 0.625000 0.083333 +v -0.083333 0.625000 0.144338 +v -0.000000 0.625000 0.166667 +v 0.083333 0.625000 0.144338 +v 0.144338 0.625000 0.083333 +v 0.166667 0.625000 0.000000 +v 0.144338 0.625000 -0.083333 +v 0.083333 0.625000 -0.144337 +vn -0.382700 0.000000 -0.923900 +vn 0.382700 0.000000 -0.923900 +vn 0.923900 0.000000 -0.382700 +vn 0.382700 0.000000 0.923900 +vn 0.923900 0.000000 0.382700 +vn -0.382700 0.000000 0.923900 +vn -0.923900 0.000000 -0.382700 +vn -0.923900 0.000000 0.382700 +vn 0.000000 -1.000000 0.000000 +vn 0.378700 0.143100 0.914400 +vn -0.372100 0.233700 0.898300 +vn -0.864900 0.351600 0.358200 +vn -0.835700 0.426300 -0.346200 +vn -0.346200 0.426300 -0.835700 +vn 0.914400 0.143100 0.378700 +vn 0.898300 0.233700 -0.372100 +vn 0.358200 0.351600 -0.864900 +vn -0.378700 0.143100 -0.914400 +vn 0.372100 0.233700 -0.898300 +vn 0.864900 0.351600 -0.358200 +vn 0.835700 0.426300 0.346200 +vn 0.346200 0.426300 0.835700 +vn -0.914400 0.143100 -0.378700 +vn -0.898300 0.233700 0.372100 +vn -0.358200 0.351600 0.864900 +vn 0.914400 0.143100 -0.378700 +vn 0.898300 0.233700 0.372100 +vn 0.358200 0.351600 0.864900 +vn -0.346200 0.426300 0.835700 +vn -0.835700 0.426300 0.346200 +vn 0.378700 0.143100 -0.914400 +vn -0.372100 0.233700 -0.898300 +vn -0.864900 0.351600 -0.358200 +vn -0.914400 0.143100 0.378700 +vn -0.898300 0.233700 -0.372100 +vn -0.358200 0.351600 -0.864900 +vn 0.346200 0.426300 -0.835700 +vn 0.835700 0.426300 -0.346200 +vn -0.378700 0.143100 0.914400 +vn 0.372100 0.233700 0.898300 +vn 0.864900 0.351600 0.358200 +vn 0.832100 0.554700 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.832100 -0.554700 0.000000 +vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.976200 0.216900 0.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 1.000000 +vn -0.832100 0.554700 0.000000 +vn 0.832100 -0.554700 0.000000 +vn 0.976200 0.216900 0.000000 +vn 0.000000 0.554700 -0.832100 +vn 0.000000 -0.554700 0.832100 +vn 0.000000 0.216900 0.976200 +vn 0.000000 0.554700 0.832100 +vn 0.000000 -0.554700 -0.832100 +vn 0.000000 0.216900 -0.976200 +vn 0.258800 0.000000 -0.965900 +vn 0.707100 0.000000 -0.707100 +vn 0.965900 0.000000 -0.258800 +vn 0.965900 0.000000 0.258800 +vn 0.707100 0.000000 0.707100 +vn 0.258800 0.000000 0.965900 +vn -0.258800 0.000000 0.965900 +vn -0.707100 0.000000 0.707100 +vn -0.965900 0.000000 0.258800 +vn -0.965900 0.000000 -0.258800 +vn -0.258800 0.000000 -0.965900 +vn -0.707100 0.000000 -0.707100 +vn 0.679200 -0.278300 0.679200 +vn -0.679200 -0.278300 0.679200 +vn 0.927800 -0.278300 0.248600 +vn 0.927800 -0.278300 -0.248600 +vn 0.679200 -0.278300 -0.679200 +vn 0.248600 -0.278300 -0.927800 +vn -0.248600 -0.278300 -0.927800 +vn -0.679200 -0.278300 -0.679200 +vn -0.927800 -0.278300 -0.248600 +vn 0.248600 -0.278300 0.927800 +vn -0.248600 -0.278300 0.927800 +vn -0.927800 -0.278300 0.248600 +vn 0.237800 -0.394500 -0.887600 +vn -0.257600 0.096100 0.961500 +vn -0.961500 0.096100 -0.257600 +vn 0.961500 0.096100 -0.257600 +vn 0.257600 0.096100 0.961500 +vn -0.961500 0.096100 0.257600 +vn 0.703800 0.096100 -0.703800 +vn -0.257600 0.096100 -0.961500 +vn 0.703800 0.096100 0.703800 +vn -0.703800 0.096100 0.703800 +vn 0.257600 0.096100 -0.961500 +vn -0.703800 0.096100 -0.703800 +vn 0.961500 0.096100 0.257600 +vn 0.887600 -0.394500 0.237800 +vn -0.887600 -0.394500 0.237800 +vn -0.237800 -0.394500 -0.887600 +vn 0.887600 -0.394500 -0.237800 +vn -0.649800 -0.394500 0.649800 +vn 0.237800 -0.394500 0.887600 +vn -0.649800 -0.394500 -0.649800 +vn 0.649800 -0.394500 -0.649800 +vn -0.237800 -0.394500 0.887600 +vn 0.649800 -0.394500 0.649800 +vn -0.887600 -0.394500 -0.237800 +s off +f 2//1 4//1 3//1 +f 5//2 24//2 21//2 +f 4//2 6//2 5//2 +f 6//3 8//3 7//3 +f 11//4 19//4 18//4 +f 8//5 10//5 9//5 +f 9//5 18//5 17//5 +f 10//4 12//4 11//4 +f 7//3 17//3 24//3 +f 12//6 14//6 13//6 +f 16//7 2//7 1//7 +f 14//8 16//8 15//8 +f 1//7 20//7 22//7 +f 3//1 21//1 20//1 +f 9//9 11//9 15//9 +f 11//6 13//6 25//6 +f 13//8 15//8 22//8 +f 10//10 23//10 12//10 +f 12//11 23//11 14//11 +f 14//12 23//12 16//12 +f 16//13 23//13 2//13 +f 2//14 23//14 4//14 +f 8//15 23//15 10//15 +f 6//16 23//16 8//16 +f 4//17 23//17 6//17 +f 27//4 29//4 28//4 +f 30//6 49//6 46//6 +f 29//6 31//6 30//6 +f 31//8 33//8 32//8 +f 36//1 44//1 43//1 +f 33//7 35//7 34//7 +f 34//7 43//7 42//7 +f 35//1 37//1 36//1 +f 32//8 42//8 49//8 +f 37//2 39//2 38//2 +f 41//5 27//5 26//5 +f 39//3 41//3 40//3 +f 26//5 45//5 47//5 +f 28//4 46//4 45//4 +f 32//9 38//9 40//9 +f 36//2 38//2 50//2 +f 38//3 40//3 47//3 +f 35//18 48//18 37//18 +f 37//19 48//19 39//19 +f 39//20 48//20 41//20 +f 41//21 48//21 27//21 +f 27//22 48//22 29//22 +f 33//23 48//23 35//23 +f 31//24 48//24 33//24 +f 29//25 48//25 31//25 +f 52//8 54//8 53//8 +f 55//7 74//7 71//7 +f 54//7 56//7 55//7 +f 56//1 58//1 57//1 +f 61//3 69//3 68//3 +f 58//2 60//2 59//2 +f 59//2 68//2 67//2 +f 60//3 62//3 61//3 +f 57//1 67//1 74//1 +f 62//5 64//5 63//5 +f 66//6 52//6 51//6 +f 64//4 66//4 65//4 +f 51//6 70//6 72//6 +f 53//8 71//8 70//8 +f 57//9 61//9 65//9 +f 61//5 63//5 75//5 +f 63//4 65//4 72//4 +f 60//26 73//26 62//26 +f 62//27 73//27 64//27 +f 64//28 73//28 66//28 +f 66//29 73//29 52//29 +f 52//30 73//30 54//30 +f 58//31 73//31 60//31 +f 56//32 73//32 58//32 +f 54//33 73//33 56//33 +f 77//3 79//3 78//3 +f 80//5 99//5 96//5 +f 79//5 81//5 80//5 +f 81//4 83//4 82//4 +f 86//8 94//8 93//8 +f 83//6 85//6 84//6 +f 84//6 93//6 92//6 +f 85//8 87//8 86//8 +f 82//4 92//4 99//4 +f 87//7 89//7 88//7 +f 91//2 77//2 76//2 +f 89//1 91//1 90//1 +f 76//2 95//2 97//2 +f 78//3 96//3 95//3 +f 82//9 86//9 90//9 +f 86//7 88//7 100//7 +f 88//1 90//1 97//1 +f 85//34 98//34 87//34 +f 87//35 98//35 89//35 +f 89//36 98//36 91//36 +f 91//37 98//37 77//37 +f 77//38 98//38 79//38 +f 83//39 98//39 85//39 +f 81//40 98//40 83//40 +f 79//41 98//41 81//41 +f 102//42 101//42 105//42 +f 103//9 107//9 105//9 +f 108//43 104//43 102//43 +f 103//44 109//44 110//44 +f 114//45 113//45 104//45 +f 109//46 111//46 112//46 +f 114//43 116//43 115//43 +f 112//47 111//47 115//47 +f 114//48 108//48 112//48 +f 104//49 113//49 111//49 +f 106//48 107//48 108//48 +f 104//49 103//49 102//49 +f 118//50 117//50 121//50 +f 119//9 123//9 121//9 +f 124//43 120//43 118//43 +f 119//51 125//51 126//51 +f 130//46 129//46 120//46 +f 125//45 127//45 128//45 +f 132//43 131//43 129//43 +f 127//52 131//52 132//52 +f 130//49 124//49 128//49 +f 120//48 129//48 127//48 +f 122//49 123//49 124//49 +f 120//48 119//48 118//48 +f 134//53 133//53 137//53 +f 135//9 139//9 137//9 +f 138//43 140//43 136//43 +f 139//54 135//54 141//54 +f 146//48 145//48 136//48 +f 141//49 143//49 144//49 +f 146//43 148//43 147//43 +f 143//55 147//55 148//55 +f 146//46 140//46 144//46 +f 136//45 145//45 143//45 +f 138//46 139//46 140//46 +f 136//45 135//45 134//45 +f 150//56 149//56 153//56 +f 151//9 155//9 153//9 +f 156//43 152//43 150//43 +f 151//57 157//57 158//57 +f 162//49 161//49 152//49 +f 157//48 159//48 160//48 +f 164//43 163//43 161//43 +f 159//58 163//58 164//58 +f 162//45 156//45 160//45 +f 152//46 161//46 159//46 +f 154//45 155//45 156//45 +f 152//46 151//46 150//46 +f 166//59 168//59 167//59 +f 168//60 170//60 169//60 +f 170//61 172//61 171//61 +f 172//62 174//62 173//62 +f 174//63 176//63 175//63 +f 176//64 178//64 177//64 +f 178//65 180//65 179//65 +f 180//66 182//66 181//66 +f 182//67 184//67 183//67 +f 184//68 186//68 185//68 +f 186//43 178//43 166//43 +f 188//69 166//69 165//69 +f 186//70 188//70 187//70 +f 187//71 200//71 199//71 +f 192//9 196//9 200//9 +f 169//72 191//72 190//72 +f 183//73 185//73 199//73 +f 183//74 198//74 197//74 +f 181//75 197//75 196//75 +f 179//76 196//76 195//76 +f 177//77 195//77 194//77 +f 175//78 194//78 193//78 +f 173//79 193//79 192//79 +f 165//80 189//80 200//80 +f 167//81 190//81 189//81 +f 171//82 192//82 191//82 +f 207//83 206//83 230//83 +f 233//9 231//9 227//9 +f 207//84 219//84 218//84 +f 204//85 216//85 215//85 +f 211//86 223//86 222//86 +f 208//87 220//87 219//87 +f 204//88 205//88 217//88 +f 212//89 224//89 223//89 +f 201//90 202//90 213//90 +f 208//91 209//91 221//91 +f 206//92 218//92 217//92 +f 201//93 214//93 224//93 +f 203//94 215//94 213//94 +f 210//95 222//95 221//95 +f 204//96 203//96 227//96 +f 210//97 234//97 235//97 +f 207//98 231//98 232//98 +f 204//99 228//99 229//99 +f 212//100 211//100 235//100 +f 201//101 226//101 225//101 +f 208//102 232//102 233//102 +f 205//103 229//103 230//103 +f 201//104 212//104 236//104 +f 202//105 225//105 227//105 +f 209//106 233//106 234//106 +f 1//1 2//1 3//1 +f 3//2 5//2 21//2 +f 3//2 4//2 5//2 +f 5//3 6//3 7//3 +f 9//4 11//4 18//4 +f 7//5 8//5 9//5 +f 7//5 9//5 17//5 +f 9//4 10//4 11//4 +f 5//3 7//3 24//3 +f 11//6 12//6 13//6 +f 15//7 16//7 1//7 +f 13//8 14//8 15//8 +f 15//7 1//7 22//7 +f 1//1 3//1 20//1 +f 15//9 1//9 7//9 +f 3//9 5//9 7//9 +f 7//9 9//9 15//9 +f 11//9 13//9 15//9 +f 1//9 3//9 7//9 +f 19//6 11//6 25//6 +f 25//8 13//8 22//8 +f 26//4 27//4 28//4 +f 28//6 30//6 46//6 +f 28//6 29//6 30//6 +f 30//8 31//8 32//8 +f 34//1 36//1 43//1 +f 32//7 33//7 34//7 +f 32//7 34//7 42//7 +f 34//1 35//1 36//1 +f 30//8 32//8 49//8 +f 36//2 37//2 38//2 +f 40//5 41//5 26//5 +f 38//3 39//3 40//3 +f 40//5 26//5 47//5 +f 26//4 28//4 45//4 +f 40//9 26//9 32//9 +f 28//9 30//9 32//9 +f 32//9 34//9 36//9 +f 36//9 38//9 32//9 +f 26//9 28//9 32//9 +f 44//2 36//2 50//2 +f 50//3 38//3 47//3 +f 51//8 52//8 53//8 +f 53//7 55//7 71//7 +f 53//7 54//7 55//7 +f 55//1 56//1 57//1 +f 59//3 61//3 68//3 +f 57//2 58//2 59//2 +f 57//2 59//2 67//2 +f 59//3 60//3 61//3 +f 55//1 57//1 74//1 +f 61//5 62//5 63//5 +f 65//6 66//6 51//6 +f 63//4 64//4 65//4 +f 65//6 51//6 72//6 +f 51//8 53//8 70//8 +f 65//9 51//9 57//9 +f 53//9 55//9 57//9 +f 57//9 59//9 61//9 +f 61//9 63//9 65//9 +f 51//9 53//9 57//9 +f 69//5 61//5 75//5 +f 75//4 63//4 72//4 +f 76//3 77//3 78//3 +f 78//5 80//5 96//5 +f 78//5 79//5 80//5 +f 80//4 81//4 82//4 +f 84//8 86//8 93//8 +f 82//6 83//6 84//6 +f 82//6 84//6 92//6 +f 84//8 85//8 86//8 +f 80//4 82//4 99//4 +f 86//7 87//7 88//7 +f 90//2 91//2 76//2 +f 88//1 89//1 90//1 +f 90//2 76//2 97//2 +f 76//3 78//3 95//3 +f 90//9 76//9 82//9 +f 78//9 80//9 82//9 +f 82//9 84//9 86//9 +f 86//9 88//9 90//9 +f 76//9 78//9 82//9 +f 94//7 86//7 100//7 +f 100//1 88//1 97//1 +f 106//42 102//42 105//42 +f 101//9 103//9 105//9 +f 106//43 108//43 102//43 +f 107//44 103//44 110//44 +f 108//45 114//45 104//45 +f 110//46 109//46 112//46 +f 113//43 114//43 115//43 +f 116//47 112//47 115//47 +f 110//48 112//48 108//48 +f 116//48 114//48 112//48 +f 115//49 111//49 113//49 +f 109//49 104//49 111//49 +f 110//48 108//48 107//48 +f 106//48 105//48 107//48 +f 101//49 102//49 103//49 +f 104//49 109//49 103//49 +f 122//50 118//50 121//50 +f 117//9 119//9 121//9 +f 122//43 124//43 118//43 +f 123//51 119//51 126//51 +f 124//46 130//46 120//46 +f 126//45 125//45 128//45 +f 130//43 132//43 129//43 +f 128//52 127//52 132//52 +f 126//49 128//49 124//49 +f 132//49 130//49 128//49 +f 131//48 127//48 129//48 +f 125//48 120//48 127//48 +f 126//49 124//49 123//49 +f 122//49 121//49 123//49 +f 117//48 118//48 119//48 +f 120//48 125//48 119//48 +f 138//53 134//53 137//53 +f 133//9 135//9 137//9 +f 134//43 138//43 136//43 +f 142//54 139//54 141//54 +f 140//48 146//48 136//48 +f 142//49 141//49 144//49 +f 145//43 146//43 147//43 +f 144//55 143//55 148//55 +f 142//46 144//46 140//46 +f 148//46 146//46 144//46 +f 147//45 143//45 145//45 +f 141//45 136//45 143//45 +f 142//46 140//46 139//46 +f 138//46 137//46 139//46 +f 133//45 134//45 135//45 +f 136//45 141//45 135//45 +f 154//56 150//56 153//56 +f 149//9 151//9 153//9 +f 154//43 156//43 150//43 +f 155//57 151//57 158//57 +f 156//49 162//49 152//49 +f 158//48 157//48 160//48 +f 162//43 164//43 161//43 +f 160//58 159//58 164//58 +f 158//45 160//45 156//45 +f 164//45 162//45 160//45 +f 163//46 159//46 161//46 +f 157//46 152//46 159//46 +f 158//45 156//45 155//45 +f 154//45 153//45 155//45 +f 149//46 150//46 151//46 +f 152//46 157//46 151//46 +f 165//59 166//59 167//59 +f 167//60 168//60 169//60 +f 169//61 170//61 171//61 +f 171//62 172//62 173//62 +f 173//63 174//63 175//63 +f 175//64 176//64 177//64 +f 177//65 178//65 179//65 +f 179//66 180//66 181//66 +f 181//67 182//67 183//67 +f 183//68 184//68 185//68 +f 170//43 168//43 166//43 +f 166//43 188//43 186//43 +f 186//43 184//43 178//43 +f 182//43 180//43 178//43 +f 178//43 176//43 174//43 +f 174//43 172//43 170//43 +f 170//43 166//43 178//43 +f 184//43 182//43 178//43 +f 178//43 174//43 170//43 +f 187//69 188//69 165//69 +f 185//70 186//70 187//70 +f 185//71 187//71 199//71 +f 200//9 189//9 192//9 +f 190//9 191//9 192//9 +f 192//9 193//9 196//9 +f 194//9 195//9 196//9 +f 196//9 197//9 198//9 +f 198//9 199//9 196//9 +f 189//9 190//9 192//9 +f 193//9 194//9 196//9 +f 196//9 199//9 200//9 +f 167//72 169//72 190//72 +f 198//73 183//73 199//73 +f 181//74 183//74 197//74 +f 179//75 181//75 196//75 +f 177//76 179//76 195//76 +f 175//77 177//77 194//77 +f 173//78 175//78 193//78 +f 171//79 173//79 192//79 +f 187//80 165//80 200//80 +f 165//81 167//81 189//81 +f 169//82 171//82 191//82 +f 231//83 207//83 230//83 +f 227//9 225//9 235//9 +f 226//9 236//9 235//9 +f 235//9 234//9 233//9 +f 233//9 232//9 231//9 +f 231//9 230//9 229//9 +f 229//9 228//9 231//9 +f 225//9 226//9 235//9 +f 235//9 233//9 227//9 +f 231//9 228//9 227//9 +f 206//84 207//84 218//84 +f 203//85 204//85 215//85 +f 210//86 211//86 222//86 +f 207//87 208//87 219//87 +f 216//88 204//88 217//88 +f 211//89 212//89 223//89 +f 214//90 201//90 213//90 +f 220//91 208//91 221//91 +f 205//92 206//92 217//92 +f 212//93 201//93 224//93 +f 202//94 203//94 213//94 +f 209//95 210//95 221//95 +f 228//96 204//96 227//96 +f 211//97 210//97 235//97 +f 208//98 207//98 232//98 +f 205//99 204//99 229//99 +f 236//100 212//100 235//100 +f 202//101 201//101 225//101 +f 209//102 208//102 233//102 +f 206//103 205//103 230//103 +f 226//104 201//104 236//104 +f 203//105 202//105 227//105 +f 210//106 209//106 234//106 diff --git a/assets/hbm/models/missile_parts/mp_t_15_kerosene_tec.obj b/assets/hbm/models/missile_parts/mp_t_15_kerosene_tec.obj new file mode 100644 index 000000000..bac5e4040 --- /dev/null +++ b/assets/hbm/models/missile_parts/mp_t_15_kerosene_tec.obj @@ -0,0 +1,744 @@ +# Blender v2.76 (sub 0) OBJ File: 'mp_t_15_kerosene_tec.blend' +# www.blender.org +o Cube.003_Cube.004 +v 0.671751 0.375000 0.671751 +v 0.671751 4.500000 0.671751 +v 0.494975 0.375000 0.744975 +v 0.494975 4.500000 0.744975 +v 0.318198 0.375000 0.671751 +v 0.318198 4.500000 0.671751 +v 0.244975 0.375000 0.494975 +v 0.244975 4.500000 0.494975 +v 0.318198 0.375000 0.318198 +v 0.318198 4.500000 0.318198 +v 0.494975 0.375000 0.244975 +v 0.494975 4.500000 0.244975 +v 0.671751 0.375000 0.318198 +v 0.671751 4.500000 0.318198 +v 0.744975 0.375000 0.494975 +v 0.744975 4.500000 0.494975 +v 0.244975 0.000000 0.494975 +v 0.318198 0.000000 0.318198 +v 0.494975 0.000000 0.244975 +v 0.671751 0.250000 0.671751 +v 0.494975 0.250000 0.744975 +v 0.744975 0.250000 0.494975 +v 0.494975 5.000000 0.494975 +v 0.318198 0.125000 0.671751 +v 0.671751 0.124998 0.318198 +v 0.318198 0.124998 -0.671751 +v 0.671751 0.125000 -0.318198 +v 0.494975 5.000000 -0.494975 +v 0.494975 0.250000 -0.744975 +v 0.744975 0.250000 -0.494975 +v 0.671751 0.250000 -0.671751 +v 0.244975 0.000000 -0.494975 +v 0.318198 0.000000 -0.318198 +v 0.494975 0.000000 -0.244975 +v 0.494975 4.500000 -0.744975 +v 0.494975 0.375000 -0.744975 +v 0.318198 4.500000 -0.671751 +v 0.318198 0.375000 -0.671751 +v 0.244975 4.500000 -0.494975 +v 0.244975 0.375000 -0.494975 +v 0.318198 4.500000 -0.318198 +v 0.318198 0.375000 -0.318198 +v 0.494975 4.500000 -0.244975 +v 0.494975 0.375000 -0.244975 +v 0.671751 4.500000 -0.318198 +v 0.671751 0.375000 -0.318198 +v 0.744975 4.500000 -0.494975 +v 0.744975 0.375000 -0.494975 +v 0.671751 4.500000 -0.671751 +v 0.671751 0.375000 -0.671751 +v -0.250000 0.000000 0.031250 +v -0.500000 0.250000 0.031250 +v -0.625000 0.000000 0.031250 +v -0.687500 0.250000 0.031250 +v -0.250000 0.000000 -0.031250 +v -0.500000 0.250000 -0.031250 +v -0.625000 0.000000 -0.031250 +v -0.687500 0.250000 -0.031250 +v -0.875000 0.250000 0.031250 +v -0.875000 0.250000 -0.031250 +v -0.875000 1.000000 0.031250 +v -0.875000 1.000000 -0.031250 +v -0.687500 1.375000 0.031250 +v -0.687500 1.375000 -0.031250 +v -0.750000 1.375000 0.031250 +v -0.750000 1.375000 -0.031250 +v 0.250000 0.000000 -0.031250 +v 0.500000 0.250000 -0.031250 +v 0.625000 0.000000 -0.031250 +v 0.687500 0.250000 -0.031250 +v 0.250000 0.000000 0.031250 +v 0.500000 0.250000 0.031250 +v 0.625000 0.000000 0.031250 +v 0.687500 0.250000 0.031250 +v 0.875000 0.250000 -0.031250 +v 0.875000 0.250000 0.031250 +v 0.875000 1.000000 -0.031250 +v 0.875000 1.000000 0.031250 +v 0.687500 1.375000 -0.031250 +v 0.687500 1.375000 0.031250 +v 0.750000 1.375000 -0.031250 +v 0.750000 1.375000 0.031250 +v 0.031250 0.000000 0.250000 +v 0.031250 0.250000 0.500000 +v 0.031250 0.000000 0.625000 +v 0.031250 0.250000 0.687500 +v -0.031250 0.000000 0.250000 +v -0.031250 0.250000 0.500000 +v -0.031250 0.000000 0.625000 +v -0.031250 0.250000 0.687500 +v 0.031250 0.250000 0.875000 +v -0.031250 0.250000 0.875000 +v 0.031250 1.000000 0.875000 +v -0.031250 1.000000 0.875000 +v 0.031250 1.375000 0.687500 +v -0.031250 1.375000 0.687500 +v 0.031250 1.375000 0.750000 +v -0.031250 1.375000 0.750000 +v -0.031250 0.000000 -0.250000 +v -0.031250 0.250000 -0.500000 +v -0.031250 0.000000 -0.625000 +v -0.031250 0.250000 -0.687500 +v 0.031250 0.000000 -0.250000 +v 0.031250 0.250000 -0.500000 +v 0.031250 0.000000 -0.625000 +v 0.031250 0.250000 -0.687500 +v -0.031250 0.250000 -0.875000 +v 0.031250 0.250000 -0.875000 +v -0.031250 1.000000 -0.875000 +v 0.031250 1.000000 -0.875000 +v -0.031250 1.375000 -0.687500 +v 0.031250 1.375000 -0.687500 +v -0.031250 1.375000 -0.750000 +v 0.031250 1.375000 -0.750000 +v 0.000000 0.500000 -0.750000 +v 0.000000 1.500000 -0.750000 +v 0.375000 0.500000 -0.649519 +v 0.375000 1.500000 -0.649519 +v 0.649519 0.500000 -0.375000 +v 0.649519 1.500000 -0.375000 +v 0.750000 0.500000 0.000000 +v 0.750000 1.500000 0.000000 +v 0.649519 0.500000 0.375000 +v 0.649519 1.500000 0.375000 +v 0.375000 0.500000 0.649519 +v 0.375000 1.500000 0.649519 +v 0.000000 0.500000 0.750000 +v 0.000000 1.500000 0.750000 +v -0.375000 0.500000 0.649519 +v -0.375000 1.500000 0.649519 +v -0.649519 0.500000 0.375000 +v -0.649519 1.500000 0.375000 +v -0.750000 0.500000 0.000000 +v -0.750000 1.500000 0.000000 +v -0.649519 0.500000 -0.375000 +v -0.649519 1.500000 -0.375000 +v -0.375000 0.500000 -0.649519 +v -0.375000 1.500000 -0.649519 +v -0.000000 0.750000 -0.637500 +v 0.318750 0.750000 -0.552091 +v 0.552091 0.750000 -0.318750 +v 0.637500 0.750000 0.000000 +v 0.552091 0.750000 0.318750 +v 0.318750 0.750000 0.552091 +v 0.000000 0.750000 0.637500 +v -0.318750 0.750000 0.552091 +v -0.552091 0.750000 0.318750 +v -0.637500 0.750000 0.000000 +v -0.552091 0.750000 -0.318750 +v -0.318750 0.750000 -0.552091 +v 0.000000 0.225000 -0.450000 +v -0.225000 0.225000 -0.389711 +v -0.389711 0.225000 -0.225000 +v -0.450000 0.225000 0.000000 +v -0.389711 0.225000 0.225000 +v -0.225000 0.225000 0.389711 +v -0.000000 0.225000 0.450000 +v 0.225000 0.225000 0.389711 +v 0.389711 0.225000 0.225000 +v 0.450000 0.225000 0.000000 +v 0.389712 0.225000 -0.225000 +v 0.225000 0.225000 -0.389711 +v -0.191250 0.675000 -0.331255 +v 0.000000 0.675000 -0.382500 +v -0.331255 0.675000 -0.191250 +v -0.382500 0.675000 0.000000 +v -0.331255 0.675000 0.191250 +v -0.191250 0.675000 0.331255 +v -0.000000 0.675000 0.382500 +v 0.191250 0.675000 0.331255 +v 0.331255 0.675000 0.191250 +v 0.382500 0.675000 0.000000 +v 0.331255 0.675000 -0.191250 +v 0.191250 0.675000 -0.331255 +v -0.125000 0.625000 -0.216506 +v 0.000000 0.625000 -0.250000 +v -0.216506 0.625000 -0.125000 +v -0.250000 0.625000 0.000000 +v -0.216506 0.625000 0.125000 +v -0.125000 0.625000 0.216506 +v -0.000000 0.625000 0.250000 +v 0.125000 0.625000 0.216506 +v 0.216506 0.625000 0.125000 +v 0.250000 0.625000 0.000000 +v 0.216506 0.625000 -0.125000 +v 0.125000 0.625000 -0.216506 +v -0.671751 0.124998 -0.318198 +v -0.318198 0.125000 -0.671751 +v -0.494975 5.000000 -0.494975 +v -0.744975 0.250000 -0.494975 +v -0.494975 0.250000 -0.744975 +v -0.671751 0.250000 -0.671751 +v -0.494975 0.000000 -0.244975 +v -0.318198 0.000000 -0.318198 +v -0.244975 0.000000 -0.494975 +v -0.744975 4.500000 -0.494975 +v -0.744975 0.375000 -0.494975 +v -0.671751 4.500000 -0.318198 +v -0.671751 0.375000 -0.318198 +v -0.494975 4.500000 -0.244975 +v -0.494975 0.375000 -0.244975 +v -0.318198 4.500000 -0.318198 +v -0.318198 0.375000 -0.318198 +v -0.244975 4.500000 -0.494975 +v -0.244975 0.375000 -0.494975 +v -0.318198 4.500000 -0.671751 +v -0.318198 0.375000 -0.671751 +v -0.494975 4.500000 -0.744975 +v -0.494975 0.375000 -0.744975 +v -0.671751 4.500000 -0.671751 +v -0.671751 0.375000 -0.671751 +v -0.318198 0.124998 0.671751 +v -0.671751 0.125000 0.318198 +v -0.494975 5.000000 0.494975 +v -0.494975 0.250000 0.744975 +v -0.744975 0.250000 0.494975 +v -0.671751 0.250000 0.671751 +v -0.244975 0.000000 0.494975 +v -0.318198 0.000000 0.318198 +v -0.494975 0.000000 0.244975 +v -0.494975 4.500000 0.744975 +v -0.494975 0.375000 0.744975 +v -0.318198 4.500000 0.671751 +v -0.318198 0.375000 0.671751 +v -0.244975 4.500000 0.494975 +v -0.244975 0.375000 0.494975 +v -0.318198 4.500000 0.318198 +v -0.318198 0.375000 0.318198 +v -0.494975 4.500000 0.244975 +v -0.494975 0.375000 0.244975 +v -0.671751 4.500000 0.318198 +v -0.671751 0.375000 0.318198 +v -0.744975 4.500000 0.494975 +v -0.744975 0.375000 0.494975 +v -0.671751 4.500000 0.671751 +v -0.671751 0.375000 0.671751 +vn 0.382700 0.000000 0.923900 +vn -0.382700 0.000000 0.923900 +vn -0.923900 0.000000 0.382700 +vn -0.382700 0.000000 -0.923900 +vn -0.923900 0.000000 -0.382700 +vn 0.382700 0.000000 -0.923900 +vn 0.923900 0.000000 0.382700 +vn 0.923900 0.000000 -0.382700 +vn 0.000000 -1.000000 0.000000 +vn -0.347400 0.419400 -0.838700 +vn 0.347400 0.419400 -0.838700 +vn 0.838700 0.419400 -0.347400 +vn 0.838700 0.419400 0.347400 +vn 0.347400 0.419400 0.838700 +vn -0.838700 0.419400 -0.347400 +vn -0.838700 0.419400 0.347400 +vn -0.347400 0.419400 0.838700 +vn 0.707100 0.707100 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.707100 -0.707100 0.000000 +vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.948700 0.316200 0.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 1.000000 +vn -0.707100 0.707100 0.000000 +vn 0.707100 -0.707100 0.000000 +vn 0.948700 0.316200 0.000000 +vn 0.000000 0.707100 -0.707100 +vn 0.000000 -0.707100 0.707100 +vn 0.000000 0.316200 0.948700 +vn 0.000000 0.707100 0.707100 +vn 0.000000 -0.707100 -0.707100 +vn 0.000000 0.316200 -0.948700 +vn 0.258800 0.000000 -0.965900 +vn 0.707100 0.000000 -0.707100 +vn 0.965900 0.000000 -0.258800 +vn 0.965900 0.000000 0.258800 +vn 0.707100 0.000000 0.707100 +vn 0.258800 0.000000 0.965900 +vn -0.258800 0.000000 0.965900 +vn -0.707100 0.000000 0.707100 +vn -0.965900 0.000000 0.258800 +vn -0.965900 0.000000 -0.258800 +vn -0.258800 0.000000 -0.965900 +vn -0.707100 0.000000 -0.707100 +vn 0.648500 -0.398600 0.648500 +vn -0.648500 -0.398600 0.648500 +vn 0.885900 -0.398600 0.237400 +vn 0.885900 -0.398600 -0.237400 +vn 0.648500 -0.398600 -0.648500 +vn 0.237400 -0.398600 -0.885900 +vn -0.237400 -0.398600 -0.885900 +vn -0.648500 -0.398600 -0.648500 +vn -0.885900 -0.398600 -0.237400 +vn 0.237400 -0.398600 0.885900 +vn -0.237400 -0.398600 0.885900 +vn -0.885900 -0.398600 0.237400 +vn 0.233100 -0.434900 -0.869800 +vn -0.256100 0.143400 0.955900 +vn -0.955900 0.143400 -0.256100 +vn 0.955900 0.143400 -0.256100 +vn 0.256100 0.143400 0.955900 +vn -0.955900 0.143400 0.256100 +vn 0.699800 0.143400 -0.699800 +vn -0.256100 0.143400 -0.955900 +vn 0.699800 0.143400 0.699800 +vn -0.699800 0.143400 0.699800 +vn 0.256100 0.143400 -0.955900 +vn -0.699800 0.143400 -0.699800 +vn 0.955900 0.143400 0.256100 +vn 0.869800 -0.434900 0.233100 +vn -0.869800 -0.434900 0.233100 +vn -0.233100 -0.434900 -0.869800 +vn 0.869800 -0.434900 -0.233100 +vn -0.636700 -0.434900 0.636700 +vn 0.233100 -0.434900 0.869800 +vn -0.636700 -0.434900 -0.636700 +vn 0.636700 -0.434900 -0.636700 +vn -0.233100 -0.434900 0.869800 +vn 0.636700 -0.434900 0.636700 +vn -0.869800 -0.434900 -0.233100 +s off +f 2//1 4//1 3//1 +f 5//2 24//2 21//2 +f 4//2 6//2 5//2 +f 6//3 8//3 7//3 +f 11//4 19//4 18//4 +f 8//5 10//5 9//5 +f 9//5 18//5 17//5 +f 10//4 12//4 11//4 +f 7//3 17//3 24//3 +f 12//6 14//6 13//6 +f 16//7 2//7 1//7 +f 14//8 16//8 15//8 +f 1//7 20//7 22//7 +f 3//1 21//1 20//1 +f 9//9 11//9 15//9 +f 11//6 13//6 25//6 +f 13//8 15//8 22//8 +f 10//10 23//10 12//10 +f 12//11 23//11 14//11 +f 14//12 23//12 16//12 +f 16//13 23//13 2//13 +f 2//14 23//14 4//14 +f 8//15 23//15 10//15 +f 6//16 23//16 8//16 +f 4//17 23//17 6//17 +f 47//13 28//13 45//13 +f 45//14 28//14 43//14 +f 43//17 28//17 41//17 +f 49//12 28//12 47//12 +f 35//11 28//11 49//11 +f 37//10 28//10 35//10 +f 39//15 28//15 37//15 +f 41//16 28//16 39//16 +f 38//4 36//4 29//4 +f 40//5 38//5 26//5 +f 48//8 30//8 31//8 +f 50//6 31//6 29//6 +f 37//4 35//4 36//4 +f 35//6 49//6 50//6 +f 39//5 37//5 38//5 +f 44//1 34//1 27//1 +f 41//3 39//3 40//3 +f 42//2 33//2 34//2 +f 43//2 41//2 42//2 +f 40//3 32//3 33//3 +f 45//1 43//1 44//1 +f 47//7 45//7 46//7 +f 46//7 27//7 30//7 +f 49//8 47//8 48//8 +f 52//18 51//18 55//18 +f 53//9 57//9 55//9 +f 58//19 54//19 52//19 +f 53//20 59//20 60//20 +f 64//21 63//21 54//21 +f 59//22 61//22 62//22 +f 66//19 65//19 63//19 +f 61//23 65//23 66//23 +f 64//24 58//24 62//24 +f 54//25 63//25 61//25 +f 56//24 57//24 58//24 +f 54//25 53//25 52//25 +f 68//26 67//26 71//26 +f 69//9 73//9 71//9 +f 74//19 70//19 68//19 +f 69//27 75//27 76//27 +f 80//22 79//22 70//22 +f 75//21 77//21 78//21 +f 82//19 81//19 79//19 +f 77//28 81//28 82//28 +f 80//25 74//25 78//25 +f 70//24 79//24 77//24 +f 72//25 73//25 74//25 +f 70//24 69//24 68//24 +f 84//29 83//29 87//29 +f 83//9 85//9 89//9 +f 88//19 90//19 86//19 +f 85//30 91//30 92//30 +f 96//24 95//24 86//24 +f 91//25 93//25 94//25 +f 96//19 98//19 97//19 +f 93//31 97//31 98//31 +f 96//22 90//22 94//22 +f 86//21 95//21 93//21 +f 88//22 89//22 90//22 +f 86//21 85//21 84//21 +f 100//32 99//32 103//32 +f 101//9 105//9 103//9 +f 106//19 102//19 100//19 +f 101//33 107//33 108//33 +f 112//25 111//25 102//25 +f 107//24 109//24 110//24 +f 114//19 113//19 111//19 +f 109//34 113//34 114//34 +f 112//21 106//21 110//21 +f 102//22 111//22 109//22 +f 104//21 105//21 106//21 +f 102//22 101//22 100//22 +f 116//35 118//35 117//35 +f 118//36 120//36 119//36 +f 120//37 122//37 121//37 +f 122//38 124//38 123//38 +f 124//39 126//39 125//39 +f 126//40 128//40 127//40 +f 128//41 130//41 129//41 +f 130//42 132//42 131//42 +f 132//43 134//43 133//43 +f 134//44 136//44 135//44 +f 136//19 128//19 120//19 +f 138//45 116//45 115//45 +f 136//46 138//46 137//46 +f 135//47 137//47 150//47 +f 142//9 148//9 150//9 +f 119//48 141//48 140//48 +f 135//49 149//49 148//49 +f 133//50 148//50 147//50 +f 131//51 147//51 146//51 +f 129//52 146//52 145//52 +f 127//53 145//53 144//53 +f 125//54 144//54 143//54 +f 123//55 143//55 142//55 +f 115//56 139//56 150//56 +f 117//57 140//57 139//57 +f 121//58 142//58 141//58 +f 156//59 180//59 181//59 +f 185//9 181//9 177//9 +f 156//60 157//60 169//60 +f 153//61 154//61 166//61 +f 161//62 173//62 172//62 +f 158//63 170//63 169//63 +f 155//64 167//64 166//64 +f 162//65 174//65 173//65 +f 151//66 152//66 163//66 +f 159//67 171//67 170//67 +f 156//68 168//68 167//68 +f 162//69 151//69 164//69 +f 153//70 165//70 163//70 +f 159//71 160//71 172//71 +f 153//72 177//72 178//72 +f 160//73 184//73 185//73 +f 157//74 181//74 182//74 +f 154//75 178//75 179//75 +f 161//76 185//76 186//76 +f 151//77 176//77 175//77 +f 158//78 182//78 183//78 +f 155//79 179//79 180//79 +f 162//80 186//80 176//80 +f 152//81 175//81 177//81 +f 159//82 183//82 184//82 +f 208//11 189//11 206//11 +f 206//12 189//12 204//12 +f 204//13 189//13 202//13 +f 210//10 189//10 208//10 +f 196//15 189//15 210//15 +f 198//16 189//16 196//16 +f 200//17 189//17 198//17 +f 202//14 189//14 200//14 +f 199//3 197//3 190//3 +f 201//2 199//2 187//2 +f 209//4 191//4 192//4 +f 211//5 192//5 190//5 +f 198//3 196//3 197//3 +f 196//5 210//5 211//5 +f 200//2 198//2 199//2 +f 205//8 195//8 188//8 +f 202//1 200//1 201//1 +f 203//7 194//7 195//7 +f 204//7 202//7 203//7 +f 201//1 193//1 194//1 +f 206//8 204//8 205//8 +f 208//6 206//6 207//6 +f 207//6 188//6 191//6 +f 210//4 208//4 209//4 +f 233//15 214//15 231//15 +f 231//10 214//10 229//10 +f 229//11 214//11 227//11 +f 235//16 214//16 233//16 +f 221//17 214//17 235//17 +f 223//14 214//14 221//14 +f 225//13 214//13 223//13 +f 227//12 214//12 225//12 +f 224//1 222//1 215//1 +f 226//7 224//7 212//7 +f 234//3 216//3 217//3 +f 236//2 217//2 215//2 +f 223//1 221//1 222//1 +f 221//2 235//2 236//2 +f 225//7 223//7 224//7 +f 230//4 220//4 213//4 +f 227//8 225//8 226//8 +f 228//6 219//6 220//6 +f 229//6 227//6 228//6 +f 226//8 218//8 219//8 +f 231//4 229//4 230//4 +f 233//5 231//5 232//5 +f 232//5 213//5 216//5 +f 235//3 233//3 234//3 +f 46//9 44//9 40//9 +f 207//9 205//9 201//9 +f 232//9 230//9 226//9 +f 1//1 2//1 3//1 +f 3//2 5//2 21//2 +f 3//2 4//2 5//2 +f 5//3 6//3 7//3 +f 9//4 11//4 18//4 +f 7//5 8//5 9//5 +f 7//5 9//5 17//5 +f 9//4 10//4 11//4 +f 5//3 7//3 24//3 +f 11//6 12//6 13//6 +f 15//7 16//7 1//7 +f 13//8 14//8 15//8 +f 15//7 1//7 22//7 +f 1//1 3//1 20//1 +f 15//9 1//9 7//9 +f 3//9 5//9 7//9 +f 7//9 9//9 15//9 +f 11//9 13//9 15//9 +f 1//9 3//9 7//9 +f 19//6 11//6 25//6 +f 25//8 13//8 22//8 +f 26//4 38//4 29//4 +f 32//5 40//5 26//5 +f 50//8 48//8 31//8 +f 36//6 50//6 29//6 +f 38//4 37//4 36//4 +f 36//6 35//6 50//6 +f 40//5 39//5 38//5 +f 46//1 44//1 27//1 +f 42//3 41//3 40//3 +f 44//2 42//2 34//2 +f 44//2 43//2 42//2 +f 42//3 40//3 33//3 +f 46//1 45//1 44//1 +f 48//7 47//7 46//7 +f 48//7 46//7 30//7 +f 50//8 49//8 48//8 +f 56//18 52//18 55//18 +f 51//9 53//9 55//9 +f 56//19 58//19 52//19 +f 57//20 53//20 60//20 +f 58//21 64//21 54//21 +f 60//22 59//22 62//22 +f 64//19 66//19 63//19 +f 62//23 61//23 66//23 +f 60//24 62//24 58//24 +f 66//24 64//24 62//24 +f 65//25 61//25 63//25 +f 59//25 54//25 61//25 +f 60//24 58//24 57//24 +f 56//24 55//24 57//24 +f 51//25 52//25 53//25 +f 54//25 59//25 53//25 +f 72//26 68//26 71//26 +f 67//9 69//9 71//9 +f 72//19 74//19 68//19 +f 73//27 69//27 76//27 +f 74//22 80//22 70//22 +f 76//21 75//21 78//21 +f 80//19 82//19 79//19 +f 78//28 77//28 82//28 +f 76//25 78//25 74//25 +f 82//25 80//25 78//25 +f 81//24 77//24 79//24 +f 75//24 70//24 77//24 +f 76//25 74//25 73//25 +f 72//25 71//25 73//25 +f 67//24 68//24 69//24 +f 70//24 75//24 69//24 +f 88//29 84//29 87//29 +f 87//9 83//9 89//9 +f 84//19 88//19 86//19 +f 89//30 85//30 92//30 +f 90//24 96//24 86//24 +f 92//25 91//25 94//25 +f 95//19 96//19 97//19 +f 94//31 93//31 98//31 +f 92//22 94//22 90//22 +f 98//22 96//22 94//22 +f 97//21 93//21 95//21 +f 91//21 86//21 93//21 +f 92//22 90//22 89//22 +f 88//22 87//22 89//22 +f 83//21 84//21 85//21 +f 86//21 91//21 85//21 +f 104//32 100//32 103//32 +f 99//9 101//9 103//9 +f 104//19 106//19 100//19 +f 105//33 101//33 108//33 +f 106//25 112//25 102//25 +f 108//24 107//24 110//24 +f 112//19 114//19 111//19 +f 110//34 109//34 114//34 +f 108//21 110//21 106//21 +f 114//21 112//21 110//21 +f 113//22 109//22 111//22 +f 107//22 102//22 109//22 +f 108//21 106//21 105//21 +f 104//21 103//21 105//21 +f 99//22 100//22 101//22 +f 102//22 107//22 101//22 +f 115//35 116//35 117//35 +f 117//36 118//36 119//36 +f 119//37 120//37 121//37 +f 121//38 122//38 123//38 +f 123//39 124//39 125//39 +f 125//40 126//40 127//40 +f 127//41 128//41 129//41 +f 129//42 130//42 131//42 +f 131//43 132//43 133//43 +f 133//44 134//44 135//44 +f 120//19 118//19 136//19 +f 116//19 138//19 136//19 +f 136//19 134//19 132//19 +f 132//19 130//19 136//19 +f 128//19 126//19 124//19 +f 124//19 122//19 128//19 +f 118//19 116//19 136//19 +f 136//19 130//19 128//19 +f 128//19 122//19 120//19 +f 137//45 138//45 115//45 +f 135//46 136//46 137//46 +f 149//47 135//47 150//47 +f 150//9 139//9 142//9 +f 140//9 141//9 142//9 +f 142//9 143//9 146//9 +f 144//9 145//9 146//9 +f 146//9 147//9 148//9 +f 148//9 149//9 150//9 +f 139//9 140//9 142//9 +f 143//9 144//9 146//9 +f 146//9 148//9 142//9 +f 117//48 119//48 140//48 +f 133//49 135//49 148//49 +f 131//50 133//50 147//50 +f 129//51 131//51 146//51 +f 127//52 129//52 145//52 +f 125//53 127//53 144//53 +f 123//54 125//54 143//54 +f 121//55 123//55 142//55 +f 137//56 115//56 150//56 +f 115//57 117//57 139//57 +f 119//58 121//58 141//58 +f 157//59 156//59 181//59 +f 177//9 175//9 176//9 +f 176//9 186//9 185//9 +f 185//9 184//9 183//9 +f 183//9 182//9 181//9 +f 181//9 180//9 179//9 +f 179//9 178//9 177//9 +f 177//9 176//9 185//9 +f 185//9 183//9 181//9 +f 181//9 179//9 177//9 +f 168//60 156//60 169//60 +f 165//61 153//61 166//61 +f 160//62 161//62 172//62 +f 157//63 158//63 169//63 +f 154//64 155//64 166//64 +f 161//65 162//65 173//65 +f 164//66 151//66 163//66 +f 158//67 159//67 170//67 +f 155//68 156//68 167//68 +f 174//69 162//69 164//69 +f 152//70 153//70 163//70 +f 171//71 159//71 172//71 +f 154//72 153//72 178//72 +f 161//73 160//73 185//73 +f 158//74 157//74 182//74 +f 155//75 154//75 179//75 +f 162//76 161//76 186//76 +f 152//77 151//77 175//77 +f 159//78 158//78 183//78 +f 156//79 155//79 180//79 +f 151//80 162//80 176//80 +f 153//81 152//81 177//81 +f 160//82 159//82 184//82 +f 187//3 199//3 190//3 +f 193//2 201//2 187//2 +f 211//4 209//4 192//4 +f 197//5 211//5 190//5 +f 199//3 198//3 197//3 +f 197//5 196//5 211//5 +f 201//2 200//2 199//2 +f 207//8 205//8 188//8 +f 203//1 202//1 201//1 +f 205//7 203//7 195//7 +f 205//7 204//7 203//7 +f 203//1 201//1 194//1 +f 207//8 206//8 205//8 +f 209//6 208//6 207//6 +f 209//6 207//6 191//6 +f 211//4 210//4 209//4 +f 212//1 224//1 215//1 +f 218//7 226//7 212//7 +f 236//3 234//3 217//3 +f 222//2 236//2 215//2 +f 224//1 223//1 222//1 +f 222//2 221//2 236//2 +f 226//7 225//7 224//7 +f 232//4 230//4 213//4 +f 228//8 227//8 226//8 +f 230//6 228//6 220//6 +f 230//6 229//6 228//6 +f 228//8 226//8 219//8 +f 232//4 231//4 230//4 +f 234//5 233//5 232//5 +f 234//5 232//5 216//5 +f 236//3 235//3 234//3 +f 40//9 38//9 36//9 +f 36//9 50//9 40//9 +f 48//9 46//9 40//9 +f 44//9 42//9 40//9 +f 40//9 50//9 48//9 +f 201//9 199//9 197//9 +f 197//9 211//9 201//9 +f 209//9 207//9 201//9 +f 205//9 203//9 201//9 +f 201//9 211//9 209//9 +f 226//9 224//9 222//9 +f 222//9 236//9 226//9 +f 234//9 232//9 226//9 +f 230//9 228//9 226//9 +f 226//9 236//9 234//9 diff --git a/assets/hbm/models/missile_parts/mp_w_15_balefire.obj b/assets/hbm/models/missile_parts/mp_w_15_balefire.obj new file mode 100644 index 000000000..1c365e72f --- /dev/null +++ b/assets/hbm/models/missile_parts/mp_w_15_balefire.obj @@ -0,0 +1,821 @@ +# Blender v2.76 (sub 0) OBJ File: 'mp_w_15_balefire.blend' +# www.blender.org +o Cylinder +v 0.000000 0.562500 -0.750000 +v 0.000000 1.000000 -0.750000 +v 0.375000 0.562500 -0.649519 +v 0.375000 1.000000 -0.649519 +v 0.649519 0.562500 -0.375000 +v 0.649519 1.000000 -0.375000 +v 0.750000 0.562500 0.000000 +v 0.750000 1.000000 0.000000 +v 0.649519 0.562500 0.375000 +v 0.649519 1.000000 0.375000 +v 0.375000 0.562500 0.649519 +v 0.375000 1.000000 0.649519 +v 0.000000 0.562500 0.750000 +v 0.000000 1.000000 0.750000 +v -0.375000 0.562500 0.649519 +v -0.375000 1.000000 0.649519 +v -0.649519 0.562500 0.375000 +v -0.649519 1.000000 0.375000 +v -0.750000 0.562500 0.000000 +v -0.750000 1.000000 0.000000 +v -0.649519 0.562500 -0.375000 +v -0.649519 1.000000 -0.375000 +v -0.375000 0.562500 -0.649519 +v -0.375000 1.000000 -0.649519 +v 0.140625 1.125000 -0.243570 +v -0.000000 1.125000 -0.281250 +v 0.243570 1.125000 -0.140625 +v 0.281250 1.125000 0.000000 +v 0.243570 1.125000 0.140625 +v 0.140625 1.125000 0.243570 +v 0.000000 1.125000 0.281250 +v -0.140625 1.125000 0.243570 +v -0.243570 1.125000 0.140625 +v -0.281250 1.125000 0.000000 +v -0.243570 1.125000 -0.140625 +v -0.140625 1.125000 -0.243569 +v 0.140625 1.750000 -0.243570 +v 0.243570 1.750000 -0.140625 +v 0.243570 1.750000 0.140625 +v 0.140625 1.750000 0.243570 +v -0.140625 1.750000 0.243570 +v -0.243570 1.750000 0.140625 +v -0.243570 1.750000 -0.140625 +v -0.140625 1.750000 -0.243569 +v 0.140625 2.000000 -0.243570 +v -0.000000 2.000000 -0.281250 +v 0.243570 2.000000 -0.140625 +v 0.281250 2.000000 0.000000 +v 0.243570 2.000000 0.140625 +v 0.140625 2.000000 0.243570 +v -0.000000 2.000000 0.281250 +v -0.140625 2.000000 0.243570 +v -0.243570 2.000000 0.140625 +v -0.281250 2.000000 0.000000 +v -0.243570 2.000000 -0.140625 +v -0.140625 2.000000 -0.243569 +v -0.000000 2.750000 0.000000 +v -0.000000 1.500000 -0.575000 +v 0.053033 1.500000 -0.553033 +v 0.000000 1.000000 -0.650000 +v 0.000000 1.375000 -0.650000 +v 0.106066 1.000000 -0.606066 +v 0.106066 1.375000 -0.606066 +v 0.150000 1.000000 -0.500000 +v 0.150000 1.375000 -0.500000 +v 0.106066 1.000000 -0.393934 +v 0.106066 1.375000 -0.393934 +v -0.000000 1.000000 -0.350000 +v -0.000000 1.375000 -0.350000 +v -0.106066 1.000000 -0.393934 +v -0.106066 1.375000 -0.393934 +v -0.150000 1.000000 -0.500000 +v -0.150000 1.375000 -0.500000 +v -0.106066 1.000000 -0.606066 +v -0.106066 1.375000 -0.606066 +v 0.075000 1.500000 -0.500000 +v 0.053033 1.500000 -0.446967 +v -0.000000 1.500000 -0.425000 +v -0.053033 1.500000 -0.446967 +v -0.075000 1.500000 -0.500000 +v -0.053033 1.500000 -0.553033 +v -0.000000 1.500000 0.425000 +v 0.053033 1.500000 0.446967 +v 0.000000 1.000000 0.350000 +v 0.000000 1.375000 0.350000 +v 0.106066 1.000000 0.393934 +v 0.106066 1.375000 0.393934 +v 0.150000 1.000000 0.500000 +v 0.150000 1.375000 0.500000 +v 0.106066 1.000000 0.606066 +v 0.106066 1.375000 0.606066 +v -0.000000 1.000000 0.650000 +v -0.000000 1.375000 0.650000 +v -0.106066 1.000000 0.606066 +v -0.106066 1.375000 0.606066 +v -0.150000 1.000000 0.500000 +v -0.150000 1.375000 0.500000 +v -0.106066 1.000000 0.393934 +v -0.106066 1.375000 0.393934 +v 0.075000 1.500000 0.500000 +v 0.053033 1.500000 0.553033 +v -0.000000 1.500000 0.575000 +v -0.053033 1.500000 0.553033 +v -0.075000 1.500000 0.500000 +v -0.053033 1.500000 0.446967 +v 0.500000 1.500000 -0.075000 +v 0.553033 1.500000 -0.053033 +v 0.500000 1.000000 -0.150000 +v 0.500000 1.375000 -0.150000 +v 0.606066 1.000000 -0.106066 +v 0.606066 1.375000 -0.106066 +v 0.650000 1.000000 0.000000 +v 0.650000 1.375000 0.000000 +v 0.606066 1.000000 0.106066 +v 0.606066 1.375000 0.106066 +v 0.500000 1.000000 0.150000 +v 0.500000 1.375000 0.150000 +v 0.393934 1.000000 0.106066 +v 0.393934 1.375000 0.106066 +v 0.350000 1.000000 0.000000 +v 0.350000 1.375000 0.000000 +v 0.393934 1.000000 -0.106066 +v 0.393934 1.375000 -0.106066 +v 0.575000 1.500000 0.000000 +v 0.553033 1.500000 0.053033 +v 0.500000 1.500000 0.075000 +v 0.446967 1.500000 0.053033 +v 0.425000 1.500000 0.000000 +v 0.446967 1.500000 -0.053033 +v -0.500000 1.500000 -0.075000 +v -0.446967 1.500000 -0.053033 +v -0.500000 1.000000 -0.150000 +v -0.500000 1.375000 -0.150000 +v -0.393934 1.000000 -0.106066 +v -0.393934 1.375000 -0.106066 +v -0.350000 1.000000 0.000000 +v -0.350000 1.375000 0.000000 +v -0.393934 1.000000 0.106066 +v -0.393934 1.375000 0.106066 +v -0.500000 1.000000 0.150000 +v -0.500000 1.375000 0.150000 +v -0.606066 1.000000 0.106066 +v -0.606066 1.375000 0.106066 +v -0.650000 1.000000 0.000000 +v -0.650000 1.375000 0.000000 +v -0.606066 1.000000 -0.106066 +v -0.606066 1.375000 -0.106066 +v -0.425000 1.500000 0.000000 +v -0.446967 1.500000 0.053033 +v -0.500000 1.500000 0.075000 +v -0.553033 1.500000 0.053033 +v -0.575000 1.500000 0.000000 +v -0.553033 1.500000 -0.053033 +v -0.000000 0.562500 -0.712500 +v 0.356250 0.562500 -0.617043 +v 0.617043 0.562500 -0.356250 +v 0.712500 0.562500 0.000000 +v 0.617043 0.562500 0.356250 +v 0.356250 0.562500 0.617043 +v 0.000000 0.562500 0.712500 +v -0.356250 0.562500 0.617043 +v -0.617043 0.562500 0.356250 +v -0.712500 0.562500 0.000000 +v -0.617043 0.562500 -0.356250 +v -0.356250 0.562500 -0.617043 +v -0.000000 0.437500 -0.712500 +v 0.356250 0.437500 -0.617043 +v 0.617043 0.437500 -0.356250 +v 0.712500 0.437500 0.000000 +v 0.617043 0.437500 0.356250 +v 0.356250 0.437500 0.617043 +v 0.000000 0.437500 0.712500 +v -0.356250 0.437500 0.617043 +v -0.617043 0.437500 0.356250 +v -0.712500 0.437500 0.000000 +v -0.617043 0.437500 -0.356250 +v -0.356250 0.437500 -0.617043 +v -0.000000 0.437500 -0.750000 +v 0.375000 0.437500 -0.649519 +v 0.649519 0.437500 -0.375000 +v 0.750000 0.437500 0.000000 +v 0.649519 0.437500 0.375000 +v 0.375000 0.437500 0.649519 +v 0.000000 0.437500 0.750000 +v -0.375000 0.437500 0.649519 +v -0.649519 0.437500 0.375000 +v -0.750000 0.437500 0.000000 +v -0.649519 0.437500 -0.375000 +v -0.375000 0.437500 -0.649519 +v 0.000000 0.000000 -0.750000 +v 0.375000 0.000000 -0.649519 +v 0.649519 0.000000 -0.375000 +v 0.750000 0.000000 0.000000 +v 0.649519 0.000000 0.375000 +v 0.375000 0.000000 0.649519 +v 0.000000 0.000000 0.750000 +v -0.375000 0.000000 0.649519 +v -0.649519 0.000000 0.375000 +v -0.750000 0.000000 0.000000 +v -0.649519 0.000000 -0.375000 +v -0.375000 0.000000 -0.649519 +vt 0.750000 0.250000 +vt 0.666667 0.250000 +vt 0.666667 0.152778 +vt 0.583333 0.250000 +vt 0.583333 0.152778 +vt 0.500000 0.250000 +vt 0.500000 0.152778 +vt 0.416667 0.250000 +vt 0.416667 0.152778 +vt 0.333333 0.250000 +vt 0.333333 0.152778 +vt 0.250000 0.250000 +vt 0.250000 0.152778 +vt 0.166667 0.250000 +vt 0.166667 0.152778 +vt 0.083333 0.250000 +vt 0.083333 0.152778 +vt -0.000000 0.250000 +vt -0.000000 0.152778 +vt 1.000000 0.250000 +vt 0.916667 0.250000 +vt 0.916667 0.152778 +vt 0.833333 0.250000 +vt 0.750000 0.152778 +vt 0.833333 0.152778 +vt 0.000000 0.138889 +vt 0.750000 0.472222 +vt 0.750000 0.583333 +vt 0.625000 0.444444 +vt 0.972222 0.361111 +vt 0.944444 0.361111 +vt 0.055556 0.361111 +vt 0.222222 0.361111 +vt 0.194444 0.361111 +vt 0.305556 0.361111 +vt -0.000000 0.472222 +vt 0.125000 0.444444 +vt 0.000000 0.583333 +vt 0.472222 0.361111 +vt 0.805556 0.361111 +vt 0.777778 0.361111 +vt 0.722222 0.361111 +vt 0.694444 0.361111 +vt 0.388889 0.444444 +vt 0.638889 0.444444 +vt 0.611111 0.444444 +vt 0.861111 0.444444 +vt 0.111111 0.444444 +vt 0.250000 0.472222 +vt 0.250000 0.583333 +vt 0.375000 0.444444 +vt 0.500000 0.472222 +vt 0.500000 0.583333 +vt 0.555556 0.361111 +vt 0.527778 0.361111 +vt 1.000000 0.472222 +vt 1.000000 0.583333 +vt 0.875000 0.444444 +vt 0.277778 0.777778 +vt 0.250000 0.777778 +vt 0.222222 0.777778 +vt 0.222222 0.583333 +vt 0.236111 0.944444 +vt 0.208333 0.944444 +vt 0.194444 0.777778 +vt 0.180556 0.944444 +vt 0.166667 0.777778 +vt 0.152778 0.944444 +vt 0.138889 0.777778 +vt 0.125000 0.944444 +vt 0.111111 0.777778 +vt 0.097222 0.944444 +vt 0.083333 0.777778 +vt 0.069444 0.944444 +vt 0.055556 0.777778 +vt 0.041667 0.944444 +vt 0.027778 0.777778 +vt 0.013889 0.944444 +vt -0.000000 0.777778 +vt 0.333333 0.777778 +vt 0.319444 0.944444 +vt 0.305556 0.777778 +vt 0.291667 0.944444 +vt 0.263889 0.944444 +vt 0.305556 0.583333 +vt 0.055556 0.583333 +vt 0.083333 0.583333 +vt 0.138889 0.583333 +vt 0.166667 0.583333 +vt 0.027778 0.583333 +vt 0.111111 0.583333 +vt 0.194444 0.583333 +vt 0.277778 0.583333 +vt 0.541667 0.666667 +vt 0.583333 0.666667 +vt 0.569444 0.694444 +vt 0.333333 0.666667 +vt 0.375000 0.666667 +vt 0.361111 0.694444 +vt 0.500000 0.666667 +vt 0.458333 0.666667 +vt 0.458333 0.583333 +vt 0.541667 0.583333 +vt 0.416667 0.666667 +vt 0.416667 0.583333 +vt 0.402778 0.694444 +vt 0.375000 0.583333 +vt 0.666667 0.666667 +vt 0.625000 0.666667 +vt 0.625000 0.583333 +vt 0.486111 0.694444 +vt 0.333333 0.583333 +vt 0.527778 0.694444 +vt 0.611111 0.694444 +vt 0.583333 0.694444 +vt 0.652778 0.694444 +vt 0.625000 0.694444 +vt 0.350190 0.695857 +vt 0.372032 0.695857 +vt 0.387477 0.733143 +vt 0.583333 0.583333 +vt 0.444444 0.694444 +vt 0.416667 0.694444 +vt 0.500000 0.694444 +vt 0.458333 0.694444 +vt 0.350190 0.748588 +vt 0.334745 0.711301 +vt 0.387477 0.711301 +vt 0.333333 0.694444 +vt 0.333333 0.138889 +vt 0.333333 0.111111 +vt 0.416667 0.111111 +vt 0.083333 0.138889 +vt 0.166667 0.138889 +vt 0.250000 0.138889 +vt 0.416667 0.138889 +vt 0.500000 0.138889 +vt 0.750000 0.138889 +vt 0.833333 0.138889 +vt 0.666667 0.138889 +vt 0.583333 0.138889 +vt 0.916667 0.138889 +vt 1.000000 0.138889 +vt 0.333333 0.097222 +vt 0.750000 0.111111 +vt 0.833333 0.111111 +vt 0.583333 0.111111 +vt 0.666667 0.111111 +vt 0.000000 0.111111 +vt 0.083333 0.111111 +vt 0.250000 0.111111 +vt 0.500000 0.111111 +vt 0.916667 0.111111 +vt 1.000000 0.111111 +vt 0.166667 0.111111 +vt 0.083333 0.097222 +vt 0.083333 0.000000 +vt 0.166667 0.000000 +vt 0.750000 0.097222 +vt 0.583333 0.097222 +vt 0.666667 0.097222 +vt 0.000000 0.097222 +vt 0.250000 0.097222 +vt 0.500000 0.097222 +vt 0.916667 0.097222 +vt 1.000000 0.097222 +vt 0.166667 0.097222 +vt 0.416667 0.097222 +vt 0.833333 0.097222 +vt 0.833333 0.589223 +vt 0.694097 0.830388 +vt 0.972570 0.830388 +vt 0.333333 0.000000 +vt 0.416667 0.000000 +vt 0.750000 0.000000 +vt 0.833333 0.000000 +vt 0.583333 0.000000 +vt 0.666667 0.000000 +vt 0.000000 0.000000 +vt 0.250000 0.000000 +vt 0.500000 0.000000 +vt 0.916667 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.152778 +vt 0.027778 0.361111 +vt 0.277778 0.361111 +vt 0.444444 0.361111 +vt 0.361111 0.444444 +vt 0.888889 0.444444 +vt 0.138889 0.444444 +vt 0.541667 0.694444 +vt 0.375000 0.694444 +vt 0.666667 0.583333 +vt 0.372032 0.748588 +vt 0.334745 0.733143 +vt 0.994110 0.750000 +vt 0.972570 0.669612 +vt 0.913722 0.610763 +vt 0.752945 0.610763 +vt 0.694097 0.669612 +vt 0.672557 0.750000 +vt 0.752945 0.889237 +vt 0.833333 0.910777 +vt 0.913722 0.889237 +vn 0.258800 0.000000 -0.965900 +vn 0.707100 0.000000 -0.707100 +vn 0.965900 0.000000 -0.258800 +vn 0.965900 0.000000 0.258800 +vn 0.707100 0.000000 0.707100 +vn 0.258800 0.000000 0.965900 +vn -0.258800 0.000000 0.965900 +vn -0.707100 0.000000 0.707100 +vn -0.965900 0.000000 0.258800 +vn -0.965900 0.000000 -0.258800 +vn -0.258800 0.000000 -0.965900 +vn -0.707100 0.000000 -0.707100 +vn 0.000000 -1.000000 0.000000 +vn -0.866000 0.000000 -0.500000 +vn -0.257100 0.963900 -0.068900 +vn -0.257100 0.963900 0.068900 +vn -0.068900 0.963900 0.257100 +vn 0.068900 0.963900 0.257100 +vn -0.500000 0.000000 -0.866000 +vn 0.257100 0.963900 0.068900 +vn -0.068900 0.963900 -0.257100 +vn 0.068900 0.963900 -0.257100 +vn 0.605300 0.516800 0.605300 +vn 0.605300 0.516800 -0.605300 +vn -0.605300 0.516800 -0.605300 +vn -0.605300 0.516800 0.605300 +vn 0.866000 0.000000 0.500000 +vn -0.866000 0.000000 0.500000 +vn 0.500000 0.000000 -0.866000 +vn 0.257100 0.963900 -0.068900 +vn 0.500000 0.000000 0.866000 +vn -0.500000 0.000000 0.866000 +vn 0.866000 0.000000 -0.500000 +vn 0.243300 0.340600 -0.908200 +vn 0.664800 0.340600 -0.664800 +vn 0.908200 0.340600 -0.243300 +vn 0.908200 0.340600 0.243300 +vn 0.664800 0.340600 0.664800 +vn 0.243300 0.340600 0.908200 +vn -0.243300 0.340600 0.908200 +vn -0.664800 0.340600 0.664800 +vn -0.908200 0.340600 0.243300 +vn -0.908200 0.340600 -0.243300 +vn -0.664800 0.340600 -0.664800 +vn -0.243300 0.340600 -0.908200 +vn 0.808000 0.484800 0.334700 +vn 0.334700 0.484800 0.808000 +vn 0.382700 0.000000 -0.923900 +vn 0.923900 0.000000 0.382700 +vn -0.808000 0.484800 -0.334700 +vn 0.923900 0.000000 -0.382700 +vn 0.334700 0.484800 -0.808000 +vn 0.382700 0.000000 0.923900 +vn -0.808000 0.484800 0.334700 +vn -0.382700 0.000000 0.923900 +vn -0.334700 0.484800 0.808000 +vn 0.000000 1.000000 -0.000000 +vn -0.923900 0.000000 0.382700 +vn 0.808000 0.484800 -0.334700 +vn -0.382700 0.000000 -0.923900 +vn -0.923900 0.000000 -0.382700 +vn -0.334700 0.484800 -0.808000 +s off +f 2/1/1 4/2/1 3/3/1 +f 4/2/2 6/4/2 5/5/2 +f 6/4/3 8/6/3 7/7/3 +f 8/6/4 10/8/4 9/9/4 +f 10/8/5 12/10/5 11/11/5 +f 12/10/6 14/12/6 13/13/6 +f 14/12/7 16/14/7 15/15/7 +f 16/14/8 18/16/8 17/17/8 +f 18/16/9 20/18/9 19/19/9 +f 20/20/10 22/21/10 21/22/10 +f 24/23/11 2/1/11 1/24/11 +f 22/21/12 24/23/12 23/25/12 +f 17/17/13 19/19/13 163/26/13 +f 25/27/14 37/28/14 4/29/14 +f 20/20/15 34/30/15 35/31/15 +f 20/18/16 18/16/16 33/32/16 +f 14/12/17 31/33/17 32/34/17 +f 14/12/18 12/10/18 30/35/18 +f 33/36/19 18/37/19 42/38/19 +f 10/8/20 8/6/20 28/39/20 +f 24/23/21 36/40/21 26/41/21 +f 2/1/22 26/42/22 25/43/22 +f 12/10/23 10/8/23 39/44/23 +f 37/45/24 38/46/24 6/4/24 +f 44/47/25 24/23/25 22/21/25 +f 42/48/26 18/16/26 16/14/26 +f 32/49/27 41/50/27 16/37/27 +f 30/49/28 12/51/28 40/50/28 +f 29/52/29 39/53/29 10/51/29 +f 6/4/30 27/54/30 28/55/30 +f 27/52/31 6/29/31 38/53/31 +f 35/56/32 43/57/32 22/58/32 +f 24/58/33 44/28/33 36/27/33 +f 56/59/11 46/60/11 26/50/11 +f 46/60/1 45/61/1 25/62/1 +f 45/61/34 46/60/34 57/63/34 +f 45/61/35 57/64/35 47/65/35 +f 47/65/36 57/66/36 48/67/36 +f 48/67/37 57/68/37 49/69/37 +f 49/69/38 57/70/38 50/71/38 +f 50/71/39 57/72/39 51/73/39 +f 51/73/40 57/74/40 52/75/40 +f 52/75/41 57/76/41 53/77/41 +f 53/77/42 57/78/42 54/79/42 +f 54/80/43 57/81/43 55/82/43 +f 55/82/44 57/83/44 56/59/44 +f 56/59/45 57/84/45 46/60/45 +f 54/80/10 55/82/10 35/85/10 +f 53/77/9 54/79/9 34/38/9 +f 51/73/7 52/75/7 32/86/7 +f 50/71/6 51/73/6 31/87/6 +f 48/67/4 49/69/4 29/88/4 +f 47/65/3 48/67/3 28/89/3 +f 53/77/8 33/90/8 32/86/8 +f 50/71/5 30/91/5 29/88/5 +f 27/92/2 25/62/2 45/61/2 +f 56/59/12 36/93/12 35/85/12 +f 91/94/46 89/95/46 100/96/46 +f 69/97/47 67/98/47 77/99/47 +f 61/100/48 63/101/48 62/102/48 +f 89/95/49 91/94/49 90/103/49 +f 75/94/50 73/95/50 80/96/50 +f 63/101/51 65/104/51 64/105/51 +f 99/98/50 97/104/50 104/106/50 +f 67/98/46 65/104/46 76/106/46 +f 65/104/49 67/98/49 66/107/49 +f 85/108/48 87/109/48 86/110/48 +f 63/101/52 61/100/52 58/111/52 +f 67/98/53 69/97/53 68/112/53 +f 93/100/47 91/94/47 101/113/47 +f 71/109/54 79/114/54 80/115/54 +f 69/108/55 71/109/55 70/110/55 +f 69/108/56 78/116/56 79/117/56 +f 79/118/57 78/119/57 76/120/57 +f 71/109/58 73/95/58 72/121/58 +f 63/101/59 59/122/59 76/123/59 +f 75/94/60 61/100/60 60/53/60 +f 73/95/61 75/94/61 74/103/61 +f 87/109/51 89/95/51 88/121/51 +f 75/94/62 81/113/62 58/124/62 +f 87/109/52 85/108/52 82/116/52 +f 91/94/53 93/100/53 92/53/53 +f 95/101/54 103/122/54 104/123/54 +f 93/100/55 95/101/55 94/102/55 +f 93/100/56 102/111/56 103/125/56 +f 104/126/57 101/118/57 100/119/57 +f 95/101/58 97/104/58 96/105/58 +f 87/109/59 83/114/59 100/115/59 +f 99/98/60 85/97/60 84/112/60 +f 97/104/61 99/98/61 98/107/61 +f 85/97/62 99/98/62 105/99/62 +f 113/100/46 124/111/46 125/125/46 +f 113/100/49 115/101/49 114/102/49 +f 121/108/50 128/116/50 129/117/50 +f 109/95/48 111/94/48 110/103/48 +f 115/101/47 125/122/47 126/123/47 +f 111/94/51 113/100/51 112/53/51 +f 111/94/52 109/95/52 106/96/52 +f 115/101/53 117/104/53 116/105/53 +f 121/97/54 119/98/54 127/99/54 +f 117/104/55 119/98/55 118/107/55 +f 119/98/56 117/104/56 126/106/56 +f 128/126/57 125/118/57 124/119/57 +f 119/98/58 121/97/58 120/112/58 +f 113/100/59 111/94/59 107/113/59 +f 123/109/60 109/95/60 108/121/60 +f 121/108/61 123/109/61 122/110/61 +f 123/109/62 129/114/62 106/115/62 +f 137/108/46 148/116/46 149/117/46 +f 137/108/49 139/109/49 138/110/49 +f 145/100/50 152/111/50 153/125/50 +f 133/104/48 135/98/48 134/107/48 +f 139/109/47 149/114/47 150/115/47 +f 135/98/51 137/97/51 136/112/51 +f 135/98/52 133/104/52 130/106/52 +f 139/109/53 141/95/53 140/121/53 +f 145/100/54 143/94/54 151/113/54 +f 141/95/55 143/94/55 142/103/55 +f 143/94/56 141/95/56 150/96/56 +f 151/127/57 150/118/57 148/128/57 +f 143/94/58 145/100/58 144/53/58 +f 135/98/59 131/99/59 148/129/59 +f 147/101/60 133/104/60 132/105/60 +f 145/100/61 147/101/61 146/102/61 +f 133/104/62 147/101/62 153/122/62 +f 159/130/5 171/131/5 170/132/5 +f 17/17/13 162/133/13 161/134/13 +f 15/15/13 161/134/13 160/135/13 +f 13/13/13 160/135/13 159/130/13 +f 11/11/13 159/130/13 158/136/13 +f 9/9/13 158/136/13 157/137/13 +f 1/24/13 154/138/13 165/139/13 +f 3/3/13 155/140/13 154/138/13 +f 7/7/13 157/137/13 156/141/13 +f 23/25/13 165/139/13 164/142/13 +f 5/5/13 156/141/13 155/140/13 +f 21/22/13 164/142/13 163/143/13 +f 170/132/57 171/131/57 183/144/57 +f 154/138/11 166/145/11 177/146/11 +f 156/141/2 168/147/2 167/148/2 +f 163/26/9 175/149/9 174/150/9 +f 160/135/6 172/151/6 171/131/6 +f 157/137/3 169/152/3 168/147/3 +f 164/142/10 176/153/10 175/154/10 +f 161/134/7 173/155/7 172/151/7 +f 158/136/4 170/132/4 169/152/4 +f 165/139/12 177/146/12 176/153/12 +f 155/140/1 167/148/1 166/145/1 +f 162/133/8 174/150/8 173/155/8 +f 186/156/8 198/157/8 197/158/8 +f 177/146/57 166/145/57 178/159/57 +f 168/147/57 180/160/57 179/161/57 +f 174/150/57 175/149/57 187/162/57 +f 172/151/57 184/163/57 183/144/57 +f 168/147/57 169/152/57 181/164/57 +f 176/153/57 188/165/57 187/166/57 +f 173/155/57 185/167/57 184/163/57 +f 170/132/57 182/168/57 181/164/57 +f 177/146/57 189/169/57 188/165/57 +f 167/148/57 179/161/57 178/159/57 +f 173/155/57 174/150/57 186/156/57 +f 193/170/13 197/171/13 201/172/13 +f 183/144/5 195/173/5 194/174/5 +f 178/159/11 190/175/11 201/176/11 +f 180/160/2 192/177/2 191/178/2 +f 187/162/9 199/179/9 198/157/9 +f 184/163/6 196/180/6 195/173/6 +f 181/164/3 193/181/3 192/177/3 +f 188/165/10 200/182/10 199/183/10 +f 185/167/7 197/158/7 196/180/7 +f 182/168/4 194/174/4 193/181/4 +f 189/169/12 201/176/12 200/182/12 +f 179/161/1 191/178/1 190/175/1 +f 1/24/1 2/1/1 3/3/1 +f 3/3/2 4/2/2 5/5/2 +f 5/5/3 6/4/3 7/7/3 +f 7/7/4 8/6/4 9/9/4 +f 9/9/5 10/8/5 11/11/5 +f 11/11/6 12/10/6 13/13/6 +f 13/13/7 14/12/7 15/15/7 +f 15/15/8 16/14/8 17/17/8 +f 17/17/9 18/16/9 19/19/9 +f 19/184/10 20/20/10 21/22/10 +f 23/25/11 24/23/11 1/24/11 +f 21/22/12 22/21/12 23/25/12 +f 162/133/13 17/17/13 163/26/13 +f 22/21/15 20/20/15 35/31/15 +f 34/185/16 20/18/16 33/32/16 +f 16/14/17 14/12/17 32/34/17 +f 31/186/18 14/12/18 30/35/18 +f 29/187/20 10/8/20 28/39/20 +f 2/1/21 24/23/21 26/41/21 +f 4/2/22 2/1/22 25/43/22 +f 40/188/23 12/10/23 39/44/23 +f 4/2/24 37/45/24 6/4/24 +f 43/189/25 44/47/25 22/21/25 +f 41/190/26 42/48/26 16/14/26 +f 8/6/30 6/4/30 28/55/30 +f 36/93/11 56/59/11 26/50/11 +f 26/50/1 46/60/1 25/62/1 +f 34/112/10 54/80/10 35/85/10 +f 33/90/9 53/77/9 34/38/9 +f 31/87/7 51/73/7 32/86/7 +f 30/91/6 50/71/6 31/87/6 +f 28/89/4 48/67/4 29/88/4 +f 27/92/3 47/65/3 28/89/3 +f 52/75/8 53/77/8 32/86/8 +f 49/69/5 50/71/5 29/88/5 +f 47/65/2 27/92/2 45/61/2 +f 55/82/12 56/59/12 35/85/12 +f 101/191/46 91/94/46 100/96/46 +f 78/129/47 69/97/47 77/99/47 +f 60/53/48 61/100/48 62/102/48 +f 88/121/49 89/95/49 90/103/49 +f 81/191/50 75/94/50 80/96/50 +f 62/102/51 63/101/51 64/105/51 +f 105/192/50 99/98/50 104/106/50 +f 77/192/46 67/98/46 76/106/46 +f 64/105/49 65/104/49 66/107/49 +f 84/193/48 85/108/48 86/110/48 +f 59/125/52 63/101/52 58/111/52 +f 66/107/53 67/98/53 68/112/53 +f 102/124/47 93/100/47 101/113/47 +f 73/95/54 71/109/54 80/115/54 +f 68/193/55 69/108/55 70/110/55 +f 71/109/56 69/108/56 79/117/56 +f 76/120/57 59/194/57 58/126/57 +f 58/126/57 81/195/57 76/120/57 +f 80/127/57 79/118/57 76/120/57 +f 78/119/57 77/128/57 76/120/57 +f 76/120/57 81/195/57 80/127/57 +f 70/110/58 71/109/58 72/121/58 +f 65/104/59 63/101/59 76/123/59 +f 74/103/60 75/94/60 60/53/60 +f 72/121/61 73/95/61 74/103/61 +f 86/110/51 87/109/51 88/121/51 +f 61/100/62 75/94/62 58/124/62 +f 83/117/52 87/109/52 82/116/52 +f 90/103/53 91/94/53 92/53/53 +f 97/104/54 95/101/54 104/123/54 +f 92/53/55 93/100/55 94/102/55 +f 95/101/56 93/100/56 103/125/56 +f 100/119/57 83/128/57 82/120/57 +f 82/120/57 105/194/57 100/119/57 +f 104/126/57 103/195/57 102/127/57 +f 102/127/57 101/118/57 104/126/57 +f 100/119/57 105/194/57 104/126/57 +f 94/102/58 95/101/58 96/105/58 +f 89/95/59 87/109/59 100/115/59 +f 98/107/60 99/98/60 84/112/60 +f 96/105/61 97/104/61 98/107/61 +f 82/129/62 85/97/62 105/99/62 +f 115/101/46 113/100/46 125/125/46 +f 112/53/49 113/100/49 114/102/49 +f 123/109/50 121/108/50 129/117/50 +f 108/121/48 109/95/48 110/103/48 +f 117/104/47 115/101/47 126/123/47 +f 110/103/51 111/94/51 112/53/51 +f 107/191/52 111/94/52 106/96/52 +f 114/102/53 115/101/53 116/105/53 +f 128/129/54 121/97/54 127/99/54 +f 116/105/55 117/104/55 118/107/55 +f 127/192/56 119/98/56 126/106/56 +f 124/119/57 107/128/57 106/120/57 +f 106/120/57 129/194/57 128/126/57 +f 128/126/57 127/195/57 126/127/57 +f 126/127/57 125/118/57 128/126/57 +f 124/119/57 106/120/57 128/126/57 +f 118/107/58 119/98/58 120/112/58 +f 124/124/59 113/100/59 107/113/59 +f 122/110/60 123/109/60 108/121/60 +f 120/193/61 121/108/61 122/110/61 +f 109/95/62 123/109/62 106/115/62 +f 139/109/46 137/108/46 149/117/46 +f 136/193/49 137/108/49 138/110/49 +f 147/101/50 145/100/50 153/125/50 +f 132/105/48 133/104/48 134/107/48 +f 141/95/47 139/109/47 150/115/47 +f 134/107/51 135/98/51 136/112/51 +f 131/192/52 135/98/52 130/106/52 +f 138/110/53 139/109/53 140/121/53 +f 152/124/54 145/100/54 151/113/54 +f 140/121/55 141/95/55 142/103/55 +f 151/191/56 143/94/56 150/96/56 +f 148/128/57 131/120/57 130/194/57 +f 130/194/57 153/126/57 148/128/57 +f 152/195/57 151/127/57 148/128/57 +f 150/118/57 149/119/57 148/128/57 +f 148/128/57 153/126/57 152/195/57 +f 142/103/58 143/94/58 144/53/58 +f 137/97/59 135/98/59 148/129/59 +f 146/102/60 147/101/60 132/105/60 +f 144/53/61 145/100/61 146/102/61 +f 130/123/62 133/104/62 153/122/62 +f 158/136/5 159/130/5 170/132/5 +f 15/15/13 17/17/13 161/134/13 +f 13/13/13 15/15/13 160/135/13 +f 11/11/13 13/13/13 159/130/13 +f 9/9/13 11/11/13 158/136/13 +f 7/7/13 9/9/13 157/137/13 +f 23/25/13 1/24/13 165/139/13 +f 1/24/13 3/3/13 154/138/13 +f 5/5/13 7/7/13 156/141/13 +f 21/22/13 23/25/13 164/142/13 +f 3/3/13 5/5/13 155/140/13 +f 19/184/13 21/22/13 163/143/13 +f 182/168/57 170/132/57 183/144/57 +f 165/139/11 154/138/11 177/146/11 +f 155/140/2 156/141/2 167/148/2 +f 162/133/9 163/26/9 174/150/9 +f 159/130/6 160/135/6 171/131/6 +f 156/141/3 157/137/3 168/147/3 +f 163/143/10 164/142/10 175/154/10 +f 160/135/7 161/134/7 172/151/7 +f 157/137/4 158/136/4 169/152/4 +f 164/142/12 165/139/12 176/153/12 +f 154/138/1 155/140/1 166/145/1 +f 161/134/8 162/133/8 173/155/8 +f 185/167/8 186/156/8 197/158/8 +f 189/169/57 177/146/57 178/159/57 +f 167/148/57 168/147/57 179/161/57 +f 186/156/57 174/150/57 187/162/57 +f 171/131/57 172/151/57 183/144/57 +f 180/160/57 168/147/57 181/164/57 +f 175/154/57 176/153/57 187/166/57 +f 172/151/57 173/155/57 184/163/57 +f 169/152/57 170/132/57 181/164/57 +f 176/153/57 177/146/57 188/165/57 +f 166/145/57 167/148/57 178/159/57 +f 185/167/57 173/155/57 186/156/57 +f 201/172/13 190/196/13 193/170/13 +f 191/197/13 192/198/13 193/170/13 +f 193/170/13 194/199/13 195/200/13 +f 195/200/13 196/201/13 193/170/13 +f 197/171/13 198/202/13 199/203/13 +f 199/203/13 200/204/13 197/171/13 +f 190/196/13 191/197/13 193/170/13 +f 193/170/13 196/201/13 197/171/13 +f 197/171/13 200/204/13 201/172/13 +f 182/168/5 183/144/5 194/174/5 +f 189/169/11 178/159/11 201/176/11 +f 179/161/2 180/160/2 191/178/2 +f 186/156/9 187/162/9 198/157/9 +f 183/144/6 184/163/6 195/173/6 +f 180/160/3 181/164/3 192/177/3 +f 187/166/10 188/165/10 199/183/10 +f 184/163/7 185/167/7 196/180/7 +f 181/164/4 182/168/4 193/181/4 +f 188/165/12 189/169/12 200/182/12 +f 178/159/1 179/161/1 190/175/1 diff --git a/assets/hbm/models/taperecorder.obj b/assets/hbm/models/taperecorder.obj new file mode 100644 index 000000000..d16bcc1a6 --- /dev/null +++ b/assets/hbm/models/taperecorder.obj @@ -0,0 +1,166 @@ +# Blender v2.76 (sub 0) OBJ File: 'taperecorder.blend' +# www.blender.org +o Cube_Cube.001 +v -0.500000 0.000000 0.500000 +v -0.500000 1.000000 0.500000 +v -0.500000 0.000000 -0.500000 +v -0.500000 1.000000 -0.500000 +v 0.250000 0.000000 0.500000 +v 0.250000 1.000000 0.500000 +v 0.250000 0.000000 -0.500000 +v 0.250000 1.000000 -0.500000 +v 0.250000 0.812500 0.187500 +v 0.250000 0.812500 0.312500 +v 0.250000 0.437500 0.187500 +v 0.250000 0.437500 0.312500 +v 0.250000 0.562500 0.437500 +v 0.250000 0.562500 0.062500 +v 0.250000 0.687500 0.062500 +v 0.250000 0.687500 0.437500 +v 0.375000 0.812500 0.187500 +v 0.375000 0.812500 0.312500 +v 0.375000 0.437500 0.187500 +v 0.375000 0.437500 0.312500 +v 0.375000 0.562500 0.437500 +v 0.375000 0.687500 0.437500 +v 0.375000 0.687500 0.062500 +v 0.375000 0.562500 0.062500 +v 0.250000 0.812500 -0.312500 +v 0.250000 0.812500 -0.187500 +v 0.250000 0.437500 -0.312500 +v 0.250000 0.437500 -0.187500 +v 0.250000 0.562500 -0.062500 +v 0.250000 0.562500 -0.437500 +v 0.250000 0.687500 -0.437500 +v 0.250000 0.687500 -0.062500 +v 0.375000 0.812500 -0.312500 +v 0.375000 0.812500 -0.187500 +v 0.375000 0.437500 -0.312500 +v 0.375000 0.437500 -0.187500 +v 0.375000 0.562500 -0.062500 +v 0.375000 0.687500 -0.062500 +v 0.375000 0.687500 -0.437500 +v 0.375000 0.562500 -0.437500 +v 0.250000 0.812500 0.187500 +v 0.375000 0.812500 0.187500 +v 0.250000 0.812500 -0.187500 +v 0.375000 0.812500 -0.187500 +vt 1.000000 0.500000 +vt 1.000000 0.785714 +vt 0.714286 0.785714 +vt 0.500000 0.785714 +vt 0.500000 0.500000 +vt 0.714286 0.500000 +vt 0.214286 0.785714 +vt 0.214286 0.500000 +vt -0.000000 0.785714 +vt 0.000000 0.500000 +vt 0.785714 0.785714 +vt 0.785714 1.000000 +vt 0.500000 1.000000 +vt 0.214286 1.000000 +vt 0.500000 0.357143 +vt 0.571429 0.392857 +vt 0.535714 0.464286 +vt 0.357143 0.357143 +vt 0.428571 0.392857 +vt 0.392857 0.464286 +vt 0.428571 0.500000 +vt 0.428571 0.464286 +vt 0.464286 0.464286 +vt 0.285714 0.428571 +vt 0.321429 0.428571 +vt 0.321429 0.464286 +vt 0.392857 0.500000 +vt 0.285714 0.357143 +vt 0.321429 0.357143 +vt 0.464286 0.392857 +vt 0.428571 0.357143 +vt 0.321429 0.500000 +vt 0.464286 0.500000 +vt 0.535714 0.500000 +vt 0.196429 0.464286 +vt 0.196429 0.500000 +vt 0.089286 0.500000 +vt 0.500000 0.464286 +vt 0.464286 0.428571 +vt 0.535714 0.357143 +vt 0.571429 0.428571 +vt 0.357143 0.464286 +vt 0.321429 0.392857 +vt 0.392857 0.357143 +vt 0.428571 0.428571 +vt 0.285714 0.464286 +vt 0.464286 0.357143 +vt 0.089286 0.464286 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -0.707100 -0.707100 +vn 0.000000 0.707100 -0.707100 +vn 0.000000 -0.707100 0.707100 +vn 0.000000 0.707100 0.707100 +s off +f 4/1/1 3/2/1 1/3/1 +f 8/4/2 7/5/2 3/6/2 +f 6/7/3 5/8/3 7/5/3 +f 2/9/4 1/10/4 5/8/4 +f 3/11/5 7/12/5 5/13/5 +f 8/4/6 4/13/6 2/14/6 +f 36/15/3 40/16/3 33/17/3 +f 20/18/3 24/19/3 17/20/3 +f 14/21/7 24/22/7 19/23/7 +f 9/23/8 17/22/8 23/19/8 +f 13/24/4 21/25/4 22/26/4 +f 10/27/6 18/20/6 17/22/6 +f 12/28/9 20/29/9 21/25/9 +f 15/30/2 23/19/2 24/31/2 +f 16/32/10 22/26/10 18/20/10 +f 11/33/5 19/23/5 20/17/5 +f 30/17/7 40/34/7 35/33/7 +f 25/23/8 33/22/8 39/19/8 +f 29/24/4 37/25/4 38/26/4 +f 26/27/6 34/20/6 33/22/6 +f 28/28/9 36/29/9 37/25/9 +f 31/30/2 39/19/2 40/31/2 +f 32/32/10 38/26/10 34/20/10 +f 27/23/5 35/33/5 36/21/5 +f 17/35/5 9/36/5 26/37/5 +f 43/37/6 41/36/6 42/35/6 +f 2/6/1 4/1/1 1/3/1 +f 4/3/2 8/4/2 3/6/2 +f 8/4/3 6/7/3 7/5/3 +f 6/7/4 2/9/4 5/8/4 +f 1/4/5 3/11/5 5/13/5 +f 6/7/6 8/4/6 2/14/6 +f 33/17/3 34/38/3 38/39/3 +f 38/39/3 37/30/3 36/15/3 +f 36/15/3 35/40/3 40/16/3 +f 40/16/3 39/41/3 33/17/3 +f 33/17/3 38/39/3 36/15/3 +f 17/20/3 18/42/3 22/25/3 +f 22/25/3 21/43/3 20/18/3 +f 20/18/3 19/44/3 24/19/3 +f 24/19/3 23/45/3 17/20/3 +f 17/20/3 22/25/3 20/18/3 +f 11/33/7 14/21/7 19/23/7 +f 15/30/8 9/23/8 23/19/8 +f 16/46/4 13/24/4 22/26/4 +f 9/21/6 10/27/6 17/22/6 +f 13/24/9 12/28/9 21/25/9 +f 14/47/2 15/30/2 24/31/2 +f 10/27/10 16/32/10 18/20/10 +f 12/34/5 11/33/5 20/17/5 +f 27/23/7 30/17/7 35/33/7 +f 31/30/8 25/23/8 39/19/8 +f 32/46/4 29/24/4 38/26/4 +f 25/21/6 26/27/6 33/22/6 +f 29/24/9 28/28/9 37/25/9 +f 30/47/2 31/30/2 40/31/2 +f 26/27/10 32/32/10 34/20/10 +f 28/22/5 27/23/5 36/21/5 +f 34/48/5 17/35/5 26/37/5 +f 44/48/6 43/37/6 42/35/6 diff --git a/assets/hbm/textures/blocks/deco_tape_recorder.png b/assets/hbm/textures/blocks/deco_tape_recorder.png index 905f6946c..83aa2d487 100644 Binary files a/assets/hbm/textures/blocks/deco_tape_recorder.png and b/assets/hbm/textures/blocks/deco_tape_recorder.png differ diff --git a/assets/hbm/textures/items/canister_biofuel.png b/assets/hbm/textures/items/canister_biofuel.png index d53fe1be1..5e509e6b8 100644 Binary files a/assets/hbm/textures/items/canister_biofuel.png and b/assets/hbm/textures/items/canister_biofuel.png differ diff --git a/assets/hbm/textures/items/canister_bitumen.png b/assets/hbm/textures/items/canister_bitumen.png index 310e712f9..3e3e9e79c 100644 Binary files a/assets/hbm/textures/items/canister_bitumen.png and b/assets/hbm/textures/items/canister_bitumen.png differ diff --git a/assets/hbm/textures/items/canister_blank.png b/assets/hbm/textures/items/canister_blank.png new file mode 100644 index 000000000..9e19878bc Binary files /dev/null and b/assets/hbm/textures/items/canister_blank.png differ diff --git a/assets/hbm/textures/items/canister_canola.png b/assets/hbm/textures/items/canister_canola.png index c96ca883f..7f5a44f91 100644 Binary files a/assets/hbm/textures/items/canister_canola.png and b/assets/hbm/textures/items/canister_canola.png differ diff --git a/assets/hbm/textures/items/canister_empty.png b/assets/hbm/textures/items/canister_empty.png index a38a2821f..36c11231a 100644 Binary files a/assets/hbm/textures/items/canister_empty.png and b/assets/hbm/textures/items/canister_empty.png differ diff --git a/assets/hbm/textures/items/canister_fuel.png b/assets/hbm/textures/items/canister_fuel.png index 441b098c1..359fba8c8 100644 Binary files a/assets/hbm/textures/items/canister_fuel.png and b/assets/hbm/textures/items/canister_fuel.png differ diff --git a/assets/hbm/textures/items/canister_heatingoil.png b/assets/hbm/textures/items/canister_heatingoil.png index 5ac3eddd6..e8654568e 100644 Binary files a/assets/hbm/textures/items/canister_heatingoil.png and b/assets/hbm/textures/items/canister_heatingoil.png differ diff --git a/assets/hbm/textures/items/canister_heavyoil.png b/assets/hbm/textures/items/canister_heavyoil.png index 6c36ec828..62f810b25 100644 Binary files a/assets/hbm/textures/items/canister_heavyoil.png and b/assets/hbm/textures/items/canister_heavyoil.png differ diff --git a/assets/hbm/textures/items/canister_kerosene.png b/assets/hbm/textures/items/canister_kerosene.png index 227b1fc5d..61649e01b 100644 Binary files a/assets/hbm/textures/items/canister_kerosene.png and b/assets/hbm/textures/items/canister_kerosene.png differ diff --git a/assets/hbm/textures/items/canister_lightoil.png b/assets/hbm/textures/items/canister_lightoil.png index d030fa54b..49528bdd0 100644 Binary files a/assets/hbm/textures/items/canister_lightoil.png and b/assets/hbm/textures/items/canister_lightoil.png differ diff --git a/assets/hbm/textures/items/canister_napalm.png b/assets/hbm/textures/items/canister_napalm.png index 60849d1ac..66d2fae42 100644 Binary files a/assets/hbm/textures/items/canister_napalm.png and b/assets/hbm/textures/items/canister_napalm.png differ diff --git a/assets/hbm/textures/items/canister_naphtha.png b/assets/hbm/textures/items/canister_naphtha.png index 3635c1c82..8ca35d24f 100644 Binary files a/assets/hbm/textures/items/canister_naphtha.png and b/assets/hbm/textures/items/canister_naphtha.png differ diff --git a/assets/hbm/textures/items/canister_oil.png b/assets/hbm/textures/items/canister_oil.png index 8df5b504d..6af9430a0 100644 Binary files a/assets/hbm/textures/items/canister_oil.png and b/assets/hbm/textures/items/canister_oil.png differ diff --git a/assets/hbm/textures/items/canister_petroil.png b/assets/hbm/textures/items/canister_petroil.png index 0c7aa508d..bc5aa6314 100644 Binary files a/assets/hbm/textures/items/canister_petroil.png and b/assets/hbm/textures/items/canister_petroil.png differ diff --git a/assets/hbm/textures/items/canister_reoil.png b/assets/hbm/textures/items/canister_reoil.png index 729168060..aa36d54e1 100644 Binary files a/assets/hbm/textures/items/canister_reoil.png and b/assets/hbm/textures/items/canister_reoil.png differ diff --git a/assets/hbm/textures/items/canister_smear.png b/assets/hbm/textures/items/canister_smear.png index dcb31ab64..e81ab1572 100644 Binary files a/assets/hbm/textures/items/canister_smear.png and b/assets/hbm/textures/items/canister_smear.png differ diff --git a/assets/hbm/textures/items/canister_superfuel.png b/assets/hbm/textures/items/canister_superfuel.png index 4a972cd72..f38d02ff7 100644 Binary files a/assets/hbm/textures/items/canister_superfuel.png and b/assets/hbm/textures/items/canister_superfuel.png differ diff --git a/assets/hbm/textures/items/designator_tracker.png b/assets/hbm/textures/items/designator_tracker.png new file mode 100644 index 000000000..b07620eab Binary files /dev/null and b/assets/hbm/textures/items/designator_tracker.png differ diff --git a/assets/hbm/textures/items/gas_biogas.png b/assets/hbm/textures/items/gas_biogas.png index 83ddfc3fc..e715954a6 100644 Binary files a/assets/hbm/textures/items/gas_biogas.png and b/assets/hbm/textures/items/gas_biogas.png differ diff --git a/assets/hbm/textures/items/gas_empty.png b/assets/hbm/textures/items/gas_empty.png index ddf920031..8014cfd5e 100644 Binary files a/assets/hbm/textures/items/gas_empty.png and b/assets/hbm/textures/items/gas_empty.png differ diff --git a/assets/hbm/textures/items/gas_full.png b/assets/hbm/textures/items/gas_full.png index fe0c4280d..740f6ea87 100644 Binary files a/assets/hbm/textures/items/gas_full.png and b/assets/hbm/textures/items/gas_full.png differ diff --git a/assets/hbm/textures/items/gas_petroleum.png b/assets/hbm/textures/items/gas_petroleum.png index 29c9f755d..a01909058 100644 Binary files a/assets/hbm/textures/items/gas_petroleum.png and b/assets/hbm/textures/items/gas_petroleum.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/base/camo_sky.png b/assets/hbm/textures/models/missile_parts/fuselages/base/camo_sky.png new file mode 100644 index 000000000..84a29a1cc Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/base/camo_sky.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/base/missile_parts.zip b/assets/hbm/textures/models/missile_parts/fuselages/base/missile_parts.zip deleted file mode 100644 index 45861ea95..000000000 Binary files a/assets/hbm/textures/models/missile_parts/fuselages/base/missile_parts.zip and /dev/null differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/base/mp_f_15_kerosene_blank.png b/assets/hbm/textures/models/missile_parts/fuselages/base/mp_f_15_kerosene_blank.png deleted file mode 100644 index cc6cbd4b5..000000000 Binary files a/assets/hbm/textures/models/missile_parts/fuselages/base/mp_f_15_kerosene_blank.png and /dev/null differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_kerosene_taint.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_kerosene_taint.png new file mode 100644 index 000000000..fef2dbc4d Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_kerosene_taint.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_kerosene_dash.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_kerosene_dash.png new file mode 100644 index 000000000..d4abbd1aa Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_kerosene_dash.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_kerosene_taint.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_kerosene_taint.png new file mode 100644 index 000000000..9389436bc Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_kerosene_taint.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_kerosene_vap.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_kerosene_vap.png new file mode 100644 index 000000000..80d1fe90b Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_kerosene_vap.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_solid_bullet.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_solid_bullet.png new file mode 100644 index 000000000..97276e515 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_solid_bullet.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_solid_silvermoonlight.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_solid_silvermoonlight.png new file mode 100644 index 000000000..62865156d Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_long_solid_silvermoonlight.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_solid_battery.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_solid_battery.png new file mode 100644 index 000000000..144b39ec8 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_solid_battery.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_solid_cathedral.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_solid_cathedral.png new file mode 100644 index 000000000..535e31376 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_solid_cathedral.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_solid_moonlit.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_solid_moonlit.png new file mode 100644 index 000000000..c32892275 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_solid_moonlit.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_xenon_bhole.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_xenon_bhole.png new file mode 100644 index 000000000..02eb0a591 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_10_xenon_bhole.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_hydrogen_cathedral.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_hydrogen_cathedral.png new file mode 100644 index 000000000..217559fa6 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_hydrogen_cathedral.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_lambda.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_lambda.png new file mode 100644 index 000000000..31b3e061a Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_lambda.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_minuteman.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_minuteman.png new file mode 100644 index 000000000..0a2d64c31 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_minuteman.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_pip.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_pip.png new file mode 100644 index 000000000..5f40d73ad Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_pip.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_taint.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_taint.png new file mode 100644 index 000000000..2f97f1d10 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_taint.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_solid_faust.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_solid_faust.png new file mode 100644 index 000000000..e38ff00d8 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_solid_faust.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_solid_silvermoonlight.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_solid_silvermoonlight.png new file mode 100644 index 000000000..ec35d0a1c Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_solid_silvermoonlight.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_solid_snowy.png b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_solid_snowy.png new file mode 100644 index 000000000..56f984eec Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/contest/mp_f_15_solid_snowy.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/mp_f_10_kerosene_sky.png b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_10_kerosene_sky.png new file mode 100644 index 000000000..ce849212d Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_10_kerosene_sky.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/mp_f_10_long_kerosene_sky.png b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_10_long_kerosene_sky.png new file mode 100644 index 000000000..037815f1f Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_10_long_kerosene_sky.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/mp_f_10_solid_duracell.png b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_10_solid_duracell.png new file mode 100644 index 000000000..79e7b507b Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_10_solid_duracell.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_20_kerosene.png b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_20_kerosene.png new file mode 100644 index 000000000..d3e9de731 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_20_kerosene.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_kerosene_sky.png b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_kerosene_sky.png new file mode 100644 index 000000000..660b79f84 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_kerosene_sky.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_kerosene_yuck.png b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_kerosene_yuck.png new file mode 100644 index 000000000..2873ed72b Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_kerosene_yuck.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_solid_panorama.png b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_solid_panorama.png new file mode 100644 index 000000000..e4f36d4e2 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_solid_panorama.png differ diff --git a/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_solid_roses.png b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_solid_roses.png new file mode 100644 index 000000000..b9a8c9533 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/fuselages/mp_f_15_solid_roses.png differ diff --git a/assets/hbm/textures/models/missile_parts/launch_table.png b/assets/hbm/textures/models/missile_parts/launch_table.png index 389b8cbad..182f562e9 100644 Binary files a/assets/hbm/textures/models/missile_parts/launch_table.png and b/assets/hbm/textures/models/missile_parts/launch_table.png differ diff --git a/assets/hbm/textures/models/missile_parts/launch_table_large_pad.png b/assets/hbm/textures/models/missile_parts/launch_table_large_pad.png index 4c5774e35..3c71e503a 100644 Binary files a/assets/hbm/textures/models/missile_parts/launch_table_large_pad.png and b/assets/hbm/textures/models/missile_parts/launch_table_large_pad.png differ diff --git a/assets/hbm/textures/models/missile_parts/launch_table_small_pad.png b/assets/hbm/textures/models/missile_parts/launch_table_small_pad.png index 133fd2975..b128c4c3c 100644 Binary files a/assets/hbm/textures/models/missile_parts/launch_table_small_pad.png and b/assets/hbm/textures/models/missile_parts/launch_table_small_pad.png differ diff --git a/assets/hbm/textures/models/missile_parts/stability/mp_s_15_soyuz.png b/assets/hbm/textures/models/missile_parts/stability/mp_s_15_soyuz.png new file mode 100644 index 000000000..6e03c7a40 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/stability/mp_s_15_soyuz.png differ diff --git a/assets/hbm/textures/models/missile_parts/warheads/mp_w_15_balefire.png b/assets/hbm/textures/models/missile_parts/warheads/mp_w_15_balefire.png new file mode 100644 index 000000000..0f61c4e67 Binary files /dev/null and b/assets/hbm/textures/models/missile_parts/warheads/mp_w_15_balefire.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 382cb43d6..c0e25136d 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -1035,7 +1035,7 @@ public class ModBlocks { machine_missile_assembly = new MachineMissileAssembly(Material.iron).setBlockName("machine_missile_assembly").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":machine_missile_assembly"); compact_launcher = new CompactLauncher(Material.iron).setBlockName("compact_launcher").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":compact_launcher"); - launch_table = new MachineLaunchTable(Material.iron).setBlockName("launch_table").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":launch_table"); + launch_table = new LaunchTable(Material.iron).setBlockName("launch_table").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":launch_table"); sat_mapper = new DecoBlock(Material.iron).setBlockName("sat_mapper").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":sat_mapper"); sat_radar = new DecoBlock(Material.iron).setBlockName("sat_radar").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":sat_radar"); diff --git a/com/hbm/blocks/bomb/CompactLauncher.java b/com/hbm/blocks/bomb/CompactLauncher.java index 9d6c8ac1f..dca4f0b83 100644 --- a/com/hbm/blocks/bomb/CompactLauncher.java +++ b/com/hbm/blocks/bomb/CompactLauncher.java @@ -1,6 +1,7 @@ package com.hbm.blocks.bomb; import com.hbm.blocks.ModBlocks; +import com.hbm.interfaces.IBomb; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.bomb.TileEntityCompactLauncher; @@ -19,7 +20,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class CompactLauncher extends BlockContainer implements IMultiblock { +public class CompactLauncher extends BlockContainer implements IMultiblock, IBomb { public CompactLauncher(Material p_i45386_1_) { super(p_i45386_1_); @@ -120,4 +121,12 @@ public class CompactLauncher extends BlockContainer implements IMultiblock { return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); } + @Override + public void explode(World world, int x, int y, int z) { + TileEntityCompactLauncher entity = (TileEntityCompactLauncher) world.getTileEntity(x, y, z); + + if(entity.canLaunch()) + entity.launch(); + } + } diff --git a/com/hbm/blocks/machine/MachineLaunchTable.java b/com/hbm/blocks/bomb/LaunchTable.java similarity index 75% rename from com/hbm/blocks/machine/MachineLaunchTable.java rename to com/hbm/blocks/bomb/LaunchTable.java index 00cfc22d1..b9672c035 100644 --- a/com/hbm/blocks/machine/MachineLaunchTable.java +++ b/com/hbm/blocks/bomb/LaunchTable.java @@ -1,8 +1,10 @@ -package com.hbm.blocks.machine; +package com.hbm.blocks.bomb; import com.hbm.blocks.ModBlocks; +import com.hbm.interfaces.IBomb; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import com.hbm.tileentity.bomb.TileEntityLaunchTable; import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; @@ -13,9 +15,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class MachineLaunchTable extends BlockContainer implements IMultiblock { +public class LaunchTable extends BlockContainer implements IMultiblock, IBomb { - public MachineLaunchTable(Material p_i45386_1_) { + public LaunchTable(Material p_i45386_1_) { super(p_i45386_1_); } @@ -57,4 +59,12 @@ public class MachineLaunchTable extends BlockContainer implements IMultiblock { } } + @Override + public void explode(World world, int x, int y, int z) { + TileEntityLaunchTable entity = (TileEntityLaunchTable) world.getTileEntity(x, y, z); + + if(entity.canLaunch()) + entity.launch(); + } + } diff --git a/com/hbm/blocks/generic/BlockOre.java b/com/hbm/blocks/generic/BlockOre.java index 907df8e20..d79f35467 100644 --- a/com/hbm/blocks/generic/BlockOre.java +++ b/com/hbm/blocks/generic/BlockOre.java @@ -105,13 +105,13 @@ public class BlockOre extends Block { case 1: return ModItems.plate_advanced_alloy; case 2: return ModItems.powder_desh_mix; case 3: return ModItems.ingot_desh; - case 4: return ModItems.fusion_core; + case 4: return ModItems.battery_advanced; case 5: return ModItems.battery_lithium_cell; - case 6: return ModItems.battery_schrabidium; + case 6: return ModItems.battery_advanced_cell; case 7: return ModItems.nugget_schrabidium; - case 8: return ModItems.ingot_pu238; - case 9: return ModItems.ingot_pu239; - case 10: return ModItems.ingot_u235; + case 8: return ModItems.ingot_plutonium; + case 9: return ModItems.ingot_thorium_fuel; + case 10: return ModItems.ingot_u233; case 11: return ModItems.turbine_tungsten; case 12: return ModItems.ingot_dura_steel; case 13: return ModItems.ingot_polymer; diff --git a/com/hbm/blocks/generic/DecoTapeRecorder.java b/com/hbm/blocks/generic/DecoTapeRecorder.java index b6ee5094e..267d1d384 100644 --- a/com/hbm/blocks/generic/DecoTapeRecorder.java +++ b/com/hbm/blocks/generic/DecoTapeRecorder.java @@ -1,5 +1,6 @@ package com.hbm.blocks.generic; +import com.hbm.blocks.ModBlocks; import com.hbm.tileentity.deco.TileEntityDecoTapeRecorder; import net.minecraft.block.BlockContainer; @@ -18,12 +19,12 @@ public class DecoTapeRecorder extends BlockContainer{ @Override public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileEntityDecoTapeRecorder(); + return null; } @Override public int getRenderType(){ - return -1; + return 334079; } @Override diff --git a/com/hbm/entity/missile/EntityMissileCustom.java b/com/hbm/entity/missile/EntityMissileCustom.java index 2106f95c8..013f9c70a 100644 --- a/com/hbm/entity/missile/EntityMissileCustom.java +++ b/com/hbm/entity/missile/EntityMissileCustom.java @@ -12,6 +12,7 @@ import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.handler.MissileStruct; import com.hbm.items.weapon.ItemMissile; +import com.hbm.items.weapon.ItemMissile.FuelType; import com.hbm.items.weapon.ItemMissile.WarheadType; import com.hbm.main.MainRegistry; import com.hbm.packet.AuxParticlePacket; @@ -231,15 +232,11 @@ public class EntityMissileCustom extends Entity implements IChunkLoader { { this.dataWatcher.updateObject(8, Integer.valueOf(this.health)); - this.prevPosX = this.posX; - this.prevPosY = this.posY; - this.prevPosZ = this.posZ; - this.setLocationAndAngles(posX + this.motionX * velocity, posY + this.motionY * velocity, posZ + this.motionZ * velocity, 0, 0); this.rotation(); - if(fuel > 0) { + if(fuel > 0 || worldObj.isRemote) { fuel -= consumption; @@ -266,7 +263,9 @@ public class EntityMissileCustom extends Entity implements IChunkLoader { motionX *= 0.99; motionZ *= 0.99; - motionY -= 0.1; + + if(motionY > -1.5) + motionY -= 0.05; } if (this.worldObj.getBlock((int) this.posX, (int) this.posY, (int) this.posZ) != Blocks.air @@ -280,8 +279,35 @@ public class EntityMissileCustom extends Entity implements IChunkLoader { return; } - if (this.worldObj.isRemote) - MainRegistry.proxy.particleControl(posX, posY, posZ, 2); + if (this.worldObj.isRemote) { + + Vec3 v = Vec3.createVectorHelper(motionX, motionY, motionZ); + v = v.normalize(); + + String smoke = ""; + + ItemMissile part = (ItemMissile) Item.getItemById(this.dataWatcher.getWatchableObjectInt(10)); + FuelType type = (FuelType)part.attributes[0]; + + switch(type) { + case BALEFIRE: + break; + case HYDROGEN: + smoke = "exHydrogen"; + break; + case KEROSENE: + smoke = "exKerosene"; + break; + case SOLID: + smoke = "exSolid"; + break; + case XENON: + break; + } + + for(int i = 0; i < velocity; i++) + MainRegistry.proxy.spawnParticle(posX - v.xCoord * i, posY - v.yCoord * i, posZ - v.zCoord * i, smoke, null); + } loadNeighboringChunks((int)(posX / 16), (int)(posZ / 16)); } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 5633e7f08..661c8afca 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -827,9 +827,11 @@ public class ModItems { public static Item missile_emp; public static Item mp_thruster_10_kerosene; + public static Item mp_thruster_10_kerosene_tec; public static Item mp_thruster_10_solid; public static Item mp_thruster_10_xenon; public static Item mp_thruster_15_kerosene; + public static Item mp_thruster_15_kerosene_tec; public static Item mp_thruster_15_kerosene_dual; public static Item mp_thruster_15_kerosene_triple; public static Item mp_thruster_15_solid; @@ -839,6 +841,7 @@ public class ModItems { public static Item mp_thruster_15_balefire_short; public static Item mp_thruster_15_balefire; public static Item mp_thruster_15_balefire_large; + public static Item mp_thruster_15_balefire_large_rad; public static Item mp_thruster_20_kerosene; public static Item mp_stability_10_flat; @@ -846,53 +849,91 @@ public class ModItems { public static Item mp_stability_10_space; public static Item mp_stability_15_flat; public static Item mp_stability_15_thin; + public static Item mp_stability_15_soyuz; public static Item mp_stability_20_flat; public static Item mp_fuselage_10_kerosene; public static Item mp_fuselage_10_kerosene_camo; public static Item mp_fuselage_10_kerosene_desert; + public static Item mp_fuselage_10_kerosene_sky; public static Item mp_fuselage_10_kerosene_flames; public static Item mp_fuselage_10_kerosene_insulation; public static Item mp_fuselage_10_kerosene_sleek; public static Item mp_fuselage_10_kerosene_metal; + public static Item mp_fuselage_10_kerosene_taint; + public static Item mp_fuselage_10_solid; public static Item mp_fuselage_10_solid_flames; public static Item mp_fuselage_10_solid_insulation; public static Item mp_fuselage_10_solid_sleek; public static Item mp_fuselage_10_solid_soviet_glory; + public static Item mp_fuselage_10_solid_cathedral; + public static Item mp_fuselage_10_solid_moonlit; + public static Item mp_fuselage_10_solid_battery; + public static Item mp_fuselage_10_solid_duracell; + public static Item mp_fuselage_10_xenon; + public static Item mp_fuselage_10_xenon_bhole; + public static Item mp_fuselage_10_long_kerosene; public static Item mp_fuselage_10_long_kerosene_camo; public static Item mp_fuselage_10_long_kerosene_desert; + public static Item mp_fuselage_10_long_kerosene_sky; public static Item mp_fuselage_10_long_kerosene_flames; public static Item mp_fuselage_10_long_kerosene_insulation; public static Item mp_fuselage_10_long_kerosene_sleek; public static Item mp_fuselage_10_long_kerosene_metal; + public static Item mp_fuselage_10_long_kerosene_taint; + public static Item mp_fuselage_10_long_kerosene_dash; + public static Item mp_fuselage_10_long_kerosene_vap; + public static Item mp_fuselage_10_long_solid; public static Item mp_fuselage_10_long_solid_flames; public static Item mp_fuselage_10_long_solid_insulation; public static Item mp_fuselage_10_long_solid_sleek; public static Item mp_fuselage_10_long_solid_soviet_glory; + public static Item mp_fuselage_10_long_solid_bullet; + public static Item mp_fuselage_10_long_solid_silvermoonlight; + public static Item mp_fuselage_10_15_kerosene; public static Item mp_fuselage_10_15_solid; public static Item mp_fuselage_10_15_hydrogen; public static Item mp_fuselage_10_15_balefire; + public static Item mp_fuselage_15_kerosene; public static Item mp_fuselage_15_kerosene_camo; public static Item mp_fuselage_15_kerosene_desert; + public static Item mp_fuselage_15_kerosene_sky; public static Item mp_fuselage_15_kerosene_insulation; public static Item mp_fuselage_15_kerosene_metal; public static Item mp_fuselage_15_kerosene_decorated; public static Item mp_fuselage_15_kerosene_steampunk; public static Item mp_fuselage_15_kerosene_polite; public static Item mp_fuselage_15_kerosene_blackjack; + public static Item mp_fuselage_15_kerosene_lambda; + public static Item mp_fuselage_15_kerosene_minuteman; + public static Item mp_fuselage_15_kerosene_pip; + public static Item mp_fuselage_15_kerosene_taint; + public static Item mp_fuselage_15_kerosene_yuck; + public static Item mp_fuselage_15_solid; public static Item mp_fuselage_15_solid_insulation; public static Item mp_fuselage_15_solid_desh; public static Item mp_fuselage_15_solid_soviet_glory; public static Item mp_fuselage_15_solid_soviet_stank; + public static Item mp_fuselage_15_solid_faust; + public static Item mp_fuselage_15_solid_silvermoonlight; + public static Item mp_fuselage_15_solid_snowy; + public static Item mp_fuselage_15_solid_panorama; + public static Item mp_fuselage_15_solid_roses; + public static Item mp_fuselage_15_hydrogen; + public static Item mp_fuselage_15_hydrogen_cathedral; + public static Item mp_fuselage_15_balefire; + + public static Item mp_fuselage_15_20_kerosene; + public static Item mp_fuselage_20_kerosene; public static Item mp_warhead_10_he; @@ -907,6 +948,7 @@ public class ModItems { public static Item mp_warhead_15_nuclear_shark; public static Item mp_warhead_15_boxcar; public static Item mp_warhead_15_n2; + public static Item mp_warhead_15_balefire; public static Item mp_warhead_20_he; public static Item mp_chip_1; @@ -2424,85 +2466,131 @@ public class ModItems { sat_chip = new ItemSatChip().setUnlocalizedName("sat_chip").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":sat_chip"); sat_interface = new ItemSatInterface().setUnlocalizedName("sat_interface").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":sat_interface"); - mp_thruster_10_kerosene = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 1.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_thruster_10_kerosene").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_10_solid = new ItemMissile().makeThruster(FuelType.SOLID, 1F, 1.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_thruster_10_solid").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_10_xenon = new ItemMissile().makeThruster(FuelType.XENON, 1F, 1.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_thruster_10_xenon").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_15_kerosene = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 7.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_kerosene").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_15_kerosene_dual = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 2.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_kerosene_dual").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_15_kerosene_triple = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_kerosene_triple").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_15_solid = new ItemMissile().makeThruster(FuelType.SOLID, 1F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_solid").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_15_solid_hexdecuple = new ItemMissile().makeThruster(FuelType.SOLID, 1F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_solid_hexdecuple").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_15_hydrogen = new ItemMissile().makeThruster(FuelType.HYDROGEN, 1F, 7.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_hydrogen").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_15_hydrogen_dual = new ItemMissile().makeThruster(FuelType.HYDROGEN, 1F, 2.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_hydrogen_dual").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_15_balefire_short = new ItemMissile().makeThruster(FuelType.BALEFIRE, 1F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_balefire_short").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_15_balefire = new ItemMissile().makeThruster(FuelType.BALEFIRE, 1F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_15_balefire_large = new ItemMissile().makeThruster(FuelType.BALEFIRE, 1F, 7.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_balefire_large").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_thruster_20_kerosene = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 1F, PartSize.SIZE_20) .setUnlocalizedName("mp_t_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_thruster"); - mp_stability_10_flat = new ItemMissile().makeStability(0.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_stability_10_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_stability"); - mp_stability_10_cruise = new ItemMissile().makeStability(0.25F, PartSize.SIZE_10) .setUnlocalizedName("mp_stability_10_cruise").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_stability"); - mp_stability_10_space = new ItemMissile().makeStability(0.35F, PartSize.SIZE_10) .setUnlocalizedName("mp_stability_10_space").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_stability"); - mp_stability_15_flat = new ItemMissile().makeStability(0.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_stability_15_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_stability"); - mp_stability_15_thin = new ItemMissile().makeStability(0.25F, PartSize.SIZE_15) .setUnlocalizedName("mp_stability_15_thin").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_stability"); - mp_stability_20_flat = new ItemMissile().makeStability(0.5F, PartSize.SIZE_20) .setUnlocalizedName("mp_s_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_stability"); - mp_fuselage_10_kerosene = new ItemMissile().makeFuselage(FuelType.KEROSENE, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_kerosene").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_kerosene_camo = new ItemMissile().makeFuselage(FuelType.KEROSENE, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_kerosene_camo").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_kerosene_desert = new ItemMissile().makeFuselage(FuelType.KEROSENE, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_kerosene_desert").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_kerosene_flames = new ItemMissile().makeFuselage(FuelType.KEROSENE, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_kerosene_flames").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_kerosene_insulation = new ItemMissile().makeFuselage(FuelType.KEROSENE, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_kerosene_insulation").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_kerosene_sleek = new ItemMissile().makeFuselage(FuelType.KEROSENE, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_kerosene_sleek").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_kerosene_metal = new ItemMissile().makeFuselage(FuelType.KEROSENE, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_kerosene_metal").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_solid = new ItemMissile().makeFuselage(FuelType.SOLID, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_solid").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_solid_flames = new ItemMissile().makeFuselage(FuelType.SOLID, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_solid_flames").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_solid_insulation = new ItemMissile().makeFuselage(FuelType.SOLID, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_solid_insulation").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_solid_sleek = new ItemMissile().makeFuselage(FuelType.SOLID, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_solid_sleek").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_solid_soviet_glory = new ItemMissile().makeFuselage(FuelType.SOLID, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_solid_soviet_glory").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_xenon = new ItemMissile().makeFuselage(FuelType.XENON, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_xenon").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_long_kerosene = new ItemMissile().makeFuselage(FuelType.KEROSENE, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_kerosene").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_long_kerosene_camo = new ItemMissile().makeFuselage(FuelType.KEROSENE, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_kerosene_camo").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_long_kerosene_desert = new ItemMissile().makeFuselage(FuelType.KEROSENE, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_kerosene_desert").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_long_kerosene_flames = new ItemMissile().makeFuselage(FuelType.KEROSENE, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_kerosene_flames").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_long_kerosene_insulation = new ItemMissile().makeFuselage(FuelType.KEROSENE, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_kerosene_insulation").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_long_kerosene_sleek = new ItemMissile().makeFuselage(FuelType.KEROSENE, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_kerosene_sleek").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_long_kerosene_metal = new ItemMissile().makeFuselage(FuelType.KEROSENE, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_kerosene_metal").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_long_solid = new ItemMissile().makeFuselage(FuelType.SOLID, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_solid").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_long_solid_flames = new ItemMissile().makeFuselage(FuelType.SOLID, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_solid_flames").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_long_solid_insulation = new ItemMissile().makeFuselage(FuelType.SOLID, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_solid_insulation").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_long_solid_sleek = new ItemMissile().makeFuselage(FuelType.SOLID, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_solid_sleek").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_long_solid_soviet_glory = new ItemMissile().makeFuselage(FuelType.SOLID, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_solid_soviet_glory").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_15_kerosene = new ItemMissile().makeFuselage(FuelType.KEROSENE, 10000F, PartSize.SIZE_10, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_10_15_kerosene").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_15_solid = new ItemMissile().makeFuselage(FuelType.SOLID, 10000F, PartSize.SIZE_10, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_10_15_solid").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_15_hydrogen = new ItemMissile().makeFuselage(FuelType.HYDROGEN, 10000F, PartSize.SIZE_10, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_10_15_hydrogen").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_10_15_balefire = new ItemMissile().makeFuselage(FuelType.BALEFIRE, 10000F, PartSize.SIZE_10, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_10_15_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_kerosene = new ItemMissile().makeFuselage(FuelType.KEROSENE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_kerosene").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_kerosene_camo = new ItemMissile().makeFuselage(FuelType.KEROSENE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_kerosene_camo").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_kerosene_desert = new ItemMissile().makeFuselage(FuelType.KEROSENE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_kerosene_desert").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_kerosene_insulation = new ItemMissile().makeFuselage(FuelType.KEROSENE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_kerosene_insulation").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_kerosene_metal = new ItemMissile().makeFuselage(FuelType.KEROSENE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_kerosene_metal").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_kerosene_decorated = new ItemMissile().makeFuselage(FuelType.KEROSENE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_kerosene_decorated").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_kerosene_steampunk = new ItemMissile().makeFuselage(FuelType.KEROSENE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_kerosene_steampunk").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_kerosene_polite = new ItemMissile().makeFuselage(FuelType.KEROSENE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_kerosene_polite").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_kerosene_blackjack = new ItemMissile().makeFuselage(FuelType.KEROSENE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_kerosene_blackjack").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); + mp_thruster_10_kerosene = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 1.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_thruster_10_kerosene"); + mp_thruster_10_kerosene_tec = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 1.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_thruster_10_kerosene_tec"); + mp_thruster_10_solid = new ItemMissile().makeThruster(FuelType.SOLID, 1F, 1.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_thruster_10_solid"); + mp_thruster_10_xenon = new ItemMissile().makeThruster(FuelType.XENON, 1F, 1.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_thruster_10_xenon"); + mp_thruster_15_kerosene = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 7.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_kerosene"); + mp_thruster_15_kerosene_tec = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 7.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_kerosene_tec"); + mp_thruster_15_kerosene_dual = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 2.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_kerosene_dual"); + mp_thruster_15_kerosene_triple = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_kerosene_triple"); + mp_thruster_15_solid = new ItemMissile().makeThruster(FuelType.SOLID, 1F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_solid"); + mp_thruster_15_solid_hexdecuple = new ItemMissile().makeThruster(FuelType.SOLID, 1F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_solid_hexdecuple"); + mp_thruster_15_hydrogen = new ItemMissile().makeThruster(FuelType.HYDROGEN, 1F, 7.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_hydrogen"); + mp_thruster_15_hydrogen_dual = new ItemMissile().makeThruster(FuelType.HYDROGEN, 1F, 2.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_hydrogen_dual"); + mp_thruster_15_balefire_short = new ItemMissile().makeThruster(FuelType.BALEFIRE, 1F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_balefire_short"); + mp_thruster_15_balefire = new ItemMissile().makeThruster(FuelType.BALEFIRE, 1F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_balefire"); + mp_thruster_15_balefire_large = new ItemMissile().makeThruster(FuelType.BALEFIRE, 1F, 7.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_thruster_15_balefire_large"); + mp_thruster_15_balefire_large_rad = new ItemMissile().makeThruster(FuelType.BALEFIRE, 1F, 7.5F, PartSize.SIZE_15).setAuthor("The Master").setUnlocalizedName("mp_thruster_15_balefire_large_rad"); + mp_thruster_20_kerosene = new ItemMissile().makeThruster(FuelType.KEROSENE, 1F, 100F, PartSize.SIZE_20) .setUnlocalizedName("mp_t_20"); + + mp_stability_10_flat = new ItemMissile().makeStability(0.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_stability_10_flat"); + mp_stability_10_cruise = new ItemMissile().makeStability(0.25F, PartSize.SIZE_10) .setUnlocalizedName("mp_stability_10_cruise"); + mp_stability_10_space = new ItemMissile().makeStability(0.35F, PartSize.SIZE_10) .setUnlocalizedName("mp_stability_10_space"); + mp_stability_15_flat = new ItemMissile().makeStability(0.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_stability_15_flat"); + mp_stability_15_thin = new ItemMissile().makeStability(0.35F, PartSize.SIZE_15) .setUnlocalizedName("mp_stability_15_thin"); + mp_stability_15_soyuz = new ItemMissile().makeStability(0.25F, PartSize.SIZE_15) .setUnlocalizedName("mp_stability_15_soyuz"); + mp_stability_20_flat = new ItemMissile().makeStability(0.5F, PartSize.SIZE_20) .setUnlocalizedName("mp_s_20"); + + mp_fuselage_10_kerosene = new ItemMissile().makeFuselage(FuelType.KEROSENE, 2500F, PartSize.SIZE_10, PartSize.SIZE_10).setAuthor("Hoboy") .setUnlocalizedName("mp_fuselage_10_kerosene"); + mp_fuselage_10_kerosene_camo = ((ItemMissile) mp_fuselage_10_kerosene).copy().setTitle("Camo").setUnlocalizedName("mp_fuselage_10_kerosene_camo"); + mp_fuselage_10_kerosene_desert = ((ItemMissile) mp_fuselage_10_kerosene).copy().setTitle("Desert Camo").setUnlocalizedName("mp_fuselage_10_kerosene_desert"); + mp_fuselage_10_kerosene_sky = ((ItemMissile) mp_fuselage_10_kerosene).copy().setTitle("Sky Camo").setUnlocalizedName("mp_fuselage_10_kerosene_sky"); + mp_fuselage_10_kerosene_flames = ((ItemMissile) mp_fuselage_10_kerosene).copy().setTitle("Sick Flames").setUnlocalizedName("mp_fuselage_10_kerosene_flames"); + mp_fuselage_10_kerosene_insulation = ((ItemMissile) mp_fuselage_10_kerosene).copy().setTitle("Orange Insulation").setUnlocalizedName("mp_fuselage_10_kerosene_insulation"); + mp_fuselage_10_kerosene_sleek = ((ItemMissile) mp_fuselage_10_kerosene).copy().setTitle("IF-R&D").setUnlocalizedName("mp_fuselage_10_kerosene_sleek"); + mp_fuselage_10_kerosene_metal = ((ItemMissile) mp_fuselage_10_kerosene).copy().setTitle("Bolted Metal").setAuthor("Hoboy").setUnlocalizedName("mp_fuselage_10_kerosene_metal"); + mp_fuselage_10_kerosene_taint = ((ItemMissile) mp_fuselage_10_kerosene).copy().setAuthor("Sam").setTitle("Tainted").setUnlocalizedName("mp_fuselage_10_kerosene_taint"); + + mp_fuselage_10_solid = new ItemMissile().makeFuselage(FuelType.SOLID, 2500F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_solid"); + mp_fuselage_10_solid_flames = ((ItemMissile) mp_fuselage_10_solid).copy().setTitle("Sick Flames").setUnlocalizedName("mp_fuselage_10_solid_flames"); + mp_fuselage_10_solid_insulation = ((ItemMissile) mp_fuselage_10_solid).copy().setTitle("Orange Insulation").setUnlocalizedName("mp_fuselage_10_solid_insulation"); + mp_fuselage_10_solid_sleek = ((ItemMissile) mp_fuselage_10_solid).copy().setTitle("IF-R&D").setUnlocalizedName("mp_fuselage_10_solid_sleek"); + mp_fuselage_10_solid_soviet_glory = ((ItemMissile) mp_fuselage_10_solid).copy().setAuthor("Hoboy").setTitle("Soviet Glory").setUnlocalizedName("mp_fuselage_10_solid_soviet_glory"); + mp_fuselage_10_solid_cathedral = ((ItemMissile) mp_fuselage_10_solid).copy().setAuthor("Satan").setTitle("Unholy Cathedral").setUnlocalizedName("mp_fuselage_10_solid_cathedral"); + mp_fuselage_10_solid_moonlit = ((ItemMissile) mp_fuselage_10_solid).copy().setAuthor("The Master & Hoboy").setTitle("Moonlit").setUnlocalizedName("mp_fuselage_10_solid_moonlit"); + mp_fuselage_10_solid_battery = ((ItemMissile) mp_fuselage_10_solid).copy().setAuthor("wolfmonster222").setTitle("Ecstatic").setWittyText("I got caught eating batteries again :(").setUnlocalizedName("mp_fuselage_10_solid_battery"); + mp_fuselage_10_solid_duracell = ((ItemMissile) mp_fuselage_10_solid).copy().setAuthor("Hoboy").setTitle("Duracell").setUnlocalizedName("mp_fuselage_10_solid_duracell"); + + mp_fuselage_10_xenon = new ItemMissile().makeFuselage(FuelType.XENON, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_xenon"); + mp_fuselage_10_xenon_bhole = ((ItemMissile) mp_fuselage_10_xenon).copy().setAuthor("Sten89").setTitle("Morceus-1457").setUnlocalizedName("mp_fuselage_10_xenon_bhole"); + + mp_fuselage_10_long_kerosene = new ItemMissile().makeFuselage(FuelType.KEROSENE, 5000F, PartSize.SIZE_10, PartSize.SIZE_10).setAuthor("Hoboy") .setUnlocalizedName("mp_fuselage_10_long_kerosene"); + mp_fuselage_10_long_kerosene_camo = ((ItemMissile) mp_fuselage_10_long_kerosene).copy().setTitle("Camo").setUnlocalizedName("mp_fuselage_10_long_kerosene_camo"); + mp_fuselage_10_long_kerosene_desert = ((ItemMissile) mp_fuselage_10_long_kerosene).copy().setTitle("Desert Camo").setUnlocalizedName("mp_fuselage_10_long_kerosene_desert"); + mp_fuselage_10_long_kerosene_sky = ((ItemMissile) mp_fuselage_10_long_kerosene).copy().setTitle("Sky Camo").setUnlocalizedName("mp_fuselage_10_long_kerosene_sky"); + mp_fuselage_10_long_kerosene_flames = ((ItemMissile) mp_fuselage_10_long_kerosene).copy().setTitle("Sick Flames").setUnlocalizedName("mp_fuselage_10_long_kerosene_flames"); + mp_fuselage_10_long_kerosene_insulation = ((ItemMissile) mp_fuselage_10_long_kerosene).copy().setTitle("Orange Insulation").setUnlocalizedName("mp_fuselage_10_long_kerosene_insulation"); + mp_fuselage_10_long_kerosene_sleek = ((ItemMissile) mp_fuselage_10_long_kerosene).copy().setTitle("IF-R&D").setUnlocalizedName("mp_fuselage_10_long_kerosene_sleek"); + mp_fuselage_10_long_kerosene_metal = ((ItemMissile) mp_fuselage_10_long_kerosene).copy().setAuthor("Hoboy").setUnlocalizedName("mp_fuselage_10_long_kerosene_metal"); + mp_fuselage_10_long_kerosene_dash = ((ItemMissile) mp_fuselage_10_long_kerosene).copy().setAuthor("Sam").setTitle("Dash").setWittyText("I wash my hands of it.").setUnlocalizedName("mp_fuselage_10_long_kerosene_dash"); + mp_fuselage_10_long_kerosene_taint = ((ItemMissile) mp_fuselage_10_long_kerosene).copy().setAuthor("Sam").setTitle("Tainted").setUnlocalizedName("mp_fuselage_10_long_kerosene_taint"); + mp_fuselage_10_long_kerosene_vap = ((ItemMissile) mp_fuselage_10_long_kerosene).copy().setAuthor("VT-6/24").setTitle("Minty Contrail").setUnlocalizedName("mp_fuselage_10_long_kerosene_vap"); + + mp_fuselage_10_long_solid = new ItemMissile().makeFuselage(FuelType.SOLID, 5000F, PartSize.SIZE_10, PartSize.SIZE_10) .setUnlocalizedName("mp_fuselage_10_long_solid"); + mp_fuselage_10_long_solid_flames = ((ItemMissile) mp_fuselage_10_long_solid).copy().setTitle("Sick Flames").setUnlocalizedName("mp_fuselage_10_long_solid_flames"); + mp_fuselage_10_long_solid_insulation = ((ItemMissile) mp_fuselage_10_long_solid).copy().setTitle("Orange Insulation").setUnlocalizedName("mp_fuselage_10_long_solid_insulation"); + mp_fuselage_10_long_solid_sleek = ((ItemMissile) mp_fuselage_10_long_solid).copy().setTitle("IF-R&D").setUnlocalizedName("mp_fuselage_10_long_solid_sleek"); + mp_fuselage_10_long_solid_soviet_glory = ((ItemMissile) mp_fuselage_10_long_solid).copy().setAuthor("Hoboy").setTitle("Soviet Glory").setUnlocalizedName("mp_fuselage_10_long_solid_soviet_glory"); + mp_fuselage_10_long_solid_bullet = ((ItemMissile) mp_fuselage_10_long_solid).copy().setAuthor("Sam").setTitle("Bullet Bill").setUnlocalizedName("mp_fuselage_10_long_solid_bullet"); + mp_fuselage_10_long_solid_silvermoonlight = ((ItemMissile) mp_fuselage_10_long_solid).copy().setAuthor("The Master").setTitle("Silver Moonlight").setUnlocalizedName("mp_fuselage_10_long_solid_silvermoonlight"); + + mp_fuselage_10_15_kerosene = new ItemMissile().makeFuselage(FuelType.KEROSENE, 10000F, PartSize.SIZE_10, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_10_15_kerosene"); + mp_fuselage_10_15_solid = new ItemMissile().makeFuselage(FuelType.SOLID, 10000F, PartSize.SIZE_10, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_10_15_solid"); + mp_fuselage_10_15_hydrogen = new ItemMissile().makeFuselage(FuelType.HYDROGEN, 10000F, PartSize.SIZE_10, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_10_15_hydrogen"); + mp_fuselage_10_15_balefire = new ItemMissile().makeFuselage(FuelType.BALEFIRE, 10000F, PartSize.SIZE_10, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_10_15_balefire"); + + mp_fuselage_15_kerosene = new ItemMissile().makeFuselage(FuelType.KEROSENE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15).setAuthor("Hoboy") .setUnlocalizedName("mp_fuselage_15_kerosene"); + mp_fuselage_15_kerosene_camo = ((ItemMissile) mp_fuselage_15_kerosene).copy().setTitle("Camo").setUnlocalizedName("mp_fuselage_15_kerosene_camo"); + mp_fuselage_15_kerosene_desert = ((ItemMissile) mp_fuselage_15_kerosene).copy().setTitle("Desert Camo").setUnlocalizedName("mp_fuselage_15_kerosene_desert"); + mp_fuselage_15_kerosene_sky = ((ItemMissile) mp_fuselage_15_kerosene).copy().setTitle("Sky Camo").setUnlocalizedName("mp_fuselage_15_kerosene_sky"); + mp_fuselage_15_kerosene_insulation = ((ItemMissile) mp_fuselage_15_kerosene).copy().setTitle("Orange Insulation").setUnlocalizedName("mp_fuselage_15_kerosene_insulation"); + mp_fuselage_15_kerosene_metal = ((ItemMissile) mp_fuselage_15_kerosene).copy().setAuthor("Hoboy").setTitle("Bolted Metal").setUnlocalizedName("mp_fuselage_15_kerosene_metal"); + mp_fuselage_15_kerosene_decorated = ((ItemMissile) mp_fuselage_15_kerosene).copy().setAuthor("Hoboy").setTitle("Decorated").setUnlocalizedName("mp_fuselage_15_kerosene_decorated"); + mp_fuselage_15_kerosene_steampunk = ((ItemMissile) mp_fuselage_15_kerosene).copy().setAuthor("Hoboy").setTitle("Steampunk").setUnlocalizedName("mp_fuselage_15_kerosene_steampunk"); + mp_fuselage_15_kerosene_polite = ((ItemMissile) mp_fuselage_15_kerosene).copy().setAuthor("Hoboy").setTitle("Polite").setUnlocalizedName("mp_fuselage_15_kerosene_polite"); + mp_fuselage_15_kerosene_blackjack = ((ItemMissile) mp_fuselage_15_kerosene).copy().setTitle("Queen Whiskey").setUnlocalizedName("mp_fuselage_15_kerosene_blackjack"); + mp_fuselage_15_kerosene_lambda = ((ItemMissile) mp_fuselage_15_kerosene).copy().setAuthor("VT-6/24").setTitle("Lambda Complex").setWittyText("MAGNIFICENT MICROWAVE CASSEROLE").setUnlocalizedName("mp_fuselage_15_kerosene_lambda"); + mp_fuselage_15_kerosene_minuteman = ((ItemMissile) mp_fuselage_15_kerosene).copy().setAuthor("Spexta").setTitle("MX 1702").setUnlocalizedName("mp_fuselage_15_kerosene_minuteman"); + mp_fuselage_15_kerosene_pip = ((ItemMissile) mp_fuselage_15_kerosene).copy().setAuthor("The Doctor").setTitle("LittlePip").setWittyText("32!").setUnlocalizedName("mp_fuselage_15_kerosene_pip"); + mp_fuselage_15_kerosene_taint = ((ItemMissile) mp_fuselage_15_kerosene).copy().setAuthor("Sam").setTitle("Tainted").setUnlocalizedName("mp_fuselage_15_kerosene_taint"); + mp_fuselage_15_kerosene_yuck = ((ItemMissile) mp_fuselage_15_kerosene).copy().setAuthor("Hoboy").setTitle("Flesh").setUnlocalizedName("mp_fuselage_15_kerosene_yuck"); + mp_fuselage_15_solid = new ItemMissile().makeFuselage(FuelType.SOLID, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_solid").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_solid_insulation = new ItemMissile().makeFuselage(FuelType.SOLID, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_solid_insulation").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_solid_desh = new ItemMissile().makeFuselage(FuelType.SOLID, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_solid_desh").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_solid_soviet_glory = new ItemMissile().makeFuselage(FuelType.SOLID, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_solid_soviet_glory").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); - mp_fuselage_15_solid_soviet_stank = new ItemMissile().makeFuselage(FuelType.SOLID, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_solid_soviet_stank").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); + mp_fuselage_15_solid_insulation = ((ItemMissile) mp_fuselage_15_solid).copy().setTitle("Orange Insulation").setUnlocalizedName("mp_fuselage_15_solid_insulation"); + mp_fuselage_15_solid_desh = ((ItemMissile) mp_fuselage_15_solid).copy().setAuthor("Hoboy").setTitle("Desh Plating").setUnlocalizedName("mp_fuselage_15_solid_desh"); + mp_fuselage_15_solid_soviet_glory = ((ItemMissile) mp_fuselage_15_solid).copy().setAuthor("Hoboy").setTitle("Soviet Glory").setUnlocalizedName("mp_fuselage_15_solid_soviet_glory"); + mp_fuselage_15_solid_soviet_stank = ((ItemMissile) mp_fuselage_15_solid).copy().setAuthor("Hoboy").setTitle("Soviet Stank").setUnlocalizedName("mp_fuselage_15_solid_soviet_stank"); + mp_fuselage_15_solid_faust = ((ItemMissile) mp_fuselage_15_solid).copy().setAuthor("Dr.Nostalgia").setTitle("Mighty Lauren").setWittyText("Welcome to Subway, may I take your order?").setUnlocalizedName("mp_fuselage_15_solid_faust"); + mp_fuselage_15_solid_silvermoonlight = ((ItemMissile) mp_fuselage_15_solid).copy().setAuthor("The Master").setTitle("Silver Moonlight").setUnlocalizedName("mp_fuselage_15_solid_silvermoonlight"); + mp_fuselage_15_solid_snowy = ((ItemMissile) mp_fuselage_15_solid).copy().setAuthor("Dr.Nostalgia").setTitle("Chilly Day").setUnlocalizedName("mp_fuselage_15_solid_snowy"); + mp_fuselage_15_solid_panorama = ((ItemMissile) mp_fuselage_15_solid).copy().setAuthor("Hoboy").setTitle("Panorama").setUnlocalizedName("mp_fuselage_15_solid_panorama"); + mp_fuselage_15_solid_roses = ((ItemMissile) mp_fuselage_15_solid).copy().setAuthor("Hoboy").setTitle("Bed of roses").setUnlocalizedName("mp_fuselage_15_solid_roses"); + mp_fuselage_15_hydrogen = new ItemMissile().makeFuselage(FuelType.HYDROGEN, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_hydrogen").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); + mp_fuselage_15_hydrogen_cathedral = ((ItemMissile) mp_fuselage_15_hydrogen).copy().setAuthor("Satan").setTitle("Unholy Cathedral").setUnlocalizedName("mp_fuselage_15_hydrogen_cathedral"); + mp_fuselage_15_balefire = new ItemMissile().makeFuselage(FuelType.BALEFIRE, 15000F, PartSize.SIZE_15, PartSize.SIZE_15) .setUnlocalizedName("mp_fuselage_15_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); + + mp_fuselage_15_20_kerosene = new ItemMissile().makeFuselage(FuelType.KEROSENE, 20000, PartSize.SIZE_15, PartSize.SIZE_20) .setUnlocalizedName("mp_fuselage_15_20_kerosene").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); + mp_fuselage_20_kerosene = new ItemMissile().makeFuselage(FuelType.KEROSENE, 1000F, PartSize.SIZE_20, PartSize.SIZE_20) .setUnlocalizedName("mp_f_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_fuselage"); + mp_warhead_10_he = new ItemMissile().makeWarhead(WarheadType.HE, 15F, 1.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_warhead_10_he").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); mp_warhead_10_incendiary = new ItemMissile().makeWarhead(WarheadType.INC, 15F, 1.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_warhead_10_incendiary").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); mp_warhead_10_buster = new ItemMissile().makeWarhead(WarheadType.BUSTER, 5F, 1.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_warhead_10_buster").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); - mp_warhead_10_nuclear = new ItemMissile().makeWarhead(WarheadType.NUCLEAR, 35F, 1.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_warhead_10_nuclear").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); - mp_warhead_10_nuclear_large = new ItemMissile().makeWarhead(WarheadType.NUCLEAR, 75F, 2.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_warhead_10_nuclear_large").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); + mp_warhead_10_nuclear = new ItemMissile().makeWarhead(WarheadType.NUCLEAR, 35F, 1.5F, PartSize.SIZE_10).setTitle("Tater Tot") .setUnlocalizedName("mp_warhead_10_nuclear").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); + mp_warhead_10_nuclear_large = new ItemMissile().makeWarhead(WarheadType.NUCLEAR, 75F, 2.5F, PartSize.SIZE_10).setTitle("Chernobyl Boris").setUnlocalizedName("mp_warhead_10_nuclear_large").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); mp_warhead_10_taint = new ItemMissile().makeWarhead(WarheadType.TAINT, 15F, 1.5F, PartSize.SIZE_10) .setUnlocalizedName("mp_warhead_10_taint").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); mp_warhead_15_he = new ItemMissile().makeWarhead(WarheadType.HE, 50F, 2.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_warhead_15_he").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); mp_warhead_15_incendiary = new ItemMissile().makeWarhead(WarheadType.INC, 35F, 2.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_warhead_15_incendiary").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); - mp_warhead_15_nuclear = new ItemMissile().makeWarhead(WarheadType.NUCLEAR, 125F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_warhead_15_nuclear").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); - mp_warhead_15_nuclear_shark = new ItemMissile().makeWarhead(WarheadType.NUCLEAR, 125F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_warhead_15_nuclear_shark").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); - mp_warhead_15_boxcar = new ItemMissile().makeWarhead(WarheadType.TX, 250F, 7.5F, PartSize.SIZE_15) .setUnlocalizedName("mp_warhead_15_boxcar").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); - mp_warhead_15_n2 = new ItemMissile().makeWarhead(WarheadType.N2, 100F, 5F, PartSize.SIZE_15) .setUnlocalizedName("mp_warhead_15_n2").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); + mp_warhead_15_nuclear = new ItemMissile().makeWarhead(WarheadType.NUCLEAR, 125F, 5F, PartSize.SIZE_15).setTitle("Auntie Bertha") .setUnlocalizedName("mp_warhead_15_nuclear").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); + mp_warhead_15_nuclear_shark = ((ItemMissile) mp_warhead_15_nuclear).copy().setTitle("Discount Bullet Bill").setUnlocalizedName("mp_warhead_15_nuclear_shark"); + mp_warhead_15_boxcar = new ItemMissile().makeWarhead(WarheadType.TX, 250F, 7.5F, PartSize.SIZE_15).setWittyText("?!?!") .setUnlocalizedName("mp_warhead_15_boxcar").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); + mp_warhead_15_n2 = new ItemMissile().makeWarhead(WarheadType.N2, 100F, 5F, PartSize.SIZE_15).setWittyText("[screams geometrically]") .setUnlocalizedName("mp_warhead_15_n2").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); + mp_warhead_15_balefire = new ItemMissile().makeWarhead(WarheadType.BALEFIRE, 100F, 7.5F, PartSize.SIZE_15).setAuthor("VT-6/24") .setUnlocalizedName("mp_warhead_15_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); mp_warhead_20_he = new ItemMissile().makeWarhead(WarheadType.HE, 15F, 1F, PartSize.SIZE_20) .setUnlocalizedName("mp_w_20").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_warhead"); + mp_chip_1 = new ItemMissile().makeChip(0.1F) .setUnlocalizedName("mp_c_1").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_1"); mp_chip_2 = new ItemMissile().makeChip(0.05F) .setUnlocalizedName("mp_c_2").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_2"); mp_chip_3 = new ItemMissile().makeChip(0.01F) .setUnlocalizedName("mp_c_3").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":mp_c_3"); @@ -4195,9 +4283,11 @@ public class ModItems { //Missile Parts GameRegistry.registerItem(mp_thruster_10_kerosene, mp_thruster_10_kerosene.getUnlocalizedName()); + GameRegistry.registerItem(mp_thruster_10_kerosene_tec, mp_thruster_10_kerosene_tec.getUnlocalizedName()); GameRegistry.registerItem(mp_thruster_10_solid, mp_thruster_10_solid.getUnlocalizedName()); GameRegistry.registerItem(mp_thruster_10_xenon, mp_thruster_10_xenon.getUnlocalizedName()); GameRegistry.registerItem(mp_thruster_15_kerosene, mp_thruster_15_kerosene.getUnlocalizedName()); + GameRegistry.registerItem(mp_thruster_15_kerosene_tec, mp_thruster_15_kerosene_tec.getUnlocalizedName()); GameRegistry.registerItem(mp_thruster_15_kerosene_dual, mp_thruster_15_kerosene_dual.getUnlocalizedName()); GameRegistry.registerItem(mp_thruster_15_kerosene_triple, mp_thruster_15_kerosene_triple.getUnlocalizedName()); GameRegistry.registerItem(mp_thruster_15_solid, mp_thruster_15_solid.getUnlocalizedName()); @@ -4207,38 +4297,53 @@ public class ModItems { GameRegistry.registerItem(mp_thruster_15_balefire_short, mp_thruster_15_balefire_short.getUnlocalizedName()); GameRegistry.registerItem(mp_thruster_15_balefire, mp_thruster_15_balefire.getUnlocalizedName()); GameRegistry.registerItem(mp_thruster_15_balefire_large, mp_thruster_15_balefire_large.getUnlocalizedName()); + GameRegistry.registerItem(mp_thruster_15_balefire_large_rad, mp_thruster_15_balefire_large_rad.getUnlocalizedName()); GameRegistry.registerItem(mp_thruster_20_kerosene, mp_thruster_20_kerosene.getUnlocalizedName()); GameRegistry.registerItem(mp_stability_10_flat, mp_stability_10_flat.getUnlocalizedName()); GameRegistry.registerItem(mp_stability_10_cruise, mp_stability_10_cruise.getUnlocalizedName()); GameRegistry.registerItem(mp_stability_10_space, mp_stability_10_space.getUnlocalizedName()); GameRegistry.registerItem(mp_stability_15_flat, mp_stability_15_flat.getUnlocalizedName()); GameRegistry.registerItem(mp_stability_15_thin, mp_stability_15_thin.getUnlocalizedName()); + GameRegistry.registerItem(mp_stability_15_soyuz, mp_stability_15_soyuz.getUnlocalizedName()); GameRegistry.registerItem(mp_stability_20_flat, mp_stability_20_flat.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_kerosene, mp_fuselage_10_kerosene.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_kerosene_camo, mp_fuselage_10_kerosene_camo.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_kerosene_desert, mp_fuselage_10_kerosene_desert.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_kerosene_sky, mp_fuselage_10_kerosene_sky.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_kerosene_flames, mp_fuselage_10_kerosene_flames.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_kerosene_insulation, mp_fuselage_10_kerosene_insulation.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_kerosene_sleek, mp_fuselage_10_kerosene_sleek.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_kerosene_metal, mp_fuselage_10_kerosene_metal.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_kerosene_taint, mp_fuselage_10_kerosene_taint.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_solid, mp_fuselage_10_solid.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_solid_flames, mp_fuselage_10_solid_flames.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_solid_insulation, mp_fuselage_10_solid_insulation.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_solid_sleek, mp_fuselage_10_solid_sleek.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_solid_soviet_glory, mp_fuselage_10_solid_soviet_glory.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_solid_cathedral, mp_fuselage_10_solid_cathedral.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_solid_moonlit, mp_fuselage_10_solid_moonlit.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_solid_battery, mp_fuselage_10_solid_battery.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_solid_duracell, mp_fuselage_10_solid_duracell.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_xenon, mp_fuselage_10_xenon.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_xenon_bhole, mp_fuselage_10_xenon_bhole.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_long_kerosene, mp_fuselage_10_long_kerosene.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_long_kerosene_camo, mp_fuselage_10_long_kerosene_camo.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_long_kerosene_desert, mp_fuselage_10_long_kerosene_desert.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_long_kerosene_sky, mp_fuselage_10_long_kerosene_sky.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_long_kerosene_flames, mp_fuselage_10_long_kerosene_flames.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_long_kerosene_insulation, mp_fuselage_10_long_kerosene_insulation.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_long_kerosene_sleek, mp_fuselage_10_long_kerosene_sleek.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_long_kerosene_metal, mp_fuselage_10_long_kerosene_metal.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_long_kerosene_dash, mp_fuselage_10_long_kerosene_dash.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_long_kerosene_taint, mp_fuselage_10_long_kerosene_taint.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_long_kerosene_vap, mp_fuselage_10_long_kerosene_vap.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_long_solid, mp_fuselage_10_long_solid.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_long_solid_flames, mp_fuselage_10_long_solid_flames.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_long_solid_insulation, mp_fuselage_10_long_solid_insulation.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_long_solid_sleek, mp_fuselage_10_long_solid_sleek.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_long_solid_soviet_glory, mp_fuselage_10_long_solid_soviet_glory.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_long_solid_bullet, mp_fuselage_10_long_solid_bullet.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_10_long_solid_silvermoonlight, mp_fuselage_10_long_solid_silvermoonlight.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_15_kerosene, mp_fuselage_10_15_kerosene.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_15_solid, mp_fuselage_10_15_solid.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_10_15_hydrogen, mp_fuselage_10_15_hydrogen.getUnlocalizedName()); @@ -4246,19 +4351,32 @@ public class ModItems { GameRegistry.registerItem(mp_fuselage_15_kerosene, mp_fuselage_15_kerosene.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_kerosene_camo, mp_fuselage_15_kerosene_camo.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_kerosene_desert, mp_fuselage_15_kerosene_desert.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_kerosene_sky, mp_fuselage_15_kerosene_sky.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_kerosene_insulation, mp_fuselage_15_kerosene_insulation.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_kerosene_metal, mp_fuselage_15_kerosene_metal.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_kerosene_decorated, mp_fuselage_15_kerosene_decorated.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_kerosene_steampunk, mp_fuselage_15_kerosene_steampunk.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_kerosene_polite, mp_fuselage_15_kerosene_polite.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_kerosene_blackjack, mp_fuselage_15_kerosene_blackjack.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_kerosene_lambda, mp_fuselage_15_kerosene_lambda.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_kerosene_minuteman, mp_fuselage_15_kerosene_minuteman.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_kerosene_pip, mp_fuselage_15_kerosene_pip.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_kerosene_taint, mp_fuselage_15_kerosene_taint.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_kerosene_yuck, mp_fuselage_15_kerosene_yuck.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_solid, mp_fuselage_15_solid.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_solid_insulation, mp_fuselage_15_solid_insulation.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_solid_desh, mp_fuselage_15_solid_desh.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_solid_soviet_glory, mp_fuselage_15_solid_soviet_glory.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_solid_soviet_stank, mp_fuselage_15_solid_soviet_stank.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_solid_faust, mp_fuselage_15_solid_faust.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_solid_silvermoonlight, mp_fuselage_15_solid_silvermoonlight.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_solid_snowy, mp_fuselage_15_solid_snowy.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_solid_panorama, mp_fuselage_15_solid_panorama.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_solid_roses, mp_fuselage_15_solid_roses.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_hydrogen, mp_fuselage_15_hydrogen.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_hydrogen_cathedral, mp_fuselage_15_hydrogen_cathedral.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_15_balefire, mp_fuselage_15_balefire.getUnlocalizedName()); + GameRegistry.registerItem(mp_fuselage_15_20_kerosene, mp_fuselage_15_20_kerosene.getUnlocalizedName()); GameRegistry.registerItem(mp_fuselage_20_kerosene, mp_fuselage_20_kerosene.getUnlocalizedName()); GameRegistry.registerItem(mp_warhead_10_he, mp_warhead_10_he.getUnlocalizedName()); GameRegistry.registerItem(mp_warhead_10_incendiary, mp_warhead_10_incendiary.getUnlocalizedName()); @@ -4272,6 +4390,7 @@ public class ModItems { GameRegistry.registerItem(mp_warhead_15_nuclear_shark, mp_warhead_15_nuclear_shark.getUnlocalizedName()); GameRegistry.registerItem(mp_warhead_15_boxcar, mp_warhead_15_boxcar.getUnlocalizedName()); GameRegistry.registerItem(mp_warhead_15_n2, mp_warhead_15_n2.getUnlocalizedName()); + GameRegistry.registerItem(mp_warhead_15_balefire, mp_warhead_15_balefire.getUnlocalizedName()); GameRegistry.registerItem(mp_warhead_20_he, mp_warhead_20_he.getUnlocalizedName()); GameRegistry.registerItem(mp_chip_1, mp_chip_1.getUnlocalizedName()); GameRegistry.registerItem(mp_chip_2, mp_chip_2.getUnlocalizedName()); diff --git a/com/hbm/items/special/ItemGlitch.java b/com/hbm/items/special/ItemGlitch.java index 1b8caebae..bb4813675 100644 --- a/com/hbm/items/special/ItemGlitch.java +++ b/com/hbm/items/special/ItemGlitch.java @@ -93,7 +93,7 @@ public class ItemGlitch extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_pip)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle_sparkle)); player.inventory.addItemStackToInventory(new ItemStack(ModItems.geiger_counter)); - player.addChatMessage(new ChatComponentText("Congratz, you're the hero now, now throw yourself into some fire or something for this weird achievement. Get going already, I'm not even being paid to tell you this.")); + player.addChatMessage(new ChatComponentText("Have some free stuff. You'll need it for that one cryptic achievement.")); break; case 14: player.inventory.dropAllItems(); @@ -115,10 +115,10 @@ public class ItemGlitch extends Item { player.addChatMessage(new ChatComponentText("Here ya go.")); break; case 19: - player.addChatMessage(new ChatComponentText("Indigo - Purple - Pink - Indigo")); + player.addChatMessage(new ChatComponentText("Ë")); break; case 20: - player.addChatMessage(new ChatComponentText("These colors are everywhere. Everywhere.")); + player.addChatMessage(new ChatComponentText("Good day, I am text")); break; case 21: player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_nuclear)); @@ -155,15 +155,15 @@ public class ItemGlitch extends Item { mirv.posY = player.posY + 100; mirv.posZ = player.posZ; world.spawnEntityInWorld(mirv); - player.addChatMessage(new ChatComponentText("Watch your head...")); + player.addChatMessage(new ChatComponentText("Watch your head!")); break; case 29: ExplosionLarge.spawnBurst(world, player.posX, player.posY, player.posZ, 27, 3); player.addChatMessage(new ChatComponentText("Bam!")); break; case 30: - player.inventory.addItemStackToInventory(new ItemStack(ModItems.plate_dineutronium)); - player.addChatMessage(new ChatComponentText("Stare at it. No really, stare at it until you understand. Stare at it more. Stop reading this text, STARE AT IT!")); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.plate_saturnite)); + player.addChatMessage(new ChatComponentText("It's dangerous to go alone, take this!")); break; } diff --git a/com/hbm/items/weapon/ItemCustomMissile.java b/com/hbm/items/weapon/ItemCustomMissile.java index 3927aab0e..66b7cc75d 100644 --- a/com/hbm/items/weapon/ItemCustomMissile.java +++ b/com/hbm/items/weapon/ItemCustomMissile.java @@ -68,11 +68,19 @@ public class ItemCustomMissile extends Item { list.add(EnumChatFormatting.BOLD + "Fuel Type: " + EnumChatFormatting.GRAY + fuselage.getFuel((FuelType)fuselage.attributes[0])); list.add(EnumChatFormatting.BOLD + "Fuel amount: " + EnumChatFormatting.GRAY + (Float)fuselage.attributes[1] + "l"); list.add(EnumChatFormatting.BOLD + "Chip inaccuracy: " + EnumChatFormatting.GRAY + (Float)chip.attributes[0] * 100 + "%"); + if(stability != null) list.add(EnumChatFormatting.BOLD + "Fin inaccuracy: " + EnumChatFormatting.GRAY + (Float)stability.attributes[0] * 100 + "%"); else list.add(EnumChatFormatting.BOLD + "Fin inaccuracy: " + EnumChatFormatting.GRAY + "100%"); + list.add(EnumChatFormatting.BOLD + "Size: " + EnumChatFormatting.GRAY + fuselage.getSize(fuselage.top) + "/" + fuselage.getSize(fuselage.bottom)); + + float health = warhead.health + fuselage.health + thruster.health; + if(stability != null) + health += stability.health; + + list.add(EnumChatFormatting.BOLD + "Health: " + EnumChatFormatting.GRAY + health + "HP"); } public static MissileStruct getStruct(ItemStack stack) { diff --git a/com/hbm/items/weapon/ItemMissile.java b/com/hbm/items/weapon/ItemMissile.java index 14c6d481a..469406ab6 100644 --- a/com/hbm/items/weapon/ItemMissile.java +++ b/com/hbm/items/weapon/ItemMissile.java @@ -6,6 +6,8 @@ import java.util.HashSet; import java.util.List; import com.hbm.items.ModItems; +import com.hbm.lib.RefStrings; +import com.hbm.main.MainRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -17,6 +19,15 @@ public class ItemMissile extends Item { public PartType type; public PartSize top; public PartSize bottom; + public float health; + private String title; + private String author; + private String witty; + + public ItemMissile() { + this.setMaxStackSize(1); + this.setCreativeTab(MainRegistry.missileTab); + } public static HashMap parts = new HashMap(); @@ -105,6 +116,7 @@ public class ItemMissile extends Item { this.top = PartSize.NONE; this.bottom = size; this.attributes = new Object[] { type, punch, weight }; + setTextureName(RefStrings.MODID + ":mp_warhead"); parts.put(this.hashCode(), this); @@ -117,6 +129,7 @@ public class ItemMissile extends Item { this.top = top; this.bottom = bottom; attributes = new Object[] { type, fuel }; + setTextureName(RefStrings.MODID + ":mp_fuselage"); parts.put(this.hashCode(), this); @@ -129,6 +142,7 @@ public class ItemMissile extends Item { this.top = size; this.bottom = size; this.attributes = new Object[] { inaccuracy }; + setTextureName(RefStrings.MODID + ":mp_stability"); parts.put(this.hashCode(), this); @@ -141,6 +155,7 @@ public class ItemMissile extends Item { this.top = size; this.bottom = PartSize.NONE; this.attributes = new Object[] { type, consumption, lift }; + setTextureName(RefStrings.MODID + ":mp_thruster"); parts.put(this.hashCode(), this); @@ -150,6 +165,10 @@ public class ItemMissile extends Item { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + + if(title != null) + list.add(EnumChatFormatting.DARK_PURPLE + "\"" + title + "\""); + try { switch(type) { case CHIP: @@ -181,6 +200,13 @@ public class ItemMissile extends Item { } catch(Exception ex) { list.add("### I AM ERROR ###"); } + + if(type != PartType.CHIP) + list.add(EnumChatFormatting.BOLD + "Health: " + EnumChatFormatting.GRAY + health + "HP"); + if(author != null) + list.add(EnumChatFormatting.WHITE + " by " + author); + if(witty != null) + list.add(EnumChatFormatting.GOLD + " " + EnumChatFormatting.ITALIC + "\"" + witty + "\""); } public String getSize(PartSize size) { @@ -246,5 +272,34 @@ public class ItemMissile extends Item { return EnumChatFormatting.BOLD + "N/A"; } } + + //am i retarded? + public ItemMissile copy() { + + ItemMissile part = new ItemMissile(); + part.type = this.type; + part.top = this.top; + part.bottom = this.bottom; + part.health = this.health; + part.attributes = this.attributes; + part.setTextureName(this.iconString); + + return part; + } + + public ItemMissile setAuthor(String author) { + this.author = author; + return this; + } + + public ItemMissile setTitle(String title) { + this.title = title; + return this; + } + + public ItemMissile setWittyText(String witty) { + this.witty = witty; + return this; + } } diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 737d1ac42..8e965d00d 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (3147B)"; + public static final String VERSION = "1.0.27 BETA (3152)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index 986c862c8..1dc5b45cc 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -50,7 +50,8 @@ public class ClientProxy extends ServerProxy AdvancedModelLoader.registerModelHandler(new HmfModelLoader()); RenderingRegistry.registerBlockHandler(new RenderTaintBlock()); - RenderingRegistry.registerBlockHandler(new RenderRoofBlock()); + RenderingRegistry.registerBlockHandler(new RenderScaffoldBlock()); + RenderingRegistry.registerBlockHandler(new RenderTapeBlock()); MinecraftForgeClient.registerItemRenderer(ModItems.assembly_template, new ItemRenderTemplate()); MinecraftForgeClient.registerItemRenderer(ModItems.chemistry_template, new ItemRenderTemplate()); @@ -208,10 +209,10 @@ public class ClientProxy extends ServerProxy ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoPoleTop.class, new RenderPoleTop()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoPoleSatelliteReceiver.class, new RenderPoleSatelliteReceiver()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.tape_recorder), new ItemRenderTapeRecorder()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.steel_poles), new ItemRenderSteelPoles()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.pole_top), new ItemRenderPoleTop()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.pole_satellite_receiver), new ItemRenderSatelliteReceiver()); + //MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.tape_recorder), new ItemRenderTapeRecorder()); + //MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.steel_poles), new ItemRenderSteelPoles()); + //MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.pole_top), new ItemRenderPoleTop()); + //MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.pole_satellite_receiver), new ItemRenderSatelliteReceiver()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTaint.class, new RenderTaint()); @@ -504,6 +505,18 @@ public class ClientProxy extends ServerProxy ParticleSmokePlume contrail = new ParticleSmokePlume(man, world, x, y, z); Minecraft.getMinecraft().effectRenderer.addEffect(contrail); } + if("exKerosene".equals(type)) { + ParticleContrail contrail = new ParticleContrail(man, world, x, y, z); + Minecraft.getMinecraft().effectRenderer.addEffect(contrail); + } + if("exSolid".equals(type)) { + ParticleContrail contrail = new ParticleContrail(man, world, x, y, z, 0.3F, 0.2F, 0.05F, 1F); + Minecraft.getMinecraft().effectRenderer.addEffect(contrail); + } + if("exHydrogen".equals(type)) { + ParticleContrail contrail = new ParticleContrail(man, world, x, y, z, 0.7F, 0.7F, 0.7F, 1F); + Minecraft.getMinecraft().effectRenderer.addEffect(contrail); + } } } diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 99aa7720c..053e0231a 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -1562,10 +1562,70 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.bobmazon_weapons), new Object[] { Items.book, Items.gold_nugget, new ItemStack(Items.dye, 1, 8) }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.bobmazon_tools), new Object[] { Items.book, Items.gold_nugget, new ItemStack(Items.dye, 1, 2) }); + GameRegistry.addRecipe(new ItemStack(Blocks.torch, 3), new Object[] { "L", "S", 'L', ModItems.lignite, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(Blocks.torch, 6), new Object[] { "L", "S", 'L', ModItems.briquette_lignite, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(Blocks.torch, 8), new Object[] { "L", "S", 'L', ModItems.coke, 'S', Items.stick }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_missile_assembly, 1), new Object[] { "PWP", "SSS", "CCC", 'P', ModItems.pedestal_steel, 'W', ModItems.wrench, 'S', "plateSteel", 'C', ModBlocks.steel_scaffold })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.struct_launcher, 1), new Object[] { "PPP", "SDS", "CCC", 'P', "plateSteel", 'S', ModBlocks.steel_scaffold, 'D', ModItems.pipes_steel, 'C', ModBlocks.concrete_smooth })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.struct_launcher, 1), new Object[] { "PPP", "SDS", "CCC", 'P', "plateSteel", 'S', ModBlocks.steel_scaffold, 'D', ModItems.pipes_steel, 'C', ModBlocks.concrete })); GameRegistry.addRecipe(new ItemStack(ModBlocks.struct_scaffold, 1), new Object[] { "SSS", "DCD", "SSS", 'S', ModBlocks.steel_scaffold, 'D', ModBlocks.fluid_duct, 'C', ModBlocks.red_cable }); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_10_kerosene, 1), new Object[] { "PSM", "TPT", "T T", 'P', ModItems.pipes_steel, 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'T', "ingotTungsten" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_10_solid, 1), new Object[] { "PSM", "DPD", "T T", 'P', ModItems.pipes_steel, 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'T', "ingotSteel", 'D', "plateTitanium" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_10_xenon, 1), new Object[] { "PSM", "DPD", "T T", 'P', ModItems.pipes_steel, 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'T', "ingotSteel", 'D', ModItems.arc_electrode })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_15_kerosene_dual, 1), new Object[] { "SPS", "IPI", "T T", 'S', ModBlocks.steel_scaffold, 'P', ModItems.pipes_steel, 'I', "ingotSteel", 'T', ModItems.mp_thruster_10_kerosene })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_15_kerosene_triple, 1), new Object[] { "SPS", "IPI", "TTT", 'S', ModBlocks.steel_scaffold, 'P', ModItems.pipes_steel, 'I', "ingotSteel", 'T', ModItems.mp_thruster_10_kerosene })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_15_kerosene, 1), new Object[] { "SMS", "IPI", "B B", 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'I', "ingotTungsten", 'P', ModItems.pipes_steel, 'B', "blockTungsten" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_15_solid, 1), new Object[] { "SMS", "IPI", "B B", 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'I', "plateTitanium", 'P', ModItems.pipes_steel, 'B', "blockSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_15_solid_hexdecuple, 1), new Object[] { "SMS", "PBP", "BPB", 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'P', ModItems.pipes_steel, 'B', "blockSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_15_hydrogen, 1), new Object[] { "SMS", "IPI", "B B", 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'I', "ingotTungsten", 'P', ModItems.tank_steel, 'B', "blockTungsten" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_15_hydrogen_dual, 1), new Object[] { "SPS", "IDI", "T T", 'S', ModBlocks.steel_scaffold, 'P', ModItems.pipes_steel, 'D', ModItems.tank_steel, 'I', "ingotSteel", 'T', ModItems.mp_thruster_10_kerosene })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_15_balefire_short, 1), new Object[] { "SMS", "PTP", "I I", 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'P', ModItems.board_copper, 'T', ModItems.tank_steel, 'I', "ingotTungsten" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_15_balefire, 1), new Object[] { "SMS", "PTP", "I I", 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'P', ModItems.board_copper, 'T', ModBlocks.reactor_element, 'I', "ingotTungsten" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_thruster_15_balefire_large, 1), new Object[] { "SMS", "PTP", "I I", 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'P', "blockDesh", 'T', ModBlocks.reactor_element, 'I', ModBlocks.brick_compound })); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_stability_10_flat, 1), new Object[] { "PSP", "P P", 'P', "plateSteel", 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_stability_10_cruise, 1), new Object[] { "ASA", " S ", "PSP", 'A', "plateTitanium", 'P', "plateSteel", 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_stability_10_space, 1), new Object[] { "ASA", "PSP", 'A', "plateAluminum", 'P', "ingotSteel", 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_stability_15_flat, 1), new Object[] { "ASA", "PSP", 'A', "plateAluminum", 'P', "plateSteel", 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_stability_15_thin, 1), new Object[] { "A A", "PSP", "PSP", 'A', "plateAluminum", 'P', "plateSteel", 'S', ModBlocks.steel_scaffold })); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_kerosene, 1), new Object[] { "STS", "ATA", "STS", 'S', "plateSteel", 'T', ModItems.tank_steel, 'A', "plateTitanium" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_solid, 1), new Object[] { "STS", "ATA", "STS", 'S', "plateAluminum", 'T', ModItems.tank_steel, 'A', "plateCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_xenon, 1), new Object[] { "STS", "ATA", "STS", 'S', "plateSteel", 'T', ModItems.tank_steel, 'A', "plateAdvanced" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_long_kerosene, 1), new Object[] { "F ", " F", 'F', ModItems.mp_fuselage_10_kerosene })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_long_solid, 1), new Object[] { "F ", " F", 'F', ModItems.mp_fuselage_10_solid })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_15_kerosene, 1), new Object[] { "P ", " LF", " FS", 'P', "plateSteel", 'L', ModItems.mp_fuselage_10_long_kerosene, 'F', ModItems.mp_fuselage_10_kerosene, 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_15_solid, 1), new Object[] { "P ", " LF", " FS", 'P', "plateAluminum", 'L', ModItems.mp_fuselage_10_long_solid, 'F', ModItems.mp_fuselage_10_solid, 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_15_hydrogen, 1), new Object[] { "PP ", "PLF", " FS", 'P', "plateTitanium", 'L', ModItems.mp_fuselage_10_long_kerosene, 'F', ModItems.mp_fuselage_10_kerosene, 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_15_balefire, 1), new Object[] { "PP ", "PLF", " FS", 'P', ModItems.plate_saturnite, 'L', ModItems.mp_fuselage_10_long_solid, 'F', ModItems.mp_fuselage_10_solid, 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_15_kerosene, 1), new Object[] { "SP ", "PFP", " PL", 'S', ModBlocks.steel_scaffold, 'P', "plateSteel", 'F', ModItems.mp_fuselage_10_long_kerosene, 'L', ModItems.mp_fuselage_10_15_kerosene })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_15_solid, 1), new Object[] { "SP ", "PFP", " PL", 'S', ModBlocks.steel_scaffold, 'P', "plateAluminum", 'F', ModItems.mp_fuselage_10_long_solid, 'L', ModItems.mp_fuselage_10_15_solid })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_15_hydrogen, 1), new Object[] { "SP ", "PFP", " PL", 'S', ModBlocks.steel_scaffold, 'P', "plateTitanium", 'F', ModItems.mp_fuselage_10_long_kerosene, 'L', ModItems.mp_fuselage_10_15_hydrogen })); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_fuselage_15_balefire, 1), new Object[] { "SP ", "PFP", " PL", 'S', ModBlocks.steel_scaffold, 'P', ModItems.plate_saturnite, 'F', ModItems.mp_fuselage_10_long_solid, 'L', ModItems.mp_fuselage_10_15_balefire }); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_10_he, 1), new Object[] { " P ", "PTP", "TST", 'P', "plateSteel", 'T', Blocks.tnt, 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_10_incendiary, 1), new Object[] { "PIP", "ITI", "TST", 'P', "plateTitanium", 'T', Blocks.tnt, 'S', ModBlocks.steel_scaffold, 'I', ModItems.powder_fire })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_10_buster, 1), new Object[] { "PPP", "DCD", "DSD", 'P', "plateTitanium", 'D', ModBlocks.det_cord, 'C', ModBlocks.det_charge, 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_10_nuclear, 1), new Object[] { " U ", "PTP", "PSP", 'U', "Pu239", 'P', "plateLead", 'T', Blocks.tnt, 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_10_nuclear_large, 1), new Object[] { "PUP", "TUT", "PSP", 'U', "Pu239", 'P', "plateLead", 'T', ModBlocks.det_charge, 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_10_taint, 1), new Object[] { "AEA", "PBP", "ASA", 'A', "plateAluminum", 'E', ModItems.powder_magic, 'P', "plateSteel", 'B', ModItems.bucket_mud, 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_15_he, 1), new Object[] { "PTP", "CWC", "STS", 'P', "plateSteel", 'T', Blocks.tnt, 'C', ModBlocks.det_charge, 'W', ModItems.mp_warhead_10_he, 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_15_incendiary, 1), new Object[] { "PTP", "CWC", "STS", 'P', "plateTitanium", 'T', ModItems.powder_fire, 'C', ModBlocks.det_charge, 'W', ModItems.mp_warhead_10_incendiary, 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_15_nuclear, 1), new Object[] { "PUP", "CUC", "SUS", 'P', ModItems.plate_saturnite, 'U', "Pu239", 'C', ModBlocks.det_charge, 'S', ModBlocks.steel_scaffold })); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_warhead_15_n2, 1), new Object[] { "PCP", "CUC", "SCS", 'P', ModItems.plate_saturnite, 'U', ModItems.mp_warhead_15_he, 'C', ModItems.n2_charge, 'S', ModBlocks.steel_scaffold }); + + GameRegistry.addRecipe(new ItemStack(ModItems.mp_chip_1, 1), new Object[] { "P", "C", "S", 'P', ModItems.plate_polymer, 'C', ModItems.circuit_targeting_tier1, 'S', ModBlocks.steel_scaffold }); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_chip_2, 1), new Object[] { "P", "C", "S", 'P', ModItems.plate_polymer, 'C', ModItems.circuit_targeting_tier2, 'S', ModBlocks.steel_scaffold }); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_chip_3, 1), new Object[] { "P", "C", "S", 'P', ModItems.plate_polymer, 'C', ModItems.circuit_targeting_tier3, 'S', ModBlocks.steel_scaffold }); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_chip_4, 1), new Object[] { "P", "C", "S", 'P', ModItems.plate_polymer, 'C', ModItems.circuit_targeting_tier4, 'S', ModBlocks.steel_scaffold }); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_chip_5, 1), new Object[] { "P", "C", "S", 'P', ModItems.plate_polymer, 'C', ModItems.circuit_targeting_tier5, 'S', ModBlocks.steel_scaffold }); + + GameRegistry.addRecipe(new ItemStack(ModBlocks.struct_launcher_core, 1), new Object[] { "SCS", "SIS", "BEB", 'S', ModBlocks.steel_scaffold, 'I', Blocks.iron_bars, 'C', ModItems.circuit_targeting_tier3, 'B', ModBlocks.struct_launcher, 'E', ModBlocks.machine_battery }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.struct_launcher_core_large, 1), new Object[] { "SIS", "ICI", "BEB", 'S', ModItems.circuit_red_copper, 'I', Blocks.iron_bars, 'C', ModItems.circuit_targeting_tier4, 'B', ModBlocks.struct_launcher, 'E', ModBlocks.machine_battery }); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.obj_tester, 1), new Object[] { "P", "I", "S", 'P', ModItems.polaroid, 'I', ModItems.flame_pony, 'S', "plateSteel" })); } public static void AddSmeltingRec() diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 88d8354af..cf48f1b21 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -1049,7 +1049,7 @@ public class MainRegistry OreDictionary.registerOre("U238", ModItems.ingot_u238); OreDictionary.registerOre("Th232", ModItems.ingot_th232); OreDictionary.registerOre("Pu238", ModItems.ingot_pu238); - OreDictionary.registerOre("Pu39", ModItems.ingot_pu239); + OreDictionary.registerOre("Pu239", ModItems.ingot_pu239); OreDictionary.registerOre("Pu240", ModItems.ingot_pu240); OreDictionary.registerOre("ingotTitanium", ModItems.ingot_titanium); OreDictionary.registerOre("ingotSchrabidium", ModItems.ingot_schrabidium); diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java index 7dd05db9b..9105d952d 100644 --- a/com/hbm/main/ResourceManager.java +++ b/com/hbm/main/ResourceManager.java @@ -330,11 +330,13 @@ public class ResourceManager { public static final IModelCustom launch_table_small_scaffold_base = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/launch_table/launch_table_small_scaffold_base.obj")); public static final IModelCustom launch_table_small_scaffold_connector = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/launch_table/launch_table_small_scaffold_connector.obj")); public static final IModelCustom launch_table_small_scaffold_empty = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/launch_table/launch_table_small_scaffold_empty.obj")); - + public static final IModelCustom mp_t_10_kerosene = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_10_kerosene.obj")); + public static final IModelCustom mp_t_10_kerosene_tec = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_10_kerosene_tec.obj")); public static final IModelCustom mp_t_10_solid = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_10_solid.obj")); public static final IModelCustom mp_t_10_xenon = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_10_xenon.obj")); public static final IModelCustom mp_t_15_kerosene = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_15_kerosene.obj")); + public static final IModelCustom mp_t_15_kerosene_tec = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_15_kerosene_tec.obj")); public static final IModelCustom mp_t_15_kerosene_dual = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_15_kerosene_dual.obj")); public static final IModelCustom mp_t_15_kerosene_triple = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_15_kerosene_triple.obj")); public static final IModelCustom mp_t_15_solid = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_t_15_solid.obj")); @@ -349,6 +351,7 @@ public class ResourceManager { public static final IModelCustom mp_s_10_space = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_s_10_space.obj")); public static final IModelCustom mp_s_15_flat = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_s_15_flat.obj")); public static final IModelCustom mp_s_15_thin = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_s_15_thin.obj")); + public static final IModelCustom mp_s_15_soyuz = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_s_15_soyuz.obj")); public static final IModelCustom mp_s_20 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_s_20.obj")); public static final IModelCustom mp_f_10_kerosene = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_f_10_kerosene.obj")); @@ -356,6 +359,7 @@ public class ResourceManager { public static final IModelCustom mp_f_10_15_kerosene = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_f_10_15_kerosene.obj")); public static final IModelCustom mp_f_15_kerosene = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_f_15_kerosene.obj")); public static final IModelCustom mp_f_15_hydrogen = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_f_15_hydrogen.obj")); + public static final IModelCustom mp_f_15_20_kerosene = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_f_15_20_kerosene.obj")); public static final IModelCustom mp_f_20 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_f_20.obj")); public static final IModelCustom mp_w_10_he = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_w_10_he.obj")); @@ -369,6 +373,7 @@ public class ResourceManager { public static final IModelCustom mp_w_15_nuclear = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_w_15_nuclear.obj")); public static final IModelCustom mp_w_15_boxcar = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_w_15_boxcar.obj")); public static final IModelCustom mp_w_15_n2 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_w_15_n2.obj")); + public static final IModelCustom mp_w_15_balefire = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_w_15_balefire.obj")); public static final IModelCustom mp_w_20 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/missile_parts/mp_w_20.obj")); ////Texture Entities @@ -456,58 +461,96 @@ public class ResourceManager { public static final ResourceLocation mp_t_15_balefire_short_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/thrusters/mp_t_15_balefire_short.png"); public static final ResourceLocation mp_t_15_balefire_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/thrusters/mp_t_15_balefire.png"); public static final ResourceLocation mp_t_15_balefire_large_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/thrusters/mp_t_15_balefire_large.png"); + public static final ResourceLocation mp_t_15_balefire_large_rad_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/thrusters/mp_t_15_balefire_large_rad.png"); public static final ResourceLocation mp_s_10_flat_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/stability/mp_s_10_flat.png"); public static final ResourceLocation mp_s_10_cruise_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/stability/mp_s_10_cruise.png"); public static final ResourceLocation mp_s_10_space_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/stability/mp_s_10_space.png"); public static final ResourceLocation mp_s_15_flat_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/stability/mp_s_15_flat.png"); public static final ResourceLocation mp_s_15_thin_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/stability/mp_s_15_thin.png"); + public static final ResourceLocation mp_s_15_soyuz_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/stability/mp_s_15_soyuz.png"); public static final ResourceLocation mp_f_10_kerosene_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_kerosene.png"); public static final ResourceLocation mp_f_10_kerosene_camo_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_kerosene_camo.png"); public static final ResourceLocation mp_f_10_kerosene_desert_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_kerosene_desert.png"); + public static final ResourceLocation mp_f_10_kerosene_sky_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_kerosene_sky.png"); public static final ResourceLocation mp_f_10_kerosene_flames_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_kerosene_flames.png"); public static final ResourceLocation mp_f_10_kerosene_insulation_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_kerosene_insulation.png"); public static final ResourceLocation mp_f_10_kerosene_sleek_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_kerosene_sleek.png"); public static final ResourceLocation mp_f_10_kerosene_metal_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_kerosene_metal.png"); + public static final ResourceLocation mp_f_10_kerosene_taint_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_10_kerosene_taint.png"); + public static final ResourceLocation mp_f_10_solid_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_solid.png"); public static final ResourceLocation mp_f_10_solid_flames_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_solid_flames.png"); public static final ResourceLocation mp_f_10_solid_insulation_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_solid_insulation.png"); public static final ResourceLocation mp_f_10_solid_sleek_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_solid_sleek.png"); public static final ResourceLocation mp_f_10_solid_soviet_glory_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_solid_soviet_glory.png"); + public static final ResourceLocation mp_f_10_solid_moonlit_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_10_solid_moonlit.png"); + public static final ResourceLocation mp_f_10_solid_cathedral_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_10_solid_cathedral.png"); + public static final ResourceLocation mp_f_10_solid_battery_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_10_solid_battery.png"); + public static final ResourceLocation mp_f_10_solid_duracell_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_solid_duracell.png"); + public static final ResourceLocation mp_f_10_xenon_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_xenon.png"); + public static final ResourceLocation mp_f_10_xenon_bhole_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_10_xenon_bhole.png"); + public static final ResourceLocation mp_f_10_long_kerosene_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_kerosene.png"); public static final ResourceLocation mp_f_10_long_kerosene_camo_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_kerosene_camo.png"); public static final ResourceLocation mp_f_10_long_kerosene_desert_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_kerosene_desert.png"); + public static final ResourceLocation mp_f_10_long_kerosene_sky_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_kerosene_sky.png"); public static final ResourceLocation mp_f_10_long_kerosene_flames_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_kerosene_flames.png"); public static final ResourceLocation mp_f_10_long_kerosene_insulation_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_kerosene_insulation.png"); public static final ResourceLocation mp_f_10_long_kerosene_sleek_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_kerosene_sleek.png"); public static final ResourceLocation mp_f_10_long_kerosene_metal_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_kerosene_metal.png"); + public static final ResourceLocation mp_f_10_long_kerosene_dash_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_10_long_kerosene_dash.png"); + public static final ResourceLocation mp_f_10_long_kerosene_taint_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_10_long_kerosene_taint.png"); + public static final ResourceLocation mp_f_10_long_kerosene_vap_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_10_long_kerosene_vap.png"); + public static final ResourceLocation mp_f_10_long_solid_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_solid.png"); public static final ResourceLocation mp_f_10_long_solid_flames_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_solid_flames.png"); public static final ResourceLocation mp_f_10_long_solid_insulation_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_solid_insulation.png"); public static final ResourceLocation mp_f_10_long_solid_sleek_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_solid_sleek.png"); public static final ResourceLocation mp_f_10_long_solid_soviet_glory_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_long_solid_soviet_glory.png"); + public static final ResourceLocation mp_f_10_long_solid_bullet_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_10_long_solid_bullet.png"); + public static final ResourceLocation mp_f_10_long_solid_silvermoonlight_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_10_long_solid_silvermoonlight.png"); + public static final ResourceLocation mp_f_10_15_kerosene_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_15_kerosene.png"); public static final ResourceLocation mp_f_10_15_solid_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_15_solid.png"); public static final ResourceLocation mp_f_10_15_hydrogen_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_15_hydrogen.png"); public static final ResourceLocation mp_f_10_15_balefire_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_10_15_balefire.png"); + public static final ResourceLocation mp_f_15_kerosene_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_kerosene.png"); public static final ResourceLocation mp_f_15_kerosene_camo_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_kerosene_camo.png"); public static final ResourceLocation mp_f_15_kerosene_desert_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_kerosene_desert.png"); + public static final ResourceLocation mp_f_15_kerosene_sky_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_kerosene_sky.png"); public static final ResourceLocation mp_f_15_kerosene_insulation_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_kerosene_insulation.png"); public static final ResourceLocation mp_f_15_kerosene_metal_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_kerosene_metal.png"); public static final ResourceLocation mp_f_15_kerosene_decorated_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_kerosene_decorated.png"); public static final ResourceLocation mp_f_15_kerosene_steampunk_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_kerosene_steampunk.png"); public static final ResourceLocation mp_f_15_kerosene_polite_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_kerosene_polite.png"); public static final ResourceLocation mp_f_15_kerosene_blackjack_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/base/mp_f_15_kerosene_blackjack.png"); + public static final ResourceLocation mp_f_15_kerosene_lambda_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_lambda.png"); + public static final ResourceLocation mp_f_15_kerosene_minuteman_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_minuteman.png"); + public static final ResourceLocation mp_f_15_kerosene_pip_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_pip.png"); + public static final ResourceLocation mp_f_15_kerosene_taint_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_15_kerosene_taint.png"); + public static final ResourceLocation mp_f_15_kerosene_yuck_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_kerosene_yuck.png"); + public static final ResourceLocation mp_f_15_solid_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_solid.png"); public static final ResourceLocation mp_f_15_solid_insulation_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_solid_insulation.png"); public static final ResourceLocation mp_f_15_solid_desh_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_solid_desh.png"); public static final ResourceLocation mp_f_15_solid_soviet_glory_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_solid_soviet_glory.png"); public static final ResourceLocation mp_f_15_solid_soviet_stank_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_solid_soviet_stank.png"); + public static final ResourceLocation mp_f_15_solid_faust_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_15_solid_faust.png"); + public static final ResourceLocation mp_f_15_solid_silvermoonlight_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_15_solid_silvermoonlight.png"); + public static final ResourceLocation mp_f_15_solid_snowy_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_15_solid_snowy.png"); + public static final ResourceLocation mp_f_15_solid_panorama_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_solid_panorama.png"); + public static final ResourceLocation mp_f_15_solid_roses_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_solid_roses.png"); + public static final ResourceLocation mp_f_15_hydrogen_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_hydrogen.png"); + public static final ResourceLocation mp_f_15_hydrogen_cathedral_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/contest/mp_f_15_hydrogen_cathedral.png"); + public static final ResourceLocation mp_f_15_balefire_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_balefire.png"); + + public static final ResourceLocation mp_f_15_20_kerosene_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/fuselages/mp_f_15_20_kerosene.png"); public static final ResourceLocation mp_w_10_he_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/warheads/mp_w_10_he.png"); public static final ResourceLocation mp_w_10_incendiary_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/warheads/mp_w_10_incendiary.png"); @@ -520,8 +563,10 @@ public class ResourceManager { public static final ResourceLocation mp_w_15_nuclear_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/warheads/mp_w_15_nuclear.png"); public static final ResourceLocation mp_w_15_nuclear_shark_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/warheads/mp_w_15_nuclear_shark.png"); public static final ResourceLocation mp_w_15_n2_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/warheads/mp_w_15_n2.png"); + public static final ResourceLocation mp_w_15_balefire_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/warheads/mp_w_15_balefire.png"); //ISBRHs public static final IModelCustom scaffold = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/scaffold.obj")); + public static final IModelCustom taperecorder = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/taperecorder.obj")); } diff --git a/com/hbm/particle/ParticleContrail.java b/com/hbm/particle/ParticleContrail.java index 995769158..9a972bee4 100644 --- a/com/hbm/particle/ParticleContrail.java +++ b/com/hbm/particle/ParticleContrail.java @@ -28,6 +28,21 @@ public class ParticleContrail extends EntityFX { super(p_i1218_1_, p_i1218_2_, p_i1218_4_, p_i1218_6_); theRenderEngine = p_i1213_1_; maxAge = 100 + rand.nextInt(40); + + this.particleRed = this.particleGreen = this.particleBlue = 0; + this.particleScale = 1F; + } + + public ParticleContrail(TextureManager p_i1213_1_, World p_i1218_1_, double p_i1218_2_, double p_i1218_4_, double p_i1218_6_, float red, float green, float blue, float scale) { + super(p_i1218_1_, p_i1218_2_, p_i1218_4_, p_i1218_6_); + theRenderEngine = p_i1213_1_; + maxAge = 100 + rand.nextInt(40); + + this.particleRed = red; + this.particleGreen = green; + this.particleBlue = blue; + + this.particleScale = scale; } public void onUpdate() { @@ -65,14 +80,14 @@ public class ParticleContrail extends EntityFX { for(int i = 0; i < 6; i++) { p_70539_1_.startDrawingQuads(); + - this.particleRed = this.particleGreen = this.particleBlue = urandom.nextFloat() * 0.2F + 0.2F; - - p_70539_1_.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha); + float mod = urandom.nextFloat() * 0.2F + 0.2F; + p_70539_1_.setColorRGBA_F(this.particleRed + mod, this.particleGreen + mod, this.particleBlue + mod, this.particleAlpha); p_70539_1_.setNormal(0.0F, 1.0F, 0.0F); p_70539_1_.setBrightness(240); - float scale = particleAlpha + 0.5F; + float scale = particleAlpha + 0.5F * this.particleScale; float pX = (float) ((this.prevPosX + (this.posX - this.prevPosX) * (double)p_70539_2_ - interpPosX) + urandom.nextGaussian() * 0.5); float pY = (float) ((this.prevPosY + (this.posY - this.prevPosY) * (double)p_70539_2_ - interpPosY) + urandom.nextGaussian() * 0.5); float pZ = (float) ((this.prevPosZ + (this.posZ - this.prevPosZ) * (double)p_70539_2_ - interpPosZ) + urandom.nextGaussian() * 0.5); diff --git a/com/hbm/render/block/ObjUtil.java b/com/hbm/render/block/ObjUtil.java index e2dd745c4..8b6dac094 100644 --- a/com/hbm/render/block/ObjUtil.java +++ b/com/hbm/render/block/ObjUtil.java @@ -22,6 +22,10 @@ public class ObjUtil { if(shadow) { float brightness = (n.y + 1) * 0.65F; + + if(brightness < 0.45F) + brightness = 0.45F; + tes.setColorOpaque_F(brightness, brightness, brightness); } diff --git a/com/hbm/render/block/RenderRoofBlock.java b/com/hbm/render/block/RenderScaffoldBlock.java similarity index 97% rename from com/hbm/render/block/RenderRoofBlock.java rename to com/hbm/render/block/RenderScaffoldBlock.java index f2b787286..dce202cb1 100644 --- a/com/hbm/render/block/RenderRoofBlock.java +++ b/com/hbm/render/block/RenderScaffoldBlock.java @@ -16,7 +16,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.model.obj.WavefrontObject; -public class RenderRoofBlock implements ISimpleBlockRenderingHandler { +public class RenderScaffoldBlock implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { diff --git a/com/hbm/render/block/RenderTapeBlock.java b/com/hbm/render/block/RenderTapeBlock.java new file mode 100644 index 000000000..0059f56b1 --- /dev/null +++ b/com/hbm/render/block/RenderTapeBlock.java @@ -0,0 +1,79 @@ +package com.hbm.render.block; + +import org.lwjgl.opengl.GL11; + +import com.hbm.main.ResourceManager; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.model.obj.WavefrontObject; + +public class RenderTapeBlock implements ISimpleBlockRenderingHandler { + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + + GL11.glPushMatrix(); + Tessellator tessellator = Tessellator.instance; + IIcon iicon = block.getIcon(0, 0); + tessellator.setColorOpaque_F(1, 1, 1); + + if (renderer.hasOverrideBlockTexture()) + { + iicon = renderer.overrideBlockTexture; + } + + GL11.glTranslated(0, -0.5, 0); + tessellator.startDrawingQuads(); + ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.taperecorder, iicon, tessellator, 0, false); + tessellator.draw(); + + GL11.glPopMatrix(); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + + Tessellator tessellator = Tessellator.instance; + IIcon iicon = block.getIcon(0, world.getBlockMetadata(x, y, z)); + + tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); + tessellator.setColorOpaque_F(1, 1, 1); + + if (renderer.hasOverrideBlockTexture()) + { + iicon = renderer.overrideBlockTexture; + } + + float rotation = 0; + + if(world.getBlockMetadata(x, y, z) == 2) + rotation = 90F / 180F * (float)Math.PI; + + if(world.getBlockMetadata(x, y, z) == 3) + rotation = 270F / 180F * (float)Math.PI; + + if(world.getBlockMetadata(x, y, z) == 4) + rotation = 180F / 180F * (float)Math.PI; + + tessellator.addTranslation(x + 0.5F, y, z + 0.5F); + ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.taperecorder, iicon, tessellator, rotation, true); + tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); + + return true; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return 334079; + } +} diff --git a/com/hbm/render/misc/MissilePart.java b/com/hbm/render/misc/MissilePart.java index 5c3bef639..ce74ba9bf 100644 --- a/com/hbm/render/misc/MissilePart.java +++ b/com/hbm/render/misc/MissilePart.java @@ -37,10 +37,12 @@ public class MissilePart { parts.clear(); MissilePart.registerPart(ModItems.mp_thruster_10_kerosene, PartType.THRUSTER, 1, 1, ResourceManager.mp_t_10_kerosene, ResourceManager.mp_t_10_kerosene_tex); + MissilePart.registerPart(ModItems.mp_thruster_10_kerosene_tec, PartType.THRUSTER, 1.25, 1.25, ResourceManager.mp_t_10_kerosene_tec, ResourceManager.universal); MissilePart.registerPart(ModItems.mp_thruster_10_solid, PartType.THRUSTER, 0.5, 1, ResourceManager.mp_t_10_solid, ResourceManager.mp_t_10_solid_tex); MissilePart.registerPart(ModItems.mp_thruster_10_xenon, PartType.THRUSTER, 0.5, 1, ResourceManager.mp_t_10_xenon, ResourceManager.mp_t_10_xenon_tex); // MissilePart.registerPart(ModItems.mp_thruster_15_kerosene, PartType.THRUSTER, 1.5, 1.5, ResourceManager.mp_t_15_kerosene, ResourceManager.mp_t_15_kerosene_tex); + MissilePart.registerPart(ModItems.mp_thruster_15_kerosene_tec, PartType.THRUSTER, 1.5, 3.25, ResourceManager.mp_t_15_kerosene_tec, ResourceManager.universal); MissilePart.registerPart(ModItems.mp_thruster_15_kerosene_dual, PartType.THRUSTER, 1, 1.5, ResourceManager.mp_t_15_kerosene_dual, ResourceManager.mp_t_15_kerosene_dual_tex); MissilePart.registerPart(ModItems.mp_thruster_15_kerosene_triple, PartType.THRUSTER, 1, 1.5, ResourceManager.mp_t_15_kerosene_triple, ResourceManager.mp_t_15_kerosene_dual_tex); MissilePart.registerPart(ModItems.mp_thruster_15_solid, PartType.THRUSTER, 0.5, 1, ResourceManager.mp_t_15_solid, ResourceManager.mp_t_15_solid_tex); @@ -50,6 +52,7 @@ public class MissilePart { MissilePart.registerPart(ModItems.mp_thruster_15_balefire_short, PartType.THRUSTER, 2, 2, ResourceManager.mp_t_15_balefire_short, ResourceManager.mp_t_15_balefire_short_tex); MissilePart.registerPart(ModItems.mp_thruster_15_balefire, PartType.THRUSTER, 3, 2.5, ResourceManager.mp_t_15_balefire, ResourceManager.mp_t_15_balefire_tex); MissilePart.registerPart(ModItems.mp_thruster_15_balefire_large, PartType.THRUSTER, 3, 2.5, ResourceManager.mp_t_15_balefire_large, ResourceManager.mp_t_15_balefire_large_tex); + MissilePart.registerPart(ModItems.mp_thruster_15_balefire_large_rad, PartType.THRUSTER, 3, 2.5, ResourceManager.mp_t_15_balefire_large, ResourceManager.mp_t_15_balefire_large_rad_tex); // MissilePart.registerPart(ModItems.mp_thruster_20_kerosene, PartType.THRUSTER, 2.25, 2, ResourceManager.mp_t_20, ResourceManager.universal); @@ -61,6 +64,7 @@ public class MissilePart { // MissilePart.registerPart(ModItems.mp_stability_15_flat, PartType.FINS, 0, 3, ResourceManager.mp_s_15_flat, ResourceManager.mp_s_15_flat_tex); MissilePart.registerPart(ModItems.mp_stability_15_thin, PartType.FINS, 0, 3, ResourceManager.mp_s_15_thin, ResourceManager.mp_s_15_thin_tex); + MissilePart.registerPart(ModItems.mp_stability_15_soyuz, PartType.FINS, 0, 3, ResourceManager.mp_s_15_soyuz, ResourceManager.mp_s_15_soyuz_tex); // MissilePart.registerPart(ModItems.mp_stability_20_flat, PartType.FINS, 0, 3, ResourceManager.mp_s_20, ResourceManager.universal); @@ -69,28 +73,41 @@ public class MissilePart { MissilePart.registerPart(ModItems.mp_fuselage_10_kerosene, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_kerosene_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_kerosene_camo, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_kerosene_camo_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_kerosene_desert, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_kerosene_desert_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_kerosene_sky, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_kerosene_sky_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_kerosene_insulation, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_kerosene_insulation_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_kerosene_flames, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_kerosene_flames_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_kerosene_sleek, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_kerosene_sleek_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_kerosene_metal, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_kerosene_metal_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_kerosene_taint, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_kerosene_taint_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_solid, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_solid_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_solid_flames, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_solid_flames_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_solid_insulation, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_solid_insulation_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_solid_sleek, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_solid_sleek_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_solid_soviet_glory, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_solid_soviet_glory_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_solid_cathedral, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_solid_cathedral_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_solid_moonlit, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_solid_moonlit_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_solid_battery, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_solid_battery_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_solid_duracell, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_solid_duracell_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_xenon, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_xenon_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_xenon_bhole, PartType.FUSELAGE, 4, 3, ResourceManager.mp_f_10_kerosene, ResourceManager.mp_f_10_xenon_bhole_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_long_kerosene, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_kerosene_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_long_kerosene_camo, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_kerosene_camo_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_long_kerosene_desert, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_kerosene_desert_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_long_kerosene_sky, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_kerosene_sky_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_long_kerosene_flames, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_kerosene_flames_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_long_kerosene_insulation, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_kerosene_insulation_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_long_kerosene_sleek, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_kerosene_sleek_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_long_kerosene_metal, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_kerosene_metal_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_long_kerosene_dash, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_kerosene_dash_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_long_kerosene_taint, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_kerosene_taint_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_long_kerosene_vap, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_kerosene_vap_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_long_solid, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_solid_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_long_solid_flames, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_solid_flames_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_long_solid_insulation, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_solid_insulation_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_long_solid_sleek, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_solid_sleek_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_long_solid_soviet_glory, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_solid_soviet_glory_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_long_solid_bullet, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_solid_bullet_tex); + MissilePart.registerPart(ModItems.mp_fuselage_10_long_solid_silvermoonlight, PartType.FUSELAGE, 7, 5, ResourceManager.mp_f_10_long_kerosene, ResourceManager.mp_f_10_long_solid_silvermoonlight_tex); // MissilePart.registerPart(ModItems.mp_fuselage_10_15_kerosene, PartType.FUSELAGE, 9, 5.5, ResourceManager.mp_f_10_15_kerosene, ResourceManager.mp_f_10_15_kerosene_tex); MissilePart.registerPart(ModItems.mp_fuselage_10_15_solid, PartType.FUSELAGE, 9, 5.5, ResourceManager.mp_f_10_15_kerosene, ResourceManager.mp_f_10_15_solid_tex); @@ -100,19 +117,33 @@ public class MissilePart { MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_camo, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_camo_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_desert, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_desert_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_sky, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_sky_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_insulation, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_insulation_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_metal, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_metal_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_decorated, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_decorated_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_steampunk, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_steampunk_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_polite, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_polite_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_blackjack, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_blackjack_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_lambda, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_lambda_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_minuteman, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_minuteman_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_pip, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_pip_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_taint, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_taint_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_kerosene_yuck, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_kerosene_yuck_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_solid, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_solid_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_solid_insulation, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_solid_insulation_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_solid_desh, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_solid_desh_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_solid_soviet_glory, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_solid_soviet_glory_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_solid_soviet_stank, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_solid_soviet_stank_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_solid_faust, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_solid_faust_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_solid_silvermoonlight, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_solid_silvermoonlight_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_solid_snowy, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_solid_snowy_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_solid_panorama, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_solid_panorama_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_solid_roses, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_kerosene, ResourceManager.mp_f_15_solid_roses_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_hydrogen, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_hydrogen, ResourceManager.mp_f_15_hydrogen_tex); + MissilePart.registerPart(ModItems.mp_fuselage_15_hydrogen_cathedral, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_hydrogen, ResourceManager.mp_f_15_hydrogen_cathedral_tex); MissilePart.registerPart(ModItems.mp_fuselage_15_balefire, PartType.FUSELAGE, 10, 6, ResourceManager.mp_f_15_hydrogen, ResourceManager.mp_f_15_balefire_tex); + + MissilePart.registerPart(ModItems.mp_fuselage_15_20_kerosene, PartType.FUSELAGE, 16, 10, ResourceManager.mp_f_15_20_kerosene, ResourceManager.mp_f_15_20_kerosene_tex); // MissilePart.registerPart(ModItems.mp_fuselage_20_kerosene, PartType.FUSELAGE, 10, 8, ResourceManager.mp_f_20, ResourceManager.universal); @@ -131,6 +162,7 @@ public class MissilePart { MissilePart.registerPart(ModItems.mp_warhead_15_nuclear_shark, PartType.WARHEAD, 3.5, 2, ResourceManager.mp_w_15_nuclear, ResourceManager.mp_w_15_nuclear_shark_tex); MissilePart.registerPart(ModItems.mp_warhead_15_boxcar, PartType.WARHEAD, 2.25, 7.5, ResourceManager.mp_w_15_boxcar, ResourceManager.boxcar_tex); MissilePart.registerPart(ModItems.mp_warhead_15_n2, PartType.WARHEAD, 3, 2, ResourceManager.mp_w_15_n2, ResourceManager.mp_w_15_n2_tex); + MissilePart.registerPart(ModItems.mp_warhead_15_balefire, PartType.WARHEAD, 2.75, 2, ResourceManager.mp_w_15_balefire, ResourceManager.mp_w_15_balefire_tex); // MissilePart.registerPart(ModItems.mp_warhead_20_he, PartType.WARHEAD, 3, 2.25, ResourceManager.mp_w_20, ResourceManager.universal); diff --git a/com/hbm/render/tileentity/RendererObjTester.java b/com/hbm/render/tileentity/RendererObjTester.java index ca682d118..f55955b1a 100644 --- a/com/hbm/render/tileentity/RendererObjTester.java +++ b/com/hbm/render/tileentity/RendererObjTester.java @@ -6,6 +6,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; +import com.hbm.render.misc.SoyuzPronter; import com.hbm.render.model.ModelCalBarrel; import com.hbm.render.model.ModelCalDualStock; import com.hbm.render.model.ModelCalStock; @@ -35,8 +36,7 @@ public class RendererObjTester extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) { GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5D, y + 1, z + 0.5D); - GL11.glRotatef(180, 0F, 0F, 1F); + GL11.glTranslated(x + 0.5D, y, z + 0.5D); /*switch(tileEntity.getBlockMetadata()) { case 5: @@ -94,7 +94,7 @@ public class RendererObjTester extends TileEntitySpecialRenderer { GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_TEXTURE_2D);*/ - ModelCalBarrel barrel = new ModelCalBarrel(); + /*ModelCalBarrel barrel = new ModelCalBarrel(); ModelCalStock stock = new ModelCalStock(); ModelCalDualStock saddle = new ModelCalDualStock(); @@ -107,8 +107,10 @@ public class RendererObjTester extends TileEntitySpecialRenderer { GL11.glTranslated(0, 0, 0.5); barrel.renderAll(1F/16F); - bindTexture(new ResourceLocation(RefStrings.MODID, "textures/models/ModelCalStock.png")); + bindTexture(new ResourceLocation(RefStrings.MODID, "textures/models/ModelCalStock.png"));*/ //stock.renderAll(1F/16F); + + SoyuzPronter.prontSoyuz(); GL11.glPopMatrix(); } diff --git a/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java b/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java index 1288dce8d..52c8b8382 100644 --- a/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java +++ b/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java @@ -28,11 +28,13 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Vec3; public class TileEntityCompactLauncher extends TileEntity implements ISidedInventory, IConsumer, IFluidContainer, IFluidAcceptor { @@ -185,17 +187,14 @@ public class TileEntityCompactLauncher extends TileEntity implements ISidedInven PacketDispatcher.wrapper.sendToAll(new TEMissileMultipartPacket(xCoord, yCoord, zCoord, multipart)); else PacketDispatcher.wrapper.sendToAll(new TEMissileMultipartPacket(xCoord, yCoord, zCoord, new MissileStruct())); - - if(power >= maxPower * 0.75 && isMissileValid() && hasDesignator() && hasFuel()) { - outer: - for(int x = -1; x <= 1; x++) { - for(int z = -1; z <= 1; z++) { + outer: + for(int x = -1; x <= 1; x++) { + for(int z = -1; z <= 1; z++) { - if(worldObj.isBlockIndirectlyGettingPowered(xCoord + x, yCoord, zCoord + z)) { - launch(); - break outer; - } + if(worldObj.isBlockIndirectlyGettingPowered(xCoord + x, yCoord, zCoord + z) && canLaunch()) { + launch(); + break outer; } } } @@ -216,14 +215,37 @@ public class TileEntityCompactLauncher extends TileEntity implements ISidedInven } } - private void launch() { + public boolean canLaunch() { + + if(power >= maxPower * 0.75 && isMissileValid() && hasDesignator() && hasFuel()) + return true; + + return false; + } + + public void launch() { worldObj.playSoundEffect(xCoord, yCoord, zCoord, "hbm:weapon.missileTakeOff", 10.0F, 1.0F); int tX = slots[1].stackTagCompound.getInteger("xCoord"); int tZ = slots[1].stackTagCompound.getInteger("zCoord"); - EntityMissileCustom missile = new EntityMissileCustom(worldObj, xCoord + 0.5F, yCoord + 2.5F, zCoord + 0.5F, tX, tZ, getStruct(slots[0])); + ItemMissile chip = (ItemMissile) Item.getItemById(ItemCustomMissile.readFromNBT(slots[0], "chip")); + float c = (Float)chip.attributes[0]; + float f = 1.0F; + + if(getStruct(slots[0]).fins != null) { + ItemMissile fins = (ItemMissile) Item.getItemById(ItemCustomMissile.readFromNBT(slots[0], "stability")); + f = (Float) fins.attributes[0]; + } + + Vec3 target = Vec3.createVectorHelper(xCoord - tX, 0, zCoord - tZ); + target.xCoord *= c * f; + target.zCoord *= c * f; + + target.rotateAroundY(worldObj.rand.nextFloat() * 360); + + EntityMissileCustom missile = new EntityMissileCustom(worldObj, xCoord + 0.5F, yCoord + 2.5F, zCoord + 0.5F, tX + (int)target.xCoord, tZ + (int)target.zCoord, getStruct(slots[0])); worldObj.spawnEntityInWorld(missile); subtractFuel(); diff --git a/com/hbm/tileentity/bomb/TileEntityLaunchTable.java b/com/hbm/tileentity/bomb/TileEntityLaunchTable.java index 498eec694..8f06b66f0 100644 --- a/com/hbm/tileentity/bomb/TileEntityLaunchTable.java +++ b/com/hbm/tileentity/bomb/TileEntityLaunchTable.java @@ -189,17 +189,14 @@ public class TileEntityLaunchTable extends TileEntity implements ISidedInventory PacketDispatcher.wrapper.sendToAll(new TEMissileMultipartPacket(xCoord, yCoord, zCoord, multipart)); else PacketDispatcher.wrapper.sendToAll(new TEMissileMultipartPacket(xCoord, yCoord, zCoord, new MissileStruct())); - - if(power >= maxPower * 0.75 && isMissileValid() && hasDesignator() && hasFuel()) { - outer: - for(int x = -4; x <= 4; x++) { - for(int z = -4; z <= 4; z++) { - - if(worldObj.isBlockIndirectlyGettingPowered(xCoord + x, yCoord, zCoord + z)) { - launch(); - break outer; - } + outer: + for(int x = -4; x <= 4; x++) { + for(int z = -4; z <= 4; z++) { + + if(worldObj.isBlockIndirectlyGettingPowered(xCoord + x, yCoord, zCoord + z) && canLaunch()) { + launch(); + break outer; } } } @@ -220,7 +217,15 @@ public class TileEntityLaunchTable extends TileEntity implements ISidedInventory } } - private void launch() { + public boolean canLaunch() { + + if(power >= maxPower * 0.75 && isMissileValid() && hasDesignator() && hasFuel()) + return true; + + return false; + } + + public void launch() { worldObj.playSoundEffect(xCoord, yCoord, zCoord, "hbm:weapon.missileTakeOff", 10.0F, 1.0F); diff --git a/com/hbm/tileentity/machine/TileEntityMultiblock.java b/com/hbm/tileentity/machine/TileEntityMultiblock.java index d5dbb58c5..7d4bdeb41 100644 --- a/com/hbm/tileentity/machine/TileEntityMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityMultiblock.java @@ -45,7 +45,7 @@ public class TileEntityMultiblock extends TileEntity { private int isTable() { for(int i = -4; i <= 4; i++) - for(int j = -4; j <= -4; j++) + for(int j = -4; j <= 4; j++) if(!(i == 0 && j == 0)) if(worldObj.getBlock(xCoord + i, yCoord, zCoord + j) != ModBlocks.struct_launcher) return -1;