diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index 0f584b88f..510893b8f 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -273,6 +273,9 @@ item.solinium_core.name=Semistabiler Soliniumkern item.n2_charge.name=Große Sprengladung +item.egg_balefire_shard.name=Balefire-Scherbe +item.egg_balefire.name=Balefire-Ei + item.custom_tnt.name=AB - Sprengladung item.custom_nuke.name=AB - Nukleares Element item.custom_hydro.name=AB - Wasserstoffelement @@ -378,7 +381,7 @@ tile.struct_launcher.name=Startrampe-Komponentenblock tile.struct_scaffold.name=Startrampe-Gerüstblock tile.struct_launcher_core.name=Kompaktrampe-Kernkomponente tile.struct_launcher_core_large.name=Startrampe-Kernkomponente -tile.struct_soyuz_launcher.name=Soyuz-Startrampe-Kernkomponente +tile.struct_soyuz_core.name=Soyuz-Startrampe-Kernkomponente tile.machine_difurnace_off.name=Hochofen tile.machine_difurnace_on.name=Hochofen @@ -1296,6 +1299,7 @@ item.gun_stinger.name=FIM-92 Stinger item.gun_skystinger.name=The One Sky Stinger item.gun_stinger_ammo.name=Stinger-Rakete item.gun_hk69.name=Granatenpistole +item.gun_quadro.name=Quattro Formaggi item.flame_pony.name=Bild eines Cartoon Ponys item.flame_conspiracy.name=Verschwörungstheorie @@ -1457,6 +1461,8 @@ item.apple_schrabidium.name=Schrabidiumapfel item.cotton_candy.name=Radioaktive Zuckerwatte item.tem_flakes.name=Tem Flakes item.glowing_stew.name=Leuchtende Pilzsuppe +item.balefire_scrambled.name=Rühr-Balefire-Ei +item.balefire_and_ham.name=Ham and Balefire-Eggs item.lemon.name="Zitrone" item.definitelyfood.name=GarantiertKeinDreck-Marken Feldration item.loops.name=Lüüps @@ -1555,7 +1561,7 @@ item.gun_calamity_ammo.name=.50 BMG Patrone (LEGACY) item.gun_lacunae_ammo.name=5mm Patrone (LEGACY) item.gun_fatman_ammo.name=Miniatombombe item.gun_mirv_ammo.name=Achtfaches MIRV -item.gun_bf_ammo.name=Mk.V kompaktes AMAT-Artilleriegeschoss - Typ B.F. +item.gun_bf_ammo.name=Balefire-Geschoss item.gun_mp40_ammo.name=SMG-Patrone (LEGACY) item.gun_uzi_ammo.name=.22 lfB Patrone (LEGACY) item.gun_uboinik_ammo.name=12x70 Schrotmunition (LEGACY) diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 317af7e8e..2032f3ad6 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -273,6 +273,9 @@ item.solinium_core.name=Semi-Stable Solinium Core item.n2_charge.name=Large Explosive Charge +item.egg_balefire_shard.name=Balefire Shard +item.egg_balefire.name=Balefire Egg + item.custom_tnt.name=Custom Nuke Explosive Charge item.custom_nuke.name=Custom Nuke Nuclear Rod item.custom_hydro.name=Custom Nuke Hydrogen Rod @@ -378,7 +381,7 @@ tile.struct_launcher.name=Launch Pad Component Block tile.struct_scaffold.name=Launch Pad Scaffold Block tile.struct_launcher_core.name=Compact Launcher Core Component tile.struct_launcher_core_large.name=Launch Table Core Component -tile.struct_soyuz_launcher.name=Soyuz Launcher Core Component +tile.struct_soyuz_core.name=Soyuz Launcher Core Component tile.machine_difurnace_off.name=Blast Furnace tile.machine_difurnace_on.name=Blast Furnace @@ -1302,6 +1305,7 @@ item.gun_stinger.name=FIM-92 Stinger item.gun_skystinger.name=The One Sky Stinger item.gun_stinger_ammo.name=Stinger Rocket item.gun_hk69.name=Grenade Pistol +item.gun_quadro.name=Quattro Formaggi item.flame_pony.name=Painting of a Cartoon Pony item.flame_conspiracy.name=Conspiracy Theory @@ -1463,6 +1467,8 @@ item.apple_schrabidium.name=Schrabidium Apple item.cotton_candy.name=Radioactive Cotton Candy item.tem_flakes.name=Tem Flakes item.glowing_stew.name=Glowing Mushroom Stew +item.balefire_scrambled.name=Scrambled Balefire Egg +item.balefire_and_ham.name=Ham and Balefire Eggs item.lemon.name="Lemon" item.definitelyfood.name=TotallyNotDirt-Brand MRE item.loops.name=Lööps @@ -1561,7 +1567,7 @@ item.gun_calamity_ammo.name=.50 BMG Round (LEGACY) item.gun_lacunae_ammo.name=5mm Round (LEGACY) item.gun_fatman_ammo.name=Mini Nuke item.gun_mirv_ammo.name=Eightfold MIRV -item.gun_bf_ammo.name=Mk.V Compact AMAT-Artillery Shell - Type B.F. +item.gun_bf_ammo.name=Balefire Shell item.gun_mp40_ammo.name=Submachine Gun Round (LEGACY) item.gun_uzi_ammo.name=.22 LR Round (LEGACY) item.gun_uboinik_ammo.name=12x70 Buckshot (LEGACY) diff --git a/src/main/java/assets/hbm/models/machines/refinery_small.obj b/src/main/java/assets/hbm/models/machines/refinery_small.obj new file mode 100644 index 000000000..d4c334a01 --- /dev/null +++ b/src/main/java/assets/hbm/models/machines/refinery_small.obj @@ -0,0 +1,2499 @@ +# Blender v2.81 (sub 16) OBJ File: '' +# www.blender.org +mtllib FinalRefinery.mtl +o Cube.001 +v -1.000000 -0.000000 1.000000 +v 1.000000 0.000000 -1.000000 +v -1.000000 0.000000 -1.000000 +v 0.937500 0.500000 0.937500 +v 0.937500 0.312500 -0.937500 +v 0.937500 0.500000 -0.937500 +v 1.000000 0.500000 1.000000 +v 1.000000 -0.000000 1.000000 +v -1.000000 0.500000 1.000000 +v 1.000000 0.500000 -1.000000 +v -1.000000 0.500000 -1.000000 +v -0.937500 0.500000 0.937500 +v -0.937500 0.500000 -0.937500 +v -0.937500 0.312500 0.937500 +v -0.937500 0.312500 -0.937500 +v 0.937500 0.312500 0.937500 +v -0.437500 3.000000 -0.437500 +v -0.437500 2.937500 0.437500 +v -0.437500 3.000000 0.437500 +v 0.500000 0.562500 0.500000 +v 0.500000 3.000000 -0.500000 +v 0.500000 0.562500 -0.500000 +v -0.500000 3.000000 -0.500000 +v -0.500000 0.562500 -0.500000 +v -0.500000 0.562500 0.500000 +v 0.500000 3.000000 0.500000 +v -0.500000 3.000000 0.500000 +v 0.062500 1.250000 0.625000 +v -0.062500 0.561250 0.625000 +v 0.062500 0.561250 0.625000 +v 0.250000 1.750000 0.625000 +v 0.375000 0.561250 0.625000 +v 0.250000 0.561250 0.625000 +v -0.062500 1.312500 0.500000 +v 0.062500 1.312500 0.562500 +v 0.062500 1.312500 0.500000 +v 0.250000 1.812500 0.500000 +v 0.250000 1.812500 0.562500 +v 0.375000 1.750000 0.625000 +v 0.375000 1.812500 0.562500 +v 0.375000 1.812500 0.500000 +v -0.375000 2.687500 0.625000 +v -0.375000 2.750000 0.562500 +v -0.375000 2.750000 0.500000 +v -0.250000 2.687500 0.625000 +v -0.375000 0.561250 0.625000 +v -0.250000 0.561250 0.625000 +v -0.062500 1.312500 -0.500000 +v 0.062500 1.312500 -0.562500 +v 0.062500 1.312500 -0.500000 +v -0.250000 2.750000 0.562500 +v -0.250000 2.750000 0.500000 +v -0.062500 1.250000 -0.625000 +v -0.062500 0.561250 -0.625000 +v 0.250000 2.750000 -0.500000 +v 0.250000 2.687500 -0.625000 +v 0.250000 0.561250 -0.625000 +v -0.375000 1.750000 -0.625000 +v -0.375000 1.812500 -0.500000 +v -0.375000 0.561250 -0.625000 +v -0.250000 0.561250 -0.625000 +v 0.375000 2.687500 -0.625000 +v 0.375000 0.561250 -0.625000 +v 0.062500 0.561250 -0.625000 +v -0.625000 2.687500 -0.375000 +v -0.562500 2.750000 -0.375000 +v -0.500000 2.750000 -0.375000 +v 0.375000 2.750000 -0.500000 +v 0.250000 2.750000 -0.562500 +v -0.250000 1.812500 -0.500000 +v -0.250000 1.750000 -0.625000 +v -0.250000 1.812500 -0.562500 +v 0.062500 1.250000 -0.625000 +v 0.875000 0.375000 0.437500 +v -0.812500 0.312500 0.437500 +v -0.812500 0.375000 0.437500 +v 0.812500 0.312500 0.500000 +v -0.875000 0.375000 0.500000 +v -0.875000 0.312500 0.500000 +v 0.812500 0.375000 0.500000 +v 0.812500 0.312500 0.875000 +v -0.875000 0.375000 0.875000 +v -0.875000 0.312500 0.875000 +v 0.875000 0.312500 0.812500 +v -0.812500 0.375000 0.812500 +v -0.812500 0.312500 0.812500 +v 0.812500 0.375000 0.875000 +v 0.812500 0.312500 0.125000 +v -0.875000 0.375000 0.125000 +v -0.875000 0.312500 0.125000 +v 0.875000 0.312500 0.062500 +v -0.812500 0.375000 0.062500 +v -0.812500 0.312500 0.062500 +v 0.812500 0.375000 0.125000 +v 0.812500 0.312500 -0.250000 +v -0.875000 0.375000 -0.250000 +v -0.875000 0.312500 -0.250000 +v 0.875000 0.312500 -0.312500 +v -0.812500 0.375000 -0.312500 +v -0.812500 0.312500 -0.312500 +v 0.812500 0.375000 -0.250000 +v 0.812500 0.312500 -0.625000 +v -0.875000 0.375000 -0.625000 +v -0.875000 0.312500 -0.625000 +v 0.875000 0.312500 -0.687500 +v -0.812500 0.375000 -0.687500 +v -0.812500 0.312500 -0.687500 +v 0.812500 0.375000 -0.625000 +v -0.875000 0.312500 0.625000 +v 0.812500 0.375000 0.625000 +v 0.812500 0.312500 0.625000 +v -0.812500 0.312500 0.687500 +v 0.875000 0.375000 0.687500 +v 0.875000 0.312500 0.687500 +v -0.875000 0.375000 0.625000 +v -0.812500 0.375000 0.687500 +v 0.875000 0.312500 0.437500 +v 0.812500 0.312500 0.937500 +v 0.875000 0.312500 0.937500 +v 0.875000 0.375000 0.812500 +v 0.875000 0.375000 0.937500 +v -0.875000 0.312500 0.250000 +v -0.812500 0.312500 0.312500 +v 0.812500 0.312500 0.250000 +v -0.875000 0.375000 0.250000 +v 0.812500 0.375000 0.250000 +v -0.812500 0.375000 0.312500 +v 0.875000 0.312500 0.312500 +v 0.875000 0.375000 0.312500 +v 0.875000 0.375000 0.062500 +v -0.812500 0.312500 -0.062500 +v -0.875000 0.312500 -0.125000 +v -0.875000 0.375000 -0.125000 +v 0.875000 0.312500 -0.062500 +v -0.812500 0.375000 -0.062500 +v 0.875000 0.375000 -0.062500 +v 0.812500 0.312500 -0.125000 +v 0.812500 0.375000 -0.125000 +v 0.875000 0.375000 -0.312500 +v 0.875000 0.312500 -0.437500 +v -0.812500 0.375000 -0.437500 +v 0.875000 0.375000 -0.437500 +v -0.812500 0.312500 -0.437500 +v -0.875000 0.312500 -0.500000 +v -0.875000 0.375000 -0.500000 +v 0.812500 0.312500 -0.500000 +v 0.812500 0.375000 -0.500000 +v 0.875000 0.375000 -0.687500 +v -0.875000 0.312500 -0.875000 +v -0.875000 0.375000 -0.875000 +v -0.812500 0.312500 -0.812500 +v 0.812500 0.312500 -0.875000 +v 0.812500 0.375000 -0.875000 +v 0.875000 0.375000 -0.812500 +v -0.812500 0.375000 -0.812500 +v 0.875000 0.375000 -0.937500 +v 0.875000 0.312500 -0.812500 +v 0.875000 0.312500 -0.937500 +v 0.812500 0.312500 -0.937500 +v -0.625000 0.561250 0.062500 +v -0.625000 1.250000 -0.062500 +v -0.625000 0.561250 -0.062500 +v -0.625000 0.561250 -0.250000 +v -0.625000 0.561250 -0.375000 +v -0.500000 1.812500 0.250000 +v -0.562500 1.812500 0.250000 +v -0.625000 1.750000 0.250000 +v -0.500000 1.812500 0.375000 +v -0.625000 0.561250 0.250000 +v -0.625000 1.750000 0.375000 +v -0.625000 0.561250 0.375000 +v -0.562500 1.812500 0.375000 +v -0.562500 1.312500 -0.062500 +v -0.500000 1.312500 -0.062500 +v -0.500000 1.312500 0.062500 +v -0.562500 1.312500 0.062500 +v -0.625000 1.250000 0.062500 +v 0.500000 1.812500 -0.250000 +v 0.562500 1.812500 -0.375000 +v 0.500000 1.812500 -0.375000 +v -0.500000 2.750000 -0.250000 +v -0.562500 2.750000 -0.250000 +v -0.625000 2.687500 -0.250000 +v 0.625000 1.750000 -0.375000 +v 0.625000 0.561250 -0.375000 +v 0.500000 1.312500 -0.062500 +v 0.625000 1.250000 -0.062500 +v 0.625000 0.561250 -0.062500 +v 0.500000 2.750000 0.375000 +v 0.625000 2.687500 0.375000 +v 0.625000 0.561250 0.375000 +v 0.500000 1.312500 0.062500 +v 0.562500 1.312500 -0.062500 +v 0.625000 2.687500 0.250000 +v 0.625000 0.561250 0.250000 +v 0.625000 1.250000 0.062500 +v 0.625000 0.561250 0.062500 +v 0.500000 2.750000 0.250000 +v 0.562500 2.750000 0.375000 +v 0.625000 1.750000 -0.250000 +v 0.625000 0.561250 -0.250000 +v -0.500000 0.437500 -0.062500 +v -0.687500 0.437500 0.062500 +v -0.500000 0.437500 0.062500 +v -0.750000 0.437500 0.375000 +v -0.500000 0.437500 0.375000 +v -0.687500 0.437500 0.250000 +v -0.500000 0.437500 0.250000 +v -0.687500 0.437500 -0.062500 +v -0.687500 0.561250 0.062500 +v -0.687500 0.437500 -0.250000 +v -0.500000 0.437500 -0.250000 +v -0.750000 0.437500 -0.375000 +v -0.500000 0.437500 -0.375000 +v -0.062500 1.312500 0.562500 +v -0.062500 1.250000 0.625000 +v -0.062500 1.312500 -0.562500 +v 0.375000 2.750000 -0.562500 +v -0.375000 1.812500 -0.562500 +v 0.562500 1.812500 -0.250000 +v 0.562500 1.312500 0.062500 +v 0.562500 2.750000 0.250000 +v 0.437500 3.000000 -0.437500 +v 0.437500 3.000000 0.437500 +v 0.437500 2.937500 0.437500 +v -0.437500 2.937500 -0.437500 +v 0.437500 2.937500 -0.437500 +v -0.312500 0.561250 0.875000 +v -0.250000 0.561250 0.812500 +v -0.375000 0.561250 0.750000 +v -0.375000 0.437500 0.750000 +v -0.062500 0.437500 0.500000 +v 0.062500 0.437500 0.687500 +v 0.062500 0.437500 0.500000 +v -0.062500 0.437500 0.687500 +v -0.062500 0.561250 0.687500 +v 0.062500 0.561250 0.687500 +v 0.312500 0.437500 0.875000 +v 0.437500 0.437500 0.875000 +v 0.562500 0.437500 0.875000 +v 0.375000 0.437500 0.750000 +v 0.375000 0.561250 0.750000 +v -0.687500 0.500000 1.000000 +v -0.687500 0.687500 0.937500 +v -0.687500 0.500000 0.937500 +v -0.312500 0.687500 0.937500 +v -0.312500 0.500000 1.000000 +v -0.312500 0.500000 0.937500 +v -0.312500 0.687500 1.000000 +v -0.561250 0.561250 0.875000 +v -0.436250 0.561250 0.875000 +v -0.312500 0.312500 0.937500 +v -0.561250 0.437500 0.875000 +v -0.687500 0.312500 0.937500 +v -0.436250 0.437500 0.875000 +v -0.498750 0.437500 0.750000 +v -0.498750 0.561250 0.750000 +v -0.561250 0.437500 0.812500 +v -0.561250 0.561250 0.812500 +v -0.250000 0.437500 0.812500 +v -0.312500 0.437500 0.875000 +v -0.250000 0.561250 0.687500 +v 0.250000 0.437500 0.687500 +v 0.250000 0.561250 0.687500 +v 0.250000 0.437500 0.812500 +v 0.250000 0.561250 0.812500 +v -0.250000 0.437500 0.687500 +v 0.687500 0.500000 0.937500 +v 0.687500 0.687500 1.000000 +v 0.687500 0.500000 1.000000 +v 0.312500 0.687500 0.937500 +v 0.687500 0.687500 0.937500 +v 0.312500 0.687500 1.000000 +v 0.312500 0.500000 0.937500 +v 0.312500 0.500000 1.000000 +v 0.562500 0.561250 0.875000 +v 0.437500 0.561250 0.875000 +v 0.312500 0.312500 0.937500 +v 0.687500 0.312500 0.937500 +v 0.500000 0.561250 0.750000 +v 0.312500 0.561250 0.875000 +v 0.562500 0.561250 0.812500 +v 0.500000 0.437500 0.750000 +v 0.562500 0.437500 0.812500 +v 0.687500 0.500000 -1.000000 +v 0.312500 0.687500 -1.000000 +v 0.312500 0.500000 -1.000000 +v -0.312500 0.500000 -1.000000 +v -0.687500 0.687500 -1.000000 +v -0.687500 0.500000 -1.000000 +v -0.687500 0.687500 1.000000 +v -0.687500 0.500000 -0.937500 +v -0.312500 0.687500 -0.937500 +v -0.312500 0.687500 -1.000000 +v 0.312500 0.500000 -0.937500 +v 0.687500 0.687500 -0.937500 +v 0.687500 0.687500 -1.000000 +v -0.062500 0.437500 -0.500000 +v 0.062500 0.437500 -0.687500 +v 0.062500 0.437500 -0.500000 +v 0.250000 0.437500 -0.687500 +v 0.250000 0.437500 -0.500000 +v 0.375000 0.437500 -0.750000 +v 0.375000 0.437500 -0.500000 +v -0.062500 0.437500 -0.687500 +v -0.250000 0.437500 -0.687500 +v -0.250000 0.437500 -0.500000 +v -0.375000 0.437500 -0.750000 +v -0.375000 0.437500 -0.500000 +v 0.062500 0.561250 -0.687500 +v 0.250000 0.561250 -0.687500 +v -0.062500 0.561250 -0.687500 +v -0.250000 0.437500 -0.812500 +v -0.250000 0.561250 -0.812500 +v -0.250000 0.561250 -0.687500 +v 0.250000 0.561250 -0.812500 +v 0.250000 0.437500 -0.812500 +v 0.312500 0.312500 -0.937500 +v 0.437500 0.561250 -0.875000 +v 0.437500 0.437500 -0.875000 +v 0.312500 0.687500 -0.937500 +v 0.562500 0.561250 -0.875000 +v 0.687500 0.312500 -0.937500 +v 0.562500 0.437500 -0.875000 +v -0.312500 0.312500 -0.937500 +v -0.437500 0.561250 -0.875000 +v -0.437500 0.437500 -0.875000 +v -0.687500 0.312500 -0.937500 +v -0.562500 0.561250 -0.875000 +v -0.562500 0.437500 -0.875000 +v -0.687500 0.687500 -0.937500 +v 0.312500 0.437500 -0.875000 +v -0.312500 0.437500 -0.875000 +v -0.312500 0.561250 -0.875000 +v -0.500000 0.437500 -0.750000 +v -0.375000 0.561250 -0.750000 +v -0.562500 0.561250 -0.812500 +v -0.562500 0.437500 -0.812500 +v 0.500000 0.437500 -0.750000 +v 0.375000 0.561250 -0.750000 +v 0.562500 0.561250 -0.812500 +v 0.562500 0.437500 -0.812500 +v -0.937500 0.687500 -0.687500 +v -1.000000 0.687500 -0.312500 +v -1.000000 0.687500 -0.687500 +v -0.937500 0.500000 -0.312500 +v -1.000000 0.500000 -0.312500 +v -1.000000 0.500000 -0.687500 +v -0.937500 0.500000 -0.687500 +v -1.000000 0.687500 0.312500 +v -0.937500 0.500000 0.312500 +v -0.937500 0.687500 0.312500 +v -0.937500 0.500000 0.687500 +v -1.000000 0.687500 0.687500 +v -0.937500 0.687500 0.687500 +v -0.687500 0.561250 -0.062500 +v -0.687500 0.561250 0.250000 +v -0.812500 0.437500 -0.250000 +v -0.812500 0.561250 -0.250000 +v -0.687500 0.561250 -0.250000 +v -0.812500 0.561250 0.250000 +v -0.812500 0.437500 0.250000 +v -0.750000 0.437500 0.500000 +v -0.750000 0.561250 0.375000 +v -0.750000 0.437500 -0.500000 +v -0.750000 0.561250 -0.375000 +v -0.812500 0.437500 0.562500 +v -0.750000 0.561250 0.500000 +v -0.812500 0.437500 -0.562500 +v -0.750000 0.561250 -0.500000 +v -0.875000 0.437500 0.562500 +v -0.812500 0.561250 0.562500 +v -0.875000 0.437500 -0.562500 +v -0.812500 0.561250 -0.562500 +v -0.875000 0.437500 0.312500 +v -0.875000 0.437500 -0.312500 +v -0.875000 0.437500 -0.437500 +v -0.875000 0.561250 -0.312500 +v -0.875000 0.561250 0.312500 +v -0.875000 0.437500 0.437500 +v -0.937500 0.312500 0.312500 +v -0.937500 0.312500 0.687500 +v -0.875000 0.561250 0.562500 +v -0.875000 0.561250 0.437500 +v -0.937500 0.312500 -0.312500 +v -0.875000 0.561250 -0.437500 +v -0.937500 0.312500 -0.687500 +v -0.875000 0.561250 -0.562500 +v 1.000000 0.500000 0.687500 +v 1.000000 0.687500 0.312500 +v 1.000000 0.687500 0.687500 +v 1.000000 0.687500 -0.312500 +v 1.000000 0.500000 -0.687500 +v 1.000000 0.687500 -0.687500 +v 0.937500 0.687500 -0.687500 +v 0.937500 0.500000 -0.312500 +v 1.000000 0.500000 -0.312500 +v 1.000000 0.500000 0.312500 +v 0.937500 0.687500 0.312500 +v 0.937500 0.500000 0.687500 +v 0.937500 0.312500 0.312500 +v 0.875000 0.437500 0.562500 +v 0.937500 0.312500 0.687500 +v 0.875000 0.561250 0.437500 +v 0.875000 0.437500 0.437500 +v 0.875000 0.561250 0.562500 +v 0.937500 0.687500 0.687500 +v 0.937500 0.312500 -0.312500 +v 0.875000 0.561250 -0.437500 +v 0.875000 0.437500 -0.437500 +v 0.937500 0.312500 -0.687500 +v 0.875000 0.561250 -0.562500 +v 0.875000 0.437500 -0.562500 +v 0.937500 0.687500 -0.312500 +v 0.875000 0.437500 -0.312500 +v 0.875000 0.437500 0.312500 +v 0.812500 0.437500 0.562500 +v 0.812500 0.437500 -0.562500 +v 0.750000 0.437500 -0.500000 +v 0.812500 0.561250 -0.562500 +v 0.750000 0.437500 0.500000 +v 0.812500 0.561250 0.562500 +v 0.875000 0.561250 -0.312500 +v 0.812500 0.437500 -0.250000 +v 0.875000 0.561250 0.312500 +v 0.812500 0.437500 0.250000 +v 0.687500 0.437500 0.062500 +v 0.500000 0.437500 0.062500 +v 0.687500 0.437500 -0.062500 +v 0.687500 0.561250 -0.062500 +v 0.750000 0.437500 -0.375000 +v 0.750000 0.561250 -0.375000 +v 0.750000 0.437500 0.375000 +v 0.750000 0.561250 0.375000 +v 0.750000 0.561250 0.500000 +v 0.750000 0.561250 -0.500000 +v 0.687500 0.437500 0.250000 +v 0.500000 0.437500 0.250000 +v 0.687500 0.437500 -0.250000 +v 0.500000 0.437500 -0.250000 +v 0.687500 0.561250 0.062500 +v 0.812500 0.561250 -0.250000 +v 0.500000 0.437500 -0.375000 +v 0.500000 0.437500 0.375000 +v 0.500000 0.437500 -0.062500 +v 0.687500 0.561250 -0.250000 +v -1.000000 0.500000 0.312500 +v -0.250000 0.437500 0.500000 +v 0.250000 0.437500 0.500000 +v 0.375000 0.437500 0.500000 +v -0.500000 0.437500 -0.500000 +v 0.500000 0.437500 0.500000 +v 0.500000 0.437500 -0.500000 +v -0.500000 0.437500 0.500000 +v -0.375000 0.437500 0.500000 +v 0.812500 0.375000 0.937500 +v 0.812500 0.375000 -0.937500 +v -0.312500 0.500000 -0.937500 +v 0.687500 0.500000 -0.937500 +v 0.312500 0.561250 -0.875000 +v -0.500000 0.561250 -0.750000 +v 0.500000 0.561250 -0.750000 +v -0.937500 0.687500 -0.312500 +v -1.000000 0.500000 0.687500 +v 0.937500 0.500000 -0.687500 +v 0.937500 0.500000 0.312500 +v 0.812500 0.561250 0.250000 +v 0.687500 0.561250 0.250000 +vt 0.531250 1.000000 +vt 0.781250 0.750000 +vt 0.781250 1.000000 +vt 0.773438 0.640625 +vt 0.539062 0.617188 +vt 0.539062 0.640625 +vt 0.781250 0.648438 +vt 0.531250 0.718750 +vt 0.531250 0.648438 +vt 0.781250 0.648438 +vt 0.531250 0.718750 +vt 0.531250 0.648438 +vt 0.781250 0.648438 +vt 0.531250 0.718750 +vt 0.531250 0.648438 +vt 0.781250 0.648438 +vt 0.531250 0.718750 +vt 0.531250 0.648438 +vt 0.773438 0.992188 +vt 0.531250 1.000000 +vt 0.539062 0.992188 +vt 0.531250 0.750000 +vt 0.539062 0.757812 +vt 0.773438 0.757812 +vt 0.781250 1.000000 +vt 0.781250 0.750000 +vt 0.289062 0.992188 +vt 0.523438 0.757812 +vt 0.523438 0.992188 +vt 0.773438 0.617188 +vt 0.773438 0.640625 +vt 0.539062 0.640625 +vt 0.773438 0.617188 +vt 0.539062 0.640625 +vt 0.773438 0.617188 +vt 0.773438 0.640625 +vt 0.242188 0.617188 +vt 0.250000 0.507812 +vt 0.242188 0.507812 +vt 0.000000 0.695312 +vt 0.125000 1.000000 +vt 0.125000 0.695312 +vt 0.000000 0.695312 +vt 0.125000 1.000000 +vt 0.125000 0.695312 +vt -0.000000 0.695312 +vt 0.125000 1.000000 +vt 0.125000 0.695312 +vt 0.000000 0.695312 +vt 0.125000 1.000000 +vt 0.125000 0.695312 +vt 0.265625 0.804688 +vt 0.281250 0.718750 +vt 0.265625 0.718750 +vt 0.281250 0.867188 +vt 0.265625 0.718750 +vt 0.281250 0.718750 +vt 0.281250 0.937500 +vt 0.265625 0.929688 +vt 0.265625 0.937500 +vt 0.265625 0.875000 +vt 0.273438 0.875000 +vt 0.265625 0.867188 +vt 0.273438 0.875000 +vt 0.281250 0.875000 +vt 0.281250 0.992188 +vt 0.273438 1.000000 +vt 0.265625 1.000000 +vt 0.265625 0.968750 +vt 0.281250 0.703125 +vt 0.265625 0.703125 +vt 0.265625 0.906250 +vt 0.281250 0.914062 +vt 0.281250 0.906250 +vt 0.281250 0.921875 +vt 0.265625 0.929688 +vt 0.265625 0.921875 +vt 0.265625 0.812500 +vt 0.281250 0.820312 +vt 0.265625 0.734375 +vt 0.281250 1.000000 +vt 0.265625 0.992188 +vt 0.265625 0.726562 +vt 0.281250 0.867188 +vt 0.265625 0.875000 +vt 0.281250 0.718750 +vt 0.281250 0.718750 +vt 0.265625 0.867188 +vt 0.265625 0.718750 +vt 0.265625 0.703125 +vt 0.281250 0.968750 +vt 0.281250 0.703125 +vt 0.281250 0.718750 +vt 0.265625 0.804688 +vt 0.265625 0.718750 +vt 0.281250 0.992188 +vt 0.273438 1.000000 +vt 0.265625 1.000000 +vt 0.281250 0.992188 +vt 0.265625 1.000000 +vt 0.281250 0.726562 +vt 0.281250 0.921875 +vt 0.265625 0.929688 +vt 0.265625 0.921875 +vt 0.265625 0.875000 +vt 0.281250 0.867188 +vt 0.265625 0.992188 +vt 0.281250 1.000000 +vt 0.281250 0.992188 +vt 0.265625 0.804688 +vt 0.281250 0.796875 +vt 0.281250 1.000000 +vt 0.273438 1.000000 +vt 0.265625 0.992188 +vt 0.281250 0.812500 +vt 0.273438 0.812500 +vt 0.265625 0.976562 +vt 0.281250 0.984375 +vt 0.281250 0.976562 +vt 0.515625 0.765625 +vt 0.296875 0.773438 +vt 0.296875 0.765625 +vt 0.515625 0.773438 +vt 0.296875 0.765625 +vt 0.296875 0.773438 +vt 0.507812 0.835938 +vt 0.304688 0.843750 +vt 0.296875 0.835938 +vt 0.296875 0.765625 +vt 0.515625 0.773438 +vt 0.515625 0.765625 +vt 0.515625 0.773438 +vt 0.296875 0.765625 +vt 0.296875 0.773438 +vt 0.507812 0.976562 +vt 0.304688 0.984375 +vt 0.515625 0.984375 +vt 0.296875 0.773438 +vt 0.515625 0.765625 +vt 0.515625 0.773438 +vt 0.296875 0.765625 +vt 0.515625 0.773438 +vt 0.515625 0.765625 +vt 0.507812 0.882812 +vt 0.304688 0.890625 +vt 0.296875 0.882812 +vt 0.296875 0.773438 +vt 0.515625 0.765625 +vt 0.515625 0.773438 +vt 0.296875 0.773438 +vt 0.515625 0.765625 +vt 0.515625 0.773438 +vt 0.507812 0.929688 +vt 0.304688 0.937500 +vt 0.296875 0.929688 +vt 0.515625 0.773438 +vt 0.296875 0.765625 +vt 0.296875 0.773438 +vt 0.296875 0.765625 +vt 0.515625 0.773438 +vt 0.515625 0.765625 +vt 0.304688 0.796875 +vt 0.507812 0.789062 +vt 0.515625 0.796875 +vt 0.515625 0.765625 +vt 0.296875 0.773438 +vt 0.296875 0.765625 +vt 0.296875 0.765625 +vt 0.515625 0.773438 +vt 0.515625 0.765625 +vt 0.507812 0.890625 +vt 0.515625 0.859375 +vt 0.507812 0.859375 +vt 0.515625 0.789062 +vt 0.507812 0.773438 +vt 0.515625 0.773438 +vt 0.507812 0.960938 +vt 0.507812 0.820312 +vt 0.304688 0.812500 +vt 0.515625 0.812500 +vt 0.507812 0.929688 +vt 0.515625 0.914062 +vt 0.515625 0.929688 +vt 0.304688 0.960938 +vt 0.296875 0.929688 +vt 0.304688 0.929688 +vt 0.515625 0.843750 +vt 0.468750 0.812500 +vt 0.460938 0.820312 +vt 0.460938 0.812500 +vt 0.515625 0.789062 +vt 0.507812 0.773438 +vt 0.296875 0.992188 +vt 0.296875 0.976562 +vt 0.296875 0.929688 +vt 0.304688 0.960938 +vt 0.304688 0.929688 +vt 0.304688 0.906250 +vt 0.296875 0.890625 +vt 0.304688 0.890625 +vt 0.515625 0.773438 +vt 0.296875 0.765625 +vt 0.515625 0.765625 +vt 0.515625 0.765625 +vt 0.296875 0.773438 +vt 0.296875 0.765625 +vt 0.304688 0.859375 +vt 0.507812 0.867188 +vt 0.515625 0.859375 +vt 0.507812 0.789062 +vt 0.515625 0.773438 +vt 0.515625 0.789062 +vt 0.296875 0.960938 +vt 0.304688 0.929688 +vt 0.304688 0.960938 +vt 0.515625 0.890625 +vt 0.515625 0.789062 +vt 0.507812 0.773438 +vt 0.507812 0.789062 +vt 0.507812 0.937500 +vt 0.515625 0.906250 +vt 0.515625 0.937500 +vt 0.296875 0.914062 +vt 0.296875 0.765625 +vt 0.515625 0.773438 +vt 0.296875 0.773438 +vt 0.296875 0.773438 +vt 0.515625 0.765625 +vt 0.296875 0.765625 +vt 0.296875 0.960938 +vt 0.515625 0.953125 +vt 0.507812 0.960938 +vt 0.515625 0.789062 +vt 0.507812 0.773438 +vt 0.507812 0.789062 +vt 0.515625 0.859375 +vt 0.507812 0.890625 +vt 0.507812 0.859375 +vt 0.507812 0.914062 +vt 0.515625 0.937500 +vt 0.515625 0.765625 +vt 0.296875 0.773438 +vt 0.515625 0.773438 +vt 0.507812 0.789062 +vt 0.515625 0.773438 +vt 0.507812 0.773438 +vt 0.304688 0.960938 +vt 0.296875 0.929688 +vt 0.296875 0.960938 +vt 0.296875 0.960938 +vt 0.515625 0.765625 +vt 0.296875 0.773438 +vt 0.515625 0.773438 +vt 0.515625 0.890625 +vt 0.507812 0.859375 +vt 0.515625 0.859375 +vt 0.507812 0.789062 +vt 0.515625 0.789062 +vt 0.296875 0.820312 +vt 0.296875 0.789062 +vt 0.304688 0.906250 +vt 0.507812 0.914062 +vt 0.515625 0.906250 +vt 0.507812 0.890625 +vt 0.515625 0.859375 +vt 0.515625 0.890625 +vt 0.515625 0.765625 +vt 0.304688 0.906250 +vt 0.296875 0.890625 +vt 0.304688 0.890625 +vt 0.515625 0.773438 +vt 0.296875 0.765625 +vt 0.515625 0.765625 +vt 0.296875 0.765625 +vt 0.515625 0.773438 +vt 0.296875 0.773438 +vt 0.304688 0.906250 +vt 0.296875 0.890625 +vt 0.296875 0.906250 +vt 0.468750 0.820312 +vt 0.476562 0.812500 +vt 0.476562 0.820312 +vt 0.296875 0.757812 +vt 0.304688 0.765625 +vt 0.296875 0.773438 +vt 0.507812 0.773438 +vt 0.265625 0.718750 +vt 0.281250 0.804688 +vt 0.281250 0.718750 +vt 0.265625 0.703125 +vt 0.281250 0.968750 +vt 0.281250 0.703125 +vt 0.265625 0.875000 +vt 0.273438 0.875000 +vt 0.281250 0.867188 +vt 0.265625 0.921875 +vt 0.281250 0.929688 +vt 0.281250 0.921875 +vt 0.281250 0.718750 +vt 0.265625 0.867188 +vt 0.265625 0.718750 +vt 0.273438 0.875000 +vt 0.281250 0.875000 +vt 0.273438 0.812500 +vt 0.265625 0.812500 +vt 0.281250 0.812500 +vt 0.273438 0.812500 +vt 0.265625 0.804688 +vt 0.281250 0.921875 +vt 0.265625 0.929688 +vt 0.265625 0.921875 +vt 0.281250 1.000000 +vt 0.273438 1.000000 +vt 0.265625 0.992188 +vt 0.281250 0.921875 +vt 0.265625 0.929688 +vt 0.265625 0.921875 +vt 0.281250 0.921875 +vt 0.265625 0.929688 +vt 0.265625 0.921875 +vt 0.281250 0.906250 +vt 0.265625 0.898438 +vt 0.265625 0.750000 +vt 0.281250 0.812500 +vt 0.265625 0.804688 +vt 0.265625 0.718750 +vt 0.265625 1.000000 +vt 0.281250 0.992188 +vt 0.281250 0.726562 +vt 0.281250 0.937500 +vt 0.265625 0.929688 +vt 0.265625 0.937500 +vt 0.281250 0.703125 +vt 0.265625 0.968750 +vt 0.265625 0.703125 +vt 0.281250 0.820312 +vt 0.265625 0.828125 +vt 0.281250 0.734375 +vt 0.265625 0.937500 +vt 0.281250 0.929688 +vt 0.281250 0.937500 +vt 0.265625 0.718750 +vt 0.281250 0.867188 +vt 0.281250 0.718750 +vt 0.265625 0.992188 +vt 0.281250 1.000000 +vt 0.265625 0.726562 +vt 0.281250 0.804688 +vt 0.281250 0.718750 +vt 0.281250 0.898438 +vt 0.265625 0.906250 +vt 0.281250 0.750000 +vt 0.421875 0.648438 +vt 0.406250 0.671875 +vt 0.406250 0.648438 +vt 0.343750 0.640625 +vt 0.359375 0.625000 +vt 0.375000 0.640625 +vt 0.359375 0.640625 +vt 0.367188 0.625000 +vt 0.343750 0.625000 +vt 0.351562 0.640625 +vt 0.343750 0.625000 +vt 0.367188 0.625000 +vt 0.367188 0.625000 +vt 0.359375 0.640625 +vt 0.343750 0.625000 +vt 0.406250 0.656250 +vt 0.421875 0.648438 +vt 0.421875 0.656250 +vt 0.351562 0.625000 +vt 0.343750 0.640625 +vt 0.367188 0.640625 +vt 0.343750 0.625000 +vt 0.359375 0.640625 +vt 0.375000 0.625000 +vt 0.265625 0.921875 +vt 0.281250 0.929688 +vt 0.281250 0.921875 +vt 0.281250 0.890625 +vt 0.265625 0.898438 +vt 0.265625 0.890625 +vt 0.265625 0.937500 +vt 0.281250 0.929688 +vt 0.281250 0.937500 +vt 0.281250 0.960938 +vt 0.265625 0.953125 +vt 0.265625 0.960938 +vt 0.265625 0.937500 +vt 0.281250 0.929688 +vt 0.281250 0.937500 +vt 0.281250 0.976562 +vt 0.265625 0.968750 +vt 0.265625 0.976562 +vt 0.265625 0.937500 +vt 0.281250 0.929688 +vt 0.281250 0.937500 +vt 0.265625 0.937500 +vt 0.281250 0.929688 +vt 0.281250 0.937500 +vt 0.281250 0.937500 +vt 0.265625 0.929688 +vt 0.265625 0.937500 +vt 0.281250 0.929688 +vt 0.265625 0.937500 +vt 0.281250 0.929688 +vt 0.265625 0.921875 +vt 0.265625 0.929688 +vt 0.281250 0.921875 +vt 0.281250 0.804688 +vt 0.273438 0.812500 +vt 0.265625 0.812500 +vt 0.242188 0.507812 +vt 0.250000 0.625000 +vt 0.242188 0.617188 +vt 0.125000 0.625000 +vt 0.132812 0.617188 +vt 0.125000 0.500000 +vt 0.132812 0.507812 +vt 0.250000 0.500000 +vt 0.242188 0.507812 +vt 0.132812 0.617188 +vt 0.132812 0.507812 +vt 0.125000 0.507812 +vt 0.132812 0.617188 +vt 0.125000 0.617188 +vt 0.132812 0.625000 +vt 0.242188 0.617188 +vt 0.242188 0.625000 +vt 0.242188 0.500000 +vt 0.132812 0.507812 +vt 0.132812 0.500000 +vt 0.375000 0.625000 +vt 0.382812 0.632812 +vt 0.367188 0.640625 +vt 0.359375 0.640625 +vt 0.375000 0.625000 +vt 0.375000 0.640625 +vt 0.421875 0.671875 +vt 0.406250 0.648438 +vt 0.406250 0.671875 +vt 0.359375 0.625000 +vt 0.367188 0.640625 +vt 0.343750 0.640625 +vt 0.359375 0.640625 +vt 0.367188 0.625000 +vt 0.367188 0.640625 +vt 0.406250 0.648438 +vt 0.421875 0.656250 +vt 0.421875 0.648438 +vt 0.453125 0.625000 +vt 0.468750 0.625000 +vt 0.484375 0.625000 +vt 0.359375 0.625000 +vt 0.375000 0.640625 +vt 0.375000 0.625000 +vt 0.289062 0.718750 +vt 0.281250 0.742188 +vt 0.281250 0.718750 +vt 0.328125 0.742188 +vt 0.320312 0.718750 +vt 0.328125 0.718750 +vt 0.328125 0.734375 +vt 0.281250 0.742188 +vt 0.296875 0.710938 +vt 0.296875 0.726562 +vt 0.328125 0.742188 +vt 0.312500 0.710938 +vt 0.328125 0.695312 +vt 0.312500 0.726562 +vt 0.367188 0.640625 +vt 0.343750 0.625000 +vt 0.351562 0.640625 +vt 0.265625 0.710938 +vt 0.281250 0.726562 +vt 0.281250 0.710938 +vt 0.265625 0.703125 +vt 0.281250 0.703125 +vt 0.359375 0.625000 +vt 0.351562 0.640625 +vt 0.351562 0.625000 +vt 0.382812 0.656250 +vt 0.367188 0.671875 +vt 0.382812 0.671875 +vt 0.367188 0.648438 +vt 0.367188 0.656250 +vt 0.445312 0.671875 +vt 0.460938 0.648438 +vt 0.460938 0.671875 +vt 0.367188 0.648438 +vt 0.382812 0.671875 +vt 0.382812 0.648438 +vt 0.445312 0.648438 +vt 0.445312 0.632812 +vt 0.445312 0.648438 +vt 0.382812 0.632812 +vt 0.445312 0.632812 +vt 0.445312 0.648438 +vt 0.382812 0.648438 +vt 0.421875 0.656250 +vt 0.406250 0.648438 +vt 0.421875 0.648438 +vt 0.328125 0.718750 +vt 0.320312 0.742188 +vt 0.320312 0.718750 +vt 0.328125 0.734375 +vt 0.281250 0.742188 +vt 0.328125 0.742188 +vt 0.304688 0.914062 +vt 0.296875 0.882812 +vt 0.304688 0.882812 +vt 0.281250 0.695312 +vt 0.296875 0.726562 +vt 0.281250 0.742188 +vt 0.296875 0.710938 +vt 0.328125 0.695312 +vt 0.312500 0.710938 +vt 0.328125 0.742188 +vt 0.312500 0.726562 +vt 0.265625 0.718750 +vt 0.281250 0.703125 +vt 0.281250 0.718750 +vt 0.375000 0.640625 +vt 0.359375 0.625000 +vt 0.375000 0.625000 +vt 0.281250 0.710938 +vt 0.265625 0.718750 +vt 0.265625 0.710938 +vt 0.265625 0.703125 +vt 0.695312 0.718750 +vt 0.742188 0.742188 +vt 0.742188 0.718750 +vt 0.570312 0.718750 +vt 0.617188 0.742188 +vt 0.617188 0.718750 +vt 0.617188 0.718750 +vt 0.570312 0.742188 +vt 0.570312 0.718750 +vt 0.695312 0.718750 +vt 0.742188 0.742188 +vt 0.742188 0.718750 +vt 0.320312 0.742188 +vt 0.328125 0.718750 +vt 0.320312 0.718750 +vt 0.281250 0.718750 +vt 0.289062 0.742188 +vt 0.281250 0.742188 +vt 0.328125 0.742188 +vt 0.320312 0.718750 +vt 0.328125 0.718750 +vt 0.578125 0.742188 +vt 0.570312 0.718750 +vt 0.578125 0.718750 +vt 0.328125 0.742188 +vt 0.281250 0.734375 +vt 0.328125 0.734375 +vt 0.328125 0.742188 +vt 0.281250 0.734375 +vt 0.328125 0.734375 +vt 0.406250 0.671875 +vt 0.421875 0.648438 +vt 0.421875 0.671875 +vt 0.359375 0.625000 +vt 0.367188 0.640625 +vt 0.343750 0.640625 +vt 0.265625 0.734375 +vt 0.281250 0.718750 +vt 0.265625 0.703125 +vt 0.359375 0.640625 +vt 0.367188 0.625000 +vt 0.343750 0.625000 +vt 0.367188 0.640625 +vt 0.359375 0.625000 +vt 0.343750 0.640625 +vt 0.359375 0.640625 +vt 0.367188 0.625000 +vt 0.343750 0.625000 +vt 0.382812 0.625000 +vt 0.367188 0.640625 +vt 0.351562 0.625000 +vt 0.421875 0.648438 +vt 0.406250 0.656250 +vt 0.406250 0.648438 +vt 0.265625 0.726562 +vt 0.281250 0.703125 +vt 0.281250 0.726562 +vt 0.281250 0.726562 +vt 0.265625 0.703125 +vt 0.281250 0.703125 +vt 0.445312 0.648438 +vt 0.382812 0.632812 +vt 0.382812 0.648438 +vt 0.382812 0.648438 +vt 0.445312 0.632812 +vt 0.445312 0.648438 +vt 0.382812 0.648438 +vt 0.445312 0.632812 +vt 0.445312 0.648438 +vt 0.328125 0.742188 +vt 0.296875 0.726562 +vt 0.312500 0.726562 +vt 0.281250 0.742188 +vt 0.296875 0.710938 +vt 0.328125 0.695312 +vt 0.281250 0.695312 +vt 0.312500 0.710938 +vt 0.328125 0.742188 +vt 0.296875 0.726562 +vt 0.312500 0.726562 +vt 0.281250 0.742188 +vt 0.296875 0.710938 +vt 0.296875 0.726562 +vt 0.281250 0.695312 +vt 0.312500 0.710938 +vt 0.312500 0.710938 +vt 0.328125 0.695312 +vt 0.265625 0.726562 +vt 0.281250 0.718750 +vt 0.281250 0.726562 +vt 0.281250 0.734375 +vt 0.265625 0.726562 +vt 0.281250 0.726562 +vt 0.265625 0.718750 +vt 0.281250 0.703125 +vt 0.281250 0.718750 +vt 0.265625 0.703125 +vt 0.281250 0.718750 +vt 0.265625 0.718750 +vt 0.265625 0.718750 +vt 0.281250 0.703125 +vt 0.265625 0.703125 +vt 0.281250 0.710938 +vt 0.265625 0.703125 +vt 0.265625 0.710938 +vt 0.281250 0.718750 +vt 0.265625 0.718750 +vt 0.265625 0.718750 +vt 0.281250 0.703125 +vt 0.265625 0.703125 +vt 0.281250 0.726562 +vt 0.265625 0.726562 +vt 0.367188 0.625000 +vt 0.359375 0.640625 +vt 0.359375 0.625000 +vt 0.453125 0.625000 +vt 0.484375 0.625000 +vt 0.460938 0.640625 +vt 0.351562 0.640625 +vt 0.367188 0.640625 +vt 0.359375 0.625000 +vt 0.445312 0.656250 +vt 0.460938 0.640625 +vt 0.343750 0.632812 +vt 0.343750 0.625000 +vt 0.359375 0.625000 +vt 0.617188 0.695312 +vt 0.609375 0.742188 +vt 0.609375 0.695312 +vt 0.617188 0.742188 +vt 0.609375 0.718750 +vt 0.617188 0.718750 +vt 0.570312 0.718750 +vt 0.578125 0.742188 +vt 0.570312 0.742188 +vt 0.578125 0.718750 +vt 0.570312 0.742188 +vt 0.570312 0.718750 +vt 0.617188 0.718750 +vt 0.609375 0.742188 +vt 0.617188 0.742188 +vt 0.609375 0.695312 +vt 0.617188 0.695312 +vt 0.445312 0.671875 +vt 0.460938 0.648438 +vt 0.445312 0.648438 +vt 0.382812 0.671875 +vt 0.367188 0.648438 +vt 0.367188 0.671875 +vt 0.382812 0.648438 +vt 0.445312 0.632812 +vt 0.445312 0.648438 +vt 0.445312 0.648438 +vt 0.382812 0.632812 +vt 0.382812 0.648438 +vt 0.445312 0.648438 +vt 0.382812 0.632812 +vt 0.382812 0.648438 +vt 0.265625 0.718750 +vt 0.281250 0.703125 +vt 0.265625 0.703125 +vt 0.445312 0.648438 +vt 0.429688 0.632812 +vt 0.429688 0.648438 +vt 0.265625 0.710938 +vt 0.281250 0.703125 +vt 0.265625 0.703125 +vt 0.382812 0.671875 +vt 0.367188 0.664062 +vt 0.382812 0.664062 +vt 0.265625 0.710938 +vt 0.281250 0.703125 +vt 0.265625 0.703125 +vt 0.437500 0.648438 +vt 0.429688 0.632812 +vt 0.429688 0.648438 +vt 0.398438 0.632812 +vt 0.406250 0.648438 +vt 0.398438 0.648438 +vt 0.367188 0.656250 +vt 0.382812 0.648438 +vt 0.367188 0.648438 +vt 0.367188 0.671875 +vt 0.382812 0.656250 +vt 0.382812 0.632812 +vt 0.398438 0.648438 +vt 0.382812 0.648438 +vt 0.328125 0.695312 +vt 0.296875 0.710938 +vt 0.281250 0.695312 +vt 0.328125 0.695312 +vt 0.312500 0.726562 +vt 0.312500 0.710938 +vt 0.296875 0.726562 +vt 0.328125 0.742188 +vt 0.281250 0.742188 +vt 0.281250 0.695312 +vt 0.296875 0.710938 +vt 0.265625 0.648438 +vt 0.281250 0.617188 +vt 0.281250 0.632812 +vt 0.312500 0.648438 +vt 0.265625 0.601562 +vt 0.296875 0.617188 +vt 0.281250 0.617188 +vt 0.312500 0.601562 +vt 0.296875 0.632812 +vt 0.375000 0.625000 +vt 0.343750 0.625000 +vt 0.367188 0.640625 +vt 0.453125 0.625000 +vt 0.468750 0.625000 +vt 0.460938 0.640625 +vt 0.382812 0.656250 +vt 0.367188 0.640625 +vt 0.445312 0.632812 +vt 0.445312 0.656250 +vt 0.460938 0.640625 +vt 0.617188 0.718750 +vt 0.570312 0.742188 +vt 0.617188 0.742188 +vt 0.742188 0.742188 +vt 0.695312 0.718750 +vt 0.695312 0.742188 +vt 0.320312 0.742188 +vt 0.328125 0.718750 +vt 0.320312 0.718750 +vt 0.289062 0.742188 +vt 0.281250 0.718750 +vt 0.289062 0.718750 +vt 0.320312 0.742188 +vt 0.328125 0.718750 +vt 0.320312 0.718750 +vt 0.281250 0.718750 +vt 0.289062 0.742188 +vt 0.281250 0.742188 +vt 0.281250 0.734375 +vt 0.328125 0.742188 +vt 0.281250 0.742188 +vt 0.281250 0.734375 +vt 0.328125 0.742188 +vt 0.281250 0.742188 +vt 0.281250 0.742188 +vt 0.312500 0.726562 +vt 0.328125 0.742188 +vt 0.296875 0.710938 +vt 0.296875 0.726562 +vt 0.312500 0.710938 +vt 0.281250 0.695312 +vt 0.328125 0.695312 +vt 0.281250 0.742188 +vt 0.296875 0.710938 +vt 0.296875 0.726562 +vt 0.328125 0.742188 +vt 0.312500 0.710938 +vt 0.312500 0.726562 +vt 0.281250 0.695312 +vt 0.281250 0.703125 +vt 0.265625 0.718750 +vt 0.265625 0.703125 +vt 0.265625 0.726562 +vt 0.281250 0.710938 +vt 0.281250 0.726562 +vt 0.281250 0.718750 +vt 0.265625 0.710938 +vt 0.281250 0.710938 +vt 0.265625 0.718750 +vt 0.281250 0.710938 +vt 0.265625 0.710938 +vt 0.265625 0.710938 +vt 0.281250 0.703125 +vt 0.265625 0.703125 +vt 0.281250 0.710938 +vt 0.265625 0.703125 +vt 0.281250 0.703125 +vt 0.367188 0.640625 +vt 0.359375 0.625000 +vt 0.367188 0.625000 +vt 0.265625 0.710938 +vt 0.281250 0.703125 +vt 0.265625 0.726562 +vt 0.265625 0.703125 +vt 0.281250 0.726562 +vt 0.265625 0.726562 +vt 0.281250 0.734375 +vt 0.265625 0.734375 +vt 0.265625 0.734375 +vt 0.281250 0.718750 +vt 0.281250 0.734375 +vt 0.281250 0.726562 +vt 0.265625 0.710938 +vt 0.265625 0.726562 +vt 0.281250 0.710938 +vt 0.281250 0.726562 +vt 0.265625 0.718750 +vt 0.281250 0.703125 +vt 0.265625 0.726562 +vt 0.265625 0.703125 +vt 0.265625 0.703125 +vt 0.281250 0.703125 +vt 0.281250 0.703125 +vt 0.382812 0.632812 +vt 0.445312 0.648438 +vt 0.445312 0.632812 +vt 0.382812 0.632812 +vt 0.445312 0.648438 +vt 0.382812 0.648438 +vt 0.382812 0.648438 +vt 0.367188 0.671875 +vt 0.367188 0.640625 +vt 0.460938 0.671875 +vt 0.460938 0.640625 +vt 0.375000 0.625000 +vt 0.359375 0.625000 +vt 0.367188 0.640625 +vt 0.453125 0.625000 +vt 0.468750 0.625000 +vt 0.460938 0.640625 +vt 0.421875 0.648438 +vt 0.406250 0.671875 +vt 0.406250 0.648438 +vt 0.406250 0.648438 +vt 0.421875 0.656250 +vt 0.406250 0.656250 +vt 0.445312 0.632812 +vt 0.445312 0.648438 +vt 0.421875 0.648438 +vt 0.570312 0.718750 +vt 0.570312 0.742188 +vt 0.742188 0.742188 +vt 0.695312 0.718750 +vt 0.695312 0.742188 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.460938 0.656250 +vt 0.460938 0.640625 +vt 0.382812 0.640625 +vt 0.367188 0.632812 +vt 0.367188 0.656250 +vt 0.437500 0.632812 +vt 0.445312 0.648438 +vt 0.421875 0.648438 +vt 0.460938 0.671875 +vt 0.460938 0.640625 +vt 0.125000 0.625000 +vt 0.000000 0.500000 +vt 0.125000 0.500000 +vt 0.125000 0.710938 +vt 0.250000 0.695312 +vt 0.250000 0.710938 +vt 0.125000 0.710938 +vt 0.250000 0.710938 +vt 0.125000 0.695312 +vt 0.125000 0.710938 +vt 0.250000 0.695312 +vt 0.250000 0.710938 +vt 0.546875 0.578125 +vt 0.312500 0.343750 +vt 0.546875 0.343750 +vt 0.531250 0.750000 +vt 0.781250 0.718750 +vt 0.781250 0.718750 +vt 0.781250 0.718750 +vt 0.781250 0.718750 +vt 0.289062 0.757812 +vt 0.539062 0.617188 +vt 0.539062 0.617188 +vt 0.250000 0.617188 +vt -0.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 1.000000 +vt 0.265625 0.703125 +vt 0.281250 0.703125 +vt 0.265625 0.710938 +vt 0.281250 0.726562 +vt 0.281250 0.968750 +vt 0.265625 0.914062 +vt 0.273438 0.820312 +vt 0.281250 0.718750 +vt 0.281250 0.710938 +vt 0.273438 1.000000 +vt 0.273438 0.875000 +vt 0.265625 0.703125 +vt 0.265625 0.968750 +vt 0.281250 0.804688 +vt 0.265625 0.710938 +vt 0.281250 0.726562 +vt 0.273438 1.000000 +vt 0.265625 0.710938 +vt 0.265625 0.703125 +vt 0.273438 0.875000 +vt 0.265625 1.000000 +vt 0.265625 0.703125 +vt 0.273438 0.804688 +vt 0.265625 0.726562 +vt 0.281250 0.710938 +vt 0.281250 0.703125 +vt 0.265625 0.984375 +vt 0.515625 0.773438 +vt 0.515625 0.765625 +vt 0.296875 0.773438 +vt 0.515625 0.765625 +vt 0.296875 0.765625 +vt 0.296875 0.773438 +vt 0.296875 0.765625 +vt 0.296875 0.765625 +vt 0.515625 0.765625 +vt 0.296875 0.773438 +vt 0.515625 0.773438 +vt 0.296875 0.773438 +vt 0.515625 0.890625 +vt 0.507812 0.789062 +vt 0.515625 0.953125 +vt 0.296875 0.820312 +vt 0.507812 0.914062 +vt 0.296875 0.960938 +vt 0.468750 0.820312 +vt 0.507812 0.789062 +vt 0.304688 0.992188 +vt 0.296875 0.960938 +vt 0.296875 0.906250 +vt 0.296875 0.773438 +vt 0.515625 0.773438 +vt 0.296875 0.867188 +vt 0.507812 0.773438 +vt 0.296875 0.929688 +vt 0.507812 0.906250 +vt 0.304688 0.906250 +vt 0.515625 0.765625 +vt 0.515625 0.773438 +vt 0.304688 0.953125 +vt 0.515625 0.773438 +vt 0.515625 0.890625 +vt 0.515625 0.906250 +vt 0.296875 0.765625 +vt 0.515625 0.789062 +vt 0.304688 0.929688 +vt 0.304688 0.953125 +vt 0.296875 0.765625 +vt 0.507812 0.890625 +vt 0.507812 0.773438 +vt 0.304688 0.812500 +vt 0.296875 0.914062 +vt 0.507812 0.859375 +vt 0.296875 0.906250 +vt 0.296875 0.773438 +vt 0.515625 0.765625 +vt 0.304688 0.890625 +vt 0.468750 0.812500 +vt 0.304688 0.757812 +vt 0.265625 0.968750 +vt 0.265625 0.703125 +vt 0.281250 0.703125 +vt 0.265625 0.703125 +vt 0.281250 0.703125 +vt 0.265625 0.726562 +vt 0.281250 0.710938 +vt 0.281250 0.734375 +vt 0.273438 0.906250 +vt 0.281250 0.703125 +vt 0.273438 0.812500 +vt 0.265625 0.710938 +vt 0.273438 1.000000 +vt 0.281250 0.968750 +vt 0.273438 0.828125 +vt 0.265625 0.718750 +vt 0.265625 0.867188 +vt 0.273438 1.000000 +vt 0.281250 0.710938 +vt 0.273438 0.906250 +vt 0.265625 0.734375 +vt 0.421875 0.671875 +vt 0.343750 0.625000 +vt 0.367188 0.640625 +vt 0.343750 0.640625 +vt 0.367188 0.640625 +vt 0.406250 0.648438 +vt 0.343750 0.625000 +vt 0.343750 0.640625 +vt 0.281250 0.898438 +vt 0.281250 0.953125 +vt 0.281250 0.968750 +vt 0.281250 0.937500 +vt 0.281250 0.921875 +vt 0.265625 0.921875 +vt 0.265625 0.703125 +vt 0.242188 0.617188 +vt 0.242188 0.507812 +vt 0.382812 0.656250 +vt 0.367188 0.656250 +vt 0.351562 0.640625 +vt 0.343750 0.625000 +vt 0.343750 0.632812 +vt 0.343750 0.625000 +vt 0.421875 0.648438 +vt 0.367188 0.625000 +vt 0.343750 0.625000 +vt 0.406250 0.656250 +vt 0.343750 0.640625 +vt 0.289062 0.742188 +vt 0.320312 0.742188 +vt 0.281250 0.734375 +vt 0.281250 0.695312 +vt 0.367188 0.671875 +vt 0.382812 0.671875 +vt 0.382812 0.632812 +vt 0.375000 0.625000 +vt 0.343750 0.632812 +vt 0.265625 0.726562 +vt 0.359375 0.640625 +vt 0.382812 0.648438 +vt 0.367188 0.671875 +vt 0.382812 0.648438 +vt 0.382812 0.648438 +vt 0.406250 0.656250 +vt 0.281250 0.734375 +vt 0.296875 0.914062 +vt 0.265625 0.703125 +vt 0.359375 0.640625 +vt 0.281250 0.718750 +vt 0.281250 0.703125 +vt 0.695312 0.742188 +vt 0.570312 0.742188 +vt 0.617188 0.742188 +vt 0.695312 0.742188 +vt 0.328125 0.742188 +vt 0.289062 0.718750 +vt 0.320312 0.742188 +vt 0.570312 0.742188 +vt 0.281250 0.742188 +vt 0.406250 0.648438 +vt 0.367188 0.625000 +vt 0.281250 0.734375 +vt 0.367188 0.640625 +vt 0.367188 0.625000 +vt 0.367188 0.640625 +vt 0.382812 0.640625 +vt 0.421875 0.656250 +vt 0.265625 0.703125 +vt 0.265625 0.726562 +vt 0.445312 0.632812 +vt 0.382812 0.632812 +vt 0.382812 0.632812 +vt 0.281250 0.742188 +vt 0.328125 0.695312 +vt 0.265625 0.718750 +vt 0.265625 0.734375 +vt 0.265625 0.703125 +vt 0.281250 0.703125 +vt 0.281250 0.718750 +vt 0.281250 0.703125 +vt 0.281250 0.718750 +vt 0.367188 0.640625 +vt 0.460938 0.671875 +vt 0.445312 0.648438 +vt 0.445312 0.671875 +vt 0.445312 0.632812 +vt 0.484375 0.632812 +vt 0.476562 0.640625 +vt 0.367188 0.671875 +vt 0.382812 0.671875 +vt 0.382812 0.648438 +vt 0.382812 0.632812 +vt 0.375000 0.625000 +vt 0.343750 0.625000 +vt 0.343750 0.632812 +vt 0.460938 0.656250 +vt 0.476562 0.640625 +vt 0.484375 0.625000 +vt 0.484375 0.632812 +vt 0.453125 0.625000 +vt 0.382812 0.656250 +vt 0.367188 0.640625 +vt 0.367188 0.656250 +vt 0.351562 0.640625 +vt 0.375000 0.625000 +vt 0.617188 0.742188 +vt 0.609375 0.742188 +vt 0.578125 0.718750 +vt 0.578125 0.742188 +vt 0.609375 0.718750 +vt 0.460938 0.671875 +vt 0.382812 0.648438 +vt 0.382812 0.632812 +vt 0.445312 0.632812 +vt 0.281250 0.718750 +vt 0.445312 0.632812 +vt 0.281250 0.710938 +vt 0.367188 0.671875 +vt 0.281250 0.710938 +vt 0.437500 0.632812 +vt 0.406250 0.632812 +vt 0.382812 0.671875 +vt 0.398438 0.632812 +vt 0.312500 0.710938 +vt 0.265625 0.601562 +vt 0.296875 0.632812 +vt 0.312500 0.648438 +vt 0.367188 0.671875 +vt 0.382812 0.648438 +vt 0.382812 0.671875 +vt 0.382812 0.632812 +vt 0.343750 0.632812 +vt 0.351562 0.640625 +vt 0.460938 0.671875 +vt 0.445312 0.671875 +vt 0.445312 0.632812 +vt 0.484375 0.625000 +vt 0.484375 0.632812 +vt 0.476562 0.640625 +vt 0.367188 0.656250 +vt 0.351562 0.640625 +vt 0.359375 0.625000 +vt 0.343750 0.632812 +vt 0.343750 0.625000 +vt 0.375000 0.625000 +vt 0.460938 0.656250 +vt 0.476562 0.640625 +vt 0.468750 0.625000 +vt 0.484375 0.632812 +vt 0.484375 0.625000 +vt 0.453125 0.625000 +vt 0.570312 0.718750 +vt 0.742188 0.718750 +vt 0.328125 0.742188 +vt 0.281250 0.742188 +vt 0.328125 0.742188 +vt 0.289062 0.718750 +vt 0.328125 0.734375 +vt 0.328125 0.734375 +vt 0.328125 0.695312 +vt 0.281250 0.718750 +vt 0.265625 0.718750 +vt 0.281250 0.718750 +vt 0.359375 0.640625 +vt 0.265625 0.703125 +vt 0.281250 0.726562 +vt 0.281250 0.703125 +vt 0.265625 0.703125 +vt 0.265625 0.726562 +vt 0.281250 0.726562 +vt 0.265625 0.726562 +vt 0.281250 0.726562 +vt 0.265625 0.703125 +vt 0.445312 0.632812 +vt 0.343750 0.625000 +vt 0.359375 0.625000 +vt 0.343750 0.632812 +vt 0.375000 0.625000 +vt 0.382812 0.671875 +vt 0.351562 0.640625 +vt 0.484375 0.625000 +vt 0.468750 0.625000 +vt 0.484375 0.632812 +vt 0.453125 0.625000 +vt 0.445312 0.671875 +vt 0.476562 0.640625 +vt 0.367188 0.656250 +vt 0.382812 0.648438 +vt 0.382812 0.656250 +vt 0.382812 0.632812 +vt 0.343750 0.632812 +vt 0.351562 0.640625 +vt 0.343750 0.625000 +vt 0.460938 0.656250 +vt 0.445312 0.656250 +vt 0.484375 0.632812 +vt 0.476562 0.640625 +vt 0.484375 0.625000 +vt 0.421875 0.671875 +vt 0.742188 0.718750 +vt 0.484375 0.632812 +vt 0.484375 0.625000 +vt 0.476562 0.640625 +vt 0.453125 0.625000 +vt 0.445312 0.656250 +vt 0.382812 0.632812 +vt 0.445312 0.632812 +vt 0.484375 0.632812 +vt 0.476562 0.640625 +vt 0.445312 0.632812 +vt 0.445312 0.671875 +vt 0.000000 0.625000 +vt 0.125000 0.695312 +vt 0.125000 0.695312 +vt 0.250000 0.695312 +vt 0.312500 0.578125 +vn 0.0000 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 -0.0000 1.0000 +vn -0.0000 -1.0000 0.0000 +vn 0.0000 0.7071 0.7071 +vn 0.0000 -0.7071 -0.7071 +vn 0.0000 -0.7071 0.7071 +vn 0.0000 0.7071 -0.7071 +vn -0.7071 0.7071 0.0000 +vn 0.7071 -0.7071 -0.0000 +vn 0.7071 0.7071 0.0000 +vn -0.7071 -0.7071 0.0000 +vn 0.0000 -0.4437 0.8962 +vn 0.0000 0.4472 0.8944 +vn 0.4437 -0.0000 0.8962 +vn -0.4508 -0.0000 0.8926 +vn 0.7071 -0.0000 0.7071 +vn -0.7071 -0.0000 0.7071 +vn 0.4472 -0.0000 0.8944 +vn -0.4472 -0.0000 0.8944 +vn 0.4472 0.0000 -0.8944 +vn 0.0000 -0.4437 -0.8962 +vn -0.4472 0.0000 -0.8944 +vn 0.0000 0.4472 -0.8944 +vn 0.0000 -0.4472 0.8944 +vn -0.7071 0.0000 -0.7071 +vn 0.7071 0.0000 -0.7071 +vn 0.8944 -0.4472 -0.0000 +vn -0.8944 0.0000 -0.4472 +vn -0.8962 -0.4437 -0.0000 +vn -0.8944 0.0000 0.4472 +vn -0.8944 0.4472 0.0000 +vn 0.8944 0.0000 -0.4472 +vn 0.8962 0.4437 0.0000 +vn 0.8944 0.4472 0.0000 +vn 0.8944 -0.0000 0.4472 +vn 0.8962 -0.4437 -0.0000 +vn -0.8944 -0.4472 -0.0000 +vn -0.8962 0.4437 0.0000 +usemtl Material.001 +s 1 +f 1/1/1 2/2/1 3/3/1 +f 4/4/2 5/5/2 6/6/2 +f 1/7/3 7/8/3 8/9/3 +f 3/10/2 9/11/2 1/12/2 +f 8/13/4 10/14/4 2/15/4 +f 2/16/5 11/17/5 3/18/5 +f 12/19/6 11/20/6 13/21/6 +f 13/21/6 10/22/6 6/23/6 +f 4/24/6 9/25/6 12/19/6 +f 6/23/6 7/26/6 4/24/6 +f 5/27/6 14/28/6 15/29/6 +f 6/6/3 15/30/3 13/31/3 +f 12/32/5 16/33/5 4/4/5 +f 13/34/4 14/35/4 12/36/4 +f 17/37/4 18/38/4 19/39/4 +f 20/40/4 21/41/4 22/42/4 +f 22/43/5 23/44/5 24/45/5 +f 25/46/3 26/47/3 20/48/3 +f 24/49/2 27/50/2 25/51/2 +f 28/52/5 29/53/5 30/54/5 +f 31/55/3 32/56/3 33/57/3 +f 34/58/1 35/59/1 36/60/1 +f 37/61/2 38/62/2 31/55/2 +f 39/63/4 40/64/4 41/65/4 +f 42/66/4 43/67/4 44/68/4 +f 45/69/5 46/70/5 47/71/5 +f 48/72/6 49/73/6 50/74/6 +f 44/75/1 51/76/1 52/77/1 +f 53/78/2 48/79/2 54/80/2 +f 55/81/4 56/82/4 57/83/4 +f 58/84/2 59/85/2 60/86/2 +f 61/87/5 58/88/5 60/89/5 +f 57/90/3 62/91/3 63/92/3 +f 64/93/5 53/94/5 54/95/5 +f 65/96/3 66/97/3 67/98/3 +f 62/99/2 68/100/2 63/101/2 +f 68/102/1 69/103/1 55/104/1 +f 70/105/4 71/106/4 61/87/4 +f 59/107/6 72/108/6 70/109/6 +f 50/110/4 73/111/4 64/93/4 +f 52/112/2 51/113/2 45/114/2 +f 36/115/2 35/116/2 28/52/2 +f 41/117/6 38/118/6 37/119/6 +f 74/120/3 75/121/3 76/122/3 +f 77/123/5 78/124/5 79/125/5 +f 80/126/1 76/127/1 78/128/1 +f 81/129/5 82/130/5 83/131/5 +f 84/132/5 85/133/5 86/134/5 +f 85/135/6 87/136/6 82/137/6 +f 88/138/5 89/139/5 90/140/5 +f 91/141/5 92/142/5 93/143/5 +f 94/144/1 92/145/1 89/146/1 +f 95/147/5 96/148/5 97/149/5 +f 98/150/5 99/151/5 100/152/5 +f 101/153/1 99/154/1 96/155/1 +f 102/156/5 103/157/5 104/158/5 +f 105/159/5 106/160/5 107/161/5 +f 108/162/1 106/163/1 103/164/1 +f 109/165/3 110/166/3 111/167/3 +f 112/168/3 113/169/3 114/170/3 +f 83/171/4 115/172/4 109/173/4 +f 86/174/4 116/175/4 112/176/4 +f 82/137/6 116/177/6 85/135/6 +f 110/178/1 116/179/1 113/180/1 +f 110/181/4 77/182/4 111/183/4 +f 117/184/2 113/185/2 114/186/2 +f 80/126/1 113/180/1 74/187/1 +f 118/188/4 87/189/4 81/190/4 +f 119/191/4 120/192/4 84/132/4 +f 121/193/6 87/136/6 120/194/6 +f 78/195/4 122/196/4 79/197/4 +f 123/198/2 76/199/2 75/200/2 +f 124/201/3 125/202/3 126/203/3 +f 127/204/5 128/205/5 129/206/5 +f 127/207/1 78/128/1 76/127/1 +f 126/208/1 127/207/1 129/209/1 +f 126/210/4 88/211/4 124/212/4 +f 129/213/4 91/214/4 128/215/4 +f 126/208/1 130/216/1 94/144/1 +f 92/217/4 131/218/4 93/219/4 +f 89/220/4 132/221/4 90/222/4 +f 92/145/1 133/223/1 89/146/1 +f 134/224/3 135/225/3 136/226/3 +f 137/227/3 133/228/3 138/229/3 +f 135/230/6 138/231/6 136/232/6 +f 138/233/4 95/234/4 137/235/4 +f 136/236/4 98/237/4 134/238/4 +f 138/239/1 139/240/1 101/153/1 +f 140/241/3 141/242/3 142/243/3 +f 100/244/4 141/245/4 143/246/4 +f 96/247/4 144/248/4 97/249/4 +f 99/154/1 145/250/1 96/155/1 +f 146/251/3 145/252/3 147/253/3 +f 140/254/4 148/255/4 105/256/4 +f 147/257/4 102/156/4 146/258/4 +f 108/162/1 142/259/1 148/260/1 +f 141/261/6 147/262/6 142/263/6 +f 149/264/4 103/265/4 150/266/4 +f 106/163/1 150/267/1 103/164/1 +f 151/268/2 106/269/2 107/270/2 +f 152/271/3 150/272/3 153/273/3 +f 151/274/5 154/275/5 155/276/5 +f 156/277/2 157/278/2 158/279/2 +f 153/280/4 159/281/4 152/282/4 +f 156/283/1 153/284/1 154/285/1 +f 155/286/1 153/284/1 150/267/1 +f 160/287/4 161/288/4 162/289/4 +f 163/290/4 65/291/4 164/292/4 +f 165/293/5 166/294/5 167/295/5 +f 168/296/6 166/297/6 165/298/6 +f 169/299/2 170/300/2 171/301/2 +f 170/300/3 172/302/3 168/303/3 +f 161/288/3 173/304/3 174/305/3 +f 175/306/5 176/307/5 177/308/5 +f 178/309/1 179/310/1 180/311/1 +f 181/312/5 182/313/5 183/314/5 +f 67/315/1 182/316/1 181/317/1 +f 174/318/1 176/319/1 175/320/1 +f 180/321/3 184/322/3 185/323/3 +f 186/324/3 187/325/3 188/326/3 +f 189/327/3 190/328/3 191/329/3 +f 192/330/1 193/331/1 186/332/1 +f 191/333/4 194/334/4 195/335/4 +f 196/336/5 192/337/5 197/338/5 +f 198/339/6 199/340/6 189/341/6 +f 185/342/2 200/343/2 201/344/2 +f 194/345/5 198/346/5 195/347/5 +f 188/326/2 196/348/2 197/349/2 +f 200/350/5 178/351/5 201/352/5 +f 202/353/1 203/354/1 204/355/1 +f 205/356/3 171/357/3 206/358/3 +f 169/359/5 207/360/5 208/361/5 +f 160/362/5 203/363/5 204/364/5 +f 209/365/3 162/366/3 202/367/3 +f 162/368/1 210/369/1 160/370/1 +f 163/371/5 211/372/5 212/373/5 +f 213/374/3 164/375/3 214/376/3 +f 28/377/7 215/378/7 216/379/7 +f 31/380/8 40/381/8 39/382/8 +f 45/383/7 43/384/7 42/385/7 +f 73/386/9 217/387/9 53/388/9 +f 56/389/10 218/390/10 62/391/10 +f 71/392/9 219/393/9 58/394/9 +f 177/395/11 173/396/11 161/397/11 +f 183/398/11 66/399/11 65/400/11 +f 167/401/12 172/402/12 170/403/12 +f 220/404/13 184/405/13 179/310/13 +f 221/406/13 187/407/13 193/331/13 +f 222/408/14 190/409/14 199/340/14 +f 216/410/4 215/411/4 34/412/4 +f 223/413/6 26/414/6 224/415/6 +f 224/415/6 27/416/6 19/417/6 +f 19/417/6 23/418/6 17/419/6 +f 17/419/6 21/420/6 223/413/6 +f 225/421/6 226/422/6 227/423/6 +f 224/424/2 227/425/2 223/426/2 +f 223/427/3 226/428/3 17/429/3 +f 19/430/5 225/431/5 224/432/5 +f 228/433/1 229/434/1 230/435/1 +f 46/436/4 231/437/4 230/438/4 +f 232/439/1 233/440/1 234/441/1 +f 30/442/2 233/443/2 234/444/2 +f 29/445/4 235/446/4 236/447/4 +f 29/448/1 237/449/1 30/450/1 +f 238/451/5 239/452/5 240/453/5 +f 32/454/4 241/455/4 242/456/4 +f 243/457/4 244/458/4 245/459/4 +f 246/460/2 247/461/2 248/462/2 +f 244/458/1 249/463/1 246/460/1 +f 246/464/15 250/465/15 251/466/15 +f 252/467/16 253/468/16 254/469/16 +f 250/465/17 254/469/17 253/468/17 +f 252/467/18 251/466/18 255/470/18 +f 231/471/6 253/472/6 256/473/6 +f 256/474/5 230/475/5 257/476/5 +f 258/477/19 257/476/19 259/478/19 +f 258/479/2 250/480/2 253/481/2 +f 228/482/3 255/483/3 251/484/3 +f 260/485/19 228/482/19 261/486/19 +f 235/487/3 262/488/3 236/489/3 +f 263/490/3 237/491/3 264/492/3 +f 229/434/5 265/493/5 266/494/5 +f 267/495/6 265/496/6 260/497/6 +f 229/434/1 264/498/1 262/499/1 +f 238/500/20 266/501/20 265/502/20 +f 268/503/2 269/504/2 270/505/2 +f 269/506/6 271/507/6 272/508/6 +f 273/509/4 274/510/4 275/511/4 +f 271/512/15 276/513/15 272/514/15 +f 277/515/21 278/516/21 239/517/21 +f 279/518/16 239/517/16 278/516/16 +f 279/518/22 276/513/22 240/519/22 +f 241/520/5 280/521/5 242/522/5 +f 281/523/3 239/524/3 238/525/3 +f 282/526/20 283/527/20 284/528/20 +f 240/529/4 282/526/4 284/528/4 +f 285/530/5 286/531/5 287/532/5 +f 288/533/5 289/534/5 290/535/5 +f 247/536/5 291/537/5 243/538/5 +f 270/539/5 273/540/5 275/541/5 +f 289/542/2 292/543/2 290/544/2 +f 288/545/4 293/546/4 294/547/4 +f 286/548/2 295/549/2 287/550/2 +f 285/551/4 296/552/4 297/553/4 +f 296/554/6 286/555/6 297/556/6 +f 293/557/6 289/558/6 294/559/6 +f 298/560/6 299/561/6 300/562/6 +f 57/563/4 301/564/4 302/565/4 +f 303/566/2 63/567/2 304/568/2 +f 64/569/4 299/570/4 300/571/4 +f 305/572/2 54/573/2 298/574/2 +f 61/575/4 306/576/4 307/577/4 +f 308/578/2 60/579/2 309/580/2 +f 54/581/6 310/582/6 64/583/6 +f 311/584/5 299/585/5 301/586/5 +f 306/587/3 312/588/3 305/589/3 +f 301/590/1 313/591/1 306/592/1 +f 311/593/1 314/594/1 315/595/1 +f 313/596/3 316/597/3 317/598/3 +f 318/599/23 319/600/23 320/601/23 +f 321/602/24 322/603/24 319/600/24 +f 323/604/25 322/603/25 296/605/25 +f 318/599/26 324/606/26 323/604/26 +f 325/607/21 326/608/21 327/609/21 +f 328/610/23 329/611/23 330/612/23 +f 331/613/24 326/614/24 329/611/24 +f 325/607/27 330/615/27 328/616/27 +f 316/617/28 332/618/28 317/619/28 +f 314/620/29 333/621/29 334/622/29 +f 319/623/5 332/624/5 320/625/5 +f 334/626/3 327/627/3 326/628/3 +f 335/629/3 336/630/3 308/631/3 +f 337/632/29 335/633/29 338/634/29 +f 329/635/2 338/634/2 330/636/2 +f 339/637/5 340/638/5 303/639/5 +f 341/640/19 339/637/19 342/641/19 +f 342/642/4 322/643/4 324/644/4 +f 333/645/1 330/646/1 308/647/1 +f 339/648/6 303/649/6 320/650/6 +f 314/594/6 61/651/6 336/652/6 +f 341/653/1 322/654/1 319/655/1 +f 343/656/6 344/657/6 345/658/6 +f 344/659/3 346/660/3 347/661/3 +f 343/662/5 348/663/5 349/664/5 +f 350/665/5 351/666/5 352/667/5 +f 353/668/3 354/669/3 355/670/3 +f 355/670/6 350/671/6 352/672/6 +f 211/673/2 356/674/2 209/675/2 +f 357/676/4 203/677/4 207/678/4 +f 207/679/6 358/680/6 211/681/6 +f 357/682/6 359/683/6 360/684/6 +f 358/685/2 361/686/2 362/687/2 +f 363/688/4 364/689/4 205/690/4 +f 365/691/2 366/692/2 213/693/2 +f 367/694/28 368/695/28 363/696/28 +f 369/697/29 370/698/29 365/699/29 +f 371/700/3 372/701/3 367/702/3 +f 373/703/3 374/704/3 369/705/3 +f 361/706/19 375/707/19 362/708/19 +f 376/709/29 359/710/29 358/711/29 +f 377/712/2 378/713/2 376/709/2 +f 379/714/2 380/715/2 375/716/2 +f 381/717/30 371/718/30 382/719/30 +f 382/720/31 383/721/31 371/722/31 +f 384/723/32 355/724/32 352/725/32 +f 384/723/33 381/726/33 380/727/33 +f 385/728/31 386/729/31 377/730/31 +f 377/730/34 387/731/34 385/728/34 +f 387/732/35 388/733/35 373/734/35 +f 343/735/36 386/736/36 388/733/36 +f 376/737/6 373/738/6 213/739/6 +f 375/740/1 380/741/1 205/742/1 +f 359/683/1 163/743/1 366/744/1 +f 361/745/6 169/746/6 364/747/6 +f 389/748/2 390/749/2 391/750/2 +f 392/751/2 393/752/2 394/753/2 +f 393/754/3 395/755/3 394/756/3 +f 392/757/5 396/758/5 397/759/5 +f 398/760/3 399/761/3 390/762/3 +f 391/763/5 400/764/5 389/765/5 +f 399/766/1 391/767/1 390/768/1 +f 395/769/1 392/770/1 394/771/1 +f 401/772/37 402/773/37 403/774/37 +f 401/772/38 404/775/38 405/776/38 +f 406/777/39 399/778/39 407/779/39 +f 406/777/35 403/774/35 402/773/35 +f 408/780/33 409/781/33 410/782/33 +f 410/782/40 411/783/40 408/780/40 +f 412/784/31 411/783/31 413/785/31 +f 414/786/41 412/784/41 409/781/41 +f 409/787/2 415/788/2 410/789/2 +f 404/790/4 416/791/4 405/792/4 +f 417/793/3 406/794/3 402/795/3 +f 418/796/3 412/797/3 413/798/3 +f 419/799/28 420/800/28 418/801/28 +f 421/802/29 422/803/29 417/804/29 +f 423/805/19 424/806/19 415/807/19 +f 425/808/20 426/809/20 416/791/20 +f 427/810/5 197/349/5 428/811/5 +f 429/812/3 188/326/3 430/813/3 +f 431/814/3 185/342/3 432/815/3 +f 433/816/3 191/817/3 434/818/3 +f 433/819/2 435/820/2 421/802/2 +f 431/821/4 436/822/4 419/799/4 +f 437/823/5 195/824/5 438/825/5 +f 439/826/5 201/344/5 440/827/5 +f 437/823/4 441/828/4 427/829/4 +f 430/813/4 439/830/4 429/812/4 +f 424/831/1 437/832/1 426/833/1 +f 442/834/2 426/835/2 424/836/2 +f 439/837/6 443/838/6 431/839/6 +f 437/832/1 444/840/1 433/841/1 +f 425/842/6 404/843/6 434/844/6 +f 423/845/1 409/846/1 432/847/1 +f 427/848/6 445/849/6 429/850/6 +f 441/851/1 188/852/1 197/853/1 +f 442/854/1 446/855/1 430/856/1 +f 344/659/2 348/857/2 345/858/2 +f 354/859/2 447/860/2 350/861/2 +f 276/862/5 277/863/5 281/864/5 +f 264/498/6 32/865/6 242/866/6 +f 47/867/2 267/868/2 448/869/2 +f 33/870/2 263/871/2 449/872/2 +f 263/871/6 450/873/6 241/874/6 +f 451/875/1 452/876/1 453/877/1 +f 24/878/5 453/879/5 22/880/5 +f 453/879/4 20/881/4 22/880/4 +f 20/882/3 454/883/3 25/884/3 +f 25/884/2 451/885/2 24/886/2 +f 13/887/1 4/888/1 6/889/1 +f 1/1/1 8/890/1 2/2/1 +f 4/4/2 16/33/2 5/5/2 +f 1/7/3 9/891/3 7/8/3 +f 3/10/2 11/892/2 9/11/2 +f 8/13/4 7/893/4 10/14/4 +f 2/16/5 10/894/5 11/17/5 +f 12/19/6 9/25/6 11/20/6 +f 13/21/6 11/20/6 10/22/6 +f 4/24/6 7/26/6 9/25/6 +f 6/23/6 10/22/6 7/26/6 +f 5/27/6 16/895/6 14/28/6 +f 6/6/3 5/5/3 15/30/3 +f 12/32/5 14/896/5 16/33/5 +f 13/34/4 15/897/4 14/35/4 +f 17/37/4 226/898/4 18/38/4 +f 20/40/4 26/899/4 21/41/4 +f 22/43/5 21/900/5 23/44/5 +f 25/46/3 27/901/3 26/47/3 +f 24/49/2 23/902/2 27/50/2 +f 28/52/5 216/410/5 29/53/5 +f 31/55/3 39/63/3 32/56/3 +f 34/58/1 215/378/1 35/59/1 +f 31/55/2 33/57/2 37/61/2 +f 33/57/2 449/903/2 37/61/2 +f 41/65/4 450/904/4 32/56/4 +f 32/56/4 39/63/4 41/65/4 +f 44/68/4 455/905/4 46/906/4 +f 46/906/4 42/66/4 44/68/4 +f 45/69/5 42/907/5 46/70/5 +f 48/72/6 217/908/6 49/73/6 +f 44/75/1 43/384/1 51/76/1 +f 217/909/2 48/79/2 53/78/2 +f 48/79/2 298/910/2 54/80/2 +f 57/83/4 302/911/4 55/81/4 +f 55/81/4 69/912/4 56/82/4 +f 219/913/2 59/85/2 58/84/2 +f 59/85/2 309/914/2 60/86/2 +f 61/87/5 71/106/5 58/88/5 +f 57/90/3 56/915/3 62/91/3 +f 64/93/5 73/916/5 53/94/5 +f 67/98/3 214/917/3 164/918/3 +f 164/918/3 65/96/3 67/98/3 +f 218/919/2 68/100/2 62/99/2 +f 68/100/2 304/920/2 63/101/2 +f 68/102/1 218/390/1 69/103/1 +f 61/87/4 307/921/4 70/105/4 +f 70/105/4 72/922/4 71/106/4 +f 59/107/6 219/923/6 72/108/6 +f 64/93/4 300/924/4 50/110/4 +f 50/110/4 49/925/4 73/111/4 +f 45/114/2 47/926/2 52/112/2 +f 47/926/2 448/927/2 52/112/2 +f 28/52/2 30/54/2 36/115/2 +f 30/54/2 234/928/2 36/115/2 +f 41/117/6 40/929/6 38/118/6 +f 74/120/3 117/930/3 75/121/3 +f 77/123/5 80/931/5 78/124/5 +f 80/126/1 74/187/1 76/127/1 +f 81/129/5 87/932/5 82/130/5 +f 84/132/5 120/933/5 85/133/5 +f 85/135/6 120/194/6 87/136/6 +f 88/138/5 94/934/5 89/139/5 +f 91/141/5 130/935/5 92/142/5 +f 94/144/1 130/216/1 92/145/1 +f 95/147/5 101/936/5 96/148/5 +f 98/150/5 139/937/5 99/151/5 +f 101/153/1 139/240/1 99/154/1 +f 102/156/5 108/938/5 103/157/5 +f 105/159/5 148/939/5 106/160/5 +f 108/162/1 148/260/1 106/163/1 +f 109/165/3 115/940/3 110/166/3 +f 112/168/3 116/941/3 113/169/3 +f 83/171/4 82/942/4 115/172/4 +f 86/174/4 85/943/4 116/175/4 +f 82/137/6 115/944/6 116/177/6 +f 110/178/1 115/945/1 116/179/1 +f 110/181/4 80/946/4 77/182/4 +f 117/184/2 74/947/2 113/185/2 +f 80/126/1 110/178/1 113/180/1 +f 118/188/4 456/948/4 87/189/4 +f 119/191/4 121/949/4 120/192/4 +f 121/193/6 456/950/6 87/136/6 +f 78/195/4 125/951/4 122/196/4 +f 123/198/2 127/952/2 76/199/2 +f 124/201/3 122/953/3 125/202/3 +f 127/204/5 123/954/5 128/205/5 +f 127/207/1 125/955/1 78/128/1 +f 126/208/1 125/955/1 127/207/1 +f 126/210/4 94/956/4 88/211/4 +f 129/213/4 130/957/4 91/214/4 +f 126/208/1 129/209/1 130/216/1 +f 92/217/4 135/225/4 131/218/4 +f 89/220/4 133/958/4 132/221/4 +f 92/145/1 135/959/1 133/223/1 +f 134/224/3 131/960/3 135/225/3 +f 137/227/3 132/961/3 133/228/3 +f 135/230/6 133/962/6 138/231/6 +f 138/233/4 101/963/4 95/234/4 +f 136/236/4 139/964/4 98/237/4 +f 138/239/1 136/965/1 139/240/1 +f 140/241/3 143/966/3 141/242/3 +f 100/244/4 99/967/4 141/245/4 +f 96/247/4 145/968/4 144/248/4 +f 99/154/1 141/969/1 145/250/1 +f 146/251/3 144/970/3 145/252/3 +f 140/254/4 142/971/4 148/255/4 +f 147/257/4 108/972/4 102/156/4 +f 108/162/1 147/973/1 142/259/1 +f 141/261/6 145/974/6 147/262/6 +f 149/264/4 104/975/4 103/265/4 +f 106/163/1 155/286/1 150/267/1 +f 151/268/2 155/976/2 106/269/2 +f 152/271/3 149/977/3 150/272/3 +f 151/274/5 157/978/5 154/275/5 +f 156/277/2 154/979/2 157/278/2 +f 153/280/4 457/980/4 159/281/4 +f 156/283/1 457/981/1 153/284/1 +f 155/286/1 154/285/1 153/284/1 +f 160/287/4 177/308/4 161/288/4 +f 163/290/4 183/982/4 65/291/4 +f 167/295/5 169/299/5 165/293/5 +f 169/299/5 208/983/5 165/293/5 +f 168/296/6 172/402/6 166/297/6 +f 169/299/2 167/295/2 170/300/2 +f 168/303/3 206/984/3 171/301/3 +f 171/301/3 170/300/3 168/303/3 +f 174/305/3 202/985/3 162/289/3 +f 162/289/3 161/288/3 174/305/3 +f 177/308/5 160/287/5 175/306/5 +f 160/287/5 204/986/5 175/306/5 +f 178/309/1 220/404/1 179/310/1 +f 183/314/5 163/987/5 181/312/5 +f 163/987/5 212/988/5 181/312/5 +f 67/315/1 66/399/1 182/316/1 +f 174/318/1 173/396/1 176/319/1 +f 185/323/3 443/989/3 180/321/3 +f 180/321/3 179/990/3 184/322/3 +f 188/326/3 445/991/3 186/324/3 +f 186/324/3 193/992/3 187/325/3 +f 191/329/3 444/993/3 189/327/3 +f 189/327/3 199/994/3 190/328/3 +f 192/330/1 221/406/1 193/331/1 +f 191/333/4 190/995/4 194/334/4 +f 221/996/5 192/337/5 196/336/5 +f 192/337/5 428/997/5 197/338/5 +f 198/339/6 222/408/6 199/340/6 +f 185/342/2 184/998/2 200/343/2 +f 222/999/5 198/346/5 194/345/5 +f 198/346/5 438/1000/5 195/347/5 +f 188/326/2 187/325/2 196/348/2 +f 220/1001/5 178/351/5 200/350/5 +f 178/351/5 440/1002/5 201/352/5 +f 202/353/1 209/1003/1 203/354/1 +f 205/356/3 364/1004/3 171/357/3 +f 169/359/5 357/1005/5 207/360/5 +f 160/362/5 210/1006/5 203/363/5 +f 209/365/3 356/1007/3 162/366/3 +f 162/368/1 356/1008/1 210/369/1 +f 163/371/5 360/1009/5 211/372/5 +f 213/374/3 366/1010/3 164/375/3 +f 28/377/7 35/59/7 215/378/7 +f 31/380/8 38/1011/8 40/381/8 +f 45/383/7 51/76/7 43/384/7 +f 73/386/9 49/1012/9 217/387/9 +f 56/389/10 69/103/10 218/390/10 +f 71/392/9 72/1013/9 219/393/9 +f 177/395/11 176/319/11 173/396/11 +f 183/398/11 182/316/11 66/399/11 +f 167/401/12 166/297/12 172/402/12 +f 220/404/13 200/1014/13 184/405/13 +f 221/406/13 196/1015/13 187/407/13 +f 222/408/14 194/1016/14 190/409/14 +f 34/412/4 232/1017/4 29/53/4 +f 29/53/4 216/410/4 34/412/4 +f 223/413/6 21/420/6 26/414/6 +f 224/415/6 26/414/6 27/416/6 +f 19/417/6 27/416/6 23/418/6 +f 17/419/6 23/418/6 21/420/6 +f 225/421/6 18/1018/6 226/422/6 +f 224/424/2 225/431/2 227/425/2 +f 223/427/3 227/425/3 226/428/3 +f 19/430/5 18/1019/5 225/431/5 +f 229/434/1 47/1020/1 230/435/1 +f 47/1020/1 46/1021/1 230/435/1 +f 230/435/1 257/1022/1 250/1023/1 +f 257/1022/1 259/1024/1 250/1023/1 +f 250/1023/1 228/433/1 230/435/1 +f 46/436/4 455/1025/4 231/437/4 +f 232/439/1 235/1026/1 233/440/1 +f 30/442/2 237/1027/2 233/443/2 +f 29/445/4 232/1028/4 235/446/4 +f 29/448/1 236/1029/1 237/449/1 +f 32/454/4 450/1030/4 241/455/4 +f 243/457/4 291/1031/4 244/458/4 +f 246/460/2 249/1032/2 247/461/2 +f 244/458/1 291/1033/1 249/463/1 +f 246/464/15 244/1034/15 250/465/15 +f 252/467/16 255/470/16 253/468/16 +f 250/465/17 244/1034/17 254/469/17 +f 252/467/18 246/464/18 251/466/18 +f 231/471/6 455/1035/6 448/1036/6 +f 448/1036/6 260/1037/6 231/471/6 +f 260/1037/6 261/1038/6 231/471/6 +f 261/1038/6 253/472/6 231/471/6 +f 253/472/6 258/1039/6 256/473/6 +f 256/474/5 231/1040/5 230/475/5 +f 258/477/19 256/474/19 257/476/19 +f 258/479/2 259/1041/2 250/480/2 +f 228/482/3 261/486/3 255/483/3 +f 260/485/19 229/1042/19 228/482/19 +f 235/487/3 267/495/3 262/488/3 +f 263/490/3 233/1043/3 237/491/3 +f 229/434/5 260/1044/5 265/493/5 +f 267/495/6 263/1045/6 265/496/6 +f 229/434/1 266/494/1 264/498/1 +f 238/500/20 281/1046/20 266/501/20 +f 268/503/2 272/508/2 269/504/2 +f 269/506/6 273/1047/6 271/507/6 +f 273/509/4 271/1048/4 274/510/4 +f 271/512/15 277/515/15 276/513/15 +f 277/515/21 271/512/21 278/516/21 +f 279/518/16 240/519/16 239/517/16 +f 279/518/22 272/514/22 276/513/22 +f 241/520/5 283/1049/5 280/521/5 +f 281/523/3 277/1050/3 239/524/3 +f 282/526/20 280/1051/20 283/527/20 +f 240/529/4 276/1052/4 282/526/4 +f 285/530/5 297/1053/5 286/531/5 +f 288/533/5 294/1054/5 289/534/5 +f 247/536/5 249/1055/5 291/537/5 +f 270/539/5 269/1056/5 273/540/5 +f 289/542/2 331/1057/2 292/543/2 +f 288/545/4 458/1058/4 293/546/4 +f 286/548/2 321/1059/2 295/549/2 +f 285/551/4 459/1060/4 296/552/4 +f 296/554/6 321/602/6 286/555/6 +f 293/557/6 331/1061/6 289/558/6 +f 298/560/6 305/1062/6 299/561/6 +f 57/563/4 311/1063/4 301/564/4 +f 303/566/2 340/1064/2 63/567/2 +f 64/569/4 310/1065/4 299/570/4 +f 305/572/2 312/1066/2 54/573/2 +f 61/575/4 315/1067/4 306/576/4 +f 308/578/2 336/1068/2 60/579/2 +f 54/581/6 312/1069/6 310/582/6 +f 311/584/5 310/1070/5 299/585/5 +f 306/587/3 315/1071/3 312/588/3 +f 301/590/1 317/1072/1 313/591/1 +f 311/593/1 316/1073/1 314/594/1 +f 313/596/3 314/1074/3 316/597/3 +f 318/599/23 321/602/23 319/600/23 +f 321/602/24 296/605/24 322/603/24 +f 323/604/25 324/606/25 322/603/25 +f 318/599/26 320/601/26 324/606/26 +f 325/607/21 293/1075/21 326/608/21 +f 328/610/23 331/613/23 329/611/23 +f 331/613/24 293/1076/24 326/614/24 +f 325/607/27 327/609/27 330/615/27 +f 316/617/28 460/1077/28 332/618/28 +f 314/620/29 313/1078/29 333/621/29 +f 319/623/5 460/1079/5 332/624/5 +f 334/626/3 333/1080/3 327/627/3 +f 335/629/3 461/1081/3 336/630/3 +f 337/632/29 461/1082/29 335/633/29 +f 329/635/2 337/632/2 338/634/2 +f 339/637/5 462/1083/5 340/638/5 +f 341/640/19 462/1083/19 339/637/19 +f 342/642/4 341/1084/4 322/643/4 +f 308/647/1 309/1085/1 306/1086/1 +f 309/1085/1 307/1087/1 306/1086/1 +f 306/1086/1 313/1088/1 308/647/1 +f 313/1088/1 333/645/1 308/647/1 +f 338/1089/1 335/1090/1 330/646/1 +f 335/1090/1 308/647/1 330/646/1 +f 304/1091/6 302/1092/6 301/1093/6 +f 301/1093/6 317/1094/6 303/649/6 +f 317/1094/6 332/1095/6 303/649/6 +f 320/650/6 324/1096/6 342/1097/6 +f 332/1095/6 320/650/6 303/649/6 +f 303/649/6 304/1091/6 301/1093/6 +f 342/1097/6 339/648/6 320/650/6 +f 61/651/6 60/1098/6 336/652/6 +f 336/652/6 461/1099/6 329/1100/6 +f 461/1099/6 337/1101/6 329/1100/6 +f 329/1100/6 334/1102/6 336/652/6 +f 334/1102/6 314/594/6 336/652/6 +f 316/1073/1 57/1103/1 340/1104/1 +f 57/1103/1 63/1105/1 340/1104/1 +f 340/1104/1 462/1106/1 319/655/1 +f 462/1106/1 341/653/1 319/655/1 +f 319/655/1 460/1107/1 340/1104/1 +f 460/1107/1 316/1073/1 340/1104/1 +f 343/656/6 463/1108/6 344/657/6 +f 344/659/3 463/1109/3 346/660/3 +f 343/662/5 345/1110/5 348/663/5 +f 350/665/5 447/1111/5 351/666/5 +f 353/668/3 464/1112/3 354/669/3 +f 355/670/6 354/669/6 350/671/6 +f 211/673/2 360/1113/2 356/674/2 +f 357/676/4 210/1114/4 203/677/4 +f 207/679/6 362/1115/6 358/680/6 +f 357/682/6 361/745/6 359/683/6 +f 358/685/2 359/1116/2 361/686/2 +f 363/688/4 368/1117/4 364/689/4 +f 365/691/2 370/1118/2 366/692/2 +f 367/694/28 372/1119/28 368/695/28 +f 369/697/29 374/1120/29 370/698/29 +f 371/700/3 383/1121/3 372/701/3 +f 373/703/3 388/1122/3 374/704/3 +f 361/706/19 379/1123/19 375/707/19 +f 376/709/29 378/713/29 359/710/29 +f 377/712/2 386/1124/2 378/713/2 +f 379/714/2 384/1125/2 380/715/2 +f 381/717/30 380/1126/30 371/718/30 +f 382/720/31 355/724/31 383/721/31 +f 384/723/32 383/721/32 355/724/32 +f 384/723/33 352/725/33 381/726/33 +f 385/728/31 463/1127/31 386/729/31 +f 377/730/34 373/1128/34 387/731/34 +f 387/732/35 343/735/35 388/733/35 +f 343/735/36 463/1129/36 386/736/36 +f 213/739/6 214/1130/6 211/1131/6 +f 214/1130/6 212/1132/6 211/1131/6 +f 211/1131/6 358/1133/6 213/739/6 +f 358/1133/6 376/737/6 213/739/6 +f 369/1134/6 365/1135/6 373/738/6 +f 365/1135/6 213/739/6 373/738/6 +f 205/742/1 206/1136/1 208/1137/1 +f 208/1137/1 362/1138/1 205/742/1 +f 362/1138/1 375/740/1 205/742/1 +f 380/741/1 371/1139/1 367/1140/1 +f 367/1140/1 363/1141/1 380/741/1 +f 363/1141/1 205/742/1 380/741/1 +f 163/743/1 164/1142/1 366/744/1 +f 366/744/1 370/1143/1 386/1144/1 +f 370/1143/1 374/1145/1 386/1144/1 +f 374/1145/1 388/1146/1 386/1144/1 +f 386/1144/1 378/1147/1 366/744/1 +f 378/1147/1 359/683/1 366/744/1 +f 169/746/6 171/1148/6 364/747/6 +f 364/747/6 368/1149/6 384/1150/6 +f 368/1149/6 372/1151/6 384/1150/6 +f 372/1151/6 383/1152/6 384/1150/6 +f 384/1150/6 379/1153/6 364/747/6 +f 379/1153/6 361/745/6 364/747/6 +f 389/748/2 398/1154/2 390/749/2 +f 392/751/2 397/1155/2 393/752/2 +f 393/754/3 465/1156/3 395/755/3 +f 392/757/5 414/1157/5 396/758/5 +f 398/760/3 466/1158/3 399/761/3 +f 391/763/5 407/1159/5 400/764/5 +f 399/766/1 407/1160/1 391/767/1 +f 395/769/1 414/1161/1 392/770/1 +f 401/772/37 405/776/37 402/773/37 +f 401/772/38 399/778/38 404/775/38 +f 406/777/39 404/775/39 399/778/39 +f 406/777/35 407/779/35 403/774/35 +f 408/780/33 414/786/33 409/781/33 +f 410/782/40 413/785/40 411/783/40 +f 412/784/31 395/1162/31 411/783/31 +f 414/786/41 395/1162/41 412/784/41 +f 409/787/2 423/1163/2 415/788/2 +f 404/790/4 425/808/4 416/791/4 +f 417/793/3 422/1164/3 406/794/3 +f 418/796/3 420/1165/3 412/797/3 +f 419/799/28 436/822/28 420/800/28 +f 421/802/29 435/820/29 422/803/29 +f 423/805/19 442/1166/19 424/806/19 +f 425/808/20 467/1167/20 426/809/20 +f 427/810/5 441/1168/5 197/349/5 +f 429/812/3 445/991/3 188/326/3 +f 431/814/3 443/1169/3 185/342/3 +f 433/816/3 444/1170/3 191/817/3 +f 433/819/2 434/1171/2 435/820/2 +f 431/821/4 432/1172/4 436/822/4 +f 437/823/5 468/1173/5 195/824/5 +f 439/826/5 446/1174/5 201/344/5 +f 437/823/4 468/1173/4 441/828/4 +f 430/813/4 446/1175/4 439/830/4 +f 424/831/1 439/837/1 437/832/1 +f 442/834/2 467/1176/2 426/835/2 +f 413/1177/6 410/1178/6 418/1179/6 +f 410/1178/6 415/1180/6 431/839/6 +f 431/839/6 415/1180/6 424/831/6 +f 424/831/6 439/837/6 431/839/6 +f 439/837/6 440/1181/6 443/838/6 +f 431/839/6 419/1182/6 410/1178/6 +f 419/1182/6 418/1179/6 410/1178/6 +f 402/1183/1 405/1184/1 417/1185/1 +f 405/1184/1 416/1186/1 433/841/1 +f 433/841/1 416/1186/1 426/833/1 +f 426/833/1 437/832/1 433/841/1 +f 437/832/1 438/1187/1 444/840/1 +f 433/841/1 421/1188/1 405/1184/1 +f 421/1188/1 417/1185/1 405/1184/1 +f 434/844/6 191/1189/6 468/1190/6 +f 191/1189/6 195/1191/6 468/1190/6 +f 468/1190/6 467/1192/6 434/844/6 +f 467/1192/6 425/842/6 434/844/6 +f 422/1193/6 435/1194/6 404/843/6 +f 435/1194/6 434/844/6 404/843/6 +f 404/843/6 406/1195/6 422/1193/6 +f 432/847/1 185/1196/1 446/855/1 +f 185/1196/1 201/1197/1 446/855/1 +f 446/855/1 442/854/1 432/847/1 +f 442/854/1 423/845/1 432/847/1 +f 420/1198/1 436/1199/1 409/846/1 +f 436/1199/1 432/847/1 409/846/1 +f 409/846/1 412/1200/1 420/1198/1 +f 427/848/6 428/1201/6 445/849/6 +f 441/851/1 430/856/1 188/852/1 +f 430/856/1 441/851/1 442/854/1 +f 441/851/1 468/1190/1 467/1192/1 +f 442/854/1 441/851/1 467/1192/1 +f 344/659/2 347/661/2 348/857/2 +f 354/859/2 464/1202/2 447/860/2 +f 282/1203/6 276/1204/6 280/1205/6 +f 276/1204/6 281/1206/6 242/866/6 +f 281/1206/6 266/494/6 242/866/6 +f 266/494/6 264/498/6 242/866/6 +f 264/498/6 33/1207/6 32/865/6 +f 242/866/6 280/1205/6 276/1204/6 +f 47/867/2 262/1208/2 267/868/2 +f 33/870/2 264/1209/2 263/871/2 +f 284/1210/6 240/453/6 283/1211/6 +f 240/453/6 238/451/6 241/874/6 +f 238/451/6 265/1212/6 241/874/6 +f 265/1212/6 263/871/6 241/874/6 +f 263/871/6 449/1213/6 450/873/6 +f 241/874/6 283/1211/6 240/453/6 +f 451/875/1 454/1214/1 452/876/1 +f 24/878/5 451/1215/5 453/879/5 +f 453/879/4 452/1216/4 20/881/4 +f 20/882/3 452/1217/3 454/883/3 +f 25/884/2 454/883/2 451/885/2 +f 13/887/1 12/1218/1 4/888/1 diff --git a/src/main/java/assets/hbm/sounds.json b/src/main/java/assets/hbm/sounds.json index ecc4c12f4..d967e96d5 100644 --- a/src/main/java/assets/hbm/sounds.json +++ b/src/main/java/assets/hbm/sounds.json @@ -132,6 +132,8 @@ "weapon.glauncher": {"category": "player", "sounds": ["weapon/glauncher1", "weapon/glauncher2"]}, "weapon.bodysplat": {"category": "player", "sounds": [{"name": "weapon/bodysplat", "stream": false}]}, "weapon.quadroReload": {"category": "player", "sounds": [{"name": "weapon/quadroReload", "stream": false}]}, + "weapon.fstbmbStart": {"category": "player", "sounds": [{"name": "weapon/fstbmbStart", "stream": false}]}, + "weapon.fstbmbPing": {"category": "player", "sounds": [{"name": "weapon/fstbmbPing", "stream": false}]}, "weapon.reloadTurret": {"category": "player", "sounds": [{"name": "weapon/reloadTurret", "stream": false}]}, "weapon.switchmode1": {"category": "player", "sounds": [{"name": "weapon/switchmode1", "stream": false}]}, diff --git a/src/main/java/assets/hbm/textures/gui/weapon/fstbmbSchematic.png b/src/main/java/assets/hbm/textures/gui/weapon/fstbmbSchematic.png index 83d55db3e..e3819577a 100644 Binary files a/src/main/java/assets/hbm/textures/gui/weapon/fstbmbSchematic.png and b/src/main/java/assets/hbm/textures/gui/weapon/fstbmbSchematic.png differ diff --git a/src/main/java/assets/hbm/textures/gui/weapon/gui_launch_table.png b/src/main/java/assets/hbm/textures/gui/weapon/gui_launch_table.png index 905ef3152..7ad42bed7 100644 Binary files a/src/main/java/assets/hbm/textures/gui/weapon/gui_launch_table.png and b/src/main/java/assets/hbm/textures/gui/weapon/gui_launch_table.png differ diff --git a/src/main/java/assets/hbm/textures/gui/weapon/gui_launch_table_small.png b/src/main/java/assets/hbm/textures/gui/weapon/gui_launch_table_small.png index 2a9736baf..ff3fefb0e 100644 Binary files a/src/main/java/assets/hbm/textures/gui/weapon/gui_launch_table_small.png and b/src/main/java/assets/hbm/textures/gui/weapon/gui_launch_table_small.png differ diff --git a/src/main/java/assets/hbm/textures/items/balefire_and_ham.png b/src/main/java/assets/hbm/textures/items/balefire_and_ham.png new file mode 100644 index 000000000..26f924a8e Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/balefire_and_ham.png differ diff --git a/src/main/java/assets/hbm/textures/items/balefire_scrambled.png b/src/main/java/assets/hbm/textures/items/balefire_scrambled.png new file mode 100644 index 000000000..67835ec84 Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/balefire_scrambled.png differ diff --git a/src/main/java/assets/hbm/textures/items/egg_balefire_shard.png b/src/main/java/assets/hbm/textures/items/egg_balefire_shard.png new file mode 100644 index 000000000..394d8a8ba Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/egg_balefire_shard.png differ diff --git a/src/main/java/assets/hbm/textures/items/gun_quadro.png b/src/main/java/assets/hbm/textures/items/gun_quadro.png new file mode 100644 index 000000000..1e7f41b68 Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/gun_quadro.png differ diff --git a/src/main/java/assets/hbm/textures/items/plate_titanium.png b/src/main/java/assets/hbm/textures/items/plate_titanium.png index 763f0ea4f..7bb75e92e 100644 Binary files a/src/main/java/assets/hbm/textures/items/plate_titanium.png and b/src/main/java/assets/hbm/textures/items/plate_titanium.png differ diff --git a/src/main/java/assets/hbm/textures/models/machines/crystallizer.png b/src/main/java/assets/hbm/textures/models/machines/crystallizer.png new file mode 100644 index 000000000..3260dcab3 Binary files /dev/null and b/src/main/java/assets/hbm/textures/models/machines/crystallizer.png differ diff --git a/src/main/java/assets/hbm/textures/models/machines/crystallizer_spinner.png b/src/main/java/assets/hbm/textures/models/machines/crystallizer_spinner.png new file mode 100644 index 000000000..b782659a6 Binary files /dev/null and b/src/main/java/assets/hbm/textures/models/machines/crystallizer_spinner.png differ diff --git a/src/main/java/assets/hbm/textures/models/machines/crystallizer_window.png b/src/main/java/assets/hbm/textures/models/machines/crystallizer_window.png new file mode 100644 index 000000000..287c0670d Binary files /dev/null and b/src/main/java/assets/hbm/textures/models/machines/crystallizer_window.png differ diff --git a/src/main/java/assets/hbm/textures/models/machines/hatch.png b/src/main/java/assets/hbm/textures/models/machines/hatch.png new file mode 100644 index 000000000..f077b5ead Binary files /dev/null and b/src/main/java/assets/hbm/textures/models/machines/hatch.png differ diff --git a/src/main/java/assets/hbm/textures/models/machines/refinery_small.png b/src/main/java/assets/hbm/textures/models/machines/refinery_small.png new file mode 100644 index 000000000..05adea0e4 Binary files /dev/null and b/src/main/java/assets/hbm/textures/models/machines/refinery_small.png differ diff --git a/src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java b/src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java index b7797bd67..da1be6bb0 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java @@ -6,12 +6,15 @@ import com.hbm.blocks.ModBlocks; import com.hbm.entity.logic.EntityBalefire; import com.hbm.explosion.ExplosionParticleB; import com.hbm.interfaces.IBomb; +import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.tileentity.bomb.TileEntityCrashedBomb; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -71,6 +74,25 @@ public class BlockCrashedBomb extends BlockContainer implements IBomb { world.setBlockMetadataWithNotify(x, y, z, 2, 2); } } + + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int i, float fx, float fy, float fz) { + + if(world.isRemote) + return true; + + if (player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.defuser) { + + world.func_147480_a(x, y, z, false); + + world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.egg_balefire_shard))); + world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.plate_steel, 10 + world.rand.nextInt(15)))); + world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.plate_titanium, 2 + world.rand.nextInt(7)))); + + return true; + } + + return false; + } @Override public void explode(World world, int x, int y, int z) { diff --git a/src/main/java/com/hbm/blocks/bomb/NukeBalefire.java b/src/main/java/com/hbm/blocks/bomb/NukeBalefire.java index ad4b64f69..ddff048a0 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeBalefire.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeBalefire.java @@ -1,13 +1,15 @@ package com.hbm.blocks.bomb; import com.hbm.blocks.machine.BlockMachineBase; +import com.hbm.interfaces.IBomb; import com.hbm.tileentity.bomb.TileEntityNukeBalefire; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class NukeBalefire extends BlockMachineBase { +public class NukeBalefire extends BlockMachineBase implements IBomb { public NukeBalefire(Material mat, int guiID) { super(mat, guiID); @@ -34,4 +36,23 @@ public class NukeBalefire extends BlockMachineBase { return false; } + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block b) { + + if (world.isBlockIndirectlyGettingPowered(x, y, z)) { + explode(world, x, y, z); + } + } + + @Override + public void explode(World world, int x, int y, int z) { + + if(!world.isRemote) { + TileEntityNukeBalefire bomb = (TileEntityNukeBalefire) world.getTileEntity(x, y, z); + + if(bomb.isLoaded()) + bomb.explode(); + } + } + } diff --git a/src/main/java/com/hbm/explosion/ExplosionBalefire.java b/src/main/java/com/hbm/explosion/ExplosionBalefire.java index 804e2e4da..73acb4de8 100644 --- a/src/main/java/com/hbm/explosion/ExplosionBalefire.java +++ b/src/main/java/com/hbm/explosion/ExplosionBalefire.java @@ -80,6 +80,50 @@ public class ExplosionBalefire } private void breakColumn(int x, int z) + { + int dist = (int) (radius - Math.sqrt(x * x + z * z)); + + if (dist > 0) { + int pX = posX + x; + int pZ = posZ + z; + + int y = worldObj.getHeightValue(pX, pZ); + int maxdepth = (int) (10 + radius * 0.25); + int depth = (int) ((maxdepth * dist / radius) + (Math.sin(dist * 0.15 + 2) * 2));// + + depth = Math.max(y - depth, 0); + + while(y > depth) { + + if(worldObj.getBlock(pX, y, pZ) == ModBlocks.block_schrabidium_cluster) { + + if(worldObj.rand.nextInt(10) == 0) { + worldObj.setBlock(pX, y + 1, pZ, ModBlocks.balefire); + worldObj.setBlock(pX, y, pZ, ModBlocks.block_euphemium_cluster, worldObj.getBlockMetadata(pX, y, pZ), 3); + } + return; + } + + worldObj.setBlockToAir(pX, y, pZ); + + y--; + } + + if(worldObj.rand.nextInt(10) == 0) { + worldObj.setBlock(pX, depth + 1, pZ, ModBlocks.balefire); + + if(worldObj.getBlock(pX, y, pZ) == ModBlocks.block_schrabidium_cluster) + worldObj.setBlock(pX, y, pZ, ModBlocks.block_euphemium_cluster, worldObj.getBlockMetadata(pX, y, pZ), 3); + } + + for(int i = depth; i > depth - 5; i--) { + if(worldObj.getBlock(pX, i, pZ) == Blocks.stone) + worldObj.setBlock(pX, i, pZ, ModBlocks.sellafield_slaked); + } + } + } + + /*private void breakColumn(int x, int z) { int dist = this.radius2 - (x * x + z * z); if (dist > 0) @@ -87,7 +131,7 @@ public class ExplosionBalefire int pX = posX + x; int pZ = posZ + z; - int y = worldObj.getHeightValue(pX, pZ); + int y = worldObj.getHeightValue(pX, pZ); float strength = (float)dist / (float) this.radius; while(y > 0) { @@ -126,5 +170,5 @@ public class ExplosionBalefire y--; } } - } + }*/ } diff --git a/src/main/java/com/hbm/handler/guncfg/BulletConfigFactory.java b/src/main/java/com/hbm/handler/guncfg/BulletConfigFactory.java index f5b625ba2..0822ffcb0 100644 --- a/src/main/java/com/hbm/handler/guncfg/BulletConfigFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/BulletConfigFactory.java @@ -277,6 +277,9 @@ public class BulletConfigFactory { if(bullet.shooter == null || !(bullet.shooter instanceof EntityPlayer)) return; + if(Vec3.createVectorHelper(bullet.posX - bullet.shooter.posX, bullet.posY - bullet.shooter.posY, bullet.posZ - bullet.shooter.posZ).lengthVector() > 100) + return; + MovingObjectPosition mop = Library.rayTrace((EntityPlayer)bullet.shooter, 200, 1); if(mop == null || mop.hitVec == null) diff --git a/src/main/java/com/hbm/inventory/container/ContainerCompactLauncher.java b/src/main/java/com/hbm/inventory/container/ContainerCompactLauncher.java index a48c477ab..acb823339 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCompactLauncher.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCompactLauncher.java @@ -18,10 +18,12 @@ public class ContainerCompactLauncher extends Container { this.addSlotToContainer(new Slot(tedf, 0, 26, 36)); this.addSlotToContainer(new Slot(tedf, 1, 26, 72)); - this.addSlotToContainer(new Slot(tedf, 2, 116, 90)); - this.addSlotToContainer(new Slot(tedf, 3, 134, 90)); + this.addSlotToContainer(new Slot(tedf, 2, 116, 90 - 18)); + this.addSlotToContainer(new Slot(tedf, 3, 134, 90 - 18)); this.addSlotToContainer(new Slot(tedf, 4, 152, 90)); this.addSlotToContainer(new Slot(tedf, 5, 116, 108)); + this.addSlotToContainer(new Slot(tedf, 6, 116, 90)); + this.addSlotToContainer(new Slot(tedf, 7, 134, 90)); for(int i = 0; i < 3; i++) { @@ -48,13 +50,13 @@ public class ContainerCompactLauncher extends Container { ItemStack var5 = var4.getStack(); var3 = var5.copy(); - if (par2 <= 1) { - if (!this.mergeItemStack(var5, 2, this.inventorySlots.size(), true)) + if (par2 <= 7) { + if (!this.mergeItemStack(var5, 8, this.inventorySlots.size(), true)) { return null; } } - else if (!this.mergeItemStack(var5, 0, 1, false)) + else if (!this.mergeItemStack(var5, 0, 8, false)) return null; if (var5.stackSize == 0) diff --git a/src/main/java/com/hbm/inventory/container/ContainerLaunchTable.java b/src/main/java/com/hbm/inventory/container/ContainerLaunchTable.java index ca7e95fe9..7a6855cff 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerLaunchTable.java +++ b/src/main/java/com/hbm/inventory/container/ContainerLaunchTable.java @@ -18,10 +18,12 @@ public class ContainerLaunchTable extends Container { this.addSlotToContainer(new Slot(tedf, 0, 26, 36)); this.addSlotToContainer(new Slot(tedf, 1, 26, 72)); - this.addSlotToContainer(new Slot(tedf, 2, 116, 90)); - this.addSlotToContainer(new Slot(tedf, 3, 134, 90)); + this.addSlotToContainer(new Slot(tedf, 2, 116, 90 - 18)); + this.addSlotToContainer(new Slot(tedf, 3, 134, 90 - 18)); this.addSlotToContainer(new Slot(tedf, 4, 152, 90)); this.addSlotToContainer(new Slot(tedf, 5, 116, 108)); + this.addSlotToContainer(new Slot(tedf, 6, 116, 90)); + this.addSlotToContainer(new Slot(tedf, 7, 134, 90)); for(int i = 0; i < 3; i++) { @@ -48,13 +50,13 @@ public class ContainerLaunchTable extends Container { ItemStack var5 = var4.getStack(); var3 = var5.copy(); - if (par2 <= 1) { - if (!this.mergeItemStack(var5, 2, this.inventorySlots.size(), true)) + if (par2 <= 7) { + if (!this.mergeItemStack(var5, 8, this.inventorySlots.size(), true)) { return null; } } - else if (!this.mergeItemStack(var5, 0, 1, false)) + else if (!this.mergeItemStack(var5, 0, 8, false)) return null; if (var5.stackSize == 0) diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java b/src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java index a41dc8953..81ce3d7cf 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java @@ -32,8 +32,8 @@ public class GUIMachineCompactLauncher extends GuiInfoContainer { public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); - launcher.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 116, guiTop + 88 - 52, 16, 52); - launcher.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 88 - 52, 16, 52); + launcher.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 116, guiTop + 36, 16, 34); + launcher.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 36, 16, 34); this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 88 - 52, 16, 52, new String[] { "Solid Fuel: " + launcher.solid + "l" }); this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 113, 34, 6, launcher.power, launcher.maxPower); @@ -89,10 +89,10 @@ public class GUIMachineCompactLauncher extends GuiInfoContainer { this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 11); Minecraft.getMinecraft().getTextureManager().bindTexture(launcher.tanks[0].getSheet()); - launcher.tanks[0].renderTank(this, guiLeft + 116, guiTop + 88, launcher.tanks[0].getTankType().textureX() * FluidTank.x, launcher.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); + launcher.tanks[0].renderTank(this, guiLeft + 116, guiTop + 70, launcher.tanks[0].getTankType().textureX() * FluidTank.x, launcher.tanks[0].getTankType().textureY() * FluidTank.y, 16, 34); Minecraft.getMinecraft().getTextureManager().bindTexture(launcher.tanks[1].getSheet()); - launcher.tanks[1].renderTank(this, guiLeft + 134, guiTop + 88, launcher.tanks[1].getTankType().textureX() * FluidTank.x, launcher.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + launcher.tanks[1].renderTank(this, guiLeft + 134, guiTop + 70, launcher.tanks[1].getTankType().textureX() * FluidTank.x, launcher.tanks[1].getTankType().textureY() * FluidTank.y, 16, 34); /// DRAW MISSILE START GL11.glPushMatrix(); diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java b/src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java index f1ba99a27..23ec4f79e 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java @@ -37,8 +37,8 @@ public class GUIMachineLaunchTable extends GuiInfoContainer { public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); - launcher.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 116, guiTop + 88 - 52, 16, 52); - launcher.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 88 - 52, 16, 52); + launcher.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 116, guiTop + 36, 16, 34); + launcher.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 36, 16, 34); this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 88 - 52, 16, 52, new String[] { "Solid Fuel: " + launcher.solid + "l" }); this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 113, 34, 6, launcher.power, launcher.maxPower); this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 7, guiTop + 98, 18, 18, new String[] { "Size 10 & 10/15" }); @@ -135,10 +135,10 @@ public class GUIMachineLaunchTable extends GuiInfoContainer { this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 11); Minecraft.getMinecraft().getTextureManager().bindTexture(launcher.tanks[0].getSheet()); - launcher.tanks[0].renderTank(this, guiLeft + 116, guiTop + 88, launcher.tanks[0].getTankType().textureX() * FluidTank.x, launcher.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); + launcher.tanks[0].renderTank(this, guiLeft + 116, guiTop + 70, launcher.tanks[0].getTankType().textureX() * FluidTank.x, launcher.tanks[0].getTankType().textureY() * FluidTank.y, 16, 34); Minecraft.getMinecraft().getTextureManager().bindTexture(launcher.tanks[1].getSheet()); - launcher.tanks[1].renderTank(this, guiLeft + 134, guiTop + 88, launcher.tanks[1].getTankType().textureX() * FluidTank.x, launcher.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52); + launcher.tanks[1].renderTank(this, guiLeft + 134, guiTop + 70, launcher.tanks[1].getTankType().textureX() * FluidTank.x, launcher.tanks[1].getTankType().textureY() * FluidTank.y, 16, 34); /// DRAW MISSILE START GL11.glPushMatrix(); diff --git a/src/main/java/com/hbm/inventory/gui/GUINukeFstbmb.java b/src/main/java/com/hbm/inventory/gui/GUINukeFstbmb.java index 95766e9c4..1a731c6a4 100644 --- a/src/main/java/com/hbm/inventory/gui/GUINukeFstbmb.java +++ b/src/main/java/com/hbm/inventory/gui/GUINukeFstbmb.java @@ -1,21 +1,27 @@ package com.hbm.inventory.gui; +import org.apache.commons.lang3.math.NumberUtils; +import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeFstbmb; import com.hbm.lib.RefStrings; +import com.hbm.packet.AuxButtonPacket; +import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.bomb.TileEntityNukeBalefire; import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.PositionedSoundRecord; +import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; public class GUINukeFstbmb extends GuiInfoContainer { public static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/weapon/fstbmbSchematic.png"); private TileEntityNukeBalefire bomb; + private GuiTextField timer; public GUINukeFstbmb(InventoryPlayer invPlayer, TileEntityNukeBalefire bomb) { super(new ContainerNukeFstbmb(invPlayer, bomb)); @@ -25,6 +31,19 @@ public class GUINukeFstbmb extends GuiInfoContainer { this.ySize = 222; } + public void initGui() { + + super.initGui(); + + Keyboard.enableRepeatEvents(true); + this.timer = new GuiTextField(this.fontRendererObj, guiLeft + 94, guiTop + 40, 29, 12); + this.timer.setTextColor(0xff0000); + this.timer.setDisabledTextColour(0x800000); + this.timer.setEnableBackgroundDrawing(false); + this.timer.setMaxStringLength(3); + this.timer.setText(String.valueOf(bomb.timer / 20)); + } + @Override public void drawScreen(int mouseX, int mouseY, float f) { super.drawScreen(mouseX, mouseY, f); @@ -32,12 +51,15 @@ public class GUINukeFstbmb extends GuiInfoContainer { protected void mouseClicked(int x, int y, int i) { super.mouseClicked(x, y, i); + this.timer.mouseClicked(x, y, i); - if(guiLeft + 61 <= x && guiLeft + 61 + 18 > x && guiTop + 17 < y && guiTop + 17 + 18 >= y) { - - mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); - //PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(laser.xCoord, laser.yCoord, laser.zCoord, 0, 0)); - } + + if(!bomb.started) { + if(guiLeft + 142 <= x && guiLeft + 142 + 18 > x && guiTop + 35 < y && guiTop + 35 + 18 >= y) { + + PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(bomb.xCoord, bomb.yCoord, bomb.zCoord, 0, 0)); + } + } } @Override @@ -69,5 +91,24 @@ public class GUINukeFstbmb extends GuiInfoContainer { if(bomb.hasBattery()) drawTexturedModalRect(guiLeft + 88, guiTop + 93, 176, 16, 18, 10); + + if(bomb.started) + drawTexturedModalRect(guiLeft + 142, guiTop + 35, 176, 26, 18, 18); + + this.timer.drawTextBox(); } + + protected void keyTyped(char p_73869_1_, int p_73869_2_) { + + if (this.timer.textboxKeyTyped(p_73869_1_, p_73869_2_)) { + + if(NumberUtils.isNumber(timer.getText())) { + int j = MathHelper.clamp_int(Integer.parseInt(timer.getText()), 1, 999); + PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(bomb.xCoord, bomb.yCoord, bomb.zCoord, j, 1)); + } + + } else { + super.keyTyped(p_73869_1_, p_73869_2_); + } + } } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 63647fdac..3e6670eb8 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1352,6 +1352,8 @@ public class ModItems { public static Item apple_schrabidium; public static Item tem_flakes; public static Item glowing_stew; + public static Item balefire_scrambled; + public static Item balefire_and_ham; public static Item lemon; public static Item definitelyfood; public static Item loops; @@ -1399,6 +1401,7 @@ public class ModItems { public static Item solinium_propellant; public static Item solinium_core; public static Item n2_charge; + public static Item egg_balefire_shard; public static Item egg_balefire; public static Item custom_tnt; @@ -3148,6 +3151,8 @@ public class ModItems { apple_schrabidium = new ItemAppleSchrabidium(20, 100, false).setUnlocalizedName("apple_schrabidium").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":apple_schrabidium"); tem_flakes = new ItemTemFlakes(0, 0, false).setUnlocalizedName("tem_flakes").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":tem_flakes"); glowing_stew = new ItemSoup(6).setUnlocalizedName("glowing_stew").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":glowing_stew"); + balefire_scrambled = new ItemSoup(6).setUnlocalizedName("balefire_scrambled").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":balefire_scrambled"); + balefire_and_ham = new ItemSoup(6).setUnlocalizedName("balefire_and_ham").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":balefire_and_ham"); lemon = new ItemLemon(3, 5, false).setUnlocalizedName("lemon").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":lemon"); definitelyfood = new ItemLemon(2, 5, false).setUnlocalizedName("definitelyfood").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":definitelyfood"); med_ipecac = new ItemLemon(0, 0, false).setUnlocalizedName("med_ipecac").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":med_ipecac_new"); @@ -3201,7 +3206,8 @@ public class ModItems { n2_charge = new ItemN2().setUnlocalizedName("n2_charge").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":n2_charge"); - egg_balefire = new ItemCustomLore().setUnlocalizedName("egg_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":egg_balefire"); + egg_balefire_shard = new ItemRadioactive(1500F, true).setUnlocalizedName("egg_balefire_shard").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":egg_balefire_shard"); + egg_balefire = new ItemRadioactive(10000F, true).setUnlocalizedName("egg_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":egg_balefire"); custom_tnt = new ItemCustomLore().setUnlocalizedName("custom_tnt").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":custom_tnt"); custom_nuke = new ItemCustomLore().setUnlocalizedName("custom_nuke").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":custom_nuke"); @@ -3211,32 +3217,32 @@ public class ModItems { custom_schrab = new ItemCustomLore().setUnlocalizedName("custom_schrab").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":custom_schrab"); custom_fall = new ItemCustomLore().setUnlocalizedName("custom_fall").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":custom_fall"); - battery_generic = new ItemBattery(50, 1, 1).setUnlocalizedName("battery_generic").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_generic_new"); - battery_advanced = new ItemBattery(200, 5, 5).setUnlocalizedName("battery_advanced").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_advanced_new"); - battery_lithium = new ItemBattery(2500, 10, 10).setUnlocalizedName("battery_lithium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_lithium"); - battery_schrabidium = new ItemBattery(10000, 50, 50).setUnlocalizedName("battery_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_schrabidium_new"); - battery_spark = new ItemBattery(1000000, 20000, 20000).setUnlocalizedName("battery_spark").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark"); + battery_generic = new ItemBattery(5000, 100, 100).setUnlocalizedName("battery_generic").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_generic_new"); + battery_advanced = new ItemBattery(20000, 500, 500).setUnlocalizedName("battery_advanced").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_advanced_new"); + battery_lithium = new ItemBattery(250000, 1000, 1000).setUnlocalizedName("battery_lithium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_lithium"); + battery_schrabidium = new ItemBattery(1000000, 5000, 5000).setUnlocalizedName("battery_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_schrabidium_new"); + battery_spark = new ItemBattery(100000000, 2000000, 2000000).setUnlocalizedName("battery_spark").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark"); battery_creative = new Item().setUnlocalizedName("battery_creative").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_creative_new"); - battery_red_cell = new ItemBattery(150, 1, 1).setUnlocalizedName("battery_red_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_red_cell"); - battery_red_cell_6 = new ItemBattery(150 * 6, 1, 1).setUnlocalizedName("battery_red_cell_6").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_red_cell_6"); - battery_red_cell_24 = new ItemBattery(150 * 24, 1, 1).setUnlocalizedName("battery_red_cell_24").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_red_cell_24"); - battery_advanced_cell = new ItemBattery(600, 5, 5).setUnlocalizedName("battery_advanced_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_advanced_cell"); - battery_advanced_cell_4 = new ItemBattery(600 * 4, 5, 5).setUnlocalizedName("battery_advanced_cell_4").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_advanced_cell_4"); - battery_advanced_cell_12 = new ItemBattery(600 * 12, 5, 5).setUnlocalizedName("battery_advanced_cell_12").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_advanced_cell_12"); - battery_lithium_cell = new ItemBattery(7500, 10, 10).setUnlocalizedName("battery_lithium_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_lithium_cell"); - battery_lithium_cell_3 = new ItemBattery(7500 * 3, 10, 10).setUnlocalizedName("battery_lithium_cell_3").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_lithium_cell_3"); - battery_lithium_cell_6 = new ItemBattery(7500 * 6, 10, 10).setUnlocalizedName("battery_lithium_cell_6").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_lithium_cell_6"); - battery_schrabidium_cell = new ItemBattery(30000, 50, 50).setUnlocalizedName("battery_schrabidium_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell"); - battery_schrabidium_cell_2 = new ItemBattery(30000 * 2, 50, 50).setUnlocalizedName("battery_schrabidium_cell_2").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell_2"); - battery_schrabidium_cell_4 = new ItemBattery(30000 * 4, 50, 50).setUnlocalizedName("battery_schrabidium_cell_4").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell_4"); - battery_spark_cell_6 = new ItemBattery(1000000 * 6, 20000, 20000).setUnlocalizedName("battery_spark_cell_6").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_6"); - battery_spark_cell_25 = new ItemBattery(1000000 * 25, 20000, 20000).setUnlocalizedName("battery_spark_cell_25").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_25"); - battery_spark_cell_100 = new ItemBattery(1000000L * 100L, 20000, 20000).setUnlocalizedName("battery_spark_cell_100").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_100"); - battery_spark_cell_1000 = new ItemBattery(1000000L * 1000L, 200000, 200000).setUnlocalizedName("battery_spark_cell_1000").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_1000"); - battery_spark_cell_2500 = new ItemBattery(1000000L * 2500L, 200000, 200000).setUnlocalizedName("battery_spark_cell_2500").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_2500"); - battery_spark_cell_10000 = new ItemBattery(1000000L * 10000L, 2000000, 2000000).setUnlocalizedName("battery_spark_cell_10000").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_10000"); - battery_spark_cell_power = new ItemBattery(1000000L * 1000000L, 2000000, 2000000).setUnlocalizedName("battery_spark_cell_power").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_power"); + battery_red_cell = new ItemBattery(15000, 100, 100).setUnlocalizedName("battery_red_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_red_cell"); + battery_red_cell_6 = new ItemBattery(15000 * 6, 100, 100).setUnlocalizedName("battery_red_cell_6").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_red_cell_6"); + battery_red_cell_24 = new ItemBattery(15000 * 24, 100, 100).setUnlocalizedName("battery_red_cell_24").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_red_cell_24"); + battery_advanced_cell = new ItemBattery(60000, 500, 500).setUnlocalizedName("battery_advanced_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_advanced_cell"); + battery_advanced_cell_4 = new ItemBattery(60000 * 4, 500, 500).setUnlocalizedName("battery_advanced_cell_4").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_advanced_cell_4"); + battery_advanced_cell_12 = new ItemBattery(60000 * 12, 500, 500).setUnlocalizedName("battery_advanced_cell_12").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_advanced_cell_12"); + battery_lithium_cell = new ItemBattery(750000, 1000, 1000).setUnlocalizedName("battery_lithium_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_lithium_cell"); + battery_lithium_cell_3 = new ItemBattery(750000 * 3, 1000, 1000).setUnlocalizedName("battery_lithium_cell_3").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_lithium_cell_3"); + battery_lithium_cell_6 = new ItemBattery(750000 * 6, 1000, 1000).setUnlocalizedName("battery_lithium_cell_6").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_lithium_cell_6"); + battery_schrabidium_cell = new ItemBattery(3000000, 5000, 5000).setUnlocalizedName("battery_schrabidium_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell"); + battery_schrabidium_cell_2 = new ItemBattery(3000000 * 2, 5000, 5000).setUnlocalizedName("battery_schrabidium_cell_2").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell_2"); + battery_schrabidium_cell_4 = new ItemBattery(3000000 * 4, 5000, 5000).setUnlocalizedName("battery_schrabidium_cell_4").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_schrabidium_cell_4"); + battery_spark_cell_6 = new ItemBattery(100000000L * 6L, 2000000, 2000000).setUnlocalizedName("battery_spark_cell_6").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_6"); + battery_spark_cell_25 = new ItemBattery(100000000L * 25L, 2000000, 2000000).setUnlocalizedName("battery_spark_cell_25").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_25"); + battery_spark_cell_100 = new ItemBattery(100000000L * 100L, 2000000, 2000000).setUnlocalizedName("battery_spark_cell_100").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_100"); + battery_spark_cell_1000 = new ItemBattery(100000000L * 1000L, 20000000, 20000000).setUnlocalizedName("battery_spark_cell_1000").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_1000"); + battery_spark_cell_2500 = new ItemBattery(100000000L * 2500L, 20000000, 20000000).setUnlocalizedName("battery_spark_cell_2500").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_2500"); + battery_spark_cell_10000 = new ItemBattery(100000000L * 10000L, 200000000, 200000000).setUnlocalizedName("battery_spark_cell_10000").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_10000"); + battery_spark_cell_power = new ItemBattery(100000000L * 1000000L, 200000000, 200000000).setUnlocalizedName("battery_spark_cell_power").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_power"); battery_potato = new ItemBattery(1, 0, 1).setUnlocalizedName("battery_potato").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potato"); battery_potatos = new ItemPotatos(50, 0, 1).setUnlocalizedName("battery_potatos").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potatos"); @@ -5380,6 +5386,8 @@ public class ModItems { GameRegistry.registerItem(apple_schrabidium, apple_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(tem_flakes, tem_flakes.getUnlocalizedName()); GameRegistry.registerItem(glowing_stew, glowing_stew.getUnlocalizedName()); + GameRegistry.registerItem(balefire_scrambled, balefire_scrambled.getUnlocalizedName()); + GameRegistry.registerItem(balefire_and_ham, balefire_and_ham.getUnlocalizedName()); GameRegistry.registerItem(lemon, lemon.getUnlocalizedName()); GameRegistry.registerItem(definitelyfood, definitelyfood.getUnlocalizedName()); GameRegistry.registerItem(loops, loops.getUnlocalizedName()); @@ -5512,6 +5520,7 @@ public class ModItems { GameRegistry.registerItem(n2_charge, n2_charge.getUnlocalizedName()); //FSTBMB + GameRegistry.registerItem(egg_balefire_shard, egg_balefire_shard.getUnlocalizedName()); GameRegistry.registerItem(egg_balefire, egg_balefire.getUnlocalizedName()); //Conventional Armor diff --git a/src/main/java/com/hbm/items/machine/ItemBattery.java b/src/main/java/com/hbm/items/machine/ItemBattery.java index 433e8d2e5..9746df56b 100644 --- a/src/main/java/com/hbm/items/machine/ItemBattery.java +++ b/src/main/java/com/hbm/items/machine/ItemBattery.java @@ -40,14 +40,14 @@ public class ItemBattery extends Item implements IBatteryItem { itemstack.getItem() != ModItems.dynosphere_euphemium && itemstack.getItem() != ModItems.dynosphere_dineutronium) { - list.add("Energy stored: " + Library.getShortNumber(charge * 100) + "/" + Library.getShortNumber(maxCharge * 100) + "HE"); + list.add("Energy stored: " + Library.getShortNumber(charge) + "/" + Library.getShortNumber(maxCharge) + "HE"); } else { - String charge1 = Library.getShortNumber((charge * 100) / this.maxCharge); + String charge1 = Library.getShortNumber((charge * 100) / this.maxCharge); list.add("Charge: " + charge1 + "%"); - list.add("(" + Library.getShortNumber(charge * 100) + "/" + Library.getShortNumber(maxCharge * 100) + "HE)"); + list.add("(" + Library.getShortNumber(charge) + "/" + Library.getShortNumber(maxCharge) + "HE)"); } - list.add("Charge rate: " + Library.getShortNumber(chargeRate * 100) + "HE/t"); - list.add("Discharge rate: " + Library.getShortNumber(dischargeRate * 100) + "HE/t"); + list.add("Charge rate: " + Library.getShortNumber(chargeRate) + "HE/t"); + list.add("Discharge rate: " + Library.getShortNumber(dischargeRate) + "HE/t"); } @Override diff --git a/src/main/java/com/hbm/items/special/ItemCell.java b/src/main/java/com/hbm/items/special/ItemCell.java index 66fb7a083..18d100171 100644 --- a/src/main/java/com/hbm/items/special/ItemCell.java +++ b/src/main/java/com/hbm/items/special/ItemCell.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.blocks.bomb.BlockCrashedBomb; import com.hbm.items.ModItems; +import com.hbm.lib.Library; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -47,6 +48,9 @@ public class ItemCell extends Item { } } } + + Library.applyRadDirect(player, 50F); + return true; } return false; diff --git a/src/main/java/com/hbm/items/special/ItemCladding.java b/src/main/java/com/hbm/items/special/ItemCladding.java index 7b1d74615..bb2a109dc 100644 --- a/src/main/java/com/hbm/items/special/ItemCladding.java +++ b/src/main/java/com/hbm/items/special/ItemCladding.java @@ -28,7 +28,7 @@ public class ItemCladding extends Item { for(ItemStack armor : player.inventory.armorInventory) { - if(armor != null && HazmatRegistry.instance.getCladding(armor) == 0) { + if(armor != null && HazmatRegistry.instance.getCladding(armor) < rad) { if(!armor.hasTagCompound()) armor.stackTagCompound = new NBTTagCompound(); diff --git a/src/main/java/com/hbm/items/special/ItemCustomLore.java b/src/main/java/com/hbm/items/special/ItemCustomLore.java index 198d47cc3..cf68c5290 100644 --- a/src/main/java/com/hbm/items/special/ItemCustomLore.java +++ b/src/main/java/com/hbm/items/special/ItemCustomLore.java @@ -587,7 +587,12 @@ public class ItemCustomLore extends Item { if(this == ModItems.egg_balefire) { - list.add("Doubles as a crappy lander!"); + list.add("What kind of bird lays a radioactive egg?"); + } + + if(this == ModItems.ingot_schraranium) + { + list.add("Made from uranium in a schrabidium transmutator"); } } @@ -645,8 +650,8 @@ public class ItemCustomLore extends Item { this == ModItems.rune_hagalaz || this == ModItems.rune_jera || this == ModItems.rune_thurisaz || - this == ModItems.egg_balefire) - { + this == ModItems.egg_balefire_shard || + this == ModItems.egg_balefire) { return true; } diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index e0f229a3e..71495794f 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -93,7 +93,7 @@ public class Library { } float rad = e.getEntityData().getFloat("hfr_radiation"); - e.getEntityData().setFloat("hfr_radiation", rad + f); + e.getEntityData().setFloat("hfr_radiation", Math.min(rad + f, 2500)); } public static void applyRadDirect(Entity e, float f) { @@ -105,7 +105,7 @@ public class Library { return; float rad = e.getEntityData().getFloat("hfr_radiation"); - e.getEntityData().setFloat("hfr_radiation", rad + f); + e.getEntityData().setFloat("hfr_radiation", Math.min(rad + f, 2500)); } public static boolean checkForHeld(EntityPlayer player, Item item) { @@ -379,9 +379,9 @@ public class Library { long batRate = battery.getChargeRate(); //in hHE - long toCharge = Math.min(Math.min(power / 100, batRate), batMax - batCharge); + long toCharge = Math.min(Math.min(power, batRate), batMax - batCharge); - power -= toCharge * 100; + power -= toCharge; battery.chargeBattery(slots[index], toCharge); @@ -402,9 +402,9 @@ public class Library { long batRate = ((ItemToolAbilityPower)slots[index].getItem()).getChargeRate(); //in hHE - long toCharge = Math.min(Math.min(power / 100, batRate), batMax - batCharge); + long toCharge = Math.min(Math.min(power, batRate), batMax - batCharge); - power -= toCharge * 100; + power -= toCharge; ((ItemToolAbilityPower)slots[index].getItem()).chargeBattery(slots[index], toCharge); @@ -433,10 +433,10 @@ public class Library { long batRate = battery.getDischargeRate(); //in hHe - long toDischarge = Math.min(Math.min((maxPower - power) / 100, batRate), batCharge); + long toDischarge = Math.min(Math.min((maxPower - power), batRate), batCharge); battery.dischargeBattery(slots[index], toDischarge); - power += toDischarge * 100; + power += toDischarge; } return power; diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index c04b2e51a..b30e8f147 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -260,6 +260,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.nuclear_waste_tiny, 9), new Object[] { "#", '#', ModItems.nuclear_waste }); GameRegistry.addRecipe(new ItemStack(ModItems.bottle_mercury, 1), new Object[] { "###", "#B#", "###", '#', ModItems.nugget_mercury, 'B', Items.glass_bottle }); GameRegistry.addRecipe(new ItemStack(ModItems.nugget_mercury, 8), new Object[] { "#", '#', ModItems.bottle_mercury }); + GameRegistry.addRecipe(new ItemStack(ModItems.egg_balefire, 1), new Object[] { "###", "###", "###", '#', ModItems.egg_balefire_shard }); + GameRegistry.addRecipe(new ItemStack(ModItems.egg_balefire_shard, 9), new Object[] { "#", '#', ModItems.egg_balefire }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.rod_empty, 16), new Object[] { "SSS", "L L", "SSS", 'S', "plateSteel", 'L', "plateLead" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_th232, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_th232, ModItems.nugget_th232, ModItems.nugget_th232, ModItems.nugget_th232, ModItems.nugget_th232, ModItems.nugget_th232 }); @@ -458,7 +460,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.deco_titanium), new Object[] { "ingotTitanium", ModBlocks.steel_scaffold })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.deco_tungsten), new Object[] { "ingotTungsten", ModBlocks.steel_scaffold })); - GameRegistry.addRecipe(new ItemStack(ModItems.nugget_euphemium, 1), new Object[] { "##", "##", '#', ModItems.rod_quad_euphemium }); + GameRegistry.addRecipe(new ItemStack(ModItems.nugget_euphemium, 1), new Object[] { "#", '#', ModItems.rod_quad_euphemium }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_euphemium, 1), new Object[] { "###", "###", "###", '#', ModItems.rod_quad_euphemium }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_euphemium, 1), new Object[] { "###", "###", "###", '#', ModItems.nugget_euphemium }); GameRegistry.addRecipe(new ItemStack(ModItems.nugget_euphemium, 9), new Object[] { "#", '#', ModItems.ingot_euphemium }); @@ -681,6 +684,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg, 1), new Object[] { "SSW", " MW", 'S', ModItems.hull_small_steel, 'W', "plateIron", 'M', ModItems.mechanism_launcher_1 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_panzerschreck, 1), new Object[] { "SSS", " MW", 'S', ModItems.hull_small_steel, 'W', "plateCopper", 'M', ModItems.mechanism_launcher_1 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_karl, 1), new Object[] { "SSW", " MW", 'S', ModItems.hull_small_steel, 'W', "plateAdvanced", 'M', ModItems.mechanism_launcher_2 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_quadro, 1), new Object[] { "SSS", "SSS", "CM ", 'S', ModItems.hull_small_steel, 'C', ModItems.circuit_targeting_tier3, 'M', ModItems.mechanism_launcher_2 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_hk69, 1), new Object[] { "SSI", " MB", 'S', ModItems.hull_small_steel, 'I', "ingotIron", 'M', ModItems.mechanism_launcher_1, 'B', ModItems.bolt_tungsten })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_stinger, 1), new Object[] { "SSW", "CMW", 'S', "plateSteel", 'W', "plateTitanium", 'C', ModItems.circuit_red_copper, 'M', ModItems.mechanism_launcher_2 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_stinger_ammo, 4), new Object[] { "SS ", "STI", " IR", 'S', "plateSteel", 'T', Item.getItemFromBlock(Blocks.tnt), 'I', "plateAluminum", 'R', "dustRedstone" })); @@ -698,7 +702,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mirv, 1), new Object[] { "LLL", "WFW", "SSS", 'S', "plateSteel", 'L', "plateLead", 'W', ModItems.wire_gold, 'F', ModItems.gun_fatman })); GameRegistry.addRecipe(new ItemStack(ModItems.gun_proto, 1), new Object[] { "LLL", "WFW", "SSS", 'S', ModItems.plate_polymer, 'L', ModItems.plate_desh, 'W', ModItems.wire_tungsten, 'F', ModItems.gun_fatman }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bf, 1), new Object[] { "LLL", "WFW", "SSS", 'S', ModItems.plate_paa, 'L', "plateDenseLead", 'W', ModItems.wire_advanced_alloy, 'F', ModItems.gun_mirv })); - GameRegistry.addRecipe(new ItemStack(ModItems.gun_bf_ammo, 1), new Object[] { "AEA", "SHS", "AEA", 'H', ModItems.hull_small_steel, 'A', ModItems.cell_antimatter, 'S', ModItems.cell_anti_schrabidium, 'E', ModItems.powder_power }); + GameRegistry.addRecipe(new ItemStack(ModItems.gun_bf_ammo, 1), new Object[] { " S ", "EBE", " S ", 'S', ModItems.hull_small_steel, 'E', ModItems.powder_power, 'B', ModItems.egg_balefire_shard }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_mp40, 1), new Object[] { "IIM", " SW", " S ", 'S', "plateSteel", 'I', "ingotSteel", 'W', "plankWood", 'M', ModItems.mechanism_rifle_2 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_flechette, 1), new Object[] { "PPM", "TIS", "G ", 'P', "plateSteel", 'M', ModItems.mechanism_rifle_2, 'T', ModItems.hull_small_steel, 'I', "ingotSteel", 'S', ModItems.ingot_polymer, 'G', ModItems.mechanism_launcher_1 })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_uboinik, 1), new Object[] { "IIM", "SPW", 'P', "plateSteel", 'I', "ingotSteel", 'W', "plankWood", 'S', Items.stick, 'M', ModItems.mechanism_revolver_2 })); @@ -738,7 +742,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bolt_action, 1), new Object[] { "PPI", "SWD", 'P', "plateSteel", 'I', ModItems.mechanism_rifle_1, 'S', Items.stick, 'D', "plankWood", 'W', ModItems.wire_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bolt_action_green, 1), new Object[] { "PPI", "SWD", 'P', "plateIron", 'I', ModItems.mechanism_rifle_1, 'S', Items.stick, 'D', "plankWood", 'W', ModItems.wire_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_bolt_action_saturnite, 1), new Object[] { "PPI", "SWD", 'P', "plateSaturnite", 'I', ModItems.mechanism_rifle_1, 'S', Items.stick, 'D', "plankWood", 'W', ModItems.wire_tungsten })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_b92, 1), new Object[] { "SSS", " EP", 'P', "ingotPolymer", 'S', ModItems.ingot_starmetal, 'E', ModItems.powder_spark_mix })); + GameRegistry.addRecipe(new ItemStack(ModItems.gun_b92, 1), new Object[] { "DDD", "SSC", " R", 'D', ModItems.plate_dineutronium, 'S', ModItems.ingot_starmetal, 'S', ModItems.circuit_targeting_tier6, 'R', ModItems.gun_revolver_schrabidium }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_b92_ammo, 1), new Object[] { "PSP", "ESE", "PSP", 'P', "plateSteel", 'S', ModItems.ingot_starmetal, 'E', ModItems.powder_spark_mix })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.weaponized_starblaster_cell, 1), new Object[] { new ItemStack(ModItems.fluid_tank_full, 1, FluidType.ACID.getID()), GunB92Cell.getFullCell(), ModItems.wire_copper }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_uzi, 1), new Object[] { "SMS", " PB", " P ", 'S', "ingotSteel", 'M', ModItems.mechanism_rifle_2, 'P', "plateSteel", 'B', ModItems.bolt_dura_steel })); @@ -957,6 +961,8 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tem_flakes, 1, 1), new Object[] { Items.gold_nugget, Items.gold_nugget, Items.gold_nugget, Items.paper }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tem_flakes, 1, 2), new Object[] { Items.gold_ingot, Items.gold_ingot, Items.gold_nugget, Items.gold_nugget, Items.paper }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.glowing_stew, 1), new Object[] { Items.bowl, Item.getItemFromBlock(ModBlocks.mush), Item.getItemFromBlock(ModBlocks.mush) }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.balefire_scrambled, 1), new Object[] { Items.bowl, ModItems.egg_balefire }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.balefire_and_ham, 1), new Object[] { ModItems.balefire_scrambled, Items.cooked_beef }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.med_ipecac, 1), new Object[] { Items.glass_bottle, Items.nether_wart }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.med_ptsd, 1), new Object[] { ModItems.med_ipecac }); @@ -1483,6 +1489,7 @@ public class CraftingManager { 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 ItemStack(ModBlocks.struct_soyuz_core, 1), new Object[] { "CUC", "TST", "TBT", 'C', ModItems.circuit_targeting_tier4, 'U', ModItems.upgrade_power_3, 'T', ModBlocks.barrel_steel, 'S', ModBlocks.steel_scaffold, 'B', ModBlocks.machine_lithium_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" })); @@ -1528,6 +1535,10 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_crystallizer, 1), new Object[] { "PMP", "STS", "DMD", 'P', "ingotPolymer", 'M', ModItems.motor, 'S', ModItems.blades_advanced_alloy, 'T', ModItems.tank_steel, 'D', "ingotDesh" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade_nullifier, 1), new Object[] { "SPS", "PUP", "SPS", 'S', "plateSteel", 'P', ModItems.powder_fire, 'U', ModItems.upgrade_template })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade_smelter, 1), new Object[] { "PHP", "CUC", "DTD", 'P', "plateCopper", 'H', Blocks.hopper, 'C', ModItems.coil_tungsten, 'U', ModItems.upgrade_template, 'D', ModItems.coil_copper, 'T', ModBlocks.machine_transformer })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade_shredder, 1), new Object[] { "PHP", "CUC", "DTD", 'P', ModItems.motor, 'H', Blocks.hopper, 'C', ModItems.blades_advanced_alloy, 'U', ModItems.upgrade_smelter, 'D', "plateTitanium", 'T', ModBlocks.machine_transformer })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade_centrifuge, 1), new Object[] { "PHP", "PUP", "DTD", 'P', ModItems.centrifuge_element, 'H', Blocks.hopper, 'U', ModItems.upgrade_shredder, 'D', "ingotPolymer", 'T', ModBlocks.machine_transformer })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade_crystallizer, 1), new Object[] { "PHP", "CUC", "DTD", 'P', new ItemStack(ModItems.fluid_barrel_full, 1, FluidType.ACID.ordinal()), 'H', ModItems.circuit_targeting_tier4, 'C', ModBlocks.barrel_steel, 'U', ModItems.upgrade_centrifuge, 'D', ModItems.motor, 'T', ModBlocks.machine_transformer })); } diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index b7c84788b..3ea3b8c2d 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1473,15 +1473,15 @@ public class MainRegistry HazmatRegistry.instance.registerHazmat(ModItems.alloy_legs, 0.12F); HazmatRegistry.instance.registerHazmat(ModItems.alloy_boots, 0.04F); - HazmatRegistry.instance.registerHazmat(ModItems.cmb_helmet, 1F); - HazmatRegistry.instance.registerHazmat(ModItems.cmb_plate, 2.2F); - HazmatRegistry.instance.registerHazmat(ModItems.cmb_legs, 1.6F); - HazmatRegistry.instance.registerHazmat(ModItems.cmb_boots, 0.5F); + HazmatRegistry.instance.registerHazmat(ModItems.cmb_helmet, 0.5F); + HazmatRegistry.instance.registerHazmat(ModItems.cmb_plate, 1.1F); + HazmatRegistry.instance.registerHazmat(ModItems.cmb_legs, 0.8F); + HazmatRegistry.instance.registerHazmat(ModItems.cmb_boots, 0.2F); - HazmatRegistry.instance.registerHazmat(ModItems.schrabidium_helmet, 1.2F); - HazmatRegistry.instance.registerHazmat(ModItems.schrabidium_plate, 2.4F); - HazmatRegistry.instance.registerHazmat(ModItems.schrabidium_legs, 1.8F); - HazmatRegistry.instance.registerHazmat(ModItems.schrabidium_boots, 0.6F); + HazmatRegistry.instance.registerHazmat(ModItems.schrabidium_helmet, 0.6F); + HazmatRegistry.instance.registerHazmat(ModItems.schrabidium_plate, 1.2F); + HazmatRegistry.instance.registerHazmat(ModItems.schrabidium_legs, 0.9F); + HazmatRegistry.instance.registerHazmat(ModItems.schrabidium_boots, 0.3F); HazmatRegistry.instance.registerHazmat(ModItems.euphemium_helmet, 6F); HazmatRegistry.instance.registerHazmat(ModItems.euphemium_plate, 12F); diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index 2e5466eb1..940af3107 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -292,12 +292,12 @@ public class ModEventHandler if(eRad < 200 || entity instanceof EntityNuclearCreeper || entity instanceof EntityMooshroom || entity instanceof EntityZombie || entity instanceof EntitySkeleton) continue; - if(entity instanceof EntityPlayer && ((EntityPlayer)entity).capabilities.isCreativeMode) - continue; - if(eRad > 2500) entity.getEntityData().setFloat("hfr_radiation", 2500); + if(entity instanceof EntityPlayer && ((EntityPlayer)entity).capabilities.isCreativeMode) + continue; + if(eRad >= 1000) { if(entity.attackEntityFrom(ModDamageSource.radiation, entity.getMaxHealth() * 100)) { entity.getEntityData().setFloat("hfr_radiation", 0); diff --git a/src/main/java/com/hbm/packet/AuxButtonPacket.java b/src/main/java/com/hbm/packet/AuxButtonPacket.java index 798fe1f4d..09e451dd2 100644 --- a/src/main/java/com/hbm/packet/AuxButtonPacket.java +++ b/src/main/java/com/hbm/packet/AuxButtonPacket.java @@ -2,6 +2,7 @@ package com.hbm.packet; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.items.weapon.ItemMissile.PartSize; +import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.tileentity.bomb.TileEntityLaunchTable; import com.hbm.tileentity.machine.TileEntityBarrel; import com.hbm.tileentity.machine.TileEntityCoreEmitter; @@ -266,6 +267,12 @@ public class AuxButtonPacket implements IMessage { laser.isOn = !laser.isOn; } + /// yes /// + if(te instanceof TileEntityMachineBase) { + TileEntityMachineBase base = (TileEntityMachineBase)te; + base.handleButtonPacket(m.value, m.id); + } + //} catch (Exception x) { } return null; diff --git a/src/main/java/com/hbm/render/item/ItemRenderWeaponObj.java b/src/main/java/com/hbm/render/item/ItemRenderWeaponObj.java index 21b93b519..c65aaab51 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderWeaponObj.java +++ b/src/main/java/com/hbm/render/item/ItemRenderWeaponObj.java @@ -130,19 +130,20 @@ public class ItemRenderWeaponObj implements IItemRenderer { } if(item.getItem() == ModItems.gun_flechette) { + GL11.glRotatef(25F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(1.0F, -1.0F, -0.0F); GL11.glRotatef(170F, 0.0F, 1.0F, 0.0F); GL11.glScaled(0.25, 0.25, 0.25); - - double[] recoil = HbmAnimations.getRelevantTransformation("RECOIL"); - GL11.glTranslated(recoil[0], recoil[1], recoil[2]); if(player.isSneaking()) { GL11.glRotatef(5F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-2F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(-2.0F, 1.2F, 3.7F); } + + double[] recoil = HbmAnimations.getRelevantTransformation("RECOIL"); + GL11.glTranslated(recoil[0], recoil[1], recoil[2]); } if(item.getItem() == ModItems.gun_quadro) { diff --git a/src/main/java/com/hbm/render/tileentity/RenderNukeFstbmb.java b/src/main/java/com/hbm/render/tileentity/RenderNukeFstbmb.java index 23862e0c3..82bf299b6 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderNukeFstbmb.java +++ b/src/main/java/com/hbm/render/tileentity/RenderNukeFstbmb.java @@ -41,12 +41,10 @@ public class RenderNukeFstbmb extends TileEntitySpecialRenderer { TileEntityNukeBalefire bf = (TileEntityNukeBalefire)tileEntity; - if(bf.hasEgg()) { + if(bf.loaded) { bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/misc/glintBF.png")); RenderMiscEffects.renderClassicGlint(tileEntity.getWorldObj(), f, ResourceManager.fstbmb, "Balefire", 0.0F, 0.8F, 0.15F, 5, 2F); - } - - if(bf.hasBattery()) { + FontRenderer font = Minecraft.getMinecraft().fontRenderer; float f3 = 0.04F; GL11.glTranslatef(0.815F, 0.9275F, 0.5F); diff --git a/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java b/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java index 5172e3e1f..ba57bc629 100644 --- a/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java +++ b/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java @@ -163,6 +163,8 @@ public abstract class TileEntityMachineBase extends TileEntity implements ISided public void networkUnpack(NBTTagCompound nbt) { } + public void handleButtonPacket(int value, int meta) { } + @Override public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java index cc8caa813..2f7766391 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java @@ -53,7 +53,7 @@ public class TileEntityCompactLauncher extends TileEntity implements ISidedInven private String customName; public TileEntityCompactLauncher() { - slots = new ItemStack[6]; + slots = new ItemStack[8]; tanks = new FluidTank[2]; tanks[0] = new FluidTank(FluidType.NONE, 25000, 0); tanks[1] = new FluidTank(FluidType.NONE, 25000, 1); @@ -164,8 +164,8 @@ public class TileEntityCompactLauncher extends TileEntity implements ISidedInven updateTypes(); - tanks[0].loadTank(2, 3, slots); - tanks[1].loadTank(2, 3, slots); + tanks[0].loadTank(2, 6, slots); + tanks[1].loadTank(3, 7, slots); for (int i = 0; i < 2; i++) tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java index 6596c9f7a..19b6a3616 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java @@ -52,7 +52,7 @@ public class TileEntityLaunchTable extends TileEntity implements ISidedInventory private String customName; public TileEntityLaunchTable() { - slots = new ItemStack[6]; + slots = new ItemStack[8]; tanks = new FluidTank[2]; tanks[0] = new FluidTank(FluidType.NONE, 100000, 0); tanks[1] = new FluidTank(FluidType.NONE, 100000, 1); @@ -165,8 +165,8 @@ public class TileEntityLaunchTable extends TileEntity implements ISidedInventory updateTypes(); - tanks[0].loadTank(2, 3, slots); - tanks[1].loadTank(2, 3, slots); + tanks[0].loadTank(2, 6, slots); + tanks[1].loadTank(3, 7, slots); for (int i = 0; i < 2; i++) tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java index e7c97c841..9101085bf 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java @@ -1,10 +1,16 @@ package com.hbm.tileentity.bomb; +import com.hbm.entity.effect.EntityNukeCloudSmall; +import com.hbm.entity.logic.EntityBalefire; import com.hbm.items.ModItems; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IBatteryItem; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; public class TileEntityNukeBalefire extends TileEntityMachineBase { @@ -14,6 +20,7 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase { public TileEntityNukeBalefire() { super(2); + timer = 18000; } @Override @@ -26,15 +33,24 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase { if(!worldObj.isRemote) { - if(started) - timer--; + if(!this.isLoaded()) { + started = false; + } - if(timer <= 0) + if(started) { + timer--; + + if(timer % 20 == 0) + worldObj.playSoundEffect(xCoord, yCoord, zCoord, "hbm:weapon.fstbmbPing", 5.0F, 1.0F); + } + + if(timer <= 0) { explode(); + } NBTTagCompound data = new NBTTagCompound(); data.setInteger("timer", timer); - data.setBoolean("loaded", loaded); + data.setBoolean("loaded", this.isLoaded()); data.setBoolean("started", started); networkPack(data, 250); } @@ -47,6 +63,17 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase { loaded = data.getBoolean("loaded"); } + public void handleButtonPacket(int value, int meta) { + + if(meta == 0 && this.isLoaded()) { + worldObj.playSoundEffect(xCoord, yCoord, zCoord, "hbm:weapon.fstbmbStart", 5.0F, 1.0F); + started = true; + } + + if(meta == 1) + timer = value * 20; + } + public boolean isLoaded() { return hasEgg() && hasBattery(); @@ -73,11 +100,23 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase { public void explode() { + for(int i = 0; i < slots.length; i++) + slots[i] = null; + + worldObj.func_147480_a(xCoord, yCoord, zCoord, false); + + EntityBalefire bf = new EntityBalefire(worldObj); + bf.posX = xCoord + 0.5; + bf.posY = yCoord + 0.5; + bf.posZ = zCoord + 0.5; + bf.destructionRange = (int) 250; + worldObj.spawnEntityInWorld(bf); + worldObj.spawnEntityInWorld(EntityNukeCloudSmall.statFacBale(worldObj, xCoord + 0.5, yCoord + 5, zCoord + 0.5, 250 * 1.5F, 1000)); } public String getMinutes() { - String mins = "" + (timer / 60); + String mins = "" + (timer / 1200); if(mins.length() == 1) mins = "0" + mins; @@ -87,12 +126,39 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase { public String getSeconds() { - String mins = "" + (timer % 60); + String mins = "" + ((timer / 20) % 60); if(mins.length() == 1) mins = "0" + mins; return mins; } - + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + started = nbt.getBoolean("started"); + timer = nbt.getInteger("timer"); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + nbt.setBoolean("started", started); + nbt.setInteger("timer", timer); + } + + @Override + public AxisAlignedBB getRenderBoundingBox() { + return TileEntity.INFINITE_EXTENT_AABB; + } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } }