From 2f2b655e5a903876047d39703187b0c247295182 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Tue, 4 Sep 2018 00:00:55 +0200 Subject: [PATCH] Fat mine, saturnite rifle, explosion sounds for MK4 --- assets/hbm/lang/de_DE.lang | 4 +- assets/hbm/lang/en_US.lang | 2 + assets/hbm/models/mine_fat.obj | 1208 +++++++++++++++++ assets/hbm/textures/blocks/mine_fat.png | Bin 0 -> 322 bytes .../items/gun_bolt_action_saturnite.png | Bin 0 -> 210 bytes .../models/ModelBoltActionSaturnite.png | Bin 0 -> 2012 bytes assets/hbm/textures/models/mine_fat.png | Bin 0 -> 2235 bytes com/hbm/blocks/ModBlocks.java | 3 + com/hbm/blocks/bomb/Landmine.java | 24 + .../entity/logic/EntityNukeExplosionMK4.java | 4 + com/hbm/explosion/ExplosionNukeGeneric.java | 3 +- com/hbm/explosion/ExplosionParticle.java | 2 +- com/hbm/explosion/ExplosionParticleB.java | 2 +- com/hbm/inventory/MachineRecipes.java | 6 + com/hbm/items/ModItems.java | 3 + com/hbm/items/tool/ItemAssemblyTemplate.java | 3 + com/hbm/items/weapon/GunBoltAction.java | 22 +- com/hbm/main/ClientProxy.java | 1 + com/hbm/main/CraftingManager.java | 2 + com/hbm/main/ResourceManager.java | 2 + com/hbm/render/item/ItemRenderGunAnim.java | 10 +- com/hbm/render/tileentity/RenderLandmine.java | 9 +- .../tileentity/bomb/TileEntityLandmine.java | 3 + 23 files changed, 1304 insertions(+), 9 deletions(-) create mode 100644 assets/hbm/models/mine_fat.obj create mode 100644 assets/hbm/textures/blocks/mine_fat.png create mode 100644 assets/hbm/textures/items/gun_bolt_action_saturnite.png create mode 100644 assets/hbm/textures/models/ModelBoltActionSaturnite.png create mode 100644 assets/hbm/textures/models/mine_fat.png diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index fb28aa67c..7b65d82ed 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -252,6 +252,7 @@ item.turret_biometry.name=Geschütz-Telemetriekarte tile.mine_ap.name=Antipersonenmine tile.mine_he.name=Antipanzermine tile.mine_shrap.name=Schrapnellmine +tile.mine_fat.name=Fat Mine item.defuser.name=High-Tech Bombenentschärfungsgerät tile.bomb_multi.name=Mehrzweckbombe @@ -1128,7 +1129,8 @@ item.gun_lever_action.name=Mare's Leg (Original) item.gun_bolt_action.name=Dream-Repetiergewehr (Original) item.gun_lever_action_dark.name=Mare's Leg (Dunkel) item.gun_bolt_action_green.name=Dream-Repetiergewehr (Grün) -item.gun_lever_action_sonata.name=Flipped Mare's Leg +item.gun_bolt_action_saturnite.name=Saturnitbüchse +item.gun_lever_action_sonata.name=Verkehrter Mare's Leg item.gun_lever_action_sonata_2.name=§cSonatas Mikrophon§r item.gun_b92.name=§9B92 Energiepistole§r item.gun_b93.name=§cB93 Energiemod§r diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index c0097ddf3..2879624b2 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -265,6 +265,7 @@ item.turret_biometry.name=Turret Telemetry Card tile.mine_ap.name=Anti-Personell Mine tile.mine_he.name=Anti-Tank Mine tile.mine_shrap.name=Shrapnel Mine +tile.mine_fat.name=Fat Mine item.defuser.name=High-Tech Bomb Defusing Device tile.crate.name=Supply Crate @@ -1128,6 +1129,7 @@ item.gun_lever_action.name=Mare's Leg (Original) item.gun_bolt_action.name=Dream Bolt-Action Rifle (Original) item.gun_lever_action_dark.name=Mare's Leg (Dark) item.gun_bolt_action_green.name=Dream Bolt-Action Rifle (Green) +item.gun_bolt_action_saturnite.name=Saturnite Rifle item.gun_lever_action_sonata.name=Flipped Mare's Leg item.gun_lever_action_sonata_2.name=§cSonata's Microphone§r item.gun_b92.name=§9B92 Energy Pistol§r diff --git a/assets/hbm/models/mine_fat.obj b/assets/hbm/models/mine_fat.obj new file mode 100644 index 000000000..0dddca7db --- /dev/null +++ b/assets/hbm/models/mine_fat.obj @@ -0,0 +1,1208 @@ +# Blender v2.76 (sub 0) OBJ File: 'mine_fat.blend' +# www.blender.org +o Sphere +v -0.191342 0.500000 0.692910 +v -0.353553 0.500000 0.530330 +v -0.461940 0.500000 0.287013 +v -0.500000 0.500000 -0.000000 +v -0.461940 0.500000 -0.287013 +v -0.353553 0.500000 -0.530330 +v -0.191342 0.500000 -0.692910 +v -0.000000 0.500000 -0.750000 +v -0.135299 0.635299 0.692910 +v -0.250000 0.750000 0.530330 +v -0.326641 0.826641 0.287013 +v -0.353553 0.853553 -0.000000 +v -0.326641 0.826641 -0.287013 +v -0.250000 0.750000 -0.530330 +v -0.135299 0.635299 -0.692910 +v -0.000000 0.691342 0.692910 +v -0.000000 0.853553 0.530330 +v -0.000000 0.961940 0.287013 +v -0.000000 1.000000 -0.000000 +v -0.000000 0.961940 -0.287013 +v -0.000000 0.853553 -0.530330 +v -0.000000 0.691342 -0.692910 +v -0.000000 0.500000 0.750000 +v 0.135299 0.635299 0.692910 +v 0.250000 0.750000 0.530330 +v 0.326641 0.826641 0.287013 +v 0.353553 0.853553 -0.000000 +v 0.326641 0.826641 -0.287013 +v 0.250000 0.750000 -0.530330 +v 0.135299 0.635299 -0.692910 +v 0.191342 0.500000 0.692910 +v 0.353553 0.500000 0.530330 +v 0.461940 0.500000 0.287013 +v 0.500000 0.500000 -0.000000 +v 0.461940 0.500000 -0.287013 +v 0.353553 0.500000 -0.530330 +v 0.191342 0.500000 -0.692910 +v 0.135299 0.364701 0.692910 +v 0.250000 0.250000 0.530330 +v 0.326641 0.173359 0.287013 +v 0.353553 0.146447 0.000000 +v 0.326641 0.173359 -0.287013 +v 0.250000 0.250000 -0.530330 +v 0.135299 0.364701 -0.692910 +v -0.000000 0.308658 0.692910 +v -0.000000 0.146447 0.530330 +v -0.000000 0.038060 0.287013 +v -0.000000 0.000000 0.000000 +v -0.000000 0.038060 -0.287013 +v -0.000000 0.146447 -0.530330 +v -0.000000 0.308658 -0.692910 +v -0.135299 0.364701 0.692910 +v -0.250000 0.250000 0.530330 +v -0.326641 0.173359 0.287013 +v -0.353553 0.146447 0.000000 +v -0.326641 0.173359 -0.287013 +v -0.250000 0.250000 -0.530330 +v -0.135299 0.364701 -0.692910 +v 0.000000 1.000000 -0.750000 +v 0.353553 0.853553 -0.750000 +v 0.500000 0.500000 -0.750000 +v 0.353553 0.146447 -0.750000 +v -0.000000 0.000000 -0.750000 +v -0.353553 0.146447 -0.750000 +v -0.500000 0.500000 -0.750000 +v -0.353553 0.853553 -0.750000 +v 0.176777 0.926777 -1.100000 +v 0.426777 0.676777 -1.100000 +v 0.426777 0.323223 -1.100000 +v 0.176777 0.073223 -1.100000 +v -0.176777 0.073223 -1.100000 +v -0.426777 0.323223 -1.100000 +v -0.426777 0.676777 -1.100000 +v -0.176777 0.926777 -1.100000 +v 0.176777 0.926777 -0.875000 +v 0.426777 0.676777 -0.875000 +v 0.426777 0.323223 -0.875000 +v 0.176777 0.073223 -0.875000 +v -0.176777 0.073223 -0.875000 +v -0.426777 0.323223 -0.875000 +v -0.426777 0.676777 -0.875000 +v -0.176777 0.926777 -0.875000 +v 0.353553 0.853553 -0.875000 +v 0.353553 0.146447 -0.875000 +v -0.353553 0.146447 -0.875000 +v -0.353553 0.853553 -0.875000 +v 0.000000 1.000000 -1.100000 +v 0.500000 0.500000 -1.100000 +v -0.000000 -0.000000 -1.100000 +v -0.500000 0.500000 -1.100000 +v 0.200000 0.500000 -0.600000 +v -0.200000 0.500000 -0.600000 +v -0.000000 0.300000 -0.600000 +v 0.000000 0.700000 -0.600000 +v 0.000000 0.700000 -1.100000 +v -0.000000 0.300000 -1.100000 +v -0.200000 0.500000 -1.100000 +v 0.200000 0.500000 -1.100000 +v 0.000000 1.000000 -0.600000 +v 0.500000 0.500000 -0.600000 +v -0.000000 0.000000 -0.600000 +v -0.500000 0.500000 -0.600000 +v 0.350000 0.500000 -0.450000 +v -0.350000 0.500000 -0.450000 +v -0.000000 0.150000 -0.450000 +v 0.000000 0.850000 -0.450000 +v -0.225000 0.150000 1.000000 +v -0.225000 0.850000 1.000000 +v -0.225000 0.150000 0.700000 +v -0.225000 0.850000 0.700000 +v 0.225000 0.150000 1.000000 +v 0.225000 0.850000 1.000000 +v 0.225000 0.150000 0.700000 +v 0.225000 0.850000 0.700000 +v -0.100000 0.850000 0.775000 +v -0.100000 0.900000 0.775000 +v -0.046967 0.850000 0.796967 +v -0.046967 0.900000 0.796967 +v -0.025000 0.850000 0.850000 +v -0.025000 0.900000 0.850000 +v -0.046967 0.850000 0.903033 +v -0.046967 0.900000 0.903033 +v -0.100000 0.850000 0.925000 +v -0.100000 0.900000 0.925000 +v -0.153033 0.850000 0.903033 +v -0.153033 0.900000 0.903033 +v -0.175000 0.850000 0.850000 +v -0.175000 0.900000 0.850000 +v -0.153033 0.850000 0.796967 +v -0.153033 0.900000 0.796967 +v -0.100000 0.900000 0.895000 +v -0.068180 0.905000 0.881820 +v -0.100000 0.910000 0.895000 +v -0.055000 0.910000 0.850000 +v -0.068180 0.915000 0.881820 +v -0.068180 0.915000 0.818180 +v -0.055000 0.920000 0.850000 +v -0.068180 0.925000 0.818180 +v -0.100000 0.920000 0.805000 +v -0.100000 0.930000 0.805000 +v -0.131820 0.925000 0.818180 +v -0.131820 0.900000 0.881820 +v -0.131820 0.890000 0.881820 +v -0.131820 0.985000 0.881820 +v -0.145000 0.980000 0.850000 +v -0.131820 0.975000 0.881820 +v -0.145000 0.930000 0.850000 +v -0.131820 0.935000 0.818180 +v -0.131820 0.975000 0.818180 +v -0.145000 0.970000 0.850000 +v -0.131820 0.965000 0.818180 +v -0.100000 0.970000 0.805000 +v -0.100000 0.960000 0.805000 +v -0.131820 0.935000 0.881820 +v -0.145000 0.940000 0.850000 +v -0.068180 0.965000 0.818180 +v -0.055000 0.960000 0.850000 +v -0.068180 0.955000 0.818180 +v -0.068180 0.955000 0.881820 +v -0.055000 0.950000 0.850000 +v -0.100000 0.950000 0.895000 +v -0.131820 0.945000 0.881820 +v -0.068180 0.945000 0.881820 +v -0.100000 0.940000 0.895000 +v -0.131820 1.025000 0.881820 +v -0.145000 1.020000 0.850000 +v -0.131820 1.015000 0.881820 +v -0.131820 1.015000 0.818180 +v -0.145000 1.010000 0.850000 +v -0.131820 1.005000 0.818180 +v -0.100000 1.010000 0.805000 +v -0.100000 1.000000 0.805000 +v -0.068180 1.005000 0.818180 +v -0.055000 1.000000 0.850000 +v -0.068180 0.995000 0.818180 +v -0.068180 0.995000 0.881820 +v -0.055000 0.990000 0.850000 +v -0.100000 0.990000 0.895000 +v -0.068180 0.985000 0.881820 +v -0.100000 0.980000 0.895000 +v -0.131820 1.065000 0.881820 +v -0.145000 1.060000 0.850000 +v -0.131820 1.055000 0.881820 +v -0.131820 1.055000 0.818180 +v -0.145000 1.050000 0.850000 +v -0.131820 1.045000 0.818180 +v -0.100000 1.050000 0.805000 +v -0.100000 1.040000 0.805000 +v -0.068180 1.045000 0.818180 +v -0.055000 1.040000 0.850000 +v -0.068180 1.035000 0.818180 +v -0.068180 1.035000 0.881820 +v -0.055000 1.030000 0.850000 +v -0.100000 1.030000 0.895000 +v -0.068180 1.025000 0.881820 +v -0.100000 1.020000 0.895000 +v -0.100000 1.070000 0.895000 +v -0.100000 1.060000 0.895000 +v -0.090000 1.070000 0.895000 +v -0.090000 1.060000 0.895000 +v -0.100000 1.570000 0.895000 +v -0.090000 1.570000 0.895000 +v 0.100000 0.875000 0.810000 +v 0.128284 0.875000 0.821716 +v 0.100000 0.850000 0.800000 +v 0.100000 0.875000 0.800000 +v 0.135355 0.850000 0.814645 +v 0.135355 0.875000 0.814645 +v 0.150000 0.850000 0.850000 +v 0.150000 0.875000 0.850000 +v 0.135355 0.850000 0.885355 +v 0.135355 0.875000 0.885355 +v 0.100000 0.850000 0.900000 +v 0.100000 0.875000 0.900000 +v 0.064645 0.850000 0.885355 +v 0.064645 0.875000 0.885355 +v 0.050000 0.850000 0.850000 +v 0.050000 0.875000 0.850000 +v 0.064645 0.850000 0.814645 +v 0.064645 0.875000 0.814645 +v 0.140000 0.875000 0.850000 +v 0.128284 0.875000 0.878284 +v 0.100000 0.875000 0.890000 +v 0.071716 0.875000 0.878284 +v 0.060000 0.875000 0.850000 +v 0.071716 0.875000 0.821716 +v 0.100000 0.890000 0.810000 +v 0.071716 0.890000 0.821716 +v 0.060000 0.890000 0.850000 +v 0.071716 0.890000 0.878284 +v 0.100000 0.890000 0.890000 +v 0.128284 0.890000 0.878284 +v 0.140000 0.890000 0.850000 +v 0.128284 0.890000 0.821716 +v 0.100000 0.905000 0.820000 +v 0.078787 0.905000 0.828787 +v 0.070000 0.905000 0.850000 +v 0.078787 0.905000 0.871213 +v 0.100000 0.905000 0.880000 +v 0.121213 0.905000 0.871213 +v 0.130000 0.905000 0.850000 +v 0.121213 0.905000 0.828787 +v -0.235000 0.425000 1.010000 +v -0.235000 0.775000 1.010000 +v 0.235000 0.425000 1.010000 +v 0.235000 0.775000 1.010000 +v -0.270250 0.425000 0.410000 +v -0.270250 0.775000 0.410000 +v 0.270250 0.425000 0.410000 +v 0.270250 0.775000 0.410000 +v -0.075000 1.150000 0.500000 +v 0.075000 1.150000 0.500000 +v -0.075000 1.150000 -0.500000 +v 0.075000 1.150000 -0.500000 +v -0.075000 1.200000 0.000000 +v 0.075000 1.200000 0.000000 +v -0.075000 0.800000 0.550000 +v 0.075000 0.800000 0.550000 +v -0.075000 0.800000 -0.550000 +v 0.075000 0.800000 -0.550000 +v -0.050000 0.400000 1.000000 +v -0.050000 0.400000 1.050000 +v 0.020711 0.370711 1.000000 +v 0.020711 0.370711 1.050000 +v 0.050000 0.300000 1.000000 +v 0.050000 0.300000 1.050000 +v 0.020711 0.229289 1.000000 +v 0.020711 0.229289 1.050000 +v -0.050000 0.200000 1.000000 +v -0.050000 0.200000 1.050000 +v -0.120711 0.229289 1.000000 +v -0.120711 0.229289 1.050000 +v -0.150000 0.300000 1.000000 +v -0.150000 0.300000 1.050000 +v -0.120711 0.370711 1.000000 +v -0.120711 0.370711 1.050000 +v -0.065274 0.239884 1.230059 +v -0.071600 0.226042 1.223604 +v -0.065274 0.212199 1.217149 +v -0.050000 0.206465 1.214475 +v -0.034727 0.212199 1.217149 +v -0.028400 0.226042 1.223604 +v -0.050000 0.245618 1.232732 +v -0.034727 0.239884 1.230059 +v -0.024544 0.259678 1.211704 +v -0.014000 0.236607 1.200946 +v -0.024544 0.213536 1.190188 +v -0.050000 0.203980 1.185732 +v -0.075456 0.213536 1.190188 +v -0.086000 0.236607 1.200946 +v -0.075456 0.259678 1.211704 +v -0.050000 0.269234 1.216160 +v -0.075456 0.331523 1.057632 +v -0.086000 0.308452 1.046874 +v -0.075456 0.285381 1.036116 +v -0.050000 0.275825 1.031659 +v -0.024544 0.285381 1.036116 +v -0.014000 0.308452 1.046874 +v -0.050000 0.341079 1.062088 +v -0.024544 0.331523 1.057632 +v 0.006569 0.356569 1.050000 +v -0.050000 0.380000 1.050000 +v 0.030000 0.300000 1.050000 +v 0.006569 0.243431 1.050000 +v -0.050000 0.220000 1.050000 +v -0.106569 0.243431 1.050000 +v -0.130000 0.300000 1.050000 +v -0.106569 0.356569 1.050000 +v 0.006569 0.356569 1.065000 +v -0.050000 0.380000 1.065000 +v 0.030000 0.300000 1.065000 +v 0.006569 0.243431 1.065000 +v -0.050000 0.220000 1.065000 +v -0.106569 0.243431 1.065000 +v -0.130000 0.300000 1.065000 +v -0.106569 0.356569 1.065000 +vt 0.628826 0.653838 +vt 0.561052 0.672886 +vt 0.561028 0.589937 +vt 0.391763 0.690114 +vt 0.391730 0.572807 +vt 0.480369 0.577246 +vt 0.222465 0.672983 +vt 0.222441 0.590034 +vt 0.303093 0.577297 +vt 0.480400 0.685623 +vt 0.303124 0.685674 +vt 0.154680 0.653974 +vt 0.154667 0.609082 +vt 0.628813 0.608946 +vt 0.097729 0.631544 +vt 0.685764 0.631376 +vt 0.479227 0.978483 +vt 0.371939 0.978483 +vt 0.410256 0.919830 +vt 0.371939 0.861177 +vt 0.410256 0.861177 +vt 0.410256 0.802523 +vt 0.371939 0.743870 +vt 0.479227 0.743870 +vt 0.159539 0.832193 +vt 0.312808 0.832193 +vt 0.205520 0.740231 +vt 0.159539 0.740231 +vt 0.205520 0.832193 +vt 0.264229 0.442193 +vt 0.264229 0.227617 +vt 0.356190 0.227617 +vt 0.126287 0.442193 +vt 0.126287 0.227617 +vt 0.494132 0.442193 +vt 0.494132 0.227617 +vt 0.586094 0.227617 +vt 0.356190 0.442193 +vt 0.126287 0.135655 +vt 0.264229 0.534154 +vt 0.146421 0.942265 +vt 0.162677 0.935531 +vt 0.168543 0.949692 +vt 0.169411 0.919275 +vt 0.183571 0.925140 +vt 0.162677 0.903018 +vt 0.176838 0.897153 +vt 0.146421 0.896284 +vt 0.152286 0.882124 +vt 0.130164 0.903018 +vt 0.124299 0.888858 +vt 0.123430 0.919275 +vt 0.109270 0.913409 +vt 0.130164 0.935531 +vt 0.140555 0.956425 +vt 0.116004 0.941397 +vt 0.877669 0.046860 +vt 0.874655 0.047419 +vt 0.874234 0.036760 +vt 0.877248 0.036200 +vt 0.873813 0.026100 +vt 0.878090 0.057519 +vt 0.875077 0.058079 +vt 0.878512 0.068178 +vt 0.878933 0.078838 +vt 0.875919 0.079397 +vt 0.875498 0.068738 +vt 0.879354 0.089497 +vt 0.876340 0.090057 +vt 0.879775 0.100156 +vt 0.881039 0.132135 +vt 0.878025 0.132694 +vt 0.877604 0.122035 +vt 0.880617 0.121475 +vt 0.877183 0.111376 +vt 0.881460 0.142794 +vt 0.878446 0.143354 +vt 0.881881 0.153453 +vt 0.882303 0.164113 +vt 0.879289 0.164673 +vt 0.878868 0.154013 +vt 0.882724 0.174772 +vt 0.879710 0.175332 +vt 0.883145 0.185432 +vt 0.876762 0.100716 +vt 0.880196 0.110816 +vt 0.874899 0.015161 +vt 0.877913 0.014602 +vt 0.876827 0.025541 +vt 0.884409 0.217410 +vt 0.881395 0.217970 +vt 0.880974 0.207310 +vt 0.883987 0.206751 +vt 0.880552 0.196651 +vt 0.884830 0.228069 +vt 0.881816 0.228629 +vt 0.885251 0.238729 +vt 0.885672 0.249388 +vt 0.882659 0.249948 +vt 0.882238 0.239289 +vt 0.886094 0.260048 +vt 0.883080 0.260608 +vt 0.886515 0.270707 +vt 0.887779 0.302686 +vt 0.884765 0.303245 +vt 0.884344 0.292586 +vt 0.887357 0.292026 +vt 0.883923 0.281927 +vt 0.888200 0.313345 +vt 0.885186 0.313905 +vt 0.888622 0.324005 +vt 0.889043 0.334664 +vt 0.886029 0.335224 +vt 0.885608 0.324564 +vt 0.889464 0.345323 +vt 0.886450 0.345883 +vt 0.889885 0.355983 +vt 0.886936 0.281367 +vt 0.883501 0.271267 +vt 0.883566 0.196091 +vt 0.880131 0.185991 +vt 0.890307 0.366642 +vt 0.887293 0.367202 +vt 0.886872 0.356543 +vt 0.890866 0.369656 +vt 0.887853 0.370216 +vt 0.737137 0.398213 +vt 0.736577 0.395198 +vt 0.541724 0.779480 +vt 0.543484 0.775231 +vt 0.552154 0.778823 +vt 0.533838 0.836312 +vt 0.538327 0.825474 +vt 0.540495 0.827641 +vt 0.560003 0.847149 +vt 0.564492 0.836311 +vt 0.571572 0.839244 +vt 0.537846 0.752776 +vt 0.542094 0.754536 +vt 0.538502 0.763206 +vt 0.549165 0.851638 +vt 0.549165 0.848573 +vt 0.557835 0.844982 +vt 0.560003 0.825474 +vt 0.567083 0.822541 +vt 0.534254 0.766931 +vt 0.538502 0.765171 +vt 0.542094 0.773842 +vt 0.549165 0.820985 +vt 0.549165 0.824050 +vt 0.552097 0.813905 +vt 0.555879 0.783071 +vt 0.554119 0.778823 +vt 0.562790 0.775232 +vt 0.538327 0.847149 +vt 0.540495 0.844982 +vt 0.535394 0.818394 +vt 0.553137 0.773385 +vt 0.559639 0.770691 +vt 0.557835 0.827641 +vt 0.526758 0.833379 +vt 0.536903 0.836312 +vt 0.564549 0.748898 +vt 0.562790 0.753146 +vt 0.554119 0.749554 +vt 0.531247 0.850082 +vt 0.562935 0.854229 +vt 0.546232 0.858719 +vt 0.572019 0.761446 +vt 0.567771 0.763206 +vt 0.564179 0.754536 +vt 0.561426 0.836311 +vt 0.568428 0.775601 +vt 0.564180 0.773842 +vt 0.567771 0.765171 +vt 0.550394 0.745306 +vt 0.552154 0.749554 +vt 0.543484 0.753146 +vt 0.546634 0.770691 +vt 0.553137 0.754992 +vt 0.559639 0.757686 +vt 0.562333 0.764189 +vt 0.546634 0.757686 +vt 0.543940 0.764189 +vt 0.867378 0.633716 +vt 0.867378 0.777789 +vt 0.760090 0.777789 +vt 0.867378 0.962029 +vt 0.760090 0.962029 +vt 0.760090 0.449477 +vt 0.867378 0.449477 +vt 0.402749 0.048192 +vt 0.556782 0.048192 +vt 0.556782 0.094173 +vt 0.248716 0.048192 +vt 0.402749 0.094173 +vt 0.248716 0.094173 +vt 0.140338 0.094173 +vt 0.140338 0.048192 +vt 0.665160 0.048192 +vt 0.665160 0.094173 +vt 0.278815 0.947502 +vt 0.295405 0.930913 +vt 0.306243 0.941750 +vt 0.295405 0.907451 +vt 0.310732 0.907451 +vt 0.306243 0.896613 +vt 0.278815 0.890862 +vt 0.278815 0.875535 +vt 0.255354 0.890862 +vt 0.238764 0.907451 +vt 0.227926 0.896613 +vt 0.238764 0.930913 +vt 0.223437 0.930913 +vt 0.276469 0.896526 +vt 0.257700 0.896526 +vt 0.255354 0.962829 +vt 0.255354 0.947502 +vt 0.244516 0.958340 +vt 0.621935 0.742318 +vt 0.621935 0.750764 +vt 0.613254 0.749075 +vt 0.621935 0.725426 +vt 0.621935 0.733872 +vt 0.613254 0.732182 +vt 0.621935 0.776102 +vt 0.621935 0.784548 +vt 0.613254 0.782859 +vt 0.621935 0.759210 +vt 0.621935 0.767656 +vt 0.613254 0.765967 +vt 0.613254 0.740628 +vt 0.613254 0.723736 +vt 0.613254 0.718669 +vt 0.613254 0.774413 +vt 0.613254 0.769345 +vt 0.674046 0.742318 +vt 0.674046 0.750764 +vt 0.674046 0.725426 +vt 0.674046 0.733872 +vt 0.674046 0.776102 +vt 0.674046 0.759210 +vt 0.621935 0.716979 +vt 0.674046 0.716980 +vt 0.674046 0.767656 +vt 0.613254 0.757521 +vt 0.613254 0.752453 +vt 0.638688 0.827862 +vt 0.643756 0.827862 +vt 0.647340 0.836513 +vt 0.574922 0.909916 +vt 0.571671 0.913167 +vt 0.558399 0.899895 +vt 0.244428 0.928566 +vt 0.257700 0.941838 +vt 0.289741 0.928567 +vt 0.289741 0.909797 +vt 0.244428 0.909797 +vt 0.276469 0.941838 +vt 0.526358 0.931936 +vt 0.539630 0.899895 +vt 0.561650 0.948459 +vt 0.558399 0.945208 +vt 0.571671 0.931936 +vt 0.539630 0.949806 +vt 0.539630 0.945208 +vt 0.521760 0.913167 +vt 0.526358 0.913167 +vt 0.558399 0.895297 +vt 0.576269 0.931936 +vt 0.523107 0.935187 +vt 0.536379 0.896644 +vt 0.479227 0.919830 +vt 0.479227 0.802523 +vt 0.113558 0.786212 +vt 0.312808 0.740231 +vt 0.586094 0.442193 +vt 0.264229 0.135655 +vt 0.126287 0.534154 +vt 0.152286 0.956425 +vt 0.176838 0.941397 +vt 0.183571 0.913409 +vt 0.168543 0.888858 +vt 0.140555 0.882124 +vt 0.116004 0.897153 +vt 0.124299 0.949692 +vt 0.109270 0.925140 +vt 0.550394 0.783071 +vt 0.567083 0.850082 +vt 0.534254 0.761446 +vt 0.571572 0.833379 +vt 0.537846 0.775601 +vt 0.562935 0.818394 +vt 0.564549 0.779480 +vt 0.546232 0.813905 +vt 0.531247 0.822541 +vt 0.555879 0.745306 +vt 0.526758 0.839244 +vt 0.552097 0.858718 +vt 0.535394 0.854229 +vt 0.568428 0.752776 +vt 0.572019 0.766931 +vt 0.541724 0.748898 +vt 0.760090 0.633716 +vt 0.289653 0.958340 +vt 0.310732 0.930913 +vt 0.289653 0.880024 +vt 0.255354 0.875535 +vt 0.244516 0.880024 +vt 0.223437 0.907451 +vt 0.278815 0.962829 +vt 0.227926 0.941750 +vt 0.613254 0.744007 +vt 0.613254 0.727115 +vt 0.613254 0.777791 +vt 0.613254 0.760899 +vt 0.613254 0.735561 +vt 0.674046 0.784548 +vt 0.643756 0.840096 +vt 0.638688 0.840096 +vt 0.635105 0.836513 +vt 0.635105 0.831445 +vt 0.647340 0.831445 +vt 0.561650 0.896644 +vt 0.574922 0.935188 +vt 0.558399 0.949806 +vt 0.521760 0.931936 +vt 0.539630 0.895297 +vt 0.576269 0.913167 +vt 0.536379 0.948459 +vt 0.523107 0.909916 +vn -0.679300 0.281400 -0.677800 +vn -0.917000 0.379800 -0.121600 +vn -0.854400 0.353900 0.380600 +vn -0.854400 0.353900 -0.380600 +vn -0.917000 0.379800 0.121600 +vn -0.679300 0.281400 0.677800 +vn -0.353900 0.854400 0.380600 +vn -0.353900 0.854400 -0.380600 +vn -0.379800 0.917000 0.121600 +vn -0.281400 0.679300 0.677800 +vn -0.281400 0.679300 -0.677800 +vn -0.379800 0.917000 -0.121600 +vn 0.353900 0.854400 -0.380600 +vn 0.379800 0.917000 0.121600 +vn 0.281400 0.679300 0.677800 +vn 0.281400 0.679300 -0.677800 +vn 0.379800 0.917000 -0.121600 +vn 0.353900 0.854400 0.380600 +vn 0.679300 0.281400 0.677800 +vn 0.679300 0.281400 -0.677800 +vn 0.917000 0.379800 -0.121600 +vn 0.854400 0.353900 0.380600 +vn 0.854400 0.353900 -0.380600 +vn 0.917000 0.379800 0.121600 +vn 0.679300 -0.281400 -0.677800 +vn 0.917000 -0.379800 -0.121600 +vn 0.854400 -0.353900 0.380600 +vn 0.854400 -0.353900 -0.380600 +vn 0.917000 -0.379800 0.121600 +vn 0.679300 -0.281400 0.677800 +vn 0.353900 -0.854400 -0.380600 +vn 0.379800 -0.917000 0.121600 +vn 0.281400 -0.679300 0.677800 +vn 0.281400 -0.679300 -0.677800 +vn 0.379800 -0.917000 -0.121600 +vn 0.353900 -0.854400 0.380600 +vn -0.353900 -0.854400 -0.380600 +vn -0.379800 -0.917000 0.121600 +vn -0.281400 -0.679300 0.677800 +vn -0.281400 -0.679300 -0.677800 +vn -0.379800 -0.917000 -0.121600 +vn -0.353900 -0.854400 0.380600 +vn -0.283900 0.117600 0.951600 +vn -0.283900 0.117600 -0.951600 +vn -0.117600 0.283900 0.951600 +vn -0.117600 0.283900 -0.951600 +vn 0.117600 0.283900 -0.951600 +vn 0.117600 0.283900 0.951600 +vn 0.283900 0.117600 0.951600 +vn 0.283900 0.117600 -0.951600 +vn 0.283900 -0.117600 0.951600 +vn 0.283900 -0.117600 -0.951600 +vn 0.117600 -0.283900 0.951600 +vn 0.117600 -0.283900 -0.951600 +vn -0.117600 -0.283900 0.951600 +vn -0.117600 -0.283900 -0.951600 +vn -0.679300 -0.281400 -0.677800 +vn -0.917000 -0.379800 -0.121600 +vn -0.854400 -0.353900 0.380600 +vn -0.283900 -0.117600 0.951600 +vn -0.283900 -0.117600 -0.951600 +vn -0.854400 -0.353900 -0.380600 +vn -0.917000 -0.379800 0.121600 +vn -0.679300 -0.281400 0.677800 +vn 0.382700 0.923900 0.000000 +vn 0.923900 0.382700 0.000000 +vn 0.923900 -0.382700 0.000000 +vn 0.382700 -0.923900 0.000000 +vn -0.382700 -0.923900 0.000000 +vn -0.923900 -0.382700 0.000000 +vn -0.923900 0.382700 0.000000 +vn -0.382700 0.923900 -0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.382700 0.000000 -0.923900 +vn 0.923900 0.000000 -0.382700 +vn 0.923900 0.000000 0.382700 +vn 0.382700 0.000000 0.923900 +vn -0.382700 0.000000 0.923900 +vn -0.923900 0.000000 0.382700 +vn -0.382700 0.000000 -0.923900 +vn -0.923900 0.000000 -0.382700 +vn -0.325800 0.524400 -0.786600 +vn 0.325800 0.524400 -0.786600 +vn 0.786600 0.524400 0.325800 +vn -0.325800 0.524400 0.786600 +vn -0.786600 0.524400 -0.325800 +vn 0.786600 0.524400 -0.325800 +vn 0.325800 0.524400 0.786600 +vn -0.786600 0.524400 0.325800 +vn 0.998300 0.000000 0.058600 +vn -0.998300 0.000000 0.058600 +vn 0.000000 0.995000 -0.099500 +vn 0.000000 0.995000 0.099500 +vn 0.000000 0.141400 0.989900 +vn 0.000000 0.141400 -0.989900 +vn 0.337800 0.540600 0.770400 +vn 0.815600 -0.504700 0.283000 +vn -0.337800 -0.937700 0.081100 +vn -0.815600 0.107600 0.568500 +vn 0.815600 0.107600 0.568500 +vn 0.337800 -0.937700 0.081100 +vn -0.815600 -0.504700 0.283000 +vn 0.382700 0.837300 0.390400 +vn 0.923900 -0.346800 -0.161700 +vn -0.382700 -0.837300 -0.390400 +vn -0.923900 0.346800 0.161700 +vn 0.923900 0.346800 0.161700 +vn 0.382700 -0.837300 -0.390400 +vn -0.923900 -0.346800 -0.161700 +vn -0.382700 0.837300 0.390400 +vn -0.337800 0.540600 0.770400 +vn 0.000000 -0.422600 0.906300 +s off +f 7/1/1 6/2/1 14/3/1 +f 4/4/2 12/5/2 13/6/2 +f 2/7/3 10/8/3 11/9/3 +f 5/10/4 13/6/4 14/3/4 +f 3/11/5 11/9/5 12/5/5 +f 1/12/6 9/13/6 10/8/6 +f 10/7/7 17/8/7 18/9/7 +f 13/10/8 20/6/8 21/3/8 +f 12/4/9 11/11/9 18/9/9 +f 9/12/10 16/13/10 17/8/10 +f 15/1/11 14/2/11 21/3/11 +f 12/4/12 19/5/12 20/6/12 +f 21/2/13 20/10/13 28/6/13 +f 18/11/14 26/9/14 27/5/14 +f 16/12/15 24/13/15 25/8/15 +f 21/2/16 29/3/16 30/14/16 +f 19/4/17 27/5/17 28/6/17 +f 17/7/18 25/8/18 26/9/18 +f 25/7/19 24/12/19 31/13/19 +f 30/1/20 29/2/20 36/3/20 +f 27/4/21 34/5/21 35/6/21 +f 25/7/22 32/8/22 33/9/22 +f 29/2/23 28/10/23 35/6/23 +f 26/11/24 33/9/24 34/5/24 +f 36/2/25 43/3/25 44/14/25 +f 34/4/26 41/5/26 42/6/26 +f 32/7/27 39/8/27 40/9/27 +f 36/2/28 35/10/28 42/6/28 +f 34/4/29 33/11/29 40/9/29 +f 32/7/30 31/12/30 38/13/30 +f 42/10/31 49/6/31 50/3/31 +f 41/4/32 40/11/32 47/9/32 +f 38/12/33 45/13/33 46/8/33 +f 44/1/34 43/2/34 50/3/34 +f 41/4/35 48/5/35 49/6/35 +f 39/7/36 46/8/36 47/9/36 +f 50/2/37 49/10/37 56/6/37 +f 47/11/38 54/9/38 55/5/38 +f 45/12/39 52/13/39 53/8/39 +f 51/1/40 50/2/40 57/3/40 +f 48/4/41 55/5/41 56/6/41 +f 46/7/42 53/8/42 54/9/42 +f 1/12/43 23/15/43 9/13/43 +f 8/16/44 7/1/44 15/14/44 +f 9/12/45 23/15/45 16/13/45 +f 8/16/46 15/1/46 22/14/46 +f 8/16/47 22/1/47 30/14/47 +f 16/12/48 23/15/48 24/13/48 +f 24/12/49 23/15/49 31/13/49 +f 8/16/50 30/1/50 37/14/50 +f 31/12/51 23/15/51 38/13/51 +f 8/16/52 37/1/52 44/14/52 +f 38/12/53 23/15/53 45/13/53 +f 8/16/54 44/1/54 51/14/54 +f 45/12/55 23/15/55 52/13/55 +f 8/16/56 51/1/56 58/14/56 +f 57/2/57 6/3/57 7/14/57 +f 55/4/58 4/5/58 5/6/58 +f 54/11/59 53/7/59 2/8/59 +f 52/12/60 23/15/60 1/13/60 +f 8/16/61 58/1/61 7/14/61 +f 56/10/62 5/6/62 6/3/62 +f 54/11/63 3/9/63 4/5/63 +f 53/7/64 52/12/64 1/13/64 +f 87/17/65 59/18/65 75/19/65 +f 60/20/65 83/21/65 75/19/65 +f 76/22/66 61/23/66 88/24/66 +f 60/20/66 61/23/66 76/22/66 +f 88/17/67 61/18/67 77/19/67 +f 62/20/67 84/21/67 77/19/67 +f 62/20/68 63/23/68 78/22/68 +f 78/22/68 63/23/68 89/24/68 +f 89/17/69 63/18/69 79/19/69 +f 64/20/69 85/21/69 79/19/69 +f 64/20/70 65/23/70 80/22/70 +f 80/22/70 65/23/70 90/24/70 +f 90/17/71 65/18/71 81/19/71 +f 66/20/71 86/21/71 81/19/71 +f 66/20/72 59/23/72 82/22/72 +f 82/22/72 59/23/72 87/24/72 +f 92/25/73 97/26/73 65/27/73 +f 99/25/74 94/28/74 59/29/74 +f 61/27/73 91/25/73 100/28/73 +f 63/27/74 93/25/74 101/28/74 +f 110/30/75 109/31/75 107/32/75 +f 114/33/76 113/34/76 109/31/76 +f 112/35/74 111/36/74 113/37/74 +f 108/38/77 107/32/77 111/36/77 +f 109/31/78 113/34/78 111/39/78 +f 114/33/73 110/30/73 108/40/73 +f 116/41/79 118/42/79 117/43/79 +f 118/42/80 120/44/80 119/45/80 +f 120/44/81 122/46/81 121/47/81 +f 122/46/82 124/48/82 123/49/82 +f 124/48/83 126/50/83 125/51/83 +f 126/50/84 128/52/84 127/53/84 +f 130/54/85 116/41/85 115/55/85 +f 128/52/86 130/54/86 129/56/86 +f 128/52/73 124/48/73 120/44/73 +f 134/57/81 137/58/81 135/59/81 +f 132/60/82 135/59/82 133/61/82 +f 137/58/80 134/57/80 136/62/80 +f 138/63/79 136/62/79 139/64/79 +f 141/65/85 148/66/85 140/67/85 +f 148/66/86 141/65/86 147/68/86 +f 155/69/84 147/68/84 154/70/84 +f 160/71/81 157/72/81 159/73/81 +f 163/74/82 159/73/82 161/75/82 +f 157/72/80 160/71/80 158/76/80 +f 156/77/79 158/76/79 153/78/79 +f 151/79/85 149/80/85 152/81/85 +f 149/80/86 151/79/86 150/82/86 +f 145/83/84 150/82/84 146/84/84 +f 162/85/83 154/70/83 164/86/83 +f 142/87/83 143/88/83 131/89/83 +f 177/90/81 174/91/81 176/92/81 +f 179/93/82 176/92/82 178/94/82 +f 174/91/80 177/90/80 175/95/80 +f 173/96/79 175/95/79 172/97/79 +f 170/98/85 168/99/85 171/100/85 +f 168/99/86 170/98/86 169/101/86 +f 166/102/84 169/101/84 167/103/84 +f 193/104/81 190/105/81 192/106/81 +f 195/107/82 192/106/82 194/108/82 +f 190/105/80 193/104/80 191/109/80 +f 189/110/79 191/109/79 188/111/79 +f 186/112/85 184/113/85 187/114/85 +f 184/113/86 186/112/86 185/115/86 +f 182/116/84 185/115/84 183/117/84 +f 196/118/83 194/108/83 165/119/83 +f 180/120/83 178/94/83 144/121/83 +f 198/122/83 197/123/83 181/124/83 +f 200/125/77 199/126/77 197/123/77 +f 202/127/77 201/128/77 197/123/77 +f 225/129/86 229/130/86 228/131/86 +f 216/132/73 214/133/73 223/134/73 +f 206/135/79 208/136/79 207/137/79 +f 223/138/83 231/139/83 230/140/83 +f 220/141/73 226/142/73 203/143/73 +f 208/136/80 210/144/80 209/145/80 +f 224/146/84 230/147/84 229/148/84 +f 212/149/73 222/150/73 223/134/73 +f 210/144/81 212/149/81 211/151/81 +f 226/152/85 228/153/85 227/154/85 +f 218/155/73 225/156/73 226/142/73 +f 212/149/82 214/133/82 213/157/82 +f 228/153/87 236/158/87 235/159/87 +f 212/149/73 210/144/73 221/160/73 +f 214/133/83 216/132/83 215/161/83 +f 218/155/73 216/132/73 224/162/73 +f 221/163/81 233/164/81 232/165/81 +f 216/132/84 218/155/84 217/166/84 +f 208/136/73 206/135/73 203/143/73 +f 220/141/85 206/135/85 205/167/85 +f 218/155/86 220/141/86 219/168/86 +f 204/169/80 234/170/80 233/171/80 +f 208/136/73 204/172/73 221/160/73 +f 203/173/79 227/174/79 234/175/79 +f 222/176/82 232/177/82 231/178/82 +f 237/179/73 240/180/73 241/181/73 +f 227/174/88 235/159/88 242/182/88 +f 233/164/89 241/181/89 240/180/89 +f 230/140/90 231/139/90 239/183/90 +f 229/130/91 237/179/91 236/158/91 +f 233/171/92 234/170/92 242/182/92 +f 232/177/93 240/180/93 239/183/93 +f 230/147/94 238/184/94 237/179/94 +f 243/185/77 245/186/77 246/187/77 +f 249/188/95 250/189/95 246/187/95 +f 248/190/96 247/191/96 243/185/96 +f 256/192/97 254/193/97 253/194/97 +f 252/195/98 256/192/98 255/196/98 +f 251/197/99 257/198/99 258/199/99 +f 254/193/100 260/200/100 259/201/100 +f 262/202/65 264/203/65 263/204/65 +f 264/203/66 266/205/66 265/206/66 +f 265/207/67 266/205/67 268/208/67 +f 267/209/68 268/208/68 270/210/68 +f 270/210/69 272/211/69 271/212/69 +f 272/211/70 274/213/70 273/214/70 +f 268/208/77 304/215/77 305/216/77 +f 275/217/72 276/218/72 262/202/72 +f 274/213/71 276/218/71 275/219/71 +f 285/220/101 292/221/101 283/222/101 +f 287/223/102 286/224/102 282/225/102 +f 289/226/103 288/227/103 280/228/103 +f 291/229/104 290/230/104 278/231/104 +f 286/224/105 285/220/105 284/232/105 +f 287/223/106 281/233/106 280/234/106 +f 289/226/107 279/235/107 278/236/107 +f 285/220/108 300/237/108 299/238/108 +f 287/223/109 297/239/109 298/240/109 +f 288/227/110 289/226/110 295/241/110 +f 290/230/111 291/229/111 293/242/111 +f 286/224/112 298/240/112 300/237/112 +f 288/243/113 296/244/113 297/239/113 +f 290/230/114 294/245/114 295/241/114 +f 291/229/115 292/221/115 299/238/115 +f 291/229/116 277/246/116 283/247/116 +f 279/248/117 280/249/117 282/250/117 +f 303/251/67 311/252/67 312/253/67 +f 274/213/77 307/254/77 308/255/77 +f 264/203/77 301/256/77 303/257/77 +f 270/210/77 305/216/77 306/258/77 +f 276/218/77 308/255/77 302/259/77 +f 264/203/77 262/202/77 302/259/77 +f 266/205/77 303/257/77 304/215/77 +f 272/211/77 306/258/77 307/254/77 +f 315/260/77 313/261/77 311/252/77 +f 302/262/65 310/263/65 309/264/65 +f 308/265/72 316/266/72 310/263/72 +f 306/267/70 314/268/70 315/260/70 +f 304/269/68 312/253/68 313/261/68 +f 301/270/66 309/264/66 311/252/66 +f 307/271/71 315/260/71 316/266/71 +f 305/272/69 313/261/69 314/268/69 +f 15/14/1 7/1/1 14/3/1 +f 5/10/2 4/4/2 13/6/2 +f 3/11/3 2/7/3 11/9/3 +f 6/2/4 5/10/4 14/3/4 +f 4/4/5 3/11/5 12/5/5 +f 2/7/6 1/12/6 10/8/6 +f 11/11/7 10/7/7 18/9/7 +f 14/2/8 13/10/8 21/3/8 +f 19/5/9 12/4/9 18/9/9 +f 10/7/10 9/12/10 17/8/10 +f 22/14/11 15/1/11 21/3/11 +f 13/10/12 12/4/12 20/6/12 +f 29/3/13 21/2/13 28/6/13 +f 19/4/14 18/11/14 27/5/14 +f 17/7/15 16/12/15 25/8/15 +f 22/1/16 21/2/16 30/14/16 +f 20/10/17 19/4/17 28/6/17 +f 18/11/18 17/7/18 26/9/18 +f 32/8/19 25/7/19 31/13/19 +f 37/14/20 30/1/20 36/3/20 +f 28/10/21 27/4/21 35/6/21 +f 26/11/22 25/7/22 33/9/22 +f 36/3/23 29/2/23 35/6/23 +f 27/4/24 26/11/24 34/5/24 +f 37/1/25 36/2/25 44/14/25 +f 35/10/26 34/4/26 42/6/26 +f 33/11/27 32/7/27 40/9/27 +f 43/3/28 36/2/28 42/6/28 +f 41/5/29 34/4/29 40/9/29 +f 39/8/30 32/7/30 38/13/30 +f 43/2/31 42/10/31 50/3/31 +f 48/5/32 41/4/32 47/9/32 +f 39/7/33 38/12/33 46/8/33 +f 51/14/34 44/1/34 50/3/34 +f 42/10/35 41/4/35 49/6/35 +f 40/11/36 39/7/36 47/9/36 +f 57/3/37 50/2/37 56/6/37 +f 48/4/38 47/11/38 55/5/38 +f 46/7/39 45/12/39 53/8/39 +f 58/14/40 51/1/40 57/3/40 +f 49/10/41 48/4/41 56/6/41 +f 47/11/42 46/7/42 54/9/42 +f 58/1/57 57/2/57 7/14/57 +f 56/10/58 55/4/58 5/6/58 +f 3/9/59 54/11/59 2/8/59 +f 57/2/62 56/10/62 6/3/62 +f 55/4/63 54/11/63 4/5/63 +f 2/8/64 53/7/64 1/13/64 +f 67/273/65 87/17/65 75/19/65 +f 59/18/65 60/20/65 75/19/65 +f 68/274/66 76/22/66 88/24/66 +f 83/21/66 60/20/66 76/22/66 +f 69/273/67 88/17/67 77/19/67 +f 61/18/67 62/20/67 77/19/67 +f 84/21/68 62/20/68 78/22/68 +f 70/274/68 78/22/68 89/24/68 +f 71/273/69 89/17/69 79/19/69 +f 63/18/69 64/20/69 79/19/69 +f 85/21/70 64/20/70 80/22/70 +f 72/274/70 80/22/70 90/24/70 +f 73/273/71 90/17/71 81/19/71 +f 65/18/71 66/20/71 81/19/71 +f 86/21/72 66/20/72 82/22/72 +f 74/274/72 82/22/72 87/24/72 +f 65/27/73 102/28/73 92/25/73 +f 104/275/73 92/25/73 102/28/73 +f 97/26/73 90/276/73 65/27/73 +f 87/26/74 59/29/74 95/276/74 +f 99/25/74 106/275/74 94/28/74 +f 94/28/74 95/276/74 59/29/74 +f 103/275/73 100/28/73 91/25/73 +f 61/27/73 88/276/73 98/26/73 +f 98/26/73 91/25/73 61/27/73 +f 105/275/74 101/28/74 93/25/74 +f 63/27/74 89/276/74 96/26/74 +f 96/26/74 93/25/74 63/27/74 +f 108/38/75 110/30/75 107/32/75 +f 110/30/76 114/33/76 109/31/76 +f 114/277/74 112/35/74 113/37/74 +f 112/35/77 108/38/77 111/36/77 +f 107/278/78 109/31/78 111/39/78 +f 112/279/73 114/33/73 108/40/73 +f 115/280/79 116/41/79 117/43/79 +f 117/281/80 118/42/80 119/45/80 +f 119/282/81 120/44/81 121/47/81 +f 121/283/82 122/46/82 123/49/82 +f 123/284/83 124/48/83 125/51/83 +f 125/285/84 126/50/84 127/53/84 +f 129/286/85 130/54/85 115/55/85 +f 127/287/86 128/52/86 129/56/86 +f 120/44/73 118/42/73 128/52/73 +f 116/41/73 130/54/73 128/52/73 +f 128/52/73 126/50/73 124/48/73 +f 124/48/73 122/46/73 120/44/73 +f 118/42/73 116/41/73 128/52/73 +f 132/60/81 134/57/81 135/59/81 +f 131/89/82 132/60/82 133/61/82 +f 138/63/80 137/58/80 136/62/80 +f 140/67/79 138/63/79 139/64/79 +f 139/64/85 141/65/85 140/67/85 +f 155/69/86 148/66/86 147/68/86 +f 162/85/84 155/69/84 154/70/84 +f 163/74/81 160/71/81 159/73/81 +f 164/86/82 163/74/82 161/75/82 +f 156/77/80 157/72/80 158/76/80 +f 152/81/79 156/77/79 153/78/79 +f 153/78/85 151/79/85 152/81/85 +f 145/83/86 149/80/86 150/82/86 +f 144/121/84 145/83/84 146/84/84 +f 161/75/83 162/85/83 164/86/83 +f 133/61/83 142/87/83 131/89/83 +f 179/93/81 177/90/81 176/92/81 +f 180/120/82 179/93/82 178/94/82 +f 173/96/80 174/91/80 175/95/80 +f 171/100/79 173/96/79 172/97/79 +f 172/97/85 170/98/85 171/100/85 +f 166/102/86 168/99/86 169/101/86 +f 165/119/84 166/102/84 167/103/84 +f 195/107/81 193/104/81 192/106/81 +f 196/118/82 195/107/82 194/108/82 +f 189/110/80 190/105/80 191/109/80 +f 187/114/79 189/110/79 188/111/79 +f 188/111/85 186/112/85 187/114/85 +f 182/116/86 184/113/86 185/115/86 +f 181/124/84 182/116/84 183/117/84 +f 167/103/83 196/118/83 165/119/83 +f 146/84/83 180/120/83 144/121/83 +f 183/117/83 198/122/83 181/124/83 +f 198/122/77 200/125/77 197/123/77 +f 199/126/77 202/127/77 197/123/77 +f 226/288/86 225/129/86 228/131/86 +f 224/162/73 216/132/73 223/134/73 +f 205/289/79 206/135/79 207/137/79 +f 224/290/83 223/138/83 230/140/83 +f 206/135/73 220/141/73 203/143/73 +f 207/291/80 208/136/80 209/145/80 +f 225/292/84 224/146/84 229/148/84 +f 214/133/73 212/149/73 223/134/73 +f 209/293/81 210/144/81 211/151/81 +f 203/294/85 226/152/85 227/154/85 +f 220/141/73 218/155/73 226/142/73 +f 211/295/82 212/149/82 213/157/82 +f 227/154/87 228/153/87 235/159/87 +f 222/150/73 212/149/73 221/160/73 +f 213/296/83 214/133/83 215/161/83 +f 225/156/73 218/155/73 224/162/73 +f 222/297/81 221/163/81 232/165/81 +f 215/298/84 216/132/84 217/166/84 +f 204/172/73 208/136/73 203/143/73 +f 219/299/85 220/141/85 205/167/85 +f 217/300/86 218/155/86 219/168/86 +f 221/301/80 204/169/80 233/171/80 +f 210/144/73 208/136/73 221/160/73 +f 204/302/79 203/173/79 234/175/79 +f 223/303/82 222/176/82 231/178/82 +f 241/181/73 242/182/73 237/179/73 +f 235/159/73 236/158/73 237/179/73 +f 237/179/73 238/184/73 239/183/73 +f 239/183/73 240/180/73 237/179/73 +f 242/182/73 235/159/73 237/179/73 +f 234/175/88 227/174/88 242/182/88 +f 232/165/89 233/164/89 240/180/89 +f 238/184/90 230/140/90 239/183/90 +f 228/131/91 229/130/91 236/158/91 +f 241/181/92 233/171/92 242/182/92 +f 231/178/93 232/177/93 239/183/93 +f 229/148/94 230/147/94 237/179/94 +f 244/304/77 243/185/77 246/187/77 +f 245/186/95 249/188/95 246/187/95 +f 244/304/96 248/190/96 243/185/96 +f 255/196/97 256/192/97 253/194/97 +f 251/197/98 252/195/98 255/196/98 +f 252/195/99 251/197/99 258/199/99 +f 253/194/100 254/193/100 259/201/100 +f 261/305/65 262/202/65 263/204/65 +f 263/306/66 264/203/66 265/206/66 +f 267/307/67 265/207/67 268/208/67 +f 269/308/68 267/209/68 270/210/68 +f 269/309/69 270/210/69 271/212/69 +f 271/310/70 272/211/70 273/214/70 +f 270/210/77 268/208/77 305/216/77 +f 261/311/72 275/217/72 262/202/72 +f 273/312/71 274/213/71 275/219/71 +f 284/313/101 285/220/101 283/222/101 +f 281/314/102 287/223/102 282/225/102 +f 279/315/103 289/226/103 280/228/103 +f 277/316/104 291/229/104 278/231/104 +f 282/317/105 286/224/105 284/232/105 +f 288/243/106 287/223/106 280/234/106 +f 290/230/107 289/226/107 278/236/107 +f 292/221/108 285/220/108 299/238/108 +f 286/224/109 287/223/109 298/240/109 +f 296/318/110 288/227/110 295/241/110 +f 294/245/111 290/230/111 293/242/111 +f 285/220/112 286/224/112 300/237/112 +f 287/223/113 288/243/113 297/239/113 +f 289/226/114 290/230/114 295/241/114 +f 293/242/115 291/229/115 299/238/115 +f 292/221/116 291/229/116 283/247/116 +f 282/250/117 284/319/117 283/320/117 +f 283/320/117 277/321/117 282/250/117 +f 278/322/117 279/248/117 282/250/117 +f 280/249/117 281/323/117 282/250/117 +f 282/250/117 277/321/117 278/322/117 +f 304/324/67 303/251/67 312/253/67 +f 276/218/77 274/213/77 308/255/77 +f 266/205/77 264/203/77 303/257/77 +f 272/211/77 270/210/77 306/258/77 +f 262/202/77 276/218/77 302/259/77 +f 301/256/77 264/203/77 302/259/77 +f 268/208/77 266/205/77 304/215/77 +f 274/213/77 272/211/77 307/254/77 +f 311/252/77 309/264/77 310/263/77 +f 310/263/77 316/266/77 311/252/77 +f 315/260/77 314/268/77 313/261/77 +f 313/261/77 312/253/77 311/252/77 +f 311/252/77 316/266/77 315/260/77 +f 301/325/65 302/262/65 309/264/65 +f 302/326/72 308/265/72 310/263/72 +f 307/327/70 306/267/70 315/260/70 +f 305/328/68 304/269/68 313/261/68 +f 303/329/66 301/270/66 311/252/66 +f 308/330/71 307/271/71 316/266/71 +f 306/331/69 305/272/69 314/268/69 diff --git a/assets/hbm/textures/blocks/mine_fat.png b/assets/hbm/textures/blocks/mine_fat.png new file mode 100644 index 0000000000000000000000000000000000000000..cd8a11873daa1377b84c3162ae2193eac0baae1f GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfmTuLEcFA6yo%`11 zN#E_9LpOkAL$BDY`)A(Rf3DyBA$^KUXN~&xUoRitXJ3+Isu7O;=z3u%F@A$8f=F(Q4(g z?nzfq^Bjm?7vh-Ra7~aQR(7Jes%zk;GsOwFxoac3i*pYdd|`a{ve(3y(c;>ydl%3_jQMxAkRaYBBL!t4q4>-_uU5*=h} SpZ);`0)wZkpUXO@geCy4Pl_7= literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/gun_bolt_action_saturnite.png b/assets/hbm/textures/items/gun_bolt_action_saturnite.png new file mode 100644 index 0000000000000000000000000000000000000000..6c84794619f770fd2f74ef56c2e162ab09fb52b6 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vflx4Zf#u@^F7k3kx$4ggMXPkW^4qJow?!QSLdPSa=hFpyJBq0~uO%y^7U^a&BLQ zOcXPgg&ebxsLQ0NFi8 A`Tzg` literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/ModelBoltActionSaturnite.png b/assets/hbm/textures/models/ModelBoltActionSaturnite.png new file mode 100644 index 0000000000000000000000000000000000000000..f89c1a96078ae127f1599cd8008fa91fb483e75f GIT binary patch literal 2012 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 0) { + if((item.getItem() == ModItems.gun_bolt_action || item.getItem() == ModItems.gun_bolt_action_green || item.getItem() == ModItems.gun_bolt_action_saturnite) && GunBoltAction.getRotationFromAnim(item) > 0) { GL11.glRotatef(GunBoltAction.getRotationFromAnim(item) * 10, 2.5F, 0.0F, 1.5F); GL11.glTranslatef(GunBoltAction.getOffsetFromAnim(item) * -1.75F, 0.0F, 0.0F); } @@ -126,7 +128,7 @@ public class ItemRenderGunAnim implements IItemRenderer { leveraction.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunLeverAction.getRotationFromAnim(item)); if(item.getItem() == ModItems.gun_lever_action_sonata) leveraction.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunLeverActionS.getRotationFromAnim(item)); - if(item.getItem() == ModItems.gun_bolt_action || item.getItem() == ModItems.gun_bolt_action_green) + if(item.getItem() == ModItems.gun_bolt_action || item.getItem() == ModItems.gun_bolt_action_green || item.getItem() == ModItems.gun_bolt_action_saturnite) boltaction.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunBoltAction.getLevRotationFromAnim(item), GunBoltAction.getTransFromAnim(item)); if(item.getItem() == ModItems.gun_b92) b92.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunB92.getTransFromAnim(item)); @@ -147,6 +149,8 @@ public class ItemRenderGunAnim implements IItemRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLeverActionDark.png")); if(item.getItem() == ModItems.gun_bolt_action_green) Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelBoltActionGreen.png")); + if(item.getItem() == ModItems.gun_bolt_action_saturnite) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelBoltActionSaturnite.png")); if(item.getItem() == ModItems.gun_b92) Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB92SM.png")); if(item.getItem() == ModItems.gun_b93) @@ -170,7 +174,7 @@ public class ItemRenderGunAnim implements IItemRenderer { leveraction.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunLeverAction.getRotationFromAnim(item)); if(item.getItem() == ModItems.gun_lever_action_sonata) leveraction.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunLeverActionS.getRotationFromAnim(item)); - if(item.getItem() == ModItems.gun_bolt_action || item.getItem() == ModItems.gun_bolt_action_green) + if(item.getItem() == ModItems.gun_bolt_action || item.getItem() == ModItems.gun_bolt_action_green || item.getItem() == ModItems.gun_bolt_action_saturnite) boltaction.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunBoltAction.getLevRotationFromAnim(item), GunBoltAction.getTransFromAnim(item)); if(item.getItem() == ModItems.gun_b92) b92.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunB92.getTransFromAnim(item)); diff --git a/com/hbm/render/tileentity/RenderLandmine.java b/com/hbm/render/tileentity/RenderLandmine.java index dc6a8e032..9a82aa50e 100644 --- a/com/hbm/render/tileentity/RenderLandmine.java +++ b/com/hbm/render/tileentity/RenderLandmine.java @@ -6,6 +6,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.main.ResourceManager; import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -18,12 +19,13 @@ public class RenderLandmine extends TileEntitySpecialRenderer { GL11.glTranslated(x + 0.5D, y, z + 0.5D); GL11.glEnable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef(180, 0F, 1F, 0F); Block block = tileEntity.getWorldObj().getBlock(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); if(block == ModBlocks.mine_ap) { - GL11.glScaled(1.5F, 1.5F, 1.5F); + GL11.glScaled(1.5D, 1.5D, 1.5D); bindTexture(ResourceManager.mine_ap_tex); ResourceManager.mine_ap.renderAll(); } @@ -35,6 +37,11 @@ public class RenderLandmine extends TileEntitySpecialRenderer { bindTexture(ResourceManager.mine_shrap_tex); ResourceManager.mine_he.renderAll(); } + if(block == ModBlocks.mine_fat) { + GL11.glScaled(0.25D, 0.25D, 0.25D); + bindTexture(ResourceManager.mine_fat_tex); + ResourceManager.mine_fat.renderAll(); + } GL11.glPopMatrix(); } diff --git a/com/hbm/tileentity/bomb/TileEntityLandmine.java b/com/hbm/tileentity/bomb/TileEntityLandmine.java index 9e8863b0e..1ab27692f 100644 --- a/com/hbm/tileentity/bomb/TileEntityLandmine.java +++ b/com/hbm/tileentity/bomb/TileEntityLandmine.java @@ -34,6 +34,9 @@ public class TileEntityLandmine extends TileEntity { if (block == ModBlocks.mine_shrap) { range = 1.5D; } + if (block == ModBlocks.mine_fat) { + range = 2.5D; + } List list = worldObj.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(xCoord - range, yCoord - 1, zCoord - range, xCoord + range, yCoord + 1, zCoord + range));